mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CORS moved to attribute

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2146 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2012-11-20 17:51:45 +00:00
parent b243759731
commit 1570284868
2 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
FHEM/01_FHEMWEB.pm
View File

@@ -10,7 +10,6 @@ use HttpUtils;
#########################
# Forward declaration
sub FW_IconURL($);
sub FW_fC($@);
sub FW_answerCall($);
sub FW_calcWeblink($$);
sub FW_dev2image($);
@@ -100,7 +99,6 @@ my $FW_longpoll; # Set if longpoll (i.e. server notification) is active
my $FW_inform;
my $FW_XHR; # Data only answer, no HTML
my $FW_jsonp; # jasonp answer (sending function calls to the client)
my $FW_cors; # Cross-origin resource sharing
my $FW_headercors; #
my $FW_chash; # client fhem hash
#my $FW_encoding="ISO-8859-1";
@@ -128,7 +126,7 @@ FHEMWEB_Initialize($)
"plotmode:gnuplot,gnuplot-scroll,SVG plotsize refresh " .
"touchpad smallscreen plotfork basicAuth basicAuthMsg ".
"stylesheetPrefix iconpath hiddenroom HTTPS longpoll:1,0 ".
"redirectCmds:0,1 reverseLogs:0,1 allowfrom ";
"redirectCmds:0,1 reverseLogs:0,1 allowfrom CORS:0,1";
###############
# Initialize internal structures
@@ -247,9 +245,9 @@ FW_Read($)
@FW_httpheader = split("[\r\n]", $hash->{BUF});
my @origin = grep /Origin/, @FW_httpheader;
$FW_headercors = ($FW_cors ?
$FW_headercors = (AttrVal($FW_wname, "CORS", 0) ?
"Access-Control-Allow-".$origin[0]."\r\n".
"Access-Control-Allow-Methods: GET\r\n".
"Access-Control-Allow-Methods: GET OPTIONS\r\n".
"Access-Control-Allow-Headers: Origin, Authorization, Accept\r\n".
"Access-Control-Allow-Credentials: true\r\n".
"Access-Control-Max-Age:86400\r\n" : "");
@@ -633,7 +631,6 @@ FW_digestCgi($)
$FW_XHR = undef;
$FW_jsonp = undef;
$FW_inform = undef;
$FW_cors = undef;
%FW_webArgs = ();
$arg =~ s,^[?/],,;
@@ -658,7 +655,6 @@ FW_digestCgi($)
if($p eq "XHR") { $FW_XHR = 1; }
if($p eq "jsonp") { $FW_jsonp = $v; }
if($p eq "inform") { $FW_inform = $v; }
if($p eq "CORS") { $FW_cors = 1; }
}
$cmd.=" $dev{$c}" if(defined($dev{$c}));
@@ -2845,6 +2841,13 @@ FW_Set($@)
</li>
<br>
<a name="CORS"></a>
<li>CORS<br>
If set to 1, FHEMWEB will supply a "Cross origin resource sharing"
header, see the wikipedia for details.
</li>
<br>
</ul>
See also <a href="#room">room</a> and <a href="#group">group</a> attributes.