Author: markt
Date: Mon Mar 2 15:18:24 2015
New Revision: 1663325
URL: http://svn.apache.org/r1663325
Log:
When an uncompressed part results in multiple compressed parts, ensure that the
OpCodes are correctly set.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 2 15:18:24 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java?rev=1663325&r1=1663324&r2=1663325&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
Mon Mar 2 15:18:24 2015
@@ -316,16 +316,13 @@ public class PerMessageDeflate implement
List<MessagePart> allCompressedParts = new ArrayList<>();
for (MessagePart uncompressedPart : uncompressedParts) {
- byte opCode = uncompressedPart.getOpCode();
- if (Util.isControl(opCode)) {
+ if (Util.isControl(uncompressedPart.getOpCode())) {
// Control messages can appear in the middle of other messages
// and must not be compressed. Pass it straight through
allCompressedParts.add(uncompressedPart);
} else {
List<MessagePart> compressedParts = new ArrayList<>();
ByteBuffer uncompressedPayload = uncompressedPart.getPayload();
- SendHandler uncompressedIntermediateHandler =
- uncompressedPart.getIntermediateHandler();
deflater.setInput(uncompressedPayload.array(),
uncompressedPayload.arrayOffset() +
uncompressedPayload.position(),
@@ -342,7 +339,8 @@ public class PerMessageDeflate implement
compressedPayload.remaining(), flush);
compressedPayload.position(compressedPayload.position() +
written);
- if (!uncompressedPart.isFin() &&
compressedPayload.hasRemaining() && deflater.needsInput()) {
+ if (!uncompressedPart.isFin() &&
compressedPayload.hasRemaining() &&
+ deflater.needsInput()) {
// This message part has been fully processed by the
// deflater. Fire the send handler for this message
part
// and move on to the next message part.
@@ -366,23 +364,20 @@ public class PerMessageDeflate implement
if (fin && !full && needsInput) {
// End of compressed message. Drop EOM bytes and
output.
compressedPayload.limit(compressedPayload.limit() -
EOM_BYTES.length);
- compressedPart = new MessagePart(true,
getRsv(uncompressedPart),
- opCode, compressedPayload,
uncompressedIntermediateHandler,
- uncompressedIntermediateHandler);
+ compressedPart = createNewCompressedMessagePart(
+ uncompressedPart, true, compressedPayload);
deflateRequired = false;
startNewMessage();
} else if (full && !needsInput) {
// Write buffer full and input message not fully read.
// Output and start new compressed part.
- compressedPart = new MessagePart(false,
getRsv(uncompressedPart),
- opCode, compressedPayload,
uncompressedIntermediateHandler,
- uncompressedIntermediateHandler);
+ compressedPart = createNewCompressedMessagePart(
+ uncompressedPart, false, compressedPayload);
} else if (!fin && full && needsInput) {
// Write buffer full and input message not fully read.
// Output and get more data.
- compressedPart = new MessagePart(false,
getRsv(uncompressedPart),
- opCode, compressedPayload,
uncompressedIntermediateHandler,
- uncompressedIntermediateHandler);
+ compressedPart = createNewCompressedMessagePart(
+ uncompressedPart, false, compressedPayload);
deflateRequired = false;
} else if (fin && full && needsInput) {
// Write buffer full. Input fully read. Deflater may be
@@ -392,22 +387,22 @@ public class PerMessageDeflate implement
// - in middle of EOM bytes
// - about to write EOM bytes
// - more data to write
- int eomBufferWritten = deflater.deflate(EOM_BUFFER, 0,
EOM_BUFFER.length, Deflater.SYNC_FLUSH);
+ int eomBufferWritten = deflater.deflate(
+ EOM_BUFFER, 0, EOM_BUFFER.length,
Deflater.SYNC_FLUSH);
if (eomBufferWritten < EOM_BUFFER.length) {
// EOM has just been completed
- compressedPayload.limit(compressedPayload.limit()
- EOM_BYTES.length + eomBufferWritten);
- compressedPart = new MessagePart(true,
- getRsv(uncompressedPart), opCode,
compressedPayload,
- uncompressedIntermediateHandler,
uncompressedIntermediateHandler);
+ compressedPayload.limit(compressedPayload.limit() -
+ EOM_BYTES.length + eomBufferWritten);
+ compressedPart = createNewCompressedMessagePart(
+ uncompressedPart, true, compressedPayload);
deflateRequired = false;
startNewMessage();
} else {
// More data to write
// Copy bytes to new write buffer
writeBuffer.put(EOM_BUFFER, 0, eomBufferWritten);
- compressedPart = new MessagePart(false,
- getRsv(uncompressedPart), opCode,
compressedPayload,
- uncompressedIntermediateHandler,
uncompressedIntermediateHandler);
+ compressedPart = createNewCompressedMessagePart(
+ uncompressedPart, false,
compressedPayload);
}
} else {
throw new IllegalStateException("Should never happen");
@@ -444,12 +439,19 @@ public class PerMessageDeflate implement
}
- private int getRsv(MessagePart uncompressedMessagePart) {
- int result = uncompressedMessagePart.getRsv();
+ private MessagePart createNewCompressedMessagePart(MessagePart
uncompressedMessagePart,
+ boolean fin, ByteBuffer compressedPayload) {
+ int rsv = uncompressedMessagePart.getRsv();
+ byte opCode = uncompressedMessagePart.getOpCode();
if (!firstCompressedFrameWritten) {
- result += RSV_BITMASK;
+ rsv += RSV_BITMASK;
firstCompressedFrameWritten = true;
+ } else {
+ // This must be a continuation frame
+ opCode = 0;
}
- return result;
+ return new MessagePart(fin, rsv, opCode, compressedPayload,
+ uncompressedMessagePart.getIntermediateHandler(),
+ uncompressedMessagePart.getIntermediateHandler());
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1663325&r1=1663324&r2=1663325&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Mar 2 15:18:24 2015
@@ -127,6 +127,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="WebSocket">
+ <changelog>
+ <fix>
+ Correct a bug in the <code>permessage-deflate</code> implementation
that
+ meant that the incorrect op-codes were used if an uncompressed message
+ was converted into more than one compressed message. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
