Support rack v3.

ioquatix · ioquatix · commit f4e6a3dcbb56 · 2025-01-29T22:51:00.000+13:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,13 +35,15 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
+          - 3.4
 
-        gemfile: ["Gemfile"]
+        gemfile:
+          - gems/rack-v2.rb
 
         include:
           - experimental: false
             os: macos
-            ruby: 3.3
+            ruby: 3.4
             gemfile: gems/rack-v2.rb
           - experimental: true
             os: ubuntu
@@ -53,13 +55,16 @@ jobs:
             gemfile: gems/rack-v1.rb
           - experimental: true
             os: ubuntu
-            ruby: 3.2
+            ruby: 3.4
             gemfile: gems/rack-v2.rb
-          # enable when rack v3 is supported
-          # - experimental: true
-          #  os: ubuntu
-          #  ruby: 3.2
-          #  env: BUNDLE_GEMFILE=gems/rack-head.rb
+          - experimental: true
+            os: ubuntu
+            ruby: 3.4
+            gemfile: gems/rack-v3.rb
+          - experimental: true
+            os: ubuntu
+            ruby: 3.4
+            gemfile: gems/rack-head.rb
 
     steps:
     - uses: actions/checkout@v3
diff --git a/benchmark/benchmarker.rb b/benchmark/benchmarker.rb
@@ -37,7 +37,7 @@ def start_server(handler_name)
         end
 
         app = proc do |env|
-          [200, {'Content-Type' => 'text/html', 'Content-Length' => '11'}, ['hello world']]
+          [200, {'content-type' => 'text/html', 'content-length' => '11'}, ['hello world']]
         end
 
         handler = Rack::Handler.const_get(handler_name)
diff --git a/example/adapter.rb b/example/adapter.rb
@@ -8,7 +8,7 @@ def call(env)
     body = ["hello!"]
     [
       200,
-      { 'Content-Type' => 'text/plain' },
+      { 'content-type' => 'text/plain' },
       body
     ]
   end
@@ -20,7 +20,7 @@ def call(env)
     run SimpleAdapter.new
   end
   map '/files' do
-    run Rack::File.new('.')
+    run Rack::Files.new('.')
   end
 end
 
diff --git a/example/async_app.ru b/example/async_app.ru
@@ -87,7 +87,7 @@ class AsyncApp
     body = DeferrableBody.new
     
     # Get the headers out there asap, let the client know we're alive...
-    EventMachine::next_tick { env['async.callback'].call [200, {'Content-Type' => 'text/plain'}, body] }
+    EventMachine::next_tick { env['async.callback'].call [200, {'content-type' => 'text/plain'}, body] }
     
     # Semi-emulate a long db request, instead of a timer, in reality we'd be 
     # waiting for the response data. Whilst this happens, other connections 
diff --git a/example/async_chat.ru b/example/async_chat.ru
@@ -118,7 +118,7 @@ class Chat
         send_message = function(message_box) {
           xhr = XHR();
           xhr.open("POST", "/", true); 
-      		xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+      		xhr.setRequestHeader("content-type", "application/x-www-form-urlencoded");
       		xhr.setRequestHeader("X_REQUESTED_WITH", "XMLHttpRequest");
       		xhr.send("message="+escape(message_box.value));
           scroll();
@@ -161,7 +161,7 @@ class Chat
     body.callback { delete_user user_id }
     
     EventMachine::next_tick do
-      renderer.call [200, {'Content-Type' => 'text/html'}, body]
+      renderer.call [200, {'content-type' => 'text/html'}, body]
     end
   end
   
diff --git a/example/async_tailer.ru b/example/async_tailer.ru
@@ -70,7 +70,7 @@ class AsyncTailer
     
     EventMachine::next_tick do
       
-      env['async.callback'].call [200, {'Content-Type' => 'text/html'}, body]
+      env['async.callback'].call [200, {'content-type' => 'text/html'}, body]
       
       body.call ["<h1>Async Tailer</h1><pre>"]
       
diff --git a/example/config.ru b/example/config.ru
@@ -14,7 +14,7 @@ app = proc do |env|
   
   [
     200,                                        # Status code
-    { 'Content-Type' => 'text/html' },          # Reponse headers
+    { 'content-type' => 'text/html' },          # Reponse headers
     body                                        # Body of the response
   ]
 end
diff --git a/ext/thin_parser/thin.c b/ext/thin_parser/thin.c
@@ -155,6 +155,7 @@ static void http_version(void *data, const char *at, size_t length)
   VALUE req = (VALUE)data;
   VALUE val = rb_str_new(at, length);
   rb_hash_aset(req, global_http_version, val);
+  rb_hash_aset(req, global_server_protocol, val);
 }
 
 /** Finalizes the request header to have a bunch of stuff that's
@@ -211,7 +212,6 @@ static void header_done(void *data, const char *at, size_t length)
   }
   
   /* set some constants */
