svn commit: r1521370 - /tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Author: markt
Date: Tue Sep 10 08:44:20 2013
New Revision: 1521370
URL: http://svn.apache.org/r1521370
Log:
Fix regression introduced in r1518158
Calls to available() (used by comet) which in turn calls fill(false) should
result in a non-blocking rather than a blocking read.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1521370&r1=1521369&r2=1521370&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Tue
Sep 10 08:44:20 2013
@@ -556,33 +556,15 @@ public class InternalAprInputBuffer exte
@Override
protected boolean fill(boolean block) throws IOException {
-// Ignore the block parameter
int nRead = 0;
if (parsingHeader) {
-
if (lastValid == buf.length) {
throw new IllegalArgumentException
(sm.getString("iib.requestheadertoolarge.error"));
}
-
-bbuf.clear();
-nRead = doReadSocket(true);
-if (nRead > 0) {
-bbuf.limit(nRead);
-bbuf.get(buf, pos, nRead);
-lastValid = pos + nRead;
-} else {
-if ((-nRead) == Status.EAGAIN) {
-return false;
-} else {
-throw new IOException(sm.getString("iib.failedread"));
-}
-}
-
} else {
-
if (buf.length - end < 4500) {
// In this case, the request header was really large, so we
allocate a
// brand new one; the old one will get GCed when subsequent
requests
@@ -592,34 +574,36 @@ public class InternalAprInputBuffer exte
}
pos = end;
lastValid = pos;
-bbuf.clear();
-nRead = doReadSocket(true);
-if (nRead > 0) {
-bbuf.limit(nRead);
-bbuf.get(buf, pos, nRead);
-lastValid = pos + nRead;
-} else if (-nRead == Status.EAGAIN) {
-return false;
-} else if ((-nRead) == Status.ETIMEDOUT || (-nRead) ==
Status.TIMEUP) {
-if (block) {
-throw new SocketTimeoutException(
-sm.getString("iib.readtimeout"));
-} else {
-// Attempting to read from the socket when the poller
-// has not signalled that there is data to read appears
-// to behave like a blocking read with a short timeout
-// on OSX rather than like a non-blocking read. If no
-// data is read, treat the resulting timeout like a
-// non-blocking read that returned no data.
-return false;
-}
-} else if (nRead == 0) {
-// APR_STATUS_IS_EOF, since native 1.1.22
-return false;
+}
+
+bbuf.clear();
+
+nRead = doReadSocket(block);
+if (nRead > 0) {
+bbuf.limit(nRead);
+bbuf.get(buf, pos, nRead);
+lastValid = pos + nRead;
+} else if (-nRead == Status.EAGAIN) {
+return false;
+} else if ((-nRead) == Status.ETIMEDOUT || (-nRead) == Status.TIMEUP) {
+if (block) {
+throw new SocketTimeoutException(
+sm.getString("iib.readtimeout"));
} else {
-throw new IOException(sm.getString("iib.failedread.apr",
-Integer.valueOf(-nRead)));
+// Attempting to read from the socket when the poller
+// has not signalled that there is data to read appears
+// to behave like a blocking read with a short timeout
+// on OSX rather than like a non-blocking read. If no
+// data is read, treat the resulting timeout like a
+// non-blocking read that returned no data.
+return false;
}
+} else if (nRead == 0) {
+// APR_STATUS_IS_EOF, since native 1.1.22
+return false;
+} else {
+throw new IOException(sm.getString("iib.failedread.apr",
+Integer.valueOf(-nRead)));
}
return (nRead > 0);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/4946 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1521370 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1521440 - /tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Author: markt
Date: Tue Sep 10 11:47:30 2013
New Revision: 1521440
URL: http://svn.apache.org/r1521440
Log:
Fix Comet unit test failures on OSX. OSX requires timeout of 0 for non-blocking
read
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1521440&r1=1521439&r2=1521440&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Tue
Sep 10 11:47:30 2013
@@ -638,7 +638,12 @@ public class InternalAprInputBuffer exte
writeLock.lock();
wrapper.setBlockingStatus(block);
// Set the current settings for this socket
-Socket.optSet(socket, Socket.APR_SO_NONBLOCK, (block ? 0 : 1));
+if (block) {
+Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 0);
+} else {
+Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 1);
+Socket.timeoutSet(socket, 0);
+}
// Downgrade the lock
try {
readLock.lock();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1521444 - /tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
Author: markt
Date: Tue Sep 10 11:54:41 2013
New Revision: 1521444
URL: http://svn.apache.org/r1521444
Log:
Reduce timing sensitivity of test as some false positives have been observed.
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java?rev=1521444&r1=1521443&r2=1521444&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
Tue Sep 10 11:54:41 2013
@@ -59,17 +59,18 @@ public class TestWebappClassLoaderMemory
// Stop the context
ctx.stop();
-// If the thread still exists, we have a thread/memory leak
-try {
-Thread.sleep(10);
-} catch(InterruptedException ie) {
-// ignore
-}
Thread[] threads = getThreads();
for (Thread thread : threads) {
if (thread != null && thread.isAlive() &&
TaskServlet.TIMER_THREAD_NAME.equals(thread.getName())) {
-fail("Timer thread still running");
+int count = 0;
+while (count < 50 && thread.isAlive()) {
+Thread.sleep(100);
+count++;
+}
+if (thread.isAlive()) {
+fail("Timer thread still running");
+}
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1521023 - in /tomcat/trunk/java: javax/annotation/Generated.java javax/annotation/Resource.java org/apache/catalina/startup/WebAnnotationSet.java
2013/9/9 Mark Thomas : > On 09/09/2013 11:20, Mark Thomas wrote: >> On 09/09/2013 11:09, ma...@apache.org wrote: >>> Author: markt >>> Date: Mon Sep 9 10:09:36 2013 >>> New Revision: 1521023 >>> >>> URL: http://svn.apache.org/r1521023 >>> Log: >>> Fix wrongly named annotation attributes >>> >>> Modified: >>> tomcat/trunk/java/javax/annotation/Generated.java >> This one is OK. >> >>> tomcat/trunk/java/javax/annotation/Resource.java >> This one I am less sure about. The JavaEE 5 Javadoc uses authentication >> but JavaEE 6 onwards uses authenticationType with no indication that >> there has been a change. >> >> I need to dig into the specifications to see what is going on. > > The specification says authenticationType. I'll revert this change. > > It looks like a bug in whatever implementation was used to generate the > Javadoc. > +1. Geronimo uses authenticationType as well, in all versions of the specification (1.0 - 1.2). http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-annotation_1.2_spec/src/main/java/javax/annotation/ Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1521457 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java LocalStrings.properties
Author: markt
Date: Tue Sep 10 12:18:00 2013
New Revision: 1521457
URL: http://svn.apache.org/r1521457
Log:
Fix failing org.apache.coyote.ajp.TestAbstractAjpProcessor unit test. Handle
EAGAIN result from non-blocking read.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1521457&r1=1521456&r2=1521457&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Tue Sep 10
12:18:00 2013
@@ -17,6 +17,7 @@
package org.apache.coyote.ajp;
import java.io.IOException;
+import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
@@ -201,6 +202,21 @@ public class AjpAprProcessor extends Abs
if (nRead == 0) {
// Must be a non-blocking read
return false;
+} else if (-nRead == Status.EAGAIN) {
+return false;
+} else if ((-nRead) == Status.ETIMEDOUT || (-nRead) ==
Status.TIMEUP) {
+if (block) {
+throw new SocketTimeoutException(
+sm.getString("ajpprocessor.readtimeout"));
+} else {
+// Attempting to read from the socket when the poller
+// has not signalled that there is data to read appears
+// to behave like a blocking read with a short timeout
+// on OSX rather than like a non-blocking read. If no
+// data is read, treat the resulting timeout like a
+// non-blocking read that returned no data.
+return false;
+}
} else if (nRead > 0) {
inputBuffer.limit(inputBuffer.limit() + nRead);
nextReadBlocks = true;
Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1521457&r1=1521456&r2=1521457&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Tue Sep 10
12:18:00 2013
@@ -20,6 +20,7 @@ ajpprocessor.failedread=Socket read fail
ajpprocessor.failedsend=Failed to send AJP message
ajpprocessor.header.error=Header message parsing failed
ajpprocessor.header.tooLong=Header message of length [{0}] received but the
packetSize is only [{1}]
+ajpprocessor.readtimeout=Timeout attempting to read data from the socket
ajpprocessor.request.prepare=Error preparing request
ajpprocessor.request.process=Error processing request
ajpprocessor.certs.fail=Certificate conversion failed
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/4947 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1521440 Blamelist: markt Build succeeded! sincerely, -The Buildbot
Re: [VOTE] Release Apache Tomcat Native 1.1.28
On 09/09/2013 12:31, Mladen Turk wrote: > Version 1.1.28 is bug fixing release. > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The VOTE will remain open for at least 48 hours. > > The Apache Tomcat Native 1.1.28 is > [X] Stable, go ahead and release > [ ] Broken because of ... > > > [1] http://people.apache.org/~mturk/native/1.1.28 > [2] > https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_1_28 Tested with the 8.0.x unit tests on Windows, Linux and OSX. I've seen various issues but the root causes have all been in the Java code I have been working on recently and I see the same issues with 1.1.27. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55383] Improve markup and design of Tomcat's HTML pages
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383 --- Comment #31 from Konstantin Preißer --- Created attachment 30809 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30809&action=edit Ppatch for improving HTML markup & style in the Tomcat Site Hi, here is a patch for the main Tomcat Site to improve the HTML markup and the layout, similar to the one for Tomcat 8 Doc. The added image (xdocs/images/tomcat.png) is the same one as in attachment 30740. -- 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: r1521514 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/connector/Connector.java webapps/docs/changelog.xml webapps/docs/config/http.xml
Author: schultz
Date: Tue Sep 10 14:44:15 2013
New Revision: 1521514
URL: http://svn.apache.org/r1521514
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54691
Add configuration property "protocols" alias: "sslEnabledProtocols"
Document the as-yet-undocumented property (only documented sslEnabledProtocols,
to match Tomcat 7/8 documentation).
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=1521514&r1=1521513&r2=1521514&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java Tue
Sep 10 14:44:15 2013
@@ -312,6 +312,7 @@ public class Connector
replacements.put("keystoreType", "keytype");
replacements.put("sslProtocol", "protocol");
replacements.put("sslProtocols", "protocols");
+ replacements.put("sslEnabledProtocols", "protocols");
}
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=1521514&r1=1521513&r2=1521514&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 10 14:44:15 2013
@@ -60,6 +60,11 @@
logging properties without prefixes if the property cannot be found
with
a prefix. (kkolinko)
+
+54691: Add "sslEnableProtocols" alias to HTTP connector
+configuration attribute "protocols" and document the configuration
+attribute. (schultz)
+
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?rev=1521514&r1=1521513&r2=1521514&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Tue Sep 10 14:44:15 2013
@@ -849,7 +849,21 @@
timeout. Use 0 to specify an unlimited timeout. If not specified, a
default of 86400 (24 hours) is used.
-
+
+
+ The comma separated list of SSL protocols to support for HTTPS
+ connections. If specified, only the protocols that are listed and
+ supported by the SSL implementation will be enabled. If not specified,
+ the JVM default is used. The permitted values may be obtained from the
+ JVM documentation for the allowed values for
+ SSLSocket.setEnabledProtocols() e.g.
+ http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#jssenames";>
+ Oracle Java 6 and
+ http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#jssenames";>
+ Oracle Java 7. Note: There is overlap between this attribute and
+ sslProtocol.
+
+
The certificate revocation list file to use to validate client
certificates.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1521040 - in /tomcat/tc7.0.x/trunk/java/javax/annotation: ./ security/
Mark, On 9/9/13 7:12 AM, ma...@apache.org wrote: > Author: markt > Date: Mon Sep 9 11:12:47 2013 > New Revision: 1521040 > > URL: http://svn.apache.org/r1521040 > Log: > Preparation for fixing BZ 55534 > Add @since markers for common annotations > Fix a few spec non-compliance issues > - Generated#comment -> commnets > - DenyAll is permitted on classes Not sure if it's worth correcting, but you have misspelled "comments" above. Given that the patch for Generated.java was specifically to correct the "spelling" (really pluralization) of "comment", it might actually be worth fixing the commit commnet. :) -chris signature.asc Description: OpenPGP digital signature
svn commit: r1521515 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: schultz Date: Tue Sep 10 14:58:29 2013 New Revision: 1521515 URL: http://svn.apache.org/r1521515 Log: Votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1521515&r1=1521514&r2=1521515&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 10 14:58:29 2013 @@ -37,7 +37,7 @@ PATCHES PROPOSED TO BACKPORT: NIO connector incorrectly rejects a request if the CRLF terminating the request line is split across multiple packets. Patch for the fix by Konstantin Preißer (Preisser). - +1: markt, kkolinko + +1: markt, kkolinko, schultz -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55198 @@ -97,7 +97,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix errors in Commons Annotations 1.0 and add some @since markers http://svn.apache.org/r1521040 - +1: markt + +1: markt, schultz -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54691] Rename HTTPS BIO/NIO connector attribute "protocols" to sslEnabledProtocols and document it.
https://issues.apache.org/bugzilla/show_bug.cgi?id=54691 Christopher Schultz changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Christopher Schultz --- I chose not to re-name the "protocols" property... I merely created (another) alias for it called "sslEnabledProtocols". I added documentation for only "sslEnabledProtocols" to encourage the use of that particular property name, but the existing property names remain valid. Fixed in r1521514. Will be included in Tomcat 6.0.38. -- 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: r1521514 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/connector/Connector.java webapps/docs/changelog.xml webapps/docs/config/http.xml
On 10/09/2013 17:10, Christopher Schultz wrote: > Mark, > > On 9/10/13 11:43 AM, Mark Thomas wrote: >> On 10/09/2013 15:44, schu...@apache.org wrote: >>> Author: schultz Date: Tue Sep 10 14:44:15 2013 New Revision: >>> 1521514 >>> >>> URL: http://svn.apache.org/r1521514 Log: Fix >>> https://issues.apache.org/bugzilla/show_bug.cgi?id=54691 >>> >>> Add configuration property "protocols" alias: >>> "sslEnabledProtocols" Document the as-yet-undocumented property >>> (only documented sslEnabledProtocols, to match Tomcat 7/8 >>> documentation). >>> >>> Modified: >>> tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java >>> >>> tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml >>> tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml >> >> This is Tomcat 6 which is RTC not CTR. There should have been a >> proposal in the status file with 3 +1 votes before this was >> applied. > > Yipes. > >> Retrospectively, you have my +1. > > Well. Shall I do things properly and revert the patch, make a > proposal, etc. or can I get a vote by acclimation and avoid the svn > acrobatics? I'm okay with reverting... I just wanted to avoid it if > it didn't really matter (code change is quite trivial after all) > and the team was okay with it. I've done this before and opted for avoiding the svn acrobatics. I'd wait to see if you get another +1. If you don't after a few days then think about reverting it. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1521514 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/connector/Connector.java webapps/docs/changelog.xml webapps/docs/config/http.xml
Mark, On 9/10/13 11:43 AM, Mark Thomas wrote: > On 10/09/2013 15:44, schu...@apache.org wrote: >> Author: schultz >> Date: Tue Sep 10 14:44:15 2013 >> New Revision: 1521514 >> >> URL: http://svn.apache.org/r1521514 >> Log: >> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54691 >> >> Add configuration property "protocols" alias: "sslEnabledProtocols" >> Document the as-yet-undocumented property (only documented >> sslEnabledProtocols, to match Tomcat 7/8 documentation). >> >> Modified: >> tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java >> tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml >> tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml > > This is Tomcat 6 which is RTC not CTR. There should have been a proposal > in the status file with 3 +1 votes before this was applied. Yipes. > Retrospectively, you have my +1. Well. Shall I do things properly and revert the patch, make a proposal, etc. or can I get a vote by acclimation and avoid the svn acrobatics? I'm okay with reverting... I just wanted to avoid it if it didn't really matter (code change is quite trivial after all) and the team was okay with it. Thanks, -chris signature.asc Description: OpenPGP digital signature
[VOTE] Over-zealous svn commit to Tomcat 6.0
All, I recently, forgetting the current RTC policy, made a commit to the Tomcat 6 trunk without making a proposal. Mark pointed out my mistake and I'm prepared to revert the patch if necessary. It is, however, a minor code patch (added a Connector configuration property alias) and the rest is documentation. You can find the patch here: http://svn.apache.org/r1521514 In order to avoid a whole round of svn acrobatics (revert, propose, vote, re-commit), I'd like to ask the committers to vote retrospectively on my patch. If the vote passes (3+ binding), then I'll consider the proposal accepted and take no further action. If the vote fails to pass, I shall revert the patch and make a formal proposal. The VOTE will remain open for at least 48 hours. Patch http://svn.apache.org/r1521514 is [ ] Okay, leave it committed and don't do it again [ ] Broken, revert and propose an alternate patch [ ] Committed in violation of the RTC policy, revert and propose Thanks, -chris signature.asc Description: OpenPGP digital signature
Re: [VOTE] Over-zealous svn commit to Tomcat 6.0
On 10/09/2013 17:23, Christopher Schultz wrote: > All, > > I recently, forgetting the current RTC policy, made a commit to > the Tomcat 6 trunk without making a proposal. Mark pointed out my > mistake and I'm prepared to revert the patch if necessary. > > It is, however, a minor code patch (added a Connector > configuration property alias) and the rest is documentation. You > can find the patch here: http://svn.apache.org/r1521514 > > In order to avoid a whole round of svn acrobatics (revert, > propose, vote, re-commit), I'd like to ask the committers to vote > retrospectively on my patch. If the vote passes (3+ binding), then > I'll consider the proposal accepted and take no further action. If > the vote fails to pass, I shall revert the patch and make a formal > proposal. > > The VOTE will remain open for at least 48 hours. > > Patch http://svn.apache.org/r1521514 is > > [X] Okay, leave it committed and don't do it again [ ] Broken, > revert and propose an alternate patch [ ] Committed in violation of > the RTC policy, revert and propose Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1521514 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/connector/Connector.java webapps/docs/changelog.xml webapps/docs/config/http.xml
On 10.09.2013 17:43, Mark Thomas wrote: > On 10/09/2013 15:44, schu...@apache.org wrote: >> Author: schultz >> Date: Tue Sep 10 14:44:15 2013 >> New Revision: 1521514 >> >> URL: http://svn.apache.org/r1521514 >> Log: >> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54691 >> >> Add configuration property "protocols" alias: "sslEnabledProtocols" >> Document the as-yet-undocumented property (only documented >> sslEnabledProtocols, to match Tomcat 7/8 documentation). >> >> Modified: >> tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java >> tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml >> tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml > > This is Tomcat 6 which is RTC not CTR. There should have been a proposal > in the status file with 3 +1 votes before this was applied. > > Retrospectively, you have my +1. Here's mine as well: +1. I guess that makes 3 assuming your own +1 ;) Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1521546 - /tomcat/jk/trunk/native/common/jk_connect.c
Author: mturk
Date: Tue Sep 10 16:44:48 2013
New Revision: 1521546
URL: http://svn.apache.org/r1521546
Log:
Do not use APR types for common code
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1521546&r1=1521545&r2=1521546&view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Tue Sep 10 16:44:48 2013
@@ -64,7 +64,7 @@ static apr_pool_t *jk_apr_pool = NULL;
#endif
#ifndef INT16SZ
-#define INT16SZ sizeof(apr_int16_t)
+#define INT16SZ sizeof(short)
#endif
#if !defined(EAFNOSUPPORT) && defined(WSAEAFNOSUPPORT)
@@ -978,7 +978,7 @@ int jk_tcp_socket_recvfull(jk_sock_t sd,
*/
static const char *inet_ntop4(const unsigned char *src, char *dst, size_t size)
{
-const apr_size_t MIN_SIZE = 16; /* space for 255.255.255.255\0 */
+const size_t MIN_SIZE = 16; /* space for 255.255.255.255\0 */
int n = 0;
char *next = dst;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1521514 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/connector/Connector.java webapps/docs/changelog.xml webapps/docs/config/http.xml
On 10/09/2013 15:44, schu...@apache.org wrote:
> Author: schultz
> Date: Tue Sep 10 14:44:15 2013
> New Revision: 1521514
>
> URL: http://svn.apache.org/r1521514
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54691
>
> Add configuration property "protocols" alias: "sslEnabledProtocols"
> Document the as-yet-undocumented property (only documented
> sslEnabledProtocols, to match Tomcat 7/8 documentation).
>
> Modified:
> tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
> tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
> tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
This is Tomcat 6 which is RTC not CTR. There should have been a proposal
in the status file with 3 +1 votes before this was applied.
Retrospectively, you have my +1.
Mark
>
> Modified:
> tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
> URL:
> http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=1521514&r1=1521513&r2=1521514&view=diff
> ==
> --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
> (original)
> +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
> Tue Sep 10 14:44:15 2013
> @@ -312,6 +312,7 @@ public class Connector
> replacements.put("keystoreType", "keytype");
> replacements.put("sslProtocol", "protocol");
> replacements.put("sslProtocols", "protocols");
> + replacements.put("sslEnabledProtocols", "protocols");
> }
>
>
>
> 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=1521514&r1=1521513&r2=1521514&view=diff
> ==
> --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 10 14:44:15 2013
> @@ -60,6 +60,11 @@
> logging properties without prefixes if the property cannot be found
> with
> a prefix. (kkolinko)
>
> +
> +54691: Add "sslEnableProtocols" alias to HTTP connector
> +configuration attribute "protocols" and document the configuration
> +attribute. (schultz)
> +
>
>
>
>
> Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?rev=1521514&r1=1521513&r2=1521514&view=diff
> ==
> --- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original)
> +++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Tue Sep 10 14:44:15 2013
> @@ -849,7 +849,21 @@
>timeout. Use 0 to specify an unlimited timeout. If not specified, a
>default of 86400 (24 hours) is used.
>
> -
> +
> +
> + The comma separated list of SSL protocols to support for HTTPS
> + connections. If specified, only the protocols that are listed and
> + supported by the SSL implementation will be enabled. If not specified,
> + the JVM default is used. The permitted values may be obtained from the
> + JVM documentation for the allowed values for
> + SSLSocket.setEnabledProtocols() e.g.
> + href="http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#jssenames";>
> + Oracle Java 6 and
> + href="http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#jssenames";>
> + Oracle Java 7. Note: There is overlap between this attribute and
> + sslProtocol.
> +
> +
>
>The certificate revocation list file to use to validate client
>certificates.
>
>
>
> -
> 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: r1521594 [1/16] - in /tomcat/site/trunk: docs/ docs/images/ docs/stylesheets/ xdocs/images/ xdocs/stylesheets/
Author: markt Date: Tue Sep 10 19:21:22 2013 New Revision: 1521594 URL: http://svn.apache.org/r1521594 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55383 for the main web site Improve markup and design Patch provided by Konstantin Preißer Added: tomcat/site/trunk/docs/images/tomcat.png (with props) tomcat/site/trunk/xdocs/images/tomcat.png - copied unchanged from r1521483, tomcat/trunk/webapps/docs/images/tomcat.png Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration-6.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews-2010.html tomcat/site/trunk/docs/oldnews-2011.html tomcat/site/trunk/docs/oldnews-2012.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-8.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/stylesheets/tomcat-printer.css tomcat/site/trunk/docs/stylesheets/tomcat.css tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/tools.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/stylesheets/tomcat-printer.css tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl tomcat/site/trunk/xdocs/stylesheets/tomcat.css Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1521594&r1=1521593&r2=1521594&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Tue Sep 10 19:21:22 2013 @@ -1,701 +1,194 @@ - - - -Apache Tomcat - Reporting Bugs - - - - - - - - - -http://tomcat.apache.org/";> -Apache Tomcat - -http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> - - - -http://www.google.com/search"; method="get"> - - - - - - - - - - - - - - -Apache Tomcat - - - -Home - - -Taglibs - - -Maven Plugin - - - -Download - - - -Which version? - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat 6.0 - - -Tomcat Connectors - - -Tomcat Native - - -http://archive.apache.org/dist/tomcat/";>Archives - - - -Documentation - - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat 6.0 - - -Tomcat Connectors - - -Tomcat Native - - -http://wiki.apache.org/tomcat/FrontPage";>Wiki - - -Migration Guide - - - -Problems? - - - -Security Reports - - -Find help - - -http://wiki.apache.org/tomcat/FAQ";>FAQ - - -Mailing Lists - - -Bug Database - - -IRC - - - -Get Involved - - - -Overview - - -SVN Repositories - - -Buildbot - - -https://reviews.apache.org/groups/tomcat/";>Reviewboard - - -Tools - - - -Media - - - -http://blogs.apache.org/tomcat/";>Blog - - -http://twitter.com/theapachetomcat";>Twitter - - - -Misc - - - -Who We Are - - -Heritage - - -http://www.apache.org";>Apache Home - - -Resources - - -Contact - - -Legal - - -http://www.apache.org/foundation/sponsorship.html";>Sponsorship - - -http://www.apache.org/foundation/thanks.html";>Thanks - - - - - - - -Table of Contents - - - - - - - - -Before you report a bug - - -Bugzilla is not a support forum - - - - -Resources to help resolve Apache Tomcat problems - - -Problem troubleshooting - - -Apache Tomcat discussion lists - - -Known issues - - -Recent version - - - - -Looking for known issues - - -Search the bug database - - -Changelog - - -Third party components - - - - -Reporting Apache Tomcat bugs - - -How to write a bug report - - -How to submit patches and enhancement requests - - -Security Issues - - - - - - - - - - - - - - - - - - -Before you report a bug - - - - - - + +Apache Tomcat - Reporting Bugshttp://www.apache.org/"; target="_blank">http://www.apache.org/images/feather.png"; alt="The Apache Software Foundation" style="width: 266px; height: 83px;">Apa
svn commit: r1521594 [9/16] - in /tomcat/site/trunk: docs/ docs/images/ docs/stylesheets/ xdocs/images/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-3.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-3.html?rev=1521594&r1=1521593&r2=1521594&view=diff == --- tomcat/site/trunk/docs/security-3.html (original) +++ tomcat/site/trunk/docs/security-3.html Tue Sep 10 19:21:22 2013 @@ -1,252 +1,8 @@ - - - -Apache Tomcat - Apache Tomcat 3.x vulnerabilities - - - - - - - - - -http://tomcat.apache.org/";> -Apache Tomcat - -http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> - - - -http://www.google.com/search"; method="get"> - - - - - - - - - - - - - - -Apache Tomcat - - - -Home - - -Taglibs - - -Maven Plugin - - - -Download - - - -Which version? - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat 6.0 - - -Tomcat Connectors - - -Tomcat Native - - -http://archive.apache.org/dist/tomcat/";>Archives - - - -Documentation - - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat 6.0 - - -Tomcat Connectors - - -Tomcat Native - - -http://wiki.apache.org/tomcat/FrontPage";>Wiki - - -Migration Guide - - - -Problems? - - - -Security Reports - - -Find help - - -http://wiki.apache.org/tomcat/FAQ";>FAQ - - -Mailing Lists - - -Bug Database - - -IRC - - - -Get Involved - - - -Overview - - -SVN Repositories - - -Buildbot - - -https://reviews.apache.org/groups/tomcat/";>Reviewboard - - -Tools - - - -Media - - - -http://blogs.apache.org/tomcat/";>Blog - - -http://twitter.com/theapachetomcat";>Twitter - - - -Misc - - - -Who We Are - - -Heritage - - -http://www.apache.org";>Apache Home - - -Resources - - -Contact - - -Legal - - -http://www.apache.org/foundation/sponsorship.html";>Sponsorship - - -http://www.apache.org/foundation/thanks.html";>Thanks - - - - - - - -Table of Contents - - - - - - - - -Apache Tomcat 3.x vulnerabilities - - -Not fixed in Apache Tomcat 3.x - - -Fixed in Apache Tomcat 3.3.2 - - -Fixed in Apache Tomcat 3.3.1a - - -Fixed in Apache Tomcat 3.3.1 - - -Fixed in Apache Tomcat 3.3a - - -Fixed in Apache Tomcat 3.2.4 - - -Fixed in Apache Tomcat 3.2.2 - - -Fixed in Apache Tomcat 3.2 - - -Fixed in Apache Tomcat 3.1 - - - - - - - - - - - - - - - - -Apache Tomcat 3.x vulnerabilities - - - - - - -This page lists all security vulnerabilities fixed in released versions + +Apache Tomcat - Apache Tomcat 3.x vulnerabilitieshttp://www.apache.org/"; target="_blank">http://www.apache.org/images/feather.png"; alt="The Apache Software Foundation" style="width: 266px; height: 83px;">Apache Tomcathttp://www.google.com/search"; method="get">SearchApache TomcatHomeTaglibsMaven PluginDownloadWhich version?Tomcat 8.0Tomcat 7.0Tomcat 6.0Tomcat ConnectorsTomcat Nativehttp://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 8.0href="./tomcat-7.0-doc/index.html">Tomcat 7.0href="./tomcat-6.0-doc/index.html">Tomcat 6.0href="./connectors-doc/">Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="http://wiki.apache.org/tomcat/FrontPage";>Wikihref="./migration.html">Migration >GuideProblems?href="./security.html">Security Reportshref="./findhelp.html">Find helphref="http://wiki.apache.org/tomcat/FAQ";>FAQhref="./lists.html">Mailing ListsBug >Databasehref="./irc.html">IRCGet >Involvedhref="./getinvolved.html">OverviewSVN >RepositoriesBuildbothref="https://reviews.apa che.org/groups/tomcat/">ReviewboardToolsMediahttp://blogs.apache.org/tomcat/";>Bloghttp://twitter.com/theapachetomcat";>TwitterMiscWho We AreHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttp://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>ThanksContentTable of Contents +Apache Tomcat 3.x vulnerabilitiesNot fixed in Apache Tomcat 3.xFixed in Apache Tomcat 3.3.2Fixed in Apache Tomcat 3.3.1aFixed in Apache Tomcat 3.3.1Fixed in Apache Tomcat 3.3aFixed in Apache Tomcat 3.2.4Fixed in Apache Tomcat 3.2.2Fixed in Apache Tomcat 3.2Fixed in Apache Tomcat 3.1 +Apache Tomcat 3.x vulnerabilities +This page lists all security vulnerabilities fixed in released versions of Apache Tomcat 3.x. Each vulnerability is given a security impact rating by the Apache Tomcat security team — please note that this rating may vary from @@ -254,445 +10,162 @@ is known to affect, and where a flaw has not been verified list the version with a question mark. - -Please note that Tomcat 3 is no longer supported. Further vulnerabilities +Please note that Tomcat 3 is no longer supported. Further vulnerabilities in the 3.x branches will not be fixed. Users should upgrade to 6.x or 7.x to obtain security fixes. - -Please send comments or corrections for these vulnerabilities to the +Please send comments or corrections for these vulnerabilities to the Tomcat Security Team. - - - - - - - - - - - - - - -Not fixed in Apache Tomcat 3.x - - - - - - - -Important: Denial of service -
svn commit: r1521594 [16/16] - in /tomcat/site/trunk: docs/ docs/images/ docs/stylesheets/ xdocs/images/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/whoweare.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1521594&r1=1521593&r2=1521594&view=diff == --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Tue Sep 10 19:21:22 2013 @@ -1,197 +1,5 @@ - - - -Apache Tomcat - Who We Are - - - - - - - - -http://tomcat.apache.org/";> -Apache Tomcat - -http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> - - - -http://www.google.com/search"; method="get"> - - - - - - - - - - - - - - -Apache Tomcat - - - -Home - - -Taglibs - - -Maven Plugin - - - -Download - - - -Which version? - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat 6.0 - - -Tomcat Connectors - - -Tomcat Native - - -http://archive.apache.org/dist/tomcat/";>Archives - - - -Documentation - - - -Tomcat 8.0 - - -Tomcat 7.0 - - -Tomcat 6.0 - - -Tomcat Connectors - - -Tomcat Native - - -http://wiki.apache.org/tomcat/FrontPage";>Wiki - - -Migration Guide - - - -Problems? - - - -Security Reports - - -Find help - - -http://wiki.apache.org/tomcat/FAQ";>FAQ - - -Mailing Lists - - -Bug Database - - -IRC - - - -Get Involved - - - -Overview - - -SVN Repositories - - -Buildbot - - -https://reviews.apache.org/groups/tomcat/";>Reviewboard - - -Tools - - - -Media - - - -http://blogs.apache.org/tomcat/";>Blog - - -http://twitter.com/theapachetomcat";>Twitter - - - -Misc - - - -Who We Are - - -Heritage - - -http://www.apache.org";>Apache Home - - -Resources - - -Contact - - -Legal - - -http://www.apache.org/foundation/sponsorship.html";>Sponsorship - - -http://www.apache.org/foundation/thanks.html";>Thanks - - - - - - - -Who We Are - - - - - - + +Apache Tomcat - Who We Arehttp://www.apache.org/"; target="_blank">http://www.apache.org/images/feather.png"; alt="The Apache Software Foundation" style="width: 266px; height: 83px;">Apache Tomcathttp://www.google.com/search"; method="get">SearchApache TomcatHomeTaglibsMaven PluginDownloadWhich version?Tomcat 8.0Tomcat 7.0Tomcat 6.0Tomcat ConnectorsTomcat Nativehttp://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 8.0Tomcat 7.0Tomcat 6.0Tomcat ConnectorsTomcat Nativehttp://wiki.apache.org/tomcat/FrontPage";>WikiMigration GuideProblems?Security ReportsFind helphttp://wiki.apache.org/tomcat/FAQ";>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSVN RepositoriesBuildbothttps://reviews.apache.org/groups/tomcat/";>ReviewboardTool sMediahttp://blogs.apache.org/tomcat/";>Bloghttp://twitter.com/theapachetomcat";>TwitterMiscWho We AreHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttp://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>ThanksContentWho We Are The Apache Tomcat Project operates on a meritocracy: the more you do, the more responsibility you will obtain. This page lists all of the @@ -201,7 +9,6 @@ see the overview on http://www.apache.org/~jim/committers.html";>also available. (It's a long list, so please be patient.) - - - - - - - - - - - - - - -Project Management Committee - - - - - - +Project Management Committee PMC Chair - - -Mladen Turk (mturk at apache.org) - - +Mladen Turk (mturk at apache.org) PMC Members & Committers +Jean-Francois Arcand (jfarcand at apache.org) - -Jean-Francois Arcand (jfarcand at apache.org) - +Bill Barker (billbarker at apache.org) - -Bill Barker (billbarker at apache.org) - +Jean-Frederic Clere (jfclere at apache.org) +Ian Darwin (idarwin at apache.org) - -Jean-Frederic Clere (jfclere at apache.org) - +Keiichi Fujino (kfujino at apache.org) - -Ian Darwin (idarwin at apache.org) - +Tim Funk (funkman at apache.org) - -Keiichi Fujino (kfujino at apache.org) - +Violeta Georgieva (violetagg at apache.org) +Henri Gomez (hgomez at apache.org) - -Tim Funk (funkman at apache.org) - +Filip Hanik (fhanik at apache.org) +Jacob Hookom (jhook at apache.org) - -Violeta Georgieva (violetagg at apache.org) - +Jim Jagielski (jim at apache.org) - -Henri Gomez (hgomez at apache.org) - +Rainer Jung (rjung at apache.org) +Konstantin Kolinko (kkolinko at apache.org) - -Filip Hanik (fhanik at apache.org) - +Olivier Lamy (olamy at apache.org) - -Jacob Hookom (jhook at apache.org) - +Sylvain Laurent (slaurent at apache.org) - - -Jim Jagielski (jim at apache.org) - +Remy Maucherat (remm at apache.org) +Costin Manolache (costin at apache.org) - -Rainer Jung (rjung at apache.org) - +Peter Rossbach (pero at apache.org) - -Konstantin Kolinko (kkolinko at apache.org) - +Christopher Schultz (schultz at apache.org) - - -Olivier Lamy (olamy at apache.org) - - - - - -Sylvain Laurent (slaurent at apache.org) - - - - - -Remy Maucherat (remm at apache.org) - - - - - -Costin Manolache (costin at apache.org) - - - - - -Peter Rossbach (pero at apache.org) - - - -
[Bug 55383] Improve markup and design of Tomcat's HTML pages
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383 --- Comment #32 from Mark Thomas --- (In reply to Konstantin Preißer from comment #31) > Created attachment 30809 [details] > Patch for improving HTML markup & style in the Tomcat Site Patch applied. Waiting for the reaction on the users mailing list... I haven't enjoyed committing a patch so much in ages. Thank you. It is a huge improvement. But don't let that stop you trying to make it even better ;) -- 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: [VOTE] Over-zealous svn commit to Tomcat 6.0
2013/9/10 Christopher Schultz :
> All,
>
> I recently, forgetting the current RTC policy, made a commit to the
> Tomcat 6 trunk without making a proposal. Mark pointed out my mistake
> and I'm prepared to revert the patch if necessary.
>
> It is, however, a minor code patch (added a Connector configuration
> property alias) and the rest is documentation. You can find the patch
> here: http://svn.apache.org/r1521514
>
> In order to avoid a whole round of svn acrobatics (revert, propose,
> vote, re-commit), I'd like to ask the committers to vote retrospectively
> on my patch. If the vote passes (3+ binding), then I'll consider the
> proposal accepted and take no further action. If the vote fails to pass,
> I shall revert the patch and make a formal proposal.
>
> The VOTE will remain open for at least 48 hours.
>
> Patch http://svn.apache.org/r1521514 is
>
> [x] Okay, leave it committed and don't do it again
but please fix the following in documentation:
1) A typo in attribute name in changelog,
s/ sslEnableProtocols / sslEnabledProtocols /
2) Update documentation for "sslProtocol" attribute, in the same way
as it is in Tomcat 7,
to clarify its relation with sslEnabledProtocols.
It is a bit unusual that instead of documenting the two existing names
for this attribute ("sslProtocols", "protocols") we are introducing
the third one, but I am OK with this, as this matches Tomcat 7.
I have not tested this new attribute, though.
Looking at JSSESocketFactory I see how the "protocols" attribute works,
but I am not sure how it handles incorrect values.
There was related bug report for Tomcat 7:
https://issues.apache.org/bugzilla/show_bug.cgi?id=54406
>From the code it looks that JSSESocketFactory.getEnabledProtocols(...)
silently swallows incorrect values without any logging and I think
it may result in insecure configuration.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1521594 [1/16] - in /tomcat/site/trunk: docs/ docs/images/ docs/stylesheets/ xdocs/images/ xdocs/stylesheets/
Mark, On 9/10/13 3:21 PM, ma...@apache.org wrote: > Author: markt > Date: Tue Sep 10 19:21:22 2013 > New Revision: 1521594 It's amazing how a relatively small number of changes can take a page from 1996 to ... well, at least 2006. :) -chris signature.asc Description: OpenPGP digital signature
Re: svn commit: r1521594 [1/16] - in /tomcat/site/trunk: docs/ docs/images/ docs/stylesheets/ xdocs/images/ xdocs/stylesheets/
On Sep 10, 2013, at 4:34 PM, Christopher Schultz wrote: > Mark, > > On 9/10/13 3:21 PM, ma...@apache.org wrote: >> Author: markt >> Date: Tue Sep 10 19:21:22 2013 >> New Revision: 1521594 > > It's amazing how a relatively small number of changes can take a page > from 1996 to ... well, at least 2006. :) +1 smime.p7s Description: S/MIME cryptographic signature
svn commit: r1521685 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Tue Sep 10 23:48:38 2013 New Revision: 1521685 URL: http://svn.apache.org/r1521685 Log: Docs: Correct typos. Clarify the change for http://issues.apache.org/bugzilla/show_bug.cgi?id=54691 Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml 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=1521685&r1=1521684&r2=1521685&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 10 23:48:38 2013 @@ -60,23 +60,29 @@ logging properties without prefixes if the property cannot be found with a prefix. (kkolinko) + + + + -54691: Add "sslEnableProtocols" alias to HTTP connector -configuration attribute "protocols" and document the configuration -attribute. (schultz) +54691: Add configuration attribute "sslEnabledProtocols" +to HTTP connector and document it. (Internally this attribute has +been already implemented but not documented, under names "protocols" +and "sslProtocols". Those names of this attribute are now deprecated). +(schultz) -Add document for +Add documentation for o.a.c.tribes.group.interceptors.TcpFailureDetector. (kfujino) -Complete the document for MessageDispatch15Interceptor. -(kfujino) +Complete the documentation for +MessageDispatch15Interceptor. (kfujino) @@ -89,7 +95,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1514485 - in /tomcat/trunk/java/org/apache: coyote/ajp/AbstractAjpProcessor.java coyote/http11/AbstractOutputBuffer.java coyote/spdy/SpdyProcessor.java tomcat/util/http/HttpMessages.j
2013/8/16 :
> Author: markt
> Date: Thu Aug 15 20:51:38 2013
> New Revision: 1514485
>
> URL: http://svn.apache.org/r1514485
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55399
> Have the message in the response line use the locale set for the response.
>
> Modified:
> tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
> tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
> tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
> tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
>
>
> +
> +public static HttpMessages getInstance(Locale locale) {
> +HttpMessages result = instances.get(locale);
> +if (result == null) {
> +StringManager sm = StringManager.getManager(
> +"org.apache.tomcat.util.http.res", locale);
> +if (Locale.getDefault().equals(sm.getLocale())) {
> +result = DEFAULT;
> +} else {
> +result = new HttpMessages(sm);
> +}
> +instances.put(locale, result);
> +}
> +return result;
> +}
> +
What a bit bothers me here (and in earlier changes to ErrorReportValve
etc. - r1514496) is that locale is provided by client and thus the
caches here and in StringManager can grow, instead of being limited to
the few locales that are actually bundled with Tomcat.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1521693 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/res/StringManager.java
Author: kkolinko
Date: Wed Sep 11 00:27:48 2013
New Revision: 1521693
URL: http://svn.apache.org/r1521693
Log:
Merged r1521687 from tomcat/trunk:
Followup to r1514376.
Use value from local variable instead of repeating a method call.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1521687
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=1521693&r1=1521692&r2=1521693&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java Wed
Sep 11 00:27:48 2013
@@ -93,7 +93,7 @@ public class StringManager {
if (bundleLocale.equals(Locale.ROOT)) {
this.locale = Locale.ENGLISH;
} else {
-this.locale = bundle.getLocale();
+this.locale = bundleLocale;
}
} else {
this.locale = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1521687 - /tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
Author: kkolinko
Date: Wed Sep 11 00:04:37 2013
New Revision: 1521687
URL: http://svn.apache.org/r1521687
Log:
Followup to r1514376.
Use value from local variable instead of repeating a method call.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=1521687&r1=1521686&r2=1521687&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Wed Sep 11
00:04:37 2013
@@ -93,7 +93,7 @@ public class StringManager {
if (bundleLocale.equals(Locale.ROOT)) {
this.locale = Locale.ENGLISH;
} else {
-this.locale = bundle.getLocale();
+this.locale = bundleLocale;
}
} else {
this.locale = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1521702 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko
Date: Wed Sep 11 00:42:56 2013
New Revision: 1521702
URL: http://svn.apache.org/r1521702
Log:
votes
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1521702&r1=1521701&r2=1521702&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 11 00:42:56 2013
@@ -49,7 +49,7 @@ PATCHES PROPOSED TO BACKPORT:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55228
Allow applications to set an HTTP date header
http://svn.apache.org/r1502258
- +1: markt, schultz
+ +1: markt, schultz, kkolinko
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55268
@@ -85,7 +85,7 @@ PATCHES PROPOSED TO BACKPORT:
Log warnings about using security roles that are not defined in web.xml as
warnings
http://svn.apache.org/r1513151
- +1: markt, schultz
+ +1: markt, schultz, kkolinko
-1:
* Fix issue with Manager app and other apps that use i18n in the UI when a
@@ -93,11 +93,16 @@ PATCHES PROPOSED TO BACKPORT:
or Japanese.
http://svn.apache.org/r1514376
+1: schultz, markt
+ +0: kkolinko: 1) Code in Tomcat 6 differs. A patch is needed. 2) +r1521693
-1:
* Fix errors in Commons Annotations 1.0 and add some @since markers
http://svn.apache.org/r1521040
+1: markt, schultz
+ +1: kkolinko: +1 to all changes, except this one:
+ I think @Target change for @DenyAll is wrong.
+ Looking at Geronimo, @DenyAll has "@Target({ElementType.METHOD})" in CA
1.0 there.
+ It is "@Target({ElementType.TYPE, ElementType.METHOD})" starting with CA
1.1.
-1:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/4949 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1521687 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[jira] [Commented] (MTOMCAT-228) Provide option to deploy war file(s) from a location when executing run mojo
[ https://issues.apache.org/jira/browse/MTOMCAT-228?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13763868#comment-13763868 ] Travis Schneeberger commented on MTOMCAT-228: - This jira would provide a possible solution to the issue documented at: http://stackoverflow.com/questions/15480218/tomcat-maven-plugin-run-webapps-but-not-current-project/ Since the jetty maven plugin supports this, it would make things a bit more consistent when wanting to use both jetty and tomcat. > Provide option to deploy war file(s) from a location when executing run mojo > > > Key: MTOMCAT-228 > URL: https://issues.apache.org/jira/browse/MTOMCAT-228 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement >Reporter: Peter Nguyen >Priority: Minor > > Can we please add the ability to deploy a war file from a location instead of > the m2 repository (via webapps) when running the run mojo? > I currently have a multi module project that contains two sub projects: a > project containing a war file and it's sibling containing a suite of selenium > tests > project-parent > +-- war-project (war project) > +-- integration-tests (non-war project) > I'd like to have the integration tests start up an embedded server and deploy > the war file from the project containing the web app. It seems I can only do > this if the artifact under test has been installed and deployed via the > configuration. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55383] Improve markup and design of Tomcat's HTML pages
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383 --- Comment #33 from Violeta Georgieva --- Created attachment 30812 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30812&action=edit Missing background color IE9 top The background color on the top is missing when using IE9. See the attached screenshot. -- 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
