svn commit: r950904 - /tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java

2010-06-03 Thread markt
Author: markt
Date: Thu Jun  3 07:50:51 2010
New Revision: 950904

URL: http://svn.apache.org/viewvc?rev=950904&view=rev
Log:
Fix an Eclipse nag

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java?rev=950904&r1=950903&r2=950904&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java Thu 
Jun  3 07:50:51 2010
@@ -173,10 +173,9 @@ public final class FastHttpDateFormat {
 }
 if (date == null) {
 return (-1L);
-} else {
-return date.longValue();
 }
 
+return date.longValue();
 }
 
 



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



svn commit: r950905 - in /tomcat/trunk/java/org/apache: catalina/security/SecurityClassLoad.java coyote/http11/Http11AprProcessor.java coyote/http11/Http11NioProcessor.java coyote/http11/Http11Process

2010-06-03 Thread markt
Author: markt
Date: Thu Jun  3 07:56:23 2010
New Revision: 950905

URL: http://svn.apache.org/viewvc?rev=950905&view=rev
Log:
Clean up FastHttpDateFormat initialisation when using a security manager as 
prompted by Konstantin

Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=950905&r1=950904&r2=950905&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Thu 
Jun  3 07:56:23 2010
@@ -43,7 +43,6 @@ public final class SecurityClassLoad {
 loadUtilPackage(loader);
 loadJavaxPackage(loader);
 loadCoyotePackage(loader);
-loadHttp11Package(loader);
 loadTomcatPackage(loader);
 }
 
@@ -141,13 +140,6 @@ public final class SecurityClassLoad {
 }
 
 
-private final static void loadHttp11Package(ClassLoader loader)
-throws Exception {
-String basePackage = "org.apache.coyote.http11.";
-loader.loadClass(basePackage + "Http11Processor$1");
-}
-
-
 private final static void loadCoyotePackage(ClassLoader loader)
 throws Exception {
 String basePackage = "org.apache.catalina.connector.";

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=950905&r1=950904&r2=950905&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Jun  
3 07:56:23 2010
@@ -106,10 +106,6 @@ public class Http11AprProcessor implemen
 
 // Cause loading of HexUtils
 HexUtils.load();
-
-// Cause loading of FastHttpDateFormat
-FastHttpDateFormat.getCurrentDate();
-
 }
 
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=950905&r1=950904&r2=950905&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Jun  
3 07:56:23 2010
@@ -96,10 +96,6 @@ public class Http11NioProcessor extends 
 
 // Cause loading of HexUtils
 HexUtils.load();
-
-// Cause loading of FastHttpDateFormat
-FastHttpDateFormat.getCurrentDate();
-
 }
 
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=950905&r1=950904&r2=950905&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Jun  3 
07:56:23 2010
@@ -930,19 +930,7 @@ public class Http11Processor extends Abs
 }
 
 // Add date header
-String date = null;
-if (isSecurityEnabled){
-date = AccessController.doPrivileged(
-new PrivilegedAction() {
-public String run(){
-return FastHttpDateFormat.getCurrentDate();
-}
-}
-);
-} else {
-date = FastHttpDateFormat.getCurrentDate();
-}
-headers.setValue("Date").setString(date);
+
headers.setValue("Date").setString(FastHttpDateFormat.getCurrentDate());
 
 // FIXME: Add transfer encoding header
 



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



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

2010-06-03 Thread Mark Thomas
On 02/06/2010 20:35, Konstantin Kolinko wrote:
> If I search for the calls of FastHttpDateFormat.getCurrentDate()
> method I see that in trunk
> 
> a) Http11AprProcessor() and  Http11NioProcessor() constructors call
> FastHttpDateFormat.getCurrentDate() to preload the class
> 
> b) Http11Processor uses PrivilegedAction
> http://svn.apache.org/viewvc?view=revision&revision=299009
> 
> c) The proposed patch implements the third way to solve this issue:
> - preload the class inside SecurityClassLoad and
> - call a constructor, to trigger initialization of static fields.
> 
> The same could be achieved with calling any static method of the
> class, as said in ch.2.17.4 of JVM spec,
> http://java.sun.com/docs/books/jvms/second_edition/html/Concepts.doc.html#19075
> though I am fine with this implementation, as calling the constructor
> looks faster and independent of the API.
> 
> 
> I think that only one of those three approaches should be used,
> and that will be c), as it covers not only HTTP, but AJP connectors as well.

Fixed in trunk. It passes a simple test and I plan to do more extensive
testing later today.

> By the way,
> http://svn.apache.org/viewvc?rev=947717&view=rev
> contains changes to SecurityClassLoad.loadUtilPackage(). Those should
> not/cannot be backported as they are, because that method differs in
> tc6.0.x.

Those can be skipped.

Mark



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



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

2010-06-03 Thread markt
Author: markt
Date: Thu Jun  3 08:08:55 2010
New Revision: 950909

URL: http://svn.apache.org/viewvc?rev=950909&view=rev
Log:
Action review comments

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=950909&r1=950908&r2=950909&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun  3 08:08:55 2010
@@ -150,11 +150,15 @@ PATCHES PROPOSED TO BACKPORT:
   -1: 
 
 * Fix issues running AJP BIO coyote connector under a security manager
-  http://svn.apache.org/viewvc?rev=947717&view=rev
-  +1: markt
-  +1: kkolinko (without the changes to SecurityClassLoad.loadUtilPackage())
+  http://svn.apache.org/viewvc?rev=947717&view=rev (less changes to 
loadUtilPackage())
+  +1: markt, kkolinko
   -1: 
 
+* Additional clean-up possible as a result of above fix
+  http://svn.apache.org/viewvc?rev=950905&view=rev (associated clean-up)
+  +1: markt
+  -1: 
+  
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49095
   AprEndpoint does not wakeup accepts with deferred accept or BSD filters
   Based on a patch provided by Ruediger Pluem



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



Donation: Want to donate a robust HTTP ProxyServlet to tomcat

2010-06-03 Thread Sébastien Migniot

Hi

   I'll try to be quick. I'm a french J2EE Architect and author of Streamy,
   at http://www.migniot.com/matrix/projects/streamy

   I want to *donate the ProxyServlet.java* to tomcat core/extensions,
   available at
   
https://streamy.svn.sourceforge.net/svnroot/streamy/trunk/com.migniot.streamy.Proxy/src/com/migniot/streamy/proxy/ProxyServlet.java


_Explanation :_

   1. I've googled a long time for a /decent /HTTP Proxy component
   written as a /pure/
   Servlet in java and failed to find it - tigris "Noodles" and other
   components didn't
   do the trick -

   2. So I've wrote my own, followed the misc HTTP RFCs, and approximately
   10 users are using Streamy, so running this servlet everyday =>
   It works

   3. I want to donate it to an Apache Project so that other J2EE
   developers
   benefit of this "HTTP Proxy written as a /Pure /Servlet"


Feel free to correct me/redirect me if this is the wrong mailing list
Best Regards,

 S. Migniot.



svn commit: r950922 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

2010-06-03 Thread kfujino
Author: kfujino
Date: Thu Jun  3 09:37:36 2010
New Revision: 950922

URL: http://svn.apache.org/viewvc?rev=950922&view=rev
Log:
"this.channel.removeChannelListener(this.rpcChannel);" call is replaced with 
"this.rpcChannel.breakdown();". 

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=950922&r1=950921&r2=950922&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
Thu Jun  3 09:37:36 2010
@@ -228,7 +228,7 @@ public abstract class AbstractReplicated
 } catch (ChannelException x) {
 log.warn("Unable to send map start message.");
 // remove listener from channel
-this.channel.removeChannelListener(this.rpcChannel);
+this.rpcChannel.breakdown();
 this.channel.removeChannelListener(this);
 this.channel.removeMembershipListener(this);
 throw new RuntimeException("Unable to start replicated map.",x);



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



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

2010-06-03 Thread kfujino
Author: kfujino
Date: Thu Jun  3 09:43:12 2010
New Revision: 950924

URL: http://svn.apache.org/viewvc?rev=950924&view=rev
Log:
Additional patch for BZ48971.

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=950924&r1=950923&r2=950924&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun  3 09:43:12 2010
@@ -185,7 +185,13 @@ PATCHES PROPOSED TO BACKPORT:
kkolinko:
 Maybe "this.channel.removeChannelListener(this.rpcChannel);" call
 has to be replaced with "this.rpcChannel.breakdown();"
-
+  
+  Additional patch.
+  "this.channel.removeChannelListener(this.rpcChannel);" call is 
+  replaced with "this.rpcChannel.breakdown();". 
+  http://svn.apache.org/viewvc?view=revision&revision=950922
+  +1: kfujino
+  -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48971
   Make stopping of leaking Timer threads optional



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



svn commit: r950929 - /tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java

2010-06-03 Thread markt
Author: markt
Date: Thu Jun  3 10:02:30 2010
New Revision: 950929

URL: http://svn.apache.org/viewvc?rev=950929&view=rev
Log:
Re-order so it is easier to check all objects are re-cycled

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java?rev=950929&r1=950928&r2=950929&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java Thu 
Jun  3 10:02:30 2010
@@ -42,12 +42,12 @@ public class MappingData {
 host = null;
 context = null;
 wrapper = null;
-pathInfo.recycle();
+jspWildCard = false;
+contextPath.recycle();
 requestPath.recycle();
 wrapperPath.recycle();
-contextPath.recycle();
+pathInfo.recycle();
 redirectPath.recycle();
-jspWildCard = false;
 }
 
 }



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



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

2010-06-03 Thread kfujino
Author: kfujino
Date: Thu Jun  3 10:23:29 2010
New Revision: 950935

URL: http://svn.apache.org/viewvc?rev=950935&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=950935&r1=950934&r2=950935&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun  3 10:23:29 2010
@@ -174,7 +174,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49196
   Avoid NPE in PageContext.getErrorData()
   http://svn.apache.org/viewvc?rev=948057&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49343
@@ -198,6 +198,7 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=950164&view=rev
   +1: markt
   +1: kkolinko (with r950614)
+  +1: kfujino (with r950614)
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49099
@@ -221,6 +222,7 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=950596&view=rev
   +1: markt
   +1: kkolinko: s/ie/i.e./ in the comment
+  +1: kfujino: s/ie/i.e./ in the comment
   -1: 
 
 * Fix issue that is similar to 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48843
