Mercurial > hg > nginx
comparison src/core/ngx_string.c @ 4246:d3568507db51 stable-1.0
Merging r4132, r4134, r4143, r4183, r4191, r4199:
Various fixes related to error messages:
*) Removed old warning that suggested to use "server_name_in_redirect off"
(now the default) in place of no longer supported "server_name *".
*) Fixing directive name in error message if types hash size is not enough.
*) Replaced "can not" with "cannot" and "could not" in a bunch of places.
Fixed nearby grammar errors.
*) Overhauled error messages.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 01 Nov 2011 13:24:50 +0000 |
parents | 7224d008faaf |
children | 61e4af19df9f |
comparison
equal
deleted
inserted
replaced
4245:8d39230df833 | 4246:d3568507db51 |
---|---|
379 scale *= 10.0; | 379 scale *= 10.0; |
380 } | 380 } |
381 | 381 |
382 /* | 382 /* |
383 * (int64_t) cast is required for msvc6: | 383 * (int64_t) cast is required for msvc6: |
384 * it can not convert uint64_t to double | 384 * it cannot convert uint64_t to double |
385 */ | 385 */ |
386 ui64 = (uint64_t) ((f - (int64_t) ui64) * scale + 0.5); | 386 ui64 = (uint64_t) ((f - (int64_t) ui64) * scale + 0.5); |
387 | 387 |
388 buf = ngx_sprintf_num(buf, last, ui64, '0', 0, frac_width); | 388 buf = ngx_sprintf_num(buf, last, ui64, '0', 0, frac_width); |
389 } | 389 } |