merge revision(s) 25230:25233:

	* lib/cgi.rb (CGI.unescapeHTML): fix for hex values 80-FF,
	  single-byte hex entity encodings from 80-FF are valid HTML.
		[ruby-core:25702]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f64fa85914..2bb49e4cc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 19 18:03:31 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi.rb (CGI.unescapeHTML): fix for hex values 80-FF,
+	  single-byte hex entity encodings from 80-FF are valid HTML.
+		[ruby-core:25702]
+
 Thu Nov 19 15:34:40 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_io_fptr_finalize): free fptr to avoid memory leaks.
diff --git a/lib/cgi.rb b/lib/cgi.rb
index c999503a59..6d299798e6 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -385,7 +385,7 @@ class CGI
           end
         end
       when /\A#x([0-9a-f]+)\z/ni then
-        if $1.hex < 256
+        if $1.hex < 128
           $1.hex.chr
         else
           if $1.hex < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
diff --git a/version.h b/version.h
index 30d64c5d5c..f99e8d00e0 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-11-19"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091119
-#define RUBY_PATCHLEVEL 214
+#define RUBY_PATCHLEVEL 215
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8