@@ -228,5 +230,5 @@ PATCHES PROPOSED TO BACKPORT:
   caused by missing Object.notify() wakeup,
   http://svn.apache.org/viewvc?rev=950851&view=rev
   (Easier to review if you ignore whitespaces during the diff)
-  +1: kkolinko
+  +1: kkolinko, kfujino
   -1:



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



DO NOT REPLY [Bug 49376] New: Minor corrections to info properties.

2010-06-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49376

   Summary: Minor corrections to info properties.
   Product: Tomcat 7
   Version: unspecified
  Platform: All
Status: NEW
  Severity: trivial
  Priority: P2
 Component: Cluster
AssignedTo: dev@tomcat.apache.org
ReportedBy: bugzi...@pidster.com


The static info properties appear to contain legacy packages.

-- 
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 49376] Minor corrections to info properties.

2010-06-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49376

--- Comment #1 from Pid  2010-06-03 07:35:39 EDT ---
Created an attachment (id=25515)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25515)
Patch to 3 files correcting package in info property

-- 
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 49234] JMX Descriptor Modifications

2010-06-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234

--- Comment #20 from chamith buddhika  2010-06-03 
08:49:21 EDT ---
Created an attachment (id=25516)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25516)
o.a.Catalina.ha.session Patch

Adds missing attributes and reorders the existing attributes.

-- 
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 49234] JMX Descriptor Modifications

2010-06-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234

--- Comment #21 from chamith buddhika  2010-06-03 
08:52:31 EDT ---
Created an attachment (id=25517)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25517)
o.a.Catalina.ha.tcp Patch

I found references to some classes I cannot seem to find in the code base? Am I
missing some thing here? Classes are

 - ClusterReceiverBase
 - SocketReplicatonListener
 - AsyncSocketSender
 - FastAsyncSocketSender
 - PooledSocketSender
 - SocketSender

-- 
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 49234] JMX Descriptor Modifications

2010-06-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234

--- Comment #22 from chamith buddhika  2010-06-03 
08:54:14 EDT ---
Created an attachment (id=25518)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25518)
o.a.Catalina.loader Patch

Adds missing attributes/operations and reorders existing attributes.

-- 
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: r950811 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-06-03 Thread Mark Thomas
On 03/06/2010 00:01, kkoli...@apache.org wrote:
>the standard access log
>http://svn.apache.org/viewvc?rev=950587&view=rev
>+1: markt
> +  +1: kkolinko: only if together with r950809
>-1: 
> +   kkolinko: 1) JDBCAccessLogValve is not a child of AccessLogValve, will 
> need
> +   its own implementation. 2) It would be nice to log requests using the 
> timestamp
> +   when it was received (like HTTPD 2.0+ does), not when it was processed. 
> If that
> +   is to be implemented, an additional parameter will be needed for the 
> log() method
> +   in the AccessLog interface. I suppose that might be "long t1, long t2" 
> instead
> +   of "long time".
> +   3) I see no way to turn off this feature or filter the output.

I am working on an improved overall fix for trunk. If it works, I'll
probably propose a combined backport to 6.0.x

Mark



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



svn commit: r950983 - /tomcat/trunk/conf/server.xml

2010-06-03 Thread markt
Author: markt
Date: Thu Jun  3 13:16:27 2010
New Revision: 950983

URL: http://svn.apache.org/viewvc?rev=950983&view=rev
Log:
Enable access logs by default for 7.0.x

Modified:
tomcat/trunk/conf/server.xml

Modified: tomcat/trunk/conf/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/server.xml?rev=950983&r1=950982&r2=950983&view=diff
==
--- tomcat/trunk/conf/server.xml (original)
+++ tomcat/trunk/conf/server.xml Thu Jun  3 13:16:27 2010
@@ -127,10 +127,8 @@
 
 
-
 
   
 



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



Re: svn commit: r950983 - /tomcat/trunk/conf/server.xml

2010-06-03 Thread Rainer Jung

On 03.06.2010 15:16, ma...@apache.org wrote:

Author: markt
Date: Thu Jun  3 13:16:27 2010
New Revision: 950983

URL: http://svn.apache.org/viewvc?rev=950983&view=rev
Log:
Enable access logs by default for 7.0.x

Modified:
 tomcat/trunk/conf/server.xml

Modified: tomcat/trunk/conf/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/server.xml?rev=950983&r1=950982&r2=950983&view=diff
==
--- tomcat/trunk/conf/server.xml (original)
+++ tomcat/trunk/conf/server.xml Thu Jun  3 13:16:27 2010
@@ -127,10 +127,8 @@

  
-


  


+1000

Another related observation: Users often are not aware that they can 
substitute "common" with an individual log pattern, although that is 
very often essential (like including %D etc.). Even though many know 
similar constructs from Apache httpd, it's not obvious for them that 
they can substitute the word "common" with a pattern.


Should we add an example pattern to server.xml? Or would it be easier 
understandable if we removed the abbreviation "common" from the default 
config and replace it with the full pattern?


