[Phpmyadmin-devel] patch suggestion for version check problem under https
Hi, with the goal of releasing a quick 3.4.1-rc1, I suggest this: diff --git a/main.php b/main.php index c7c25bc..4f3b6c3 100644 --- a/main.php +++ b/main.php @@ -202,7 +202,10 @@ echo '<div class="group pmagroup">'; echo '<h2>phpMyAdmin</h2>'; echo '<ul>'; $class = null; -if ($GLOBALS['cfg']['VersionCheck']) { +// workaround for bug 3302733; some browsers don't like the situation +// where phpMyAdmin is called on a secure page but a part of the page +// (the version check) refers to a non-secure page +if ($GLOBALS['cfg']['VersionCheck'] && ! $GLOBALS['PMA_Config']->get('is_https')) { $class = 'jsversioncheck'; } PMA_printListItem(__('Version information') . ': ' . PMA_VERSION, 'li_pma_version', null, null, null, null, $class); -- Marc Delisle http://infomarc.info
Hi Dne Mon, 16 May 2011 12:40:42 -0400 Marc Delisle <marc@infomarc.info> napsal(a):
with the goal of releasing a quick 3.4.1-rc1, I suggest this:
diff --git a/main.php b/main.php index c7c25bc..4f3b6c3 100644 --- a/main.php +++ b/main.php @@ -202,7 +202,10 @@ echo '<div class="group pmagroup">'; echo '<h2>phpMyAdmin</h2>'; echo '<ul>'; $class = null; -if ($GLOBALS['cfg']['VersionCheck']) { +// workaround for bug 3302733; some browsers don't like the situation +// where phpMyAdmin is called on a secure page but a part of the page +// (the version check) refers to a non-secure page +if ($GLOBALS['cfg']['VersionCheck'] && ! $GLOBALS['PMA_Config']->get('is_https')) { $class = 'jsversioncheck'; } PMA_printListItem(__('Version information') . ': ' . PMA_VERSION, 'li_pma_version', null, null, null, null, $class);
I was rather thinking if we can push version information to some SSL enabled server. For example getting information somewhere from sf.net where SSL works. -- Michal Čihař | http://cihar.com | http://blog.cihar.com
Michal Čihař a écrit :
Hi
Dne Mon, 16 May 2011 12:40:42 -0400 Marc Delisle <marc@infomarc.info> napsal(a):
with the goal of releasing a quick 3.4.1-rc1, I suggest this:
diff --git a/main.php b/main.php index c7c25bc..4f3b6c3 100644 --- a/main.php +++ b/main.php @@ -202,7 +202,10 @@ echo '<div class="group pmagroup">'; echo '<h2>phpMyAdmin</h2>'; echo '<ul>'; $class = null; -if ($GLOBALS['cfg']['VersionCheck']) { +// workaround for bug 3302733; some browsers don't like the situation +// where phpMyAdmin is called on a secure page but a part of the page +// (the version check) refers to a non-secure page +if ($GLOBALS['cfg']['VersionCheck'] && ! $GLOBALS['PMA_Config']->get('is_https')) { $class = 'jsversioncheck'; } PMA_printListItem(__('Version information') . ': ' . PMA_VERSION, 'li_pma_version', null, null, null, null, $class);
I was rather thinking if we can push version information to some SSL enabled server. For example getting information somewhere from sf.net where SSL works.
This could be for 3.4.2. Meanwhile, let's use my patch for a quick 3.4.1-rc1, ok? -- Marc Delisle http://infomarc.info
Hi Dne Tue, 17 May 2011 07:09:01 -0400 Marc Delisle <marc@infomarc.info> napsal(a):
Michal Čihař a écrit :
I was rather thinking if we can push version information to some SSL enabled server. For example getting information somewhere from sf.net where SSL works.
This could be for 3.4.2. Meanwhile, let's use my patch for a quick 3.4.1-rc1, ok?
Makes sense, though it effectively means disabling new version check for most people. -- Michal Čihař | http://cihar.com | http://blog.cihar.com
participants (2)
-
Marc Delisle -
Michal Čihař