Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.

This commit is contained in:
Simone Bordet 2016-05-25 00:57:43 +02:00
parent 016a7b72a1 4762a6eaa3
commit ba48aa27b0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
View File

@ -939,7 +939,9 @@ public class SslConnection extends AbstractConnection
_sslEngine.closeOutbound();
// Send the TLS close message.
flush(BufferUtil.EMPTY_BUFFER);
if (!ishut)
if (ishut)
getEndPoint().close();
else
ensureFillInterested();
}
}

8
jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java
View File

@ -184,7 +184,6 @@ public class SecureRequestCustomizer implements HttpConfiguration.Customizer
customizeSecure(request);
}
/**
* Customizes the request attributes for general secure settings.
* The default impl calls {@link Request#setSecure(boolean)} with true
@ -199,8 +198,7 @@ public class SecureRequestCustomizer implements HttpConfiguration.Customizer
if (_stsField!=null)
request.getResponse().getHttpFields().add(_stsField);
}
/**
* <p>
* Customizes the request attributes to be set for SSL requests.
@ -272,7 +270,9 @@ public class SecureRequestCustomizer implements HttpConfiguration.Customizer
request.setAttribute("javax.servlet.request.cipher_suite",cipherSuite);
request.setAttribute("javax.servlet.request.key_size",keySize);
request.setAttribute("javax.servlet.request.ssl_session_id", idStr);
request.setAttribute(getSslSessionAttribute(), sslSession);
String sessionAttribute = getSslSessionAttribute();
if (sessionAttribute != null && sessionAttribute.isEmpty())
request.setAttribute(sessionAttribute, sslSession);
}
catch (Exception e)
{