Prepare for 1.2.0 release.

evan · Apr 28, 2010 · 08b502e · 08b502e
1 parent 0418837
commit 08b502e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/History.txt b/History.txt
@@ -1,4 +1,4 @@
-=== 1.2.0.pre2 / 2010-03-18
+=== 1.2.0 / 2010-04-28
 
 Improvements:
 

diff --git a/ext/http11/http11.c b/ext/http11/http11.c
@@ -515,7 +515,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.2.0.pre2"); /* XXX Why is this defined here? */
+  DEF_GLOBAL(mongrel_version, "Mongrel 1.2.0"); /* XXX Why is this defined here? */
   DEF_GLOBAL(server_software, "SERVER_SOFTWARE");
   DEF_GLOBAL(port_80, "80");
 

diff --git a/ext/http11/org/jruby/mongrel/Http11.java b/ext/http11/org/jruby/mongrel/Http11.java
@@ -183,7 +183,7 @@ public void call(Object data, int at, int length) {
 
                 req.setInstanceVariable("@http_body", RubyString.newString(runtime, new ByteList(hp.parser.buffer, at, length)));
                 req.op_aset(context, runtime.newString("SERVER_PROTOCOL"),runtime.newString("HTTP/1.1"));
-                req.op_aset(context, runtime.newString("SERVER_SOFTWARE"),runtime.newString("Mongrel 1.2.0.pre2"));
+                req.op_aset(context, runtime.newString("SERVER_SOFTWARE"),runtime.newString("Mongrel 1.2.0"));
             }
         };
 

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.2.0.pre2".freeze
+    MONGREL_VERSION = VERSION = "1.2.0".freeze
 
     MONGREL_TMP_BASE="mongrel".freeze