From fbe2a01519745f56647918cd28cd1bcbb6bae337 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Sun, 29 Sep 2024 22:47:28 +0800
Subject: [PATCH] =?UTF-8?q?loadHeaderBytes=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/redkale/net/http/HttpRequest.java     | 81 +++++--------------
 src/main/java/org/redkale/util/ByteArray.java | 10 +++
 2 files changed, 28 insertions(+), 63 deletions(-)

diff --git a/src/main/java/org/redkale/net/http/HttpRequest.java b/src/main/java/org/redkale/net/http/HttpRequest.java
index 29e597848..14a29fe77 100644
--- a/src/main/java/org/redkale/net/http/HttpRequest.java
+++ b/src/main/java/org/redkale/net/http/HttpRequest.java
@@ -568,72 +568,27 @@ public class HttpRequest extends Request<HttpContext> {
 
     private int loadHeaderBytes(final ByteBuffer buf) {
         final ByteBuffer buffer = buf;
-        ByteArray hbytes = this.headerBytes;
+        final ByteArray hbytes = this.headerBytes;
         int remain = buffer.remaining();
-        byte b1, b2, b3, b4;
-        for (; ; ) {
-            if (remain-- < 4) { // bytes不存放\r\n\r\n这4个字节
-                hbytes.put(buffer);
-                buffer.clear();
-                if (hbytes.length() > 0) {
-                    byte rn1 = 0, rn2 = 0, rn3 = 0;
-                    byte b = hbytes.getLastByte();
-                    if (b == '\r' || b == '\n') {
-                        rn3 = b;
-                        hbytes.backCount();
-                        if (hbytes.length() > 0) {
-                            b = hbytes.getLastByte();
-                            if (b == '\r' || b == '\n') {
-                                rn2 = b;
-                                hbytes.backCount();
-                                if (hbytes.length() > 0) {
-                                    b = hbytes.getLastByte();
-                                    if (b == '\r' || b == '\n') {
-                                        rn1 = b;
-                                        hbytes.backCount();
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    if (rn1 != 0) {
-                        buffer.put(rn1);
-                    }
-                    if (rn2 != 0) {
-                        buffer.put(rn2);
-                    }
-                    if (rn3 != 0) {
-                        buffer.put(rn3);
-                    }
-                }
-                this.headerHalfLen = hbytes.length();
-                return 1;
-            }
-            b1 = buffer.get();
-            hbytes.put(b1);
-            if (b1 == '\r') {
-                remain--;
-                b2 = buffer.get();
-                if (b2 == '\n') {
-                    remain--;
-                    b3 = buffer.get();
-                    if (b3 == '\r') {
-                        remain--;
-                        b4 = buffer.get();
-                        hbytes.put(b2, b3, b4);
-                        if (b4 == '\n') {
-                            this.headerLength = hbytes.length();
-                            this.headerHalfLen = this.headerLength;
-                            return 0;
-                        }
-                    } else {
-                        hbytes.put(b2, b3);
-                    }
-                } else {
-                    hbytes.put(b2);
-                }
+        final byte[] content = hbytes.expand(remain);
+        int pos = hbytes.length();
+        int rs = 1;
+        while (remain-- > 0) {
+            byte b = buffer.get();
+            content[pos++] = b;
+            if (b == '\n'
+                    && pos > 3
+                    && content[pos - 2] == '\r'
+                    && content[pos - 3] == '\n'
+                    && content[pos - 4] == '\r') {
+                rs = 0;
+                break;
             }
         }
+        hbytes.position(pos);
+        this.headerLength = hbytes.length();
+        this.headerHalfLen = this.headerLength;
+        return rs;
     }
 
     // 解析 GET /xxx HTTP/1.1
diff --git a/src/main/java/org/redkale/util/ByteArray.java b/src/main/java/org/redkale/util/ByteArray.java
index 3771f36f9..7a776c255 100644
--- a/src/main/java/org/redkale/util/ByteArray.java
+++ b/src/main/java/org/redkale/util/ByteArray.java
@@ -76,6 +76,16 @@ public final class ByteArray implements ByteTuple {
         return true;
     }
 
+    public byte[] expand(int len) {
+        int newcount = count + len;
+        if (newcount > content.length) {
+            byte[] newdata = new byte[newcount];
+            System.arraycopy(content, 0, newdata, 0, count);
+            this.content = newdata;
+        }
+        return content;
+    }
+
     public ByteBuffer wrapByteBuffer() {
         return ByteBuffer.wrap(content, 0, count);
     }