From f9ad2a71a8509c90a8566b5c094cf1a41bd00c9b Mon Sep 17 00:00:00 2001
From: Damian Kaczmarek <rush@rushbase.net>
Date: Wed, 23 Apr 2014 11:20:12 +0200
Subject: [PATCH] Bump http-proxy dependency and remove null agent

Conflicts:
	package.json
---
 modules/proxy.js |  2 +-
 package.json     | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/proxy.js b/modules/proxy.js
index 3de5115..9876478 100644
--- a/modules/proxy.js
+++ b/modules/proxy.js
@@ -33,7 +33,7 @@ function parseEntry(entry) {
   return entry;
 }
 
-var proxy = httpProxy.createProxyServer({agent: null, xfwd: true});
+var proxy = httpProxy.createProxyServer({xfwd: true});
 var regexpHelper = require('../regexpHelper');
 
 var proxyFailErrorHandler;
diff --git a/package.json b/package.json
index 57d3420..0252fc7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "http-master",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "Easy to setup, convenient, universal, parallel, http/https proxy daemon. Setup in 1 minute, run, configure, adapt. Proxying based on excellent node-http-proxy.",
   "main": "master.js",
   "scripts": {
@@ -22,14 +22,18 @@
   ],
   "license": "BSD",
   "dependencies": {
-    "http-proxy": "~1.0.1",
-    "optimist": "~0.6.0",
     "async": "~0.2.9",
-    "extend": "~1.2.1",
+    "bugsnag": "~1.2",
     "es6-shim": "~0.9.2",
+    "extend": "~1.2.1",
+    "http-auth": "~2.1.6",
+    "http-proxy": "^1.1.2",
+    "js-yaml": "~3.0.1",
     "jsonlint-lines": "~1.6.0",
+    "moment": "^2.6.0",
     "node-static": "~0.7.2",
     "node-watch": "~0.3.4",
+    "optimist": "~0.6.0",
     "spdy": "~1.17.22",
     "uid-number": "0.0.3",
     "x509": "git://github.com/CodeCharmLtd/node-x509#parse-pem",