DO NOT REPLY [Bug 46457] New: Typos in multicast.c
https://issues.apache.org/bugzilla/show_bug.cgi?id=46457 Summary: Typos in multicast.c Product: Tomcat Native Version: 1.1.15 Platform: All OS/Version: All Status: NEW Severity: major Priority: P2 Component: Library AssignedTo: dev@tomcat.apache.org ReportedBy: b...@hot-shot.com In the multicast.c source all references to "Multicast" are misspelled "Mulicast". -- 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: r730382 - in /tomcat/trunk: ./ java/org/apache/catalina/tribes/group/interceptors/ modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ modules/jdbc-pool/test/org/apache/tomcat/
Author: markt Date: Wed Dec 31 04:36:44 2008 New Revision: 730382 URL: http://svn.apache.org/viewvc?rev=730382&view=rev Log: Fix svn properties. Patch by sebb Modified: tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt (contents, props changed) tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java (contents, props changed) tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java (props changed) tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml (props changed) tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java (props changed) tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestGetConnection.java (props changed) tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java (props changed) tomcat/trunk/test/org/apache/el/parser/TestELParser.java (contents, props changed) Modified: tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt?rev=730382&r1=730381&r2=730382&view=diff == --- tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt (original) +++ tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt Wed Dec 31 04:36:44 2008 @@ -1,48 +1,48 @@ - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - -$Id: $ - -= -An outline plan for the first stable Tomcat 7 release -= - -1. Update trunk with new API from Servlet Spec 3.0 PR - -2. Provide NOOP implementations with TODO SRV3 markers so it will build - -3. Implement all the new Servlet 3 features - -4. Do an alpha realease (from trunk) - - Create tc7.0.x\tags to hold release tags - - Create Bugzilla project - - Add to web site - - Update Wiki version status page - -5. Fix issues as they get reported - -6. Update for next public draft(s) of the spec if any. - -7. Aim for first stable TC7 release with final release of Servlet 3 spec - - Create tc7.0.x\trunk from trunk at first stable release - -8. Nice to haves in first Tomcat 7 stable release - - Remove old, unused code - - Clean up internal API (eg remove unused params from methods) - - Code needs to be ID'd and deprecated in 6.x first - - Support for standalone EL - - http://issues.apache.org/bugzilla/show_bug.cgi?id=43819 + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +$Id: $ + += +An outline plan for the first stable Tomcat 7 release += + +1. Update trunk with new API from Servlet Spec 3.0 PR + +2. Provide NOOP implementations with TODO SRV3 markers so it will build + +3. Implement all the new Servlet 3 features + +4. Do an alpha realease (from trunk) + - Create tc7.0.x\tags to hold release tags + - Create Bugzilla project + - Add to web site + - Upda
Re: SVN properties for tomcat trunk
sebb wrote: > AFAICT, the following SVN property settings are missing from tomcat-trunk: Fixed. Thanks for the patch. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Java (and other) source files without AL headers
sebb wrote: > Tomcat trunk has quite a few Java files without the correct AL headers: Fixed. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730383 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/ modules/bayeux/java/org/apache/tomcat/bayeux/ modules/bayeux/test/org/apache/cometd/bayeux/samples/ modules/bayeux/webapps
Author: markt
Date: Wed Dec 31 04:48:07 2008
New Revision: 730383
URL: http://svn.apache.org/viewvc?rev=730383&view=rev
Log:
Add missing AL2 headers.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/HttpError.java
tomcat/trunk/modules/bayeux/test/org/apache/cometd/bayeux/samples/BayeuxStockTicker.java
tomcat/trunk/modules/bayeux/test/org/apache/cometd/bayeux/samples/EchoChatClient.java
tomcat/trunk/modules/bayeux/webapps/cometd/WEB-INF/web.xml
tomcat/trunk/modules/bayeux/webapps/cometd/examples/simplechat/cometdchat.htm
tomcat/trunk/modules/bayeux/webapps/cometd/examples/simplechat/ticker.html
tomcat/trunk/modules/bayeux/webapps/cometd/index.html
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CreateTestTable.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/StatementFinalizerTest.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestGetConnection.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TwoDataSources.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java?rev=730383&r1=730382&r2=730383&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java
Wed Dec 31 04:48:07 2008
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.tomcat.util.net.jsse;
import java.net.Socket;
Modified:
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/HttpError.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/HttpError.java?rev=730383&r1=730382&r2=730383&view=diff
==
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/HttpError.java
(original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/HttpError.java
Wed Dec 31 04:48:07 2008
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.tomcat.bayeux;
public class HttpError {
Modified:
tomcat/trunk/modules/bayeux/test/org/apache/cometd/bayeux/samples/BayeuxStockTicker.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/test/org/apache/cometd/bayeux/samples/BayeuxStockTicker.java?rev=730383&r1=730382&r2=730383&view=diff
==
---
tomcat/trunk/modules/bayeux/test/org/apache/cometd/bayeux/samples/Ba
svn commit: r730384 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/tomcat/util/net/ webapps/docs/
Author: markt
Date: Wed Dec 31 05:17:41 2008
New Revision: 730384
URL: http://svn.apache.org/viewvc?rev=730384&view=rev
Log:
Make thread pool limits configurable via JMX (they were already read/write but
changing them caused various errors)
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 31 05:17:41 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,726052,728032,728947,729057
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,719602,719626,719628,726052,728032,728947,729057
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=730384&r1=730383&r2=730384&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 31 05:17:41 2008
@@ -131,14 +131,6 @@
Just did that for trunk (r711934; but it contains also other changes).
Caution: at the moment there's no @VERSION@ substitution for
service.bat.
-* Make thread pool limits dynamically configurable
- http://svn.apache.org/viewvc?rev=719602&view=rev
- http://svn.apache.org/viewvc?rev=719628&view=rev
- +1: markt, fhanik, jim
- 0: remm (risky, would it be possible to stop backporting risky changes and
behavior modifications to 6.0.x ?
- on this particular one, if people want fancy behavior, maybe they should
use an executor)
- -1:
-
* I have summarized all the NIO fixes into one patch for those who wish to
test it
* It includes patch [1]-[6] below and can be found at:
* http://people.apache.org/~fhanik/tomcat/uber-patch.txt
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java?rev=730384&r1=730383&r2=730384&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
Wed Dec 31 05:17:41 2008
@@ -130,14 +130,23 @@
public void setMaxIdleTime(int maxIdleTime) {
this.maxIdleTime = maxIdleTime;
+if (executor != null) {
+executor.setKeepAliveTime(maxIdleTime, TimeUnit.MILLISECONDS);
+}
}
public void setMaxThreads(int maxThreads) {
this.maxThreads = maxThreads;
+if (executor != null) {
+executor.setMaximumPoolSize(maxThreads);
+}
}
public void setMinSpareThreads(int minSpareThreads) {
this.minSpareThreads = minSpareThreads;
+if (executor != null) {
+executor.setCorePoolSize(minSpareThreads);
+}
}
public void setName(String name) {
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=730384&r1=730383&r2=730384&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 Wed
Dec 31 05:17:41 2008
@@ -36,6 +36,7 @@
import org.apache.tomcat.jni.SSLSocket;
import org.apache.tomcat.jni.Socket;
import org.apache.tomcat.jni.Status;
+import org.apache.tomcat.util.net.JIoEndpoint.Worker;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -179,7 +180,14 @@
* Maximum amount of worker threads.
*/
protected int maxThreads = 200;
-public void setMaxThreads(int maxThreads) { this.maxThreads = maxThreads; }
+public void setMaxThreads(int maxThreads) {
+this.maxThreads = maxThreads;
+if (running) {
+synchronized(workers) {
+
svn commit: r730390 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/javax/el/CompositeELResolver.java webapps/docs/changelog.xml
Author: markt
Date: Wed Dec 31 05:33:19 2008
New Revision: 730390
URL: http://svn.apache.org/viewvc?rev=730390&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42077
Don't include nulls in iterator. Based on a patch by Mathias Broekelmann
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/javax/el/CompositeELResolver.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 31 05:33:19 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,719602,719626,719628,726052,728032,728947,729057
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,719602,719626,719628,720069,726052,728032,728947,729057
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=730390&r1=730389&r2=730390&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 31 05:33:19 2008
@@ -175,12 +175,6 @@
+1: markt, fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42077
- Don't include nulls in iterator. Based on a patch by Mathias Broekelmann
- http://svn.apache.org/viewvc?rev=720069&view=rev
- +1: markt, fhanik, jim
- -1:
-
* Use consistent (and more useful) JPDA defaults in catalina.bat
http://svn.apache.org/viewvc?rev=721040&view=rev
+1: markt, fhanik
Modified: tomcat/tc6.0.x/trunk/java/javax/el/CompositeELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/CompositeELResolver.java?rev=730390&r1=730389&r2=730390&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/el/CompositeELResolver.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/CompositeELResolver.java Wed Dec 31
05:33:19 2008
@@ -19,6 +19,7 @@
import java.beans.FeatureDescriptor;
import java.util.Iterator;
+import java.util.NoSuchElementException;
public class CompositeELResolver extends ELResolver {
@@ -127,16 +128,18 @@
private final int size;
- private Iterator itr;
+private Iterator itr;
private int idx;
- public FeatureIterator(ELContext context, Object base,
- ELResolver[] resolvers, int size) {
- this.context = context;
- this.base = base;
- this.resolvers = resolvers;
- this.size = size;
+private FeatureDescriptor next;
+
+public FeatureIterator(ELContext context, Object base,
+ELResolver[] resolvers, int size) {
+this.context = context;
+this.base = base;
+this.resolvers = resolvers;
+this.size = size;
this.idx = 0;
this.guaranteeIterator();
@@ -150,27 +153,35 @@
}
}
- public boolean hasNext() {
- return this.itr != null;
- }
+public boolean hasNext() {
+if (this.next != null)
+return true;
+if (this.itr != null){
+while (this.next == null && itr.hasNext()) {
+this.next = itr.next();
+}
+} else {
+return false;
+}
+if (this.next == null) {
+this.itr = null;
+this.guaranteeIterator();
+}
+return hasNext();
+}
+
+public FeatureDescriptor next() {
+if (!hasNext())
+throw new NoSuchElementException();
+FeatureDescriptor next = this.next;
+this.next = null;
+return next;
- public FeatureDescriptor next() {
- Object result = null;
- if (this.itr != null) {
- if (this.itr.hasNext()) {
- result = this.itr.next();
- if (!this.itr.hasNext()) {
- this.itr = null;
-
DO NOT REPLY [Bug 42077] the iterator from javax.el.CompositeELResolver#getFeatureDescriptor() must not return null values
https://issues.apache.org/bugzilla/show_bug.cgi?id=42077 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2008-12-31 05:33:44 PST --- Thanks for the patch. It has been applied to 6.0.x and will be included in 6.0.19 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: r730393 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/net/NioEndpoint.java java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java webapps/docs/changelog.xml we
Author: markt
Date: Wed Dec 31 05:38:45 2008
New Revision: 730393
URL: http://svn.apache.org/viewvc?rev=730393&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44285
Make SSL session cache size and timeout configurable
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 31 05:38:45 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,719602,719626,719628,720069,726052,728032,728947,729057
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,719602,719626,719628,720069,723404,726052,728032,728947,729057
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=730393&r1=730392&r2=730393&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 31 05:38:45 2008
@@ -191,12 +191,6 @@
possibly be exploited by a malicious webapp.
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44285
- Make SSL session cache size and timeout configurable
- http://svn.apache.org/viewvc?rev=723404&view=rev
- +1: markt, fhanik, jim
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46232
Don't override the endorsed dir if the user has set it
http://svn.apache.org/viewvc?rev=723738&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=730393&r1=730392&r2=730393&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed
Dec 31 05:38:45 2008
@@ -47,6 +47,7 @@
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLSessionContext;
import javax.net.ssl.TrustManagerFactory;
import org.apache.juli.logging.Log;
@@ -589,7 +590,6 @@
public void setKeystoreType(String s ) { this.keystoreType = s;}
protected String sslProtocol = "TLS";
-
public String getSslProtocol() { return sslProtocol;}
public void setSslProtocol(String s) { sslProtocol = s;}
@@ -602,7 +602,6 @@
for (int i=0; i0) reclaimParachute(true);
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=730393&r1=730392&r2=730393&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Wed Dec 31 05:38:45 2008
@@ -49,6 +49,7 @@
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSessionContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
@@ -88,6 +89,9 @@
private static final String defaultKeystoreFile
= System.getProperty("user.home") + "/.keystore";
private static final String defaultKeyPass = "changeit";
+private static final int defaultSessionCacheSize = 0;
+private static final int defaultSessionTimeout = 86400;
+
static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog(JSSESocketFactory.class);
@@ -413,6 +417,28 @@
trustAlgorithm),
new SecureRandom());
+// Configure SSL session cache
+int sessionCacheSize;
+if (attributes.get("sessionCacheSize") != null) {
+sessionCacheSize = Integer.parseInt(
+
DO NOT REPLY [Bug 44285] ssl.SessionId Cache Control
https://issues.apache.org/bugzilla/show_bug.cgi?id=44285 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2008-12-31 05:38:45 PST --- This has been fixed in 6.0.x and will be included in 6.0.19 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: r730396 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt bin/setclasspath.bat bin/setclasspath.sh webapps/docs/changelog.xml
Author: markt Date: Wed Dec 31 05:49:30 2008 New Revision: 730396 URL: http://svn.apache.org/viewvc?rev=730396&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46232 Don't override the endorsed dir if the user has set it Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/bin/setclasspath.bat tomcat/tc6.0.x/trunk/bin/setclasspath.sh tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 31 05:49:30 2008 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,719602,719626,719628,720069,723404,726052,728032,728947,729057 +/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,719602,719626,719628,720069,723404,723738,726052,727303,728032,728947,729057,730250 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=730396&r1=730395&r2=730396&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 31 05:49:30 2008 @@ -191,14 +191,6 @@ possibly be exploited by a malicious webapp. -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46232 - Don't override the endorsed dir if the user has set it - http://svn.apache.org/viewvc?rev=723738&view=rev - http://svn.apache.org/viewvc?rev=727303&view=rev - http://svn.apache.org/viewvc?rev=730250&view=rev - +1: markt, fhanik, jim - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46304 Excludes performance issues Use Principal when calling doFilterEvent() Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?rev=730396&r1=730395&r2=730396&view=diff == --- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original) +++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Wed Dec 31 05:49:30 2008 @@ -61,8 +61,11 @@ goto exit :okBasedir +rem Don't override the endorsed dir if the user has set it previously +if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir rem Set the default -Djava.endorsed.dirs argument set JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed +:gotEndorseddir rem Set standard CLASSPATH rem Note that there are no quotes as we do not want to introduce random Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.sh?rev=730396&r1=730395&r2=730396&view=diff == --- tomcat/tc6.0.x/trunk/bin/setclasspath.sh (original) +++ tomcat/tc6.0.x/trunk/bin/setclasspath.sh Wed Dec 31 05:49:30 2008 @@ -95,8 +95,11 @@ fi fi -# Set the default -Djava.endorsed.dirs argument -JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed +# Don't override the endorsed dir if the user has set it previously +if [ -z "$JAVA_ENDORSED_DIRS" ]; then + # Set the default -Djava.endorsed.dirs argument + JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed +fi # Set standard CLASSPATH if [ "$1" = "javac" ] ; then Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=730396&r1=730395&r2=730396&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Dec 31 05:49:30 2008 @@ -209,6 +209,10 @@ manifest. (markt) +46232: Enabled the XMl parser to be over-ridden using the +standard endorsed mechanism. (markt) + + 46403: Provide a workaround for an IE and Safari bug that means the Max-Age attribute of a cookie is ignored. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46232] Can't override XML parser implementation using endorsed mechanism
https://issues.apache.org/bugzilla/show_bug.cgi?id=46232 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2008-12-31 05:49:51 PST --- This has been fixed in 6.0.x and will be included in 6.0.19 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: r730212 - in /tomcat/trunk/modules/jdbc-pool: build.xml sign.sh
Thank you very much David, I will get this in there
Filip
David Knox wrote:
Hi Filip,
Of course, I think most would prefer the build wasn't broken :) I may be one of only a few people that watch and actually build the trunk. That aside, I wrote a little test to make sure introspection traverses the graph as I thought. NotificationBroadcasterSupport implements NotificationEmitter, where getNotificationInfo is described, the call works the same through the NotificationEmitter, NotificationBroadcasterSupport, implementation, and Method.invoke - the last definition is the one that's called and any call up the graph has to be explicit.
Since that was so straight forward, I guessed that you want getNotificationInfo
to be visible viz JMX instrumentation. But this has a straight forward solution
too - so, finally, guessed that there's something I'm missing :)
I changed ConnectionPool locally to get it to compile. I pasted the diff below. I've made a few assumptions and won't take it personally if wrong - I'm not committed to this solution. I think it does what you intended but I'm not sure I've covered the introspection aspect that you are concerned about.
Index: ConnectionPool.java
===
--- ConnectionPool.java (revision 730270)
+++ ConnectionPool.java (working copy)
@@ -42,7 +42,7 @@
}
public ConnectionPool(org.apache.tomcat.jdbc.pool.ConnectionPool pool, boolean for16) {
-super(getDefaultNotificationInfo());
+super();
this.pool = pool;
}
@@ -61,10 +61,18 @@
@Override
public MBeanNotificationInfo[] getNotificationInfo() {
-return getDefaultNotificationInfo();
-}
+ MBeanNotificationInfo[] pres = super.getNotificationInfo();
+ MBeanNotificationInfo[] loc = getDefaultNotificationInfo();
+ MBeanNotificationInfo[] aug = new MBeanNotificationInfo[
+ pres.length + loc.length
+ ];
+ System.arraycopy(pres, 0, aug, 0, pres.length);
+ System.arraycopy(loc, 0, aug, pres.length+1, loc.length);
+
+return aug;
+}
-public static MBeanNotificationInfo[] getDefaultNotificationInfo() {
+private MBeanNotificationInfo[] getDefaultNotificationInfo() {
String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, NOTIFY_ABANDON};
String name = Notification.class.getName();
String description = "A connection pool error condition was met.";
On Tuesday, December 30, 2008, at 02:34PM, "Filip Hanik - Dev Lists"
wrote:
David Knox wrote:
Hi,
jdbc-pool doesn't compile using JDK5 (sun).
[javac]
/home/dknox/src/tomcat-trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java:45:
cannot find symbol
[javac] symbol : constructor
NotificationBroadcasterSupport(javax.management.MBeanNotificationInfo[])
[javac] location: class javax.management.NotificationBroadcasterSupport
[javac] super(getDefaultNotificationInfo());
The constructor NotificationBroadcasterSupport(MBeanNotificationInfo[]) doesn't
exist in the JDK1.5 JMX package. The jdbc-pool module builds as one would
expect with JDK6
Was this intentional? Maybe I've missed something?
yes it was, I can make it compile with 1.5 but then I will lose
information about the notifications through introspections.
It still runs with 1.5, I'm contemplating making it compile on 1.5, any
preferences?
Filip
-- knoxy
On Tuesday, December 30, 2008, at 11:37AM, wrote:
Author: fhanik
Date: Tue Dec 30 10:37:07 2008
New Revision: 730212
URL: http://svn.apache.org/viewvc?rev=730212&view=rev
Log:
Make sure that the packaged up binaries have a MD5 sum as well, to verify
download size
Modified:
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/modules/jdbc-pool/sign.sh
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=730212&r1=730211&r2=730212&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Tue Dec 30 10:37:07 2008
@@ -23,7 +23,7 @@
-
+
@@ -194,6 +194,11 @@
destfile="${destdir}/apache-tomcat-jdbc-${version}.tar.gz"/>
+
+
+
+
+
Modified: tomcat/trunk/modules/jdbc-pool/sign.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=730212&r1=730211&r2=730212&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/sign.sh (original)
+++ tomcat/trunk/modules/jdbc-pool/sign.sh Tue Dec 30 10:37:07 2008
@@ -1,4 +1,4 @@
-VERSION=v1.0.12-beta
+VERSION=v1.0.13-beta
for i in $(fin
