Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
joyride phase2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jansa Jose
joyride phase2
Commits
a578bfc8
Commit
a578bfc8
authored
6 years ago
by
Jansa Jose
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'dev_production'
changed See merge request
!46
parents
4ea85281
7ffd5c2b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Webservices.php
application/controllers/Webservices.php
+2
-2
No files found.
application/controllers/Webservices.php
View file @
a578bfc8
...
...
@@ -13,7 +13,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
header
(
'Content-Type: text/html; charset=utf-8'
);
// Allow from any origin
/*
if (isset($_SERVER['HTTP_ORIGIN'])) {
if
(
isset
(
$_SERVER
[
'HTTP_ORIGIN'
]))
{
//header("Access-Control-Allow-Origin: {$_SERVER['HTTP_ORIGIN']}");
header
(
'Access-Control-Allow-Credentials: true'
);
header
(
'Access-Control-Max-Age: 86400'
);
// cache for 1 day
...
...
@@ -30,7 +30,7 @@ header('Content-Type: text/html; charset=utf-8');
exit
(
0
);
}
*/
class
Webservices
extends
REST_Controller
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment