puma 2.7.0 → 3.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjM1MjBkYTU2MjE3ZjEwNTM1YTBmNWY0NmVkYjE0NTQzNjljYmZjMQ==
-  data.tar.gz: !binary |-
-    ZTBmNzgyZmM5NzVmYjAxMDY1ZjY4ODY3Yzc0ZDJhNWQ4NzNkNTVmNw==
+SHA1:
+  metadata.gz: a8b54fddb15d1859af7c94fe4dc95d34af40e876
+  data.tar.gz: 90eda7e0a364e1e1ef1e887a7c74324c3c6cecd0
 SHA512:
-  metadata.gz: !binary |-
-    YTAyZjlkMGIwNTM0MDYzNWViYjQ4MjUwYWVhZDU2NTVlMTQ5ZDgwNzBiYzA5
-    MWUyOGFkZjZkYTdjNmRmOTQ0MGQxOWM3MDZmNTM4NzI0MjgzNjcxMmE5ODg3
-    ZWNlNmQ2OTM3ZTZmNzcyOTc1OTgyMGE2ZTUyMzUzMGQwNDk2NDQ=
-  data.tar.gz: !binary |-
-    ZWZiYmM1ODc4ZGIzY2FlNTczNTE4MjEyMzkzNjgxNzhlMmM2MGUzM2ZiMTlj
-    MjE3MTM2MzY0Zjk5YTc2ZTc0MDA4ZmZkNjc3ODNhZjQyNDM1ZmE0MjEyMmIy
-    NzI5Zjg5OTZjOWI1ZDE0YjY1ZTQ0ZWYyODE2YTQwYmEyYzA4ZTE=
+  metadata.gz: c8197313239e459ed3f37c86e1445b5799cc899e53bbde54408cf2f51a730195674c5fb0e2ca614d926ceaaa928b3085a40762ff79542a8177eec00e22e1d284
+  data.tar.gz: fdd6b229cb07839741bbe9612c18ef84b856f9dea72d7cc35ed5224d254e94db285025599015ea2c2cbe80df5282a9a05b10671c8576ba656d5f1f99aced7caf

data/DEPLOYMENT.md

@@ -0,0 +1,91 @@
+# Deployment engineering for puma
+
+Puma is software that is expected to be run in a deployed environment eventually.
+You can certainly use it as your dev server only, but most people look to use
+it in their production deployments as well.
+
+To that end, this is meant to serve as a foundation of wisdom how to do that
+in a way that increases happiness and decreases downtime.
+
+## Specifying puma
+
+Most people want to do this by putting `gem "puma"` into their Gemfile, so we'll
+go ahead and assume that. Go add it now... we'll wait.
+
+
+Welcome back!
+
+## Single vs Cluster mode
+
+Puma was originally conceived as a thread-only webserver, but grew the ability to
+also use processes in version 2.
+
+Here are some rules of thumb:
+
+### MRI
+
+* Use cluster mode and set the number of workers to 1.5x the number of cpu cores
+  in the machine, minimum 2.
+* Set the number of threads to desired concurrent requests / number of workers.
+  Puma defaults to 8 and that's a decent number.
+
+#### Migrating from Unicorn
+
+* If you're migrating from unicorn though, here are some settings to start with:
+  * Set workers to half the number of unicorn workers you're using
+  * Set threads to 2
+  * Enjoy 50% memory savings
+* As you grow more confident in the thread safety of your app, you can tune the
+  workers down and the threads up.
+
+#### Worker utilization
+
+**How do you know if you're got enough (or too many workers)?**
+
+A good question. Due to MRI's GIL, only one thread can be executing Ruby code at a time.
+But since so many apps are waiting on IO from DBs, etc., they can utilize threads
+to make better use of the process.
+
+The rule of thumb is you never want processes that are pegged all the time. This
+means that there is more work to do that the process can get through. On the other
+hand, if you have processes that sit around doing nothing, then they're just eating
+up resources.
+
+Watching your CPU utilization over time and aim for about 70% on average. This means
+you've got capacity still but aren't starving threads.
+
+## Daemonizing
+
+I prefer to not daemonize my servers and use something like `runit` or `upstart` to
+monitor them as child processes. This gives them fast response to crashes and
+makes it easy to figure out what is going on. Additionally, unlike `unicorn`,
+puma does not require daemonization to do zero-downtime restarts.
+
+I see people using daemonization because they start puma directly via capistrano
+task and thus want it to live on past the `cap deploy`. To this people I said:
+You need to be using a process monitor. Nothing is making sure puma stays up in
+this scenario! You're just waiting for something weird to happen, puma to die,
+and to get paged at 3am. Do yourself a favor, at least the process monitoring
+your OS comes with, be it `sysvinit`, `upstart`, or `systemd`. Or branch out
+and use `runit` or hell, even `monit`.
+
+## Restarting
+
+You probably will want to deploy some new code at some point, and you'd like
+puma to start running that new code. Minimizing the amount of time the server
+is unavailable would be nice as well. Here's how to do it:
+
+1. Don't use `preload!`. This dirties the master process and means it will have
+to shutdown all the workers and re-exec itself to get your new code. It is not compatible with phased-restart and `prune_bundler` as well.
+
+1. Use `prune_bundler`. This makes it so that the cluster master will detach itself
+from a Bundler context on start. This allows the cluster workers to load your app
+and start a brand new Bundler context within the worker only. This means your
+master remains pristine and can live on between new releases of your code.
+
+1. Use phased-restart (`SIGUSR1` or `pumactl phased-restart`). This tells the master
+to kill off one worker at a time and restart them in your new code. This minimizes
+downtime and staggers the restart nicely. **WARNING** This means that both your
+old code and your new code will be running concurrently. Most deployment solutions
+already cause that, but it's worth warning you about it again. Be careful with your
+migrations, etc!

