bayserver-docker-http 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a4d46496d23a37a8c5bc5f5852b379d0a901f5599aaaa502d949646c134e921
-  data.tar.gz: b44a1b58fe21107515516a280654801e24f6cde5f7130b089f4c5d4882377259
+  metadata.gz: 77533775218a5eeece533642ac1268d650988959191835225d32c64169b0a22b
+  data.tar.gz: 1f84273c4d5308ed6f0a9f35304d87a3ac81f39bc82ca1e2f76b51cb9e42fc72
 SHA512:
-  metadata.gz: f66955666f1fce85453badd1b76db78a3d3982c0a238e7a3c42c7acfdc8b2ec9420de309031212fa479b47dde6da288faacdafacbde87fb8ea4313a4ff13779d
-  data.tar.gz: f304c2c88516c98712406769238d4c261bb637fc21d1d88b9f6d6701c20de967f4def4e1af3f6793015d6d7ac8e78d3a050dbb35db6bea7ab4eb413305238ccf
+  metadata.gz: 8843bca3e9b0468c6c2b3f3a92803c2f8246a670ac8f94258c3e4b73bc5a2cf959b0d6d8e86067bd3f8ef7fe58a69b910bd37a9156fe55de7df26db937603693
+  data.tar.gz: 589f8e2c5db82799fe851e78c1a42c35a51dd963f849aad53f3dad6d246293cd0baa5e7e6cdbd7f9b271e84a18a0cba531ef5b661ca289472dcf0d804c13651b

data/lib/baykit/bayserver/docker/http/h1/command/cmd_header.rb

@@ -118,42 +118,48 @@ module Baykit
               end
 
               def unpack(pkt)
-                acc = pkt.new_data_accessor
                 data_len = pkt.data_len()
                 state = STATE_READ_FIRST_LINE
 
                 line_start_pos = 0
                 line_len = 0
 
-                data_len.times do |pos|
-                  b = acc.get_byte
-                  case b
-                  when CharUtil::CR_BYTE
-                    next
+                pos = 0
+                while pos < data_len
+                  next_nl = pkt.buf.index("\n", pos)
+                  if !next_nl
+                    # No more new lines
+                    break
+                  end
 
-                  when CharUtil::LF_BYTE
-                    if line_len == 0
-                      break
-                    end
-                    if state == STATE_READ_FIRST_LINE
-                      if @is_req_header
-                        unpack_request_line(pkt.buf, line_start_pos, line_len)
-                      else
-                        unpack_status_line(pkt.buf, line_start_pos, line_len)
-                      end
-
-                      state = STATE_READ_MESSAGE_HEADERS
+                  line_start_pos = pos
+
+                  # Calculate line length excluding \n
+                  # Also handle \r if it exists just before \n
+                  line_end = (next_nl > pos && pkt.buf[next_nl - 1] == "\r") ? next_nl - 1 : next_nl
+                  line_len = line_end - pos
+
+                  if line_len == 0
+                    # Empty line found (End of headers)
+                    # Move pos past the newline and exit
+                    pos = next_nl + 1
+                    break
+                  end
+
+                  if state == STATE_READ_FIRST_LINE
+                    if @is_req_header
+                      unpack_request_line(pkt.buf, pos, line_len)
                     else
-                      unpack_message_header(pkt.buf, line_start_pos, line_len)
+                      unpack_status_line(pkt.buf, pos, line_len)
                     end
 
-                    line_len = 0
-                    line_start_pos = pos + 1
-
+                    state = STATE_READ_MESSAGE_HEADERS
                   else
-                    line_len += 1
+                    unpack_message_header(pkt.buf, pos, line_len)
                   end
 
+                  # Move to the start of the next line
+                  pos = next_nl + 1
                 end
 
                 if state == STATE_READ_FIRST_LINE
@@ -257,11 +263,11 @@ module Baykit
               end
 
               def pack_request_line(acc)
-                acc.put_string(@method)
+                acc.put_bytes(@method)
                 acc.put_bytes(" ")
-                acc.put_string(@uri)
+                acc.put_bytes(@uri)
                 acc.put_bytes(" ")
-                acc.put_string(@version);
+                acc.put_bytes(@version)
                 acc.put_bytes(CharUtil::CRLF)
               end
 
@@ -276,9 +282,9 @@ module Baykit
 
                 # status
                 acc.put_bytes(" ")
-                acc.put_string(@status.to_s)
+                acc.put_bytes(@status.to_s)
                 acc.put_bytes(" ")
-                acc.put_string(desc)
+                acc.put_bytes(desc)
                 acc.put_bytes(CharUtil::CRLF)
               end
 
@@ -289,9 +295,9 @@ module Baykit
                 if !value.kind_of?(String)
                   raise RuntimeError.new("IllegalArgument: #{value}")
                 end
-                acc.put_string(name)
+                acc.put_bytes(name)
                 acc.put_bytes(":")
