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

bug #2799009 Login with ipv6 IP address breaks redirect

Browse Source
This commit is contained in:
Herman van Rink
2009-05-31 12:50:52 +00:00
parent f1501e6544
commit 06bb14ff47
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -6,6 +6,7 @@ $Id$
$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
3.2.1.0 (not yet released) 3.2.1.0 (not yet released)
- bug #2799009 Login with ipv6 IP address breaks redirect
3.2.0.0 (not yet released) 3.2.0.0 (not yet released)
- [core] better support for vendor customisation (based on what Debian needs) - [core] better support for vendor customisation (based on what Debian needs)

7
libraries/Config.class.php
View File

@@ -603,9 +603,10 @@ class PMA_Config
// Host and port // Host and port
if (PMA_getenv('HTTP_HOST')) { if (PMA_getenv('HTTP_HOST')) {
if (strpos(PMA_getenv('HTTP_HOST'), ':') !== false) { // Prepend the scheme before using parse_url() since this is not part of the RFC2616 Host request-header
list($url['host'], $url['port']) = $parsed_url = parse_url($url['scheme'] . '://' . PMA_getenv('HTTP_HOST'));
explode(':', PMA_getenv('HTTP_HOST')); if (!empty($parsed_url['host'])) {
$url = $parsed_url;
} else { } else {
$url['host'] = PMA_getenv('HTTP_HOST'); $url['host'] = PMA_getenv('HTTP_HOST');
} }