Only requests that require processing from a controller should block the webrick server -- requests for stylesheets, images, and the like should be concurrent

David Heinemeier Hansson · David Heinemeier Hansson · commit 12f10f6baf7e · 2004-12-16T16:08:10.000Z
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@189 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb
@@ -27,19 +27,18 @@ def initialize(server, options)
 
   def do_GET(req, res)
     begin
-      REQUEST_MUTEX.lock
-
       unless handle_index(req, res)
         unless handle_dispatch(req, res)
           unless handle_file(req, res)
+            REQUEST_MUTEX.lock
             unless handle_mapped(req, res)
               raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found."
             end
           end
         end
       end
     ensure
-      REQUEST_MUTEX.unlock
+      REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?
     end
   end
 

Original file line number	Original file line	Diff line number	Diff line change
`@@ -27,19 +27,18 @@ def initialize(server, options)`
`27`		`27`
`28`	`def do_GET(req, res)`	`28`	`def do_GET(req, res)`
`29`	`begin`	`29`	`begin`
`30`	`- REQUEST_MUTEX.lock`
`31`	`-`
`32`	`unless handle_index(req, res)`	`30`	`unless handle_index(req, res)`
`33`	`unless handle_dispatch(req, res)`	`31`	`unless handle_dispatch(req, res)`
`34`	`unless handle_file(req, res)`	`32`	`unless handle_file(req, res)`
		`33`	`+ REQUEST_MUTEX.lock`
`35`	`unless handle_mapped(req, res)`	`34`	`unless handle_mapped(req, res)`
`36`	raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found."	`35`	raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found."
`37`	`end`	`36`	`end`
`38`	`end`	`37`	`end`
`39`	`end`	`38`	`end`
`40`	`end`	`39`	`end`
`41`	`ensure`	`40`	`ensure`
`42`	`- REQUEST_MUTEX.unlock`	`41`	`+ REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?`
`43`	`end`	`42`	`end`
`44`	`end`	`43`	`end`
`45`		`44`