Author: markt
Date: Thu Oct 8 20:40:25 2015
New Revision: 1707617
URL: http://svn.apache.org/viewvc?rev=1707617&view=rev
Log:
Get FORM authentication working
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1707617&r1=1707616&r2=1707617&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Thu Oct 8 20:40:25
2015
@@ -609,6 +609,11 @@ public class Stream extends AbstractStre
}
+ protected synchronized void insertReplayedBody(ByteChunk body) {
+ inBuffer = ByteBuffer.wrap(body.getBytes(), body.getOffset(),
body.getLength());
+ }
+
+
private void ensureBuffersExist() {
if (inBuffer == null) {
synchronized (this) {
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=1707617&r1=1707616&r2=1707617&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Thu Oct 8
20:40:25 2015
@@ -33,6 +33,7 @@ import org.apache.coyote.ContainerThread
import org.apache.coyote.ErrorState;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.DispatchType;
import org.apache.tomcat.util.net.SSLSupport;
@@ -181,6 +182,12 @@ public class StreamProcessor extends Abs
request.setAvailable(stream.getInputBuffer().available());
break;
}
+ case REQ_SET_BODY_REPLAY: {
+ ByteChunk body = (ByteChunk) param;
+ stream.getInputBuffer().insertReplayedBody(body);
+ stream.receivedEndOfStream();
+ break;
+ }
case RESET: {
stream.getOutputBuffer().reset();
break;
@@ -382,11 +389,6 @@ public class StreamProcessor extends Abs
case UPGRADE:
throw new UnsupportedOperationException(
sm.getString("streamProcessor.httpupgrade.notsupported"));
-
- // Unimplemented / to review
- case REQ_SET_BODY_REPLAY:
- log.info("TODO: Implement [" + actionCode + "] for HTTP/2");
- break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
