diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-16 03:41:12 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-16 03:41:12 +0000 |
| commit | 4b46ec3491389d581251357225b5e15501b6d086 (patch) | |
| tree | 1cafc8b2b6e7813d1f898385cca973534f5fbf4e | |
| parent | ee2d1bb703a752e28a2a3c6948567e2f1c83c1c4 (diff) | |
merge revision(s) 28997:
* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#set_error):
Fix for possible cross-site scripting (CVE-2010-0541).
Found by Apple, reported by Hideki Yamane.
Patch by Hirokazu Nishio <nishio.hirokazu AT gmail.com>.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | version.h | 10 |
2 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,10 @@ +Sun Aug 15 19:59:58 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#set_error): + Fix for possible cross-site scripting (CVE-2010-0541). + Found by Apple, reported by Hideki Yamane. + Patch by Hirokazu Nishio <nishio.hirokazu AT gmail.com>. + Sat Jul 17 15:19:58 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * configure.in: Change AC_PREREQ from 2.58 to 2.60 because @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2010-07-17" +#define RUBY_RELEASE_DATE "2010-08-16" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20100717 -#define RUBY_PATCHLEVEL 300 +#define RUBY_RELEASE_CODE 20100816 +#define RUBY_PATCHLEVEL 301 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2010 -#define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_MONTH 8 +#define RUBY_RELEASE_DAY 16 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |