Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merge revision(s) 26140:

?\012
	* ext/stringio/stringio.c (strio_getline): fix for "" as separator.
	  [ruby-dev:34591] (Backport r17739 by Yusuke Endoh from trunk).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>



git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@29904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit e0992d877dcef47aa00f6418da88ed766df31f79 1 parent 688b6c8
@shyouhei shyouhei authored
Showing with 8 additions and 3 deletions.
  1. +6 −1 ChangeLog
  2. +1 −1  ext/stringio/stringio.c
  3. +1 −1  version.h
View
7 ChangeLog
@@ -1,4 +1,9 @@
-Thu Jun 19 20:37:00 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Wed Nov 24 13:27:34 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_getline): fix for "" as separator.
+ [ruby-dev:34591] (Backport r17739 by Yusuke Endoh from trunk).
+
+Wed Nov 24 13:27:20 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* lib/net/pop.rb (Net::POP3#set_all_uids): speed
up. a patch from <m-sumi AT techfirm.co.jp> [ruby-list:45047]
View
2  ext/stringio/stringio.c
@@ -933,7 +933,7 @@ strio_getline(argc, argv, ptr)
s = p;
while ((p = memchr(p, '\n', e - p)) && (p != e)) {
if (*++p == '\n') {
- e = p;
+ e = p + 1;
break;
}
}
View
2  version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-11-24"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20101124
-#define RUBY_PATCHLEVEL 320
+#define RUBY_PATCHLEVEL 321
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
Please sign in to comment.
Something went wrong with that request. Please try again.