Merge pull request #1 from nodejitsu/master

nicolayr · nicolayr · commit 98b0fbd683db · 2016-05-24T09:59:49.000+02:00
Merge upstream
diff --git a/lib/http-proxy/index.js b/lib/http-proxy/index.js
@@ -1,4 +1,4 @@
-var httpProxy = exports,
+var httpProxy = module.exports,
     extend    = require('util')._extend,
     parse_url = require('url').parse,
     EE3       = require('eventemitter3'),
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "http-proxy",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/nodejitsu/node-http-proxy.git"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var httpProxy = exports,`
	`1`	`+var httpProxy = module.exports,`
`2`	`2`	`extend = require('util')._extend,`
`3`	`3`	`parse_url = require('url').parse,`
`4`	`4`	`EE3 = require('eventemitter3'),`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "http-proxy",`
`3`		`- "version": "1.13.2",`
	`3`	`+ "version": "1.13.3",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "https://github.com/nodejitsu/node-http-proxy.git"`