Re: [VOTE] Release build 6.0.18

[Rainer Jung]

Remy Maucherat wrote:

The candidates binaries are available here:
http://people.apache.org/~remm/tomcat-6/v6.0.18/

According to the release process, the 6.0.18 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[X] Stable

Rémy


Regards,

Rainer

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] bayeux inclusion

[Rainer Jung]

Filip Hanik - Dev Lists wrote:

As promised, here is the vote for inclusion of the bayeux toolkit

https://issues.apache.org/bugzilla/show_bug.cgi?id=45413

I think this toolkit should

[X] +1 include it as an independent component, I'm interested
[ ]  0 sounds interesting
[ ] -1 throw it away


Regards,

Rainer

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r680947 - in /tomcat: connectors/trunk/coyote/src/java/org/apache/coyote/ connectors/trunk/http11/src/java/org/apache/coyote/http11/ connectors/trunk/jk/java/org/apache/coyote/ajp/ connect

[markt]

Author: markt
Date: Wed Jul 30 02:26:27 2008
New Revision: 680947

URL: http://svn.apache.org/viewvc?rev=680947&view=rev
Log:
Port r673834 to 5.5.x
Make filtering of \r and \n in headers consistent for all connectors.
Make handling of 404s consistent across components.
Provide option to include custom status message in headers. SRV.5.3 suggests 
custom messages are intended for the body of the response, not the status line.

Modified:
tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/Constants.java

tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java

tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/connectors/trunk/jk/java/org/apache/jk/common/JkInputStream.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
tomcat/container/tc5.5.x/webapps/docs/config/systemprops.xml

Modified: 
tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/Constants.java?rev=680947&r1=680946&r2=680947&view=diff
==
--- tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/Constants.java 
(original)
+++ tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/Constants.java 
Wed Jul 30 02:26:27 2008
@@ -53,4 +53,12 @@
 public static final int STAGE_ENDED = 7;
 
 
+/**
+ * If true, custom HTTP status messages will be used in headers.
+ */
+public static final boolean USE_CUSTOM_STATUS_MSG_IN_HEADER =
+Boolean.valueOf(System.getProperty(
+"org.apache.coyote.USE_CUSTOM_STATUS_MSG_IN_HEADER",
+"false")).booleanValue();
+
 }

Modified: 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=680947&r1=680946&r2=680947&view=diff
==
--- 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
 (original)
+++ 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
 Wed Jul 30 02:26:27 2008
@@ -429,11 +429,14 @@
 buf[pos++] = Constants.SP;
 
 // Write message
-String message = response.getMessage();
+String message = null;
+if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+message = response.getMessage();
+} 
 if (message == null) {
 write(HttpMessages.getMessage(status));
 } else {
-write(message);
+write(message.replace('\n', ' ').replace('\r', ' '));
 }
 
 // End the response status line

Modified: 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=680947&r1=680946&r2=680947&view=diff
==
--- 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
 (original)
+++ 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
 Wed Jul 30 02:26:27 2008
@@ -448,11 +448,14 @@
 buf[pos++] = Constants.SP;
 
 // Write message
-String message = response.getMessage();
+String message = null;
+if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+message = response.getMessage();
+} 
 if (message == null) {
 write(getMessage(status));
 } else {
-write(message);
+write(message.replace('\n', ' ').replace('\r', ' '));
 }
 
 // End the response status line

Modified: 
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=680947&r1=680946&r2=680947&view=diff
==
--- tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java 
(original)
+++ tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java 
Wed Jul 30 02:26:27 2008
@@ -942,7 +942,10 @@
 
 // HTTP header contents
 responseHeaderMessage.appendInt(response.getStatus());
-String message = response.getMessage();
+String message = null;
+if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+message 

svn commit: r680948 - /tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java

[markt]

Author: markt
Date: Wed Jul 30 02:31:54 2008
New Revision: 680948

URL: http://svn.apache.org/viewvc?rev=680948&view=rev
Log:
Port r673834 to 4.1.x (Note most was covered by r680947 since 4.1.x and 5.5.x 
share the same connector code)
Make filtering of \r and \n in headers consistent for all connectors.
Make handling of 404s consistent across components.
Provide option to include custom status message in headers. SRV.5.3 suggests 
custom messages are intended for the body of the response, not the status line.

Modified:

tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java

Modified: 
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java?rev=680948&r1=680947&r2=680948&view=diff
==
--- 
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
 (original)
+++ 
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
 Wed Jul 30 02:31:54 2008
@@ -113,7 +113,7 @@
 relativeURI.equals("/WEB-INF") ||
 relativeURI.startsWith("/META-INF/") ||
 relativeURI.startsWith("/WEB-INF/")) {
-notFound(requestURI, (HttpServletResponse) response.getResponse());
+notFound((HttpServletResponse) response.getResponse());
 return;
 }
 
@@ -129,7 +129,7 @@
 return;
 }
 if (wrapper == null) {
-notFound(requestURI, (HttpServletResponse) response.getResponse());
+notFound((HttpServletResponse) response.getResponse());
 return;
 }
 
@@ -171,13 +171,12 @@
  * application, but currently that code runs at the wrapper level rather
  * than the context level.
  *
- * @param requestURI The request URI for the requested resource
  * @param response The response we are creating
  */
-private void notFound(String requestURI, HttpServletResponse response) {
+private void notFound(HttpServletResponse response) {
 
 try {
-response.sendError(HttpServletResponse.SC_NOT_FOUND, requestURI);
+response.sendError(HttpServletResponse.SC_NOT_FOUND);
 } catch (IllegalStateException e) {
 ;
 } catch (IOException e) {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r680949 - /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java

[markt]

Author: markt
Date: Wed Jul 30 02:34:21 2008
New Revision: 680949

URL: http://svn.apache.org/viewvc?rev=680949&view=rev
Log:
Port r673820 to 5.5.x
Extract the query string before we try to normalise the URI

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java?rev=680949&r1=680948&r2=680949&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
 Wed Jul 30 02:34:21 2008
@@ -379,10 +379,21 @@
 throw new IllegalArgumentException
 (sm.getString
  ("applicationContext.requestDispatcher.iae", path));
+
+// Get query string
+String queryString = null;
+int pos = path.indexOf('?');
+if (pos >= 0) {
+queryString = path.substring(pos + 1);
+path = path.substring(0, pos); 
+}
+ 
 path = normalize(path);
 if (path == null)
 return (null);
 
+pos = path.length();
+
 // Retrieve the thread local URI
 MessageBytes uriMB = (MessageBytes) localUriMB.get();
 if (uriMB == null) {
@@ -394,15 +405,6 @@
 uriMB.recycle();
 }
 
-// Get query string
-String queryString = null;
-int pos = path.indexOf('?');
-if (pos >= 0) {
-queryString = path.substring(pos + 1);
-} else {
-pos = path.length();
-}
- 
 // Retrieve the thread local mapping data
 MappingData mappingData = (MappingData) localMappingData.get();
 if (mappingData == null) {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 45500] New: Error wjile implement HTTPS on IBM AIX Box - SunX509 KeyManagerFactory not available

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=45500

   Summary: Error wjile implement HTTPS on IBM AIX Box - SunX509
KeyManagerFactory not available
   Product: Tomcat 5
   Version: Unknown
  Platform: Other
OS/Version: AIX
Status: NEW
  Keywords: ErrorMessage
  Severity: critical
  Priority: P1
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


I am trying to implement HTTPS for Tomcat5 server in IBM AIX Version 5.3 (AIX
Version 5.3 TL07 SP04 (64 bit)).
JVM - IBM Java 5.0
Tomcat Version - 5.2





I am getting the following error 

Jul 30, 2008 2:05:42 AM org.apache.coyote.http11.Http11BaseProtocol start
SEVERE: Error starting endpoint
java.io.IOException: SunX509 KeyManagerFactory not available
at
org.apache.tomcat.util.net.jsse.JSSE14SocketFactory.init(JSSE14SocketFactory.java:126)
at
org.apache.tomcat.util.net.jsse.JSSESocketFactory.createSocket(JSSESocketFactory.java:89)
at
org.apache.tomcat.util.net.PoolTcpEndpoint.initEndpoint(PoolTcpEndpoint.java:293)
at
org.apache.tomcat.util.net.PoolTcpEndpoint.startEndpoint(PoolTcpEndpoint.java:313)
at
org.apache.coyote.http11.Http11BaseProtocol.start(Http11BaseProtocol.java:151)
at
org.apache.coyote.http11.Http11Protocol.start(Http11Protocol.java:76)
at org.apache.catalina.connector.Connector.start(Connector.java:1090)
at
org.apache.catalina.core.StandardService.start(StandardService.java:457)
at
org.apache.catalina.core.StandardServer.start(StandardServer.java:700)
at org.apache.catalina.startup.Catalina.start(Catalina.java:552)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:79)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:618)
at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:295)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:433)
Jul 30, 2008 2:05:42 AM org.apache.catalina.startup.Catalina start
SEVERE: Catalina.start: 
LifecycleException:  service.getName(): "Catalina";  Protocol handler start
failed: java.io.IOException: SunX509 KeyManagerFactory not available
at org.apache.catalina.connector.Connector.start(Connector.java:1097)
at
org.apache.catalina.core.StandardService.start(StandardService.java:457)
at
org.apache.catalina.core.StandardServer.start(StandardServer.java:700)
at org.apache.catalina.startup.Catalina.start(Catalina.java:552)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:79)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:618)
at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:295)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:433)
Jul 30, 2008 2:05:42 AM org.apache.catalina.startup.Catalina start




