svn commit: r1066756 - in /tomcat/trunk/test/org/apache: catalina/startup/TestTomcatSSL.java tomcat/util/net/TestSsl.java
Author: markt
Date: Thu Feb 3 08:36:03 2011
New Revision: 1066756
URL: http://svn.apache.org/viewvc?rev=1066756&view=rev
Log:
Move/rename to better location
Added:
tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java
- copied, changed from r1066568,
tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
Removed:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
Copied: tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java (from
r1066568, tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java?p2=tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java&p1=tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java&r1=1066568&r2=1066756&rev=1066756&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java Thu Feb 3
08:36:03 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.startup;
+package org.apache.tomcat.util.net;
import java.io.File;
import java.io.IOException;
@@ -30,6 +30,8 @@ import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
/**
@@ -38,7 +40,7 @@ import org.apache.tomcat.util.buf.ByteCh
* pass: changeit
* CN: localhost ( for hostname validation )
*/
-public class TestTomcatSSL extends TomcatBaseTest {
+public class TestSsl extends TomcatBaseTest {
static TrustManager[] trustAllCerts = new TrustManager[] {
new X509TrustManager() {
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1066759 - in /tomcat/trunk/test/org/apache/tomcat/util/net: TestSsl.java TesterSupport.java
Author: markt
Date: Thu Feb 3 08:44:37 2011
New Revision: 1066759
URL: http://svn.apache.org/viewvc?rev=1066759&view=rev
Log:
Factor out support code prior to splitting up the TestSsl class
Added:
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (with
props)
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java?rev=1066759&r1=1066758&r2=1066759&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java Thu Feb 3
08:44:37 2011
@@ -20,15 +20,12 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.security.cert.X509Certificate;
import javax.net.ssl.HandshakeCompletedEvent;
import javax.net.ssl.HandshakeCompletedListener;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -41,55 +38,15 @@ import org.apache.tomcat.util.buf.ByteCh
* CN: localhost ( for hostname validation )
*/
public class TestSsl extends TomcatBaseTest {
-static TrustManager[] trustAllCerts = new TrustManager[] {
-new X509TrustManager() {
-@Override
-public X509Certificate[] getAcceptedIssuers() {
-return null;
-}
-@Override
-public void checkClientTrusted(X509Certificate[] certs,
-String authType) {
-// NOOP - Trust everything
-}
-@Override
-public void checkServerTrusted(X509Certificate[] certs,
-String authType) {
-// NOOP - Trust everything
-}
-}
-};
-
-private void initSsl(Tomcat tomcat) {
-String protocol = tomcat.getConnector().getProtocolHandlerClassName();
-if (protocol.indexOf("Apr") == -1) {
-tomcat.getConnector().setProperty("sslProtocol", "tls");
-File keystoreFile = new File(
-"test/org/apache/catalina/startup/test.keystore");
-tomcat.getConnector().setAttribute("keystoreFile",
-keystoreFile.getAbsolutePath());
-} else {
-File keystoreFile = new File(
-"test/org/apache/catalina/startup/test-cert.pem");
-tomcat.getConnector().setAttribute("SSLCertificateFile",
-keystoreFile.getAbsolutePath());
-keystoreFile = new File(
-"test/org/apache/catalina/startup/test-key.pem");
-tomcat.getConnector().setAttribute("SSLCertificateKeyFile",
-keystoreFile.getAbsolutePath());
-}
-tomcat.getConnector().setSecure(true);
-tomcat.getConnector().setProperty("SSLEnabled", "true");
-}
-
public void testSimpleSsl() throws Exception {
// Install the all-trusting trust manager so https:// works
// with unsigned certs.
try {
SSLContext sc = SSLContext.getInstance("SSL");
-sc.init(null, trustAllCerts, new java.security.SecureRandom());
+sc.init(null, TesterSupport.TRUST_ALL_CERTS,
+new java.security.SecureRandom());
javax.net.ssl.HttpsURLConnection.setDefaultSSLSocketFactory(
sc.getSocketFactory());
} catch (Exception e) {
@@ -101,7 +58,7 @@ public class TestSsl extends TomcatBaseT
File appDir = new File(getBuildDirectory(), "webapps/examples");
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
-initSsl(tomcat);
+TesterSupport.initSsl(tomcat);
tomcat.start();
ByteChunk res = getUrl("https://localhost:"; + getPort() +
@@ -118,13 +75,14 @@ public class TestSsl extends TomcatBaseT
// app dir is relative to server home
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
-initSsl(tomcat);
+TesterSupport.initSsl(tomcat);
// Default - MITM attack prevented
tomcat.start();
SSLContext sslCtx = SSLContext.getInstance("TLS");
-sslCtx.init(null, trustAllCerts, new java.security.SecureRandom());
+sslCtx.init(null, TesterSupport.TRUST_ALL_CERTS,
+new java.security.SecureRandom());
SSLSocketFactory socketFactory = sslCtx.getSocketFactory();
SSLSocket socket = (SSLSocket) socketFactory.createSocket("localhost",
getPort());
@@ -182,7 +140,7 @@ public class TestSsl
svn commit: r1066766 - in /tomcat/trunk/test/org/apache/tomcat/util/net: TestSsl.java TesterSupport.java
Author: markt
Date: Thu Feb 3 09:20:34 2011
New Revision: 1066766
URL: http://svn.apache.org/viewvc?rev=1066766&view=rev
Log:
Hmm. Can't see a way (without changing the connector code) to test SSL
renegotiation failure if the JVM supports RFC5746. Need to think about this
some more. In the meantime, get the tests working.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java?rev=1066766&r1=1066765&r2=1066766&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java Thu Feb 3
09:20:34 2011
@@ -69,6 +69,13 @@ public class TestSsl extends TomcatBaseT
boolean handshakeDone = false;
public void testRenegotiateFail() throws Exception {
+
+// If RFC5746 is supported, renegotiation will always will (and will
+// always be secure)
+if (TesterSupport.RFC_5746_SUPPORTED) {
+return;
+}
+
Tomcat tomcat = getTomcatInstance();
File appDir = new File(getBuildDirectory(), "webapps/examples");
@@ -200,8 +207,10 @@ public class TestSsl extends TomcatBaseT
@Override
public void setUp() throws Exception {
-// Make sure SSL renegotiation is not disabled in the JVM
-System.setProperty("sun.security.ssl.allowUnsafeRenegotiation",
"true");
+if (!TesterSupport.RFC_5746_SUPPORTED) {
+// Make sure SSL renegotiation is not disabled in the JVM
+System.setProperty("sun.security.ssl.allowUnsafeRenegotiation",
"true");
+}
super.setUp();
}
}
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1066766&r1=1066765&r2=1066766&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Thu Feb 3
09:20:34 2011
@@ -17,14 +17,44 @@
package org.apache.tomcat.util.net;
import java.io.File;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
import java.security.cert.X509Certificate;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLServerSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import org.apache.catalina.startup.Tomcat;
public final class TesterSupport {
+
+protected static final boolean RFC_5746_SUPPORTED;
+
+static {
+boolean result = false;
+SSLContext context;
+try {
+context = SSLContext.getInstance("TLS");
+context.init(null, null, new SecureRandom());
+SSLServerSocketFactory ssf = context.getServerSocketFactory();
+String ciphers[] = ssf.getSupportedCipherSuites();
+for (String cipher : ciphers) {
+if ("TLS_EMPTY_RENEGOTIATION_INFO_SCSV".equals(cipher)) {
+result = true;
+break;
+}
+}
+} catch (NoSuchAlgorithmException e) {
+// Assume no RFC 5746 support
+} catch (KeyManagementException e) {
+// Assume no RFC 5746 support
+}
+RFC_5746_SUPPORTED = result;
+}
+
protected static final TrustManager[] TRUST_ALL_CERTS = new TrustManager[]
{
new X509TrustManager() {
@Override
@@ -65,4 +95,5 @@ public final class TesterSupport {
tomcat.getConnector().setSecure(true);
tomcat.getConnector().setProperty("SSLEnabled", "true");
}
+
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release build 6.0.32
+1 Peter Am 02.02.2011 um 20:37 schrieb jean-frederic clere: > The candidates binaries are available here: > http://people.apache.org/~jfclere/tomcat-6/v6.0.32/ > > According to the release process, the 6.0.32 build corresponding to the > tag TOMCAT_6_0_32 is: > [ ] Broken > [ ] Alpha > [ ] Beta > [ x] Stable > > Cheers > > Jean-Frederic > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging 7.0.7
+1 Peter Am 02.02.2011 um 16:26 schrieb Mark Thomas: > All, > > I'd like to stick to my plan to release Tomcat 7 every month or so. The > last release was ~ 3 weeks ago so that suggests next week. However, I > have some commitments next week that would make tagging and rolling a > release difficult so I intend to tag later today. There are plenty of > fixes in the changelog, particularly for Comet, that I think makes this > worthwhile. > > Mark > > - > 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: r1066772 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java AjpProcessor.java
Author: mturk
Date: Thu Feb 3 10:23:20 2011
New Revision: 1066772
URL: http://svn.apache.org/viewvc?rev=1066772&view=rev
Log:
Make sure flush packet is not send after END_RESPONSE packet. Should handle
BZ49929
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
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=1066772&r1=1066771&r2=1066772&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Thu Feb 3
10:23:20 2011
@@ -663,7 +663,7 @@ public class AjpAprProcessor extends Abs
outputBuffer.clear();
}
// Send explicit flush message
-if (explicit) {
+if (explicit && !finished) {
if (Socket.sendb(socketRef, flushMessageBuffer, 0,
flushMessageBuffer.position()) < 0) {
throw new
IOException(sm.getString("ajpprocessor.failedflush"));
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1066772&r1=1066771&r2=1066772&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Feb 3
10:23:20 2011
@@ -578,8 +578,10 @@ public class AjpProcessor extends Abstra
*/
@Override
protected void flush(boolean explicit) throws IOException {
-// Send the flush message
-output.write(flushMessageArray);
+if (!finished) {
+// Send the flush message
+output.write(flushMessageArray);
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48208] allow to configure a custom client certificate Trust Manager in server.xml per connector attribute "trustManagerClassName"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48208 --- Comment #8 from Ralf Hauser 2011-02-03 05:24:46 EST --- Just another application scenario the mandates a custom TrustManager as suggested by Mark: There is a restriction that depending on the time-of-the-day, a different set of certificates is trusted. Our original solution approach was then to accept all certificates. Once the certificate is provided and the full SSL handshake is finished, we can choose the set of acceptable trusted issuing certificates depending on time-of-day or other context paramters. Only then we do the verification and possibly abort the session. As I mentioned before, wedo understand your reservations on incorporating an AcceptAllTrustManager patch, however, we would hope that a more generic solution as the trustManagerClassName suggested by Mark Thomas would be a fair compromise. Then, we could move the logic from the application into our custom trust manager we define in “trustManagerClassName”. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49929] AJP APR connector to mod_jk can result in SEND_BODY_CHUNK message after END_RESPONSE message
https://issues.apache.org/bugzilla/show_bug.cgi?id=49929 --- Comment #12 from Mladen Turk 2011-02-03 05:25:24 EST --- Can you check if r1066772 fixes the issue? It's for trunk, but applying it for 6.0.x should be trivial -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49929] AJP APR connector to mod_jk can result in SEND_BODY_CHUNK message after END_RESPONSE message
https://issues.apache.org/bugzilla/show_bug.cgi?id=49929 --- Comment #13 from brett.dellegra...@intact-is.com 2011-02-03 05:32:12 EST --- Hi Mladen, We switched from using Apache HTTPD to HAproxy late last year because of this issue... therefore it might take me quite a while to verify this. I'll try, but no guarantees. Best Regards, Brett -- 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: r1066773 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_7: ./ build.properties.default modules/
Author: markt Date: Thu Feb 3 10:34:25 2011 New Revision: 1066773 URL: http://svn.apache.org/viewvc?rev=1066773&view=rev Log: Tag 7.0.7 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_7/ (props changed) - copied from r1066772, tomcat/trunk/ Removed: tomcat/tc7.0.x/tags/TOMCAT_7_0_7/modules/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_7/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_7/ -- --- svn:ignore (added) +++ svn:ignore Thu Feb 3 10:34:25 2011 @@ -0,0 +1,5 @@ +.* +output +build.properties +work +logs Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_7/ -- svn:mergeinfo = /tomcat/tc6.0.x/trunk:742915 Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_7/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/tags/TOMCAT_7_0_7/build.properties.default?rev=1066773&r1=1066772&r2=1066773&view=diff == --- tomcat/tc7.0.x/tags/TOMCAT_7_0_7/build.properties.default (original) +++ tomcat/tc7.0.x/tags/TOMCAT_7_0_7/build.properties.default Thu Feb 3 10:34:25 2011 @@ -29,7 +29,7 @@ version.major=7 version.minor=0 version.build=7 version.patch=0 -version.suffix=-dev +version.suffix= # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1066774 - /tomcat/trunk/build.properties.default
Author: markt Date: Thu Feb 3 10:35:53 2011 New Revision: 1066774 URL: http://svn.apache.org/viewvc?rev=1066774&view=rev Log: Bump version number Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1066774&r1=1066773&r2=1066774&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Thu Feb 3 10:35:53 2011 @@ -27,7 +27,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=7 +version.build=8 version.patch=0 version.suffix=-dev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1066796 - in /tomcat/site/trunk: docs/download-60.html docs/index.html docs/oldnews.html docs/whichversion.html xdocs/download-60.xml xdocs/index.xml xdocs/oldnews.xml xdocs/whichversion.
Author: jfclere Date: Thu Feb 3 12:39:59 2011 New Revision: 1066796 URL: http://svn.apache.org/viewvc?rev=1066796&view=rev Log: Release 6.0.32 Modified: tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/download-60.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1066796&r1=1066795&r2=1066796&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Thu Feb 3 12:39:59 2011 @@ -227,8 +227,8 @@ http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS | -6.0.30 | -Browse | +6.0.32 | +Browse | http://archive.apache.org/dist/tomcat/tomcat-6";>Archives @@ -328,8 +328,8 @@ - -6.0.30 + +6.0.32 @@ -339,8 +339,8 @@ - Please see the - README + Please see the + README file for packaging information. It explains what every distribution contains. @@ -364,48 +364,48 @@ Core: -zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30.zip.md5";>md5) +zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.zip.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.zip.md5";>md5) -tar.gz -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30.tar.gz.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30.tar.gz.md5";>md5) +tar.gz +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz.md5";>md5) -32-bit Windows zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30-windows-x86.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30-windows-x86.zip.md5";>md5) +32-bit Windows zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32-windows-x86.zip.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32-windows-x86.zip.md5";>md5) -64-bit Windows zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30-windows-x64.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30-windows-x64.zip.md5";>md5) +64-bit Windows zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32-windows-x64.zip.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32-windows-x64.zip.md5";>md5) -64-bit Itanium Windows zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30-windows-i64.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30-windows-i64.zip.md5";>md5) +64-bit Itanium Windows zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32-windows-i64.zip.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32-windows-i64.zip.md5";>md5) -32-bit/64-bit Windows Service Installer -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30.exe.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30.exe.md5";>md5) +32-bit/64-bit Windows Service Installer +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.exe.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.exe.md5";>md5) Deployer: -zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30-deployer.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.30/bin/apache-tomcat-6.0.30-deployer.zip.md5";>md5) +zip +(http
svn commit: r1066803 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: jfclere Date: Thu Feb 3 13:10:47 2011 New Revision: 1066803 URL: http://svn.apache.org/viewvc?rev=1066803&view=rev Log: Oops a bit better english.. Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1066803&r1=1066802&r2=1066803&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Thu Feb 3 13:10:47 2011 @@ -294,7 +294,7 @@ prevention features. The Apache Tomcat Project is proud to announce the release of version 6.0.32 of -Apache Tomcat. This release includes security bug fixes over Apache Tomcat 6.0.30. +Apache Tomcat. This release includes security and bug fixes over Apache Tomcat 6.0.30. Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1066803&r1=1066802&r2=1066803&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Thu Feb 3 13:10:47 2011 @@ -49,7 +49,7 @@ prevention features. The Apache Tomcat Project is proud to announce the release of version 6.0.32 of -Apache Tomcat. This release includes security bug fixes over Apache Tomcat 6.0.30. +Apache Tomcat. This release includes security and bug fixes over Apache Tomcat 6.0.30. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 7.0.7
The proposed Apache Tomcat 7.0.7 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.7/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_7/ The proposed 7.0.7 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 7.0.7 Alpha [ ] Beta - go ahead and release as 7.0.7 Beta [ ] Stable - go ahead and release as 7.0.7 Stable Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release build 6.0.32
On Feb 2, 2011, at 2:37 PM, jean-frederic clere wrote: > The candidates binaries are available here: > http://people.apache.org/~jfclere/tomcat-6/v6.0.32/ > > According to the release process, the 6.0.32 build corresponding to the > tag TOMCAT_6_0_32 is: > [ ] Broken > [ ] Alpha > [ ] Beta > [X] Stable > +1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 6.0.32 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat 6.0.32 stable. Apache Tomcat 6.0.32 is primarily a security and bug fix release. All users of older versions of the Tomcat 6.0 family should upgrade to 6.0.32. Note that is version has 4 zip binaries: a generic one and three bundled with Tomcat native binaries for different CPU architectures. Apache Tomcat 6.0 includes new features over Apache Tomcat 5.5, including support for the new Servlet 2.5 and JSP 2.1 specifications, a refactored clustering implementation, advanced IO features, and improvements in memory usage. Please refer to the change log for the list of changes: http://tomcat.apache.org/tomcat-6.0-doc/changelog.html Downloads: http://tomcat.apache.org/download-60.cgi Migration guide from Apache Tomcat 5.5.x: http://tomcat.apache.org/migration.html Thank you, -- The Apache Tomcat Team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.7
2011/2/3 Mark Thomas : > The proposed Apache Tomcat 7.0.7 release is now available for voting. > > It can be obtained from: > http://people.apache.org/~markt/dev/tomcat-7/v7.0.7/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_7/ > > The proposed 7.0.7 release is: > > [x] Stable - go ahead and release as 7.0.7 Stable 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: r1066908 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Feb 3 18:46:31 2011 New Revision: 1066908 URL: http://svn.apache.org/viewvc?rev=1066908&view=rev Log: proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1066908&r1=1066907&r2=1066908&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Feb 3 18:46:31 2011 @@ -67,3 +67,11 @@ PATCHES PROPOSED TO BACKPORT: 2) do not change visibility of defaultProtocol, defaultKeystoreType markt: Happy to include those changes + +* Add additional roles to the Admin, Manager and Host-Manager applications + (admin-gui, admin-script; manager-gui, manager-script, manager-jmx, manager-status) + to allow more fine-grained control over which functionality is accessible, + like it was done in Tomcat 6. + http://people.apache.org/~kkolinko/patches/2011-02-03_tc55_roles.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 44408] EL-expression evaluation slow due to synchronization caused by JspFactory.getDefaultFactory
https://issues.apache.org/bugzilla/show_bug.cgi?id=44408 --- Comment #4 from Xiaoming Shi 2011-02-03 14:48:07 EST --- Hi Robert, I find that this similar bug can be found in other Apache projects: ./openwebbeans-1.0.0/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java line:86 ./tiles-2.2.2/src/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java line:61 (In reply to comment #0) > Tomcat version 6.0.16 trunk (and earlier) > > PageContextImpl.java has: > public static Object proprietaryEvaluate() > that does a: > final ExpressionFactory exprFactory = JspFactory.getDefaultFactory().get > JspApplicationContext(pageContext.getServletContext()).getExpressionFactory(); > > Our benchmarking of pages using large amounts of EL-expression shows this > turns > into a bottleneck due to the fact that JspFactory.getDefaultFactory() is > synchronized. > > The bug is very similar to bug #41558 > > I have a patch that fixes the issue, coming up... -- 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: [VOTE] Release Apache Tomcat 7.0.7
On 03.02.2011 14:32, Mark Thomas wrote: The proposed Apache Tomcat 7.0.7 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.7/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_7/ The proposed 7.0.7 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 7.0.7 Alpha [ ] Beta - go ahead and release as 7.0.7 Beta [X] Stable - go ahead and release as 7.0.7 Stable - MD5 OK - signatures OK - key in KEYS file - gz and zip for src and bin consistent - src consistent with svn tag - builds fine - build result looks consistent with binaries - no checkstyle complaints - Unit tests run OK except for one failure (see below, same as for 7.0.6). Tests have been run on Solaris 10 Sparc with 2 CPUs using Java 1.6.0_17. 1 unit test failing (not a problem) --- Testsuite: org.apache.catalina.connector.TestMaxConnections [junit] Tests run: 1, Failures: 1, Errors: 0, Time elapsed: 6.88 sec - Standard Error - Feb 3, 2011 8:52:06 PM org.apache.coyote.AbstractProtocolHandler init INFO: Initializing ProtocolHandler ["http-bio-8080"] Feb 3, 2011 8:52:06 PM org.apache.catalina.core.StandardService startInternal INFO: Starting service Tomcat Feb 3, 2011 8:52:06 PM org.apache.catalina.core.StandardEngine startInternal INFO: Starting Servlet Engine: Apache Tomcat/7.0.7 Feb 3, 2011 8:52:07 PM org.apache.coyote.AbstractProtocolHandler start INFO: Starting ProtocolHandler ["http-bio-8080"] Feb 3, 2011 8:52:09 PM org.apache.catalina.connector.TestMaxConnections$ConnectThread run SEVERE: ConnectThread[6] Error:connect timed out Feb 3, 2011 8:52:09 PM org.apache.catalina.connector.TestMaxConnections$ConnectThread run SEVERE: ConnectThread[7] Error:connect timed out Feb 3, 2011 8:52:09 PM org.apache.catalina.connector.TestMaxConnections$ConnectThread run SEVERE: ConnectThread[8] Error:connect timed out Feb 3, 2011 8:52:09 PM org.apache.catalina.connector.TestMaxConnections$ConnectThread run SEVERE: ConnectThread[9] Error:connect timed out Feb 3, 2011 8:52:09 PM org.apache.catalina.connector.TestMaxConnections$TestClient doHttp10Request INFO: ConnectThread[0] Request complete:1690 ms. Feb 3, 2011 8:52:09 PM org.apache.catalina.connector.TestMaxConnections$TestClient doHttp10Request INFO: ConnectThread[1] Request complete:1638 ms. Feb 3, 2011 8:52:09 PM org.apache.catalina.connector.TestMaxConnections$TestClient doHttp10Request INFO: ConnectThread[2] Request complete:1529 ms. Feb 3, 2011 8:52:09 PM org.apache.catalina.connector.TestMaxConnections$TestClient doHttp10Request INFO: ConnectThread[3] Request complete:1504 ms. Feb 3, 2011 8:52:10 PM org.apache.catalina.connector.TestMaxConnections$TestClient doHttp10Request INFO: ConnectThread[5] Request complete:2885 ms. Feb 3, 2011 8:52:10 PM org.apache.catalina.connector.TestMaxConnections$TestClient doHttp10Request INFO: ConnectThread[4] Request complete:2935 ms. Feb 3, 2011 8:52:10 PM org.apache.coyote.AbstractProtocolHandler pause INFO: Pausing ProtocolHandler ["http-bio-8080"] Feb 3, 2011 8:52:11 PM org.apache.catalina.core.StandardService stopInternal INFO: Stopping service Tomcat Feb 3, 2011 8:52:11 PM org.apache.coyote.AbstractProtocolHandler stop INFO: Stopping ProtocolHandler ["http-bio-8080"] Feb 3, 2011 8:52:11 PM org.apache.coyote.AbstractProtocolHandler destroy INFO: Destroying ProtocolHandler ["http-bio-8080"] - --- Testcase: testConnector took 6.867 sec FAILED The number of successful requests should have been 4-5, actual 6 junit.framework.AssertionFailedError: The number of successful requests should have been 4-5, actual 6 at org.apache.catalina.connector.TestMaxConnections.testConnector(TestMaxConnections.java:58) I expect the analysis I wrote when voting for 7.0.6 is still correct. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1066937 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Thu Feb 3 20:13:03 2011 New Revision: 1066937 URL: http://svn.apache.org/viewvc?rev=1066937&view=rev Log: Vote. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1066937&r1=1066936&r2=1066937&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Feb 3 20:13:03 2011 @@ -49,7 +49,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1061442&view=rev http://svn.apache.org/viewvc?rev=1061446&view=rev (by markt) - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: (For convenience, here is patch that applies the above: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.7
On Thu, Feb 3, 2011 at 8:32 AM, Mark Thomas wrote: > The proposed Apache Tomcat 7.0.7 release is now available for voting. > > It can be obtained from: > http://people.apache.org/~markt/dev/tomcat-7/v7.0.7/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_7/ > > The proposed 7.0.7 release is: > > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 7.0.7 Alpha > [ ] Beta - go ahead and release as 7.0.7 Beta > [ X ] Stable - go ahead and release as 7.0.7 Stable Partial testing. Yoav > > Cheers, > > Mark > > - > 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: r1066996 - in /tomcat/tc5.5.x/trunk: ./ connectors/util/java/org/apache/tomcat/util/ container/catalina/src/share/org/apache/catalina/connector/ container/webapps/docs/
Author: kkolinko
Date: Thu Feb 3 21:54:51 2011
New Revision: 1066996
URL: http://svn.apache.org/viewvc?rev=1066996&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50620
Exceptions calling session.endAccess should not prevent recycle() from
completing normally
Added:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1066996&r1=1066995&r2=1066996&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Feb 3 21:54:51 2011
@@ -41,21 +41,6 @@ PATCHES PROPOSED TO BACKPORT:
-O: jim
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50620
- Exceptions calling session.endAccess should not prevent recycle() from
completing normally
- 1) copy o.a.tomcat.util.ExceptionUtils from trunk
- svn copy ../../trunk/java/org/apache/tomcat/util/ExceptionUtils.java
connectors/util/java/org/apache/tomcat/util/
- 2) patches:
- http://svn.apache.org/viewvc?rev=1061442&view=rev
- http://svn.apache.org/viewvc?rev=1061446&view=rev
- (by markt)
- +1: kkolinko, markt, rjung
- -1:
-
- (For convenience, here is patch that applies the above:
- http://people.apache.org/~kkolinko/patches/2011-01-22_tc55_50620.patch
- )
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50325
Use JVM provided solutions to CVE-2009-3555 if available (i.e. RFC 5746
support)
Added:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java?rev=1066996&view=auto
==
---
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java
(added)
+++
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java
Thu Feb 3 21:54:51 2011
@@ -0,0 +1,38 @@
+/*
+ * 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;
+
+/**
+ * Utilities for handling Throwables and Exceptions.
+ */
+public class ExceptionUtils {
+
+/**
+ * Checks whether the supplied Throwable is one that needs to be
+ * rethrown and swallows all others.
+ * @param t the Throwable to check
+ */
+public static void handleThrowable(Throwable t) {
+if (t instanceof ThreadDeath) {
+throw (ThreadDeath) t;
+}
+if (t instanceof VirtualMachineError) {
+throw (VirtualMachineError) t;
+}
+// All other instances of Throwable will be silently swallowed
+}
+}
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties?rev=1066996&r1=1066995&r2=1066996&view=diff
==
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
Thu Feb 3 21:54:51 2011
@@ -59,6 +59,7 @@ coyoteRequest.attributeEvent=Exception t
coyoteRequest.parseParameters=Exception thrown whilst processing POSTed
parameters
coyoteRequest.postTooLarge=Parameters were not parsed because the size of the
posted data was too big. Use the maxPostSize attribute of the connector to
resolve this if the application should accept large POSTs.
coyoteRequest.chunkedPostTooLarge=Parameters were not parsed because the size
of the posted da
DO NOT REPLY [Bug 50620] Session related errors prevent clean recycle of Request and Response objects by CoyoteAdapter
https://issues.apache.org/bugzilla/show_bug.cgi?id=50620 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Konstantin Kolinko 2011-02-03 16:56:50 EST --- Fixed in 5.5 with r1066996 and will be in 5.5.33. -- 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: r1067039 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Author: markt
Date: Thu Feb 3 23:56:55 2011
New Revision: 1067039
URL: http://svn.apache.org/viewvc?rev=1067039&view=rev
Log:
Reduce severity level. The ASF Jira instance logs were filling with these
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1067039&r1=1067038&r2=1067039&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu Feb 3
23:56:55 2011
@@ -249,21 +249,23 @@ public final class Parameters {
pos=valEnd+1;
if( nameEnd<=nameStart ) {
-StringBuilder msg = new StringBuilder("Parameters: Invalid
chunk ");
-// No name eg ...&=xx&... will trigger this
-if (valEnd >= nameStart) {
-msg.append('\'');
-try {
-msg.append(new String(bytes, nameStart,
-valEnd - nameStart, DEFAULT_ENCODING));
-} catch (UnsupportedEncodingException e) {
-// Should never happen...
-log.error("Unable to convert bytes", e);
+if (log.isInfoEnabled()) {
+StringBuilder msg = new StringBuilder("Parameters: Invalid
chunk ");
+// No name eg ...&=xx&... will trigger this
+if (valEnd >= nameStart) {
+msg.append('\'');
+try {
+msg.append(new String(bytes, nameStart,
+valEnd - nameStart, DEFAULT_ENCODING));
+} catch (UnsupportedEncodingException e) {
+// Should never happen...
+log.error("Unable to convert bytes", e);
+}
+msg.append("' ");
}
-msg.append("' ");
+msg.append("ignored.");
+log.info(msg);
}
-msg.append("ignored.");
-log.warn(msg);
continue;
// invalid chunk - it's better to ignore
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1067072 - in /tomcat/trunk: java/org/apache/catalina/connector/CoyoteAdapter.java webapps/docs/changelog.xml
Author: kkolinko
Date: Fri Feb 4 03:07:37 2011
New Revision: 1067072
URL: http://svn.apache.org/viewvc?rev=1067072&view=rev
Log:
Fix NPE in CoyoteAdapter when postParseRequest() call fails.
That was caused by mappingData.context being null.
This NPE occurence in 7.0.7 was reported on the users list.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1067072&r1=1067071&r2=1067072&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Feb
4 03:07:37 2011
@@ -375,7 +375,8 @@ public class CoyoteAdapter implements Ad
// Parse and set Catalina and configuration specific
// request parameters
req.getRequestProcessor().setWorkerThreadName(Thread.currentThread().getName());
-if (postParseRequest(req, request, res, response)) {
+boolean postParseSuccess = postParseRequest(req, request, res,
response);
+if (postParseSuccess) {
//check valves if we support async
request.setAsyncSupported(connector.getService().getContainer().getPipeline().isAsyncSupported());
// Calling the container
@@ -406,9 +407,14 @@ public class CoyoteAdapter implements Ad
async = true;
} else if (!comet) {
response.finishResponse();
-((Context) request.getMappingData().context).logAccess(request,
-response,
-System.currentTimeMillis() - req.getStartTime(),
false);
+if (postParseSuccess) {
+// Log only if processing was invoked.
+// If postParseRequest() failed, it has already logged it.
+((Context) request.getMappingData().context).logAccess(
+request, response,
+System.currentTimeMillis() - req.getStartTime(),
+false);
+}
req.action(ActionCode.POST_REQUEST , null);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1067072&r1=1067071&r2=1067072&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 4 03:07:37 2011
@@ -41,6 +41,15 @@
+
+
+
+
+Fix NPE in CoyoteAdapter when postParseRequest() call fails. (kkolinko)
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1067075 - in /tomcat/trunk: res/confinstall/server_2.xml webapps/docs/changelog.xml
Author: kkolinko Date: Fri Feb 4 03:22:53 2011 New Revision: 1067075 URL: http://svn.apache.org/viewvc?rev=1067075&view=rev Log: Align server.xml installed by the Windows installer with the one bundled in zip/tar.gz files. Modified: tomcat/trunk/res/confinstall/server_2.xml tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/res/confinstall/server_2.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/confinstall/server_2.xml?rev=1067075&r1=1067074&r2=1067075&view=diff == --- tomcat/trunk/res/confinstall/server_2.xml (original) +++ tomcat/trunk/res/confinstall/server_2.xml Fri Feb 4 03:22:53 2011 @@ -40,16 +40,17 @@ --> - - + + + + + - @@ -60,11 +61,11 @@ --> - ---> + prefix="localhost_access_log." suffix=".txt" + pattern="%h %l %u %t "%r" %s %b" resolveHosts="false"/> Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1067075&r1=1067074&r2=1067075&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 4 03:22:53 2011 @@ -49,6 +49,15 @@ + + + +Align server.xml installed by the Windows installer with the one +bundled in zip/tar.gz files. The differences are LockOutRealm being +used and AccessLogValve being enabled by default. (kkolinko) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1067076 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Fri Feb 4 03:36:40 2011 New Revision: 1067076 URL: http://svn.apache.org/viewvc?rev=1067076&view=rev Log: Add release date 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=1067076&r1=1067075&r2=1067076&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Feb 4 03:36:40 2011 @@ -43,7 +43,7 @@ - + @@ -96,7 +96,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.7
+1 Peter Am 03.02.2011 um 14:32 schrieb Mark Thomas: > The proposed Apache Tomcat 7.0.7 release is now available for voting. > > It can be obtained from: > http://people.apache.org/~markt/dev/tomcat-7/v7.0.7/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_7/ > > The proposed 7.0.7 release is: > > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 7.0.7 Alpha > [ ] Beta - go ahead and release as 7.0.7 Beta > [ x] Stable - go ahead and release as 7.0.7 Stable > > Cheers, > > Mark > > - > 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
