DO NOT REPLY [Bug 38346] InputBuffer breaks request.readLine()

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=38346

--- Comment #8 from naani...@gmail.com 2011-10-25 06:49:15 UTC ---
thi issue still occurs with tomcat 5.5.28. Could you please let me know, how to
apply this patch to 5.5.28?

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Publishing zips to the maven repo

2011-10-25 Thread Henri Gomez
 I have to search what it's done exactly with that. (BTW version is
 defined in poms with maven).
 I will try to work on that later this week.

Thanks

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 38346] InputBuffer breaks request.readLine()

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=38346

--- Comment #9 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 08:33:03 
UTC ---
This is very unlikely the same problem.

Bugzilla is not a support form.
Please post your problem description to the Tomcat users list.

Regards,

Rainer

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 52083] New: java.lang.NullPointerException at org.apache.catalina.connector.Request.getSession

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52083

 Bug #: 52083
   Summary: java.lang.NullPointerException at
org.apache.catalina.connector.Request.getSession
   Product: Tomcat 6
   Version: 6.0.32
  Platform: Other
OS/Version: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: kevinser...@sina.com
Classification: Unclassified


Started tomcat 6.0.32, and then access web app, got a NullPointExceptions.
Logs:
Oct 21, 2011 4:05:41 PM org.apache.catalina.core.StandardWrapperValve invoke
SEVERE: Servlet.service() for servlet PageEntry threw exception
Throwable occurred: java.lang.NullPointerException
at
javax.servlet.ServletResponseWrapper.isCommitted(ServletResponseWrapper.java:174)
at
javax.servlet.ServletResponseWrapper.isCommitted(ServletResponseWrapper.java:174)
at org.apache.catalina.connector.Request.doGetSession(Request.java:2365)
at org.apache.catalina.connector.Request.getSession(Request.java:2120)
at
org.apache.catalina.connector.RequestFacade.getSession(RequestFacade.java:833)
at com.ibm.evo.util.UserSession.wrap(UserSession.java:74)
at
com.ibm.evo.servlets.filters.ServletFilter.doFilter(ServletFilter.java:87)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:219)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:563)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127)
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:298)
at
org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:859)
at
org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:588)
at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:489)
at java.lang.Thread.run(Thread.java:736)

Is this a tomcat 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 52083] java.lang.NullPointerException at org.apache.catalina.connector.Request.getSession

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52083

--- Comment #1 from kevinser...@sina.com 2011-10-25 08:37:31 UTC ---
I use request.getSession(true) in code.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 52083] java.lang.NullPointerException at org.apache.catalina.connector.Request.getSession

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52083

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #2 from Mark Thomas ma...@apache.org 2011-10-25 08:43:53 UTC ---
You have a bug in your application. Please use the Tomcat users mailing list
for further assistance.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1188399 - in /tomcat/trunk/java/org/apache/catalina: authenticator/ connector/

2011-10-25 Thread Rainer Jung
Hi Mark,

since this mostly deprecates getters and setters, did you cross check,
whether they were published via JMX? I guess your eclipse tooling
wouldn't do that for you.

I went through the list and there was nothing I could immediately spot,
but it might be good if you (or others) check it as well.

Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1188399 - in /tomcat/trunk/java/org/apache/catalina: authenticator/ connector/

2011-10-25 Thread Mark Thomas
On 25/10/2011 09:52, Rainer Jung wrote:
 Hi Mark,
 
 since this mostly deprecates getters and setters, did you cross check,
 whether they were published via JMX? I guess your eclipse tooling
 wouldn't do that for you.

When reviewing the results from the UCDetector, I ignored a number of
results for various reasons. JMX was one of them. (Property
getter/setters that are accessed via reflection was the other main one).
I can't swear I checked every single method but I did check the ones
where I thought there was a chance they were exposed via JMX.

 I went through the list and there was nothing I could immediately spot,
 but it might be good if you (or others) check it as well.

Thanks for the double check.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 38346] InputBuffer breaks request.readLine()

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=38346

--- Comment #10 from naani...@gmail.com 2011-10-25 09:02:16 UTC ---
Thanks for your response Jung. We have an environment using HTTP connector. The
issue does not occur, other environment using AJP connector.

In code we are using
BufferedReader in = request.getReader();

When a request is sent on AJP connector environment, the above code reads only
8192 length, not whole.

But if a request is sent on HTTP connector environment, the same method reads
whole data. do you have any idea.. Please help.

The Tomcat version same in the both of the environments above.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 38346] InputBuffer breaks request.readLine()

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=38346

--- Comment #11 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 09:07:46 
UTC ---
Please discuss this on the Tomcat users list, see
http://tomcat.apache.org/lists.html

Thank you.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1188313 [1/5] - in /tomcat/trunk/java: javax/el/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/catalina/deploy/ org/apache/cat

2011-10-25 Thread Konstantin Kolinko
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?r1=1188313r2=1188312pathrev=1188313

The new value of webXml.mergeConflictOrder is wrong, it is
concatenation of two values.

It is the only glitch that I noted.

Is your tool able to find properties that are not mentioned in
*.properties files?

Best regards,
Konstantin Kolinko

2011/10/24  ma...@apache.org:
 Author: markt
 Date: Mon Oct 24 19:18:39 2011
 New Revision: 1188313

 URL: http://svn.apache.org/viewvc?rev=1188313view=rev
 Log:
 Remove unused properties

 Removed:
    
 tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties
    
 tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties
 Modified:
    tomcat/trunk/java/javax/el/LocalStrings.properties
    tomcat/trunk/java/javax/el/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
    
 tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
    
 tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
    
 tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
    tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
    tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties
    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties
    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties
    tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
    
 tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
    
 tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/users/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/users/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties
    tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
    

