svn commit: r763533 - in /tomcat/trunk/java/org/apache/catalina: cluster/ ha/backend/ ha/backend/CollectedInfo.java ha/backend/HeartbeatListener.java
Author: jfclere Date: Thu Apr 9 06:54:21 2009 New Revision: 763533 URL: http://svn.apache.org/viewvc?rev=763533view=rev Log: Move the class from cluster to ha.backend Added: tomcat/trunk/java/org/apache/catalina/ha/backend/ (props changed) - copied from r762374, tomcat/trunk/java/org/apache/catalina/cluster/ tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java - copied, changed from r762411, tomcat/trunk/java/org/apache/catalina/cluster/HeartbeatListener.java Removed: tomcat/trunk/java/org/apache/catalina/cluster/ Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java Propchange: tomcat/trunk/java/org/apache/catalina/ha/backend/ -- svn:mergeinfo = Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java?rev=763533r1=762374r2=763533view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java Thu Apr 9 06:54:21 2009 @@ -16,7 +16,7 @@ */ -package org.apache.catalina.cluster; +package org.apache.catalina.ha.backend; /* for MBean to read ready and busy */ Copied: tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java (from r762411, tomcat/trunk/java/org/apache/catalina/cluster/HeartbeatListener.java) URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java?p2=tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.javap1=tomcat/trunk/java/org/apache/catalina/cluster/HeartbeatListener.javar1=762411r2=763533rev=763533view=diff == --- tomcat/trunk/java/org/apache/catalina/cluster/HeartbeatListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java Thu Apr 9 06:54:21 2009 @@ -16,7 +16,7 @@ */ -package org.apache.catalina.cluster; +package org.apache.catalina.ha.backend; import org.apache.catalina.ContainerEvent; import org.apache.catalina.ContainerListener; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46933] Using Java 1.5 in StringManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=46933 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Comment #3 from Mark Thomas ma...@apache.org 2009-04-09 01:49:10 PST --- Bugs are not marked as fixed until they are applied to the appropriate release branch(es) -- 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 46991] Bytes received problem
https://issues.apache.org/bugzilla/show_bug.cgi?id=46991 --- Comment #3 from Mark Thomas ma...@apache.org 2009-04-09 01:51:44 PST --- It will probably be in 6.0.20 but that depends on a) it getting the 3 +1 votes to be back-ported and b) there being a 6.0.20 release. Given that 6.0.19 is still in progress 6.0.20 is likely to be some time away. Alternatively, you can build Tomcat from source with the patch. If you want to do that, the users list is the place to get help. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763562 - in /tomcat/site/trunk: docs/lists.html xdocs/lists.xml
Author: markt Date: Thu Apr 9 08:42:21 2009 New Revision: 763562 URL: http://svn.apache.org/viewvc?rev=763562view=rev Log: Make it clear you have to subscribe first, advice on how to avoid spam and some other minor tweaks. Modified: tomcat/site/trunk/docs/lists.html tomcat/site/trunk/xdocs/lists.xml Modified: tomcat/site/trunk/docs/lists.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=763562r1=763561r2=763562view=diff == --- tomcat/site/trunk/docs/lists.html (original) +++ tomcat/site/trunk/docs/lists.html Thu Apr 9 08:42:21 2009 @@ -192,8 +192,19 @@ p blockquote -pThe following mailing lists relate to the Apache Tomcat -project. Users should consider subscribing to the +pBefore you can send a message to one of the Tomcat lists, you must subscribe +to that list. If you try to send a message to a list from an e-mail address that +is not subscribed to the list, it will be rejected./p + +pAll messages to the Tomcat lists are filtered for spam. To avoid your valid +message being marked as spam: + ul +lisend your message in plain text, not HTML;/li +liinclude a subject./li + /ul +/p + +pUsers should consider subscribing to the a href=#tomcat-usersUser Support/a mailing list. The a href=#tomcat-devDeveloper/a list is for people interested in @@ -211,7 +222,8 @@ a href=#tomcat-usersUser support and discussion/a /li li -a href=#tomcat-devDevelopment mailing list and source change reports/a +a href=#tomcat-devDevelopment mailing list, including commit + messages/a /li /ul Modified: tomcat/site/trunk/xdocs/lists.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/lists.xml?rev=763562r1=763561r2=763562view=diff == --- tomcat/site/trunk/xdocs/lists.xml (original) +++ tomcat/site/trunk/xdocs/lists.xml Thu Apr 9 08:42:21 2009 @@ -7,8 +7,19 @@ body section name=Apache Tomcat Mailing Lists -pThe following mailing lists relate to the Apache Tomcat -project. Users should consider subscribing to the +pBefore you can send a message to one of the Tomcat lists, you must subscribe +to that list. If you try to send a message to a list from an e-mail address that +is not subscribed to the list, it will be rejected./p + +pAll messages to the Tomcat lists are filtered for spam. To avoid your valid +message being marked as spam: + ul +lisend your message in plain text, not HTML;/li +liinclude a subject./li + /ul +/p + +pUsers should consider subscribing to the a href=#tomcat-usersUser Support/a mailing list. The a href=#tomcat-devDeveloper/a list is for people interested in @@ -26,7 +37,8 @@ ul lia href=#tomcat-usersUser support and discussion/a/li - lia href=#tomcat-devDevelopment mailing list and source change reports/a/li + lia href=#tomcat-devDevelopment mailing list, including commit + messages/a/li /ul /section - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 45852] conf/tomcat-users.xml has invalid encoding cp932.
https://issues.apache.org/bugzilla/show_bug.cgi?id=45852 Mark Thomas ma...@apache.org changed: What|Removed |Added CC||jwex...@mail.usa.com --- Comment #6 from Mark Thomas ma...@apache.org 2009-04-09 01:54:06 PST --- *** Bug 47005 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
DO NOT REPLY [Bug 47005] Does not render pages on native Japanese windows server 2003
https://issues.apache.org/bugzilla/show_bug.cgi?id=47005 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #2 from Mark Thomas ma...@apache.org 2009-04-09 01:54:06 PST --- *** This bug has been marked as a duplicate of bug 45852 *** -- 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 46991] Bytes received problem
https://issues.apache.org/bugzilla/show_bug.cgi?id=46991 --- Comment #4 from huangfeng huangf...@tongtech.com 2009-04-09 02:11:27 PST --- Thanks ! -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763580 - in /tomcat/trunk/java/org/apache/catalina: connector/Connector.java startup/Embedded.java
Author: markt
Date: Thu Apr 9 09:49:34 2009
New Revision: 763580
URL: http://svn.apache.org/viewvc?rev=763580view=rev
Log:
Switch to org.apache.coyote.ajp.AjpProtocol rather than
org.apache.jk.server.JkCoyoteHandler
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=763580r1=763579r2=763580view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Apr 9
09:49:34 2009
@@ -596,7 +596,7 @@
|| org.apache.coyote.http11.Http11AprProtocol.equals
(getProtocolHandlerClassName())) {
return HTTP/1.1;
-} else if (org.apache.jk.server.JkCoyoteHandler.equals
+} else if (org.apache.coyote.ajp.AjpProtocol.equals
(getProtocolHandlerClassName())
|| org.apache.coyote.ajp.AjpAprProtocol.equals
(getProtocolHandlerClassName())) {
@@ -684,7 +684,7 @@
(org.apache.coyote.http11.Http11Protocol);
} else if (AJP/1.3.equals(protocol)) {
setProtocolHandlerClassName
-(org.apache.jk.server.JkCoyoteHandler);
+(org.apache.coyote.ajp.AjpProtocol);
} else if (protocol != null) {
setProtocolHandlerClassName(protocol);
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Embedded.java?rev=763580r1=763579r2=763580view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Thu Apr 9
09:49:34 2009
@@ -418,7 +418,7 @@
try {
if (protocol.equals(ajp)) {
-connector = new
Connector(org.apache.jk.server.JkCoyoteHandler);
+connector = new Connector(org.apache.coyote.ajp.AjpProtocol);
} else if (protocol.equals(memory)) {
connector = new
Connector(org.apache.coyote.memory.MemoryProtocolHandler);
} else if (protocol.equals(http)) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763581 - in /tomcat/trunk/webapps/docs/config: ajp.xml http.xml
Author: markt Date: Thu Apr 9 09:53:34 2009 New Revision: 763581 URL: http://svn.apache.org/viewvc?rev=763581view=rev Log: Update the docs for the protocol attribute Modified: tomcat/trunk/webapps/docs/config/ajp.xml tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/ajp.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=763581r1=763580r2=763581view=diff == --- tomcat/trunk/webapps/docs/config/ajp.xml (original) +++ tomcat/trunk/webapps/docs/config/ajp.xml Thu Apr 9 09:53:34 2009 @@ -113,20 +113,21 @@ /attribute attribute name=protocol required=false - pSets the protocol to handle incoming traffic. The default value is -codeAJP/1.3/code and configures -codeorg.apache.jk.server.JkCoyoteHandler/code the original blocking -Java connector by default.br/ -If the codePATH(Windows)/code or codeLD_LIBRARY_PATH -(on most unix system)/code environment variables contain the Tomcat -native library, the native/APR connector will automatically be -configured instead.br/ + pSets the protocol to handle incoming traffic. To configure an AJP +connector this must be specified. If no value for protocol is provided, +an a href=http.htmlHTTP connector/a rather than an AJP connector +will be configured.br/ +The standard protocol value for an AJP connector is codeAJP/1.3/code +which uses an auto-switching mechanism to select either a Java based +connector or an APR/native based connector. If the +codePATH(Windows)/code or codeLD_LIBRARY_PATH/code (on most unix +system) environment variables contain the Tomcat native library, the +native/APR connector will be used. If the native library cannot be +found, the Java based connector will be used.br/ To use an explicit protocol rather than rely on the auto-switching mechanism described above, the following values may be used:br/ -codeorg.apache.jk.server.JkCoyoteHandler/code -- original blocking Java connectorbr/ codeorg.apache.coyote.ajp.AjpProtocol/code -- new blocking Java connector that supports an executorbr/ +- blocking Java connectorbr/ codeorg.apache.coyote.ajp.AjpAprProtocol/code - the APR/native connector.br/ Custom implementations may also be used./p @@ -261,9 +262,7 @@ attribute name=executor required=false pA reference to the name in an a href=executor.htmlExecutor/a element. If this attribute is enabled, and the named executor exists, the connector will - use the executor, and all the other thread attributes will be ignored. - This attribute is not supported by the original blocking Java - connector./p + use the executor, and all the other thread attributes will be ignored./p /attribute attribute name=keepAliveTimeout required=false Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=763581r1=763580r2=763581view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Thu Apr 9 09:53:34 2009 @@ -116,21 +116,28 @@ attribute name=protocol required=false p Sets the protocol to handle incoming traffic. -The default value is codeHTTP/1.1/code and configures the -codeorg.apache.coyote.http11.Http11Protocol/code. This is the blocking Java connector.br/ -If the codePATH(Windows)/code or codeLD_LIBRARY_PATH(on most unix system)/code -environment variables contain the Tomcat native library, the APR connector -will automatically be configured. Please be advised that the APR connector has different -settings for HTTPS than the default Java connector.br/ -Other values for this attribute are, but not limited to:br/ -codeorg.apache.coyote.http11.Http11Protocol/code - same as HTTP/1.1br/ -codeorg.apache.coyote.http11.Http11NioProtocol/code - non blocking Java connectorbr/ -codeorg.apache.coyote.http11.Http11AprProtocol/code - the APR connector.br/ -Take a look at our a href=#Connector ComparisonConnector Comparison/a chart. -The configuration for both Java connectors are identical, both for http and https. br/ -For more information on the APR connector and APR specific SSL settings please -visit the a href=../apr.htmlAPR documentation/a - +The default value is codeHTTP/1.1/code which uses an auto-switching +mechanism to select either a blocking Java based connector or an +APR/native based connector. If the codePATH(Windows)/code or +
svn commit: r763585 - /tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
Author: markt
Date: Thu Apr 9 10:20:36 2009
New Revision: 763585
URL: http://svn.apache.org/viewvc?rev=763585view=rev
Log:
Java uses 0 rather than -1 for infinite socket timeout
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
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=763585r1=763584r2=763585view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Thu Apr 9
10:20:36 2009
@@ -253,7 +253,14 @@
* Socket timeout.
*/
public int getSoTimeout() { return socketProperties.getSoTimeout(); }
-public void setSoTimeout(int soTimeout) {
socketProperties.setSoTimeout(soTimeout); }
+public void setSoTimeout(int soTimeout) {
+// APR/native uses -1 for infinite - Java uses 0
+if (soTimeout == -1) {
+socketProperties.setSoTimeout(0);
+} else {
+socketProperties.setSoTimeout(soTimeout);
+}
+}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763588 - /tomcat/trunk/java/org/apache/jk/
Author: markt Date: Thu Apr 9 10:27:01 2009 New Revision: 763588 URL: http://svn.apache.org/viewvc?rev=763588view=rev Log: Remove the org.apache.jk package as per discussion on dev list. Do this early in Tomcat 7 development to increase chances of identifying any issues with org.apache.coyoye.ajp package Removed: tomcat/trunk/java/org/apache/jk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763590 - in /tomcat/trunk/java/org/apache/tomcat/util: net/ threads/
Author: markt Date: Thu Apr 9 10:37:36 2009 New Revision: 763590 URL: http://svn.apache.org/viewvc?rev=763590view=rev Log: Remove old thread pool code Removed: tomcat/trunk/java/org/apache/tomcat/util/net/LeaderFollowerWorkerThread.java tomcat/trunk/java/org/apache/tomcat/util/net/MasterSlaveWorkerThread.java tomcat/trunk/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java tomcat/trunk/java/org/apache/tomcat/util/net/TcpConnection.java tomcat/trunk/java/org/apache/tomcat/util/net/TcpConnectionHandler.java tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPool.java tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolRunnable.java tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadWithAttributes.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763566 - /tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java
Author: markt
Date: Thu Apr 9 09:13:28 2009
New Revision: 763566
URL: http://svn.apache.org/viewvc?rev=763566view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46997
Code clean up
Patch provided by Jens Kapitza
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java?rev=763566r1=763565r2=763566view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java Thu Apr 9
09:13:28 2009
@@ -30,7 +30,7 @@
*
*/
public class TaskQueue extends LinkedBlockingQueueRunnable {
-ThreadPoolExecutor parent = null;
+private ThreadPoolExecutor parent = null;
public TaskQueue() {
super();
@@ -59,15 +59,13 @@
}
public boolean offer(Runnable o) {
-//we can't do any checks
-if (parent==null) return super.offer(o);
-//we are maxed out on threads, simply queue the object
-if (parent.getPoolSize() == parent.getMaximumPoolSize()) return
super.offer(o);
-//we have idle threads, just add it to the queue
-if (parent.getActiveCount()(parent.getPoolSize())) return
super.offer(o);
-//if we have less threads than maximum force creation of a new thread
-if (parent.getPoolSize()parent.getMaximumPoolSize()) return false;
-//if we reached here, we need to add it to the queue
-return super.offer(o);
+if (parent != null
parent.getPoolSize()parent.getMaximumPoolSize()){
+ return false;
+} else {
+//if we reached here, we need to add it to the queue
+//or can't do any checks
+return super.offer(o);
+}
+
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46997] small fix to TaskQueue
https://issues.apache.org/bugzilla/show_bug.cgi?id=46997 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2009-04-09 02:13:45 PST --- Applied to trunk. Thanks for the 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
svn commit: r763598 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Thu Apr 9 11:01:38 2009 New Revision: 763598 URL: http://svn.apache.org/viewvc?rev=763598view=rev Log: Propose patch Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=763598r1=763597r2=763598view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Thu Apr 9 11:01:38 2009 @@ -197,3 +197,9 @@ http://svn.apache.org/viewvc?rev=763325view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46552 + Return a 400 rather than a 200 if headers are too large + http://people.apache.org/~markt/patches/2009-04-09-bug46552.patch + +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 46552] Could there be a logging for requests exceeding maxHttpHeaderSize
https://issues.apache.org/bugzilla/show_bug.cgi?id=46552 --- Comment #1 from Mark Thomas ma...@apache.org 2009-04-09 04:01:42 PST --- This is essentially the same as bug 46125. I have proposed a backport of the same fix for 5.5.x. This will: - ensure a 400 response is issued rather than the current 200 - log a message (at debug level) - removes an odd error message http://people.apache.org/~markt/patches/2009-04-09-bug46552.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
svn commit: r763599 - /tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
Author: markt Date: Thu Apr 9 11:06:34 2009 New Revision: 763599 URL: http://svn.apache.org/viewvc?rev=763599view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46562 Close the reader when we are done Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java?rev=763599r1=763598r2=763599view=diff == --- tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java Thu Apr 9 11:06:34 2009 @@ -210,5 +210,6 @@ String text = stringWriter.toString(); res.getWriter().write(text); } +bufferedReader.close(); } } \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763601 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Apr 9 11:09:00 2009 New Revision: 763601 URL: http://svn.apache.org/viewvc?rev=763601view=rev Log: Propose 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=763601r1=763600r2=763601view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 9 11:09:00 2009 @@ -212,3 +212,9 @@ http://svn.apache.org/viewvc?rev=763325view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46562 + Close the reader in the SSI servlet when we are done + http://svn.apache.org/viewvc?rev=763599view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763602 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Thu Apr 9 11:09:10 2009 New Revision: 763602 URL: http://svn.apache.org/viewvc?rev=763602view=rev Log: Propose patch Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=763602r1=763601r2=763602view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Thu Apr 9 11:09:10 2009 @@ -203,3 +203,9 @@ http://people.apache.org/~markt/patches/2009-04-09-bug46552.patch +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46562 + Close the reader in the SSI servlet when we are done + http://svn.apache.org/viewvc?rev=763599view=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 46597] Not all cookie changes in 6.0.x branch have been ported to 5.5.x
https://issues.apache.org/bugzilla/show_bug.cgi?id=46597 --- Comment #3 from Mark Thomas ma...@apache.org 2009-04-09 04:11:06 PST --- The patch has been proposed for 5.5.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 46770] Headers are send duplicate
https://issues.apache.org/bugzilla/show_bug.cgi?id=46770 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #16 from Mark Thomas ma...@apache.org 2009-04-09 04:12:20 PST --- This has been fixed in 5.5.x and will be included in 5.5.28 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
DO NOT REPLY [Bug 46907] Jasper with log4j in web-app classpath and debug level enabled prevents reading HTTP POST stream from JSP
https://issues.apache.org/bugzilla/show_bug.cgi?id=46907 --- Comment #7 from IzhikovNikolay northdra...@gmail.com 2009-04-09 04:12:48 PST --- Ok. I take a look. -- 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 46903] STRICT_SERVLET_COMPLIANCE=false doesn't turn off all checks
https://issues.apache.org/bugzilla/show_bug.cgi?id=46903 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Mark Thomas ma...@apache.org 2009-04-09 04:27:21 PST --- There are two separate issues here. For cookies, we have to prevent invalid characters to prevent security issues (see CVE-2007-3385 CVE-2007-5333). It took a couple of iterations to get an implementation that was a) secure and b) backwards compatible. Bug 46597 is tracking the back-porting of the remaining changes to 5.5.x and will hopefully be included in 5.5.28 onwards. Once this has been applied, the default behaviour will be to switch invalid v0 cookies to v1 and to quote where necessary. The jsp quoting rules may be relaxed by setting org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false STRICT_SERVLET_COMPLIANCE is not intended to be a catch-all for all of the settings for servlet, jsp and el spec compatibility. The expected behaviour (for 5.5.27) is documented at http://tomcat.apache.org/tomcat-5.5-doc/confiG/systemprops.html which will be updated as required with each new 5.5.x release. The cookie element is a duplicate and the quoting element a won't fix so I am marking this as won't fix. -- 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: r763611 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Author: markt Date: Thu Apr 9 11:46:13 2009 New Revision: 763611 URL: http://svn.apache.org/viewvc?rev=763611view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46909 The ';' should really only be used if there is a following parameter Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=763611r1=763610r2=763611view=diff == --- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Thu Apr 9 11:46:13 2009 @@ -1574,8 +1574,7 @@ s0 = param name=\type\ + makeAttr(value, application/x-java- + type -+ ; -+ ((jreversion == null) ? : version= ++ ((jreversion == null) ? : ;version= + jreversion)) + ''; out.printil(out.write( + quote(s0) + );); out.printil(out.write(\\\n\);); @@ -1594,8 +1593,7 @@ s0 = EMBED + makeAttr(type, application/x-java- + type -+ ; -+ ((jreversion == null) ? : version= ++ ((jreversion == null) ? : ;version= + jreversion)) + makeAttr(name, name); // s1 and s2 are the same as before. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763613 - in /tomcat: current/tc5.5.x/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Apr 9 11:48:36 2009 New Revision: 763613 URL: http://svn.apache.org/viewvc?rev=763613view=rev Log: Propose fix for 46909 Modified: tomcat/current/tc5.5.x/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=763613r1=763612r2=763613view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Thu Apr 9 11:48:36 2009 @@ -209,3 +209,9 @@ http://svn.apache.org/viewvc?rev=763599view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46909 + Only include ';' in type attribute if there is a parameter + http://svn.apache.org/viewvc?rev=763611view=rev + +1: markt + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=763613r1=763612r2=763613view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 9 11:48:36 2009 @@ -218,3 +218,9 @@ http://svn.apache.org/viewvc?rev=763599view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46909 + Only include ';' in type attribute if there is a parameter + http://svn.apache.org/viewvc?rev=763611view=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 46909] jsp:plugin error
https://issues.apache.org/bugzilla/show_bug.cgi?id=46909 --- Comment #1 from Mark Thomas ma...@apache.org 2009-04-09 04:48:42 PST --- Note that the ';' is expected in some circumstances. Eg: type=application/x-java-applet;version=1.5.0 That said, the ';' should really only be present if there is a following parameter so I have patched trunk to that effect and proposed the change for 5.5.x and 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 46998] small fix to TaskThreadFactory
https://issues.apache.org/bugzilla/show_bug.cgi?id=46998 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2009-04-09 02:14:47 PST --- Patch applied to trunk. Many thanks. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763567 - /tomcat/trunk/java/org/apache/tomcat/util/threads/TaskThreadFactory.java
Author: markt
Date: Thu Apr 9 09:14:40 2009
New Revision: 763567
URL: http://svn.apache.org/viewvc?rev=763567view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46998
Reduce scope
Patch provided by Jens Kapitza
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/TaskThreadFactory.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/TaskThreadFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/TaskThreadFactory.java?rev=763567r1=763566r2=763567view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/threads/TaskThreadFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/TaskThreadFactory.java Thu
Apr 9 09:14:40 2009
@@ -24,11 +24,11 @@
*
*/
public class TaskThreadFactory implements ThreadFactory {
-final ThreadGroup group;
-final AtomicInteger threadNumber = new AtomicInteger(1);
-final String namePrefix;
-final boolean daemon;
-final int threadPriority;
+private final ThreadGroup group;
+private final AtomicInteger threadNumber = new AtomicInteger(1);
+private final String namePrefix;
+private final boolean daemon;
+private final int threadPriority;
public TaskThreadFactory(String namePrefix, boolean daemon, int priority) {
SecurityManager s = System.getSecurityManager();
group = (s != null) ? s.getThreadGroup() :
Thread.currentThread().getThreadGroup();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46999] change scope in ThreadPoolExecutor
https://issues.apache.org/bugzilla/show_bug.cgi?id=46999 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas ma...@apache.org 2009-04-09 02:16:06 PST --- No patch attached. -- 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 46961] org.apache.catalina.loader.WebappClassLoader throws exception related to Java 6 Bug 6434149
https://issues.apache.org/bugzilla/show_bug.cgi?id=46961 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2009-04-09 05:55:57 PST --- I've fixed this in trunk but won't be proposing it for backport to 6.0.x or 5.5.x. For those versions you can use setenv.sh|bat to configure -Dsun.lang.ClassLoader.allowArraySyntax=true -- 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: r763635 - in /tomcat/trunk/java/org/apache/catalina/ha/backend: HeartbeatListener.java MultiCastSender.java Sender.java
Author: jfclere
Date: Thu Apr 9 13:00:21 2009
New Revision: 763635
URL: http://svn.apache.org/viewvc?rev=763635view=rev
Log:
Move the multi logic to MultiCastSender with
the idea to TCP sockets and a list of proxy too.
Added:
tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
tomcat/trunk/java/org/apache/catalina/ha/backend/Sender.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java?rev=763635r1=763634r2=763635view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java Thu
Apr 9 13:00:21 2009
@@ -55,8 +55,6 @@
public void setPort(int port) { this.port = port; }
/* for multicasting stuff */
-MulticastSocket s = null;
-InetAddress group = null;
String ip = 224.0.1.105; /* Multicast IP */
int multiport = 23364; /* Multicast Port */
int ttl = 16;
@@ -70,23 +68,17 @@
private CollectedInfo coll = null;
+private Sender sender = null;
+
public void containerEvent(ContainerEvent event) {
}
public void lifecycleEvent(LifecycleEvent event) {
Object source = event.getLifecycle();
if (Lifecycle.PERIODIC_EVENT.equals(event.getType())) {
-if (s == null) {
-try {
-group = InetAddress.getByName(ip);
-s = new MulticastSocket(port);
-s.setTimeToLive(16);
-s.joinGroup(group);
-} catch (Exception ex) {
-log.error(Unable to use multicast: + ex);
-s = null;
-return;
-}
+if (sender == null) {
+sender = new MultiCastSender();
+sender.init(this);
}
/* Read busy and ready */
@@ -108,19 +100,10 @@
}
String output = new String();
output = v=1ready= + coll.ready + busy= + coll.busy;
-byte[] buf;
-try {
-buf = output.getBytes(US-ASCII);
-} catch (UnsupportedEncodingException ex) {
-buf = output.getBytes();
-}
-DatagramPacket data = new DatagramPacket(buf, buf.length, group,
multiport);
try {
-s.send(data);
+sender.send(output);
} catch (Exception ex) {
log.error(Unable to send colllected load information: + ex);
-s.close();
-s = null;
}
}
}
Added: tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java?rev=763635view=auto
==
--- tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
(added)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java Thu
Apr 9 13:00:21 2009
@@ -0,0 +1,79 @@
+/*
+ * 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.catalina.ha.backend;
+
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+import java.net.MulticastSocket;
+import java.net.InetAddress;
+import java.net.DatagramPacket;
+import java.io.UnsupportedEncodingException;
+
+/*
+ * Sender to proxies using multicast socket.
+ */
+public class MultiCastSender
+implements Sender {
+
+private static Log log = LogFactory.getLog(HeartbeatListener.class);
+
+HeartbeatListener config = null;
+
+/* for multicasting stuff */
+MulticastSocket s = null;
+InetAddress group = null;
+
+public void init(HeartbeatListener config) {
+this.config = config;
+}
+
+public int send(String mess) throws Exception {
+if (s == null) {
+
Re: svn commit: r763585 - /tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
On Thu, 2009-04-09 at 10:20 +, ma...@apache.org wrote: Author: markt Date: Thu Apr 9 10:20:36 2009 New Revision: 763585 URL: http://svn.apache.org/viewvc?rev=763585view=rev Log: Java uses 0 rather than -1 for infinite socket timeout But the value is never used if = 0, so what does it change ? Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r763585 - /tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
Remy Maucherat wrote: On Thu, 2009-04-09 at 10:20 +, ma...@apache.org wrote: Author: markt Date: Thu Apr 9 10:20:36 2009 New Revision: 763585 URL: http://svn.apache.org/viewvc?rev=763585view=rev Log: Java uses 0 rather than -1 for infinite socket timeout But the value is never used if = 0, so what does it change ? This broke with http://svn.apache.org/viewvc?view=revrevision=703017 for org.apache.coyote.ajp.AjpProtocol but I suspect no-one ever tested it until today when I swapped AJP implementations for trunk. I'm open to fixing it a different way if you have a better suggestion. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763654 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java InternalAprInputBuffer.java InternalInputBuffer.java Internal
Author: markt
Date: Thu Apr 9 13:54:05 2009
New Revision: 763654
URL: http://svn.apache.org/viewvc?rev=763654view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46984
CR LF in middle of method name should cause a 400
So client sees 400, stop processing the request once we know it is bad
Modified:
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
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
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=763654r1=763653r2=763654view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Apr
9 13:54:05 2009
@@ -818,17 +818,19 @@
error = true;
}
-// Setting up filters, and parse some request headers
-rp.setStage(org.apache.coyote.Constants.STAGE_PREPARE);
-try {
-prepareRequest();
-} catch (Throwable t) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString(http11processor.request.prepare),
t);
+if (!error) {
+// Setting up filters, and parse some request headers
+rp.setStage(org.apache.coyote.Constants.STAGE_PREPARE);
+try {
+prepareRequest();
+} catch (Throwable t) {
+if (log.isDebugEnabled()) {
+
log.debug(sm.getString(http11processor.request.prepare), t);
+}
+// 400 - Internal Server Error
+response.setStatus(400);
+error = true;
}
-// 400 - Internal Server Error
-response.setStatus(400);
-error = true;
}
if (maxKeepAliveRequests 0 --keepAliveLeft == 0)
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=763654r1=763653r2=763654view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Apr
9 13:54:05 2009
@@ -849,17 +849,19 @@
error = true;
}
-// Setting up filters, and parse some request headers
-rp.setStage(org.apache.coyote.Constants.STAGE_PREPARE);
-try {
-prepareRequest();
-} catch (Throwable t) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString(http11processor.request.prepare),
t);
+if (!error) {
+// Setting up filters, and parse some request headers
+rp.setStage(org.apache.coyote.Constants.STAGE_PREPARE);
+try {
+prepareRequest();
+} catch (Throwable t) {
+if (log.isDebugEnabled()) {
+
log.debug(sm.getString(http11processor.request.prepare), t);
+}
+// 400 - Internal Server Error
+response.setStatus(400);
+error = true;
}
-// 400 - Internal Server Error
-response.setStatus(400);
-error = true;
}
if (maxKeepAliveRequests == 1 )
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=763654r1=763653r2=763654view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Apr 9
13:54:05 2009
@@ -807,17 +807,19 @@
error = true;
}
-// Setting up filters, and parse some request headers
-rp.setStage(org.apache.coyote.Constants.STAGE_PREPARE);
-try {
-prepareRequest();
-} catch (Throwable t) {
-if (log.isDebugEnabled()) {
DO NOT REPLY [Bug 46984] Server incorrectly reports a 501 error on bad method name. Should report 400 error.
https://issues.apache.org/bugzilla/show_bug.cgi?id=46984 --- Comment #1 from Mark Thomas ma...@apache.org 2009-04-09 07:03:21 PST --- This has been fixed in trunk and proposed for 6.0.x and 5.5.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
svn commit: r763658 - in /tomcat: current/tc5.5.x/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Apr 9 14:03:30 2009 New Revision: 763658 URL: http://svn.apache.org/viewvc?rev=763658view=rev Log: Propose fix for 46984 Modified: tomcat/current/tc5.5.x/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=763658r1=763657r2=763658view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Thu Apr 9 14:03:30 2009 @@ -215,3 +215,9 @@ http://svn.apache.org/viewvc?rev=763611view=rev +1: markt -1: + +* https://issues.apache.org/bugzilla/show_bug.cgi?id=46984 + Invalid characters in HTTP request method should result in a 400 + http://svn.apache.org/viewvc?rev=763654view=rev + +1: markt + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=763658r1=763657r2=763658view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 9 14:03:30 2009 @@ -224,3 +224,9 @@ http://svn.apache.org/viewvc?rev=763611view=rev +1: markt -1: + +* https://issues.apache.org/bugzilla/show_bug.cgi?id=46984 + Invalid characters in HTTP request method should result in a 400 + http://svn.apache.org/viewvc?rev=763654view=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 45737] AcessControlException when using security manager: juli can't read logging.properties
https://issues.apache.org/bugzilla/show_bug.cgi?id=45737 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2009-04-09 07:10:53 PST --- This has been fixed in 5.5.x and will be included in 5.5.28 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
DO NOT REPLY [Bug 42950] ConcurrentModificationException on Shutdown
https://issues.apache.org/bugzilla/show_bug.cgi?id=42950 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||WONTFIX --- Comment #10 from Mark Thomas ma...@apache.org 2009-04-09 07:13:53 PST --- No test case, therefore assume disabling the clear references functionality fixes the 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: r763681 - /tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
Author: markt
Date: Thu Apr 9 15:11:46 2009
New Revision: 763681
URL: http://svn.apache.org/viewvc?rev=763681view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46354
ArrayIndexOutOfBoundsException when using
org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true
Pathc provided by Konstantin Kolinko
Modified:
tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java?rev=763681r1=763680r2=763681view=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java Thu Apr 9
15:11:46 2009
@@ -51,9 +51,6 @@
// Enclosed writer to which any output is written
private Writer writer;
-// See comment in setWriter()
-private int bufferSizeSave;
-
/**
* Constructor.
*/
@@ -508,6 +505,19 @@
}
/**
+ * This method returns the size of the buffer used by the JspWriter.
+ *
+ * @return the size of the buffer in bytes, or 0 is unbuffered.
+ */
+public int getBufferSize() {
+// According to the spec, the JspWriter returned by
+// JspContext.pushBody(java.io.Writer writer) must behave as
+// though it were unbuffered. This means that its getBufferSize()
+// must always return 0.
+return (writer == null) ? bufferSize : 0;
+}
+
+/**
* @return the number of bytes unused in the buffer
*/
public int getRemaining() {
@@ -558,22 +568,7 @@
void setWriter(Writer writer) {
this.writer = writer;
closed = false;
-if (writer != null) {
-// According to the spec, the JspWriter returned by
-// JspContext.pushBody(java.io.Writer writer) must behave as
-// though it were unbuffered. This means that its getBufferSize()
-// must always return 0. The implementation of
-// JspWriter.getBufferSize() returns the value of JspWriter's
-// 'bufferSize' field, which is inherited by this class.
-// Therefore, we simply save the current 'bufferSize' (so we can
-// later restore it should this BodyContentImpl ever be reused by
-// a call to PageContext.pushBody()) before setting it to 0.
-if (bufferSize != 0) {
-bufferSizeSave = bufferSize;
-bufferSize = 0;
-}
-} else {
-bufferSize = bufferSizeSave;
+if (writer == null) {
clearBody();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763684 - in /tomcat: current/tc5.5.x/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Apr 9 15:14:00 2009 New Revision: 763684 URL: http://svn.apache.org/viewvc?rev=763684view=rev Log: Propose fix for 46354 Modified: tomcat/current/tc5.5.x/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=763684r1=763683r2=763684view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Thu Apr 9 15:14:00 2009 @@ -221,3 +221,10 @@ http://svn.apache.org/viewvc?rev=763654view=rev +1: markt -1: + +* Fix http://svn.apache.org/viewvc?rev=763681view=rev + ArrayIndexOutOfBoundsException when using + org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true + Patch provided by Konstantin Kolinko + +1: markt + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=763684r1=763683r2=763684view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 9 15:14:00 2009 @@ -230,3 +230,10 @@ http://svn.apache.org/viewvc?rev=763654view=rev +1: markt -1: + +* Fix http://svn.apache.org/viewvc?rev=763681view=rev + ArrayIndexOutOfBoundsException when using + org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true + Patch provided by Konstantin Kolinko + +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 46354] LIMIT_BUFFER setting causes arraycopy errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=46354 --- Comment #7 from Mark Thomas ma...@apache.org 2009-04-09 08:14:22 PST --- Many thanks for the test case and patch, as well as your efforts in tracking this one down. The patch has been applied to trunk and proposed for 6.0.x and 5.5.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
Re: svn commit: r763585 - /tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
On Thu, 2009-04-09 at 14:37 +0100, Mark Thomas wrote: This broke with http://svn.apache.org/viewvc?view=revrevision=703017 for org.apache.coyote.ajp.AjpProtocol but I suspect no-one ever tested it until today when I swapped AJP implementations for trunk. I'm open to fixing it a different way if you have a better suggestion. Ok, I was looking at the old code for setSocketOptions. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763693 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Thu Apr 9 15:23:27 2009 New Revision: 763693 URL: http://svn.apache.org/viewvc?rev=763693view=rev Log: Propose backport to fix 42707 Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=763693r1=763692r2=763693view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Thu Apr 9 15:23:27 2009 @@ -228,3 +228,9 @@ Patch provided by Konstantin Kolinko +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42707 + Make adding a host alias via jmx take effect immediately + http://svn.apache.org/viewvc?view=revrevision=734570 + +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 42707] add host alias using jmx doesn't take affect until restart
https://issues.apache.org/bugzilla/show_bug.cgi?id=42707 --- Comment #7 from Mark Thomas ma...@apache.org 2009-04-09 08:23:38 PST --- I've proposed backporting the fix to 5.5.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
svn commit: r763706 - /tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
Author: markt
Date: Thu Apr 9 15:45:30 2009
New Revision: 763706
URL: http://svn.apache.org/viewvc?rev=763706view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42579
Handle both relative and absolute search results
Patch provided by Brandon DuRette
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
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=763706r1=763705r2=763706view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Thu Apr 9
15:45:30 2009
@@ -18,6 +18,8 @@
package org.apache.catalina.realm;
import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.security.Principal;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -2147,19 +2149,51 @@
* @param result The search result
* @return String containing the distinguished name
*/
-protected String getDistinguishedName(DirContext context, String base,
SearchResult result)
-throws NamingException {
-// Get the entry's distinguished name
-NameParser parser = context.getNameParser();
-Name contextName = parser.parse(context.getNameInNamespace());
-Name baseName = parser.parse(base);
-
-// Bugzilla 32269
-Name entryName = parser.parse(new
CompositeName(result.getName()).get(0));
-
-Name name = contextName.addAll(baseName);
-name = name.addAll(entryName);
-return name.toString();
+protected String getDistinguishedName(DirContext context, String base,
+SearchResult result) throws NamingException {
+// Get the entry's distinguished name. For relative results, this
means
+// we need to composite a name with the base name, the context name,
and
+// the result name. For non-relative names, use the returned name.
+if (result.isRelative()) {
+ if (containerLog.isTraceEnabled()) {
+ containerLog.trace( search returned relative name: +
+ result.getName());
+ }
+ NameParser parser = context.getNameParser();
+ Name contextName = parser.parse(context.getNameInNamespace());
+ Name baseName = parser.parse(base);
+
+ // Bugzilla 32269
+ Name entryName =
+ parser.parse(new CompositeName(result.getName()).get(0));
+
+ Name name = contextName.addAll(baseName);
+ name = name.addAll(entryName);
+ return name.toString();
+} else {
+ String absoluteName = result.getName();
+ if (containerLog.isTraceEnabled())
+ containerLog.trace( search returned absolute name: +
+ result.getName());
+ try {
+ // Normalize the name by running it through the name parser.
+ NameParser parser = context.getNameParser();
+ URI userNameUri = new URI(absoluteName);
+ String pathComponent = userNameUri.getPath();
+ // Should not ever have an empty path component, since that is
/{DN}
+ if (pathComponent.length() 1 ) {
+ throw new InvalidNameException(
+ Search returned unparseable absolute name: +
+ absoluteName );
+ }
+ Name name = parser.parse(pathComponent.substring(1));
+ return name.toString();
+ } catch ( URISyntaxException e ) {
+ throw new InvalidNameException(
+ Search returned unparseable absolute name: +
+ absoluteName );
+ }
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763707 - in /tomcat: current/tc5.5.x/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Apr 9 15:47:49 2009 New Revision: 763707 URL: http://svn.apache.org/viewvc?rev=763707view=rev Log: Propose patch for 42579 Modified: tomcat/current/tc5.5.x/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=763707r1=763706r2=763707view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Thu Apr 9 15:47:49 2009 @@ -234,3 +234,10 @@ http://svn.apache.org/viewvc?view=revrevision=734570 +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42579 + Handle both relative and absolute search results + Patch provided by Brandon DuRette + http://svn.apache.org/viewvc?rev=763706view=rev + +1: markt + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=763707r1=763706r2=763707view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 9 15:47:49 2009 @@ -237,3 +237,10 @@ Patch provided by Konstantin Kolinko +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42579 + Handle both relative and absolute search results + Patch provided by Brandon DuRette + http://svn.apache.org/viewvc?rev=763706view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763717 - /tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
Author: markt
Date: Thu Apr 9 16:13:00 2009
New Revision: 763717
URL: http://svn.apache.org/viewvc?rev=763717view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
Correct JSP compilation error with nested tagfile tags with variables with
AT_BEGIN scope
Patch provided by Konstantin Kolinko
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java?rev=763717r1=763716r2=763717view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java Thu
Apr 9 16:13:00 2009
@@ -68,7 +68,7 @@
public void visit(Node.CustomTag n) throws JasperException {
setScriptingVars(n, VariableInfo.AT_BEGIN);
setScriptingVars(n, VariableInfo.NESTED);
- visitBody(n);
+ new ScriptingVariableVisitor(err).visitBody(n);
setScriptingVars(n, VariableInfo.AT_END);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r763720 - in /tomcat: current/tc5.5.x/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Apr 9 16:15:07 2009 New Revision: 763720 URL: http://svn.apache.org/viewvc?rev=763720view=rev Log: Propose fix for 42390 Modified: tomcat/current/tc5.5.x/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=763720r1=763719r2=763720view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Thu Apr 9 16:15:07 2009 @@ -241,3 +241,11 @@ http://svn.apache.org/viewvc?rev=763706view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390 + Correct JSP compilation error with nested tagfile tags with variables with + AT_BEGIN scope + Patch provided by Konstantin Kolinko + http://svn.apache.org/viewvc?rev=763717view=rev + +1: markt + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=763720r1=763719r2=763720view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 9 16:15:07 2009 @@ -244,3 +244,11 @@ http://svn.apache.org/viewvc?rev=763706view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390 + Correct JSP compilation error with nested tagfile tags with variables with + AT_BEGIN scope + Patch provided by Konstantin Kolinko + http://svn.apache.org/viewvc?rev=763717view=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 42390] JSP compilation error with nested tagfile tags with variables with AT_BEGIN scope
https://issues.apache.org/bugzilla/show_bug.cgi?id=42390 --- Comment #4 from Mark Thomas ma...@apache.org 2009-04-09 09:15:08 PST --- Again, many thanks for the patch. It has been applied to trunk and proposed for 6.0.x and 5.5.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
svn commit: r763723 - /tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
Author: markt
Date: Thu Apr 9 16:20:23 2009
New Revision: 763723
URL: http://svn.apache.org/viewvc?rev=763723view=rev
Log:
Drop some unused methods
Modified:
tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=763723r1=763722r2=763723view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Thu Apr 9
16:20:23 2009
@@ -701,117 +701,11 @@
return getClassPath(jarsV);
}
-// Mapping command line params to setters
-
-public static boolean processArgs(Object proxy, String args[])
-throws Exception {
-String args0[] = null;
-if (null != findMethod(proxy.getClass(), getOptions1, new Class[]
{})) {
-args0 = (String[]) callMethod0(proxy, getOptions1);
-}
-
-if (args0 == null) {
-//args0=findVoidSetters(proxy.getClass());
-args0 = findBooleanSetters(proxy.getClass());
-}
-HashtableObject,Object h = null;
-if (null != findMethod(proxy.getClass(), getOptionAliases,
-new Class[] {})) {
-h = (HashtableObject,Object) callMethod0(proxy,
-getOptionAliases);
-}
-return processArgs(proxy, args, args0, null, h);
-}
-
-public static boolean processArgs(Object proxy, String args[],
-String args0[], String args1[],
-HashtableObject,Object aliases) throws Exception {
-for (int i = 0; i args.length; i++) {
-String arg = args[i];
-if (arg.startsWith(-))
-arg = arg.substring(1);
-if (aliases != null aliases.get(arg) != null)
-arg = (String) aliases.get(arg);
-
-if (args0 != null) {
-boolean set = false;
-for (int j = 0; j args0.length; j++) {
-if (args0[j].equalsIgnoreCase(arg)) {
-setProperty(proxy, args0[j], true);
-set = true;
-break;
-}
-}
-if (set)
-continue;
-}
-if (args1 != null) {
-for (int j = 0; j args1.length; j++) {
-if (args1[j].equalsIgnoreCase(arg)) {
-i++;
-if (i = args.length)
-return false;
-setProperty(proxy, arg, args[i]);
-break;
-}
-}
-} else {
-// if args1 is not specified,assume all other options have
param
-i++;
-if (i = args.length)
-return false;
-setProperty(proxy, arg, args[i]);
-}
-
-}
-return true;
-}
-
// other utils
public static void clear() {
objectMethods.clear();
}
-public static String[] findVoidSetters(Class? c) {
-Method m[] = findMethods(c);
-if (m == null)
-return null;
-VectorString v = new VectorString();
-for (int i = 0; i m.length; i++) {
-if (m[i].getName().startsWith(set)
- m[i].getParameterTypes().length == 0) {
-String arg = m[i].getName().substring(3);
-v.addElement(unCapitalize(arg));
-}
-}
-String s[] = new String[v.size()];
-for (int i = 0; i s.length; i++) {
-s[i] = v.elementAt(i);
-}
-return s;
-}
-
-public static String[] findBooleanSetters(Class? c) {
-Method m[] = findMethods(c);
-if (m == null)
-return null;
-VectorString v = new VectorString();
-for (int i = 0; i m.length; i++) {
-if (m[i].getName().startsWith(set)
- m[i].getParameterTypes().length == 1
- boolean.equalsIgnoreCase(m[i].getParameterTypes()[0]
-.getName())) {
-String arg = m[i].getName().substring(3);
-v.addElement(unCapitalize(arg));
-}
-}
-String s[] = new String[v.size()];
-for (int i = 0; i s.length; i++) {
-s[i] = v.elementAt(i);
-}
-return s;
-}
-
static HashtableClass?,Method[] objectMethods =
new HashtableClass?,Method[]();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional
svn commit: r763726 - in /tomcat/trunk/java/org/apache/catalina/ha/backend: HeartbeatListener.java MultiCastSender.java Proxy.java Sender.java TcpSender.java
Author: jfclere
Date: Thu Apr 9 16:32:04 2009
New Revision: 763726
URL: http://svn.apache.org/viewvc?rev=763726view=rev
Log:
Add the Tcp code... Still need the code in httpd-trunk to test it.
Added:
tomcat/trunk/java/org/apache/catalina/ha/backend/Proxy.java
tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
tomcat/trunk/java/org/apache/catalina/ha/backend/Sender.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java?rev=763726r1=763725r2=763726view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java Thu
Apr 9 16:32:04 2009
@@ -29,11 +29,6 @@
import org.apache.catalina.connector.Connector;
-import java.net.MulticastSocket;
-import java.net.InetAddress;
-import java.net.DatagramPacket;
-import java.io.UnsupportedEncodingException;
-
import org.apache.tomcat.util.modeler.Registry;
/*
@@ -66,6 +61,20 @@
public void setTtl(int ttl) { this.ttl = ttl; }
public int getTtl() { return ttl; }
+/**
+ * Proxy list, format address:port,address:port.
+ */
+protected String proxyList = null;
+public String getProxyList() { return proxyList; }
+public void setProxyList(String proxyList) { this.proxyList = proxyList; }
+
+/**
+ * URL prefix.
+ */
+protected String proxyURL = /HeartbeatListener;
+public String getProxyURL() { return proxyURL; }
+public void setProxyURL(String proxyURL) { this.proxyURL = proxyURL; }
+
private CollectedInfo coll = null;
private Sender sender = null;
@@ -77,8 +86,18 @@
Object source = event.getLifecycle();
if (Lifecycle.PERIODIC_EVENT.equals(event.getType())) {
if (sender == null) {
-sender = new MultiCastSender();
-sender.init(this);
+if (proxyList == null)
+sender = new MultiCastSender();
+else
+sender = new TcpSender();
+
+try {
+sender.init(this);
+} catch (Exception ex) {
+log.error(Unable to initialize Sender: + ex);
+sender = null;
+return;
+}
}
/* Read busy and ready */
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java?rev=763726r1=763725r2=763726view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java Thu
Apr 9 16:32:04 2009
@@ -40,7 +40,7 @@
MulticastSocket s = null;
InetAddress group = null;
-public void init(HeartbeatListener config) {
+public void init(HeartbeatListener config) throws Exception {
this.config = config;
}
Added: tomcat/trunk/java/org/apache/catalina/ha/backend/Proxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/Proxy.java?rev=763726view=auto
==
--- tomcat/trunk/java/org/apache/catalina/ha/backend/Proxy.java (added)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/Proxy.java Thu Apr 9
16:32:04 2009
@@ -0,0 +1,34 @@
+/*
+ * 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.catalina.ha.backend;
+
+import java.net.InetAddress;
+
+/*
+ * This class represents a front-end httpd server.
+ *
+ */
+public class Proxy {
+
+ protected enum State { OK, ERROR, DOWN };
+
+ public InetAddress address = null;
+ public int port = 80;
+ public
Re: svn commit: r763726 - in /tomcat/trunk/java/org/apache/catalina/ha/backend: HeartbeatListener.java MultiCastSender.java Proxy.java Sender.java TcpSender.java
It requires some new code in httpd-trunk to work... Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46597] Not all cookie changes in 6.0.x branch have been ported to 5.5.x
https://issues.apache.org/bugzilla/show_bug.cgi?id=46597 --- Comment #4 from David Lewis dle...@pfc.cfs.nrcan.gc.ca 2009-04-09 09:55:15 PST --- I look forward to this patch being integrated into the next Tomcat 5.5.x. Until our organization migrates to Java 6/Tomcat 6, we are stuck using Tomcat 5.5.25 due to cookie compatibility issues. -- 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: r763298 - in /tomcat/trunk/java/org/apache/catalina: core/StandardContext.java core/StandardHost.java tribes/membership/Membership.java util/InstanceSupport.java util/LifecycleSupport.
I'm generally against this find bugs 'may be bugs' issues.
is there an actual bug here?
Filip
ma...@apache.org wrote:
Author: markt
Date: Wed Apr 8 16:08:42 2009
New Revision: 763298
URL: http://svn.apache.org/viewvc?rev=763298view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46990
Various sync issues.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleSupport.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=763298r1=763297r2=763298view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Apr 8
16:08:42 2009
@@ -201,6 +201,8 @@
* application, in the order they were encountered in the web.xml file.
*/
private String applicationListeners[] = new String[0];
+
+private final Object applicationListenersLock = new Object();
/**
@@ -223,6 +225,8 @@
private ApplicationParameter applicationParameters[] =
new ApplicationParameter[0];
+private final Object applicationParametersLock = new Object();
+
/**
* The application available flag for this Context.
@@ -263,6 +267,8 @@
* The security constraints for this web application.
*/
private SecurityConstraint constraints[] = new SecurityConstraint[0];
+
+private final Object constraintsLock = new Object();
/**
@@ -364,6 +370,9 @@
* defined in the deployment descriptor.
*/
private FilterMap filterMaps[] = new FilterMap[0];
+
+private final Object filterMapsLock = new Object();
+
/**
* Filter mappings added via {...@link ServletContext} may have to be
inserted
@@ -388,6 +397,8 @@
*/
private String instanceListeners[] = new String[0];
+private final Object instanceListenersLock = new Object();
+
/**
* The login configuration descriptor for this web application.
@@ -508,6 +519,8 @@
*/
private String securityRoles[] = new String[0];
+private final Object securityRolesLock = new Object();
+
/**
* The servlet mappings for this web application, keyed by
@@ -515,6 +528,8 @@
*/
private HashMapString, String servletMappings =
new HashMapString, String();
+
+private final Object servletMappingsLock = new Object();
/**
@@ -559,12 +574,16 @@
*/
private String watchedResources[] = new String[0];
+private final Object watchedResourcesLock = new Object();
+
/**
* The welcome files for this application.
*/
private String welcomeFiles[] = new String[0];
+private final Object welcomeFilesLock = new Object();
+
/**
* The set of classnames of LifecycleListeners that will be added
@@ -572,6 +591,7 @@
*/
private String wrapperLifecycles[] = new String[0];
+private final Object wrapperLifecyclesLock = new Object();
/**
* The set of classnames of ContainerListeners that will be added
@@ -579,6 +599,7 @@
*/
private String wrapperListeners[] = new String[0];
+private final Object wrapperListenersLock = new Object();
/**
* The pathname to the work directory for this context (relative to
@@ -2021,7 +2042,7 @@
*/
public void addApplicationListener(String listener) {
-synchronized (applicationListeners) {
+synchronized (applicationListenersLock) {
String results[] =new String[applicationListeners.length + 1];
for (int i = 0; i applicationListeners.length; i++) {
if (listener.equals(applicationListeners[i])) {
@@ -2048,7 +2069,7 @@
*/
public void addApplicationParameter(ApplicationParameter parameter) {
-synchronized (applicationParameters) {
+synchronized (applicationParametersLock) {
String newName = parameter.getName();
for (int i = 0; i applicationParameters.length; i++) {
if (newName.equals(applicationParameters[i].getName())
@@ -2145,7 +2166,7 @@
}
// Add this constraint to the set for our web application
-synchronized (constraints) {
+synchronized (constraintsLock) {
SecurityConstraint results[] =
new SecurityConstraint[constraints.length + 1];
for (int i = 0; i constraints.length; i++)
@@ -2231,7 +2252,7 @@
validateFilterMap(filterMap);
// Add this filter
Re: svn commit: r763298 - in /tomcat/trunk/java/org/apache/catalina: core/StandardContext.java core/StandardHost.java tribes/membership/Membership.java util/InstanceSupport.java util/LifecycleSupport.
Filip Hanik - Dev Lists wrote: I'm generally against this find bugs 'may be bugs' issues. is there an actual bug here? It's generally making the code better. What do you object to about it? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r763726 - in /tomcat/trunk/java/org/apache/catalina/ha/backend: HeartbeatListener.java MultiCastSender.java Proxy.java Sender.java TcpSender.java
jean-frederic clere wrote: It requires some new code in httpd-trunk to work... sounds like you're reinventing the wheel in tomcat trunk to avoid code in httpd trunk :) I'm fine either way, I just wanted to notify you of work that probably already does everything you are trying to do, and some more. Cheers Jean-Frederic - 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