-  rb_hash_aset(req, global_server_protocol, global_server_protocol_value);
   rb_hash_aset(req, global_url_scheme, global_url_scheme_value);
   rb_hash_aset(req, global_script_name, global_empty);
 }
diff --git a/gems/rack-v2.rb b/gems/rack-v2.rb
@@ -4,7 +4,7 @@
 
 gemspec path: "../"
 
-gem 'rack', '~> 2.0'
+gem 'rack', "~> 2.0"
 
 group :development do
   gem "rake-compiler"
diff --git a/gems/rack-v3.rb b/gems/rack-v3.rb
@@ -4,7 +4,7 @@
 
 gemspec path: "../"
 
-gem 'rack', '~> 1.0'
+gem 'rack', "~> 3.0"
 
 group :development do
   gem "rake-compiler"
@@ -14,4 +14,3 @@
   gem "rake", ">= 12.3.3"
   gem "rspec", "~> 3.5"
 end
-
diff --git a/lib/rack/adapter/loader.rb b/lib/rack/adapter/loader.rb
@@ -64,7 +64,7 @@ def self.for(name, options={})
         return Merb::Rack::Application.new
         
       when :file
-        return Rack::File.new(options[:chdir])
+        return Rack::Files.new(options[:chdir])
         
       else
         raise AdapterNotFound, "Adapter not found: #{name}"
diff --git a/lib/rack/adapter/rails.rb b/lib/rack/adapter/rails.rb
@@ -23,7 +23,7 @@ def initialize(options = {})
         load_application
 
         @rails_app = self.class.rack_based? ? ActionController::Dispatcher.new : CgiApp.new
-        @file_app  = Rack::File.new(::File.join(RAILS_ROOT, "public"))
+        @file_app  = Rack::Files.new(::File.join(RAILS_ROOT, "public"))
       end
 
       def load_application
diff --git a/lib/thin/response.rb b/lib/thin/response.rb
@@ -1,18 +1,18 @@
 module Thin
   # A response sent to the client.
   class Response
-    CONNECTION     = 'Connection'.freeze
+    CONNECTION     = 'connection'.freeze
     CLOSE          = 'close'.freeze
     KEEP_ALIVE     = 'keep-alive'.freeze
-    SERVER         = 'Server'.freeze
-    CONTENT_LENGTH = 'Content-Length'.freeze
+    SERVER         = 'server'.freeze
+    CONTENT_LENGTH = 'content-length'.freeze
 
     PERSISTENT_STATUSES  = [100, 101].freeze
 
     #Error Responses
-    ERROR            = [500, {'Content-Type' => 'text/plain'}, ['Internal server error']].freeze
-    PERSISTENT_ERROR = [500, {'Content-Type' => 'text/plain', 'Connection' => 'keep-alive', 'Content-Length' => "21"}, ['Internal server error']].freeze
-    BAD_REQUEST      = [400, {'Content-Type' => 'text/plain'}, ['Bad Request']].freeze
+    ERROR            = [500, {'content-type' => 'text/plain'}, ['Internal server error']].freeze
+    PERSISTENT_ERROR = [500, {'content-type' => 'text/plain', 'connection' => 'keep-alive', 'content-length' => "21"}, ['Internal server error']].freeze
+    BAD_REQUEST      = [400, {'content-type' => 'text/plain'}, ['Bad Request']].freeze
 
     # Status code
     attr_accessor :status
@@ -104,7 +104,7 @@ def persistent!
     end
 
     # Persistent connection must be requested as keep-alive
-    # from the server and have a Content-Length, or the response
+    # from the server and have a content-length, or the response
     # status must require that the connection remain open.
     def persistent?
       (@persistent && @headers.has_key?(CONTENT_LENGTH)) || PERSISTENT_STATUSES.include?(@status)
