JBossWeb SVN: r329 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-10-24 12:46:52 -0400 (Wed, 24 Oct 2007)
New Revision: 329
Added:
tags/JBOSSWEB_2_1_0_CR7/
Log:
- 2.1.0 CR7, should be mostly in sync with Tomcat 6.0.15.
Copied: tags/JBOSSWEB_2_1_0_CR7 (from rev 328, trunk)
16 years, 6 months
JBossWeb SVN: r328 - trunk.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-10-23 19:57:04 -0400 (Tue, 23 Oct 2007)
New Revision: 328
Modified:
trunk/build.xml
Log:
- Add chmod.
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-10-23 23:45:52 UTC (rev 327)
+++ trunk/build.xml 2007-10-23 23:57:04 UTC (rev 328)
@@ -448,6 +448,7 @@
<exclude name="**/*.launch"/>
</fileset>
</copy>
+ <chmod perm="ug+x" dir="${tomcat.build}/bin" includes="*.sh"/>
<!-- Copy static resource files -->
<copy todir="${tomcat.build}/conf">
16 years, 6 months
JBossWeb SVN: r327 - trunk/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-10-23 19:45:52 -0400 (Tue, 23 Oct 2007)
New Revision: 327
Modified:
trunk/webapps/docs/changelog.xml
Log:
- Changelog update (it should include all relevant Tomcat 6.0.15 changes now).
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2007-10-23 17:56:06 UTC (rev 326)
+++ trunk/webapps/docs/changelog.xml 2007-10-23 23:45:52 UTC (rev 327)
@@ -80,6 +80,9 @@
<fix>
Use Eclipse JDT 3.3.1. (pero)
</fix>
+ <update>
+ Try to guess java path in Unix scripts. (jfclere)
+ </update>
</changelog>
</subsection>
<subsection name="Catalina">
@@ -148,6 +151,16 @@
<fix>
<bug>43487</bug>: Fix request processing stats. (fhanik)
</fix>
+ <fix>
+ Fix CVE-2007-5461, an important information disclosure vulnerability in
+ the WebDAV Servlet. Based on a patch by Marc Schoenefeld. (markt)
+ </fix>
+ <fix>
+ Call stopAwait in StandardServer.stop if port == -1. (pero)
+ </fix>
+ <fix>
+ <bug>43668</bug>: Fix problem on a Forward when the outer most wrapper isn't a HttpServletRequest/ResponseWrapper. (billbarker)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -171,6 +184,9 @@
<fix>
<bug>42925</bug>: Add maintain for sendfile. (remm)
</fix>
+ <fix>
+ Properly close sockets for java.io AJP connector. (jfclere)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
16 years, 6 months
JBossWeb SVN: r326 - trunk/jboss/org/apache/catalina/startup.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-10-23 13:56:06 -0400 (Tue, 23 Oct 2007)
New Revision: 326
Modified:
trunk/jboss/org/apache/catalina/startup/catalina.properties
Log:
- Cosmetic change (all the bootsrap related properties shouldbe useless in AS).
Modified: trunk/jboss/org/apache/catalina/startup/catalina.properties
===================================================================
--- trunk/jboss/org/apache/catalina/startup/catalina.properties 2007-10-23 17:46:30 UTC (rev 325)
+++ trunk/jboss/org/apache/catalina/startup/catalina.properties 2007-10-23 17:56:06 UTC (rev 326)
@@ -1,71 +1,10 @@
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
+# JBoss AS configuration
+org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
+org.apache.catalina.core.StandardService.DELAY_CONNECTOR_STARTUP=true
+org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true
-#
-#
-# List of comma-separated paths defining the contents of the "common"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank,the JVM system loader will be used as Catalina's "common"
-# loader.
-# Examples:
-# "foo": Add this folder as a class repository
-# "foo/*.jar": Add all the JARs of the specified folder as class
-# repositories
-# "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.home}/lib,${catalina.home}/lib/*.jar
-
-#
-# List of comma-separated paths defining the contents of the "server"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank, the "common" loader will be used as Catalina's "server"
-# loader.
-# Examples:
-# "foo": Add this folder as a class repository
-# "foo/*.jar": Add all the JARs of the specified folder as class
-# repositories
-# "foo/bar.jar": Add bar.jar as a class repository
-server.loader=
-
-#
-# List of comma-separated paths defining the contents of the "shared"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
-# the "common" loader will be used as Catalina's "shared" loader.
-# Examples:
-# "foo": Add this folder as a class repository
-# "foo/*.jar": Add all the JARs of the specified folder as class
-# repositories
-# "foo/bar.jar": Add bar.jar as a class repository
-# Please note that for single jars, e.g. bar.jar, you need the URL form
-# starting with file:.
-shared.loader=
-
-#
# String cache configuration.
tomcat.util.buf.StringCache.byte.enabled=true
#tomcat.util.buf.StringCache.char.enabled=true
#tomcat.util.buf.StringCache.trainThreshold=500000
#tomcat.util.buf.StringCache.cacheSize=5000
-
-# JBoss AS configuration
-org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
-org.apache.catalina.core.StandardService.DELAY_CONNECTOR_STARTUP=true
-org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true
16 years, 6 months
JBossWeb SVN: r325 - trunk/java/org/apache/catalina/authenticator.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-10-23 13:46:30 -0400 (Tue, 23 Oct 2007)
New Revision: 325
Modified:
trunk/java/org/apache/catalina/authenticator/Constants.java
Log:
- Adjust system property name (it must begin with the classname).
Modified: trunk/java/org/apache/catalina/authenticator/Constants.java
===================================================================
--- trunk/java/org/apache/catalina/authenticator/Constants.java 2007-10-23 17:41:08 UTC (rev 324)
+++ trunk/java/org/apache/catalina/authenticator/Constants.java 2007-10-23 17:46:30 UTC (rev 325)
@@ -41,7 +41,7 @@
// Cookie name for single sign on support
public static final String SINGLE_SIGN_ON_COOKIE =
- System.getProperty("org.apache.catalina.JSESSIONIDSSO", "JSESSIONIDSSO");
+ System.getProperty("org.apache.catalina.authenticator.Constants.JSESSIONIDSSO", "JSESSIONIDSSO");
// --------------------------------------------------------- Request Notes
16 years, 6 months
JBossWeb SVN: r324 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-10-23 13:41:08 -0400 (Tue, 23 Oct 2007)
New Revision: 324
Modified:
trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Log:
- Port request dispatcher fix.
Modified: trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
===================================================================
--- trunk/java/org/apache/catalina/core/ApplicationDispatcher.java 2007-10-23 15:13:42 UTC (rev 323)
+++ trunk/java/org/apache/catalina/core/ApplicationDispatcher.java 2007-10-23 17:41:08 UTC (rev 324)
@@ -59,7 +59,7 @@
* <code>javax.servlet.ServletResponseWrapper</code>.
*
* @author Craig R. McClanahan
- * @version $Revision: 572856 $ $Date: 2007-09-05 04:01:02 +0200 (mer., 05 sept. 2007) $
+ * @version $Revision: 572856 $ $Date: 2007-09-05 04:01:02 +0200 (Wed, 05 Sep 2007) $
*/
final class ApplicationDispatcher
@@ -138,6 +138,16 @@
* Are we performing an include() instead of a forward()?
*/
boolean including = false;
+
+ /**
+ * Outer most HttpServletRequest in the chain
+ */
+ HttpServletRequest hrequest = null;
+
+ /**
+ * Outermost HttpServletResponse in the chain
+ */
+ HttpServletResponse hresponse = null;
}
// ----------------------------------------------------------- Constructors
@@ -316,24 +326,13 @@
checkSameObjects(request, response);
}
- // Identify the HTTP-specific request and response objects (if any)
- HttpServletRequest hrequest = null;
- if (request instanceof HttpServletRequest)
- hrequest = (HttpServletRequest) request;
- HttpServletResponse hresponse = null;
- if (response instanceof HttpServletResponse)
- hresponse = (HttpServletResponse) response;
-
- // Handle a non-HTTP forward by passing the existing request/response
- if ((hrequest == null) || (hresponse == null)) {
- processRequest(hrequest,hresponse,state);
- }
-
+ wrapResponse(state);
// Handle an HTTP named dispatcher forward
- else if ((servletPath == null) && (pathInfo == null)) {
+ if ((servletPath == null) && (pathInfo == null)) {
ApplicationHttpRequest wrequest =
(ApplicationHttpRequest) wrapRequest(state);
+ HttpServletRequest hrequest = state.hrequest;
wrequest.setRequestURI(hrequest.getRequestURI());
wrequest.setContextPath(hrequest.getContextPath());
wrequest.setServletPath(hrequest.getServletPath());
@@ -349,7 +348,7 @@
ApplicationHttpRequest wrequest =
(ApplicationHttpRequest) wrapRequest(state);
String contextPath = context.getPath();
-
+ HttpServletRequest hrequest = state.hrequest;
if (hrequest.getAttribute(Globals.FORWARD_REQUEST_URI_ATTR) == null) {
wrequest.setAttribute(Globals.FORWARD_REQUEST_URI_ATTR,
hrequest.getRequestURI());
@@ -488,19 +487,8 @@
// Create a wrapped response to use for this request
wrapResponse(state);
- // Handle a non-HTTP include
- if (!(request instanceof HttpServletRequest) ||
- !(response instanceof HttpServletResponse)) {
- request.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
- Integer.valueOf(ApplicationFilterFactory.INCLUDE));
- request.setAttribute(
- ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
- servletPath);
- invoke(request, state.outerResponse, state);
- }
-
// Handle an HTTP named dispatcher include
- else if (name != null) {
+ if (name != null) {
ApplicationHttpRequest wrequest =
(ApplicationHttpRequest) wrapRequest(state);
@@ -584,7 +572,7 @@
}
// Initialize local variables we may need
- HttpServletResponse hresponse = (HttpServletResponse) response;
+ HttpServletResponse hresponse = state.hresponse;
Servlet servlet = null;
IOException ioException = null;
ServletException servletException = null;
@@ -817,6 +805,8 @@
ServletRequest previous = null;
ServletRequest current = state.outerRequest;
while (current != null) {
+ if(state.hrequest == null && (current instanceof HttpServletRequest))
+ state.hrequest = (HttpServletRequest)current;
if ("org.apache.catalina.servlets.InvokerHttpRequest".
equals(current.getClass().getName()))
break; // KLUDGE - Make nested RD.forward() using invoker work
@@ -878,6 +868,11 @@
ServletResponse previous = null;
ServletResponse current = state.outerResponse;
while (current != null) {
+ if(state.hresponse == null && (current instanceof HttpServletResponse)) {
+ state.hresponse = (HttpServletResponse)current;
+ if(!state.including) // Forward only needs hresponse
+ return null;
+ }
if (!(current instanceof ServletResponseWrapper))
break;
if (current instanceof ApplicationHttpResponse)
16 years, 6 months
JBossWeb SVN: r323 - in trunk/java/org/apache/catalina: authenticator and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-10-23 11:13:42 -0400 (Tue, 23 Oct 2007)
New Revision: 323
Modified:
trunk/java/org/apache/catalina/Globals.java
trunk/java/org/apache/catalina/authenticator/Constants.java
Log:
Allow to define JSESSIONID/jsessionid and JSESSIONIDSSO.
Modified: trunk/java/org/apache/catalina/Globals.java
===================================================================
--- trunk/java/org/apache/catalina/Globals.java 2007-10-23 12:22:37 UTC (rev 322)
+++ trunk/java/org/apache/catalina/Globals.java 2007-10-23 15:13:42 UTC (rev 323)
@@ -269,14 +269,16 @@
* The name of the cookie used to pass the session identifier back
* and forth with the client.
*/
- public static final String SESSION_COOKIE_NAME = "JSESSIONID";
+ public static final String SESSION_COOKIE_NAME =
+ System.getProperty("org.apache.catalina.JSESSIONID", "JSESSIONID");
/**
* The name of the path parameter used to pass the session identifier
* back and forth with the client.
*/
- public static final String SESSION_PARAMETER_NAME = "jsessionid";
+ public static final String SESSION_PARAMETER_NAME =
+ System.getProperty("org.apache.catalina.jsessionid", "jsessionid");
/**
Modified: trunk/java/org/apache/catalina/authenticator/Constants.java
===================================================================
--- trunk/java/org/apache/catalina/authenticator/Constants.java 2007-10-23 12:22:37 UTC (rev 322)
+++ trunk/java/org/apache/catalina/authenticator/Constants.java 2007-10-23 15:13:42 UTC (rev 323)
@@ -40,7 +40,8 @@
public static final String FORM_USERNAME = "j_username";
// Cookie name for single sign on support
- public static final String SINGLE_SIGN_ON_COOKIE = "JSESSIONIDSSO";
+ public static final String SINGLE_SIGN_ON_COOKIE =
+ System.getProperty("org.apache.catalina.JSESSIONIDSSO", "JSESSIONIDSSO");
// --------------------------------------------------------- Request Notes
16 years, 6 months
JBossWeb SVN: r322 - branches/2.0.x/src/share/classes/org/apache/coyote/ajp.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-10-23 08:22:37 -0400 (Tue, 23 Oct 2007)
New Revision: 322
Modified:
branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpProcessor.java
branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpProtocol.java
Log:
- Port patch: harmonize with HTTP connector.
Modified: branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpProcessor.java
===================================================================
--- branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpProcessor.java 2007-10-23 11:22:51 UTC (rev 321)
+++ branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpProcessor.java 2007-10-23 12:22:37 UTC (rev 322)
@@ -355,7 +355,7 @@
*
* @throws IOException error during an I/O operation
*/
- public boolean process(Socket socket)
+ public void process(Socket socket)
throws IOException {
RequestInfo rp = request.getRequestProcessor();
rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
@@ -471,8 +471,6 @@
input = null;
output = null;
- return true;
-
}
Modified: branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpProtocol.java
===================================================================
--- branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpProtocol.java 2007-10-23 11:22:51 UTC (rev 321)
+++ branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpProtocol.java 2007-10-23 12:22:37 UTC (rev 322)
@@ -363,7 +363,8 @@
((ActionHook) processor).action(ActionCode.ACTION_START, null);
}
- return processor.process(socket);
+ processor.process(socket);
+ return false;
} catch(java.net.SocketException e) {
// SocketExceptions are normal
16 years, 6 months
JBossWeb SVN: r321 - trunk/java/org/apache/coyote/ajp.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-10-23 07:22:51 -0400 (Tue, 23 Oct 2007)
New Revision: 321
Modified:
trunk/java/org/apache/coyote/ajp/AjpProcessor.java
trunk/java/org/apache/coyote/ajp/AjpProtocol.java
Log:
- Harmonize with HTTP java.io code.
Modified: trunk/java/org/apache/coyote/ajp/AjpProcessor.java
===================================================================
--- trunk/java/org/apache/coyote/ajp/AjpProcessor.java 2007-10-22 15:15:22 UTC (rev 320)
+++ trunk/java/org/apache/coyote/ajp/AjpProcessor.java 2007-10-23 11:22:51 UTC (rev 321)
@@ -355,7 +355,7 @@
*
* @throws IOException error during an I/O operation
*/
- public boolean process(Socket socket)
+ public void process(Socket socket)
throws IOException {
RequestInfo rp = request.getRequestProcessor();
rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
@@ -471,8 +471,6 @@
input = null;
output = null;
- return true;
-
}
Modified: trunk/java/org/apache/coyote/ajp/AjpProtocol.java
===================================================================
--- trunk/java/org/apache/coyote/ajp/AjpProtocol.java 2007-10-22 15:15:22 UTC (rev 320)
+++ trunk/java/org/apache/coyote/ajp/AjpProtocol.java 2007-10-23 11:22:51 UTC (rev 321)
@@ -381,7 +381,8 @@
((ActionHook) processor).action(ActionCode.ACTION_START, null);
}
- return processor.process(socket);
+ processor.process(socket);
+ return false;
} catch(java.net.SocketException e) {
// SocketExceptions are normal
16 years, 6 months
JBossWeb SVN: r320 - trunk/bin.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-10-22 11:15:22 -0400 (Mon, 22 Oct 2007)
New Revision: 320
Modified:
trunk/bin/setclasspath.sh
Log:
Use any JVM that be could run in the $PATH.
Modified: trunk/bin/setclasspath.sh
===================================================================
--- trunk/bin/setclasspath.sh 2007-10-21 12:51:27 UTC (rev 319)
+++ trunk/bin/setclasspath.sh 2007-10-22 15:15:22 UTC (rev 320)
@@ -10,18 +10,29 @@
# Make sure prerequisite environment variables are set
if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
- # Bugzilla 37284
- if $darwin && [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home" ]; then
- export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home"
+ # Bugzilla 37284 (reviewed).
+ if $darwin; then
+ if [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
+ export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home"
+ fi
else
- if [ -x /usr/bin/java ]; then
- JRE_HOME=/usr
- else
- echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
- echo "At least one of these environment variable is needed to run this program"
- exit 1
+ JAVA_PATH=`which java 2>/dev/null`
+ if [ "x$JAVA_PATH" != "x" ]; then
+ JAVA_PATH=`dirname $JAVA_PATH 2>/dev/null`
+ JRE_HOME=`dirname $JAVA_PATH 2>/dev/null`
fi
+ if [ "x$JRE_HOME" = "x" ]; then
+ # XXX: Should we try other locations?
+ if [ -x /usr/bin/java ]; then
+ JRE_HOME=/usr
+ fi
+ fi
fi
+ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
+ echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
+ echo "At least one of these environment variable is needed to run this program"
+ exit 1
+ fi
fi
if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then
echo "JAVA_HOME should point to a JDK in order to run in debug mode."
16 years, 6 months