You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2005/10/06 22:31:06 UTC
svn commit: r306878 - in /httpd/httpd/trunk: CHANGES
modules/proxy/mod_proxy_connect.c
Author: trawick
Date: Thu Oct 6 13:31:03 2005
New Revision: 306878
URL: http://svn.apache.org/viewcvs?rev=306878&view=rev
Log:
mod_proxy_connect: Fix high CPU loop on systems like UnixWare which
trigger POLL_ERR or POLL_HUP on a terminated connection.
PR: 36951
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=306878&r1=306877&r2=306878&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Oct 6 13:31:03 2005
@@ -31,6 +31,10 @@
Changes with Apache 2.1.9
+ *) mod_proxy_connect: Fix high CPU loop on systems like UnixWare which
+ trigger POLL_ERR or POLL_HUP on a terminated connection. PR 36951.
+ [Jeff Trawick, Ruediger Pluem]
+
*) SECURITY: CAN-2005-2970 (cve.mitre.org)
worker MPM: Fix a memory leak which can occur after an aborted
connection in some limited circumstances. [Greg Ames, Jeff Trawick]
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c?rev=306878&r1=306877&r2=306878&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c Thu Oct 6 13:31:03 2005
@@ -357,8 +357,10 @@
else
break;
}
- else if ((pollevent & APR_POLLERR) || (pollevent & APR_POLLHUP))
+ else if ((pollevent & APR_POLLERR) || (pollevent & APR_POLLHUP)) {
+ rv = APR_EOF;
break;
+ }
}
else
break;
Re: svn commit: r306878 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy_connect.c
Posted by Ruediger Pluem <rp...@apache.org>.
On 10/06/2005 10:45 PM, Rüdiger Plüm wrote:
>
> On 10/06/2005 10:31 PM, trawick@apache.org wrote:
>
[..cut..]
>
> Sorry for being picky Jeff, but actually you only committed it right now to the trunk and not to the 2.2.x
> branch from which 2.1.9 will be rolled. So shouldn't your entry be at the top of the file?
Been too impatient again :-). Just seen that you backported it.
Regards
Rüdiger
Re: svn commit: r306878 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy_connect.c
Posted by Rüdiger Plüm <r....@gmx.de>.
On 10/06/2005 10:31 PM, trawick@apache.org wrote:
> Author: trawick
> Date: Thu Oct 6 13:31:03 2005
> New Revision: 306878
>
> URL: http://svn.apache.org/viewcvs?rev=306878&view=rev
> --- httpd/httpd/trunk/CHANGES [utf-8] (original)
> +++ httpd/httpd/trunk/CHANGES [utf-8] Thu Oct 6 13:31:03 2005
> @@ -31,6 +31,10 @@
>
> Changes with Apache 2.1.9
>
> + *) mod_proxy_connect: Fix high CPU loop on systems like UnixWare which
> + trigger POLL_ERR or POLL_HUP on a terminated connection. PR 36951.
> + [Jeff Trawick, Ruediger Pluem]
> +
Sorry for being picky Jeff, but actually you only committed it right now to the trunk and not to the 2.2.x
branch from which 2.1.9 will be rolled. So shouldn't your entry be at the top of the file?
Regards
Rüdiger