Author: jfclere
Date: Wed Sep 2 10:59:19 2015
New Revision: 1700765
URL: http://svn.apache.org/r1700765
Log:
Make sure sendFile is not used with SSL.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1700765&r1=1700764&r2=1700765&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Wed
Sep 2 10:59:19 2015
@@ -26,12 +26,17 @@ import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLSessionContext;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
import org.apache.tomcat.util.net.SSLHostConfig.Type;
import org.apache.tomcat.util.net.jsse.openssl.Cipher;
import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;
public abstract class AbstractJsseEndpoint<S> extends AbstractEndpoint<S> {
+ private static final Log log =
LogFactory.getLog(AbstractJsseEndpoint.class);
+
private String sslImplementationName = null;
private int sniParseLimit = 64 * 1024;
@@ -92,6 +97,12 @@ public abstract class AbstractJsseEndpoi
certificate.setSslContextWrapper(sslContextWrapper);
}
}
+ // For now, sendfile is not supported with SSL
+ if (getUseSendfile()) {
+ super.setUseSendfile(false);
+ log.warn(sm.getString("endpoint.noSendfileWithSSL"));
+ }
+
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1700765&r1=1700764&r2=1700765&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Wed
Sep 2 10:59:19 2015
@@ -30,6 +30,7 @@ endpoint.warn.noRemotePort=Unable to det
endpoint.warn.noLocalAddr=Unable to determine local address for socket [{0}]
endpoint.warn.noLocalName=Unable to determine local host name for socket [{0}]
endpoint.warn.noLocalPort=Unable to determine local port for socket [{0}]
+endpoint.warn.noSendfileWithSSL=Sendfile is not supported for the connector
when SSL is enabled
endpoint.warn.incorrectConnectionCount=Incorrect connection count, multiple
socket.close called on the same socket.
endpoint.debug.channelCloseFail=Failed to close channel
endpoint.debug.destroySocket=Destroying socket [{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
