You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/09/09 12:06:57 UTC
[tomcat] branch 7.0.x updated (2efd3a6 -> fa34afd)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 2efd3a6 Fix Javadoc issues preventing release builds with newer Java versions
new 78803c5 Align with 8.5.x
new fa34afd Simplify / align(ish) with 8.5.x.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../coyote/http11/filters/ChunkedOutputFilter.java | 29 +++-------------------
1 file changed, 4 insertions(+), 25 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Simplify / align(ish) with 8.5.x.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fa34afd8bb57ce73fd7cb4c1ae2b0379cb0bc001
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 9 13:00:02 2019 +0100
Simplify / align(ish) with 8.5.x.
---
java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java b/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
index d6ef494..9d5f8ae 100644
--- a/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
+++ b/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
@@ -105,14 +105,14 @@ public class ChunkedOutputFilter implements OutputFilter {
}
// Calculate chunk header
- int pos = 7;
+ int pos = 8;
int current = result;
while (current > 0) {
int digit = current % 16;
current = current / 16;
- chunkLength[pos--] = HexUtils.getHex(digit);
+ chunkLength[--pos] = HexUtils.getHex(digit);
}
- chunkHeader.setBytes(chunkLength, pos + 1, 9 - pos);
+ chunkHeader.setBytes(chunkLength, pos, 10 - pos);
buffer.doWrite(chunkHeader, res);
buffer.doWrite(chunk, res);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Align with 8.5.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 78803c53f4ffa4eebe68faa4bf0d283145ff94f7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 9 12:55:46 2019 +0100
Align with 8.5.x
---
.../coyote/http11/filters/ChunkedOutputFilter.java | 23 +---------------------
1 file changed, 1 insertion(+), 22 deletions(-)
diff --git a/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java b/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
index 6e2c7f9..d6ef494 100644
--- a/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
+++ b/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.coyote.http11.filters;
import java.io.IOException;
@@ -122,7 +121,6 @@ public class ChunkedOutputFilter implements OutputFilter {
buffer.doWrite(chunkHeader, res);
return result;
-
}
@@ -134,46 +132,27 @@ public class ChunkedOutputFilter implements OutputFilter {
// --------------------------------------------------- OutputFilter Methods
-
- /**
- * Some filters need additional parameters from the response. All the
- * necessary reading can occur in that method, as this method is called
- * after the response header processing is complete.
- */
@Override
public void setResponse(Response response) {
// NOOP: No need for parameters from response in this filter
}
- /**
- * Set the next buffer in the filter pipeline.
- */
@Override
public void setBuffer(OutputBuffer buffer) {
this.buffer = buffer;
}
- /**
- * End the current request. It is acceptable to write extra bytes using
- * buffer.doWrite during the execution of this method.
- */
@Override
- public long end()
- throws IOException {
-
+ public long end() throws IOException {
// Write end chunk
buffer.doWrite(END_CHUNK, null);
return 0;
-
}
- /**
- * Make the filter ready to process the next request.
- */
@Override
public void recycle() {
// NOOP: Nothing to recycle
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org