JBossWeb SVN: r2628 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2015-09-03 04:20:42 -0400 (Thu, 03 Sep 2015)
New Revision: 2628
Added:
tags/JBOSSWEB_7_5_11_FINAL/
Log:
7.5.11
9 years, 3 months
JBossWeb SVN: r2627 - branches/7.5.x.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2015-09-03 04:19:58 -0400 (Thu, 03 Sep 2015)
New Revision: 2627
Modified:
branches/7.5.x/pom.xml
Log:
7.5.11
Modified: branches/7.5.x/pom.xml
===================================================================
--- branches/7.5.x/pom.xml 2015-09-01 13:49:43 UTC (rev 2626)
+++ branches/7.5.x/pom.xml 2015-09-03 08:19:58 UTC (rev 2627)
@@ -33,7 +33,7 @@
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>7.5.10.Final</version>
+ <version>7.5.11.Final</version>
<name>JBoss Web</name>
<description>Servlet 3.0 container</description>
9 years, 3 months
JBossWeb SVN: r2626 - in branches/7.5.x/src/main/java/org: apache/catalina/valves and 1 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2015-09-01 09:49:43 -0400 (Tue, 01 Sep 2015)
New Revision: 2626
Modified:
branches/7.5.x/src/main/java/org/apache/catalina/servlets/DefaultServlet.java
branches/7.5.x/src/main/java/org/apache/catalina/valves/ErrorReportValve.java
branches/7.5.x/src/main/java/org/jboss/web/CatalinaMessages.java
Log:
BZ1241032: Remove version numbers. Submitted by baranowb.
Modified: branches/7.5.x/src/main/java/org/apache/catalina/servlets/DefaultServlet.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/catalina/servlets/DefaultServlet.java 2015-09-01 13:45:57 UTC (rev 2625)
+++ branches/7.5.x/src/main/java/org/apache/catalina/servlets/DefaultServlet.java 2015-09-01 13:49:43 UTC (rev 2626)
@@ -1412,7 +1412,6 @@
sb.append("<HR size=\"1\" noshade=\"noshade\">");
}
- sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>");
sb.append("</body>\r\n");
sb.append("</html>\r\n");
Modified: branches/7.5.x/src/main/java/org/apache/catalina/valves/ErrorReportValve.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/catalina/valves/ErrorReportValve.java 2015-09-01 13:45:57 UTC (rev 2625)
+++ branches/7.5.x/src/main/java/org/apache/catalina/valves/ErrorReportValve.java 2015-09-01 13:49:43 UTC (rev 2626)
@@ -214,8 +214,7 @@
StringBuilder sb = new StringBuilder();
sb.append("<html><head><title>");
- sb.append(ServerInfo.getServerInfo()).append(" - ");
- sb.append(MESSAGES.errorReport());
+ sb.append(MESSAGES.statusHeader(statusCode, message));
sb.append("</title>");
sb.append("<style><!--");
sb.append(org.apache.catalina.util.TomcatCSS.TOMCAT_CSS);
@@ -266,16 +265,9 @@
loops++;
}
- sb.append("<p><b>");
- sb.append(MESSAGES.statusNote());
- sb.append("</b> <u>");
- sb.append(MESSAGES.statusRootCauseInLogs(ServerInfo.getServerInfo()));
- sb.append("</u></p>");
-
}
sb.append("<HR size=\"1\" noshade=\"noshade\">");
- sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>");
sb.append("</body></html>");
try {
Modified: branches/7.5.x/src/main/java/org/jboss/web/CatalinaMessages.java
===================================================================
--- branches/7.5.x/src/main/java/org/jboss/web/CatalinaMessages.java 2015-09-01 13:45:57 UTC (rev 2625)
+++ branches/7.5.x/src/main/java/org/jboss/web/CatalinaMessages.java 2015-09-01 13:49:43 UTC (rev 2626)
@@ -237,12 +237,12 @@
@Message(id = 71, value = "root cause")
String statusRootCause();
- @Message(id = 72, value = "note")
- String statusNote();
+// @Message(id = 72, value = "note")
+// String statusNote();
+//
+// @Message(id = 73, value = "The full stack trace of the root cause is available in the %s logs.")
+// String statusRootCauseInLogs(String log);
- @Message(id = 73, value = "The full stack trace of the root cause is available in the %s logs.")
- String statusRootCauseInLogs(String log);
-
@Message(id = 74, value = "Exception processing event.")
String eventValveExceptionDuringEvent();
9 years, 3 months
JBossWeb SVN: r2625 - branches/7.5.x/src/main/java/org/apache/catalina/authenticator.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2015-09-01 09:45:57 -0400 (Tue, 01 Sep 2015)
New Revision: 2625
Modified:
branches/7.5.x/src/main/java/org/apache/catalina/authenticator/FormAuthenticator.java
Log:
BZ1221446: Filter out HEAD method. Submitted by Hisanobu Okuda.
Modified: branches/7.5.x/src/main/java/org/apache/catalina/authenticator/FormAuthenticator.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/catalina/authenticator/FormAuthenticator.java 2015-09-01 11:55:36 UTC (rev 2624)
+++ branches/7.5.x/src/main/java/org/apache/catalina/authenticator/FormAuthenticator.java 2015-09-01 13:45:57 UTC (rev 2625)
@@ -368,9 +368,12 @@
request.changeSessionId(session.getId());
}
}
- // Always use GET for the login page, regardless of the method used
+ // Always use GET for the login page, regardless of the method used.
+ // In case of HEAD method. the container should not return body
String oldMethod = request.getMethod();
- request.getCoyoteRequest().method().setString("GET");
+ if (!"HEAD".equals(oldMethod)) {
+ request.getCoyoteRequest().method().setString("GET");
+ }
RequestDispatcher disp =
context.getServletContext().getRequestDispatcher(config.getLoginPage());
9 years, 3 months
JBossWeb SVN: r2624 - in branches/7.5.x/src/main/java/org: jboss/web and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2015-09-01 07:55:36 -0400 (Tue, 01 Sep 2015)
New Revision: 2624
Modified:
branches/7.5.x/src/main/java/org/apache/tomcat/util/http/Parameters.java
branches/7.5.x/src/main/java/org/jboss/web/CoyoteLogger.java
Log:
BZ1210388: Remove bad debug logging for parameters.
Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/http/Parameters.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/tomcat/util/http/Parameters.java 2015-09-01 11:52:49 UTC (rev 2623)
+++ branches/7.5.x/src/main/java/org/apache/tomcat/util/http/Parameters.java 2015-09-01 11:55:36 UTC (rev 2624)
@@ -215,10 +215,6 @@
private void processParameters(byte bytes[], int start, int len, String enc) {
- if (CoyoteLogger.HTTP_LOGGER.isDebugEnabled()) {
- CoyoteLogger.HTTP_LOGGER.startProcessingParameter(new String(bytes, start, len, DEFAULT_CHARSET));
- }
-
int decodeFailCount = 0;
int pos = start;
Modified: branches/7.5.x/src/main/java/org/jboss/web/CoyoteLogger.java
===================================================================
--- branches/7.5.x/src/main/java/org/jboss/web/CoyoteLogger.java 2015-09-01 11:52:49 UTC (rev 2623)
+++ branches/7.5.x/src/main/java/org/jboss/web/CoyoteLogger.java 2015-09-01 11:55:36 UTC (rev 2624)
@@ -206,9 +206,7 @@
@Message(id = 3027, value = "Failed loading HTTP messages strings")
void errorLoadingMessages(@Cause Throwable exception);
- @LogMessage(level = DEBUG)
- @Message(id = 3028, value = "Start processing with input [%s]")
- void startProcessingParameter(String parameter);
+ // 3028
@LogMessage(level = DEBUG)
@Message(id = 3029, value = "Parameter starting at position [%s] and ending at position [%s] with a value of [%s] was not followed by an '=' character")
9 years, 3 months
JBossWeb SVN: r2623 - in branches/7.5.x/src/main/java/org/apache/jasper: compiler and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2015-09-01 07:52:49 -0400 (Tue, 01 Sep 2015)
New Revision: 2623
Modified:
branches/7.5.x/src/main/java/org/apache/jasper/Constants.java
branches/7.5.x/src/main/java/org/apache/jasper/compiler/JspRuntimeContext.java
Log:
BZ1075083: Use the right code source if provided. Submitted by Bartek Spyrko-Smietanko.
Modified: branches/7.5.x/src/main/java/org/apache/jasper/Constants.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/jasper/Constants.java 2015-08-26 07:41:16 UTC (rev 2622)
+++ branches/7.5.x/src/main/java/org/apache/jasper/Constants.java 2015-09-01 11:52:49 UTC (rev 2623)
@@ -154,4 +154,6 @@
*/
public static final String SESSION_PARAMETER_NAME = System.getProperty("org.apache.catalina.jsessionid", "jsessionid");
+ public static final String PERMISSION_COLLECTION_ATTRIBUTE_NAME = "org.apache.jasper.Constants.PERMISSION_COLLECTION_ATTRIBUTE_NAME";
+ public static final String CODE_SOURCE_ATTRIBUTE_NAME = "org.apache.jasper.Constants.CODE_SOURCE_ATTRIBUTE_NAME";
}
Modified: branches/7.5.x/src/main/java/org/apache/jasper/compiler/JspRuntimeContext.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/jasper/compiler/JspRuntimeContext.java 2015-08-26 07:41:16 UTC (rev 2622)
+++ branches/7.5.x/src/main/java/org/apache/jasper/compiler/JspRuntimeContext.java 2015-09-01 11:52:49 UTC (rev 2623)
@@ -363,7 +363,12 @@
}
File contextDir = new File(codeBase);
URL url = contextDir.getCanonicalFile().toURL();
- codeSource = new CodeSource(url,(Certificate[])null);
+ URL providedCodeSource = (URL) context.getAttribute(Constants.CODE_SOURCE_ATTRIBUTE_NAME);
+ if (providedCodeSource != null) {
+ codeSource = new CodeSource(providedCodeSource, (Certificate[]) null);
+ } else {
+ codeSource = new CodeSource(url,(Certificate[])null);
+ }
permissionCollection = policy.getPermissions(codeSource);
// Create a file read permission for web app context directory
9 years, 3 months