DO NOT REPLY [Bug 50538] Unable to Install Apache in windows XP

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50538

Mark Thomas  changed:

   What|Removed |Added

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



Time for 6.0.30?

2011-01-04 Thread Mark Thomas
It has been a while since 6.0.29 and there have been a few requests for
this on the users list. Jean-Frederic, do you have any plans for 6.0.30
at this point?

Cheers,

Mark

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



svn commit: r1054987 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java JIoEndpoint.java NioEndpoint.java

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 11:53:32 2011
New Revision: 1054987

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

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1054987&r1=1054986&r2=1054987&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Jan  4 
11:53:32 2011
@@ -40,7 +40,6 @@ import org.apache.tomcat.jni.SSLSocket;
 import org.apache.tomcat.jni.Socket;
 import org.apache.tomcat.jni.Status;
 import org.apache.tomcat.util.ExceptionUtils;
-import org.apache.tomcat.util.threads.CounterLatch;
 
 
 /**

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=1054987&r1=1054986&r2=1054987&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Tue Jan  4 
11:53:32 2011
@@ -32,7 +32,6 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
-import org.apache.tomcat.util.threads.CounterLatch;
 
 
 /**

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1054987&r1=1054986&r2=1054987&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Jan  4 
11:53:32 2011
@@ -57,7 +57,6 @@ import org.apache.tomcat.util.net.Abstra
 import org.apache.tomcat.util.net.SecureNioChannel.ApplicationBufferHandler;
 import org.apache.tomcat.util.net.jsse.JSSESocketFactory;
 import org.apache.tomcat.util.net.jsse.NioX509KeyManager;
-import org.apache.tomcat.util.threads.CounterLatch;
 
 /**
  * NIO tailored thread pool, providing the following services:



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



DO NOT REPLY [Bug 50523] Unsuccessfully Deployed WebApplication Has Not Removed From JMX Server When Undeployed

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50523

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME

--- Comment #1 from Mark Thomas  2011-01-04 07:14:18 EST ---
I can't repeat this with the current 7.0.x trunk.

-- 
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 "FAQ" by markt

2011-01-04 Thread Apache Wiki
Dear Wiki user,

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

The "FAQ" page has been changed by markt.
The comment on this change is: Alphabetical order.
http://wiki.apache.org/tomcat/FAQ?action=diff&rev1=30&rev2=31

--

  For your convenience, we have tried to break the FAQ out into multiple 
sections consisting of the following topics: 
  
  * [[/Bugs|Bugs]] - You think you have a bug or there is a difference in 
behavior with another servlet container.
+ * [[/CharacterEncoding|Character Encoding]] - How to handle non-standard 
characters.
  * [[/Class_Not_Found|Class Not Found]] - What to do with Class Not Found 
errors.
- * [[/CharacterEncoding|Character Encoding]] - How to handle non-standard 
characters.
  * [[/Clustering|Clustering]] - Cluster and clustering related questions
  * [[/Connectors|Connectors]] - You want to connect tomcat to Apache, IIS, 
or have questions about tomcat-standalone.
  * [[/Database|Database]] - Getting tomcat to talk to a database.
  * [[/Deployment|Deployment]] - Questions related to web application 
deployment.
  * [[/Developing|Developing]] - Various IDE integration questions.
+ * [[/FDA_Validation|FDA Validation]] - Questions related to running 
Tomcat in an FDA validated environment.
  * [[HowTo|How To]] - Miscellaneous common how to's.
- * [[/FDA_Validation|FDA Validation]] - Questions related to running 
Tomcat in an FDA validated environment.
  * [[/Linux_Unix|Linux / Unix]] - Common questions for Linux / Unix 
related platforms.
- * [[/Other_Operating_Systems|Other Operating Systems]] - Information 
about scripts and support for other operating systems.
  * [[/Logging|Logging]] - Common questions related to logging in Tomcat.
  * [[/Memory|Memory]] - Common memory related questions.
  * [[/About|Meta]] - About Tomcat and this FAQ.
  * [[/Miscellaneous|Miscellaneous]] - Miscellaneous questions that weren't 
categorized.
+ * [[/Other_Operating_Systems|Other Operating Systems]] - Information 
about scripts and support for other operating systems.
+ * [[UsefulLinks|Other Resources]] - A lot of links to tomcat related 
documentation and experiences.
  * [[/Performance_and_Monitoring|Performance & Monitoring]] - Performance 
& Monitoring questions.
+ * [[/Security|Security]] - Common security issues.
+ * [[/Tomcat_User|Tomcat User]] - More information about the tomcat-user 
list.
  * [[/Troubleshooting_and_Diagnostics|Troubleshooting & Diagnostics]] - 
Tools and techniques for diagnosing problems.
- * [[UsefulLinks|Other Resources]] - A lot of links to tomcat related 
documentation and experiences.
- * [[/Security|Security]] - Common security issues.
  * [[TomcatVersions|Version]] - About the different tomcat versions.
- * [[/Tomcat_User|Tomcat User]] - More information about the tomcat-user 
list.
  * [[../Tomcat/WebDav|WebDav]] - Questions on using Tomcat Webdav servlet.
  * [[/Windows|Windows]] - Common Windows questions.
  

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



[Tomcat Wiki] Update of "FAQ" by markt

2011-01-04 Thread Apache Wiki
Dear Wiki user,

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

The "FAQ" page has been changed by markt.
The comment on this change is: Add a link to a (soon to be written) known 
issues page.
http://wiki.apache.org/tomcat/FAQ?action=diff&rev1=31&rev2=32

--

  * [[/Developing|Developing]] - Various IDE integration questions.
  * [[/FDA_Validation|FDA Validation]] - Questions related to running 
Tomcat in an FDA validated environment.
  * [[HowTo|How To]] - Miscellaneous common how to's.
+ * [[/KnownIssues|Known Issues]] - Known issues
  * [[/Linux_Unix|Linux / Unix]] - Common questions for Linux / Unix 
related platforms.
  * [[/Logging|Logging]] - Common questions related to logging in Tomcat.
  * [[/Memory|Memory]] - Common memory related questions.

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



Re: 7.0.6 plans

2011-01-04 Thread Rainer Jung

On 03.01.2011 17:49, Mark Thomas wrote:

Hope everyone had a good holiday.


Thanks, hope you had good holidays too!


I think it is time for another 7.0.x release. I'll start going through
the open bugs this week and depending on how long that takes probably
get to the point where 7.0.6 is tagged end of this week / beginning of next.


+1


On related news, I managed to spend some time over the holidays setting
up a new Jira installation for the ASF that we'll be able to use to test
Tomcat 7. There are a few things still to do before that goes live but
we should have the ASF Jira running on Tomcat 7.0.latest in a month or two.


Great!

Rainer

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



Re: Time for 6.0.30?

2011-01-04 Thread Rainer Jung

On 04.01.2011 11:44, Mark Thomas wrote:

It has been a while since 6.0.29 and there have been a few requests for
this on the users list. Jean-Frederic, do you have any plans for 6.0.30
at this point?


I think a 6.0.30 is kind of overdue. If Jean-Frederic can't start the 
release process during the next 2 weeks or so, I can volunteer. It looks 
like releasing TC 6 isn't very complicated and the more people can do it 
the better. If Jean-Frederic is willing to do it, I would nevertheless 
prefer him to do it.


Regards,

Rainer

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



[Tomcat Wiki] Update of "FAQ/KnownIssues" by markt

2011-01-04 Thread Apache Wiki
Dear Wiki user,

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

The "FAQ/KnownIssues" page has been changed by markt.
The comment on this change is: Add known issues page.
http://wiki.apache.org/tomcat/FAQ/KnownIssues

--

New page:
= FAQ / Known Issues =

== Questions ==

 1. [[#TomcatIssues|What are the known issues in any given Tomcat version?]]
 1. [[#OracleJREIssues|What are the known issues with the Oracle JRE?]]

== Answers ==

<>'''What are the known issues in any given Tomcat 
version?'''

To determine the known issues for any given Tomcat version, you'll need to 
review the following:
 * The currently open bugs and enhancement requests in Bugzilla
   * 
[[https://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;bug_status=NEEDINFO;product=Tomcat%207|Open
 Tomcat 7 bugs]]
   * 
[[https://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;bug_status=NEEDINFO;product=Tomcat%206|Open
 Tomcat 6 bugs]]
   * 
[[https://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;bug_status=NEEDINFO;product=Tomcat%205|Open
 Tomcat 5 bugs]]
 * The latest (from svn) change log entries for all newer versions
   * [[http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml| 
Tomcat 7 change log]]
   * 
[[http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml|
 Tomcat 6 change log]]
   * 
[[http://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml|
 Tomcat 5 change log]]

<>'''What are the known issues with the Oracle JRE?'''

 * [[https://issues.apache.org/bugzilla/show_bug.cgi?id=50518|jps.exe and 
jvisualvm.exe cannot detect tomcat using jdk1.6.0_23 onwards]]

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



DO NOT REPLY [Bug 50518] jps.exe and jvisualvm.exe cannot detect tomcat using jdk1.6.0_23

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50518

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||INVALID

--- Comment #8 from Mark Thomas  2011-01-04 07:37:45 EST ---
Yep - this is a JVM issue, not a Tomcat bug. I've added a known issues section
to the FAQ.

-- 
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: Time for 6.0.30?

2011-01-04 Thread jean-frederic clere

On 01/04/2011 11:44 AM, Mark Thomas wrote:

It has been a while since 6.0.29 and there have been a few requests for
this on the users list. Jean-Frederic, do you have any plans for 6.0.30
at this point?


Next week :D

Cheers

Jean-Frederic

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



svn commit: r1055055 - in /tomcat/trunk: java/org/apache/el/lang/ELArithmetic.java test/org/apache/el/lang/TestELArithmetic.java webapps/docs/changelog.xml

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 14:22:52 2011
New Revision: 1055055

URL: http://svn.apache.org/viewvc?rev=1055055&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50500
Use correct coercions (as per the EL spec) for arithmetic operations involving 
string values containing '.', 'e' or 'E'. Based on a patch by Brian Weisleder.

Added:
tomcat/trunk/test/org/apache/el/lang/TestELArithmetic.java   (with props)
Modified:
tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=1055055&r1=1055054&r2=1055055&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java Tue Jan  4 14:22:52 
2011
@@ -257,9 +257,12 @@ public abstract class ELArithmetic {
 final ELArithmetic delegate;
 if (BIGDECIMAL.matches(obj0, obj1))
 delegate = BIGDECIMAL;
-else if (DOUBLE.matches(obj0, obj1))
-delegate = DOUBLE;
-else if (BIGINTEGER.matches(obj0, obj1))
+else if (DOUBLE.matches(obj0, obj1)) {
+if (BIGINTEGER.matches(obj0, obj1))
+delegate = BIGDECIMAL;
+else
+delegate = DOUBLE;
+} else if (BIGINTEGER.matches(obj0, obj1))
 delegate = BIGINTEGER;
 else
 delegate = LONG;
@@ -277,7 +280,7 @@ public abstract class ELArithmetic {
 
 final ELArithmetic delegate;
 if (BIGDECIMAL.matches(obj0, obj1))
-delegate = BIGDECIMAL;
+delegate = DOUBLE;
 else if (DOUBLE.matches(obj0, obj1))
 delegate = DOUBLE;
 else if (BIGINTEGER.matches(obj0, obj1))
@@ -299,9 +302,12 @@ public abstract class ELArithmetic {
 final ELArithmetic delegate;
 if (BIGDECIMAL.matches(obj0, obj1))
 delegate = BIGDECIMAL;
-else if (DOUBLE.matches(obj0, obj1))
-delegate = DOUBLE;
-else if (BIGINTEGER.matches(obj0, obj1))
+else if (DOUBLE.matches(obj0, obj1)) {
+if (BIGINTEGER.matches(obj0, obj1))
+delegate = BIGDECIMAL;
+else
+delegate = DOUBLE;
+} else if (BIGINTEGER.matches(obj0, obj1))
 delegate = BIGINTEGER;
 else
 delegate = LONG;
@@ -339,9 +345,12 @@ public abstract class ELArithmetic {
 final ELArithmetic delegate;
 if (BIGDECIMAL.matches(obj0, obj1))
 delegate = BIGDECIMAL;
-else if (DOUBLE.matches(obj0, obj1))
-delegate = DOUBLE;
-else if (BIGINTEGER.matches(obj0, obj1))
+else if (DOUBLE.matches(obj0, obj1)) {
+if (BIGINTEGER.matches(obj0, obj1))
+delegate = BIGDECIMAL;
+else
+delegate = DOUBLE;
+} else if (BIGINTEGER.matches(obj0, obj1))
 delegate = BIGINTEGER;
 else
 delegate = LONG;

Added: tomcat/trunk/test/org/apache/el/lang/TestELArithmetic.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/lang/TestELArithmetic.java?rev=1055055&view=auto
==
--- tomcat/trunk/test/org/apache/el/lang/TestELArithmetic.java (added)
+++ tomcat/trunk/test/org/apache/el/lang/TestELArithmetic.java Tue Jan  4 
14:22:52 2011
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.lang;
+
+import java.math.BigInteger;
+
+import junit.framework.TestCase;
+
+public class TestELArithmetic extends TestCase {
+private final String a = "1.1";
+private final BigInteger b = new BigInteger("10");
+
+public void testAdd() throws Exception {
+assertEquals("11.1",
+String.valueOf(ELArithmetic.add(a, b)));
+}
+
+public void testSubtract() throws Exception {
+assertEquals("-8.9",
+ 

svn commit: r1055056 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 14:23:58 2011
New Revision: 1055056

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

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1055056&r1=1055055&r2=1055056&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan  4 14:23:58 2011
@@ -330,3 +330,10 @@ PATCHES PROPOSED TO BACKPORT:
   which is not just a context name and looks ugly. The patch is not
   clean - it includes BZ 50459 bindThread patch that was proposed above.
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50500
+  Use correct coercions for EL arithmetic operations. Based on a patch by Brian
+  Weisleder
+  http://svn.apache.org/viewvc?rev=1055055&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 50500] EL evaluation of floating-point String value vs BigInteger loses precision

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50500

Mark Thomas  changed:

   What|Removed |Added

  Component|Jasper  |Jasper
Version|trunk   |6.0.29
Product|Tomcat 7|Tomcat 6
   Target Milestone|--- |default

--- Comment #3 from Mark Thomas  2011-01-04 09:25:23 EST ---
Thanks for the patches. I applied them (with some minor alterations after
reviewing the spec) to 7.0.x and they will be included in 7.0.6 onwards. I also
proposed back-porting the changes to 6.0.x.

Since this is now fixed in 7.0.x, I'm moving this issue to 6.0.x

-- 
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 50495] Comet connector needs ability to access the client send queue.

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50495

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX
   Severity|blocker |enhancement

--- Comment #1 from Mark Thomas  2011-01-04 09:42:15 EST ---
This is an enhancement request, not a blocker.

This enhancement looks like something that is application specific. There are
various reasons why a generic solution would be difficult:
- the Comet API (and all of Tomcat's internals) has no concept of a message
- bytes written to clients are buffered are various points both under Tomcat's
control and completely outside of Tomcat's control
- the criteria for compressing messages is something that would be very hard to
make generic

With all this in mind, I am resolving this as WONTFIX.

That said, if there are changes to the Comet API you would like to propose (in
the form of a patch) that would make an application level implementation of
these features easier, feel free to re-open this issue and attach your proposed
patch.

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

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



DO NOT REPLY [Bug 50494] Need to add ability to disable chunked encoding or support HTTP 1.0 response.

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50494

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas  2011-01-04 09:55:33 EST ---
Bugzilla is not a support forum. These questions below on the users mailing
list.

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

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



DO NOT REPLY [Bug 50495] Comet connector needs ability to access the client send queue.

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50495

--- Comment #2 from gober...@msn.com 2011-01-04 09:56:22 EST ---
Mark, 
this is not application specific. I have no idea when data is written to a
socket from Tomcat.
I need to know when you write messages "under Tomcat control" - this is all I
need. I am sure you have some concept of "client message queue".
This is an a enhancement to address a bug in my opinion. As of now, a single
client has the ability to deplete resources of the whole server. This makes
Tomcat Comet technology a toy for college projects at best. Completely
unsuitable for production application.
I have no choice but to look for alternative implementations.

-- 
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 50494] Need to add ability to disable chunked encoding or support HTTP 1.0 response.

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50494

--- Comment #2 from gober...@msn.com 2011-01-04 10:02:30 EST ---
This is not a support question. It is a legitimate requests for enhancement. Is
there a place I can request enhancements for Tomcat?
Or maybe you do not accept requests for enhancements?

-- 
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 50494] Need to add ability to disable chunked encoding or support HTTP 1.0 response.

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50494

--- Comment #3 from Mark Thomas  2011-01-04 10:09:15 EST ---
The questions you asked "Is it possible to ...?" are support questions that
belong on the users mailing list. Enhancement requests are usually phrased
"Please add an option to ..."

Enhancement requests can be made by selecting 'enhancement' for the issues
severity.

Given your questions, I'd recommend the users list is the place to start to get
the "Is it possible to ..." answers and then open an enhancement request if
there is a new feature you'd like to see.

-- 
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 50494] Need to add ability to disable chunked encoding or support HTTP 1.0 response.

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50494

gober...@msn.com changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |
   Severity|critical|enhancement

--- Comment #4 from gober...@msn.com 2011-01-04 10:16:35 EST ---
Given how fast you reject enhancement requests, I feel it will be waste of
time, but, just to please you I am making the changes:

I use NIO HTTP Tomcat connector org.apache.coyote.Http11NioProtocol to
implement Comet streaming to browsers and mobile devices. 
The application opens 'primary' persistent Comet connection to receive data
from the server. Server sends data to the client periodically.

Currently, the response always uses HTTP 1.1 type response with chunked
encoding.

There could be a legitimate reason to disable chunked encoding - use
"Connection: close" without "Content-Length" headers.

For example, if I use tomcat to implement EventType streaming with Chrome, it
does not like chunked encoding and fails to receive any data. Also, chunked
encoding increases network bandwidth.

One way to disable chunked encoding (and actually the one I would prefer) is to
force HTTP 1.0 response.

PLEASE ADD AN OPTION TO:
1) force HTTP 1.0 response.
2) use HTTP 1.1 response, but disable chunked encoding.

-- 
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 50495] Comet connector needs ability to access the client send queue.

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50495

--- Comment #3 from Mark Thomas  2011-01-04 10:38:25 EST ---
(In reply to comment #2)
> I have no idea when data is written to a socket from Tomcat.
This is open source. You could have looked it up. The users list is always very
helpful to folks trying to understand Tomcat's internals and needing a few
pointers. The short version is:
'out' -> 8k buffer -> socket

> I need to know when you write messages "under Tomcat control" - this is all I
> need.
It depends. The above buffer is flushed if it is full or if a call is made to
out.flush(). Once the buffer is flushed, Tomcat has no control over the data.

> I am sure you have some concept of "client message queue".
As I said before, Tomcat has no concept of a message so there is no message
queue. The bytes are treated as just that - bytes. There is nothing the
delimits messages which are an application defined concept. If there are 5,000
bytes to be written the client, Tomcat has no idea if they represent 10*500
byte message or 1000*5 byte messages.

> This is an a enhancement to address a bug in my opinion. As of now, a single
> client has the ability to deplete resources of the whole server.
That shouldn't happen. The NIO connector uses simulated blocking so the call to
out.write() should block if the socket send buffer is full. If memory serves me
correctly, that is around 30k. If you have a simple test case that demonstrates
an OOME then please re-open this issue, attach it and someone will take a look.

> This makes  Tomcat Comet technology a toy for college projects at best.
> Completely unsuitable for production application.
That sort of comment isn't going to encourage any of the folks here (who are
all volunteers) to help you.

> I have no choice but to look for alternative implementations.
You are, of course, free to do that is you wish.

-- 
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 50494] Need to add ability to disable chunked encoding or support HTTP 1.0 response.

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50494

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||INVALID

--- Comment #5 from Mark Thomas  2011-01-04 10:52:52 EST ---
Tomcat aims to implement the various specifications (HTTP, Servlet, etc.) as
closely as possible and deviates from those specifications only when there is a
very good reason to do so. Working around bugs in third party applications is
typically not viewed as good reason to diverge from the specifications.

Quoting from section 4.4 of the HTTP 1.1 spec:

All HTTP/1.1 applications that receive entities MUST accept the
"chunked" transfer-coding (section 3.6), thus allowing this mechanism
to be used for messages when the message length cannot be determined
in advance.


With the above in mind, this looks like a bug in the user agent.

I can think of several ways to force a non-chunked response with the current
Tomcat versions. As I said previously, the users mailing list is the place to
discuss this. If a discussion on the users list identifies a use case that
isn't currently supported, that would be the point to re-open this issue.

-- 
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: r1055085 - in /tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test: AlternateUsernameTest.java DefaultTestCase.java

2011-01-04 Thread fhanik
Author: fhanik
Date: Tue Jan  4 15:55:18 2011
New Revision: 1055085

URL: http://svn.apache.org/viewvc?rev=1055085&view=rev
Log:
Add a test case of no user name change

Modified:

tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java

tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java

Modified: 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java?rev=1055085&r1=1055084&r2=1055085&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
 Tue Jan  4 15:55:18 2011
@@ -38,13 +38,16 @@ public class AlternateUsernameTest exten
 public AlternateUsernameTest(String name) {
 super(name);
 }
-
 public void testUsernameCompare() throws Exception {
-
+testUsername(true);
+}
+
+private void testUsername(boolean allowUsernameChange) throws Exception {
+long start = System.currentTimeMillis();
 this.init();
 this.datasource.setDriverClassName(Driver.class.getName());
 this.datasource.setUrl("jdbc:tomcat:test");
-this.datasource.setAlternateUsernameAllowed(true);
+this.datasource.setAlternateUsernameAllowed(allowUsernameChange);
 this.datasource.getConnection().close();
 int withoutuser =10;
 int withuser = withoutuser;
@@ -52,7 +55,7 @@ public class AlternateUsernameTest exten
 for (int i=0; ihttp://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java?rev=1055085&r1=1055084&r2=1055085&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
 Tue Jan  4 15:55:18 2011
@@ -180,6 +180,7 @@ public class DefaultTestCase extends Tes
 tDatasource = null;
 //c3p0Datasource = null;
 System.gc();
+org.apache.tomcat.jdbc.test.driver.Driver.reset();
 }
 
 private final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";



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



Re: Time for 6.0.30?

2011-01-04 Thread Filip Hanik - Dev Lists

+1

Filip

On 1/4/2011 3:44 AM, Mark Thomas wrote:

It has been a while since 6.0.29 and there have been a few requests for
this on the users list. Jean-Frederic, do you have any plans for 6.0.30
at this point?

Cheers,

Mark

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



-
No virus found in this message.
Checked by AVG - www.avg.com
Version: 10.0.1191 / Virus Database: 1435/3357 - Release Date: 01/03/11





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



Re: Tomcat JDBC Pool in Tomcat 6.0.x / 7.0.x

2011-01-04 Thread Henri Gomez
I just see a new tag for jdbc-pool.

I'll be very happy to have such advanced pool on Tomcat but we need
some stable release (and of course artifact deployed to Maven
central).

So what's the status for it, and possible inclusion (as extra) in Tomcat 6.0.x ?

2010/10/28 Henri Gomez :
>> Several reasons:
>>
>> 1. It isn't a 100% compatible drop-in replacement. There are some
>> features in Commons DBCP that jdbc-pool doesn't provide.
>
> I was thinking at JDBC pool for Datasources management as an
> alternative to Tomcat DBCP pool based on Common DBCP.
>
>> 2. Every time Filip tried to get votes for a release (and the one time I
>> did) the release failed to collect sufficient votes.
>
> May be you could resend a new vote, there is many new commiters today,
> they may be interested.
>
>> There is nothing stopping you using it. Just set the factory attribute
>> for the resource.
>
> I know, but having it bundled with Tomcat is allways better,
> especially when you are working with community edition of Tomcat.
>
>>> Also, could it be deployed to Maven repo so it could be used and
>>> deployed more easily ?
>>
>> No. Not until such time as it has an official release. (That doesn't
>> stop it being added to the ASF snapshot repo).
>
> Any date for official release ?
> +1 to have it on ASF snapshot repo.
>
>
>      
>            org.apache.tomcat
>            jdbc-pool
>            1.0.8.5-SNAPSHOT
>        
>
> 
>
>> I would also add:
>> - SpringSource is using it as the default pool in tc Server. There have
>> been a few bugs but it looks stable to me.
>
> It's a gage of stability.
> Default datasource factory could still use common-dbcp implementation,
> but jdbc-pool could be provided also.
>
>> - Commons is currently re-writing Pool and DBCP and using jdbc-pool as
>> the basis.
>
> Interesting, another sign jdbc-pool is a good implementation.
>

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



svn commit: r1055088 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-01-04 Thread fhanik
Author: fhanik
Date: Tue Jan  4 16:28:30 2011
New Revision: 1055088

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

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1055088&r1=1055087&r2=1055088&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan  4 16:28:30 2011
@@ -291,7 +291,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Make SSL protocol selection consistent between BIO and NIO and update docs
   to reflect current BIO and post-patch NIO.
   http://people.apache.org/~markt/patches/2010-12-07-ssl-algorithm-tc6.patch
-  +1: markt, kkolinko
+  +1: markt, kkolinko, fhanik
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413



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



DO NOT REPLY [Bug 50541] New: JNDIRealm: support configuring LDAP sizeLimit (countLimit in SearchControls)

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50541

   Summary: JNDIRealm: support configuring LDAP sizeLimit
(countLimit in SearchControls)
   Product: Tomcat 7
   Version: trunk
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: apa...@olo.org.pl


Today, when enabling an application's LDAP authentication through Active
Directory, I've discovered that with apparently a completely correct LDAP Realm
configuration on the Tomcat side, AD returns the following error all the time:

LDAP: error code 1 - 04DC: LdapErr: DSID-0C0906DD, comment: In order to
perform this operation a successful bind must be completed on the connection.,
data 0, v1771

After some hours of Googling and experimenting with referrals, subtree search
modes et cetera, I've found out (through network packet analysis) that the
problem is caused by LDAP sizeLimit being set to zero in the searches sent by
Tomcat.

After closer inspection of Tomcat source code, I've dug out this class:

http://svn.apache.org/repos/asf/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java

And this code fragment in the method getUserBySearch(DirContext context, String
username, String[] attrIds):



// Set up the search controls
SearchControls constraints = new SearchControls();

if (userSubtree) {
constraints.setSearchScope(SearchControls.SUBTREE_SCOPE);
}
else {
constraints.setSearchScope(SearchControls.ONELEVEL_SCOPE);
}

// Specify the attributes to be retrieved
if (attrIds == null)
attrIds = new String[0];
constraints.setReturningAttributes(attrIds);

NamingEnumeration results =
context.search(userBase, filter, constraints);

As you can see
(http://tomcat.apache.org/tomcat-7.0-doc/realm-howto.html#JNDIRealm), currently
there's no way to customize other search controls than search scope and
returning attributes by means of XML configuration.

In javax.naming.directory.SearchControls, the LDAP sizeLimit is determined by
the countLimit property:
http://download.oracle.com/javase/6/docs/api/javax/naming/directory/SearchControls.html#setCountLimit(long)

I propose to create a new configuration attribute for the Realm XML element
that would enable setting this limit, and naming it "sizeLimit" (not
"countLimit" like the Java property, because in LDAP world people are used to
the former term). While we're at it, adding "timeLimit" (measured in
milliseconds) attribute would be also nice.

So for example one would be able to set 1000 entries sizeLimit and 5 seconds
timeLimit this way:

ldap://localhost:389";
   userPattern="uid={0},ou=people,dc=mycompany,dc=com"
   sizeLimit="1000"
   timeLimit="5000"
/>

-- 
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: r1055101 - in /tomcat/trunk/webapps/docs: changelog.xml setup.xml

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 16:56:58 2011
New Revision: 1055101

URL: http://svn.apache.org/viewvc?rev=1055101&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50488
Update classpath required when using jsvc and add a note regarding server VMs.

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/setup.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1055101&r1=1055100&r2=1055101&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan  4 16:56:58 2011
@@ -234,6 +234,10 @@
   
 Improve documentation of database connection factory. (rjung)
   
+  
+50488: Update classpath required when using jsvc and add a
+note regarding server VMs. (markt)
+  
 
   
   

Modified: tomcat/trunk/webapps/docs/setup.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/setup.xml?rev=1055101&r1=1055100&r2=1055101&view=diff
==
--- tomcat/trunk/webapps/docs/setup.xml (original)
+++ tomcat/trunk/webapps/docs/setup.xml Tue Jan  4 16:56:58 2011
@@ -119,11 +119,15 @@
 
 
 cd $CATALINA_HOME
-./bin/jsvc -cp ./bin/bootstrap.jar \
+./bin/jsvc -cp ./bin/bootstrap.jar:./bin/tomcat-juli.jar \
 -outfile ./logs/catalina.out -errfile ./logs/catalina.err \
 org.apache.catalina.startup.Bootstrap
 
 
+You may also need to specify -jvm server if you JVM 
defaults
+   to using a server VM rather than a client VM. This has been observed on
+   OSX.
+
 jsvc has other useful parameters, such as -user which 
causes it to switch to another user after the daemon initialization is
complete. This allows, for example, running Tomcat as a non privileged



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



DO NOT REPLY [Bug 50488] classpath for jsvc in web page

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50488

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2011-01-04 11:57:14 EST ---
Thanks for the report. Fixed in 7.0.x and will be included in 7.0.5 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: r1055101 - in /tomcat/trunk/webapps/docs: changelog.xml setup.xml

2011-01-04 Thread Caldarale, Charles R
> From: ma...@apache.org [mailto:ma...@apache.org] 
> Subject: svn commit: r1055101 - in /tomcat/trunk/webapps/docs: changelog.xml 
> setup.xml

> +You may also need to specify -jvm server if you JVM 
> defaults
> +   to using a server VM rather than a client VM. This has been observed 
> on
> +   OSX.

The above note doesn't make sense to me (besides the ungrammatical "you JVM"): 
if the JVM defaults to server mode, why would you need to specify "-jvm server"?

 - Chuck


THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
MATERIAL and is thus for use only by the intended recipient. If you received 
this in error, please contact the sender and delete the e-mail and its 
attachments from all computers.



Re: Tomcat JDBC Pool in Tomcat 6.0.x / 7.0.x

2011-01-04 Thread Filip Hanik - Dev Lists

On 1/4/2011 9:22 AM, Henri Gomez wrote:

I just see a new tag for jdbc-pool.

I'll be very happy to have such advanced pool on Tomcat but we need
some stable release (and of course artifact deployed to Maven
central).

So what's the status for it, and possible inclusion (as extra) in Tomcat 6.0.x ?


I can run a vote for a release, people just need to check it out, and then we 
can release it.
Personally I like to see it as default for Tomcat 7, as it offers much 
enhancements, and little disadvantages over dbcp
the code base is so small, that the interest in working on it, makes it a bit 
harder

Filip


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



Re: svn commit: r1055101 - in /tomcat/trunk/webapps/docs: changelog.xml setup.xml

2011-01-04 Thread Mark Thomas
On 04/01/2011 17:02, Caldarale, Charles R wrote:
>> From: ma...@apache.org [mailto:ma...@apache.org] 
>> Subject: svn commit: r1055101 - in /tomcat/trunk/webapps/docs: changelog.xml 
>> setup.xml
> 
>> +You may also need to specify -jvm server if you JVM 
>> defaults
>> +   to using a server VM rather than a client VM. This has been observed 
>> on
>> +   OSX.
> 
> The above note doesn't make sense to me (besides the ungrammatical "you 
> JVM"): if the JVM defaults to server mode, why would you need to specify 
> "-jvm server"?

I'll fix the typo.

I suspect some sort of mismatch between jsvc and the jvm default. I
haven't tested it, just going on what the OP said.

Mark

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



svn commit: r1055103 - /tomcat/trunk/webapps/docs/setup.xml

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 17:09:48 2011
New Revision: 1055103

URL: http://svn.apache.org/viewvc?rev=1055103&view=rev
Log:
Fix typo

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

Modified: tomcat/trunk/webapps/docs/setup.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/setup.xml?rev=1055103&r1=1055102&r2=1055103&view=diff
==
--- tomcat/trunk/webapps/docs/setup.xml (original)
+++ tomcat/trunk/webapps/docs/setup.xml Tue Jan  4 17:09:48 2011
@@ -124,7 +124,7 @@
 org.apache.catalina.startup.Bootstrap
 
 
-You may also need to specify -jvm server if you JVM 
defaults
+You may also need to specify -jvm server if the JVM 
defaults
to using a server VM rather than a client VM. This has been observed on
OSX.
 



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



svn commit: r1055115 - in /tomcat/trunk: java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml webapps/docs/config/realm.xml

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 17:35:06 2011
New Revision: 1055115

URL: http://svn.apache.org/viewvc?rev=1055115&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50541
Add support for sizeLimit and timeLimit on the JNDIRealm

Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/realm.xml

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1055115&r1=1055114&r2=1055115&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Jan  4 
17:35:06 2011
@@ -389,6 +389,18 @@ public class JNDIRealm extends RealmBase
  */
 protected String connectionTimeout = "5000";
 
