puma 1.2.1-java → 1.2.2-java

data/Gemfile

@@ -4,3 +4,5 @@ gem "hoe"
 gem "rdoc"
 gem "rake-compiler"
 gem "rack"
+
+gem "jruby-openssl", :platform => "jruby"

data/History.txt

@@ -1,3 +1,12 @@
+=== 1.2.2 / 2012-04-28
+
+* 4 bug fixes:
+
+  * Report a lowlevel error to stderr
+  * Set a fallback SERVER_NAME and SERVER_PORT
+  * Keep the encoding of the body correct. Fixes #79
+  * show error.to_s along with backtrace for low-level error
+
 === 1.2.1 / 2012-04-11
 
  1 bug fix:

data/Manifest.txt

@@ -57,6 +57,7 @@ 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

data/README.md

@@ -87,6 +87,41 @@ Need a bit of security? Use SSL sockets!
 
     $ puma -b 'ssl://127.0.0.1:9292?key=path_to_key&cert=path_to_cert'
 
+### Control/Status Server
+
+Puma comes with a builtin status/control app that can be used query and control puma itself. Here is an example of starting puma with the control server:
+
+    $ puma --control tcp://127.0.0.1:9293 --control-token foo
+
+This directly puma to start the control server on localhost port 9293. Additionally, all requests to the control server will need to include `token=foo` as a query parameter. This allows for simple authentication. Check out https://github.com/puma/puma/blob/master/lib/puma/app/status.rb to see what the app has available.
+
+## Restart
+
+Puma includes the ability to restart itself, allowing for new versions to be easily upgraded to. When available (currently anywhere but JRuby), puma performs a "hot restart". This is the same functionality available in *unicorn* and *nginx* which keep the server sockets open between restarts. This makes sure that no pending requests are dropped while the restart is taking place.
+
+To perform a restart, there are 2 builtin mechanism:
+
+  * Send the puma process the `SIGUSR2` signal
+  * Use the status server and issue `/restart`
+
+No code is shared between the current and restarted process, so it should be safe to issue a restart any place where you would manually stop puma and start it again.
+
+If the new process is unable to load, it will simply exit. You should therefore run puma under a supervisor when using it in production.
+
+### Cleanup Code
+
+Puma isn't able to understand all the resources that your app may use, so it provides a hook in the configuration file you pass to `-C` call `on_restart`. The block passed to `on_restart` will be called, unsurprisingly, just before puma restarts itself.
+
+You should place code to close global log files, redis connections, etc in this block so that their file descriptors don't leak into the restarted process. Failure to do so will result in slowly running out of descriptors and eventually obscure crashes as the server is restart many times.
+
+## pumactl
+
+If you start puma with `-S some/path` then you can pass that same path to the `pumactl` program to control your server. For instance:
+
+    $ pumactl -S some/path restart
+
+will cause the server to perform a restart. `pumactl` is a simple CLI frontend to the contro/status app described above.
+
 ## 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/const.rb

@@ -1,52 +1,16 @@
+require 'rack'
+
 module Puma
 
   # Every standard HTTP code mapped to the appropriate message.  These are
   # used so frequently that they are placed directly in Puma for easy
   # access rather than Puma::Const itself.
-  HTTP_STATUS_CODES = {
-    100  => 'Continue',
-    101  => 'Switching Protocols',
-    200  => 'OK',
-    201  => 'Created',
-    202  => 'Accepted',
-    203  => 'Non-Authoritative Information',
-    204  => 'No Content',
-    205  => 'Reset Content',
-    206  => 'Partial Content',
-    300  => 'Multiple Choices',
-    301  => 'Moved Permanently',
-    302  => 'Moved Temporarily',
-    303  => 'See Other',
-    304  => 'Not Modified',
-    305  => 'Use Proxy',
-    400  => 'Bad Request',
-    401  => 'Unauthorized',
-    402  => 'Payment Required',
-    403  => 'Forbidden',
-    404  => 'Not Found',
-    405  => 'Method Not Allowed',
-    406  => 'Not Acceptable',
-    407  => 'Proxy Authentication Required',
-    408  => 'Request Time-out',
-    409  => 'Conflict',
-    410  => 'Gone',
-    411  => 'Length Required',
-    412  => 'Precondition Failed',
-    413  => 'Request Entity Too Large',
-    414  => 'Request-URI Too Large',
-    415  => 'Unsupported Media Type',
-    500  => 'Internal Server Error',
-    501  => 'Not Implemented',
-    502  => 'Bad Gateway',
-    503  => 'Service Unavailable',
-    504  => 'Gateway Time-out',
-    505  => 'HTTP Version not supported'
-  }
+  HTTP_STATUS_CODES = Rack::Utils::HTTP_STATUS_CODES
 
   # For some HTTP status codes the client only expects headers.
