Merge remote branch 'origin/v0.4'

Conflicts:
	deps/http_parser/http_parser.c
	deps/http_parser/test.c
	lib/repl.js

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/module.js b/lib/module.js
index 2f8f02ff3..08e8ba155 100644
--- a/lib/module.js
+++ b/lib/module.js
@@ -25,6 +25,15 @@ var runInThisContext = Script.runInThisContext;
 var runInNewContext = Script.runInNewContext;
 var assert = require('assert').ok;
 
+
+// If obj.hasOwnProperty has been overridden, then calling
+// obj.hasOwnProperty(prop) will break.
+// See: https://github.com/joyent/node/issues/1707
+function hasOwnProperty(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+}
+
+
 function Module(id, parent) {
   this.id = id;
   this.exports = {};
@@ -86,7 +95,7 @@ function statPath(path) {
 var packageCache = {};
 
 function readPackage(requestPath) {
-  if (packageCache.hasOwnProperty(requestPath)) {
+  if (hasOwnProperty(packageCache, requestPath)) {
     return packageCache[requestPath];
   }