cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject cvs commit: cocoon-2.2/src/java/org/apache/cocoon/environment/http HttpRequest.java
Date Wed, 29 Oct 2003 14:48:56 GMT
vgritsenko    2003/10/29 06:48:56

  Modified:    src/java/org/apache/cocoon/environment/http HttpRequest.java
               src/java/org/apache/cocoon/environment/http HttpRequest.java
  Log:
  Return actual character encoding in effect.
  
  Revision  Changes    Path
  1.5       +6 -2      cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpRequest.java
  
  Index: HttpRequest.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpRequest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HttpRequest.java	6 Jul 2003 20:37:48 -0000	1.4
  +++ HttpRequest.java	29 Oct 2003 14:48:56 -0000	1.5
  @@ -299,7 +299,11 @@
       }
   
       public String getCharacterEncoding() {
  -        return this.req.getCharacterEncoding();
  +        if (this.form_encoding == null) {
  +            return this.req.getCharacterEncoding();
  +        } else {
  +            return this.form_encoding;
  +        }
       }
   
       public void setCharacterEncoding(String form_encoding)
  
  
  
  1.5       +6 -2      cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpRequest.java
  
  Index: HttpRequest.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpRequest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HttpRequest.java	6 Jul 2003 20:37:48 -0000	1.4
  +++ HttpRequest.java	29 Oct 2003 14:48:56 -0000	1.5
  @@ -299,7 +299,11 @@
       }
   
       public String getCharacterEncoding() {
  -        return this.req.getCharacterEncoding();
  +        if (this.form_encoding == null) {
  +            return this.req.getCharacterEncoding();
  +        } else {
  +            return this.form_encoding;
  +        }
       }
   
       public void setCharacterEncoding(String form_encoding)
  
  
  

Mime
View raw message