+/**
+ * The sizeLimit (also known as the countLimit) to use when the realm is
+ * configured with {...@link #userSearch}. Zero for no limit.
+ */
+protected long sizeLimit = 0;
+
+/**
+ * The timeLimit (in milliseconds) to use when the realm is configured with
+ * {...@link #userSearch}. Zero for no limit.
+ */
+protected int timeLimit = 0;
+
 // - Properties
 
 /**
@@ -900,6 +912,26 @@ public class JNDIRealm extends RealmBase
 }
 
 
+public long getSizeLimit() {
+return sizeLimit;
+}
+
+
+public void setSizeLimit(long sizeLimit) {
+this.sizeLimit = sizeLimit;
+}
+
+
+public int getTimeLimit() {
+return timeLimit;
+}
+
+
+public void setTimeLimit(int timeLimit) {
+this.timeLimit = timeLimit;
+}
+
+
 /**
  * Return descriptive information about this Realm implementation and
  * the corresponding version number, in the format
@@ -1334,6 +1366,9 @@ public class JNDIRealm extends RealmBase
 constraints.setSearchScope(SearchControls.ONELEVEL_SCOPE);
 }
 
+constraints.setCountLimit(sizeLimit);
+constraints.setTimeLimit(timeLimit);
+
 // Specify the attributes to be retrieved
 if (attrIds == null)
 attrIds = new String[0];

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1055115&r1=1055114&r2=1055115&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan  4 17:35:06 2011
@@ -157,6 +157,11 @@
 Log a warning if context.xml files define values for properties  that 
do
 not exist (e.g. if there is a typo in a property name). (markt)
   
+  
+50541: Add support for setting the size limit and time limit
+for LDAP seaches when using the JNDI Realm with 
userSearch.
+(markt)
+  
 
   
   

Modified: tomcat/trunk/webapps/docs/config/realm.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=1055115&r1=1055114&r2=1055115&view=diff
==
--- tomcat/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/trunk/webapps/docs/config/realm.xml Tue Jan  4 17:35:06 2011
@@ -420,6 +420,19 @@
 to be searched.
   
 
+  
+Specifies the maximum number of records to return when using the
+userSearch attribute. If not specified, the default of
+0 is used which indicates no limit.
+  
+
+  
+Specifies the time (in milliseconds) to wait for records to be
+returned when using the userSearch attribute. If not
+specified, the default of 0 is used which indicates no
+limit.
+  
+
   
 The base element for user searches performed using the
 userSearch expression.  Not used if you are using



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



DO NOT REPLY [Bug 50541] JNDIRealm: support configuring LDAP sizeLimit (countLimit in SearchControls)

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50541

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2011-01-04 12:35:16 EST ---
Fixed in 7.0.x and will be included in 7.0.6 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



svn commit: r1055121 - in /tomcat/trunk: java/org/apache/catalina/core/StandardService.java java/org/apache/catalina/util/LifecycleBase.java webapps/docs/changelog.xml

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 17:57:16 2011
New Revision: 1055121

URL: http://svn.apache.org/viewvc?rev=1055121&view=rev
Log:
Re-fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49372
Don't throw an LifecycleException for an invalid transition if a connector 
fails to start.

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1055121&r1=1055120&r2=1055121&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Tue Jan  4 
17:57:16 2011
@@ -453,7 +453,10 @@ public class StandardService extends Lif
 synchronized (connectors) {
 for (Connector connector: connectors) {
 try {
-connector.start();
+// If it has already failed, don't try and start it
+if (connector.getState() != LifecycleState.FAILED) {
+connector.start();
+}
 } catch (Exception e) {
 log.error(sm.getString(
 "standardService.connector.startFailed",

Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=1055121&r1=1055120&r2=1055121&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Tue Jan  4 
17:57:16 2011
@@ -97,7 +97,12 @@ public abstract class LifecycleBase impl
 }
 setState(LifecycleState.INITIALIZING);
 
-initInternal();
+try {
+initInternal();
+} catch (LifecycleException e) {
+setState(LifecycleState.FAILED);
+throw e;
+}
 
 setState(LifecycleState.INITIALIZED);
 }
@@ -213,7 +218,12 @@ public abstract class LifecycleBase impl
 
 setState(LifecycleState.STOPPING_PREP);
 
-stopInternal();
+try {
+stopInternal();
+} catch (LifecycleException e) {
+setState(LifecycleState.FAILED);
+throw e;
+}
 
 if (state.equals(LifecycleState.MUST_DESTROY)) {
 // Complete stop process first
@@ -221,8 +231,8 @@ public abstract class LifecycleBase impl
 
 destroy();
 } else {
-// Shouldn't be necessary but acts as a check that sub-classes are 
doing
-// what they are supposed to.
+// Shouldn't be necessary but acts as a check that sub-classes are
+// doing what they are supposed to.
 if (!state.equals(LifecycleState.STOPPING)) {
 invalidTransition(Lifecycle.AFTER_STOP_EVENT);
 }
@@ -271,7 +281,12 @@ public abstract class LifecycleBase impl
 
 setState(LifecycleState.DESTROYING);
 
-destroyInternal();
+try {
+destroyInternal();
+} catch (LifecycleException e) {
+setState(LifecycleState.FAILED);
+throw e;
+}
 
 setState(LifecycleState.DESTROYED);
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1055121&r1=1055120&r2=1055121&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan  4 17:57:16 2011
@@ -82,6 +82,12 @@
 the pool when a web application is stopped. (slaurent)
   
   
+49372: Re-fix after connector re-factoring. If connector
+initialisation fails (e.g. if a port is alreasy in use) do not trigger
+an LifecycleException for an invalid state transition.
+(markt)
+  
+  
 49650: Remove unnecessary entries package.access property
 defined in catalina.properties. Patch provided by Owen Farrell. 
(markt) 
   



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



DO NOT REPLY [Bug 49372] 7.0.0RC: Starting second instance of Tomcat on the same port results in "An invalid Lifecycle transition was attempted"

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49372

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2011-01-04 12:57:38 EST ---
Thanks for the report. This is fixed in 7.0.x and will be included in 7.0.6
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: Time for 6.0.30?

2011-01-04 Thread Konstantin Kolinko
2011/1/4 jean-frederic clere :
> On 01/04/2011 11:44 AM, Mark Thomas wrote:
>>
>> It has been a while since 6.0.29 and there have been a few requests for
>> this on the users list. Jean-Frederic, do you have any plans for 6.0.30
>> at this point?
>
> Next week :D
>
> Cheers
>
> Jean-Frederic
>

Sounds good.

FYI:  current TC 6 is configured to use commons-daemon 1.0.4 and I was
hitting a regression with that [1].

In short, [1] is a race condition between service thread and jvm
initialization thread, that caused the service to fail to start at
boot time.
I did not observe it with commons-daemon 1.0.2 that 6.0.29 release is
using, but I am not sure that it is absent there.

I'd be nice if next release of commons-daemon were available in time
for TC 6.0.30 to use it.


[1] https://issues.apache.org/jira/browse/DAEMON-190


Best regards,
Konstantin Kolinko

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



svn commit: r1055132 - in /tomcat/trunk: java/org/apache/tomcat/util/http/Cookies.java test/org/apache/tomcat/util/http/TestCookies.java

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 18:28:23 2011
New Revision: 1055132

URL: http://svn.apache.org/viewvc?rev=1055132&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49000
Consistently handle name only cookies (which are not spec complaint)

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java?rev=1055132&r1=1055131&r2=1055132&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java Tue Jan  4 
18:28:23 2011
@@ -283,7 +283,7 @@ public final class Cookies { // extends 
 // cookie at the end of the cookie header, so if we
 // are past the end of the header, but we have a name
 // skip to the name-only part.
-if (pos < end && bytes[pos] == '=') {
+if (pos < (end - 1) && bytes[pos] == '=') {
 
 // Skip whitespace
 do {

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java?rev=1055132&r1=1055131&r2=1055132&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java Tue Jan  4 
18:28:23 2011
@@ -17,31 +17,10 @@
 
 package org.apache.tomcat.util.http; 
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
 
 public class TestCookies extends TestCase {
-public static void main( String args[] ) {
-   TestRunner.run(suite());
-}
-public static Test suite() {
-   TestSuite suite = new TestSuite();
-   suite.addTest(new TestSuite(TestCookies.class));
-   return suite;
-}
-/*
-   int i = 1000;
-  // These tests are not really representative 
- while (i-- > 0) { 
- test("session=1234567890;name=\"John Q. Public\";");
-}
-//runtests();
-} 
- */
-
+
 public void testCookies() throws Exception {
 test("foo=bar; a=b", "foo", "bar", "a", "b");
 test("foo=bar;a=b", "foo", "bar", "a", "b");
@@ -120,6 +99,20 @@ public class TestCookies extends TestCas
 test("$Version=0;foo=bar", 0);
 }
 
