From: Ruediger Pluem <rpluem@apache.org>
Date: Wed, 15 Oct 2008 00:22:04 +0000 (+0000)
Subject: * Veto a backport
X-Git-Tag: 2.2.11~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5955d4b395377fae35b2ee6861688cc24bc5acfd;p=thirdparty%2Fapache%2Fhttpd.git

* Veto a backport


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@704751 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 1499ba060b8..236db92e484 100644
--- a/STATUS
+++ b/STATUS
@@ -124,6 +124,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Backport version for 2.2.x of patch:
         Trunk version of patch works
      +1: jim
+     -1: rpluem: apr_socket_timeout_set already sets the socket to non-blocking
+         mode because the timeout of the socket is -1 after creation. A further
+         call to apr_socket_timeout_set (after the connect call does not do
+         this, because the old and the new timeout are >=0).
+         The further code expects the socket to be in non-blocking mode, otherwise
+         we have regressions with ssl. This can be notified by running t/ssl/proxy
+         which runs much much slower with the patch applied. This does not happen
+         on trunk because the socket is set back to non blocking by the core
+         output filter (async write completion).
+         So r703998 should be also reverted on trunk.
 
    * mod_rewrite: Export and install the mod_rewrite.h header to ensure the
      optional rewrite_mapfunc_t and ap_register_rewrite_mapfunc functions are