-  STATUS_WITH_NO_ENTITY_BODY = {
-    204 => true, 205 => true, 304 => true
-  }
+  STATUS_WITH_NO_ENTITY_BODY = Hash[Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.map { |s|
+    [s, true]
+  }]
 
   # Frequently used constants when constructing requests or responses.  Many times
   # the constant just refers to a string with the same contents.  Using these constants
@@ -61,6 +25,8 @@ module Puma
   # too taxing on performance.
   module Const
 
+    PUMA_VERSION = VERSION = "1.2.2".freeze
+
     # The default number of seconds for another request within a persistent
     # session.
     PERSISTENT_TIMEOUT = 20
@@ -75,8 +41,6 @@ module Puma
 
     PATH_INFO = 'PATH_INFO'.freeze
 
-    PUMA_VERSION = VERSION = "1.2.1".freeze
-
     PUMA_TMP_BASE = "puma".freeze
 
     # The standard empty 404 response for bad requests.  Use Error4040Handler for custom stuff.
@@ -122,6 +86,7 @@ module Puma
     SERVER_PORT = "SERVER_PORT".freeze
     HTTP_HOST = "HTTP_HOST".freeze
     PORT_80 = "80".freeze
+    LOCALHOST = "localhost".freeze
 
     SERVER_PROTOCOL = "SERVER_PROTOCOL".freeze
     HTTP_11 = "HTTP/1.1".freeze

data/lib/puma/server.rb

@@ -356,6 +356,9 @@ module Puma
           env[SERVER_NAME] = host
           env[SERVER_PORT] = PORT_80
         end
+      else
+        env[SERVER_NAME] = LOCALHOST
+        env[SERVER_PORT] = PORT_80
       end
 
       unless env[REQUEST_PATH]
@@ -422,6 +425,8 @@ module Puma
             return :async
           end
         rescue => e
+          @events.unknown_error self, e, "Rack app"
+
           status, headers, res_body = lowlevel_error(e)
         end
 
@@ -568,12 +573,11 @@ module Puma
       if remain > MAX_BODY
         stream = Tempfile.new(Const::PUMA_TMP_BASE)
         stream.binmode
+        stream.write body
       else
-        stream = StringIO.new
+        stream = StringIO.new body
       end
 
-      stream.write body
-
       # Read an odd sized chunk so we can read even sized ones
       # after this
       chunk = client.readpartial(remain % CHUNK_SIZE)
@@ -605,7 +609,7 @@ module Puma
     # A fallback rack response if +@app+ raises as exception.
     #
     def lowlevel_error(e)
-      [500, {}, ["Puma caught this error:\n#{e.backtrace.join("\n")}"]]
+      [500, {}, ["Puma caught this error: #{e}\n#{e.backtrace.join("\n")}"]]
     end
 
     # Wait for all outstanding requests to finish.

data/puma.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-04-11"
+  s.date = "2012-04-28"
   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", "test/test_puma_server.rb"]
-  s.homepage = "http://puma.io"
+  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_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", "test/testhelp.rb", "tools/trickletest.rb"]
+  s.homepage = "[![Build Status](https://secure.travis-ci.org/puma/puma.png)](http://travis-ci.org/puma/puma) [![Dependency Status](https://gemnasium.com/puma/puma.png)](https://gemnasium.com/puma/puma)"
   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.21"
+  s.rubygems_version = "1.8.18"
   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_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"]
 
@@ -27,19 +27,19 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["~> 1.2"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_development_dependency(%q<hoe>, ["~> 2.14"])
     else
       s.add_dependency(%q<rack>, ["~> 1.2"])
-      s.add_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_dependency(%q<hoe>, ["~> 2.14"])
     end
   else
     s.add_dependency(%q<rack>, ["~> 1.2"])
-    s.add_dependency(%q<rdoc>, ["~> 3.10"])
     s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.10"])
+    s.add_dependency(%q<hoe>, ["~> 2.14"])
   end
 end

data/test/test_rack_server.rb

@@ -75,6 +75,24 @@ class TestRackServer < Test::Unit::TestCase
     end
   end
 
+  def test_large_post_body
+    @checker = ErrorChecker.new ServerLint.new(@simple)
+    @server.app = @checker
+
+    @server.run
+
+    big = "x" * (1024 * 16)
+
+    Net::HTTP.post_form URI.parse('http://localhost:9998/test'),
+                 { "big" => big }
+
+    stop
+
+    if exc = @checker.exception
+      raise exc
+    end
+  end
+
   def test_path_info
     input = nil
     @server.app = lambda { |env| input = env; @simple.call(env) }
@@ -119,4 +137,5 @@ class TestRackServer < Test::Unit::TestCase
 
     assert_match %r!GET /test HTTP/1\.1!, log.string
   end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: puma
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.2.2
 platform: java
 authors: 
   - Evan Phoenix
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-11 00:00:00 Z
+date: 2012-04-28 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rack
@@ -134,6 +134,7 @@ 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
@@ -141,7 +142,6 @@ 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: []