Author: markt
Date: Wed Apr 7 22:07:04 2010
New Revision: 931706
URL: http://svn.apache.org/viewvc?rev=931706&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48862
Port pero's patch to add backlog to JK ChannelSocket
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=931706&r1=931705&r2=931706&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 7 22:07:04 2010
@@ -264,12 +264,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48862
- Port pero's patch to add backlog to JK ChannelSocket
- http://svn.apache.org/viewvc?view=revision&revision=493480
- +1: markt, kkolinko, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48895
Make clearing thread locals optional and disabled by default since it isn't
thread-safe
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java?rev=931706&r1=931705&r2=931706&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java Wed Apr
7 22:07:04 2010
@@ -83,6 +83,7 @@ public class ChannelSocket extends JkHan
private int startPort=8009;
private int maxPort=8019; // 0 for backward compat.
private int port=startPort;
+ private int backlog = 0;
private InetAddress inet;
private int serverTimeout;
private boolean tcpNoDelay=true; // nodelay to true by default
@@ -263,12 +264,16 @@ public class ChannelSocket extends JkHan
}
public int getMaxSpareThreads() {
- return tp.getMaxSpareThreads();
+ return tp.getMaxSpareThreads();
}
public void setBacklog(int i) {
+ this.backlog = i;
}
-
+
+ public int getBacklog() {
+ return backlog;
+ }
/* ==================== ==================== */
ServerSocket sSocket;
@@ -367,9 +372,9 @@ public class ChannelSocket extends JkHan
for( int i=startPort; i<=maxPort; i++ ) {
try {
if( inet == null ) {
- sSocket = new ServerSocket( i, 0 );
+ sSocket = new ServerSocket( i, backlog );
} else {
- sSocket=new ServerSocket( i, 0, inet );
+ sSocket=new ServerSocket( i, backlog, inet );
}
port=i;
break;
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=931706&r1=931705&r2=931706&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 7 22:07:04 2010
@@ -52,6 +52,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <add>
+ <bug>48862</bug>: Add support for the backlog parameter to the AJP
+ connector. (pero/markt)
+ </add>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>Update to Commons Daemon 1.0.2. Use service launcher (procrun)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
