You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2016/10/27 21:27:47 UTC
svn commit: r1766894 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/
java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/
java/org/apache/coyote/http11/filters/ java/org/apache/coyote/http2/
test/org/apache/coyote/http11/filters/
Author: violetagg
Date: Thu Oct 27 21:27:47 2016
New Revision: 1766894
URL: http://svn.apache.org/viewvc?rev=1766894&view=rev
Log:
Introduce a new method org.apache.coyote.OutputBuffer.doWrite(ByteBuffer)
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/OutputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 27 21:27:47 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,176317
9,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,176316
7,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/OutputBuffer.java?rev=1766894&r1=1766893&r2=1766894&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/OutputBuffer.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/OutputBuffer.java Thu Oct 27 21:27:47 2016
@@ -17,6 +17,7 @@
package org.apache.coyote;
import java.io.IOException;
+import java.nio.ByteBuffer;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -24,7 +25,7 @@ import org.apache.tomcat.util.buf.ByteCh
* Output buffer.
*
* This class is used internally by the protocol implementation. All writes from
- * higher level code should happen via Resonse.doWrite().
+ * higher level code should happen via Response.doWrite().
*
* @author Remy Maucherat
*/
@@ -44,6 +45,19 @@ public interface OutputBuffer {
/**
+ * Write the given data to the response. The caller owns the chunks.
+ *
+ * @param chunk data to write
+ *
+ * @return The number of bytes written which may be less than available in
+ * the input chunk
+ *
+ * @throws IOException an underlying I/O error occurred
+ */
+ public int doWrite(ByteBuffer chunk) throws IOException;
+
+
+ /**
* Bytes written to the underlying socket. This includes the effects of
* chunking, compression, etc.
*
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java?rev=1766894&r1=1766893&r2=1766894&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java Thu Oct 27 21:27:47 2016
@@ -17,6 +17,8 @@
package org.apache.coyote.ajp;
+import java.nio.ByteBuffer;
+
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -220,18 +222,47 @@ public class AjpMessage {
* @param numBytes The number of bytes to copy.
*/
public void appendBytes(byte[] b, int off, int numBytes) {
+ if (checkOverflow(numBytes)) {
+ return;
+ }
+ appendInt(numBytes);
+ System.arraycopy(b, off, buf, pos, numBytes);
+ pos += numBytes;
+ appendByte(0);
+ }
+
+
+ /**
+ * Copy a chunk of bytes into the packet, starting at the current
+ * write position. The chunk of bytes is encoded with the length
+ * in two bytes first, then the data itself, and finally a
+ * terminating \0 (which is <B>not</B> included in the encoded
+ * length).
+ *
+ * @param b The ByteBuffer from which to copy bytes.
+ */
+ public void appendBytes(ByteBuffer b) {
+ int numBytes = b.remaining();
+ if (checkOverflow(numBytes)) {
+ return;
+ }
+ appendInt(numBytes);
+ b.get(buf, pos, numBytes);
+ pos += numBytes;
+ appendByte(0);
+ }
+
+
+ private boolean checkOverflow(int numBytes) {
if (pos + numBytes + 3 > buf.length) {
log.error(sm.getString("ajpmessage.overflow", "" + numBytes, "" + pos),
new ArrayIndexOutOfBoundsException());
if (log.isDebugEnabled()) {
dump("Overflow/coBytes");
}
- return;
+ return true;
}
- appendInt(numBytes);
- System.arraycopy(b, off, buf, pos, numBytes);
- pos += numBytes;
- appendByte(0);
+ return false;
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1766894&r1=1766893&r2=1766894&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Oct 27 21:27:47 2016
@@ -21,6 +21,7 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.net.InetAddress;
+import java.nio.ByteBuffer;
import java.security.NoSuchProviderException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
@@ -1312,10 +1313,8 @@ public class AjpProcessor extends Abstra
// Write this chunk
while (len > 0) {
- int thisTime = len;
- if (thisTime > outputMaxChunkSize) {
- thisTime = outputMaxChunkSize;
- }
+ int thisTime = Math.min(len, outputMaxChunkSize);
+
responseMessage.reset();
responseMessage.appendByte(Constants.JK_AJP13_SEND_BODY_CHUNK);
responseMessage.appendBytes(chunk.getBytes(), chunk.getOffset() + off, thisTime);
@@ -1331,6 +1330,32 @@ public class AjpProcessor extends Abstra
}
+ private void writeData(ByteBuffer chunk) throws IOException {
+ boolean blocking = (response.getWriteListener() == null);
+
+ int len = chunk.remaining();
+ int off = 0;
+
+ // Write this chunk
+ while (len > 0) {
+ int thisTime = Math.min(len, outputMaxChunkSize);
+
+ responseMessage.reset();
+ responseMessage.appendByte(Constants.JK_AJP13_SEND_BODY_CHUNK);
+ chunk.limit(chunk.position() + thisTime);
+ responseMessage.appendBytes(chunk);
+ responseMessage.end();
+ socketWrapper.write(blocking, responseMessage.getBuffer(), 0, responseMessage.getLen());
+ socketWrapper.flush(blocking);
+
+ len -= thisTime;
+ off += thisTime;
+ }
+
+ bytesWritten += off;
+ }
+
+
private boolean hasDataToWrite() {
return responseMsgPos != -1 || socketWrapper.hasDataToWrite();
}
@@ -1396,6 +1421,27 @@ public class AjpProcessor extends Abstra
}
@Override
+ public int doWrite(ByteBuffer chunk) throws IOException {
+
+ if (!response.isCommitted()) {
+ // Validate and write response headers
+ try {
+ prepareResponse();
+ } catch (IOException e) {
+ setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
+ }
+ }
+
+ int len = 0;
+ if (!swallowResponse) {
+ len = chunk.remaining();
+ writeData(chunk);
+ len -= chunk.remaining();
+ }
+ return len;
+ }
+
+ @Override
public long getBytesWritten() {
return bytesWritten;
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java?rev=1766894&r1=1766893&r2=1766894&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java Thu Oct 27 21:27:47 2016
@@ -17,6 +17,7 @@
package org.apache.coyote.http11;
import java.io.IOException;
+import java.nio.ByteBuffer;
import org.apache.coyote.ActionCode;
import org.apache.coyote.OutputBuffer;
@@ -209,6 +210,24 @@ public class Http11OutputBuffer implemen
@Override
+ public int doWrite(ByteBuffer chunk) throws IOException {
+
+ if (!response.isCommitted()) {
+ // Send the connector a request for commit. The connector should
+ // then validate the headers, send them (using sendHeaders) and
+ // set the filters accordingly.
+ response.action(ActionCode.COMMIT, null);
+ }
+
+ if (lastActiveFilter == -1) {
+ return outputStreamOutputBuffer.doWrite(chunk);
+ } else {
+ return activeFilters[lastActiveFilter].doWrite(chunk);
+ }
+ }
+
+
+ @Override
public long getBytesWritten() {
if (lastActiveFilter == -1) {
return outputStreamOutputBuffer.getBytesWritten();
@@ -551,6 +570,18 @@ public class Http11OutputBuffer implemen
byteCount += len;
return len;
}
+
+ /**
+ * Write chunk.
+ */
+ @Override
+ public int doWrite(ByteBuffer chunk) throws IOException {
+ int len = chunk.remaining();
+ socketWrapper.write(isBlocking(), chunk);
+ len -= chunk.remaining();
+ byteCount += len;
+ return len;
+ }
@Override
public long getBytesWritten() {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java?rev=1766894&r1=1766893&r2=1766894&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java Thu Oct 27 21:27:47 2016
@@ -18,6 +18,7 @@
package org.apache.coyote.http11.filters;
import java.io.IOException;
+import java.nio.ByteBuffer;
import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
@@ -89,8 +90,7 @@ public class ChunkedOutputFilter impleme
// --------------------------------------------------- OutputBuffer Methods
@Override
- public int doWrite(ByteChunk chunk)
- throws IOException {
+ public int doWrite(ByteChunk chunk) throws IOException {
int result = chunk.getLength();
@@ -98,14 +98,32 @@ public class ChunkedOutputFilter impleme
return 0;
}
- // Calculate chunk header
- int pos = 7;
- int current = result;
- while (current > 0) {
- int digit = current % 16;
- current = current / 16;
- chunkLength[pos--] = HexUtils.getHex(digit);
+ int pos = calculateChunkHeader(result);
+
+ chunkHeader.setBytes(chunkLength, pos + 1, 9 - pos);
+ buffer.doWrite(chunkHeader);
+
+ buffer.doWrite(chunk);
+
+ chunkHeader.setBytes(chunkLength, 8, 2);
+ buffer.doWrite(chunkHeader);
+
+ return result;
+
+ }
+
+
+ @Override
+ public int doWrite(ByteBuffer chunk) throws IOException {
+
+ int result = chunk.remaining();
+
+ if (result <= 0) {
+ return 0;
}
+
+ int pos = calculateChunkHeader(result);
+
chunkHeader.setBytes(chunkLength, pos + 1, 9 - pos);
buffer.doWrite(chunkHeader);
@@ -119,6 +137,19 @@ public class ChunkedOutputFilter impleme
}
+ private int calculateChunkHeader(int len) {
+ // Calculate chunk header
+ int pos = 7;
+ int current = len;
+ while (current > 0) {
+ int digit = current % 16;
+ current = current / 16;
+ chunkLength[pos--] = HexUtils.getHex(digit);
+ }
+ return pos;
+ }
+
+
@Override
public long getBytesWritten() {
return buffer.getBytesWritten();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java?rev=1766894&r1=1766893&r2=1766894&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java Thu Oct 27 21:27:47 2016
@@ -19,6 +19,7 @@ package org.apache.coyote.http11.filters
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.ByteBuffer;
import java.util.zip.GZIPOutputStream;
import org.apache.coyote.OutputBuffer;
@@ -73,6 +74,23 @@ public class GzipOutputFilter implements
}
+ @Override
+ public int doWrite(ByteBuffer chunk) throws IOException {
+ if (compressionStream == null) {
+ compressionStream = new GZIPOutputStream(fakeOutputStream, true);
+ }
+ int len = chunk.remaining();
+ if (chunk.hasArray()) {
+ compressionStream.write(chunk.array(), chunk.arrayOffset() + chunk.position(), len);
+ } else {
+ byte[] bytes = new byte[len];
+ chunk.put(bytes);
+ compressionStream.write(bytes, 0, len);
+ }
+ return len;
+ }
+
+
@Override
public long getBytesWritten() {
return buffer.getBytesWritten();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java?rev=1766894&r1=1766893&r2=1766894&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java Thu Oct 27 21:27:47 2016
@@ -18,6 +18,7 @@
package org.apache.coyote.http11.filters;
import java.io.IOException;
+import java.nio.ByteBuffer;
import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
@@ -88,6 +89,44 @@ public class IdentityOutputFilter implem
}
return result;
+
+ }
+
+
+ @Override
+ public int doWrite(ByteBuffer chunk) throws IOException {
+
+ int result = -1;
+
+ if (contentLength >= 0) {
+ if (remaining > 0) {
+ result = chunk.remaining();
+ if (result > remaining) {
+ // The chunk is longer than the number of bytes remaining
+ // in the body; changing the chunk length to the number
+ // of bytes remaining
+ chunk.limit(chunk.position() + (int) remaining);
+ result = (int) remaining;
+ remaining = 0;
+ } else {
+ remaining = remaining - result;
+ }
+ buffer.doWrite(chunk);
+ } else {
+ // No more bytes left to be written : return -1 and clear the
+ // buffer
+ chunk.position(0);
+ chunk.limit(0);
+ result = -1;
+ }
+ } else {
+ // If no content length was set, just write the bytes
+ result = chunk.remaining();
+ buffer.doWrite(chunk);
+ result -= chunk.remaining();
+ }
+
+ return result;
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java?rev=1766894&r1=1766893&r2=1766894&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java Thu Oct 27 21:27:47 2016
@@ -18,6 +18,7 @@
package org.apache.coyote.http11.filters;
import java.io.IOException;
+import java.nio.ByteBuffer;
import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
@@ -41,6 +42,12 @@ public class VoidOutputFilter implements
}
+ @Override
+ public int doWrite(ByteBuffer chunk) throws IOException {
+ return chunk.remaining();
+ }
+
+
@Override
public long getBytesWritten() {
return 0;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java?rev=1766894&r1=1766893&r2=1766894&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java Thu Oct 27 21:27:47 2016
@@ -567,6 +567,35 @@ public class Stream extends AbstractStre
return offset;
}
+ @Override
+ public synchronized int doWrite(ByteBuffer chunk) throws IOException {
+ if (closed) {
+ throw new IllegalStateException(
+ sm.getString("stream.closed", getConnectionId(), getIdentifier()));
+ }
+ if (!coyoteResponse.isCommitted()) {
+ coyoteResponse.sendHeaders();
+ }
+ int chunkLimit = chunk.limit();
+ int offset = 0;
+ while (chunk.remaining() > 0) {
+ int thisTime = Math.min(buffer.remaining(), chunk.remaining());
+ chunk.limit(chunk.position() + thisTime);
+ buffer.put(chunk);
+ chunk.limit(chunkLimit);
+ offset += thisTime;
+ if (chunk.remaining() > 0 && !buffer.hasRemaining()) {
+ // Only flush if we have more data to write and the buffer
+ // is full
+ if (flush(true, coyoteResponse.getWriteListener() == null)) {
+ break;
+ }
+ }
+ }
+ written += offset;
+ return offset;
+ }
+
public synchronized boolean flush(boolean block) throws IOException {
return flush(false, block);
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java?rev=1766894&r1=1766893&r2=1766894&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java Thu Oct 27 21:27:47 2016
@@ -18,6 +18,7 @@ package org.apache.coyote.http11.filters
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.nio.ByteBuffer;
import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
@@ -110,6 +111,11 @@ public class TesterOutputBuffer extends
}
@Override
+ public int doWrite(ByteBuffer chunk) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
public long getBytesWritten() {
return byteCount;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org