puma 1.2.0-java → 1.2.1-java

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.2.1 / 2012-04-11
+
+ 1 bug fix:
+
+   * Fix rack.url_scheme for SSL servers. Fixes #65
+
 === 1.2.0 / 2012-04-11
 
  1 major feature:

data/lib/puma/const.rb

@@ -75,7 +75,7 @@ module Puma
 
     PATH_INFO = 'PATH_INFO'.freeze
 
-    PUMA_VERSION = VERSION = "1.2.0".freeze
+    PUMA_VERSION = VERSION = "1.2.1".freeze
 
     PUMA_TMP_BASE = "puma".freeze
 

data/lib/puma/server.rb

@@ -134,11 +134,12 @@ module Puma
       s.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
       s.listen backlog
 
+      ssl = OpenSSL::SSL::SSLServer.new(s, ctx)
       env = @proto_env.dup
       env[HTTPS_KEY] = HTTPS
-      @envs[s] = env
+      @envs[ssl] = env
 
-      @ios << OpenSSL::SSL::SSLServer.new(s, ctx)
+      @ios << ssl
       s
     end
 

data/puma.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "examples/CA/cacert.pem", "examples/CA/newcerts/cert_1.pem", "examples/CA/newcerts/cert_2.pem", "examples/CA/private/cakeypair.pem", "examples/CA/serial", "examples/config.rb", "examples/puma/cert_puma.pem", "examples/puma/csr_puma.pem", "examples/puma/puma_keypair.pem", "examples/qc_config.rb", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/app/status.rb", "lib/puma/cli.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/events.rb", "lib/puma/jruby_restart.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "test/ab_rs.rb", "test/config/app.rb", "test/hello.ru", "test/lobster.ru", "test/mime.yaml", "test/slow.ru", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb"]
+  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "examples/CA/cacert.pem", "examples/CA/newcerts/cert_1.pem", "examples/CA/newcerts/cert_2.pem", "examples/CA/private/cakeypair.pem", "examples/CA/serial", "examples/config.rb", "examples/puma/cert_puma.pem", "examples/puma/csr_puma.pem", "examples/puma/puma_keypair.pem", "examples/qc_config.rb", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/app/status.rb", "lib/puma/cli.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/events.rb", "lib/puma/jruby_restart.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "test/ab_rs.rb", "test/config/app.rb", "test/hello.ru", "test/lobster.ru", "test/mime.yaml", "test/slow.ru", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb", "test/test_puma_server.rb"]
   s.homepage = "http://puma.io"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "puma"
   s.rubygems_version = "1.8.21"
   s.summary = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications"
-  s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
+  s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_puma_server.rb

@@ -0,0 +1,56 @@
+require "rbconfig"
+require 'test/unit'
+require 'socket'
+require 'openssl'
+
+require 'puma/server'
+
+require 'net/https'
+
+class TestPumaServer < Test::Unit::TestCase
+
+  def setup
+    @port = 3212
+    @host = "127.0.0.1"
+
+    @app = lambda { |env| [200, {}, [env['rack.url_scheme']]] }
+
+    @events = Puma::Events.new STDOUT, STDERR
+    @server = Puma::Server.new @app, @events
+
+    @ssl_key =  File.expand_path "../../examples/puma/puma_keypair.pem", __FILE__
+    @ssl_cert = File.expand_path "../../examples/puma/cert_puma.pem", __FILE__
+  end
+
+  def teardown
+    @server.stop
+  end
+
+  def test_url_scheme_for_https
+    ctx = OpenSSL::SSL::SSLContext.new
+
+    ctx.key = OpenSSL::PKey::RSA.new File.read(@ssl_key)
+
+    ctx.cert = OpenSSL::X509::Certificate.new File.read(@ssl_cert)
+
+    ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+    @server.add_ssl_listener @host, @port, ctx
+    @server.run
+
+    http = Net::HTTP.new @host, @port
+    http.use_ssl = true
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+    body = nil
+    http.start do
+      req = Net::HTTP::Get.new "/", {}
+
+      http.request(req) do |rep|
+        body = rep.body
+      end
+    end
+
+    assert_equal "https", body
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: puma
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.2.1
 platform: java
 authors: 
   - Evan Phoenix
@@ -141,6 +141,7 @@ files:
   - test/test_ws.rb
   - test/testhelp.rb
   - tools/trickletest.rb
+  - test/test_puma_server.rb
   - lib/puma/puma_http11.jar
 homepage: http://puma.io
 licenses: []
@@ -178,6 +179,7 @@ test_files:
   - test/test_http11.rb
   - test/test_integration.rb
   - test/test_persistent.rb
+  - test/test_puma_server.rb
   - test/test_rack_handler.rb
   - test/test_rack_server.rb
   - test/test_thread_pool.rb