Mercurial > hg > nginx-vendor-current
diff src/http/modules/ngx_http_fastcgi_module.c @ 654:753f505670e0 NGINX_1_1_11
nginx 1.1.11
*) Feature: the "so_keepalive" parameter of the "listen" directive.
Thanks to Vsevolod Stakhov.
*) Feature: the "if_not_empty" parameter of the
"fastcgi/scgi/uwsgi_param" directives.
*) Feature: the $https variable.
*) Feature: the "proxy_redirect" directive supports variables in the
first parameter.
*) Feature: the "proxy_redirect" directive supports regular expressions.
*) Bugfix: the $sent_http_cache_control variable might contain a wrong
value if the "expires" directive was used.
Thanks to Yichun Zhang.
*) Bugfix: the "read_ahead" directive might not work combined with
"try_files" and "open_file_cache".
*) Bugfix: a segmentation fault might occur in a worker process if small
time was used in the "inactive" parameter of the "proxy_cache_path"
directive.
*) Bugfix: responses from cache might hang.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 12 Dec 2011 00:00:00 +0400 |
parents | f200748c0ac8 |
children | 9d21dad0b5a1 |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_fastcgi_module.c +++ b/src/http/modules/ngx_http_fastcgi_module.c @@ -411,8 +411,8 @@ static ngx_command_t ngx_http_fastcgi_c &ngx_http_fastcgi_next_upstream_masks }, { ngx_string("fastcgi_param"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2, - ngx_conf_set_keyval_slot, + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE23, + ngx_http_upstream_param_set_slot, NGX_HTTP_LOC_CONF_OFFSET, offsetof(ngx_http_fastcgi_loc_conf_t, params_source), NULL }, @@ -708,7 +708,7 @@ ngx_http_fastcgi_create_request(ngx_http u_char ch, *pos, *lowcase_key; size_t size, len, key_len, val_len, padding, allocated; - ngx_uint_t i, n, next, hash, header_params; + ngx_uint_t i, n, next, hash, skip_empty, header_params; ngx_buf_t *b; ngx_chain_t *cl, *body; ngx_list_part_t *part; @@ -739,11 +739,18 @@ ngx_http_fastcgi_create_request(ngx_http lcode = *(ngx_http_script_len_code_pt *) le.ip; key_len = lcode(&le); + lcode = *(ngx_http_script_len_code_pt *) le.ip; + skip_empty = lcode(&le); + for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode(&le)) { lcode = *(ngx_http_script_len_code_pt *) le.ip; } le.ip += sizeof(uintptr_t); + if (skip_empty && val_len == 0) { + continue; + } + len += 1 + key_len + ((val_len > 127) ? 4 : 1) + val_len; } } @@ -893,11 +900,28 @@ ngx_http_fastcgi_create_request(ngx_http lcode = *(ngx_http_script_len_code_pt *) le.ip; key_len = (u_char) lcode(&le); + lcode = *(ngx_http_script_len_code_pt *) le.ip; + skip_empty = lcode(&le); + for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode(&le)) { lcode = *(ngx_http_script_len_code_pt *) le.ip; } le.ip += sizeof(uintptr_t); + if (skip_empty && val_len == 0) { + e.skip = 1; + + while (*(uintptr_t *) e.ip) { + code = *(ngx_http_script_code_pt *) e.ip; + code((ngx_http_script_engine_t *) &e); + } + e.ip += sizeof(uintptr_t); + + e.skip = 0; + + continue; + } + *e.pos++ = (u_char) key_len; if (val_len > 127) { @@ -2370,9 +2394,9 @@ ngx_http_fastcgi_merge_params(ngx_conf_t #if (NGX_HTTP_CACHE) ngx_array_t params_merged; #endif - ngx_keyval_t *src; ngx_hash_key_t *hk; ngx_hash_init_t hash; + ngx_http_upstream_param_t *src; ngx_http_script_compile_t sc; ngx_http_script_copy_code_t *copy; @@ -2433,9 +2457,11 @@ ngx_http_fastcgi_merge_params(ngx_conf_t #if (NGX_HTTP_CACHE) if (conf->upstream.cache) { - ngx_keyval_t *h, *s; - - if (ngx_array_init(¶ms_merged, cf->temp_pool, 4, sizeof(ngx_keyval_t)) + ngx_keyval_t *h; + ngx_http_upstream_param_t *s; + + if (ngx_array_init(¶ms_merged, cf->temp_pool, 4, + sizeof(ngx_http_upstream_param_t)) != NGX_OK) { return NGX_ERROR; @@ -2469,7 +2495,9 @@ ngx_http_fastcgi_merge_params(ngx_conf_t return NGX_ERROR; } - *s = *h; + s->key = h->key; + s->value = h->value; + s->skip_empty = 0; next: @@ -2511,6 +2539,15 @@ ngx_http_fastcgi_merge_params(ngx_conf_t copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; copy->len = src[i].key.len; + copy = ngx_array_push_n(conf->params_len, + sizeof(ngx_http_script_copy_code_t)); + if (copy == NULL) { + return NGX_ERROR; + } + + copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; + copy->len = src[i].skip_empty; + size = (sizeof(ngx_http_script_copy_code_t) + src[i].key.len + sizeof(uintptr_t) - 1)