Author: markt
Date: Fri Aug 12 08:37:25 2016
New Revision: 1756125
URL: http://svn.apache.org/viewvc?rev=1756125&view=rev
Log:
Complete 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/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:37:25 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-1756098
+/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-1756104
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=1756125&r1=1756124&r2=1756125&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:37:25 2016
@@ -35,6 +35,7 @@ import org.apache.coyote.AsyncContextCal
import org.apache.coyote.ErrorState;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.OutputBuffer;
+import org.apache.coyote.PushToken;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.UpgradeToken;
import org.apache.juli.logging.Log;
@@ -542,19 +543,18 @@ public class AjpProcessor extends Abstra
// Servlet 3.1 non-blocking I/O
case REQUEST_BODY_FULLY_READ: {
AtomicBoolean result = (AtomicBoolean) param;
- result.set(endOfStream);
+ result.set(isRequestBodyFullyRead());
break;
}
case NB_READ_INTEREST: {
- if (!endOfStream) {
- socketWrapper.registerReadInterest();
+ if (!isRequestBodyFullyRead()) {
+ registerReadInterest();
}
break;
}
case NB_WRITE_INTEREST: {
AtomicBoolean isReady = (AtomicBoolean)param;
- boolean result = responseMsgPos == -1 &&
socketWrapper.isReadyForWrite();
- isReady.set(result);
+ isReady.set(isReady());
break;
}
case DISPATCH_READ: {
@@ -566,28 +566,28 @@ public class AjpProcessor extends Abstra
break;
}
case DISPATCH_EXECUTE: {
-
socketWrapper.executeNonBlockingDispatches(getIteratorAndClearDispatches());
+ SocketWrapperBase<?> wrapper = socketWrapper;
+ if (wrapper != null) {
+ executeDispatches(wrapper);
+ }
break;
}
// Servlet 3.1 HTTP Upgrade
case UPGRADE: {
- // HTTP connections only. Unsupported for AJP.
- throw new UnsupportedOperationException(
- sm.getString("ajpprocessor.httpupgrade.notsupported"));
+ doHttpUpgrade((UpgradeToken) param);
+ break;
}
// Servlet 4.0 Push requests
case IS_PUSH_SUPPORTED: {
- // HTTP2 connections only. Unsupported for AJP.
AtomicBoolean result = (AtomicBoolean) param;
- result.set(false);
+ result.set(isPushSupported());
break;
}
case PUSH_REQUEST: {
- // HTTP2 connections only. Unsupported for AJP.
- throw new UnsupportedOperationException(
- sm.getString("ajpprocessor.pushrequest.notsupported"));
+ doPush((PushToken) param);
+ break;
}
}
}
@@ -1422,13 +1422,13 @@ public class AjpProcessor extends Abstra
replay = true;
endOfStream = false;
}
-
-
+
+
private void setSwallowResponse() {
swallowResponse = true;
}
-
-
+
+
private void disableSwallowRequest() {
/* NO-OP
* With AJP, Tomcat controls when the client sends request body data.
At
@@ -1436,15 +1436,15 @@ public class AjpProcessor extends Abstra
* in finishResponse().
*/
}
-
-
+
+
private boolean getPopulateRequestAttributesFromSocket() {
// NO-OPs the attribute requests since they are pre-populated when
// parsing the first AJP message.
return false;
}
-
+
private void populateRequestAttributeRemoteHost() {
// Get remote host name using a DNS resolution
if (request.remoteHost().isNull()) {
@@ -1456,8 +1456,8 @@ public class AjpProcessor extends Abstra
}
}
}
-
-
+
+
private void populateSslRequestAttributes() {
if (!certificates.isNull()) {
ByteChunk certData = certificates.getByteChunk();
@@ -1499,14 +1499,60 @@ public class AjpProcessor extends Abstra
request.setAttribute(SSLSupport.CERTIFICATE_KEY, jsseCerts);
}
}
-
-
+
+
private void sslReHandShake() {
// NO-OP. Can't force a new SSL handshake with the client when using
// AJP as the reverse proxy controls that connection.
}
-
+
+ private boolean isRequestBodyFullyRead() {
+ return endOfStream;
+ }
+
+
+ private void registerReadInterest() {
+ socketWrapper.registerReadInterest();
+ }
+
+
+ private boolean isReady() {
+ return responseMsgPos == -1 && socketWrapper.isReadyForWrite();
+ }
+
+
+ private void executeDispatches(SocketWrapperBase<?> wrapper) {
+ wrapper.executeNonBlockingDispatches(getIteratorAndClearDispatches());
+ }
+
+
+ /**
+ * @param upgradeToken Unused.
+ */
+ private void doHttpUpgrade(UpgradeToken upgradeToken) {
+ // HTTP connections only. Unsupported for AJP.
+ throw new UnsupportedOperationException(
+ sm.getString("ajpprocessor.httpupgrade.notsupported"));
+ }
+
+
+ private boolean isPushSupported() {
+ // HTTP2 connections only. Unsupported for AJP.
+ return false;
+ }
+
+
+ /**
+ * @param pushToken Unused
+ */
+ private void doPush(PushToken pushToken) {
+ // HTTP2 connections only. Unsupported for AJP.
+ throw new UnsupportedOperationException(
+ sm.getString("ajpprocessor.pushrequest.notsupported"));
+ }
+
+
/**
* 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/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1756125&r1=1756124&r2=1756125&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:37:25 2016
@@ -32,6 +32,7 @@ import org.apache.coyote.AbstractProcess
import org.apache.coyote.ActionCode;
import org.apache.coyote.AsyncContextCallback;
import org.apache.coyote.ErrorState;
+import org.apache.coyote.PushToken;
import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.UpgradeProtocol;
@@ -835,16 +836,18 @@ public class Http11Processor extends Abs
// Servlet 3.1 non-blocking I/O
case REQUEST_BODY_FULLY_READ: {
AtomicBoolean result = (AtomicBoolean) param;
- result.set(inputBuffer.isFinished());
+ result.set(isRequestBodyFullyRead());
break;
}
case NB_READ_INTEREST: {
- socketWrapper.registerReadInterest();
+ if (!isRequestBodyFullyRead()) {
+ registerReadInterest();
+ }
break;
}
case NB_WRITE_INTEREST: {
AtomicBoolean isReady = (AtomicBoolean)param;
- isReady.set(outputBuffer.isReady());
+ isReady.set(isReady());
break;
}
case DISPATCH_READ: {
@@ -858,30 +861,26 @@ public class Http11Processor extends Abs
case DISPATCH_EXECUTE: {
SocketWrapperBase<?> wrapper = socketWrapper;
if (wrapper != null) {
-
wrapper.executeNonBlockingDispatches(getIteratorAndClearDispatches());
+ executeDispatches(wrapper);
}
break;
}
// Servlet 3.1 HTTP Upgrade
case UPGRADE: {
- upgradeToken = (UpgradeToken) param;
- // Stop further HTTP output
- outputBuffer.responseFinished = true;
+ doHttpUpgrade((UpgradeToken) param);
break;
}
// Servlet 4.0 Push requests
case IS_PUSH_SUPPORTED: {
- // HTTP2 connections only. Unsupported for HTTP/1.x
AtomicBoolean result = (AtomicBoolean) param;
- result.set(false);
+ result.set(isPushSupported());
break;
}
case PUSH_REQUEST: {
- // HTTP2 connections only. Unsupported for AJP.
- throw new UnsupportedOperationException(
- sm.getString("http11processor.pushrequest.notsupported"));
+ doPush((PushToken) param);
+ break;
}
}
}
@@ -1744,39 +1743,39 @@ public class Http11Processor extends Abs
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);
}
-
-
+
+
private void setSwallowResponse() {
outputBuffer.responseFinished = true;
}
-
-
+
+
private void disableSwallowRequest() {
inputBuffer.setSwallowInput(false);
}
-
-
+
+
private boolean getPopulateRequestAttributesFromSocket() {
return true;
}
-
-
+
+
private void populateRequestAttributeRemoteHost() {
if (getPopulateRequestAttributesFromSocket() && socketWrapper != null)
{
request.remoteHost().setString(socketWrapper.getRemoteHost());
}
}
-
-
+
+
private void populateSslRequestAttributes() {
try {
if (sslSupport != null) {
@@ -1828,8 +1827,51 @@ public class Http11Processor extends Abs
}
}
}
-
-
+
+
+ private boolean isRequestBodyFullyRead() {
+ return inputBuffer.isFinished();
+ }
+
+
+ private void registerReadInterest() {
+ socketWrapper.registerReadInterest();
+ }
+
+
+ private boolean isReady() {
+ return outputBuffer.isReady();
+ }
+
+
+ private void executeDispatches(SocketWrapperBase<?> wrapper) {
+ wrapper.executeNonBlockingDispatches(getIteratorAndClearDispatches());
+ }
+
+
+ private void doHttpUpgrade(UpgradeToken upgradeToken) {
+ this.upgradeToken = upgradeToken;
+ // Stop further HTTP output
+ outputBuffer.responseFinished = true;
+ }
+
+
+ private boolean isPushSupported() {
+ // HTTP2 connections only. Unsupported for HTTP/1.x
+ return false;
+ }
+
+
+ /**
+ * @param pushToken Unused
+ */
+ private void doPush(PushToken pushToken) {
+ // HTTP2 connections only. Unsupported for AJP.
+ throw new UnsupportedOperationException(
+ sm.getString("http11processor.pushrequest.notsupported"));
+ }
+
+
/**
* 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=1756125&r1=1756124&r2=1756125&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:37:25 2016
@@ -220,6 +220,7 @@ public class StreamProcessor extends Abs
break;
}
case ASYNC_COMPLETE: {
+ clearDispatches();
if (asyncStateMachine.asyncComplete()) {
socketWrapper.getEndpoint().getExecutor().execute(this);
}
@@ -288,16 +289,18 @@ public class StreamProcessor extends Abs
// Servlet 3.1 non-blocking I/O
case REQUEST_BODY_FULLY_READ: {
AtomicBoolean result = (AtomicBoolean) param;
- result.set(stream.getInputBuffer().isRequestBodyFullyRead());
+ result.set(isRequestBodyFullyRead());
break;
}
case NB_READ_INTEREST: {
- stream.getInputBuffer().registerReadInterest();
+ if (!isRequestBodyFullyRead()) {
+ registerReadInterest();
+ }
break;
}
case NB_WRITE_INTEREST: {
AtomicBoolean result = (AtomicBoolean) param;
- result.set(stream.getOutputBuffer().isReady());
+ result.set(isReady());
break;
}
case DISPATCH_READ: {
@@ -309,31 +312,27 @@ public class StreamProcessor extends Abs
break;
}
case DISPATCH_EXECUTE: {
- socketWrapper.getEndpoint().getExecutor().execute(this);
+ SocketWrapperBase<?> wrapper = socketWrapper;
+ if (wrapper != null) {
+ executeDispatches(wrapper);
+ }
break;
}
// Servlet 3.1 HTTP Upgrade
case UPGRADE: {
- // Unsupported / illegal under HTTP/2
- throw new UnsupportedOperationException(
- sm.getString("streamProcessor.httpupgrade.notsupported"));
+ doHttpUpgrade((UpgradeToken) param);
+ break;
}
// Servlet 4.0 Push requests
case IS_PUSH_SUPPORTED: {
AtomicBoolean result = (AtomicBoolean) param;
- result.set(stream.isPushSupported());
+ result.set(isPushSupported());
break;
}
case PUSH_REQUEST: {
- try {
- PushToken pushToken = (PushToken) param;
- pushToken.setResult(stream.push(pushToken.getPushTarget()));
- } catch (IOException ioe) {
- setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
- response.setErrorException(ioe);
- }
+ doPush((PushToken) param);
break;
}
}
@@ -368,43 +367,43 @@ public class StreamProcessor extends Abs
/**
- * @param doRead Unused for HTTP/2
+ * @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();
}
-
-
+
+
private void setSwallowResponse() {
// NO-OP
}
-
-
+
+
private void disableSwallowRequest() {
// NO-OP
// HTTP/2 has to swallow any input received to ensure that the flow
// control windows are correctly tracked.
}
-
-
+
+
private boolean getPopulateRequestAttributesFromSocket() {
return true;
}
-
+
private void populateRequestAttributeRemoteHost() {
if (getPopulateRequestAttributesFromSocket() && socketWrapper != null)
{
request.remoteHost().setString(socketWrapper.getRemoteHost());
}
}
-
-
+
+
private void populateSslRequestAttributes() {
try {
if (sslSupport != null) {
@@ -440,7 +439,52 @@ public class StreamProcessor extends Abs
// No re-negotiation support in HTTP/2.
}
-
+
+ private boolean isRequestBodyFullyRead() {
+ return stream.getInputBuffer().isRequestBodyFullyRead();
+ }
+
+
+ private void registerReadInterest() {
+ stream.getInputBuffer().registerReadInterest();
+ }
+
+
+ private boolean isReady() {
+ return stream.getOutputBuffer().isReady();
+ }
+
+
+ private void executeDispatches(SocketWrapperBase<?> wrapper) {
+ wrapper.getEndpoint().getExecutor().execute(this);
+ }
+
+
+ /**
+ * @param upgradeToken Unused
+ */
+ private void doHttpUpgrade(UpgradeToken upgradeToken) {
+ // Unsupported / illegal under HTTP/2
+ throw new UnsupportedOperationException(
+ sm.getString("streamProcessor.httpupgrade.notsupported"));
+ }
+
+
+ private boolean isPushSupported() {
+ return stream.isPushSupported();
+ }
+
+
+ private void doPush(PushToken pushToken) {
+ try {
+ pushToken.setResult(stream.push(pushToken.getPushTarget()));
+ } catch (IOException ioe) {
+ setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
+ response.setErrorException(ioe);
+ }
+ }
+
+
@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
