svn commit: r1070401 - in /httpd/httpd/branches/2.2.x: STATUS modules/proxy/mod_proxy_http.c

[rp...@apache.org]

Author: rpluem
Date: Mon Feb 14 08:04:57 2011
New Revision: 1070401

URL: http://svn.apache.org/viewvc?rev=1070401&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1070401&r1=1070400&r2=1070401&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Feb 14 08:04:57 2011
@@ -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 ]
 

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c?rev=1070401&r1=1070400&r2=1070401&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c Mon Feb 14 08:04:57 2011
@@ -272,8 +272,10 @@ static int pass_brigade(apr_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");