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

Merge branch 'QA_4_0'

Browse Source
This commit is contained in:
Marc Delisle 2013-11-13 07:41:47 -05:00
commit 1955d5e8dc
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog
- bug #4141 Wrong page is shown after editing; also, do not show a modal
dialog for multi-row edit
- bug #3939 PHP NavigationTree error when paging through list
- bug #4075 Support A10 Networks load balancer
4.0.9.0 (2013-11-04)
- bug #4104 Can't edit updatable view when searching

4
libraries/Config.class.php
View File

@ -1567,6 +1567,10 @@ class PMA_Config
&& strtolower(PMA_getenv('HTTPS')) == 'on'
) {
$url['scheme'] = 'https';
// A10 Networks load balancer:
} elseif (PMA_getenv('HTTP_HTTPS_FROM_LB')
&& strtolower(PMA_getenv('HTTP_HTTPS_FROM_LB')) == 'on') {
$url['scheme'] = 'https';
} elseif (PMA_getenv('HTTP_X_FORWARDED_PROTO')) {
$url['scheme'] = strtolower(PMA_getenv('HTTP_X_FORWARDED_PROTO'));
} elseif (PMA_getenv('HTTP_FRONT_END_HTTPS')