diff --git a/History.txt b/History.txt index c2687f4f..f42f5e26 100644 --- a/History.txt +++ b/History.txt @@ -1,4 +1,4 @@ -=== 1.1.6 / 2009-07-07 +=== 1.2.0.pre / 2009-07-07 Improvements: diff --git a/ext/http11/http11.c b/ext/http11/http11.c index c3892246..c4a1eefe 100644 --- 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.1.6"); /* XXX Why is this defined here? */ + DEF_GLOBAL(mongrel_version, "Mongrel 1.2.0.pre"); /* 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 index 52c83ebe..d339bd2c 100644 --- a/ext/http11/org/jruby/mongrel/Http11.java +++ b/ext/http11/org/jruby/mongrel/Http11.java @@ -183,7 +183,7 @@ public class Http11 extends RubyObject { 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.1.6")); + req.op_aset(context, runtime.newString("SERVER_SOFTWARE"),runtime.newString("Mongrel 1.2.0.pre")); } }; diff --git a/lib/mongrel/const.rb b/lib/mongrel/const.rb index 9d401222..b27987fb 100644 --- a/lib/mongrel/const.rb +++ b/lib/mongrel/const.rb @@ -65,7 +65,7 @@ module Mongrel REQUEST_URI='REQUEST_URI'.freeze REQUEST_PATH='REQUEST_PATH'.freeze - MONGREL_VERSION = VERSION = "1.1.6".freeze + MONGREL_VERSION = VERSION = "1.2.0.pre".freeze MONGREL_TMP_BASE="mongrel".freeze