From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 4 Jul 2011 17:46:15 +0000 (+0000)
Subject: Correct regression caused by connector re-factoring that made AJP
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=53c4af601e9a1c705e20ea86a2a013193f93d753;p=tomcat7.0

Correct regression caused by connector re-factoring that made AJP
APR/native connector very unstable on Windows platforms.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1142748 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java
index 361a735dd..6cf6ac521 100644
--- a/java/org/apache/coyote/ajp/AjpAprProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java
@@ -239,8 +239,6 @@ public class AjpAprProcessor extends AbstractAjpProcessor {
         } else if (isAsync()) {
             return SocketState.LONG;
         } else {
-            // Add the socket to the poller
-            ((AprEndpoint)endpoint).getPoller().add(socketRef);
             return SocketState.OPEN;
         }
     }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f9d1bc314..1f3349a4d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -72,6 +72,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Coyote">
+    <changelog>
+      <fix>
+        Correct regression caused by connector re-factoring that made AJP
+        APR/native connector very unstable on Windows platforms. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
       <fix>