From c2068d08f097383b8eac508117e6d405627e6cef Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 19 Oct 2005 12:33:58 +0000 Subject: nginx-0.3.3-RELEASE import *) Change: the "bl" and "af" parameters of the "listen" directive was renamed to the "backlog" and "accept_filter". *) Feature: the "rcvbuf" and "sndbuf" parameters of the "listen" directive. *) Change: the "$msec" log parameter does not require now the additional the gettimeofday() system call. *) Feature: the -t switch now tests the "listen" directives. *) Bugfix: if the invalid address was specified in the "listen" directive, then after the -HUP signal nginx left an open socket in the CLOSED state. *) Bugfix: the mime type may be incorrectly set to default value for index file with variable in the name; the bug had appeared in 0.3.0. *) Feature: the "timer_resolution" directive. *) Feature: the millisecond "$upstream_response_time" log parameter. *) Bugfix: a temporary file with client request body now is removed just after the response header was transferred to a client. *) Bugfix: OpenSSL 0.9.6 compatibility. *) Bugfix: the SSL certificate and key file paths could not be relative. *) Bugfix: the "ssl_prefer_server_ciphers" directive did not work in the ngx_imap_ssl_module. *) Bugfix: the "ssl_protocols" directive allowed to specify the single protocol only. --- src/core/ngx_parse.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/core/ngx_parse.c') diff --git a/src/core/ngx_parse.c b/src/core/ngx_parse.c index dad9efcbd..f8e5f6c2e 100644 --- a/src/core/ngx_parse.c +++ b/src/core/ngx_parse.c @@ -8,11 +8,13 @@ #include -ngx_int_t ngx_parse_size(ngx_str_t *line) +ssize_t +ngx_parse_size(ngx_str_t *line) { u_char last; size_t len; - ngx_int_t scale, size; + ssize_t size; + ngx_int_t scale; len = line->len; last = line->data[len - 1]; @@ -34,7 +36,7 @@ ngx_int_t ngx_parse_size(ngx_str_t *line) scale = 1; } - size = ngx_atoi(line->data, len); + size = ngx_atosz(line->data, len); if (size == NGX_ERROR) { return NGX_ERROR; } @@ -45,7 +47,8 @@ ngx_int_t ngx_parse_size(ngx_str_t *line) } -ngx_int_t ngx_parse_time(ngx_str_t *line, ngx_int_t sec) +ngx_int_t +ngx_parse_time(ngx_str_t *line, ngx_int_t sec) { size_t len; u_char *start, last; -- cgit v1.2.3