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: [email protected]
For additional commands, e-mail: [email protected]
