puma 2.0.0.b3-java → 2.0.0.b4-java

data/History.txt

@@ -1,3 +1,11 @@
+=== 2.0.0.b4 / 2012-12-12
+
+* 4 bug fixes:
+  * Properly check #syswrite's value for variable sized buffers. Fixes #170
+  * Shutdown status server properly
+  * Handle char vs byte and mixing syswrite with write properly
+  * made MiniSSL validate key/cert file existence
+
 === 2.0.0.b3 / 2012-11-22
 
 * 1 bug fix:

data/Rakefile

@@ -112,6 +112,10 @@ namespace :test do
   end
 
   desc "Run all tests"
-  task :all => [:test, "test:integration"]
+  if defined?(JRUBY_VERSION) and ENV['TRAVIS']
+    task :all => :test
+  else
+    task :all => [:test, "test:integration"]
+  end
 end
 

data/ext/puma_http11/io_buffer.c

@@ -107,6 +107,8 @@ static VALUE buf_append2(int argc, VALUE* argv, VALUE self) {
     memcpy(b->cur, RSTRING_PTR(str), str_len);
     b->cur += str_len;
   }
+
+  return self;
 }
 
 static VALUE buf_to_str(VALUE self) {

data/ext/puma_http11/mini_ssl.c

@@ -37,19 +37,22 @@ ms_conn* engine_alloc(VALUE klass, VALUE* obj) {
 
 VALUE engine_init_server(VALUE self, VALUE key, VALUE cert) {
   VALUE obj;
+  SSL_CTX* ctx;
+  SSL* ssl;
+
   ms_conn* conn = engine_alloc(self, &obj);
 
   StringValue(key);
   StringValue(cert);
 
-  SSL_CTX* ctx = SSL_CTX_new(SSLv23_server_method());
+  ctx = SSL_CTX_new(SSLv23_server_method());
   conn->ctx = ctx;
 
   SSL_CTX_use_certificate_file(ctx, RSTRING_PTR(cert), SSL_FILETYPE_PEM);
   SSL_CTX_use_PrivateKey_file(ctx, RSTRING_PTR(key), SSL_FILETYPE_PEM);
   /* SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE); */
 
-  SSL* ssl =  SSL_new(ctx);
+  ssl =  SSL_new(ctx);
   conn->ssl = ssl;
 
   /* SSL_set_verify(ssl, SSL_VERIFY_NONE, NULL); */
@@ -82,7 +85,7 @@ VALUE engine_inject(VALUE self, VALUE str) {
 
   StringValue(str);
 
-  used = BIO_write(conn->read, RSTRING_PTR(str), RSTRING_LEN(str));
+  used = BIO_write(conn->read, RSTRING_PTR(str), (int)RSTRING_LEN(str));
 
   if(used == 0 || used == -1) {
     return Qfalse;
@@ -134,7 +137,7 @@ VALUE engine_write(VALUE self, VALUE str) {
 
   StringValue(str);
 
-  bytes = SSL_write(conn->ssl, (void*)RSTRING_PTR(str), RSTRING_LEN(str));
+  bytes = SSL_write(conn->ssl, (void*)RSTRING_PTR(str), (int)RSTRING_LEN(str));
   if(bytes > 0) {
     return INT2FIX(bytes);
   }
@@ -168,13 +171,15 @@ VALUE engine_extract(VALUE self) {
 }
 
 void Init_mini_ssl(VALUE puma) {
+  VALUE mod, eng;
+
   SSL_library_init();
   OpenSSL_add_ssl_algorithms();
   SSL_load_error_strings();
   ERR_load_crypto_strings();
   
-  VALUE mod = rb_define_module_under(puma, "MiniSSL");
-  VALUE eng = rb_define_class_under(mod, "Engine", rb_cObject);
+  mod = rb_define_module_under(puma, "MiniSSL");
+  eng = rb_define_class_under(mod, "Engine", rb_cObject);
 
   eError = rb_define_class_under(mod, "SSLError", rb_eStandardError);
 

data/lib/puma/cli.rb

@@ -321,6 +321,7 @@ module Puma
 
     def graceful_stop(server)
       log " - Gracefully stopping, waiting for requests to finish"
+      @status.stop(true) if @status
       server.stop(true)
       delete_pidfile
       log " - Goodbye!"
@@ -623,6 +624,7 @@ module Puma
     end
 
     def stop
+      @status.stop(true) if @status
       @server.stop(true) if @server
       delete_pidfile
     end

data/lib/puma/compat.rb

@@ -4,4 +4,8 @@ class String
   unless method_defined? :bytesize
     alias_method :bytesize, :size
   end
+
+  unless method_defined? :byteslice
+    alias_method :byteslice, :[]
+  end
 end

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.0.0.b3".freeze
+    PUMA_VERSION = VERSION = "2.0.0.b4".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/minissl.rb

@@ -79,7 +79,20 @@ module Puma::MiniSSL
   end
 
   class Context
-    attr_accessor :key, :cert, :verify_mode
+    attr_accessor :verify_mode
+
+    attr_reader :key
+    attr_reader :cert
+
+    def key=(key)
+      raise ArgumentError, "No such key file '#{key}'" unless File.exist? key
+      @key = key
+    end
+
+    def cert=(cert)
+      raise ArgumentError, "No such cert file '#{cert}'" unless File.exist? cert
+      @cert = cert
+    end
   end
 
   VERIFY_NONE = 0

data/lib/puma/server.rb

@@ -423,7 +423,7 @@ module Puma
 
         if no_body
           lines << line_ending
-          client.syswrite lines.to_s
+          fast_write client, lines.to_s
           return keep_alive
         end
 
@@ -443,16 +443,16 @@ module Puma
 
         lines << line_ending
 
-        client.syswrite lines.to_s
+        fast_write client, lines.to_s
 
         res_body.each do |part|
           if chunked
             client.syswrite part.bytesize.to_s(16)
             client.syswrite line_ending
-            client.syswrite part
+            fast_write client, part
             client.syswrite line_ending
           else
-            client.syswrite part
+            fast_write client, part
           end
 
           client.flush
@@ -562,5 +562,23 @@ module Puma
       @persistent_wakeup.close
       @notify << RESTART_COMMAND
     end
+
+    def fast_write(io, str)
+      n = io.syswrite str
+
+      # Fast path.
+      return if n == str.bytesize
+
+      pos = n
+      left = str.bytesize - n
+
+      until left == 0
+       n = io.syswrite str.byteslice(pos..-1)
+
+       pos += n
+       left -= n
+      end
+    end
+    private :fast_write
   end
 end

data/puma.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.0.0.b3"
+  s.version = "2.0.0.b4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-11-22"
+  s.date = "2012-12-13"
   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", "docs/config.md", "docs/nginx.md", "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/io_buffer.c", "ext/puma_http11/mini_ssl.c", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/org/jruby/puma/MiniSSL.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/accept_nonblock.rb", "lib/puma/app/status.rb", "lib/puma/binder.rb", "lib/puma/capistrano.rb", "lib/puma/cli.rb", "lib/puma/client.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/daemon_ext.rb", "lib/puma/delegation.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/io_buffer.rb", "lib/puma/java_io_buffer.rb", "lib/puma/jruby_restart.rb", "lib/puma/minissl.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/reactor.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tools/jungle/README.md", "tools/jungle/puma", "tools/jungle/run-puma", "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_iobuffer.rb", "test/test_null_io.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"]
+  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "docs/config.md", "docs/nginx.md", "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/io_buffer.c", "ext/puma_http11/mini_ssl.c", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/org/jruby/puma/MiniSSL.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/accept_nonblock.rb", "lib/puma/app/status.rb", "lib/puma/binder.rb", "lib/puma/capistrano.rb", "lib/puma/cli.rb", "lib/puma/client.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/daemon_ext.rb", "lib/puma/delegation.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/io_buffer.rb", "lib/puma/java_io_buffer.rb", "lib/puma/jruby_restart.rb", "lib/puma/minissl.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/reactor.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tools/jungle/README.md", "tools/jungle/puma", "tools/jungle/run-puma", "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_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.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"]
   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.24"
   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_iobuffer.rb", "test/test_null_io.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"]
+  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_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.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_integration.rb

@@ -8,6 +8,8 @@ require 'tempfile'
 require 'puma/cli'
 require 'puma/control_cli'
 
+# These don't run on travis because they're too fragile
+
 class TestIntegration < Test::Unit::TestCase
   def setup
     @state_path = "test/test_puma.state"
@@ -145,4 +147,4 @@ class TestIntegration < Test::Unit::TestCase
     data = s.read
     assert_equal "HTTP/1.1 400 Bad Request\r\n\r\n", data
   end
-end
+end unless ENV['TRAVIS']

data/test/test_minissl.rb

@@ -0,0 +1,22 @@
+require 'test/unit'
+
+require 'puma'
+require 'puma/minissl'
+
+class TestMiniSSL < Test::Unit::TestCase
+
+  def test_raises_with_invalid_key_file
+    ctx = Puma::MiniSSL::Context.new
+
+    exception = assert_raise(ArgumentError) { ctx.key = "/no/such/key" }
+    assert_equal("No such key file '/no/such/key'", exception.message)
+  end unless defined? JRUBY_VERSION
+
+  def test_raises_with_invalid_cert_file
+    ctx = Puma::MiniSSL::Context.new
+
+    exception = assert_raise(ArgumentError) { ctx.cert = "/no/such/cert" }
+    assert_equal("No such cert file '/no/such/cert'", exception.message)
+  end unless defined? JRUBY_VERSION
+
+end

data/test/test_puma_server.rb

@@ -57,7 +57,7 @@ class TestPumaServer < Test::Unit::TestCase
     end
 
     assert_equal "https", body
-  end
+  end unless defined? JRUBY_VERSION
 
   def test_proper_stringio_body
     data = nil
@@ -102,4 +102,27 @@ class TestPumaServer < Test::Unit::TestCase
 
     assert_equal body, sock.read
   end
+
+  def test_very_large_return
+    giant = "x" * 2056610
+
+    @server.app = proc do |env|
+      [200, {}, [giant]]
+    end
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "GET / HTTP/1.0\r\n\r\n"
+
+    while true
+      line = sock.gets
+      break if line == "\r\n"
+    end
+
+    out = sock.read
+
+    assert_equal giant.bytesize, out.bytesize
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: puma
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.b3
+  version: 2.0.0.b4
 platform: java
 authors: 
   - Evan Phoenix
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-22 00:00:00 Z
+date: 2012-12-13 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rack
@@ -137,6 +137,7 @@ files:
   - test/test_http11.rb
   - test/test_integration.rb
   - test/test_iobuffer.rb
+  - test/test_minissl.rb
   - test/test_null_io.rb
   - test/test_persistent.rb
   - test/test_puma_server.rb
@@ -182,6 +183,7 @@ test_files:
   - test/test_http11.rb
   - test/test_integration.rb
   - test/test_iobuffer.rb
+  - test/test_minissl.rb
   - test/test_null_io.rb
   - test/test_persistent.rb
   - test/test_puma_server.rb