Author: rjung
Date: Mon Dec 29 14:49:41 2014
New Revision: 1648352
URL: http://svn.apache.org/r1648352
Log:
BZ 54177: Status: Use numeric time stamps instead of
textual ones to avoid non-well-formed XML output.
Textual timestamps are formatted according to locale
settings and reencoding them to UTF-8 would be cumbersome.
Modified:
tomcat/jk/trunk/native/common/jk_status.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1648352&r1=1648351&r2=1648352&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Mon Dec 29 14:49:41 2014
@@ -204,10 +204,10 @@
#define JK_STATUS_WAIT_AFTER_UPDATE "3"
#define JK_STATUS_REFRESH_DEF "10"
#define JK_STATUS_ESC_CHARS ("<>?\"")
-#define JK_STATUS_TIME_FMT_HTML "%a, %d %b %Y %X %Z"
+#define JK_STATUS_TIME_FMT_HTML "%Y-%m-%d %H:%M:%S %z"
#define JK_STATUS_TIME_FMT_TEXT "%Y%m%d%H%M%S"
-#define JK_STATUS_TIME_FMT_TZ "%Z"
-#define JK_STATUS_TIME_BUF_SZ (80)
+#define JK_STATUS_TIME_FMT_TZ "%z"
+#define JK_STATUS_TIME_BUF_SZ (30)
#define JK_STATUS_HEAD "<?xml version=\"1.0\"
encoding=\"ISO-8859-1\"?>\n" \
"<!DOCTYPE html PUBLIC
\"-//W3C//DTD XHTML 1.0 Transitional//EN\"" \
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1648352&r1=1648351&r2=1648352&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 29 14:49:41 2014
@@ -141,6 +141,12 @@
<bug>52483</bug>: Apache: Add debug logging for result
of JkOptions configuration processing. (rjung)
</add>
+ <fix>
+ <bug>54177</bug>: Status: Use numeric time stamps instead of
+ textual ones to avoid non-well-formed XML output. Textual
+ timestamps are formatted according to locale settings and
+ reencoding them to UTF-8 would be cumbersome. (rjung)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
