https: don't overwrite servername optionjenkins-accept-commit-temp2

PR-URL: https://github.com/joyent/node/pull/9368
Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/lib/http.js b/lib/http.js
index f4e8db7de..857578149 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -1283,11 +1283,13 @@ Agent.prototype.createSocket = function(name, host, port, localAddress, req) {
   options.host = host;
   options.localAddress = localAddress;
 
-  options.servername = host;
-  if (req) {
-    var hostHeader = req.getHeader('host');
-    if (hostHeader) {
-      options.servername = hostHeader.replace(/:.*$/, '');
+  if (!options.servername) {
+    options.servername = host;
+    if (req) {
+      var hostHeader = req.getHeader('host');
+      if (hostHeader) {
+        options.servername = hostHeader.replace(/:.*$/, '');
+      }
     }
   }