glenn 02/01/31 09:18:51
Modified: util/java/org/apache/tomcat/util/http BaseRequest.java
jk/java/org/apache/ajp/tomcat4 Ajp13Request.java
jk/java/org/apache/ajp RequestHandler.java
Log:
Tested and applied a patch submitted by Adam Fitzpatrick
to fix BUG 5647 - AJP13 connector will not pass authentication requests.
Revision Changes Path
1.5 +11 -1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/BaseRequest.java
Index: BaseRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/BaseRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseRequest.java 6 Jan 2002 08:34:56 -0000 1.4
+++ BaseRequest.java 31 Jan 2002 17:18:50 -0000 1.5
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Base http request object. *
* Author: Keving Seguin [[EMAIL PROTECTED]] *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***************************************************************************/
package org.apache.tomcat.util.http;
@@ -92,6 +92,7 @@
MessageBytes remoteUser = new MessageBytes();
MessageBytes authType = new MessageBytes();
MessageBytes queryString = new MessageBytes();
+ MessageBytes authorization = new MessageBytes();
String scheme = SCHEME_HTTP;
boolean secure = false;
int contentLength = 0;
@@ -116,6 +117,7 @@
remoteUser.recycle();
authType.recycle();
queryString.recycle();
+ authorization.recycle();
scheme = SCHEME_HTTP;
secure = false;
contentLength = 0;
@@ -212,6 +214,14 @@
*/
public MessageBytes queryString() {
return queryString;
+ }
+
+ /**
+ * Get the authorization credentials
+ * @return the authorization credentials
+ */
+ public MessageBytes authorization() {
+ return authorization;
}
/**
1.6 +1 -0
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Request.java
Index: Ajp13Request.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Request.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Ajp13Request.java 26 Nov 2001 16:56:19 -0000 1.5
+++ Ajp13Request.java 31 Jan 2002 17:18:51 -0000 1.6
@@ -118,6 +118,7 @@
}
setAuthType(ajp.authType().toString());
+ setAuthorization(ajp.authorization().toString());
setQueryString(ajp.queryString().toString());
setScheme(ajp.getScheme());
setSecure(ajp.getSecure());
1.10 +5 -0
jakarta-tomcat-connectors/jk/java/org/apache/ajp/RequestHandler.java
Index: RequestHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/RequestHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RequestHandler.java 26 Jan 2002 04:58:29 -0000 1.9
+++ RequestHandler.java 31 Jan 2002 17:18:51 -0000 1.10
@@ -299,6 +299,11 @@
req.contentType().setBytes(bchunk.getBytes(),
bchunk.getOffset(),
bchunk.getLength());
+ } else if (hId == SC_REQ_AUTHORIZATION) {
+ ByteChunk bchunk = vMB.getByteChunk();
+ req.authorization().setBytes(bchunk.getBytes(),
+ bchunk.getOffset(),
+ bchunk.getLength());
}
} else {
//
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
