You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2003/01/03 03:10:57 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardServer.java
amyroh 2003/01/02 18:10:57
Modified: catalina/src/share/org/apache/catalina/core
StandardServer.java
Log:
Port change.
Revision Changes Path
1.8 +14 -6 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StandardServer.java 16 Sep 2002 04:45:38 -0000 1.7
+++ StandardServer.java 3 Jan 2003 02:10:56 -0000 1.8
@@ -883,7 +883,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);
}
@@ -1923,7 +1931,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: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>