shyouhei	2010-11-24 16:38:34 +0900 (Wed, 24 Nov 2010)

  New Revision: 29904

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29904

  Log:
    merge revision(s) 26140:
    
    * 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@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/stringio/stringio.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/stringio/stringio.c
===================================================================
--- ruby_1_8_7/ext/stringio/stringio.c	(revision 29903)
+++ ruby_1_8_7/ext/stringio/stringio.c	(revision 29904)
@@ -933,7 +933,7 @@
 	s = p;
 	while ((p = memchr(p, '\n', e - p)) && (p != e)) {
 	    if (*++p == '\n') {
-		e = p;
+		e = p + 1;
 		break;
 	    }
 	}
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 29903)
+++ ruby_1_8_7/ChangeLog	(revision 29904)
@@ -1,5 +1,10 @@
-Thu Jun 19 20:37:00 2008  Kazuhiro NISHIYAMA  <zn@m...>
+Wed Nov 24 13:27:34 2010  NAKAMURA, Hiroshi  <nahi@r...>
 
+	* 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@m...>
+
 	* lib/net/pop.rb (Net::POP3#set_all_uids): speed
 	  up. a patch from <m-sumi AT techfirm.co.jp> [ruby-list:45047]
 
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 29903)
+++ ruby_1_8_7/version.h	(revision 29904)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/