svn commit: r721797 - /tomcat/tc6.0.x/trunk/res/
Author: markt Date: Sun Nov 30 03:33:46 2008 New Revision: 721797 URL: http://svn.apache.org/viewvc?rev=721797&view=rev Log: Add temp file to ignore list Modified: tomcat/tc6.0.x/trunk/res/ (props changed) Propchange: tomcat/tc6.0.x/trunk/res/ -- --- svn:ignore (added) +++ svn:ignore Sun Nov 30 03:33:46 2008 @@ -0,0 +1 @@ +manifest.tmp - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r721835 - in /tomcat/trunk/java/org/apache/coyote: ./ ajp/ http11/ memory/
Author: markt
Date: Sun Nov 30 07:59:48 2008
New Revision: 721835
URL: http://svn.apache.org/viewvc?rev=721835&view=rev
Log:
Generics for o.a.coyote
Modified:
tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/RequestGroupInfo.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/memory/MemoryProtocolHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java?rev=721835&r1=721834&r2=721835&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java Sun Nov 30
07:59:48 2008
@@ -42,7 +42,7 @@
public Object getAttribute(String name);
-public Iterator getAttributeNames();
+public Iterator getAttributeNames();
/**
* The adapter, used to call the connector.
Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=721835&r1=721834&r2=721835&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Sun Nov 30 07:59:48 2008
@@ -135,7 +135,7 @@
private MessageBytes remoteUser=MessageBytes.newInstance();
private MessageBytes authType=MessageBytes.newInstance();
-private HashMap attributes=new HashMap();
+private HashMap attributes=new HashMap();
private Response response;
private ActionHook hook;
@@ -377,7 +377,7 @@
attributes.put( name, o );
}
-public HashMap getAttributes() {
+public HashMap getAttributes() {
return attributes;
}
Modified: tomcat/trunk/java/org/apache/coyote/RequestGroupInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/RequestGroupInfo.java?rev=721835&r1=721834&r2=721835&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/RequestGroupInfo.java (original)
+++ tomcat/trunk/java/org/apache/coyote/RequestGroupInfo.java Sun Nov 30
07:59:48 2008
@@ -24,7 +24,7 @@
* collected from each RequestProcessor thread.
*/
public class RequestGroupInfo {
-ArrayList processors=new ArrayList();
+ArrayList processors=new ArrayList();
private long deadMaxTime = 0;
private long deadProcessingTime = 0;
private int deadRequestCount = 0;
@@ -53,7 +53,7 @@
public synchronized long getMaxTime() {
long maxTime=deadMaxTime;
for( int i=0; ihttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=721835&r1=721834&r2=721835&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sun Nov 30
07:59:48 2008
@@ -634,7 +634,7 @@
// Translate the HTTP method code to a String.
byte methodCode = requestHeaderMessage.getByte();
if (methodCode != Constants.SC_M_JK_STORED) {
-String methodName = Constants.methodTransArray[(int)methodCode -
1];
+String methodName = Constants.methodTransArray[methodCode - 1];
request.method().setString(methodName);
}
@@ -894,7 +894,7 @@
int port = 0;
int mult = 1;
for (int i = valueL - 1; i > colonPos; i--) {
-int charValue = HexUtils.DEC[(int) valueB[i + valueS]];
+int charValue = HexUtils.DEC[valueB[i + valueS]];
if (charValue == -1) {
// Invalid character
error = true;
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=721835&r1=721834&r2=721835&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Sun Nov 30
07:59:48 2008
@@ -95
svn commit: r721886 - /tomcat/trunk/conf/catalina.policy
Author: markt Date: Sun Nov 30 12:14:59 2008 New Revision: 721886 URL: http://svn.apache.org/viewvc?rev=721886&view=rev Log: Allow webapps to access org.apache.jasper.el package. I have looked through the package and I believe this change is safe although more eyes would be good. Without this permission, a handful of TCKs fail if tested with a security manager enabled. Modified: tomcat/trunk/conf/catalina.policy Modified: tomcat/trunk/conf/catalina.policy URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=721886&r1=721885&r2=721886&view=diff == --- tomcat/trunk/conf/catalina.policy (original) +++ tomcat/trunk/conf/catalina.policy Sun Nov 30 12:14:59 2008 @@ -14,7 +14,7 @@ // limitations under the License. // -// catalina.corepolicy - Security Policy Permissions for Tomcat @VERSION_MAJOR@ +// catalina.corepolicy - Security Policy Permissions for Tomcat 6 // // This file contains a default set of security policies to be enforced (by the // JVM) when Catalina is executed with the "-security" option. In addition @@ -134,7 +134,8 @@ // Allow read of JAXP compliant XML parser debug permission java.util.PropertyPermission "jaxp.debug", "read"; -// Precompiled JSPs need access to this package. +// Precompiled JSPs need access to these packages. +permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*"; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r721908 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sun Nov 30 14:23:38 2008 New Revision: 721908 URL: http://svn.apache.org/viewvc?rev=721908&view=rev Log: Add some proposals Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721908&r1=721907&r2=721908&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 14:23:38 2008 @@ -1,4 +1,4 @@ - + Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. @@ -271,4 +271,27 @@ +1: fhanik -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42693 + Fix compilation of recursive tags + http://svn.apache.org/viewvc?rev=720046&view=rev + +1: markt + -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42077 + Don't include nulls in iterator. Based on a patch by Mathias Broekelmann + http://svn.apache.org/viewvc?rev=720069&view=rev + +1: markt + -1: +* Use consistent (and more useful) JPDA defaults in catalina.bat + http://svn.apache.org/viewvc?rev=721040&view=rev + +1: markt + -1: + +* Changes required to run with a security manager + http://svn.apache.org/viewvc?rev=721286&view=rev + http://svn.apache.org/viewvc?rev=721704&view=rev + http://svn.apache.org/viewvc?rev=721708&view=rev + http://svn.apache.org/viewvc?rev=721886&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r721914 - in /tomcat/trunk/java/org/apache/el: ./ lang/ parser/ util/
Author: markt
Date: Sun Nov 30 14:32:18 2008
New Revision: 721914
URL: http://svn.apache.org/viewvc?rev=721914&view=rev
Log:
Generics changes for o.a.el
Modified:
tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java
tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java
tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java
tomcat/trunk/java/org/apache/el/parser/AstChoice.java
tomcat/trunk/java/org/apache/el/parser/AstCompositeExpression.java
tomcat/trunk/java/org/apache/el/parser/AstDeferredExpression.java
tomcat/trunk/java/org/apache/el/parser/AstDynamicExpression.java
tomcat/trunk/java/org/apache/el/parser/AstEmpty.java
tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java
tomcat/trunk/java/org/apache/el/parser/AstFunction.java
tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
tomcat/trunk/java/org/apache/el/parser/AstInteger.java
tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
tomcat/trunk/java/org/apache/el/parser/AstNegative.java
tomcat/trunk/java/org/apache/el/parser/AstNot.java
tomcat/trunk/java/org/apache/el/parser/AstNull.java
tomcat/trunk/java/org/apache/el/parser/AstString.java
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/java/org/apache/el/parser/BooleanNode.java
tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
Modified: tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java?rev=721914&r1=721913&r2=721914&view=diff
==
--- tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java Sun Nov 30
14:32:18 2008
@@ -42,7 +42,7 @@
super();
}
-public Object coerceToType(Object obj, Class type) {
+public Object coerceToType(Object obj, Class type) {
return ELSupport.coerceToType(obj, type);
}
@@ -59,7 +59,7 @@
}
public ValueExpression createValueExpression(ELContext context,
-String expression, Class expectedType) {
+String expression, Class expectedType) {
if (expectedType == null) {
throw new NullPointerException(MessageFactory
.get("error.value.expectedType"));
@@ -69,7 +69,7 @@
}
public ValueExpression createValueExpression(Object instance,
-Class expectedType) {
+Class expectedType) {
if (expectedType == null) {
throw new NullPointerException(MessageFactory
.get("error.value.expectedType"));
Modified: tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=721914&r1=721913&r2=721914&view=diff
==
--- tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java Sun Nov 30
14:32:18 2008
@@ -80,7 +80,7 @@
public final class MethodExpressionImpl extends MethodExpression implements
Externalizable {
-private Class expectedType;
+private Class expectedType;
private String expr;
@@ -90,7 +90,7 @@
private transient Node node;
-private Class[] paramTypes;
+private Class[] paramTypes;
/**
*
@@ -108,7 +108,7 @@
*/
public MethodExpressionImpl(String expr, Node node,
FunctionMapper fnMapper, VariableMapper varMapper,
-Class expectedType, Class[] paramTypes) {
+Class expectedType, Class[] paramTypes) {
super();
this.expr = expr;
this.node = node;
Modified: tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java?rev=721914&r1=721913&r2=721914&view=diff
==
--- tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java Sun Nov 30
14:32:18 2008
@@ -33,17 +33,18 @@
public class MethodExpressionLiteral extends MethodExpression implements
Externalizable {
-private Class expectedType;
+private Class expectedType;
private String expr;
-private Class[] p
svn commit: r721916 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/authenticator/FormAuthenticator.java webapps/docs/changelog.xml
Author: markt
Date: Sun Nov 30 14:43:01 2008
New Revision: 721916
URL: http://svn.apache.org/viewvc?rev=721916&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46105
Correctly set URI encoding when replaying a request after FORM auth
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 30 14:43:01 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709816,711126
+/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,711126
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721916&r1=721915&r2=721916&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 14:43:01 2008
@@ -136,12 +136,6 @@
really old to me, so where would this come from ?)
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46105
- Correctly set URI encoding when replaying a request after FORM auth
- http://svn.apache.org/viewvc?rev=709294&view=rev
- +1: markt, fhanik, remm
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46125
Change the exception to cause a 400 status code if the request headers are
too
big
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=721916&r1=721915&r2=721916&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
Sun Nov 30 14:43:01 2008
@@ -426,7 +426,9 @@
}
request.getCoyoteRequest().getParameters().recycle();
-
+request.getCoyoteRequest().getParameters().setQueryStringEncoding(
+request.getConnector().getURIEncoding());
+
if ("POST".equalsIgnoreCase(saved.getMethod())) {
ByteChunk body = saved.getBody();
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=721916&r1=721915&r2=721916&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Nov 30 14:43:01 2008
@@ -180,6 +180,10 @@
The invoker servlet has been deprecated and will be removed in Tomcat 7
onwards. (markt)
+
+46105: Correctly set URI encoding when replaying a request
+after FORM authentication. (markt)
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 46105] URIEncoding doesn't affect after form-authentication redirect
https://issues.apache.org/bugzilla/show_bug.cgi?id=46105 --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-30 14:43:26 PST --- This has been fixed in 6.0.x and will be in 6.0.19 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r721921 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/connector/Response.java java/org/apache/catalina/core/StandardHostValve.java webapps/docs/changelog.xml
Author: markt
Date: Sun Nov 30 14:58:06 2008
New Revision: 721921
URL: http://svn.apache.org/viewvc?rev=721921&view=rev
Log:
Use resetBuffer() as suggested by the spec. Makes custom and standard error
page handling consistent
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 30 14:58:06 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,711126
+/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,711126
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721921&r1=721920&r2=721921&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 14:58:06 2008
@@ -143,15 +143,6 @@
+1: markt, remm (with a trivial improvement)
-1: fhanik - InternalAprInputBuffer/InternalNioInputBuffer should provide
the same behavior (+1 for same changes in all three)
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42409
- Use resetBuffer() as suggested by the spec. Makes custom and standard error
- page handling consistent
- http://svn.apache.org/viewvc?rev=710063&view=rev
- http://svn.apache.org/viewvc?rev=710125&view=rev (to address Remy's comment)
- +1: markt, fhanik, pero
- 0: remm (I think it should now be ok)
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41861
Add major version number to Tomcat service name created by Windows installer
http://svn.apache.org/viewvc?rev=710066&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java?rev=721921&r1=721920&r2=721921&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java Sun
Nov 30 14:58:06 2008
@@ -670,16 +670,38 @@
* been committed
*/
public void resetBuffer() {
+resetBuffer(false);
+}
+
+
+/**
+ * Reset the data buffer and the using Writer/Stream flags but not any
+ * status or header information.
+ *
+ * @param resetWriterStreamFlags true if the internal
+ *usingWriter, usingOutputStream,
+ *isCharacterEncodingSet flags should also be reset
+ *
+ * @exception IllegalStateException if the response has already
+ * been committed
+ */
+public void resetBuffer(boolean resetWriterStreamFlags) {
if (isCommitted())
throw new IllegalStateException
(sm.getString("coyoteResponse.resetBuffer.ise"));
outputBuffer.reset();
+
+if(resetWriterStreamFlags) {
+usingOutputStream = false;
+usingWriter = false;
+isCharacterEncodingSet = false;
+}
}
-
+
/**
* Set the buffer size to be used for this Response.
*
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=721921&r1=721920&r2=721921&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
Sun Nov 30 14:58:06 2008
@@ -368,7 +368,7 @@
if (exception == null)
return (null);
-Class clazz = exception.getClass();
+Class clazz = exception.getClass();
String name = clazz.getName();
while (!Object.class.equals(clazz)) {
ErrorPage errorPage = context.findErrorPage(name);
@@ -405,16 +405,8 @@
request.setPathInfo(errorPage.getLocation());
try {
-
-// Reset the response if possible (else IllegalStateException)
-//hres.reset();
// Reset the response (keeping the real error code and message)
-Integer statusCodeObj =
-
DO NOT REPLY [Bug 42409] Extra response headers not sent when using custom error page
https://issues.apache.org/bugzilla/show_bug.cgi?id=42409 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #25 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-30 14:58:37 PST --- This has been fixed in 6.0.x and will be included in 6.0.19 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r721925 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/ParserController.java webapps/docs/changelog.xml
Author: markt
Date: Sun Nov 30 15:05:51 2008
New Revision: 721925
URL: http://svn.apache.org/viewvc?rev=721925&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46047
Include jar in path for dependencies if they are in a JAR
Patch provided by Cédric Mailleux
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 30 15:05:51 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,711126
+/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721925&r1=721924&r2=721925&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 15:05:51 2008
@@ -158,13 +158,6 @@
Just did that for trunk (r711934; but it contains also other changes).
Caution: at the moment there's no @VERSION@ substitution for
service.bat.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46047
- Include jar in path for dependencies if they are in a JAR
- Patch provided by C�dric Mailleux
- http://svn.apache.org/viewvc?rev=710205&view=rev
- +1: markt, remm, fhanik, pero
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46011
Make Principal accessible (if set) via
Subject.getSubject(AccessController.getContext()) when processing filters.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=721925&r1=721924&r2=721925&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java
Sun Nov 30 15:05:51 2008
@@ -192,7 +192,12 @@
if (parent != null) {
// Included resource, add to dependent list
-compiler.getPageInfo().addDependant(absFileName);
+if (jarFile == null) {
+compiler.getPageInfo().addDependant(absFileName);
+} else {
+compiler.getPageInfo().addDependant(
+jarFileUrl.toExternalForm() +
absFileName.substring(1));
+}
}
if ((isXml && isEncodingSpecifiedInProlog) || isBomPresent) {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=721925&r1=721924&r2=721925&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Nov 30 15:05:51 2008
@@ -262,6 +262,11 @@
precedence over JSP.1.3.10. Therefore EL in attributes must be escaped
twice.
+
+46047: Include the path to the JAR when recording
+dependencies that are located inside a JAR file. Patch provided by
+Cédric Mailleux. (markt)
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 46047] Issue when using include directive inside tag files that are inside jar files
https://issues.apache.org/bugzilla/show_bug.cgi?id=46047 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-30 15:07:07 PST --- This has been fixed for 6.0.x and will be included in 6.0.19 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r721931 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/ApplicationFilterChain.java java/org/apache/catalina/security/SecurityUtil.java webapps/docs/changelog.xml
Author: markt
Date: Sun Nov 30 15:24:38 2008
New Revision: 721931
URL: http://svn.apache.org/viewvc?rev=721931&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46011
Make Principal accessible (if set) via
Subject.getSubject(AccessController.getContext()) when processing filters.
Based on a patch provided by tsveg1
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityUtil.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 30 15:24:38 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126
+/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721931&r1=721930&r2=721931&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 15:24:38 2008
@@ -158,13 +158,6 @@
Just did that for trunk (r711934; but it contains also other changes).
Caution: at the moment there's no @VERSION@ substitution for
service.bat.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46011
- Make Principal accessible (if set) via
- Subject.getSubject(AccessController.getContext()) when processing filters.
- Based on a patch provided by tsveg1
- +1: markt, pero, remm
- -1:
-
* Fix http://svn.apache.org/viewvc?rev=712274&view=rev
ReplicationValve can throw NPE as context doesn't exists! (Config as Engine
level)
+1: pero, fhanik, markt
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=721931&r1=721930&r2=721931&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
Sun Nov 30 15:24:38 2008
@@ -228,7 +228,7 @@
Object[] args = new Object[]{req, res, this};
SecurityUtil.doAsPrivilege
-("doFilter", filter, classType, args);
+("doFilter", filter, classType, args, principal);
args = null;
} else {
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=721931&r1=721930&r2=721931&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityUtil.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityUtil.java
Sun Nov 30 15:24:38 2008
@@ -180,7 +180,7 @@
/**
- * Perform work as a particular Subject. Here the work
+ * Perform work as a particular Subject. Here the work
* will be granted to a null subject.
*
* @param methodName the method to apply the security restriction
@@ -196,6 +196,31 @@
final Class[] targetType,
final Object[] targetArguments)
throws java.lang.Exception{
+
+doAsPrivilege(
+methodName, targetObject, targetType, targetArguments, null);
+}
+
+/**
+ * Perform work as a particular Subject. Here the work
+ * will be granted to a null subject.
+ *
+ * @param methodName the method to apply the security restriction
+ * @param targetObject the Filter on which the method will
+ * be called.
+ * @param targetType Class array used to instanciate a
+ * Method object.
+ * @param targetArguments Object array contains the
+ * runtime parameters instance.
+ * @param principal the Principal to which the security
+ * privilege apply
+ */
+public static void doAsPrivilege(final String methodName,
+ final Filter targetObject,
+ final Clas
DO NOT REPLY [Bug 46011] Cannot access to Principal via Subject.getSubject(AccessController.getContext())
https://issues.apache.org/bugzilla/show_bug.cgi?id=46011 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-30 15:25:36 PST --- This has been applied to 6.0.x and will be in 6.0.19 onwards. Thanks again for the patch. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r721932 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/ssi/SSIServletExternalResolver.java webapps/docs/changelog.xml
Author: markt
Date: Sun Nov 30 15:43:47 2008
New Revision: 721932
URL: http://svn.apache.org/viewvc?rev=721932&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42673
Correctly handle includes with multi-level contexts
Patch provided by Peter Jodeleit
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 30 15:43:47 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600
+/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721932&r1=721931&r2=721932&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 15:43:47 2008
@@ -163,13 +163,6 @@
+1: pero, fhanik, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42673
- Correctly handle includes with multi-level contexts
- Patch provided by Peter Jodeleit
- http://svn.apache.org/viewvc?rev=712461&view=rev
- +1: markt, fhanik, remm, pero
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42747
Ensure context.xml takes effect on first deployment. Make processing of
context.xml consistent.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java?rev=721932&r1=721931&r2=721932&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
Sun Nov 30 15:43:47 2008
@@ -353,14 +353,12 @@
}
-protected String getPathWithoutContext(String servletPath) {
-String retVal = null;
-int secondSlash = servletPath.indexOf('/', 1);
-if (secondSlash >= 0) {
-//cut off context
-retVal = servletPath.substring(secondSlash);
+protected String getPathWithoutContext(final String contextPath,
+final String servletPath) {
+if (servletPath.startsWith(contextPath)) {
+return servletPath.substring(contextPath.length());
}
-return retVal;
+return servletPath;
}
@@ -419,7 +417,8 @@
// ie:
// '/file1.shtml' vs '/appName1/file1.shtml'
if (!isRootContext(normContext)) {
-String noContext = getPathWithoutContext(normalized);
+String noContext = getPathWithoutContext(
+normContext.getContextPath(), normalized);
if (noContext == null) {
throw new IOException(
"Couldn't remove context from path: "
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=721932&r1=721931&r2=721932&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Nov 30 15:43:47 2008
@@ -75,6 +75,10 @@
headers. (markt)
+42673: Fix SSI virtual includes for multi-level contexts.
+Patch provided by Peter Jodeleit. (markt)
+
+
43656: Correct regression in previous fix for this bug.
Patch
provided by Nils Eckert. (markt)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 42673] SSI virtual include broken for context path with slashes
https://issues.apache.org/bugzilla/show_bug.cgi?id=42673 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-11-30 15:44:08 PST --- This has been fixed in 6.0.x and will be included in 6.0.19 onwards. Thanks again for the patch. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r721934 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt build.xml webapps/docs/changelog.xml
Author: markt Date: Sun Nov 30 15:53:03 2008 New Revision: 721934 URL: http://svn.apache.org/viewvc?rev=721934&view=rev Log: Port Costin's build on a 1.6 JDK fix Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 30 15:53:03 2008 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461 +/tomcat/trunk:601180,606992,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721934&r1=721933&r2=721934&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 15:53:03 2008 @@ -172,12 +172,6 @@ -1: -* Add Costin's DBCP check so you can build Tomcat 6 on a 1.6 JDK - http://svn.apache.org/viewvc?view=rev&revision=652744 - http://svn.apache.org/viewvc?view=rev&revision=653247 - +1: markt, fhanik, remm, pero - -1: - * Remove unnecessary commons-logging reference from manifest http://svn.apache.org/viewvc?view=rev&revision=612607 +1: markt, remm, fhanik, pero Modified: tomcat/tc6.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=721934&r1=721933&r2=721934&view=diff == --- tomcat/tc6.0.x/trunk/build.xml (original) +++ tomcat/tc6.0.x/trunk/build.xml Sun Nov 30 15:53:03 2008 @@ -78,6 +78,8 @@ + + @@ -427,8 +429,14 @@ - - + + +WARNING: tomcat-dbcp.jar not included, this build can't be used +in a release. Please run 'ant download' with JDK1.5 if you are +building a tomcat release. + + + @@ -565,7 +573,8 @@ - + @@ -688,7 +697,7 @@ - +
svn commit: r721935 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt res/bootstrap.jar.manifest webapps/docs/changelog.xml
Author: markt Date: Sun Nov 30 15:56:37 2008 New Revision: 721935 URL: http://svn.apache.org/viewvc?rev=721935&view=rev Log: Remove unnecessary commons-logging reference from manifest Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 30 15:56:37 2008 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461 +/tomcat/trunk:601180,606992,612607,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721935&r1=721934&r2=721935&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 15:56:37 2008 @@ -171,12 +171,6 @@ 0: remm (risky, would it be possible to stop backporting risky changes and behavior modifications to 6.0.x ?) -1: - -* Remove unnecessary commons-logging reference from manifest - http://svn.apache.org/viewvc?view=rev&revision=612607 - +1: markt, remm, fhanik, pero - -1: - * Fix broken URL mapping in examples http://svn.apache.org/viewvc?view=rev&revision=630314 +1: markt, remm, fhanik Modified: tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest?rev=721935&r1=721934&r2=721935&view=diff == --- tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest (original) +++ tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest Sun Nov 30 15:56:37 2008 @@ -1,5 +1,5 @@ Manifest-Version: 1.0 Main-Class: org.apache.catalina.startup.Bootstrap -Class-Path: commons-daemon.jar commons-logging-api.jar tomcat-juli.jar tomcat-coyote.jar +Class-Path: commons-daemon.jar tomcat-juli.jar tomcat-coyote.jar Specification-Title: Catalina Specification-Version: 6.0 \ No newline at end of file Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=721935&r1=721934&r2=721935&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Nov 30 15:56:37 2008 @@ -198,6 +198,10 @@ 46105: Correctly set URI encoding when replaying a request after FORM authentication. (markt) + +Remove unnecessary reference to commons-logging from the bootstrap JAR +manifest. (markt) + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r721936 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt webapps/docs/changelog.xml webapps/examples/WEB-INF/web.xml
Author: markt Date: Sun Nov 30 15:58:56 2008 New Revision: 721936 URL: http://svn.apache.org/viewvc?rev=721936&view=rev Log: Fix broken URL mapping in examples Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 30 15:58:56 2008 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461 +/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721936&r1=721935&r2=721936&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 15:58:56 2008 @@ -171,11 +171,6 @@ 0: remm (risky, would it be possible to stop backporting risky changes and behavior modifications to 6.0.x ?) -1: -* Fix broken URL mapping in examples - http://svn.apache.org/viewvc?view=rev&revision=630314 - +1: markt, remm, fhanik - -1: - * Clean up dist.xml http://svn.apache.org/viewvc?rev=718360&view=rev +1: markt, remm, fhanik, pero Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=721936&r1=721935&r2=721936&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Nov 30 15:58:56 2008 @@ -339,6 +339,9 @@ Document the LifecycleListeners. (markt) + +Fix broken URL mapping in the examples. (markt) + Modified: tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml?rev=721936&r1=721935&r2=721936&view=diff == --- tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml Sun Nov 30 15:58:56 2008 @@ -223,12 +223,12 @@ Special property group for JSP Configuration JSP example. JSPConfiguration - /jsp2/misc/config.jsp + /jsp/jsp2/misc/config.jsp true ISO-8859-1 true - /jsp2/misc/prelude.jspf - /jsp2/misc/coda.jspf + /jsp/jsp2/misc/prelude.jspf + /jsp/jsp2/misc/coda.jspf - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r721937 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt dist.xml
Author: markt
Date: Sun Nov 30 16:07:06 2008
New Revision: 721937
URL: http://svn.apache.org/viewvc?rev=721937&view=rev
Log:
Clean up
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 30 16:07:06 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461,718360
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721937&r1=721936&r2=721937&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 16:07:06 2008
@@ -171,11 +171,6 @@
0: remm (risky, would it be possible to stop backporting risky changes and
behavior modifications to 6.0.x ?)
-1:
-* Clean up dist.xml
- http://svn.apache.org/viewvc?rev=718360&view=rev
- +1: markt, remm, fhanik, pero
- -1:
-
* Make sure DIR deployment with context.xml works when configBase does no
exist.
This is required as a result of my previous changes to HostConfig
http://svn.apache.org/viewvc?rev=718436&view=rev
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=721937&r1=721936&r2=721937&view=diff
==
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Sun Nov 30 16:07:06 2008
@@ -79,11 +79,9 @@
-
-
@@ -117,15 +115,6 @@
addWebXmlMappings="true"
outputDir="${jsp-examples.base}/WEB-INF/src" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -341,7 +238,6 @@
-
@@ -519,8 +415,6 @@
-
-
@@ -546,26 +440,6 @@
message="${md5sum.binary-prefix}${final.name}-deployer.zip${line.separator}"
append="true" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -588,7 +462,6 @@
-
@@ -617,7 +490,6 @@
-
@@ -652,33 +524,6 @@
message="${md5sum.binary-prefix}${final.name}-deployer.tar.gz${line.separator}"
append="true" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Tomcat 4 [2008/11/30]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 3839|Opn|Enh|2001-09-26|Problem bookmarking login page| | 4227|Opn|Enh|2001-10-17|Invalid CGI path | | 5329|New|Enh|2001-12-08|NT Service exits startup before Tomcat is finished| | 5795|New|Enh|2002-01-10|Catalina Shutdown relies on localhost causing prob| | 5829|New|Enh|2002-01-13|StandardManager needs to cope with sessions throwi| | 5985|New|Enh|2002-01-23|Tomcat should perform a more restrictive validatio| | 6600|Opn|Enh|2002-02-20|enodeURL adds 'jsession' when 'isRequestedSessionI| | 6614|New|Enh|2002-02-21|Have Bootstrap and StandardClassLoader use the sam| | 6671|New|Enh|2002-02-25|Simple custom tag example uses old declaration sty| | 7043|New|Enh|2002-03-12|database user and password for JDBC Based Store | | 7374|New|Enh|2002-03-22|Apache Tomcat/4.0.1 message on standard output| | 7676|New|Enh|2002-04-02|Allow name property to use match experssions in without className in server.xml produces N| |11129|New|Enh|2002-07-24|New valve for putting the sessionIDs in the reques| |11248|New|Enh|2002-07-29|DefaultServlet doesn't send expires header| |11754|Opn|Enh|2002-08-15|Synchronous shutdown script - shutdown.sh should w| |12069|New|Enh|2002-08-27|Creation of more HttpSession objects for one previ| |12428|Opn|Enh|2002-09-09|request.getUserPrincipal(): Misinterpretation of s| |12658|New|Enh|2002-09-15|a proxy host and port at the element level | |12766|New|Enh|2002-09-18|Tomcat should use tld files in /WEB-INF/ over vers| |13309|Opn|Enh|2002-10-04|Catalina calls System.exit() | |13634|New|Enh|2002-10-15|Allowing system properties to be substituted in co| |13689|Opn|Enh|2002-10-16|Classloader paths for 'Common' classes and librari| |13731|New|Enh|2002-10-17|Final request, response, session and other variabl| |13941|New|Enh|2002-10-24|reload is VERY slow | |13965|New|Enh|2002-10-25|Catalina.sh correction request for Tru64 Unix | |14097|New|Enh|2002-10-30|hardcoded registry value for vm lets tomcat servic| |14416|New|Enh|2002-11-10|blank tag name in TLD cause NullPointerException | |14635|New|Enh|2002-11-18|Should be possible not to have -MM-DD in log f| |14766|New|Enh|2002-11-22|Redirect Vavle| |14993|New|Enh|2002-12-02|Possible obselete synchronized declaration| |15115|New|Enh|2002-12-05|correct docs... XML parser *cannot* be overridden | |15417|Opn|Enh|2002-12-16|Add port for forced compilation of JSP pages | |15688|New|Enh|2002-12-27|full-qualified names instead of imports | |15941|New|Enh|2003-01-10|Expose rootCause exceptions at deeper levels | |16294|New|Enh|2003-01-21|Configurable URL Decoding.| |16357|New|Enh|2003-01-23|"connection timeout reached" | |16531|New|Enh|2003-01-29|Updating already deployed ".war" files in a single| |16579|New|Enh|2003-01-30|documentation page layout/style breaks wrapping to| |16596|New|Enh|2003-01-30|option for disabling log rotation | |17070|New|Enh|2003-02-14|The Catalina Ant tasks do not allow for 'reusable'| |17146|New|Enh|2003-02-18|Simplify build.xml using
Bug report for Tomcat 3 [2008/11/30]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 412|Ver|Nor|2001-01-08|JspC on Windows fails to handle includes in subdir| | 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt| | 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c| | 9737|Ver|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p| |44911|Ass|Nor|2008-04-30|Test again from Chirag| +-+---+---+--+--+ | Total5 bugs | +---+ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Tomcat 5 [2008/11/30]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat| |28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn | |29160|Ver|Enh|2004-05-23|precompile problem: _jspx_meth_* (javax.servlet.js| |29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi| |30241|Ver|Enh|2004-07-21|Enhance build script to use branch argument when c| |33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis| |33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps| |33650|Inf|Enh|2005-02-19|Jasper performance for multiple files processing | |33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na| |34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a| |34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern| |34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that| |35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc| |36133|Inf|Enh|2005-08-10|Support JSS SSL implementation| |36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi| |36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's | |36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re| |36911|Opn|Min|2005-10-04|Make fails while building jsvc on mac os x, multip| |36922|Inf|Enh|2005-10-04|setup.sh file mis-advertised and missing | |36923|New|Nor|2005-10-05|Deactivated EL expressions are not parsed for jsp | |37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token| |37084|Opn|Reg|2005-10-14|JspC from ant fails on JSPs that use custom taglib| |37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis| |37449|Opn|Enh|2005-11-10|Two UserDatabaseRealm break manager user | |37458|Opn|Nor|2005-11-10|Datarace on org.apache.catalina.loader.WebappClass| |37485|Inf|Enh|2005-11-14|I'd like to run init SQL after JDBC Connection cre| |37498|Inf|Nor|2005-11-14|[PATCH] NPE in org.apache.catalina.core.ContainerB| |37515|Inf|Nor|2005-11-15|smap not generated by JspC when used from Ant for | |37627|Opn|Nor|2005-11-24|Slow and incomplete dynamic content generation aft| |37785|Inf|Nor|2005-12-05|Changing startup type via Tomcat Monitor does not | |37794|Opn|Nor|2005-12-05|getParameter() fails on POST with transfer-encodin| |37797|Inf|Maj|2005-12-05|Configure Tomcat utility truncates classpath to 96| |37847|Ass|Enh|2005-12-09|Allow User To Optionally Specify Catalina Output F| |37869|Opn|Nor|2005-12-12|Cannot obtain client certificate with SSL / client| |37918|Inf|Nor|2005-12-15|EL cannot find valid getter from object when using| |37984|New|Nor|2005-12-21|JNDIRealm.java not able to handle MD5 password| |38046|Ass|Reg|2005-12-27|apache-tomcat-5.5.14-deployer doesn't work (Illega| |38197|Opn|Maj|2006-01-09|taglib pool bug when tag is used with jsp:attribut| |38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations | |38217|Ver|Enh|2006-01-10|mention that private key password and keystore pas| |38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti| |38352|Inf|Nor|2006-01-22|Additional Entries for Default catalina.policy fil| |38360|Inf|Enh|2006-01-24|Domain for session cookies| |38427|Inf|Nor|2006-01-27|ServletContextListener Notified Multiple Times Whe| |38483|New|Nor|2006-02-01|access log valve uses simpledateformat in tread-un| |38484|New|Min|2006-02-01|webapps Admin: Invalid path /login was requested | |38516|Inf|Nor|2006-02-05|Configuration Manager loses "Log On" settings | |38546|Inf|Enh|2006-02-07|Google bot sends invalid If-Modifed-Since Header, | |38553|Inf|Nor|2006-02-07|Wrong HTTP code for failed CLIENT-CERT authenticat| |38570|Inf|Nor|2006-02-08|if docBase path contains "webapps", a backslash is| |38577|Inf|Enh|2006-02-08|Enhance logging of security failures | |38630|
Bug report for Watchdog [2008/11/30]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 278|Unc|Nor|2000-12-04|Bug in GetParameterValuesTestServlet.java file Bug| | 279|Unc|Nor|2000-12-04|Logical Error in GetParameterValuesTestServlet Bug| | 469|Unc|Nor|2001-01-17|in example-taglib.tld "urn" should be "uri" BugRat| | 470|Unc|Nor|2001-01-17|FAIL positiveForward.jsp and positiveInclude.jsp B| | 9634|New|Enh|2002-06-05|No tests exist for ServletContext.getResourcePaths| |10703|New|Enh|2002-07-11|Need to test getRequestURI after RequestDispatcher| |11336|New|Enh|2002-07-31|Test wrapped path methods with RD.foward()| |11663|New|Maj|2002-08-13|JSP precompile tests rely on Jasper specific behav| |11664|New|Maj|2002-08-13|A sweep is needed of all Watchdog 4.0 tag librarie| |11665|New|Maj|2002-08-13|ServletToJSPErrorPageTest and ServletToServletErro| |11666|New|Maj|2002-08-13|SetBufferSize_1TestServlet is invalid.| |14004|New|Maj|2002-10-28|Incorrent behaviour of all attribute-related lifec| |15504|New|Nor|2002-12-18|JSP positiveGetValues test relies on order preserv| |24649|New|Nor|2003-11-12|getRemoteHost fails when agent has uppercase chara| |29398|New|Nor|2004-06-04|Update site and note current status | +-+---+---+--+--+ | Total 15 bugs | +---+ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
