nginx-vendor-1-0: src/http/modules/ngx_http_proxy

comparison src/http/modules/ngx_http_proxy_module.c @ 642:1b80544421e8 NGINX_1_0_11

nginx 1.0.11 *) Change: now double quotes are encoded in an "echo" SSI-command output. Thanks to Zaur Abasmirzoev. *) Feature: the "image_filter_sharpen" directive. *) Bugfix: a segmentation fault might occur in a worker process if SNI was used; the bug had appeared in 1.0.9. *) Bugfix: SIGWINCH signal did not work after first binary upgrade; the bug had appeared in 1.0.9. *) Bugfix: the "If-Modified-Since", "If-Range", etc. client request header lines might be passed to backend while caching; or not passed without caching if caching was enabled in another part of the configuration. *) Bugfix: in the "scgi_param" directive, if complex parameters were used. *) Bugfix: "add_header" and "expires" directives did not work if a request was proxied and response status code was 206. *) Bugfix: in the "expires @time" directive. *) Bugfix: in the ngx_http_flv_module. Thanks to Piotr Sikora. *) Bugfix: in the ngx_http_mp4_module. *) Bugfix: nginx could not be built on FreeBSD 10. *) Bugfix: nginx could not be built on AIX.

author	Igor Sysoev <http://sysoev.ru>
date	Thu, 15 Dec 2011 00:00:00 +0400
parents	0d6525917227
children	ad25218fd14b

comparison

equal deleted inserted replaced

-:e21c9e01ce08
+:1b80544421e8
 ngx_http_proxy_loc_conf_t *prev = parent;
 ngx_http_proxy_loc_conf_t *conf = child;
 u_char                     *p;
 size_t                      size;
-ngx_keyval_t               *s;
 ngx_hash_init_t             hash;
 ngx_http_core_loc_conf_t   *clcf;
 ngx_http_proxy_redirect_t  *pr;
 ngx_http_script_compile_t   sc;
 sc.complete_values = 1;
 if (ngx_http_script_compile(&sc) != NGX_OK) {
 return NGX_CONF_ERROR;
 }
-if (conf->headers_source == NULL) {
-conf->headers_source = ngx_array_create(cf->pool, 4,
-sizeof(ngx_keyval_t));
-if (conf->headers_source == NULL) {
-return NGX_CONF_ERROR;
-}
-}
-s = ngx_array_push(conf->headers_source);
-if (s == NULL) {
-return NGX_CONF_ERROR;
-}
-ngx_str_set(&s->key, "Content-Length");
-ngx_str_set(&s->value, "$proxy_internal_body_length");
 }
 if (ngx_http_proxy_merge_headers(cf, conf, prev) != NGX_OK) {
 return NGX_CONF_ERROR;
 }
 {
 u_char                       *p;
 size_t                        size;
 uintptr_t                    *code;
 ngx_uint_t                    i;
-ngx_array_t                   headers_names;
+ngx_array_t                   headers_names, headers_merged;
 ngx_keyval_t                 *src, *s, *h;
 ngx_hash_key_t               *hk;
 ngx_hash_init_t               hash;
 ngx_http_script_compile_t     sc;
 ngx_http_script_copy_code_t  *copy;
 conf->headers_set_hash = prev->headers_set_hash;
 conf->headers_source = prev->headers_source;
 }
 if (conf->headers_set_hash.buckets
+&& ((conf->body_source.data == NULL)
+== (prev->body_source.data == NULL))
 #if (NGX_HTTP_CACHE)
 && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL))
 #endif
 )
 {
 != NGX_OK)
 {
 return NGX_ERROR;
 }
+if (ngx_array_init(&headers_merged, cf->temp_pool, 4, sizeof(ngx_keyval_t))
+!= NGX_OK)
+{
+return NGX_ERROR;
+}
 if (conf->headers_source == NULL) {
 conf->headers_source = ngx_array_create(cf->pool, 4,
 sizeof(ngx_keyval_t));
 if (conf->headers_source == NULL) {
 return NGX_ERROR;
 if (conf->headers_set == NULL) {
 return NGX_ERROR;
 }
-src = conf->headers_source->elts;
 #if (NGX_HTTP_CACHE)
 h = conf->upstream.cache ? ngx_http_proxy_cache_headers:
 ngx_http_proxy_headers;
 #else
 h = ngx_http_proxy_headers;
 #endif
+src = conf->headers_source->elts;
+for (i = 0; i < conf->headers_source->nelts; i++) {
+s = ngx_array_push(&headers_merged);
+if (s == NULL) {
+return NGX_ERROR;
+}
+*s = src[i];
+}
 while (h->key.len) {
-for (i = 0; i < conf->headers_source->nelts; i++) {
+src = headers_merged.elts;
+for (i = 0; i < headers_merged.nelts; i++) {
 if (ngx_strcasecmp(h->key.data, src[i].key.data) == 0) {
 goto next;
 }
 }
-s = ngx_array_push(conf->headers_source);
+s = ngx_array_push(&headers_merged);
 if (s == NULL) {
 return NGX_ERROR;
 }
 *s = *h;
-src = conf->headers_source->elts;
 next:
 h++;
 }
+if (conf->body_source.data) {
-src = conf->headers_source->elts;
+s = ngx_array_push(&headers_merged);
-for (i = 0; i < conf->headers_source->nelts; i++) {
+if (s == NULL) {
+return NGX_ERROR;
+}
+ngx_str_set(&s->key, "Content-Length");
+ngx_str_set(&s->value, "$proxy_internal_body_length");
+}
+src = headers_merged.elts;
+for (i = 0; i < headers_merged.nelts; i++) {
 hk = ngx_array_push(&headers_names);
 if (hk == NULL) {
 return NGX_ERROR;
 }

Mercurial > hg > nginx-vendor-1-0

comparison src/http/modules/ngx_http_proxy_module.c @ 642:1b80544421e8 NGINX_1_0_11