There's also the topic that the common pattern contains quotation marks, 
which you can't add verbatim to the attribute if you want to extend the 
common pattern with additional items. So adding an example or using the 
real pattern in the default configuration would show users how to work 
around that (" or similar).


My .1 Euro Cents.

Rainer

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



DO NOT REPLY [Bug 49234] JMX Descriptor Modifications

2010-06-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234

--- Comment #23 from Rainer Jung  2010-06-03 09:52:52 
EDT ---
(In reply to comment #21)
> I found references to some classes I cannot seem to find in the code base? Am 
> I
> missing some thing here? Classes are
> 
>  - ClusterReceiverBase
>  - SocketReplicatonListener
>  - AsyncSocketSender
>  - FastAsyncSocketSender
>  - PooledSocketSender
>  - SocketSender

At least some of them were part of Tomcat 5.5 ´cluster and have been dropped
when the new Tomcat 6 cluster was written.

-- 
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: r950983 - /tomcat/trunk/conf/server.xml

2010-06-03 Thread Mark Thomas
On 03/06/2010 14:50, Rainer Jung wrote:
> +1000
:)

> Another related observation: Users often are not aware that they can
> substitute "common" with an individual log pattern, although that is
> very often essential (like including %D etc.). Even though many know
> similar constructs from Apache httpd, it's not obvious for them that
> they can substitute the word "common" with a pattern.
> 
> Should we add an example pattern to server.xml? Or would it be easier
> understandable if we removed the abbreviation "common" from the default
> config and replace it with the full pattern?
> 
> There's also the topic that the common pattern contains quotation marks,
> which you can't add verbatim to the attribute if you want to extend the
> common pattern with additional items. So adding an example or using the
> real pattern in the default configuration would show users how to work
> around that (" or similar).

I like explicitly defining the pattern along with a comment that this is
equivalent to common.

1 commit, coming up.

Mark



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



svn commit: r951012 - /tomcat/trunk/conf/server.xml

2010-06-03 Thread markt
Author: markt
Date: Thu Jun  3 14:33:16 2010
New Revision: 951012

URL: http://svn.apache.org/viewvc?rev=951012&view=rev
Log:
Expand the common pattern as an example to users

Modified:
tomcat/trunk/conf/server.xml

Modified: tomcat/trunk/conf/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/server.xml?rev=951012&r1=951011&r2=951012&view=diff
==
--- tomcat/trunk/conf/server.xml (original)
+++ tomcat/trunk/conf/server.xml Thu Jun  3 14:33:16 2010
@@ -126,9 +126,11 @@
 -->
 
 
+ Documentation at: /docs/config/valve.html
+ Note: The pattern used is equivalent to using pattern="common" -->
 
+   prefix="localhost_access_log." suffix=".txt"
+   pattern="%h %l %u %t "%r" %s %b" 
resolveHosts="false"/>
 
   
 



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



svn commit: r951018 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ webapps/docs/config/

2010-06-03 Thread markt
Author: markt
Date: Thu Jun  3 15:00:11 2010
New Revision: 951018

URL: http://svn.apache.org/viewvc?rev=951018&view=rev
Log:
Refactor the hooks from the CoyoteAdapter to the access logs
- cleaner interface
- handles AccessLogs at multiple levels (but not multiple AccessLogs per 
container)

Modified:
tomcat/trunk/java/org/apache/catalina/AccessLog.java
tomcat/trunk/java/org/apache/catalina/Container.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/webapps/docs/config/valve.xml

Modified: tomcat/trunk/java/org/apache/catalina/AccessLog.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/AccessLog.java?rev=951018&r1=951017&r2=951018&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/AccessLog.java (original)
+++ tomcat/trunk/java/org/apache/catalina/AccessLog.java Thu Jun  3 15:00:11 
2010
@@ -23,9 +23,8 @@ import org.apache.catalina.connector.Res
 
 /**
  * Intended for use by a {...@link Valve} to indicate that the {...@link Valve}
- * provides access logging. It is used by the Tomcat internals (the
- * {...@link org.apache.catalina.connector.CoyoteAdapter} at the time of 
writing)
- * to identify a Valve that logs access requests so requests that are rejected
+ * provides access logging. It is used by the Tomcat internals to identify a
+ * Valve that logs access requests so requests that are rejected
  * earlier in the processing chain can still be added to the access log.
  * Implementations of this interface should be robust against the provided
  * {...@link Request} and {...@link Response} objects being null, having null

Modified: tomcat/trunk/java/org/apache/catalina/Container.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Container.java?rev=951018&r1=951017&r2=951018&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Container.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Container.java Thu Jun  3 15:00:11 
2010
@@ -450,4 +450,27 @@ public interface Container extends Lifec
  * @param data Event data
  */
 public void fireContainerEvent(String type, Object data);
+
+
+/**
+ * Log a request/response that was destined for this container but has been
+ * handled earlier in the processing chain so that the request/response
+ * still appears in the correct access logs.
+ * @param request   Request (associated with the response) to log
+ * @param response  Response (associated with the request) to log
+ * @param time  Time taken to process the request/response in
+ *  milliseconds (use 0 if not known) 
+ * @param   useDefault  Flag that indicates that the request/response 
should
+ *  be logged in the engine's default access log
+ */
+public void logAccess(Request request, Response response, long time,
+boolean useDefault);
+
+
+/**
+ * Identify the AccessLog to use to log a request/response that was 
destined
+ * for this container but was handled earlier in the processing chain so
+ * that the request/response still appears in the correct access logs.
+ */
+public AccessLog getAccessLog();
 }

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=951018&r1=951017&r2=951018&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Jun  
3 15:00:11 2010
@@ -24,13 +24,8 @@ import java.util.EnumSet;
 
 import javax.servlet.SessionTrackingMode;
 
-import org.apache.catalina.AccessLog;
-import org.apache.catalina.Container;
 import org.apache.catalina.Context;
-import org.apache.catalina.Engine;
 import org.apache.catalina.Globals;
-import org.apache.catalina.Host;
-import org.apache.catalina.Valve;
 import org.apache.catalina.Wrapper;
 import org.apache.tomcat.util.res.StringManager;
 import org.apache.catalina.comet.CometEvent;
@@ -120,11 +115,6 @@ public class CoyoteAdapter implements Ad
 protected static URLEncoder urlEncoder;
 
 
-/**
- * Access log to use for rejected requests
- */
-private volatile AccessLog accessLog = null;
-
 // - Static Initializer
 
 
@@ -522,14 +512,16 @@ public class CoyoteAdapter implements Ad
 } catch (IOException ioe) {
 res.setStatus(400);
 res.setMessage("Invalid URI: " + ioe.getM

Re: svn commit: r950983 - /tomcat/trunk/conf/server.xml

2010-06-03 Thread Ian Darwin
On Thu, Jun 03, 2010 at 03:50:06PM +0200, Rainer Jung wrote:
> >  
> >-
 
++

> ...
> Should we add an example pattern to server.xml? Or would it be easier 
> understandable if we removed the abbreviation "common" from the default 
> config and replace it with the full pattern?

How about:
>  

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



svn commit: r951093 - in /tomcat/trunk/java/org/apache: catalina/connector/ coyote/ coyote/ajp/ coyote/http11/

2010-06-03 Thread markt
Author: markt
Date: Thu Jun  3 18:13:47 2010
New Revision: 951093

URL: http://svn.apache.org/viewvc?rev=951093&view=rev
Log:
Extend access logging to requests rejected in the Processors

Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/coyote/Adapter.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=951093&r1=951092&r2=951093&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Jun  
3 18:13:47 2010
@@ -457,6 +457,41 @@ public class CoyoteAdapter implements Ad
 }
 
 
+public void log(org.apache.coyote.Request req,
+org.apache.coyote.Response res, long time) {
+
+Request request = (Request) req.getNote(ADAPTER_NOTES);
+Response response = (Response) res.getNote(ADAPTER_NOTES);
+
+if (request == null) {
+
+// Create objects
+request = connector.createRequest();
+request.setCoyoteRequest(req);
+response = connector.createResponse();
+response.setCoyoteResponse(res);
+
+// Link objects
+request.setResponse(response);
+response.setRequest(request);
+
+// Set as notes
+req.setNote(ADAPTER_NOTES, request);
+res.setNote(ADAPTER_NOTES, response);
+
+// Set query string encoding
+req.getParameters().setQueryStringEncoding
+(connector.getURIEncoding());
+}
+
+connector.getService().getContainer().logAccess(
+request, response, 0, true);
+
+request.recycle();
+response.recycle();
+}
+
+
 // -- Protected Methods
 
 

Modified: tomcat/trunk/java/org/apache/coyote/Adapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Adapter.java?rev=951093&r1=951092&r2=951093&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Adapter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Adapter.java Thu Jun  3 18:13:47 2010
@@ -45,11 +45,13 @@ public interface Adapter {
  *  runtime exceptions )
  */
 public void service(Request req, Response res)
-   throws Exception;
+throws Exception;
 
 public boolean event(Request req, Response res, SocketStatus status)
-throws Exception;
+throws Exception;
 
-public boolean asyncDispatch(Request req,Response res, SocketStatus 
status) throws Exception;
+public boolean asyncDispatch(Request req,Response res, SocketStatus status)
+throws Exception;
 
+public void log(Request req, Response res, long time);
 }

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=951093&r1=951092&r2=951093&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Thu Jun  3 
18:13:47 2010
@@ -416,6 +416,7 @@ public class AjpAprProcessor implements 
 log.debug(sm.getString("ajpprocessor.header.error"), t);
 // 400 - Bad Request
 response.setStatus(400);
