* eval.c (rb_thread_restore_context): save current value of

  lastline and lastmatch in the thread struct for later restore.

* eval.c (rb_thread_save_context): restore lastline and lastmatch.

* numeric.c (flo_to_s): should handle negative float value.

* class.c (rb_include_module): should check whole ancestors to
  avoid duplicate module inclusion.

* string.c (trnext): should check backslash before updating "now"
  position.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/resolv.rb b/lib/resolv.rb
index 16cf4b5c8..68b41c65b 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -48,6 +48,7 @@ class Resolv
     def initialize(filename = DefaultFileName)
       @filename = filename
       @mutex = Mutex.new
+      @initialized = nil
     end
 
     def lazy_initialize
@@ -106,6 +107,7 @@ class Resolv
     def initialize(config="/etc/resolv.conf")
       @mutex = Mutex.new
       @config = Config.new(config)
+      @initialized = nil
     end
 
     def lazy_initialize
@@ -157,7 +159,7 @@ class Resolv
           end
           sender.send
           reply = reply_name = nil
-          timeout (tout) { reply, reply_name = q.pop }
+          timeout(tout) { reply, reply_name = q.pop }
           case reply.rcode
           when RCode::NoError
             return extract_resource(reply, reply_name, typeclass)
@@ -385,6 +387,7 @@ class Resolv
       def initialize(filename="/etc/resolv.conf")
         @mutex = Mutex.new
         @filename = filename
+	@initialized = nil
       end
 
       def lazy_initialize