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 2017/11/30 10:20:08 UTC
svn commit: r1816697 - in /tomcat/trunk/java/org/apache/coyote/http11:
Http11OutputBuffer.java filters/ChunkedOutputFilter.java
filters/GzipOutputFilter.java filters/IdentityOutputFilter.java
Author: markt
Date: Thu Nov 30 10:20:08 2017
New Revision: 1816697
URL: http://svn.apache.org/viewvc?rev=1816697&view=rev
Log:
Refactoring: HTTP/1.1 - HTTP/2 alignment
Chain end() calls to align with doWrite() and getBytesWritten()
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java?rev=1816697&r1=1816696&r2=1816697&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java Thu Nov 30 10:20:08 2017
@@ -282,12 +282,12 @@ public class Http11OutputBuffer implemen
return;
}
- if (lastActiveFilter != -1) {
+ if (lastActiveFilter == -1) {
+ outputStreamOutputBuffer.end();
+ } else {
activeFilters[lastActiveFilter].end();
}
- outputStreamOutputBuffer.end();
-
responseFinished = true;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java?rev=1816697&r1=1816696&r2=1816697&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java Thu Nov 30 10:20:08 2017
@@ -188,6 +188,8 @@ public class ChunkedOutputFilter impleme
buffer.doWrite(crlfChunk);
crlfChunk.position(0).limit(crlfChunk.capacity());
+
+ buffer.end();
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java?rev=1816697&r1=1816696&r2=1816697&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java Thu Nov 30 10:20:08 2017
@@ -122,7 +122,7 @@ public class GzipOutputFilter implements
}
compressionStream.finish();
compressionStream.close();
- ((OutputFilter) buffer).end();
+ buffer.end();
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java?rev=1816697&r1=1816696&r2=1816697&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java Thu Nov 30 10:20:08 2017
@@ -113,7 +113,7 @@ public class IdentityOutputFilter implem
@Override
public void end() throws IOException {
- // NO-OP
+ buffer.end();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org