You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2002/11/26 12:06:23 UTC
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java CoyoteRequest.java
remm 2002/11/26 03:06:23
Modified: coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
CoyoteRequest.java
Log:
- Remove useless operations and fields, as the Catalina request always delegates
to the actual Coyote request.
Revision Changes Path
1.5 +5 -12 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CoyoteAdapter.java 10 Oct 2002 09:07:33 -0000 1.4
+++ CoyoteAdapter.java 26 Nov 2002 11:06:23 -0000 1.5
@@ -250,8 +250,6 @@
// in ajp13 protocols dont make sense to get the port from the connector..
request.setSecure(req.scheme().equals("https"));
- request.setAuthorization
- (req.getHeader(Constants.AUTHORIZATION_HEADER));
// FIXME: the code below doesnt belongs to here, this is only have sense
// in Http11, not in ajp13..
// At this point the Host header has been processed.
@@ -259,16 +257,10 @@
String proxyName = connector.getProxyName();
int proxyPort = connector.getProxyPort();
if (proxyPort != 0) {
- request.setServerPort(proxyPort);
req.setServerPort(proxyPort);
- } else {
- request.setServerPort(req.getServerPort());
}
if (proxyName != null) {
- request.setServerName(proxyName);
req.serverName().setString(proxyName);
- } else {
- request.setServerName(req.serverName().toString());
}
// URI decoding
@@ -292,6 +284,7 @@
// Set the SSL properties
res.action(ActionCode.ACTION_REQ_SSL_ATTRIBUTE,request.getRequest());
}
+
/**
* Parse session id in URL.
1.10 +7 -15 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteRequest.java
Index: CoyoteRequest.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteRequest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CoyoteRequest.java 25 Nov 2002 21:04:42 -0000 1.9
+++ CoyoteRequest.java 26 Nov 2002 11:06:23 -0000 1.10
@@ -371,7 +371,6 @@
context = null;
wrapper = null;
- authorization = null;
authType = null;
usingInputStream = false;
usingReader = false;
@@ -382,7 +381,6 @@
inputStream.recycle();
userPrincipal = null;
sessionParsed = false;
- authorization = null;
requestParametersParsed = false;
locales.clear();
localesParsed = false;
@@ -414,17 +412,10 @@
/**
- * The authorization credentials sent with this Request.
- */
- protected String authorization = null;
-
- /**
* Return the authorization credentials sent with this request.
*/
public String getAuthorization() {
-
- return (this.authorization);
-
+ return (coyoteRequest.getHeader(Constants.AUTHORIZATION_HEADER));
}
/**
@@ -433,7 +424,8 @@
* @param authorization The new authorization credentials
*/
public void setAuthorization(String authorization) {
- this.authorization = authorization;
+ System.out.println("SA");
+ //this.authorization = authorization;
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>