bug 1445120, cookie login not working on IIS

This commit is contained in:
Marc Delisle
2006-03-13 23:14:50 +00:00
parent 50dc7744ed
commit 30afc8d7b0
3 changed files with 14 additions and 2 deletions

View File

@@ -231,7 +231,10 @@ class PMA_Config
function checkWebServer()
{
if (getenv('SERVER_SOFTWARE')
&& stristr(getenv('SERVER_SOFTWARE'), 'Microsoft/IIS')) {
// some versions return Microsoft-IIS, some Microsoft/IIS
// we could use a preg_match() but it's slower
&& stristr(getenv('SERVER_SOFTWARE'), 'Microsoft')
&& stristr(getenv('SERVER_SOFTWARE'), 'IIS')) {
$this->set('PMA_IS_IIS', 1);
} else {
$this->set('PMA_IS_IIS', 0);