Merge remote-tracking branch 'remotes/upstream/master'

History.txt

@@ -1,3 +1,27 @@
+=== 2.9.0 / 2014-07-12
+
+* 1 minor feature:
+  * Add SSL support for JRuby
+
+* 3 bug fixes:
+  * Typo BUNDLER_GEMFILE -> BUNDLE_GEMFILE
+  * Use fast_write because we can't trust syswrite
+  * pumactl - do not modify original ARGV
+
+* 4 doc fixes:
+  * BSD-3-Clause over BSD to avoid confusion
+  * Deploy doc: clarification of the GIL
+  * Fix typo in DEPLOYMENT.md
+  * Update README.md
+
+* 6 PRs merged:
+  * Merge pull request #520 from misfo/patch-2
+  * Merge pull request #530 from looker/jruby-ssl
+  * Merge pull request #537 from vlmonk/patch-1
+  * Merge pull request #540 from allaire/patch-1
+  * Merge pull request #544 from chulkilee/bsd-3-clause
+  * Merge pull request #551 from jcxplorer/patch-1
+
 === 2.8.2 / 2014-04-12
 
 * 4 bug fixes:

README.md

@@ -117,7 +117,7 @@ If you're preloading your application and using ActiveRecord, it's recommend you
       end
     end
     
-When you use preload_app, your new code goes all in the master process, and is then copied in the workers (meaning it’s only compatible with cluster mode). General rule is to use preload_app when your workers die often and need fast starts. If you don’t have many workers, you should probably don’t use preload_app.
+When you use preload_app, your new code goes all in the master process, and is then copied in the workers (meaning it’s only compatible with cluster mode). General rule is to use preload_app when your workers die often and need fast starts. If you don’t have many workers, you probably should not use preload_app.
 
 Note that preload_app can’t be used with phased restart, since phased restart kills and restarts workers one-by-one, and preload_app is all about copying the code of master into the workers.
 

Rakefile

@@ -22,7 +22,7 @@ HOE = Hoe.spec "puma" do
 
   dependency "rack", [">= 1.1", "< 2.0"]
 
-  extra_dev_deps << ["rake-compiler", "~> 0.8.0"]
+  extra_dev_deps << ["rake-compiler", "~> 0.8"]
 end
 
 task :prerelease => [:clobber, :check_manifest, :test]

lib/puma/const.rb

@@ -28,8 +28,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.8.2".freeze
-    CODE_NAME = "Sir Edmund Percival Hillary".freeze
+    PUMA_VERSION = VERSION = "2.9.0".freeze
+    CODE_NAME = "Team High Five".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

lib/puma/server.rb

@@ -614,10 +614,10 @@ module Puma
         begin
           res_body.each do |part|
             if chunked
-              client.syswrite part.bytesize.to_s(16)
-              client.syswrite line_ending
+              fast_write client, part.bytesize.to_s(16)
+              fast_write client, line_ending
               fast_write client, part
-              client.syswrite line_ending
+              fast_write client, line_ending
             else
               fast_write client, part
             end
@@ -626,7 +626,7 @@ module Puma
           end
 
           if chunked
-            client.syswrite CLOSE_CHUNKED
+            fast_write client, CLOSE_CHUNKED
             client.flush
           end
         rescue SystemCallError, IOError