bug #4120 SSL redirects to port 80

This commit is contained in:
Marc Delisle 2013-10-27 06:44:44 -04:00
parent 2fbe37a94a
commit 70e3fc7415
2 changed files with 8 additions and 0 deletions

View File

@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
- bug #3911 Filtering database names includes empty groupings
- bug #3678 Does not display or manipulate bit(64) fields appropriately
- bug #4129 Unneeded navi panel refresh
- bug #4120 SSL redirects to port 80
4.0.8.0 (2013-10-06)
- bug #3988 Rename view is not working

View File

@ -1333,6 +1333,13 @@ class PMA_Config
}
$pma_absolute_uri .= $path;
// This is to handle the case of a reverse proxy
if ($this->get('ForceSSL')) {
$this->set('PmaAbsoluteUri', $pma_absolute_uri);
$pma_absolute_uri = $this->getSSLUri();
$this->checkIsHttps();
}
// We used to display a warning if PmaAbsoluteUri wasn't set, but now
// the autodetect code works well enough that we don't display the
// warning at all. The user can still set PmaAbsoluteUri manually.