* marshal.c (w_class): should not dump singleton class.

  [ruby-dev:22631]

* marshal.c (class2path): check anonymous class/module before
  checking referable, and allow singleton classes.

* marshal.c (class2path): get class path and check referable.
  [ruby-dev:22588]


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

2 files changed, 9 insertions, 11 deletions

diff --git a/lib/cgi.rb b/lib/cgi.rb
index 460a8b886..17bbdbeab 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1547,14 +1547,9 @@ class CGI
         body = ""
       end
       if @output_hidden
-        hidden = @output_hidden.collect{|k,v|
-          "<INPUT TYPE=HIDDEN NAME=\"#{k}\" VALUE=\"#{v}\">"
+        body += @output_hidden.collect{|k,v|
+          "<INPUT TYPE=\"HIDDEN\" NAME=\"#{k}\" VALUE=\"#{v}\">"
         }.to_s
-        if defined? fieldset
-          body += fieldset{ hidden }
-        else
-          body += hidden
-        end
       end
       super(attributes){body}
     end
diff --git a/lib/thread.rb b/lib/thread.rb
index 3baa95152..8b27356c4 100644
--- a/lib/thread.rb
+++ b/lib/thread.rb
@@ -189,11 +189,14 @@ class ConditionVariable
   # Releases the lock held in +mutex+ and waits; reacquires the lock on wakeup.
   #
   def wait(mutex)
-    mutex.exclusive_unlock do
-      @waiters.push(Thread.current)
-      Thread.stop
+    begin
+      mutex.exclusive_unlock do
+        @waiters.push(Thread.current)
+        Thread.stop
+      end
+    ensure
+      mutex.lock
     end
-    mutex.lock
   end
   
   #