svn commit: r794992 - in /tomcat: build/tc5.5.x/resources/ container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/ container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/ container/tc5
Author: kkolinko
Date: Fri Jul 17 07:29:30 2009
New Revision: 794992
URL: http://svn.apache.org/viewvc?rev=794992&view=rev
Log:
Correct references to Tomcat website, and also to some other ex-Jakarta projects
Modified:
tomcat/build/tc5.5.x/resources/tomcat.spec
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/package.html
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/package.html
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
tomcat/container/tc5.5.x/webapps/balancer/WEB-INF/classes/org/apache/webapp/balancer/overview.html
tomcat/container/tc5.5.x/webapps/balancer/WEB-INF/classes/org/apache/webapp/balancer/package.html
tomcat/container/tc5.5.x/webapps/docs/architecture/project.xml
tomcat/container/tc5.5.x/webapps/docs/catalina/docs/api/index.html
tomcat/container/tc5.5.x/webapps/docs/funcspecs/fs-admin-apps.xml
tomcat/container/tc5.5.x/webapps/docs/jasper/docs/api/index.html
tomcat/container/tc5.5.x/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/container/tc5.5.x/webapps/docs/jndi-resources-howto.xml
Modified: tomcat/build/tc5.5.x/resources/tomcat.spec
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/resources/tomcat.spec?rev=794992&r1=794991&r2=794992&view=diff
==
--- tomcat/build/tc5.5.x/resources/tomcat.spec (original)
+++ tomcat/build/tc5.5.x/resources/tomcat.spec Fri Jul 17 07:29:30 2009
@@ -24,7 +24,7 @@
Group: System Environment/Daemons
Copyright: Apache License
BuildArch: noarch
-URL: http://jakarta.apache.org/tomcat
+URL: http://tomcat.apache.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Provides: jakarta-tomcat tomcat tomcat5
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/package.html
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/package.html?rev=794992&r1=794991&r2=794992&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/package.html
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/package.html
Fri Jul 17 07:29:30 2009
@@ -20,8 +20,8 @@
Ant (version 1.6 or later) that can be used to interact with the
Remote JMX JSR 160 RMI Adaptor to get/set attributes, invoke MBean operations
and query for Mbeans inside a running instance of Tomcat. For more
information, see
-http://jakarta.apache.org/tomcat/tomcat-5.5-doc/monitoring.html";>
-http://jakarta.apache.org/tomcat/tomcat-5.5-doc/monitoring.html.
+http://tomcat.apache.org/tomcat-5.5-doc/monitoring.html";>
+http://tomcat.apache.org/tomcat-5.5-doc/monitoring.html.
Each task element can open a new jmx connection or reference an
existing one. The following attribute are exists in every tasks:
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/package.html
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/package.html?rev=794992&r1=794991&r2=794992&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/package.html
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/package.html
Fri Jul 17 07:29:30 2009
@@ -20,8 +20,8 @@
Ant (version 1.6.x or later) that can be used to interact with the
Manager application to deploy, undeploy, list, reload, start and stop web
applications
from a running instance of Tomcat. For more information, see
-http://jakarta.apache.org/tomcat/tomcat-5.5-doc/manager-howto.html";>
-http://jakarta.apache.org/tomcat/tomcat-5.5-doc/manager-howto.html.
+http://tomcat.apache.org/tomcat-5.5-doc/manager-howto.html";>
+http://tomcat.apache.org/tomcat-5.5-doc/manager-howto.html.
The attributes of each task element correspond
exactly to the request parameters that are included with an HTTP request
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java?rev=794992&r1=794991&r2=794992&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
Fri Jul 17 07:29:30 2009
@@ -123,7 +123,7 @@
* or an instance where the specification cited differs from Best
* Community Practice (BCP).
* Such instances should be well-documented here. Please email the
- * mailto:tomcat-...@jakarta.apache.org";>Jakarta To
svn commit: r794996 - /tomcat/build/tc5.5.x/tomcat.nsi
Author: kkolinko
Date: Fri Jul 17 08:11:55 2009
New Revision: 794996
URL: http://svn.apache.org/viewvc?rev=794996&view=rev
Log:
Enable description for SecWebapps installer section.
Fixes the following warning shown by MakeNSIS at build time:
warning: LangString "DESC_SecWebapps" is not set in language table of language
English
Modified:
tomcat/build/tc5.5.x/tomcat.nsi
Modified: tomcat/build/tc5.5.x/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/tomcat.nsi?rev=794996&r1=794995&r2=794996&view=diff
==
--- tomcat/build/tc5.5.x/tomcat.nsi (original)
+++ tomcat/build/tc5.5.x/tomcat.nsi Fri Jul 17 08:11:55 2009
@@ -102,8 +102,8 @@
LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group
for Tomcat."
LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation
bundle. This include documentation on the servlet container and its
configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors."
LangString DESC_SecExamples ${LANG_ENGLISH} "Installs some examples web
applications."
-LangString DESC_SecAdmin ${LANG_ENGLISH} "Installs the administration web
application.";
-;LangString DESC_SecWebapps ${LANG_ENGLISH} "Installs other utility web
applications (WebDAV, balancer, etc)."
+LangString DESC_SecAdmin ${LANG_ENGLISH} "Installs the administration web
application."
+LangString DESC_SecWebapps ${LANG_ENGLISH} "Installs other utility web
applications (WebDAV, balancer, etc)."
;LangString DESC_SecCompat ${LANG_ENGLISH} "Installs Java2 compatibility
package. This release of Apache Tomcat was packaged to run on J2SE 5.0 or
later. It can be run on earlier JVMs by installng this package."
;Language
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Remove Realm from GenericPrincipal
Konstantin Kolinko wrote: > 2009/7/17 Mark Thomas : >> As a result of looking into >> https://issues.apache.org/bugzilla/show_bug.cgi?id=40881, I discovered >> that the only use made of the Realm attribute of GenericPrincipal is to >> control whether or not a debug message is logged in RealmBase.hasRole() > > Looking at > http://svn.apache.org/viewvc?view=rev&revision=301601 > > That revision comment says about switch to commons-logging, but > besides just that the > "if (!(gp.getRealm() == this))" block was changed from returning false > to just logging a message. > I am not sure, that it was intentional. The commit message indicates that it was intentional. > Or there was really a bug with jaas, that this change fixed? I think it is safe to assume Costin wasn't making this up. > Is there a use case, besides replication, where a Principal is > processed in context of some other realm, some other realm instance, > different from the one that created it? Single Sign On uses a shared Principal >> Given that the Realm is the reason that GenericPrincipal is not >> Serializable, I'd like to propose the following changes for Tomcat 7. >> >> 1. Remove the Realm from GenericPrincipal >> 2. Make GenericPrincipal Serializable >> 3. Take advantage of this to simplify the Cluster code > > I think "3." includes removing the > o.a.c.cluster.session.SerializablePrincipal class Yep :) >> As a by product, this should also address bug 40881 by allowing any >> Realm that uses any Serializable Principal to work with clustering. >> > > I attached a patch to that issue, see comment #12: > https://issues.apache.org/bugzilla/show_bug.cgi?id=40881#c12 > It is to allow a serializable Principal to be written out and read in > during replication. > > Cannot test it, though, as I do not have relevant configuration now. I see where you are going with that. That could be a potential backport route for 6.0.x and 5.5.x but for 7.0.x I can't see a good reason to include the Realm in the Principal and several for getting rid of it. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tomcat 7 created for Bugzilla
Since we had a bug reported against trunk recently, I have just created a Tomcat 7 product in Bugzilla. It is heavily based on Tomcat 6 with a few minor tweaks to the components. Let me know if anything needs changing. I'll move that one TC7 bug to the new product in a sec. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795010 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Fri Jul 17 08:40:49 2009 New Revision: 795010 URL: http://svn.apache.org/viewvc?rev=795010&view=rev Log: Vote. 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=795010&r1=795009&r2=795010&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 08:40:49 2009 @@ -121,5 +121,7 @@ architecture. Ported from 6.0 (mainly from Mladen's rev.791699) http://people.apache.org/~kkolinko/patches/2009-07-17_tc55_native_install_791699.patch - +1: kkolinko + +1: kkolinko, rjung -1: + rjung: Please change all occurences of "i64" to "ia64". AFAIK ia64 is the official notation. + Please only commit for 5.5.28 if you find time to test before Filip tags later today. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47524] McastServiceImpl executor is not dispatching events.
https://issues.apache.org/bugzilla/show_bug.cgi?id=47524 Mark Thomas changed: What|Removed |Added Component|Cluster |Cluster Version|unspecified |trunk Product|Tomcat 6|Tomcat 7 Target Milestone|default |--- Summary|[TRUNK] McastServiceImpl|McastServiceImpl executor |executor is not dispatching |is not dispatching events. |events. | --- Comment #2 from Mark Thomas 2009-07-17 01:42:36 PST --- Move to Tomcat 7 product, now it has been created. -- 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: r795018 - in /tomcat: connectors/trunk/coyote/src/java/org/apache/coyote/ connectors/trunk/util/java/org/apache/tomcat/util/net/ container/tc5.5.x/catalina/src/share/org/apache/catalina/an
Author: kkolinko
Date: Fri Jul 17 08:50:45 2009
New Revision: 795018
URL: http://svn.apache.org/viewvc?rev=795018&view=rev
Log:
Fix JavaDoc warnings
Modified:
tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/OutputBuffer.java
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/JMXAdaptorLifecycleListener.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/Embedded.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/tcp/ReplicationValve.java
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JspUtil.java
Modified:
tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/OutputBuffer.java?rev=795018&r1=795017&r2=795018&view=diff
==
--- tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/OutputBuffer.java
(original)
+++ tomcat/connectors/trunk/coyote/src/java/org/apache/coyote/OutputBuffer.java
Fri Jul 17 08:50:45 2009
@@ -26,7 +26,7 @@
* Output buffer.
*
* This class is used internally by the protocol implementation. All writes
from higher level code should happen
- * via Resonse.doWrite().
+ * via Response.doWrite().
*
* @author Remy Maucherat
*/
@@ -37,7 +37,7 @@
*
* @param chunk data to write
* @param response used to allow buffers that can be shared by multiple
responses.
- * @return
+ * @return number of bytes written
* @throws IOException
*/
public int doWrite(ByteChunk chunk, Response response)
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=795018&r1=795017&r2=795018&view=diff
==
---
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Fri Jul 17 08:50:45 2009
@@ -1633,7 +1633,7 @@
/**
* Put the object into the queue.
*
- * @param object the object to be appended to the queue (first
element).
+ * @param worker the object to be appended to the queue (first
element).
*/
public void push(Worker worker) {
workers[end++] = worker;
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=795018&r1=795017&r2=795018&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
Fri Jul 17 08:50:45 2009
@@ -87,14 +87,14 @@
// - Properties
/**
- * @return Returns the classLoader.
+ * @return Returns the classLoader name.
*/
public String getClassLoader() {
return classLoader;
}
/**
- * @param classLoader The classLoader to set.
+ * @param classLoaderName The classLoader name to set.
*/
public void setClassLoader(String classLoaderName) {
this.classLoader = classLoaderName;
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java?rev=795018&r1=795017&r2=795018&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSign
Re: Tomcat 7 created for Bugzilla
Mark Thomas wrote: > Since we had a bug reported against trunk recently, I have just created > a Tomcat 7 product in Bugzilla. It is heavily based on Tomcat 6 with a > few minor tweaks to the components. > > Let me know if anything needs changing. > > I'll move that one TC7 bug to the new product in a sec. I've also removed TC4 from the weekly e-mails and added Tomcat 7, Tomcat Connectors and Tomcat Native. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r795010 - /tomcat/current/tc5.5.x/STATUS.txt
2009/7/17 : > Author: rjung > Date: Fri Jul 17 08:40:49 2009 > New Revision: 795010 > > URL: http://svn.apache.org/viewvc?rev=795010&view=rev > Log: > Vote. > > Modified: > tomcat/current/tc5.5.x/STATUS.txt > > Ported from 6.0 (mainly from Mladen's rev.791699) > > http://people.apache.org/~kkolinko/patches/2009-07-17_tc55_native_install_791699.patch > - +1: kkolinko > + +1: kkolinko, rjung > -1: > + rjung: Please change all occurences of "i64" to "ia64". AFAIK ia64 is the > official notation. Thank you for the vote. I do not plan changing the name. We already voted for these names when the patch was proposed for TC 6.0 (committed in rev.791699), and some discussion was before that. The only place where the name is important is this line in tomcat.nsi: + StrCmp $0 "IA64" 0 +3 It is also present as a subdirectory of /bin in the *.zip and *.tgz distributives. If we backport the second part of rev.791699 - the separate zips for different windows CPU architectures, there wouldn't be such subdirectories, but "i64" will be in the name of the archive. That name will be easier to fix. I plan to prepare the backport and propose it once this patch is applied. I think that will be in 4 hours. We better come to some decision before that. I understand, that we have 9 hours left before the "12 pm MST" deadline that Filip stated. > + Please only commit for 5.5.28 if you find time to test before Filip > tags later today. I already tested it on my 32-bit WinXP system, and it builds, installs and runs OK. I plan to also test it on Vista 64-bit (x86-64), but I have yet to reach that place. I do not have an IA64 system. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r795010 - /tomcat/current/tc5.5.x/STATUS.txt
Hi Konstantin, On 17.07.2009 12:01, Konstantin Kolinko wrote: > 2009/7/17 : >> Modified: >>tomcat/current/tc5.5.x/STATUS.txt >> >> Ported from 6.0 (mainly from Mladen's rev.791699) >> >> http://people.apache.org/~kkolinko/patches/2009-07-17_tc55_native_install_791699.patch >> - +1: kkolinko >> + +1: kkolinko, rjung >> -1: >> + rjung: Please change all occurences of "i64" to "ia64". AFAIK ia64 is the >> official notation. > > Thank you for the vote. > > I do not plan changing the name. We already voted for these names when > the patch was proposed for TC 6.0 (committed in rev.791699), and some > discussion was before that. Sorry, I missed that and I actually voted +1 on that revision, so I'll shut up and live with i64. Pretty sure sometime in the future I will have forgotten the discussion and stumble again over the unusual choice of name and might ask about it again. > The only place where the name is important is this line in tomcat.nsi: > + StrCmp $0 "IA64" 0 +3 Sure. It was more of an issue for us working with the directories and file names etc. giving them reasonable names in den land. > It is also present as a subdirectory of /bin in the *.zip and *.tgz > distributives. Yes, and that's why I was putting focus on the testing topic. I saw, that the tomcat6.exe file was put in a new dir and wanted to make sure, it's use is adjusted accordingly. Now I see, that the nsi changes cope with that. All fine, sorrry for the noise. > If we backport the second part of rev.791699 - the separate zips for > different windows CPU architectures, there wouldn't be such > subdirectories, but "i64" will be in the name of the archive. That > name will be easier to fix. I plan to prepare the backport and > propose it once this patch is applied. I think that will be in 4 > hours. We better come to some decision before that. In this case, name to be seen by users, I have some strong feelings for ia64 instead of i64. I thought that's the standard used for the Itanium architecture. Is there any official or pseudo-official of i64 in the wild? Short googling didn't reveal anything useful on i64 and Itanium. > I understand, that we have 9 hours left before the "12 pm MST" > deadline that Filip stated. > I already tested it on my 32-bit WinXP system, and it builds, installs > and runs OK. > > I plan to also test it on Vista 64-bit (x86-64), but I have yet to > reach that place. > > I do not have an IA64 system. Yeah, maybe Mladen can jump in, but I think Itanium support for TC 6 is not that critical, so we can go a slightly higher risk of breaking things. Thanks a lot for your explanation, and sorry that I didn't first read the original patch. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795031 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Fri Jul 17 10:24:44 2009 New Revision: 795031 URL: http://svn.apache.org/viewvc?rev=795031&view=rev Log: Remove comment clarified by Konstantin. 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=795031&r1=795030&r2=795031&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 10:24:44 2009 @@ -123,5 +123,3 @@ http://people.apache.org/~kkolinko/patches/2009-07-17_tc55_native_install_791699.patch +1: kkolinko, rjung -1: - rjung: Please change all occurences of "i64" to "ia64". AFAIK ia64 is the official notation. - Please only commit for 5.5.28 if you find time to test before Filip tags later today. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r795010 - /tomcat/current/tc5.5.x/STATUS.txt
All references to TC 6 in my reply should have been to TC 5.5. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795032 - in /tomcat/container/tc5.5.x: catalina/src/bin/catalina.bat catalina/src/bin/catalina.sh catalina/src/bin/setclasspath.bat catalina/src/bin/setclasspath.sh webapps/docs/changelog
Author: markt Date: Fri Jul 17 10:41:20 2009 New Revision: 795032 URL: http://svn.apache.org/viewvc?rev=795032&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39194 Make classpath setting consistent across scripts Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.sh tomcat/container/tc5.5.x/webapps/docs/changelog.xml Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat?rev=795032&r1=795031&r2=795032&view=diff == --- tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat (original) +++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat Fri Jul 17 10:41:20 2009 @@ -63,6 +63,10 @@ goto end :okHome +rem Ensure that any user defined CLASSPATH variables are not used on startup, +rem but allow them to be specified in setenv.bat, in rare case when it is needed. +set CLASSPATH= + rem Get standard environment variables if "%CATALINA_BASE%" == "" goto gotSetenvHome if exist "%CATALINA_BASE%\bin\setenv.bat" call "%CATALINA_BASE%\bin\setenv.bat" @@ -81,8 +85,13 @@ call "%CATALINA_HOME%\bin\setclasspath.bat" %1 if errorlevel 1 goto end -rem Add on extra jar files to CLASSPATH -set CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\bootstrap.jar +rem Add on extra jar file to CLASSPATH +rem Note that there are no quotes as we do not want to introduce random +rem quotes into the CLASSPATH +if "%CLASSPATH%" == "" goto emptyClasspath +set CLASSPATH=%CLASSPATH%; +:emptyClasspath +set CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar if not "%CATALINA_BASE%" == "" goto gotBase set CATALINA_BASE=%CATALINA_HOME% Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?rev=795032&r1=795031&r2=795032&view=diff == --- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original) +++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Fri Jul 17 10:41:20 2009 @@ -18,7 +18,7 @@ # $CATALINA_BASE/temp. # # JAVA_HOME Must point at your Java Development Kit installation. -# Required to run the with the "debug" or "javac" argument. +# Required to run the with the "debug" argument. # # JRE_HOMEMust point at your Java Development Kit installation. # Defaults to JAVA_HOME if empty. @@ -79,6 +79,10 @@ # Only set CATALINA_HOME if not already set [ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd` +# Ensure that any user defined CLASSPATH variables are not used on startup, +# but allow them to be specified in setenv.sh, in rare case when it is needed. +CLASSPATH= + if [ -r "$CATALINA_BASE"/bin/setenv.sh ]; then . "$CATALINA_BASE"/bin/setenv.sh elif [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then @@ -126,7 +130,10 @@ fi # Add on extra jar files to CLASSPATH -CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar +if [ ! -z "$CLASSPATH" ] ; then + CLASSPATH="$CLASSPATH": +fi +CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar if [ -z "$CATALINA_BASE" ] ; then CATALINA_BASE="$CATALINA_HOME" @@ -170,7 +177,7 @@ echo "Using CATALINA_BASE: $CATALINA_BASE" echo "Using CATALINA_HOME: $CATALINA_HOME" echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR" - if [ "$1" = "debug" -o "$1" = "javac" ] ; then + if [ "$1" = "debug" ] ; then echo "Using JAVA_HOME: $JAVA_HOME" else echo "Using JRE_HOME:$JRE_HOME" Modified: tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat?rev=795032&r1=795031&r2=795032&view=diff == --- tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat (original) +++ tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat Fri Jul 17 10:41:20 2009 @@ -48,18 +48,11 @@ rem Set the default -Djava.endorsed.dirs argument set JAVA_ENDORSED_DIRS=%BASEDIR%\common\endorsed -rem Set standard CLASSPATH -rem Note that there are no quotes as we do not want to introduce random -rem quotes into the CLASSPATH -set CLASSPATH=%JAVA_HOME%\lib\tools.jar - rem Set standard command for invoking Java. rem Note that NT requires a window name argument when using start. rem Also note the quoting as JAVA_HOME may contain spaces. set _RUNJAVA="%JRE_HOME%\bin\java" -set _RUNJAVAW="%JRE_HOME%\bin\javaw" set _RUNJDB="%JAVA_HOME%\bin\jdb" -set _RUNJAVAC="%JAVA_HOME%\bin\javac" goto end Modified: tomcat/container/tc5.5.x/c
svn commit: r795036 - in /tomcat/container/tc5.5.x/catalina/src/bin: tool-wrapper.bat tool-wrapper.sh
Author: markt Date: Fri Jul 17 10:47:46 2009 New Revision: 795036 URL: http://svn.apache.org/viewvc?rev=795036&view=rev Log: Opps. Missed these in fix for 39194. Modified: tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.bat tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh Modified: tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.bat URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.bat?rev=795036&r1=795035&r2=795036&view=diff == --- tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.bat (original) +++ tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.bat Fri Jul 17 10:47:46 2009 @@ -30,6 +30,10 @@ goto end :okHome +rem Ensure that any user defined CLASSPATH variables are not used on startup, +rem but allow them to be specified in setenv.bat, in rare case when it is needed. +set CLASSPATH= + rem Get standard environment variables if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat" @@ -43,7 +47,14 @@ call "%CATALINA_HOME%\bin\setclasspath.bat" rem Add on extra jar files to CLASSPATH -set CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\bootstrap.jar;"%BASEDIR%"\common\lib\jmx.jar;"%BASEDIR%"\common\lib\servlet-api.jar +rem Note that there are no quotes as we do not want to introduce random +rem quotes into the CLASSPATH +if "%CLASSPATH%" == "" goto noclasspath +set CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\bootstrap.jar;%BASEDIR%\lib\servlet-api.jar +goto okclasspath +:noclasspath +set CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar;%BASEDIR%\lib\servlet-api.jar +:okclasspath rem Get remaining unshifted command line arguments and save them in the set CMD_LINE_ARGS= Modified: tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh?rev=795036&r1=795035&r2=795036&view=diff == --- tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh (original) +++ tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh Fri Jul 17 10:47:46 2009 @@ -36,6 +36,10 @@ fi done +# Ensure that any user defined CLASSPATH variables are not used on startup, +# but allow them to be specified in setenv.sh, in rare case when it is needed. +CLASSPATH= + # Get standard environment variables PRGDIR=`dirname "$PRG"` CATALINA_HOME=`cd "$PRGDIR/.." ; pwd` - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795037 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt bin/catalina.bat bin/catalina.sh bin/setclasspath.bat bin/setclasspath.sh bin/tool-wrapper.bat bin/tool-wrapper.sh webapps/docs/changelog.
Author: markt Date: Fri Jul 17 10:52:16 2009 New Revision: 795037 URL: http://svn.apache.org/viewvc?rev=795037&view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=39194 Make classpath config consistent Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/bin/catalina.bat tomcat/tc6.0.x/trunk/bin/catalina.sh tomcat/tc6.0.x/trunk/bin/setclasspath.bat tomcat/tc6.0.x/trunk/bin/setclasspath.sh tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 17 10:52:16 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,791789,792740,793882 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=795037&r1=795036&r2=795037&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 17 10:52:16 2009 @@ -126,18 +126,6 @@ +1: markt, kkolinko -1: -* Script improvement - alternative patch - http://svn.apache.org/viewvc?rev=793372&view=rev (align platforms / bug 39194) - +1: markt, rjung, kkolinko - -1: - kkolinko: It needs rev.793757 that I am proposing below. Otherwise the -user isn't able to set CLASSPATH in setenv script. - -* Script improvement - additional patch - http://svn.apache.org/viewvc?rev=793757&view=rev - +1: kkolinko, markt, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47478 https://svn.apache.org/viewcvs.cgi?view=rev&rev=791524 +1: fhanik, rjung, markt Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=795037&r1=795036&r2=795037&view=diff == --- tomcat/tc6.0.x/trunk/bin/catalina.bat (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.bat Fri Jul 17 10:52:16 2009 @@ -88,6 +88,10 @@ goto end :okHome +rem Ensure that any user defined CLASSPATH variables are not used on startup, +rem but allow them to be specified in setenv.bat, in rare case when it is needed. +set CLASSPATH= + rem Get standard environmen
DO NOT REPLY [Bug 39194] classpath inconsistent between Windows and Unix for tools.jar
https://issues.apache.org/bugzilla/show_bug.cgi?id=39194 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas 2009-07-17 03:53:47 PST --- This has been fixed in 6.0.x and 5.5.x and will be in 6.0.21 and 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
svn commit: r795038 - in /tomcat: connectors/trunk/jk/java/org/apache/ajp/ connectors/trunk/jk/java/org/apache/coyote/ajp/ connectors/trunk/jk/java/org/apache/jk/core/ container/tc5.5.x/webapps/docs/
Author: markt
Date: Fri Jul 17 10:58:30 2009
New Revision: 795038
URL: http://svn.apache.org/viewvc?rev=795038&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39637
AJP connectors do not handle certificate chains
Patch by Patrik Schnellmann
Modified:
tomcat/connectors/trunk/jk/java/org/apache/ajp/RequestHandler.java
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/connectors/trunk/jk/java/org/apache/ajp/RequestHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/ajp/RequestHandler.java?rev=795038&r1=795037&r2=795038&view=diff
==
--- tomcat/connectors/trunk/jk/java/org/apache/ajp/RequestHandler.java
(original)
+++ tomcat/connectors/trunk/jk/java/org/apache/ajp/RequestHandler.java Fri Jul
17 10:58:30 2009
@@ -351,21 +351,33 @@
break;
case SC_A_SSL_CERT :
- isSSL = true;
+isSSL = true;
// Transform the string into certificate.
String certString = msg.getString();
byte[] certData = certString.getBytes();
ByteArrayInputStream bais = new ByteArrayInputStream(certData);
-// Fill the first element.
+// Fill all elements.
X509Certificate jsseCerts[] = null;
try {
CertificateFactory cf =
CertificateFactory.getInstance("X.509");
-X509Certificate cert = (X509Certificate)
-cf.generateCertificate(bais);
-jsseCerts = new X509Certificate[1];
-jsseCerts[0] = cert;
+int i = 0;
+while (bais.available() > 0) {
+X509Certificate cert = (X509Certificate)
+cf.generateCertificate(bais);
+if (jsseCerts == null) {
+jsseCerts = new X509Certificate[1];
+} else {
+X509Certificate tmpJsseCerts[] =
+new X509Certificate[jsseCerts.length + 1];
+System.arraycopy(jsseCerts, 0,
+ tmpJsseCerts, 0,
+ jsseCerts.length);
+jsseCerts = tmpJsseCerts;
+}
+jsseCerts[i++] = cert;
+}
} catch(java.security.cert.CertificateException e) {
log("Certificate convertion failed" + e );
}
Modified:
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=795038&r1=795037&r2=795038&view=diff
==
--- tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Fri Jul 17 10:58:30 2009
@@ -568,19 +568,28 @@
new ByteArrayInputStream(certData.getBytes(),
certData.getStart(),
certData.getLength());
-// Fill the first element.
+// Fill the elements.
try {
CertificateFactory cf =
CertificateFactory.getInstance("X.509");
-X509Certificate cert = (X509Certificate)
-cf.generateCertificate(bais);
-jsseCerts = new X509Certificate[1];
-jsseCerts[0] = cert;
-request.setAttribute(AprEndpoint.CERTIFICATE_KEY,
jsseCerts);
+while(bais.available() > 0) {
+X509Certificate cert = (X509Certificate)
+cf.generateCertificate(bais);
+if(jsseCerts == null) {
+jsseCerts = new X509Certificate[1];
+jsseCerts[0] = cert;
+} else {
+X509Certificate [] temp = new
X509Certificate[jsseCerts.length+1];
+
System.arraycopy(jsseCerts,0,temp,0,jsseCerts.length);
+temp[jsseCerts.length] = cert;
+jsseCerts = temp;
+}
+}
} catch (java.security.cert.CertificateException e) {
log.error(sm.getString("ajpprocessor.certs.fail"), e
DO NOT REPLY [Bug 39637] AJP13 connector does not handle chain of SSL client certificate
https://issues.apache.org/bugzilla/show_bug.cgi?id=39637 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #13 from Mark Thomas 2009-07-17 03:58:45 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
svn commit: r795039 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/apr.xml webapps/docs/changelog.xml
Author: markt
Date: Fri Jul 17 11:02:40 2009
New Revision: 795039
URL: http://svn.apache.org/viewvc?rev=795039&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39997
Port of http://svn.apache.org/viewvc?view=rev&revision=637867
Add SSLRandomSeed option to APR to enable faster starts on development systems
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
tomcat/container/tc5.5.x/webapps/docs/apr.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java?rev=795039&r1=795038&r2=795039&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
Fri Jul 17 11:02:40 2009
@@ -47,6 +47,7 @@
protected StringManager sm =
StringManager.getManager(Constants.Package);
+protected static String SSLRandomSeed = "builtin";
// -- Constants
@@ -80,6 +81,13 @@
Class clazz = Class.forName("org.apache.tomcat.jni.Library");
Method method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
+
+methodName = "randSet";
+paramValues[0] = SSLRandomSeed;
+clazz = Class.forName("org.apache.tomcat.jni.SSL");
+method = clazz.getMethod(methodName, paramTypes);
+method.invoke(null, paramValues);
+
major = clazz.getField("TCN_MAJOR_VERSION").getInt(null);
minor = clazz.getField("TCN_MINOR_VERSION").getInt(null);
patch = clazz.getField("TCN_PATCH_VERSION").getInt(null);
@@ -131,5 +139,11 @@
}
+public String getSSLRandomSeed() {
+return SSLRandomSeed;
+}
+public void setSSLRandomSeed(String SSLRandomSeed) {
+AprLifecycleListener.SSLRandomSeed = SSLRandomSeed;
+}
}
Modified: tomcat/container/tc5.5.x/webapps/docs/apr.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/apr.xml?rev=795039&r1=795038&r2=795039&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/apr.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/apr.xml Fri Jul 17 11:02:40 2009
@@ -103,11 +103,39 @@
+
+
+
+The APR library is configured by the AprLifecycleListener.
This
+listener is configured as a global listener under the Server
+element in server.xml. If the listener can't find the
APR/native
+library when it started, the library path it searched will be displayed.
+
+
+The following attributes are supported by the
+AprLifecycleListener:
+
+
+
+
+This must be
+org.apache.catalina.core.AprLifecycleListener
+
+
+Sets the source of entropy. Production system needs a reliable
source
+of entropy but entropy may need a lot of time to be collected therefore
+test systems could use non-blocking entropy sources like
+/dev/urandom that will allow quicker starts of Tomcat. The
+default value is builtin.
+
+
+
+
-Once the libraries are properly installed and available to Java (if
loading fails, the library path
-will be displayed), the Tomcat connectors will automatically use APR.
Configuration of the connectors
+Once the libraries are properly installed and available to Java, the Tomcat
+connectors will automatically use APR. Configuration of the connectors
is similar to the regular connectors, but have a few extra attributes
which are used to configure
APR components. Note that the defaults should be well tuned for most use
cases, and additional
tweaking shouldn't be required.
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=795039&r1=795038&r2=795039&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Jul 17 11:02:40 2009
@@ -121,6 +121,11 @@
even if a role was found. (rjung)
+39997: Add the SSLRandomSeed option to the
+AprLifecycleListener to enable faster starts on development systems.
+(markt)
+
+
41407: JAAS Realm now works wit
DO NOT REPLY [Bug 39997] JSVC and APR do not work together for HTTPS connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=39997 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2009-07-17 04:03:00 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
svn commit: r795040 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/session/StandardSession.java webapps/docs/changelog.xml
Author: markt Date: Fri Jul 17 11:08:38 2009 New Revision: 795040 URL: http://svn.apache.org/viewvc?rev=795040&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40380 Correct synchronisation of expire(). Method should only run once. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 17 11:08:38 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=795040&r1=795039&r2=795040&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 17 11:08:38 2009 @@ -144,12 +144,6 @@ +1: fhanik -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40380 - Correct synchronisation of expire(). Method should only run once. - http://svn.apache.org/viewvc?rev=793981&view=rev - +1: markt, kkolinko, rjung - -1: - * Improve JNDI debug logging for lookups http://svn.apache.org/viewvc?rev=794082&view=rev +1: markt, kkolinko, rjung Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java?rev=795040&r1=795039&r2=795040&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java Fri Jul 17 11:08:38 2009 @@ -161,7 +161,7 @@ * certain IllegalStateException tests. NOTE: This value is not * included in the serialized version of this object. */ -protected transient boolean expiring = false; +protected transient volatile boolean expiring = false; /** @@ -218,7 +218,7 @@ /** * Flag indicating whether this session is valid or not. */ -protected boolean isValid = false; +protected volatile boolean isValid
svn commit: r795041 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/session/StandardSession.java webapps/docs/changelog.xml
Author: markt
Date: Fri Jul 17 11:16:05 2009
New Revision: 795041
URL: http://svn.apache.org/viewvc?rev=795041&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40380
Correct synchronisation of expire(). Method should only run once.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java?rev=795041&r1=795040&r2=795041&view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java
Fri Jul 17 11:16:05 2009
@@ -167,7 +167,7 @@
* certain IllegalStateException tests. NOTE: This value is not
* included in the serialized version of this object.
*/
-protected transient boolean expiring = false;
+protected transient volatile boolean expiring = false;
/**
@@ -224,7 +224,7 @@
/**
* Flag indicating whether this session is valid or not.
*/
-protected boolean isValid = false;
+protected volatile boolean isValid = false;
/**
@@ -666,15 +666,20 @@
*/
public void expire(boolean notify) {
-// Mark this session as "being expired" if needed
-if (expiring)
+// Check to see if expire is in progress or has previously been called
+if (expiring || !isValid)
return;
synchronized (this) {
+// Check again, now we are inside the sync so this code only runs
once
+// Double check locking - expiring and isValid need to be volatile
+if (expiring || !isValid)
+return;
if (manager == null)
return;
+// Mark this session as "being expired"
expiring = true;
// Notify interested application event listeners
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=795041&r1=795040&r2=795041&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Jul 17 11:16:05 2009
@@ -126,6 +126,10 @@
(markt)
+40380: Fix potential synchronization issue in
+StandardSession.expire(). (markt)
+
+
41407: JAAS Realm now works with CLIENT-CERT authentication.
(markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 40380] Potential syncro problem in StandardSession.expire(boolean)
https://issues.apache.org/bugzilla/show_bug.cgi?id=40380 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2009-07-17 04:16:21 PST --- This has been fixed in 6.0.x and 5.5.x and will be included in 6.0.21 and 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
svn commit: r795043 - /tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
Author: markt
Date: Fri Jul 17 11:21:32 2009
New Revision: 795043
URL: http://svn.apache.org/viewvc?rev=795043&view=rev
Log:
Make info message less harsh
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=795043&r1=795042&r2=795043&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
Fri Jul 17 11:21:32 2009
@@ -79,7 +79,7 @@
jvmRoute.lostSession=Lost Session [{0}] at path [{1}]
jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
jvmRoute.newSessionCookie=Setting cookie with session id [{0}] name: [{1}]
path: [{2}] secure: [{3}]
-jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is
not being used. You must use a PersistentManager for fail-over
+jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is
not being used. Fail over will still work, providing a PersistentManager is
used.
jvmRoute.notFoundManager=Not found Cluster DeltaManager {0} at {1}
jvmRoute.receiveMessage.sessionIDChanged=Cluster
JvmRouteSessionIDBinderListener received orginal session ID [{0}] set to new id
[{1}] for context path [{2}]
jvmRoute.run.already=jvmRoute SessionID receiver run already
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795047 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/ha/session/JvmRouteBinderValve.java java/org/apache/catalina/ha/session/LocalStrings.properties webapps/docs/chan
Author: markt Date: Fri Jul 17 11:25:39 2009 New Revision: 795047 URL: http://svn.apache.org/viewvc?rev=795047&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40551 Enable the JvmRouteBinderValve to work with PersistentManagers as well as clusters Based on a patch by Chris Chandler Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 17 11:25:39 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77 7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794822,795043 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=795047&r1=795046&r2=795047&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 17 11:25:39 2009 @@ -169,11 +169,3 @@ https://issues.apache.org/bugzilla/attachment.cgi?id=23973 +1: fhanik, kkolinko, markt -1: - -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40551 - Enable the JvmRouteBinderValve to work with PersistentManagers as well as - clusters - http://svn.apache.org/viewvc?rev=794822&view=rev - +1: markt, rjung - +1: kkolinko (see my comment in STATUS file of TC 5.5) - -1: Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=795047&r1=795046&r2=795047&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Fri Jul 17 11:25:39 2009 @@ -39,6 +39,7 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.session.ManagerBase; +import org.apache.catalina.session.PersistentManager; import org.apache.catalin
svn commit: r795052 - in /tomcat/container/tc5.5.x: modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java modules/ha/src/share/org/apache/catalina/ha/session/LocalStrings.proper
Author: markt
Date: Fri Jul 17 11:38:11 2009
New Revision: 795052
URL: http://svn.apache.org/viewvc?rev=795052&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40551
Enable the JvmRouteBinderValve to work with PersistentManagers as well as
clusters
Patch by Chris Chandler
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=795052&r1=795051&r2=795052&view=diff
==
---
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Fri Jul 17 11:38:11 2009
@@ -38,6 +38,7 @@
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.session.ManagerBase;
+import org.apache.catalina.session.PersistentManager;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.valves.ValveBase;
@@ -195,14 +196,18 @@
ServletException {
if (getEnabled()
- && getCluster() != null
&& request.getContext() != null
&& request.getContext().getDistributable() ) {
// valve cluster can access manager - other cluster handle
turnover
// at host level - hopefully!
Manager manager = request.getContext().getManager();
- if (manager != null && manager instanceof ClusterManager
- &&
getCluster().getManager(((ClusterManager)manager).getName()) != null)
+
+ if (manager != null && (
+ (manager instanceof ClusterManager
+ && getCluster() != null
+ &&
getCluster().getManager(((ClusterManager)manager).getName()) != null)
+ ||
+ (manager instanceof PersistentManager)))
handlePossibleTurnover(request, response);
}
// Pass this request on to the next valve in our pipeline
@@ -357,9 +362,13 @@
}
request.setAttribute(sessionIdAttribute, sessionId);
}
-// now sending the change to all other clusternode!
-ClusterManager manager = (ClusterManager)catalinaSession.getManager();
-sendSessionIDClusterBackup(manager,request,sessionId, newSessionID);
+
+if (getCluster() != null) {
+// now sending the change to all other clusternode!
+ClusterManager manager =
(ClusterManager)catalinaSession.getManager();
+sendSessionIDClusterBackup(manager,request,sessionId,
newSessionID);
+}
+
lifecycle
.fireLifecycleEvent("After session migration",
catalinaSession);
if (log.isDebugEnabled()) {
@@ -507,13 +516,12 @@
}
}
}
-if (cluster == null) {
-throw new RuntimeException("No clustering support at container "
-+ container.getName());
-}
-if (log.isInfoEnabled())
+if (log.isInfoEnabled()) {
log.info(sm.getString("jvmRoute.valve.started"));
+if (cluster == null)
+log.info(sm.getString("jvmRoute.noCluster"));
+}
}
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/LocalStrings.properties?rev=795052&r1=795051&r2=795052&view=diff
==
---
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/LocalStrings.properties
(original)
+++
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/LocalStrings.properties
Fri Jul 17 11:38:11 2009
@@ -79,6 +79,7 @@
jvmRoute.lostSession=Lost Session [{0}] at path [{1}]
jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
jvmRoute.newSessionCookie=Setting cookie with session id [{0}] name: [{1}]
path: [{2}] secure: [{3}]
+jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is
not being used. Fail over will still work, providing a PersistentManager is
used.
jvmRoute.notFoundManager=Not found Cluster DeltaManager {0} at {1}
jvmRoute.receive
DO NOT REPLY [Bug 40551] Sticky sessions using PersistentManager enter indeterminate state on node failover
https://issues.apache.org/bugzilla/show_bug.cgi?id=40551 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #10 from Mark Thomas 2009-07-17 04:38:35 PST --- This has been applied to 6.0.x and 5.5.x and will be included in 6.0.21 and 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
svn commit: r795053 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Fri Jul 17 11:39:05 2009 New Revision: 795053 URL: http://svn.apache.org/viewvc?rev=795053&view=rev Log: Remove the applied patches 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=795053&r1=795052&r2=795053&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 11:39:05 2009 @@ -33,18 +33,6 @@ 0: fhanik - big step for an old branch, could be risky, I'd wait until after next release if we consider it -1: -* Script improvement - alternative patch - http://svn.apache.org/viewvc?rev=793372&view=rev (align platforms / bug 39194) - +1: markt, kkolinko, rjung - -1: - kkolinko: It needs rev.793757 that I am proposing below. Otherwise the -user isn't able to set CLASSPATH in setenv script. - -* Script improvement - additional patch - http://svn.apache.org/viewvc?rev=793757&view=rev - +1: kkolinko, markt, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39231 http://svn.apache.org/viewvc?rev=791900&view=rev http://svn.apache.org/viewvc?rev=792446&view=rev (Filip's suggestion) @@ -52,17 +40,6 @@ +1: markt, fhanik -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39637 - AJP connectors do not handle certificate chains - Patch by Patrik Schnellmann - https://issues.apache.org/bugzilla/attachment.cgi?id=23952 - +1: markt, kkolinko, rjung - -1: - kkolinko: in the lines of RequestHandler.java that are seen in the patch, -but are not changed by it there is a bug: "certString.getBytes()" - it -uses Platform default encoding. Though it should not be of much value -for base64 encoded data that these certificates are. - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39844 Port r588477 (fix for #43668) by billbarker that corrected this for Tomcat 6 http://people.apache.org/~markt/patches/2009-07-11-bug39844.patch @@ -82,19 +59,7 @@ Do we need to update REQUIRED_PATCH, RECOMMENDED_PV in AprLifecycleListener? [1] http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?r1=697046&r2=697045&pathrev=697046 - -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39997 - Port of http://svn.apache.org/viewvc?view=rev&revision=637867 - Add SSLRandomSeed option to APR to enable faster starts on development systems - https://issues.apache.org/bugzilla/attachment.cgi?id=23962 - +1: markt, kkolinko, rjung - -1: - -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40380 - Correct synchronisation of expire(). Method should only run once. - http://svn.apache.org/viewvc?rev=793981&view=rev - +1: markt, kkolinko, rjung - -1: + markt: We should update recommended. * Minor cleanups for AccessLogValve classes Reuses StringBuffer, uses char instead of single-char String, etc. @@ -103,19 +68,6 @@ +1: kkolinko -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40551 - Enable the JvmRouteBinderValve to work with PersistentManagers as well as - clusters - http://svn.apache.org/viewvc?rev=794822&view=rev - +1: markt, rjung - +1: kkolinko: I like the patch, but I do not like the jvmRoute.noCluster -message text. It is informational, but that "You must use.." sounds -like a warning. Maybe rephrase it to something more delicate, e.g.: - The JvmRouterBinderValve is configured, but clustering is not being used. In this case you have to use a PersistentManager for fail-over. -As a side note: the class Javadoc comment for JvmRouteBinderValve is -hard to read because of grammatical errors... - -1: - * Bundle native dlls with exe installer, instead of downloading some old (1.1.4) native version from Heanet, and install DLL according with CPU architecture. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r795010 - /tomcat/current/tc5.5.x/STATUS.txt
2009/7/17 Rainer Jung : > On 17.07.2009 12:01, Konstantin Kolinko wrote: >> If we backport the second part of rev.791699 - the separate zips for >> different windows CPU architectures, there wouldn't be such >> subdirectories, but "i64" will be in the name of the archive. That >> name will be easier to fix. I plan to prepare the backport and >> propose it once this patch is applied. I think that will be in 4 >> hours. We better come to some decision before that. > > In this case, name to be seen by users, I have some strong feelings for > ia64 instead of i64. I thought that's the standard used for the Itanium > architecture. Is there any official or pseudo-official of i64 in the > wild? Short googling didn't reveal anything useful on i64 and Itanium. > Searching for "i64" itanium -OpenVMS in english-language pages there are some references I like "i64" because "i" can be read as "Itanium", but I tend to read "IA" as "Intel Architecture", which becomes misleading. Just my personal preference. I can be wrong with it. >> I already tested it on my 32-bit WinXP system, and it builds, installs >> and runs OK. >> >> I plan to also test it on Vista 64-bit (x86-64), but I have yet to >> reach that place. >> Tested on Vista 64-bit. Installs and runs OK. I was not able to change service startup type from Automatic to Manual using the tomcat5w panel, but I think we have already heard about such a problem. >> >> I do not have an IA64 system. > > Yeah, maybe Mladen can jump in, but I think Itanium support for TC 6 is > not that critical, so we can go a slightly higher risk of breaking things. > > Thanks a lot for your explanation, and sorry that I didn't first read > the original patch. OK. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r795010 - /tomcat/current/tc5.5.x/STATUS.txt
On 17/07/09 15:27, Konstantin Kolinko wrote: 2009/7/17 Rainer Jung: In this case, name to be seen by users, I have some strong feelings for ia64 instead of i64. I thought that's the standard used for the Itanium architecture. Is there any official or pseudo-official of i64 in the wild? Short googling didn't reveal anything useful on i64 and Itanium. I like "i64" because "i" can be read as "Itanium", but I tend to read "IA" as "Intel Architecture", which becomes misleading. Just my personal preference. I can be wrong with it. The 'i64' naming is my fault :) The reason is unification for x86, x64 and i64 (one letter and two numbers) Since there is no standard that would define the naming I've choose that one over things that might be familiar to unix/linux user, but means nothing to windows users (Eg. x86_64 is common on linux, but linux only). Other platforms choose their own namings (I simply adore the Solaris i86pc ;) Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795143 - in /tomcat/trunk/java/org/apache/catalina/startup: LocalStrings.properties TldConfig.java
Author: markt
Date: Fri Jul 17 16:57:30 2009
New Revision: 795143
URL: http://svn.apache.org/viewvc?rev=795143&view=rev
Log:
Part 1 of a series of commits to align the Catalina and Jasper TLD scanning
code and to provide additional features when embedding. This first commit
modifies the Catalina code to:
- better match the spec
- improve logging
The JSP TCK passes with this patch applied
Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=795143&r1=795142&r2=795143&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Fri
Jul 17 16:57:30 2009
@@ -90,8 +90,19 @@
hostConfig.undeploy=Undeploying context [{0}]
hostConfig.undeploy.error=Error undeploying web application at context path {0}
hostConfig.undeploying=Undeploying deployed web applications
+tdlConfig.addListeners=Adding {0} listeners from TLD files
tldConfig.cce=Lifecycle event data object {0} is not a Context
tldConfig.execute=Error processing TLD files for context path {0}
+tldConfig.jarStart=Scanning JAR ''{0}'' for TLDs
+tldConfig.processingTld=Processing TLD found at ''{0}''
+tldConfig.webinflibStart=Scanning WEB-INF/lib for JARs containing
META-INF/**/*.TLD
+tldConfig.webinflibJarFail=Failed to scan JAR ''{0}'' for TLDs
+tldConfig.webinfFail=Failed to process TLD found at ''{0}''
+tldConfig.webinfScan=Scanning WEB-INF for TLD files in ''{0}''
+tldConfig.webxmlStart=Scanning elements in web.xml
+tldConfig.webxmlAdd=Adding path ''{0}'' for URI ''{1}''
+tldConfig.webxmlSkip=Path ''{1}'' skipped since URI ''{0}'' is a duplicate
+tldConfig.webxmlFail=Failed to process TLD with path ''{1}'' and URI ''{0}''
userConfig.database=Exception loading user database
userConfig.deploy=Deploying web application for user {0}
userConfig.deploying=Deploying user web applications
Modified: tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=795143&r1=795142&r2=795143&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Fri Jul 17
16:57:30 2009
@@ -22,15 +22,13 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.JarURLConnection;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.jar.JarEntry;
@@ -63,6 +61,11 @@
*/
public final class TldConfig implements LifecycleListener {
+private static final String JAR_EXT = ".jar";
+private static final String TLD_EXT = ".tld";
+private static final String WEB_INF = "/WEB-INF/";
+private static final String WEB_INF_LIB = "/WEB-INF/lib/";
+
// Names of JARs that are known not to contain any TLDs
private static HashSet noTldJars;
@@ -315,34 +318,32 @@
long t1=System.currentTimeMillis();
/*
- * Acquire the list of TLD resource paths, possibly embedded in JAR
- * files, to be processed
+ * Priority order of URIs required by spec is:
+ * 1. J2EE platform taglibs - Tomcat doesn't provide these
+ * 2. web.xml entries
+ * 3. JARS in WEB-INF/lib & TLDs under WEB-INF (equal priority)
+ * 4. Additional entries from the container
*/
-Set resourcePaths = tldScanResourcePaths();
-Map jarPaths = getJarPaths();
+
+// Stage 2 - web.xml entries
+tldScanWebXml();
+
+// Stage 3a - TLDs under WEB-INF (not lib or classes)
+tldScanResourcePathsWebInf(context.getResources(), WEB_INF);
-// Scan each accumulated resource path for TLDs to be processed
-Iterator paths = resourcePaths.iterator();
-while (paths.hasNext()) {
-String path = paths.next();
-if (path.endsWith(".jar")) {
-tldScanJar(path);
-} else {
-tldScanTld(path);
-}
-}
+// Stage 3b - .jar files in WEB-INF/lib/
+tldScanWebInfLib();
-if (jarPaths != null) {
-Iterator files = jarPaths.values().iterator();
-while (files.hasNext()) {
-
svn commit: r795152 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Fri Jul 17 17:19:59 2009
New Revision: 795152
URL: http://svn.apache.org/viewvc?rev=795152&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41059
Reduce one possible source of errors if using ENABLE_CLEAR_REFERENCES=true
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=795152&r1=795151&r2=795152&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Fri Jul
17 17:19:59 2009
@@ -1653,7 +1653,31 @@
// Null out any static or final fields from loaded classes,
// as a workaround for apparent garbage collection bugs
if (ENABLE_CLEAR_REFERENCES) {
-Iterator loadedClasses = ((HashMap) resourceEntries.clone()).values().iterator();
+java.util.Collection values =
+((HashMap)
resourceEntries.clone()).values();
+Iterator loadedClasses = values.iterator();
+//
+// walk through all loaded class to trigger initialization for
+//any uninitialized classes, otherwise initialization of
+//one class may call a previously cleared class.
+while(loadedClasses.hasNext()) {
+ResourceEntry entry = loadedClasses.next();
+if (entry.loadedClass != null) {
+Class clazz = entry.loadedClass;
+try {
+Field[] fields = clazz.getDeclaredFields();
+for (int i = 0; i < fields.length; i++) {
+if(Modifier.isStatic(fields[i].getModifiers())) {
+fields[i].get(null);
+break;
+}
+}
+} catch(Throwable t) {
+// Ignore
+}
+}
+}
+loadedClasses = values.iterator();
while (loadedClasses.hasNext()) {
ResourceEntry entry = loadedClasses.next();
if (entry.loadedClass != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795153 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Fri Jul 17 17:22:09 2009 New Revision: 795153 URL: http://svn.apache.org/viewvc?rev=795153&view=rev Log: Propose fix for 41059 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=795153&r1=795152&r2=795153&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 17:22:09 2009 @@ -75,3 +75,9 @@ http://people.apache.org/~kkolinko/patches/2009-07-17_tc55_native_install_791699.patch +1: kkolinko, rjung -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41059 + Reduce errors if using ENABLE_CLEAR_REFERENCES=true + http://svn.apache.org/viewvc?rev=795152&view=rev (less generics) + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795155 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Jul 17 17:22:32 2009 New Revision: 795155 URL: http://svn.apache.org/viewvc?rev=795155&view=rev Log: Propose fix for 41059 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=795155&r1=795154&r2=795155&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 17 17:22:32 2009 @@ -169,3 +169,9 @@ https://issues.apache.org/bugzilla/attachment.cgi?id=23973 +1: fhanik, kkolinko, markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41059 + Reduce errors if using ENABLE_CLEAR_REFERENCES=true + http://svn.apache.org/viewvc?rev=795152&view=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: r795158 - /tomcat/current/tc5.5.x/STATUS.txt
Author: kkolinko Date: Fri Jul 17 17:30:33 2009 New Revision: 795158 URL: http://svn.apache.org/viewvc?rev=795158&view=rev Log: vote and proposal 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=795158&r1=795157&r2=795158&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 17:30:33 2009 @@ -79,5 +79,11 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41059 Reduce errors if using ENABLE_CLEAR_REFERENCES=true http://svn.apache.org/viewvc?rev=795152&view=rev (less generics) - +1: markt + +1: markt, kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47239 + Fix Copyright sign in generated Javadoc + http://people.apache.org/~kkolinko/patches/2009-07-17_tc55_bug47239_javadoc_copyrightsign.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 41059] WebAppClassLoader clearReferences code break running threads
https://issues.apache.org/bugzilla/show_bug.cgi?id=41059 Mark Thomas changed: What|Removed |Added Status|ASSIGNED|NEW --- Comment #14 from Mark Thomas 2009-07-17 10:30:38 PST --- This has been fixed in trunk and proposed for 6.0.x and 5.5.x Keep in mind that ENABLE_CLEAR_REFERENCES=true is intended to: a) work around GC issues in old JVMs (unlikely to an issue with current jvms) b) work around one source of memory leaks in webapps that are buggy or use buggy libraries The very nature of the ENABLE_CLEAR_REFERENCES code is that it is likely to cause problems - as it does with log4j. Whilst this patch (thanks for the patch by the way) will reduce the chances or seeing errors, it will not eliminate them. A better approach is to set ENABLE_CLEAR_REFERENCES=false and to use a profiler to identify and fix the root causes of any memory leaks. A well-written app using well behaved libraries should not need ENABLE_CLEAR_REFERENCES=true If when doing this you find a memory leak in the Tomcat code (hopefully you won't - all the ones we know about should be fixed) then please open a new Bugzilla entry and report it. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r795152 - svn:log
Author: markt Revision: 795152 Modified property: svn:log Modified: svn:log at Fri Jul 17 17:31:58 2009 -- --- svn:log (original) +++ svn:log Fri Jul 17 17:31:58 2009 @@ -1,2 +1,3 @@ Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41059 Reduce one possible source of errors if using ENABLE_CLEAR_REFERENCES=true +Patch by Curt Arnold - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46967] ManagerBase.setRandomFile error handling fix
https://issues.apache.org/bugzilla/show_bug.cgi?id=46967 Konstantin Kolinko changed: What|Removed |Added CC||tim.whitting...@orionhealth ||.com --- Comment #3 from Konstantin Kolinko 2009-07-17 10:41:58 PST --- *** Bug 47276 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 47276] Repeated log warnings when /dev/urandom is not readable
https://issues.apache.org/bugzilla/show_bug.cgi?id=47276 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #1 from Konstantin Kolinko 2009-07-17 10:41:58 PST --- It is duplicate of bug 46967, that is already fixed in the 6.0.x branch. *** This bug has been marked as a duplicate of bug 46967 *** -- 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 46967] ManagerBase.setRandomFile error handling fix
https://issues.apache.org/bugzilla/show_bug.cgi?id=46967 Konstantin Kolinko changed: What|Removed |Added Status|RESOLVED|REOPENED Component|Catalina|Catalina Version|6.0.18 |5.5.27 Resolution|FIXED | Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- --- Comment #4 from Konstantin Kolinko 2009-07-17 10:45:26 PST --- Reopening, to track fixing it in 5.5 branch. -- 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: r795170 - /tomcat/current/tc5.5.x/STATUS.txt
Author: kkolinko Date: Fri Jul 17 17:57:37 2009 New Revision: 795170 URL: http://svn.apache.org/viewvc?rev=795170&view=rev Log: Propose backport of patch for 46967 from 6.0 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=795170&r1=795169&r2=795170&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 17:57:37 2009 @@ -87,3 +87,11 @@ http://people.apache.org/~kkolinko/patches/2009-07-17_tc55_bug47239_javadoc_copyrightsign.patch +1: kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46967 + Better handling of errors when trying to use Manager.randomFile + Based on a patch by Kirk Wolf + Also make behaviour consistent when using a security manager + http://svn.apache.org/viewvc?view=rev&revision=777567 + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795210 - /tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
Author: markt
Date: Fri Jul 17 20:12:49 2009
New Revision: 795210
URL: http://svn.apache.org/viewvc?rev=795210&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41661
Thread safety issue with JspConfig.init(). There is one JspConfig object per
context and as per 41661, issues have been seen with this on real systems.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=795210&r1=795209&r2=795210&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Fri Jul 17
20:12:49 2009
@@ -48,7 +48,7 @@
private Vector jspProperties = null;
private ServletContext ctxt;
-private boolean initialized = false;
+private volatile boolean initialized = false;
private String defaultIsXml = null;// unspecified
private String defaultIsELIgnored = null; // unspecified
@@ -218,13 +218,17 @@
private void init() throws JasperException {
if (!initialized) {
-processWebDotXml(ctxt);
-defaultJspProperty = new JspProperty(defaultIsXml,
-defaultIsELIgnored,
-defaultIsScriptingInvalid,
-null, null, null, defaultDeferedSyntaxAllowedAsLiteral,
-defaultTrimDirectiveWhitespaces);
-initialized = true;
+synchronized (this) {
+if (!initialized) {
+processWebDotXml(ctxt);
+defaultJspProperty = new JspProperty(defaultIsXml,
+defaultIsELIgnored,
+defaultIsScriptingInvalid,
+null, null, null,
defaultDeferedSyntaxAllowedAsLiteral,
+defaultTrimDirectiveWhitespaces);
+initialized = true;
+}
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795211 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Jul 17 20:15:48 2009 New Revision: 795211 URL: http://svn.apache.org/viewvc?rev=795211&view=rev Log: Propose fix for 41661 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=795211&r1=795210&r2=795211&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 17 20:15:48 2009 @@ -175,3 +175,9 @@ http://svn.apache.org/viewvc?rev=795152&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41661 + Thread safety issue in JspConfig.init() seen in production + http://svn.apache.org/viewvc?rev=795210&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 41661] JspConfig.init() is not synchronized
https://issues.apache.org/bugzilla/show_bug.cgi?id=41661 --- Comment #4 from Mark Thomas 2009-07-17 13:16:14 PST --- Thanks for the report and the analysis. This has been fixed in trunk and proposed 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
svn commit: r795212 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Fri Jul 17 20:17:02 2009 New Revision: 795212 URL: http://svn.apache.org/viewvc?rev=795212&view=rev Log: Propose fix for 41661 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=795212&r1=795211&r2=795212&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 20:17:02 2009 @@ -95,3 +95,9 @@ http://svn.apache.org/viewvc?view=rev&revision=777567 +1: kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41661 + Thread safety issue in JspConfig.init() seen in production + http://svn.apache.org/viewvc?rev=795210&view=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: r795229 - in /tomcat/trunk/webapps/examples: WEB-INF/classes/async/ WEB-INF/classes/async/Async1.java WEB-INF/web.xml jsp/async/ jsp/async/async1.jsp jsp/async/index.jsp
Author: fhanik
Date: Fri Jul 17 21:14:13 2009
New Revision: 795229
URL: http://svn.apache.org/viewvc?rev=795229&view=rev
Log:
very simple async example
Added:
tomcat/trunk/webapps/examples/WEB-INF/classes/async/
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java (with
props)
tomcat/trunk/webapps/examples/jsp/async/
tomcat/trunk/webapps/examples/jsp/async/async1.jsp (with props)
tomcat/trunk/webapps/examples/jsp/async/index.jsp (with props)
Modified:
tomcat/trunk/webapps/examples/WEB-INF/web.xml
Added: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java?rev=795229&view=auto
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java (added)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java Fri Jul 17
21:14:13 2009
@@ -0,0 +1,59 @@
+/*
+* 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 async;
+
+import java.io.IOException;
+
+import javax.servlet.AsyncContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+public class Async1 extends HttpServlet {
+protected static Log log = LogFactory.getLog(Async1.class);
+public Async1() {
+}
+
+@Override
+protected void service(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
+final AsyncContext actx = req.startAsync();
+Runnable run = new Runnable() {
+public void run() {
+try {
+String path = "/jsp/async/async1.jsp";
+Thread.currentThread().setName("Async1-Thread");
+log.info("Putting AsyncThread to sleep");
+Thread.sleep(10*1000);
+log.info("Dispatching to "+path);
+actx.dispatch(path);
+}catch (InterruptedException x) {
+log.error("Async1",x);
+}catch (IllegalStateException x) {
+log.error("Async1",x);
+}
+}
+};
+Thread t = new Thread(run);
+t.start();
+}
+
+
+}
Propchange: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java
--
svn:eol-style = native
Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=795229&r1=795228&r2=795229&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Fri Jul 17 21:14:13 2009
@@ -295,4 +295,13 @@
10
+
+
+ async1
+ async.Async1
+
+
+ async1
+ /async/async1
+
Added: tomcat/trunk/webapps/examples/jsp/async/async1.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/async/async1.jsp?rev=795229&view=auto
==
--- tomcat/trunk/webapps/examples/jsp/async/async1.jsp (added)
+++ tomcat/trunk/webapps/examples/jsp/async/async1.jsp Fri Jul 17 21:14:13 2009
@@ -0,0 +1,8 @@
+<%...@page session="false"%>
+Output from async1.jsp
+<%
+System.out.println("Inside Async 1");
+ if (request.isAsyncStarted()) {
+request.getAsyncContext().complete();
+ }
+%>
Propchange: tomcat/trunk/webapps/examples/jsp/async/async1.jsp
--
svn:eol-style = native
Added: tomcat/trunk/webapps/examples/jsp/async/index.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/async/index.jsp?rev=795229&view=auto
==
--- tomcat/trunk/webapps/examples/jsp/async/index.jsp (added
svn commit: r795231 - in /tomcat/trunk/java/org/apache: catalina/connector/ catalina/core/ coyote/ coyote/http11/ tomcat/util/net/
Author: fhanik
Date: Fri Jul 17 21:32:00 2009
New Revision: 795231
URL: http://svn.apache.org/viewvc?rev=795231&view=rev
Log:
Async patches phase 1 - Async means the container thread can back out. This
means that valves need to be async aware. For example, access log valve, can no
longer log upon exit of the method since the thread can back out based on async
behavior.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/trunk/java/org/apache/coyote/ActionCode.java
tomcat/trunk/java/org/apache/coyote/Adapter.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java?rev=795231&r1=795230&r2=795231&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java Fri
Jul 17 21:32:00 2009
@@ -22,10 +22,15 @@
import javax.servlet.AsyncContext;
import javax.servlet.AsyncListener;
+import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
/**
@@ -41,7 +46,8 @@
private ServletResponse servletResponse = null;
private List listeners = new
ArrayList();
private boolean hasOriginalRequestAndResponse = true;
-private boolean completed = false;
+private boolean completed = true;
+private volatile Runnable dispatch = null;
private Request request;
@@ -54,16 +60,7 @@
public void complete() {
// TODO SERVLET3 - async
-for (AsyncListenerWrapper wrapper : listeners) {
-try {
-wrapper.fireOnComplete();
-}catch (IOException x) {
-//how does this propagate, or should it?
- //TODO SERVLET3 - async
-log.error("",x);
-}
-}
-this.completed = true;
+doInternalComplete(false);
}
@@ -76,7 +73,27 @@
@Override
public void dispatch(String path) {
// TODO SERVLET3 - async
-
+if (request.getAttribute(ASYNC_REQUEST_URI)==null) {
+request.setAttribute(ASYNC_REQUEST_URI, request.getRequestURI());
+request.setAttribute(ASYNC_CONTEXT_PATH, request.getContextPath());
+request.setAttribute(ASYNC_SERVLET_PATH, request.getServletPath());
+request.setAttribute(ASYNC_QUERY_STRING, request.getQueryString());
+}
+final RequestDispatcher requestDispatcher =
request.getServletContext().getRequestDispatcher(path);
+final HttpServletRequest servletRequest =
(HttpServletRequest)getRequest();
+final HttpServletResponse servletResponse =
(HttpServletResponse)getResponse();
+Runnable run = new Runnable() {
+public void run() {
+try {
+requestDispatcher.include(servletRequest, servletResponse);
+}catch (Exception x) {
+//log.error("Async.dispatch",x);
+throw new RuntimeException(x);
+}
+}
+};
+this.dispatch = run;
+request.coyoteRequest.action(ActionCode.ACTION_ASYNC_DISPATCH, run );
}
@Override
@@ -124,7 +141,7 @@
servletResponse = null;
listeners.clear();
hasOriginalRequestAndResponse = true;
-completed = false;
+completed = true;
}
public boolean isStarted() {
@@ -168,6 +185,40 @@
this.completed = completed;
}
+public void doInternalDispatch() throws ServletException, IOException {
+if (this.dispatch!=null) {
+try {
+dispatch.run();
+} catch (RuntimeException x) {
+doInternalComplete(true);
+if (x.getCause() instanceof ServletException) throw
(ServletException)x.getCause();
+if (x.getCause() instanceof IOException) throw
(IOException)x.getCause();
+else throw new ServletException(x);
+} finally {
+dispatch = null;
+}
+
svn commit: r795234 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Fri Jul 17 21:39:59 2009 New Revision: 795234 URL: http://svn.apache.org/viewvc?rev=795234&view=rev Log: Vote. 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=795234&r1=795233&r2=795234&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 21:39:59 2009 @@ -79,13 +79,13 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41059 Reduce errors if using ENABLE_CLEAR_REFERENCES=true http://svn.apache.org/viewvc?rev=795152&view=rev (less generics) - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47239 Fix Copyright sign in generated Javadoc http://people.apache.org/~kkolinko/patches/2009-07-17_tc55_bug47239_javadoc_copyrightsign.patch - +1: kkolinko + +1: kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46967 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795235 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Fri Jul 17 21:41:16 2009 New Revision: 795235 URL: http://svn.apache.org/viewvc?rev=795235&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=795235&r1=795234&r2=795235&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 17 21:41:16 2009 @@ -159,7 +159,6 @@ .../example-taglib and .../examples-taglib Though this inconsistency already existed before this patch. - * Make constants constant http://svn.apache.org/viewvc?rev=794673&view=rev +1: markt, kkolinko, rjung @@ -173,7 +172,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41059 Reduce errors if using ENABLE_CLEAR_REFERENCES=true http://svn.apache.org/viewvc?rev=795152&view=rev - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41661 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795241 - in /tomcat/trunk/java/org/apache/catalina: connector/AsyncContextImpl.java core/StandardWrapperValve.java
Author: fhanik
Date: Fri Jul 17 21:54:34 2009
New Revision: 795241
URL: http://svn.apache.org/viewvc?rev=795241&view=rev
Log:
Add notes
Modified:
tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java?rev=795241&r1=795240&r2=795241&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java Fri
Jul 17 21:54:34 2009
@@ -59,15 +59,12 @@
@Override
public void complete() {
// TODO SERVLET3 - async
-
doInternalComplete(false);
-
}
@Override
public void dispatch() {
// TODO SERVLET3 - async
-
}
@Override
@@ -85,6 +82,8 @@
Runnable run = new Runnable() {
public void run() {
try {
+//piggy back on the request dispatcher to ensure that
filters etc get called.
+//TODO SERVLET3 - async should this be include/forward or
a new dispatch type
requestDispatcher.include(servletRequest, servletResponse);
}catch (Exception x) {
//log.error("Async.dispatch",x);
@@ -93,7 +92,7 @@
}
};
this.dispatch = run;
-request.coyoteRequest.action(ActionCode.ACTION_ASYNC_DISPATCH, run );
+request.coyoteRequest.action(ActionCode.ACTION_ASYNC_DISPATCH, null );
}
@Override
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=795241&r1=795240&r2=795241&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Fri
Jul 17 21:54:34 2009
@@ -211,7 +211,8 @@
try {
SystemLogHandler.startCapture();
if (request.isAsyncStarted()) {
-
((AsyncContextImpl)request.getAsyncContext()).doInternalDispatch();
+//TODO SERVLET3 - async
+
((AsyncContextImpl)request.getAsyncContext()).doInternalDispatch();
} else if (comet) {
filterChain.doFilterEvent(request.getEvent());
request.setComet(true);
@@ -227,6 +228,7 @@
}
} else {
if (request.isAsyncStarted()) {
+//TODO SERVLET3 - async
((AsyncContextImpl)request.getAsyncContext()).doInternalDispatch();
} else if (comet) {
request.setComet(true);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795256 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/core/ webapps/examples/jsp/async/
Author: fhanik
Date: Fri Jul 17 22:37:54 2009
New Revision: 795256
URL: http://svn.apache.org/viewvc?rev=795256&view=rev
Log:
the dispatcher type should be ASYNC when we are doing a dispatch
Modified:
tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/trunk/webapps/examples/jsp/async/async1.jsp
Modified: tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java?rev=795256&r1=795255&r2=795256&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java Fri
Jul 17 22:37:54 2009
@@ -64,7 +64,9 @@
@Override
public void dispatch() {
-// TODO SERVLET3 - async
+HttpServletRequest sr = (HttpServletRequest)getServletRequest();
+String path = sr.getRequestURI();
+dispatch(path);
}
@Override
@@ -84,6 +86,7 @@
try {
//piggy back on the request dispatcher to ensure that
filters etc get called.
//TODO SERVLET3 - async should this be include/forward or
a new dispatch type
+//javadoc suggests include with the type of
DispatcherType.ASYNC
requestDispatcher.include(servletRequest, servletResponse);
}catch (Exception x) {
//log.error("Async.dispatch",x);
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=795256&r1=795255&r2=795256&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Jul
17 22:37:54 2009
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.util.EnumSet;
+import javax.servlet.DispatcherType;
import javax.servlet.SessionTrackingMode;
import org.apache.catalina.CometEvent;
@@ -262,11 +263,15 @@
boolean success = true;
try {
+DispatcherType prevDispatcherType = request.getDispatcherType();
+request.setAttribute(Globals.DISPATCHER_TYPE_ATTR,
DispatcherType.ASYNC);
// Calling the container
try {
connector.getContainer().getPipeline().getFirst().invoke(request, response);
}catch (RuntimeException x) {
success = false;
+} finally {
+request.setAttribute(Globals.DISPATCHER_TYPE_ATTR,
prevDispatcherType);
}
if (request.isComet()) {
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=795256&r1=795255&r2=795256&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Fri
Jul 17 22:37:54 2009
@@ -96,7 +96,9 @@
}
public Void run() throws ServletException, IOException {
-doInclude(request,response);
+DispatcherType type = DispatcherType.INCLUDE;
+if (request.getDispatcherType()==DispatcherType.ASYNC) type =
DispatcherType.ASYNC;
+doInclude(request,response,type);
return null;
}
}
@@ -487,11 +489,13 @@
throw (IOException) e;
}
} else {
-doInclude(request,response);
+DispatcherType type = DispatcherType.INCLUDE;
+if (request.getDispatcherType()==DispatcherType.ASYNC) type =
DispatcherType.ASYNC;
+doInclude(request,response,type);
}
}
-private void doInclude(ServletRequest request, ServletResponse response)
+private void doInclude(ServletRequest request, ServletResponse response,
DispatcherType type)
throws ServletException, IOException
{
// Set up to handle the specified request and response
@@ -514,7 +518,7 @@
if (servletPath != null)
wrequest.setServletPath(servletPath);
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
-DispatcherType.INCLUDE);
+type);
wrequest.setAttribute(
A
svn commit: r795261 - /tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
Author: fhanik
Date: Fri Jul 17 22:47:13 2009
New Revision: 795261
URL: http://svn.apache.org/viewvc?rev=795261&view=rev
Log:
implement AsyncContext.dispatch and AsyncContext.start methods
Modified:
tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java?rev=795261&r1=795260&r2=795261&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java Fri
Jul 17 22:47:13 2009
@@ -71,14 +71,20 @@
@Override
public void dispatch(String path) {
+dispatch(request.getServletContext(),path);
+}
+
+@Override
+public void dispatch(ServletContext context, String path) {
// TODO SERVLET3 - async
+ // TODO SERVLET3 - async
if (request.getAttribute(ASYNC_REQUEST_URI)==null) {
request.setAttribute(ASYNC_REQUEST_URI, request.getRequestURI());
request.setAttribute(ASYNC_CONTEXT_PATH, request.getContextPath());
request.setAttribute(ASYNC_SERVLET_PATH, request.getServletPath());
request.setAttribute(ASYNC_QUERY_STRING, request.getQueryString());
}
-final RequestDispatcher requestDispatcher =
request.getServletContext().getRequestDispatcher(path);
+final RequestDispatcher requestDispatcher =
context.getRequestDispatcher(path);
final HttpServletRequest servletRequest =
(HttpServletRequest)getRequest();
final HttpServletResponse servletResponse =
(HttpServletResponse)getResponse();
Runnable run = new Runnable() {
@@ -99,12 +105,6 @@
}
@Override
-public void dispatch(ServletContext context, String path) {
-// TODO SERVLET3 - async
-
-}
-
-@Override
public ServletRequest getRequest() {
return getServletRequest();
}
@@ -117,7 +117,8 @@
@Override
public void start(Runnable run) {
// TODO SERVLET3 - async
-
+this.dispatch = run;
+request.coyoteRequest.action(ActionCode.ACTION_ASYNC_DISPATCH, null );
}
public void addAsyncListener(AsyncListener listener) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795271 - /tomcat/build/tags/tc5.5.x/TOMCAT_5_5_28/
Author: fhanik Date: Fri Jul 17 23:18:41 2009 New Revision: 795271 URL: http://svn.apache.org/viewvc?rev=795271&view=rev Log: Tagging Tomcat version TOMCAT_5_5_28. Added: tomcat/build/tags/tc5.5.x/TOMCAT_5_5_28/ - copied from r795270, tomcat/build/tc5.5.x/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795272 - /tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_28/
Author: fhanik Date: Fri Jul 17 23:18:46 2009 New Revision: 795272 URL: http://svn.apache.org/viewvc?rev=795272&view=rev Log: Tagging Tomcat version TOMCAT_5_5_28. Added: tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_28/ - copied from r795271, tomcat/connectors/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795273 - /tomcat/container/tags/tc5.5.x/TOMCAT_5_5_28/
Author: fhanik Date: Fri Jul 17 23:18:51 2009 New Revision: 795273 URL: http://svn.apache.org/viewvc?rev=795273&view=rev Log: Tagging Tomcat version TOMCAT_5_5_28. Added: tomcat/container/tags/tc5.5.x/TOMCAT_5_5_28/ - copied from r795272, tomcat/container/tc5.5.x/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795274 - /tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_28/
Author: fhanik Date: Fri Jul 17 23:18:56 2009 New Revision: 795274 URL: http://svn.apache.org/viewvc?rev=795274&view=rev Log: Tagging Tomcat version TOMCAT_5_5_28. Added: tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_28/ - copied from r795273, tomcat/jasper/tc5.5.x/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795275 - /tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_28/
Author: fhanik Date: Fri Jul 17 23:19:02 2009 New Revision: 795275 URL: http://svn.apache.org/viewvc?rev=795275&view=rev Log: Tagging Tomcat version TOMCAT_5_5_28. Added: tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_28/ - copied from r795274, tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795276 - /tomcat/site/tags/TOMCAT_5_5_28/
Author: fhanik Date: Fri Jul 17 23:19:07 2009 New Revision: 795276 URL: http://svn.apache.org/viewvc?rev=795276&view=rev Log: Tagging Tomcat version TOMCAT_5_5_28. Added: tomcat/site/tags/TOMCAT_5_5_28/ - copied from r795275, tomcat/site/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795311 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Jul 18 04:29:12 2009 New Revision: 795311 URL: http://svn.apache.org/viewvc?rev=795311&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=795311&r1=795310&r2=795311&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jul 18 04:29:12 2009 @@ -172,11 +172,11 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41059 Reduce errors if using ENABLE_CLEAR_REFERENCES=true http://svn.apache.org/viewvc?rev=795152&view=rev - +1: markt, rjung + +1: markt, rjung, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41661 Thread safety issue in JspConfig.init() seen in production http://svn.apache.org/viewvc?rev=795210&view=rev - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795313 - /tomcat/current/tc5.5.x/STATUS.txt
Author: kkolinko Date: Sat Jul 18 04:35:36 2009 New Revision: 795313 URL: http://svn.apache.org/viewvc?rev=795313&view=rev Log: vote 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=795313&r1=795312&r2=795313&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sat Jul 18 04:35:36 2009 @@ -99,5 +99,5 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41661 Thread safety issue in JspConfig.init() seen in production http://svn.apache.org/viewvc?rev=795210&view=rev - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
