From 72ad2c94df3f67674076b9d81b4e30f0cf448266 Mon Sep 17 00:00:00 2001
From: Koichi Kobayashi <koichik@improvement.jp>
Date: Sun, 4 Aug 2013 15:39:50 +0900
Subject: [PATCH] https: fix default port

https.get('https://github.com/') should use port 443, not 80.
---
 lib/_http_client.js                           |  8 ++-
 test/disabled/test-http-default-port.js       | 61 ++++++++++++-------
 .../internet/test-http-https-default-ports.js | 44 +++++++++++++
 3 files changed, 88 insertions(+), 25 deletions(-)
 create mode 100644 test/internet/test-http-https-default-ports.js

diff --git a/lib/_http_client.js b/lib/_http_client.js
index cf73538a60..f6a8cbfce1 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -44,12 +44,14 @@ function ClientRequest(options, cb) {
   var self = this;
   OutgoingMessage.call(self);
 
+  options = util._extend({}, options);
+
   self.agent = util.isUndefined(options.agent) ? globalAgent : options.agent;
 
-  var defaultPort = options.defaultPort || 80;
+  var defaultPort = options.defaultPort || self.agent.defaultPort;
 
-  var port = options.port || defaultPort;
-  var host = options.hostname || options.host || 'localhost';
+  var port = options.port = options.port || defaultPort;
+  var host = options.host = options.hostname || options.host || 'localhost';
 
   if (util.isUndefined(options.setHost)) {
     var setHost = true;
diff --git a/test/disabled/test-http-default-port.js b/test/disabled/test-http-default-port.js
index ec7f69fc64..ec79de2aeb 100644
--- a/test/disabled/test-http-default-port.js
+++ b/test/disabled/test-http-default-port.js
@@ -21,14 +21,11 @@
 
 
 
-
-// This must be run as root.
-
 var common = require('../common');
 var http = require('http'),
     https = require('https'),
-    PORT = 80,
-    SSLPORT = 443,
+    PORT = common.PORT,
+    SSLPORT = common.PORT + 1,
     assert = require('assert'),
     hostExpect = 'localhost',
     fs = require('fs'),
@@ -37,32 +34,52 @@ var http = require('http'),
     options = {
       key: fs.readFileSync(fixtures + '/agent1-key.pem'),
       cert: fs.readFileSync(fixtures + '/agent1-cert.pem')
-    };
+    },
+    gotHttpsResp = false,
+    gotHttpResp = false;
+
+process.on('exit', function() {
+  assert(gotHttpsResp);
+  assert(gotHttpResp);
+  console.log('ok');
+});
+
+http.globalAgent.defaultPort = PORT;
+https.globalAgent.defaultPort = SSLPORT;
 
 http.createServer(function(req, res) {
-  console.error(req.headers);
   assert.equal(req.headers.host, hostExpect);
+  assert.equal(req.headers['x-port'], PORT);
   res.writeHead(200);
   res.end('ok');
   this.close();
-}).listen(PORT);
+}).listen(PORT, function() {
+  http.get({
+    host: 'localhost',
+    headers: {
+      'x-port': PORT
+    }
+  }, function(res) {
+    gotHttpResp = true;
+    res.resume();
+  });
+});
 
 https.createServer(options, function(req, res) {
-  console.error(req.headers);
   assert.equal(req.headers.host, hostExpect);
+  assert.equal(req.headers['x-port'], SSLPORT);
   res.writeHead(200);
   res.end('ok');
   this.close();
-}).listen(SSLPORT);
-
-http
-  .get({ host: 'localhost',
-      port: PORT,
-      headers: { 'x-port': PORT } })
-  .on('response', function(res) {});
-
-https
-  .get({ host: 'localhost',
-      port: SSLPORT,
-      headers: { 'x-port': SSLPORT } })
-  .on('response', function(res) {});
+}).listen(SSLPORT, function() {
+  var req = https.get({
+    host: 'localhost',
+    rejectUnauthorized: false,
+    headers: {
+      'x-port': SSLPORT
+    }
+  }, function(res) {
+    gotHttpsResp = true;
+    res.resume();
+  });
+});
diff --git a/test/internet/test-http-https-default-ports.js b/test/internet/test-http-https-default-ports.js
new file mode 100644
index 0000000000..639bdd6b2d
--- /dev/null
+++ b/test/internet/test-http-https-default-ports.js
@@ -0,0 +1,44 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+
+var https = require('https');
+var http = require('http');
+var gotHttpsResp = false;
+var gotHttpResp = false;
+
+process.on('exit', function() {
+  assert(gotHttpsResp);
+  assert(gotHttpResp);
+  console.log('ok');
+});
+
+https.get('https://www.google.com/', function(res) {
+  gotHttpsResp = true;
+  res.resume();
+});
+
+http.get('http://www.google.com/', function(res) {
+  gotHttpResp = true;
+  res.resume();
+});