From b44ea6dda26542ff3fdad7aa86bb6a5c3d766bea Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Sun, 14 Oct 2012 23:31:09 +0100
Subject: [PATCH] Fixing issue with https ports.

---
 lib/services/core/servicebussettings.js   | 25 ++++++++++++++++++++---
 lib/services/core/storageserviceclient.js |  6 +++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/lib/services/core/servicebussettings.js b/lib/services/core/servicebussettings.js
index d3ed8cec19..4b51c46f53 100644
--- a/lib/services/core/servicebussettings.js
+++ b/lib/services/core/servicebussettings.js
@@ -48,12 +48,31 @@ var validKeys = [
 */
 function ServiceBusSettings(serviceBusEndpointUri, wrapEndpointUri, namespace, wrapName, wrapPassword) {
   this._namespace = namespace;
-  this._serviceBusEndpointUri = serviceBusEndpointUri;
+
+  var parsedServiceBusEndpointUri = url.parse(serviceBusEndpointUri);
+  if (parsedServiceBusEndpointUri.protocol === 'https:') {
+    parsedServiceBusEndpointUri.port = 443;
+  }
+
+  this._serviceBusEndpointUri = url.format({
+    protocol: parsedServiceBusEndpointUri.protocol,
+    port: parsedServiceBusEndpointUri.port,
+    hostname: parsedServiceBusEndpointUri.hostname
+  });
 
   if (wrapEndpointUri) {
-    this._wrapEndpointUri = wrapEndpointUri;
+    var parsedWrapEndpointUri = url.parse(wrapEndpointUri);
+    if (parsedWrapEndpointUri.protocol === 'https:') {
+      parsedWrapEndpointUri.port = 443;
+    }
+
+    this._wrapEndpointUri = url.format({
+      protocol: parsedWrapEndpointUri.protocol,
+      port: parsedWrapEndpointUri.port,
+      hostname: parsedWrapEndpointUri.hostname
+    });
   } else {
-    this._wrapEndpointUri = 'https://' + namespace + '-sb.accesscontrol.windows.net/WRAPv0.9';
+    this._wrapEndpointUri = 'https://' + namespace + '-sb.accesscontrol.windows.net:443/WRAPv0.9';
   }
 
   this._wrapName = wrapName;
diff --git a/lib/services/core/storageserviceclient.js b/lib/services/core/storageserviceclient.js
index 8eff197836..0e17f2f8de 100644
--- a/lib/services/core/storageserviceclient.js
+++ b/lib/services/core/storageserviceclient.js
@@ -125,9 +125,9 @@ StorageServiceClient._getStorageSettingsExplicitOrEnvironment = function (storag
       usePathStyleUri = true;
     }
 
-    blobendpoint = url.format(parsedHostUrl);
-    tableendpoint = url.format(parsedHostUrl);
-    queueendpoint = url.format(parsedHostUrl);
+    blobendpoint = url.format({ protocol: parsedHostUrl.protocol, port: parsedHostUrl.protocol, hostname: parsedHostUrl.hostname });
+    tableendpoint = url.format({ protocol: parsedHostUrl.protocol, port: parsedHostUrl.protocol, hostname: parsedHostUrl.hostname });
+    queueendpoint = url.format({ protocol: parsedHostUrl.protocol, port: parsedHostUrl.protocol, hostname: parsedHostUrl.hostname });
   }
 
   var settings = {