mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

4
src/node/hooks/express.js
View file

@ -75,6 +75,10 @@ exports.restartServer = function () {
next();
});
if(settings.trustProxy){
app.enable('trust proxy');
}
app.configure(function() {
hooks.callAll("expressConfigure", {"app": app});
});