cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http Parameters.java

[luehe]

luehe       2004/08/09 09:00:11

  Modified:    util/java/org/apache/tomcat/util/http Parameters.java
  Log:
  Consider case where query params were set as strings instead of bytes
  
  Revision  Changes    Path
  1.14      +6 -4      
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Parameters.java
  
  Index: Parameters.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Parameters.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Parameters.java   24 Feb 2004 08:50:04 -0000      1.13
  +++ Parameters.java   9 Aug 2004 16:00:10 -0000       1.14
  @@ -258,9 +258,7 @@
               // Can't happen, as decodedQuery can't overflow
               e.printStackTrace();
           }
  -        ByteChunk bc = decodedQuery.getByteChunk();
  -        processParameters( bc.getBytes(), bc.getOffset(),
  -                           bc.getLength(), queryStringEncoding );
  +        processParameters( decodedQuery, queryStringEncoding );
       }
   
       // --------------------
  @@ -491,12 +489,16 @@
       }
       
       public void processParameters( MessageBytes data ) {
  +        processParameters(data, encoding);
  +    }
  +
  +    public void processParameters( MessageBytes data, String encoding ) {
        if( data==null || data.isNull() || data.getLength() <= 0 ) return;
   
        if( data.getType() == MessageBytes.T_BYTES ) {
            ByteChunk bc=data.getByteChunk();
            processParameters( bc.getBytes(), bc.getOffset(),
  -                            bc.getLength());
  +                            bc.getLength(), encoding);
        } else {
            if (data.getType()!= MessageBytes.T_CHARS ) 
                data.toChars();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]