billbarker 2004/06/04 22:19:04
Modified: jk/java/org/apache/jk/common HandlerRequest.java
jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
Adding stage information to the RequestInfo.
Revision Changes Path
1.37 +4 -3
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java
Index: HandlerRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- HandlerRequest.java 31 May 2004 04:48:54 -0000 1.36
+++ HandlerRequest.java 5 Jun 2004 05:19:04 -0000 1.37
@@ -29,6 +29,7 @@
import org.apache.coyote.RequestGroupInfo;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.Response;
+import org.apache.coyote.Constants;
import org.apache.jk.core.JkHandler;
import org.apache.jk.core.Msg;
import org.apache.jk.core.MsgContext;
@@ -441,6 +442,8 @@
}
}
+ RequestInfo rp = req.getRequestProcessor();
+ rp.setStage(Constants.STAGE_PARSE);
MessageBytes tmpMB2 = (MessageBytes)req.getNote(WorkerEnv.SSL_CERT_NOTE);
if(tmpMB2 != null) {
tmpMB2.recycle();
@@ -480,9 +483,7 @@
decodeAttributes( ep, msg, req, tmpMB );
-// if(req.getSecure() ) {
-// req.setScheme(req.SCHEME_HTTPS);
-// }
+ rp.setStage(Constants.STAGE_PREPARE);
MessageBytes valueMB = req.getMimeHeaders().getValue("host");
parseHost(valueMB, req);
// set cookies on request now that we have all headers
1.56 +5 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- JkCoyoteHandler.java 31 May 2004 04:48:54 -0000 1.55
+++ JkCoyoteHandler.java 5 Jun 2004 05:19:04 -0000 1.56
@@ -36,6 +36,8 @@
import org.apache.coyote.ProtocolHandler;
import org.apache.coyote.Request;
import org.apache.coyote.Response;
+import org.apache.coyote.RequestInfo;
+import org.apache.coyote.Constants;
import org.apache.jk.common.HandlerRequest;
import org.apache.jk.common.JkInputStream;
import org.apache.jk.common.MsgAjp;
@@ -292,7 +294,8 @@
res.setNote( epNote, ep );
ep.setStatus( JK_STATUS_HEAD );
-
+ RequestInfo rp = req.getRequestProcessor();
+ rp.setStage(Constants.STAGE_SERVICE);
try {
adapter.service( req, res );
} catch( Exception ex ) {
@@ -307,6 +310,7 @@
req.recycle();
req.updateCounters();
res.recycle();
+ rp.setStage(Constants.STAGE_KEEPALIVE);
return OK;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
