Author: markt
Date: Fri Aug 12 08:33:19 2016
New Revision: 1756122
URL: http://svn.apache.org/viewvc?rev=1756122&view=rev
Log:
Further changes to align ActionCode implementations
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
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/Http11Processor.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 12 08:33:19 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
+/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-1756088
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=1756122&r1=1756121&r2=1756122&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 Fri Aug
12 08:33:19 2016
@@ -234,7 +234,7 @@ public class AjpProcessor extends Abstra
/**
* Finished response.
*/
- private boolean finished = false;
+ private boolean responseFinished = false;
/**
@@ -371,14 +371,14 @@ public class AjpProcessor extends Abstra
case CLOSE: {
action(ActionCode.COMMIT, null);
try {
- finish();
+ finishResponse();
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
}
break;
}
case ACK: {
- // NO_OP for AJP
+ ack();
break;
}
case CLIENT_FLUSH: {
@@ -387,27 +387,17 @@ public class AjpProcessor extends Abstra
flush();
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
+ response.setErrorException(e);
}
break;
}
case AVAILABLE: {
- if (available()) {
- request.setAvailable(1);
- } else {
- request.setAvailable(0);
- }
+ request.setAvailable(available(Boolean.TRUE.equals(param)));
break;
}
case REQ_SET_BODY_REPLAY: {
- // Set the given bytes as the content
- ByteChunk bc = (ByteChunk) param;
- int length = bc.getLength();
- bodyBytes.setBytes(bc.getBytes(), bc.getStart(), length);
- request.setContentLength(length);
- first = false;
- empty = false;
- replay = true;
- endOfStream = false;
+ ByteChunk body = (ByteChunk) param;
+ setRequestBody(body);
break;
}
case RESET: {
@@ -668,7 +658,7 @@ public class AjpProcessor extends Abstra
@Override
protected void dispatchNonBlockingRead() {
- if (available()) {
+ if (available(true) > 0) {
super.dispatchNonBlockingRead();
}
}
@@ -795,10 +785,10 @@ public class AjpProcessor extends Abstra
}
// Finish the response if not done yet
- if (!finished && getErrorState().isIoAllowed()) {
+ if (!responseFinished && getErrorState().isIoAllowed()) {
try {
action(ActionCode.COMMIT, null);
- finish();
+ finishResponse();
} catch (IOException ioe){
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
} catch (Throwable t) {
@@ -856,7 +846,7 @@ public class AjpProcessor extends Abstra
waitingForBodyMessage = false;
empty = true;
replay = false;
- finished = false;
+ responseFinished = false;
certificates.recycle();
swallowResponse = false;
bytesWritten = 0;
@@ -1410,7 +1400,7 @@ public class AjpProcessor extends Abstra
// Calling code should ensure that there is no data in the buffers for
// non-blocking writes.
// TODO Validate the assertion above
- if (!finished) {
+ if (!responseFinished) {
if (ajpFlush) {
// Send the flush message
socketWrapper.write(true, flushMessageArray, 0,
flushMessageArray.length);
@@ -1423,11 +1413,11 @@ public class AjpProcessor extends Abstra
/**
* Finish AJP response.
*/
- private void finish() throws IOException {
- if (finished)
+ private void finishResponse() throws IOException {
+ if (responseFinished)
return;
- finished = true;
+ responseFinished = true;
// Swallow the unread body packet if present
if (waitingForBodyMessage || first && request.getContentLengthLong() >
0) {
@@ -1444,24 +1434,44 @@ public class AjpProcessor extends Abstra
}
- private boolean available() {
+ private void ack() {
+ // NO-OP for AJP
+ }
+
+
+ private int available(boolean doRead) {
if (endOfStream) {
- return false;
+ return 0;
}
- if (empty) {
+ if (empty && doRead) {
try {
refillReadBuffer(false);
} catch (IOException timeout) {
// Not ideal. This will indicate that data is available
// which should trigger a read which in turn will trigger
// another IOException and that one can be thrown.
- return true;
+ return 1;
}
}
- return !empty;
+ if (empty) {
+ return 0;
+ } else {
+ return bodyBytes.getByteChunk().getLength();
+ }
}
+ private void setRequestBody(ByteChunk body) {
+ int length = body.getLength();
+ bodyBytes.setBytes(body.getBytes(), body.getStart(), length);
+ request.setContentLength(length);
+ first = false;
+ empty = false;
+ replay = true;
+ endOfStream = false;
+ }
+
+
/**
* Read at least the specified amount of bytes, and place them
* in the input buffer. Note that if any data is available to read then
this
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=1756122&r1=1756121&r2=1756122&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
Fri Aug 12 08:33:19 2016
@@ -62,7 +62,7 @@ public class Http11OutputBuffer implemen
/**
* Finished flag.
*/
- protected boolean finished;
+ protected boolean responseFinished;
/**
@@ -123,7 +123,7 @@ public class Http11OutputBuffer implemen
activeFilters = new OutputFilter[0];
lastActiveFilter = -1;
- finished = false;
+ responseFinished = false;
outputStreamOutputBuffer = new SocketOutputBuffer();
}
@@ -288,18 +288,18 @@ public class Http11OutputBuffer implemen
// Reset pointers
pos = 0;
lastActiveFilter = -1;
- finished = false;
+ responseFinished = false;
byteCount = 0;
}
/**
- * End request.
+ * Finish writing the response.
*
* @throws IOException an underlying I/O error occurred
*/
- public void endRequest() throws IOException {
- if (finished) {
+ public void finishResponse() throws IOException {
+ if (responseFinished) {
return;
}
@@ -309,7 +309,7 @@ public class Http11OutputBuffer implemen
flushBuffer(true);
- finished = true;
+ responseFinished = true;
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1756122&r1=1756121&r2=1756122&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri
Aug 12 08:33:19 2016
@@ -664,30 +664,20 @@ public class Http11Processor extends Abs
case CLOSE: {
action(ActionCode.COMMIT, null);
try {
- outputBuffer.endRequest();
+ finishResponse();
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
}
break;
}
case ACK: {
- // Acknowledge request
- // Send a 100 status back if it makes sense (response not committed
- // yet, and client specified an expectation for 100-continue)
- if (!response.isCommitted() && request.hasExpectation()) {
- inputBuffer.setSwallowInput(true);
- try {
- outputBuffer.sendAck();
- } catch (IOException e) {
- setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
- }
- }
+ ack();
break;
}
case CLIENT_FLUSH: {
action(ActionCode.COMMIT, null);
try {
- outputBuffer.flush();
+ flush();
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
response.setErrorException(e);
@@ -695,17 +685,12 @@ public class Http11Processor extends Abs
break;
}
case AVAILABLE: {
-
request.setAvailable(inputBuffer.available(Boolean.TRUE.equals(param)));
+ request.setAvailable(available(Boolean.TRUE.equals(param)));
break;
}
case REQ_SET_BODY_REPLAY: {
ByteChunk body = (ByteChunk) param;
-
- InputFilter savedBody = new SavedRequestInputFilter(body);
- savedBody.setRequest(request);
-
- Http11InputBuffer internalBuffer = (Http11InputBuffer)
request.getInputBuffer();
- internalBuffer.addActiveFilter(savedBody);
+ setRequestBody(body);
break;
}
case RESET: {
@@ -721,7 +706,7 @@ public class Http11Processor extends Abs
}
case CLOSE_NOW: {
// Block further output
- outputBuffer.finished = true;
+ outputBuffer.responseFinished = true;
setErrorState(ErrorState.CLOSE_NOW, null);
break;
}
@@ -948,7 +933,7 @@ public class Http11Processor extends Abs
case UPGRADE: {
upgradeToken = (UpgradeToken) param;
// Stop further HTTP output
- outputBuffer.finished = true;
+ outputBuffer.responseFinished = true;
break;
}
@@ -1785,7 +1770,7 @@ public class Http11Processor extends Abs
if (getErrorState().isIoAllowed()) {
try {
action(ActionCode.COMMIT, null);
- outputBuffer.endRequest();
+ outputBuffer.finishResponse();
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
} catch (Throwable t) {
@@ -1797,6 +1782,45 @@ public class Http11Processor extends Abs
}
+ private void finishResponse() throws IOException {
+ outputBuffer.finishResponse();
+ }
+
+
+ private void ack() {
+ // Acknowledge request
+ // Send a 100 status back if it makes sense (response not committed
+ // yet, and client specified an expectation for 100-continue)
+ if (!response.isCommitted() && request.hasExpectation()) {
+ inputBuffer.setSwallowInput(true);
+ try {
+ outputBuffer.sendAck();
+ } catch (IOException e) {
+ setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
+ }
+ }
+ }
+
+
+ private void flush() throws IOException {
+ outputBuffer.flush();
+ }
+
+
+ private int available(boolean doRead) {
+ return inputBuffer.available(doRead);
+ }
+
+
+ private void setRequestBody(ByteChunk body) {
+ InputFilter savedBody = new SavedRequestInputFilter(body);
+ savedBody.setRequest(request);
+
+ Http11InputBuffer internalBuffer = (Http11InputBuffer)
request.getInputBuffer();
+ internalBuffer.addActiveFilter(savedBody);
+ }
+
+
/**
* Checks to see if the keep-alive loop should be broken, performing any
* processing (e.g. sendfile handling) that may have an impact on whether
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1756122&r1=1756121&r2=1756122&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java Fri
Aug 12 08:33:19 2016
@@ -118,26 +118,20 @@ public class StreamProcessor extends Abs
case CLOSE: {
action(ActionCode.COMMIT, null);
try {
- stream.getOutputBuffer().close();
+ finishResponse();
} catch (IOException ioe) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
}
break;
}
case ACK: {
- if (!response.isCommitted() && request.hasExpectation()) {
- try {
- stream.writeAck();
- } catch (IOException ioe) {
- setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
- }
- }
+ ack();
break;
}
case CLIENT_FLUSH: {
action(ActionCode.COMMIT, null);
try {
- stream.flushData();
+ flush();
} catch (IOException ioe) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
response.setErrorException(ioe);
@@ -145,13 +139,12 @@ public class StreamProcessor extends Abs
break;
}
case AVAILABLE: {
- request.setAvailable(stream.getInputBuffer().available());
+ request.setAvailable(available(Boolean.TRUE.equals(param)));
break;
}
case REQ_SET_BODY_REPLAY: {
ByteChunk body = (ByteChunk) param;
- stream.getInputBuffer().insertReplayedBody(body);
- stream.receivedEndOfStream();
+ setRequestBody(body);
break;
}
case RESET: {
@@ -385,6 +378,41 @@ public class StreamProcessor extends Abs
}
+ private void finishResponse() throws IOException {
+ stream.getOutputBuffer().close();
+ }
+
+
+ private void ack() {
+ if (!response.isCommitted() && request.hasExpectation()) {
+ try {
+ stream.writeAck();
+ } catch (IOException ioe) {
+ setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
+ }
+ }
+ }
+
+
+ private void flush() throws IOException {
+ stream.flushData();
+ }
+
+
+ /**
+ * @param doRead Unused for HTTP/2
+ */
+ private int available(boolean doRead) {
+ return stream.getInputBuffer().available();
+ }
+
+
+ private void setRequestBody(ByteChunk body) {
+ stream.getInputBuffer().insertReplayedBody(body);
+ stream.receivedEndOfStream();
+ }
+
+
@Override
public void recycle() {
// StreamProcessor instances are not re-used.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
