remm 02/03/08 10:50:41
Modified: coyote/src/java/org/apache/coyote Request.java
coyote/src/java/org/apache/coyote/tomcat4
CoyoteProcessor.java CoyoteRequest.java
Log:
- Add parameters object in the request.
- Move the Catalina-specific 'secure' flag to the Catalina adapter.
Revision Changes Path
1.6 +32 -16
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java
Index: Request.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Request.java 8 Mar 2002 05:15:51 -0000 1.5
+++ Request.java 8 Mar 2002 18:50:41 -0000 1.6
@@ -114,7 +114,13 @@
public Request() {
+
recycle();
+
+ parameters.setQuery(queryMB);
+ parameters.setURLDecoder(urlDecoder);
+ parameters.setHeaders(headers);
+
}
@@ -127,7 +133,6 @@
protected String localHost;
protected MessageBytes schemeMB = new MessageBytes();
- protected boolean secure = false;
protected MessageBytes methodMB = new MessageBytes();
protected MessageBytes unparsedURIMB = new MessageBytes();
@@ -158,7 +163,7 @@
/**
* URL decoder.
*/
- UDecoder urlDecoder = new UDecoder();
+ protected UDecoder urlDecoder = new UDecoder();
/**
@@ -170,16 +175,18 @@
protected MessageBytes contentTypeMB = null;
protected String charEncoding = null;
protected Cookies cookies = new Cookies(headers);
+ protected Parameters parameters = new Parameters();
// ------------------------------------------------------------- Properties
/**
- * Get the host id ( or jvmRoute )
- * @return the jvm route
+ * Get the instance id (or JVM route).
+ *
+ * @return the instance id
*/
- public MessageBytes getInstanceId() {
+ public MessageBytes instanceId() {
return instanceId;
}
@@ -260,22 +267,21 @@
this.localHost = host;
}
- public boolean isSecure() {
- return secure;
- }
-
- public void setSecure(boolean secure) {
- this.secure = secure;
- }
// -------------------- encoding/type --------------------
+ /**
+ * Get the character encoding used for this request.
+ */
public String getCharacterEncoding() {
- if(charEncoding != null) return charEncoding;
+
+ if (charEncoding != null)
+ return charEncoding;
charEncoding = ContentType.getCharsetFromContentType(getContentType());
- return charEncoding;
+ return charEncoding;
+
}
@@ -339,6 +345,14 @@
}
+ // -------------------- Parameters --------------------
+
+
+ public Parameters getParameters() {
+ return parameters;
+ }
+
+
// -------------------- Input Buffer --------------------
@@ -389,14 +403,16 @@
public void recycle() {
+
contentLength = -1;
contentTypeMB = null;
charEncoding = null;
headers.recycle();
serverNameMB.recycle();
serverPort=-1;
-
+
cookies.recycle();
+ parameters.recycle();
unparsedURIMB.recycle();
uriMB.recycle();
@@ -408,13 +424,13 @@
// XXX Do we need such defaults ?
schemeMB.setString("http");
- secure = false;
methodMB.setString("GET");
uriMB.setString("/");
queryMB.setString("");
protoMB.setString("HTTP/1.0");
remoteAddrMB.setString("127.0.0.1");
remoteHostMB.setString("localhost");
+
}
1.6 +5 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteProcessor.java
Index: CoyoteProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoyoteProcessor.java 8 Mar 2002 05:16:56 -0000 1.5
+++ CoyoteProcessor.java 8 Mar 2002 18:50:41 -0000 1.6
@@ -1,6 +1,6 @@
-/* * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteProcessor.java,v
1.5 2002/03/08 05:16:56 remm Exp $
- * $Revision: 1.5 $
- * $Date: 2002/03/08 05:16:56 $
+/* * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteProcessor.java,v
1.6 2002/03/08 18:50:41 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/03/08 18:50:41 $
*
* ====================================================================
*
@@ -111,7 +111,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.5 $ $Date: 2002/03/08 05:16:56 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/08 18:50:41 $
*/
final class CoyoteProcessor
@@ -366,7 +366,7 @@
protected void postParseRequest(Request req)
throws IOException {
- req.setSecure(connector.getSecure());
+ request.setSecure(connector.getSecure());
req.scheme().setString(connector.getScheme());
parseHost();
1.4 +13 -6
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java
Index: CoyoteRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoyoteRequest.java 8 Mar 2002 05:17:54 -0000 1.3
+++ CoyoteRequest.java 8 Mar 2002 18:50:41 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
1.3 2002/03/08 05:17:54 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2002/03/08 05:17:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
1.4 2002/03/08 18:50:41 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/03/08 18:50:41 $
*
* ====================================================================
*
@@ -115,7 +115,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2002/03/08 05:17:54 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/08 18:50:41 $
*/
public class CoyoteRequest
@@ -283,6 +283,12 @@
protected boolean requestParametersParsed = false;
+ /**
+ * Secure flag.
+ */
+ protected boolean secure = false;
+
+
// --------------------------------------------------------- Public Methods
@@ -305,6 +311,7 @@
userPrincipal = null;
sessionParsed = false;
requestParametersParsed = false;
+ secure = false;
attributes.clear();
notes.clear();
@@ -646,7 +653,7 @@
* @param secure The new isSecure value
*/
public void setSecure(boolean secure) {
- // Not used
+ this.secure = secure;
}
@@ -948,7 +955,7 @@
* Was this request received on a secure connection?
*/
public boolean isSecure() {
- return (coyoteRequest.isSecure());
+ return (secure);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
