diff options
| -rw-r--r-- | Rakefile | 2 | ||||
| -rw-r--r-- | bin/mongrel_rails | 3 | ||||
| -rw-r--r-- | doc/site/src/default.template | 9 | ||||
| -rw-r--r-- | doc/site/src/news.page | 20 | ||||
| -rw-r--r-- | ext/http11/http11.c | 2 | ||||
| -rw-r--r-- | lib/mongrel.rb | 10 |
6 files changed, 37 insertions, 9 deletions
@@ -53,7 +53,7 @@ task :site => [:site_webgen, :site_rdoc, :site_coverage, :site_projects_rdoc] setup_extension("http11", "http11") name="mongrel" -version="0.3.13.2" +version="0.3.13.3" setup_gem(name, version) do |spec| spec.summary = "A small fast HTTP library and server that runs Rails, Camping, and Nitro apps." diff --git a/bin/mongrel_rails b/bin/mongrel_rails index 69d953c..f404044 100644 --- a/bin/mongrel_rails +++ b/bin/mongrel_rails @@ -103,6 +103,9 @@ class Start < GemPlugin::Plugin "/commands" if defaults[:debug] log "Installing debugging prefixed filters. Look in log/mongrel_debug for the files." debug "/" + elsif not defaults[:daemon] + # they don't have debug on and aren't in daemon so at least log accesses + debug "/", what = [:files] end log "Starting Rails with #{defaults[:environment]} environment ..." diff --git a/doc/site/src/default.template b/doc/site/src/default.template index 122f078..2f7e88e 100644 --- a/doc/site/src/default.template +++ b/doc/site/src/default.template @@ -48,6 +48,15 @@ <dl> <dt>Jun-25-2006</dt> <dd> + <h5><a href="{relocatable: news.html}">Mongrel 0.3.13.3 -- Ruby Licensed Release</a></h5> + + <p>This release is now licensed under the Ruby license. Enjoy!</p> + <a href="{relocatable: news.html}" title="Read About It">Read About It</a> + <a href="{relocatable: news.html}"><img src="{relocatable: images/li4.gif}" alt="more" /><br /></a></p> + </dd> + + <dt>Jun-25-2006</dt> + <dd> <h5><a href="{relocatable: news.html}">Mongrel 0.3.13.2 -- RailsConf 2006 Release</a></h5> <p>Release from RailsConf that does Upload Progress and defending better.</p> diff --git a/doc/site/src/news.page b/doc/site/src/news.page index 85d020d..9955196 100644 --- a/doc/site/src/news.page +++ b/doc/site/src/news.page @@ -7,11 +7,27 @@ ordering: 2 h1. Latest News -h2. Jun 30: Mongrel 0.3.13.3 -- Ruby Licensed Now +h2. Jun 30: Mongrel 0.3.13.3 -- Ruby Licensed Release After talking with various people deep inside the Ruby machine, I've decided to release Mongrel Ruby licensed as of 0.3.13.3. This release should make -quite a few people happy. +quite a few people happy. It also means that contributors will hopefully +feel better about their contibutions and people using Mongrel have more freedom. + +This release also fixes a problem with the -B option not actually logging +object counts. The object count logging isn't perfect, but some folks use +it. + +This release also will print the access log to the screen when you run it in +your console. This was requested by a few folks, but I'm not convinced I like +it. Try it out and if you do or don't then mention it in the mailing list. + +As usual, do your: + + gem install mongrel + +To get the release, and if it doesn't show up then you have to wait +for the ruby gems mirror to sync up. h2. Jun 25: Mongrel 0.3.13.2 -- RailsConf 2006 Release diff --git a/ext/http11/http11.c b/ext/http11/http11.c index f3f688b..58f2307 100644 --- a/ext/http11/http11.c +++ b/ext/http11/http11.c @@ -539,7 +539,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 0.3.13.2"); + DEF_GLOBAL(mongrel_version, "Mongrel 0.3.13.3"); DEF_GLOBAL(server_software, "SERVER_SOFTWARE"); DEF_GLOBAL(port_80, "80"); diff --git a/lib/mongrel.rb b/lib/mongrel.rb index 03b053a..f2f1a02 100644 --- a/lib/mongrel.rb +++ b/lib/mongrel.rb @@ -120,7 +120,7 @@ module Mongrel # The original URI requested by the client. Passed to URIClassifier to build PATH_INFO and SCRIPT_NAME. REQUEST_URI='REQUEST_URI'.freeze - MONGREL_VERSION="0.3.13.2".freeze + MONGREL_VERSION="0.3.13.3".freeze # TODO: this use of a base for tempfiles needs to be looked at for security problems MONGREL_TMP_BASE="mongrel".freeze @@ -995,21 +995,21 @@ module Mongrel # debug "/", what = [:rails] # # And it will only produce the log/mongrel_debug/rails.log file. - # Available options are: :object, :rails, :files, :threads, :params + # Available options are: :objects, :rails, :files, :threads, :params # # NOTE: Use [:files] to get accesses dumped to stderr like with WEBrick. - def debug(location, what = [:object, :rails, :files, :threads, :params]) + def debug(location, what = [:objects, :rails, :files, :threads, :params]) require 'mongrel/debug' handlers = { :files => "/handlers/requestlog::access", :rails => "/handlers/requestlog::files", - :object => "/handlers/requestlog::objects", + :objects => "/handlers/requestlog::objects", :threads => "/handlers/requestlog::threads", :params => "/handlers/requestlog::params" } # turn on the debugging infrastructure, and ObjectTracker is a pig - ObjectTracker.configure if what.include? :object + ObjectTracker.configure if what.include? :objects MongrelDbg.configure # now we roll through each requested debug type, turn it on and load that plugin |