Fijxu
/
nginx-quic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge of r4651: proxy_cookie_* fix. 

Fixed returned value handling from the cookie rewrite handler.

If the "proxy_cookie_domain" or "proxy_cookie_path" directive is used and there
are no matches in Set-Cookie header then ngx_http_proxy_rewrite_cookie() returns
NGX_DECLINED to indicate that the header was not rewritten. Returning this value
further from the upstream headers copy handler resulted in 500 error response.

See here for report:
http://mailman.nginx.org/pipermail/nginx/2012-May/033858.html
This commit is contained in:
Maxim Dounin 2012-07-02 15:43:50 +00:00
parent 5eb5790e06
commit a9cc91bacf
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/http/ngx_http_upstream.c
View File

@ -3677,6 +3677,7 @@ static ngx_int_t
ngx_http_upstream_rewrite_set_cookie(ngx_http_request_t *r, ngx_table_elt_t *h,
ngx_uint_t offset)
{
ngx_int_t rc;
ngx_table_elt_t *ho;
ho = ngx_list_push(&r->headers_out.headers);
@ -3687,7 +3688,20 @@ ngx_http_upstream_rewrite_set_cookie(ngx_http_request_t *r, ngx_table_elt_t *h,
*ho = *h;
if (r->upstream->rewrite_cookie) {
return r->upstream->rewrite_cookie(r, ho);
rc = r->upstream->rewrite_cookie(r, ho);
if (rc == NGX_DECLINED) {
return NGX_OK;
}
#if (NGX_DEBUG)
if (rc == NGX_OK) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"rewritten cookie: \"%V\"", &ho->value);
}
#endif
return rc;
}
return NGX_OK;