mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
aamine
* lib/net/http.rb: Socket#readline() reads until "\n", not "\r\n" git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c12c7ab1dc
commit
15b9494baa
2 changed files with 6 additions and 3 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
Sat Nov 18 14:07:20 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
|
||||||
|
|
||||||
|
* lib/net/http.rb: Socket#readline() reads until "\n", not "\r\n"
|
||||||
|
|
||||||
Fri Nov 17 14:55:18 2000 WATANABE Hirofumi <eban@ruby-lang.org>
|
Fri Nov 17 14:55:18 2000 WATANABE Hirofumi <eban@ruby-lang.org>
|
||||||
|
|
||||||
* string.c (rb_str_succ): output should be NUL terminated.
|
* string.c (rb_str_succ): output should be NUL terminated.
|
||||||
|
|
|
@ -528,7 +528,7 @@ module Net
|
||||||
|
|
||||||
|
|
||||||
def readline
|
def readline
|
||||||
ret = readuntil( "\r\n" )
|
ret = readuntil( "\n" )
|
||||||
ret.chop!
|
ret.chop!
|
||||||
ret
|
ret
|
||||||
end
|
end
|
||||||
|
@ -538,7 +538,6 @@ module Net
|
||||||
@pipe << "reading text...\n" if @pipe; pipeoff
|
@pipe << "reading text...\n" if @pipe; pipeoff
|
||||||
|
|
||||||
rsize = 0
|
rsize = 0
|
||||||
|
|
||||||
while (str = readuntil("\r\n")) != ".\r\n" do
|
while (str = readuntil("\r\n")) != ".\r\n" do
|
||||||
rsize += str.size
|
rsize += str.size
|
||||||
str.gsub!( /\A\./, '' )
|
str.gsub!( /\A\./, '' )
|
||||||
|
@ -557,9 +556,9 @@ module Net
|
||||||
str = nil
|
str = nil
|
||||||
i = 0
|
i = 0
|
||||||
while (str = readuntil("\r\n")) != ".\r\n" do
|
while (str = readuntil("\r\n")) != ".\r\n" do
|
||||||
|
i += 1
|
||||||
str.chop!
|
str.chop!
|
||||||
yield str
|
yield str
|
||||||
i += 1
|
|
||||||
end
|
end
|
||||||
|
|
||||||
@pipe << "read #{i} items\n" if pipeon
|
@pipe << "read #{i} items\n" if pipeon
|
||||||
|
|
Loading…
Add table
Reference in a new issue