DO NOT REPLY [Bug 49867] default library location into the project tree
https://issues.apache.org/bugzilla/show_bug.cgi?id=49867 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Mark Thomas 2010-09-03 03:03:05 EDT --- The current default places the libs outside the project tree so they can be shared between multiple projects. You are, of course, free to use whatever dir you like on your system. -- 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 49868] refactor BeanELResolver.java invoke()
https://issues.apache.org/bugzilla/show_bug.cgi?id=49868 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Mark Thomas 2010-09-03 03:05:06 EDT --- Random patches without explanation are not going to get applied. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Voting for issues.
On 02/09/2010 20:43, Wesley Acheson wrote: > I understand that the Apache voting system is a bit odd. For enhancement > requests though is there no way for users to vote for the features that they > would like. (Which is different to you as devs voting on whether to apply a > patch or not). I'm pretty sure that's a normal bugzilla feature but I > haven't seen it in your installation. It is currently enabled for: - Tomcat 3 - Tomcat 4 - Tomcat 5 It is currently disabled for: - Tomcat 6 - Tomcat 7 - Tomcat Connectors - Tomcat Modules - Tomcat Native I don't recall it ever being used very much (by users or by committers) so I disabled it for the newer projects. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Voting for issues.
> I don't recall it ever being used very much (by users or by committers) > so I disabled it for the newer projects. > > Okay fair enough. Would the best process for suggesting changes be to raise a discussion on the users list? Suggestions that outside the users ability to patch. Oh and there is no way to register interest in something that's already there? --- PERSONALLY: I saw someone had a patch to salt passwords and even though we bypass the tomcat authentication mechanisms at work I think security is a worthwhile effort so I wanted to vote on that. Regards, Wes
DO NOT REPLY [Bug 49868] refactor BeanELResolver.java invoke()
https://issues.apache.org/bugzilla/show_bug.cgi?id=49868 --- Comment #2 from Konstantin Kolinko 2010-09-03 04:22:38 EDT --- You cannot introduce new protected methods in a class in javax.el package. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Voting for issues.
On 03/09/2010 08:56, Wesley Acheson wrote: >> I don't recall it ever being used very much (by users or by committers) >> so I disabled it for the newer projects. >> >> > Okay fair enough. Would the best process for suggesting changes be to raise > a discussion on the users list? Suggestions that outside the users ability > to patch. I'd say requirements discussions belong on the users list. How to implement them belongs on the dev list. It will never be that black and white but a little cross-over isn't an issue. I'd suggest leaning towards the users list if you are unsure. > Oh and there is no way to register interest in something that's already > there? There will be in about 5 minutes. > I saw someone had a patch to salt passwords and even though we bypass the > tomcat authentication mechanisms at work I think security is a worthwhile > effort so I wanted to vote on that. I'll turn voting back on for the Tomcat projects where it is currently disabled and we can see how much use it gets. The only 'cost' is mails to the dev list when someone votes. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47081] Add support for RFC 2817 - Upgrading to TLS Within HTTP/1.1
https://issues.apache.org/bugzilla/show_bug.cgi?id=47081 Mark Thomas changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever Confirmed|0 |1 --- Comment #1 from Mark Thomas 2010-09-03 04:46:13 EDT --- *** This bug has been confirmed by popular vote. *** -- 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 23406] Jasper should use file size as well as date for recompile check
https://issues.apache.org/bugzilla/show_bug.cgi?id=23406 Mark Thomas changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever Confirmed|0 |1 --- Comment #3 from Mark Thomas 2010-09-03 04:47:02 EDT --- *** This bug has been confirmed by popular vote. *** -- 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 24174] [PACTH]/home/cvspublic/jakarta-tomcat-4.0/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java
https://issues.apache.org/bugzilla/show_bug.cgi?id=24174 Mark Thomas changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever Confirmed|0 |1 --- Comment #1 from Mark Thomas 2010-09-03 04:47:02 EDT --- *** This bug has been confirmed by popular vote. *** -- 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 49871] http 404 status error
https://issues.apache.org/bugzilla/show_bug.cgi?id=49871 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2010-09-03 04:48:53 EDT --- Bugzilla is not a support forum. Use the users mailing list. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992234 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: rjung
Date: Fri Sep 3 08:54:20 2010
New Revision: 992234
URL: http://svn.apache.org/viewvc?rev=992234&view=rev
Log:
BZ 49869: Javadoc Fix.
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=992234&r1=992233&r2=992234&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Fri Sep
3 08:54:20 2010
@@ -233,8 +233,10 @@ public class WebappClassLoader
/**
- * Construct a new ClassLoader with no defined repositories and no
+ * Construct a new ClassLoader with no defined repositories and the given
* parent ClassLoader.
+ *
+ * @param parent Our parent class loader
*/
public WebappClassLoader(ClassLoader parent) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992238 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: rjung
Date: Fri Sep 3 08:57:45 2010
New Revision: 992238
URL: http://svn.apache.org/viewvc?rev=992238&view=rev
Log:
BZ 49869: Javadoc Fix.
CTR.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=992238&r1=992237&r2=992238&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Fri Sep 3 08:57:45 2010
@@ -250,8 +250,10 @@ public class WebappClassLoader
/**
- * Construct a new ClassLoader with no defined repositories and no
+ * Construct a new ClassLoader with no defined repositories and the given
* parent ClassLoader.
+ *
+ * @param parent Our parent class loader
*/
public WebappClassLoader(ClassLoader parent) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992240 - /tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Author: rjung
Date: Fri Sep 3 09:00:10 2010
New Revision: 992240
URL: http://svn.apache.org/viewvc?rev=992240&view=rev
Log:
BZ 49869: Javadoc Fix.
CTR.
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=992240&r1=992239&r2=992240&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 Sep 3 09:00:10 2010
@@ -231,8 +231,10 @@ public class WebappClassLoader
/**
- * Construct a new ClassLoader with no defined repositories and no
+ * Construct a new ClassLoader with no defined repositories and the given
* parent ClassLoader.
+ *
+ * @param parent Our parent class loader
*/
public WebappClassLoader(ClassLoader parent) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 38895] Http headers with an underscore "_" change into hyphen "-"
https://issues.apache.org/bugzilla/show_bug.cgi?id=38895 --- Comment #5 from Joachim Wagner 2010-09-03 05:02:02 EDT --- General comment (without knowing tomcat): HTTP RFC 2616 defines HTTP header field names as case-insensitive. Existing applications will break if suddenly the raw headers are used and the problems may not surface in testing as your test client probably uses the same casing as your server app. http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2 My best guess why underscores are converted to hyphens by tomcat is that apache httpd converts in the other direction (in order to generate valid environment variable names for CGI programs). -- 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 49869] Javadoc for WebAppClassLoader constructor has copy/paste error
https://issues.apache.org/bugzilla/show_bug.cgi?id=49869 Rainer Jung changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED OS/Version||All --- Comment #1 from Rainer Jung 2010-09-03 05:11:41 EDT --- Thanks. Fixed in r992234 (trunk), r992238 (tc6) and r992240 (tc5.5). -- 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 38895] Http headers with an underscore "_" change into hyphen "-"
https://issues.apache.org/bugzilla/show_bug.cgi?id=38895 --- Comment #6 from Rainer Jung 2010-09-03 05:15:56 EDT --- This is not about Tomcat itself but instead about forwarding requests through a web server reverse proxy. More precisely about using the ISAPI redirector plugin to IIS provided by the Tomcat connectors project. Traditionally that plugin does some mangling of the request headers before forwarding them to Tomcat (because of using a specific part of the IIS API which behaves similar to the CGI headers convention). After the change, te headers will be forward to Tomcat as is. -- 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: r992245 - in /tomcat/trunk/java/org/apache/catalina: ./ authenticator/ connector/ core/ ha/session/ ha/tcp/ loader/ realm/ session/ util/ valves/
Author: markt
Date: Fri Sep 3 09:48:46 2010
New Revision: 992245
URL: http://svn.apache.org/viewvc?rev=992245&view=rev
Log:
Expose current state of Lifecycle components via JMX beans (where a component
has one). Mainly useful for monitoring web application status.
Modified:
tomcat/trunk/java/org/apache/catalina/Lifecycle.java
tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml
Modified: tomcat/trunk/java/org/apache/catalina/Lifecycle.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Lifecycle.java?rev=992245&r1=992244&r2=992245&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Lifecycle.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Lifecycle.java Fri Sep 3 09:48:46
2010
@@ -287,4 +287,11 @@ public interface Lifecycle {
* @return The current state of the source component.
*/
public LifecycleState getState();
+
+
+/**
+ * Obtain a textual representation of the current component state. Useful
+ * for JMX.
+ */
+public String getStateName();
}
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml?rev=992245&r1=992244&r2=992245&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
Fri Sep 3 09:48:46 2010
@@ -23,7 +23,7 @@
group="Valve"
type="org.apache.catalina.authenticator.BasicAuthenticator">
-
@@ -31,7 +31,7 @@
description="Should we cache authenticated Principals if the
request is part of an HTTP session?"
type="boolean"/>
-
@@ -39,6 +39,10 @@
+
+
@@ -56,14 +60,18 @@
description="Should we cache authenticated Principals if the
request is part of an HTTP session?"
type="boolean"/>
-
-
+
+
-
-
-
-
+
+
+
+
@@ -121,7 +137,7 @@
group="Valve"
type="org.apache.catalina.authenticator.SingleSignOn">
-
@@ -133,7 +149,10 @@
-
+
+
@@ -159,6 +178,10 @@
+
+
Modified: tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=992245&r1=992244&r2=992245&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml Fri
Sep 3 09:48:46 2010
@@ -145,6 +145,10 @@
description="Comma-separated list of SSL protocol variants to be
enabled"
type="java.lang.String"/>
+
+
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=992245&r1=992244&r2=992245&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Fri Sep
3 09:48:46 2010
@@ -324,6 +324,10 @@
is="true"
type="boolean"
writeable="false" />
+
+
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=992245&r1=992244&r2=992245&view=dif
svn commit: r992246 - /tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
Author: markt Date: Fri Sep 3 09:49:52 2010 New Revision: 992246 URL: http://svn.apache.org/viewvc?rev=992246&view=rev Log: Remove method that no longer exists Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=992246&r1=992245&r2=992246&view=diff == --- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Fri Sep 3 09:49:52 2010 @@ -315,10 +315,6 @@ description="Time (in milliseconds) it took to start this context" type="long"/> - -
svn commit: r992250 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: mturk
Date: Fri Sep 3 10:12:57 2010
New Revision: 992250
URL: http://svn.apache.org/viewvc?rev=992250&view=rev
Log:
Add wrapper over Socket.destroy which will make sure we don't call destory for
sockets already closed by the parent pool cleanup
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=992250&r1=992249&r2=992250&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Sep 3
10:12:57 2010
@@ -904,6 +904,15 @@ public class AprEndpoint extends Abstrac
return true;
}
+private void destroySocket(long socket)
+{
+if (running && socket != 0) {
+// If not running the socket will be destroyed by
+// parent pool or acceptor socket.
+// In any case disable double free which would cause JVM core.
+Socket.destroy(socket);
+}
+}
// --- Acceptor Inner Class
@@ -944,13 +953,13 @@ public class AprEndpoint extends Abstrac
* socket and don't process it.
*/
if (deferAccept && (paused || !running)) {
-Socket.destroy(socket);
+destroySocket(socket);
continue;
}
// Hand this socket off to an appropriate processor
if (!processSocketWithOptions(socket)) {
// Close socket and pool right away
-Socket.destroy(socket);
+destroySocket(socket);
}
} catch (Throwable t) {
if (running)
log.error(sm.getString("endpoint.accept.fail"), t);
@@ -1024,7 +1033,7 @@ public class AprEndpoint extends Abstrac
if (comet) {
processSocket(addS[i], SocketStatus.STOP);
} else {
-Socket.destroy(addS[i]);
+destroySocket(addS[i]);
}
}
// Close all sockets still in the poller
@@ -1034,7 +1043,7 @@ public class AprEndpoint extends Abstrac
if (comet) {
processSocket(desc[n*2+1], SocketStatus.STOP);
} else {
-Socket.destroy(desc[n*2+1]);
+destroySocket(desc[n*2+1]);
}
}
}
@@ -1060,7 +1069,7 @@ public class AprEndpoint extends Abstrac
if (comet) {
processSocket(socket, SocketStatus.ERROR);
} else {
-Socket.destroy(socket);
+destroySocket(socket);
}
return;
}
@@ -1124,7 +1133,7 @@ public class AprEndpoint extends Abstrac
if (comet) {
processSocket(addS[i],
SocketStatus.ERROR);
} else {
-Socket.destroy(addS[i]);
+destroySocket(addS[i]);
}
}
}
@@ -1150,7 +1159,7 @@ public class AprEndpoint extends Abstrac
if (comet) {
processSocket(desc[n*2+1],
SocketStatus.DISCONNECT);
} else {
-Socket.destroy(desc[n*2+1]);
+destroySocket(desc[n*2+1]);
}
continue;
}
@@ -1181,7 +1190,7 @@ public class AprEndpoint extends Abstrac
if (comet) {
processSocket(desc[n],
SocketStatus.TIMEOUT);
} else {
-Socket.destroy(desc[n]);
+destroySocket(desc[n]);
}
}
}
@@ -1278,14 +1287,14 @@ public class AprEndpoint extends Abstrac
addCount = 0;
for (int i = (addS.size() - 1); i >= 0; i--) {
SendfileData data = addS.get(i);
-Socket.destroy(data.socket);
+destroySocket(data.socket);
}
addS.clear();
// Close a
svn commit: r992252 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: mturk
Date: Fri Sep 3 10:16:00 2010
New Revision: 992252
URL: http://svn.apache.org/viewvc?rev=992252&view=rev
Log:
Call join only for alive threads
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=992252&r1=992251&r2=992252&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Sep 3
10:16:00 2010
@@ -692,32 +692,38 @@ public class AprEndpoint extends Abstrac
}
for (int i = 0; i < pollers.length; i++) {
pollers[i].destroy();
-try {
-pollers[i].interrupt();
-pollers[i].join();
-} catch (InterruptedException e) {
+if (pollers[i].isAlive()) {
+try {
+ pollers[i].interrupt();
+pollers[i].join();
+} catch (InterruptedException e) {
// Ignore
+}
}
}
pollers = null;
for (int i = 0; i < cometPollers.length; i++) {
cometPollers[i].destroy();
-try {
-cometPollers[i].interrupt();
-cometPollers[i].join();
-} catch (InterruptedException e) {
+if (cometPollers[i].isAlive()) {
+try {
+cometPollers[i].interrupt();
+cometPollers[i].join();
+} catch (InterruptedException e) {
// Ignore
+}
}
}
cometPollers = null;
if (useSendfile) {
for (int i = 0; i < sendfiles.length; i++) {
sendfiles[i].destroy();
-try {
-sendfiles[i].interrupt();
-sendfiles[i].join();
-} catch (InterruptedException e) {
-// Ignore
+if (sendfiles[i].isAlive()) {
+try {
+sendfiles[i].interrupt();
+sendfiles[i].join();
+} catch (InterruptedException e) {
+// Ignore
+}
}
}
sendfiles = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992253 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Sep 3 10:19:20 2010 New Revision: 992253 URL: http://svn.apache.org/viewvc?rev=992253&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=992253&r1=992252&r2=992253&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 3 10:19:20 2010 @@ -196,3 +196,11 @@ PATCHES PROPOSED TO BACKPORT: http://people.apache.org/~markt/patches/2010-08-25-bug38113.patch +1: markt, kkolinko, rjung -1: + +* Provide better web application state information via JMX + A limited back-port of http://svn.apache.org/viewvc?rev=992245&view=rev that + could be extended to other components that use LifecycleSupport and expose + an MBean + http://people.apache.org/~markt/patches/2010-09-03-better-state-info.patch + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992258 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: mturk
Date: Fri Sep 3 10:37:53 2010
New Revision: 992258
URL: http://svn.apache.org/viewvc?rev=992258&view=rev
Log:
Make destroy method returning when the worker thread finishes instead
separately calling destroy followed by join
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=992258&r1=992257&r2=992258&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Sep 3
10:37:53 2010
@@ -671,59 +671,37 @@ public class AprEndpoint extends Abstrac
running = false;
unlockAccept();
for (int i = 0; i < acceptors.length; i++) {
-if (acceptors[i].isAlive()) {
+while (acceptors[i].isAlive()) {
try {
acceptors[i].interrupt();
-acceptors[i].join();
+acceptors[i].join(1000);
} catch (InterruptedException e) {
// Ignore
}
}
}
-// Wait for polltime before doing anything, so that the poller
threads
-// exit, otherwise parallel destruction of sockets which are still
-// in the poller can cause problems
-try {
-synchronized (this) {
-this.wait(pollTime / 1000);
-}
-} catch (InterruptedException e) {
-// Ignore
-}
for (int i = 0; i < pollers.length; i++) {
-pollers[i].destroy();
-if (pollers[i].isAlive()) {
-try {
- pollers[i].interrupt();
-pollers[i].join();
-} catch (InterruptedException e) {
-// Ignore
-}
+try {
+pollers[i].destroy();
+} catch (Exception e) {
+// Ignore
}
}
pollers = null;
for (int i = 0; i < cometPollers.length; i++) {
-cometPollers[i].destroy();
-if (cometPollers[i].isAlive()) {
-try {
-cometPollers[i].interrupt();
-cometPollers[i].join();
-} catch (InterruptedException e) {
-// Ignore
-}
+try {
+cometPollers[i].destroy();
+} catch (Exception e) {
+// Ignore
}
}
cometPollers = null;
if (useSendfile) {
for (int i = 0; i < sendfiles.length; i++) {
-sendfiles[i].destroy();
-if (sendfiles[i].isAlive()) {
-try {
-sendfiles[i].interrupt();
-sendfiles[i].join();
-} catch (InterruptedException e) {
-// Ignore
-}
+try {
+sendfiles[i].destroy();
+} catch (Exception e) {
+// Ignore
}
}
sendfiles = null;
@@ -1056,6 +1034,14 @@ public class AprEndpoint extends Abstrac
Pool.destroy(pool);
keepAliveCount = 0;
addCount = 0;
+try {
+while (this.isAlive()) {
+this.interrupt();
+this.join(1000);
+}
+} catch (InterruptedException e) {
+// Ignore
+}
}
/**
@@ -1305,6 +1291,14 @@ public class AprEndpoint extends Abstrac
}
Pool.destroy(pool);
sendfileData.clear();
+try {
+while (this.isAlive()) {
+this.interrupt();
+this.join(1000);
+}
+} catch (InterruptedException e) {
+// Ignore
+}
}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49868] refactor BeanELResolver.java invoke()
https://issues.apache.org/bugzilla/show_bug.cgi?id=49868 Gábor changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WONTFIX | --- Comment #3 from Gábor 2010-09-03 08:14:10 EDT --- Mark, the method invoke in the current tree is very complex, so splitting it up into several methods might be desirable. Konstantin, would making the new methods private work? -- 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 49876] New: correcting generics related compile warning in org/apache/tomcat/util/bcel/classfile files
https://issues.apache.org/bugzilla/show_bug.cgi?id=49876 Summary: correcting generics related compile warning in org/apache/tomcat/util/bcel/classfile files Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Windows XP Status: NEW Severity: trivial Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: glip...@gmail.com Explanation: Several files have compile time generics related warnings displayed for org/apache/tomcat/util/bcel/classfile. This patch cleans up several of those warnings. -- 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 49876] correcting generics related compile warning in org/apache/tomcat/util/bcel/classfile files
https://issues.apache.org/bugzilla/show_bug.cgi?id=49876 --- Comment #1 from Gábor 2010-09-03 08:18:20 EDT --- Created an attachment (id=25980) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25980) Diff attached -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49868] refactor BeanELResolver.java invoke()
https://issues.apache.org/bugzilla/show_bug.cgi?id=49868 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||WONTFIX --- Comment #4 from Mark Thomas 2010-09-03 09:15:54 EDT --- The patch just moves stuff around. If improving understanding is your goal then comments would be more useful. Any additional methods would have to be private -- 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: r992290 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
Author: markt
Date: Fri Sep 3 13:20:22 2010
New Revision: 992290
URL: http://svn.apache.org/viewvc?rev=992290&view=rev
Log:
Keep MBean names consistent with Tomact 6.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=992290&r1=992289&r2=992290&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Sep 3
13:20:22 2010
@@ -5570,7 +5570,7 @@ public class StandardContext extends Con
}
private String getObjectKeyPropertiesNameOnly() {
-StringBuilder result = new StringBuilder("name=");
+StringBuilder result = new StringBuilder("name=//");
String hostname = getParent().getName();
if (hostname == null) {
result.append("DEFAULT");
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=992290&r1=992289&r2=992290&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Sep 3 13:20:22 2010
@@ -106,6 +106,10 @@
48967: Replace strings "catalina.base" and "catalina.home"
by globally defined constants. Patch provided by Marc Guillemot.
(rjung)
+
+Keep the MBean names for web applications consistent between Tomcat 6
+and Tomcat 7. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.2
On 05/08/2010 22:09, Jason Brittain wrote: > One thing I noticed while testing 7.0.2 is that the WebModule MBean > ObjectNames differ slightly from those of Tomcat 6. Example: > > Tomcat 7.0.2, ObjectName for the context "/": > Catalina:j2eeType=WebModule,name=localhost/,J2EEApplication=none,J2EEServer=none > > Tomcat 6.0.x, ObjectName for the context "/": > Catalina:j2eeType=WebModule,name=//localhost/,J2EEApplication=none,J2EEServer=none I don't see any reason for the // in the Tomcat 6 name either but I have added them back for Tomcat 7 to keep things consistent. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.2
Thanks Mark! It's probably from a very long time ago, in which case there could be years worth of code that depends on these slashes being there. -- Jason On Fri, Sep 3, 2010 at 6:21 AM, Mark Thomas wrote: > On 05/08/2010 22:09, Jason Brittain wrote: > > One thing I noticed while testing 7.0.2 is that the WebModule MBean > > ObjectNames differ slightly from those of Tomcat 6. Example: > > > > Tomcat 7.0.2, ObjectName for the context "/": > > > Catalina:j2eeType=WebModule,name=localhost/,J2EEApplication=none,J2EEServer=none > > > > Tomcat 6.0.x, ObjectName for the context "/": > > > Catalina:j2eeType=WebModule,name=//localhost/,J2EEApplication=none,J2EEServer=none > > I don't see any reason for the // in the Tomcat 6 name either but I have > added them back for Tomcat 7 to keep things consistent. > > Mark >
Ready for Tomcat 5.5.31?
I think we're at the stage where I can go ahead and T&R Tomcat 5.5.31... Anyone disagree? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992356 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: jim Date: Fri Sep 3 16:25:14 2010 New Revision: 992356 URL: http://svn.apache.org/viewvc?rev=992356&view=rev Log: "Final" patch before 5.5.31... 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=992356&r1=992355&r2=992356&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Sep 3 16:25:14 2010 @@ -25,6 +25,16 @@ $Id$ PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38113 + Add system property to allow spec compliant handling of query string + http://people.apache.org/~markt/patches/2010-08-25-bug38113.patch + -1: + +1: kkolinko jim, rjung, markt: (only with the following trivial change: + s/Boolean.parseBoolean(..)/Boolean.valueOf(..).booleanValue()/ + because parseBoolean is @since 1.5. + See Globals.java line 334 for an example. + ) + * Remove JSSE13Factory, JSSE13SocketFactory classes, because @@ -79,16 +89,6 @@ PATCHES PROPOSED TO BACKPORT: a (looking at the default server.xml), so we have to call request.getContext() to get a Context there? -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38113 - Add system property to allow spec compliant handling of query string - http://people.apache.org/~markt/patches/2010-08-25-bug38113.patch - -1: - +1: kkolinko jim, rjung, markt: (only with the following trivial change: - s/Boolean.parseBoolean(..)/Boolean.valueOf(..).booleanValue()/ - because parseBoolean is @since 1.5. - See Globals.java line 334 for an example. - ) - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49774 Add SSL support using the APR connector to the admin app https://issues.apache.org/bugzilla/attachment.cgi?id=25954 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Ready for Tomcat 5.5.31?
On 09/03/2010 06:19 PM, Jim Jagielski wrote: I think we're at the stage where I can go ahead and T&R Tomcat 5.5.31... Anyone disagree? There are still couple of STATUS.txt things that get voted (dunno if committed cause they are still in the STATUS) and one that I'm just about to +1. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992362 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: mturk Date: Fri Sep 3 16:35:39 2010 New Revision: 992362 URL: http://svn.apache.org/viewvc?rev=992362&view=rev Log: Vote 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=992362&r1=992361&r2=992362&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Sep 3 16:35:39 2010 @@ -92,6 +92,6 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49774 Add SSL support using the APR connector to the admin app https://issues.apache.org/bugzilla/attachment.cgi?id=25954 - +1: markt, jim + +1: markt, jim, mturk -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992363 - in /tomcat/tc5.5.x/trunk: ./ connectors/http11/src/java/org/apache/coyote/http11/ container/catalina/src/share/org/apache/catalina/connector/ container/webapps/admin/WEB-INF/clas
Author: markt
Date: Fri Sep 3 16:40:16 2010
New Revision: 992363
URL: http://svn.apache.org/viewvc?rev=992363&view=rev
Log:
Add SSL with APR support to the admin app
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources.properties
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
tomcat/tc5.5.x/trunk/container/webapps/admin/connector/connector.jsp
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=992363&r1=992362&r2=992363&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Sep 3 16:40:16 2010
@@ -88,10 +88,3 @@ PATCHES PROPOSED TO BACKPORT:
and thus I am letting this pass. The SingleSignOn valve is usually added
to
a (looking at the default server.xml), so we have to call
request.getContext() to get a Context there?
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49774
- Add SSL support using the APR connector to the admin app
- https://issues.apache.org/bugzilla/attachment.cgi?id=25954
- +1: markt, jim, mturk
- -1:
-
Modified:
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=992363&r1=992362&r2=992363&view=diff
==
---
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
Fri Sep 3 16:40:16 2010
@@ -498,14 +498,20 @@ public class Http11AprProtocol implement
* SSL engine.
*/
public String getSSLEngine() { return ep.getSSLEngine(); }
-public void setSSLEngine(String SSLEngine) { ep.setSSLEngine(SSLEngine); }
+public void setSSLEngine(String SSLEngine) {
+ep.setSSLEngine(SSLEngine);
+setAttribute("SSLEngine", SSLEngine);
+}
/**
* SSL protocol.
*/
public String getSSLProtocol() { return ep.getSSLProtocol(); }
-public void setSSLProtocol(String SSLProtocol) {
ep.setSSLProtocol(SSLProtocol); }
+public void setSSLProtocol(String SSLProtocol) {
+ep.setSSLProtocol(SSLProtocol);
+setAttribute("SSLProtocol", SSLProtocol);
+}
/**
@@ -513,77 +519,110 @@ public class Http11AprProtocol implement
* will ask for a password).
*/
public String getSSLPassword() { return ep.getSSLPassword(); }
-public void setSSLPassword(String SSLPassword) {
ep.setSSLPassword(SSLPassword); }
+public void setSSLPassword(String SSLPassword) {
+ep.setSSLPassword(SSLPassword);
+setAttribute("SSLPassword", SSLPassword);
+}
/**
* SSL cipher suite.
*/
public String getSSLCipherSuite() { return ep.getSSLCipherSuite(); }
-public void setSSLCipherSuite(String SSLCipherSuite) {
ep.setSSLCipherSuite(SSLCipherSuite); }
+public void setSSLCipherSuite(String SSLCipherSuite) {
+ep.setSSLCipherSuite(SSLCipherSuite);
+setAttribute("SSLCipherSuite", SSLCipherSuite);
+}
/**
* SSL certificate file.
*/
public String getSSLCertificateFile() { return ep.getSSLCertificateFile();
}
-public void setSSLCertificateFile(String SSLCertificateFile) {
ep.setSSLCertificateFile(SSLCertificateFile); }
+public void setSSLCertificateFile(String SSLCertificateFile) {
+ep.setSSLCertificateFile(SSLCertificateFile);
+setAttribute("SSLCertificateFile", SSLCertificateFile);
+}
/**
* SSL certificate key file.
*/
public String getSSLCertificateKeyFile() { return
ep.getSSLCertificateKeyFile(); }
-public void setSSLCertificateKeyFile(String SSLCertificateKeyFile) {
ep.setSSLCertificateKeyFile(SSLCertificateKeyFile); }
+public void setSSLCertificateKeyFile(String SSLCertificateKeyFile) {
+ep.setSSLCertificateKeyFile(SSLCertificateKeyFile);
+
DO NOT REPLY [Bug 49774] admin webapp breaking https configuration when using tomcat-native libs
https://issues.apache.org/bugzilla/show_bug.cgi?id=49774 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2010-09-03 12:40:31 EDT --- The patch has been applied and will be included in 5.5.31 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: r992366 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/connector/Request.java container/webapps/docs/changelog.xml container/webapps/docs/config/sy
Author: jim
Date: Fri Sep 3 16:42:10 2010
New Revision: 992366
URL: http://svn.apache.org/viewvc?rev=992366&view=rev
Log:
Bugfix: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38113
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=992366&r1=992365&r2=992366&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Sep 3 16:42:10 2010
@@ -25,16 +25,6 @@ $Id$
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38113
- Add system property to allow spec compliant handling of query string
- http://people.apache.org/~markt/patches/2010-08-25-bug38113.patch
- -1:
- +1: kkolinko jim, rjung, markt: (only with the following trivial change:
- s/Boolean.parseBoolean(..)/Boolean.valueOf(..).booleanValue()/
- because parseBoolean is @since 1.5.
- See Globals.java line 334 for an example.
- )
-
* Remove JSSE13Factory, JSSE13SocketFactory classes,
because
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java?rev=992366&r1=992365&r2=992366&view=diff
==
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
Fri Sep 3 16:42:10 2010
@@ -84,16 +84,20 @@ import org.apache.catalina.util.StringPa
public class Request
implements HttpServletRequest {
-
-// --- Constructors
-
+private final static boolean ALLOW_EMPTY_QUERY_STRING;
static {
// Ensure that classes are loaded for SM
new StringCache.ByteEntry();
new StringCache.CharEntry();
+
+ALLOW_EMPTY_QUERY_STRING = Boolean.valueOf(System.getProperty(
+
"org.apache.catalina.connector.Request.ALLOW_EMPTY_QUERY_STRING",
+
Boolean.toString(Globals.STRICT_SERVLET_COMPLIANCE))).booleanValue();
}
+
+// --- Constructors
public Request() {
formats[0].setTimeZone(GMT_ZONE);
@@ -1900,11 +1904,11 @@ public class Request
*/
public String getQueryString() {
String queryString = coyoteRequest.queryString().toString();
-if (queryString == null || queryString.equals("")) {
-return (null);
-} else {
-return queryString;
+if (!ALLOW_EMPTY_QUERY_STRING && "".equals(queryString)) {
+return null;
}
+
+return queryString;
}
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=992366&r1=992365&r2=992366&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Sep 3
16:42:10 2010
@@ -38,7 +38,7 @@
-
+
@@ -50,6 +50,10 @@
+38113 Add system property (ALLOW_EMPTY_QUERY_STRING) to
allow
+spec compliant handling of query string. (markt/kkolinko/jim)
+
+
Return a copy of the URL being used from the webapp class loader, not
the original array. (kkolinko/markt)
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml?rev=992366&r1=992365&r2=992366&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml
(original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml Fri Sep
3 16:42:10 2010
@@ -158,6 +158,14 @@
+
+ If this is true Tomcat will return an empty string rather
+ than null for empty query strings - i.e. query strings where
+ only ? is present. If not specified, the value of
+ org.apache.catalina.STRICT_SERVLET_COMPLIANCE will be used
as
+ the default.
+
+
An alternative name for the session cookie. Defa
Re: Ready for Tomcat 5.5.31?
I just committed the only one I saw with => 3 votes... On Sep 3, 2010, at 12:34 PM, Mladen Turk wrote: > On 09/03/2010 06:19 PM, Jim Jagielski wrote: >> I think we're at the stage where I can go ahead and T&R Tomcat 5.5.31... >> >> Anyone disagree? >> > > There are still couple of STATUS.txt things that > get voted (dunno if committed cause they are still > in the STATUS) and one that I'm just about to +1. > > > Regards > -- > ^TM > > - > 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
Re: Ready for Tomcat 5.5.31?
Ahh... I see a few more being added... will hold of for a little bit. I propose a T&R on Monday then; that gives today and the weekend for people to vote and pick off the remaining low hanging fruit. On Sep 3, 2010, at 12:44 PM, Jim Jagielski wrote: > I just committed the only one I saw with => 3 votes... > > On Sep 3, 2010, at 12:34 PM, Mladen Turk wrote: > >> On 09/03/2010 06:19 PM, Jim Jagielski wrote: >>> I think we're at the stage where I can go ahead and T&R Tomcat 5.5.31... >>> >>> Anyone disagree? >>> >> >> There are still couple of STATUS.txt things that >> get voted (dunno if committed cause they are still >> in the STATUS) and one that I'm just about to +1. >> >> >> Regards >> -- >> ^TM >> >> - >> 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: r992367 - /tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml
Author: markt Date: Fri Sep 3 16:47:59 2010 New Revision: 992367 URL: http://svn.apache.org/viewvc?rev=992367&view=rev Log: Move property to intended section Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml?rev=992367&r1=992366&r2=992367&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml Fri Sep 3 16:47:59 2010 @@ -130,6 +130,14 @@ + + If this is true Tomcat will return an empty string rather + than null for empty query strings - i.e. query strings where + only ? is present. If not specified, the value of + org.apache.catalina.STRICT_SERVLET_COMPLIANCE will be used as + the default. + + If this is true Tomcat will allow = @@ -158,14 +166,6 @@ - - If this is true Tomcat will return an empty string rather - than null for empty query strings - i.e. query strings where - only ? is present. If not specified, the value of - org.apache.catalina.STRICT_SERVLET_COMPLIANCE will be used as - the default. - - An alternative name for the session cookie. Defaults to JSESSIONID. Note that the Servlet specification requires - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 38113] getQueryString returns null instead of empty-string
https://issues.apache.org/bugzilla/show_bug.cgi?id=38113 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #9 from Mark Thomas 2010-09-03 12:48:43 EDT --- Fixed in 5.5.x and will be in 5.5.31 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Ready for Tomcat 5.5.31?
On 09/03/2010 06:44 PM, Jim Jagielski wrote: I just committed the only one I saw with => 3 votes... Think there is one with 3 votes for #49749 if I'm not reading that wrongly. And now the #49774 has 3 votes as well. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 39130] Hostname contains ? even if no query string exists
https://issues.apache.org/bugzilla/show_bug.cgi?id=39130 Bug 39130 depends on bug 38113, which changed state. Bug 38113 Summary: getQueryString returns null instead of empty-string https://issues.apache.org/bugzilla/show_bug.cgi?id=38113 What|Old Value |New Value Status|REOPENED|RESOLVED Resolution||FIXED -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r990673 - /tomcat/tc5.5.x/trunk/STATUS.txt
On 30/08/2010 00:34, kkoli...@apache.org wrote: > + +1: kkolinko: Looking for usages of Constants.SINGLE_SIGN_ON_COOKIE, > + in SingleSignOn.invoke() there is one more call to response.addCookie(). > + It is used to remove the cookie, so I think HttpOnly is not important > there > + and thus I am letting this pass. Ack. > The SingleSignOn valve is usually added to > + a (looking at the default server.xml), so we have to call > + request.getContext() to get a Context there? If we needed to, yes. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992373 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java container/webapps/docs/changelog.xml
Author: markt Date: Fri Sep 3 16:56:30 2010 New Revision: 992373 URL: http://svn.apache.org/viewvc?rev=992373&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49749 Add httpOnly support to SSO cookie Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=992373&r1=992372&r2=992373&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Sep 3 16:56:30 2010 @@ -66,15 +66,3 @@ PATCHES PROPOSED TO BACKPORT: -- see attachment 25657 in BZ 49521, but I do not think that it is worth it.) jim: Also not comfortable with such a change this late in the game regarding default behavior of a stable branch. - -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49749 - Add httpOnly support to SSO cookie - http://people.apache.org/~markt/patches/2010-08-25-bug49749.patch - +1: markt, rjung - -1: - +1: kkolinko: Looking for usages of Constants.SINGLE_SIGN_ON_COOKIE, - in SingleSignOn.invoke() there is one more call to response.addCookie(). - It is used to remove the cookie, so I think HttpOnly is not important there - and thus I am letting this pass. The SingleSignOn valve is usually added to - a (looking at the default server.xml), so we have to call - request.getContext() to get a Context there? Modified: tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=992373&r1=992372&r2=992373&view=diff == --- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java Fri Sep 3 16:56:30 2010 @@ -800,7 +800,7 @@ public abstract class AuthenticatorBase cookie.setDomain(ssoDomain); } -response.addCookie(cookie); +response.addCookieInternal(cookie, context.getUseHttpOnly()); // Register this principal with our SSO valve sso.register(ssoId, principal, authType, username, password); Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=992373&r1=992372&r2=992373&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Sep 3 16:56:30 2010 @@ -57,6 +57,10 @@ Return a copy of the URL being used from the webapp class loader, not the original array. (kkolinko/markt) + +49749: Use HttpOnly flag of current context when genrating +a Single-Sign-On cookie. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49749] SSO cookie should be added as HttpOnly
https://issues.apache.org/bugzilla/show_bug.cgi?id=49749 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2010-09-03 12:56:49 EDT --- Fixed in trunk and will be in 5.5.31 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Ready for Tomcat 5.5.31?
On 03/09/2010 17:48, Mladen Turk wrote: > On 09/03/2010 06:44 PM, Jim Jagielski wrote: >> I just committed the only one I saw with => 3 votes... >> > > Think there is one with 3 votes for #49749 > if I'm not reading that wrongly. > > And now the #49774 has 3 votes as well. Both applied. I'm done as far as 5.5.31 goes. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Ready for Tomcat 5.5.31?
On Sep 3, 2010, at 12:59 PM, Mark Thomas wrote: > On 03/09/2010 17:48, Mladen Turk wrote: >> On 09/03/2010 06:44 PM, Jim Jagielski wrote: >>> I just committed the only one I saw with => 3 votes... >>> >> >> Think there is one with 3 votes for #49749 >> if I'm not reading that wrongly. >> >> And now the #49774 has 3 votes as well. > > Both applied. > > I'm done as far as 5.5.31 goes. > Cool... I may then T&R today and give people the weekend to test and play... - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Ready for Tomcat 5.5.31?
On 09/03/2010 07:16 PM, Jim Jagielski wrote: On Sep 3, 2010, at 12:59 PM, Mark Thomas wrote: On 03/09/2010 17:48, Mladen Turk wrote: On 09/03/2010 06:44 PM, Jim Jagielski wrote: I just committed the only one I saw with => 3 votes... Think there is one with 3 votes for #49749 if I'm not reading that wrongly. And now the #49774 has 3 votes as well. Both applied. I'm done as far as 5.5.31 goes. Cool... I may then T&R today and give people the weekend to test and play... +1 Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992392 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/
Author: markt
Date: Fri Sep 3 17:40:12 2010
New Revision: 992392
URL: http://svn.apache.org/viewvc?rev=992392&view=rev
Log:
Sync with Jakarta. Add generated serialVersionUID's.
Don't use the same values as Jakarta since the code has been structurally
modified (to removed unused elements)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java?rev=992392&r1=992391&r2=992392&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
Fri Sep 3 17:40:12 2010
@@ -26,6 +26,7 @@ package org.apache.tomcat.util.bcel.clas
*/
public abstract class AccessFlags implements java.io.Serializable {
+private static final long serialVersionUID = 2548932939969293935L;
protected int access_flags;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util
svn commit: r992393 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/
Author: markt Date: Fri Sep 3 17:45:05 2010 New Revision: 992393 URL: http://svn.apache.org/viewvc?rev=992393&view=rev Log: Update merge info Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/ (props changed) Propchange: tomcat/trunk/java/org/apache/tomcat/util/bcel/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 3 17:45:05 2010 @@ -1,2 +1 @@ -/jakarta/bcel/trunk/src/main/java/org/apache/bcel:886845-981191 -/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/bcel:742915 +/jakarta/bcel/trunk/src/main/java/org/apache/bcel:886845-992360 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992394 - in /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile: AnnotationEntry.java Annotations.java ElementValue.java ParameterAnnotationEntry.java RuntimeInvisibleAnnotations.jav
Author: markt
Date: Fri Sep 3 17:50:32 2010
New Revision: 992394
URL: http://svn.apache.org/viewvc?rev=992394&view=rev
Log:
Trace through some unused code and remove it.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=992394&r1=992393&r2=992394&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Fri Sep 3 17:50:32 2010
@@ -39,7 +39,6 @@ public class AnnotationEntry implements
private int type_index;
private ConstantPool constant_pool;
-private boolean isRuntimeVisible;
private List element_value_pairs;
@@ -51,9 +50,9 @@ public class AnnotationEntry implements
* @param isRuntimeVisible
* @throws IOException
*/
-public static AnnotationEntry read(DataInputStream file, ConstantPool
constant_pool, boolean isRuntimeVisible) throws IOException {
+public static AnnotationEntry read(DataInputStream file, ConstantPool
constant_pool) throws IOException {
-final AnnotationEntry annotationEntry = new
AnnotationEntry(file.readUnsignedShort(), constant_pool, isRuntimeVisible);
+final AnnotationEntry annotationEntry = new
AnnotationEntry(file.readUnsignedShort(), constant_pool);
final int num_element_value_pairs = (file.readUnsignedShort());
annotationEntry.element_value_pairs = new ArrayList();
for (int i = 0; i < num_element_value_pairs; i++) {
@@ -63,10 +62,9 @@ public class AnnotationEntry implements
return annotationEntry;
}
-public AnnotationEntry(int type_index, ConstantPool constant_pool, boolean
isRuntimeVisible) {
+public AnnotationEntry(int type_index, ConstantPool constant_pool) {
this.type_index = type_index;
this.constant_pool = constant_pool;
-this.isRuntimeVisible = isRuntimeVisible;
}
/**
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=992394&r1=992393&r2=992394&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
Fri Sep 3 17:50:32 2010
@@ -41,12 +41,12 @@ public abstract class Annotations extend
* @param file Input stream
* @param constant_pool Array of constants
*/
-public Annotations(byte annotation_type, int name_index, int length,
DataInputStream file, ConstantPool constant_pool, boolean isRuntimeVisible)
throws IOException {
+public Annotations(byte annotation_type, int name_index, int length,
DataInputStream file, ConstantPool constant_pool) throws IOException {
this(annotation_type, name_index, length, (AnnotationEntry[]) null,
constant_pool);
final int annotation_table_length = (file.readUnsignedShort());
annotation_table = new AnnotationEntry[annotation_table_length];
for (int i = 0; i < annotation_table_length; i++) {
-annotation_table[i] = AnnotationEntry.read(file, constant_pool,
isRuntimeVisible);
+annotation_table[i] = AnnotationEntry.read(file, constant_pool);
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java?rev=992394&r1=992393&r2=992394&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
Fri Sep 3 17:50:32 2010
@@ -116,7 +116,7 @@ public abstract class ElementValue
case '@': // Annotation
// TODO isRuntimeVisible
return new AnnotationElementValue(ANNOTATION, AnnotationEntry.read(
-dis, cpool, false), cpool);
+dis, cpool), cpool);
case '[':
Re: OS/X packaging for Tomcat ?
I don't run Mac OS, but for our book Tomcat: The Definitive Guide, 2nd Edition, a couple of other Mac OS Tomcat users wrote a launchd script and the associated files (such as a .plist), and we wrote a section about it in the book. It's on page 32, Automatic Startup on Mac OS X. The section isn't very long, but shows how to use it. The real meat is in the files that are included in the book's examples archive here: http://examples.oreilly.com/9780596101060/ O'Reilly gave me permission to open source all of that code. I have not spent time looking at how our code is different from the code on the Tomcat wiki page about it, so a Mac OS saavy developer should compare them. -- Jason On Tue, Aug 31, 2010 at 1:40 AM, Henri Gomez wrote: > > Lots of the content on http://wiki.apache.org/tomcat/TomcatOnMacOS is > > old, some of it is questionable. > > You're very welcome, I'm not very experience in OS/X development, I'll > be happy to get expert vision on this wiki. > > > A few Mac users have been double clicking the tar.gz and getting a > > broken Tomcat because the archive didn't unpack the directories as > expected. > > Strange, didn't see such error with Snow Leopard on each Tomcat release. > > > Providing a standard .plist, launchd script & instructions for use would > > be a start - and a simple script to place them in suitable locations, > > like the service installer .bat for Win. > > Did the launchd script could be enabled/disabled via OS/X UI ? > > Thanks for your time > >
svn commit: r992397 - /tomcat/tc5.5.x/trunk/build/build.properties.default
Author: jim Date: Fri Sep 3 18:11:13 2010 New Revision: 992397 URL: http://svn.apache.org/viewvc?rev=992397&view=rev Log: Get ready for 5.5.31 Modified: tomcat/tc5.5.x/trunk/build/build.properties.default Modified: tomcat/tc5.5.x/trunk/build/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.properties.default?rev=992397&r1=992396&r2=992397&view=diff == --- tomcat/tc5.5.x/trunk/build/build.properties.default (original) +++ tomcat/tc5.5.x/trunk/build/build.properties.default Fri Sep 3 18:11:13 2010 @@ -12,10 +12,10 @@ # - Vesion Control Flags - version.major=5 version.minor=5 -version.build=30 +version.build=31 version.patch=0 #Set the pretty version name -version=5.5.30 +version=5.5.31 # - Compile Control Flags - compile.debug=on - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992398 - /tomcat/tc5.5.x/tags/TOMCAT_5_5_31/
Author: jim Date: Fri Sep 3 18:13:14 2010 New Revision: 992398 URL: http://svn.apache.org/viewvc?rev=992398&view=rev Log: Tagging Tomcat version TOMCAT_5_5_31 Added: tomcat/tc5.5.x/tags/TOMCAT_5_5_31/ - copied from r992397, tomcat/tc5.5.x/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992404 - /tomcat/tc5.5.x/tags/TOMCAT_5_5_31/
Author: jim Date: Fri Sep 3 18:22:35 2010 New Revision: 992404 URL: http://svn.apache.org/viewvc?rev=992404&view=rev Log: Pre-mature Removed: tomcat/tc5.5.x/tags/TOMCAT_5_5_31/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992407 - /tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Author: jim
Date: Fri Sep 3 18:30:42 2010
New Revision: 992407
URL: http://svn.apache.org/viewvc?rev=992407&view=rev
Log:
versioning change for jdk
Modified:
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Modified:
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java?rev=992407&r1=992406&r2=992407&view=diff
==
---
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
(original)
+++
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Fri Sep 3 18:30:42 2010
@@ -490,7 +490,7 @@ public final class SaveConnectorAction e
} catch (NumberFormatException e) {
mBServer.setAttribute(coname,
new Attribute("SSLVerifyDepthText",
-Integer.valueOf(10)));
+Integer.valueOf(10).intValue()));
}
String sSLCACertificateFile = cform.getSSLCACertificateFile();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992411 - /tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Author: jim
Date: Fri Sep 3 18:42:48 2010
New Revision: 992411
URL: http://svn.apache.org/viewvc?rev=992411&view=rev
Log:
Build is 1.4.2... use ugly method
Modified:
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Modified:
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java?rev=992411&r1=992410&r2=992411&view=diff
==
---
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
(original)
+++
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Fri Sep 3 18:42:48 2010
@@ -490,7 +490,7 @@ public final class SaveConnectorAction e
} catch (NumberFormatException e) {
mBServer.setAttribute(coname,
new Attribute("SSLVerifyDepthText",
-Integer.valueOf(10).intValue()));
+new Integer(10)));
}
String sSLCACertificateFile = cform.getSSLCACertificateFile();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992414 - /tomcat/tc5.5.x/tags/TOMCAT_5_5_31/
Author: jim Date: Fri Sep 3 18:47:30 2010 New Revision: 992414 URL: http://svn.apache.org/viewvc?rev=992414&view=rev Log: Ready for Tomcat-5.5.31 Tagging tc5.5.x/trunk as TOMCAT_5_5_31 Added: tomcat/tc5.5.x/tags/TOMCAT_5_5_31/ - copied from r992412, tomcat/tc5.5.x/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992413 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
Author: markt
Date: Fri Sep 3 18:47:29 2010
New Revision: 992413
URL: http://svn.apache.org/viewvc?rev=992413&view=rev
Log:
Remove some unnecessary code and fix an Eclipse warning
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java?rev=992413&r1=992412&r2=992413&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
Fri Sep 3 18:47:29 2010
@@ -84,10 +84,10 @@ public class SimpleElementValue extends
case PRIMITIVE_BOOLEAN:
ConstantInteger bo = (ConstantInteger) cpool.getConstant(
getIndex(), Constants.CONSTANT_Integer);
-if (bo.getBytes() == 0)
+if (bo.getBytes() == 0) {
return "false";
-if (bo.getBytes() != 0)
-return "true";
+}
+return "true";
case STRING:
ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(getIndex(),
Constants.CONSTANT_Utf8);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992416 - in /tomcat/trunk: java/org/apache/tomcat/util/bcel/classfile/ webapps/docs/
Author: markt
Date: Fri Sep 3 18:50:57 2010
New Revision: 992416
URL: http://svn.apache.org/viewvc?rev=992416&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=49876
Generics warnings in the copied Apache Jakarta BCEL code. Based on a patch by
Gábor. (markt)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=992416&r1=992415&r2=992416&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Fri Sep 3 18:50:57 2010
@@ -40,7 +40,7 @@ public class AnnotationEntry implements
private int type_index;
private ConstantPool constant_pool;
-private List element_value_pairs;
+private List element_value_pairs;
/**
* Factory method to create an AnnotionEntry from a DataInputStream
@@ -54,7 +54,7 @@ public class AnnotationEntry implements
final AnnotationEntry annotationEntry = new
AnnotationEntry(file.readUnsignedShort(), constant_pool);
final int num_element_value_pairs = (file.readUnsignedShort());
-annotationEntry.element_value_pairs = new ArrayList();
+annotationEntry.element_value_pairs = new
ArrayList();
for (int i = 0; i < num_element_value_pairs; i++) {
annotationEntry.element_value_pairs.add(new
ElementValuePair(file.readUnsignedShort(), ElementValue.readElementValue(file,
constant_pool),
constant_pool));
@@ -80,7 +80,7 @@ public class AnnotationEntry implements
*/
public ElementValuePair[] getElementValuePairs() {
// TOFO return List
-return (ElementValuePair[]) element_value_pairs.toArray(new
ElementValuePair[element_value_pairs.size()]);
+return element_value_pairs.toArray(new
ElementValuePair[element_value_pairs.size()]);
}
@@ -89,7 +89,7 @@ public class AnnotationEntry implements
dos.writeShort(type_index);// u2 index of type name in cpool
dos.writeShort(element_value_pairs.size()); // u2 element_value pair
count
for (int i = 0 ; ihttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=992416&r1=992415&r2=992416&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java Fri
Sep 3 18:50:57 2010
@@ -82,7 +82,8 @@ public abstract class Attribute implemen
file.writeInt(length);
}
-private static final Map readers = new HashMap();
+private static final Map readers =
+new HashMap();
/*
* Class method reads one attribute from the input data stream. This method
@@ -124,7 +125,7 @@ public abstract class Attribute implemen
switch (tag)
{
case Constants.ATTR_UNKNOWN:
-AttributeReader r = (AttributeReader) readers.get(name);
+AttributeReader r = readers.get(name);
if (r != null)
{
return r.createAttribute(name_index, length, file,
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=992416&r1=992415&r2=992416&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java Fri
Sep 3 18:50:57 2010
@@ -35,7 +35,8 @@ import org.apache.tomcat.util.bcel.util.
* @version $Id$
* @author mailto:m.d...@gmx.de";>M. Dahm
*/
-public class JavaClass extends AccessFlags implements Cloneable, Comparable {
+public class JavaClass extends AccessFlags
+implements Cloneable, Comparable {
private static final long serialVersionUID = 7029227708237523236L;
private String file_name;
@@ -155,7 +156,7 @@ public class JavaClass extends AccessFla
if (annotationsOutOfDate) {
// Find attributes that contain annotation data
Attribute[] attrs = getAttributes();
-List ac
DO NOT REPLY [Bug 49876] correcting generics related compile warning in org/apache/tomcat/util/bcel/classfile files
https://issues.apache.org/bugzilla/show_bug.cgi?id=49876 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-09-03 14:52:26 EDT --- Thanks. Patch applied. I was originally avoiding changing the BCEL code but there have already been quite a few changes to remove unused code the the diffs from Jakarta aren't that tricky to apply (and there aren't that many of them). I fixed the remaining issues the patch didn't address as well as a couple of cast warnings created by applying the patch. The fix is in 7.0.x and will be in 7.0.3 onwards. Thanks. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r992411 - /tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
On 03/09/2010 19:42, j...@apache.org wrote: > Author: jim > Date: Fri Sep 3 18:42:48 2010 > New Revision: 992411 > > URL: http://svn.apache.org/viewvc?rev=992411&view=rev > Log: > Build is 1.4.2... use ugly method My bad. Sorry. My IDE was set up for 1.5 and I missed that. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Preliminary Tomcat 5.5.31 Builds.
The prelim builds can be found at: http://people.apache.org/~jim/tomcat-5.5/ I will call for an official vote early next week... - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992429 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: mturk
Date: Fri Sep 3 19:35:31 2010
New Revision: 992429
URL: http://svn.apache.org/viewvc?rev=992429&view=rev
Log:
Trivial. Remove trailing spaces. No functional change
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=992429&r1=992428&r2=992429&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri
Sep 3 19:35:31 2010
@@ -157,7 +157,7 @@ public class AprEndpoint {
*/
protected long sslContext = 0;
-
+
// - Properties
@@ -167,7 +167,7 @@ public class AprEndpoint {
protected boolean deferAccept = true;
public void setDeferAccept(boolean deferAccept) { this.deferAccept =
deferAccept; }
public boolean getDeferAccept() { return deferAccept; }
-
+
/**
* External Executor based thread pool.
@@ -409,7 +409,7 @@ public class AprEndpoint {
this.unlockTimeout = unlockTimeout;
}
-
+
/**
* SSL engine.
*/
@@ -564,7 +564,7 @@ public class AprEndpoint {
}
/**
- * Return the amount of threads that are in use
+ * Return the amount of threads that are in use
*
* @return the amount of threads that are in use
*/
@@ -608,7 +608,7 @@ public class AprEndpoint {
if (initialized)
return;
-
+
// Create the root APR memory pool
rootPool = Pool.create(0);
// Create the pool for the server socket
@@ -689,7 +689,7 @@ public class AprEndpoint {
sendfileThreadCount = 1;
}
}
-
+
// Delay accepting of new connections until data is available
// Only Linux kernels 2.4 + have that implemented
// on other platforms this call is noop and will return APR_ENOTIMPL.
@@ -701,7 +701,7 @@ public class AprEndpoint {
// Initialize SSL if needed
if (SSLEnabled) {
-
+
// SSL protocol
int value = SSL.SSL_PROTOCOL_ALL;
if ("SSLv2".equalsIgnoreCase(SSLProtocol)) {
@@ -1058,7 +1058,7 @@ public class AprEndpoint {
}
}
-
+
/**
* Allocate a new poller of the specified size.
*/
@@ -1076,7 +1076,7 @@ public class AprEndpoint {
}
}
-
+
/**
* Process given socket.
*/
@@ -1095,7 +1095,7 @@ public class AprEndpoint {
}
return true;
}
-
+
/**
* Process given socket.
@@ -1115,7 +1115,7 @@ public class AprEndpoint {
}
return true;
}
-
+
/**
* Process given socket for an event.
@@ -1135,7 +1135,7 @@ public class AprEndpoint {
}
return true;
}
-
+
// --- Acceptor Inner Class
@@ -1208,7 +1208,7 @@ public class AprEndpoint {
protected long[] addS;
protected volatile int addCount = 0;
-
+
protected boolean comet = true;
protected volatile int keepAliveCount = 0;
@@ -1217,7 +1217,7 @@ public class AprEndpoint {
public Poller(boolean comet) {
this.comet = comet;
}
-
+
/**
* Create the poller. With some versions of APR, the maximum poller
size will
* be 62 (recompiling APR is necessary to remove this limitation).
@@ -1377,7 +1377,7 @@ public class AprEndpoint {
// Check for failed sockets and hand this socket
off to a worker
if (((desc[n*2] & Poll.APR_POLLHUP) ==
Poll.APR_POLLHUP)
|| ((desc[n*2] & Poll.APR_POLLERR) ==
Poll.APR_POLLERR)
-|| (comet && (!processSocket(desc[n*2+1],
SocketStatus.OPEN)))
+|| (comet && (!processSocket(desc[n*2+1],
SocketStatus.OPEN)))
|| (!comet &&
(!processSocket(desc[n*2+1] {
// Close socket and clear pool
if (comet) {
@@ -1430,7 +1430,7 @@ public class AprEndpoint {
}
}
-
+
}
@@ -1581,7 +1581,7 @@ public class AprEndpoint {
// Close socket and pool
Socket.destroy(socket);
socket = 0;
-} else if ((status == null) && ((options &&
!setSocketOptions(socket))
+} else if ((status == null) && ((options &&
!setSocketOptions(socket))
svn commit: r992430 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: mturk Date: Fri Sep 3 19:39:50 2010 New Revision: 992430 URL: http://svn.apache.org/viewvc?rev=992430&view=rev Log: Propose a fix for unlockAccept 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=992430&r1=992429&r2=992430&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 3 19:39:50 2010 @@ -200,7 +200,14 @@ PATCHES PROPOSED TO BACKPORT: * Provide better web application state information via JMX A limited back-port of http://svn.apache.org/viewvc?rev=992245&view=rev that could be extended to other components that use LifecycleSupport and expose - an MBean + an MBean http://people.apache.org/~markt/patches/2010-09-03-better-state-info.patch +1: markt -1: + +* Fix unlockAccept when the soTimeout is -1 (default). + Default conf has soTimeout -1 and that will throw exception if + used in setSoTimeout method. + http://people.apache.org/~mturk/tomcat/patches/tomcat-6.0.x-aprunlockaccept.patch + +1: mturk + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992431 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: mturk Date: Fri Sep 3 19:43:47 2010 New Revision: 992431 URL: http://svn.apache.org/viewvc?rev=992431&view=rev Log: Mark as accepted 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=992431&r1=992430&r2=992431&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 3 19:43:47 2010 @@ -28,6 +28,11 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT: [ start all new proposals below, under PATCHES PROPOSED. ] +* Backport r988817 from trunk which allows using tomcat-native + 1.2.x versions. + http://people.apache.org/~mturk/tomcat/patches/tomcat-6.0.x-aprver.patch + +1: mturk, markt, rjung + -1: PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] @@ -179,12 +184,6 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, rjung -1: -* Backport r988817 from trunk which allows using tomcat-native - 1.2.x versions. - http://people.apache.org/~mturk/tomcat/patches/tomcat-6.0.x-aprver.patch - +1: mturk, markt, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49749 Add httpOnly support to SSO cookie http://people.apache.org/~markt/patches/2010-08-25-bug49749.patch - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992432 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/AprLifecycleListener.java
Author: mturk
Date: Fri Sep 3 19:44:41 2010
New Revision: 992432
URL: http://svn.apache.org/viewvc?rev=992432&view=rev
Log:
Backport r988817 from trunk
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=992432&r1=992431&r2=992432&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 3 19:44:41 2010
@@ -28,12 +28,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT:
[ start all new proposals below, under PATCHES PROPOSED. ]
-* Backport r988817 from trunk which allows using tomcat-native
- 1.2.x versions.
- http://people.apache.org/~mturk/tomcat/patches/tomcat-6.0.x-aprver.patch
- +1: mturk, markt, rjung
- -1:
-
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=992432&r1=992431&r2=992432&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Fri Sep 3 19:44:41 2010
@@ -34,7 +34,7 @@ import org.apache.tomcat.jni.Library;
/**
* Implementation of LifecycleListener that will init and
* and destroy APR.
- *
+ *
* @author Remy Maucherat
* @author Filip Hanik
* @version $Id$
@@ -76,7 +76,7 @@ public class AprLifecycleListener
if (instanceCreated) init();
return aprAvailable;
}
-
+
public AprLifecycleListener() {
instanceCreated = true;
}
@@ -135,11 +135,14 @@ public class AprLifecycleListener
int major = 0;
int minor = 0;
int patch = 0;
+int apver = 0;
+int rqver = TCN_REQUIRED_MAJOR * 1000 + TCN_REQUIRED_MINOR * 100 +
TCN_REQUIRED_PATCH;
+int rcver = TCN_REQUIRED_MAJOR * 1000 + TCN_REQUIRED_MINOR * 100 +
TCN_RECOMMENDED_PV;
if (aprInitialized) {
-return;
+return;
}
aprInitialized = true;
-
+
try {
String methodName = "initialize";
Class paramTypes[] = new Class[1];
@@ -152,6 +155,7 @@ public class AprLifecycleListener
major = clazz.getField("TCN_MAJOR_VERSION").getInt(null);
minor = clazz.getField("TCN_MINOR_VERSION").getInt(null);
patch = clazz.getField("TCN_PATCH_VERSION").getInt(null);
+apver = major * 1000 + minor * 100 + patch;
} catch (Throwable t) {
if (!log.isDebugEnabled()) {
log.info(sm.getString("aprListener.aprInit",
@@ -162,9 +166,7 @@ public class AprLifecycleListener
}
return;
}
-if ((major != TCN_REQUIRED_MAJOR) ||
-(minor != TCN_REQUIRED_MINOR) ||
-(patch < TCN_REQUIRED_PATCH)) {
+if (apver < rqver) {
log.error(sm.getString("aprListener.tcnInvalid", major + "."
+ minor + "." + patch,
TCN_REQUIRED_MAJOR + "." +
@@ -172,14 +174,14 @@ public class AprLifecycleListener
TCN_REQUIRED_PATCH));
try {
// Terminate the APR in case the version
-// is below required.
+// is below required.
terminateAPR();
} catch (Throwable t) {
// Ignore
}
return;
}
-if (patch < TCN_RECOMMENDED_PV) {
+if (apver < rcver) {
if (!log.isDebugEnabled()) {
log.info(sm.getString("aprListener.tcnVersion", major + "."
+ minor + "." + patch,
@@ -203,7 +205,7 @@ public class AprLifecycleListener
+ minor + "." + patch));
}
// Log APR flags
-log.info(sm.getString("aprListener.flags", Library.APR_HAVE_IPV6,
Library.APR_HAS_SENDFILE,
+log.info(sm.getString("aprListener.flags", Library.APR_HAVE_IPV6,
Library.APR_HAS_SENDFILE,
Library.APR_HAS_SO_ACCEPTFILTER, Library.APR_HAS_RANDOM));
aprAvailable = true;
}
@@ -230,13 +232,13 @@ public class AprLifecycleListener
Class clazz = Class.forName("org.apache.tomcat.jni.SSL");
Method method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
-
+
methodName = "initialize";
paramValues[0] = "on".equalsIgnoreCase(SSLEngine)?null:SSLEngine;
method = clazz.getMethod(methodName, p
svn commit: r992440 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: mturk
Date: Fri Sep 3 19:54:02 2010
New Revision: 992440
URL: http://svn.apache.org/viewvc?rev=992440&view=rev
Log:
Hard close the accepting socket if unlockAccept failed
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=992440&r1=992439&r2=992440&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Sep 3
19:54:02 2010
@@ -671,6 +671,7 @@ public class AprEndpoint extends Abstrac
running = false;
unlockAccept();
for (int i = 0; i < acceptors.length; i++) {
+int c = 0;
while (acceptors[i].isAlive()) {
try {
acceptors[i].interrupt();
@@ -678,6 +679,14 @@ public class AprEndpoint extends Abstrac
} catch (InterruptedException e) {
// Ignore
}
+if (c++ > 60) {
+// If the Acceptor is still running force
+// the hard socket close.
+if (serverSock != 0) {
+Socket.close(serverSock);
+serverSock = 0;
+}
+}
}
}
for (int i = 0; i < pollers.length; i++) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992456 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: mturk
Date: Fri Sep 3 20:30:10 2010
New Revision: 992456
URL: http://svn.apache.org/viewvc?rev=992456&view=rev
Log:
Use shutdown instead close for hard closing the socket which is inside
Socket.accept call
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=992456&r1=992455&r2=992456&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Sep 3
20:30:10 2010
@@ -683,7 +683,7 @@ public class AprEndpoint extends Abstrac
// If the Acceptor is still running force
// the hard socket close.
if (serverSock != 0) {
-Socket.close(serverSock);
+Socket.shutdown(serverSock,
Socket.APR_SHUTDOWN_READ);
serverSock = 0;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992459 - in /tomcat/trunk: java/org/apache/catalina/startup/CatalinaProperties.java webapps/docs/changelog.xml
Author: markt
Date: Fri Sep 3 20:37:46 2010
New Revision: 992459
URL: http://svn.apache.org/viewvc?rev=992459&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49865
Allow Tomcat to start if catalina.properties is not present
Modified:
tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=992459&r1=992458&r2=992459&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Fri
Sep 3 20:37:46 2010
@@ -26,7 +26,6 @@ import java.util.Enumeration;
import java.util.Properties;
import org.apache.catalina.Globals;
-import org.apache.tomcat.util.ExceptionUtils;
/**
@@ -99,8 +98,7 @@ public class CatalinaProperties {
is = (new URL(configUrl)).openStream();
}
} catch (Throwable t) {
-// TODO Throws NoClassDefFoundError for ExceptionUtils
-ExceptionUtils.handleThrowable(t);
+handleThrowable(t);
}
if (is == null) {
@@ -110,8 +108,7 @@ public class CatalinaProperties {
File properties = new File(conf, "catalina.properties");
is = new FileInputStream(properties);
} catch (Throwable t) {
-// TODO Throws NoClassDefFoundError for ExceptionUtils
-ExceptionUtils.handleThrowable(t);
+handleThrowable(t);
}
}
@@ -120,8 +117,7 @@ public class CatalinaProperties {
is = CatalinaProperties.class.getResourceAsStream
("/org/apache/catalina/startup/catalina.properties");
} catch (Throwable t) {
-// TODO Throws NoClassDefFoundError for ExceptionUtils
-ExceptionUtils.handleThrowable(t);
+handleThrowable(t);
}
}
@@ -179,5 +175,15 @@ public class CatalinaProperties {
return System.getProperty("catalina.config");
}
+// Copied from ExceptionUtils since that class is not visible during start
+private static void handleThrowable(Throwable t) {
+if (t instanceof ThreadDeath) {
+throw (ThreadDeath) t;
+}
+if (t instanceof VirtualMachineError) {
+throw (VirtualMachineError) t;
+}
+// All other instances of Throwable will be silently swallowed
+}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=992459&r1=992458&r2=992459&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Sep 3 20:37:46 2010
@@ -111,6 +111,10 @@
and Tomcat 7. (markt)
+49865: Tomcat failed to start if catalina.properties was not
+present. (markt)
+
+
49876: Fix the generics warnings in the copied Apache
Jakarta
BCEL code. Based on a patch by Gábor. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992461 - /tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
Author: markt
Date: Fri Sep 3 20:41:25 2010
New Revision: 992461
URL: http://svn.apache.org/viewvc?rev=992461&view=rev
Log:
Remove debug code that was added in r991959
Modified:
tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=992461&r1=992460&r2=992461&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Fri
Sep 3 20:41:25 2010
@@ -87,11 +87,6 @@ public class CatalinaProperties {
InputStream is = null;
Throwable error = null;
-ClassLoader cl = CatalinaProperties.class.getClassLoader();
-System.err.println("CatalinaProprties: cl=" + cl.toString());
-if ((cl = cl.getParent()) != null) {
-System.err.println("CatalinaProprties: parent cl=" +
cl.toString());
-}
try {
String configUrl = getConfigUrl();
if (configUrl != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r992463 - /tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
Author: markt
Date: Fri Sep 3 20:45:41 2010
New Revision: 992463
URL: http://svn.apache.org/viewvc?rev=992463&view=rev
Log:
Fix an Eclispe nag.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=992463&r1=992462&r2=992463&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Fri
Sep 3 20:45:41 2010
@@ -100,8 +100,8 @@ public class CatalinaProperties {
try {
File home = new File(getCatalinaBase());
File conf = new File(home, "conf");
-File properties = new File(conf, "catalina.properties");
-is = new FileInputStream(properties);
+File propsFile = new File(conf, "catalina.properties");
+is = new FileInputStream(propsFile);
} catch (Throwable t) {
handleThrowable(t);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49865] ExceptionUtils throw NoClassDefFoundError during startup
https://issues.apache.org/bugzilla/show_bug.cgi?id=49865 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2010-09-03 16:48:29 EDT --- Fixed in trunk and will be included in 7.0.3 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r992258 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
On 03/09/2010 11:37, mt...@apache.org wrote: > Author: mturk > Date: Fri Sep 3 10:37:53 2010 > New Revision: 992258 > > URL: http://svn.apache.org/viewvc?rev=992258&view=rev > Log: > Make destroy method returning when the worker thread finishes instead > separately calling destroy followed by join I'm seeing long shutdown times now on OSX. I haven't had the patience to see if they eventually return and have had been killing the process. >From where it appears to be looping - this patch looks like the culprit. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "FindPage" by chadear
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "FindPage" page has been changed by chadear. http://wiki.apache.org/tomcat/FindPage?action=diff&rev1=2&rev2=3 -- - ##language:en + ##language:tr You can use this page to search all entries in this WikiWikiWeb. Searches are not case sensitive. Good starting points to explore a wiki are: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
New attachment added to page PythonLanguage on Tomcat Wiki
Dear Wiki user, You have subscribed to a wiki page "PythonLanguage" for change notification. An attachment has been added to that page by chadear. Following detailed information is available: Attachment name: ıı Attachment size: 5345 Attachment link: http://wiki.apache.org/tomcat/PythonLanguage?action=AttachFile&do=get&target=%C4%B1%C4%B1 Page link: http://wiki.apache.org/tomcat/PythonLanguage - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
New attachment added to page PythonLanguage on Tomcat Wiki
Dear Wiki user, You have subscribed to a wiki page "PythonLanguage" for change notification. An attachment has been added to that page by chadear. Following detailed information is available: Attachment name: pp Attachment size: 2993 Attachment link: http://wiki.apache.org/tomcat/PythonLanguage?action=AttachFile&do=get&target=pp Page link: http://wiki.apache.org/tomcat/PythonLanguage - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "selam" by chadear
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "selam" page has been changed by chadear. http://wiki.apache.org/tomcat/selam -- New page: Describe selam here.rtertyertyerty - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "selam" by chadear
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "selam" page has been changed by chadear. http://wiki.apache.org/tomcat/selam?action=diff&rev1=1&rev2=2 -- - Describe selam here.rtertyertyerty + Describe selam - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Page FrontPage renamed to aselam on Tomcat Wiki
Dear wiki user, You have subscribed to a wiki page "Tomcat Wiki" for change notification. The page "aselam" has been renamed from "FrontPage" by chadear. http://wiki.apache.org/tomcat/aselam - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
New attachment added to page aselam on Tomcat Wiki
Dear Wiki user, You have subscribed to a wiki page "aselam" for change notification. An attachment has been added to that page by chadear. Following detailed information is available: Attachment name: 4.jpg Attachment size: 5345 Attachment link: http://wiki.apache.org/tomcat/aselam?action=AttachFile&do=get&target=4.jpg Page link: http://wiki.apache.org/tomcat/aselam - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "PythonLanguage" by chadear
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "PythonLanguage" page has been changed by chadear. http://wiki.apache.org/tomcat/PythonLanguage?action=diff&rev1=2&rev2=3 -- Python is a dynamic object-oriented language. Links: - * http://www.python.org/ + * http://www.selam.org/ * [[EfnetPythonWiki:FrontPage|#python Wiki]] * http://python.faqts.com - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Wiki graffiti
Hi, Anyone around with rights to stop a user messing about with the Wiki, before there's too many change notices in my/your/our mailboxs? p 0x62590808.asc Description: application/pgp-keys signature.asc Description: OpenPGP digital signature
[Tomcat Wiki] Update of "FrontPage" by chadear
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "FrontPage" page has been changed by chadear.
http://wiki.apache.org/tomcat/FrontPage?action=diff&rev1=1&rev2=2
--
+ A Wiki is a collaborative site, anyone can contribute and share:
- ## Please edit system and help pages ONLY in the moinmaster wiki! For more
- ## information, please see MoinMaster:MoinPagesEditorGroup.
- ##master-page:FrontPage
- #format wiki
- #language en
- #pragma section-numbers off
- = WikiName Wiki =
- What is this wiki about?
-
- Interesting starting points:
- * RecentChanges: see where people are currently working
- * WikiSandBox: feel free to change this page and experiment with editing
- * FindPage: search or browse the database in various ways
- * SyntaxReference: quick access to wiki syntax
- * SiteNavigation: get an overview over this site and what it contains
-
-
- == How to use this site ==
-
- A Wiki is a collaborative site, anyone can contribute and share:
- * Edit any page by pressing '''<>''' at the top or the bottom
of the page
+ * Edit any page by pressing '''<>''' at the top or the bottom
of the page
* Create a link to another page with joined capitalized words (like
WikiSandBox) or with {{{["quoted words in brackets"]}}}
* Search for page titles or text within pages using the search box at the
top of any page
* See HelpForBeginners to get you going, HelpContents for all help pages.
- To learn more about what a WikiWikiWeb is, read about MoinMoin:WhyWikiWorks
and the MoinMoin:WikiNature. Also, consult the MoinMoin:WikiWikiWebFaq.
+ To learn more about what a WikiWikiWeb is, read about MoinMoin:WhyWikiWorks
and the MoinMoin:WikiNature. Also, consult the MoinMoin:WikiWikiWebFaq.
This wiki is powered by MoinMoin.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
New attachment added to page FrontPage on Tomcat Wiki
Dear Wiki user, You have subscribed to a wiki page "FrontPage" for change notification. An attachment has been added to that page by chadear. Following detailed information is available: Attachment name: ata Attachment size: 3317 Attachment link: http://wiki.apache.org/tomcat/FrontPage?action=AttachFile&do=get&target=ata Page link: http://wiki.apache.org/tomcat/FrontPage - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "aselam" by chadear
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "aselam" page has been changed by chadear.
http://wiki.apache.org/tomcat/aselam?action=diff&rev1=70&rev2=71
--
= Welcome to the Apache Tomcat Wiki =
{{http://tomcat.apache.org/images/tomcat.gif}}
- This is the Wiki for Apache Tomcat, a Servlet and Java Server Pages container
developed under the Apache License. The main documentation for this product is
at [[http://tomcat.apache.org|tomcat.apache.org]]. Below is a list of some
useful pages: we encourage everyone to contribute to these pages or start new
ones as desired. But before you do, please check out the main documentation
site as well as the [[FAQ]] and the
[[http://tomcat.apache.org/lists.html|mailing lists]] (whose archives are
searchable).
-
- * '''[[GettingStarted|Getting Started]]''' - Getting started with Tomcat.
- * '''[[TomcatVersions|Tomcat versions]]''' - A list of every Tomcat version
and its current status.
- * '''[[FAQ]]''' - Frequently Asked Questions
- * '''[[SupportAndTraining|Support and Training]]''' - A list of companies
that offer support and training for Tomcat.
- * '''[[PoweredBy|Powered By]]''' - A list of sites powered by Tomcat.
- * '''[[HowTo|How To ...]]''' - How to as linked by the FAQ.
- * '''[[Specifications]]''' - A list of the relevant specifications and links
to them
- * '''[[Logging_Tutorial]]''' - A Logging Tutorial.
- * '''[[JNDI_HowTo]]''' - How to authenticate to different LDAP servers
- * '''[[Tomcat/Books|Books]]''' - Books about Tomcat.
- * '''[[UsingPhp|Using PHP]]''' - Using PHP with Tomcat 4 or later.
- * '''[[WhatIsComet|What is Comet]]''' - What is the Tomcat Comet API.
- * '''[[DocumentInOtherLanguages|Translations]]''' - List of Tomcat documents
in other languages.
- * '''[[GSOC]]''' - Google Summer of Code
-
- = Special Wiki pages =
- * '''HelpContents''' - A basic guide to the MoinMoin wiki (including
information about wiki syntax).
- * See also '''[[http://moinmo.in/HelpForUsers|HelpForUsers]]''' on the
[[http://moinmo.in/|moinmo.in]] site.
- * '''CategoryCategory''' - A list of page categories on this wiki.
- * See '''[[CategoryFAQ|CategoryFAQ]]''',
'''[[CategoryGSOC|CategoryGSOC]]'''.
-
- * '''TitleIndex''' - A list of all pages on this wiki.
- * '''WordIndex''' - A list of all the words that appear in the titles of the
pages on this wiki, with links to pages that include that word.
- * '''FindPage''' - A full-text search of the wiki.
- * '''WantedPages''' - All the "broken links" -- a list of all the pages on
this wiki that are linked to, but do not exist.
- * '''OrphanedPages''' - All pages on this wiki that are not linked to from
anywhere else (and are thus very hard to reach).
- * '''RandomPage''' - Generates a list of 75 random pages on this wiki.
- * '''RecentChanges''' - Shows a list of recent changes in this wiki.
- * '''PageSize''' - Generates a graph and some statistics about the sizes of
pages on this wiki.
- * '''EventStats/HitCounts''' - Generates a graph and some statistics about
the sizes of pages on this wiki.
- * '''EventStats/UserAgents''' -Generates a graph of the web browsers used in
visiting this page.
- * '''SystemInformation''' - Shows basic information about this wiki
installation, the extensions it has installed, etc.
- * '''PythonLanguage''' - The language used for this Wiki.
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "FrontPage" by chadear
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "FrontPage" page has been changed by chadear.
http://wiki.apache.org/tomcat/FrontPage?action=diff&rev1=2&rev2=3
--
- A Wiki is a collaborative site, anyone can contribute and share:
+ http://wiki.apache.org/tomcat/aselam?action=AttachFile&do=view&target=4.jpg
- * Edit any page by pressing '''<>''' at the top or the bottom
of the page
- * Create a link to another page with joined capitalized words (like
WikiSandBox) or with {{{["quoted words in brackets"]}}}
- * Search for page titles or text within pages using the search box at the
top of any page
- * See HelpForBeginners to get you going, HelpContents for all help pages.
-
- To learn more about what a WikiWikiWeb is, read about MoinMoin:WhyWikiWorks
and the MoinMoin:WikiNature. Also, consult the MoinMoin:WikiWikiWebFaq.
-
- This wiki is powered by MoinMoin.
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Page FrontPage deleted from Tomcat Wiki
Dear wiki user, You have subscribed to a wiki page "Tomcat Wiki" for change notification. The page "FrontPage" has been deleted by chadear. http://wiki.apache.org/tomcat/FrontPage - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
FindPage reverted to revision 2 on Tomcat Wiki
Dear wiki user, You have subscribed to a wiki page "Tomcat Wiki" for change notification. The page FindPage has been reverted to revision 2 by KonstantinKolinko. The comment on this change is: Revert to rev.2 (Undo vandalizm). http://wiki.apache.org/tomcat/FindPage?action=diff&rev1=3&rev2=4 -- - ##language:tr + ##language:en You can use this page to search all entries in this WikiWikiWeb. Searches are not case sensitive. Good starting points to explore a wiki are: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Page selam deleted from Tomcat Wiki
Dear wiki user, You have subscribed to a wiki page "Tomcat Wiki" for change notification. The page "selam" has been deleted by KonstantinKolinko. The comment on this change is: Deleting the page created by a vandal.. http://wiki.apache.org/tomcat/selam - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
PythonLanguage reverted to revision 2 on Tomcat Wiki
Dear wiki user, You have subscribed to a wiki page "Tomcat Wiki" for change notification. The page PythonLanguage has been reverted to revision 2 by KonstantinKolinko. The comment on this change is: Revert to rev.2 (Undo vandalism). http://wiki.apache.org/tomcat/PythonLanguage?action=diff&rev1=3&rev2=4 -- Python is a dynamic object-oriented language. Links: - * http://www.selam.org/ + * http://www.python.org/ * [[EfnetPythonWiki:FrontPage|#python Wiki]] * http://python.faqts.com - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
aselam reverted to revision 69 on Tomcat Wiki
Dear wiki user,
You have subscribed to a wiki page "Tomcat Wiki" for change notification.
The page aselam has been reverted to revision 69 by KonstantinKolinko.
The comment on this change is: Revert to rev.69 (Undo vandalism).
http://wiki.apache.org/tomcat/aselam?action=diff&rev1=73&rev2=74
--
- q
+ = Welcome to the Apache Tomcat Wiki =
+ {{http://tomcat.apache.org/images/tomcat.gif}}
+ This is the Wiki for Apache Tomcat, a Servlet and Java Server Pages container
developed under the Apache License. The main documentation for this product is
at [[http://tomcat.apache.org|tomcat.apache.org]]. Below is a list of some
useful pages: we encourage everyone to contribute to these pages or start new
ones as desired. But before you do, please check out the main documentation
site as well as the [[FAQ]] and the
[[http://tomcat.apache.org/lists.html|mailing lists]] (whose archives are
searchable).
+
+ * '''[[GettingStarted|Getting Started]]''' - Getting started with Tomcat.
+ * '''[[TomcatVersions|Tomcat versions]]''' - A list of every Tomcat version
and its current status.
+ * '''[[FAQ]]''' - Frequently Asked Questions
+ * '''[[SupportAndTraining|Support and Training]]''' - A list of companies
that offer support and training for Tomcat.
+ * '''[[PoweredBy|Powered By]]''' - A list of sites powered by Tomcat.
+ * '''[[HowTo|How To ...]]''' - How to as linked by the FAQ.
+ * '''[[Specifications]]''' - A list of the relevant specifications and links
to them
+ * '''[[Logging_Tutorial]]''' - A Logging Tutorial.
+ * '''[[JNDI_HowTo]]''' - How to authenticate to different LDAP servers
+ * '''[[Tomcat/Books|Books]]''' - Books about Tomcat.
+ * '''[[UsingPhp|Using PHP]]''' - Using PHP with Tomcat 4 or later.
+ * '''[[WhatIsComet|What is Comet]]''' - What is the Tomcat Comet API.
+ * '''[[DocumentInOtherLanguages|Translations]]''' - List of Tomcat documents
in other languages.
+ * '''[[GSOC]]''' - Google Summer of Code
+
+ = Special Wiki pages =
+ * '''HelpContents''' - A basic guide to the MoinMoin wiki (including
information about wiki syntax).
+ * See also '''[[http://moinmo.in/HelpForUsers|HelpForUsers]]''' on the
[[http://moinmo.in/|moinmo.in]] site.
+ * '''CategoryCategory''' - A list of page categories on this wiki.
+ * See '''[[CategoryFAQ|CategoryFAQ]]''',
'''[[CategoryGSOC|CategoryGSOC]]'''.
+
+ * '''TitleIndex''' - A list of all pages on this wiki.
+ * '''WordIndex''' - A list of all the words that appear in the titles of the
pages on this wiki, with links to pages that include that word.
+ * '''FindPage''' - A full-text search of the wiki.
+ * '''WantedPages''' - All the "broken links" -- a list of all the pages on
this wiki that are linked to, but do not exist.
+ * '''OrphanedPages''' - All pages on this wiki that are not linked to from
anywhere else (and are thus very hard to reach).
+ * '''RandomPage''' - Generates a list of 75 random pages on this wiki.
+ * '''RecentChanges''' - Shows a list of recent changes in this wiki.
+ * '''PageSize''' - Generates a graph and some statistics about the sizes of
pages on this wiki.
+ * '''EventStats/HitCounts''' - Generates a graph and some statistics about
the sizes of pages on this wiki.
+ * '''EventStats/UserAgents''' -Generates a graph of the web browsers used in
visiting this page.
+ * '''SystemInformation''' - Shows basic information about this wiki
installation, the extensions it has installed, etc.
+ * '''PythonLanguage''' - The language used for this Wiki.
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Page FrontPage deleted from Tomcat Wiki
Dear wiki user, You have subscribed to a wiki page "Tomcat Wiki" for change notification. The page "FrontPage" has been deleted by KonstantinKolinko. The comment on this change is: Trying to delete default version of FrontPage. The actual version is in the page named "aselam" at this moment.. http://wiki.apache.org/tomcat/FrontPage - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "FrontPage" by KonstantinKolink o
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "FrontPage" page has been changed by KonstantinKolinko.
The comment on this change is: Undoing vandalism. Renaming a FrontPage cannot
be reveted easily, because deleting just reverts the page to defaults. Copying
the text from rev69 of http://wiki.apache.org/tomcat/aselam?action=info.
http://wiki.apache.org/tomcat/FrontPage?action=diff&rev1=3&rev2=6
--
- http://wiki.apache.org/tomcat/aselam?action=AttachFile&do=view&target=4.jpg
+ = Welcome to the Apache Tomcat Wiki =
+ {{http://tomcat.apache.org/images/tomcat.gif}}
+ This is the Wiki for Apache Tomcat, a Servlet and Java Server Pages container
developed under the Apache License. The main documentation for this product is
at [[http://tomcat.apache.org|tomcat.apache.org]]. Below is a list of some
useful pages: we encourage everyone to contribute to these pages or start new
ones as desired. But before you do, please check out the main documentation
site as well as the [[FAQ]] and the
[[http://tomcat.apache.org/lists.html|mailing lists]] (whose archives are
searchable).
+
+ * '''[[GettingStarted|Getting Started]]''' - Getting started with Tomcat.
+ * '''[[TomcatVersions|Tomcat versions]]''' - A list of every Tomcat version
and its current status.
+ * '''[[FAQ]]''' - Frequently Asked Questions
+ * '''[[SupportAndTraining|Support and Training]]''' - A list of companies
that offer support and training for Tomcat.
+ * '''[[PoweredBy|Powered By]]''' - A list of sites powered by Tomcat.
+ * '''[[HowTo|How To ...]]''' - How to as linked by the FAQ.
+ * '''[[Specifications]]''' - A list of the relevant specifications and links
to them
+ * '''[[Logging_Tutorial]]''' - A Logging Tutorial.
+ * '''[[JNDI_HowTo]]''' - How to authenticate to different LDAP servers
+ * '''[[Tomcat/Books|Books]]''' - Books about Tomcat.
+ * '''[[UsingPhp|Using PHP]]''' - Using PHP with Tomcat 4 or later.
+ * '''[[WhatIsComet|What is Comet]]''' - What is the Tomcat Comet API.
+ * '''[[DocumentInOtherLanguages|Translations]]''' - List of Tomcat documents
in other languages.
+ * '''[[GSOC]]''' - Google Summer of Code
+
+ = Special Wiki pages =
+ * '''HelpContents''' - A basic guide to the MoinMoin wiki (including
information about wiki syntax).
+ * See also '''[[http://moinmo.in/HelpForUsers|HelpForUsers]]''' on the
[[http://moinmo.in/|moinmo.in]] site.
+ * '''CategoryCategory''' - A list of page categories on this wiki.
+ * See '''[[CategoryFAQ|CategoryFAQ]]''',
'''[[CategoryGSOC|CategoryGSOC]]'''.
+
+ * '''TitleIndex''' - A list of all pages on this wiki.
+ * '''WordIndex''' - A list of all the words that appear in the titles of the
pages on this wiki, with links to pages that include that word.
+ * '''FindPage''' - A full-text search of the wiki.
+ * '''WantedPages''' - All the "broken links" -- a list of all the pages on
this wiki that are linked to, but do not exist.
+ * '''OrphanedPages''' - All pages on this wiki that are not linked to from
anywhere else (and are thus very hard to reach).
+ * '''RandomPage''' - Generates a list of 75 random pages on this wiki.
+ * '''RecentChanges''' - Shows a list of recent changes in this wiki.
+ * '''PageSize''' - Generates a graph and some statistics about the sizes of
pages on this wiki.
+ * '''EventStats/HitCounts''' - Generates a graph and some statistics about
the sizes of pages on this wiki.
+ * '''EventStats/UserAgents''' -Generates a graph of the web browsers used in
visiting this page.
+ * '''SystemInformation''' - Shows basic information about this wiki
installation, the extensions it has installed, etc.
+ * '''PythonLanguage''' - The language used for this Wiki.
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Page aselam deleted from Tomcat Wiki
Dear wiki user, You have subscribed to a wiki page "Tomcat Wiki" for change notification. The page "aselam" has been deleted by KonstantinKolinko. The comment on this change is: Deleting the renamed version of FrontPage created by a vandal. The text was copied back to FrontPage.. http://wiki.apache.org/tomcat/aselam - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r992258 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
On 09/04/2010 12:16 AM, Mark Thomas wrote: On 03/09/2010 11:37, mt...@apache.org wrote: I'm seeing long shutdown times now on OSX. I haven't had the patience to see if they eventually return and have had been killing the process. From where it appears to be looping - this patch looks like the culprit. Right, however the culprit is probably hidden somewhere inside those run() methods which never ends. What does kill -3 says? Where it's blocked? Is it Acceptor or some Poller. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r992258 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
On 09/04/2010 12:16 AM, Mark Thomas wrote: On 03/09/2010 11:37, mt...@apache.org wrote: Author: mturk Date: Fri Sep 3 10:37:53 2010 New Revision: 992258 URL: http://svn.apache.org/viewvc?rev=992258&view=rev Log: Make destroy method returning when the worker thread finishes instead separately calling destroy followed by join I'm seeing long shutdown times now on OSX. I haven't had the patience to see if they eventually return and have had been killing the process. From where it appears to be looping - this patch looks like the culprit. BTW, I just did a fresh trunk build on Darwin 10.4.0 with java 1.6.0_20 and sudo port install tomcat-native No delay on shutdown. Any particular conf or something I can reproduce that locally? Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
