merge -c 12123

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

1 files changed, 2 insertions, 1 deletions

diff --git a/eval.c b/eval.c
index 014f3f73a..bc657c186 100644
--- a/eval.c
+++ b/eval.c
@@ -7017,7 +7017,8 @@ rb_provided(feature)
 	    return Qfalse;
 	}
 	else if (IS_SOEXT(ext) || IS_DLEXT(ext)) {
-	    return Qfalse;	/* may be overriden by .rb file */
+	    if (rb_feature_p(feature, ext, Qfalse)) return Qtrue;
+	    return Qfalse;
 	}
     }
     if (rb_feature_p(feature, feature + strlen(feature), Qtrue))