Re: Response.getWriter(), getOutputStream(), setContentLength() spec issues

2011-02-27 Thread Rainer Jung

On 25.02.2011 13:01, Mark Thomas wrote:

So, the questions we need to decide:

1. Is the fix for bug 50748 correct? I think it is.


+0


2. Should Tomcat try and handle this situation (e.g. if any bytes have
been written by a filter, commit the response). This could be tricky to
get right when forwards are involved and the response is meant to have
been cleared. I'm leaning towards not doing this.


TC should not try to handle it.


3. Is any filter that writes to the response without wrapping it so any
calls to setContentLength() can be intercepted and adjusted as necessary
broken? I think it is.


It is.

Rainer

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



svn commit: r1075019 - /tomcat/trunk/res/findbugs/filter-false-positives.xml

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 10:31:49 2011
New Revision: 1075019

URL: http://svn.apache.org/viewvc?rev=1075019&view=rev
Log:
Another false positive

Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1075019&r1=1075018&r2=1075019&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sun Feb 27 10:31:49 
2011
@@ -70,6 +70,11 @@
 
   
   
+
+
+
+  
+  
 
 
 



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



DO NOT REPLY [Bug 50836] LifecycleState#isAvailable() to be more restrictive

2011-02-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50836

--- Comment #6 from Mark Thomas  2011-02-27 05:49:00 EST ---
(In reply to comment #5)
> I do not have one. I was thinking about AccessLog in context of bug 50835
> (AccessLog#log() being called on uninitialized valve in unclear circumstances
> in some broken configuration), but I do not have any custom implementation.

If the Javadoc is followed, I don't see how that bug happened. I'd be happy to
revist this with a reproducible test case.

> I am also concerned with StandardContext#getAvailable() delegating to
> LifecycleState#isAvailable().

It is always possible to change the implementation of
StandardContext#getAvailable() to check for a more limited set of states.

I count 46 references to isAvailable(). I can see at least one place where
changing that will break something (ContainerBase.addChildInternal()) and I am
concerned that there will be places that are missed if we make this change.

> If Child extends AccessLogValve, implementing Child#startInternal() to do not
> make the component available too soon essentially means that
> super.startInternal() should be called at the end of child's method, not
> sooner.

It depends. That exact requirements are defined in the Javadoc and I am in the
process of making that Javadoc even more explicit.

> Transition to STARTING means that Lifecycle.START_EVENT will be fired after 
> the
> transition, but we are not waiting for the listeners to complete before
> declaring the component "available".

I'm happy with that. The listeners should be fired after the state change.
Again, I'll clarify this in the Javadoc.

> Transition to STARTED is performed automatically in LifecycleBase#start(). All
> startup procedures for the component are completed in that state, and I think
> the STARTED state is better place to mark it as "available".

"available" means whatever we define it to mean. I'm happy with the way the
current code works but can see lots of places where the Javadoc can be
improved.

> > I think we could safely move from FAILED to STOPPING in that case. It means
> > changing the permitted Lifecycle transitions slightly but from a quick look 
> > at
> > the code it should be ok.
> 
> I like the idea. It means that we are not firing Lifecycle.BEFORE_STOP_EVENT,
> but that is not much to lose.

That event can still be fired.

I have a patch for most of the above, I just need to finish some of the Javadoc
improvements.

-- 
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: r1075022 - in /tomcat/trunk: java/org/apache/catalina/Lifecycle.java java/org/apache/catalina/LifecycleListener.java java/org/apache/catalina/LifecycleState.java java/org/apache/catalina/u

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 11:00:12 2011
New Revision: 1075022

URL: http://svn.apache.org/viewvc?rev=1075022&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50836
Better documentation of the meaning of Lifecycle.isAvailable() and correct a 
couple of cases where this could incorrectly return true. 

Modified:
tomcat/trunk/java/org/apache/catalina/Lifecycle.java
tomcat/trunk/java/org/apache/catalina/LifecycleListener.java
tomcat/trunk/java/org/apache/catalina/LifecycleState.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/Lifecycle.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Lifecycle.java?rev=1075022&r1=1075021&r2=1075022&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Lifecycle.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Lifecycle.java Sun Feb 27 11:00:12 
2011
@@ -25,7 +25,8 @@ package org.apache.catalina;
  * the functionality they support) in order to provide a consistent mechanism
  * to start and stop the component.
  * 
- * The valid state transitions for components that support Lifecycle are:
+ * The valid state transitions for components that support {@link Lifecycle}
+ * are:
  * 
  *init()
  * NEW ->-- INITIALIZING
@@ -44,9 +45,11 @@ package org.apache.catalina;
  * |  |  | 
|
  * |  | \|/auto auto  start()  
|
  * |  | STOPPING_PREP -->- STOPPING -->- STOPPED 
>--
- * |  |  ^   |  |  ^
+ * |  |   ^  |  |  ^
+ * |  |  stop()   |  |  |  |
+ * |  |  --  |  |  |
  * |  |  |  auto |  |  |
- * |  |  |stop()MUST_DESTROY--<---  |  |
+ * |  |  |  MUST_DESTROY--<---  |  |
  * |  |  || |  |
  * |  |  ||auto |  |
  * |  |  |destroy()  \|/  destroy() |  |
@@ -197,8 +200,8 @@ public interface Lifecycle {
 
 
 /**
- * Get the lifecycle listeners associated with this lifecycle. If this 
- * Lifecycle has no listeners registered, a zero-length array is returned.
+ * Get the life cycle listeners associated with this life cycle. If this 
+ * component has no listeners registered, a zero-length array is returned.
  */
 public LifecycleListener[] findLifecycleListeners();
 
@@ -226,10 +229,12 @@ public interface Lifecycle {
 public void init() throws LifecycleException;
 
 /**
- * Prepare for the beginning of active use of the public methods of this
- * component.  This method should be called before any of the public
- * methods of this component are utilized. The following
- * {@link LifecycleEvent}s will be fired in the following order:
+ * Prepare for the beginning of active use of the public methods other than
+ * property getters/setters and life cycle methods of this component. This
+ * method should be called before any of the public methods other than
+ * property getters/setters and life cycle methods of this component are
+ * utilized. The following {@link LifecycleEvent}s will be fired in the
+ * following order:
  * 
  *   BEFORE_START_EVENT: At the beginning of the method. It is as this
  *   point the state transitions to
@@ -237,7 +242,9 @@ public interface Lifecycle {
  *   START_EVENT: During the method once it is safe to call start() for
  *any child components. It is at this point that the
  *state transitions to {@link LifecycleState#STARTING}
- *and that the public methods may be used.
+ *and that the public methods other than property
+ *getters/setters and life cycle methods may be 
+ *used.
  *   AFTER_START_EVENT: At the end of the method, immediately before it
  *  returns. It is at this point that the state
  *  transitions to {@link LifecycleState#STARTED}.
@@ -251,10 +258,11 @@ public interface Lifecycle {
 
 
 /**
- * Gracefully terminate the active use of the public methods of this
- * component. Once the STOP_EVENT is fired, the public methods should not
- * be used. The following {@link LifecycleEvent}s will be fired in the
- * following order:
+ * Gracefully terminate the active use of the public methods other t

DO NOT REPLY [Bug 50836] LifecycleState#isAvailable() to be more restrictive

2011-02-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50836

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #7 from Mark Thomas  2011-02-27 06:02:09 EST ---
I have applied a patch to 7.0.x that will be included in 7.0.9 that I believe
addresses nearly all of the concerns raised in this issue. The bulk of the
change clarifies what is meant by "available".

The outstanding issue is perhaps what StandardContext#getAvailable() returns
but that is probably better discussed in a new issue / on the dev list if it is
still of concern.

-- 
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: r1075030 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 11:28:01 2011
New Revision: 1075030

URL: http://svn.apache.org/viewvc?rev=1075030&view=rev
Log:
Block whilst waiting for data from client in NIO SSL-rehandshake rather than 
spinning the CPU

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1075030&r1=1075029&r2=1075030&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Sun Feb 
27 11:28:01 2011
@@ -294,7 +294,18 @@ public class SecureNioChannel extends Ni
 while (!handshakeComplete) {
 handshake(true, true);
 if (handshakeStatus == HandshakeStatus.NEED_UNWRAP)  {
-handshakeUnwrap(true);
+// Block until there is data to read from the client
+Selector selector = null;
+try {
+selector = Selector.open();
+sc.register(selector, SelectionKey.OP_READ);
+selector.select();
+handshakeUnwrap(true);
+} finally {
+if (selector != null) {
+selector.close();
+}
+}
 }
 }
 } finally {



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



Re: svn commit: r1074675 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ webapps/docs/

2011-02-27 Thread Mark Thomas
> On 25/02/2011 20:16, Filip Hanik - Dev Lists wrote:
>> The simplest solution is, would be to use an individual selector.
>> Register the socket and issue a select() on the thread you are running on.
>> If you want to use a shared selector (like NIO does for reads and
>> writes) it requires a bit more logic.

I have implemented the simple solution and based on a quick test with
the Eclipse debugger the handshake now blocks while waiting for client data.

A review would be good since my understanding of NIO is not as good as
yours.

Mark

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



Bug report for Taglibs [2011/02/27]

2011-02-27 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field   |
|38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)|
|42413|New|Enh|2007-05-14|[PATCH] Log Taglib enhancements   |
|46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l|
|48333|New|Enh|2009-12-02|TLD generator |
|50674|New|Nor|2011-01-27|Some maven pom improvments|
|50825|New|Nor|2011-02-24|Site still has links to Jakarta for mailing lists |
+-+---+---+--+--+
| Total7 bugs   |
+---+

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



Bug report for Tomcat 5 [2011/02/27]

2011-02-27 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat|
|28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn  |
|33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis|
|33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps|
|33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na|
|34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a|
|34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern|
|34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that|
|35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc|
|36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi|
|36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's   |
|36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re|
|37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token|
|37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis|
|38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations |
|38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti|
|38546|Inf|Enh|2006-02-07|Google bot sends invalid If-Modifed-Since Header, |
|38577|Inf|Enh|2006-02-08|Enhance logging of security failures  |
|39862|Inf|Enh|2006-06-22|provide support for protocol-independent GenericSe|
|40211|Inf|Enh|2006-08-08|Compiled JSP don't indent HTML code   |
|40402|New|Enh|2006-09-03|Manager should display Exceptions |
|40510|New|Enh|2006-09-14|installer does not create shortcuts for all users |
|40712|New|Enh|2006-10-10|Realm admin error.|
|40728|Inf|Enh|2006-10-11|Catalina MBeans use non-serializable classes  |
|40766|New|Enh|2006-10-16|Using an unsecure jsessionid with mod_proxy_ajp ov|
|40881|Opn|Enh|2006-11-02|Unable to receive message through  TCP channel -> |
|41007|Opn|Enh|2006-11-20|Can't define customized 503 error page|
|41179|New|Enh|2006-12-15|400 Bad Request response during auto re-deployment|
|41227|Opn|Enh|2006-12-21|When the jasper compiler fails to compile a JSP, i|
|41337|Opn|Enh|2007-01-10|Display an error page if no cert is available on C|
|41496|New|Enh|2007-01-30|set a security provider for jsse in a connector co|
|41498|New|Enh|2007-01-30|allRolesMode Realm configuration option not docume|
|41539|Inf|Enh|2007-02-05|NullPointerException during Embedded tomcat restar|
|41673|New|Enh|2007-02-21|Jasper output the message of compiling error using|
|41697|Ver|Enh|2007-02-25|make visible in debug output if charset from brows|
|41709|Inf|Enh|2007-02-26|When calling the API that relates to the buffer af|
|41718|New|Enh|2007-02-27|Status 302 response to GET request has no body whe|
|43423|New|Enh|2007-09-18|catalina.sh -force too fast   |
|43538|New|Enh|2007-10-02|[patch] Show the hostname and IP address in the ma|
|43796|Inf|Enh|2007-11-05|Add MIME type mapping for the "log" extension |
|43866|New|Enh|2007-11-14|add support for session attribute propagation with|
|43925|Opn|Enh|2007-11-21|org.apache.jasper.runtime.BodyContentImpl causing |
|43991|New|Enh|2007-11-29|Contributing a URLResourceFactory |
|44216|New|Enh|2008-01-11|Don't reuse session ID even if emptySessionPath=tr|
|44309|New|Enh|2008-01-28|Possible overriding the security state of the conn|
|44897|New|Enh|2008-04-28|HttpServletRequest's .getParameter(String) method |
|44904|New|Enh|2008-04-29|Provide warning message when DataSource's maxActiv|
|45052|New|Enh|2008-05-21|Provide read only access for certain role in Manag|
|45882|New|Enh|2008-09-24|Ensure all jars have full manifests and N & L file|
|46221|New|Enh|2008-11-17|Leak WebappClassLoader with commons-logging and lo|
|46252|New|Enh|2008-11-20|Tomcat access log doesn't support Unicode |
|47081|

Bug report for Tomcat 6 [2011/02/27]

2011-02-27 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|39661|Opn|Enh|2006-05-25|Please document JULI FileHandler configuration pro|
|41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat|
|41883|Ass|Enh|2007-03-18|use abstract wrapper instead of plain X509Certific|
|41992|New|Enh|2007-03-30|Need ability to set OS process title  |
|42463|New|Enh|2007-05-20|"crossContext" and classloader issues - pls amend |
|43001|New|Enh|2007-07-30|JspC lacks setMappedFile and setDie for use in Ant|
|43400|New|Enh|2007-09-14|enum support for tag libs |
|43497|New|Enh|2007-09-26|Add ability to escape rendered output of JSP expre|
|43548|Opn|Enh|2007-10-04|xml schema for tomcat-users.xml   |
|43682|New|Enh|2007-10-23|JULI: web-inf/classes/logging.properties to suppor|
|43742|New|Enh|2007-10-30|.tag compiles  performed one at a time -- extremel|
|43790|Ass|Enh|2007-11-03|concurrent access issue on TagHandlerPool |
|43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output |
|44047|New|Enh|2007-12-10|Provide a way for Tomcat to serve up error pages w|
|44199|New|Enh|2008-01-10|expose current backlog queue size |
|44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f|
|44264|New|Enh|2008-01-18|Clustering - Support for disabling multicasting an|
|44284|New|Enh|2008-01-23|Support java.lang.Iterable in c:forEach tag   |
|44294|New|Enh|2008-01-25|Support for EL functions with varargs |
|44299|New|Enh|2008-01-26|Provider manager app with a log out button|
|44312|New|Enh|2008-01-28|Warn when overwritting docBase of the default Host|
|44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam|
|44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt|
|44818|New|Enh|2008-04-13|tomcat hangs with GET when content-length is defin|
|45014|New|Enh|2008-05-15|Request and Response classes should have wrappers |
|45282|New|Enh|2008-06-25|NioReceiver doesn't close cleanly, leaving sockets|
|45283|Opn|Enh|2008-06-25|Provide a JSR196 implementation   |
|45428|New|Enh|2008-07-18|warn if the tomcat stop doesn't complete  |
|45654|New|Enh|2008-08-19|use static methods and attributes in a direct way!|
|45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks|
|45871|New|Enh|2008-09-23|Support for salted and digested patches in DataSou|
|45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or |
|45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE|
|45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output|
|45995|New|Enh|2008-10-13|RFE - MIME type extension not case sensitive  |
|46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c|
|46263|New|Enh|2008-11-21|Tomcat reloading of context does not update contex|
|46264|New|Enh|2008-11-21|Shutting down tomcat with large number of contexts|
|46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl|
|46350|New|Enh|2008-12-05|Maven repository should contain source bundles|
|46451|New|Enh|2008-12-30|Configure svn:bugtraq properties  |
|46461|New|Enh|2009-01-01|fail graceful on dns changes for connectors/hosts |
|46497|New|Enh|2009-01-08|Install Tomcat Deployer/ANT on Windows Platform   |
|46655|New|Enh|2009-02-03|keystore's password handler   |
|46727|New|Enh|2009-02-17|DefaultServlet - serving multiple encodings   |
|46902|New|Enh|2009-03-24|LoginValve to bypass restrictions of j_security_ch|
|47061|New|Enh|2009-04-21|JDBCStore for saving sessions doesn't support data|
|47214|New|Enh|2009-05-17|Inner classes that are explicitly referenced - sho|
|47230|New|Enh|2009-05-21|Include sample cert attributes for SSL connectors |
|47242|New|Enh|2009-05-22|request for AJP command line client   |
|47281|New|Enh|2009-05-28|Efficiency of the JDBCStore   |
|47396|

Bug report for Tomcat 7 [2011/02/27]

2011-02-27 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|39740|Opn|Enh|2006-06-07|semi-colon ; isn't allowed as a query argument sep|
|48358|Opn|Enh|2009-12-09|JSP-unloading reloaded|
|48550|Inf|Enh|2010-01-14|Update examples and default server.xml to use UTF-|
|48892|New|Enh|2010-03-11|Use URIEncoding from server.xml for decoding post |
|49122|Opn|Enh|2010-04-14|Update of ROOT application index.html |
|49159|New|Enh|2010-04-20|Improve ThreadLocal memory leak clean-up  |
|49165|New|Enh|2010-04-21|Enhancement - Allow %{TIME_FORMAT}t As Configurati|
|49290|New|Enh|2010-05-14|Using a JarScanner with scanAllDirectories=true ca|
|49318|New|Enh|2010-05-20|add a Negotiate (Kerberos/NTLM) authenticator / in|
|49395|New|Enh|2010-06-06|manager.findLeaks : display the date when the leak|
|49589|New|Enh|2010-07-12|Tag handlers with constant attribute values are al|
|49591|New|Enh|2010-07-13|Custom error page always uses Transfer-Encoding: c|
|49683|New|Nor|2010-08-01|Separate keep-alive and connection timeout with AP|
|49785|New|Enh|2010-08-19|Enabling TLS for JNDIRealm|
|49821|New|Enh|2010-08-25|Tomcat CLI|
|50019|New|Enh|2010-09-28|Adding JNDI "lookup-name" support In XML and Resou|
|50175|New|Enh|2010-10-28|Enhance memory leak detection by selectively apply|
|50234|New|Enh|2010-11-08|JspC use servlet 3.0 features |
|50306|New|Enh|2010-11-19|Detect stuck threads  |
|50353|New|Enh|2010-11-27|Calling asyncContext.getResponse() returns null af|
|50504|New|Enh|2010-12-21|Allow setting query string character set trough re|
|50570|New|Enh|2011-01-11|Allow explicit use of FIPS mode in APR lifecycle l|
|50670|New|Enh|2011-01-27|Tribes | RpcChannel | Add option to specify extern|
|50677|New|Enh|2011-01-27|Allow system property variables in catalina.proper|
|50791|New|Enh|2011-02-15|appropriate buffer size can accelerate the copyRan|
|50793|Ver|Nor|2011-02-15|Invalid DispatchType in ServletRequestListener on |
+-+---+---+--+--+
| Total   26 bugs   |
+---+

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



Bug report for Tomcat Modules [2011/02/27]

2011-02-27 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers |
|48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite  |
|48861|New|Nor|2010-03-04|Files without AL headers  |
|49685|New|Nor|2010-08-02|Unsafe synchronization in class ManagedBean   |
|49686|New|Nor|2010-08-02|Using an instance lock to protect static shared da|
|49953|Opn|Nor|2010-09-17|Missing @Override annotations |
|50565|New|Min|2011-01-10|Static variables should be accessed in a static wa|
|50566|New|Nor|2011-01-10|Duplicate assignment to connection variable   |
|50567|New|Enh|2011-01-10|Classpath does not need to reference tomcat-dbcp.j|
|50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen|
|50660|New|Min|2011-01-26|Improve validationQuery error handling|
+-+---+---+--+--+
| Total   11 bugs   |
+---+

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



Bug report for Tomcat Connectors [2011/02/27]

2011-02-27 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo|
|35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName|
|36155|Opn|Nor|2005-08-12|tomcat chooses wrong host if using mod_jk |
|39967|Inf|Nor|2006-07-05|mod_jk gives segmentation fault when apache is sta|
|40208|Inf|Nor|2006-08-08|Request-Dump when ErrorDocument in httpd.conf is a|
|41923|Opn|Nor|2007-03-21|Tomcat doesnt recognized client abort |
|42366|Inf|Nor|2007-05-09|Memory leak in newer mod_jk version when connectio|
|42554|Opn|Nor|2007-05-31|mod_ssl + mod_jk with status_worker does not work |
|43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn|
|43968|New|Enh|2007-11-26|[patch] support ipv6 with mod_jk  |
|44290|New|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan|
|44349|New|Maj|2008-02-04|mod_jk/1.2.26 module does not read worker.status.s|
|44379|New|Enh|2008-02-07|convert the output of strftime into UTF-8 |
|44454|New|Nor|2008-02-19|busy count reported in mod_jk inflated, causes inc|
|44571|New|Enh|2008-03-10|Limits busy per worker to a threshold |
|45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff|
|45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so|
|45395|New|Min|2008-07-14|MsgAjp dump method does not dump packet when being|
|46337|New|Nor|2008-12-04|real worker name is wrong |
|46406|New|Enh|2008-12-16|Supporting relative paths in isapi_redirect.proper|
|46676|New|Enh|2009-02-09|Configurable test request for Watchdog thread |
|46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca|
|47038|New|Enh|2009-04-15|USE_FLOCK_LK redefined compiler warning when using|
|47327|New|Enh|2009-06-07|remote_user not logged in apache logfile  |
|47617|New|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err|
|47678|New|Cri|2009-08-11|Unable to allocate shared memory when using isapi_|
|47679|New|Nor|2009-08-11|Not all headers get passed to Tomcat server from i|
|47692|New|Reg|2009-08-12|Can not compile mod_jk with apache2.0.63 and tomca|
|47714|New|Cri|2009-08-20|Reponse mixed between users   |
|47750|New|Maj|2009-08-27|Loss of worker settings when changing via jkstatus|
|47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit|
|47840|Inf|Min|2009-09-14|A broken worker name is written in the log file.  |
|48191|New|Maj|2009-11-13|Problem with mod_jk 1.2.28 - Can not render up the|
|48460|New|Nor|2009-12-30|mod_proxy_ajp document has three misleading portio|
|48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert|
|48513|New|Enh|2010-01-09|IIS Quick setup instructions  |
|48564|New|Nor|2010-01-18|Unable to turn off retries for LB worker  |
|48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv|
|48891|Opn|Enh|2010-03-11|Missing EOL-style settings in tomcat/jk/trunk |
|48940|New|Maj|2010-03-18|IIS to Tomcat occasionally fails on POST with T-E |
|49035|New|Maj|2010-04-01|data lost when post a multipart/form-data form|
|49048|New|Nor|2010-04-05|ACL not applied to redirect URLs  |
|49063|New|Enh|2010-04-07|Please add JkStripSession status in jk-status work|
|49135|New|Enh|2010-04-16|SPDY Connector for The Tomcat |
|49413|Opn|Reg|2010-06-09|Apache Mod_jk 1.2.30 is shutting down communicatio|
|49469|New|Enh|2010-06-19|Workers status page has negative number of connect|
|49732|Opn|Nor|2010-08-10|reply_timeout can't wait forever. |
|49822|New|Enh|2010-08-25|Add hash lb worker method |
|49903|New|Enh|2010-09-09|Make workers file reloadable  |
|50186|New|Nor|2010-10-31|Wrong documentation of connection_pool_timeout / c|
|50233|New|Cri|2010-11-08|support long URLs (more than 2048)|
|50304|

Bug report for Tomcat Native [2011/02/27]

2011-02-27 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|45392|New|Nor|2008-07-14|No OCSP support for client SSL verification   |
|46179|Opn|Maj|2008-11-10|apr ssl client authentication |
|48655|New|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown|
|49038|Inf|Nor|2010-04-02|Crash in tcnative |
|49595|New|Cri|2010-07-15|Tomcat crashes in tcnative-1.dll frequently   |
|49795|New|Nor|2010-08-22|Crash in Socket.destroy   |
|50394|New|Nor|2010-12-01|InternalAprInputBuffer.fill() doesn't deal correct|
+-+---+---+--+--+
| Total7 bugs   |
+---+

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



svn commit: r1075050 - in /tomcat/trunk: java/org/apache/catalina/startup/CatalinaProperties.java webapps/docs/changelog.xml

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 13:19:22 2011
New Revision: 1075050

URL: http://svn.apache.org/viewvc?rev=1075050&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31027
Trim whitespace from names and values obtained from 
$CATALINA_BASE/conf/catalina.properties to avoid hard to diagnose errors on 
startup.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=1075050&r1=1075049&r2=1075050&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Sun 
Feb 27 13:19:22 2011
@@ -140,7 +140,9 @@ public class CatalinaProperties {
 String name = (String) enumeration.nextElement();
 String value = properties.getProperty(name);
 if (value != null) {
-System.setProperty(name, value);
+// Remove leading/trailing whitespace as that can lead to hard
+// to diagnose failures
+System.setProperty(name.trim(), value.trim());
 }
 }
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1075050&r1=1075049&r2=1075050&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Feb 27 13:19:22 2011
@@ -62,6 +62,11 @@
 (markt)
   
   
+31027: Trim whitespace from names and values obtained from
+$CATALINA_BASE/conf/catalina.properties to avoid hard to
+diagnose errors on startup. (markt)
+  
+  
 48863: Better logging when specifying an invalid directory
 for a class loader. Based on a patch by Ralf Hauser. (markt)
   



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



svn commit: r1075052 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 13:22:56 2011
New Revision: 1075052

URL: http://svn.apache.org/viewvc?rev=1075052&view=rev
Log:
Proposal

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1075052&r1=1075051&r2=1075052&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Feb 27 13:22:56 2011
@@ -52,3 +52,10 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1072042&view=rev
   +1: markt, mturk
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31027
+  Trim whitespace from names and values obtained from
+  $CATALINA_BASE/conf/catalina.properties to avoid hard to diagnose errors on 
startup.
+  http://svn.apache.org/viewvc?rev=1075050&view=rev
+  +1: markt
+  -1:

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1075052&r1=1075051&r2=1075052&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Feb 27 13:22:56 2011
@@ -125,3 +125,10 @@ PATCHES PROPOSED TO BACKPORT:
   http://people.apache.org/~markt/patches/2011-02-21-bug48863.patch
   +1: markt
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31027
+  Trim whitespace from names and values obtained from
+  $CATALINA_BASE/conf/catalina.properties to avoid hard to diagnose errors on 
startup.
+  http://svn.apache.org/viewvc?rev=1075050&view=rev
+  +1: markt
+  -1:



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



DO NOT REPLY [Bug 31027] major error from minor whitespace error in properties file

2011-02-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=31027

Mark Thomas  changed:

   What|Removed |Added

  Component|Catalina|Catalina
Version|4.1.30  |5.5.33
Product|Tomcat 4|Tomcat 5

--- Comment #3 from Mark Thomas  2011-02-27 08:23:10 EST ---
Later versions of Tomcat have better error messages that should help but it
makes sense to fix this.

I have fixed this in 7.0.x and it will be included in 7.0.9 onwards. I have
also proposed it for back-port to 6.0.x and 5.5.x

Since Tomcat 4 is no longer supported, I am moving this issue to Tomcat 5.

-- 
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 28853] Make Ant tasks declaration easier

2011-02-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=28853

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #4 from Mark Thomas  2011-02-27 08:26:01 EST ---
This change has already been made to all supported Tomcat versions (5.5.x
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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1075050 - in /tomcat/trunk: java/org/apache/catalina/startup/CatalinaProperties.java webapps/docs/changelog.xml

2011-02-27 Thread Konstantin Kolinko
2011/2/27  :
> Author: markt
> Date: Sun Feb 27 13:19:22 2011
> New Revision: 1075050
>

> --- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java 
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Sun 
> Feb 27 13:19:22 2011
> @@ -140,7 +140,9 @@ public class CatalinaProperties {
>             String name = (String) enumeration.nextElement();
>             String value = properties.getProperty(name);
>             if (value != null) {
> -                System.setProperty(name, value);
> +                // Remove leading/trailing whitespace as that can lead to 
> hard
> +                // to diagnose failures
> +                System.setProperty(name.trim(), value.trim());
>             }
>         }

1) The above fixes System.getProperty() only.
CatalinaProperties#properties keeps the original values.
2) There is no need for name.trim(). See java.util.Properties#load javadoc.
3) I think I am -1 on this change. If there ever would be some
property that I would need to set to the value of \u0020, I would not
be able to do so. I think that we should care about our own properties
only and not enforce our rules on something that we-do-not-know.

Regarding the original
https://issues.apache.org/bugzilla/show_bug.cgi?id=31027
they are saying about whitespace in port number.

I think that throwing a reasonable exception in that case is what has
to be done (and I think it is already done).

They say:
> it was difficult to track down whether tomcat was running

There are a log of log files, as well as tomcat.pid, as well as ps
command in the OS, etc.

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: r1075050 - in /tomcat/trunk: java/org/apache/catalina/startup/CatalinaProperties.java webapps/docs/changelog.xml

2011-02-27 Thread Mark Thomas
On 27/02/2011 14:00, Konstantin Kolinko wrote:
> 3) I think I am -1 on this change. If there ever would be some
> property that I would need to set to the value of \u0020, I would not
> be able to do so. I think that we should care about our own properties
> only and not enforce our rules on something that we-do-not-know.

I can't see a use case for properties starting/ending in whitespace but
neither do I think this fix is a must have. There is more than enough
error logging provided for invalid properties. I'll revert this and
close the issue as WONTFIX.

Mark

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



svn commit: r1075056 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 14:06:56 2011
New Revision: 1075056

URL: http://svn.apache.org/viewvc?rev=1075056&view=rev
Log:
Withdraw proposal

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1075056&r1=1075055&r2=1075056&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Feb 27 14:06:56 2011
@@ -52,10 +52,3 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1072042&view=rev
   +1: markt, mturk
   -1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31027
-  Trim whitespace from names and values obtained from
-  $CATALINA_BASE/conf/catalina.properties to avoid hard to diagnose errors on 
startup.
-  http://svn.apache.org/viewvc?rev=1075050&view=rev
-  +1: markt
-  -1:

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1075056&r1=1075055&r2=1075056&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Feb 27 14:06:56 2011
@@ -125,10 +125,3 @@ PATCHES PROPOSED TO BACKPORT:
   http://people.apache.org/~markt/patches/2011-02-21-bug48863.patch
   +1: markt
   -1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31027
-  Trim whitespace from names and values obtained from
-  $CATALINA_BASE/conf/catalina.properties to avoid hard to diagnose errors on 
startup.
-  http://svn.apache.org/viewvc?rev=1075050&view=rev
-  +1: markt
-  -1:



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



DO NOT REPLY [Bug 31027] major error from minor whitespace error in properties file

2011-02-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=31027

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX

--- Comment #4 from Mark Thomas  2011-02-27 09:08:34 EST ---
The change in 7.0.x was vetoed.

Given that the error messages provided in 5.5.x onwards are sufficient to track
down the error this will not be resolved as WONTFIX.

-- 
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: r1075058 - in /tomcat/trunk: java/org/apache/catalina/startup/CatalinaProperties.java webapps/docs/changelog.xml

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 14:12:39 2011
New Revision: 1075058

URL: http://svn.apache.org/viewvc?rev=1075058&view=rev
Log:
Revert r1075050

Modified:
tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=1075058&r1=1075057&r2=1075058&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Sun 
Feb 27 14:12:39 2011
@@ -140,9 +140,7 @@ public class CatalinaProperties {
 String name = (String) enumeration.nextElement();
 String value = properties.getProperty(name);
 if (value != null) {
-// Remove leading/trailing whitespace as that can lead to hard
-// to diagnose failures
-System.setProperty(name.trim(), value.trim());
+System.setProperty(name, value);
 }
 }
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1075058&r1=1075057&r2=1075058&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Feb 27 14:12:39 2011
@@ -62,11 +62,6 @@
 (markt)
   
   
-31027: Trim whitespace from names and values obtained from
-$CATALINA_BASE/conf/catalina.properties to avoid hard to
-diagnose errors on startup. (markt)
-  
-  
 48863: Better logging when specifying an invalid directory
 for a class loader. Based on a patch by Ralf Hauser. (markt)
   



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



svn commit: r1075060 - /tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 14:26:55 2011
New Revision: 1075060

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

Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=1075060&r1=1075059&r2=1075060&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Sun 
Feb 27 14:26:55 2011
@@ -176,11 +176,6 @@ public class JMXAccessorQueryTask extend
 && pname != null && oname != null ) {
 try {
 MBeanInfo minfo = jmxServerConnection.getMBeanInfo(oname);
-String code = minfo.getClassName();
-if 
("org.apache.tomcat.util.modeler.BaseModelMBean".equals(code)) {
-code = (String) jmxServerConnection.getAttribute(oname,
-"modelerType");
-}
 MBeanAttributeInfo attrs[] = minfo.getAttributes();
 Object value = null;
 



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



svn commit: r1075061 - /tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 14:29:07 2011
New Revision: 1075061

URL: http://svn.apache.org/viewvc?rev=1075061&view=rev
Log:
Misc clean-up
 - Suppress Eclipse warnings
 - Remove unused code
 - Correct Javadoc

Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java

Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=1075061&r1=1075060&r2=1075061&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Sun Feb 
27 14:29:07 2011
@@ -420,6 +420,7 @@ public class JMXAccessorTask extends Bas
  * @throws MalformedURLException
  * @throws IOException
  */
+@SuppressWarnings("null")
 public static MBeanServerConnection accessJMXConnection(Project project,
 String url, String host, String port, String username,
 String password, String refId) throws MalformedURLException,
@@ -680,22 +681,9 @@ public class JMXAccessorTask extends Bas
 }
 
 /**
- * get all properties, when project is there got all project Properties
- * @return properties
- */
-public Map getProperties() {
-Project currentProject = getProject();
-if (currentProject != null) {
-return currentProject.getProperties();
-} else {
-return properties;
-}
-}
-
-/**
- * get all Properties
- * @param property
- * @return The property
+ * Get Property
+ * @param property name
+ * @return The property value
  */
 public String getProperty(String property) {
 Project currentProject = getProject();



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



svn commit: r1075062 - /tomcat/trunk/res/findbugs/filter-false-positives.xml

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 14:31:27 2011
New Revision: 1075062

URL: http://svn.apache.org/viewvc?rev=1075062&view=rev
Log:
Couple more false positives

Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1075062&r1=1075061&r2=1075062&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sun Feb 27 14:31:27 
2011
@@ -22,6 +22,16 @@
 
   
   
+
+
+
+  
+  
+
+
+
+  
+  
 
 
 



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



svn commit: r1075063 - /tomcat/trunk/res/findbugs/filter-false-positives.xml

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 14:34:19 2011
New Revision: 1075063

URL: http://svn.apache.org/viewvc?rev=1075063&view=rev
Log:
Another false positive

Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1075063&r1=1075062&r2=1075063&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sun Feb 27 14:34:19 
2011
@@ -22,6 +22,11 @@
 
   
   
+
+
+
+  
+  
 
 
 



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



DO NOT REPLY [Bug 50836] LifecycleState#isAvailable() to be more restrictive

2011-02-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50836

--- Comment #8 from Konstantin Kolinko  2011-02-27 
09:36:52 EST ---
OK. I like it. Let's stop at this.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 50838] New: Enhance Supported TLD Scanning Locations with WEB-INF/classes Support

2011-02-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50838

   Summary: Enhance Supported TLD Scanning Locations with
WEB-INF/classes Support
   Product: Tomcat 7
   Version: 7.0.8
  Platform: All
OS/Version: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: scott.hamil...@plateau.com


Prior to TC7.x, one could in their development environment use an exploded
deployment model for their java and web projects such that taglib library
projects that included TLD files in their classpath:META-INF folder would be
expanded into the WEB-INF/classes folder for testing on the servlet container.

In TC6 this worked because TC6 scanned this location along with the other
supported locations.

In TC7, stricter compliance to the JSP spec required TC to NOT scan this
location.

This enhancement request proposes to add a configuration option (in
context.xml?) to allow WEB-INF/classes to also be scanned as an exploded JAR.

The present workaround suggested by Mark Thomas works fine but requires one to
write additional code to customize Tomcat's behavior: write a JarScanner
implementation extending the default.

-- 
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 50838] Enhance Supported TLD Scanning Locations with WEB-INF/classes Support

2011-02-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50838

Scott Hamilton  changed:

   What|Removed |Added

 CC||scott.hamil...@plateau.com

-- 
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: r1075083 - in /tomcat/trunk: java/org/apache/catalina/authenticator/AuthenticatorBase.java res/findbugs/filter-false-positives.xml

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 15:53:45 2011
New Revision: 1075083

URL: http://svn.apache.org/viewvc?rev=1075083&view=rev
Log:
Misc clean-up
- remove unused code
- suppress FindBugs false positives
- add javadoc

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1075083&r1=1075082&r2=1075083&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
Sun Feb 27 15:53:45 2011
@@ -92,12 +92,6 @@ public abstract class AuthenticatorBase 
 
 
 /**
- * The number of random bytes to include when generating a
- * session identifier.
- */
-protected static final int SESSION_ID_BYTES = 16;
-
-/**
  * Authentication header
  */
 protected static final String AUTH_HEADER_NAME = "WWW-Authenticate";
@@ -789,6 +783,15 @@ public abstract class AuthenticatorBase 
 
 protected abstract String getAuthMethod();
 
+/**
+ * Process the login request.
+ * 
+ * @param request   Associated request
+ * @param username  The user
+ * @param password  The password
+ * @return  The authenticated Principal
+ * @throws ServletException
+ */
 protected Principal doLogin(Request request, String username,
 String password) throws ServletException {
 Principal p = context.getRealm().authenticate(username, password);

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1075083&r1=1075082&r2=1075083&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sun Feb 27 15:53:45 
2011
@@ -37,6 +37,11 @@
 
   
   
+
+
+
+  
+  
 
 
 



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



[Tomcat Wiki] Update of "FAQ/Developing" by KonstantinKolinko

2011-02-27 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "FAQ/Developing" page has been changed by KonstantinKolinko.
The comment on this change is: Reformat. Split into subsections..
http://wiki.apache.org/tomcat/FAQ/Developing?action=diff&rev1=11&rev2=12

--

  This section of the FAQ discusses common questions related to Tomcat 
development.
  
  == Questions ==
+  1. [[#Debugging|Debugging]]
-  1. [[#Q1|How do I configure Tomcat to support remote debugging?]]
+1. [[#Q1|How do I configure Tomcat to support remote debugging?]]
-  1. [[#Q2|How do I remotely debug Tomcat using Eclipse?]]
+1. [[#Q2|How do I remotely debug Tomcat using Eclipse?]]
-  1. [[#Q3|How do I remotely debug Tomcat using NetBeans?]]
+1. [[#Q3|How do I remotely debug Tomcat using NetBeans?]]
+  1. Other
-  1. [[#Q4|How do I change the monitoring interval for modified resources and 
application reloading?]]
+1. [[#Q4|How do I change the monitoring interval for modified resources 
and application reloading?]]
  == Answers ==
+ 
+ === Debugging ===
+ 
+ <>
- <>'''How do I configure Tomcat to support remote debugging?'''
+  How do I configure Tomcat to support remote debugging? 
  
  The short answer is to add the following options when the JVM is started:
+ {{{
- {{{-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n}}}
+ -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+ }}}
  
  There are a number of ways you can do this depending on how you normally 
start Tomcat:
- * If you are using shell scripts to start Tomcat, start it with the 
following command: {{{catalina jpda start}}}<>The above mentioned options 
can be provided by setting certain environment variables, e.g. 
{{{JPDA_ADDRESS=8000}}} and {{{JPDA_TRANSPORT=dt_socket}}}. See comments at the 
top of {{{catalina.sh}}} or {{{.bat}}} file for details.
+ * If you are using '''shell scripts''' to start Tomcat, start it with the 
following command:
+ {{{
+ catalina jpda start
+ }}}
+ 
+ It will start Tomcat so that a remote debugger can be connected to port 8000.
+ 
+ The above mentioned options can be provided by setting certain environment 
variables. See the comments at the top of {{{catalina.sh}}} or {{{.bat}}} file 
for details.
+ 
+ For example, the port number and JPDA transport implementation can be set 
with {{{JPDA_ADDRESS=8000}}} and {{{JPDA_TRANSPORT=dt_socket}}}.
+ 
- * If you run Tomcat using service wrapper, add the above JVM options 
before any other JVM options. Check the documentation for the service to 
determine how to set JVM options.
+ * If you run Tomcat using '''service wrapper''', add the above JVM 
options before any other JVM options. Check the documentation for the service 
wrapper to determine how to set JVM options.
  * If you start Tomcat from within an IDE, check the documentation for the 
IDE to determine how to set the required JVM options.
  
  The port does not need to be set to 8000, it may be any value appropriate for 
your system.
@@ -24, +42 @@

  Whilst this is very useful in development it should not be used in production 
because of both security and performance implications.
  
  
+ <>
- <>'''How do I remotely debug Tomcat using Eclipse?'''
+  How do I remotely debug Tomcat using Eclipse? 
  
  This answer assumes that you have a project set up and have some idea of what 
you are doing in this respect. If not then that is really outside the scope of 
this topic and you need to go to [[http://eclipse.org|eclipse.org]] and read up 
on how to use your IDE, and maybe practice a little bit before you come back to 
this. We are also going to assume that you have some idea of what a debugger is 
and how to use one.
  
@@ -37, +56 @@

  Now go type the url to submit to your servlet or whatever in your browser. 
Boom you hit the breakpoint right? Have fun!
  
  
- <>'''How do I remotely debug Tomcat using !NetBeans?'''
+ <>
+  How do I remotely debug Tomcat using NetBeans? 
  
  This answer assumes that you have correctly set up a 
[[http://netbeans.org/|NetBeans]] project and that you know how to use the 
!NetBeans debugger. If not, please go to 
http://www.netbeans.org/kb/using-netbeans/40/debug.html and read up on how to 
use !NetBeans and its debugger.
  
@@ -53, +73 @@

  Note that !NetBeans has a second option -- you can debug JSP files and 
servlets locally using a Tomcat server that is bundled with the IDE. When you 
debug a JSP file or servlet in the IDE, the bundled Tomcat server automatically 
starts in debug mode, and the debugger connects to it.
  
  
+ === Other ===
+ 
+ <>
- <>'''How do I change the monitoring interval for modified 
resources and application reloading?'''
+  How do I change the monitoring interval for modified resources and 
application reloading? 
  
  Monitoring interval for application reloading is contro

DO NOT REPLY [Bug 50839] New: Closing connection on the client side (browser) during unfinished transmission result in 100% CPU slike for 30 sec during socket shutdownd in jk_connect.c

2011-02-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50839

   Summary: Closing connection on the client side (browser) during
unfinished transmission result in 100% CPU slike for
30 sec during socket shutdownd in jk_connect.c
   Product: Tomcat Connectors
   Version: unspecified
  Platform: PC
OS/Version: Windows 2000
Status: NEW
  Severity: major
  Priority: P2
 Component: isapi
AssignedTo: dev@tomcat.apache.org
ReportedBy: serhiy_holodn...@adp.com


Configuration:
Windows 2000 server SP4
IIS 5
Tomcat 6.0.26
JK connector 1.2.31.0

All components are on the same server.

During research an issue why once in a while Tomcat on our servers starts
rejecting connection on port for JK connector with error 61, we noticed that
looks like it is starting with multiple 10054 errors recorded by JK connector
during our regression testing. Last one could be easily reproduced on all our
servers where it is installed. Error entry follows by spike in CPU utilization
for 30 seconds during attempt to shutdown a socket (reporting large negative or
positive number of lingering bytes read).

Here the snapshot from JK connector logs during these events:

[Sat Feb 26 19:22:19.979 2011] [2856:1508] [debug]
isapi_write_client::jk_isapi_plugin.c (1204): Writing 2057 bytes of data to
client
[Sat Feb 26 19:22:19.979 2011] [2856:1508] [error]
isapi_write_client::jk_isapi_plugin.c (1210): WriteClient failed with 10054
(0x2746)
[Sat Feb 26 19:22:19.979 2011] [2856:1508] [info]
ajp_process_callback::jk_ajp_common.c (1885): Writing to client aborted or
client network problems
[Sat Feb 26 19:22:19.979 2011] [2856:1508] [info] ajp_service::jk_ajp_common.c
(2543): (worker1) sending request to tomcat failed (unrecoverable), because of
client write error (attempt=1)
[Sat Feb 26 19:22:19.979 2011] [2856:1508] [info]
HttpExtensionProc::jk_isapi_plugin.c (2217): service() failed because client
aborted connection
[Sat Feb 26 19:22:19.979 2011] [2856:1508] [debug]
ajp_reset_endpoint::jk_ajp_common.c (757): (worker1) resetting endpoint with
socket 2776 (socket shutdown)
[Sat Feb 26 19:22:19.979 2011] [2856:1508] [debug]
jk_shutdown_socket::jk_connect.c (726): About to shutdown socket 2776
[127.0.0.1:2755 -> 127.0.0.1:8109]
[Sat Feb 26 19:22:49.010 2011] [2856:1508] [debug]
jk_shutdown_socket::jk_connect.c (808): Shutdown socket 2776 [127.0.0.1:2755 ->
127.0.0.1:8109] and read 1402725467 lingering bytes in 30 sec.

Other things noted: 
- download speed between webserver and client browser is about 60-80 Kb/sec
when JK is used. Content served by IIS or Tomcat directly delivered with about
2Mb/sec. 
- changing packet size (connector and tomcat) from default to 32K didn't make a
difference.
- Configure JK2 connector instead of JK (same box, same everything) - no issues
whatsoever (no CPU spikes, no download speed issues).

All values in server.xml and workers.properties are pretty much at default
values, but below is our workers.properties, just in case:


worker.list=worker1,worker2,worker3
worker.worker1.host=localhost
worker.worker1.port=8109 
worker.worker1.type=ajp13
worker.worker2.host=localhost
worker.worker2.port=8209 
worker.worker2.type=ajp13
worker.worker3.host=localhost
worker.worker3.port=8309 
worker.worker3.type=ajp13


and workers2.properties
-
[shm:]
file=${serverRoot}\work\jk2.shm
size=1048576

# add this section to test the proposition that it resolved the upload bug
[logger]
level=DEBUG

[logger.file:0]
file=D:\jk2logs\jk2.log
debug=1

# Define the communication channel 
[channel.socket:127.0.0.1:8109]
info=Ajp13 forwarding over socket
tomcatId=127.0.0.1:8109

# Map the Tomcat examples webapp to the Web server uri space
[uri:/*.jsp]
[uri:/*.jsf]
[uri:/*.faces]
[uri:/*.class]
[uri:/*download.pdf]
[uri:/*testServ]
[uri:/*TimerServlet]


Here the section from server.xml regarding AJP:
-


-

Please let me know if more information is needed.

Thanks,
Serhiy

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



[Tomcat Wiki] Update of "HowTo" by KonstantinKolinko

2011-02-27 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "HowTo" page has been changed by KonstantinKolinko.
The comment on this change is: Correct wrong example. Add a link..
http://wiki.apache.org/tomcat/HowTo?action=diff&rev1=98&rev2=99

--

   * Enter the following in myapp.xml:
  
  {{{
- 
+ 
  }}}
   . This assumes you have a web application containing WEB-INF in 
'''c:/workspace/myapp/WebRoot'''
  
@@ -460, +460 @@

   * Use your IDE to connect to Tomcat through port 1044
  
  If Eclipse happens to be your IDE of choice, you can get more information at 
[[http://www.jacoozi.com/index.php?option=com_content&task=view&id=119&Itemid=134|Remote
 Debugging with Eclipse (Jacoozi Article)]].
+ 
+ See also: [[FAQ/Developing]]
  
  == How do I debug a Tomcat application when Tomcat is run as a Windows 
service ? ==
  You can debug the tomcat service by editing the service parameters as follows.

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



DO NOT REPLY [Bug 48863] Log directory misconfiguration for class loaders

2011-02-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48863

--- Comment #7 from Konstantin Kolinko  2011-02-27 
13:46:41 EST ---
Regarding the patch that is applied to tc7 at r1073047 and is currently
proposed for 6.0.x:

1) The calls to ClassLoaderFactory#validateFile(file, type) pass canonical path
for DIR and JAR, but not for GLOB.  I mean, the following change to be done,
for consistency: (in trunk)

Index: java/org/apache/catalina/startup/ClassLoaderFactory.java
===
--- java/org/apache/catalina/startup/ClassLoaderFactory.java(revision
1075098)
+++ java/org/apache/catalina/startup/ClassLoaderFactory.java(working copy)
@@ -187,6 +187,7 @@
 set.add(url);
 } else if (repository.getType() == RepositoryType.GLOB) {
 File directory=new File(repository.getLocation());
+directory = new File(directory.getCanonicalPath());
 if (!validateFile(directory, RepositoryType.GLOB)) {
 continue;
 }

BTW, with the above change the calls to file.getAbsolutePath() inside of
#validateFile() become unnecessary.

2) The following check in ClassLoaderFactory#validateFile(file, type) assumes
that Bootstrap.getCatalinaBase() is an absolute (and canonical, because file is
canonical) path. But that is not guaranteed to be so:

if (!Bootstrap.getCatalinaHome().equals(   
Bootstrap.getCatalinaBase()) &&
file.getAbsolutePath().startsWith( 
Bootstrap.getCatalinaBase())) {

-- 
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 43497] Add ability to escape rendered output of JSP expressions

2011-02-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=43497

--- Comment #4 from Chin Huang  2011-02-27 13:49:50 EST ---
If you don't want to patch Tomcat, here is a custom ELResolver that XML-escapes
EL values.  You just have to add a servlet context listener to web.xml to
configure it in your web application.

http://pukkaone.github.com/2011/01/03/jsp-cross-site-scripting-elresolver.html

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



svn commit: r1075129 - /tomcat/tc5.5.x/trunk/STATUS.txt

2011-02-27 Thread kkolinko
Author: kkolinko
Date: Sun Feb 27 20:11:50 2011
New Revision: 1075129

URL: http://svn.apache.org/viewvc?rev=1075129&view=rev
Log:
vote

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1075129&r1=1075128&r2=1075129&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Feb 27 20:11:50 2011
@@ -50,5 +50,5 @@ PATCHES PROPOSED TO BACKPORT:
   reads from the request since this causes various problems in the connectors
   which do not expect this.
   http://svn.apache.org/viewvc?rev=1072042&view=rev
-  +1: markt, mturk
+  +1: markt, mturk, kkolinko
   -1:



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



svn commit: r1075175 - /tomcat/trunk/res/findbugs/filter-false-positives.xml

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 22:59:10 2011
New Revision: 1075175

URL: http://svn.apache.org/viewvc?rev=1075175&view=rev
Log:
Clear remaining FindBugs issues from javax.*

Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1075175&r1=1075174&r2=1075175&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sun Feb 27 22:59:10 
2011
@@ -17,6 +17,16 @@
 
   
   
+
+
+
+  
+  
+
+
+
+  
+  
 
 
 



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



svn commit: r1075176 - in /tomcat/trunk/java/org/apache/catalina/connector: CometEventImpl.java Connector.java Constants.java CoyoteInputStream.java CoyotePrincipal.java InputBuffer.java OutputBuffer.

2011-02-27 Thread markt
Author: markt
Date: Sun Feb 27 23:08:45 2011
New Revision: 1075176

URL: http://svn.apache.org/viewvc?rev=1075176&view=rev
Log:
Fix Eclipse warnings
Remove unused code

Modified:
tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/Constants.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java?rev=1075176&r1=1075175&r2=1075176&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java Sun Feb 
27 23:08:45 2011
@@ -88,6 +88,7 @@ public class CometEventImpl implements C
 this.eventSubType = eventSubType;
 }
 
+@Override
 public void close() throws IOException {
 if (request == null) {
 throw new 
IllegalStateException(sm.getString("cometEvent.nullRequest"));
@@ -98,22 +99,27 @@ public class CometEventImpl implements C
 if (iscomet) request.cometClose();
 }
 
+@Override
 public EventSubType getEventSubType() {
 return eventSubType;
 }
 
+@Override
 public EventType getEventType() {
 return eventType;
 }
 
+@Override
 public HttpServletRequest getHttpServletRequest() {
 return request.getRequest();
 }
 
+@Override
 public HttpServletResponse getHttpServletResponse() {
 return response.getResponse();
 }
 
+@Override
 public void setTimeout(int timeout) throws IOException, ServletException,
 UnsupportedOperationException {
 if (request.getAttribute("org.apache.tomcat.comet.timeout.support") == 
Boolean.TRUE) {

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1075176&r1=1075175&r2=1075176&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Sun Feb 27 
23:08:45 2011
@@ -1005,8 +1005,6 @@ public class Connector extends Lifecycle
 
 //  JMX registration  
 
-private ObjectName onameProtocolHandler;
-
 @Override
 protected String getDomainInternal() {
 return MBeanUtils.getDomain(getService());

Modified: tomcat/trunk/java/org/apache/catalina/connector/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Constants.java?rev=1075176&r1=1075175&r2=1075176&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Constants.java Sun Feb 27 
23:08:45 2011
@@ -23,11 +23,4 @@ public final class Constants {
 
 public static final String Package = "org.apache.catalina.connector";
 
-public static final int DEFAULT_CONNECTION_LINGER = -1;
-public static final int DEFAULT_CONNECTION_TIMEOUT = 6;
-public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 30;
-public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0;
-
-public static final int PROCESSOR_IDLE = 0;
-public static final int PROCESSOR_ACTIVE = 1;
 }

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java?rev=1075176&r1=1075175&r2=1075176&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java Sun 
Feb 27 23:08:45 2011
@@ -88,6 +88,7 @@ public class CoyoteInputStream
 AccessController.doPrivileged(
 new PrivilegedExceptionAction(){
 
+@Override
 public Integer run() throws IOException{
 Integer integer = 
Integer.valueOf(ib.readByte());
 return integer;
@@ -117,6 +118,7 @@ public class CoyoteInputStream
 AccessController.doPrivileged(
 new Pri

DO NOT REPLY [Bug 50793] Invalid DispatchType in ServletRequestListener on async dispatch

2011-02-27 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50793

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|VERIFIED|CLOSED

-- 
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: r1075175 - /tomcat/trunk/res/findbugs/filter-false-positives.xml

2011-02-27 Thread sebb
On 27 February 2011 22:59,   wrote:
> Author: markt
> Date: Sun Feb 27 22:59:10 2011
> New Revision: 1075175
>
> URL: http://svn.apache.org/viewvc?rev=1075175&view=rev
> Log:
> Clear remaining FindBugs issues from javax.*
>
> Modified:
>    tomcat/trunk/res/findbugs/filter-false-positives.xml
>
> Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1075175&r1=1075174&r2=1075175&view=diff
> ==
> --- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
> +++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sun Feb 27 22:59:10 
> 2011
> @@ -17,6 +17,16 @@
>  
>   
>   
> +    

s/Can/Cannot/

> +    
> +    
> +  
> +  
> +     name="javax.servlet.jsp.el.ImplicitObjectELResolver$ScopeMap$ScopeEntry"/>
> +    
> +    
> +  
> +  
>     
>     
>     
>
>
>
> -
> 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