Merge branch 'release/3.4.2'

This commit is contained in:
Fergal Moran
2016-02-08 20:33:24 +00:00
2 changed files with 2 additions and 1 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "dssweb",
"version": "3.4.1",
"version": "3.4.2",
"main": "server/app.js",
"dependencies": {
"body-parser": "~1.5.0",

View File

@@ -42,6 +42,7 @@ module.exports = function (app) {
var url = _parseUrl((app.get('apiUrl') + req.path + '/').replace(/([^:]\/)\/+/g, "$1"));
console.log('Api url: ' + url);
var fun = isHttps(url) ? https : http;
console.log("Using protocol: " + isHttps(url) ? "https" : "http");
fun.get(url, function (api_res) {
var body = '';
api_res.on('data', function (chunk) {