diff --git a/ChangeLog b/ChangeLog
index 8bf2661dd7..f9be67544b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Aug  7 09:51:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_equal): should check default values.
+
+Fri Aug  2 01:21:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (s_recvfrom): update RSTRING len.
+
 Thu Aug  1 13:51:30 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* io.c (io_fread): return value was longer when EWOULDBLOCK
diff --git a/eval.c b/eval.c
index 96f9775f35..17b7f7de4d 100644
--- a/eval.c
+++ b/eval.c
@@ -1566,7 +1566,7 @@ rb_undef(klass, id)
     VALUE origin;
     NODE *body;
 
-    if (ruby_class == rb_cObject) {
+    if (klass == rb_cObject) {
 	rb_secure(4);
     }
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(klass)) {
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 244b3bc13f..f0e8110656 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -646,6 +646,7 @@ def extmake(target)
 	end
       end
     end
+    $static = $target if $static
     if File.exist?("./Makefile")
       if $static
  	$extlist.push [$static, File.basename($target)]
diff --git a/gc.c b/gc.c
index d9e169c141..9f79e83e32 100644
--- a/gc.c
+++ b/gc.c
@@ -24,11 +24,8 @@
 void re_free_registers _((struct re_registers*));
 void rb_io_fptr_finalize _((struct OpenFile*));
 
-#ifndef setjmp
-#ifdef HAVE__SETJMP
+#if !defined(setjmp) && defined(HAVE__SETJMP)
 #define setjmp(env) _setjmp(env)
-#define longjmp(env,val) _longjmp(env,val)
-#endif
 #endif
 
 /* Make alloca work the best possible way.  */
diff --git a/hash.c b/hash.c
index b9f09eef25..fddbb0129a 100644
--- a/hash.c
+++ b/hash.c
@@ -805,6 +805,8 @@ rb_hash_equal(hash1, hash2)
     if (TYPE(hash2) != T_HASH) return Qfalse;
     if (RHASH(hash1)->tbl->num_entries != RHASH(hash2)->tbl->num_entries)
 	return Qfalse;
+    if (!rb_equal(RHASH(hash1)->ifnone, RHASH(hash2)->ifnone))
+	return Qfalse;
 
     data.tbl = RHASH(hash2)->tbl;
     data.result = Qtrue;
diff --git a/lib/cgi.rb b/lib/cgi.rb
index eb476923e9..7870c8125b 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1273,7 +1273,7 @@ The hash keys are case sensitive. Ask the samples.
       end
       if @output_hidden
         hidden = @output_hidden.collect{|k,v|
-          "<INPUT TYPE=HIDDEN NAME=\"#{k}\" VALUE=\"#{v}\">"
+          "<DIV><INPUT TYPE=HIDDEN NAME=\"#{k}\" VALUE=\"#{v}\"></DIV>"
         }.to_s
         body += hidden
       end