Merge "Update notes about password security"

[gigi.git] / lib / jetty / org / eclipse / jetty / server / SslConnectionFactory.java

diff --git a/lib/jetty/org/eclipse/jetty/server/SslConnectionFactory.java b/lib/jetty/org/eclipse/jetty/server/SslConnectionFactory.java
index 5fcc1038da68ad0b9b25f33094b9320f13f05ea6..fe3ea149b9a1292f69850b2351aca4e3399f157b 100644 (file)
--- a/lib/jetty/org/eclipse/jetty/server/SslConnectionFactory.java
+++ b/lib/jetty/org/eclipse/jetty/server/SslConnectionFactory.java
@@ -1,6 +1,6 @@
 //
 //  ========================================================================
-//  Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0
@@ -27,10 +27,11 @@ import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.io.ssl.SslConnection;
+import org.eclipse.jetty.io.ssl.SslReconfigurator;
 import org.eclipse.jetty.util.annotation.Name;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
-public class SslConnectionFactory extends AbstractConnectionFactory
+public class SslConnectionFactory extends AbstractConnectionFactory implements SslReconfigurator
 {
     private final SslContextFactory _sslContextFactory;
     private final String _nextProtocol;
@@ -91,7 +92,15 @@ public class SslConnectionFactory extends AbstractConnectionFactory
 
     protected SslConnection newSslConnection(Connector connector, EndPoint endPoint, SSLEngine engine)
     {
-        return new SslConnection(connector.getByteBufferPool(), connector.getExecutor(), endPoint, engine);
+        return new SslConnection(connector.getByteBufferPool(), connector.getExecutor(), endPoint, engine, shouldRestartSSL()?this:null);
+    }
+    
+    public boolean shouldRestartSSL(){
+       return false;
+    }
+    
+    public SSLEngine restartSSL(SSLSession sslSession){
+       throw new UnsupportedOperationException();
     }
 
     @Override