Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit 9843179e556edaea3b8f7796d0a248bec5f41931 1 parent b08af90
@trawick trawick authored
Showing with 3 additions and 4 deletions.
  1. +3 −0  CHANGES
  2. +0 −4 server/core_filters.c
View
3  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,
View
4 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
Please sign in to comment.
Something went wrong with that request. Please try again.