Author: rjung
Date: Sun Sep 18 12:30:47 2011
New Revision: 1172271
URL: http://svn.apache.org/viewvc?rev=1172271&view=rev
Log:
BZ 51811: Fix typo in attribute name
(sslImplementationName instead of
sslImplemenationName).
Backport of r1172269 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 18 12:30:47 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1171692,1172233-1172234,1172236
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1171692,1172233-1172234,1172236,1172269
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=1172271&r1=1172270&r2=1172271&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
Sun Sep 18 12:30:47 2011
@@ -103,10 +103,10 @@ public abstract class AbstractHttp11Jsse
return endpoint.getAllowUnsafeLegacyRenegotiation();
}
- private String sslImplemenationName = null;
- public String getSslImplemenationName() { return sslImplemenationName; }
- public void setSslImplemenationName(String s) {
- this.sslImplemenationName = s;
+ private String sslImplementationName = null;
+ public String getSslImplementationName() { return sslImplementationName; }
+ public void setSslImplementationName(String s) {
+ this.sslImplementationName = s;
}
// ------------------------------------------------------- Lifecycle
methods
@@ -115,7 +115,7 @@ public abstract class AbstractHttp11Jsse
public void init() throws Exception {
// SSL implementation needs to be in place before end point is
// initialized
- sslImplementation =
SSLImplementation.getInstance(sslImplemenationName);
+ sslImplementation =
SSLImplementation.getInstance(sslImplementationName);
super.init();
}
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java?rev=1172271&r1=1172270&r2=1172271&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java Sun
Sep 18 12:30:47 2011
@@ -54,7 +54,7 @@ public class TestCustomSsl extends Tomca
return;
}
- connector.setProperty("sslImplemenationName",
+ connector.setProperty("sslImplementationName",
"org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl");
connector.setProperty(TesterBug50640SslImpl.PROPERTY_NAME,
TesterBug50640SslImpl.PROPERTY_VALUE);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1172271&r1=1172270&r2=1172271&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Sep 18 12:30:47 2011
@@ -123,6 +123,10 @@
Further re-factoring of the HTTP connectors to align the BIO, NIO and
APR implementations. (markt)
</scode>
+ <fix>
+ <bug>51811</bug>: Correct SSL configuration property name from
+ sslImplemenationName to sslImplementationName. (rjung)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1172271&r1=1172270&r2=1172271&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Sun Sep 18 12:30:47 2011
@@ -990,7 +990,7 @@
used.</p>
</attribute>
- <attribute name="sslImplemenationName" required="false">
+ <attribute name="sslImplementationName" required="false">
<p>The class name of the SSL implementation to use. If not specified, the
default of
<code>org.apache.tomcat.util.net.jsse.JSSEImplementation</code>
will be used which wraps JVM's default JSSE provider. Note that the
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
