From 7f7c056ecdd6aa69dec98a6eea8e71e6490e0827 Mon Sep 17 00:00:00 2001
From: Alex Kocharin <alex@kocharin.ru>
Date: Mon, 9 Dec 2013 08:00:16 +0400
Subject: [PATCH] various bugfixes, camelcase for http headers

---
 lib/storage.js    | 17 +++++++++--------
 lib/up-storage.js |  8 ++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/storage.js b/lib/storage.js
index 604f55633..057ce9109 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -67,6 +67,14 @@ Storage.prototype.add_package = function(name, metadata, callback) {
 			// something weird
 			if (err && err.status !== 404) return cb(err)
 
+			// checking package
+			if (results) {
+				return cb(new UError({
+					status: 409,
+					msg: 'this package is already present'
+				}))
+			}
+
 			for (var i=0; i<err_results.length; i++) {
 				// checking error
 				// if uplink fails with a status other than 404, we report failure
@@ -80,14 +88,6 @@ Storage.prototype.add_package = function(name, metadata, callback) {
 				}
 			}
 
-			// checking package
-			if (results) {
-				return cb(new UError({
-					status: 409,
-					msg: 'this package is already present'
-				}))
-			}
-
 			return cb()
 		})
 	}
@@ -473,6 +473,7 @@ Storage.prototype.get_package = function(name, options, callback) {
 				for (var i in result['dist-tags']) {
 					if (Array.isArray(result['dist-tags'][i])) {
 						result['dist-tags'][i] = result['dist-tags'][i][result['dist-tags'][i].length-1]
+						if (result['dist-tags'][i] == null) delete result['dist-tags'][i]
 					}
 				}
 
diff --git a/lib/up-storage.js b/lib/up-storage.js
index ed64441fa..606a82e3a 100644
--- a/lib/up-storage.js
+++ b/lib/up-storage.js
@@ -85,8 +85,8 @@ function _setupProxy(hostname, config, mainconfig, isHTTPS) {
 Storage.prototype.request = function(options, cb) {
 	var self = this
 	  , headers = options.headers || {}
-	headers.accept = headers.accept || 'application/json'
-	headers['user-agent'] = headers['user-agent'] || this.userAgent
+	headers.Accept = headers.Accept || 'application/json'
+	headers['User-Agent'] = headers['User-Agent'] || this.userAgent
 
 	var method = options.method || 'GET'
 	  , uri = options.uri_full || (this.config.url + options.uri)
@@ -98,7 +98,7 @@ Storage.prototype.request = function(options, cb) {
 
 	if (utils.is_object(options.json)) {
 		var json = JSON.stringify(options.json)
-		headers['content-type'] = headers['content-type'] || 'application/json'
+		headers['Content-Type'] = headers['Content-Type'] || 'application/json'
 	}
 
 	var req = request({
@@ -224,7 +224,7 @@ Storage.prototype.add_tarball = function(name, filename, options) {
 		uri: '/' + escape(name) + '/-/' + escape(filename) + '/whatever',
 		method: 'PUT',
 		headers: {
-			'content-type': 'application/octet-stream'
+			'Content-Type': 'application/octet-stream'
 		},
 	})