-
Notifications
You must be signed in to change notification settings - Fork 29.6k
Commit
the previous version checked if io.js was compiled with openssl support which isn't really relevant since we're starting a http server. we on the other hand need an openssl-cli which may or may not exist. PR-URL: #1049 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Shigeki Ohtsu <[email protected]>
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
if (!process.versions.openssl) { | ||
console.error('Skipping because node compiled without OpenSSL.'); | ||
var common = require('../common'); | ||
var assert = require('assert'); | ||
if (!common.opensslCli) { | ||
console.error('Skipping because node compiled without OpenSSL CLI.'); | ||
process.exit(0); | ||
} | ||
|
||
// http://groups.google.com/group/nodejs/browse_thread/thread/f66cd3c960406919 | ||
var common = require('../common'); | ||
var assert = require('assert'); | ||
var http = require('http'); | ||
var cp = require('child_process'); | ||
var fs = require('fs'); | ||
|
@@ -16,7 +16,7 @@ var count = 0; | |
function maybeMakeRequest() { | ||
if (++count < 2) return; | ||
console.log('making curl request'); | ||
var cmd = 'curl http://127.0.0.1:' + common.PORT + '/ | openssl sha1'; | ||
var cmd = 'curl http://127.0.0.1:' + common.PORT + '/ | ' + common.opensslCli + ' sha1'; | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
shigeki
Contributor
|
||
cp.exec(cmd, function(err, stdout, stderr) { | ||
if (err) throw err; | ||
var hex = stdout.match(/([A-Fa-f0-9]{40})/)[0]; | ||
|
@jbergstroem @shigeki This won't work if there are spaces in the path to openssl-cli (which often happens on windows).