From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 14 Feb 2011 08:04:57 +0000 (+0000)
Subject: Merge r1069785 from trunk:
X-Git-Tag: 2.2.18~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c6b3e91d8b6c610848543632856eddbfa9b6933;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1069785 from trunk:

* Play safe if the notes table does not contain an SSL_connect_rv key.
Submitted by: rpluem
Reviewed by: rpluem, covener, sf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1070401 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 50c1c3b31fa..d169b6e81e0 100644
--- a/STATUS
+++ b/STATUS
@@ -102,14 +102,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      enabling/disabling the basic capability is not split out into mod_unixd 2.2.x.
      +1: trawick, covener, wrowe
 
-  * mod_proxy: Avoid a segfault if the notes table does not contain an
-               SSL_connect_rv key.
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=1069785&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, covener, sf
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 359e40fc06b..19c82f2c8aa 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -272,8 +272,10 @@ static int pass_brigade(apr_bucket_alloc_t *bucket_alloc,
                      "proxy: pass request body failed to %pI (%s)",
                      conn->addr, conn->hostname);
         if (origin->aborted) {
-            if (strcmp(apr_table_get(origin->notes,
-                                     "SSL_connect_rv"), "err") == 0) {
+            const char *ssl_note;
+
+            if (((ssl_note = apr_table_get(origin->notes, "SSL_connect_rv"))
+                != NULL) && (strcmp(ssl_note, "err") == 0)) {
                 return ap_proxyerror(r, HTTP_INTERNAL_SERVER_ERROR,
                                      "Error during SSL Handshake with"
                                      " remote server");