You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/05/28 11:53:36 UTC
svn commit: r1682194 - in /tomcat/trunk:
java/org/apache/coyote/ajp/AjpAprProtocol.java
java/org/apache/coyote/http11/Http11AprProtocol.java
webapps/docs/config/ajp.xml webapps/docs/config/http.xml
Author: markt
Date: Thu May 28 09:53:36 2015
New Revision: 1682194
URL: http://svn.apache.org/r1682194
Log:
Remove APR specific pollerSize (it is a synonym for the general maxConnections)
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1682194&r1=1682193&r2=1682194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Thu May 28 09:53:36 2015
@@ -55,10 +55,6 @@ public class AjpAprProtocol extends Abst
public int getPollTime() { return ((AprEndpoint)getEndpoint()).getPollTime(); }
public void setPollTime(int pollTime) { ((AprEndpoint)getEndpoint()).setPollTime(pollTime); }
- // pollerSize is now a synonym for maxConnections
- public void setPollerSize(int pollerSize) { getEndpoint().setMaxConnections(pollerSize); }
- public int getPollerSize() { return getEndpoint().getMaxConnections(); }
-
// ----------------------------------------------------- JMX related methods
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1682194&r1=1682193&r2=1682194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu May 28 09:53:36 2015
@@ -54,9 +54,6 @@ public class Http11AprProtocol extends A
public int getPollTime() { return ((AprEndpoint)getEndpoint()).getPollTime(); }
public void setPollTime(int pollTime) { ((AprEndpoint)getEndpoint()).setPollTime(pollTime); }
- public void setPollerSize(int pollerSize) { getEndpoint().setMaxConnections(pollerSize); }
- public int getPollerSize() { return getEndpoint().getMaxConnections(); }
-
public int getSendfileSize() { return ((AprEndpoint)getEndpoint()).getSendfileSize(); }
public void setSendfileSize(int sendfileSize) { ((AprEndpoint)getEndpoint()).setSendfileSize(sendfileSize); }
Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1682194&r1=1682193&r2=1682194&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Thu May 28 09:53:36 2015
@@ -706,13 +706,6 @@
</p>
</attribute>
- <attribute name="pollerSize" required="false">
- <p>Amount of sockets that the poller responsible for polling kept alive
- connections can hold at a given time. Extra connections will be closed
- right away. The default value is 8192, corresponding to 8192 keep-alive
- connections.</p>
- </attribute>
-
</attributes>
</subsection>
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1682194&r1=1682193&r2=1682194&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Thu May 28 09:53:36 2015
@@ -867,13 +867,6 @@
otherwise it is <code>false</code>.</p>
</attribute>
- <attribute name="pollerSize" required="false">
- <p>Amount of sockets that the poller responsible for polling kept alive
- connections can hold at a given time. Extra connections will be closed
- right away. The default value is 8192, corresponding to 8192 keep-alive
- connections. This is a synonym for maxConnections.</p>
- </attribute>
-
<attribute name="pollerThreadCount" required="false">
<p>Number of threads used to poll kept alive connections. On Windows the
default is chosen so that the sockets managed by each thread is
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org