mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-25 01:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'pr/1756' into develop

Browse source 
Conflicts:
	src/node/handler/SocketIORouter.js
This commit is contained in:
Marcel Klehr 2013-09-29 16:45:12 +02:00
commit 7b17bd58ae
4 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/node/utils/Settings.js
View file

@ -119,6 +119,11 @@ exports.logconfig = { appenders: [{ type: "console" }]};
*/
exports.sessionKey = false;
/*
* Trust Proxy, whether or not trust the x-forwarded-for header.
*/
exports.trustProxy = false;
/* This setting is used if you need authentication and/or
* authorization. Note: /admin always requires authentication, and
* either authorization by a module, or a user with is_admin set */