This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 437a8dd Re-word
437a8dd is described below
commit 437a8dd7c64286d6d84a3f6d1c922de2ff211fb7
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Aug 18 16:50:24 2020 +0100
Re-word
---
java/org/apache/coyote/AbstractProcessor.java | 2 +-
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 ++--
java/org/apache/coyote/http2/LocalStrings.properties | 2 +-
java/org/apache/coyote/http2/Stream.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index 87d504a..3ab18dd 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -433,7 +433,7 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
break;
}
case DISABLE_SWALLOW_INPUT: {
- // Aborted upload or similar.
+ // Cancelled upload or similar.
// No point reading the remainder of the request.
disableSwallowRequest();
// This is an error state. Make sure it is marked as such.
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index d5da3dc..367fe95 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -912,14 +912,14 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
msg = sm.getString("stream.writeTimeout");
error = Http2Error.ENHANCE_YOUR_CALM;
} else {
- msg = sm.getString("stream.clientAbort");
+ msg = sm.getString("stream.clientCancel");
error = Http2Error.CANCEL;
}
// Close the stream
// This thread is in application code so need
// to signal to the application that the
// stream is closing
- stream.doStreamAbort(msg, error);
+ stream.doStreamCancel(msg, error);
}
} catch (InterruptedException e) {
throw new IOException(sm.getString(
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index fadfa0f..4ba59c1 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -74,7 +74,7 @@ http2Parser.swallow.debug=Connection [{0}], Stream [{1}],
Swallowed [{2}] bytes
pingManager.roundTripTime=Connection [{0}] Round trip time measured as [{1}]ns
-stream.clientAbort=Client reset the stream before the response was complete
+stream.clientCancel=Client reset the stream before the response was complete
stream.closed=Connection [{0}], Stream [{1}], Unable to write to stream once
it has been closed
stream.header.case=Connection [{0}], Stream [{1}], HTTP header name [{2}] must
be in lower case
stream.header.connection=Connection [{0}], Stream [{1}], HTTP header
[connection] is not permitted in an HTTP/2 request
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index fe69f8f..2f40e28 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -275,7 +275,7 @@ class Stream extends AbstractStream implements
HeaderEmitter {
allocationManager.waitForStream(writeTimeout);
windowSize = getWindowSize();
if (windowSize == 0) {
- doStreamAbort(sm.getString("stream.writeTimeout"),
Http2Error.ENHANCE_YOUR_CALM);
+ doStreamCancel(sm.getString("stream.writeTimeout"),
Http2Error.ENHANCE_YOUR_CALM);
}
} catch (InterruptedException e) {
// Possible shutdown / rst or similar. Use an IOException
to
@@ -299,7 +299,7 @@ class Stream extends AbstractStream implements
HeaderEmitter {
}
- void doStreamAbort(String msg, Http2Error error) throws CloseNowException {
+ void doStreamCancel(String msg, Http2Error error) throws CloseNowException
{
StreamException se = new StreamException(msg, error, getIdAsInt());
// Prevent the application making further writes
streamOutputBuffer.closed = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
