Merge branch 'master' of github.com:TechEmpower/FrameworkBenchmarks

rack/README.md

@@ -12,7 +12,7 @@ The tests were run with:
 * [Ruby 2.0.0-p0](http://www.ruby-lang.org/)
 * [JRuby 1.7.3](http://jruby.org/)
 * [Rack 1.5.1](http://rack.github.com/)
-* [Passenger 3.9.5-rc3](https://www.phusionpassenger.com/)
+* [Unicorn 4.6.2](http://unicorn.bogomips.org/)
 * [Resin 4.0.34](http://www.caucho.com/)
 
 ## References

rails-stripped/README.md

@@ -15,7 +15,7 @@ The tests were run with:
 * [Ruby 2.0.0-p0](http://www.ruby-lang.org/)
 * [JRuby 1.7.3](http://jruby.org/)
 * [Rails 3.2.11](http://rubyonrails.org/)
-* [Passenger 3.9.5-rc3](https://www.phusionpassenger.com/)
+* [Unicorn 4.6.2](http://unicorn.bogomips.org/)
 * [Resin 4.0.34](http://www.caucho.com/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

rails/README.md

@@ -15,7 +15,7 @@ The tests were run with:
 * [Ruby 2.0.0-p0](http://www.ruby-lang.org/)
 * [JRuby 1.7.3](http://jruby.org/)
 * [Rails 3.2.11](http://rubyonrails.org/)
-* [Passenger 3.9.5-rc3](https://www.phusionpassenger.com/)
+* [Unicorn 4.6.2](http://unicorn.bogomips.org/)
 * [Resin 4.0.34](http://www.caucho.com/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

sinatra/README.md

@@ -14,7 +14,7 @@ The tests were run with:
 * [Ruby 2.0.0-p0](http://www.ruby-lang.org/)
 * [JRuby 1.7.3](http://jruby.org/)
 * [Sinatra 1.3.4](http://www.sinatrarb.com/)
-* [Passenger 3.9.5-rc3](https://www.phusionpassenger.com/)
+* [Unicorn 4.6.2](http://unicorn.bogomips.org/)
 * [Resin 4.0.34](http://www.caucho.com/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 

tornado/deploy/nginx.conf

@@ -1,11 +1,12 @@
 #user nginx;
-worker_processes 1;
+worker_processes 8;
 
 #error_log /var/log/nginx/error.log;
 #pid /var/run/nginx.pid;
 
 events {
-    worker_connections 1024;
+    worker_connections 8196;
+    accept_mutex off;
     use epoll;
 }
 
@@ -27,7 +28,7 @@ http {
 
     # access_log /var/log/nginx/access.log;
 
-    keepalive_timeout 65;
+    keepalive_timeout 5;
     proxy_read_timeout 200;
     sendfile on;
     tcp_nopush on;