Mercurial > hg > nginx-mail
diff src/http/ngx_http.c @ 308:94e16de3c33f NGINX_0_5_24
nginx 0.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 might be passed uncompressed if gzip
was used; bug appeared in 0.5.23.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 06 Jun 2007 00:00:00 +0400 |
parents | 9b7db0df50f0 |
children | 429900ca25ee |
line wrap: on
line diff
--- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1015,7 +1015,11 @@ ngx_http_merge_locations(ngx_conf_t *cf, 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;