diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-10-22 11:17:22 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2007-10-22 11:17:22 +0000 |
| commit | 388fd29a9824babe892771b2ca42db491b90bfde (patch) | |
| tree | 48da2a3018050fa6ac4ba84fc8438aac387201f1 /src/http/ngx_http.h | |
| parent | 7a5fafa72cef419ba594e9357cfbcb47e9663311 (diff) | |
| download | nginx-388fd29a9824babe892771b2ca42db491b90bfde.tar.gz | |
Changes with nginx 0.6.15 22 Oct 2007v0.6.15
*) Feature: cygwin compatibility.
Thanks to Vladimir Kutakov.
*) Feature: the "merge_slashes" directive.
*) Feature: the "gzip_vary" directive.
*) Feature: the "server_tokens" directive.
*) Bugfix: nginx did not unescape URI in the "include" SSI command.
*) Bugfix: the segmentation fault was occurred on start or while
reconfiguration if variable was used in the "charset" or
"source_charset" directives.
*) Bugfix: nginx returned the 400 response on requests like
"GET http://www.domain.com HTTP/1.0".
Thanks to James Oakley.
*) Bugfix: if request with request body was redirected using the
"error_page" directive, then nginx tried to read the request body
again; bug appeared in 0.6.7.
*) Bugfix: a segmentation fault occurred in worker process if no
server_name was explicitly defined for server processing request;
bug appeared in 0.6.7.
Diffstat (limited to 'src/http/ngx_http.h')
| -rw-r--r-- | src/http/ngx_http.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h index 8b04b7a35..93c140f07 100644 --- a/src/http/ngx_http.h +++ b/src/http/ngx_http.h @@ -64,7 +64,8 @@ int ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg); #endif ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b); -ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r); +ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r, + ngx_uint_t merge_slashes); ngx_int_t ngx_http_parse_unsafe_uri(ngx_http_request_t *r, ngx_str_t *uri, ngx_str_t *args, ngx_uint_t *flags); ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b); |