diff --git a/lib/thin/stats.rb b/lib/thin/stats.rb
@@ -43,7 +43,7 @@ def serve(env)
         
         [
           200,
-          { 'Content-Type' => 'text/html' },
+          { 'content-type' => 'text/html' },
           [body]
         ]
       end
diff --git a/script/profile b/script/profile
@@ -9,7 +9,7 @@ require 'thin'
 
 class Adapter
   def call(env)
-    [200, {'Content-Type' => 'text/html', 'Content-Length' => '11'}, ['hello world']]
+    [200, {'content-type' => 'text/html', 'content-length' => '11'}, ['hello world']]
   end
 end
 
diff --git a/site/rdoc.rb b/site/rdoc.rb
@@ -169,7 +169,7 @@ module Page
   %realtitle%
 ENDIF:title
   </title>
-  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+  <meta http-equiv="content-type" content="text/html; charset=%charset%" />
   <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
   <script language="JavaScript" type="text/javascript">
     // <![CDATA[
@@ -371,7 +371,7 @@ module Page
 FILE_INDEX = %{
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<meta http-equiv="content-type" content="text/html; charset=%charset%">
 <style>
 <!--
   body {
diff --git a/site/thin.rb b/site/thin.rb
@@ -127,8 +127,8 @@ def usage_page
         [
           200,          # Status code
           {             # Response headers
-            'Content-Type' => 'text/html',
-            'Content-Length' => '2',
+            'content-type' => 'text/html',
+            'content-length' => '2',
           },
           ['hi']        # Response body
         ]
diff --git a/spec/daemonizing_spec.rb b/spec/daemonizing_spec.rb
@@ -94,6 +94,7 @@ def name
       subject.kill(1)
     end
 
+    sleep(1)
     expect(File.exist?(subject.pid_file)).to be_falsey
   end
   
diff --git a/spec/perf/server_perf_spec.rb b/spec/perf/server_perf_spec.rb
@@ -4,7 +4,7 @@
   before do
     start_server do |env|
       body = env.inspect + env['rack.input'].read
-      [200, { 'Content-Length' => body.size.to_s }, body]
+      [200, { 'content-length' => body.size.to_s }, body]
     end
   end
   
@@ -25,7 +25,7 @@
   before do
     start_server('/tmp/thin_test.sock') do |env|
       body = env.inspect + env['rack.input'].read
-      [200, { 'Content-Length' => body.size.to_s }, body]
+      [200, { 'content-length' => body.size.to_s }, body]
     end
   end
   
diff --git a/spec/rack/loader_spec.rb b/spec/rack/loader_spec.rb
@@ -32,7 +32,7 @@
   end
   
   it "should load File adapter" do
-    expect(Rack::File).to receive(:new)
+    expect(Rack::Files).to receive(:new)
     Rack::Adapter.for(:file)
   end
   
diff --git a/spec/response_spec.rb b/spec/response_spec.rb
@@ -3,22 +3,22 @@
 describe Response do
   before do
     @response = Response.new
-    @response.headers['Content-Type'] = 'text/html'
-    @response.headers['Content-Length'] = '0'
+    @response.headers['content-type'] = 'text/html'
+    @response.headers['content-length'] = '0'
     @response.body = ''
   end
   
   it 'should output headers' do
-    expect(@response.headers_output).to include("Content-Type: text/html", "Content-Length: 0", "Connection: close")
+    expect(@response.headers_output).to include("content-type: text/html", "content-length: 0", "connection: close")
   end
   
   it 'should include server name header' do
-    expect(@response.headers_output).to include("Server: thin")
+    expect(@response.headers_output).to include("server: thin")
   end
   
   it 'should output head' do
-    expect(@response.head).to include("HTTP/1.1 200 OK", "Content-Type: text/html", "Content-Length: 0",
-                                  "Connection: close", "\r\n\r\n")
+    expect(@response.head).to include("HTTP/1.1 200 OK", "content-type: text/html", "content-length: 0",
+                                      "connection: close", "\r\n\r\n")
   end
   
   it 'should allow duplicates in headers' do
@@ -71,18 +71,18 @@
     expect(@response).not_to be_persistent
   end
   
-  it "should not be persistent when no Content-Length" do
+  it "should not be persistent when no content-length" do
     @response = Response.new
-    @response.headers = {'Content-Type' => 'text/html'}
+    @response.headers = {'content-type' => 'text/html'}
     @response.body = ''
     
     @response.persistent!
     expect(@response).not_to be_persistent
   end
 
-  it "should ignore Content-Length case" do
+  it "should ignore content-length case" do
     @response = Response.new
-    @response.headers = {'Content-Type' => 'text/html', 'content-length' => '0'}
+    @response.headers = {'content-type' => 'text/html', 'content-length' => '0'}
     @response.body = ''
 
     @response.persistent!
diff --git a/spec/server/robustness_spec.rb b/spec/server/robustness_spec.rb
@@ -4,7 +4,7 @@
   before do
     start_server do |env|
       body = 'hello!'
-      [200, { 'Content-Type' => 'text/html' }, body]
+      [200, { 'content-type' => 'text/html' }, body]
     end
   end
   
diff --git a/spec/server/stopping_spec.rb b/spec/server/stopping_spec.rb
@@ -5,7 +5,7 @@
 describe Server, "stopping" do
   before do
     start_server do |env|
-      [200, { 'Content-Type' => 'text/html' }, ['ok']]
+      [200, { 'content-type' => 'text/html' }, ['ok']]
     end
     @done = false
   end
diff --git a/spec/server/swiftiply_spec.rb b/spec/server/swiftiply_spec.rb
@@ -12,7 +12,7 @@
       sleep 2 # HACK ooh boy, I wish I knew how to make those specs more stable...
       start_server('0.0.0.0', 5555, :backend => Backends::SwiftiplyClient, :wait_for_socket => false) do |env|
         body = env.inspect + env['rack.input'].read
-        [200, { 'Content-Type' => 'text/html' }, body]
+        [200, { 'content-type' => 'text/html' }, body]
       end
     end
     
diff --git a/spec/server/tcp_spec.rb b/spec/server/tcp_spec.rb
@@ -4,7 +4,7 @@
   before do
     start_server do |env|
       body = env.inspect + env['rack.input'].read
-      [200, { 'Content-Type' => 'text/html' }, body]
+      [200, { 'content-type' => 'text/html' }, body]
     end
   end
   
@@ -15,8 +15,8 @@
   it 'should GET from TCPSocket' do
     status, headers, body = parse_response(send_data("GET /?this HTTP/1.0\r\nConnection: close\r\n\r\n"))
     expect(status).to eq(200)
-    expect(headers['Content-Type']).to eq('text/html')
-    expect(headers['Connection']).to eq('close')
+    expect(headers['content-type']).to eq('text/html')
+    expect(headers['connection']).to eq('close')
     expect(body).to include('this')
   end
   
diff --git a/spec/server/threaded_spec.rb b/spec/server/threaded_spec.rb
@@ -6,7 +6,7 @@
     start_server DEFAULT_TEST_ADDRESS, DEFAULT_TEST_PORT, :threaded => true do |env|
       sleep env['PATH_INFO'].delete('/').to_i
       @requests += 1
-      [200, { 'Content-Type' => 'text/html' }, 'hi']
+      [200, { 'content-type' => 'text/html' }, 'hi']
     end
   end
   
diff --git a/spec/server/unix_socket_spec.rb b/spec/server/unix_socket_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
diff --git a/thin.gemspec b/thin.gemspec

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ app = proc do \|env\|`
`14`	`14`
`15`	`15`	`[`
`16`	`16`	`200, # Status code`
`17`		`- { 'Content-Type' => 'text/html' }, # Reponse headers`
	`17`	`+ { 'content-type' => 'text/html' }, # Reponse headers`
`18`	`18`	`body # Body of the response`
`19`	`19`	`]`
`20`	`20`	`end`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ static void http_version(void data, const char at, size_t length)`
`155`	`155`	`VALUE req = (VALUE)data;`
`156`	`156`	`VALUE val = rb_str_new(at, length);`
`157`	`157`	`rb_hash_aset(req, global_http_version, val);`
	`158`	`+ rb_hash_aset(req, global_server_protocol, val);`
`158`	`159`	`}`
`159`	`160`
`160`	`161`	`/** Finalizes the request header to have a bunch of stuff that's`
`@@ -211,7 +212,6 @@ static void header_done(void data, const char at, size_t length)`
`211`	`212`	`}`
`212`	`213`
`213`	`214`	`/* set some constants */`
`214`		`- rb_hash_aset(req, global_server_protocol, global_server_protocol_value);`
`215`	`215`	`rb_hash_aset(req, global_url_scheme, global_url_scheme_value);`
`216`	`216`	`rb_hash_aset(req, global_script_name, global_empty);`
`217`	`217`	`}`