From 05894d14c61fec589077d40500c2ecb696d3cfe3 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 12 Jan 2015 18:28:47 -0500
Subject: [PATCH] closes #2151

---
 src/middleware/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/middleware/index.js b/src/middleware/index.js
index 487bda3592..c7358ca5ac 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -68,10 +68,11 @@ module.exports = function(app) {
 
 	app.use(function (req, res, next) {
 		res.setHeader('X-Powered-By', 'NodeBB');
-		res.setHeader('X-Frame-Options', 'SAMEORIGIN');
 
 		if (meta.config['allow-from-uri']) {
-			res.setHeader('ALLOW-FROM', meta.config['allow-from-uri']);
+			res.setHeader('X-Frame-Options', 'ALLOW-FROM ' + meta.config['allow-from-uri']);
+		} else {
+			res.setHeader('X-Frame-Options', 'SAMEORIGIN');
 		}
 
 		next();