We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit cb183359 authored by Zach Copley's avatar Zach Copley

Merge commit 'refs/merge-requests/157' of...

Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline into merge-requests/157
parents 069d976f 3c47d158
......@@ -59,6 +59,10 @@ class HostMetaAction extends Action
Event::handle('EndHostMetaLinks', array(&$xrd->links));
}
global $config;
if($config['site']['cors'] === true){
header('Access-Control-Allow-Origin: *');
}
header('Content-type: application/xrd+xml');
print $xrd->toXML();
}
......
......@@ -30,6 +30,10 @@ class UserxrdAction extends XrdAction
function prepare($args)
{
parent::prepare($args);
global $config;
if($config['site']['cors'] === true){
header('Access-Control-Allow-Origin: *');
}
$this->uri = $this->trimmed('uri');
$this->uri = self::normalize($this->uri);
......
......@@ -40,6 +40,8 @@ $config['site']['path'] = 'statusnet';
// $config['site']['inviteonly'] = true;
// Make the site invisible to non-logged-in users
// $config['site']['private'] = true;
// Allow Cross-Origin Resource Sharing
// $config['site']['cors'] = true;
// If your web server supports X-Sendfile (Apache with mod_xsendfile,
// lighttpd, nginx), you can enable X-Sendfile support for better
......
......@@ -61,6 +61,7 @@ $default =
'textlimit' => 140,
'indent' => true,
'use_x_sendfile' => false,
'cors' => true,
'notice' => null, // site wide notice text
'build' => 1, // build number, for code-dependent cache
'minify' => true, // true to use the minified versions of JS files; false to use orig files. Can aid during development
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment