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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306889 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 4236da9209afc93126acd1dfe82c7330691b6ed9..ea7f7be622ce0b6fe1d796d31b0872afc748dca7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/modules/proxy/mod_proxy_connect.c b/modules/proxy/mod_proxy_connect.c
index a42bb7eaca184adcecdcb77674317eaf240bf5c2..4444a3ca7684273a46fb90133573d0b086b333b2 100644 (file)
--- a/modules/proxy/mod_proxy_connect.c
+++ b/modules/proxy/mod_proxy_connect.c
@@ -357,8 +357,10 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
                     else
                         break;
                 }
-                else if ((pollevent & APR_POLLERR) || (pollevent & APR_POLLHUP))
+                else if ((pollevent & APR_POLLERR) || (pollevent & APR_POLLHUP)) {
+                    rv = APR_EOF;
                     break;
+                }
             }
             else
                 break;