You should not revert completely to revision 1.32. There were two
changes done to StandardServer.java in your commit of revision 1.33.
We discussed only the first change (in method convertStr around line
824) and I think we agree it should be reverted.
But the second change done in that same commit actually fixes the
original problem (bug 15762) and should be preserved. This is in method
storeNamingResources around line 1822:
@@ -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(' ');
Actually, I have been running Tomcat with this same fix for a month or
so, and it works well. You can enter special characters (like ) in the
data source url using the admin webapp (no need to escape them), they
get stored in server.xml and read back properly. (I had attached that
patch with the original bug report)
Thanks
Roberto
From: Amy Roh
Sent: Sunday, January 05, 2003 0:46
Roberto Casanova wrote:
I see another problem with this code.
Suppose for some reason we have an attribute or resource
parameter value
like the following (without the quotes):
gt; corresponds to
The correct XML for this string is:
amp;gt; corresponds to gt;
However this code would write to server.xml:
gt; corresponds to gt;
The next time the server.xml file is read in, we end up with:
corresponds to
which is different than the original string.
In my opinion this portion of the code should be left as it was in
revision 1.32:
I see the problem with the previous commit - Sorry, I should have
thought about it more before making the quick change. However, the
original problem of second time admin saving url in invalid
form still
occurs with revision 1.32. The workaround is to make sure url is in
valid form in datasource page everytime you commit any changes via
admin. Is this workaround feasible?
Amy
Roberto
Christoph Seibert wrote:
Hi there,
I think there is a problem with the following fix:
amyroh 2003/01/02 17:59:09
Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java
Log:
Fix for bugzilla 15762.
[...]
diff -u -r1.32 -r1.33
--- StandardServer.java11 Sep 2002 14:19:33 -1.32
+++ StandardServer.java3 Jan 2003 01:59:08 -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);
}
(Note: I haven't had a look at the surrounding code yet, so
I have to
assume that 'i' is the position of 'c', that is the '' character.)
This code assumes that character or entity references will not be
shorter than 4 characters (including the delimiters '' and
';') and
no longer than 6. However, the XML specification does not
in any way
define restrictions like that. For example, 'd;' is a
valid entity
reference (assuming it was defined in the DTD). Worse,
character or
entity references can have arbitrary length. For example,
'#x00020' is a valid character reference to the '
' (space)
character.
I'm sorry I don't have a better fix right now, but I assume
one would
have to iterate through the characters following the ''
until either
a ';' is found or a character occurs that is not a legal
part of an
entity reference name (or in the case of a character
reference, not
one of [0-9] for decimal or [0-9a-fA-F] for hexadecimal).
(Actually, I believe this wheel must already have been
invented, but
with only looking at this code snippet, I don't really know.)
I believe iterating through the characters following the ''
to look for
';' is found will fix the problem. A character such as
'#x00020' without following ';' will result in
parsing error
where as '#x00020;' will be written as a space(' ').
Thanks,
Amy
Ciao,
Christoph
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
