Author: markt
Date: Tue May 26 21:39:04 2009
New Revision: 778894
URL: http://svn.apache.org/viewvc?rev=778894&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46985
Clean up timeout handling
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 26 21:39:04 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770876
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770876,777576
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=778894&r1=778893&r2=778894&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue May 26 21:39:04 2009
@@ -81,13 +81,6 @@
but could agree to some of it if it was split into parts
-1: remm: no for TC 6.0
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46985
- Clean up timeout handling
- http://svn.apache.org/viewvc?rev=763262&view=rev
- http://svn.apache.org/viewvc?rev=777576&view=rev
- +1: markt, pero, kkolinko
- -1:
-
* Fix use of non-ASCII characters in property files
http://people.apache.org/~markt/patches/2009-04-20-native2ascii-de.patch
(German)
http://people.apache.org/~markt/patches/2009-04-20-native2ascii-en.patch
(English)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=778894&r1=778893&r2=778894&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue
May 26 21:39:04 2009
@@ -742,15 +742,14 @@
}
/**
- * Process pipelined HTTP requests using the specified input and output
- * streams.
+ * Process pipelined HTTP requests on the specified socket.
*
- * @param input stream from which the HTTP requests will be read
- * @param output stream which will be used to output the HTTP
- * responses
+ * @param socket Socket from which the HTTP requests will be read
+ * and the HTTP responses will be written.
+ *
* @throws IOException error during an I/O operation
*/
- public void process(Socket socket)
+ public void process(Socket theSocket)
throws IOException {
RequestInfo rp = request.getRequestProcessor();
rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
@@ -764,7 +763,7 @@
localPort = -1;
// Setting up the I/O
- this.socket = socket;
+ this.socket = theSocket;
inputBuffer.setInputStream(socket.getInputStream());
outputBuffer.setOutputStream(socket.getOutputStream());
@@ -773,8 +772,7 @@
keepAlive = true;
int keepAliveLeft = maxKeepAliveRequests;
- int soTimeout = socket.getSoTimeout();
- int oldSoTimeout = soTimeout;
+ int soTimeout = endpoint.getSoTimeout();
int threadRatio = (endpoint.getCurrentThreadsBusy() * 100)
/ endpoint.getMaxThreads();
@@ -782,13 +780,11 @@
keepAliveLeft = 1;
}
- if (soTimeout != oldSoTimeout) {
- try {
- socket.setSoTimeout(soTimeout);
- } catch (Throwable t) {
- log.debug(sm.getString("http11processor.socket.timeout"), t);
- error = true;
- }
+ try {
+ socket.setSoTimeout(soTimeout);
+ } catch (Throwable t) {
+ log.debug(sm.getString("http11processor.socket.timeout"), t);
+ error = true;
}
boolean keptAlive = false;
@@ -808,7 +804,9 @@
inputBuffer.parseRequestLine();
request.setStartTime(System.currentTimeMillis());
keptAlive = true;
- if (!disableUploadTimeout) {
+ if (disableUploadTimeout) {
+ socket.setSoTimeout(soTimeout);
+ } else {
socket.setSoTimeout(timeout);
}
inputBuffer.parseHeaders();
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=778894&r1=778893&r2=778894&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue May 26 21:39:04 2009
@@ -53,6 +53,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <bug>46985</bug>: Clean up code and remove impossible condition.
+ (markt/kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Webapps">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
