summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-10-04 20:27:28 +0000
committerEric Wong <normalperson@yhbt.net>2010-10-04 20:27:28 +0000
commit61516865943f1b18370357cd555811807339c1f7 (patch)
treef5b137fa6d857dfd87e5ef32206f8e2954e3d551
parent28fc5a6b069a544389603e817f608a3d09eb0440 (diff)
We no longer unlinking actively listening sockets upon startup
(but continue to unlink dead ones).  This bug could trigger
downtime and nginx failures if a user makes an error and
attempts to start Unicorn while it is already running.

Thanks to Jordan Ritter for the detailed bug report leading to
this fix.

ref: http://mid.gmane.org/8D95A44B-A098-43BE-B532-7D74BD957F31@darkridge.com

There are also minor documentation and test updates pulled in
from master.  This is hopefully the last bugfix release of the
1.1.x series.
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--lib/unicorn/const.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 40adf6d..755e132 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.1.3.GIT
+DEF_VER=v1.1.4.GIT
 
 LF='
 '
diff --git a/lib/unicorn/const.rb b/lib/unicorn/const.rb
index 5743678..a166780 100644
--- a/lib/unicorn/const.rb
+++ b/lib/unicorn/const.rb
@@ -8,8 +8,8 @@ module Unicorn
   # Symbols did not really improve things much compared to constants.
   module Const
 
-    # The current version of Unicorn, currently 1.1.3
-    UNICORN_VERSION="1.1.3"
+    # The current version of Unicorn, currently 1.1.4
+    UNICORN_VERSION="1.1.4"
 
     DEFAULT_HOST = "0.0.0.0" # default TCP listen host address
     DEFAULT_PORT = 8080      # default TCP listen port