+adapter.log(request, response, 0);
 error = true;
 }
 
@@ -427,6 +428,7 @@ public class AjpAprProcessor implements 
 log.debug(sm.getString("ajpprocessor.request.prepare"), t);
 // 400 - Internal Server Error
 response.setStatus(400);
+adapter.log(request, response, 0);
 error = true;
 }
 
@@ -441,6 +443,7 @@ public class AjpAprProcessor implements 
 log.error(sm.getString("ajpprocessor.request.process"), t);
 // 500 - Internal Server Error
 response.setStatus(500);
+adapter.log(request, response, 0);
 error = true;
 }
 }
@@ -501,6 +504,7 @@ public class AjpAprProcessor implements 
 log.error(sm.getString("http11processor

svn commit: r951094 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11Processor.java

2010-06-03 Thread markt
Author: markt
Date: Thu Jun  3 18:15:47 2010
New Revision: 951094

URL: http://svn.apache.org/viewvc?rev=951094&view=rev
Log:
Started is only used in BIO connector

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.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=951094&r1=951093&r2=951094&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu 
Jun  3 18:15:47 2010
@@ -65,12 +65,6 @@ public class AbstractHttp11Processor {
 
 
 /**
- * State flag.
- */
-protected boolean started = false;
-
-
-/**
  * Error flag.
  */
 protected boolean error = false;

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=951094&r1=951093&r2=951094&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Jun  3 
18:15:47 2010
@@ -21,8 +21,6 @@ import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.InetAddress;
 import java.net.Socket;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -107,12 +105,12 @@ public class Http11Processor extends Abs
 protected InternalOutputBuffer outputBuffer = null;
 
 
-
 /**
  * SSL information.
  */
 protected SSLSupport sslSupport;
 
+
 /**
  * Async used
  */
@@ -120,30 +118,25 @@ public class Http11Processor extends Abs
 
 
 /**
+ * State flag.
+ */
+protected boolean started = false;
+
+
+/**
  * Socket associated with the current connection.
  */
 protected SocketWrapper socket;
 
 
-
 /**
  * Associated endpoint.
  */
 protected JIoEndpoint endpoint;
 
 
-
-
-// - Properties
-
-
-
-
- 
 // - Public Methods
 
-
-
 /**
  * Set the SSL information for this HTTP connection.
  */



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



svn commit: r951100 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java

2010-06-03 Thread markt
Author: markt
Date: Thu Jun  3 18:28:01 2010
New Revision: 951100

URL: http://svn.apache.org/viewvc?rev=951100&view=rev
Log:
Correct Javadoc
Fix whitespace

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.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=951100&r1=951099&r2=951100&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu 
Jun  3 18:28:01 2010
@@ -330,7 +330,7 @@ public class AbstractHttp11Processor {
 
 
 /**
- * Return the list of restricted user agents.
+ * Return the list of compressable mime-types.
  */
 public String[] findCompressableMimeTypes() {
 return (compressableMimeTypes);
@@ -614,8 +614,6 @@ public class AbstractHttp11Processor {
 return adapter;
 }
 
- 
-
 
 /**
  * Check for compression
@@ -677,6 +675,7 @@ public class AbstractHttp11Processor {
 return false;
 }
 
+
 /**
  * Specialized utility method: find a sequence of lower case bytes inside
  * a ByteChunk.
@@ -688,23 +687,23 @@ public class AbstractHttp11Processor {
 int start = bc.getStart();
 int end = bc.getEnd();
 
-// Look for first char
-int srcEnd = b.length;
+// Look for first char
+int srcEnd = b.length;
 
-for (int i = start; i <= (end - srcEnd); i++) {
-if (Ascii.toLower(buff[i]) != first) continue;
-// found first char, now look for a match
+for (int i = start; i <= (end - srcEnd); i++) {
+if (Ascii.toLower(buff[i]) != first) continue;
+// found first char, now look for a match
 int myPos = i+1;
-for (int srcPos = 1; srcPos < srcEnd; ) {
+for (int srcPos = 1; srcPos < srcEnd; ) {
 if (Ascii.toLower(buff[myPos++]) != b[srcPos++])
-break;
+break;
 if (srcPos == srcEnd) return i - start; // found it
+}
 }
-}
-return -1;
-
+return -1;
 }
 
+
 /**
  * Determine if we must drop the connection because of the HTTP status
  * code.  Use the same list of codes as Apache/httpd.



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



svn commit: r951101 - /tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java

2010-06-03 Thread markt
Author: markt
Date: Thu Jun  3 18:28:58 2010
New Revision: 951101

URL: http://svn.apache.org/viewvc?rev=951101&view=rev
Log:
Remove code duplication by used abstract base class

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=951101&r1=951100&r2=951101&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Jun  
3 18:28:58 2010
@@ -21,16 +21,12 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.Locale;
-import java.util.StringTokenizer;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.ActionHook;
-import org.apache.coyote.Adapter;
 import org.apache.coyote.Request;
 import org.apache.coyote.RequestInfo;
 import org.apache.coyote.Response;
@@ -50,7 +46,6 @@ import org.apache.tomcat.jni.SSL;
 import org.apache.tomcat.jni.SSLSocket;
 import org.apache.tomcat.jni.Sockaddr;
 import org.apache.tomcat.jni.Socket;
-import org.apache.tomcat.util.buf.Ascii;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.HexUtils;
 import org.apache.tomcat.util.buf.MessageBytes;
@@ -60,7 +55,6 @@ import org.apache.tomcat.util.net.Abstra
 import org.apache.tomcat.util.net.AprEndpoint;
 import org.apache.tomcat.util.net.SocketStatus;
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
-import org.apache.tomcat.util.res.StringManager;
 
 
 /**
@@ -68,7 +62,7 @@ import org.apache.tomcat.util.res.String
  *
  * @author Remy Maucherat
  */
-public class Http11AprProcessor implements ActionHook {
+public class Http11AprProcessor extends AbstractHttp11Processor implements 
ActionHook {
 
 
 /**
@@ -76,13 +70,6 @@ public class Http11AprProcessor implemen
  */
 private static final Log log = LogFactory.getLog(Http11AprProcessor.class);
 
-/**
- * The string manager for this package.
- */
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
-
-
 // --- Constructors
 
 
@@ -113,24 +100,6 @@ public class Http11AprProcessor implemen
 
 
 /**
- * Associated adapter.
- */
-protected Adapter adapter = null;
-
-
-/**
- * Request object.
- */
-protected Request request = null;
-
-
-/**
- * Response object.
- */
-protected Response response = null;
-
-
-/**
  * Input.
  */
 protected InternalAprInputBuffer inputBuffer = null;
@@ -143,30 +112,6 @@ public class Http11AprProcessor implemen
 
 
 /**
- * Error flag.
- */
-protected boolean error = false;
-
-
-/**
- * Keep-alive.
- */
-protected boolean keepAlive = true;
-
-
-/**
- * HTTP/1.1 flag.
- */
-protected boolean http11 = true;
-
-
-/**
- * HTTP/0.9 flag.
- */
-protected boolean http09 = false;
-
-
-/**
  * Sendfile data.
  */
 protected AprEndpoint.SendfileData sendfileData = null;
@@ -185,31 +130,6 @@ public class Http11AprProcessor implemen
 
 
 /**
- * Content delimiter for the request (if false, the connection will
- * be closed at the end of the request).
- */
-protected boolean contentDelimitation = true;
-
-
-/**
- * Is there an expectation ?
- */
-protected boolean expectation = false;
-
-
-/**
- * List of restricted user agents.
- */
-protected Pattern[] restrictedUserAgents = null;
-
-
-/**
- * Maximum number of Keep-Alive requests to honor.
- */
-protected int maxKeepAliveRequests = -1;
-
-
-/**
  * SSL enabled ?
  */
 protected boolean ssl = false;
@@ -222,251 +142,11 @@ public class Http11AprProcessor implemen
 
 
 /**
- * Remote Address associated with the current connection.
- */
-protected String remoteAddr = null;
-
-
-/**
- * Remote Host associated with the current connection.
- */
-protected String remoteHost = null;
-
-
-/**
- * Local Host associated with the current connection.
- */
-protected String localName = null;
-
-
-
-/**
- * Local port to which the socket is connected
- */
-protected int localPort = -1;
-
-
-/**
- * Remote port to which the socket is connected
- */
-protected int remotePort = -1;
-
-
-/**
- * The local Host address.
- */
-protected String lo

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

2010-06-03 Thread kkolinko
Author: kkolinko
Date: Thu Jun  3 23:33:28 2010
New Revision: 951205

URL: http://svn.apache.org/viewvc?rev=951205&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=951205&r1=951204&r2=951205&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun  3 23:33:28 2010
@@ -156,7 +156,7 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Additional clean-up possible as a result of above fix
   http://svn.apache.org/viewvc?rev=950905&view=rev (associated clean-up)
-  +1: markt
+  +1: markt, kkolinko
   -1: 
   
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49095
@@ -190,7 +190,7 @@ PATCHES PROPOSED TO BACKPORT:
   "this.channel.removeChannelListener(this.rpcChannel);" call is 
   replaced with "this.rpcChannel.breakdown();". 
   http://svn.apache.org/viewvc?view=revision&revision=950922
-  +1: kfujino
+  +1: kfujino, kkolinko
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48971



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



[Tomcat Wiki] Update of "FrontPage" by ArmaNang

2010-06-03 Thread Apache Wiki
Dear Wiki user,

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

The "FrontPage" page has been changed by ArmaNang.
http://wiki.apache.org/tomcat/FrontPage?action=diff&rev1=53&rev2=54

--

  
  This is the Wiki for Apache Tomcat, a Servlet and Java Server Pages container 
developed under the Apache License. The main documentation for this product is 
at [[http://tomcat.apache.org|tomcat.apache.org]]. Below is a list of some 
useful pages: we encourage everyone to contribute to these pages or start new 
ones as desired. But before you do, please check out the main documentation 
site as well as the [[FAQ|FAQ]]  and the 
[[http://tomcat.apache.org/lists.html|mailing lists]] (whose archives are 
searchable).
   
+  * '''[[http://www.essaydot.com|research papers]]'''
  
   * '''[[GettingStarted|Getting Started]]''' - Getting started with Tomcat.
   * '''[[TomcatVersions|Tomcat versions]]''' - A list of every Tomcat version 
and its current status.

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



[Tomcat Wiki] Update of "FrontPage" by ChuckCaldarale

2010-06-03 Thread Apache Wiki
Dear Wiki user,

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

The "FrontPage" page has been changed by ChuckCaldarale.
http://wiki.apache.org/tomcat/FrontPage?action=diff&rev1=54&rev2=55

--

  #pragma section-numbers off
- 
  = Welcome to the Apache Tomcat Wiki =
  {{http://tomcat.apache.org/images/tomcat.gif}}
  
- This is the Wiki for Apache Tomcat, a Servlet and Java Server Pages container 
developed under the Apache License. The main documentation for this product is 
at [[http://tomcat.apache.org|tomcat.apache.org]]. Below is a list of some 
useful pages: we encourage everyone to contribute to these pages or start new 
ones as desired. But before you do, please check out the main documentation 
site as well as the [[FAQ|FAQ]]  and the 
[[http://tomcat.apache.org/lists.html|mailing lists]] (whose archives are 
searchable).
+ This is the Wiki for Apache Tomcat, a Servlet and Java Server Pages container 
developed under the Apache License. The main documentation for this product is 
at [[http://tomcat.apache.org|tomcat.apache.org]]. Below is a list of some 
useful pages: we encourage everyone to contribute to these pages or start new 
ones as desired. But before you do, please check out the main documentation 
site as well as the [[FAQ]]  and the 
[[http://tomcat.apache.org/lists.html|mailing lists]] (whose archives are 
searchable).'''[[http://www.essaydot.com]]'''
+ 
-  
-  * '''[[http://www.essaydot.com|research papers]]'''
  
   * '''[[GettingStarted|Getting Started]]''' - Getting started with Tomcat.
   * '''[[TomcatVersions|Tomcat versions]]''' - A list of every Tomcat version 
and its current status.
@@ -23, +21 @@

   * '''[[DocumentInOtherLanguages|Translations]]''' - List of Tomcat documents 
in other languages.
   * '''[[GSOC]]''' - Google Summer of Code
  
+ = Special Wiki pages =
+  * '''TitleIndex''' - A list of all pages on this wiki.
+  * '''CategoryCategory''' - A list of page categories on this wiki.
+  * '''HelpContents''' - A basic guide to the MoinMoin wiki (including 
information about wiki syntax). See also 
[[http://moinmo.in/HelpForUsers|HelpForUsers]] on the 
[[http://moinmo.in/|moinmo.in]] site.
+  * '''WordIndex''' - A list of all the words that appear in the titles of the 
pages on this wiki, with links to pages that include that word.
+  * '''FindPage''' - A full-text search of the wiki.
+  * '''WantedPages''' - All the "broken links" -- a list of all the pages on 
this wiki that are linked to, but do not exist.
+  * '''OrphanedPages''' - All pages on this wiki that are not linked to from 
anywhere else (and are thus very hard to reach).
+  * '''RandomPage''' - Generates a list of 75 random pages on this wiki.
+  * '''PageSize''' - Generates a graph and some statistics about the sizes of 
pages on this wiki.
+  * '''EventStats/HitCounts''' - Generates a graph and some statistics about 
the sizes of pages on this wiki.
+  * '''EventStats/UserAgents''' -Generates a graph of the web browsers used in 
visiting this page.
+  * '''SystemInformation''' - Shows basic information about this wiki 
installation, the extensions it has installed, etc.
+  * '''PythonLanguage''' - The language used for this Wiki.
  
- = Special Wiki pages =
- 
-   * '''[[TitleIndex]]''' - A list of all pages on this wiki.
-   * '''[[CategoryCategory]]''' - A list of page categories on this wiki.
-   * '''[[HelpContents]]''' - A basic guide to the MoinMoin wiki (including 
information about wiki syntax). See also 
[[http://moinmo.in/HelpForUsers|HelpForUsers]] on the 
[[http://moinmo.in/|moinmo.in]] site.
-   * '''[[WordIndex]]''' - A list of all the words that appear in the titles 
of the pages on this wiki, with links to pages that include that word.
-   * '''[[FindPage]]''' - A full-text search of the wiki.
-   * '''[[WantedPages]]''' - All the "broken links" -- a list of all the pages 
on this wiki that are linked to, but do not exist.
-   * '''[[OrphanedPages]]''' - All pages on this wiki that are not linked to 
from anywhere else (and are thus very hard to reach).
-   * '''[[RandomPage]]''' - Generates a list of 75 random pages on this wiki.
-   * '''[[PageSize]]''' - Generates a graph and some statistics about the 
sizes of pages on this wiki.
-   * '''[[EventStats/HitCounts]]''' - Generates a graph and some statistics 
about the sizes of pages on this wiki.
-   * '''[[EventStats/UserAgents]]''' -Generates a graph of the web browsers 
used in visiting this page.
-   * '''[[SystemInformation]]''' - Shows basic information about this wiki 
installation, the extensions it has installed, etc.
-   * '''[[PythonLanguage]]''' - The language used for this Wiki.
- 

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



[Tomcat Wiki] Trivial Update of "FrontPage" by Konstant inKolinko

2010-06-03 Thread Apache Wiki
Dear Wiki user,

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

The "FrontPage" page has been changed by KonstantinKolinko.
The comment on this change is: Remove spam introduced in rev.54.
http://wiki.apache.org/tomcat/FrontPage?action=diff&rev1=55&rev2=56

--

  = Welcome to the Apache Tomcat Wiki =
  {{http://tomcat.apache.org/images/tomcat.gif}}
  
- This is the Wiki for Apache Tomcat, a Servlet and Java Server Pages container 
developed under the Apache License. The main documentation for this product is 
at [[http://tomcat.apache.org|tomcat.apache.org]]. Below is a list of some 
useful pages: we encourage everyone to contribute to these pages or start new 
ones as desired. But before you do, please check out the main documentation 
site as well as the [[FAQ]]  and the 
[[http://tomcat.apache.org/lists.html|mailing lists]] (whose archives are 
searchable).'''[[http://www.essaydot.com]]'''
+ This is the Wiki for Apache Tomcat, a Servlet and Java Server Pages container 
developed under the Apache License. The main documentation for this product is 
at [[http://tomcat.apache.org|tomcat.apache.org]]. Below is a list of some 
useful pages: we encourage everyone to contribute to these pages or start new 
ones as desired. But before you do, please check out the main documentation 
site as well as the [[FAQ]]  and the 
[[http://tomcat.apache.org/lists.html|mailing lists]] (whose archives are 
searchable).
  
  
   * '''[[GettingStarted|Getting Started]]''' - Getting started with Tomcat.

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