remm 2003/03/23 00:50:16
Modified: http11/src/java/org/apache/coyote/http11
Http11Processor.java
Log:
- Also set the state in the request info.
Revision Changes Path
1.61 +8 -0
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Http11Processor.java 5 Mar 2003 02:38:43 -0000 1.60
+++ Http11Processor.java 23 Mar 2003 08:50:16 -0000 1.61
@@ -81,6 +81,7 @@
import org.apache.coyote.Adapter;
import org.apache.coyote.Processor;
import org.apache.coyote.Request;
+import org.apache.coyote.RequestInfo;
import org.apache.coyote.Response;
import org.apache.coyote.http11.filters.ChunkedInputFilter;
@@ -567,7 +568,9 @@
throws IOException {
ThreadWithAttributes thrA=
(ThreadWithAttributes)Thread.currentThread();
+ RequestInfo rp = request.getRequestProcessor();
thrA.setCurrentStage(threadPool, "parsing http request");
+ rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
// Set the remote address
remoteAddr = null;
@@ -613,6 +616,7 @@
// Setting up filters, and parse some request headers
thrA.setCurrentStage(threadPool, "prepareRequest");
+ rp.setStage(org.apache.coyote.Constants.STAGE_PREPARE);
prepareRequest();
if (maxKeepAliveRequests > 0 && --keepAliveLeft == 0)
@@ -622,6 +626,7 @@
if (!error) {
try {
thrA.setCurrentStage(threadPool, "service");
+ rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
adapter.service(request, response);
} catch (InterruptedIOException e) {
error = true;
@@ -636,6 +641,7 @@
// Finish the handling of the request
try {
thrA.setCurrentStage(threadPool, "endRequestIB");
+ rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT);
inputBuffer.endRequest();
} catch (IOException e) {
error = true;
@@ -647,6 +653,7 @@
}
try {
thrA.setCurrentStage(threadPool, "endRequestOB");
+ rp.setStage(org.apache.coyote.Constants.STAGE_ENDOUTPUT);
outputBuffer.endRequest();
} catch (IOException e) {
error = true;
@@ -656,6 +663,7 @@
}
thrA.setCurrentStage(threadPool, "ended");
+ rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
// Don't reset the param - we'll see it as ended. Next request
// will reset it
// thrA.setParam(null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