-                acc.put_string(value)
+                acc.put_bytes(value)
                 acc.put_bytes(CharUtil::CRLF)
               end
 

data/lib/baykit/bayserver/docker/http/h1/h1_inbound_handler.rb

@@ -139,7 +139,8 @@ module Baykit
               @protocol_handler.post(cmd, &callback)
             end
 
-            def send_end_tour(tur, keep_alive, &callback)
+            def send_end_tour(tur, &callback)
+              keep_alive = tur.res.headers.get_connection() == Headers::CONNECTION_KEEP_ALIVE
               BayLog.trace("%s sendEndTour: tur=%s keep=%s", ship, tur, keep_alive)
 
               # Send dummy end request command

data/lib/baykit/bayserver/docker/http/h1/h1_packet_unpacker.rb

@@ -68,50 +68,45 @@ module Baykit
               suspend = false
 
               if @state == STATE_READ_HEADERS
-                while pos < buf.length
-                  b = buf[pos]
-                  @tmp_buf.put_byte(b)
-                  pos += 1
-                  #@BayServer.info b + " " + b.codepoints[0].to_s + " pos=" + pos.to_s
-                  if b == CharUtil::CR
-                    next
-                  elsif b == CharUtil::LF
-                    if line_len == 0
-                      # empty line (all headers are read)
-                      pkt = @pkt_store.rent(H1Type::HEADER)
-                      pkt.new_data_accessor.put_bytes(@tmp_buf.bytes, 0, @tmp_buf.length)
-
-                      begin
-                        next_act = @cmd_upacker.packet_received(pkt)
-                      ensure
-                        @pkt_store.Return pkt
-                      end
-
-                      case next_act
-                      when NextSocketAction::CONTINUE, NextSocketAction::SUSPEND
-                        if @cmd_upacker.finished()
-                          change_state(STATE_END)
-                        else
-                          change_state(STATE_READ_CONTENT)
-                        end
-                      when NextSocketAction::CLOSE
-                        # Maybe error
-                        reset_state()
-                        return next_act
-                      else
-                        raise RuntimeError.new("Invalid next action: #{next_act}")
-                      end
-
-                      suspend = (next_act == NextSocketAction::SUSPEND)
-                      break
+
+                # Find end of headers (empty line)
+                # Look for \n\n (LF+LF) or \n\r\n (LF+CR+LF)
+                header_end_pos = buf.index("\n\r\n", pos) || buf.index("\n\n", pos)
+
+                if header_end_pos
+                  # Calculate total header length
+                  header_len = (buf[header_end_pos + 1] == "\r") ? header_end_pos + 3 : header_end_pos + 2
+
+                  # Batch copy all header bytes at once
+                  @tmp_buf.put(buf, pos, header_len - pos)
+                  pos = header_len
+
+                  # Move to packet processing
+                  pkt = @pkt_store.rent(H1Type::HEADER)
+                  pkt.new_data_accessor.put_bytes(@tmp_buf.bytes, 0, @tmp_buf.length)
+
+                  begin
+                    next_act = @cmd_upacker.packet_received(pkt)
+                  ensure
+                    @pkt_store.Return pkt
+                  end
+
+                  case next_act
+                  when NextSocketAction::CONTINUE, NextSocketAction::SUSPEND
+                    if @cmd_upacker.finished()
+                      change_state(STATE_END)
+                    else
+                      change_state(STATE_READ_CONTENT)
                     end
-                    line_len = 0
+                  when NextSocketAction::CLOSE
+                    # Maybe error
+                    reset_state()
+                    return next_act
                   else
-                    line_len += 1
-                  end
-                  if line_len >= MAX_LINE_LEN
-                    raise ProtocolException.new("Http/1 Line is too long")
+                    raise RuntimeError.new("Invalid next action: #{next_act}")
                   end
+
+                  suspend = (next_act == NextSocketAction::SUSPEND)
                 end
               end
 

data/lib/baykit/bayserver/docker/http/h2/h2_inbound_handler.rb

@@ -158,8 +158,8 @@ module Baykit
               @protocol_handler.post(cmd, &callback)
             end
 
-            def send_end_tour(tur, keep_alive, &callback)
-              BayLog.debug("%s send_end_tour. tur=%s keep=%s", self, tur, keep_alive)
+            def send_end_tour(tur, &callback)
+              BayLog.debug("%s send_end_tour. tur=%s", self, tur)
               cmd = CmdData.new(tur.req.key, nil, [], 0, 0)
               cmd.flags.set_end_stream(true)
               @protocol_handler.post(cmd, &callback)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-docker-http
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Michisuke-P
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-01 00:00:00.000000000 Z
+date: 2026-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bayserver-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.3.2
 description: BayServer is one of the high-speed web servers. It operates as a single-threaded,
   asynchronous server, which makes it exceptionally fast. It also supports multi-core
   processors, harnessing the full potential of the CPU's capabilities.