Index: DecodeInterceptor.java
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java,v
retrieving revision 1.9
diff -c -r1.9 DecodeInterceptor.java
*** DecodeInterceptor.java	2001/09/29 04:36:35	1.9
--- DecodeInterceptor.java	2001/10/01 01:25:09
***************
*** 86,91 ****
--- 86,92 ----
      private int decodedNote;
      private int encodingSourceNote;
      private int sessionEncodingNote;
+     private int urlEncodingNote;
  
      private boolean normalize=true;
      private boolean safe=true;
***************
*** 144,149 ****
--- 145,152 ----
  				  "session.encoding" );
  	decodedNote=cm.getNoteId(ContextManager.REQUEST_NOTE,
  				  "req.decoded" );
+ 	urlEncodingNote=cm.getNoteId(ContextManager.REQUEST_NOTE,
+ 				     "req.urlencode");
      }
      /* -------------------- Request mapping -------------------- */
  
***************
*** 534,539 ****
--- 537,544 ----
  		log( "Error decoding request ", ex);
  		return 400;
  	    }
+ 	} else {
+ 	    req.unparsedURI().setString(encodeURL(req));
  	}
  
  	return 0;
***************
*** 610,614 ****
--- 615,653 ----
  	}
  
      }
+     /**
+      * Utility funtion to re-encode the URL.
+      * Still has problems with charset, since UEncoder mostly 
+      * ignores it.
+      */
+     private String encodeURL(Request req) {
+ 	UEncoder enc=(UEncoder)req.getNote(urlEncodingNote);
+ 	if(enc == null) {
+ 	    enc = new UEncoder();
+ 	    enc.addSafeCharacter(';');
+ 	    req.setNote(urlEncodingNote,enc);
+ 	}
+ 	String outUri=null;
+        	try {
+ 	    /* Not really used..... */
+ 	    enc.setEncoding(req.getCharacterEncoding());
+ 	    CharArrayWriter out = new CharArrayWriter();
+ 	    enc.urlEncode(out, req.requestURI().toString());
+ 	    outUri=out.toString();
+        	} catch (IOException iex)
+ 	      {}
+ 	if(req.requestURI().equals(outUri))
+ 	    return null;
+ 	return outUri;
+     }	
  }
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
