Permalink
Browse files

Tag 1.1.5 for release.

git-svn-id: svn://rubyforge.org/var/svn/mongrel/tags/rel_1-1-5@1016 19e92222-5c0b-0410-8929-a290d50e31e9
  • Loading branch information...
1 parent 338984c commit c4ece27b0bcab5d93943411f23658cf95a1e9d0c evanweaver committed May 22, 2008
Showing with 6 additions and 4 deletions.
  1. +2 −0 CHANGELOG
  2. +1 −1 bin/mongrel_rails
  3. +1 −1 ext/http11/http11.c
  4. +1 −1 ext/http11_java/org/jruby/mongrel/Http11.java
  5. +1 −1 lib/mongrel/const.rb
View
@@ -1,4 +1,6 @@
+v1.1.5. Fix bug where num_processors is not actually set from mongrel_rails.
+
v1.1.4. Fix camping handler. Correct treatment of @throttle parameter.
v1.1.3. Fix security flaw of DirHandler; reported on mailing list.
View
@@ -28,7 +28,7 @@ module Mongrel
['-a', '--address ADDR', "Address to bind to", :@address, "0.0.0.0"],
['-l', '--log FILE', "Where to write log messages", :@log_file, "log/mongrel.log"],
['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"],
- ['-n', '--num-procs INT', "Number of processors active before clients denied", :@num_procs, 1024],
+ ['-n', '--num-processors INT', "Number of processors active before clients denied", :@num_processors, 1024],
['-o', '--timeout TIME', "Time to wait (in seconds) before killing a stalled thread", :@timeout, 60],
['-t', '--throttle TIME', "Time to pause (in hundredths of a second) between accepting clients", :@throttle, 0],
['-m', '--mime PATH', "A YAML file that lists additional MIME types", :@mime_map, nil],
View
@@ -384,7 +384,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.4"); /* XXX Why is this defined here? */
+ DEF_GLOBAL(mongrel_version, "Mongrel 1.1.5"); /* XXX Why is this defined here? */
DEF_GLOBAL(server_software, "SERVER_SOFTWARE");
DEF_GLOBAL(port_80, "80");
@@ -215,7 +215,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.aset(runtime.newString("SERVER_PROTOCOL"),runtime.newString("HTTP/1.1"));
- req.aset(runtime.newString("SERVER_SOFTWARE"),runtime.newString("Mongrel 1.1.4"));
+ req.aset(runtime.newString("SERVER_SOFTWARE"),runtime.newString("Mongrel 1.1.5"));
}
};
View
@@ -65,7 +65,7 @@ module Const
REQUEST_URI='REQUEST_URI'.freeze
REQUEST_PATH='REQUEST_PATH'.freeze
- MONGREL_VERSION="1.1.4".freeze
+ MONGREL_VERSION="1.1.5".freeze
MONGREL_TMP_BASE="mongrel".freeze

0 comments on commit c4ece27

Please sign in to comment.