Preparation for version 1.1.6

evan · Jul 7, 2009 · eb643b1 · eb643b1
1 parent 518e63b
commit eb643b1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/History.txt b/History.txt
@@ -1,15 +1,24 @@
-=== (unrealeased) / 2009-07-??
+=== 1.1.6 / 2009-07-07
+
+Improvements:
 
-* Rake task project reorganization and reformat using Hoe.
-* Compile extension using rake-compiler
-* Upgraded http11_parser to work with Ragel 6.2
 * Ruby 1.9 early compatbility: Merged commits form Eric Wong.
 * Better RubyGems support thanks to added env she-bang to mongrel_rails executable.
+* Smartly load http11 extension using fat-binary approach.
+
+Bugfixes:
+
 * Fixed proper version reporting under 1.9
 * Consider MinGW as valid Windows platform.
-* Smartly load http11 extension using fat-binary approach.
+
+Reorganization:
+
+* Rake task project reorganization and reformat using Hoe.
+* Compile extension using rake-compiler
+* Upgraded http11_parser to work with Ragel 6.2
 * Deprecated obsolete Windows service example scripts (from 2006!)
 
+
 === 1.1.5 / 2008-05-22
 
 * Fix bug where num_processors is not actually set from mongrel_rails.

diff --git a/Manifest.txt b/Manifest.txt
@@ -13,8 +13,6 @@ examples/camping/tepee.rb
 examples/httpd.conf
 examples/mime.yaml
 examples/mongrel.conf
-examples/mongrel_simple_ctrl.rb
-examples/mongrel_simple_service.rb
 examples/monitrc
 examples/random_thrash.rb
 examples/simpletest.rb

diff --git a/ext/http11/http11.c b/ext/http11/http11.c
@@ -391,7 +391,7 @@ void Init_http11()
   DEF_GLOBAL(server_protocol, "SERVER_PROTOCOL");
   DEF_GLOBAL(server_protocol_value, "HTTP/1.1");
   DEF_GLOBAL(http_host, "HTTP_HOST");
-  DEF_GLOBAL(mongrel_version, "Mongrel 1.1.5"); /* XXX Why is this defined here? */
+  DEF_GLOBAL(mongrel_version, "Mongrel 1.1.6"); /* XXX Why is this defined here? */
   DEF_GLOBAL(server_software, "SERVER_SOFTWARE");
   DEF_GLOBAL(port_80, "80");
 

diff --git a/lib/mongrel/const.rb b/lib/mongrel/const.rb
@@ -65,7 +65,7 @@ module Const
     REQUEST_URI='REQUEST_URI'.freeze
     REQUEST_PATH='REQUEST_PATH'.freeze
 
-    MONGREL_VERSION = VERSION = "1.1.5".freeze
+    MONGREL_VERSION = VERSION = "1.1.6".freeze
 
     MONGREL_TMP_BASE="mongrel".freeze