r2414 merge:

fix segfault

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 3f77c03c4ea0fe8b7e296cb3567847cea6d8a6bf..bb235db8a86b6ed16b8f12a7c480e48fd1649496 100644 (file)
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2345,7 +2345,9 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "finalize http upstream request: %i", rc);
 
-    *u->cleanup = NULL;
+    if (u->cleanup) {
+        *u->cleanup = NULL;
+    }
 
     if (u->state && u->state->response_sec) {
         tp = ngx_timeofday();