You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2011/02/11 13:50:31 UTC

svn commit: r1069785 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c

Author: rpluem
Date: Fri Feb 11 12:50:31 2011
New Revision: 1069785

URL: http://svn.apache.org/viewvc?rev=1069785&view=rev
Log:
* Play safe if the notes table does not contain an SSL_connect_rv key.

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_http.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=1069785&r1=1069784&r2=1069785&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Fri Feb 11 12:50:31 2011
@@ -272,8 +272,10 @@ static int pass_brigade(apr_bucket_alloc
                      "proxy: pass request body failed to %pI (%s)",
                      p_conn->addr, p_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");