From 6f9a6e32bdd20af00889804154343a2ff7bb67fd Mon Sep 17 00:00:00 2001
From: Redkale <redkale@qq.com>
Date: Thu, 5 Jan 2023 10:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96HttpRequest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/redkale/net/http/HttpRequest.java     | 31 ++++++-----
 src/main/java/org/redkale/util/ByteArray.java | 52 +++++++++++++++++++
 2 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/redkale/net/http/HttpRequest.java b/src/main/java/org/redkale/net/http/HttpRequest.java
index 82450381d..65375594c 100644
--- a/src/main/java/org/redkale/net/http/HttpRequest.java
+++ b/src/main/java/org/redkale/net/http/HttpRequest.java
@@ -483,10 +483,11 @@ public class HttpRequest extends Request<HttpContext> {
                 bytes.put(b);
             }
             size = bytes.length();
-            if (size == 3 && bytes.get(0) == 'G' && bytes.get(1) == 'E' && bytes.get(2) == 'T') {
+            byte[] content = bytes.content();
+            if (size == 3 && content[0] == 'G' && content[1] == 'E' && content[2] == 'T') {
                 this.method = KEY_GET;
                 this.getmethod = true;
-            } else if (size == 4 && bytes.get(0) == 'P' && bytes.get(1) == 'O' && bytes.get(2) == 'S' && bytes.get(3) == 'T') {
+            } else if (size == 4 && content[0] == 'P' && content[1] == 'O' && content[2] == 'S' && content[3] == 'T') {
                 this.method = KEY_POST;
                 this.getmethod = false;
             } else {
@@ -542,6 +543,8 @@ public class HttpRequest extends Request<HttpContext> {
                     }
                 } else {
                     this.requestURI = bytes.toString(charset);
+                    this.lastRequestURIString = null;
+                    this.lastRequestURIBytes = null;
                 }
                 this.queryBytes = EMPTY_BYTES;
             }
@@ -570,9 +573,10 @@ public class HttpRequest extends Request<HttpContext> {
             bytes.put(b);
         }
         size = bytes.length();
-        if (size == 8 && bytes.get(0) == 'H' && bytes.get(5) == '1' && bytes.get(7) == '1') {
+        byte[] content = bytes.content();
+        if (size == 8 && content[0] == 'H' && content[5] == '1' && content[7] == '1') {
             this.protocol = KEY_HTTP_1_1;
-        } else if (size == 8 && bytes.get(0) == 'H' && bytes.get(5) == '2' && bytes.get(7) == '0') {
+        } else if (size == 8 && content[0] == 'H' && content[5] == '2' && content[7] == '0') {
             this.protocol = KEY_HTTP_2_0;
         } else {
             this.protocol = bytes.toString(charset);
@@ -693,17 +697,18 @@ public class HttpRequest extends Request<HttpContext> {
                 case "Connection":
                 case "connection":
                     if (vallen > 0) {
-                        if (bytes.get(0) == 'c' && vallen == 5
-                            && bytes.get(1) == 'l' && bytes.get(2) == 'o'
-                            && bytes.get(3) == 's' && bytes.get(4) == 'e') {
+                        byte[] content = bytes.content();
+                        if (content[0] == 'c' && vallen == 5
+                            && content[1] == 'l' && content[2] == 'o'
+                            && content[3] == 's' && content[4] == 'e') {
                             value = "close";
                             this.setKeepAlive(false);
-                        } else if (bytes.get(0) == 'k' && vallen == 10
-                            && bytes.get(1) == 'e' && bytes.get(2) == 'e'
-                            && bytes.get(3) == 'p' && bytes.get(4) == '-'
-                            && bytes.get(5) == 'a' && bytes.get(6) == 'l'
-                            && bytes.get(7) == 'i' && bytes.get(8) == 'v'
-                            && bytes.get(9) == 'e') {
+                        } else if (content[0] == 'k' && vallen == 10
+                            && content[1] == 'e' && content[2] == 'e'
+                            && content[3] == 'p' && content[4] == '-'
+                            && content[5] == 'a' && content[6] == 'l'
+                            && content[7] == 'i' && content[8] == 'v'
+                            && content[9] == 'e') {
                             value = "keep-alive";
                             //if (context.getAliveTimeoutSeconds() >= 0) {
                             this.setKeepAlive(true);
diff --git a/src/main/java/org/redkale/util/ByteArray.java b/src/main/java/org/redkale/util/ByteArray.java
index 5b78ac04c..b91e543df 100644
--- a/src/main/java/org/redkale/util/ByteArray.java
+++ b/src/main/java/org/redkale/util/ByteArray.java
@@ -96,6 +96,58 @@ public final class ByteArray implements ByteTuple {
         return true;
     }
 
+    /**
+     * 比较内容是否相同
+     *
+     * @param bytes  待比较内容
+     * @param offset 偏移量
+     * @param length 长度
+     *
+     * @return 是否相同
+     */
+    public boolean equal(final byte[] bytes, int offset, int length) {
+        if (bytes == null) {
+            return false;
+        }
+        if (count != length) {
+            return false;
+        }
+        byte[] ba = content;
+        int len = count;
+        int off = offset;
+        for (int i = 0; i < len; i++) {
+            if (ba[i] != bytes[off + i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 比较内容是否相同
+     *
+     * @param bytes 待比较内容
+     *
+     * @return 是否相同
+     */
+    public boolean equal(final ByteArray bytes) {
+        if (bytes == null) {
+            return false;
+        }
+        if (count != bytes.count) {
+            return false;
+        }
+        byte[] ba1 = content;
+        byte[] ba2 = bytes.content;
+        int len = count;
+        for (int i = 0; i < len; i++) {
+            if (ba1[i] != ba2[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * 判断内容是否为空
      *