diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-14 19:17:10 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-14 19:17:10 +0000 |
| commit | 173502e368eb4de5c89b9a3e8ef915e2111d2e3d (patch) | |
| tree | 6bc669ecb58b52262060697a146ddffa9fa72972 | |
| parent | daccc3c197002c267b59b5fde7697aee1053431c (diff) | |
merge revision(s) 20246:
* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_request_line):
use non-greedy match for path retrieval to avoid huge recursion
for insanely long path.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/webrick/httprequest.rb | 2 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 11 insertions, 5 deletions
@@ -3,6 +3,12 @@ Fri Feb 13 19:17:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/logger.rb (ProgName): fixed for svn, based on a patch from Nobuhiro IMAI at [ruby-dev:37108]. +Sun Feb 15 04:15:39 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_request_line): + use non-greedy match for path retrieval to avoid huge recursion + for insanely long path. + Fri Feb 13 19:04:06 2009 Keiju Ishitsuka <keiju@ruby-lang.org> * shell/command-processor.rb: undefined method `top_level_test' in diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb index 1d32293a27..4021259072 100644 --- a/lib/webrick/httprequest.rb +++ b/lib/webrick/httprequest.rb @@ -225,7 +225,7 @@ module WEBrick @request_line = read_line(socket) if socket @request_time = Time.now raise HTTPStatus::EOFError unless @request_line - if /^(\S+)\s+(\S+)(?:\s+HTTP\/(\d+\.\d+))?\r?\n/mo =~ @request_line + if /^(\S+)\s+(\S+?)(?:\s+HTTP\/(\d+\.\d+))?\r?\n/mo =~ @request_line @request_method = $1 @unparsed_uri = $2 @http_version = HTTPVersion.new($3 ? $3 : "0.9") @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-02-13" +#define RUBY_RELEASE_DATE "2009-02-15" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090213 -#define RUBY_PATCHLEVEL 330 +#define RUBY_RELEASE_CODE 20090215 +#define RUBY_PATCHLEVEL 331 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 15 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |