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

bug #1542875 Cookie auth on IIS

Browse Source
This commit is contained in:
Marc Delisle
2006-08-21 11:55:32 +00:00
parent 747b83fa88
commit 9b2f2deb06
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-08-21 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php, libraries/auth/cookie.auth.lib.php:
bug #1542875, Cookie auth on IIS
2006-08-20 Marc Delisle <lem9@users.sourceforge.net> 2006-08-20 Marc Delisle <lem9@users.sourceforge.net>
* lang/bulgarian: Update, thanks to Stanislav Yordanov - stanprog. * lang/bulgarian: Update, thanks to Stanislav Yordanov - stanprog.

1
libraries/auth/cookie.auth.lib.php
View File

@@ -483,6 +483,7 @@ function PMA_auth_set_user()
$url_params['target'] = $GLOBALS['target']; $url_params['target'] = $GLOBALS['target'];
} }
define('PMA_COMING_FROM_COOKIE_LOGIN',1);
PMA_sendHeaderLocation( $redirect_url . PMA_generate_common_url( $url_params, '&' ) ); PMA_sendHeaderLocation( $redirect_url . PMA_generate_common_url( $url_params, '&' ) );
exit(); exit();
} // end if } // end if

9
libraries/common.lib.php
View File

@@ -1136,11 +1136,12 @@ if (!defined('PMA_MINIMUM_COMMON')) {
session_write_close(); session_write_close();
// bug #1523784: IE6 does not like 'Refresh: 0', it // bug #1523784: IE6 does not like 'Refresh: 0', it
// results in a blank page // results in a blank page
//if (PMA_IS_IIS) { // (but we need it when coming from the cookie login panel)
// header('Refresh: 0; ' . $uri); if (PMA_IS_IIS && defined('PMA_COMING_FROM_COOKIE_LOGIN')) {
//} else { header('Refresh: 0; ' . $uri);
} else {
header('Location: ' . $uri); header('Location: ' . $uri);
//} }
} }
} }
} }