Author: markt
Date: Fri Aug 12 07:46:06 2016
New Revision: 1756088
URL: http://svn.apache.org/viewvc?rev=1756088&view=rev
Log:
Align ActionCode.REQ_SET_BODY_REPLAY
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=1756088&r1=1756087&r2=1756088&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:46:06 2016
@@ -396,15 +396,8 @@ public class AjpProcessor extends Abstra
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: {
@@ -1468,6 +1461,17 @@ public class AjpProcessor extends Abstra
}
+ 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/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1756088&r1=1756087&r2=1756088&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:46:06 2016
@@ -690,12 +690,7 @@ public class Http11Processor extends Abs
}
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: {
@@ -1817,6 +1812,15 @@ public class Http11Processor extends Abs
}
+ 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/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1756088&r1=1756087&r2=1756088&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:46:06 2016
@@ -144,8 +144,7 @@ public class StreamProcessor extends Abs
}
case REQ_SET_BODY_REPLAY: {
ByteChunk body = (ByteChunk) param;
- stream.getInputBuffer().insertReplayedBody(body);
- stream.receivedEndOfStream();
+ setRequestBody(body);
break;
}
case RESET: {
@@ -408,6 +407,12 @@ public class StreamProcessor extends Abs
}
+ 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
