summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-07-16 15:45:35 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-07-16 15:45:35 +0000
commit2d02baa17001052aad8322130fd9f5ebc3792760 (patch)
treee6463a722b9766c0d93bd963ef596fc1c1d717b6
parentcddf2ce8d941c02783fe429ef2f1106ac3b5d322 (diff)
downloadruby-2d02baa17001052aad8322130fd9f5ebc3792760.tar.gz
ruby-2d02baa17001052aad8322130fd9f5ebc3792760.tar.xz
ruby-2d02baa17001052aad8322130fd9f5ebc3792760.zip
* lib/base64.rb (Base64::b64encode): should not specify /o option
for regular expression. [ruby-dev:31221] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/base64.rb2
-rw-r--r--version.h6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a1d43fb1..4e37b000a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 16 23:07:51 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/base64.rb (Base64::b64encode): should not specify /o option
+ for regular expression. [ruby-dev:31221]
+
Mon Jul 16 18:29:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_rindex_m): accept string-like object convertible
diff --git a/lib/base64.rb b/lib/base64.rb
index 731df795b..f062da2b4 100644
--- a/lib/base64.rb
+++ b/lib/base64.rb
@@ -110,7 +110,7 @@ module Base64
# UnVieQ==
def b64encode(bin, len = 60)
- encode64(bin).scan(/.{1,#{len}}/o) do
+ encode64(bin).scan(/.{1,#{len}}/) do
print $&, "\n"
end
end
diff --git a/version.h b/version.h
index 954ee9005..6fc73c76c 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-07-16"
+#define RUBY_RELEASE_DATE "2007-07-17"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070716
+#define RUBY_RELEASE_CODE 20070717
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];