pitchfork 0.18.1 → 0.18.2

data/ext/pitchfork_http/pitchfork_http.rl

@@ -340,18 +340,19 @@ static void write_value(VALUE self, struct http_parser *hp,
   }
   action host { rb_hash_aset(hp->env, g_http_host, STR_NEW(mark, fpc)); }
   action request_uri {
+    VALUE str;
+
     VALIDATE_MAX_URI_LENGTH(LEN(mark, fpc), REQUEST_URI);
-    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, fpc));
-  }
-  action fragment {
-    VALIDATE_MAX_URI_LENGTH(LEN(mark, fpc), FRAGMENT);
-    VALUE str = rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, fpc));
+    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, fpc));
+
     if (STR_CSTR_EQ(str, "*")) {
-      VALUE str = rb_str_new("*", 1);
       rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
     }
   }
+  action fragment {
+    VALIDATE_MAX_URI_LENGTH(LEN(mark, fpc), FRAGMENT);
+    rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, fpc));
+  }
   action start_query {MARK(start.query, fpc); }
   action query_string {
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, fpc), QUERY_STRING);
@@ -364,9 +365,7 @@ static void write_value(VALUE self, struct http_parser *hp,
     VALIDATE_MAX_URI_LENGTH(LEN(mark, fpc), REQUEST_PATH);
     val = rb_hash_aset(hp->env, g_request_path, STR_NEW(mark, fpc));
 
-    /* rack says PATH_INFO must start with "/" or be empty */
-    if (!STR_CSTR_EQ(val, "*"))
-      rb_hash_aset(hp->env, g_path_info, val);
+    rb_hash_aset(hp->env, g_path_info, val);
   }
   action add_to_chunk_size {
     hp->len.chunk = step_incr(hp->len.chunk, fc, 16);

data/lib/pitchfork/http_parser.rb

@@ -92,6 +92,10 @@ module Pitchfork
       e['pitchfork.socket'] = socket
       e['rack.hijack'] = self
 
+      if PATH_INFO_REQUIRES_LEADING_SLASH && e['PATH_INFO'] == '*'
+        e.delete('PATH_INFO')
+      end
+
       e.merge!(DEFAULTS)
     end
 

data/lib/pitchfork/http_server.rb

@@ -803,7 +803,7 @@ module Pitchfork
     # assuming we haven't closed the socket, but don't get hung up
     # if the socket is already closed or broken.  We'll always ensure
     # the socket is closed at the end of this function
-    def handle_error(client, e)
+    def handle_error(client, e, response_written)
       code = case e
       when EOFError,Errno::ECONNRESET,Errno::EPIPE,Errno::ENOTCONN
         # client disconnected on us and there's nothing we can do
@@ -817,7 +817,7 @@ module Pitchfork
         Pitchfork.log_error(@logger, "app error", e)
         500
       end
-      if code
+      if code && !response_written
         client.write_nonblock(err_response(code, @request.response_start_sent), exception: false)
       end
       client.close
@@ -842,6 +842,7 @@ module Pitchfork
     # once a client is accepted, it is processed in its entirety here
     # in 3 easy steps: read request, call app, write app response
     def process_client(client, worker, timeout_handler)
+      response_written = false
       env = nil
       @request = Pitchfork::HttpParser.new
       env = @request.read(client)
@@ -876,6 +877,7 @@ module Pitchfork
         end
         @request.headers? or headers = nil
         http_response_write(client, status, headers, body, @request)
+        response_written = true
       ensure
         body.respond_to?(:close) and body.close
       end
@@ -889,7 +891,7 @@ module Pitchfork
       end
       env
     rescue => application_error
-      handle_error(client, application_error)
+      handle_error(client, application_error, response_written)
       env
     ensure
       if env
@@ -1012,9 +1014,10 @@ module Pitchfork
             when Message
               worker.update(client)
             else
-              request_env = process_client(client, worker, prepare_timeout(worker))
-              worker.increment_requests_count
-              @after_request_complete&.call(self, worker, request_env)
+              if (request_env = process_client(client, worker, prepare_timeout(worker)))
+                worker.increment_requests_count
+                @after_request_complete&.call(self, worker, request_env)
+              end
             end
 
             worker.update_deadline(@timeout)

data/lib/pitchfork/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pitchfork
-  VERSION = "0.18.1"
+  VERSION = "0.18.2"
   module Const
     UNICORN_VERSION = '6.1.0'
   end

data/lib/pitchfork.rb

@@ -3,12 +3,7 @@
 require 'etc'
 require 'stringio'
 require 'io/wait'
-
-begin
-  require 'rack'
-rescue LoadError
-  warn 'rack not available, functionality reduced'
-end
+require 'rack'
 
 # :stopdoc:
 # Pitchfork module containing all of the classes (include C extensions) for
@@ -21,6 +16,7 @@ end
 # applications, so applications should be written against the Rack SPEC
 # and not pitchfork internals.
 module Pitchfork
+  PATH_INFO_REQUIRES_LEADING_SLASH = Gem::Version.new(Rack.release) < Gem::Version.new('3.2.0')
 
   # Raised inside TeeInput when a client closes the socket inside the
   # application dispatch.  This is always raised with an empty backtrace

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pitchfork
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Jean Boussier
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -53,6 +52,7 @@ files:
 - ".git-blame-ignore-revs"
 - ".gitattributes"
 - ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".ruby-version"
 - CHANGELOG.md
@@ -126,7 +126,6 @@ licenses:
 - GPL-2.0+
 - Ruby
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rack HTTP server for fast clients and Unix
 test_files: []