puma 1.0.0-java → 1.1.0-java

data/Manifest.txt

@@ -8,16 +8,7 @@ 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
@@ -32,7 +23,6 @@ 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

data/README.md

@@ -77,6 +77,14 @@ Want to use UNIX Sockets instead of TCP (which can provide a 5-10% performance b
 
     $ puma -b unix:///var/run/puma.sock
 
+If you need to change the permissions of the UNIX socket, just add a umask parameter:
+
+    $ puma -b 'unix:///var/run/puma.sock?umask=0777'
+
+Need a bit of security? Use SSL sockets!
+
+    $ puma -b 'ssl://127.0.0.1:9292?key=path_to_key&cert=path_to_cert'
+
 ## License
 
 Puma is copyright 2011 Evan Phoenix and contributors. It is licensed under the BSD license. See the include LICENSE file for details.

data/lib/puma/cli.rb

@@ -33,8 +33,6 @@ module Puma
       @restart = false
       @temp_status_path = nil
 
-      @listen_config = []
-
       setup_options
 
       generate_restart_data
@@ -66,7 +64,6 @@ module Puma
 
       if defined? Rubinius::OS_ARGV
         @restart_argv = Rubinius::OS_ARGV
-        @restart_arg0 = [@restart_argv.first]
       else
         require 'rubygems'
 
@@ -75,12 +72,10 @@ module Puma
         # picked up in PATH.
         #
         if File.exists?($0)
-          @restart_arg0 = [Gem.ruby, $0]
+          @restart_argv = [Gem.ruby, $0] + ARGV
         else
-          @restart_arg0 = [Gem.ruby, "-S", $0]
+          @restart_argv = [Gem.ruby, "-S", $0] + ARGV
         end
-
-        @restart_argv = @restart_arg0 + ARGV
       end
     end
 
@@ -94,36 +89,6 @@ module Puma
       end
     end
 
-    def hot_restart!
-      if IS_JRUBY
-        require 'puma/jruby_restart'
-        JRubyRestart.chdir_exec(@restart_dir, Gem.ruby, *@restart_argv)
-      else
-
-        path = File.join (ENV['TMPDIR'] || "/tmp"), "puma-hotrestart.#{$$}"
-
-        fork do
-          data = Marshal.dump(@listen_config)
-
-          serv = UNIXServer.new path
-          client = serv.accept
-
-          client << "#{data.bytesize}\n#{data}"
-
-          @ios.each do |x|
-            client.send_io x
-          end
-
-          client.read(1)
-          exit 0
-        end
-
-        Dir.chdir @restart_dir
-        argv = @restart_arg0 + ["--hot-restart", path]
-        Kernel.exec(*argv)
-      end
-    end
-
     # Write +str+ to +@stdout+
     #
     def log(str)
@@ -198,33 +163,6 @@ module Puma
           end
         end
 
-        o.on "--hot-restart PATH", "Used internally for performing a hot restart" do |arg|
-
-          sock = UNIXSocket.new arg
-          size = sock.gets.strip.to_i
-          data = sock.read size
-
-          @listen_config = Marshal.load data
-          ios = []
-          
-          @listen_config.each do |c|
-            case c['type']
-            when "tcp"
-              ios << sock.recv_io(TCPServer)
-            when "unix"
-              ios << sock.recv_io(UNIXServer)
-            when "ssl"
-              ctx = OpenSSL::SSL::SSLContext.new
-              ctx.key = OpenSSL::PKey::RSA.new c['key']
-              ctx.cert = OpenSSL::X509::Certificate.new c['cert']
-
-              ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-              tcp = sock.recv_io(TCPServer)
-              ios << OpenSSL::SSL::SSLServer.new(tcp, ctx)
-            end
-          end
-        end
       end
 
       @parser.banner = "puma <options> <rackup file>"
@@ -301,23 +239,21 @@ module Puma
         when "tcp"
           log "* Listening on #{str}"
           server.add_tcp_listener uri.host, uri.port
-
-          conf = { "type" => "tcp",
-                   "host" => uri.host,
-                   "port" => uri.port }
-
-          @listen_config << conf
-
         when "unix"
           log "* Listening on #{str}"
           path = "#{uri.host}#{uri.path}"
 
-          server.add_unix_listener path
+          umask = nil
 
-          conf = { "type" => "unix",
-                   "path" => path }
+          if uri.query
+            params = Rack::Utils.parse_query uri.query
+            if u = params['umask']
+              # Use Integer() to respect the 0 prefix as octal
+              umask = Integer(u)
+            end
+          end
 
-          @listen_config << conf
+          server.add_unix_listener path, umask
         when "ssl"
           log "* Listening on #{str}"
           params = Rack::Utils.parse_query uri.query
@@ -339,15 +275,6 @@ module Puma
           ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
           server.add_ssl_listener uri.host, uri.port, ctx
-
-          conf = { "type" => "ssl",
-                   "host" => uri.host,
-                   "port" => uri.port,
-                   "ssl_key" => params['key'],
-                   "ssl_cert" => params['cert'] }
-
-          @listen_config << conf
-
         else
           error "Invalid URI: #{str}"
         end
@@ -387,16 +314,10 @@ module Puma
         @status = status
       end
 
-      hot_restart = false
-
-      Signal.trap "SIGUSR1" do
-        hot_restart = true
-      end
-
       log "Use Ctrl-C to stop"
 
       begin
-        server.run.join(1) until hot_restart
+        server.run.join
       rescue Interrupt
         log " - Gracefully stopping, waiting for requests to finish"
         server.stop(true)
@@ -405,10 +326,7 @@ module Puma
 
       File.unlink @temp_status_path if @temp_status_path
 
-      if hot_restart
-        log "* Starting hot restart..."
-        hot_restart!
-      elsif @restart
+      if @restart
         log "* Restarting..."
         restart!
       end

data/lib/puma/const.rb

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

data/lib/puma/server.rb

@@ -54,6 +54,8 @@ module Puma
       @persistent_timeout = PERSISTENT_TIMEOUT
       @persistent_check, @persistent_wakeup = IO.pipe
 
+      @unix_paths = []
+
       @proto_env = {
         "rack.version".freeze => Rack::VERSION,
         "rack.errors".freeze => events.stderr,
@@ -121,8 +123,18 @@ module Puma
 
     # Tell the server to listen on +path+ as a UNIX domain socket.
     #
-    def add_unix_listener(path)
-      @ios << UNIXServer.new(path)
+    def add_unix_listener(path, umask=nil)
+      @unix_paths << path
+
+      # Let anyone connect by default
+      umask ||= 0
+
+      begin
+        old_mask = File.umask(umask)
+        @ios << UNIXServer.new(path)
+      ensure
+        File.umask old_mask
+      end
     end
 
     def backlog
@@ -176,6 +188,7 @@ module Puma
           graceful_shutdown if @status == :stop
         ensure
           @ios.each { |i| i.close }
+          @unix_paths.each { |i| File.unlink i }
         end
       end
 

data/puma.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "1.0.0"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-03-29"
-  s.description = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications. It can be used with any application that supports Rack, and is considered the replacement for Webrick and Mongrel. It was designed to be the go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and MRI. Puma is intended for use in both development and production environments.\n\nUnder the hood, Puma processes requests using a C-optimized Ragel extension (inherited from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable way. Puma then serves the request in a thread from an internal thread pool (which you can control). This allows Puma to provide real concurrency for your web application!\n\nWith Rubinius 2.0, Puma will utilize all cores on your CPU with real threads, meaning you won't have to spawn multiple processes to increase throughput. You can expect to see a similar benefit from JRuby.\n\nOn MRI, there is a Global Interpreter Lock (GIL) that ensures only one thread can be run at a time. But if you're doing a lot of blocking IO (such as HTTP calls to external APIs like Twitter), Puma still improves MRI's throughput by allowing blocking IO to be run concurrently (EventMachine-based servers such as Thin turn off this ability, requiring you to use special libraries). Your mileage may vary. In order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like [Rubinius](http://rubini.us) or [JRuby](http://jruby.org)."
+  s.date = "2012-03-03"
+  s.description = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications. It can be used with any application that supports Rack, and is considered the replacement for Webrick and Mongrel. It was designed to be the go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and MRI. Puma is intended for use in both development and production environments.\n\nUnder the hood, Puma processes requests using a C-optimized Ragel extension (inherited from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable way. Puma then serves the request in a thread from an internal thread pool (which you can control). This allows Puma to provide real concurrency for your web application!\n\nWith Rubinius 2.0, Puma will utilize all cores on your CPU with real threads, meaning you won't have to spawn multiple processes to increase throughput. You can expect to see a similar benefit from JRuby.\n\nOn MRI, there is a Global Interpreter Lock (GIL) that ensures only one thread can be run at a time. But if you're doing a lot of blocking IO (such as HTTP calls to external APIs like Twitter), Puma still improves MRI's throughput by allowing blocking IO to be run concurrently (EventMachine-based servers such as Thin turn off this ability, requiring you to use special libraries). Your mileage may vary.. in order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like [Rubinius](http://rubini.us) or [JRuby](http://jruby.org)."
   s.email = ["evan@phx.io"]
   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/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/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.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubyforge_project = "puma"
-  s.rubygems_version = "1.8.18"
+  s.rubygems_version = "1.8.17"
   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"]
 
@@ -25,20 +25,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, ["~> 1.2"])
+      s.add_runtime_dependency(%q<rack>, ["< 2.0", ">= 1.2"])
       s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_development_dependency(%q<hoe>, ["~> 2.14"])
+      s.add_development_dependency(%q<hoe>, ["~> 2.12"])
     else
-      s.add_dependency(%q<rack>, ["~> 1.2"])
+      s.add_dependency(%q<rack>, ["< 2.0", ">= 1.2"])
       s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_dependency(%q<hoe>, ["~> 2.14"])
+      s.add_dependency(%q<hoe>, ["~> 2.12"])
     end
   else
-    s.add_dependency(%q<rack>, ["~> 1.2"])
+    s.add_dependency(%q<rack>, ["< 2.0", ">= 1.2"])
     s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.10"])
-    s.add_dependency(%q<hoe>, ["~> 2.14"])
+    s.add_dependency(%q<hoe>, ["~> 2.12"])
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: puma
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.1.0
 platform: java
 authors: 
   - Evan Phoenix
@@ -85,16 +85,7 @@ files:
   - 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
@@ -109,7 +100,6 @@ files:
   - 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
@@ -141,7 +131,6 @@ files:
   - test/test_ws.rb
   - test/testhelp.rb
   - tools/trickletest.rb
-  - test/test_puma_server.rb
   - lib/puma/puma_http11.jar
 homepage: 
 licenses: []
@@ -179,7 +168,6 @@ 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

data/examples/CA/cacert.pem

@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDxzCCAq+gAwIBAgIBADANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJVUzEO
-MAwGA1UECgwFbG9jYWwxDTALBgNVBAsMBGFlcm8xCzAJBgNVBAMMAkNBMB4XDTEy
-MDExNDAwMTcyN1oXDTE3MDExMjAwMTcyN1owOTELMAkGA1UEBhMCVVMxDjAMBgNV
-BAoMBWxvY2FsMQ0wCwYDVQQLDARhZXJvMQswCQYDVQQDDAJDQTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAN8bteVsrQxfKHzYuwP1vjH2r6qavPK/agCK
-bbPXZmWfUUGjL4ZT4jmnz/B6QNBBKTE/zWcuLXvyRR2FUCi8c5itUvraJVIuBPT/
-lvAZfbyIMpdHG1RPwA6jgTTXm7hnfZc0lCzsFRLk106XrjKeIkZOWffnVLNS2dyH
-X51/yZAS8wFyfx58gabC3hvzJLWw/fDSB/qQsOjp5XCCrP30ILPads/P2dEFNZ1M
-bjGNErVjmEWEorbUsh6Gu3OyElicVf9hgHspFYNwl1rc5IX7Z5eQM9Yd/Lm1mlvU
-iM839ZPn2UOtS9EDdeeZImTSALSUoFJjMdt8+synSDUuGPczUzECAwEAAaOB2TCB
-1jAPBgNVHRMBAf8EBTADAQH/MDEGCWCGSAGG+EIBDQQkFiJSdWJ5L09wZW5TU0wg
-R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBReztszntEK4mwESl/gPjc8
-VKU2ljAOBgNVHQ8BAf8EBAMCAQYwYQYDVR0jBFowWIAUXs7bM57RCuJsBEpf4D43
-PFSlNpahPaQ7MDkxCzAJBgNVBAYTAlVTMQ4wDAYDVQQKDAVsb2NhbDENMAsGA1UE
-CwwEYWVybzELMAkGA1UEAwwCQ0GCAQAwDQYJKoZIhvcNAQEFBQADggEBABC6pRY+
-c+MKGG6hWv9FKTW5drw/9bfKxl+dVcKPP5YWuoAMtStkCVnDleQ7K2oN4o7kwr7Q
-cU3mmYJZjqRu43JBebzupBGKqe/mNWGN0EuCMT7khFEXbO3bwpcL0fhCO7+RZccx
-GF/LKglLgQSE+/SKOHlHdJZlS3EgPghrtoSiptx9ytXzkgCoEKypbAEmcArWvzzF
-81ZYjkLAwCrrB/qNAKnI0AKXMCiqnZu+8a16p5z+HGCjpTLB3NQ3YlyFF0jbr/ow
-R1Fb07t0uO2o22nuua+iK8lKqWLE6eQUIu/YB6DMEgjk+D6of+WQ+38GC35QyPKA
-9nQ8kMf2RkiGN6M=
------END CERTIFICATE-----

data/examples/CA/newcerts/cert_1.pem

@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC/jCCAeagAwIBAgIBATANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJVUzEO
-MAwGA1UECgwFbG9jYWwxDTALBgNVBAsMBGFlcm8xCzAJBgNVBAMMAkNBMB4XDTEy
-MDExNDAwMTcyN1oXDTEzMDExMzAwMTcyN1owSDELMAkGA1UEBhMCVVMxDjAMBgNV
-BAoMBWxvY2FsMQ0wCwYDVQQLDARhZXJvMQswCQYDVQQLDAJDQTENMAsGA1UEAwwE
-cHVtYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxkKjXHIYV4CVFB4YZuVk
-sXqdb7X9+igKPSkxFZoyjwW+AGiN27OwTvETLQiPMaB1WiJtDF9NEmlwYXl4dHWz
-5QPVJtQ5ud7FdCJWBUc+K6LS4xwixwis/FNZVfVcyxkR+cm7mVwxwrxle1lJasoJ
-ouqtVePdt+j+9hcJfLIaZD8CAwEAAaOBhTCBgjAMBgNVHRMBAf8EAjAAMDEGCWCG
-SAGG+EIBDQQkFiJSdWJ5L09wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0G
-A1UdDgQWBBQDrltCvbaqNl/TvFNb/NEIEnbJ2jALBgNVHQ8EBAMCBaAwEwYDVR0l
-BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQEFBQADggEBAF8xrbIbIz7YW6ydjM6g
-gesu8T6q5RcJo9k2CWhd4RgJdfVJSZbCtAAMoRQTErX9Ng6afdlMWD1KnCfbP0IJ
-dq+Umh1BMfzhpYR35NPO/RZPR7Et0OMmmWCbwJBzgI6z8R8qiSuR/to6C7BjiWzo
-rp7S2fenkB6DfzZvHvIDojQ0OpnD2oYBOn/UyAma4I7XzXWe9IIUMARjS5CYZsv9
-HBU3B+e5F9ANi3lRc7x5jIAqVt292HaH+c1UCn0/r/73cW1Z/iNYA9PgS2QKdmYq
-b3oQRFk0wM5stNVsrn7xGftmOETv8pD6r4P8jyw7Ib+ypr10WrFOm7uOscPS4QE2
-Mf0=
------END CERTIFICATE-----

data/examples/CA/newcerts/cert_2.pem

@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC/jCCAeagAwIBAgIBAjANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJVUzEO
-MAwGA1UECgwFbG9jYWwxDTALBgNVBAsMBGFlcm8xCzAJBgNVBAMMAkNBMB4XDTEy
-MDExNDAwMjcyN1oXDTEzMDExMzAwMjcyN1owSDELMAkGA1UEBhMCVVMxDjAMBgNV
-BAoMBWxvY2FsMQ0wCwYDVQQLDARhZXJvMQswCQYDVQQLDAJDQTENMAsGA1UEAwwE
-cHVtYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArxfNMp+g/pKhsDEkB3KR
-1MAkbfnN/UKMvfXwlnXpz7YX1LHHnMutiI/PqymAp6BPcu+umuW2qMHQyqqtyATm
-Z9jr3t837nhmxwG1noRaKRtsckn9FD43ZlpPg0Q5QnhS4oOsXwJzilqPjdDFYrKN
-3TSvIGM2+hVqpVoGYAHDKbMCAwEAAaOBhTCBgjAMBgNVHRMBAf8EAjAAMDEGCWCG
-SAGG+EIBDQQkFiJSdWJ5L09wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0G
-A1UdDgQWBBTyDyJlmYBDwfWdRj6lWGvoY43k9DALBgNVHQ8EBAMCBaAwEwYDVR0l
-BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQEFBQADggEBAIbBVfoVCG8RyVesPW+q
-5i0wAMbHZ1fwv1RKp17c68DYDs0YYPi0bA0ss8AgpU6thWmskxPiFaE6D5x8iv9f
-zkcHxgr1Mrbx6RLx9tLUVehSmRv3aiVO4k9Mp6vf+rJK1AYeaGBmvoqTBLwy7Jrt
-ytKMdqMJj5jKWkWgEGgTnjzbcOClmCQab9isigIzTxMyC/LjeKZe8pPeVX6OM8bY
-y8XGZp9B7uwdPzqt/g25IzTC0KsQwq8cB0raAtZzIyTNv42zcUjmQNVazAozCTcq
-MsEtK2z7TYBC3udTsdyS2qVqCpsk7IMOBGrw8vk4SNhO+coiDObW2K/HNvhl0tZC
-oQI=
------END CERTIFICATE-----

data/examples/CA/private/cakeypair.pem

@@ -1,30 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,8FE374A296255ED1
-
-g6YSW6TUA/9dSscxCWPm11bG6DedWJ6fanU6V7O2n9WbGOLE0ogz877D/5gPr94+
-WJHnCb0O4gyKQA307XA9nq+HAPTyJFKroEz1CPXVrITV8AO+vJ/PUc1y1LQ1ymMk
-fcvI3ZNdbDBr7OL7luYch7qoVULJ4kwJTU7WT9XzINiSnS3Ccqh6ZEPFyKIcxP2s
-11WkpxdDJ911nCXVUoa9Hd5tQk7mHZuf7XL01up08SDobx/imaU9VN8QQG6AFE55
-jVtfv7MxP+9gHmHQxuhYuDMnu5GIwuJPFHvI7Gi9jcwvee/GhcKBnKdpFc92fJJ8
-+TIqR2D21EHDBoep1fMGgbPOl+9z1hdE78Sj6tHwjeRF93mhJWyYNQWQ5ViKLnoF
-j11idWOXwkOCFttRBMd74QG6GyxTvs8FNDOXmm361Muk94a4fbKRJvKvYZlBnYKu
-fOmJNFf2zEVVHjBCbvM4swAT09cWLxRMRTiFb5y7QAEmtFO4WLavlmnNCdMq/uC4
-CpFqGtoiaCimunjTfvkBaJngSfTYSrd4cStnx/c0XK++dni+bLXUHOyMxvihl5vn
-SiFlzWTmoWf1gxNZgOSKY432R6T1CQXfnAd3x/FCJjfPqFt+RAFXjlVFNA0FZyVE
-sCxhVx1eZsr7aMJ5H9RehUr6b9swUEm4UGX5H3/GG7GNCZU+fA+Wfi9cl1zqJFey
-Ho5UjjmRgdV1qapioqCd+Ce/mG0LxRPt/hYdA6G5h4zheRc3KZ7YbIwWRwlkm2w5
-is4ToZKwheycaaQnUfOdHUTtZ4Kv0kRof+LMcDUDTrsydWF4T4xGxGD7/CVJkH1G
-5OTVsfv6Tw7kEMYaXYBQPs0u3GSxY3CZ+k5wATr9PBBYcArSkt5WNQYCJfO/MnWF
-z/31hp/ziCIoesgo6uZMO4Dr5Pka54nc4O4KOblvUUMX07WkYGrc4nxBGvhQ5Jl4
-A8dJBPCK3OlsVCnHYrDQ0cemhLOYPuiyKTtCUIs2nHuiM4RwoCRJgsVBUnKK+tTx
-AkM9uQvYsrZ/DoBooBdXJQy3uiHH86zEskiy72H8Wgcu8GbLt2JgCyhXkwDzrIRf
-hnAN4FS2VNOt5dDTVHBWG1vIxxlM2+LrYpY/QqihNgotZ+C4VWHkoDwbF478JgxM
-5Yk+0X9kGvLQbZCJFXdAKAyr/AzRH+Hx1cDvSi7gypf8qOEZwD1rq7f0qw8jnqfG
-3QIFoN1/+xTAV8lTlGhvbQYz1XHVBH9l7TSQDLIrnwHTIv+PdZbTveGftCCnLdDo
-wBLBnw4mKVCtnHrEgXMQF62yuwueQ8zhdh8jf3osYV/COlRZwQQGgZtnQCeeyDIh
-8GJR9b4uv22QDNv7J2vcqTEWJdnpAZvIBFGuCBCAgev+URLGW2ELXfWQwNgc5+yP
-nGRXo+IwD1uhvEqtuin+cAn/sJhOa66g0ZcV/3AcrdQhbicn12YM71cMvA/XRKf5
-rpo8bAEwDqyoFoywH4IHM3HNV45rS+brskz6tZC5ELondCPVmUqgVu7ELHlJfPXx
-RbzbMPJEGr8WjWUiTDhrD2vWgoJ6NRKkDAUYm6KQb8Sbajd2JAAlYntLz5jKqNqN
------END RSA PRIVATE KEY-----

data/examples/CA/serial

@@ -1 +0,0 @@
-0003

data/examples/puma/cert_puma.pem

@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC/jCCAeagAwIBAgIBAjANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJVUzEO
-MAwGA1UECgwFbG9jYWwxDTALBgNVBAsMBGFlcm8xCzAJBgNVBAMMAkNBMB4XDTEy
-MDExNDAwMjcyN1oXDTEzMDExMzAwMjcyN1owSDELMAkGA1UEBhMCVVMxDjAMBgNV
-BAoMBWxvY2FsMQ0wCwYDVQQLDARhZXJvMQswCQYDVQQLDAJDQTENMAsGA1UEAwwE
-cHVtYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArxfNMp+g/pKhsDEkB3KR
-1MAkbfnN/UKMvfXwlnXpz7YX1LHHnMutiI/PqymAp6BPcu+umuW2qMHQyqqtyATm
-Z9jr3t837nhmxwG1noRaKRtsckn9FD43ZlpPg0Q5QnhS4oOsXwJzilqPjdDFYrKN
-3TSvIGM2+hVqpVoGYAHDKbMCAwEAAaOBhTCBgjAMBgNVHRMBAf8EAjAAMDEGCWCG
-SAGG+EIBDQQkFiJSdWJ5L09wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0G
-A1UdDgQWBBTyDyJlmYBDwfWdRj6lWGvoY43k9DALBgNVHQ8EBAMCBaAwEwYDVR0l
-BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQEFBQADggEBAIbBVfoVCG8RyVesPW+q
-5i0wAMbHZ1fwv1RKp17c68DYDs0YYPi0bA0ss8AgpU6thWmskxPiFaE6D5x8iv9f
-zkcHxgr1Mrbx6RLx9tLUVehSmRv3aiVO4k9Mp6vf+rJK1AYeaGBmvoqTBLwy7Jrt
-ytKMdqMJj5jKWkWgEGgTnjzbcOClmCQab9isigIzTxMyC/LjeKZe8pPeVX6OM8bY
-y8XGZp9B7uwdPzqt/g25IzTC0KsQwq8cB0raAtZzIyTNv42zcUjmQNVazAozCTcq
-MsEtK2z7TYBC3udTsdyS2qVqCpsk7IMOBGrw8vk4SNhO+coiDObW2K/HNvhl0tZC
-oQI=
------END CERTIFICATE-----

data/examples/puma/csr_puma.pem

@@ -1,11 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIBhzCB8QIBADBIMQswCQYDVQQGEwJVUzEOMAwGA1UECgwFbG9jYWwxDTALBgNV
-BAsMBGFlcm8xCzAJBgNVBAsMAkNBMQ0wCwYDVQQDDARwdW1hMIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQCvF80yn6D+kqGwMSQHcpHUwCRt+c39Qoy99fCWdenP
-thfUscecy62Ij8+rKYCnoE9y766a5baowdDKqq3IBOZn2Ove3zfueGbHAbWehFop
-G2xySf0UPjdmWk+DRDlCeFLig6xfAnOKWo+N0MViso3dNK8gYzb6FWqlWgZgAcMp
-swIDAQABoAAwDQYJKoZIhvcNAQEEBQADgYEAmRsmIQ0pF9iPOO7V1NeHxrVpFz1B
-CZK0yAIGlCWqzpFO/OILN1hJfFnsFl7hZWipoARk15fN1sSXQF3Xb7/sc/8qVhyz
-oY38uu/8CE9CTdUutniLzP/4sUomXjslKNVV0qKtmfsFkj2tHtWjJkGAyZUcoKeG
-hDJxQlIHhZa7Xvw=
------END CERTIFICATE REQUEST-----

data/examples/puma/puma_keypair.pem

@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCvF80yn6D+kqGwMSQHcpHUwCRt+c39Qoy99fCWdenPthfUscec
-y62Ij8+rKYCnoE9y766a5baowdDKqq3IBOZn2Ove3zfueGbHAbWehFopG2xySf0U
-PjdmWk+DRDlCeFLig6xfAnOKWo+N0MViso3dNK8gYzb6FWqlWgZgAcMpswIDAQAB
-AoGAHv/UyZivdULas4oPue3T2dnm2T239ZXZuywW21ym96pij7ql/6Gj6KClgMVJ
-TOQ6DLxYqn3vF/OwlqEfQWF0tTUYY+xNbEDE1YsbrS5/FSzbaEYYOHzRl/vMmnsf
-aNgYaSjOIecin7L71Wzq0piMIxg8BLb6IVECBku9EQNzxuECQQDZsbRgg1XZGj+r
-XAu/qXTNKQ/r7k+iPN5bXON6ApBomG+4Q7VVITL3tkGzLOphRZ37Q28FrN4B4gtC
-Xb9il5lDAkEAzecTSopPi2VdcME4WWmwn1rbTp/jJNt4dGZLsNfj9RejVDd32i/L
-P7wCpoPDaaVcoF2HgvCs39qatyVg6ecu0QJBALN4q+q9nDMGTuNpWU5D2EWjyrqJ
-mCF66R6NcASQxJlWwxQ4zfBHFIvgOD4Nk5VqHZqet5MIN2d6AipOu4/+x50CQHDp
-jf+rd1GHBcXGf8MwnUXWCjvEnEhi/lw+mLVivsRx8QRG4rfIy9monX949Flj8DaU
-87IPj422kG9s1QeP2nECQQCkg+RUcoQm7SiM8OXuXNeHQlvQNp65geFRxzKAXxT/
-+1Mbtwnd3AXXZBekFDDpE9U3ZQjahoe7oc1oUBuw5hXL
------END RSA PRIVATE KEY-----

data/examples/qc_config.rb

@@ -1,13 +0,0 @@
-  full_hostname = `hostname`.strip
-  domainname = full_hostname.split('.')[1..-1].join('.')
-  hostname = full_hostname.split('.')[0]
-
-  CA[:hostname] = hostname
-  CA[:domainname] = domainname
-  CA[:CA_dir] = File.join Dir.pwd, "CA"
-  CA[:password] = 'puma'
-  
-  CERTS << {
-    :type => 'server',
-    :hostname => 'puma'
-  }

data/lib/puma/compat.rb

@@ -1,7 +0,0 @@
-# Provides code to work properly on 1.8 and 1.9
-
-class String
-  unless method_defined? :bytesize
-    alias_method :bytesize, :size
-  end
-end

data/test/test_puma_server.rb

@@ -1,6 +0,0 @@
-require 'puma'
-require 'test/unit'
-require 'timeout'
-
-class TestPumaServer < Test::Unit::TestCase
-end