cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade HttpServletRequestFacade.java

[costin]

costin      01/05/26 11:09:22

  Modified:    src/facade22/org/apache/tomcat/facade
                        HttpServletRequestFacade.java
  Log:
  Call request.handleQueryParameters ( to allow the request to set the
  encoding - the second stage of guessing )
  
  Return unparsed URI.
  
  Revision  Changes    Path
  1.24      +8 -5      
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletRequestFacade.java
  
  Index: HttpServletRequestFacade.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletRequestFacade.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- HttpServletRequestFacade.java     2001/05/15 09:50:37     1.23
  +++ HttpServletRequestFacade.java     2001/05/26 18:09:22     1.24
  @@ -238,7 +238,7 @@
        */
       public String getParameter(String name) {
        if( ! parametersProcessed ) {
  -         request.parameters().handleQueryParameters();
  +         request.handleQueryParameters();
            if( request.method().equals("POST")) {
                request.handlePostParameters();
            }
  @@ -249,7 +249,7 @@
   
       public String[] getParameterValues(String name) {
        if( ! parametersProcessed ) {
  -         request.parameters().handleQueryParameters();
  +         request.handleQueryParameters();
            if( request.method().equals("POST")) {
                request.handlePostParameters();
            }
  @@ -260,7 +260,7 @@
   
       public Enumeration getParameterNames() {
        if( ! parametersProcessed ) {
  -         request.parameters().handleQueryParameters();
  +         request.handleQueryParameters();
            if( request.method().equals("POST")) {
                request.handlePostParameters();
            }
  @@ -291,7 +291,8 @@
       }
   
       public String getQueryString() {
  -        String qS=request.queryString().toString();
  +     // unprocessed
  +     String qS=request.queryString().toString();
        if( "".equals(qS) )
            return null;
        return qS;
  @@ -363,7 +364,9 @@
       }
   
       public String getRequestURI() {
  -        return request.requestURI().toString();
  +     if( request.unparsedURI().isNull() )
  +         return request.requestURI().toString();
  +        return request.unparsedURI().toString();
       }
   
       /** Facade: we delegate to the right object ( the context )