diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-07 10:02:43 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-07 10:02:43 +0000 |
commit | 87d9bb7765e35f78067b5afca574f393ddebf083 (patch) | |
tree | dc97413c04a3244e4ccf66004340229fc6f9e11d /version.h | |
parent | 593230383931ccf75cc4d969af03686d59cc305e (diff) |
merges r32222 from trunk into ruby_1_9_2.
--
* lib/webrick/httprequest.rb (setup_forwarded_info): Parsing request
header failed when the request is from 2 or more Apache reverse
proxies. It's said that all X-Forwarded-* headers will contain more
than one (comma-separated) value if the original request already
contained one of these headers. Since we could use these values as
Host header, we choose the initial(first) value. See #4922.
* test/webrick/test_httprequest.rb (test_forwarded): Test it.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,13 +1,13 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 290 +#define RUBY_PATCHLEVEL 291 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2011 -#define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 9 -#define RUBY_RELEASE_DATE "2011-07-09" +#define RUBY_RELEASE_MONTH 8 +#define RUBY_RELEASE_DAY 7 +#define RUBY_RELEASE_DATE "2011-08-07" #include "ruby/version.h" |