svn commit: r1371801 - in /httpd/httpd/trunk: CHANGES server/core_filters.c

[tr...@apache.org]

Author: trawick
Date: Fri Aug 10 18:20:22 2012
New Revision: 1371801

URL: http://svn.apache.org/viewvc?rev=1371801&view=rev
Log:
Windows: Fix SSL failures on windows with AcceptFilter https none.

The now-stray apr_socket_opt_set(APR_SO_NONBLOCK=On) call was 
originally added with r327872.  The call was harmless on Unix
due to APR's use of non-blocking sockets when implementing timeouts
on that platform, but harmful on Windows since it collided with
APR's different implementation of timeouts on that platform.

PR: 52476

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/core_filters.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1371801&r1=1371800&r2=1371801&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Aug 10 18:20:22 2012
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) Windows: Fix SSL failures on windows with AcceptFilter https none.
+     PR: 52476.  [Jeff Trawick]
+
   *) ab: Fix read failure when targeting SSL server.  [Jeff Trawick]
 
   *) mod_lua: Decline handling 'lua-script' if the file doesn't exist,

Modified: httpd/httpd/trunk/server/core_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core_filters.c?rev=1371801&r1=1371800&r2=1371801&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core_filters.c (original)
+++ httpd/httpd/trunk/server/core_filters.c Fri Aug 10 18:20:22 2012
@@ -391,10 +391,6 @@ apr_status_t ap_core_output_filter(ap_fi
     if (ctx == NULL) {
         ctx = apr_pcalloc(c->pool, sizeof(*ctx));
         net->out_ctx = (core_output_filter_ctx_t *)ctx;
-        rv = apr_socket_opt_set(net->client_socket, APR_SO_NONBLOCK, 1);
-        if (rv != APR_SUCCESS) {
-            return rv;
-        }
         /*
          * Need to create tmp brigade with correct lifetime. Passing
          * NULL to apr_brigade_split_ex would result in a brigade