diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-06-16 06:01:52 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-06-16 06:01:52 +0000 |
| commit | a32303e0fcc1dd43de1d1e51442b542deaca8bf5 (patch) | |
| tree | f1da8bbeefaabbac9f4adcab99b039b4e6cb5d64 /railties/lib | |
| parent | 5b3bc3139a1b15054f26092eb95a5fbc8fdc07aa (diff) | |
| download | rails-a32303e0fcc1dd43de1d1e51442b542deaca8bf5.tar.gz rails-a32303e0fcc1dd43de1d1e51442b542deaca8bf5.tar.bz2 rails-a32303e0fcc1dd43de1d1e51442b542deaca8bf5.zip | |
Fixed Webrick to escape + characters in URL's the same way that lighttpd and apache do #1397 [Nicholas Seckar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1433 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/webrick_server.rb | 22 |
1 files changed, 10 insertions, 12 deletions
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" |