diff --git a/ChangeLog b/ChangeLog index a3a4a024..36c6510b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +*** current *** + + * 1.3 + +- python tracebacker +- user-governed harakiri +- simplified external plugin development +- Linux namespace mountpoint improvements +- secured subscription system +- merged routers codebase (fastrouter, http, rawrouter) +- https support in the http router +- config report at the end of uWSGI build process +- support for keepalive in the http router +- improved subscription system (multicast and unix socket) +- custom options +- graceful reloads on shared sockets +- configurable log-master buffer size +- extreme-optimizations for the stats subsystem + + *** april 2012 *** * 1.2 [20120430] diff --git a/plugins/rack/rack_plugin.c b/plugins/rack/rack_plugin.c index 4aceb438..1b33855f 100644 --- a/plugins/rack/rack_plugin.c +++ b/plugins/rack/rack_plugin.c @@ -20,7 +20,7 @@ struct uwsgi_option uwsgi_rack_options[] = { {"gemset", required_argument, 0, "load the specified gemset (rvm)", uwsgi_opt_set_str, &ur.gemset, 0}, {"rvm", required_argument, 0, "load the specified gemset (rvm)", uwsgi_opt_set_str, &ur.gemset, 0}, - {"rvm-path", required_argument, 0, "search for rvm in the specifiied directory", uwsgi_opt_add_string_list, &ur.rvm_path, 0}, + {"rvm-path", required_argument, 0, "search for rvm in the specified directory", uwsgi_opt_add_string_list, &ur.rvm_path, 0}, {"rbshell", optional_argument, 0, "run a ruby/irb shell", uwsgi_opt_true, &ur.rb_shell, 0},