svn commit: r1188612 - /tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties

2011-10-25 Thread markt
Author: markt
Date: Tue Oct 25 11:25:56 2011
New Revision: 1188612

URL: http://svn.apache.org/viewvc?rev=1188612view=rev
Log:
Fix missing new line in r1188313

Modified:
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?rev=1188612r1=1188611r2=1188612view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties Tue 
Oct 25 11:25:56 2011
@@ -24,7 +24,8 @@ webXml.reservedName=A web.xml file was d
 webXml.mergeConflictDisplayName=The display name was defined in multiple 
fragments with different values including fragment with name [{0}] located at 
[{1}]
 webXml.mergeConflictFilter=The Filter [{0}] was defined inconsistently in 
multiple fragments including fragment with name [{1}] located at [{2}]
 webXml.mergeConflictLoginConfig=A LoginConfig was defined inconsistently in 
multiple fragments including fragment with name [{0}] located at [{1}]
-webXml.mergeConflictOrder=Fragment relative ordering contains circular 
references. This can be resolved by using absolute ordering in 
web.xml.webXml.mergeConflictResource=The Resource [{0}] was defined 
inconsistently in multiple fragments including fragment with name [{1}] located 
at [{2}]
+webXml.mergeConflictOrder=Fragment relative ordering contains circular 
references. This can be resolved by using absolute ordering in web.xml.
+webXml.mergeConflictResource=The Resource [{0}] was defined inconsistently in 
multiple fragments including fragment with name [{1}] located at [{2}]
 webXml.mergeConflictServlet=The Servlet [{0}] was defined inconsistently in 
multiple fragments including fragment with name [{1}] located at [{2}]
 webXml.mergeConflictSessionCookieName=The session cookie name was defined 
inconsistently in multiple fragments with different values including fragment 
with name [{0}] located at [{1}]
 webXml.mergeConflictSessionCookieDomain=The session cookie domain was defined 
inconsistently in multiple fragments with different values including fragment 
with name [{0}] located at [{1}]



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1188313 [1/5] - in /tomcat/trunk/java: javax/el/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/catalina/deploy/ org/apache/cat

2011-10-25 Thread Mark Thomas
On 25/10/2011 12:06, Konstantin Kolinko wrote:
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?r1=1188313r2=1188312pathrev=1188313
 
 The new value of webXml.mergeConflictOrder is wrong, it is
 concatenation of two values.
 
 It is the only glitch that I noted.

Thanks. Fixed.

 Is your tool able to find properties that are not mentioned in
 *.properties files?

IntelliJ doesn't appear to be able to do that. JInto can. I may
re-install that and work my way through but as I said before it is
rather clunky. I'm still looking for alternative options.

Mark

 
 Best regards,
 Konstantin Kolinko
 
 2011/10/24  ma...@apache.org:
 Author: markt
 Date: Mon Oct 24 19:18:39 2011
 New Revision: 1188313

 URL: http://svn.apache.org/viewvc?rev=1188313view=rev
 Log:
 Remove unused properties

 Removed:

 tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties

 tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties
 Modified:
tomcat/trunk/java/javax/el/LocalStrings.properties
tomcat/trunk/java/javax/el/LocalStrings_es.properties

 tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties

 tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties

 tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties

 tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties

 tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties

 tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties

 tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties

svn commit: r1188644 - /tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java

2011-10-25 Thread markt
Author: markt
Date: Tue Oct 25 13:14:05 2011
New Revision: 1188644

URL: http://svn.apache.org/viewvc?rev=1188644view=rev
Log:
Remove unused code missed in earlier commit

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1188644r1=1188643r2=1188644view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Tue 
Oct 25 13:14:05 2011
@@ -34,7 +34,6 @@ import org.apache.catalina.SessionListen
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.valves.ValveBase;
-import org.apache.tomcat.util.res.StringManager;
 
 
 /**
@@ -91,14 +90,6 @@ public class SingleSignOn extends ValveB
 
 
 /**
- * The string manager for this package.
- */
-@Deprecated
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
-
-
-/**
  * Optional SSO cookie domain.
  */
 private String cookieDomain;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 52071] base.path basic choice (/usr/share/java) in build.properties.default is problematic

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52071

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX

--- Comment #1 from Mark Thomas ma...@apache.org 2011-10-25 16:53:12 UTC ---
I am resolving this as WONTFIX for a variety of reasons. In no particular
order:

1. The default has been /usr/share/java for as long as I can remember and this
is the first time an issue has been raised. I conclude from that that this is
not an issue for the vast majority of folks.

2. Any change will break things for folks that are happily using the default.

3. The build process only ever adds to that location . It does not delete or
replace existing files. That greatly reduces the chances of any harm being
done.

4. It is configurable so folks that don't like the default can easily change
it.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 46264] Shutting down tomcat with large number of contexts is slow

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46264

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

  Attachment #27772|0   |1
is obsolete||

--- Comment #27 from Mark Thomas ma...@apache.org 2011-10-25 17:27:35 UTC ---
Created attachment 27846
  -- https://issues.apache.org/bugzilla/attachment.cgi?id=27846
Threaded start, stop and deployment for Contexts

Updated patch without the line-ending issue of the previous one. I intend to
apply this in the next day or so.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1188822 - in /tomcat/trunk/java/org/apache/catalina: ./ core/

