From 592c6af31a6330749924f3023014528d5d9165ca Mon Sep 17 00:00:00 2001
From: Jonathan Lipps <jlipps@gmail.com>
Date: Thu, 24 Oct 2013 10:47:05 -0700
Subject: [PATCH 1/2] remove .appiumconfig on reset so we don't run into
 situations like reset.sh --[device] and then appium won't start because other
 devices were configured at a previous version

---
 reset.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/reset.sh b/reset.sh
index defd4d74cf1..542e285b852 100755
--- a/reset.sh
+++ b/reset.sh
@@ -58,6 +58,8 @@ reset_general() {
         echo "* Removing NPM modules"
         run_cmd rm -rf node_modules
     fi
+    echo "* Clearing out old .appiumconfig"
+    run_cmd rm -rf ./.appiumconfig
     if $include_dev ; then
         echo "* Installing new or updated NPM modules (including devDeps)"
         run_cmd npm install .

From 4ae0cd9c28ded5b34652fe99adefe3a701c831a8 Mon Sep 17 00:00:00 2001
From: Jonathan Lipps <jlipps@gmail.com>
Date: Thu, 24 Oct 2013 10:47:48 -0700
Subject: [PATCH 2/2] upgrade express so we don't get warning messages

---
 lib/server/main.js       | 6 ++++--
 lib/server/middleware.js | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/server/main.js b/lib/server/main.js
index 196824bdf71..23a8672ac95 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -5,7 +5,7 @@ var http = require('http')
   , fs = require('fs')
   , logger = require('./logger.js').get('appium')
   , appium = require('../appium.js')
-  , bodyParser = require('./middleware').parserWrap
+  , parserWrap = require('./middleware').parserWrap
   , status = require('./status.js')
   , appiumVer = require('../../package.json').version
   , appiumRev = null
@@ -87,7 +87,9 @@ var main = function(args, readyCb, doneCb) {
     if (args.log || args.webhook) {
       rest.use(express.logger({stream: winstonStream}));
     }
-    rest.use(bodyParser);
+    rest.use(parserWrap);
+    rest.use(express.urlencoded());
+    rest.use(express.json());
     rest.use(express.methodOverride());
     rest.use(rest.router);
     rest.use(catchAllHandler);
diff --git a/lib/server/middleware.js b/lib/server/middleware.js
index 3358827de21..68ff45a5372 100644
--- a/lib/server/middleware.js
+++ b/lib/server/middleware.js
@@ -1,8 +1,7 @@
 "use strict";
 
 var express = require('express')
-  , _s = require('underscore.string')
-  , bodyParser = express.bodyParser();
+  , _s = require('underscore.string');
 
 module.exports.parserWrap = function(req, res, next) {
   // wd.js sends us http POSTs with empty body which will make bodyParser fail.
@@ -18,6 +17,6 @@ module.exports.parserWrap = function(req, res, next) {
         req.headers['content-type'] = 'application/json';
       }
     }
-    bodyParser(req, res, next);
+    next();
   }
 };