Showing with 35 additions and 35 deletions.
  1. +2 −0 .travis.yml
  2. +31 −34 package.json
  3. +2 −1 test/lib-https-proxy-test.js
@@ -1,6 +1,8 @@
language: node_js
node_js:
- "0.10"
- "0.12"
- "iojs"

notifications:
email:
@@ -1,47 +1,44 @@
{
"name" : "http-proxy",
"version" : "1.10.0",

"repository" : {
"type" : "git",
"url" : "https://github.com/nodejitsu/node-http-proxy.git"
"name": "http-proxy",
"version": "1.10.0",
"repository": {
"type": "git",
"url": "https://github.com/nodejitsu/node-http-proxy.git"
},

"description" : "HTTP proxying for the masses",
"description": "HTTP proxying for the masses",
"author": "Nodejitsu Inc. <info@nodejitsu.com>",
"maintainers" : [
"maintainers": [
"yawnt <yawnt@nodejitsu.com>",
"indexzero <charlie@nodejitsu.com>"
],

"main" : "index.js",

"dependencies" : {
"eventemitter3" : "0.x.x",
"requires-port" : "0.x.x"
"main": "index.js",
"dependencies": {
"eventemitter3": "0.x.x",
"requires-port": "0.x.x"
},
"devDependencies": {
"mocha" : "*",
"expect.js" : "*",
"dox" : "*",
"coveralls" : "*",
"async": "*",
"blanket": "*",
"coveralls": "*",
"dox": "*",
"expect.js": "*",
"mocha": "*",
"mocha-lcov-reporter": "*",
"blanket" : "*",
"ws" : "~0.5.0",
"socket.io" : "*",
"socket.io-client" : "*",
"async" : "*"
"semver": "^4.3.3",
"socket.io": "*",
"socket.io-client": "*",
"ws": "~0.5.0"
},
"scripts" : {
"coveralls" : "mocha --require blanket --reporter mocha-lcov-reporter | ./node_modules/coveralls/bin/coveralls.js",
"blanket" : { "pattern": "lib/http-proxy" },
"test" : "mocha -R landing test/*-test.js",
"test-cov" : "mocha --require blanket -R html-cov > cov/coverage.html"
"scripts": {
"coveralls": "mocha --require blanket --reporter mocha-lcov-reporter | ./node_modules/coveralls/bin/coveralls.js",
"blanket": {
"pattern": "lib/http-proxy"
},
"test": "mocha -R landing test/*-test.js",
"test-cov": "mocha --require blanket -R html-cov > cov/coverage.html"
},

"engines" : {
"node" : ">=0.10.0"
"engines": {
"node": ">=0.10.0"
},

"license" : "MIT"
"license": "MIT"
}
@@ -1,4 +1,5 @@
var httpProxy = require('../lib/http-proxy'),
semver = require('semver'),
expect = require('expect.js'),
http = require('http')
https = require('https'),
@@ -166,7 +167,7 @@ describe('lib/http-proxy.js', function() {

proxy.on('error', function (err, req, res) {
expect(err).to.be.an(Error);
if (process.versions.node.indexOf('0.12.') == 0) {
if (semver.gt(process.versions.node, '0.12.0')) {
expect(err.toString()).to.be('Error: self signed certificate')
} else {
expect(err.toString()).to.be('Error: DEPTH_ZERO_SELF_SIGNED_CERT')