Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Aubry <mattab@users.noreply.github.com>2017-11-20 00:18:59 +0300
committerGitHub <noreply@github.com>2017-11-20 00:18:59 +0300
commitca0a9aaf1ca5747bcc2e7af0f8b96c65e0914c74 (patch)
tree686e3a9fd224360b4db6a78070e096ffa03c7ce9 /piwik.php
parent58428c57d1ac58af10a268204352b6a853ee045a (diff)
Issue the CORS header (Access-Control-Allow-Origin) also on Tracking API requests (#12207)
* Issue the CORS header (Access-Control-Allow-Origin) also on Tracking API requests * Move CORS code to the Tracking API endpoint file
Diffstat (limited to 'piwik.php')
-rw-r--r--piwik.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/piwik.php b/piwik.php
index a73093e292..716d8e0c8f 100644
--- a/piwik.php
+++ b/piwik.php
@@ -12,6 +12,7 @@ use Piwik\SettingsServer;
use Piwik\Tracker\RequestSet;
use Piwik\Tracker;
use Piwik\Tracker\Handler;
+use Piwik\API\CORSHandler;
@ignore_user_abort(true);
@@ -49,6 +50,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Translate.php';
require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Cache.php';
require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Request.php';
require_once PIWIK_INCLUDE_PATH . '/core/Cookie.php';
+require_once PIWIK_INCLUDE_PATH . '/core/API/CORSHandler.php';
SettingsServer::setIsTrackerApiRequest();
@@ -61,6 +63,9 @@ try {
Tracker::loadTrackerEnvironment();
+$corsHandler = new CORSHandler();
+$corsHandler->handle();
+
$tracker = new Tracker();
$requestSet = new RequestSet();