nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Recalculate URL only if needed not all times when using https.

Browse Source
This commit is contained in:
Michal Čihař
2006-06-27 14:12:02 +00:00
parent fc446fde5b
commit 1a45c89702
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -11,6 +11,8 @@ $Source$
* scripts/setup.php, libraries/compat/var_export.php: Add var_export * scripts/setup.php, libraries/compat/var_export.php: Add var_export
compatibility wrapper from PEAR PHP_Compat to make setup.php work on PHP compatibility wrapper from PEAR PHP_Compat to make setup.php work on PHP
4.1 (bug #1513007). 4.1 (bug #1513007).
* libraries/Config.class.php: Recalculate URL only if needed not all times
when using https.
2006-06-25 Marc Delisle <lem9@users.sourceforge.net> 2006-06-25 Marc Delisle <lem9@users.sourceforge.net>
* libraries/export/pdf.php, libraries/plugin_interface.lib.php, lang/*: * libraries/export/pdf.php, libraries/plugin_interface.lib.php, lang/*:

10
libraries/Config.class.php
View File

@@ -509,9 +509,13 @@ class PMA_Config
// Setup a default value to let the people and lazy syadmins work anyway, // Setup a default value to let the people and lazy syadmins work anyway,
// they'll get an error if the autodetect code doesn't work // they'll get an error if the autodetect code doesn't work
$pma_absolute_uri = $this->get('PmaAbsoluteUri'); $pma_absolute_uri = $this->get('PmaAbsoluteUri');
// by recomputing $pma_absolute_uri when is_https, we ensure $is_https = $this->get('is_https');
// that a user switching from http to https stays in https if (strlen($pma_absolute_uri) < 5
if (strlen($pma_absolute_uri) < 1 || $this->get('is_https')) { // needed to catch http/https switch
|| ($is_https && substr($pma_absolute_uri, 0, 6) != 'https:')
|| (!$is_https && substr($pma_absolute_uri, 0, 5) != 'http:')
) {
echo "recheck";
$url = array(); $url = array();
// At first we try to parse REQUEST_URI, it might contain full URL // At first we try to parse REQUEST_URI, it might contain full URL