tp2 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73f9fa79516460ea4b1c6226f2969fe0af0b394df2beec87263d94c75d9879f0
-  data.tar.gz: bbb636a70ec52928b55841ba8476ae59bdf585c4e15ae5d469b2e936787933ce
+  metadata.gz: 69d5ffc704823ef9650889a3b0ce785aa9aae379905940672ad89ecb6dca0d2b
+  data.tar.gz: 8375c0c32f27279c104351821c2dc07ec5dd7ae5b735b64ce3d5dfa774a95c64
 SHA512:
-  metadata.gz: 06f10bbc8c78af9a5cb0ff9dae4058a865144499f825b4d0a5496dab772ee9987750f0afed2eed392104007739498ae8e00a81bd27719910531cb03a6e283acc
-  data.tar.gz: e9dfa954dc71eaea7a6953c9896eaf40ed0ebd1c69883f482fc007a29c650382297b359308bdf27b0ea881c117828bda13b3fc457ebb306e0e16489f7f52ab30
+  metadata.gz: c6c9ac7ee73752d17d56dcdbb9d87bb74a0712f93328f7b8d57352de069595b45e9cf94d67f178828e39ee2a792e19f760550e9c2d08f7e11f3eaeb929e56e16
+  data.tar.gz: e0665223dba5271296c2fa8ab4aa624a280a97a86af609e9fd3ff5b9a3f215b65012f7d077f1fca3a5dc8dd698fbe96a8294c87d76bd2383a552aadb064c4bc5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.11.2 2025-06-15
+
+- Improve URI calculation for logging
+
 # Version 0.11.1 2025-06-15
 
 - Add more info to log

data/lib/tp2/http1_adapter.rb

@@ -208,17 +208,28 @@ module TP2
       return if !@opts[:log]
       
       request_headers = request.headers
+      uri = full_uri(request_headers)
+
       str = format(
         "%<client_ip>s %<method>s %<uri>s %<status>s %<tx>d",
         client_ip:  request.forwarded_for || '?',
         method:     request_headers[':method'].upcase,
-        uri:        request.full_uri,
+        uri:        uri,
         status:     @status,
         tx:         request_headers[':tx']
       )
       @opts[:log].log(str)
     end
 
+    def full_uri(headers)
+      format(
+        "%s://%s%s",
+        headers['x_forwarded_proto'] || 'http',
+        headers['host'],
+        headers[':path']
+      )
+    end
+
     RE_REQUEST_LINE = /^([a-z]+)\s+([^\s]+)\s+(http\/[0-9\.]{1,3})/i.freeze
     RE_HEADER_LINE = /^([a-z0-9\-]+)\:\s+(.+)/i.freeze
     MAX_REQUEST_LINE_LEN = 1 << 14 # 16KB
@@ -252,7 +263,6 @@ module TP2
         headers[m[1].downcase] = m[2]
       end
 
-      headers[':scheme'] = headers['x_forwarded_proto'] || 'http'
       headers
     end
 

data/lib/tp2/version.rb

@@ -1,3 +1,3 @@
 module TP2
-  VERSION = '0.11.1'
+  VERSION = '0.11.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tp2
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Sharon Rosner