From b6c5912c25b28868c41d74f1e46f76a714c83fb5 Mon Sep 17 00:00:00 2001 From: John Haley Date: Wed, 13 May 2015 09:47:56 -0700 Subject: [PATCH 1/5] Bump nan again --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c97ff3221..f159d26c4 100644 --- a/package.json +++ b/package.json @@ -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.0", "nw-gyp": "^0.12.4", "pangyp": "^2.1.0", "request": "^2.55.0", From 7fb7e5b07f70df3ffa92f150a18d7c53f017ae2a Mon Sep 17 00:00:00 2001 From: John Haley Date: Wed, 13 May 2015 10:27:29 -0700 Subject: [PATCH 2/5] Fix compile issue with latest nan --- generate/templates/partials/field_accessors.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate/templates/partials/field_accessors.cc b/generate/templates/partials/field_accessors.cc index 03131d6ba..8cb45907d 100644 --- 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()); From a2693d040c873f77eea4a3ed7e551dc416cd460b Mon Sep 17 00:00:00 2001 From: John Haley Date: Sat, 16 May 2015 08:08:05 -0700 Subject: [PATCH 3/5] Change nan version to latest --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f159d26c4..56ab5e1c2 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "lcov-result-merger": "^1.0.2", "lodash": "^3.8.0", "mocha": "^2.2.4", - "nan": "~1.8.0", + "nan": "^1.8.4", "nw-gyp": "^0.12.4", "pangyp": "^2.1.0", "request": "^2.55.0", From b646b64b6dc27ea999c36b6b4d1956f35d70f627 Mon Sep 17 00:00:00 2001 From: John Haley Date: Wed, 20 May 2015 11:27:21 -0700 Subject: [PATCH 4/5] Bump `http-parser` version This should fix linux seg faults with HTTP(S) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 56ab5e1c2..fe176ea59 100644 --- 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" From 2c4f68ed8407b7a2e35377fb8ef85b43e00b848b Mon Sep 17 00:00:00 2001 From: John Haley Date: Wed, 20 May 2015 11:34:55 -0700 Subject: [PATCH 5/5] Bump io.js verison in CI --- .travis.yml | 2 +- appveyor.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cf313285..694fa5479 100644 --- 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 index 43d9c7e82..760e6e5ff 100644 --- 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: