diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-06-06 06:05:26 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2007-06-06 06:05:26 +0000 |
| commit | 363832930d3147dbc4ae50d3ad58743e6f5a232c (patch) | |
| tree | 483976be85c9dc661093fde4e6a4f45e5b0c216d /src/http/ngx_http.c | |
| parent | 4ee9f81f19b6863397570c3cf5ba1a57011bf189 (diff) | |
| download | nginx-363832930d3147dbc4ae50d3ad58743e6f5a232c.tar.gz | |
Changes with nginx 0.5.24 06 Jun 2007v0.5.24
*) Security: the "ssl_verify_client" directive did not work if request
was made using HTTP/0.9.
*) Bugfix: a part of response body may be passed uncompressed if gzip
was used; bug appeared in 0.5.23.
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 46e576a90..c6bc6c581 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1015,7 +1015,11 @@ ngx_http_merge_locations(ngx_conf_t *cf, ngx_array_t *locations, return rv; } - rv = ngx_http_merge_locations(cf, &clcfp[i]->locations, + if (clcfp[i]->locations == NULL) { + continue; + } + + rv = ngx_http_merge_locations(cf, clcfp[i]->locations, clcfp[i]->loc_conf, module, ctx_index); if (rv != NGX_CONF_OK) { return rv; |