Author: kfujino
Date: Tue Sep 16 09:29:23 2014
New Revision: 1625228
URL: http://svn.apache.org/r1625228
Log:
follow up r1625227.
Ensure that AJP connectors enable the KeepAliveTimeout.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/trunk/webapps/docs/changelog.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=1625228&r1=1625227&r2=1625228&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Tue Sep 16
09:29:23 2014
@@ -146,6 +146,7 @@ public class AjpAprProtocol extends Abst
processor.setAdapter(proto.getAdapter());
processor.setTomcatAuthentication(proto.tomcatAuthentication);
processor.setRequiredSecret(proto.requiredSecret);
+ processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
processor.setClientCertProvider(proto.getClientCertProvider());
register(processor);
return processor;
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1625228&r1=1625227&r2=1625228&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Tue Sep 16
09:29:23 2014
@@ -147,6 +147,7 @@ public class AjpNio2Protocol extends Abs
processor.setAdapter(proto.getAdapter());
processor.setTomcatAuthentication(proto.tomcatAuthentication);
processor.setRequiredSecret(proto.requiredSecret);
+ processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
processor.setClientCertProvider(proto.getClientCertProvider());
register(processor);
return processor;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1625228&r1=1625227&r2=1625228&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Sep 16 09:29:23 2014
@@ -157,8 +157,8 @@
used for <code>maxConnections</code> with APR connectors. (markt)
</fix>
<fix>
- Ensure that <code>AjpNioProtocol</code> enable the
- <code>KeepAliveTimeout</code>. (kfujino)
+ Ensure that AJP connectors enable the <code>KeepAliveTimeout</code>.
+ (kfujino)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
