httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r306889 - in /httpd/httpd/branches/2.2.x: CHANGES modules/proxy/mod_proxy_connect.c
Date Thu, 06 Oct 2005 21:04:28 GMT
Author: trawick
Date: Thu Oct  6 14:04:25 2005
New Revision: 306889

URL: http://svn.apache.org/viewcvs?rev=306889&view=rev
Log:
merge from trunk:

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/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_connect.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=306889&r1=306888&r2=306889&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Oct  6 14:04:25 2005
@@ -1,6 +1,10 @@
                                                         -*- coding: utf-8 -*-
 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]
+
   *) mod_proxy_balancer: mod_proxy_balancer does not handle sticky sessions
      with tomcat correctly. PR36507. [Ruediger Pluem]
 

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_connect.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_connect.c?rev=306889&r1=306888&r2=306889&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_connect.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_connect.c Thu Oct  6 14:04:25 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;



Mime
View raw message