]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1039304, r1053584 from trunk:
authorRuediger Pluem <rpluem@apache.org>
Fri, 11 Feb 2011 12:30:21 +0000 (12:30 +0000)
committerRuediger Pluem <rpluem@apache.org>
Fri, 11 Feb 2011 12:30:21 +0000 (12:30 +0000)
commit293dc565b626adf8ea1a8f24e1185744dc12d0d6
tree5361865a695f243ce07e01b1494c820a8d894e13
parent0b6a34636101d7b38893107c69cbf06dd640dca4
Merge r1039304, r1053584 from trunk:

* Put a note in the connection notes that the SSL handshake to the backend
  failed such that mod_proxy can put the worker in error state.

PR: 50332
Submitted by: Daniel Ruggeri <DRuggeri primary.net>
Reviewed by: rpluem

* Fix r1039304 and make the patch similar to the one proposed for
  2.2.x: If the SSL handshake to the backend fails we cannot even
  sent an HTTP request. So the check needs to happen already when
  we sent data not when we receive data.

Reviewed by: rpluem, jim, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1069773 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/proxy/mod_proxy_http.c
modules/ssl/ssl_engine_io.c