remm 01/12/09 14:01:34
Modified: catalina/src/share/org/apache/catalina/connector/http10 Tag:
tomcat_40_branch HttpProcessor.java
Log:
- A patch from the HTTP/1.1 connector was apparently forgotten.
Submitted by Stuart Roebuck <stuart.roebuck at adolos.co.uk>
Revision Changes Path
No revision
No revision
1.4.2.1 +19 -17
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- HttpProcessor.java 2001/07/22 20:25:07 1.4
+++ HttpProcessor.java 2001/12/09 22:01:34 1.4.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java,v
1.4 2001/07/22 20:25:07 pier Exp $
- * $Revision: 1.4 $
- * $Date: 2001/07/22 20:25:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java,v
1.4.2.1 2001/12/09 22:01:34 remm Exp $
+ * $Revision: 1.4.2.1 $
+ * $Date: 2001/12/09 22:01:34 $
*
* ====================================================================
*
@@ -104,7 +104,7 @@
* the request. When the processor is completed, it will recycle itself.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/07/22 20:25:07 $
+ * @version $Revision: 1.4.2.1 $ $Date: 2001/12/09 22:01:34 $
*/
final class HttpProcessor
@@ -128,8 +128,8 @@
this.id = id;
this.proxyName = connector.getProxyName();
this.proxyPort = connector.getProxyPort();
- this.request = (HttpRequest) connector.createRequest();
- this.response = (HttpResponse) connector.createResponse();
+ this.request = (HttpRequestImpl) connector.createRequest();
+ this.response = (HttpResponseImpl) connector.createResponse();
this.serverPort = connector.getPort();
this.threadName =
"HttpProcessor[" + connector.getPort() + "][" + id + "]";
@@ -192,13 +192,13 @@
/**
* The HTTP request object we will pass to our associated container.
*/
- private HttpRequest request = null;
+ private HttpRequestImpl request = null;
/**
* The HTTP response object we will pass to our associated container.
*/
- private HttpResponse response = null;
+ private HttpResponseImpl response = null;
/**
@@ -464,16 +464,18 @@
for (int i = 0; i < cookies.length; i++) {
if (cookies[i].getName().equals
(Globals.SESSION_COOKIE_NAME)) {
-
// Override anything requested in the URL
- request.setRequestedSessionId(cookies[i].getValue());
- request.setRequestedSessionCookie(true);
- request.setRequestedSessionURL(false);
- if (debug >= 1)
- log(" Requested cookie session id is " +
- ((HttpServletRequest)
request.getRequest()).getRequestedSessionId());
- break; // Accept only the first session id value
-
+ if (!request.isRequestedSessionIdFromCookie()) {
+ // Accept only the first session id cookie
+ request.setRequestedSessionId
+ (cookies[i].getValue());
+ request.setRequestedSessionCookie(true);
+ request.setRequestedSessionURL(false);
+ if (debug >= 1)
+ log(" Requested cookie session id is " +
+ ((HttpServletRequest) request.getRequest())
+ .getRequestedSessionId());
+ }
}
request.addCookie(cookies[i]);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
