Commit b8ba64dd authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

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
parent dc834024

STATUS

+0 −8
Changes for STATUS: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -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 ]

modules/proxy/mod_proxy_http.c

+4 −2
Changes for modules/proxy/mod_proxy_http.c: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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");