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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1371801 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 47edc7f82f65a41042c99f7a1acf2292258b64bc..09061c2e36090b9eff193445aab8d5d9ad1727d1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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,

diff --git a/server/core_filters.c b/server/core_filters.c
index 18a32dde221543d62245a9f89748a5a093259581..0798d2ef1ebbbd09d9c7fd0c6127eafee0640448 100644 (file)
--- a/server/core_filters.c
+++ b/server/core_filters.c
@@ -391,10 +391,6 @@ apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *new_bb)
     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