Return-Path: 
 <tomcat-dev-return-23651-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 21528 invoked from network); 3 Jan 2003 01:59:22 -0000
Received: from exchange.sun.com (192.18.33.10)
  by daedalus.apache.org with SMTP; 3 Jan 2003 01:59:22 -0000
Received: (qmail 1004 invoked by uid 97); 3 Jan 2003 02:00:39 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 987 invoked by uid 97); 3 Jan 2003 02:00:38 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 976 invoked by uid 97); 3 Jan 2003 02:00:38 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Date: 3 Jan 2003 01:59:10 -0000
Message-ID: <20030103015910.71774.qmail@icarus.apache.org>
From: amyroh@apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit:
 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core
 StandardServer.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

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("&quot;");
               } else if (c == '&') {
  -                filtered.append("&amp;");
  +                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("&amp;");
  +                }
               } 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>