can any one please resolve this


-- 
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: r680950 - /tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java

[markt]

Author: markt
Date: Wed Jul 30 02:35:27 2008
New Revision: 680950

URL: http://svn.apache.org/viewvc?rev=680950&view=rev
Log:
Port r673820 to 4.1.x
Extract the query string before we try to normalise the URI

Modified:

tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java

Modified: 
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java?rev=680950&r1=680949&r2=680950&view=diff
==
--- 
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
 (original)
+++ 
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
 Wed Jul 30 02:35:27 2008
@@ -581,6 +581,15 @@
 if (!path.startsWith("/"))
 throw new IllegalArgumentException
   (sm.getString("applicationContext.requestDispatcher.iae", path));
+
+// Get query string
+String queryString = null;
+int question = path.indexOf('?');
+if (question >= 0) {
+queryString = path.substring(question + 1);
+path = path.substring(0, question);
+}
+
 path = normalize(path);
 if (path == null)
 return (null);
@@ -589,24 +598,17 @@
 String contextPath = context.getPath();
 if (contextPath == null)
 contextPath = "";
-String relativeURI = path;
-String queryString = null;
-int question = path.indexOf('?');
-if (question >= 0) {
-relativeURI = path.substring(0, question);
-queryString = path.substring(question + 1);
-}
 if( System.getSecurityManager() != null ) {
 PrivilegedGetRequestDispatcher dp =
 new PrivilegedGetRequestDispatcher(contextPath,
-relativeURI,queryString);
+path,queryString);
 return (RequestDispatcher)AccessController.doPrivileged(dp);
 }
 
 // The remaining code is duplicated in PrivilegedGetRequestDispatcher,
 // we need to make sure they stay in sync
 HttpRequest request = new MappingRequest
-(context.getPath(), contextPath + relativeURI, queryString);
+(context.getPath(), contextPath + path, queryString);
 /*
 request.setContext(context);
 request.setContextPath(context.getPath());



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 45500] Error wjile implement HTTPS on IBM AIX Box - SunX509 KeyManagerFactory not available

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=45500


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Comment #1 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 02:41:38 PST ---
This is covered in the connector docs. See
http://tomcat.apache.org/tomcat-5.5-doc/config/http.html


-- 
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]

Re: [VOTE] Release build 6.0.18

[Mark Thomas]

Remy Maucherat wrote:

The candidates binaries are available here:
http://people.apache.org/~remm/tomcat-6/v6.0.18/

According to the release process, the 6.0.18 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[X] Stable


Mark


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] Release build 6.0.18

[Remy Maucherat]

On Wed, 2008-07-23 at 14:23 +0200, Remy Maucherat wrote:
> The candidates binaries are available here:
> http://people.apache.org/~remm/tomcat-6/v6.0.18/
> 
> According to the release process, the 6.0.18 tag is:
> [ ] Broken
> [ ] Alpha
> [ ] Beta
> [ ] Stable

So it would seem the vote passed. I can plan to announce the release
later today.

Rémy



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r681028 - /tomcat/current-svn15/tc5.5.x/

[markt]

Author: markt
Date: Wed Jul 30 06:49:49 2008
New Revision: 681028

URL: http://svn.apache.org/viewvc?rev=681028&view=rev
Log:
Update the ignore list

Modified:
tomcat/current-svn15/tc5.5.x/   (props changed)

Propchange: tomcat/current-svn15/tc5.5.x/
--
--- svn:ignore (added)
+++ svn:ignore Wed Jul 30 06:49:49 2008
@@ -0,0 +1,3 @@
+bin
+.classpath
+.project



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r681029 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Jul 30 06:51:25 2008
New Revision: 681029

URL: http://svn.apache.org/viewvc?rev=681029&view=rev
Log:
Port r678137 from 6.0.x
Additional normalization check

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java?rev=681029&r1=681028&r2=681029&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
 Wed Jul 30 06:51:25 2008
@@ -263,6 +263,12 @@
 }
 // Character decoding
 convertURI(decodedURI, request);
+// Check that the URI is still normalized
+if (!checkNormalize(req.decodedURI())) {
+res.setStatus(400);
+res.setMessage("Invalid URI character encoding");
+return false;
+}
 } else {
 // The URL is chars or String, and has been sent using an in-memory
 // protocol handler, we have to assume the URL has been properly
@@ -632,6 +638,67 @@
 }
 
 
+/**
+ * Check that the URI is normalized following character decoding.
+ * 
+ * This method checks for "\", 0, "//", "/./" and "/../". This method will
+ * return false if sequences that are supposed to be normalized are still 
+ * present in the URI.
+ * 
+ * @param uriMB URI to be checked (should be chars)
+ */
+public static boolean checkNormalize(MessageBytes uriMB) {
+
+CharChunk uriCC = uriMB.getCharChunk();
+char[] c = uriCC.getChars();
+int start = uriCC.getStart();
+int end = uriCC.getEnd();
+
+int pos = 0;
+
+// Check for '\' and 0
+for (pos = start; pos < end; pos++) {
+if (c[pos] == '\\') {
+return false;
+}
+if (c[pos] == 0) {
+return false;
+}
+}
+
+// Check for "//"
+for (pos = start; pos < (end - 1); pos++) {
+if (c[pos] == '/') {
+if (c[pos + 1] == '/') {
+return false;
+}
+}
+}
+
+// Check for ending with "/." or "/.."
+if (((end - start) >= 2) && (c[end - 1] == '.')) {
+if ((c[end - 2] == '/') 
+|| ((c[end - 2] == '.') 
+&& (c[end - 3] == '/'))) {
+return false;
+}
+}
+
+// Check for "/./"
+if (uriCC.indexOf("/./", 0, 3, 0) >= 0) {
+return false;
+}
+
+// Check for "/../"
+if (uriCC.indexOf("/../", 0, 4, 0) >= 0) {
+return false;
+}
+
+return true;
+
+}
+
+
 // -- Protected Methods
 
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=681029&r1=681028&r2=681029&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 06:51:25 2008
@@ -40,6 +40,13 @@
   
 
   
+  
+
+  
+Add additional checks for URI normalization. (remm)
+  
+
+  
   
 
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r681040 - /tomcat/current-svn15/tc4.1.x/

[markt]

Author: markt
Date: Wed Jul 30 06:58:24 2008
New Revision: 681040

URL: http://svn.apache.org/viewvc?rev=681040&view=rev
Log:
Update the ignore list

Modified:
tomcat/current-svn15/tc4.1.x/   (props changed)

Propchange: tomcat/current-svn15/tc4.1.x/
--
--- svn:ignore (added)
+++ svn:ignore Wed Jul 30 06:58:24 2008
@@ -0,0 +1,2 @@
+.*
+output



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] Release build 6.0.18

