summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--io.c2
-rw-r--r--version.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dd05df8a57..1fa259d75d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 23 22:29:08 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * io.c (io_fillbuf): fixes a mistake on merging r30280, at r30321.
+
Thu Dec 23 06:35:41 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* lib/net/smtp.rb: Net::SMTP should close the SSL connection if the
diff --git a/io.c b/io.c
index 2b40b08f0f..268d8d7ba3 100644
--- a/io.c
+++ b/io.c
@@ -1212,7 +1212,7 @@ io_fillbuf(rb_io_t *fptr)
fptr->rbuf_capa = IO_RBUF_CAPA_FOR(fptr);
fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
#ifdef _WIN32
- fptr->rbuf.capa--;
+ fptr->rbuf_capa--;
#endif
}
if (fptr->rbuf_len == 0) {
diff --git a/version.h b/version.h
index bfb6b2b6e4..95fbf9b257 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 130
+#define RUBY_PATCHLEVEL 131
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1