Update HTTPS handling for modern days

Alex Ivashchenko · Alex Ivashchenko · commit 2c11b01ce2c0 · 2015-06-13T08:33:46.000-07:00
diff --git a/lib/form_data.js b/lib/form_data.js
@@ -306,7 +306,7 @@ FormData.prototype.submit = function(params, cb) {
   options.headers = this.getHeaders(params.headers);
 
   // https if specified, fallback to http in any other case
-  if (params.protocol == 'https:') {
+  if (options.protocol == 'https:') {
     request = https.request(options);
   } else {
     request = http.request(options);
diff --git a/test/integration/test-submit-https.js b/test/integration/test-submit-https.js
@@ -1,24 +1,54 @@
+var https = require('https');
 var common = require('../common');
 var assert = common.assert;
 var FormData = require(common.dir.lib + '/form_data');
+var server;
 
-var form = new FormData();
+function submitForm() {
 
-form.submit({
-  protocol: 'https:',
-  hostname: 'localhost',
-  port: common.httpsPort,
-  pathname: '/',
-  ca: common.httpsServerCert
-}, function(err, res) {
+  var form = new FormData();
 
-  if (err) {
-    throw err;
-  }
+  form.append('field', 'value');
 
-  assert.strictEqual(res.statusCode, 200);
-  assert.strictEqual(res.headers['x-success'], 'OK');
+  form.submit({
+    protocol: 'https:',
+    hostname: 'localhost',
+    port: common.httpsPort,
+    pathname: '/',
+    // for self-signed certs on localhost
+    secureOptions: require('constants').SSL_OP_NO_TLSv1_2,
+    ca: common.httpsServerCert
+  }, function(err, res) {
 
-  // unstuck new streams
-  res.resume();
+    if (err) {
+      throw err;
+    }
+
+    assert.strictEqual(res.statusCode, 200);
+    assert.strictEqual(res.headers['x-success'], 'OK');
+
+    // unstuck new streams
+    res.resume();
+
+    server.close();
+  });
+}
+
+// create https server
+server = https.createServer({
+  key: common.httpsServerKey,
+  cert: common.httpsServerCert
+}, function(req, res) {
+
+  // old and simple
+  req.on('data', function(){});
+
+  req.on('end', function()
+  {
+    res.writeHead(200, {'x-success': 'OK'});
+    res.end('Great Success');
+  });
 });
+
+// when https server ready submit form
+server.listen(common.httpsPort, submitForm);
diff --git a/test/static.js b/test/static.js
@@ -1,6 +1,5 @@
 // serves static files
 var http = require('http');
-var https = require('https');
 var fs = require('fs');
 var path = require('path');
 var mime = require('mime-types');
@@ -12,11 +11,6 @@ if (!fs.existsSync(common.dir.tmp))
   fs.mkdirSync(common.dir.tmp);
 }
 
-var httpsOptions = {
-  key: common.httpsServerKey,
-  cert: common.httpsServerCert
-};
-
 module.exports = function(callback) {
 
   // create http server
@@ -33,12 +27,5 @@ module.exports = function(callback) {
     fs.createReadStream(target).pipe(res);
   });
 
-  // create https server
-  var httpsServer = https.createServer(httpsOptions, function(req, res) {
-    res.writeHead(200, {'x-success': 'OK'});
-    res.end('Great Success');
-  });
-
-  // dirty&simple
-  httpServer.listen(common.staticPort, httpsServer.listen.bind(httpsServer, common.httpsPort, callback.bind(undefined, httpServer, httpsServer)));
+  httpServer.listen(common.staticPort, callback.bind(undefined, httpServer));
 };
