Author: violetagg
Date: Fri Jun 9 15:50:59 2017
New Revision: 1798238
URL: http://svn.apache.org/viewvc?rev=1798238&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61134
Do not use '[' and ']' symbols around substituted text fragments when
generating the default error pages. Patch provided by Katya Todorova via GitHub.
This closes #61
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1798238&r1=1798237&r2=1798238&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties Fri
Jun 9 15:50:59 2017
@@ -29,7 +29,9 @@ accessLogValve.invalidPortType=Invalid p
accessLogValve.writeFail=Failed to write log message [{0}]
# Error report valve
-errorReportValve.statusHeader=HTTP Status [{0}] \u2013 [{1}]
+# Default error page should not have '[' ']' symbols around substituted text
fragments.
+# https://bz.apache.org/bugzilla/show_bug.cgi?id=61134
+errorReportValve.statusHeader=HTTP Status {0} \u2013 {1}
errorReportValve.type=Type
errorReportValve.exceptionReport=Exception Report
errorReportValve.statusReport=Status Report
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties?rev=1798238&r1=1798237&r2=1798238&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties Fri
Jun 9 15:50:59 2017
@@ -17,7 +17,9 @@ accessLogValve.closeFail = No pude cerra
accessLogValve.openDirFail = No pude crear directorio [{0}] para historiales
de acceso
accessLogValve.rotateFail = No pude rotar historial de acceso
# Error report valve
-errorReportValve.statusHeader = Estado HTTP [{0}] \u2013 [{1}]
+# Default error page should not have '[' ']' symbols around substituted text
fragments.
+# https://bz.apache.org/bugzilla/show_bug.cgi?id=61134
+errorReportValve.statusHeader = Estado HTTP {0} \u2013 {1}
errorReportValve.type=Tipo
errorReportValve.exceptionReport = Informe de Excepci\u00F3n
errorReportValve.statusReport = Informe de estado
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties?rev=1798238&r1=1798237&r2=1798238&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties Fri
Jun 9 15:50:59 2017
@@ -14,7 +14,9 @@
# limitations under the License.
# Error report valve
-errorReportValve.statusHeader=\u00c9tat HTTP [{0}] \u2013 [{1}]
+# Default error page should not have '[' ']' symbols around substituted text
fragments.
+# https://bz.apache.org/bugzilla/show_bug.cgi?id=61134
+errorReportValve.statusHeader=\u00c9tat HTTP {0} \u2013 {1}
errorReportValve.type=Type
errorReportValve.exceptionReport=Rapport d''exception
errorReportValve.statusReport=Rapport d''\u00e9tat
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties?rev=1798238&r1=1798237&r2=1798238&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties Fri
Jun 9 15:50:59 2017
@@ -15,7 +15,9 @@
jdbcAccessLogValve.exception=\u30a2\u30af\u30bb\u30b9\u30a8\u30f3\u30c8\u30ea\u306e\u633f\u5165\u3092\u5b9f\u884c\u4e2d\u306e\u4f8b\u5916\u3067\u3059
# Error report valve
-errorReportValve.statusHeader=HTTP\u30b9\u30c6\u30fc\u30bf\u30b9 [{0}] - [{1}]
+# Default error page should not have '[' ']' symbols around substituted text
fragments.
+# https://bz.apache.org/bugzilla/show_bug.cgi?id=61134
+errorReportValve.statusHeader=HTTP\u30b9\u30c6\u30fc\u30bf\u30b9 {0} - {1}
errorReportValve.statusReport=\u30b9\u30c6\u30fc\u30bf\u30b9\u30ec\u30dd\u30fc\u30c8
errorReportValve.message=\u30e1\u30c3\u30bb\u30fc\u30b8
errorReportValve.description=\u8aac\u660e
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1798238&r1=1798237&r2=1798238&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 9 15:50:59 2017
@@ -81,6 +81,11 @@
certificate headers from Nginx. Based on a patch by Lucas Ventura
Carro.
(markt)
</fix>
+ <fix>
+ <bug>61134</bug>: Do not use '[' and ']' symbols around substituted
+ text fragments when generating the default error pages. Patch provided
+ by Katya Todorova. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