2011-10-25 Thread markt
Author: markt
Date: Tue Oct 25 17:42:43 2011
New Revision: 1188822

URL: http://svn.apache.org/viewvc?rev=1188822view=rev
Log:
Deprecate unused code in o.a.catalina.core

Modified:
tomcat/trunk/java/org/apache/catalina/Container.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java

Modified: tomcat/trunk/java/org/apache/catalina/Container.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Container.java?rev=1188822r1=1188821r2=1188822view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Container.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Container.java Tue Oct 25 17:42:43 
2011
@@ -176,6 +176,7 @@ public interface Container extends Lifec
 /**
  * Return an object which may be utilized for mapping to this component.
  */
+@Deprecated
 public Object getMappingObject();
 
 

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1188822r1=1188821r2=1188822view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Oct 
25 17:42:43 2011
@@ -217,6 +217,7 @@ public class ApplicationContext
  * The path must begin with a / and is interpreted as relative to the
  * current context root.
  */
+@Deprecated
 public DirContext getResources() {
 
 return context.getResources();
@@ -1499,6 +1500,7 @@ public class ApplicationContext
 return this.context;
 }
 
+@Deprecated
 protected MapString,String getReadonlyAttributes() {
 return this.readOnlyAttributes;
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=1188822r1=1188821r2=1188822view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Tue 
Oct 25 17:42:43 2011
@@ -51,6 +51,7 @@ class ApplicationHttpResponse extends Ht
  *
  * @param response The servlet response being wrapped
  */
+@Deprecated
 public ApplicationHttpResponse(HttpServletResponse response) {
 
 this(response, false);
@@ -351,6 +352,7 @@ class ApplicationHttpResponse extends Ht
 /**
  * Return the included flag for this response.
  */
+@Deprecated
 boolean isIncluded() {
 
 return (this.included);

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java?rev=1188822r1=1188821r2=1188822view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java Tue Oct 
25 17:42:43 2011
@@ -49,6 +49,7 @@ class ApplicationResponse extends Servle
  *
  * @param response The servlet response being wrapped
  */
+@Deprecated
 public ApplicationResponse(ServletResponse response) {
 
 this(response, false);
@@ -174,6 +175,7 @@ class ApplicationResponse extends Servle
 /**
  * Return the included flag for this response.
  */
+@Deprecated
 boolean isIncluded() {
 
 return (this.included);

Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1188822r1=1188821r2=1188822view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Tue Oct 25 
17:42:43 2011
@@ -439,6 +439,7 @@ public abstract class ContainerBase exte
 /**
  * Return an object which may be utilized for mapping to this component.
  */
+@Deprecated
 @Override
 public Object getMappingObject() {
 return this;

Modified: 

svn commit: r1188823 - /tomcat/trunk/java/org/apache/catalina/filters/

2011-10-25 Thread markt
Author: markt
Date: Tue Oct 25 17:43:47 2011
New Revision: 1188823

URL: http://svn.apache.org/viewvc?rev=1188823view=rev
Log:
Clean-up. No functional change.

Modified:
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
tomcat/trunk/java/org/apache/catalina/filters/Constants.java
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/filters/FilterBase.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java

tomcat/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java?rev=1188823r1=1188822r2=1188823view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java 
Tue Oct 25 17:43:47 2011
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.catalina.filters;
 
 import java.io.IOException;

Modified: tomcat/trunk/java/org/apache/catalina/filters/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/Constants.java?rev=1188823r1=1188822r2=1188823view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/Constants.java Tue Oct 25 
17:43:47 2011
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.filters;
 
 
@@ -26,7 +24,6 @@ package org.apache.catalina.filters;
  * @author Craig R. McClanahan
  * @version $Id$
  */
-
 public final class Constants {
 
 public static final String Package = org.apache.catalina.filters;

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?rev=1188823r1=1188822r2=1188823view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java Tue 
Oct 25 17:43:47 2011
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.catalina.filters;
 
 import java.io.IOException;
@@ -204,14 +203,16 @@ public class CsrfPreventionFilter extend
 for (int j = 0; j  random.length; j++) {
 byte b1 = (byte) ((random[j]  0xf0)  4);
 byte b2 = (byte) (random[j]  0x0f);
-if (b1  10)
+if (b1  10) {
 buffer.append((char) ('0' + b1));
-else
+} else {
 buffer.append((char) ('A' + (b1 - 10)));
-if (b2  10)
+}
+if (b2  10) {
 buffer.append((char) ('0' + b2));
-else
+} else {
 buffer.append((char) ('A' + (b2 - 10)));
+}
 }
 
 return buffer.toString();
@@ -220,7 +221,7 @@ public class CsrfPreventionFilter extend
 protected static class CsrfResponseWrapper
 extends HttpServletResponseWrapper {
 
-private String nonce;
+private final String nonce;
 
 public CsrfResponseWrapper(HttpServletResponse response, String nonce) 
{
 super(response);
@@ -257,8 +258,9 @@ public class CsrfPreventionFilter extend
  */
 private String addNonce(String url) {
 
-if ((url == null) || (nonce == null))
+if ((url == null) || (nonce == null)) {
 return (url);
+}
 
 String path = url;
 String query = ;

Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1188823r1=1188822r2=1188823view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ 

svn commit: r1188832 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/core/

2011-10-25 Thread markt
Author: markt
Date: Tue Oct 25 17:53:29 2011
New Revision: 1188832

URL: http://svn.apache.org/viewvc?rev=1188832view=rev
Log:
Make unused code as deprecated prior to removal in Tomcat 8.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Container.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationResponse.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 25 17:53:29 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1188303-1188
 305,1188399
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 

Re: svn commit: r1187916 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml

2011-10-25 Thread Christopher Schultz
Rainer,

On 10/23/2011 12:19 PM, rj...@apache.org wrote:
 +/*
 + * Find the first occurrence of path in uri tokenized by /.
 + * The comparison is done case insensitive.
 + */
 +static const char *find_path_in_uri(const char *uri, const char *path)
 +{
 +size_t len = strlen(path);
 +while (uri = strchr(uri, '/')) {

I think // in a URL will cause this loop to exit early, possibly
avoiding this security check.

 +uri++;
 +if (!strncmp(uri, path, len) 

strncmp doesn't use case-insensitive compare: will this ever match if
you use web-inf (as below)?

 +(*(uri + len) == '/' ||
 + strlen(uri) == len)) {
 +return uri;
 +}
 +}
 +return NULL;
 +}
 +
  static int uri_is_web_inf(const char *uri)
  {
 -if (stristr(uri, /web-inf)) {
 +if (find_path_in_uri(uri, web-inf)) {
  return JK_TRUE;

This will return JK_TRUE if web-inf occurs at any place in the path,
not just at the context level. Is that a problem? I can imagine that a
request for /context/foo/WEB-INF/something might be valid.

-chris



signature.asc
Description: OpenPGP digital signature


Re: svn commit: r1187916 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml

2011-10-25 Thread Christopher Schultz
Rainer,

On 10/23/2011 12:19 PM, rj...@apache.org wrote:
 +static const char *find_path_in_uri(const char *uri, const char *path)
 +{
 +size_t len = strlen(path);
 +while (uri = strchr(uri, '/')) {
 +uri++;
 +if (!strncmp(uri, path, len) 
 +(*(uri + len) == '/' ||
 + strlen(uri) == len)) {
 +return uri;
 +}
 +}

Also, 'len' is never updated in the loop, so the call to strncmp could
potentially cause a SIGSEGV -- but only in the cases where something
truly nefarious is going on, anyway.

-chris



signature.asc
Description: OpenPGP digital signature


DO NOT REPLY [Bug 35959] mod_jk not independant of UseCanonicalName

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=35959

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||INVALID

--- Comment #9 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 18:08:21 
UTC ---
No response in nearly 4 years.
User didn't provide a concrete use case for the feature.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 39967] mod_jk gives segmentation fault when apache is started as root

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=39967

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||INVALID

--- Comment #8 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 18:09:35 
UTC ---
Closing since no feedback for almost 4 years.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1188841 - in /tomcat/trunk/java/org/apache/catalina: ./ core/ loader/

2011-10-25 Thread markt
Author: markt
Date: Tue Oct 25 18:13:51 2011
New Revision: 1188841

URL: http://svn.apache.org/viewvc?rev=1188841view=rev
Log:
Remove deprecated code from o.a.catalina.core

Modified:
tomcat/trunk/java/org/apache/catalina/Container.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java

Modified: tomcat/trunk/java/org/apache/catalina/Container.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Container.java?rev=1188841r1=1188840r2=1188841view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Container.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Container.java Tue Oct 25 18:13:51 
2011
@@ -174,13 +174,6 @@ public interface Container extends Lifec
 
 
 /**
- * Return an object which may be utilized for mapping to this component.
- */
-@Deprecated
-public Object getMappingObject();
-
-
-/**
  * Return the JMX name associated with this container.
  */
 public ObjectName getObjectName();

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1188841r1=1188840r2=1188841view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Oct 
25 18:13:51 2011
@@ -209,25 +209,9 @@ public class ApplicationContext
  */
 private boolean newServletContextListenerAllowed = true;
 
-// - Public Methods
-
-
-/**
- * Return the resources object that is mapped to a specified path.
- * The path must begin with a / and is interpreted as relative to the
- * current context root.
- */
-@Deprecated
-public DirContext getResources() {
-
-return context.getResources();
-
-}
-
 
 // - ServletContext Methods
 
-
 /**
  * Return the value of the specified context attribute, if any;
  * otherwise return codenull/code.
@@ -1500,10 +1484,6 @@ public class ApplicationContext
 return this.context;
 }
 
-@Deprecated
-protected MapString,String getReadonlyAttributes() {
-return this.readOnlyAttributes;
-}
 /**
  * Clear all application-created attributes.
  */

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=1188841r1=1188840r2=1188841view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Tue 
Oct 25 18:13:51 2011
@@ -42,23 +42,8 @@ import javax.servlet.http.HttpServletRes
 
 class ApplicationHttpResponse extends HttpServletResponseWrapper {
 
-
 // --- Constructors
 
-
-/**
- * Construct a new wrapped response around the specified servlet response.
- *
- * @param response The servlet response being wrapped
- */
-@Deprecated
-public ApplicationHttpResponse(HttpServletResponse response) {
-
-this(response, false);
-
-}
-
-
 /**
  * Construct a new wrapped response around the specified servlet response.
  *
@@ -350,17 +335,6 @@ class ApplicationHttpResponse extends Ht
 //  Package Methods
 
 /**
- * Return the included flag for this response.
- */
-@Deprecated
-boolean isIncluded() {
-
-return (this.included);
-
-}
-
-
-/**
  * Set the included flag for this response.
  *
  * @param included The new included flag
@@ -382,6 +356,4 @@ class ApplicationHttpResponse extends Ht
 super.setResponse(response);
 
 }
-
-
 }

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java?rev=1188841r1=1188840r2=1188841view=diff

DO NOT REPLY [Bug 40208] Request-Dump when ErrorDocument in httpd.conf is a jsp

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=40208

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||INVALID

--- Comment #2 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 18:21:05 
UTC ---
No response for about 5 years.
Closing as invalid.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 42366] Memory leak in newer mod_jk version when connection is abortet by the client

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=42366

--- Comment #7 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 18:22:20 
UTC ---
No response for 3.5 years.
Closing as invalid.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 42366] Memory leak in newer mod_jk version when connection is abortet by the client

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=42366

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||INVALID

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 44290] mod_jk/1.2.26: retry is not useful for an important use case

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44290

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #3 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 18:26:00 
UTC ---
Sorry for the long silence.

If you are still observing this, could you please update to 1.2.32? There have
been lots of improvement. If the problem persists, please provide a JK log
file. If you can reproduce the problem on a test system, a debug log file would
be nice, otherwise the info log level should still be helpful.

In addition: please issue netstat -an on the Apache and Tomcat servers once
the problem happens and provide the output.

Thanks!

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 43968] [patch] support ipv6 with mod_jk

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=43968

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 44349] mod_jk/1.2.26 module does not read worker.status.sticky_session_force property correctly

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44349

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #22 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 18:30:20 
UTC ---
Sorry for the long delay.

Could you please retest with version 1.2.32 is the problem persists?
There have been multiple changes to the SHM handling, so it could well be that
the problem is gone.

Thanks!

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 45395] MsgAjp dump method does not dump packet when being written

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45395

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Status|NEW |RESOLVED
  Component|Common  |Connectors
 Resolution||INVALID
Product|Tomcat Connectors   |Tomcat 6
   Target Milestone|--- |default

--- Comment #1 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 18:48:04 
UTC ---
I don't understand your explanation.

The output would contain the bigger of len+4 and pos limited to 1000 bytes. So
if pos were bigger than 8, you would see more characters. It is more likely,
that cpBytes() had the problem, that the packet was empty, but more data than
would fit into it were supposed to be copied in (something like that).

Feel free to reopen, if you can provide additional evidence what to improve
here.

Regards,

Rainer

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1188856 - in /tomcat/jk/trunk: native/common/jk_mt.h xdocs/miscellaneous/changelog.xml

2011-10-25 Thread rjung
Author: rjung
Date: Tue Oct 25 19:04:27 2011
New Revision: 1188856

URL: http://svn.apache.org/viewvc?rev=1188856view=rev
Log:
47038: Fix compiler warning when using --enable-flock
for configure.

Modified:
tomcat/jk/trunk/native/common/jk_mt.h
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/common/jk_mt.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_mt.h?rev=1188856r1=1188855r2=1188856view=diff
==
--- tomcat/jk/trunk/native/common/jk_mt.h (original)
+++ tomcat/jk/trunk/native/common/jk_mt.h Tue Oct 25 19:04:27 2011
@@ -92,12 +92,14 @@ typedef void *JK_CRIT_SEC;
 #include fcntl.h
 
 
-#define USE_FLOCK_LK 0
 #if HAVE_FLOCK
 #ifdef JK_USE_FLOCK
 #define USE_FLOCK_LK 1
 #endif
 #endif
+#ifndef USE_FLOCK_LK
+#define USE_FLOCK_LK 0
+#endif
 
 #if USE_FLOCK_LK
 #include sys/file.h

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1188856r1=1188855r2=1188856view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Tue Oct 25 19:04:27 2011
@@ -44,6 +44,10 @@
   br /
   subsection name=Native
 changelog
+  fix
+bug47038/bug: Fix compiler warning when using --enable-flock
+ for configure. (rjung)
+  /fix
   add
 bug51326/bug: URI Map: Add session_cookie and session_path
 rule extensions. Contributed by Eiji Takahashi. (rjung)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 47038] USE_FLOCK_LK redefined compiler warning when using --enable-flock

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47038

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 19:02:41 
UTC ---
Fixed in r1188856.
Will be part of version 1.2.33.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 35959] mod_jk not independant of UseCanonicalName

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=35959

Sven sven.koeh...@gmail.com changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |

--- Comment #10 from Sven sven.koeh...@gmail.com 2011-10-25 19:03:59 UTC ---
(In reply to comment #9)
 No response in nearly 4 years.
 User didn't provide a concrete use case for the feature.

UseCanonicalName influences things like redirects on the apache side. As far as
I can recall, a redirect will use the canonical name if UseCanonicalName=on.
That behaviour of apache can be totally undesired, since obviously the http
client would be redirected to another domain and therefor cookies will be
invalid 
and whatnot.

On the other hand, UseCanonicalName=on was the only way to make sure that a
http-request that matched a certain vhost on the apache site goes to a specific
tomcat vhost. With UseCanonicalName=off you would basically have to adjust the
tomcat config so that resembles the apache config with its servernames and
serveraliases as close as possible. I'm not sure, if the latter is even
possible in any case. The apache configuration language might be more powerful
than the tomcat's.

So with respect to mod_jk, UseCanonicalName=on can be desired  while at the
same time UseCanonicalName=off can be desired for redirect on the apache side.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 47327] remote_user not logged in apache logfile

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47327

--- Comment #1 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 19:05:40 
UTC ---
This would be a protocol enhancement for AJP.

You can work around the issue by using a filter that returns the user id as a
response header. Response headers can be logged with mod_log_config using the
%{headername}o syntax in the LogFormat.

Note that a response header is sent to the client. Usually there should be no
security issue in passing the user name back to the client, but in special
cases it might be.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 47617] include time spent doing ajp_get_endpoint() in error log

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47617

--- Comment #1 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 19:09:37 
UTC ---
I hesitate to add yet another call to the clock here (for each request).

Usually the wait time will be close to the defined acquire timeout.

Do you have a more concrete reason, why you want to add this? Did you observe a
situation, where the acquire timeout wasn't respected?

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 47617] include time spent doing ajp_get_endpoint() in error log

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47617

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 47750] Loss of worker settings when changing via jkstatus

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47750

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

  Component|Common  |isapi

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 47840] A broken worker name is written in the log file.

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47840

--- Comment #6 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 19:12:18 
UTC ---
Eiji: Does this problem still exist in 1.2.32?

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1188865 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c

2011-10-25 Thread timw
Author: timw
Date: Tue Oct 25 19:18:21 2011
New Revision: 1188865

URL: http://svn.apache.org/viewvc?rev=1188865view=rev
Log:
Fixing mod_jk build on Windows with strict C style variable declarations.

Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1188865r1=1188864r2=1188865view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Tue Oct 25 19:18:21 2011
@@ -246,11 +246,13 @@ typedef struct
 /*
  * Request specific configuration
  */
-typedef struct
+struct jk_request_conf
 {
 rule_extension_t *rule_extensions;
 int jk_handled;
-} jk_request_conf_t;
+};
+
+typedef struct jk_request_conf jk_request_conf_t;
 
 struct apache_private_data
 {
@@ -750,6 +752,7 @@ static int init_ws_service(apache_privat
 const char *stateless = NULL;
 const char *route = NULL;
 rule_extension_t *e;
+jk_request_conf_t *rconf;
 
 /* Copy in function pointers (which are really methods) */
 s-start_response = ws_start_response;
@@ -792,8 +795,8 @@ static int init_ws_service(apache_privat
 if (conf-options  JK_OPT_FLUSHEADER)
 s-flush_header = 1;
 
-jk_request_conf_t *rconf = (jk_request_conf_t 
*)ap_get_module_config(r-request_config,
- 
jk_module);
+rconf = (jk_request_conf_t *)ap_get_module_config(r-request_config, 
jk_module);
+
 e = rconf-rule_extensions;
 if (e) {
 s-extension.reply_timeout = e-reply_timeout;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 49413] Apache Mod_jk 1.2.30 is shutting down communication with tomcat and getting socket error read.

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49413

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #5 from Rainer Jung rainer.j...@kippdata.de 2011-10-25 19:20:44 
UTC ---
The patch was applied as r952980 and is contained in version 1.2.31 and beyond.
If you think the bug is still in the latest version 1.2.32 please reopen.

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1188878 - /tomcat/jk/trunk/native/apache-1.3/mod_jk.c

2011-10-25 Thread rjung
Author: rjung
Date: Tue Oct 25 19:32:25 2011
New Revision: 1188878

URL: http://svn.apache.org/viewvc?rev=1188878view=rev
Log:
Fixing mod_jk build on Windows with strict
C style variable declarations.

Port of Tim's fix from apache-2.0 to apache-1.3.

Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c

Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1188878r1=1188877r2=1188878view=diff
==
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Tue Oct 25 19:32:25 2011
@@ -216,11 +216,13 @@ typedef struct
 /*
  * Request specific configuration
  */
-typedef struct
+struct jk_request_conf
 {
 rule_extension_t *rule_extensions;
 int jk_handled;
-} jk_request_conf_t;
+};
+
+typedef struct jk_request_conf jk_request_conf_t;
 
 /*
  * The private, or subclass portion of the web server service class for
@@ -695,6 +697,7 @@ static int init_ws_service(apache_privat
 const char *stateless = NULL;
 const char *route = NULL;
 rule_extension_t *e;
+jk_request_conf_t *rconf;
 
 /* Copy in function pointers (which are really methods) */
 s-start_response = ws_start_response;
@@ -738,8 +741,8 @@ static int init_ws_service(apache_privat
 if (conf-options  JK_OPT_FLUSHEADER)
 s-flush_header = 1;
 
-jk_request_conf_t *rconf = (jk_request_conf_t 
*)ap_get_module_config(r-request_config,
- 
jk_module);
+rconf = (jk_request_conf_t *)ap_get_module_config(r-request_config, 
jk_module);
+
 e = rconf-rule_extensions;
 if (e) {
 s-extension.reply_timeout = e-reply_timeout;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1187916 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml

2011-10-25 Thread Rainer Jung
On 25.10.2011 20:07, Christopher Schultz wrote:
 Rainer,
 
 On 10/23/2011 12:19 PM, rj...@apache.org wrote:
 +static const char *find_path_in_uri(const char *uri, const char
 *path) +{ +size_t len = strlen(path); +while (uri =
 strchr(uri, '/')) { +uri++; +if (!strncmp(uri,
 path, len)  +(*(uri + len) == '/' || +
 strlen(uri) == len)) { +return uri; +} +
 }
 
 Also, 'len' is never updated in the loop, so the call to strncmp
 could potentially cause a SIGSEGV -- but only in the cases where
 something truly nefarious is going on, anyway.

Hmmm, I don't get that: path isn't changed, strncmp() will never
compare beyond terminating '0', and uri+len must be inside uri if
length of path is len, and uri and path coincide for len chars. Of
course *(uri+len) could be '0', but that's OK.

Regards,

Rainer


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1187916 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml

2011-10-25 Thread Rainer Jung
On 25.10.2011 20:03, Christopher Schultz wrote:
 Rainer,
 
 On 10/23/2011 12:19 PM, rj...@apache.org wrote:
 +/* + * Find the first occurrence of path in uri tokenized by
 /. + * The comparison is done case insensitive. + */ +static
 const char *find_path_in_uri(const char *uri, const char *path) 
 +{ +size_t len = strlen(path); +while (uri = strchr(uri,
 '/')) {
 
 I think // in a URL will cause this loop to exit early, possibly 
 avoiding this security check.

Why should it? strchr() goes to all occurances of '/' and the loop
will exit at the first occurance which is followed by path and '/' or
'0'. Note the not so nice strcmp() convention that it returns 0 for
equality, so !strncmp() means equality.

 +uri++; +if (!strncmp(uri, path, len) 
 
 strncmp doesn't use case-insensitive compare: will this ever match
 if you use web-inf (as below)?

Konstantin already observed that. I fixed it yesterday in r1188226.

 +(*(uri + len) == '/' || + strlen(uri) ==
 len)) { +return uri; +} +} +return
 NULL; +} + static int uri_is_web_inf(const char *uri) { -if
 (stristr(uri, /web-inf)) { +if (find_path_in_uri(uri,
 web-inf)) { return JK_TRUE;
 
 This will return JK_TRUE if web-inf occurs at any place in the
 path, not just at the context level. Is that a problem? I can
 imagine that a request for /context/foo/WEB-INF/something might be
 valid.

But that was the original intention. Anything below web-inf should be
restricted from access, independent of how deeply below it is. That
was the original behaviour. Don't want to change that.

Thanks for the review!

Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1187916 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml

2011-10-25 Thread Christopher Schultz
All,

On 10/25/2011 2:03 PM, Christopher Schultz wrote:
 On 10/23/2011 12:19 PM, rj...@apache.org wrote:

 +if (!strncmp(uri, path, len) 
 
 strncmp doesn't use case-insensitive compare: will this ever match if
 you use web-inf (as below)?

Duh just saw Konstantin's response. Apologies for the noise.

I still think the // might be a problem, though.

-chris



signature.asc
Description: OpenPGP digital signature


Re: svn commit: r1187916 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml

2011-10-25 Thread Konstantin Kolinko
2011/10/25 Christopher Schultz ch...@christopherschultz.net:
 All,

 On 10/25/2011 2:03 PM, Christopher Schultz wrote:
 On 10/23/2011 12:19 PM, rj...@apache.org wrote:

 +        if (!strncmp(uri, path, len) 

 strncmp doesn't use case-insensitive compare: will this ever match if
 you use web-inf (as below)?

 Duh just saw Konstantin's response. Apologies for the noise.

 I still think the // might be a problem, though.

 +while (uri = strchr(uri, '/')) {

If uri starts with '/' then strchr will return uri without advancing
the pointer. I see no problem with //.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1187916 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml

2011-10-25 Thread Christopher Schultz
Rainer,

On 10/25/2011 3:37 PM, Rainer Jung wrote:
 On 25.10.2011 20:07, Christopher Schultz wrote:
 Rainer,

 On 10/23/2011 12:19 PM, rj...@apache.org wrote:
 +static const char *find_path_in_uri(const char *uri, const char
 *path) +{ +size_t len = strlen(path); +while (uri =
 strchr(uri, '/')) { +uri++; +if (!strncmp(uri,
 path, len)  +(*(uri + len) == '/' || +
 strlen(uri) == len)) { +return uri; +} +
 }

 Also, 'len' is never updated in the loop, so the call to strncmp
 could potentially cause a SIGSEGV -- but only in the cases where
 something truly nefarious is going on, anyway.
 
 Hmmm, I don't get that: path isn't changed, strncmp() will never
 compare beyond terminating '0', and uri+len must be inside uri if
 length of path is len, and uri and path coincide for len chars.

Yeah, I'm re-thinking my assertion: the code is probably safe.

On the other hand, why bother using strNcmp instead of just strcmp given
that you are trusting 'path' to be clean already. I guess there's no
reason NOT to use strNcmp when you have a choice.

 Of course *(uri+len) could be '0', but that's OK.

Also nevermind about the // : strchr returns a pointer, not an index. :(

-chris



signature.asc
Description: OpenPGP digital signature


DO NOT REPLY [Bug 51744] JNDI Lookup Error after a Context is closed

2011-10-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51744

Leonid Mikhailov lmikhai...@esri.com changed:

   What|Removed |Added

Version|7.0.14  |7.0.22
 OS/Version|Linux   |Windows 7

--- Comment #9 from Leonid Mikhailov lmikhai...@esri.com 2011-10-25 21:17:49 
UTC ---
Guys,

It appears that something is not quite right with this fix in 7.0.22. The
following worked just fine in 7.0.14 (and GlassFish, WebLogic, and WebSphere)
and now fails on envCtx.close() with Context is read only message.

javax.naming.Context initCtx = new InitialContext();
javax.naming.Context envCtx = (javax.naming.Context)
initCtx.lookup(java:comp/env);
//some clever logic that uses envCtx
envCtx.close();//Fails here!
initCtx.close();

According to JavaDoc I should be able to safely close the context when I am
done with it.  

Thanks,

Leon

-- 
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1188930 - /tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore

2011-10-25 Thread markt
Author: markt
Date: Tue Oct 25 21:34:21 2011
New Revision: 1188930

URL: http://svn.apache.org/viewvc?rev=1188930view=rev
Log:
Git ignores empty directories and the unit tests require this directory to be 
present for the welcome file tests to pass. The presence of this file doesn't 
break the unit tests.

Added:
tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore

Added: tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore?rev=1188930view=auto
==
--- tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore (added)
+++ tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore Tue Oct 25 
21:34:21 2011
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1188931 - /tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java

2011-10-25 Thread markt
Author: markt
Date: Tue Oct 25 21:35:04 2011
New Revision: 1188931

URL: http://svn.apache.org/viewvc?rev=1188931view=rev
Log:
Remove unnecessary code

Modified:

tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java?rev=1188931r1=1188930r2=1188931view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
 Tue Oct 25 21:35:04 2011
@@ -17,13 +17,9 @@
 package org.apache.tomcat.util.http.mapper;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import static org.junit.Assert.assertEquals;
@@ -47,9 +43,9 @@ public class TestMapperWelcomeFiles exte
 
 StandardContext ctxt = (StandardContext) tomcat.addWebapp(null, 
/test,
 appDir.getAbsolutePath());
-Tomcat.addServlet(ctxt, Ok, new OkServlet());
 ctxt.setReplaceWelcomeFiles(true);
 ctxt.addWelcomeFile(index.jsp);
+// Mapping for *.do is define in web.xml
 ctxt.addWelcomeFile(index.do);
 
 tomcat.start();
@@ -75,9 +71,9 @@ public class TestMapperWelcomeFiles exte
 
 StandardContext ctxt = (StandardContext) tomcat.addWebapp(null, 
/test,
 appDir.getAbsolutePath());
-Tomcat.addServlet(ctxt, Ok, new OkServlet());
 ctxt.setReplaceWelcomeFiles(true);
 ctxt.addWelcomeFile(index.jsp);
+// Mapping for *.do is define in web.xml
 ctxt.addWelcomeFile(index.do);
 
 // Simulate STRICT_SERVLET_COMPLIANCE
@@ -95,16 +91,4 @@ public class TestMapperWelcomeFiles exte
 new HashMapString,ListString());
 assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
 }
-
-private static class OkServlet extends HttpServlet {
-
-private static final long serialVersionUID = 1L;
-
-@Override
-protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-throws ServletException, IOException {
-resp.setContentType(text/plain);
-resp.getWriter().write(OK-Servlet);
-}
-}
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1188932 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java

2011-10-25 Thread markt
Author: markt
Date: Tue Oct 25 21:35:49 2011
New Revision: 1188932

URL: http://svn.apache.org/viewvc?rev=1188932view=rev
Log:
Remove unused code

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 25 21:35:49 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1188303-1188
 305,1188399,1188822
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1188303-1188
 305,1188399,1188822,1188931

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java?rev=1188932r1=1188931r2=1188932view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
 (original)
+++ 

Re: svn commit: r1188930 - /tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore

2011-10-25 Thread Konstantin Kolinko
Can you add descriptive comment in the file itself and ASL license?

2011/10/26  ma...@apache.org:
 Author: markt
 Date: Tue Oct 25 21:34:21 2011
 New Revision: 1188930

 URL: http://svn.apache.org/viewvc?rev=1188930view=rev
 Log:
 Git ignores empty directories and the unit tests require this directory to be 
 present for the welcome file tests to pass. The presence of this file doesn't 
 break the unit tests.

 Added:
    tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore

 Added: tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore
 URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore?rev=1188930view=auto
 ==
 --- tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore (added)
 +++ tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore Tue Oct 25 
 21:34:21 2011
 @@ -0,0 +1,4 @@
 +# Ignore everything in this directory
 +*
 +# Except this file
 +!.gitignore
 \ No newline at end of file



 -
 To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
 For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Executor threadRenewalDelay questions

2011-10-25 Thread Rohit Kelapure
Dear All,

After going through the thread renewal code in
/tomcat-8.0.x/java/org/apache/tomcat/util/threads/TaskQueue.java ,
/tomcat-8.0.x/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
and the bug (Improve ThreadLocal memory leak clean-up)
https://issues.apache.org/bugzilla/show_bug.cgi?id=49159 I had the
following questions-

1. Once the thread pool has been renewed  after No. of active threads
in pool * max (threadKeepAliveTimeout, longestRequest+
threadRenewalDelay) seconds, why does the ThreadPoolExecutor still
keep paying the price of thread renewal. ?

After org.apache.tomcat.util.threads.ThreadPoolExecutor.threadRenewalDelay
is set to 1000L it never goes back to -1.  Ideally once the all the
threads in the threadpool is renewed we should revert the
threadRenewalDelay back to -1 and NOT call
ThreadPoolExecutor.currentThreadShouldBeStopped()/ThreadPoolExecutor.stopCurrentThreadIfNeeded()
in TaskQueue.poll(long, TimeUnit) or TaskQueue.take().
Is this because we are never quite sure as to when *all*  of the
threads in the pool have been renewed ?

2. Does the thread renewal approach scale under load (i.e. all threads
in the pool busy servicing requests and CPU close to 90%) ? Is it
meant for production deployments ?

3. How about threads that are servicing long running HTTP Keep-alive
connections that never let the thread return to the pool. Are these
threads renewed before the server is stopped.

--Thanks,
Rohit Kelapure

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org