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

2008-07-30 Thread 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]

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

2008-07-30 Thread 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]

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

2008-07-30 Thread 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]

svn commit: r681233 - /tomcat/trunk/webapps/docs/logging.xml

2008-07-30 Thread 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]

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

2008-07-30 Thread 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]

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

2008-07-30 Thread 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]

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

2008-07-30 Thread 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 45498] j_security_check redirects to favicon.ico

2008-07-30 Thread 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]

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

2008-07-30 Thread 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

2008-07-30 Thread 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]

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

2008-07-30 Thread 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]

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

2008-07-30 Thread 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]

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

2008-07-30 Thread 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]

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

2008-07-30 Thread 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]

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

2008-07-30 Thread 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 42943] jsp:text gets confused with other *:text elements in a JSP tag file

2008-07-30 Thread 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: 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

2008-07-30 Thread 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 44943] Inconsistent engine name Catalina vs Standalone in server.xml

2008-07-30 Thread 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: r681198 - in /tomcat: container/tc5.5.x/catalina/src/conf/server.xml container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 13:42:51 2008
New Revision: 681198

URL: http://svn.apache.org/viewvc?rev=681198&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44943
Reduce issues caused by copy/paste and different engine names

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

Modified: tomcat/container/tc5.5.x/catalina/src/conf/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/conf/server.xml?rev=681198&r1=681197&r2=681198&view=diff
==
--- tomcat/container/tc5.5.x/catalina/src/conf/server.xml (original)
+++ tomcat/container/tc5.5.x/catalina/src/conf/server.xml Wed Jul 30 13:42:51 
2008
@@ -134,7 +134,7 @@
  on to the appropriate Host (virtual host). -->
 
  
  
 

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]

svn commit: r681197 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ container/tc5.5.x/catalina/src/share/org/apache/catalina/deploy/ container/tc5.5.x/webapps/docs/ curren

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 13:38:44 2008
New Revision: 681197

URL: http://svn.apache.org/viewvc?rev=681197&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43079 and 
https://issues.apache.org/bugzilla/show_bug.cgi?id=43080
Move odd url-pattern warning to StandardContext so a) we catch all patterns and 
b) it isn't logged to the wrong webapp
Based on a patch by John Kew

Modified:

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

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/deploy/SecurityCollection.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/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java?rev=681197&r1=681196&r2=681197&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
 Wed Jul 30 13:38:44 2008
@@ -4837,20 +4837,38 @@
 
getLogger().warn(sm.getString("standardContext.crlfinurl",urlPattern));
 }
 if (urlPattern.startsWith("*.")) {
-if (urlPattern.indexOf('/') < 0)
+if (urlPattern.indexOf('/') < 0) {
+checkUnusualURLPattern(urlPattern);
 return (true);
-else
+} else
 return (false);
 }
 if ( (urlPattern.startsWith("/")) &&
-(urlPattern.indexOf("*.") < 0))
+(urlPattern.indexOf("*.") < 0)) {
+checkUnusualURLPattern(urlPattern);
 return (true);
-else
+} else
 return (false);
 
 }
 
 
+/**
+ * Check for unusual but valid s.
+ * See Bugzilla 34805, 43079 & 43080
+ */
+private void checkUnusualURLPattern(String urlPattern) {
+if (log.isInfoEnabled()) {
+if(urlPattern.endsWith("*") && (urlPattern.length() < 2 ||
+urlPattern.charAt(urlPattern.length()-2) != '/')) {
+log.info("Suspicious url pattern: \"" + urlPattern + "\"" +
+" in context [" + getName() + "] - see" +
+" section SRV.11.2 of the Servlet specification" );
+}
+}
+}
+
+
 // - Operations
 
 

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/deploy/SecurityCollection.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/deploy/SecurityCollection.java?rev=681197&r1=681196&r2=681197&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/deploy/SecurityCollection.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/deploy/SecurityCollection.java
 Wed Jul 30 13:38:44 2008
@@ -21,9 +21,6 @@
 
 import org.apache.catalina.util.RequestUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import java.io.Serializable;
 
 
