Merge pull request #584 from nodegit/bump-nan

johnhaley81 · johnhaley81 · commit 13d804c65726 · 2015-05-20T13:14:20.000-07:00
Bump nan
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ env:
   matrix:
     - export NODE_VERSION="0.10"
     - export NODE_VERSION="0.12"
-    - export NODE_VERSION="iojs-v1"
+    - export NODE_VERSION="iojs"
 matrix:
   fast_finish: true
 before_install:
diff --git a/appveyor.yml b/appveyor.yml
@@ -23,13 +23,13 @@ environment:
     - nodejs_version: "0.10"
     - nodejs_version: "0.12"
     # io.js
-    - nodejs_version: "1"
+    - nodejs_version: "2"
 
 matrix:
   fast_finish: true
   allow_failures:
     - nodejs_version: "0.10"
-    - nodejs_version: "1"
+    - nodejs_version: "2"
 
 # Get the latest stable version of Node 0.STABLE.latest
 install:
diff --git a/generate/templates/partials/field_accessors.cc b/generate/templates/partials/field_accessors.cc
@@ -9,7 +9,7 @@
         NanReturnValue(NanNew((int)wrapper->GetValue()->{{ field.name }}));
 
       {% elsif field.isLibgitType | or field.payloadFor %}
-        NanReturnValue(wrapper->{{ field.name }});
+        NanReturnValue(NanNew(wrapper->{{ field.name }}));
 
       {% elsif field.isCallbackFunction %}
         NanReturnValue(wrapper->{{ field.name }}->GetFunction());
diff --git a/package.json b/package.json
@@ -12,8 +12,8 @@
     "version": "1.4.3"
   },
   "http_parser": {
-    "url": "https://github.com/joyent/http-parser/archive/v2.4.2.tar.gz",
-    "version": "2.4.2",
+    "url": "https://github.com/joyent/http-parser/archive/v2.5.0.tar.gz",
+    "version": "2.5.0",
     "0.1": {
       "url": "https://github.com/joyent/http-parser/archive/v2.0.tar.gz",
       "version": "2.0.0"
@@ -70,7 +70,7 @@
     "lcov-result-merger": "^1.0.2",
     "lodash": "^3.8.0",
     "mocha": "^2.2.4",
-    "nan": "~1.7.0",
+    "nan": "^1.8.4",
     "nw-gyp": "^0.12.4",
     "pangyp": "^2.1.0",
     "request": "^2.55.0",
