Author: markt
Date: Fri Aug 12 07:45:50 2016
New Revision: 1756085
URL: http://svn.apache.org/viewvc?rev=1756085&view=rev
Log:
Align ActionCode.ACK
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1756085&r1=1756084&r2=1756085&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Aug 12
07:45:50 2016
@@ -378,7 +378,7 @@ public class AjpProcessor extends Abstra
break;
}
case ACK: {
- // NO_OP for AJP
+ ack();
break;
}
case CLIENT_FLUSH: {
@@ -1444,6 +1444,11 @@ public class AjpProcessor extends Abstra
}
+ private void ack() {
+ // NO-OP for AJP
+ }
+
+
private boolean available() {
if (endOfStream) {
return false;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1756085&r1=1756084&r2=1756085&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Aug 12
07:45:50 2016
@@ -671,17 +671,7 @@ public class Http11Processor extends Abs
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: {
@@ -1802,6 +1792,21 @@ public class Http11Processor extends Abs
}
+ 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);
+ }
+ }
+ }
+
+
/**
* 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/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1756085&r1=1756084&r2=1756085&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Fri Aug 12
07:45:50 2016
@@ -125,13 +125,7 @@ public class StreamProcessor extends Abs
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: {
@@ -390,6 +384,17 @@ public class StreamProcessor extends Abs
}
+ private void ack() {
+ if (!response.isCommitted() && request.hasExpectation()) {
+ try {
+ stream.writeAck();
+ } catch (IOException ioe) {
+ setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
+ }
+ }
+ }
+
+
@Override
public void recycle() {
// StreamProcessor instances are not re-used.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
