From a137dd4d4a818ba4acaaf3e3ef60d83b2d120960 Mon Sep 17 00:00:00 2001 From: wentch <22250530@qq.com> Date: Mon, 28 Dec 2015 15:35:54 +0800 Subject: [PATCH] --- src/org/redkale/net/http/HttpPrepareServlet.java | 12 ------------ src/org/redkale/net/http/HttpRequest.java | 11 +---------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/org/redkale/net/http/HttpPrepareServlet.java b/src/org/redkale/net/http/HttpPrepareServlet.java index 89fbe39d2..e9701adb2 100644 --- a/src/org/redkale/net/http/HttpPrepareServlet.java +++ b/src/org/redkale/net/http/HttpPrepareServlet.java @@ -72,18 +72,6 @@ public final class HttpPrepareServlet extends PrepareServlet" - + "" - + "" - + "").getBytes()).asReadOnlyBuffer(); - } - response.finish(true, flashPolicyBuffer.duplicate()); - return; - } final String uri = request.getRequestURI(); HttpServlet servlet = this.strmaps.isEmpty() ? null : this.strmaps.get(uri); if (servlet == null && this.regArray != null) { diff --git a/src/org/redkale/net/http/HttpRequest.java b/src/org/redkale/net/http/HttpRequest.java index 21ceeae2c..77333861a 100644 --- a/src/org/redkale/net/http/HttpRequest.java +++ b/src/org/redkale/net/http/HttpRequest.java @@ -64,8 +64,6 @@ public class HttpRequest extends Request { private boolean bodyparsed = false; - protected boolean flashPolicy = false; - protected boolean boundary = false; private final String remoteAddrHeader; @@ -93,13 +91,7 @@ public class HttpRequest extends Request { @Override protected int readHeader(final ByteBuffer buffer) { - if (!readLine(buffer, array)) { - if (array.equal(flashRequestContent1) || array.equal(flashRequestContent2)) { //兼容 flash socket - this.flashPolicy = true; - return 0; - } - return -1; - } + if (!readLine(buffer, array)) return -1; Charset charset = this.context.getCharset(); int index = 0; int offset = array.find(index, ' '); @@ -299,7 +291,6 @@ public class HttpRequest extends Request { this.contentLength = -1; this.boundary = false; this.bodyparsed = false; - this.flashPolicy = false; this.header.clear(); this.params.clear();