[nginx] svn commit: r4720 - in branches/stable-1.2: . src/http

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-07-02 15:43:50 +0000 (Mon, 02 Jul 2012)
New Revision: 4720
URL: http://trac.nginx.org/nginx/changeset/4720/nginx

Log:
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


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/ngx_http_upstream.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-07-02 15:41:31 UTC (rev 4719)
+++ branches/stable-1.2	2012-07-02 15:43:50 UTC (rev 4720)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4650,4674-4676
+/trunk:4611-4632,4636-4651,4674-4676
\ No newline at end of property
Modified: branches/stable-1.2/src/http/ngx_http_upstream.c
===================================================================
--- branches/stable-1.2/src/http/ngx_http_upstream.c	2012-07-02 15:41:31 UTC (rev 4719)
+++ branches/stable-1.2/src/http/ngx_http_upstream.c	2012-07-02 15:43:50 UTC (rev 4720)
@@ -3677,6 +3677,7 @@
 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 @@
     *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;