diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-10-18 11:36:58 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-10-18 11:36:58 +0000 |
| commit | 8decab3dd9bb0e9c5313be590bb09f5b54ff7cb7 (patch) | |
| tree | 6bdf42d1bbabb7f197c9e3448add38aed9d78f2b /src/http/ngx_http_request.c | |
| parent | 4c5207fd563eda01384ede94758ff333879abffc (diff) | |
| download | nginx-8decab3dd9bb0e9c5313be590bb09f5b54ff7cb7.tar.gz nginx-8decab3dd9bb0e9c5313be590bb09f5b54ff7cb7.zip | |
merge_slashes
Diffstat (limited to 'src/http/ngx_http_request.c')
| -rw-r--r-- | src/http/ngx_http_request.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index c041383b4..4b0190689 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -602,10 +602,11 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg) static void ngx_http_process_request_line(ngx_event_t *rev) { - ssize_t n; - ngx_int_t rc, rv; - ngx_connection_t *c; - ngx_http_request_t *r; + ssize_t n; + ngx_int_t rc, rv; + ngx_connection_t *c; + ngx_http_request_t *r; + ngx_http_core_srv_conf_t *cscf; c = rev->data; r = c->data; @@ -657,7 +658,9 @@ ngx_http_process_request_line(ngx_event_t *rev) return; } - rc = ngx_http_parse_complex_uri(r); + cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); + + rc = ngx_http_parse_complex_uri(r, cscf->merge_slashes); if (rc == NGX_HTTP_PARSE_INVALID_REQUEST) { ngx_log_error(NGX_LOG_INFO, c->log, 0, |