From 5d0bbb38c3af14907567e2dc7c4f84a915b60ce5 Mon Sep 17 00:00:00 2001
From: indexzero <charlie.robbins@gmail.com>
Date: Thu, 18 Aug 2011 20:58:16 -0400
Subject: [PATCH] [minor dist] Use `pkginfo`. Minor updates to variable scoping
 in `.createServer()`

---
 lib/node-http-proxy.js | 36 +++++++-----------------------------
 package.json           |  3 ++-
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/lib/node-http-proxy.js b/lib/node-http-proxy.js
index 72e8d0ef4..6aeee31cd 100644
--- a/lib/node-http-proxy.js
+++ b/lib/node-http-proxy.js
@@ -32,9 +32,9 @@ var util = require('util'),
     maxSockets = 100;
 
 //
-// ### Version 0.5.7 // 5/19/2011
+// Expose version information through `pkginfo`.
 //
-exports.version = [0, 5, 7];
+require('pkginfo')(module, 'version');
 
 //
 // Track our own list of agents internal to `node-http-proxy`
@@ -113,30 +113,6 @@ exports.getMaxSockets = function () {
 exports.setMaxSockets = function (value) {
   maxSockets = value;
 };
-//
-// stack
-// adapted from https://github.com/creationix/stack
-//
-
-function stack (middlewares, proxy) {
-  var handle;
-  middlewares.reverse().forEach(function (layer) {
-    
-    var child = handle;
-    var next = function (err) {
-        if (err) {
-          throw err;
-          //return error(req, res, err); 
-        }
-        child(req, res);
-      }
-    next.__proto__ = proxy;
-    handle = function (req, res) {
-      layer(req, res, next);
-    };
-  });
-  return handle;
-}
 
 //
 // stack
@@ -185,6 +161,7 @@ exports.createServer = function () {
       proxy, server,
       options = {},
       middleware = [],
+      handler,
       silent;
 
   args.forEach(function (arg) {
@@ -196,7 +173,7 @@ exports.createServer = function () {
     };
   });
 
-  var proxy = new HttpProxy(options);
+  proxy = new HttpProxy(options);
 
   if (port && host) {
     //
@@ -232,7 +209,9 @@ exports.createServer = function () {
     handler = callback = stack(middleware, proxy);
   }
   else if (middleware.length) { 
-    //do not use middleware code if it's not needed.
+    //
+    // Do not use middleware code if it's not needed.
+    //
     var h = middleware[0];
     handler = callback = function (req,res) { h(req,res,proxy) };
   }
@@ -273,7 +252,6 @@ exports.createServer = function () {
   // to the consumer of the server
   //
   server.proxy = proxy;
-
   return server;
 };
 
diff --git a/package.json b/package.json
index f91a4a1e9..d46d4c4b6 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
   "keywords": ["reverse", "proxy", "http"],
   "dependencies": {
     "colors": "0.x.x",
-    "optimist": "0.2.x"
+    "optimist": "0.2.x",
+    "pkginfo": "0.2.x"
   },
   "devDependencies": {
     "request": "1.9.x",