adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding HTTPS detection fix (Ticket #1405)

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3531 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-09-20 19:13:57 +00:00
parent cc8b842467
commit 355ad78cc1
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cake/basics.php
View file

@ -800,6 +800,14 @@
*/
function env($key) {
if ($key == 'HTTPS') {
if (isset($_SERVER) && !empty($_SERVER)) {
return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on');
} else {
return (strpos(env('SCRIPT_URI'), 'https://') === 0);
}
}
if ($key == 'SCRIPT_NAME') {
if (env('CGI_MODE')) {
$key = 'SCRIPT_URL';

7
cake/config/paths.php
View file

@ -154,17 +154,16 @@
* Full url prefix
*/
$s = null;
$https = env('HTTPS');
if ( (isset($https) && $https =='on' )) {
if (env('HTTPS')) {
$s ='s';
}
unset($https);
$httpHost = env('HTTP_HOST');
if (isset($httpHost)) {
define('FULL_BASE_URL', 'http'.$s.'://'.$httpHost);
}
unset($httpHost);
unset($httpHost, $s);
/**
* Web path to the public images directory.
*/