From 87d274594cb4114ebf1b6b44dbc8e7b22c83a574 Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" Date: Fri, 6 Jun 2014 12:12:44 +0000 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BB=D1=8F=20https-=D0=BF=D0=BE=D1=80?= =?UTF-8?q?=D1=82=D0=B0=20=D1=81=D0=B2=D0=BE=D0=B9=20=D0=BA=D0=BB=D0=B8?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/nodeJSProjects@56521 954022d7-b5bf-4e40-9824-e11837661b57 --- CoAuthoring/sources/DocsCoServer.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CoAuthoring/sources/DocsCoServer.js b/CoAuthoring/sources/DocsCoServer.js index f0f58641..59b892d9 100644 --- a/CoAuthoring/sources/DocsCoServer.js +++ b/CoAuthoring/sources/DocsCoServer.js @@ -2,6 +2,7 @@ _ = require('underscore'), dataBase = null, mysqlBase = null, + https = require('https'), http = require('http'), url = require('url'), logger = require('./../../Common/sources/logger'), @@ -11,7 +12,8 @@ if (config["mongodb"]) if (config["mysql"]) mysqlBase = require('./mySqlBase'); -var objchanges = {}, messages = {}, connections = [], defaultServerPort = 80, objServiceInfo = {}; +var defaultServerPort = 80, httpsPort = 443; +var objchanges = {}, messages = {}, connections = [], objServiceInfo = {}; var c_oAscServerStatus = { NotFound : 0, @@ -243,7 +245,9 @@ function sendServerRequest (serverHost, serverPort, serverPath, sendData) { method: 'POST' }; - var req = http.request(options, function(res) { + var requestFunction = httpsPort === serverPort ? https.request : http.request; + + var req = requestFunction(options, function(res) { res.setEncoding('utf8'); res.on('data', function(replyData) { logger.info('replyData: ' + replyData); @@ -1096,7 +1100,7 @@ exports.commandFromServer = function (query) { var parseObject = url.parse(decodeURIComponent(query.callback)); var port = parseObject.port; if (!port) - port = 'https:' === parseObject.protocol ? 443 : defaultServerPort; + port = 'https:' === parseObject.protocol ? httpsPort : defaultServerPort; objServiceInfo[docId] = { 'href' : parseObject.href, 'hostname' : parseObject.hostname,