nacho 01/08/24 16:58:51
Modified: src/share/org/apache/tomcat/request Tag: tomcat_32
AccessInterceptor.java
Log:
Fix for Bugzilla#2118
Incosistent behaviuor updating OriginalLocation in FormAuthHandler Class
Reported by Juan Jose Muņoz ( jmartine at alhsys.es ), mark.shotton at
micromass.co.uk
Revision Changes Path
No revision
No revision
1.12.2.10 +8 -7
jakarta-tomcat/src/share/org/apache/tomcat/request/Attic/AccessInterceptor.java
Index: AccessInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/Attic/AccessInterceptor.java,v
retrieving revision 1.12.2.9
retrieving revision 1.12.2.10
diff -u -r1.12.2.9 -r1.12.2.10
--- AccessInterceptor.java 2001/07/17 04:25:55 1.12.2.9
+++ AccessInterceptor.java 2001/08/24 23:58:51 1.12.2.10
@@ -465,6 +465,14 @@
session=req.getSession( true );
String username=(String)session.getAttribute( "j_username" );
+ String originalLocation = req.getRequestURI();
+
+ if (req.getQueryString() != null)
+ originalLocation += "?" + req.getQueryString();
+
+ session.setAttribute( "tomcat.auth.originalLocation",
+ originalLocation);
+
if( debug>0) log( "Username = " + username);
if( username != null ) {
// 401 with existing j_username - that means wrong credentials.
@@ -477,13 +485,6 @@
return;
}
- String originalLocation = req.getRequestURI();
-
- if (req.getQueryString() != null)
- originalLocation += "?" + req.getQueryString();
-
- session.setAttribute( "tomcat.auth.originalLocation",
- originalLocation);
if( debug > 0 )
log("Redirect1: " + page + " originalUri=" + req.getRequestURI());
