Merge pull request #4 from tmaindron/tmaindron-work

Tmaindron work
actionhero · Apr 12, 2012 · 1db23ff · 1db23ff
2 parents 9e0bf79 + 68dd733
commit 1db23ff
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ log/*
 cache/*
 node_modules/*
 .DS_Store
-npm-debug.log
+npm-debug.log
+/nbproject/*
diff --git a/config.json b/config.json
@@ -6,6 +6,9 @@
 	"socketServerWelcomeMessage" : "Hello! Welcome to the actionHero api",
 	"apiBaseDir" : "./node_modules/actionHero/",
 
+        "httpHeaders" : {
+        },
+
 	"secureWebServer" : {
 		"port": 4443,
 		"enable": false,

diff --git a/initializers/initWebServer.js b/initializers/initWebServer.js
@@ -39,8 +39,15 @@ var initWebServer = function(api, next)
 		connection.remoteIP = connection.req.connection.remoteAddress;
 		connection.responseHeaders = {
 			'Content-Type': "application/json",
-			"X-Powered-By": api.configData.serverName,
+			"X-Powered-By": api.configData.serverName
 		};
+
+                if(typeof(api.configData.httpHeaders) != 'undefined'){
+                    for(var i in api.configData.httpHeaders){
+                        connection.responseHeaders[i] = api.configData.httpHeaders[i];
+                    }
+                }
+
 		connection.responseHttpCode = 200;
 		if(connection.req.headers['x-forwarded-for'] != null)
 		{