Author: jfclere
Date: Sat Oct 27 01:25:56 2007
New Revision: 589062
URL: http://svn.apache.org/viewvc?rev=589062&view=rev
Log:
Commit the accepted proposal to prevent CLOSE_WAIT sockets.
Modified:
tomcat/tc6.0.x/trunk/STATUS
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=589062&r1=589061&r2=589062&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Sat Oct 27 01:25:56 2007
@@ -26,10 +26,6 @@
[ New proposals should be added at the end of the list ]
-* Harmonize with HTTP java.io code. Otherwise the socket is not closed.
http://people.apache.org/~jfclere/patches/AjpPro.patch
- +1: jfclere, fhanik, remm, pero, jim
- -1:
-
* Fix BZ 43588 - hard coded 127.0.0.1 for localhost
http://issues.apache.org/bugzilla/attachment.cgi?id=21039&action=view
+1:
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=589062&r1=589061&r2=589062&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Sat Oct
27 01:25:56 2007
@@ -355,7 +355,7 @@
*
* @throws IOException error during an I/O operation
*/
- public boolean process(Socket socket)
+ public void process(Socket socket)
throws IOException {
RequestInfo rp = request.getRequestProcessor();
rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
@@ -471,8 +471,6 @@
input = null;
output = null;
- return true;
-
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=589062&r1=589061&r2=589062&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Sat Oct 27
01:25:56 2007
@@ -363,7 +363,8 @@
((ActionHook) processor).action(ActionCode.ACTION_START,
null);
}
- return processor.process(socket);
+ processor.process(socket);
+ return false;
} catch(java.net.SocketException e) {
// SocketExceptions are normal
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=589062&r1=589061&r2=589062&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Oct 27 01:25:56 2007
@@ -142,6 +142,9 @@
<subsection name="Coyote">
<changelog>
<fix>
+ Harmonize with HTTP java.io code. Otherwise the socket is not closed.
+ </fix>
+ <fix>
In the APR connector, start accepting connections after fully starting
the connector, to prevent possible exceptions due to non initialized
fields. (remm)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
