From: Maxim Dounin <mdounin@mdounin.ru>
Date: Tue, 18 Feb 2014 13:30:40 +0000 (+0400)
Subject: Upstream: ngx_post_event() instead of upgraded call (ticket #503).
X-Git-Tag: release-1.5.11~12
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=5ec277847e8ff5a0990c03b93794d2e5d581f8e3;p=nginx.git

Upstream: ngx_post_event() instead of upgraded call (ticket #503).

If a request is finalized in the first call to the
ngx_http_upstream_process_upgraded() function, e.g., because upstream
server closed the connection for some reason, in the second call
the u->peer.connection pointer will be null, resulting in segmentation
fault.

Fix is to avoid second direct call, and post event instead.  This ensures
that ngx_http_upstream_process_upgraded() won't be called again if
a request is finalized.
---

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 41590eae9..f4dfeb3b6 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2557,7 +2557,9 @@ ngx_http_upstream_upgrade(ngx_http_request_t *r, ngx_http_upstream_t *u)
     if (u->peer.connection->read->ready
         || u->buffer.pos != u->buffer.last)
     {
+        ngx_post_event(c->read, &ngx_posted_events);
         ngx_http_upstream_process_upgraded(r, 1, 1);
+        return;
     }
 
     ngx_http_upstream_process_upgraded(r, 0, 1);