Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-03 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.4.x'

Browse Source
This commit is contained in:
Jan Bartel 2016-07-01 18:33:29 +10:00
commit b1d0661655
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,7 @@ public class SslConnection extends AbstractConnection
private final boolean _encryptedDirectBuffers = true; private final boolean _encryptedDirectBuffers = true;
private final boolean _decryptedDirectBuffers = false; private final boolean _decryptedDirectBuffers = false;
private boolean _renegotiationAllowed; private boolean _renegotiationAllowed;
private boolean _closedOutbound;
private final Runnable _runCompletWrite = new Runnable() private final Runnable _runCompletWrite = new Runnable()
{ {
@Override @Override
@ -926,19 +927,23 @@ public class SslConnection extends AbstractConnection
@Override @Override
public void doShutdownOutput() public void doShutdownOutput()
{ {
boolean ishut = isInputShutdown();
boolean oshut = isOutputShutdown();
if (LOG.isDebugEnabled())
LOG.debug("{} shutdownOutput: oshut={}, ishut={}", SslConnection.this, oshut, ishut);
try try
{ {
synchronized (this) synchronized (this)
{ {
boolean ishut = isInputShutdown();
boolean oshut = isOutputShutdown();
if (LOG.isDebugEnabled())
LOG.debug("{} shutdownOutput: oshut={}, ishut={}", SslConnection.this, oshut, ishut);
if (!oshut) if (!oshut)
{ {
_sslEngine.closeOutbound(); if (!_closedOutbound)
// Send the TLS close message. {
flush(BufferUtil.EMPTY_BUFFER); _closedOutbound=true; // Only attempt this once
_sslEngine.closeOutbound();
flush(BufferUtil.EMPTY_BUFFER); // Send the TLS close message.
}
if (ishut) if (ishut)
getEndPoint().close(); getEndPoint().close();
else else

6
jetty-quickstart/README.txt
View File

@ -1,6 +0,0 @@
mvn exec:java -Dexec.classpathScope=test -Dexec.mainClass="org.eclipse.jetty.quickstart.StartBenchmarkWar"
OR
mvn exec:java -Dexec.classpathScope=test -Dexec.mainClass="org.eclipse.jetty.quickstart.PreconfigureBenchmarkWar"
mvn exec:java -Dexec.classpathScope=test -Dexec.mainClass="org.eclipse.jetty.quickstart.QuickStartBenchmarkWar"

1
jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartWebApp.java
View File

@ -42,7 +42,6 @@ public class QuickStartWebApp extends WebAppContext
setExtractWAR(true); setExtractWAR(true);
setCopyWebDir(false); setCopyWebDir(false);
setCopyWebInf(false); setCopyWebInf(false);
setAttribute("org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",".*\\.jar");
} }
@Deprecated @Deprecated