summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-22 01:23:41 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-22 01:23:41 +0000
commitc467fe9efbd1fddffb8ef3ee5e70a127ec19b21e (patch)
tree5b04f3aab9ae54f46dc25c82babc9f3fc0479209
parent48f695119c6e44851ea39198bd4917745fc0562c (diff)
* lib/base64.rb (Base64::b64encode): should not specify /o option
for regular expression. [ruby-dev:31221] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@13180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/base64.rb2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a5ddd98..7b01512 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 22 10:23:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/base64.rb (Base64::b64encode): should not specify /o option
+ for regular expression. [ruby-dev:31221]
+
Wed Aug 22 10:20:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_f_sprintf): more checks for format argument.
diff --git a/lib/base64.rb b/lib/base64.rb
index 05be9dd..8628d61 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 bf33a95..80212e4 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-08-22"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 66
+#define RUBY_PATCHLEVEL 67
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8