diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 11:19:58 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 11:19:58 +0000 |
| commit | f59e9d45fb8ee216dd7db6a723a7912c012e4b5b (patch) | |
| tree | 02e2710636dc71468334f81ffc57ad907f949f1c /src/core/ngx_parse.h | |
| parent | acde3201b8d1bf7da10df81eecc31ecdb072c70b (diff) | |
| download | nginx-f59e9d45fb8ee216dd7db6a723a7912c012e4b5b.tar.gz nginx-f59e9d45fb8ee216dd7db6a723a7912c012e4b5b.tar.bz2 | |
Merging r4009, r4133, r4184, r4201, r4202, r4203, r4204, r4205:
Miscellaneous fixes:
*) Fix of names of the referer hash size directives introduced in r3940.
*) Cosmetics: replaced NGX_CONF_TAKE1 to NGX_CONF_FLAG for "sendfile"
and "chunked_transfer_encoding" directives, to be in line with all
directives taking a boolean argument. Both flags will ensure that
a directive takes one argument.
*) Improved ngx_parse_time() code readability.
*) Preallocating exact number of default MIME types entries.
*) Stylistic change in checking the boolean expression.
*) Replaced magic constants representing default values of some directives
with appropriate #define's.
*) Fixed grammar in a comment.
*) Fixed two minor bugs in "types" parsing code.
Diffstat (limited to 'src/core/ngx_parse.h')
| -rw-r--r-- | src/core/ngx_parse.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ngx_parse.h b/src/core/ngx_parse.h index c25a3a023..e770623fd 100644 --- a/src/core/ngx_parse.h +++ b/src/core/ngx_parse.h @@ -17,7 +17,7 @@ ssize_t ngx_parse_size(ngx_str_t *line); off_t ngx_parse_offset(ngx_str_t *line); -ngx_int_t ngx_parse_time(ngx_str_t *line, ngx_uint_t sec); +ngx_int_t ngx_parse_time(ngx_str_t *line, ngx_uint_t is_sec); #endif /* _NGX_PARSE_H_INCLUDED_ */ |