+
+public void testNameOnlyCookies() throws Exception {
+// Bug 49000
+/*
+test("fred=1; jim=2; bob", "fred", "1", "jim", "2", "bob", "");
+test("fred=1; jim=2; bob; george=3", "fred", "1", "jim", "2", "bob", 
"",
+"george", "3");
+test("fred=1; jim=2; bob=; george=3", "fred", "1", "jim", "2",
+"bob", "", "george", "3");
+*/
+test("fred=1; jim=2; bob=", "fred", "1", "jim", "2", "bob", "");
+}
+
+
 public static void test( String s, int val ) throws Exception {
 System.out.println("Processing [" + s + "]");
 Cookies cs=new Cookies(null);



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



DO NOT REPLY [Bug 49000] Cookie parsing bug when an empty value has an equal sign on the end

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49000

--- Comment #12 from Mark Thomas  2011-01-04 13:29:19 EST ---
I've fixed the inconsistent handling. Name only cookies are currently always
allowed. I do plan on adding an option to make accepting them configurable with
a default of not accepting them.

-- 
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: Time for 6.0.30?

2011-01-04 Thread Mladen Turk

On 01/04/2011 07:04 PM, Konstantin Kolinko wrote:


FYI:  current TC 6 is configured to use commons-daemon 1.0.4 and I was
hitting a regression with that [1].



I plan to push for a 1.0.5 release tomorrow, so
hopefully the fixed version (thanks for hacking those)
will be available next week.


Regards
--
^TM

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



svn commit: r1055137 - in /tomcat/trunk/modules/jdbc-pool: java/org/apache/tomcat/jdbc/pool/PooledConnection.java test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java

2011-01-04 Thread fhanik
Author: fhanik
Date: Tue Jan  4 18:37:44 2011
New Revision: 1055137

URL: http://svn.apache.org/viewvc?rev=1055137&view=rev
Log:
No need to instantiate a new driver instance each time, simply reuse the one we 
got

Modified:

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java

tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1055137&r1=1055136&r2=1055137&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
 Tue Jan  4 18:37:44 2011
@@ -74,7 +74,7 @@ public class PooledConnection {
 /**
  * If using a XAConnection underneath.
  */
-private volatile javax.sql.XAConnection xaConnection;
+protected volatile javax.sql.XAConnection xaConnection;
 /**
  * When we track abandon traces, this string holds the thread dump
  */
@@ -117,6 +117,8 @@ public class PooledConnection {
 
 private volatile boolean suspect = false;
 
+private java.sql.Driver driver = null;
+
 /**
  * Constructor
  * @param prop - pool properties
@@ -229,10 +231,12 @@ public class PooledConnection {
 }
 }
 protected void connectUsingDriver() throws SQLException {
-java.sql.Driver driver = null;
+
 try {
-driver = (java.sql.Driver) 
Class.forName(poolProperties.getDriverClassName(),
- true, 
PooledConnection.class.getClassLoader()).newInstance();
+if (driver==null)
+driver = (java.sql.Driver) 
Class.forName(poolProperties.getDriverClassName(),
+ true, 
PooledConnection.class.getClassLoader()
+ ).newInstance();
 } catch (java.lang.Exception cn) {
 if (log.isDebugEnabled()) {
 log.debug("Unable to instantiate JDBC driver.", cn);

Modified: 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java?rev=1055137&r1=1055136&r2=1055137&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
 Tue Jan  4 18:37:44 2011
@@ -34,7 +34,7 @@ import org.apache.tomcat.jdbc.test.drive
 
 public class AlternateUsernameTest extends DefaultTestCase {
 
-private static final int iterations = (new 
Random(System.currentTimeMillis())).nextInt(100)+10;
+private static final int iterations = 50; //(new 
Random(System.currentTimeMillis())).nextInt(100)+10;
 public AlternateUsernameTest(String name) {
 super(name);
 }
@@ -44,13 +44,15 @@ public class AlternateUsernameTest exten
 
 private void testUsername(boolean allowUsernameChange) throws Exception {
 long start = System.currentTimeMillis();
+int withoutuser =10;
+int withuser = withoutuser;
 this.init();
+this.datasource.setMaxActive(withuser+withoutuser);
 this.datasource.setDriverClassName(Driver.class.getName());
 this.datasource.setUrl("jdbc:tomcat:test");
 this.datasource.setAlternateUsernameAllowed(allowUsernameChange);
 this.datasource.getConnection().close();
-int withoutuser =10;
-int withuser = withoutuser;
+
 TestRunner[] runners = new TestRunner[withuser+withoutuser];
 for (int i=0; i

svn commit: r1055141 - /tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 19:09:06 2011
New Revision: 1055141

URL: http://svn.apache.org/viewvc?rev=1055141&view=rev
Log:
Grr. Remove comment markers.

Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java?rev=1055141&r1=1055140&r2=1055141&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java Tue Jan  4 
19:09:06 2011
@@ -102,13 +102,11 @@ public class TestCookies extends TestCas
 
 public void testNameOnlyCookies() throws Exception {
 // Bug 49000
-/*
 test("fred=1; jim=2; bob", "fred", "1", "jim", "2", "bob", "");
 test("fred=1; jim=2; bob; george=3", "fred", "1", "jim", "2", "bob", 
"",
 "george", "3");
 test("fred=1; jim=2; bob=; george=3", "fred", "1", "jim", "2",
 "bob", "", "george", "3");
-*/
 test("fred=1; jim=2; bob=", "fred", "1", "jim", "2", "bob", "");
 }
 



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



svn commit: r1055143 - in /tomcat/trunk: java/org/apache/tomcat/util/http/ test/org/apache/tomcat/util/http/ webapps/docs/config/

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 19:20:28 2011
New Revision: 1055143

URL: http://svn.apache.org/viewvc?rev=1055143&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49000
Make accepting name only cookies configurable, defaulting to disabled.

Added:
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java 
  (with props)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
tomcat/trunk/webapps/docs/config/systemprops.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java?rev=1055143&r1=1055142&r2=1055143&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java Tue Jan  4 
19:20:28 2011
@@ -60,6 +60,11 @@ public final class CookieSupport {
 public static final boolean FWD_SLASH_IS_SEPARATOR;
 
 /**
+ * If true, name only cookies will be permitted.
+ */
+public static final boolean ALLOW_NAME_ONLY;
+
+/**
  * The list of separators that apply to version 0 cookies. To quote the
  * spec, these are comma, semi-colon and white-space. The HTTP spec
  * definition of linear white space is [CRLF] 1*( SP | HT )
@@ -106,6 +111,11 @@ public final class CookieSupport {
 Boolean.valueOf(fwdSlashIsSeparator).booleanValue();
 }
 
+ALLOW_NAME_ONLY = Boolean.valueOf(System.getProperty(
+"org.apache.tomcat.util.http.ServerCookie.ALLOW_NAME_ONLY",
+"false")).booleanValue();
+
+
 /*
 Excluding the '/' char by default violates the RFC, but 
 it looks like a lot of people put '/'

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java?rev=1055143&r1=1055142&r2=1055143&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java Tue Jan  4 
19:20:28 2011
@@ -422,6 +422,11 @@ public final class Cookies { // extends 
 log.info("Cookies: Unknown Special Cookie");
 
 } else { // Normal Cookie
+if (valueStart == -1 && !CookieSupport.ALLOW_NAME_ONLY) {
+// Skip name only cookies if not supported
+continue;
+}
+
 sc = addCookie();
 sc.setVersion( version );
 sc.getName().setBytes( bytes, nameStart,

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java?rev=1055143&r1=1055142&r2=1055143&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java Tue Jan  4 
19:20:28 2011
@@ -102,12 +102,12 @@ public class TestCookies extends TestCas
 
 public void testNameOnlyCookies() throws Exception {
 // Bug 49000
-test("fred=1; jim=2; bob", "fred", "1", "jim", "2", "bob", "");
-test("fred=1; jim=2; bob; george=3", "fred", "1", "jim", "2", "bob", 
"",
+test("fred=1; jim=2; bob", "fred", "1", "jim", "2");
+test("fred=1; jim=2; bob; george=3", "fred", "1", "jim", "2",
 "george", "3");
 test("fred=1; jim=2; bob=; george=3", "fred", "1", "jim", "2",
-"bob", "", "george", "3");
-test("fred=1; jim=2; bob=", "fred", "1", "jim", "2", "bob", "");
+"george", "3");
+test("fred=1; jim=2; bob=", "fred", "1", "jim", "2");
 }
 
 

Added: 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java?rev=1055143&view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java 
(added)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java 
Tue Jan  4 19:20:28 2011
@@ -0,0 +1,103 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, 

svn commit: r1055144 - in /tomcat/site/trunk: docs/migration.html xdocs/migration.xml

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 19:24:11 2011
New Revision: 1055144

URL: http://svn.apache.org/viewvc?rev=1055144&view=rev
Log:
Add info on name only cookies

Modified:
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/xdocs/migration.xml

Modified: tomcat/site/trunk/docs/migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1055144&r1=1055143&r2=1055144&view=diff
==
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Tue Jan  4 19:24:11 2011
@@ -248,6 +248,9 @@
 Session cookie configuration
 
 
+Cookies
+
+
 Comet
 
 
@@ -895,6 +898,35 @@ compatibility problems.
 
 
 
+
+Cookies
+
+
+
+
+
+
+
+  
+Tomcat no longer accepts non-specification complaint name only cookies 
by
+default. However, a new system property has been added,
+org.apache.tomcat.util.http.ServerCookie.ALLOW_NAME_ONLY, that
+can be used to accept name only cookies.
+  
+  
+
+
+
+
+
+
+
+
+
+  
+
+
+
 
 Comet
 
@@ -990,6 +1022,7 @@ compatibility problems.
 
 The org.apache.coyote.MAX_TRAILER_SIZE has been removed and
 is replaced by the maxTrailerSize attribute of the Connector.
+
   
 
 

Modified: tomcat/site/trunk/xdocs/migration.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=1055144&r1=1055143&r2=1055144&view=diff
==
--- tomcat/site/trunk/xdocs/migration.xml (original)
+++ tomcat/site/trunk/xdocs/migration.xml Tue Jan  4 19:24:11 2011
@@ -260,6 +260,15 @@ compatibility problems.
 
   
 
+  
+  
+Tomcat no longer accepts non-specification complaint name only cookies 
by
+default. However, a new system property has been added,
+org.apache.tomcat.util.http.ServerCookie.ALLOW_NAME_ONLY, that
+can be used to accept name only cookies.
+  
+  
+
   
 
 To enabled Comet to work correctly when running under a security 
manager,
@@ -301,6 +310,7 @@ compatibility problems.
 
 The org.apache.coyote.MAX_TRAILER_SIZE has been removed and
 is replaced by the maxTrailerSize attribute of the Connector.
+
   
 
 



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



DO NOT REPLY [Bug 49000] Cookie parsing bug when an empty value has an equal sign on the end

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49000

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #13 from Mark Thomas  2011-01-04 14:26:05 EST ---
Option added in 7.0.x and will be in 7.0.6 onwards. I also added a note to the
migration guide.

-- 
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: r1055137 - in /tomcat/trunk/modules/jdbc-pool: java/org/apache/tomcat/jdbc/pool/PooledConnection.java test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java

2011-01-04 Thread sebb
On 4 January 2011 18:37,   wrote:
> Author: fhanik
> Date: Tue Jan  4 18:37:44 2011
> New Revision: 1055137
>
> URL: http://svn.apache.org/viewvc?rev=1055137&view=rev
> Log:
> No need to instantiate a new driver instance each time, simply reuse the one 
> we got
>
> Modified:
>    
> tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
>    
> tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
>
> Modified: 
> tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1055137&r1=1055136&r2=1055137&view=diff
> ==
> --- 
> tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
>  (original)
> +++ 
> tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
>  Tue Jan  4 18:37:44 2011
> @@ -74,7 +74,7 @@ public class PooledConnection {
>     /**
>      * If using a XAConnection underneath.
>      */
> -    private volatile javax.sql.XAConnection xaConnection;
> +    protected volatile javax.sql.XAConnection xaConnection;
>     /**
>      * When we track abandon traces, this string holds the thread dump
>      */
> @@ -117,6 +117,8 @@ public class PooledConnection {
>
>     private volatile boolean suspect = false;
>
> +    private java.sql.Driver driver = null;
> +
>     /**
>      * Constructor
>      * @param prop - pool properties
> @@ -229,10 +231,12 @@ public class PooledConnection {
>         }
>     }
>     protected void connectUsingDriver() throws SQLException {
> -        java.sql.Driver driver = null;
> +
>         try {
> -            driver = (java.sql.Driver) 
> Class.forName(poolProperties.getDriverClassName(),
> -                                                     true, 
> PooledConnection.class.getClassLoader()).newInstance();
> +            if (driver==null)
> +                driver = (java.sql.Driver) 
> Class.forName(poolProperties.getDriverClassName(),
> +                                                         true, 
> PooledConnection.class.getClassLoader()
> +                                                         ).newInstance();

This is not thread-safe.

>         } catch (java.lang.Exception cn) {
>             if (log.isDebugEnabled()) {
>                 log.debug("Unable to instantiate JDBC driver.", cn);
>
> Modified: 
> tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java?rev=1055137&r1=1055136&r2=1055137&view=diff
> ==
> --- 
> tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
>  (original)
> +++ 
> tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
>  Tue Jan  4 18:37:44 2011
> @@ -34,7 +34,7 @@ import org.apache.tomcat.jdbc.test.drive
>
>  public class AlternateUsernameTest extends DefaultTestCase {
>
> -    private static final int iterations = (new 
> Random(System.currentTimeMillis())).nextInt(100)+10;
> +    private static final int iterations = 50; //(new 
> Random(System.currentTimeMillis())).nextInt(100)+10;
>     public AlternateUsernameTest(String name) {
>         super(name);
>     }
> @@ -44,13 +44,15 @@ public class AlternateUsernameTest exten
>
>     private void testUsername(boolean allowUsernameChange) throws Exception {
>         long start = System.currentTimeMillis();
> +        int withoutuser =10;
> +        int withuser = withoutuser;
>         this.init();
> +        this.datasource.setMaxActive(withuser+withoutuser);
>         this.datasource.setDriverClassName(Driver.class.getName());
>         this.datasource.setUrl("jdbc:tomcat:test");
>         this.datasource.setAlternateUsernameAllowed(allowUsernameChange);
>         this.datasource.getConnection().close();
> -        int withoutuser =10;
> -        int withuser = withoutuser;
> +
>         TestRunner[] runners = new TestRunner[withuser+withoutuser];
>         for (int i=0; i             TestRunner with = new 
> TestRunner("foo","bar",datasource.getPoolProperties().getUsername(),datasource.getPoolProperties().getPassword());
>
>
>
> -
> 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



svn commit: r1055147 - /tomcat/trunk/webapps/docs/changelog.xml

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 19:28:16 2011
New Revision: 1055147

URL: http://svn.apache.org/viewvc?rev=1055147&view=rev
Log:
Doh. Forgot to update the change log.

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1055147&r1=1055146&r2=1055147&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan  4 19:28:16 2011
@@ -77,6 +77,11 @@
 application if there's no session. Patch provided by Marc Guillemot.
 (slaurent)
   
+  
+49000: No longer accept specification invalid name only
+cookies by default. This behaviour can be restored using a system
+property. (markt)
+  
   
 49159: Improve memory leak protection by renewing threads of
 the pool when a web application is stopped. (slaurent)



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



svn commit: r1055190 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 21:47:25 2011
New Revision: 1055190

URL: http://svn.apache.org/viewvc?rev=1055190&view=rev
Log:
Votes

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1055190&r1=1055189&r2=1055190&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan  4 21:47:25 2011
@@ -318,7 +318,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50460
   Avoid leak caused by using a cached exception instance
   http://svn.apache.org/viewvc?rev=1044987&view=rev
-  +1: kkolinko, slaurent, kfujino
+  +1: kkolinko, slaurent, kfujino, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48822
@@ -329,6 +329,9 @@ PATCHES PROPOSED TO BACKPORT:
   "org.apache.catalina.core.ContainerBase.[engine].[host].[path]"
   which is not just a context name and looks ugly. The patch is not
   clean - it includes BZ 50459 bindThread patch that was proposed above.
+  -0: markt: The patch is not clean (includes BZ50459)
+ logName() is the wrong thing to be using. getName() should be
+ sufficient
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50500



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



svn commit: r1055191 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 21:49:04 2011
New Revision: 1055191

URL: http://svn.apache.org/viewvc?rev=1055191&view=rev
Log:
Numerical order

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

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1055191&r1=1055190&r2=1055191&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jan  4 21:49:04 2011
@@ -45,10 +45,6 @@
   
 
   
-49909: Provide a mechanism to log requests rejected before
-they reach the AccessLogValve to appear in the access log. (markt)
-  
-  
 49674: Update to Commons Daemon 1.0.4. (mturk)
   
   
@@ -66,6 +62,10 @@
 another process is managing the PID file and Tomcat does not have write
 access. (markt)
   
+  
+49909: Provide a mechanism to log requests rejected before
+they reach the AccessLogValve to appear in the access log. (markt)
+  
 
   
   



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



svn commit: r1055193 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/mbeans-descriptors.xml webapps/docs/changelog.xml

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 21:50:30 2011
New Revision: 1055193

URL: http://svn.apache.org/viewvc?rev=1055193&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43960
Expose available property of StandardWrapper via JMX

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1055193&r1=1055192&r2=1055193&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan  4 21:50:30 2011
@@ -309,12 +309,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: slaurent, kkolinko, kfujino
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43960
-  Expose available property of StandardWrapper via JMX
-  http://people.apache.org/~markt/patches/2010-12-13-bug43960-tc6.patch
-  +1: markt, kkolinko, kfujino
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50460
   Avoid leak caused by using a cached exception instance
   http://svn.apache.org/viewvc?rev=1044987&view=rev

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1055193&r1=1055192&r2=1055193&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml 
Tue Jan  4 21:50:30 2011
@@ -721,6 +721,10 @@
  group="Wrapper"
  type="org.apache.catalina.core.StandardWrapper">

+  
+
 http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1055193&r1=1055192&r2=1055193&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jan  4 21:50:30 2011
@@ -45,6 +45,10 @@
   
 
   
+43960: Expose available property of StandardWrapper via JMX.
+(markt)
+  
+  
 49674: Update to Commons Daemon 1.0.4. (mturk)
   
   



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



DO NOT REPLY [Bug 43960] Expose StandardWrapper unavailable and/or available properties to JMX

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=43960

--- Comment #4 from Mark Thomas  2011-01-04 16:50:51 EST ---
Fixed in 6.0.x and will be included in 6.0.30 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



svn commit: r1055199 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 21:56:03 2011
New Revision: 1055199

URL: http://svn.apache.org/viewvc?rev=1055199&view=rev
Log:
Correct comment

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1055199&r1=1055198&r2=1055199&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan  4 21:56:03 2011
@@ -300,7 +300,7 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt
   -1:
   +0: kkolinko: I like it, but it cannot be applied as is:
- HttpServletRequest.getStatus() is @since Servlet 3.0
+ HttpServletResponse.getStatus() is @since Servlet 3.0
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50459 
   StandardContext.bindThread() and unbindThread() are not symmetrical and not 



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



DO NOT REPLY [Bug 49543] Request for a "shared" datasource configuration as in DBCP

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49543

--- Comment #3 from Filip Hanik  2011-01-04 17:09:01 EST ---
Jason, this ability does exist with the fix of 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50025

I'm working on a simple enhancement to Tomcat 7 that will allow this for any
configured data source.

-- 
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: r1055137 - in /tomcat/trunk/modules/jdbc-pool: java/org/apache/tomcat/jdbc/pool/PooledConnection.java test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java

2011-01-04 Thread Filip Hanik - Dev Lists

On 1/4/2011 12:27 PM, sebb wrote:

On 4 January 2011 18:37,  wrote:

Author: fhanik
Date: Tue Jan  4 18:37:44 2011
New Revision: 1055137

URL: http://svn.apache.org/viewvc?rev=1055137&view=rev
Log:
No need to instantiate a new driver instance each time, simply reuse the one we 
got

Modified:

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java

tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1055137&r1=1055136&r2=1055137&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
 Tue Jan  4 18:37:44 2011
@@ -74,7 +74,7 @@ public class PooledConnection {
 /**
  * If using a XAConnection underneath.
  */
-private volatile javax.sql.XAConnection xaConnection;
+protected volatile javax.sql.XAConnection xaConnection;
 /**
  * When we track abandon traces, this string holds the thread dump
  */
@@ -117,6 +117,8 @@ public class PooledConnection {

 private volatile boolean suspect = false;

+private java.sql.Driver driver = null;
+
 /**
  * Constructor
  * @param prop - pool properties
@@ -229,10 +231,12 @@ public class PooledConnection {
 }
 }
 protected void connectUsingDriver() throws SQLException {
-java.sql.Driver driver = null;
+
 try {
-driver = (java.sql.Driver) 
Class.forName(poolProperties.getDriverClassName(),
- true, 
PooledConnection.class.getClassLoader()).newInstance();
+if (driver==null)
+driver = (java.sql.Driver) 
Class.forName(poolProperties.getDriverClassName(),
+ true, 
PooledConnection.class.getClassLoader()
+ ).newInstance();

This is not thread-safe.


and if you read the code, you'll see that it doesn't matter. sometimes thread safety can be ignored for the sake of performance and 
simplicity since there will never be a bug.


Filip


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



svn commit: r1055218 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 22:36:17 2011
New Revision: 1055218

URL: http://svn.apache.org/viewvc?rev=1055218&view=rev
Log:
Updated tc6 specific patch

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1055218&r1=1055217&r2=1055218&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan  4 22:36:17 2011
@@ -296,11 +296,9 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413
   Ensure 304s are not returned when using static files as error pages
-  http://svn.apache.org/viewvc?view=revision&revision=1044266
+  http://people.apache.org/~markt/patches/2011-01-04-bug50413-tc6.patch
   +1: markt
   -1:
-  +0: kkolinko: I like it, but it cannot be applied as is:
- HttpServletResponse.getStatus() is @since Servlet 3.0
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50459 
   StandardContext.bindThread() and unbindThread() are not symmetrical and not 



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



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

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 22:40:40 2011
New Revision: 1055225

URL: http://svn.apache.org/viewvc?rev=1055225&view=rev
Log:
Updated tc5 specific patch

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=1055225&r1=1055224&r2=1055225&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan  4 22:40:40 2011
@@ -86,11 +86,9 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413
   Ensure 304s are not returned when using static files as error pages
-  http://svn.apache.org/viewvc?view=revision&revision=1044266
+  http://people.apache.org/~markt/patches/2011-01-04-bug50413-tc5.patch
   +1: markt
   -1:
-  +0: kkolinko: I like it, but it cannot be applied as is:
- HttpServletRequest.getStatus() is @since Servlet 3.0
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43960
   Expose available property of StandardWrapper via JMX



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



svn commit: r1055230 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml webapps/docs/config/http.xml

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 22:50:46 2011
New Revision: 1055230

URL: http://svn.apache.org/viewvc?rev=1055230&view=rev
Log:
Make SSL certificate encoding algorithm selection consistent between BIO and 
NIO and update docs to reflect current BIO and post-patch NIO.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1055230&r1=1055229&r2=1055230&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan  4 22:50:46 2011
@@ -288,12 +288,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko
   -1:
 
-* Make SSL protocol selection consistent between BIO and NIO and update docs
-  to reflect current BIO and post-patch NIO.
-  http://people.apache.org/~markt/patches/2010-12-07-ssl-algorithm-tc6.patch
-  +1: markt, kkolinko, fhanik
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413
   Ensure 304s are not returned when using static files as error pages
   http://people.apache.org/~markt/patches/2011-01-04-bug50413-tc6.patch

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1055230&r1=1055229&r2=1055230&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue 
Jan  4 22:50:46 2011
@@ -603,7 +603,7 @@ public class NioEndpoint {
 public void setKeyAlias(String s ) { keyAlias = s;}
 
 
-protected String algorithm = "SunX509";
+protected String algorithm = KeyManagerFactory.getDefaultAlgorithm();
 public String getAlgorithm() { return algorithm;}
 public void setAlgorithm(String s ) { this.algorithm = s;}
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1055230&r1=1055229&r2=1055230&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jan  4 22:50:46 2011
@@ -250,7 +250,11 @@
 result in large numbers of SEVERE log messages appearing in the logs as
 a result of normal operation. (markt)
   
-  
+  
+Make SSL certificate encoding algorithm consistent between connectors 
by
+using the JVM default for all connectors. This also fixes an issue with
+the NIO connector on IBM JVMs. (markt)
+  
 
   
   

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?rev=1055230&r1=1055229&r2=1055230&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Tue Jan  4 22:50:46 2011
@@ -664,10 +664,11 @@
   
 
 
-  The certificate encoding algorithm to be used. This defaults to the 
Sun
-  implementation (SunX509). For IBM JVMs you should use the
-  value IbmX509. For other vendors, consult the JVM
-  documentation for the correct value.
+  The certificate encoding algorithm to be used. This defaults to
+  KeyManagerFactory.getDefaultAlgorithm() which returns
+  SunX509 for Sun JVMs. IBM JVMs return
+  IbmX509. For other vendors, consult the JVM
+  documentation for the default value.
 
 
 



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



svn commit: r1055232 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 22:53:25 2011
New Revision: 1055232

URL: http://svn.apache.org/viewvc?rev=1055232&view=rev
Log:
Vote

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1055232&r1=1055231&r2=1055232&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan  4 22:53:25 2011
@@ -204,59 +204,8 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50201
   Handle ROOT webapp redeployment, host start/stop etc for default access log
-  http://people.apache.org/~markt/patches/2010-12-05-bug50201-tc6.patch
-  +1: markt
-  -1: kkolinko:
-  1) A typo: in "checkHost = ((ContainerBase) context).started;"
- should be s/checkHost/checkContext/
- markt: Fixed in updated patch above
-  2) Possible NPEs in StandardEngine.logAccess(). With the old code
- the defaultAccessLog field can be checked once, and we know that
- if it is already not-null it will never become null. That is no
- longer the case and subsequent accesses to that volatile field can result
- in NPE. One needs to keep a local copy of that field.
- markt: Fixed in updated patch above
-  3) addPropertyChangeListener(l). If we are only interested in "defaultHost"
- property change, shouldn't we add the listener to StandardEngine?
- I think that there is no need to add it to Context or Host (and
- are they notified about that change at all?).
- markt: Fixed in updated patch above
-  4) Initializing defaultAccessLog may be performed by several threads
- concurrently. That may result in several listener instances being
- added. (It won't break their operation, but it is just a waste).
- markt: Agreed it is a waste. Can't do much about it without lots and lots
-of complexity.
-  5) in AccessLogListener.containerEvent():
- Context context = (Context) event.getData();
- Maybe it'd be better to add an instanceof check before that cast.
- markt: Not worth it. That object has to be an instance of Context else all
-sorts of stuff would break way before the code got this far.
-  6) In the proposed patch the Listener is only installed iff there
- is an access log there. It should be installed unconditionally.
- E.g., if Tomcat starts without access logs, NoopAccessLog is created.
- As there are no listeners, any change to the configuration
- (e.g. redeploying the ROOT webapp) will pass unnoticed
- and won't reenable the access log.
- markt: Fixed in updated patch above
-
-  kkolinko: (Re: markt's 2010-12-05-bug50201-tc6.patch)
-  7) Why "Lifecycle.DESTROY_EVENT.endsWith(type)" in a condition?
- s/endsWith/equals/
- markt: Auto-complete snafu - fixed in trunk
-  8) I do not see how the listener can be reused when recalculation
- happens.
- (We are now installing a new listener when NoAccessLog wins,
- so my understanding is that it is no more necessary to wait for
- reuse there. The new listener will catch all the necessary events).
- Thus all events that force recalculation should result
- in disabling the listener.
-  9) I propose to use an AtomicReference to guard against registering
- duplicate listeners (a fix for 4)). See the patch.
-  10) I added install() and uninstall() method to AccessLogListener
-  to help register/unregister the listeners.
-  8),9),10) were applied to trunk in r1045003
   http://people.apache.org/~kkolinko/patches/2010-12-07_tc6_bug50201.patch
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48973



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



svn commit: r1055236 - /tomcat/trunk/java/javax/servlet/http/LocalStrings.properties

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 22:59:38 2011
New Revision: 1055236

URL: http://svn.apache.org/viewvc?rev=1055236&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50527
Improve error message

Modified:
tomcat/trunk/java/javax/servlet/http/LocalStrings.properties

Modified: tomcat/trunk/java/javax/servlet/http/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/LocalStrings.properties?rev=1055236&r1=1055235&r2=1055236&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/LocalStrings.properties (original)
+++ tomcat/trunk/java/javax/servlet/http/LocalStrings.properties Tue Jan  4 
22:59:38 2011
@@ -21,7 +21,7 @@ err.cookie_name_blank=Cookie name may no
 err.io.negativelength=Negative Length given in write method
 err.io.short_read=Short Read
 
-http.method_not_implemented=Method {0} is not defined in RFC 2068 and is not 
supported by the Servlet API 
+http.method_not_implemented=Method {0} is not is not implemented by this 
servlet for this URI 
 
 http.method_get_not_supported=HTTP method GET is not supported by this URL
 http.method_post_not_supported=HTTP method POST is not supported by this URL



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



svn commit: r1055237 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-01-04 Thread markt
Author: markt
Date: Tue Jan  4 23:00:36 2011
New Revision: 1055237

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

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1055237&r1=1055236&r2=1055237&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan  4 23:00:36 2011
@@ -275,3 +275,9 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1055055&view=rev
   +1: markt
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50527
+  Improve error message
+  http://svn.apache.org/viewvc?rev=1055236&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 50527] misleading error message for unknown HTTP method

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50527

--- Comment #1 from Mark Thomas  2011-01-04 18:00:59 EST ---
Fair point.

Fixed in 7.0.x and will be included in 7.0.6 onwards.

Proposed for 6.0.x

-- 
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 50519] When CometProcessor with KeepAlive, Tomcat send a TCP RST packet

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50519

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID
 OS/Version||All

--- Comment #1 from Mark Thomas  2011-01-04 18:02:40 EST ---
This is a question for the users list. If that confirms there is a bug then
feel free to re-open this issue.

-- 
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 50505] 505 HTTP Version Not Supported

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50505

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE

--- Comment #1 from Mark Thomas  2011-01-04 18:05:36 EST ---


*** This bug has been marked as a duplicate of bug 50072 ***

-- 
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 50072] Blank responses

2011-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50072

Mark Thomas  changed:

   What|Removed |Added

 CC||kni...@nhn.com

--- Comment #11 from Mark Thomas  2011-01-04 18:05:36 EST ---
*** Bug 50505 has been marked as a duplicate of this 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



svn commit: r1055327 - /tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java

2011-01-04 Thread markt
Author: markt
Date: Wed Jan  5 07:18:29 2011
New Revision: 1055327

URL: http://svn.apache.org/viewvc?rev=1055327&view=rev
Log:
getContentCount() may return -1 so use getContentCountLong()

Modified:
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java

Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1055327&r1=1055326&r2=1055327&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Wed Jan  
5 07:18:29 2011
@@ -165,7 +165,7 @@ public class ErrorReportValve extends Va
 
 // Do nothing on a 1xx, 2xx and 3xx status
 // Do nothing if anything has been written already
-if ((statusCode < 400) || (response.getContentCount() > 0))
+if ((statusCode < 400) || (response.getContentCountLong() > 0))
 return;
 
 String message = RequestUtil.filter(response.getMessage());



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



svn commit: r1055341 - in /tomcat/trunk/java/org/apache/coyote/http11: ./ filters/

2011-01-04 Thread markt
Author: markt
Date: Wed Jan  5 07:50:11 2011
New Revision: 1055341

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

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Constants.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1055341&r1=1055340&r2=1055341&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed 
Jan  5 07:50:11 2011
@@ -61,9 +61,6 @@ public abstract class AbstractHttp11Proc
 protected static final StringManager sm =
 StringManager.getManager(Constants.Package);
 
-protected static boolean isSecurityEnabled = 
-org.apache.coyote.Constants.IS_SECURITY_ENABLED;
-
 /*
  * Tracks how many internal filters are in the filter library so they
  * are skipped when looking for pluggable filters. 
@@ -360,14 +357,6 @@ public abstract class AbstractHttp11Proc
 
 
 /**
- * Return the list of compressable mime-types.
- */
-public String[] findCompressableMimeTypes() {
-return (compressableMimeTypes);
-}
-
-
-/**
  * Return compression level.
  */
 public String getCompression() {
@@ -490,19 +479,6 @@ public abstract class AbstractHttp11Proc
 
 
 /**
- * Return the list of restricted user agents.
- */
-public String[] findRestrictedUserAgents() {
-String[] sarr = new String [restrictedUserAgents.length];
-
-for (int i = 0; i < restrictedUserAgents.length; i++)
-sarr[i] = restrictedUserAgents[i].toString();
-
-return (sarr);
-}
-
-
-/**
  * Set the maximum number of Keep-Alive requests to honor.
  * This is to safeguard from DoS attacks.  Setting to a negative
  * value disables the check.
@@ -796,30 +772,6 @@ public abstract class AbstractHttp11Proc
 
 
 /**
- * Add input or output filter.
- *
- * @param className class name of the filter
- */
-protected void addFilter(String className) {
-try {
-Class clazz = Class.forName(className);
-Object obj = clazz.newInstance();
-if (obj instanceof InputFilter) {
-getInputBuffer().addFilter((InputFilter) obj);
-} else if (obj instanceof OutputFilter) {
-getOutputBuffer().addFilter((OutputFilter) obj);
-} else {
-getLog().warn(sm.getString("http11processor.filter.unknown",
-className));
-}
-} catch (Exception e) {
-getLog().error(sm.getString(
-"http11processor.filter.error", className), e);
-}
-}
-
-
-/**
  * Add an input filter to the current request.
  *
  * @return false if the encoding was not found (which would mean it is

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1055341&r1=1055340&r2=1055341&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Wed Jan 
 5 07:50:11 2011
@@ -188,17 +188,6 @@ public abstract class AbstractInputBuffe
 
 
 /**
- * Clear filters.
- */
-public void clearFilters() {
-
-filterLibrary = new InputFilter[0];
-lastActiveFilter = -1;
-
-}
-
-
-/**
  * Add an input filter to the filter library.
  */
 public void addActiveFilter(InputFilter filter) {

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1055341&r1=1055340&r2=1055341&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.j