summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-09-11 07:51:48 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-09-11 07:51:48 +0000
commit8b16ef7897e3ab66b3382aefd8c84ffade1e0a2a (patch)
tree14b9ab057d595ddb27ad2dd0141c71785cc02534 /lib
parent9a014d0d2b7c22eba2ca8893905e5f63083398f6 (diff)
* lib/open3.rb: Merge from 1.7: Turn sync on for the writer
handle. * lib/ping.rb: Merge from 1.7: Fix a typo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/open3.rb1
-rw-r--r--lib/ping.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/open3.rb b/lib/open3.rb
index 33701bbfc0..a6e6c5d62b 100644
--- a/lib/open3.rb
+++ b/lib/open3.rb
@@ -40,6 +40,7 @@ module Open3
pe[1].close
Process.waitpid(pid)
pi = [pw[1], pr[0], pe[0]]
+ pw[1].sync = true
if defined? yield
begin
return yield(*pi)
diff --git a/lib/ping.rb b/lib/ping.rb
index d698dd0c52..d90551e671 100644
--- a/lib/ping.rb
+++ b/lib/ping.rb
@@ -44,7 +44,7 @@ module Ping
def pingecho(host, timeout=5, service="echo")
begin
timeout(timeout) do
- s = TCPsocket.new(host, service)
+ s = TCPSocket.new(host, service)
s.close
end
rescue Errno::ECONNREFUSED