[Jim Jagielski]

On Jul 30, 2008, at 5:43 AM, Mark Thomas wrote:


Remy Maucherat wrote:

The candidates binaries are available here:
http://people.apache.org/~remm/tomcat-6/v6.0.18/
According to the release process, the 6.0.18 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[X] Stable




Ditto


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] bayeux inclusion

[Jim Jagielski]

On Jul 26, 2008, at 7:26 PM, Mark Thomas wrote:


Costin Manolache wrote:

On Tue, Jul 22, 2008 at 10:17 AM, Filip Hanik - Dev Lists <
[EMAIL PROTECTED]> wrote:

As promised, here is the vote for inclusion of the bayeux toolkit

https://issues.apache.org/bugzilla/show_bug.cgi?id=45413

I think this toolkit should

[X] +1 include it as an independent component, I'm interested
[ ]  0 sounds interesting
[ ] -1 throw it away

I plan to put it under

svn.apache.org/repos/asf/tomcat/cometd/bayeux

thinking that there may be more cometd components in the future
I don't know about this - don't you think we have too many svn  
trees ? Is

there any reason for this ?
I wouldn't mind having it in the trunk.  Not in the java/ dir, but  
maybe

some extensions/bayeux ?


I agree we have (in the past) had too many svn trees. I would much  
prefer that this went into trunk/java. As long as it is in it's own  
package, it is easy to include/exclude from the main distro.




+1


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r681064 - in /tomcat/site/trunk: docs/download-60.html docs/index.html xdocs/download-60.xml xdocs/index.xml

[remm]

Author: remm
Date: Wed Jul 30 07:24:09 2008
New Revision: 681064

URL: http://svn.apache.org/viewvc?rev=681064&view=rev
Log:
- Update for TC 6.0.18.

Modified:
tomcat/site/trunk/docs/download-60.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/xdocs/download-60.xml
tomcat/site/trunk/xdocs/index.xml

Modified: tomcat/site/trunk/docs/download-60.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=681064&r1=681063&r2=681064&view=diff
==
--- tomcat/site/trunk/docs/download-60.html (original)
+++ tomcat/site/trunk/docs/download-60.html Wed Jul 30 07:24:09 2008
@@ -3,17 +3,17 @@
 
 
 Apache Tomcat - Apache Tomcat 6 Downloads
-
-
+
+
 
-
-
+
+
 
 
 
 
 http://tomcat.apache.org/";>
-
+
 
 
 
@@ -24,28 +24,28 @@
 
 
 http://www.apache.org/";>
-http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache 
Logo" border="0"/>
+http://www.apache.org/images/asf-logo.gif"; />
 
 
 
 
 
-http://www.google.com/search"; method="get">
-
-
-
+http://www.google.com/search";>
+
+
+
 
 
-
+
 
 
 
-
+
 
 
 
 
-
+
 
 Apache Tomcat
 
@@ -174,11 +174,11 @@
 
 
 
-
-
+
+
 
 
-
+
 
 Tomcat 6 Downloads
 
@@ -199,14 +199,14 @@
 
 
 
-
+
 
 
 
-
+
 
 
-
+
 
 Quick Navigation
 
@@ -218,7 +218,7 @@
 
 
 http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS |
-6.0.16 |
+6.0.18 |
 http://archive.apache.org/dist/tomcat/tomcat-6";>Archives
   
 
@@ -226,14 +226,14 @@
 
 
 
-
+
 
 
 
-
+
 
 
-
+
 
 Release Integrity
 
@@ -257,14 +257,14 @@
 
 
 
-
+
 
 
 
-
+
 
 
-
+
 
 Mirrors
 
@@ -280,8 +280,8 @@
encounter a problem with this mirror, please select another
mirror.  If all mirrors are failing, there are backup
mirrors (at the end of the mirrors list) that should be
-   available.[if-any logo]
-
+   available.[if-any logo]
+
 [end]
 
 
@@ -296,7 +296,7 @@
[for backup][backup] (backup)[end]
[end]
  
-
+
 
 
   
@@ -307,16 +307,16 @@
 
 
 
-
+
 
 
 
-
+
 
 
-
-
-6.0.16
+
+
+6.0.18
 
 
 
@@ -326,15 +326,15 @@
 
 
   
-  Please see the 
-  README
+  Please see the 
+  README
   file for packaging information.  It explains what every distribution 
contains.
   
 
-  
+  
 
 
-
+
 
 Binary Distributions
 
@@ -348,33 +348,33 @@
 Core:
   
   
