cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Request.java

[costin]

costin      00/11/29 23:59:04

  Modified:    src/facade22/org/apache/tomcat/facade
                        HttpServletResponseFacade.java
               src/share/org/apache/tomcat/core Request.java
  Log:
  More fixes from 3.2 - Request refactoring ( thanks Shawn ) and #location
  encoding ( thanks Craig )
  
  Submitted by: Shawn McMurdo <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.11      +3 -0      
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java
  
  Index: HttpServletResponseFacade.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- HttpServletResponseFacade.java    2000/11/30 04:58:38     1.10
  +++ HttpServletResponseFacade.java    2000/11/30 07:59:03     1.11
  @@ -345,6 +345,9 @@
        * @param location Absolute URL to be validated
        **/
       private boolean isEncodeable(String location) {
  +     // Is this an intra-document reference?
  +     if (location.startsWith("#"))
  +         return (false);
   
        // Are we in a valid session that is not using cookies?
        Request request = response.getRequest();
  
  
  
  1.75      +5 -1      jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- Request.java      2000/11/30 04:58:41     1.74
  +++ Request.java      2000/11/30 07:59:04     1.75
  @@ -192,7 +192,7 @@
   
       public Request() {
        headers = new MimeHeaders();
  -     recycle(); // XXX need better placement-super()
  +     initRequest();  
       }
   
       public final int getState() {
  @@ -831,6 +831,10 @@
   
       // -------------------- Recycling -------------------- 
       public void recycle() {
  +     initRequest();
  +    }
  +
  +    public void initRequest() {
           context = null;
           attributes.clear();
           parameters.clear();