tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amy...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardServer.java
Date Fri, 03 Jan 2003 01:59:10 GMT
amyroh      2003/01/02 17:59:09

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardServer.java
  Log:
  Fix for bugzilla 15762.
  
  Revision  Changes    Path
  1.33      +14 -6     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- StandardServer.java	11 Sep 2002 14:19:33 -0000	1.32
  +++ StandardServer.java	3 Jan 2003 01:59:08 -0000	1.33
  @@ -824,7 +824,15 @@
               } else if (c == '"') {
                   filtered.append(""");
               } else if (c == '&') {
  -                filtered.append("&");
  +                char s1 = input.charAt(i+3);
  +                char s2 = input.charAt(i+4);
  +                char s3 = input.charAt(i+5);
  +                if (((s1 == ';') || (s2 == ';')) || (s3 == ';')) {
  +                    // do not convert if it's already in converted form
  +                    filtered.append(c);
  +                } else {
  +                    filtered.append("&");
  +                }
               } else {
                   filtered.append(c);
               }
  @@ -1822,7 +1830,7 @@
                       writer.print(' ');
                   }
                   writer.print("<value>");
  -                writer.print(value);
  +                writer.print(convertStr(value));
                   writer.println("</value>");
                   for (int j = 0; j < indent + 2; j++) {
                       writer.print(' ');
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message