DO NOT REPLY [Bug 48392] jdbc-pool is not returning the proxied connection in resultSet and statement
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392 Neil Clarke changed: What|Removed |Added Attachment #25054|0 |1 is obsolete|| --- Comment #7 from Neil Clarke 2011-09-05 08:54:34 UTC --- Created attachment 27457 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27457 A correction to the createDecorator() method in the interceptor There appears to be a typing error in the createDecorator() method of the interceptor, setting the connection to the constructor object: statementProxy.setConnection(proxy); statementProxy.setConstructor(constructor); -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48392] jdbc-pool is not returning the proxied connection in resultSet and statement
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392 Neil Clarke changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 45052] Provide read only access for certain role in Manager webapp
https://issues.apache.org/bugzilla/show_bug.cgi?id=45052 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2011-09-05 09:34:43 UTC --- This is provided via the manager-status role which has been available since 5.5.33 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47203] Make JMXAdaptorLifecycleListener Java 1.4 compatible
https://issues.apache.org/bugzilla/show_bug.cgi?id=47203 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Mark Thomas 2011-09-05 09:59:16 UTC --- The support status of Java 1.4 is such that I expect there to be very little demand for this feature. Also, I have been unable to track down a Java 1,4 implementation of javax.rmi.ssl.* -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51756] Question on driver URL Tomcat JDBC Pool with Sybase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51756 windson.rangavajh...@gmail.com changed: What|Removed |Added Summary|Tomcat JDBC Pool does not |Question on driver URL |work with Sybase|Tomcat JDBC Pool with ||Sybase --- Comment #2 from windson.rangavajh...@gmail.com 2011-09-05 10:25:21 UTC --- hi Thanks for taking your time to look at this error. I got the issue resolved. Our db server expects appName and processId for connection, which were not getting passed correctly. I appended them to the driver URL and it worked fine. Please close this request for now. I am changing the subject accordingly. Please feel free to change as per your convenience. Thanks! -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51756] Question on driver URL Tomcat JDBC Pool with Sybase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51756 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165234 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt
Date: Mon Sep 5 10:47:43 2011
New Revision: 1165234
URL: http://svn.apache.org/viewvc?rev=1165234&view=rev
Log:
Remove unnecessary code
Timeout is set when socket is created and further changes are handled inside
the while loop
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165234&r1=1165233&r2=1165234&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 5
10:47:43 2011
@@ -152,14 +152,6 @@ public class Http11Processor extends Abs
socketWrapper.setKeepAliveLeft(0);
}
-try {
-socket.getSocket().setSoTimeout(soTimeout);
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-log.debug(sm.getString("http11processor.socket.timeout"), t);
-error = true;
-}
-
boolean keptAlive = socketWrapper.isKeptAlive();
while (!error && keepAlive && !endpoint.isPaused()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165235 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon Sep 5 10:53:48 2011 New Revision: 1165235 URL: http://svn.apache.org/viewvc?rev=1165235&view=rev Log: line length Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165235&r1=1165234&r2=1165235&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 10:53:48 2011 @@ -67,9 +67,9 @@ JNDI context while the application is running. (markt) -51741: Fixes a problem with Eclipse WTP "Serve modules without -publishing" feature where applications failed to access resources when using -getResource() on the classloader. (slaurent) +51741: Fixes a problem with Eclipse WTP "Serve modules +without publishing" feature where applications failed to access +resources when using getResource() on the classloader. (slaurent) Correct a regression with the fix for 51653 that broke custom - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165236 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11Processor.java webapps/docs/changelog.xml
Author: markt
Date: Mon Sep 5 10:56:04 2011
New Revision: 1165236
URL: http://svn.apache.org/viewvc?rev=1165236&view=rev
Log:
Further re-factoring of the HTTP connectors to align the BIO, NIO and APR
implementations.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 10:56:04 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165236&r1=1165235&r2=1165236&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon
Sep 5 10:56:04 2011
@@ -152,14 +152,6 @@ public class Http11Processor extends Abs
socketWrapper.setKeepAliveLeft(0);
}
-try {
-socket.getSocket().setSoTimeout(soTimeout);
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-log.debug(sm.getString("http11processor.socket.timeout"), t);
-error = true;
-}
-
boolean keptAlive = socketWrapper.isKeptAlive();
while (!error && keepAlive && !endpoint.isPaused()) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165236&r1=1165235&r2=1165236&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 10:56:04 2011
@@ -106,6 +106,10 @@
less than or equal to 0.
ArrayBlockingQueue doesn't allow capacity of 0 or less. (kfujino)
+
+Further re-factoring of the HTTP connectors to align the BIO, NIO and
+APR implementations. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165237 - /tomcat/trunk/webapps/docs/config/http.xml
Author: markt Date: Mon Sep 5 10:57:13 2011 New Revision: 1165237 URL: http://svn.apache.org/viewvc?rev=1165237&view=rev Log: Correct documentation of default connection timeout Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1165237&r1=1165236&r2=1165237&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Mon Sep 5 10:57:13 2011 @@ -317,7 +317,7 @@ The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be - presented. The default value is 6 (i.e. 60 seconds). + presented. The default value is 2 (i.e. 20 seconds). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165240 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/http.xml
Author: markt Date: Mon Sep 5 11:06:06 2011 New Revision: 1165240 URL: http://svn.apache.org/viewvc?rev=1165240&view=rev Log: Correct documented default for connectionTimeout with HTTP connectors Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 5 11:06:06 2011 @@ -1 +1 @@ -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234 +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165240&r1=1165239&r2=1165240&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 11:06:06 2011 @@ -97,6 +97,10 @@ Correct the documentation for connectionLinger for the AJP and HTTP connectors. (markt) + +Correct the documentation for the connectionTimeout for the HTTP +connectors to show the correct default value. (markt) + Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165240&r1=1165239&r2=1165240&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 11:06:06 2011 @@ -317,7 +317,7 @@ The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be - presented. The default value is 6 (i.e. 60 seconds). + presented. The default value is 2 (i.e. 20 seconds). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165247 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt
Date: Mon Sep 5 11:55:31 2011
New Revision: 1165247
URL: http://svn.apache.org/viewvc?rev=1165247&view=rev
Log:
Remove unnecessary try/catch
The methods it contained were either simple setters or already provided exactly
the same exception handling
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165247&r1=1165246&r2=1165247&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 5
11:55:31 2011
@@ -283,24 +283,18 @@ public class Http11Processor extends Abs
}
// Finish the handling of the request
-try {
-rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT);
-// If we know we are closing the connection, don't drain input.
-// This way uploading a 100GB file doesn't tie up the thread
-// if the servlet has rejected it.
-
-if(error && !isAsync())
-inputBuffer.setSwallowInput(false);
-if (!isAsync())
-endRequest();
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-log.error(sm.getString("http11processor.request.finish"), t);
-// 500 - Internal Server Error
-response.setStatus(500);
-adapter.log(request, response, 0);
-error = true;
+rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT);
+
+if(error && !isAsync()) {
+// If we know we are closing the connection, don't drain
+// input. This way uploading a 100GB file doesn't tie up the
+// thread if the servlet has rejected it.
+inputBuffer.setSwallowInput(false);
}
+
+if (!isAsync())
+endRequest();
+
try {
rp.setStage(org.apache.coyote.Constants.STAGE_ENDOUTPUT);
} catch (Throwable t) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165248 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt
Date: Mon Sep 5 11:57:05 2011
New Revision: 1165248
URL: http://svn.apache.org/viewvc?rev=1165248&view=rev
Log:
Remove unnecessary try/catch that just wraps a simple setter
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165248&r1=1165247&r2=1165248&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 5
11:57:05 2011
@@ -295,13 +295,7 @@ public class Http11Processor extends Abs
if (!isAsync())
endRequest();
-try {
-rp.setStage(org.apache.coyote.Constants.STAGE_ENDOUTPUT);
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-log.error(sm.getString("http11processor.response.finish"), t);
-error = true;
-}
+rp.setStage(org.apache.coyote.Constants.STAGE_ENDOUTPUT);
// If there was an error, make sure the request is counted as
// and error, and update the statistics counter
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165253 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java
Author: markt
Date: Mon Sep 5 12:09:28 2011
New Revision: 1165253
URL: http://svn.apache.org/viewvc?rev=1165253&view=rev
Log:
Start to align the request finish code
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1165253&r1=1165252&r2=1165253&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
5 12:09:28 2011
@@ -290,15 +290,20 @@ public class Http11AprProcessor extends
}
// Finish the handling of the request
-if (!comet && !isAsync()) {
-// If we know we are closing the connection, don't drain input.
-// This way uploading a 100GB file doesn't tie up the thread
-// if the servlet has rejected it.
-if(error)
+rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT);
+
+if (!isAsync() && !comet) {
+if (error) {
+// If we know we are closing the connection, don't drain
+// input. This way uploading a 100GB file doesn't tie up
the
+// thread if the servlet has rejected it.
inputBuffer.setSwallowInput(false);
+}
endRequest();
}
+rp.setStage(org.apache.coyote.Constants.STAGE_ENDOUTPUT);
+
// If there was an error, make sure the request is counted as
// and error, and update the statistics counter
if (error) {
@@ -336,7 +341,6 @@ public class Http11AprProcessor extends
}
rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
-
}
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1165253&r1=1165252&r2=1165253&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Mon Sep
5 12:09:28 2011
@@ -351,15 +351,20 @@ public class Http11NioProcessor extends
}
// Finish the handling of the request
-if (!comet && !isAsync()) {
-// If we know we are closing the connection, don't drain input.
-// This way uploading a 100GB file doesn't tie up the thread
-// if the servlet has rejected it.
-if(error)
+rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT);
+
+if (!isAsync() && !comet) {
+if(error) {
+// If we know we are closing the connection, don't drain
+// input. This way uploading a 100GB file doesn't tie up
the
+// thread if the servlet has rejected it.
inputBuffer.setSwallowInput(false);
+}
endRequest();
}
+rp.setStage(org.apache.coyote.Constants.STAGE_ENDOUTPUT);
+
// If there was an error, make sure the request is counted as
// and error, and update the statistics counter
if (error) {
@@ -385,10 +390,8 @@ public class Http11NioProcessor extends
break;
}
-
rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
-
-}//while
+}
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
if (error || endpoint.isPaused()) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165253&r1=1165252&r2=1165253&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 5
12:09:28 2011
@@ -284,16 +284,16 @@ public class Http11Processor extends Abs
// Finish the handling of the request
rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT);
-
-if(error && !isAsync()) {
-// If we know we are closing the connection, don't drain
-// input. This w
svn commit: r1165273 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java
Author: markt
Date: Mon Sep 5 13:21:28 2011
New Revision: 1165273
URL: http://svn.apache.org/viewvc?rev=1165273&view=rev
Log:
Move stage update to before point where we might break out of the keep-alive
loop
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1165273&r1=1165272&r2=1165273&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
5 13:21:28 2011
@@ -316,7 +316,9 @@ public class Http11AprProcessor extends
inputBuffer.nextRequest();
outputBuffer.nextRequest();
}
-
+
+rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
+
// Do sendfile as needed: add socket to sendfile and end
if (sendfileData != null && !error) {
sendfileData.socket = socketRef;
@@ -339,8 +341,6 @@ public class Http11AprProcessor extends
break;
}
}
-
-rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
}
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1165273&r1=1165272&r2=1165273&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Mon Sep
5 13:21:28 2011
@@ -377,7 +377,9 @@ public class Http11NioProcessor extends
inputBuffer.nextRequest();
outputBuffer.nextRequest();
}
-
+
+rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
+
// Do sendfile as needed: add socket to sendfile and end
if (sendfileData != null && !error) {
((KeyAttachment) socketWrapper).setSendfileData(sendfileData);
@@ -389,8 +391,6 @@ public class Http11NioProcessor extends
(KeyAttachment) socketWrapper, true, true);
break;
}
-
-rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
}
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165273&r1=1165272&r2=1165273&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 5
13:21:28 2011
@@ -310,13 +310,13 @@ public class Http11Processor extends Abs
outputBuffer.nextRequest();
}
+rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
+
// If we don't have a pipe-lined request allow this thread to be
// used by another connection
if (isAsync() || error || inputBuffer.lastValid == 0) {
break;
}
-
-rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
}
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165282 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java
Author: markt
Date: Mon Sep 5 13:45:14 2011
New Revision: 1165282
URL: http://svn.apache.org/viewvc?rev=1165282&view=rev
Log:
Refactoring prep for extracting sendfile code to a separate method
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1165282&r1=1165281&r2=1165282&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Mon
Sep 5 13:45:14 2011
@@ -79,6 +79,12 @@ public abstract class AbstractHttp11Proc
/**
+ * Flag used to indicate that the socket should be kept open (e.g. for keep
+ * alive or send file.
+ */
+protected boolean openSocket = false;
+
+/**
* HTTP/1.1 flag.
*/
protected boolean http11 = true;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1165282&r1=1165281&r2=1165282&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
5 13:45:14 2011
@@ -181,6 +181,7 @@ public class Http11AprProcessor extends
error = false;
keepAlive = true;
comet = false;
+openSocket = false;
int soTimeout = endpoint.getSoTimeout();
@@ -189,7 +190,6 @@ public class Http11AprProcessor extends
}
boolean keptAlive = false;
-boolean openSocket = false;
boolean sendfileInProgress = false;
long socketRef = socketWrapper.getSocket().longValue();
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1165282&r1=1165281&r2=1165282&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Mon Sep
5 13:45:14 2011
@@ -210,6 +210,7 @@ public class Http11NioProcessor extends
error = false;
keepAlive = true;
comet = false;
+openSocket = false;
int soTimeout = endpoint.getSoTimeout();
@@ -218,7 +219,6 @@ public class Http11NioProcessor extends
}
boolean keptAlive = false;
-boolean openSocket = false;
boolean readComplete = true;
while (!error && keepAlive && !comet && !isAsync() &&
!endpoint.isPaused()) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165282&r1=1165281&r2=1165282&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 5
13:45:14 2011
@@ -145,6 +145,7 @@ public class Http11Processor extends Abs
error = false;
keepAlive = true;
comet = false;
+openSocket = false;
int soTimeout = endpoint.getSoTimeout();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "LocalBadContent" by ChuckCaldarale
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "LocalBadContent" page has been changed by ChuckCaldarale: http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=27&rev2=28 easyday\.cn electronic-wire\.com envy\.nu + erectiledysfunctiontreatment\.org eseo\.cn eukhost\.com evocatus\.com - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "LocalBadContent" by ChuckCaldarale
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "LocalBadContent" page has been changed by ChuckCaldarale: http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=28&rev2=29 isas\.com\.cn j\-cellular kogaryu\.com + levidus\.com lo\.lee\.tv masterjin\.com mathsolutions\.50webs\.com - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1165240 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/http.xml
Why are you changing docs without changing the code? As far as I see org.apache.coyote.http11.Constants.DEFAULT_CONNECTION_TIMEOUT is 6 in 7.0.x. Best regards, Konstantin Kolinko 2011/9/5 : > Author: markt > Date: Mon Sep 5 11:06:06 2011 > New Revision: 1165240 > > URL: http://svn.apache.org/viewvc?rev=1165240&view=rev > Log: > Correct documented default for connectionTimeout with HTTP connectors > > Modified: > tomcat/tc7.0.x/trunk/ (props changed) > tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml > tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml > > Propchange: tomcat/tc7.0.x/trunk/ > -- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Mon Sep 5 11:06:06 2011 > @@ -1 +1 @@ > -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234 > +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237 > > Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165240&r1=1165239&r2=1165240&view=diff > == > --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) > +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 11:06:06 2011 > @@ -97,6 +97,10 @@ > Correct the documentation for connectionLinger for the AJP and HTTP > connectors. (markt) > > + > + Correct the documentation for the connectionTimeout for the HTTP > + connectors to show the correct default value. (markt) > + > > > > > Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165240&r1=1165239&r2=1165240&view=diff > == > --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) > +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 11:06:06 2011 > @@ -317,7 +317,7 @@ > > The number of milliseconds this Connector will wait, > after accepting a connection, for the request URI line to be > - presented. The default value is 6 (i.e. 60 seconds). > + presented. The default value is 2 (i.e. 20 seconds). > > > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1165240 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/http.xml
On 05/09/2011 15:27, Konstantin Kolinko wrote: > Why are you changing docs without changing the code? Because the code is 2 unless I have missed something. Mark > > As far as I see > org.apache.coyote.http11.Constants.DEFAULT_CONNECTION_TIMEOUT > is 6 in 7.0.x. > > Best regards, > Konstantin Kolinko > > 2011/9/5 : >> Author: markt >> Date: Mon Sep 5 11:06:06 2011 >> New Revision: 1165240 >> >> URL: http://svn.apache.org/viewvc?rev=1165240&view=rev >> Log: >> Correct documented default for connectionTimeout with HTTP connectors >> >> Modified: >>tomcat/tc7.0.x/trunk/ (props changed) >>tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml >>tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml >> >> Propchange: tomcat/tc7.0.x/trunk/ >> -- >> --- svn:mergeinfo (original) >> +++ svn:mergeinfo Mon Sep 5 11:06:06 2011 >> @@ -1 +1 @@ >> -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234 >> +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237 >> >> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml >> URL: >> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165240&r1=1165239&r2=1165240&view=diff >> == >> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) >> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 11:06:06 2011 >> @@ -97,6 +97,10 @@ >> Correct the documentation for connectionLinger for the AJP and HTTP >> connectors. (markt) >> >> + >> +Correct the documentation for the connectionTimeout for the HTTP >> +connectors to show the correct default value. (markt) >> + >> >> >> >> >> Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml >> URL: >> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165240&r1=1165239&r2=1165240&view=diff >> == >> --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) >> +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 11:06:06 >> 2011 >> @@ -317,7 +317,7 @@ >> >> The number of milliseconds this Connector will >> wait, >> after accepting a connection, for the request URI line to be >> - presented. The default value is 6 (i.e. 60 seconds). >> + presented. The default value is 2 (i.e. 20 seconds). >> >> >> >> >> >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> >> > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1165240 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/http.xml
On 05/09/2011 15:27, Konstantin Kolinko wrote: > Why are you changing docs without changing the code? > > As far as I see > org.apache.coyote.http11.Constants.DEFAULT_CONNECTION_TIMEOUT > is 6 in 7.0.x. Sorry, sent that last reply before I read your message properly. I was going of the default in SocketProperties. I need to do some testing to see which of those defaults is actually being used. Once I've figured that out I'll clean this up. I suspect you are right and that 60s is being used but after all the refactoring it will be worth double checking. Mark > > Best regards, > Konstantin Kolinko > > 2011/9/5 : >> Author: markt >> Date: Mon Sep 5 11:06:06 2011 >> New Revision: 1165240 >> >> URL: http://svn.apache.org/viewvc?rev=1165240&view=rev >> Log: >> Correct documented default for connectionTimeout with HTTP connectors >> >> Modified: >>tomcat/tc7.0.x/trunk/ (props changed) >>tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml >>tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml >> >> Propchange: tomcat/tc7.0.x/trunk/ >> -- >> --- svn:mergeinfo (original) >> +++ svn:mergeinfo Mon Sep 5 11:06:06 2011 >> @@ -1 +1 @@ >> -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234 >> +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237 >> >> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml >> URL: >> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165240&r1=1165239&r2=1165240&view=diff >> == >> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) >> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 11:06:06 2011 >> @@ -97,6 +97,10 @@ >> Correct the documentation for connectionLinger for the AJP and HTTP >> connectors. (markt) >> >> + >> +Correct the documentation for the connectionTimeout for the HTTP >> +connectors to show the correct default value. (markt) >> + >> >> >> >> >> Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml >> URL: >> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165240&r1=1165239&r2=1165240&view=diff >> == >> --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) >> +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 11:06:06 >> 2011 >> @@ -317,7 +317,7 @@ >> >> The number of milliseconds this Connector will >> wait, >> after accepting a connection, for the request URI line to be >> - presented. The default value is 6 (i.e. 60 seconds). >> + presented. The default value is 2 (i.e. 20 seconds). >> >> >> >> >> >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> >> > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1165240 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/http.xml
2011/9/5 Mark Thomas :
> On 05/09/2011 15:27, Konstantin Kolinko wrote:
>> Why are you changing docs without changing the code?
>>
>> As far as I see
>> org.apache.coyote.http11.Constants.DEFAULT_CONNECTION_TIMEOUT
>> is 6 in 7.0.x.
>
> Sorry, sent that last reply before I read your message properly. I was
> going of the default in SocketProperties. I need to do some testing to
> see which of those defaults is actually being used. Once I've figured
> that out I'll clean this up. I suspect you are right and that 60s is
> being used but after all the refactoring it will be worth double checking.
>
It looks that 2 is the default value of
o.a.tomcat.util.net.SocketProperties#soTimeout
but all ***Protocol classes change it in their constructor, e.g.
public Http11Protocol() {
...
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
}
There are two different constants named "Constants.DEFAULT_CONNECTION_TIMEOUT":
HTTP connectors use one that is 6,
AJP one is -1.
and default server.xml explicitly sets connectionTimeout="2" on
its HTTP/1.1 connector.
Best regards,
Konstantin Kolinko
>> 2011/9/5 :
>>> Author: markt
>>> Date: Mon Sep 5 11:06:06 2011
>>> New Revision: 1165240
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1165240&view=rev
>>> Log:
>>> Correct documented default for connectionTimeout with HTTP connectors
>>>
>>> Modified:
>>> tomcat/tc7.0.x/trunk/ (props changed)
>>> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>>> tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
>>>
>>> Propchange: tomcat/tc7.0.x/trunk/
>>> --
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Mon Sep 5 11:06:06 2011
>>> @@ -1 +1 @@
>>> -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234
>>> +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237
>>>
>>> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
>>> ==
>>> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
>>> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 11:06:06 2011
>>> @@ -97,6 +97,10 @@
>>> Correct the documentation for connectionLinger for the AJP and HTTP
>>> connectors. (markt)
>>>
>>> +
>>> + Correct the documentation for the connectionTimeout for the HTTP
>>> + connectors to show the correct default value. (markt)
>>> +
>>>
>>>
>>>
>>>
>>> Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
>>> ==
>>> --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
>>> +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 11:06:06
>>> 2011
>>> @@ -317,7 +317,7 @@
>>>
>>> The number of milliseconds this Connector will
>>> wait,
>>> after accepting a connection, for the request URI line to be
>>> - presented. The default value is 6 (i.e. 60 seconds).
>>> + presented. The default value is 2 (i.e. 20 seconds).
>>>
>>>
>>>
>>>
>>>
>>>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165309 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java
Author: markt
Date: Mon Sep 5 15:03:51 2011
New Revision: 1165309
URL: http://svn.apache.org/viewvc?rev=1165309&view=rev
Log:
Pull out implementation specific processing that determines if keep-alive
should be broken into a separate method.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1165309&r1=1165308&r2=1165309&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Mon
Sep 5 15:03:51 2011
@@ -47,6 +47,7 @@ import org.apache.tomcat.util.http.MimeH
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketWrapper;
import org.apache.tomcat.util.res.StringManager;
public abstract class AbstractHttp11Processor extends AbstractProcessor {
@@ -84,6 +85,14 @@ public abstract class AbstractHttp11Proc
*/
protected boolean openSocket = false;
+
+/**
+ * Flag that indicates that send file processing is in progress and that
the
+ * socket should not be returned to the poller (where a poller is used).
+ */
+protected boolean sendfileInProgress = false;
+
+
/**
* HTTP/1.1 flag.
*/
@@ -1303,7 +1312,18 @@ public abstract class AbstractHttp11Proc
}
}
-
+
+
+/**
+ * Checks to see of the keep-alive loop should be broken, performing any
+ * processing (e.g. send file handling) that may have an impact on whether
+ * or not the keep-alive loop should be broken.
+ * @return
+ */
+protected abstract boolean breakKeepAliveLoop(
+ SocketWrapper socketWrapper);
+
+
public final void recycle() {
getInputBuffer().recycle();
getOutputBuffer().recycle();
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1165309&r1=1165308&r2=1165309&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
5 15:03:51 2011
@@ -182,6 +182,7 @@ public class Http11AprProcessor extends
keepAlive = true;
comet = false;
openSocket = false;
+sendfileInProgress = false;
int soTimeout = endpoint.getSoTimeout();
@@ -190,7 +191,6 @@ public class Http11AprProcessor extends
}
boolean keptAlive = false;
-boolean sendfileInProgress = false;
long socketRef = socketWrapper.getSocket().longValue();
@@ -319,27 +319,8 @@ public class Http11AprProcessor extends
rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
-// Do sendfile as needed: add socket to sendfile and end
-if (sendfileData != null && !error) {
-sendfileData.socket = socketRef;
-sendfileData.keepAlive = keepAlive;
-if (!((AprEndpoint)endpoint).getSendfile().add(sendfileData)) {
-// Didn't send all of the data to sendfile.
-if (sendfileData.socket == 0) {
-// The socket is no longer set. Something went wrong.
-// Close the connection. Too late to set status code.
-if (log.isDebugEnabled()) {
-log.debug(sm.getString(
-"http11processor.sendfile.error"));
-}
-error = true;
-} else {
-// The sendfile Poller will add the socket to the main
-// Poller once sendfile processing is complete
-sendfileInProgress = true;
-}
-break;
-}
+if (breakKeepAliveLoop(socketWrapper)) {
+ break;
}
}
@@ -361,6 +342,34 @@ public class Http11AprProcessor extends
@Override
+protected boolean breakKeepAliveLoop(SocketWrapper socketWrapper) {
+// Do sendfile as needed: add socket to sendfile and end
+if (sendfileData != null && !error) {
+sendfileDa
svn commit: r1165331 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java
Author: markt
Date: Mon Sep 5 15:21:22 2011
New Revision: 1165331
URL: http://svn.apache.org/viewvc?rev=1165331&view=rev
Log:
Complete alignment of process() for finishing requests
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1165331&r1=1165330&r2=1165331&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Mon
Sep 5 15:21:22 2011
@@ -94,6 +94,11 @@ public abstract class AbstractHttp11Proc
/**
+ * Flag that indicates if the request headers have been completely read.
+ */
+protected boolean readComplete = true;
+
+/**
* HTTP/1.1 flag.
*/
protected boolean http11 = true;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1165331&r1=1165330&r2=1165331&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
5 15:21:22 2011
@@ -183,6 +183,7 @@ public class Http11AprProcessor extends
comet = false;
openSocket = false;
sendfileInProgress = false;
+readComplete = true;
int soTimeout = endpoint.getSoTimeout();
@@ -320,7 +321,7 @@ public class Http11AprProcessor extends
rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
if (breakKeepAliveLoop(socketWrapper)) {
- break;
+break;
}
}
@@ -334,10 +335,17 @@ public class Http11AprProcessor extends
if (sendfileInProgress) {
return SocketState.SENDFILE;
} else {
-return (openSocket) ? SocketState.OPEN : SocketState.CLOSED;
+if (openSocket) {
+if (readComplete) {
+return SocketState.OPEN;
+} else {
+return SocketState.LONG;
+}
+} else {
+return SocketState.CLOSED;
+}
}
}
-
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1165331&r1=1165330&r2=1165331&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Mon Sep
5 15:21:22 2011
@@ -212,6 +212,7 @@ public class Http11NioProcessor extends
comet = false;
openSocket = false;
sendfileInProgress = false;
+readComplete = true;
int soTimeout = endpoint.getSoTimeout();
@@ -220,7 +221,6 @@ public class Http11NioProcessor extends
}
boolean keptAlive = false;
-boolean readComplete = true;
while (!error && keepAlive && !comet && !isAsync() &&
!endpoint.isPaused()) {
//always default to our soTimeout
@@ -382,24 +382,37 @@ public class Http11NioProcessor extends
rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
if (breakKeepAliveLoop(socketWrapper)) {
- break;
+break;
}
}
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
+
if (error || endpoint.isPaused()) {
return SocketState.CLOSED;
} else if (comet || isAsync()) {
return SocketState.LONG;
} else {
-return (openSocket) ?
(readComplete?SocketState.OPEN:SocketState.LONG) : SocketState.CLOSED;
+if (sendfileInProgress) {
+return SocketState.SENDFILE;
+} else {
+if (openSocket) {
+if (readComplete) {
+return SocketState.OPEN;
+} else {
+return SocketState.LONG;
+}
+} else {
+return SocketState.CLOSED;
+}
+}
}
}
@Override
protect
Re: svn commit: r1165240 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/http.xml
On 05/09/2011 15:59, Konstantin Kolinko wrote:
> 2011/9/5 Mark Thomas :
>> On 05/09/2011 15:27, Konstantin Kolinko wrote:
>>> Why are you changing docs without changing the code?
>>>
>>> As far as I see
>>> org.apache.coyote.http11.Constants.DEFAULT_CONNECTION_TIMEOUT
>>> is 6 in 7.0.x.
>>
>> Sorry, sent that last reply before I read your message properly. I was
>> going of the default in SocketProperties. I need to do some testing to
>> see which of those defaults is actually being used. Once I've figured
>> that out I'll clean this up. I suspect you are right and that 60s is
>> being used but after all the refactoring it will be worth double checking.
>>
>
> It looks that 2 is the default value of
> o.a.tomcat.util.net.SocketProperties#soTimeout
>
> but all ***Protocol classes change it in their constructor, e.g.
>
> public Http11Protocol() {
> ...
> setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
> }
>
> There are two different constants named
> "Constants.DEFAULT_CONNECTION_TIMEOUT":
> HTTP connectors use one that is 6,
> AJP one is -1.
>
> and default server.xml explicitly sets connectionTimeout="2" on
> its HTTP/1.1 connector.
I'll revert that change later today.
Cheers,
Mark
>
> Best regards,
> Konstantin Kolinko
>
>>> 2011/9/5 :
Author: markt
Date: Mon Sep 5 11:06:06 2011
New Revision: 1165240
URL: http://svn.apache.org/viewvc?rev=1165240&view=rev
Log:
Correct documented default for connectionTimeout with HTTP connectors
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 11:06:06 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 11:06:06
2011
@@ -97,6 +97,10 @@
Correct the documentation for connectionLinger for the AJP and HTTP
connectors. (markt)
+
+Correct the documentation for the connectionTimeout for the HTTP
+connectors to show the correct default value. (markt)
+
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 11:06:06
2011
@@ -317,7 +317,7 @@
The number of milliseconds this Connector will
wait,
after accepting a connection, for the request URI line to be
- presented. The default value is 6 (i.e. 60 seconds).
+ presented. The default value is 2 (i.e. 20 seconds).
>>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165338 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java
Author: markt
Date: Mon Sep 5 15:31:46 2011
New Revision: 1165338
URL: http://svn.apache.org/viewvc?rev=1165338&view=rev
Log:
Align request processing between the connectors
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1165338&r1=1165337&r2=1165338&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Mon
Sep 5 15:31:46 2011
@@ -1291,6 +1291,12 @@ public abstract class AbstractHttp11Proc
protected abstract void resetTimeouts();
+/**
+ * Provides a mechanism for those connectors (currently only NIO) that need
+ * that need to set comment timeouts.
+ */
+protected abstract void setCometTimeouts(SocketWrapper socketWrapper);
+
public void endRequest() {
// Finish the handling of the request
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1165338&r1=1165337&r2=1165338&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
5 15:31:46 2011
@@ -278,6 +278,7 @@ public class Http11AprProcessor extends
(!isAsync() &&
statusDropsConnection(response.getStatus()));
}
+setCometTimeouts(socketWrapper);
} catch (InterruptedIOException e) {
error = true;
} catch (Throwable t) {
@@ -350,6 +351,13 @@ public class Http11AprProcessor extends
@Override
+protected void setCometTimeouts(SocketWrapper socketWrapper) {
+ // NO-OP for APR/native
+ return;
+}
+
+
+@Override
protected boolean breakKeepAliveLoop(SocketWrapper socketWrapper) {
// Do sendfile as needed: add socket to sendfile and end
if (sendfileData != null && !error) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1165338&r1=1165337&r2=1165338&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Mon Sep
5 15:31:46 2011
@@ -326,19 +326,7 @@ public class Http11NioProcessor extends
(!isAsync() &&
statusDropsConnection(response.getStatus()));
}
-// Comet support
-SelectionKey key =
socketWrapper.getSocket().getIOChannel().keyFor(
-
socketWrapper.getSocket().getPoller().getSelector());
-if (key != null) {
-NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment) key.attachment();
-if (attach != null) {
-attach.setComet(comet);
-if (comet) {
-Integer comettimeout = (Integer)
request.getAttribute("org.apache.tomcat.comet.timeout");
-if (comettimeout != null)
attach.setTimeout(comettimeout.longValue());
-}
-}
-}
+setCometTimeouts(socketWrapper);
} catch (InterruptedIOException e) {
error = true;
} catch (Throwable t) {
@@ -411,6 +399,24 @@ public class Http11NioProcessor extends
@Override
+protected void setCometTimeouts(SocketWrapper socketWrapper) {
+// Comet support
+SelectionKey key = socketWrapper.getSocket().getIOChannel().keyFor(
+socketWrapper.getSocket().getPoller().getSelector());
+if (key != null) {
+NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)
key.attachment();
+if (attach != null) {
+attach.setComet(comet);
+if (comet) {
+Integer comettimeout = (Integer)
request.getAttribute(
svn commit: r1165347 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11AprProcessor.java Http11Processor.java
Author: markt
Date: Mon Sep 5 16:14:46 2011
New Revision: 1165347
URL: http://svn.apache.org/viewvc?rev=1165347&view=rev
Log:
Tab police (rebuilt laptop - need to fix Eclipse config)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1165347&r1=1165346&r2=1165347&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Mon
Sep 5 16:14:46 2011
@@ -1332,7 +1332,7 @@ public abstract class AbstractHttp11Proc
* @return
*/
protected abstract boolean breakKeepAliveLoop(
- SocketWrapper socketWrapper);
+SocketWrapper socketWrapper);
public final void recycle() {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1165347&r1=1165346&r2=1165347&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
5 16:14:46 2011
@@ -352,8 +352,8 @@ public class Http11AprProcessor extends
@Override
protected void setCometTimeouts(SocketWrapper socketWrapper) {
- // NO-OP for APR/native
- return;
+// NO-OP for APR/native
+return;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165347&r1=1165346&r2=1165347&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 5
16:14:46 2011
@@ -346,8 +346,8 @@ public class Http11Processor extends Abs
@Override
protected void setCometTimeouts(SocketWrapper socketWrapper) {
- // NO-OP for BIO
- return;
+// NO-OP for BIO
+return;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165350 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/http.xml
Author: markt Date: Mon Sep 5 16:31:39 2011 New Revision: 1165350 URL: http://svn.apache.org/viewvc?rev=1165350&view=rev Log: Revert r1165240. Documented defaults are correct. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 5 16:31:39 2011 @@ -1 +1 @@ -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237 +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165350&r1=1165349&r2=1165350&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 16:31:39 2011 @@ -97,10 +97,6 @@ Correct the documentation for connectionLinger for the AJP and HTTP connectors. (markt) - -Correct the documentation for the connectionTimeout for the HTTP -connectors to show the correct default value. (markt) - Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165350&r1=1165349&r2=1165350&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 16:31:39 2011 @@ -317,7 +317,7 @@ The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be - presented. The default value is 2 (i.e. 20 seconds). + presented. The default value is 6 (i.e. 60 seconds). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165353 - /tomcat/trunk/webapps/docs/config/http.xml
Author: markt Date: Mon Sep 5 16:35:17 2011 New Revision: 1165353 URL: http://svn.apache.org/viewvc?rev=1165353&view=rev Log: Revert r1165237. Documented defaults are correct. Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1165353&r1=1165352&r2=1165353&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Mon Sep 5 16:35:17 2011 @@ -317,7 +317,7 @@ The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be - presented. The default value is 2 (i.e. 20 seconds). + presented. The default value is 6 (i.e. 60 seconds). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165360 - /tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Author: markt
Date: Mon Sep 5 16:54:25 2011
New Revision: 1165360
URL: http://svn.apache.org/viewvc?rev=1165360&view=rev
Log:
Start timing request processing after the request line has been read and before
the request headers are read (aligns with other HTTP connectors)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1165360&r1=1165359&r2=1165360&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Mon Sep
5 16:54:25 2011
@@ -206,7 +206,7 @@ public class Http11NioProcessor extends
inputBuffer.init(socketWrapper, endpoint);
outputBuffer.init(socketWrapper, endpoint);
-// Error flag
+// Flags
error = false;
keepAlive = true;
comet = false;
@@ -256,6 +256,7 @@ public class Http11NioProcessor extends
}
}
if (!endpoint.isPaused()) {
+request.setStartTime(System.currentTimeMillis());
keptAlive = true;
if ( !inputBuffer.parseHeaders() ) {
//we've read part of the request, don't recycle it
@@ -264,7 +265,6 @@ public class Http11NioProcessor extends
readComplete = false;
break;
}
-request.setStartTime(System.currentTimeMillis());
if (!disableUploadTimeout) { //only for body, not for
request headers
socketWrapper.getSocket().getIOChannel().socket().setSoTimeout(
connectionUploadTimeout);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165361 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11Processor.java
Author: markt
Date: Mon Sep 5 16:59:27 2011
New Revision: 1165361
URL: http://svn.apache.org/viewvc?rev=1165361&view=rev
Log:
Add debug log message to align HTTP connectors
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1165361&r1=1165360&r2=1165361&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
5 16:59:27 2011
@@ -177,7 +177,7 @@ public class Http11AprProcessor extends
inputBuffer.init(socketWrapper, endpoint);
outputBuffer.init(socketWrapper, endpoint);
-// Error flag
+// Flags
error = false;
keepAlive = true;
comet = false;
@@ -226,6 +226,9 @@ public class Http11AprProcessor extends
inputBuffer.parseHeaders();
}
} catch (IOException e) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("http11processor.header.parse"), e);
+}
error = true;
break;
} catch (Throwable t) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165361&r1=1165360&r2=1165361&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 5
16:59:27 2011
@@ -141,7 +141,7 @@ public class Http11Processor extends Abs
inputBuffer.init(socketWrapper, endpoint);
outputBuffer.init(socketWrapper, endpoint);
-// Error flag
+// Flags
error = false;
keepAlive = true;
comet = false;
@@ -220,6 +220,9 @@ public class Http11Processor extends Abs
inputBuffer.parseHeaders();
}
} catch (IOException e) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("http11processor.header.parse"), e);
+}
error = true;
break;
} catch (Throwable t) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165367 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11Processor.java
Author: markt
Date: Mon Sep 5 17:18:50 2011
New Revision: 1165367
URL: http://svn.apache.org/viewvc?rev=1165367&view=rev
Log:
Headers should be read with the standard connection timeout.
The upload timeout should only be used for the request body.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1165367&r1=1165366&r2=1165367&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
5 17:18:50 2011
@@ -219,11 +219,11 @@ public class Http11AprProcessor extends
if (!endpoint.isPaused()) {
request.setStartTime(System.currentTimeMillis());
keptAlive = true;
+inputBuffer.parseHeaders();
if (!disableUploadTimeout) {
Socket.timeoutSet(socketRef,
connectionUploadTimeout * 1000);
}
-inputBuffer.parseHeaders();
}
} catch (IOException e) {
if (log.isDebugEnabled()) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165367&r1=1165366&r2=1165367&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 5
17:18:50 2011
@@ -212,12 +212,12 @@ public class Http11Processor extends Abs
} else {
request.setStartTime(System.currentTimeMillis());
keptAlive = true;
-if (disableUploadTimeout) {
-socket.getSocket().setSoTimeout(soTimeout);
-} else {
+// Reset timeout for reading headers
+socket.getSocket().setSoTimeout(soTimeout);
+inputBuffer.parseHeaders();
+if (!disableUploadTimeout) {
socket.getSocket().setSoTimeout(connectionUploadTimeout);
}
-inputBuffer.parseHeaders();
}
} catch (IOException e) {
if (log.isDebugEnabled()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1165368 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java
Author: markt
Date: Mon Sep 5 17:25:31 2011
New Revision: 1165368
URL: http://svn.apache.org/viewvc?rev=1165368&view=rev
Log:
Align while loop test
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1165368&r1=1165367&r2=1165368&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
5 17:25:31 2011
@@ -195,7 +195,8 @@ public class Http11AprProcessor extends
long socketRef = socketWrapper.getSocket().longValue();
-while (!error && keepAlive && !comet && !isAsync() &&
!endpoint.isPaused()) {
+while (!error && keepAlive && !comet && !isAsync() &&
+!endpoint.isPaused()) {
// Parsing the request header
try {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1165368&r1=1165367&r2=1165368&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Mon Sep
5 17:25:31 2011
@@ -222,7 +222,9 @@ public class Http11NioProcessor extends
boolean keptAlive = false;
-while (!error && keepAlive && !comet && !isAsync() &&
!endpoint.isPaused()) {
+while (!error && keepAlive && !comet && !isAsync() &&
+!endpoint.isPaused()) {
+
//always default to our soTimeout
socketWrapper.setTimeout(soTimeout);
// Parsing the request header
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165368&r1=1165367&r2=1165368&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 5
17:25:31 2011
@@ -157,7 +157,8 @@ public class Http11Processor extends Abs
boolean keptAlive = socketWrapper.isKeptAlive();
-while (!error && keepAlive && !endpoint.isPaused()) {
+while (!error && keepAlive && !comet && !isAsync() &&
+!endpoint.isPaused()) {
// Parsing the request header
try {
@@ -358,7 +359,7 @@ public class Http11Processor extends Abs
protected boolean breakKeepAliveLoop(SocketWrapper socketWrapper) {
// If we don't have a pipe-lined request allow this thread to be
// used by another connection
-if (isAsync() || error || inputBuffer.lastValid == 0) {
+if (inputBuffer.lastValid == 0) {
return true;
}
return false;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1165338 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java
ma...@apache.org schrieb: >Author: markt >Date: Mon Sep 5 15:31:46 2011 >New Revision: 1165338 > >URL: http://svn.apache.org/viewvc?rev=1165338&view=rev >Log: >Align request processing between the connectors > >Modified: >tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java >tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java >tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java >tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java > >Modified: >tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java >URL: >http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1165338&r1=1165337&r2=1165338&view=diff >== >--- >tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java >(original) >+++ >tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java >Mon Sep 5 15:31:46 2011 >@@ -1291,6 +1291,12 @@ public abstract class AbstractHttp11Proc > protected abstract void resetTimeouts(); > > >+/** >+ * Provides a mechanism for those connectors (currently only NIO) >that need >+ * that need to set comment timeouts. Did you mean Comet timeouts? >+ */ >+protected abstract void setCometTimeouts(SocketWrapper >socketWrapper); Regards Felix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
