svn commit: r1080898 - /tomcat/trunk/res/maven/mvn.properties.default
Author: markt Date: Sat Mar 12 09:39:20 2011 New Revision: 1080898 URL: http://svn.apache.org/viewvc?rev=1080898&view=rev Log: Prep for next release Modified: tomcat/trunk/res/maven/mvn.properties.default Modified: tomcat/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1080898&r1=1080897&r2=1080898&view=diff == --- tomcat/trunk/res/maven/mvn.properties.default (original) +++ tomcat/trunk/res/maven/mvn.properties.default Sat Mar 12 09:39:20 2011 @@ -33,12 +33,12 @@ maven.snapshot.repo.repositoryId=apache. #Maven release properties for Tomcat staging maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository maven.release.repo.repositoryId=tomcat-staging -maven.release.deploy.version=7.0.9 +maven.release.deploy.version=7.0.12 #Maven release properties for the main ASF repo maven.asf.release.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository maven.asf.release.repo.repositoryId=apache.releases -maven.asf.release.deploy.version=7.0.9 +maven.asf.release.deploy.version=7.0.12 #Where do we load the libraries from - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50887] Enhancement to set security-provider within AjpAprProcessor
https://issues.apache.org/bugzilla/show_bug.cgi?id=50887 --- Comment #2 from Mark Thomas 2011-03-12 04:57:53 EST --- I've had a chance to look at this further. With regard to the three points I raised previously: > - Security providers are normally configured at the JVM level I can see why you don't like this and your reasoning is consistent with the design of the Tomcat SSL connector implementation. It is meant to be possible to configure each connector independently of any JVM configuration. > - Patches that change one of 5 connectors usually mean the other >connectors need changing too All of the connectors use CertifcateFactory. HTTP BIO & NIO use it via JSSESupport so all five connectors will need changes. > - There are other places where CertificateFactory is used that may >conflict with this patch. My point is that it isn't just the connectors that create client certificates from SSL data. The SSL Valve also does this and will also need a configuration option for this. I'll work on a patch for 7.0.x which will then be back-ported to 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1080903 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Author: markt
Date: Sat Mar 12 10:10:44 2011
New Revision: 1080903
URL: http://svn.apache.org/viewvc?rev=1080903&view=rev
Log:
Align code and comments - no functional change
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1080903&r1=1080902&r2=1080903&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Sat
Mar 12 10:10:44 2011
@@ -145,18 +145,6 @@ public abstract class AbstractHttp11Prot
}
-// HTTP specific
properties
-// -- passed through to the
EndPoint
-
-public boolean isSSLEnabled() { return endpoint.isSSLEnabled();}
-public void setSSLEnabled(boolean SSLEnabled) {
-endpoint.setSSLEnabled(SSLEnabled);
-}
-
-
-// HTTP specific
properties
-// - passed through to the EndPoint and made available as
attributes
-
/**
* This field indicates if the protocol is treated as if it is secure. This
* normally means https is being used but can be used to fake https e.g
@@ -169,6 +157,15 @@ public abstract class AbstractHttp11Prot
}
+// HTTP specific
properties
+// -- passed through to the
EndPoint
+
+public boolean isSSLEnabled() { return endpoint.isSSLEnabled();}
+public void setSSLEnabled(boolean SSLEnabled) {
+endpoint.setSSLEnabled(SSLEnabled);
+}
+
+
/**
* Maximum number of requests which can be performed over a keepalive
* connection. The default is the same as for Apache HTTP Server.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1080904 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java
Author: markt
Date: Sat Mar 12 10:27:49 2011
New Revision: 1080904
URL: http://svn.apache.org/viewvc?rev=1080904&view=rev
Log:
Align code and comments - no functional change
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java?rev=1080904&r1=1080903&r2=1080904&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java Sat Mar 12
10:27:49 2011
@@ -160,11 +160,6 @@ public abstract class AbstractProtocolHa
endpoint.setKeepAliveTimeout(keepAliveTimeout);
}
-
-
-// -- Properties that are passed through to the
EndPoint
-// and are made available as
attributes
-
public InetAddress getAddress() { return endpoint.getAddress(); }
public void setAddress(InetAddress ia) {
endpoint.setAddress(ia);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1080905 - /tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
Author: markt Date: Sat Mar 12 10:32:11 2011 New Revision: 1080905 URL: http://svn.apache.org/viewvc?rev=1080905&view=rev Log: Fix typo Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties 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=1080905&r1=1080904&r2=1080905&view=diff == --- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Sat Mar 12 10:32:11 2011 @@ -36,7 +36,7 @@ ajpprocessor.failedsend=Failed to send A ajpprocessor.header.error=Header message parsing failed ajpprocessor.request.prepare=Error preparing request ajpprocessor.request.process=Error processing request -ajpprocessor.certs.fail=Certificate convertion failed +ajpprocessor.certs.fail=Certificate conversion failed ajpprocessor.socket.info=Exception getting socket information ajpmessage.null=Cannot append null value - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