data/Gemfile

@@ -5,8 +5,9 @@ gem "hoe-git"
 gem "hoe-ignore"
 gem "rdoc"
 gem "rake-compiler"
-gem "rack"
+gem "test-unit", "~> 3.0"
 
-gem 'minitest', '~> 4.0'
+gem "rack"
+gem 'minitest', '~> 5.8'
 
 gem "jruby-openssl", :platform => "jruby"

data/History.txt

@@ -1,3 +1,626 @@
+=== 3.1.1 / 2016-03-17
+
+* 4 bug fixes:
+  * Disable USR1 usage on JRuby
+  * Fixes #922 - Correctly define file encoding as UTF-8
+  * Set a more explicit SERVER_SOFTWARE Rack variable
+  * Show RUBY_ENGINE_VERSION if available. Fixes #923
+
+* 3 PRs merged:
+  * Merge pull request #912 from tricknotes/fix-allow-failures-in-travis-yml
+  * Merge pull request #921 from swrobel/patch-1
+  * Merge pull request #924 from tbrisker/patch-1
+
+=== 3.1.0 / 2016-03-05
+
+* 1 minor feature:
+  * Add 'import' directive to config file. Fixes #916
+
+* 5 bug fixes:
+  * Add 'fetch' to options. Fixes #913
+  * Fix jruby daemonization. Fixes #918
+  * Recreate the proper args manually. Fixes #910
+  * Require 'time' to get iso8601. Fixes #914
+
+=== 3.0.2 / 2016-02-26
+
+* 5 bug fixes:
+
+  * Fix 'undefined local variable or method `pid` for #<Puma::ControlCLI:0x007f185fcef968>' when execute pumactl with `--pid` option.
+  * Fix 'undefined method `windows?` for Puma:Module' when execute pumactl.
+  * Harden tmp_restart against errors related to the restart file
+  * Make `plugin :tmp_restart` behavior correct in Windows.
+  * fix uninitialized constant Puma::ControlCLI::StateFile
+
+* 3 PRs merged:
+
+  * Merge pull request #901 from mitto/fix-pumactl-uninitialized-constant-statefile
+  * Merge pull request #902 from corrupt952/fix_undefined_method_and_variable_when_execute_pumactl
+  * Merge pull request #905 from Eric-Guo/master
+
+=== 3.0.1 / 2016-02-25
+
+* 1 bug fix:
+
+  * Removed the experimental support for async.callback as it broke
+    websockets entirely. Seems no server has both hijack and async.callback
+    and thus faye is totally confused what to do and doesn't work.
+
+=== 3.0.0 / 2016-02-25
+
+* 2 major changes:
+
+  * Ruby pre-2.0 is no longer supported. We'll do our best to not add
+    features that break those rubies but will no longer be testing
+    with them.
+  * Don't log requests by default. Fixes #852
+
+* 2 major features:
+
+  * Plugin support! Plugins can interact with configuration as well
+    as provide augment server functionality!
+  * Experimental env['async.callback'] support
+
+* 4 minor features:
+
+  * Listen to unix socket with provided backlog if any
+  * Improves the clustered stats to report worker stats
+  * Pass the env to the lowlevel_error handler. Fixes #854
+  * Treat path-like hosts as unix sockets. Fixes #824
+
+* 5 bug fixes:
+
+  * Clean thread locals when using keepalive. Fixes #823
+  * Cleanup compiler warnings. Fixes #815
+  * Expose closed? for use by the reactor. Fixes #835
+  * Move signal handlers to separate method to prevent space leak. Fixes #798
+  * Signal not full on worker exit #876
+
+* 5 doc fixes:
+
+  * Update README.md with various grammar fixes
+  * Use newest version of Minitest
+  * Add directory configuration docs, fix typo [ci skip]
+  * Remove old COPYING notice. Fixes #849
+
+* 10 merged PRs:
+
+  * Merge pull request #871 from deepj/travis
+  * Merge pull request #874 from wallclockbuilder/master
+  * Merge pull request #883 from dadah89/igor/trim_only_worker
+  * Merge pull request #884 from uistudio/async-callback
+  * Merge pull request #888 from mlarraz/tick_minitest
+  * Merge pull request #890 from todd/directory_docs
+  * Merge pull request #891 from ctaintor/improve_clustered_status
+  * Merge pull request #893 from spastorino/add_missing_require
+  * Merge pull request #897 from zendesk/master
+  * Merge pull request #899 from kch/kch-readme-fixes
+
+=== 2.16.0 / 2016-01-27
+
+* 7 minor features:
+
+  * Add 'set_remote_address' config option
+  * Allow to run puma in silent mode
+  * Expose cli options in DSL
+  * Support passing JRuby keystore info in ssl_bind DSL
+  * Allow umask for unix:/// style control urls
+  * Expose `old_worker_count` in stats url
+  * Support TLS client auth (verify_mode) in jruby
+
+* 7 bug fixes:
+
+  * Don't persist before_fork hook in state file
+  * Reload bundler before pulling in rack. Fixes #859
+  * Remove NEWRELIC_DISPATCHER env variable
+  * Cleanup C code
+  * Use Timeout.timeout instead of Object.timeout
+  * Make phased restarts faster
+  * Ignore the case of certain headers, because HTTP
+
+* 1 doc changes:
+
+  * Test against the latest Ruby 2.1, 2.2, 2.3, head and JRuby 9.0.4.0 on Travis
+
+* 12 merged PRs
+  * Merge pull request #822 from kwugirl/remove_NEWRELIC_DISPATCHER
+  * Merge pull request #833 from joemiller/jruby-client-tls-auth
+  * Merge pull request #837 from YuriSolovyov/ssl-keystore-jruby
+  * Merge pull request #839 from mezuka/master
+  * Merge pull request #845 from deepj/timeout-deprecation
+  * Merge pull request #846 from sriedel/strip_before_fork
+  * Merge pull request #850 from deepj/travis
+  * Merge pull request #853 from Jeffrey6052/patch-1
+  * Merge pull request #857 from zendesk/faster_phased_restarts
+  * Merge pull request #858 from mlarraz/fix_some_warnings
+  * Merge pull request #860 from zendesk/expose_old_worker_count
+  * Merge pull request #861 from zendesk/allow_control_url_umask
+
+=== 2.15.3 / 2015-11-07
+
+* 1 bug fix:
+
+  * Fix JRuby parser
+
+=== 2.15.2 / 2015-11-06
+
+* 2 bug fixes:
+  * ext/puma_http11: handle duplicate headers as per RFC
+  * Only set ctx.ca iff there is a params['ca'] to set with.
+
+* 2 PRs merged:
+  * Merge pull request #818 from unleashed/support-duplicate-headers
+  * Merge pull request #819 from VictorLowther/fix-ca-and-verify_null-exception
+
+=== 2.15.1 / 2015-11-06
+
+* 1 bug fix:
+
+  * Allow older openssl versions
+
+=== 2.15.0 / 2015-11-06
+
+* 6 minor features:
+  * Allow setting ca without setting a verify mode
+  * Make jungle for init.d support rbenv
+  * Use SSL_CTX_use_certificate_chain_file for full chain
+  * cluster: add worker_boot_timeout option
+  * configuration: allow empty tags to mean no tag desired
+  * puma/cli: support specifying STD{OUT,ERR} redirections and append mode
+
+* 5 bug fixes:
+  * Disable SSL Compression
+  * Fix bug setting worker_directory when using a symlink directory
+  * Fix error message in DSL that was slightly inaccurate
+  * Pumactl: set correct process name. Fixes #563
+  * thread_pool: fix race condition when shutting down workers
+
+* 10 doc fixes:
+  * Add before_fork explanation in Readme.md
+  * Correct spelling in DEPLOYMENT.md
+  * Correct spelling in docs/nginx.md
+  * Fix spelling errors.
+  * Fix typo in deployment description
+  * Fix typos (it's -> its) in events.rb and server.rb
+  * fixing for typo mentioned in #803
+  * Spelling correction for README
+  * thread_pool: fix typos in comment
+  * More explicit docs for worker_timeout
+
+* 18 PRs merged:
+  * Merge pull request #768 from nathansamson/patch-1
+  * Merge pull request #773 from rossta/spelling_corrections
+  * Merge pull request #774 from snow/master
+  * Merge pull request #781 from sunsations/fix-typo
+  * Merge pull request #791 from unleashed/allow_empty_tags
+  * Merge pull request #793 from robdimarco/fix-working-directory-symlink-bug
+  * Merge pull request #794 from peterkeen/patch-1
+  * Merge pull request #795 from unleashed/redirects-from-cmdline
+  * Merge pull request #796 from cschneid/fix_dsl_message
+  * Merge pull request #799 from annafw/master
+  * Merge pull request #800 from liamseanbrady/fix_typo
+  * Merge pull request #801 from scottjg/ssl-chain-file
+  * Merge pull request #802 from scottjg/ssl-crimes
+  * Merge pull request #804 from burningTyger/patch-2
+  * Merge pull request #809 from unleashed/threadpool-fix-race-in-shutdown
+  * Merge pull request #810 from vlmonk/fix-pumactl-restart-bug
+  * Merge pull request #814 from schneems/schneems/worker_timeout-docs
+  * Merge pull request #817 from unleashed/worker-boot-timeout
+
+=== 2.14.0 / 2015-09-18
+
+* 1 minor feature:
+  * Make building with SSL support optional
+
+* 1 bug fix:
+  * Use Rack::Builder if available. Fixes #735
+
+=== 2.13.4 / 2015-08-16
+
+* 1 bug fix:
+  * Use the environment possible set by the config early and from
+    the config file later (if set).
+
+=== 2.13.3 / 2015-08-15
+
+Seriously, I need to revamp config with tests.
+
+* 1 bug fix:
+  * Fix preserving options before cleaning for state. Fixes #769
+
+=== 2.13.2 / 2015-08-15
+
+The "clearly I don't have enough tests for the config" release.
+
+* 1 bug fix:
+  * Fix another place binds wasn't initialized. Fixes #767
+
+=== 2.13.1 / 2015-08-15
+
+* 2 bug fixes:
+  * Fix binds being masked in config files. Fixes #765
+  * Use options from the config file properly in pumactl. Fixes #764
+
+=== 2.13.0 / 2015-08-14
+
+* 1 minor feature:
+  * Add before_fork hooks option.
+
+* 3 bug fixes:
+  * Check for OPENSSL_NO_ECDH before using ECDH
+  * Eliminate logging overhead from JRuby SSL
+  * Prefer cli options over config file ones. Fixes #669
+
+* 1 deprecation:
+  * Add deprecation warning to capistrano.rb. Fixes #673
+
+* 4 PRs merged:
+  * Merge pull request #668 from kcollignon/patch-1
+  * Merge pull request #754 from nathansamson/before_boot
+  * Merge pull request #759 from BenV/fix-centos6-build
+  * Merge pull request #761 from looker/no-log
+
+=== 2.12.3 / 2015-08-03
+
+* 8 minor bugs fixed:
+  * Fix Capistrano 'uninitialized constant Puma' error.
+  * Fix some ancient and incorrect error handling code
+  * Fix uninitialized constant error
+  * Remove toplevel rack interspection, require rack on load instead
+  * Skip empty parts when chunking
+  * Switch from inject to each in config_ru_binds iteration
+  * Wrap SSLv3 spec in version guard.
+  * ruby 1.8.7 compatibility patches
+
+* 4 PRs merged:
+  * Merge pull request #742 from deivid-rodriguez/fix_missing_require
+  * Merge pull request #743 from matthewd/skip-empty-chunks
+  * Merge pull request #749 from huacnlee/fix-cap-uninitialized-puma-error
+  * Merge pull request #751 from costi/compat_1_8_7
+
+* 1 test fix:
+  * Add 1.8.7, rbx-1 (allow failures) to Travis.
+
+=== 2.12.2 / 2015-07-17
+
+* 2 bug fix:
+  * Pull over and use Rack::URLMap. Fixes #741
+  * Stub out peercert on JRuby for now. Fixes #739
+
+=== 2.12.1 / 2015-07-16
+
+* 2 bug fixes:
+  * Use a constant format. Fixes #737
+  * Use strerror for Windows sake. Fixes #733
+
+* 1 doc change:
+  * typo fix: occured -> occurred
+
+* 1 PR merged:
+  * Merge pull request #736 from paulanunda/paulanunda/typo-fix
+
+=== 2.12.0 / 2015-07-14
+
+* 13 bug fixes:
+  * Add thread reaping to thread pool
+  * Do not automatically use chunked responses when hijacked
+  * Do not suppress Content-Length on partial hijack
+  * Don't allow any exceptions to terminate a thread
+  * Handle ENOTCONN client disconnects when setting REMOTE_ADDR
+  * Handle very early exit of cluster mode. Fixes #722
+  * Install rack when running tests on travis to use rack/lint
+  * Make puma -v and -h return success exit code
+  * Make pumactl load config/puma.rb by default
+  * Pass options from pumactl properly when pruning. Fixes #694
+  * Remove rack dependency. Fixes #705
+  * Remove the default Content-Type: text/plain
+  * Add Client Side Certificate Auth
+
+* 8 doc/test changes:
+  * Added example sourcing of environment vars
+  * Added tests for bind configuration on rackup file
+  * Fix example config text
+  * Update DEPLOYMENT.md
+  * Update Readme with example of custom error handler
+  * ci: Improve Travis settings
+  * ci: Start running tests against JRuby 9k on Travis
+  * ci: Convert to container infrastructure for travisci
+
+* 2 ops changes:
+  * Check for system-wide rbenv
+  * capistrano: Add additional env when start rails
+
+* 16 PRs merged:
+  * Merge pull request #686 from jjb/patch-2
+  * Merge pull request #693 from rob-murray/update-example-config
+  * Merge pull request #697 from spk/tests-bind-on-rackup-file
+  * Merge pull request #699 from deees/fix/require_rack_builder
+  * Merge pull request #701 from deepj/master
+  * Merge pull request #702 from Jimdo/thread-reaping
+  * Merge pull request #703 from deepj/travis
+  * Merge pull request #704 from grega/master
+  * Merge pull request #709 from lian/master
+  * Merge pull request #711 from julik/master
+  * Merge pull request #712 from yakara-ltd/pumactl-default-config
+  * Merge pull request #715 from RobotJiang/master
+  * Merge pull request #725 from rwz/master
+  * Merge pull request #726 from strenuus/handle-client-disconnect
+  * Merge pull request #729 from allaire/patch-1
+  * Merge pull request #730 from iamjarvo/container-infrastructure
+
+=== 2.11.3 / 2015-05-18
+
+* 5 bug fixes:
+  * Be sure to unlink tempfiles after a request. Fixes #690
+  * Coerce the key to a string before checking. (thar be symbols). Fixes #684
+  * Fix hang on bad SSL handshake
+  * Remove `enable_SSLv3` support from JRuby
+
+* 1 PR merged:
+  * Merge pull request #698 from looker/hang-handshake
+
+=== 2.11.2 / 2015-04-11
+
+* 2 minor features:
+  * Add `on_worker_fork` hook, which allows to mimic Unicorn's behavior
+  * Add shutdown_debug config option
+
+* 4 bug fixes:
+  * Fix the Config constants not being available in the DSL. Fixes #683
+  * Ignore multiple port declarations
+  * Proper 'Connection' header handling compatible with HTTP 1.[01] protocols
+  * Use "Puma" instead of "puma" to reporting to New Relic
+
+* 1 doc fixes:
+  * Add Gitter badge.
+
+* 6 PRs merged:
+  * Merge pull request #657 from schneems/schneems/puma-once-port
+  * Merge pull request #658 from Tomohiro/newrelic-dispatcher-default-update
+  * Merge pull request #662 from basecrm/connection-compatibility
+  * Merge pull request #664 from fxposter/on-worker-fork
+  * Merge pull request #667 from JuanitoFatas/doc/gemspec
+  * Merge pull request #672 from chulkilee/refactor
+
+=== 2.11.1 / 2015-02-11
+
+* 2 bug fixes:
+  * Avoid crash in strange restart conditions
+  * Inject the GEM_HOME that bundler into puma-wild's env. Fixes #653
+
+* 2 PRs merged:
+  * Merge pull request #644 from bpaquet/master
+  * Merge pull request #646 from mkonecny/master
+
+=== 2.11.0 / 2015-01-20
+
+* 9 bug fixes:
+  * Add mode as an additional bind option to unix sockets. Fixes #630
+  * Advertise HTTPS properly after a hot restart
+  * Don't write lowlevel_error_handler to state
+  * Fix phased restart with stuck requests
+  * Handle spaces in the path properly. Fixes #622
+  * Set a default REMOTE_ADDR to avoid using peeraddr on unix sockets. Fixes #583
+  * Skip device number checking on jruby. Fixes #586
+  * Update extconf.rb to compile correctly on OS X
+  * redirect io right after daemonizing so startup errors are shown. Fixes #359
+
+* 6 minor features:
+  * Add a configuration option that prevents puma from queueing requests.
+  * Add reload_worker_directory
+  * Add the ability to pass environment variables to the init script (for Jungle).
+  * Add the proctitle tag to the worker. Fixes #633
+  * Infer a proctitle tag based on the directory
+  * Update lowlevel error message to be more meaningful.
+
+* 10 PRs merged:
+  * Merge pull request #478 from rubencaro/master
+  * Merge pull request #610 from kwilczynski/master
+  * Merge pull request #611 from jasonl/better-lowlevel-message
+  * Merge pull request #616 from jc00ke/master
+  * Merge pull request #623 from raldred/patch-1
+  * Merge pull request #628 from rdpoor/master
+  * Merge pull request #634 from deepj/master
+  * Merge pull request #637 from raskhadafi/patch-1
+  * Merge pull request #639 from ebeigarts/fix-phased-restarts
+  * Merge pull request #640 from codehotter/issue-612-dependent-requests-deadlock
+
+=== 2.10.2 / 2014-11-26
+
+* 1 bug fix:
+  * Conditionalize thread local cleaning, fixes perf degradation fix
+    The code to clean out all Thread locals adds pretty significant
+    overhead to a each request, so it has to be turned on explicitly
+    if a user needs it.
+
+=== 2.10.1 / 2014-11-24
+
+* 1 bug fix:
+  * Load the app after daemonizing because the app might start threads.
+
+  This change means errors loading the app are now reported only in the redirected
+  stdout/stderr.
+
+  If you're app has problems starting up, start it without daemon mode initially
+  to test.
+
+=== 2.10.0 / 2014-11-23
+
+* 3 minor features:
+  * Added on_worker_shutdown hook mechanism
+  * Allow binding to ipv6 addresses for ssl URIs
+  * Warn about any threads started during app preload
+
+* 5 bug fixes:
+  * Clean out a threads local data before doing work
+  * Disable SSLv3. Fixes #591
+  * First change the directory to use the correct Gemfile.
+  * Only use config.ru binds if specified. Fixes #606
+  * Strongish cipher suite with FS support for some browsers
+
+* 2 doc changes:
+  * Change umask examples to more permissive values
+  * fix typo in README.md
+
+* 9 Merged PRs:
+  * Merge pull request #560 from raskhadafi/prune_bundler-bug
+  * Merge pull request #566 from sheltond/master
+  * Merge pull request #593 from andruby/patch-1
+  * Merge pull request #594 from hassox/thread-cleanliness
+  * Merge pull request #596 from burningTyger/patch-1
+  * Merge pull request #601 from sorentwo/friendly-umask
+  * Merge pull request #602 from 1334/patch-1
+  * Merge pull request #608 from Gu1/master
+  * Merge remote-tracking branch 'origin/pr/538'
+
+=== 2.9.2 / 2014-10-25
+
+* 8 bug fixes:
+  * Fix puma-wild handling a restart properly. Fixes #550
+  * JRuby SSL POODLE update
+  * Keep deprecated features warnings
+  * Log the current time when Puma shuts down.
+  * Fix cross-platform extension library detection
+  * Use the correct Windows names for OpenSSL.
+  * Better error logging during startup
+  * Fixing sexist error messages
+
+* 6 PRs merged:
+  * Merge pull request #549 from bsnape/log-shutdown-time
+  * Merge pull request #553 from lowjoel/master
+  * Merge pull request #568 from mariuz/patch-1
+  * Merge pull request #578 from danielbuechele/patch-1
+  * Merge pull request #581 from alexch/slightly-better-logging
+  * Merge pull request #590 from looker/jruby_disable_sslv3
+
+=== 2.9.1 / 2014-09-05
+
+* 4 bug fixes:
+  * Cleanup the SSL related structures properly, fixes memory leak
+  * Fix thread spawning edge case.
+  * Force a worker check after a worker boots, don't wait 5sec. Fixes #574
+  * Implement SIGHUP for logs reopening
+
+* 2 PRs merged:
+  * Merge pull request #561 from theoldreader/sighup
+  * Merge pull request #570 from havenwood/spawn-thread-edge-case
+
+=== 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:
+  * During upgrade, change directory in main process instead of workers.
+  * Close the client properly on error
+  * Capistrano: fallback from phased restart to start when not started
+  * Allow tag option in conf file
+
+* 4 doc fixes:
+  * Fix Puma daemon service README typo
+  * `preload_app!` instead of `preload_app`
+  * add preload_app and prune_bundler to example config
+  * allow changing of worker_timeout in config file
+
+* 11 PRs merged:
+  * Merge pull request #487 from ckuttruff/master
+  * Merge pull request #492 from ckuttruff/master
+  * Merge pull request #493 from alepore/config_tag
+  * Merge pull request #503 from mariuz/patch-1
+  * Merge pull request #505 from sammcj/patch-1
+  * Merge pull request #506 from FlavourSys/config_worker_timeout
+  * Merge pull request #510 from momer/rescue-block-handle-servers-fix
+  * Merge pull request #511 from macool/patch-1
+  * Merge pull request #514 from edogawaconan/refactor_env
+  * Merge pull request #517 from misfo/patch-1
+  * Merge pull request #518 from LongMan/master
+
+=== 2.8.1 / 2014-03-06
+
+* 1 bug fixes:
+  * Run puma-wild with proper deps for prune_bundler
+
+* 2 doc changes:
+  * Described the configuration file finding behavior added in 2.8.0 and how to disable it.
+  * Start the deployment doc
+
+* 6 PRs merged:
+  * Merge pull request #471 from arthurnn/fix_test
+  * Merge pull request #485 from joneslee85/patch-9
+  * Merge pull request #486 from joshwlewis/patch-1
+  * Merge pull request #490 from tobinibot/patch-1
+  * Merge pull request #491 from brianknight10/clarify-no-config
+
+=== 2.8.0 / 2014-02-28
+
+* 8 minor features:
+  * Add ability to autoload a config file. Fixes #438
+  * Add ability to detect and terminate hung workers. Fixes #333
+  * Add booted_workers to stats response
+  * Add config to customize the default error message
+  * Add prune_bundler option
+  * Add worker indexes, expose them via on_worker_boot. Fixes #440
+  * Add pretty process name
+  * Show the ruby version in use
+
+* 7 bug fixes:
+  * Added 408 status on timeout.
+  * Be more hostile with sockets that write block. Fixes #449
+  * Expect at_exit to exclusively remove the pidfile. Fixes #444
+  * Expose latency and listen backlog via bind query. Fixes #370
+  * JRuby raises IOError if the socket is there. Fixes #377
+  * Process requests fairly. Fixes #406
+  * Rescue SystemCallError as well. Fixes #425
+
+* 4 doc changes:
+  * Add 2.1.0 to the matrix
+  * Add Code Climate badge to README
+  * Create signals.md
+  * Set the license to BSD. Fixes #432
+
+* 14 PRs merged:
+  * Merge pull request #428 from alexeyfrank/capistrano_default_hooks
+  * Merge pull request #429 from namusyaka/revert-const_defined
+  * Merge pull request #431 from mrb/master
+  * Merge pull request #433 from alepore/process-name
+  * Merge pull request #437 from ibrahima/master
+  * Merge pull request #446 from sudara/master
+  * Merge pull request #451 from pwiebe/status_408
+  * Merge pull request #453 from joevandyk/patch-1
+  * Merge pull request #470 from arthurnn/fix_458
+  * Merge pull request #472 from rubencaro/master
+  * Merge pull request #480 from jjb/docs-on-running-test-suite
+  * Merge pull request #481 from schneems/master
+  * Merge pull request #482 from prathamesh-sonpatki/signals-doc-cleanup
+  * Merge pull request #483 from YotpoLtd/master
+
+=== 2.7.1 / 2013-12-05
+
+* 1 bug fix:
+
+  * Keep STDOUT/STDERR the right mode. Fixes #422
+
 === 2.7.0 / 2013-12-03
 
 * 1 minor feature:
@@ -221,7 +844,7 @@ RailsConf 2013 edition!
   * Close the binder in the right place. Fixes #192
   * Handle early term in workers. Fixes #206
   * Make sure that the default port is 80 when the request doesn't include HTTP_X_FORWARDED_PROTO.
-  * Prevent Errno::EBADF errors on restart when running ruby 2.0 
+  * Prevent Errno::EBADF errors on restart when running ruby 2.0
   * Record the proper @master_pid
   * Respect the header HTTP_X_FORWARDED_PROTO when the host doesn't include a port number.
   * Retry EAGAIN/EWOULDBLOCK during syswrite