svrjs/orangecircle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

Update to OrangeCircle 1.1.0

Browse source
This commit is contained in:
Dorian Niemiec 2023-12-31 21:39:21 +01:00
parent 616aef298e
commit 4867f4e092
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
index.js
View file

@ -11,7 +11,13 @@ try {
} catch (ex) { } catch (ex) {
// Can't determine version // Can't determine version
} }
var configJSONS = JSON.parse(fs.readFileSync(__dirname + "/../../../config.json")); // Read configuration JSON var configJSONS = {};
try {
configJSONS = JSON.parse(fs.readFileSync(__dirname + "/../../../config.json")); // Read configuration JSON
} catch(ex) {
//OrangeCircle will not care about configJSONS in SVR.JS 3.x and newer
//SVR.JS 2.x and older will fail to start with broken configuration file anyway...
}
var scgiConf = {}; var scgiConf = {};
try { try {
scgiConf = JSON.parse(fs.readFileSync(__dirname + "/../../../orangecircle-config.json")); scgiConf = JSON.parse(fs.readFileSync(__dirname + "/../../../orangecircle-config.json"));
@ -25,6 +31,8 @@ scgiConf.path = scgiConf.path.replace(/([^\/])\/+$/, "$1");
if (scgiConf.host === undefined) scgiConf.host = "localhost"; if (scgiConf.host === undefined) scgiConf.host = "localhost";
if (scgiConf.port === undefined) scgiConf.port = 4000; if (scgiConf.port === undefined) scgiConf.port = 4000;
var disableModExposeSupported = process.versions.svrjs && process.versions.svrjs.match(/^(?:Nightly-|(?:[4-9]|[123][0-9])[0-9]*\.|3\.(?:[1-9][0-9]+\.|9\.(?:[1-9])|4\.(?:(?:[3-9]|[12][0-9])[0-9]+|29)))/i);
function Mod() {} function Mod() {}
Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, ext, uobject, search, defaultpage, users, page404, head, foot, fd, elseCallback, configJSON, callServerError, getCustomHeaders, origHref, redirect, parsePostData) { Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, ext, uobject, search, defaultpage, users, page404, head, foot, fd, elseCallback, configJSON, callServerError, getCustomHeaders, origHref, redirect, parsePostData) {
@ -231,8 +239,9 @@ Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, e
req.socket.localPort, req.socket.localPort,
getCustomHeaders ? getCustomHeaders ?
getCustomHeaders()["Server"] + getCustomHeaders()["Server"] +
(disableModExposeSupported && (configJSON.exposeModsInErrorPages || configJSON.exposeModsInErrorPages === undefined) ?
" OrangeCircle/" + " OrangeCircle/" +
version : version : "") :
"SVR.JS/" + "SVR.JS/" +
configJSON.version + configJSON.version +
" (" + " (" +

4
mod.info
View file

@ -1,4 +1,4 @@
{ {
"name": "DorianTech OrangeCircle SCGI client for SVR.JS", "name": "OrangeCircle SCGI client for SVR.JS",
"version": "1.0.7" "version": "1.1.0"
} }