You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/08/14 23:10:59 UTC
svn commit: r1373108 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
server/core_filters.c
Author: jim
Date: Tue Aug 14 21:10:59 2012
New Revision: 1373108
URL: http://svn.apache.org/viewvc?rev=1373108&view=rev
Log:
Merge r1371801 from trunk:
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
Submitted by: trawick
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/server/core_filters.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1371801
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1373108&r1=1373107&r2=1373108&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Aug 14 21:10:59 2012
@@ -7,6 +7,9 @@ Changes with Apache 2.4.3
possible XSS for a site where untrusted users can upload files to
a location with MultiViews enabled. [Niels Heinen <heinenn google.com>]
+ *) Windows: Fix SSL failures on windows with AcceptFilter https none.
+ PR: 52476. [Jeff Trawick]
+
*) ab: Fix read failure when targeting SSL server. [Jeff Trawick]
*) The following now respect DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR:
Modified: httpd/httpd/branches/2.4.x/server/core_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core_filters.c?rev=1373108&r1=1373107&r2=1373108&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core_filters.c (original)
+++ httpd/httpd/branches/2.4.x/server/core_filters.c Tue Aug 14 21:10:59 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