-zip 
-(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.16/bin/apache-tomcat-6.0.16.zip.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-6/v6.0.16/bin/apache-tomcat-6.0.16.zip.md5";>md5)
+zip 
+(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.zip.asc";>pgp,
 
+http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.zip.md5";>md5)
   
   
-tar.gz
 
-(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.16/bin/apache-tomcat-6.0.16.tar.gz.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-6/v6.0.16/bin/apache-tomcat-6.0.16.tar.gz.md5";>md5)
+tar.gz
 
+(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.tar.gz.asc";>pgp,
 
+http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.tar.gz.md5";>md5)
   
   
-Windows 
Service Installer 
-(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.16/bin/apache-tomcat-6.0.16.exe.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-6/v6.0.16/bin/apache-tomcat-6.0.16.exe.md5";>md5)
+Windows 
Service Installer 
+(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.exe.asc";>pgp,
 
+http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.exe.md5";>md5)
   
   
 
 Deployer:
   
   
-zip
 
-(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.16/bin/apache-tomcat-6.0.16-deployer.zip.asc";>pgp,
  
-http://www.apache.org/dist/tomcat/tomcat-6/v6.0.16/bin/apache-tomcat-6.0.16-deployer.zip.md5";>md5)
+zip
 
+(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18-deployer.zip.asc";>pgp,
  
+http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18-deployer.zip.md5";>md5)
   
   
-tar.gz
 
-(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.16/bin/apache-tomcat-6.0.16-deployer.tar.gz.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-6/v6.0.16/bin/apache-tomcat-6.0.16-deployer.tar.gz.md5";>md5)
+tar.gz
 
+(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18-deployer.tar.gz.asc";>pgp,
 
+http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apach

svn commit: r681065 - in /tomcat: connectors/trunk/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt

[markt]

Author: markt
Date: Wed Jul 30 07:26:41 2008
New Revision: 681065

URL: http://svn.apache.org/viewvc?rev=681065&view=rev
Log:
Port r678137 from 6.0.x
Additional normalization check

Modified:

tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt

Modified: 
tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java?rev=681065&r1=681064&r2=681065&view=diff
==
--- 
tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
 (original)
+++ 
tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
 Wed Jul 30 07:26:41 2008
@@ -264,6 +264,13 @@
 }
 }
 
+// Check that the URI is still normalized
+if (!checkNormalize(req.decodedURI())) {
+res.setStatus(400);
+res.setMessage("Invalid URI character encoding");
+throw new IOException("Invalid URI character encoding");
+}
+
 // Parse cookies
 parseCookies(req, request);
 
@@ -675,6 +682,67 @@
 }
 
 
+/**
+ * Check that the URI is normalized following character decoding.
+ * 
+ * This method checks for "\", 0, "//", "/./" and "/../". This method will
+ * return false if sequences that are supposed to be normalized are still 
+ * present in the URI.
+ * 
+ * @param uriMB URI to be checked (should be chars)
+ */
+public static boolean checkNormalize(MessageBytes uriMB) {
+
+CharChunk uriCC = uriMB.getCharChunk();
+char[] c = uriCC.getChars();
+int start = uriCC.getStart();
+int end = uriCC.getEnd();
+
+int pos = 0;
+
+// Check for '\' and 0
+for (pos = start; pos < end; pos++) {
+if (c[pos] == '\\') {
+return false;
+}
+if (c[pos] == 0) {
+return false;
+}
+}
+
+// Check for "//"
+for (pos = start; pos < (end - 1); pos++) {
+if (c[pos] == '/') {
+if (c[pos + 1] == '/') {
+return false;
+}
+}
+}
+
+// Check for ending with "/." or "/.."
+if (((end - start) >= 2) && (c[end - 1] == '.')) {
+if ((c[end - 2] == '/') 
+|| ((c[end - 2] == '.') 
+&& (c[end - 3] == '/'))) {
+return false;
+}
+}
+
+// Check for "/./"
+if (uriCC.indexOf("/./", 0, 3, 0) >= 0) {
+return false;
+}
+
+// Check for "/../"
+if (uriCC.indexOf("/../", 0, 4, 0) >= 0) {
+return false;
+}
+
+return true;
+
+}
+
+
 // -- Protected Methods
 
 

Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=681065&r1=681064&r2=681065&view=diff
==
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Wed Jul 30 07:26:41 
2008
@@ -1993,6 +1993,9 @@
  Fix security issues CVE-2007-3385 and CVE-2007-5333 in cookie handling
  that allowed session hi-jacking to occur.
 
+[4.1.38] CoyoteConnector
+ Add additional checks for URI normalization.
+
 
 
 Jasper Bug Fixes:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Question about patch in Bugzilla 44282

[Yoav Shapira]

http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?r1=603340&r2=616953&pathrev=616953

Should the actual privileges work be inside the log.isTraceEnabled
check?  Don't we want to do the work independent of the log level?

-- 
Thanks,

Yoav

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 45498] j_security_check redirects to favicon.ico

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=45498


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME




--- Comment #1 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 08:19:57 PST ---
This works for me on a clean build of the latest 5.5.x source and there haven't
been any relevant changes that I am aware of in this area for quite some time.

Looking at the headers for the complete login process will probably be quite
informative. If you need help figuring out what is happening, please ask on the
users list.


-- 
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: r681087 - /tomcat/current/tc5.5.x/STATUS.txt

[yoavs]

Author: yoavs
Date: Wed Jul 30 08:46:57 2008
New Revision: 681087

URL: http://svn.apache.org/viewvc?rev=681087&view=rev
Log:
Reviewed Tomcat 5.5 patches and added my comments in status.txt

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681087&r1=681086&r2=681087&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 08:46:57 2008
@@ -30,21 +30,22 @@
   http://svn.apache.org/viewvc?rev=616953&view=rev (less the generics stuff)
   +1: markt, fhanik
   -1:
+  0: yoavs (because I think there might be a bug when we're only diong the 
work if log.isTraceEnabled)
 
 * Fix ArrayIndexOutOfBoundsException when empty URL is requested
   http://svn.apache.org/viewvc?rev=627883&view=rev
-  +1: markt, fhanik
+  +1: markt, fhanik, yoavs
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44562
   http://svn.apache.org/viewvc?rev=635294&view=rev (prior code clean up)
   http://svn.apache.org/viewvc?rev=635297&view=rev (the actual fix)
-  +1: markt, fhanik
+  +1: markt, fhanik, yoavs
   -1:
 
 * Fix docs re use of maxActive
   http://svn.apache.org/viewvc?rev=639842&view=rev
-  +1: rjung, markt, fhanik
+  +1: rjung, markt, fhanik, yoavs
   -1:
 
 * Port fix for regression in 5.5.26 (and 4.1.37) that limited uploads to 8k
@@ -56,18 +57,18 @@
 * Fix ServletInputStream still readable when closed
   https://issues.apache.org/bugzilla/show_bug.cgi?id=44673
   http://svn.apache.org/viewvc?rev=641076&view=rev
-  +1: markt, fhanik
+  +1: markt, fhanik, yoavs
   -1:
 
 * Fix CGI servlet for vista
   http://people.apache.org/~markt/patches/2008-03-28-cgi-env.patch
-  +1: markt, fhanik
+  +1: markt, fhanik, yoavs
   -1:
 
 * No roles (deny all) trumps no auth-constraint (allow all)
   https://issues.apache.org/bugzilla/show_bug.cgi?id=44529
   http://svn.apache.org/viewvc?rev=642542&view=rev
-  +1: markt, fhanik
+  +1: markt, fhanik, yoavs
   -1:
 
 * Fix reading of multi-byte request data
@@ -83,7 +84,7 @@
 * Document missing secret attributes
   https://issues.apache.org/bugzilla/show_bug.cgi?id=44715
   http://svn.apache.org/viewvc?rev=643497&view=rev
-  +1: mark, fhanik
+  +1: mark, fhanik,yoavs
   -1:
 
 * Final fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494
@@ -93,23 +94,23 @@
   http://svn.apache.org/viewvc?rev=645719&view=rev (Remy's resizing fix)
   http://svn.apache.org/viewvc?rev=645722&view=rev (mark/reset fix)
   +1: markt
-  -1: fhanik - trunk patches wont work in 5.5, rainer has a backport, I'll 
review those
+  -1: fhanik - trunk patches won't work in 5.5, rainer has a backport, I'll 
review those
 
 * Better handling of lack of permission for context specific logging
   http://svn.apache.org/viewvc?rev=646543&view=rev
   +1: markt
-   0: fhanik - silently swallow an error, and default to the default config 
file
+   0: fhanik - silently swallow an error, and default to the default config 
file, yoavs: don't like silent swallowing
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45293
   Additional permission required to read JDK logging config
   http://svn.apache.org/viewvc?rev=646550&view=rev
-  +1: markt, fhanik
+  +1: markt, fhanik, yoavs
   -1:
 
 * Change of jar name for policy file
   http://people.apache.org/~markt/patches/2008-04-09-policy.patch
-  +1: markt, fhanik
+  +1: markt, fhanik, yoavs
   -1:
 
 * Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494
@@ -129,45 +130,45 @@
   Create digesters and parsers earlier so we aren't using the webapp class
   loader when we create them.
   http://svn.apache.org/viewvc?rev=649974&view=rev
-  +1: markt, fhanik
+  +1: markt, fhanik, yoavs
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31257
   Quote endorsed dirs if they contain a space
   http://svn.apache.org/viewvc?rev=649993&view=rev
-  +1: markt, fhanik
+  +1: markt, fhanik, yoavs
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43578
   http://svn.apache.org/viewvc?rev=651713&view=rev
   Tomcat doesn't start if installation path contains a space
   Patch provided by Ray Sauers
-  +1: markt
+  +1: markt, yoavs
   -1: 
 
 * Log errors for AJP signoffs at DEBUG level, since it is harmless if mod_jk 
has hung up the phone.
   http://svn.apache.org/viewvc?rev=651792&view=rev
-  +1: billbarker, markt, fhanik
+  +1: billbarker, markt, fhanik, yoavs
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44877
   Prevent collisions in tag pool names
   http://svn.apache.org/viewvc?rev=651984&view=rev
-  +1: markt, fhanik
+  +1: markt, fhanik, yoavs
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
-  No way to turn off compression for some miime-types
+  No way to turn off compression for some MIME types
   Based on a patc

svn commit: r681115 - /tomcat/current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Wed Jul 30 09:41:53 2008
New Revision: 681115

URL: http://svn.apache.org/viewvc?rev=681115&view=rev
Log:
Respond to Yoav's comment on bug 44282

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681115&r1=681114&r2=681115&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 09:41:53 2008
@@ -31,6 +31,9 @@
   +1: markt, fhanik
   -1:
   0: yoavs (because I think there might be a bug when we're only diong the 
work if log.isTraceEnabled)
+ markt I believe this is correct. The privileged block is only required for
+   the getClassloader() call. This call is only ever made if trace is
+   enabled
 
 * Fix ArrayIndexOutOfBoundsException when empty URL is requested
   http://svn.apache.org/viewvc?rev=627883&view=rev



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r681119 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Wed Jul 30 09:51:20 2008
New Revision: 681119

URL: http://svn.apache.org/viewvc?rev=681119&view=rev
Log:
Fix ArrayIndexOutOfBoundsException reported on users list. Patch provided by 
Charles R Caldarale.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java?rev=681119&r1=681118&r2=681119&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
 Wed Jul 30 09:51:20 2008
@@ -545,6 +545,10 @@
 int start = uriBC.getStart();
 int end = uriBC.getEnd();
 
+// An empty URL is not acceptable
+if (start == end)
+return false;
+
 // URL * is acceptable
 if ((end - start == 1) && b[start] == (byte) '*')
   return true;

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=681119&r1=681118&r2=681119&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 09:51:20 2008
@@ -45,6 +45,10 @@
   
 Add additional checks for URI normalization. (remm)
   
+  
+Don't throw an ArrayIndexOutOfBoundsException when empty URL is
+requested. Patch provided by Charles R Caldarale. (markt)
+  
 
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681119&r1=681118&r2=681119&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 09:51:20 2008
@@ -35,11 +35,6 @@
the getClassloader() call. This call is only ever made if trace is
enabled
 
-* Fix ArrayIndexOutOfBoundsException when empty URL is requested
-  http://svn.apache.org/viewvc?rev=627883&view=rev
-  +1: markt, fhanik, yoavs
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44562
   http://svn.apache.org/viewvc?rev=635294&view=rev (prior code clean up)
   http://svn.apache.org/viewvc?rev=635297&view=rev (the actual fix)



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r681124 - /tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/HttpServlet.java

[markt]

Author: markt
Date: Wed Jul 30 10:06:58 2008
New Revision: 681124

URL: http://svn.apache.org/viewvc?rev=681124&view=rev
Log:
Tabs -> 8 spaces and general clean-up of white space. No functional change.

Modified:

tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/HttpServlet.java

Modified: 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/HttpServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/HttpServlet.java?rev=681124&r1=681123&r2=681124&view=diff
==
--- 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/HttpServlet.java
 (original)
+++ 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/HttpServlet.java
 Wed Jul 30 10:06:58 2008
@@ -1,19 +1,19 @@
 /*
-* 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.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package javax.servlet.http;
 
 import java.io.IOException;
@@ -34,7 +34,6 @@
 
 
 /**
- *
  * Provides an abstract class to be subclassed to create
  * an HTTP servlet suitable for a Web site. A subclass of
  * HttpServlet must override at least 
@@ -72,16 +71,12 @@
  * Java Tutorial on Multithreaded Programming for more
  * information on handling multiple threads in a Java program.
  *
- * @author Various
- * @version$Version$
- *
+ * @author  Various
+ * @version $Version$
  */
-
-
-
 public abstract class HttpServlet extends GenericServlet
-implements java.io.Serializable
-{
+implements java.io.Serializable {
+
 private static final String METHOD_DELETE = "DELETE";
 private static final String METHOD_HEAD = "HEAD";
 private static final String METHOD_GET = "GET";
@@ -94,24 +89,18 @@
 private static final String HEADER_LASTMOD = "Last-Modified";
 
 private static final String LSTRING_FILE =
-   "javax.servlet.http.LocalStrings";
+"javax.servlet.http.LocalStrings";
 private static ResourceBundle lStrings =
-   ResourceBundle.getBundle(LSTRING_FILE);
-   
-   
+ResourceBundle.getBundle(LSTRING_FILE);

 
 /**
  * Does nothing, because this is an abstract class.
- * 
  */
-
 public HttpServlet() { }
 
-
 
 /**
- *
  * Called by the server (via the service method) to
  * allow a servlet to handle a GET request. 
  *
@@ -159,44 +148,38 @@
  * returns an HTTP "Bad Request" message.
  * 
  *
- * @param req  an [EMAIL PROTECTED] HttpServletRequest} object that
- * contains the request the client has made
- * of the servlet
- *
- * @param resp an [EMAIL PROTECTED] HttpServletResponse} object that
- * contains the response the servlet sends
- * to the client
- * 
- * @exception IOException  if an input or output error is 
- * detected when the servlet handles
- * the GET request
- *
- * @exception ServletException if the request for the GET
- * could not be handled
+ * @param reqan [EMAIL PROTECTED] HttpServletRequest} object that
+ *contains the request the client has made
+ *of the servlet
+ *
+ * @par

svn commit: r681128 - /tomcat/current/tc4.1.x/STATUS.txt

[yoavs]

Author: yoavs
Date: Wed Jul 30 10:17:26 2008
New Revision: 681128

URL: http://svn.apache.org/viewvc?rev=681128&view=rev
Log:
Reviewed pending commits for Tomcat 4.1 in STATUS.txt, added my votes.

Modified:
tomcat/current/tc4.1.x/STATUS.txt

Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=681128&r1=681127&r2=681128&view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Wed Jul 30 10:17:26 2008
@@ -28,25 +28,25 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44562
   http://svn.apache.org/viewvc?rev=635294&view=rev (prior code clean up)
   http://svn.apache.org/viewvc?rev=635297&view=rev (the actual fix)
-  +1: markt
+  +1: markt, yoavs
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41217
   This is CVE-2008-0128.
   http://people.apache.org/~markt/patches/2008-03-10-bug41217-tc4.patch
-  +1: markt
+  +1: markt, yoavs
   -1:
 
 * Fix docs re use of maxActive
   http://svn.apache.org/viewvc?rev=639842&view=rev
-  +1: rjung, markt
+  +1: rjung, markt, yoavs
   -1:
   rjung: Didn't check though, if this is actually true for the 4.1 bundled 
DBCP.
   markt: It is
 
 * Fix docs: don't include dev snapshots of JK docs, link to released version 
instead
   http://people.apache.org/~rjung/patches/tc4_1-jk-docs.patch
-  +1: rjung, markt
+  +1: rjung, markt, yoavs
   -1:
   rjung: Mark, I didn't actually try to build it. I guess it's much easier for 
you :)
   markt: Yep. Your patch is fine. I can't believe there was still a ref to the 
jk2 docs!
@@ -54,5 +54,5 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45301
   Remove a JDK 1.4 dep for the few users that still run TC4 on 1.3 JDKs
   http://people.apache.org/~markt/patches/2008-07-07-bug45301-tc4.patch
-  +1: markt
+  +1: markt, yoavs
   -1: 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r681133 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/HttpServlet.java

[markt]

Author: markt
Date: Wed Jul 30 10:25:45 2008
New Revision: 681133

URL: http://svn.apache.org/viewvc?rev=681133&view=rev
Log:
Fix bug 44562. HEAD requests cannot use includes. Patch provided by David 
Jencks.

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/HttpServlet.java

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=681133&r1=681132&r2=681133&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 10:25:45 2008
@@ -69,6 +69,10 @@
 Use a localised error message if a user tries to write a negative 
length
 byte array during default processing of a HEAD request. (markt)   
   
+  
+44562: HEAD requests cannot use includes. Patch provided by
+  David Jencks. (markt)
+  
 
   
 

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681133&r1=681132&r2=681133&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 10:25:45 2008
@@ -35,12 +35,6 @@
the getClassloader() call. This call is only ever made if trace is
enabled
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44562
-  http://svn.apache.org/viewvc?rev=635294&view=rev (prior code clean up)
-  http://svn.apache.org/viewvc?rev=635297&view=rev (the actual fix)
-  +1: markt, fhanik, yoavs
-  -1:
-
 * Fix docs re use of maxActive
   http://svn.apache.org/viewvc?rev=639842&view=rev
   +1: rjung, markt, fhanik, yoavs

Modified: 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/HttpServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/HttpServlet.java?rev=681133&r1=681132&r2=681133&view=diff
==
--- 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/HttpServlet.java
 (original)
+++ 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/javax/servlet/http/HttpServlet.java
 Wed Jul 30 10:25:45 2008
@@ -23,7 +23,6 @@
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
 import java.util.Enumeration;
-import java.util.Locale;
 import java.util.ResourceBundle;
 
 import javax.servlet.GenericServlet;
@@ -733,146 +732,48 @@
 
 
 /*
- * A response that includes no body, for use in (dumb) "HEAD" support.
+ * A response wrapper for use in in (dumb) "HEAD" support.
  * This just swallows that body, counting the bytes in order to set
- * the content length appropriately.  All other methods delegate directly
- * to the HTTP Servlet Response object used to construct this one.
+ * the content length appropriately.  All other methods delegate to the
+ * wrapped HTTP Servlet Response object.
  */
 // file private
-class NoBodyResponse implements HttpServletResponse {
-private HttpServletResponseresp;
-private NoBodyOutputStreamnoBody;
-private PrintWriterwriter;
-private booleandidSetContentLength;
+class NoBodyResponse extends HttpServletResponseWrapper {
+private NoBodyOutputStream noBody;
+private PrintWriterwriter;
+private booleandidSetContentLength;
 
 // file private
 NoBodyResponse(HttpServletResponse r) {
-resp = r;
+super(r);
 noBody = new NoBodyOutputStream();
 }
 
 // file private
 void setContentLength() {
 if (!didSetContentLength)
-  resp.setContentLength(noBody.getContentLength());
+  super.setContentLength(noBody.getContentLength());
 }
 
 // SERVLET RESPONSE interface methods
 public void setContentLength(int len) {
-resp.setContentLength(len);
+super.setContentLength(len);
 didSetContentLength = true;
 }
 
-public void setCharacterEncoding(String charset)
-  { resp.setCharacterEncoding(charset); }
-
-public void setContentType(String type)
-  { resp.setContentType(type); }
-
-public String getContentType()
-  { return resp.getContentType(); }
-
-public ServletOutputStream getOutputStream() throws IOException
-  { return noBody; }
-
-public String getCharacterEncoding()
-{ return resp.getCharacterEncoding(); }
+public ServletOutputStream getOutputStream() throws IOException {
+return noBody;
+}
 
-public PrintWriter getWriter() throws UnsupportedEncodingException
-   

DO NOT REPLY [Bug 44562] HEAD requests cannot go through request dispatch include.

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=44562


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Comment #5 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 10:26:00 PST ---
This has been fixed in 5.5.x and will be included in 5.5.27 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: r681136 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml container/tc5.5.x/webapps/docs/jndi-datasource-examples-howto.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Wed Jul 30 10:30:38 2008
New Revision: 681136

URL: http://svn.apache.org/viewvc?rev=681136&view=rev
Log:
Fix docs re maxActive

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=681136&r1=681135&r2=681136&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 10:30:38 2008
@@ -61,6 +61,10 @@
 45323: Add note that context.xml files can only contain a
 single Context element. (markt)
   
+  
+Update JNDI datasource docs since maxActive setting for unlimited
+changed in commons-pool > 1.2. (markt)
+   
 
   
   

Modified: 
tomcat/container/tc5.5.x/webapps/docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/jndi-datasource-examples-howto.xml?rev=681136&r1=681135&r2=681136&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/jndi-datasource-examples-howto.xml 
(original)
+++ tomcat/container/tc5.5.x/webapps/docs/jndi-datasource-examples-howto.xml 
Wed Jul 30 10:30:38 2008
@@ -219,7 +219,7 @@
 
 
 
 
 
  
  
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=681198&r1=681197&r2=681198&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 13:42:51 2008
@@ -82,6 +82,10 @@
 when running with a security manager. (markt)
   
   
+44943: Reduce copy/paste issues caused by different engine
+names in server.xml. (markt)
+  
+  
 45293: Update name of commons-logging jar in security 
policy.
 (markt)
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681198&r1=681197&r2=681198&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 13:42:51 2008
@@ -94,12 +94,6 @@
   +1: markt, yoavs
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44943
-  Reduce issues caused by copy/paste and different engine names
-  http://svn.apache.org/viewvc?rev=654177&view=rev
-  +1: markt, fhanik, yoavs
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42943
   Make sure nested element is inside  element before throwing
   exception.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 44943] Inconsistent engine name Catalina vs Standalone in server.xml

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=44943


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #2 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 13:42:55 PST ---
This has been fixed in 5.5.x and will be included in 5.5.27 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: r681199 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JspDocumentParser.java

[markt]

Author: markt
Date: Wed Jul 30 13:46:32 2008
New Revision: 681199

URL: http://svn.apache.org/viewvc?rev=681199&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42943
Make sure nested element is inside  element before throwing exception.

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JspDocumentParser.java

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=681199&r1=681198&r2=681199&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 13:46:32 2008
@@ -109,6 +109,10 @@
 31257: Quote endorsed dirs if they contain a space. (markt)
   
   
+42943: Make sure nested element is inside 
+element before throwing exception. (markt)
+  
+  
 44877: Prevent collisions in tag pool names. (markt)
   
 

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681199&r1=681198&r2=681199&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 13:46:32 2008
@@ -94,13 +94,6 @@
   +1: markt, yoavs
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42943
-  Make sure nested element is inside  element before throwing
-  exception.
-  http://svn.apache.org/viewvc?rev=654640&view=rev
-  +1: markt, fhanik, yoavs
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42899
   When saving config from admin app, correctly handle case where old config 
file
   does not exist.

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JspDocumentParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JspDocumentParser.java?rev=681199&r1=681198&r2=681199&view=diff
==
--- 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JspDocumentParser.java
 (original)
+++ 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JspDocumentParser.java
 Wed Jul 30 13:46:32 2008
@@ -276,8 +276,11 @@
 return;
 }
 
+String currentPrefix = getPrefix(current.getQName());
+
 // jsp:text must not have any subelements
-if (JSP_URI.equals(uri) && TEXT_ACTION.equals(current.getLocalName())) 
{
+if (JSP_URI.equals(uri) && TEXT_ACTION.equals(current.getLocalName())
+&& "jsp".equals(currentPrefix)) {
 throw new SAXParseException(
 Localizer.getMessage("jsp.error.text.has_subelement"),
 locator);
@@ -1172,11 +1175,7 @@
 }
 }
 
-String prefix = "";
-int colon = qName.indexOf(':');
-if (colon != -1) {
-prefix = qName.substring(0, colon);
-}
+String prefix = getPrefix(qName);
 
 Node.CustomTag ret = null;
 if (tagInfo != null) {
@@ -1361,9 +1360,8 @@
  */
 private void checkPrefix(String uri, String qName) {
 
-int index = qName.indexOf(':');
-if (index != -1) {
-String prefix = qName.substring(0, index);
+String prefix = getPrefix(qName);
+if (prefix.length() > 0) {
 pageInfo.addPrefix(prefix);
 if ("jsp".equals(prefix) && !JSP_URI.equals(uri)) {
 pageInfo.setIsJspPrefixHijacked(true);
@@ -1371,6 +1369,14 @@
 }
 }
 
+private String getPrefix(String qName) {
+int index = qName.indexOf(':');
+if (index != -1) {
+return qName.substring(0, index);
+}
+return "";
+}
+
 /*
  * Gets SAXParser.
  *



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 42943] jsp:text gets confused with other *:text elements in a JSP tag file

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=42943


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #5 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 13:46:36 PST ---
This has been fixed in 5.5.x and will be included in 5.5.27 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: r681201 - in /tomcat: connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.ja

[markt]

Author: markt
Date: Wed Jul 30 14:01:26 2008
New Revision: 681201

URL: http://svn.apache.org/viewvc?rev=681201&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42750
Make parsing of request line more tolerant of multiple SP and/or HT

Modified:

tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java

tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=681201&r1=681200&r2=681201&view=diff
==
--- 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
 (original)
+++ 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
 Wed Jul 30 14:01:26 2008
@@ -484,7 +484,8 @@
 
 ascbuf[pos] = (char) buf[pos];
 
-if (buf[pos] == Constants.SP) {
+// Spec says single SP but it also says be tolerant of HT
+if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
 space = true;
 request.method().setChars(ascbuf, start, pos - start);
 }
@@ -493,6 +494,20 @@
 
 }
 
+// Spec says single SP but also says be tolerant of multiple and/or HT
+while (space) {
+// Read new bytes if needed
+if (pos >= lastValid) {
+if (!fill())
+throw new EOFException(sm.getString("iib.eof.error"));
+}
+if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
+pos++;
+} else {
+space = false;
+}
+}
+
 // Mark the current buffer position
 start = pos;
 int end = 0;
@@ -502,7 +517,6 @@
 // Reading the URI
 //
 
-space = false;
 boolean eol = false;
 
 while (!space) {
@@ -513,7 +527,8 @@
 throw new EOFException(sm.getString("iib.eof.error"));
 }
 
-if (buf[pos] == Constants.SP) {
+// Spec says single SP but it also says be tolerant of HT
+if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
 space = true;
 end = pos;
 } else if ((buf[pos] == Constants.CR) 
@@ -531,6 +546,20 @@
 
 }
 
+// Spec says single SP but also says be tolerant of multiple and/or HT
+while (space) {
+// Read new bytes if needed
+if (pos >= lastValid) {
+if (!fill())
+throw new EOFException(sm.getString("iib.eof.error"));
+}
+if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
+pos++;
+} else {
+space = false;
+}
+}
+
 request.unparsedURI().setBytes(buf, start, end - start);
 if (questionPos >= 0) {
 request.queryString().setBytes(buf, questionPos + 1, 

Modified: 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=681201&r1=681200&r2=681201&view=diff
==
--- 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
 (original)
+++ 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java
 Wed Jul 30 14:01:26 2008
@@ -426,7 +426,8 @@
 
 ascbuf[pos] = (char) buf[pos];
 
-if (buf[pos] == Constants.SP) {
+// Spec says single SP but it also says be tolerant of HT
+if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
 space = true;
 request.method().setChars(ascbuf, start, pos - start);
 }
@@ -435,6 +436,20 @@
 
 }
 
+// Spec says single SP but also says be tolerant of multiple and/or HT
+while (space) {
+// Read new bytes if needed
+if (pos >= lastValid) {
+if (!fill())
+throw new EOFException(sm.getString("iib.eof.error"));
+}
+if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
+pos++;
+} else {
+space = false;
+}
+}
+
 // Mark the current buffer position
 start = pos;
 int end = 0;
@@ -444,7 +459,6 @@
 // Reading the URI
 //
 
-space = false;
 boolean eol = false;

DO NOT REPLY [Bug 42750] Http Post requests not handled correctly if there is more than one space between the "POST" and the URL

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=42750


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #7 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 14:01:40 PST ---
This has been fixed in 5.5.x and will be included in 5.5.27 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]

DO NOT REPLY [Bug 45229] Session already invalidated error running under Security Manager

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=45229


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME




--- Comment #2 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 14:03:03 PST ---
No response in over a month. Assume using
-Dorg.apache.catalina.session.StandardSession.ACTIVITY_CHECK=true fixes this
issue. Please re-open if this is not the case.


-- 
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: r681206 - in /tomcat: container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt container/branches/tc4.1.x/webapps/tomcat-docs/jndi-datasource-examples-howto.xml current/tc4.1.x/STATUS.txt

[markt]

Author: markt
Date: Wed Jul 30 14:24:58 2008
New Revision: 681206

URL: http://svn.apache.org/viewvc?rev=681206&view=rev
Log:
maxActive setting for unlimited changed in commons-pool > 1.2

Modified:
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt

tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/jndi-datasource-examples-howto.xml
tomcat/current/tc4.1.x/STATUS.txt

Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=681206&r1=681205&r2=681206&view=diff
==
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Wed Jul 30 14:24:58 
2008
@@ -696,6 +696,9 @@
 [4.1.37] Servlet API
  Use string from resource bundle for error message in HttpServlet
 
+[4.1.38] Docs
+ Update JNDI data source docs for use of maxActive
+
 
 --
 Catalina Bug Fixes:

Modified: 
tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/jndi-datasource-examples-howto.xml?rev=681206&r1=681205&r2=681206&view=diff
==
--- 
tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/jndi-datasource-examples-howto.xml
 (original)
+++ 
tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/jndi-datasource-examples-howto.xml
 Wed Jul 30 14:24:58 2008
@@ -221,7 +221,7 @@
 
 
 
   maxActive

Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=681206&r1=681205&r2=681206&view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Wed Jul 30 14:24:58 2008
@@ -37,13 +37,6 @@
   +1: markt, yoavs
   -1:
 
-* Fix docs re use of maxActive
-  http://svn.apache.org/viewvc?rev=639842&view=rev
-  +1: rjung, markt, yoavs
-  -1:
-  rjung: Didn't check though, if this is actually true for the 4.1 bundled 
DBCP.
-  markt: It is
-
 * Fix docs: don't include dev snapshots of JK docs, link to released version 
instead
   http://people.apache.org/~rjung/patches/tc4_1-jk-docs.patch
   +1: rjung, markt, yoavs



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r681212 - in /tomcat: container/branches/tc4.1.x/ container/branches/tc4.1.x/webapps/tomcat-docs/ current/tc4.1.x/

[markt]

Author: markt
Date: Wed Jul 30 14:38:33 2008
New Revision: 681212

URL: http://svn.apache.org/viewvc?rev=681212&view=rev
Log:
Fix JK docs references

Modified:
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/build.xml
tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/index.xml
tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/project.xml
tomcat/current/tc4.1.x/STATUS.txt

Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=681212&r1=681211&r2=681212&view=diff
==
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Wed Jul 30 14:38:33 
2008
@@ -486,8 +486,7 @@
 [4.1.31] #14193
  Startup and Admin webapp
  Exceptions on startup and errors in admin webapp when default
- context is
- defined with loader and/or manager.
+ context is defined with loader and/or manager.
 
 [4.1.31] #22268
  Admin webapp
@@ -549,8 +548,7 @@
 [4.1.31] #20885
  Docs
  Align the description of the reload target in application
- developer guide with the
- description of reload from the manager
+ developer guide with the description of reload from the manager
  documentation.
 
 [4.1.31] #19869
@@ -699,6 +697,9 @@
 [4.1.38] Docs
  Update JNDI data source docs for use of maxActive
 
+[4.1.38] Docs
+ Reference docs for latest JK release rather latest JK/JK2 docs from 
svn
+
 
 --
 Catalina Bug Fixes:

Modified: tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/build.xml?rev=681212&r1=681211&r2=681212&view=diff
==
--- tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/build.xml Wed Jul 30 
14:38:33 2008
@@ -10,8 +10,6 @@
   
   
 
-  
-
   
   
   
@@ -166,14 +164,6 @@
   
 
 
-
-
-
-
-   
-   
-
-
   
 
 

Modified: tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/index.xml?rev=681212&r1=681211&r2=681212&view=diff
==
--- tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/index.xml (original)
+++ tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/index.xml Wed Jul 30 
14:38:33 2008
@@ -77,7 +77,7 @@
 JNDI DataSource HOW-TO
 - Configuring a JNDI DataSoure with a dB connection pool.
 Examples for many popular databases.
-JK Documenation
+http://tomcat.apache.org/connectors-doc/";>JK 
Documenation
 - Complete documentation and HOWTOs on the JK native webserver connector,
   used to interface Tomcat with servers like Apache HTTPd, IIS 
   and others.

Modified: tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/project.xml?rev=681212&r1=681211&r2=681212&view=diff
==
--- tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/project.xml (original)
+++ tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/project.xml Wed Jul 
30 14:38:33 2008
@@ -31,7 +31,7 @@
 
 
 
-
+http://tomcat.apache.org/connectors-doc/"/>
 
 

Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=681212&r1=681211&r2=681212&view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Wed Jul 30 14:38:33 2008
@@ -37,13 +37,6 @@
   +1: markt, yoavs
   -1:
 
-* Fix docs: don't include dev snapshots of JK docs, link to released version 
instead
-  http://people.apache.org/~rjung/patches/tc4_1-jk-docs.patch
-  +1: rjung, markt, yoavs
-  -1:
-  rjung: Mark, I didn't actually try to build it. I guess it's much easier for 
you :)
-  markt: Yep. Your patch is fine. I can't believe there was still a ref to the 
jk2 docs!
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45301
   Remove a JDK 1.4 dep for the few users that still run TC4 on 1.3 JDKs
   http://people.apache.org/~markt/patches/2008-07-07-bug45301-tc4.patch



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 45498] j_security_check redirects to favicon.ico

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=45498





--- Comment #2 from Eric Jain <[EMAIL PROTECTED]>  2008-07-30 14:42:35 PST ---
Created an attachment (id=22334)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=22334)
test web application


-- 
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]

DO NOT REPLY [Bug 45498] j_security_check redirects to favicon.ico

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=45498


Eric Jain <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |
Version|5.5.9   |5.0.26




--- Comment #3 from Eric Jain <[EMAIL PROTECTED]>  2008-07-30 14:45:13 PST ---
I've attached a test application that allows this problem to be reproduced on a
fresh Tomcat 5.5.26 instance.


-- 
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]

DO NOT REPLY [Bug 45498] j_security_check redirects to favicon.ico

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=45498


Eric Jain <[EMAIL PROTECTED]> changed:

   What|Removed |Added

Version|5.0.26  |5.5.26




-- 
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: r681220 - /tomcat/current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Wed Jul 30 15:10:09 2008
New Revision: 681220

URL: http://svn.apache.org/viewvc?rev=681220&view=rev
Log:
Replace the various 44494 fixes with Rainer's two patches.
Since they are Rainer's patches and his BZ entry says he was going to add them 
himself, I have taken the liberty of including his vote with these proposal

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681220&r1=681219&r2=681220&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 15:10:09 2008
@@ -35,50 +35,12 @@
the getClassloader() call. This call is only ever made if trace is
enabled
 
-* Port fix for regression in 5.5.26 (and 4.1.37) that limited uploads to 8k
-  https://issues.apache.org/bugzilla/show_bug.cgi?id=44494
-  
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?view=diff&r1=639890&r2=639891&pathrev=639891
-  +1: markt
-  -1: fhanik - Rainer backported all the fixes, we should evaluate those, I'll 
add them at the bottom
-
-* Fix reading of multi-byte request data
-  https://issues.apache.org/bugzilla/show_bug.cgi?id=44494
-  http://svn.apache.org/viewvc?rev=642814&view=rev (clean-up)
-  http://svn.apache.org/viewvc?rev=642816&view=rev (more clean-up)
-  http://svn.apache.org/viewvc?rev=642819&view=rev (the fix)
-  This is Remy's patch from comment #23 less the one bad line (comment #28)
-  NB: Also fixes 4.1.37
-  +1: markt
-  -1: fhanik - difficult to review "cleaned up" code, rainers backports 
doesn't have that, lets review those
-
-* Final fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494
-  With these patches the test case provided in the bug report
-  passes for multibyte and single bytes tests including the edge
-  cases I could think of.
-  http://svn.apache.org/viewvc?rev=645719&view=rev (Remy's resizing fix)
-  http://svn.apache.org/viewvc?rev=645722&view=rev (mark/reset fix)
-  +1: markt
-  -1: fhanik - trunk patches won't work in 5.5, rainer has a backport, I'll 
review those
-
 * Better handling of lack of permission for context specific logging
   http://svn.apache.org/viewvc?rev=646543&view=rev
   +1: markt
0: fhanik - silently swallow an error, and default to the default config 
file, yoavs: don't like silent swallowing
   -1:
 
-* Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494
-  Fix read when maxHttpHeaderSize > 8192
-  http://svn.apache.org/viewvc?rev=647304&view=rev (rjung)
-  +1: markt
-  -1: fhanik - same as all the above
-
-* Last (hopefully) fix for 
https://issues.apache.org/bugzilla/show_bug.cgi?id=44494
-  Clear buffer if not all data is read.
-  Patch provided by Suzuki Yuichiro.
-  http://svn.apache.org/viewvc?rev=647307&view=rev
-  +1: markt
-  -1: fhanik - same as all the above 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43578
   http://svn.apache.org/viewvc?rev=651713&view=rev
   Tomcat doesn't start if installation path contains a space
@@ -134,3 +96,11 @@
   http://svn.apache.org/viewvc?rev=680725&view=rev
   +1: markt, yoavs
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44494
+  >8k request truncation and various multi-byte issues
+  These patches are Rainer's port
+  https://issues.apache.org/bugzilla/attachment.cgi?id=21872
+  https://issues.apache.org/bugzilla/attachment.cgi?id=21873
+  +1: rjung, markt
+  -1: 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 45509] New: One typo, one grammer

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=45509

   Summary: One typo, one grammer
   Product: Tomcat 6
   Version: 6.0.16
  Platform: PC
   URL: http://tomcat.apache.org/tomcat-6.0-doc/logging.html
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Typo at  tags

Build the commons-logging additional component using the extras.xml Ant build
script which is part of teh Tomcat source bundle.

Grammer at  tags

Tomcat 6 uses defines loggers by Engine and Host names.


-- 
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]

DO NOT REPLY [Bug 45498] j_security_check redirects to favicon.ico

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=45498


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WORKSFORME




--- Comment #4 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 15:34:57 PST ---
Your test case works correctly on a clean 5.5.26.

Again, you need to look at the full set of requests and responses to work out
why this doesn't work for you. Use the users list if you need help.


-- 
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: r681233 - /tomcat/trunk/webapps/docs/logging.xml

[markt]

Author: markt
Date: Wed Jul 30 15:37:11 2008
New Revision: 681233

URL: http://svn.apache.org/viewvc?rev=681233&view=rev
Log:
Fix 45509 - typos 

Modified:
tomcat/trunk/webapps/docs/logging.xml

Modified: tomcat/trunk/webapps/docs/logging.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/logging.xml?rev=681233&r1=681232&r2=681233&view=diff
==
--- tomcat/trunk/webapps/docs/logging.xml (original)
+++ tomcat/trunk/webapps/docs/logging.xml Wed Jul 30 15:37:11 2008
@@ -104,7 +104,7 @@
 (v1.2 or later) and place the log4j jar in $CATALINA_HOME/lib.
 
 Build the commons-logging additional component using the extras.xml
-Ant build script which is part of teh Tomcat source bundle.
+Ant build script which is part of the Tomcat source bundle.
 
 Replace $CATALINA_HOME/bin/tomcat-juli.jar with
 output/extras/tomcat-juli.jar.
@@ -125,7 +125,7 @@

 
   You can (and should) be more picky about which packages to include 
-  in the logging. Tomcat 6 uses defines loggers by Engine and Host names.
+  in the logging. Tomcat 6 defines loggers by Engine and Host names.
   For example, for a default Catalina localhost log, add this to the
   end of the log4j.properties above. Note that there are known issues with 
   using this naming convention (with square brackets) in log4j XML based



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r681234 - /tomcat/tc6.0.x/trunk/webapps/docs/logging.xml

[markt]

Author: markt
Date: Wed Jul 30 15:38:07 2008
New Revision: 681234

URL: http://svn.apache.org/viewvc?rev=681234&view=rev
Log:
Fix 45509 - typos.

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/logging.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/logging.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/logging.xml?rev=681234&r1=681233&r2=681234&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/logging.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/logging.xml Wed Jul 30 15:38:07 2008
@@ -104,7 +104,7 @@
 (v1.2 or later) and place the log4j jar in $CATALINA_HOME/lib.
 
 Build the commons-logging additional component using the extras.xml
-Ant build script which is part of teh Tomcat source bundle.
+Ant build script which is part of the Tomcat source bundle.
 
 Replace $CATALINA_HOME/bin/tomcat-juli.jar with
 output/extras/tomcat-juli.jar.
@@ -125,7 +125,7 @@

 
   You can (and should) be more picky about which packages to include 
-  in the logging. Tomcat 6 uses defines loggers by Engine and Host names.
+  in the logging. Tomcat 6 defines loggers by Engine and Host names.
   For example, for a default Catalina localhost log, add this to the
   end of the log4j.properties above. Note that there are known issues with 
   using this naming convention (with square brackets) in log4j XML based



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 45509] One typo, one grammer

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=45509


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #1 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 15:38:27 PST ---
Thanks for the report. These have been fixed in trunk and 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]

DO NOT REPLY [Bug 45498] j_security_check redirects to favicon.ico

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=45498





--- Comment #5 from Eric Jain <[EMAIL PROTECTED]>  2008-07-30 16:11:58 PST ---
What browser did you use? I have confirmed the problem with default
installations of Firefox 2 and 3 (problem observed only after restarting the
browser) and with Internet Explorer 7 (problem observed only after clearing all
cached data). Opera 9.5 on the other hand seems fine (even after clearing all
cached data), not sure why. What appears to be happening is that the browser
sends a request for the favicon after loading the login page. When the login
form is submitted (from the root of the web server), Tomcat redirects to the
last request in the same path -- the favicon! Jetty (6.1.11) does not have this
problem (perhaps it remembers what request triggered the authentication form?)
so I'm assuming this is a fixable bug.


-- 
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]