Mercurial > hg > nginx-vendor-1-0

comparison src/http/ngx_http.c @ 308:94e16de3c33f NGINX_0_5_24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
307:0bcb7f864b94 308:94e16de3c33f
1013 clcfp[i]->loc_conf[ctx_index]); 1013 clcfp[i]->loc_conf[ctx_index]);
1014 if (rv != NGX_CONF_OK) { 1014 if (rv != NGX_CONF_OK) {
1015 return rv; 1015 return rv;
1016 } 1016 }
1017 1017
1018 rv = ngx_http_merge_locations(cf, &clcfp[i]->locations, 1018 if (clcfp[i]->locations == NULL) {
1019 continue;
1020 }
1021
1022 rv = ngx_http_merge_locations(cf, clcfp[i]->locations,
1019 clcfp[i]->loc_conf, module, ctx_index); 1023 clcfp[i]->loc_conf, module, ctx_index);
1020 if (rv != NGX_CONF_OK) { 1024 if (rv != NGX_CONF_OK) {
1021 return rv; 1025 return rv;
1022 } 1026 }
1023 } 1027 }