Author: kkolinko
Date: Sun Apr 27 18:17:02 2014
New Revision: 1590441
URL: http://svn.apache.org/r1590441
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383
Merged r1590438 from tomcat/trunk:
Use non-empty title when both showServerInfo and showReport are false.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1590438
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1590441&r1=1590440&r2=1590441&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Sun Apr 27 18:17:02 2014
@@ -214,6 +214,10 @@ public class ErrorReportValve extends Va
sb.append("<style><!--");
sb.append(org.apache.catalina.util.TomcatCSS.TOMCAT_CSS);
sb.append("--></style> ");
+ } else {
+ sb.append("<title>");
+ sb.append(smClient.getString("errorReportValve.errorReport"));
+ sb.append("</title>");
}
sb.append("</head><body>");
sb.append("<h1>");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
