markt 2004/04/04 12:09:38
Modified: coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
jk/java/org/apache/jk/common HandlerRequest.java
Log:
- Fix bug 16157. Set AuthType on HttpServletRequest.
- First part of patch.
- Patch submitted by Kan Ogawa.
Revision Changes Path
1.28 +7 -1
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- CoyoteAdapter.java 24 Feb 2004 08:54:29 -0000 1.27
+++ CoyoteAdapter.java 4 Apr 2004 19:09:38 -0000 1.28
@@ -278,6 +278,12 @@
request.setUserPrincipal(new CoyotePrincipal(principal));
}
+ // Set the authorization type
+ String authtype = req.getAuthType().toString();
+ if (authtype != null) {
+ request.setAuthType(authtype);
+ }
+
}
/**
1.35 +6 -1
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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- HandlerRequest.java 24 Feb 2004 08:48:42 -0000 1.34
+++ HandlerRequest.java 4 Apr 2004 19:09:38 -0000 1.35
@@ -584,7 +584,12 @@
break;
case SC_A_AUTH_TYPE :
- msg.getBytes(req.getAuthType());
+ if( tomcatAuthentication ) {
+ // ignore server
+ msg.getBytes( tmpMB );
+ } else {
+ msg.getBytes(req.getAuthType());
+ }
break;
case SC_A_QUERY_STRING :
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
