about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorzedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>2006-02-14 13:13:14 +0000
committerzedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>2006-02-14 13:13:14 +0000
commita18fa951bb83316829a4c7234527cbde375c16f3 (patch)
tree45bc1b301121cb58b82ba0dc026b8aa0dcdd3f1f
parent709ef400130a3a0eeb47271f4357b90c19a92792 (diff)
downloadunicorn-a18fa951bb83316829a4c7234527cbde375c16f3.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@37 19e92222-5c0b-0410-8929-a290d50e31e9
-rw-r--r--Rakefile2
-rw-r--r--doc/site/src/default.template10
-rw-r--r--doc/site/src/news.page9
-rw-r--r--examples/simpletest.rb2
-rw-r--r--lib/mongrel.rb1
5 files changed, 21 insertions, 3 deletions
diff --git a/Rakefile b/Rakefile
index fdf32d6..872d911 100644
--- a/Rakefile
+++ b/Rakefile
@@ -31,6 +31,6 @@ setup_extension("http11", "http11")
 
 summary = "A small fast HTTP library and server that runs Rails, Camping, and Nitro apps."
 test_file = "test/test_ws.rb"
-setup_gem("mongrel", "0.3.2",  "Zed A. Shaw", summary, ['mongrel_rails'], test_file) do |spec|
+setup_gem("mongrel", "0.3.3",  "Zed A. Shaw", summary, ['mongrel_rails'], test_file) do |spec|
   spec.add_dependency('daemons', '>= 0.4.2')
 end
diff --git a/doc/site/src/default.template b/doc/site/src/default.template
index fbcd8f2..171c5a8 100644
--- a/doc/site/src/default.template
+++ b/doc/site/src/default.template
@@ -46,8 +46,16 @@
         <h4>NEWS</h4>
 
         <dl>
-          <dt>Feb-13-2006</dt>
+          <dt>Feb-14-2006</dt>
+          <dd>
+            <h5><a href="{relocatable: news.html}">Mongrel 0.3.3 Bug Fix</a></h5>
 
+            <p>Very small bug fix that repairs a missing require.</p>
+              <a href="http://rubyforge.org/frs/?group_id=1306" title="Downloads">Download</a>
+              <a href="{relocatable: news.html}"><img src="images/li4.gif" alt="more" /><br /></a></p>
+          </dd>
+
+          <dt>Feb-13-2006</dt>
           <dd>
             <h5><a href="{relocatable: news.html}">Mongrel 0.3.2 Released</a></h5>
 
diff --git a/doc/site/src/news.page b/doc/site/src/news.page
index db2fdc3..d3daa74 100644
--- a/doc/site/src/news.page
+++ b/doc/site/src/news.page
@@ -7,6 +7,15 @@ ordering: 2
 
 h1. Latest News
 
+h2.  Feb-14: Mongrel 0.3.3 Released
+
+This is a very small release that does nothing but add a one line fix
+for a major bug.  Basically, the 0.3.2 release works great with Rails,
+but other runners will have problems since I didn't require the timeout
+library needed.  Everyone should upgrade.
+
+"Download 0.3.3":http://rubyforge.org/frs/?group_id=1306
+
 h2.  Feb-13: Mongrel 0.3.2 Released
 
 Lots of little things people asked for in 0.3.1 release.  Changes are:
diff --git a/examples/simpletest.rb b/examples/simpletest.rb
index 8f78461..f668406 100644
--- a/examples/simpletest.rb
+++ b/examples/simpletest.rb
@@ -7,7 +7,7 @@ class SimpleHandler < Mongrel::HttpHandler
       response.start do |head,out|
         head["Content-Type"] = "text/html"
         results = "<html><body>Your request:<br /><pre>#{request.params.to_yaml}</pre><a href=\"/files\">View the files.</a></body></html>"
-        if not request.params["HTTP_ACCEPT_ENCODING"] == "gzip,deflate"
+        if request.params["HTTP_ACCEPT_ENCODING"] == "gzip,deflate"
           head["Content-Encoding"] = "deflate"
           # send it back deflated
           out << Zlib::Deflate.deflate(results)
diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index 389bf68..faa8832 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -2,6 +2,7 @@ require 'socket'
 require 'http11'
 require 'thread'
 require 'stringio'
+require 'timeout'
 
 # Mongrel module containing all of the classes (include C extensions) for running
 # a Mongrel web server.  It contains a minimalist HTTP server with just enough