diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/webrick_server.rb | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index bd621c9032..e131245cea 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed Webrick to escape + characters in URL's the same way that lighttpd and apache do #1397 [Nicholas Seckar] + * Added -e/--environment option to script/runner #1408 [fbeausoleil@ftml.net] * Modernize the scaffold generator to use the simplified render and test methods and to change style from @params["id"] to params[:id]. #1367 diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb index dee7713a6b..bd8c287c9b 100644 --- a/railties/lib/webrick_server.rb +++ b/railties/lib/webrick_server.rb @@ -43,28 +43,26 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet def handle_file(req, res) begin - add_dot_html(req) + req = req.dup + + path = req.path.dup + + # Add .html if the last path piece has no . in it + path << '.html' if path != '/' && (%r{(^|/)[^./]+$} =~ path) + path.gsub!('+', ' ') # Unescape + since FileHandler doesn't do so. + + req.instance_variable_set(:@path_info, path) # Set the modified path... + @file_handler.send(:service, req, res) - remove_dot_html(req) return true rescue HTTPStatus::PartialContent, HTTPStatus::NotModified => err res.set_error(err) return true rescue => err return false - ensure - remove_dot_html(req) end end - def add_dot_html(req) - if /^([^.]+)$/ =~ req.path && req.path != "/" then req.instance_variable_set(:@path_info, "#{$1}.html") end - end - - def remove_dot_html(req) - if /^([^.]+).html$/ =~ req.path && req.path != "/" then req.instance_variable_set(:@path_info, $1) end - end - def handle_dispatch(req, res, origin = nil) env = req.meta_vars.clone env.delete "SCRIPT_NAME" |