Author: markt
Date: Wed Jun 29 10:28:15 2016
New Revision: 1750617
URL: http://svn.apache.org/viewvc?rev=1750617&view=rev
Log:
Change parameter name to make meaning more obvious and consistent with
connector settings
Modified:
tomcat/trunk/java/org/apache/coyote/UpgradeProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/UpgradeProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/UpgradeProtocol.java?rev=1750617&r1=1750616&r2=1750617&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/UpgradeProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/UpgradeProtocol.java Wed Jun 29
10:28:15 2016
@@ -22,14 +22,14 @@ import org.apache.tomcat.util.net.Socket
public interface UpgradeProtocol {
/**
- * @param isSecure Is this for a connector that is configured to support
- * TLS. Some protocols (e.g. HTTP/2) only support HTTP
- * upgrade over non-secure connections.
+ * @param isSSLEnabled Is this for a connector that is configured to
support
+ * TLS. Some protocols (e.g. HTTP/2) only support HTTP
+ * upgrade over non-secure connections.
* @return The name that clients will use to request an upgrade to this
* protocol via an HTTP/1.1 upgrade request or <code>null</code> if
* upgrade via an HTTP/1.1 upgrade request is not supported.
*/
- public String getHttpUpgradeName(boolean isSecure);
+ public String getHttpUpgradeName(boolean isSSLEnabled);
/**
* @return The byte sequence as listed in the IANA registry for this
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=1750617&r1=1750616&r2=1750617&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed
Jun 29 10:28:15 2016
@@ -322,9 +322,9 @@ public abstract class AbstractHttp11Prot
*/
private final Map<String,UpgradeProtocol> negotiatedProtocols = new
HashMap<>();
private void configureUpgradeProtocol(UpgradeProtocol upgradeProtocol) {
- boolean secure = getEndpoint().isSSLEnabled();
+ boolean isSSLEnabled = getEndpoint().isSSLEnabled();
// HTTP Upgrade
- String httpUpgradeName = upgradeProtocol.getHttpUpgradeName(secure);
+ String httpUpgradeName =
upgradeProtocol.getHttpUpgradeName(isSSLEnabled);
boolean httpUpgradeConfigured = false;
if (httpUpgradeName != null && httpUpgradeName.length() > 0) {
httpUpgradeProtocols.put(httpUpgradeName, upgradeProtocol);
@@ -337,7 +337,7 @@ public abstract class AbstractHttp11Prot
String alpnName = upgradeProtocol.getAlpnName();
if (alpnName != null && alpnName.length() > 0) {
// ALPN requires SSL
- if (secure) {
+ if (isSSLEnabled) {
negotiatedProtocols.put(alpnName, upgradeProtocol);
getEndpoint().addNegotiatedProtocol(alpnName);
getLog().info(sm.getString("abstractHttp11Protocol.alpnConfigured",
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1750617&r1=1750616&r2=1750617&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java Wed Jun 29
10:28:15 2016
@@ -56,8 +56,8 @@ public class Http2Protocol implements Up
private int initialWindowSize = DEFAULT_INITIAL_WINDOW_SIZE;
@Override
- public String getHttpUpgradeName(boolean isSecure) {
- if (isSecure) {
+ public String getHttpUpgradeName(boolean isSSLEnabled) {
+ if (isSSLEnabled) {
return null;
} else {
return HTTP_UPGRADE_NAME;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
