Author: markt
Date: Fri Mar 6 14:10:06 2009
New Revision: 750909
URL: http://svn.apache.org/viewvc?rev=750909&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46666
keepAliveTimeout should be used regardless of setting of disableUploadTimeout
Discussion on best long term solution moved to dev list
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 Fri Mar 6 14:10:06 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,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,747834,748344
+/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,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,747834,748344
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=750909&r1=750908&r2=750909&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 6 14:10:06 2009
@@ -95,26 +95,6 @@
code a warning that it won't be there in the next version.
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46666
- keepAliveTimeout should be used regardless of setting of disableUploadTimeout
- http://svn.apache.org/viewvc?rev=744160&view=rev
- +1: markt, fhanik, jim
- 0: billbarker The original was an optimization to not keep setting the
timeout to the same value
- if we haven't changed it. Of course it is broken, but a
better patch would be to
- set the timeout correctly outside the loop, and retain the
disableUploadTimeout check.
- The first request shouldn't care, since we should already
have available() > 0 with the
- JIO connector.
- markt I took a look at this. I think you do have to set timeouts
- inside the loop otherwise the request line read doesn't
timeout
- correctly. I wrote this patch that only sets timeouts when
- required:
-
http://people.apache.org/~markt/patches/2009-02-12-soTimeout.patch
- but I'm not sure it is necessary. Is setSoTimeout really that
- expensive? It takes less than a microsecond on my box. The
code
- would be cleaner if we just took out most of the tests and set
- the timeout, even if it was already set as required.
- -1:
-
* Use ThreadLocal rather than syncs for DateFormat to prevent potential
bottleneck in cookie creation
http://svn.apache.org/viewvc?rev=744238&view=rev
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=750909&r1=750908&r2=750909&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 Fri
Mar 6 14:10:06 2009
@@ -797,7 +797,7 @@
// Parsing the request header
try {
- if (!disableUploadTimeout && keptAlive) {
+ if (keptAlive) {
if (keepAliveTimeout > 0) {
socket.setSoTimeout(keepAliveTimeout);
}
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=750909&r1=750908&r2=750909&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Mar 6 14:10:06 2009
@@ -360,6 +360,10 @@
<fix>
Fix HTTP/1.0 redirects handling with APR AJP connector. (remm)
</fix>
+ <fix>
+ <bug>46666</bug>: keepAliveTimeout should be used regardless of setting
+ of disableUploadTimeout. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
