[patch] 2.2.x patch - using HTTP_INTERNAL_SERVER_ERROR

httpd-2.2.x.proxyPatch (text/plain), 2.87 KB, created by Daniel Ruggeri on 2010-11-25 10:59:50 UTC

(hide)

Description: 2.2.x patch - using HTTP_INTERNAL_SERVER_ERROR

Filename:

MIME Type:

Creator: Daniel Ruggeri

Created: 2010-11-25 10:59:50 UTC

Size: 2.87 KB

patch

obsolete

>Index: httpd-2.2.x/STATUS >=================================================================== >--- httpd-2.2.x/STATUS (revision 1037345) >+++ httpd-2.2.x/STATUS (working copy) >@@ -184,6 +184,14 @@ > enabling/disabling the basic capability is not split out into mod_unixd 2.2.x. > +1: trawick > >+ * mod_proxy_http: Become aware of ssl handshake failures when attempting >+ to pass request. Makes it so workers are put in error state when a >+ handshake failure is encountered. >+ PR50332 >+ Trunk patch: https://issues.apache.org/bugzilla/attachment.cgi?id=26339 >+ 2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=26338 >+ druggeri: Need doc update? >+ > PATCHES/ISSUES THAT ARE STALLED > > * core: Support wildcards in both the directory and file components of >Index: httpd-2.2.x/modules/proxy/mod_proxy_http.c >=================================================================== >--- httpd-2.2.x/modules/proxy/mod_proxy_http.c (revision 1037345) >+++ httpd-2.2.x/modules/proxy/mod_proxy_http.c (working copy) >@@ -272,6 +272,12 @@ > "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){ >+ return ap_proxyerror(r, HTTP_INTERNAL_SERVER_ERROR, >+ "Error during SSL Handshake with remote server"); >+ } > return APR_STATUS_IS_TIMEUP(status) ? HTTP_GATEWAY_TIME_OUT : HTTP_BAD_GATEWAY; > } > else { >Index: httpd-2.2.x/modules/ssl/ssl_engine_io.c >=================================================================== >--- httpd-2.2.x/modules/ssl/ssl_engine_io.c (revision 1037345) >+++ httpd-2.2.x/modules/ssl/ssl_engine_io.c (working copy) >@@ -1065,6 +1065,7 @@ > ssl_log_ssl_error(APLOG_MARK, APLOG_INFO, server); > /* ensure that the SSL structures etc are freed, etc: */ > ssl_filter_io_shutdown(filter_ctx, c, 1); >+ apr_table_set(c->notes, "SSL_connect_rv", "err"); > return HTTP_BAD_GATEWAY; > } > >@@ -1082,6 +1083,7 @@ > } > /* ensure that the SSL structures etc are freed, etc: */ > ssl_filter_io_shutdown(filter_ctx, c, 1); >+ apr_table_set(c->notes, "SSL_connect_rv", "err"); > return HTTP_BAD_GATEWAY; > } > X509_free(cert); >@@ -1101,10 +1103,12 @@ > hostname, hostname_note); > /* ensure that the SSL structures etc are freed, etc: */ > ssl_filter_io_shutdown(filter_ctx, c, 1); >+ apr_table_set(c->notes, "SSL_connect_rv", "err"); > return HTTP_BAD_GATEWAY; > } > } > >+ apr_table_set(c->notes, "SSL_connect_rv", "ok"); > return APR_SUCCESS; > } > View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]