comparison src/core/ngx_parse.h @ 4241:6afb20bf2ad5 stable-1.0

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.
author Igor Sysoev <igor@sysoev.ru>
date Tue, 01 Nov 2011 11:19:58 +0000
parents 9d2bdbda4ee3
children d620f497c50f
comparison
equal deleted inserted replaced
4240:17ab1927f80f 4241:6afb20bf2ad5
15 #define NGX_PARSE_LARGE_TIME -2 15 #define NGX_PARSE_LARGE_TIME -2
16 16
17 17
18 ssize_t ngx_parse_size(ngx_str_t *line); 18 ssize_t ngx_parse_size(ngx_str_t *line);
19 off_t ngx_parse_offset(ngx_str_t *line); 19 off_t ngx_parse_offset(ngx_str_t *line);
20 ngx_int_t ngx_parse_time(ngx_str_t *line, ngx_uint_t sec); 20 ngx_int_t ngx_parse_time(ngx_str_t *line, ngx_uint_t is_sec);
21 21
22 22
23 #endif /* _NGX_PARSE_H_INCLUDED_ */ 23 #endif /* _NGX_PARSE_H_INCLUDED_ */