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

WIP updates from review

This commit is contained in:
gregw 2024-09-18 08:43:04 +10:00
parent b7c8bcb92f
commit d4dcd6a8c8
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormData.java
View File

@ -489,18 +489,15 @@ public class MultiPartFormData
*/
public void configure(MultiPartConfig config)
{
if (config != null)
{
parser.setMaxParts(config.getMaxParts());
maxMemoryFileSize = config.getMaxMemoryPartSize();
maxFileSize = config.getMaxPartSize();
maxLength = config.getMaxSize();
parser.setPartHeadersMaxLength(config.getMaxHeadersSize());
useFilesForPartsWithoutFileName = config.isUseFilesForPartsWithoutFileName();
filesDirectory = config.getLocation();
complianceListener = config.getViolationListener();
compliance = config.getMultiPartCompliance();
}
parser.setMaxParts(config.getMaxParts());
maxMemoryFileSize = config.getMaxMemoryPartSize();
maxFileSize = config.getMaxPartSize();
maxLength = config.getMaxSize();
parser.setPartHeadersMaxLength(config.getMaxHeadersSize());
useFilesForPartsWithoutFileName = config.isUseFilesForPartsWithoutFileName();
filesDirectory = config.getLocation();
complianceListener = config.getViolationListener();
compliance = config.getMultiPartCompliance();
}
// Only used for testing.

2
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnectionFactory.java
View File

@ -41,8 +41,6 @@ public class HttpConnectionFactory extends AbstractConnectionFactory implements
super(HttpVersion.HTTP_1_1.asString());
_config = Objects.requireNonNull(config);
installBean(_config);
setUseInputDirectByteBuffers(_config.isUseInputDirectByteBuffers());
setUseOutputDirectByteBuffers(_config.isUseOutputDirectByteBuffers());
}
@Override

18
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java
View File

@ -363,6 +363,10 @@ public class HttpChannelState implements HttpChannel, Components
if (LOG.isDebugEnabled())
LOG.debug("onIdleTimeout {}", this, t);
// Too late?
if (_request == null || _response == null)
return null;
Runnable invokeOnContentAvailable = null;
if (_readFailure == null)
{
@ -704,22 +708,24 @@ public class HttpChannelState implements HttpChannel, Components
@Override
public void succeeded()
{
HttpStream completeStream = null;
Throwable failure = null;
HttpStream stream = null;
try (AutoLock ignored = _lock.lock())
{
assert _callbackCompleted;
_streamSendState = StreamSendState.LAST_COMPLETE;
if (_handling == null)
{
completeStream = _stream;
stream = _stream;
_stream = null;
failure = _callbackFailure;
// TODO remove this before merging
if (_callbackFailure != null)
throw new IllegalStateException("failure in succeeded", _callbackFailure);
}
}
if (completeStream != null)
completeStream(completeStream, failure);
if (stream != null)
completeStream(stream, null);
}
/**

1
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java
View File

@ -967,7 +967,6 @@ public class HttpConnection extends AbstractMetaDataConnection implements Runnab
_onRequest = stream.headerComplete();
// Should we delay dispatch until we have some content?
// We should not delay if there is no content expect or client is expecting 100 or the response is already committed or the request buffer already has something in it to parse
_delayedForContent = getHttpConfiguration().isDelayDispatchUntilContent() &&
(_parser.getContentLength() > 0 || _parser.isChunking()) &&
!stream._expects100Continue &&