summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-16 16:37:56 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-16 16:37:56 +0000
commitdbfbe18a4080cf22425f2a19f4bc5818a5757ad7 (patch)
treebad24831a473c020c64d8dbdcdca8fbbac0ccbdf
parentb3470a1a45fef7c117cb06a5a90b1ff5ff2e7f1e (diff)
merge revision(s) 18031:
* ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo. [ruby-core:17713] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@18087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/zlib/zlib.c2
-rw-r--r--version.h8
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e441b82..6344850 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 17 01:36:02 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo. [ruby-core:17713]
+
Sun Jul 13 00:07:07 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/ipaddr.rb (IPAddr#initialize): get rid of ArgumentError in
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index d4c5028..306e267 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -2491,7 +2491,7 @@ rb_gzfile_set_mtime(obj, mtime)
rb_raise(cGzError, "header is already written");
}
- if (FIXNUM_P(time)) {
+ if (FIXNUM_P(mtime)) {
gz->mtime = FIX2INT(mtime);
}
else {
diff --git a/version.h b/version.h
index 8261730..473439d 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-07-13"
+#define RUBY_RELEASE_DATE "2008-07-17"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080713
-#define RUBY_PATCHLEVEL 275
+#define RUBY_RELEASE_CODE 20080717
+#define RUBY_PATCHLEVEL 276
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 17
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];