summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-07 07:37:23 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-07 07:37:23 +0000
commit6d58b1e54fa9b801382e18f49aff805bba7f7c85 (patch)
treed9b5142755a2b3a293c8e077b54c8afa0bc0ed71
parentddf88ea80bf1cd09bba74916a4e8836ecca71910 (diff)
* ext/json/lib/json/pure/generator.rb (utf8_to_json):
downcase the result of Unicode escape. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/json/lib/json/pure/generator.rb2
-rw-r--r--version.h6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c4bed9f0cc7..03a83498342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 7 16:35:41 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/json/lib/json/pure/generator.rb (utf8_to_json):
+ downcase the result of Unicode escape.
+
Mon Oct 6 16:44:52 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
* lib/cgi/core.rb (CGI::QueryExtension::initialize_query): fix the
diff --git a/ext/json/lib/json/pure/generator.rb b/ext/json/lib/json/pure/generator.rb
index 91bdc0ff410..b44e42ac41e 100644
--- a/ext/json/lib/json/pure/generator.rb
+++ b/ext/json/lib/json/pure/generator.rb
@@ -52,7 +52,7 @@ module JSON
)/nx) { |c|
c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
c = c.unpack("U*")[0]
- c > 0xFFFF ? ('\uD%03X\uD%03X' % [0x7C0+c/1024, 0xC00+c%1024]) : ('\u%04X'%c)
+ c > 0xFFFF ? ('\ud%03x\ud%03x' % [0x7C0+c/1024, 0xC00+c%1024]) : ('\u%04x'%c)
}
string
end
diff --git a/version.h b/version.h
index 6123aa99b05..8497ca1f91c 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-10-06"
+#define RUBY_RELEASE_DATE "2008-10-07"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20081006
+#define RUBY_RELEASE_CODE 20081007
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 7
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];