Author: ssievers
Date: Tue Jun 26 17:50:23 2012
New Revision: 1354132
URL: http://svn.apache.org/viewvc?rev=1354132&view=rev
Log:
SHINDIG-1812 | X-Shindig-St behaves differently when the security token is null
between Firefox and WebKit browsers
Modified:
shindig/trunk/features/src/main/javascript/features/core.io/io.js
Modified: shindig/trunk/features/src/main/javascript/features/core.io/io.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/core.io/io.js?rev=1354132&r1=1354131&r2=1354132&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/core.io/io.js (original)
+++ shindig/trunk/features/src/main/javascript/features/core.io/io.js Tue Jun
26 17:50:23 2012
@@ -426,9 +426,9 @@ gadgets.io = function() {
}
}
- var opt_headers = {
- 'X-Shindig-ST' : shindig.auth.getSecurityToken()
- };
+ // Security token may have been set above
+ st = st || shindig.auth.getSecurityToken();
+ var opt_headers = st ? { 'X-Shindig-ST' : st } : {};
var proxyUrl = config['jsonProxyUrl'].replace('%host%',
document.location.host);