DO NOT REPLY [Bug 48993] New: tomcat not responding frequently after enabling ssl.
https://issues.apache.org/bugzilla/show_bug.cgi?id=48993 Summary: tomcat not responding frequently after enabling ssl. Product: Tomcat 5 Version: 5.5.12 Platform: PC OS/Version: Windows Server 2003 Status: NEW Severity: normal Priority: P2 Component: Servlets:SSI AssignedTo: dev@tomcat.apache.org ReportedBy: svkir...@gmail.com Hi, We have two tomcat production servers both 5.5.12 on Windows Server 2003, one on java 4 and the other on Java 5. The server on Java 4 is enabled for https long time ago. It is used to hang by the end of every 2nd week. We didn't keep much effort on identifying the cause and we want on restarting it every week end. We enabled https on the other server 2 weeks ago and since then the tomcat server is not responding/accepting requests every 3rd day. We have to restart it from services to make it work. And there is no exceptions in the logs. But i can only see the requests coming in have decreased during that time while actually clients are sending requests which tomcat is not accepting. It never happened before on this server and started happening only after enabling https . I am not very sure what caused this but since this is only change that has been made, I doubt this may have caused the issue. These are settings we made on the server for enabling https. Thanks in advance -- 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 48993] tomcat not responding frequently after enabling ssl.
https://issues.apache.org/bugzilla/show_bug.cgi?id=48993 svkirans changed: What|Removed |Added CC||svkir...@gmail.com -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r927740 - /tomcat/native/branches/1.1.x/native/src/sslnetwork.c
Author: jfclere
Date: Fri Mar 26 09:05:43 2010
New Revision: 927740
URL: http://svn.apache.org/viewvc?rev=927740&view=rev
Log:
Make the non blocking write really no blocking.
Modified:
tomcat/native/branches/1.1.x/native/src/sslnetwork.c
Modified: tomcat/native/branches/1.1.x/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslnetwork.c?rev=927740&r1=927739&r2=927740&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslnetwork.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslnetwork.c Fri Mar 26 09:05:43
2010
@@ -448,12 +448,14 @@ ssl_socket_send(apr_socket_t *sock, cons
tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
int s, i, wr = (int)(*len);
apr_status_t rv = APR_SUCCESS;
+apr_int32_t nb;
if (con->reneg_state == RENEG_ABORT) {
*len = 0;
con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
return APR_ECONNABORTED;
}
+apr_socket_opt_get(con->sock, APR_SO_NONBLOCK, &nb);
for (;;) {
if ((s = SSL_write(con->ssl, buf, wr)) <= 0) {
apr_status_t os = apr_get_netos_error();
@@ -469,6 +471,10 @@ ssl_socket_send(apr_socket_t *sock, cons
break;
case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE:
+if (nb && i == SSL_ERROR_WANT_WRITE) {
+*len = 0;
+return APR_SUCCESS;
+}
if ((rv = wait_for_io_or_timeout(con, i)) != APR_SUCCESS) {
con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
return rv;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48993] tomcat not responding frequently after enabling ssl.
https://issues.apache.org/bugzilla/show_bug.cgi?id=48993 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Component|Servlets:SSI|Connector:HTTP Resolution||INVALID --- Comment #1 from Konstantin Kolinko 2010-03-26 09:52:56 UTC --- 1. Support questions are not appropriate for Bugzilla, but you can send them to the tomcat-users mailing list http://tomcat.apache.org/bugreport.html#Bugzilla%20is%20not%20a%20support%20forum 2. If a java application (such as Tomcat) hangs, it is important to take a thread dump. There is an item in the FAQ on how to obtain thread dumps. Also we will need to know a bit more about your configuration: whether Tomcat is fronted by another web server or it is running standalone, do you use Tomcat Native, and their versions. 3. Please consider upgrading your Tomcat and Java versions. Because of 1. I am closing this as INVALID. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r927759 - in /tomcat: tc6.0.x/trunk/webapps/docs/realm-howto.xml trunk/webapps/docs/realm-howto.xml
Author: kkolinko Date: Fri Mar 26 10:28:47 2010 New Revision: 927759 URL: http://svn.apache.org/viewvc?rev=927759&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48992 Fix XML tags in examples for CombinedRealm and LockOutRealm Based on the patch by Fumiyuki Shimizu Modified: tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml tomcat/trunk/webapps/docs/realm-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml?rev=927759&r1=927758&r2=927759&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml Fri Mar 26 10:28:47 2010 @@ -1162,7 +1162,7 @@ UserDatabase Realm and a DataSource Real dataSourceName="jdbc/authority" userTable="users" userNameCol="user_name" userCredCol="user_pass" userRoleTable="user_roles" roleNameCol="role_name"/> -+ @@ -1210,7 +1210,7 @@ functionality to a UserDatabase Realm. Modified: tomcat/trunk/webapps/docs/realm-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/realm-howto.xml?rev=927759&r1=927758&r2=927759&view=diff == --- tomcat/trunk/webapps/docs/realm-howto.xml (original) +++ tomcat/trunk/webapps/docs/realm-howto.xml Fri Mar 26 10:28:47 2010 @@ -1168,7 +1168,7 @@ UserDatabase Realm and a DataSource Real dataSourceName="jdbc/authority" userTable="users" userNameCol="user_name" userCredCol="user_pass" userRoleTable="user_roles" roleNameCol="role_name"/> - + @@ -1216,7 +1216,7 @@ functionality to a UserDatabase Realm. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48992] tags are not closed, in examples of CombinedRealm and LockOutRealm.
https://issues.apache.org/bugzilla/show_bug.cgi?id=48992 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Konstantin Kolinko 2010-03-26 10:31:38 UTC --- Thank you for the report. Fixed in r927759 Note, that you will not see update on the web site until the next official release of Tomcat 6.0. -- 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 48979] defaultContextXml not set by Embedded.createContext
https://issues.apache.org/bugzilla/show_bug.cgi?id=48979 --- Comment #3 from Peter Rossbach 2010-03-26 10:42:21 UTC --- Hi Marc, are you setup the catalina.base system property correct at your env? The Embedded class ist setup a ContextConfig Listener and the method defaultWebConfig configure the conf/web.xml file. You can also bundle your conf/web.xml or web-embed.xml at your classpath. Peter -- 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 48979] defaultContextXml not set by Embedded.createContext
https://issues.apache.org/bugzilla/show_bug.cgi?id=48979 --- Comment #4 from Marc Guillemot 2010-03-26 10:47:49 UTC --- Hi Peter, I don't set catalina.base as I use it embedded (ie only the jars, no dependency on a Tomcat installation on the file system). I know that it is possible to provide default web.xml by myself but I think that it should already be done by Tomcat's Embedded class to provide similar behaviour to "normal" Tomcat. -- 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
[g...@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Java Servlet 3.0, Java Server Pages 2.2 & Expression Languag... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property jasper-jdt.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 47 secs Command Line: /usr/lib/jvm/java-6-sun/bin/java -Djava.awt.headless=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-26032010.jar -Dno.build.jasper-jdt=true -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-26032010-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-26032010-native-src.tar.gz -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-26032010.jar -Djasper-jdt.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-jdbc-26032010.jar -Dcommons-pool.home=/srv/gump/public/workspace/apache-commons/pool -Dcommons-dbcp.ho me=/srv/gump/public/workspace/apache-commons/dbcp -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-jdbc-26032010.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/packages/junit3.8.1/junit.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomca t-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/ eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-jdbc-26032010.jar:/srv/gump/public/workspace/apache-commons/daemon/di
Re: Tomcat 7 windows installer image
On 26/03/2010 11:29, Mladen Turk wrote: > Hi, > > I was told this will look better as a welcome > installer image :) > > WDYT? Not too sure about the white lines in the background. Apart from that it looks great. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 7 windows installer image
> I was told this will look better as a welcome > installer image :) > > WDYT? +1 Ian - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 7 windows installer image
Thank you for bringing up this question. It is about time to think about that. And talking about the image 1). I do not like how the feather is trapped in a cage. For the cat it is bearable (even if I do not understand it), but for the feather the cage shines through it. 2). The image is usually displayed scaled down. I just took a screenshot from running the installer and the size is 164 x 314 for me. That is 66% of the original size. I am on WinXP. The display settings are 96 pixels/inch. As of now, the "http://tomcat.apache.org/"; line is hardly readable on the gradient background when I zoom-out the page in the browser. Should check how it looks when actually running the installer, though. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 7 windows installer image
I'm not a fan of the line backgrounds behind both logos. From a marketing point of view, I would prefer to see the feather above the cat. It might be nice to see the cat and feather swapped and without the lines in background, just using the gradient. But otherwise conceptually, it would be great for an installer. But if no changes where made to the image and used as is, that would be OK. -Tim On 3/26/2010 7:29 AM, Mladen Turk wrote: Hi, I was told this will look better as a welcome installer image :) WDYT? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 7 windows installer image
On 03/26/2010 01:15 PM, Mark Thomas wrote: On 26/03/2010 11:29, Mladen Turk wrote: Hi, I was told this will look better as a welcome installer image :) WDYT? Not too sure about the white lines in the background. Agreed. My private designer will remove that. You know, women do like laces and things like that :-) Cheers -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 7 windows installer image
On 03/26/2010 07:10 AM, Mladen Turk wrote: On 03/26/2010 01:15 PM, Mark Thomas wrote: On 26/03/2010 11:29, Mladen Turk wrote: Hi, I was told this will look better as a welcome installer image :) WDYT? Not too sure about the white lines in the background. Agreed. My private designer will remove that. You know, women do like laces and things like that :-) thank your private designer for the effort and the contribution!! Filip Cheers - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r927844 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: markt
Date: Fri Mar 26 13:36:22 2010
New Revision: 927844
URL: http://svn.apache.org/viewvc?rev=927844&view=rev
Log:
Remove tests rendered unnecessary when context.xml files were moved from
appBase to configBase
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=927844&r1=927843&r2=927844&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Fri Mar 26
13:36:22 2010
@@ -549,10 +549,6 @@ public class HostConfig
for (int i = 0; i < files.length; i++) {
-if (files[i].equalsIgnoreCase("META-INF"))
-continue;
-if (files[i].equalsIgnoreCase("WEB-INF"))
-continue;
File contextXml = new File(configBase, files[i]);
if (files[i].toLowerCase().endsWith(".xml")) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r927845 - in /tomcat/trunk/java/org/apache/catalina: connector/CoyoteAdapter.java core/AsyncContextImpl.java
Author: fhanik
Date: Fri Mar 26 13:38:02 2010
New Revision: 927845
URL: http://svn.apache.org/viewvc?rev=927845&view=rev
Log:
spec says that "started" is defined as started until the thread has returned to
the container.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=927845&r1=927844&r2=927845&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Mar
26 13:38:02 2010
@@ -428,7 +428,7 @@ public class CoyoteAdapter implements Ad
}
AsyncContextImpl asyncConImpl =
(AsyncContextImpl)request.getAsyncContext();
-if (request.isAsyncStarted()) {
+if (asyncConImpl!=null &&
asyncConImpl.getState()==AsyncContextImpl.AsyncState.STARTED) {
res.action(ActionCode.ACTION_ASYNC_START,
request.getAsyncContext());
async = true;
} else if (asyncConImpl!=null &&
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=927845&r1=927844&r2=927845&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Fri Mar 26
13:38:02 2010
@@ -239,7 +239,7 @@ public class AsyncContextImpl implements
}
public boolean isStarted() {
-return (state.get() == AsyncState.STARTED);
+return (state.get() == AsyncState.STARTED || state.get() ==
AsyncState.DISPATCHING);
}
public void setStarted(Context context) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r927850 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: markt
Date: Fri Mar 26 13:47:18 2010
New Revision: 927850
URL: http://svn.apache.org/viewvc?rev=927850&view=rev
Log:
Improve log message when deploying from configBase to make it clearer where xml
file is read from.
Javadoc tweak
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=927850&r1=927849&r2=927850&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Fri Mar 26
13:47:18 2010
@@ -113,7 +113,8 @@ public class HostConfig
/**
- * Should we deploy XML Context config files?
+ * Should we deploy XML Context config files packaged with WAR files and
+ * directories?
*/
protected boolean deployXML = false;
@@ -587,7 +588,8 @@ public class HostConfig
// Assume this is a configuration descriptor and deploy it
if(log.isInfoEnabled()) {
-log.info(sm.getString("hostConfig.deployDescriptor", file));
+log.info(sm.getString("hostConfig.deployDescriptor", file,
+configBase.getPath()));
}
Context context = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r927851 - /tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Author: markt
Date: Fri Mar 26 13:48:30 2010
New Revision: 927851
URL: http://svn.apache.org/viewvc?rev=927851&view=rev
Log:
Missed a file in r927850
Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
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=927851&r1=927850&r2=927851&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Fri
Mar 26 13:48:30 2010
@@ -72,7 +72,7 @@ hostConfig.context.remove=Error while re
hostConfig.context.restart=Error during context [{0}] restart
hostConfig.createDirs=Unable to create directory for deployment: {0}
hostConfig.deploy=Deploying web application directory {0}
-hostConfig.deployDescriptor=Deploying configuration descriptor {0}
+hostConfig.deployDescriptor=Deploying configuration descriptor {0} from {1}
hostConfig.deployDescriptor.error=Error deploying configuration descriptor {0}
hostConfig.deployDescriptor.localDocBaseSpecified=A docBase {0} inside the
host appBase has been specified, and will be ignored
hostConfig.deployDir=Deploying web application directory {0}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48253] Tomcat Native patch - adding dynamic locking callbacks for openssl engines
https://issues.apache.org/bugzilla/show_bug.cgi?id=48253 Daniel Ruggeri changed: What|Removed |Added Keywords||NeedsReleaseNote, ||PatchAvailable -- 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 48253] Tomcat Native patch - adding dynamic locking callbacks for openssl engines
https://issues.apache.org/bugzilla/show_bug.cgi?id=48253 jfclere changed: What|Removed |Added CC||jfcl...@gmail.com -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r927877 - /tomcat/trunk/java/org/apache/catalina/loader/ResourceEntry.java
Author: kkolinko
Date: Fri Mar 26 14:40:30 2010
New Revision: 927877
URL: http://svn.apache.org/viewvc?rev=927877&view=rev
Log:
Mark ResourceEntry.loadedClass as volatile.
That is because WebappClassLoader#findClassInternal() uses double-checked
locking to initialize this field.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/ResourceEntry.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/ResourceEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/ResourceEntry.java?rev=927877&r1=927876&r2=927877&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/ResourceEntry.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/ResourceEntry.java Fri Mar 26
14:40:30 2010
@@ -47,7 +47,7 @@ public class ResourceEntry {
/**
* Loaded class.
*/
-public Class loadedClass = null;
+public volatile Class loadedClass = null;
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48253] Tomcat Native patch - adding dynamic locking callbacks for openssl engines
https://issues.apache.org/bugzilla/show_bug.cgi?id=48253 --- Comment #1 from Mladen Turk 2010-03-26 14:41:51 UTC --- Patch looks good except that there shouldn't be any static ... function/type declarations inside .h files. Just copy that from ssl_private.h directly to the ssl.c and only for the forward declarations. -- 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
Spnego support in tomcat- patch available
Hi Tomcat Developers, I have reworked the patch for Spnego support in tomcat. It is awaiting valuable comments from one of the tomcat developers/committers. The link for bugzilla is https://issues.apache.org/bugzilla/show_bug.cgi?id=48685. Kindly review and provide your comments. Thanks Ashish
svn commit: r927889 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Mar 26 14:54:11 2010 New Revision: 927889 URL: http://svn.apache.org/viewvc?rev=927889&view=rev Log: votes and proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=927889&r1=927888&r2=927889&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 26 14:54:11 2010 @@ -210,9 +210,14 @@ PATCHES PROPOSED TO BACKPORT: cause problems The patch looks bug but it just removes the sync block and sync's the method http://svn.apache.org/viewvc?rev=927565&view=rev - +1: markt + +1: markt, kkolinko -1: + Mark ResourceEntry.loadedClass as volatile. + http://svn.apache.org/viewvc?rev=927877&view=rev + +1: kkolinko + -1: + * Correct SSL session timeout attribute name http://people.apache.org/~markt/patches/2010-03-18-SslSessionTimeout.patch +1: markt @@ -231,11 +236,11 @@ PATCHES PROPOSED TO BACKPORT: * Add support for displaying the Spring Security user name in the manager app http://svn.apache.org/viewvc?rev=927062&view=rev - +1: markt + +1: markt, kkolinko -1: * Re-fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45015 Parsing re-factoring caused a regression in quote handling http://svn.apache.org/viewvc?rev=927621&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: r927896 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Mar 26 15:01:09 2010 New Revision: 927896 URL: http://svn.apache.org/viewvc?rev=927896&view=rev Log: vote and proposal updated patch summary, because IIRC the "Filip's suggestion" is not used in the proposed patch anymore Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=927896&r1=927895&r2=927896&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Mar 26 15:01:09 2010 @@ -48,12 +48,18 @@ PATCHES PROPOSED TO BACKPORT: -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44041 - Threading issue in class loading (using Filip's suggestion) plus fix for + Threading issue in class loading plus fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48694 a potential deadlock http://people.apache.org/~markt/patches/2010-03-25-bug44041.patch - +1: markt + +1: markt, kkolinko -1: + Mark ResourceEntry.loadedClass as volatile. + http://svn.apache.org/viewvc?rev=927877&view=rev + +1: kkolinko + -1: + + * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47878 Return 404's rather than a permanent 500 if a JSP is deleted Make sure first response post deletion is correct - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r927908 - /tomcat/trunk/webapps/examples/WEB-INF/web.xml
Author: fhanik Date: Fri Mar 26 15:16:52 2010 New Revision: 927908 URL: http://svn.apache.org/viewvc?rev=927908&view=rev Log: Mark example servlets as async Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=927908&r1=927907&r2=927908&view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original) +++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Fri Mar 26 15:16:52 2010 @@ -301,6 +301,7 @@ async0 async.Async0 + true async0 @@ -309,6 +310,7 @@ async1 async.Async1 + true async1 @@ -317,6 +319,7 @@ async2 async.Async2 + true async2 @@ -325,6 +328,7 @@ async3 async.Async3 + true async3 @@ -333,6 +337,7 @@ stock async.AsyncStockServlet + true stock - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47714] Reponse mixed between users
https://issues.apache.org/bugzilla/show_bug.cgi?id=47714 --- Comment #8 from Pawel Tucholski 2010-03-26 15:17:54 UTC --- Hi I think we are facing an issue similiar or same as the described and we have also mod_jk 1.2.28. However we can not reproduce it in the test env or during performance testing. Could you give me some hint on how to reproduce the issue you were facing? Is this the scenario to reproduce it? * mod_jk: Request 1 sent to tomcat got timeout after 2 mins while waiting for a response * mod_jk : Request 2 reuses the socket of the Request 1 and reads the response of the Request 1 from tomcat. The thing is that we don't set the socket_timeout (default is infinity) so that does not fit to the described scenario. Is it a true statement that DisableResuse set to false is solving your issue? Cheers Pawel -- 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: r927911 - in /tomcat/trunk/webapps/examples/WEB-INF/classes/async: Async0.java Async3.java
Author: fhanik
Date: Fri Mar 26 15:21:39 2010
New Revision: 927911
URL: http://svn.apache.org/viewvc?rev=927911&view=rev
Log:
Adjust examples to the latest implementation
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java?rev=927911&r1=927910&r2=927911&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java Fri Mar 26
15:21:39 2010
@@ -34,8 +34,8 @@ public class Async0 extends HttpServlet
private static final Log log = LogFactory.getLog(Async0.class);
@Override
-protected void service(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
-if (req.isAsyncStarted()) {
+protected void service(final HttpServletRequest req, final
HttpServletResponse resp) throws ServletException, IOException {
+if (Boolean.TRUE == req.getAttribute("dispatch")) {
log.info("Received dispatch, completing on the worker thread.");
req.getAsyncContext().complete();
log.info("After complete called started:"+req.isAsyncStarted());
@@ -47,6 +47,7 @@ public class Async0 extends HttpServlet
Runnable run = new Runnable() {
public void run() {
try {
+req.setAttribute("dispatch", Boolean.TRUE);
Thread.currentThread().setName("Async0-Thread");
log.info("Putting AsyncThread to sleep");
Thread.sleep(2*1000);
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java?rev=927911&r1=927910&r2=927911&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java Fri Mar 26
15:21:39 2010
@@ -33,7 +33,6 @@ public class Async3 extends HttpServlet
final AsyncContext actx = req.startAsync();
actx.setTimeout(30*1000);
actx.dispatch("/jsp/async/async3.jsp");
-actx.complete();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r927923 - in /tomcat/trunk/java/org/apache/catalina/startup: HostConfig.java LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties
Author: markt
Date: Fri Mar 26 15:43:44 2010
New Revision: 927923
URL: http://svn.apache.org/viewvc?rev=927923&view=rev
Log:
Clean up
- Eclipse warnings
- Unnecessary code
- Line length
- i18n message names
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=927923&r1=927922&r2=927923&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Fri Mar 26
15:43:44 2010
@@ -362,9 +362,9 @@ public class HostConfig
DeployedApplication app = deployed.get(name);
if (app == null) {
return 0L;
- } else {
- return app.timestamp;
}
+
+ return app.timestamp;
}
@@ -379,9 +379,9 @@ public class HostConfig
DeployedApplication app = deployed.get(name);
if (app == null) {
return false;
-} else {
-return true;
}
+
+return true;
}
@@ -829,9 +829,6 @@ public class HostConfig
ostream = null;
istream.close();
istream = null;
-entry = null;
-jar.close();
-jar = null;
}
} catch (Exception e) {
// Ignore and continue
@@ -868,7 +865,7 @@ public class HostConfig
// Deploy the application in this WAR file
if(log.isInfoEnabled())
-log.info(sm.getString("hostConfig.deployJar", file));
+log.info(sm.getString("hostConfig.deployWar", file));
try {
Context context = null;
@@ -928,12 +925,13 @@ public class HostConfig
}
deployedApp.redeployResources.put(docBase.getAbsolutePath(),
new Long(docBase.lastModified()));
-addWatchedResources(deployedApp, docBase.getAbsolutePath(),
context);
+addWatchedResources(deployedApp, docBase.getAbsolutePath(),
+context);
} else {
addWatchedResources(deployedApp, null, context);
}
} catch (Throwable t) {
-log.error(sm.getString("hostConfig.deployJar.error", file), t);
+log.error(sm.getString("hostConfig.deployWar.error", file), t);
}
deployed.put(contextPath, deployedApp);
@@ -1000,7 +998,8 @@ public class HostConfig
try {
context = (Context) digester.parse(xml);
if (context == null) {
-
log.error(sm.getString("hostConfig.deployDescriptor.error",
+log.error(sm.getString(
+"hostConfig.deployDescriptor.error",
xml));
return;
}
@@ -1062,7 +1061,8 @@ public class HostConfig
* @param contextPath of the context which will be checked
*/
protected boolean deploymentExists(String contextPath) {
-return (deployed.containsKey(contextPath) ||
(host.findChild(contextPath) != null));
+return (deployed.containsKey(contextPath) ||
+(host.findChild(contextPath) != null));
}
@@ -1072,9 +1072,11 @@ public class HostConfig
* @param docBase web app docBase
* @param context web application context
*/
-protected void addWatchedResources(DeployedApplication app, String
docBase, Context context) {
-// FIXME: Feature idea. Add support for patterns (ex: WEB-INF/*,
WEB-INF/*.xml), where
-//we would only check if at least one resource is newer than
app.timestamp
+protected void addWatchedResources(DeployedApplication app, String docBase,
+Context context) {
+// FIXME: Feature idea. Add support for patterns (ex: WEB-INF/*,
+//WEB-INF/*.xml), where we would only check if at least one
+//resource is newer than app.timestamp
File docBaseFile = null;
if (docBase != null) {
docBaseFile = new File(docBase);
@@ -1090,12 +1092,14 @@ public class HostConfig
resource = new File(docBaseFile, watchedResources[i]);
} else {
if(log.isDebugEna
DO NOT REPLY [Bug 47714] Reponse mixed between users
https://issues.apache.org/bugzilla/show_bug.cgi?id=47714 --- Comment #9 from Sudhir Reddy 2010-03-26 15:51:10 UTC --- > Is it a true statement that DisableResuse set to false is solving your issue? Yes, I have not seen another instance after setting this flag on our production boxes. -- 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 48997] New: enhance ssl-howto documentation
https://issues.apache.org/bugzilla/show_bug.cgi?id=48997 Summary: enhance ssl-howto documentation Product: Tomcat 5 Version: 5.5.26 Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Webapps:Documentation AssignedTo: dev@tomcat.apache.org ReportedBy: heli...@centrum.sk 1) Please, briefly describe what a keystore is. 2) typo: "withinthe" => "within the" 3) Document that keystore password cannot be empty. Mention following scenarion in the Troubleshooting section: I created my keystore using "openssl pkcs12 ..." and entered an empty password. After restarting Tomcat, catalina log contained "java.io.IOException: failed to decrypt safe contents entry: java.lang.ArithmeticException: / by zero" -- 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: r927950 - /tomcat/tc5.5.x/trunk/build/tag.bat
Author: fhanik Date: Fri Mar 26 16:20:34 2010 New Revision: 927950 URL: http://svn.apache.org/viewvc?rev=927950&view=rev Log: Adjust helper script to new SVN layout Modified: tomcat/tc5.5.x/trunk/build/tag.bat Modified: tomcat/tc5.5.x/trunk/build/tag.bat URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/tag.bat?rev=927950&r1=927949&r2=927950&view=diff == --- tomcat/tc5.5.x/trunk/build/tag.bat (original) +++ tomcat/tc5.5.x/trunk/build/tag.bat Fri Mar 26 16:20:34 2010 @@ -17,20 +17,23 @@ rem limitations under the License. @echo off rem Expects one argument, the tag name (no quotes needed, e.g. TOMCAT_5_5_13) +rem All - new layout +svn copy https://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk https://svn.apache.org/repos/asf/tomcat/tc5.5.x/tags/%1 -m "Tagging Tomcat version %1." + rem Build -svn copy https://svn.apache.org/repos/asf/tomcat/build/tc5.5.x https://svn.apache.org/repos/asf/tomcat/build/tags/tc5.5.x/%1 -m "Tagging Tomcat version %1." +rem svn copy https://svn.apache.org/repos/asf/tomcat/build/tc5.5.x https://svn.apache.org/repos/asf/tomcat/build/tags/tc5.5.x/%1 -m "Tagging Tomcat version %1." rem Connectors -svn copy https://svn.apache.org/repos/asf/tomcat/connectors/trunk https://svn.apache.org/repos/asf/tomcat/connectors/tags/tc5.5.x/%1 -m "Tagging Tomcat version %1." +rem svn copy https://svn.apache.org/repos/asf/tomcat/connectors/trunk https://svn.apache.org/repos/asf/tomcat/connectors/tags/tc5.5.x/%1 -m "Tagging Tomcat version %1." rem Container -svn copy https://svn.apache.org/repos/asf/tomcat/container/tc5.5.x https://svn.apache.org/repos/asf/tomcat/container/tags/tc5.5.x/%1 -m "Tagging Tomcat version %1." +rem svn copy https://svn.apache.org/repos/asf/tomcat/container/tc5.5.x https://svn.apache.org/repos/asf/tomcat/container/tags/tc5.5.x/%1 -m "Tagging Tomcat version %1." rem Jasper -svn copy https://svn.apache.org/repos/asf/tomcat/jasper/tc5.5.x https://svn.apache.org/repos/asf/tomcat/jasper/tags/tc5.5.x/%1 -m "Tagging Tomcat version %1." +rem svn copy https://svn.apache.org/repos/asf/tomcat/jasper/tc5.5.x https://svn.apache.org/repos/asf/tomcat/jasper/tags/tc5.5.x/%1 -m "Tagging Tomcat version %1." rem ServletAPI -svn copy https://svn.apache.org/repos/asf/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x https://svn.apache.org/repos/asf/tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/%1 -m "Tagging Tomcat version %1." +rem svn copy https://svn.apache.org/repos/asf/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x https://svn.apache.org/repos/asf/tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/%1 -m "Tagging Tomcat version %1." rem Site -svn copy https://svn.apache.org/repos/asf/tomcat/site/trunk https://svn.apache.org/repos/asf/tomcat/site/tags/%1 -m "Tagging Tomcat version %1." \ No newline at end of file +rem svn copy https://svn.apache.org/repos/asf/tomcat/site/trunk https://svn.apache.org/repos/asf/tomcat/site/tags/%1 -m "Tagging Tomcat version %1." \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r927951 - /tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Author: fhanik
Date: Fri Mar 26 16:21:57 2010
New Revision: 927951
URL: http://svn.apache.org/viewvc?rev=927951&view=rev
Log:
Adjust startAsync().complete() behavior
Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=927951&r1=927950&r2=927951&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Fri Mar 26
16:21:57 2010
@@ -74,8 +74,10 @@ public class AsyncContextImpl implements
public void complete() {
if (state.get()==AsyncState.COMPLETING) {
//do nothing
-} else if (state.compareAndSet(AsyncState.STARTED,
AsyncState.COMPLETING) ||
-state.compareAndSet(AsyncState.DISPATCHED, AsyncState.COMPLETING))
{
+} else if (state.compareAndSet(AsyncState.STARTED,
AsyncState.COMPLETING)) {
+// TODO SERVLET3 - async
+doInternalComplete(false);
+} else if (state.compareAndSet(AsyncState.DISPATCHED,
AsyncState.COMPLETING)) {
// TODO SERVLET3 - async
AtomicBoolean dispatched = new AtomicBoolean(false);
request.getCoyoteRequest().action(ActionCode.ACTION_ASYNC_COMPLETE,dispatched);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48998] New: Proposal : port mod_expires in java as ExpiresFilter Servlet Filter
https://issues.apache.org/bugzilla/show_bug.cgi?id=48998 Summary: Proposal : port mod_expires in java as ExpiresFilter Servlet Filter Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Mac OS X 10.4 Status: NEW Severity: enhancement Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: clecl...@pobox.com Created an attachment (id=25189) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25189) Port of mod_expires as ExpiresFilter Here is a proposal to port Apache Httpd mod_expires in java as ExpiresFilter, a standard Servlet Filter. I detailed a standalone version on http://code.google.com/p/xebia-france/wiki/ExpiresFilter . More over, I tried my best to provide very detailed javadocs and docs (in filter.html). The proposed contribution is slightly different because it uses Tomcat logging, few Servlet 3 enhancements and test cases use Tomcat engine. The attached patch contains : * ExpiresFilter.java : the Expires Filter * TestExpiresFilter : detailed test cases * filter.xml : doc updates The filter has been optimized using a profiler and stress tested with Apache Bench under high load. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tomcat 5.5 does not compile
Somehow 1.5 classes got inserted. 5.5 is compiled using JDK 1.4 build-catalina-core: [javac] Compiling 319 source files to C:\development\tomcat\tc5build\tc5.5.x\trunk\build\build\classes [javac] C:\development\tomcat\tc5build\tc5.5.x\trunk\container\catalina\src\share\org\apache\catalina\loader\WebappC lassLoader.java:2150: cannot resolve symbol [javac] symbol : constructor IllegalArgumentException (java.lang.String,java.io.IOException) [javac] location: class java.lang.IllegalArgumentException [javac] throw new IllegalArgumentException( [javac] ^ [javac] C:\development\tomcat\tc5build\tc5.5.x\trunk\container\catalina\src\share\org\apache\catalina\startup\HostCo nfig.java:750: cannot resolve symbol [javac] symbol : class StringBuilder [javac] location: class org.apache.catalina.startup.HostConfig [javac] StringBuilder docBase; [javac] ^ [javac] C:\development\tomcat\tc5build\tc5.5.x\trunk\container\catalina\src\share\org\apache\catalina\startup\HostCo nfig.java:755: cannot resolve symbol [javac] symbol : class StringBuilder [javac] location: class org.apache.catalina.startup.HostConfig [javac] docBase = new StringBuilder(canonicalAppBase); [javac] ^ [javac] Note: Some input files use or override a deprecated API. [javac] Note: Recompile with -deprecation for details. [javac] 3 errors BUILD FAILED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 5.5 does not compile
On 26/03/2010 16:58, Filip Hanik - Dev Lists wrote: > Somehow 1.5 classes got inserted. 5.5 is compiled using JDK 1.4 The first one was me. I'll fix that now. Mark > > build-catalina-core: > [javac] Compiling 319 source files to > C:\development\tomcat\tc5build\tc5.5.x\trunk\build\build\classes > [javac] > C:\development\tomcat\tc5build\tc5.5.x\trunk\container\catalina\src\share\org\apache\catalina\loader\WebappC > > lassLoader.java:2150: cannot resolve symbol > [javac] symbol : constructor IllegalArgumentException > (java.lang.String,java.io.IOException) > [javac] location: class java.lang.IllegalArgumentException > [javac] throw new > IllegalArgumentException( > [javac] ^ > [javac] > C:\development\tomcat\tc5build\tc5.5.x\trunk\container\catalina\src\share\org\apache\catalina\startup\HostCo > > nfig.java:750: cannot resolve symbol > [javac] symbol : class StringBuilder > [javac] location: class org.apache.catalina.startup.HostConfig > [javac] StringBuilder docBase; > [javac] ^ > [javac] > C:\development\tomcat\tc5build\tc5.5.x\trunk\container\catalina\src\share\org\apache\catalina\startup\HostCo > > nfig.java:755: cannot resolve symbol > [javac] symbol : class StringBuilder > [javac] location: class org.apache.catalina.startup.HostConfig > [javac] docBase = new StringBuilder(canonicalAppBase); > [javac] ^ > [javac] Note: Some input files use or override a deprecated API. > [javac] Note: Recompile with -deprecation for details. > [javac] 3 errors > > BUILD FAILED > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r927971 - /tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Fri Mar 26 17:10:02 2010
New Revision: 927971
URL: http://svn.apache.org/viewvc?rev=927971&view=rev
Log:
Remove Java 5 usage that was added in r919406
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=927971&r1=927970&r2=927971&view=diff
==
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Fri Mar 26 17:10:02 2010
@@ -2147,9 +2147,12 @@ public class WebappClassLoader
jarEntry2.getName()));
}
} catch (IOException ioe) {
-throw new IllegalArgumentException(
+IllegalArgumentException iae =
+new IllegalArgumentException(
sm.getString("webappClassLoader.validationErrorJarPath",
-
jarEntry2.getName()), ioe);
+
jarEntry2.getName()));
+iae.initCause(ioe);
+throw iae;
}
resourceFile.getParentFile().mkdirs();
FileOutputStream os = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 5.5 does not compile
On 26/03/2010 17:05, Mark Thomas wrote: > On 26/03/2010 16:58, Filip Hanik - Dev Lists wrote: >> Somehow 1.5 classes got inserted. 5.5 is compiled using JDK 1.4 > > The first one was me. I'll fix that now. Done. The others look like me too. Fixing them now... Mark >> build-catalina-core: >> [javac] Compiling 319 source files to >> C:\development\tomcat\tc5build\tc5.5.x\trunk\build\build\classes >> [javac] >> C:\development\tomcat\tc5build\tc5.5.x\trunk\container\catalina\src\share\org\apache\catalina\loader\WebappC >> >> lassLoader.java:2150: cannot resolve symbol >> [javac] symbol : constructor IllegalArgumentException >> (java.lang.String,java.io.IOException) >> [javac] location: class java.lang.IllegalArgumentException >> [javac] throw new >> IllegalArgumentException( >> [javac] ^ >> [javac] >> C:\development\tomcat\tc5build\tc5.5.x\trunk\container\catalina\src\share\org\apache\catalina\startup\HostCo >> >> nfig.java:750: cannot resolve symbol >> [javac] symbol : class StringBuilder >> [javac] location: class org.apache.catalina.startup.HostConfig >> [javac] StringBuilder docBase; >> [javac] ^ >> [javac] >> C:\development\tomcat\tc5build\tc5.5.x\trunk\container\catalina\src\share\org\apache\catalina\startup\HostCo >> >> nfig.java:755: cannot resolve symbol >> [javac] symbol : class StringBuilder >> [javac] location: class org.apache.catalina.startup.HostConfig >> [javac] docBase = new StringBuilder(canonicalAppBase); >> [javac] ^ >> [javac] Note: Some input files use or override a deprecated API. >> [javac] Note: Recompile with -deprecation for details. >> [javac] 3 errors >> >> BUILD FAILED >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r927973 - /tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Author: markt
Date: Fri Mar 26 17:11:59 2010
New Revision: 927973
URL: http://svn.apache.org/viewvc?rev=927973&view=rev
Log:
Remove Java 5 usage that was added in r902650
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/startup/HostConfig.java?rev=927973&r1=927972&r2=927973&view=diff
==
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/startup/HostConfig.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Fri Mar 26 17:11:59 2010
@@ -747,12 +747,12 @@ public class HostConfig
// More complicated than the ideal as the canonical path may or may
// not end with File.separator for a directory
-StringBuilder docBase;
+StringBuffer docBase;
String canonicalDocBase = null;
try {
String canonicalAppBase = appBase.getCanonicalPath();
-docBase = new StringBuilder(canonicalAppBase);
+docBase = new StringBuffer(canonicalAppBase);
if (canonicalAppBase.endsWith(File.separator)) {
docBase.append(contextPath.substring(1).replace(
'/', File.separatorChar));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 5.5 does not compile
On 26/03/2010 17:10, Mark Thomas wrote: > On 26/03/2010 17:05, Mark Thomas wrote: >> On 26/03/2010 16:58, Filip Hanik - Dev Lists wrote: >>> Somehow 1.5 classes got inserted. 5.5 is compiled using JDK 1.4 >> >> The first one was me. I'll fix that now. > > Done. > > The others look like me too. Fixing them now... Done. Sorry for the hassle. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49000] New: Cookie parsing bug when an empty value has an equal sign on the end
https://issues.apache.org/bugzilla/show_bug.cgi?id=49000 Summary: Cookie parsing bug when an empty value has an equal sign on the end Product: Tomcat 7 Version: unspecified Platform: PC OS/Version: Mac OS X 10.4 Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: hyand...@amazon.com Created an attachment (id=25190) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25190) Code patch that stops the loop parsing the final character if it's an equal sign Cookie values such as the following don't get their last value parsed as an empty value. i.e. this does create a 'bob' cookie key: Cookie: fred=1; jim=2; bob and this doesn't create a 'bob' cookie key: Cookie: fred=1; jim=2; bob= -- 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 49000] Cookie parsing bug when an empty value has an equal sign on the end
https://issues.apache.org/bugzilla/show_bug.cgi?id=49000 --- Comment #1 from Henri Yandell 2010-03-26 20:09:24 UTC --- Created an attachment (id=25191) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25191) Unit test patch -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48990] Build fails on Linux when skip.installer set to true
https://issues.apache.org/bugzilla/show_bug.cgi?id=48990 --- Comment #3 from Henri Yandell 2010-03-26 20:37:49 UTC --- Noting that this is not a problem with 7.0 from trunk. Previous problems are with the official src.tar.gz downloads 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: r928120 - in /tomcat/trunk/java/org/apache: catalina/connector/ catalina/core/ catalina/valves/ coyote/ajp/ coyote/http11/
Author: fhanik
Date: Sat Mar 27 01:50:13 2010
New Revision: 928120
URL: http://svn.apache.org/viewvc?rev=928120&view=rev
Log:
Add in some debug, what is causing some TCK failures is a request/response pair
not being recycled properly
Modified:
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/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=928120&r1=928119&r2=928120&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Sat Mar
27 01:50:13 2010
@@ -344,7 +344,7 @@ public class CoyoteAdapter implements Ad
} finally {
req.getRequestProcessor().setWorkerThreadName(null);
// Recycle the wrapper request and response
-if (!comet && !async) {
+if (!success || (!comet && !async)) {
request.recycle();
response.recycle();
} else {
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=928120&r1=928119&r2=928120&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Sat Mar 27
01:50:13 2010
@@ -490,6 +490,7 @@ public class Request
asyncSupported = null;
if (asyncContext!=null) asyncContext.recycle();
+asyncContext = null;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=928120&r1=928119&r2=928120&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Sat Mar 27
01:50:13 2010
@@ -66,18 +66,22 @@ public class AsyncContextImpl implements
private Request request;
public AsyncContextImpl(Request request) {
+if (log.isDebugEnabled()) {
+log.debug("AsyncContext
created["+request.getRequestURI()+"?"+request.getQueryString()+"]", new
DebugException());
+}
//TODO SERVLET3 - async
this.request = request;
}
@Override
public void complete() {
+if (log.isDebugEnabled()) {
+log.debug("AsyncContext Complete Called["+state.get()+";
"+request.getRequestURI()+"?"+request.getQueryString()+"]", new
DebugException());
+}
if (state.get()==AsyncState.COMPLETING) {
//do nothing
-} else if (state.compareAndSet(AsyncState.STARTED,
AsyncState.COMPLETING)) {
-// TODO SERVLET3 - async
-doInternalComplete(false);
-} else if (state.compareAndSet(AsyncState.DISPATCHED,
AsyncState.COMPLETING)) {
+} else if (state.compareAndSet(AsyncState.DISPATCHED,
AsyncState.COMPLETING) ||
+ state.compareAndSet(AsyncState.STARTED,
AsyncState.COMPLETING)) {
// TODO SERVLET3 - async
AtomicBoolean dispatched = new AtomicBoolean(false);
request.getCoyoteRequest().action(ActionCode.ACTION_ASYNC_COMPLETE,dispatched);
@@ -104,12 +108,16 @@ public class AsyncContextImpl implements
@Override
public void dispatch(ServletContext context, String path) {
+if (log.isDebugEnabled()) {
+log.debug("AsyncContext Dispatch Called["+state.get()+"; "+path+";
"+request.getRequestURI()+"?"+request.getQueryString()+"]", new
DebugException());
+}
+
// TODO SERVLET3 - async
if (state.compareAndSet(AsyncState.STARTED, AsyncState.DISPATCHING) ||
state.compareAndSet(AsyncState.DISPATCHED,
AsyncState.DISPATCHING)) {
if (request.getAttribute(ASYNC_REQUEST_URI)==null) {
-request.setAttribute(ASYNC_REQUEST_URI,
request.getRequestURI());
+request.setAttribute(ASYNC_REQUEST_URI,
request.getRequestURI()+"?"+request.getQueryString());
request.setAttribute(ASYNC_CONTEXT
