001225

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

1 files changed, 4 insertions, 2 deletions

diff --git a/eval.c b/eval.c
index 258842741..ae2ce62da 100644
--- a/eval.c
+++ b/eval.c
@@ -5162,7 +5162,7 @@ rb_feature_p(feature, wait)
   load_wait:
     if (loading_tbl) {
 	char *ext = strrchr(f, '.');
-	if (strcmp(ext, ".rb") == 0) {
+	if (ext && strcmp(ext, ".rb") == 0) {
 	    rb_thread_t th;
 
 	    while (st_lookup(loading_tbl, f, &th)) {
@@ -7177,7 +7177,7 @@ rb_thread_schedule()
     }
 
   again:
-    max = 0;
+    max = -1;
     FD_ZERO(&readfds);
     FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
@@ -8332,6 +8332,7 @@ rb_thread_inspect(thread)
 void
 rb_thread_atfork()
 {
+#if 0				/* enable on 1.7 */
     rb_thread_t th;
 
     if (rb_thread_alone()) return;
@@ -8344,6 +8345,7 @@ rb_thread_atfork()
     main_thread = curr_thread;
     curr_thread->next = curr_thread;
     curr_thread->prev = curr_thread;
+#endif
 }
 
 static VALUE rb_cCont;