@@ -44,9 +41,6 @@
 
 public class SecurityCollection implements Serializable {
 
-private static Log log = LogFactory.getLog(SecurityCollection.class);
-
-
 // --- Constructors
 
 
@@ -188,17 +182,6 @@
 if (pattern == null)
 return;
 
-// Bugzilla 34805: add friendly warning.
-if(pattern.endsWith("*")) {
-  if (pattern.charAt(pattern.length()-1) != '/') {
-if (log.isDebugEnabled()) {
-  log.warn("Suspicious url pattern: \"" + pattern + "\"" +
-   " - see 
http://java.sun.com/aboutJava/communityprocess/first/jsr053/servlet23_PFD.pdf"; +
-   "  section 11.2" );
-}
-  }
-}
-
 pattern = RequestUtil.URLDecode(pattern);
 String results[] = new String[patterns.length + 1];
 for (int i = 0; i < patterns.length; i++) {

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=681197&r1=681196&r2=681197&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:38:44 2008
@@ -54,6 +54,14 @@
 context.xml files. (markt)
   
   
+43079: Correct pattern verification for suspicious URLs.
+Patch provide

DO NOT REPLY [Bug 43079] pattern verification broken

2008-07-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=43079


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #8 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 13:38:53 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 43080] Suspicious url pattern warning logged to wrong webapp

2008-07-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=43080


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Comment #7 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 13:38:49 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: r681195 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 13:28:16 2008
New Revision: 681195

URL: http://svn.apache.org/viewvc?rev=681195&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43117
Setting an empty workDir can delete all of CATALINA_HOME
Patch provided by Takayuki Kaneko.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.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/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java?rev=681195&r1=681194&r2=681195&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
 Wed Jul 30 13:28:16 2008
@@ -4751,7 +4751,7 @@
 
 // Acquire (or calculate) the work directory path
 String workDir = getWorkDir();
-if (workDir == null) {
+if (workDir == null || workDir.length() == 0) {
 
 // Retrieve our parent (normally a host) name
 String hostName = null;

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=681195&r1=681194&r2=681195&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:28:16 2008
@@ -54,6 +54,10 @@
 context.xml files. (markt)
   
   
+43117: Setting an empty workDIR could delete all of
+CATALINA_HOME. Patch provided by Takayuki Kaneko. (markt)
+  
+  
 44529: No roles specified (deny all) should take precedence
 over no auth-constraint specified (allow-all). (markt)


Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681195&r1=681194&r2=681195&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 13:28:16 2008
@@ -86,13 +86,6 @@
   +1: markt, yoavs
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43117
-  Setting an empty workDir can delete all of CATALINA_HOME
-  Patch provided by Takayuki Kaneko.
-  http://svn.apache.org/viewvc?rev=653113&view=rev
-  +1: markt, fhanik, yoavs
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43079
   and https://issues.apache.org/bugzilla/show_bug.cgi?id=43080
   http://svn.apache.org/viewvc?rev=653195&view=rev



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

DO NOT REPLY [Bug 43117] Dangerousness of workDir setting on Context

2008-07-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=43117


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #3 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 13:28:07 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 43191] compressableMimeType attribute ignored

2008-07-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=43191


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Comment #13 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 13:24:26 PST 
---
This is fixed for 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: r681194 - in /tomcat: connectors/trunk/http11/src/java/org/apache/coyote/http11/ container/tc5.5.x/webapps/docs/ current/tc5.5.x/

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 13:24:13 2008
New Revision: 681194

URL: http://svn.apache.org/viewvc?rev=681194&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
No way to turn off compression for some MIME types
Based on a patch by Len Popp

Modified:

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

tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=681194&r1=681193&r2=681194&view=diff
==
--- 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
 (original)
+++ 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
 Wed Jul 30 13:24:13 2008
@@ -448,6 +448,7 @@
  */
 public void setCompressableMimeTypes(String compressableMimeTypes) {
 if (compressableMimeTypes != null) {
+this.compressableMimeTypes = null;
 StringTokenizer st = new StringTokenizer(compressableMimeTypes, 
",");
 
 while (st.hasMoreTokens()) {

Modified: 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java?rev=681194&r1=681193&r2=681194&view=diff
==
--- 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
 (original)
+++ 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
 Wed Jul 30 13:24:13 2008
@@ -453,6 +453,7 @@
  */
 public void setCompressableMimeTypes(String compressableMimeTypes) {
 if (compressableMimeTypes != null) {
+this.compressableMimeTypes = null;
 StringTokenizer st = new StringTokenizer(compressableMimeTypes, 
",");
 
 while (st.hasMoreTokens()) {

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=681194&r1=681193&r2=681194&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:24:13 2008
@@ -81,6 +81,10 @@
 Log errors for AJP signoffs at DEBUG level, since it is harmless if
 mod_jk has hung up the phone. (billbarker)
   
+  
+43191: Compression could not be disabled for some file 
types.
+Based on a patch by Len Popp. (markt)
+  
 
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681194&r1=681193&r2=681194&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 13:24:13 2008
@@ -86,13 +86,6 @@
   +1: markt, yoavs
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
-  No way to turn off compression for some MIME types
-  Based on a patch by Len Popp
-  http://svn.apache.org/viewvc?rev=653032&view=rev
-  +1: markt, fhanik, yoavs
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43117
   Setting an empty workDir can delete all of CATALINA_HOME
   Patch provided by Takayuki Kaneko.



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

svn commit: r681192 - 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/Generator.java

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 13:17:03 2008
New Revision: 681192

URL: http://svn.apache.org/viewvc?rev=681192&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44877
Prevent collisions in tag pool names

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/Generator.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=681192&r1=681191&r2=681192&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:17:03 2008
@@ -88,6 +88,9 @@
   
 31257: Quote endorsed dirs if they contain a space. (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=681192&r1=681191&r2=681192&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 13:17:03 2008
@@ -86,12 +86,6 @@
   +1: markt, 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, yoavs
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
   No way to turn off compression for some MIME types
   Based on a patch by Len Popp

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java?rev=681192&r1=681191&r2=681192&view=diff
==
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java 
(original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java 
Wed Jul 30 13:17:03 2008
@@ -262,6 +262,9 @@
 attrNames[i] = attrs.getQName(i);
 }
 Arrays.sort(attrNames, Collections.reverseOrder());
+if (attrNames.length > 0) {
+poolName = poolName + "&";
+}
 for (int i = 0; i < attrNames.length; i++) {
 poolName = poolName + "_" + attrNames[i];
 }



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

DO NOT REPLY [Bug 44877] ClassCastException due to bad TagHandlerPool name generation of two different tags

2008-07-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=44877


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Comment #4 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 13:16:40 PST ---
This has been fixed for 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: r681189 - in /tomcat: connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 13:13:06 2008
New Revision: 681189

URL: http://svn.apache.org/viewvc?rev=681189&view=rev
Log:
Log errors for AJP signoffs at DEBUG level, since it is harmless if mod_jk has 
hung up the phone.

Modified:
tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java?rev=681189&r1=681188&r2=681189&view=diff
==
--- tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java 
(original)
+++ tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java Wed Jul 
30 13:13:06 2008
@@ -304,7 +304,7 @@
 try {
 jkIS.endMessage();
 } catch(IOException iex) {
-log.warn("Error sending end packet",iex);
+log.debug("Error sending end packet",iex);
 setStatus(JK_STATUS_ERROR);
 }
 if(getStatus() != JK_STATUS_ERROR) {

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=681189&r1=681188&r2=681189&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:13:06 2008
@@ -75,6 +75,14 @@
   
 
   
+  
+
+  
+Log errors for AJP signoffs at DEBUG level, since it is harmless if
+mod_jk has hung up the phone. (billbarker)
+  
+
+  
   
 
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681189&r1=681188&r2=681189&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 13:13:06 2008
@@ -86,11 +86,6 @@
   +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, 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



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

svn commit: r681160 - 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/AntCompiler.java

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 11:15:07 2008
New Revision: 681160

URL: http://svn.apache.org/viewvc?rev=681160&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31257
Quote endorsed dirs if they contain a space

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/AntCompiler.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=681160&r1=681159&r2=681160&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 11:15:07 2008
@@ -75,6 +75,13 @@
   
 
   
+  
+
+  
+31257: Quote endorsed dirs if they contain a space. (markt)
+  
+
+  
   
 
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681160&r1=681159&r2=681160&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 11:15:07 2008
@@ -79,12 +79,6 @@
   +1: markt
   -1: fhanik - same as all the above 
 
-* 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, 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

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/AntCompiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/AntCompiler.java?rev=681160&r1=681159&r2=681160&view=diff
==
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/AntCompiler.java 
(original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/AntCompiler.java 
Wed Jul 30 11:15:07 2008
@@ -171,8 +171,10 @@
 if(endorsed != null) {
 Javac.ImplementationSpecificArgument endorsedArg = 
 javac.createCompilerArg();
-endorsedArg.setLine("-J-Djava.endorsed.dirs="+endorsed);
-info.append("endorsed dir=" + endorsed + "\n");
+endorsedArg.setLine("-J-Djava.endorsed.dirs=" +
+quotePathList(endorsed));
+info.append("endorsed dir=" + quotePathList(endorsed) +
+"\n");
 } else {
 info.append("no endorsed dirs specified\n");
 }
@@ -272,5 +274,22 @@
 }
 }
 
-
+private String quotePathList(String list) {
+   StringBuffer result = new StringBuffer(list.length() + 10);
+   StringTokenizer st = new StringTokenizer(list, File.pathSeparator);
+   while (st.hasMoreTokens()) {
+   String token = st.nextToken();
+   if (token.indexOf(' ') == -1) {
+   result.append(token);
+   } else {
+   result.append('\"');
+   result.append(token);
+   result.append('\"');
+   }
+   if (st.hasMoreTokens()) {
+   result.append(File.pathSeparatorChar);
+   }
+   }
+   return result.toString();
+}
 }



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

DO NOT REPLY [Bug 31257] java.endorsed.dirs is not used when JSP compilation is forked

2008-07-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=31257


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Comment #5 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 11:14: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 29936] XML parser loading problems by container

2008-07-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=29936


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Comment #18 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 11:06: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: r681156 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 11:06:25 2008
New Revision: 681156

URL: http://svn.apache.org/viewvc?rev=681156&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=29936
Don't use parser from a webapp to parse web.xml and possibly context.xml files.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.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/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java?rev=681156&r1=681155&r2=681156&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
 Wed Jul 30 11:06:25 2008
@@ -322,10 +322,6 @@
 
 long t1=System.currentTimeMillis();
 
-if (webDigester == null){
-webDigester = createWebDigester();
-}
-
 URL url=null;
 // Process the application web.xml file
 synchronized (webDigester) {
@@ -606,10 +602,6 @@
   + " " + defaultWebXml + " " + file , e);
 }
 
-if (webDigester == null){
-webDigester = createWebDigester();
-}
-
 if (stream != null) {
 processDefaultWebConfig(webDigester, stream, source);
 webRuleSet.recycle();
@@ -768,9 +760,6 @@
 
 if (source == null)
 return;
-if (contextDigester == null){
-contextDigester = createContextDigester();
-}
 synchronized (contextDigester) {
 try {
 source.setByteStream(stream);
@@ -979,6 +968,16 @@
 protected void init() {
 // Called from StandardContext.init()
 
+if (webDigester == null){
+webDigester = createWebDigester();
+webDigester.getParser();
+}
+
+if (contextDigester == null){
+contextDigester = createContextDigester();
+contextDigester.getParser();
+}
+
 if (log.isDebugEnabled())
 log.debug(sm.getString("contextConfig.init"));
 context.setConfigured(false);

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=681156&r1=681155&r2=681156&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 11:06:25 2008
@@ -50,6 +50,10 @@
 requested. Patch provided by Charles R Caldarale. (markt)
   
   
+29936: Don't use parser from a webapp to parse web.xml and 
possibly
+context.xml files. (markt)
+  
+  
 44529: No roles specified (deny all) should take precedence
 over no auth-constraint specified (allow-all). (markt)


Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681156&r1=681155&r2=681156&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 11:06:25 2008
@@ -79,13 +79,6 @@
   +1: markt
   -1: fhanik - same as all the above 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=29936
-  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, 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



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

svn commit: r681150 - in /tomcat: container/tc5.5.x/catalina/src/conf/catalina.policy container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 11:01:44 2008
New Revision: 681150

URL: http://svn.apache.org/viewvc?rev=681150&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45293
Update name of commons-logging jar in security policy

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

Modified: tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy?rev=681150&r1=681149&r2=681150&view=diff
==
--- tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy (original)
+++ tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy Wed Jul 30 
11:01:44 2008
@@ -66,7 +66,7 @@
 };
 
 // These permissions apply to the commons-logging API
-grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar" {
+grant codeBase "file:${catalina.home}/bin/commons-logging-api-1.1.1.jar" {
 permission java.security.AllPermission;
 };
 

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=681150&r1=681149&r2=681150&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 11:01:44 2008
@@ -65,6 +65,10 @@
 Add additional permission required to read JDK logging configuration
 when running with a security manager. (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=681150&r1=681149&r2=681150&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 11:01:44 2008
@@ -66,11 +66,6 @@
0: fhanik - silently swallow an error, and default to the default config 
file, yoavs: don't like silent swallowing
   -1:
 
-* Change of jar name for policy file
-  http://people.apache.org/~markt/patches/2008-04-09-policy.patch
-  +1: markt, fhanik, yoavs
-  -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)



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

DO NOT REPLY [Bug 45293] catalina.policy prevents tomcat 5.5.26 from start

2008-07-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=45293


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #3 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 11:01:35 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: r681148 - in /tomcat: container/tc5.5.x/catalina/src/conf/catalina.policy container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 10:58:24 2008
New Revision: 681148

URL: http://svn.apache.org/viewvc?rev=681148&view=rev
Log:
Add additional permission required to read JDK logging configuration

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

Modified: tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy?rev=681148&r1=681147&r2=681148&view=diff
==
--- tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy (original)
+++ tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy Wed Jul 30 
10:58:24 2008
@@ -84,6 +84,7 @@
 grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
 permission java.util.PropertyPermission 
"java.util.logging.config.class", "read";
 permission java.util.PropertyPermission 
"java.util.logging.config.file", "read";
+permission java.io.FilePermission 
"${java.home}${file.separator}lib${file.separator}logging.properties", "read"; 
 permission java.lang.RuntimePermission "shutdownHooks";
 permission java.io.FilePermission 
"${catalina.base}${file.separator}conf${file.separator}logging.properties", 
"read";
 permission java.util.PropertyPermission "catalina.base", "read";

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=681148&r1=681147&r2=681148&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:58:24 2008
@@ -61,6 +61,10 @@
   
 Enable the CGIServlet to work with Windows Vista. (markt)
   
+  
+Add additional permission required to read JDK logging configuration
+when running with a security manager. (markt)
+  
 
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681148&r1=681147&r2=681148&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 10:58:24 2008
@@ -66,12 +66,6 @@
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, yoavs
-  -1:
-
 * Change of jar name for policy file
   http://people.apache.org/~markt/patches/2008-04-09-policy.patch
   +1: markt, fhanik, yoavs



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

svn commit: r681146 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml container/tc5.5.x/webapps/docs/config/ajp.xml current/tc5.5.x/STATUS.txt

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 10:54:23 2008
New Revision: 681146

URL: http://svn.apache.org/viewvc?rev=681146&view=rev
Log:
Fix for bug 44715. Document use of secret for AJP connector.

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/docs/config/ajp.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=681146&r1=681145&r2=681146&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:54:23 2008
@@ -69,6 +69,9 @@
 44541: Document packetSize attribute for AJP connector.
 (markt)
   
+  
+44715: Document use of secret for AJP connector. (markt)
+  
   
 45323: Add note that context.xml files can only contain a
 single Context element. (markt)

Modified: tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml?rev=681146&r1=681145&r2=681146&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml Wed Jul 30 10:54:23 
2008
@@ -292,6 +292,25 @@
   to a particular port number on a particular IP address.
 
 
+
+  Only requests from workers with this secret keyword will be accepted.
+  
+
+
+
+  If true and a secret has been configured, a correctly fomatted AJP
+  request (that includes the secret) will shutdown the Tomcat instance
+  associated with this connector. This is set to false by
+  default.
+
+
+
+  If set to true, then a random value for
+  request.secret will be generated. It is for use with
+  request.shutdownEnabled. This is set to false
+  by default.
+
+
 
   If set to true, the TCP_NO_DELAY option will be
   set on the server socket, which improves performance under most

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681146&r1=681145&r2=681146&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 10:54:23 2008
@@ -51,12 +51,6 @@
   +1: markt
   -1: fhanik - difficult to review "cleaned up" code, rainers backports 
doesn't have that, lets review those
 
-* 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,yoavs
-  -1:
-
 * 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



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

DO NOT REPLY [Bug 44715] Missing attribute in the AJP Connector (jk) configuration Doc.

2008-07-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=44715


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #3 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 10:54:08 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 44529] RealmBase authorization via hasResourcePermission not fully servlet spec compliant

2008-07-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=44529


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #3 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 10:50:30 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 45500] Error wjile implement HTTPS on IBM AIX Box - SunX509 KeyManagerFactory not available

2008-07-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=45500


Thiru <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Resolution|INVALID |FIXED




--- Comment #2 from Thiru <[EMAIL PROTECTED]>  2008-07-30 10:50:00 PST ---
modified Server.xml by adding this attribute to HTTPS Connector

algorithm="IbmX509"


-- 
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: r681143 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 10:49:50 2008
New Revision: 681143

URL: http://svn.apache.org/viewvc?rev=681143&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44529
No roles (deny all) trumps no auth-constraint (allow all)

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.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/realm/RealmBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java?rev=681143&r1=681142&r2=681143&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java
 Wed Jul 30 10:49:50 2008
@@ -774,17 +774,16 @@
 log.debug("No roles ");
 status = false; // No listed roles means no access at all
 denyfromall = true;
+break;
 } else {
 if(log.isDebugEnabled())
 log.debug("Passing all access");
-return (true);
+status = true;
 }
 } else if (principal == null) {
 if (log.isDebugEnabled())
 log.debug("  No user authenticated, cannot grant access");
-status = false;
-} else if(!denyfromall) {
-
+} else {
 for (int j = 0; j < roles.length; j++) {
 if (hasRole(principal, roles[j]))
 status = true;
@@ -794,7 +793,8 @@
 }
 }
 
-if (allRolesMode != AllRolesMode.STRICT_MODE && !status && principal 
!= null) {
+if (!denyfromall && allRolesMode != AllRolesMode.STRICT_MODE &&
+!status && principal != null) {
 if (log.isDebugEnabled()) {
 log.debug("Checking for all roles mode: " + allRolesMode);
 }

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=681143&r1=681142&r2=681143&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:49:50 2008
@@ -50,6 +50,10 @@
 requested. Patch provided by Charles R Caldarale. (markt)
   
   
+44529: No roles specified (deny all) should take precedence
+over no auth-constraint specified (allow-all). (markt)
+   
+  
 44673: Throw IOE if ServletInputStream is closed and a call
 is made to any read(), ready(), mark(), reset(), or skip() method as 
per
 javadocs for Reader. (markt)

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681143&r1=681142&r2=681143&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 10:49:50 2008
@@ -41,12 +41,6 @@
   +1: markt
   -1: fhanik - Rainer backported all the fixes, we should evaluate those, I'll 
add them at the bottom
 
-* 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, yoavs
-  -1:
-
 * 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)



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

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

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 10:46:08 2008
New Revision: 681141

URL: http://svn.apache.org/viewvc?rev=681141&view=rev
Log:
Fix CGI Servlet for Vista

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.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/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java?rev=681141&r1=681140&r2=681141&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
 Wed Jul 30 10:46:08 2008
@@ -667,9 +667,7 @@
 if (OS.indexOf("windows 9") > -1) {
 p = r.exec( "command.com /c set" );
 ignoreCase = true;
-} else if ( (OS.indexOf("nt") > -1)
-|| (OS.indexOf("windows 20") > -1)
-|| (OS.indexOf("windows xp") > -1) ) {
+} else if ((OS.indexOf("nt") > -1) || (OS.indexOf("windows") > -1) ) {
 // thanks to JuanFran for the xp fix!
 p = r.exec( "cmd.exe /c set" );
 ignoreCase = 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=681141&r1=681140&r2=681141&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:46:08 2008
@@ -54,6 +54,9 @@
 is made to any read(), ready(), mark(), reset(), or skip() method as 
per
 javadocs for Reader. (markt)
   
+  
+Enable the CGIServlet to work with Windows Vista. (markt)
+  
 
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681141&r1=681140&r2=681141&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 10:46:08 2008
@@ -41,11 +41,6 @@
   +1: markt
   -1: fhanik - Rainer backported all the fixes, we should evaluate those, I'll 
add them at the bottom
 
-* Fix CGI servlet for vista
-  http://people.apache.org/~markt/patches/2008-03-28-cgi-env.patch
-  +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



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

svn commit: r681139 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/ container/tc5.5.x/webapps/docs/ current/tc5.5.x/

2008-07-30 Thread markt 
Author: markt
Date: Wed Jul 30 10:42:11 2008
New Revision: 681139

URL: http://svn.apache.org/viewvc?rev=681139&view=rev
Log:
Fix bug 44673. Throw IOE if stream is closed and a call is made to any read(), 
ready(), mark(), reset(), or skip() method as per javadocs for Reader.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/InputBuffer.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
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/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/InputBuffer.java?rev=681139&r1=681138&r2=681139&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/InputBuffer.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/InputBuffer.java
 Wed Jul 30 10:42:11 2008
@@ -25,6 +25,7 @@
 import java.util.HashMap;
 
 import org.apache.catalina.security.SecurityUtil;
+import org.apache.catalina.util.StringManager;
 import org.apache.coyote.Request;
 import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.ByteChunk;
@@ -43,6 +44,11 @@
 implements ByteChunk.ByteInputChannel, CharChunk.CharInputChannel,
CharChunk.CharOutputChannel {
 
+/**
+ * The string manager for this package.
+ */
+protected static StringManager sm =
+StringManager.getManager(Constants.Package);
 
 // -- Constants
 
@@ -270,12 +276,20 @@
 
 public int readByte()
 throws IOException {
+
+if (closed)
+throw new IOException(sm.getString("inputBuffer.streamClosed"));
+
 return bb.substract();
 }
 
 
 public int read(byte[] b, int off, int len)
 throws IOException {
+
+if (closed)
+throw new IOException(sm.getString("inputBuffer.streamClosed"));
+
 return bb.substract(b, off, len);
 }
 
@@ -330,18 +344,30 @@
 
 public int read()
 throws IOException {
+
+if (closed)
+throw new IOException(sm.getString("inputBuffer.streamClosed"));
+
 return cb.substract();
 }
 
 
 public int read(char[] cbuf)
 throws IOException {
+
+if (closed)
+throw new IOException(sm.getString("inputBuffer.streamClosed"));
+
 return read(cbuf, 0, cbuf.length);
 }
 
 
 public int read(char[] cbuf, int off, int len)
 throws IOException {
+
+if (closed)
+throw new IOException(sm.getString("inputBuffer.streamClosed"));
+
 return cb.substract(cbuf, off, len);
 }
 
@@ -349,6 +375,10 @@
 public long skip(long n)
 throws IOException {
 
+
+if (closed)
+throw new IOException(sm.getString("inputBuffer.streamClosed"));
+
 if (n < 0) {
 throw new IllegalArgumentException();
 }
@@ -380,6 +410,10 @@
 
 public boolean ready()
 throws IOException {
+
+if (closed)
+throw new IOException(sm.getString("inputBuffer.streamClosed"));
+
 return (cb.getLength() > 0);
 }
 
@@ -391,6 +425,10 @@
 
 public void mark(int readAheadLimit)
 throws IOException {
+
+if (closed)
+throw new IOException(sm.getString("inputBuffer.streamClosed"));
+
 if (cb.getLength() <= 0) {
 cb.setOffset(0);
 cb.setEnd(0);
@@ -414,6 +452,10 @@
 
 public void reset()
 throws IOException {
+
+if (closed)
+throw new IOException(sm.getString("inputBuffer.streamClosed"));
+
 if (state == CHAR_STATE) {
 if (markPos < 0) {
 cb.recycle();

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties?rev=681139&r1=681138&r2=681139&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
 Wed Jul 30 10:42:11 2008
@@ -17,7 +17,6 @@
 #
 # CoyoteConnector
 #
-
 coyoteConnector.alreadyInitialized=The connector has already been initialized
 coyoteConnector.alreadyStarted=The connector has already been started
 coyoteConnector.cannotRegisterProtocol=Cannot register MBean for the Protocol
@@ -32,17

DO NOT REPLY [Bug 44673] ServletInputStream still readable even when closed

2008-07-30 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=44673


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #2 from Mark Thomas <[EMAIL PROTECTED]>  2008-07-30 10:41:51 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

2008-07-30 Thread 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 @@