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

bug #4630 AJAX request infinite loop

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2014-12-15 16:12:33 +05:30
parent fefb11eb87
commit e79bfbdbeb
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
- bug The "Recently used tables" setting should be with Nav panel
- bug #4647 Can't disable Favorites
- bug #4646 Version Check Broken
- bug #4630 AJAX request infinite loop
4.3.2.0 (2014-12-12)
- bug #4628 PHP error while exporting schema as PDF

12
js/functions.js
View File

@ -705,7 +705,11 @@ AJAX.registerOnload('functions.js', function () {
clearInterval(updateInterval);
if (data.success) {
if (PMA_commonParams.get('LoginCookieValidity')-_idleSecondsCounter > 5) {
updateInterval = window.setInterval(UpdateIdleTime, (PMA_commonParams.get('LoginCookieValidity')-_idleSecondsCounter-5)*1000);
var interval = (PMA_commonParams.get('LoginCookieValidity') - _idleSecondsCounter - 5) * 1000;
if (interval > Math.pow(2, 31) - 1) { // max value for setInterval() function
interval = Math.pow(2, 31) - 1;
}
updateInterval = window.setInterval(UpdateIdleTime, interval);
} else {
updateInterval = window.setInterval(UpdateIdleTime, 2000);
}
@ -718,7 +722,11 @@ AJAX.registerOnload('functions.js', function () {
}
if (PMA_commonParams.get('logged_in')) {
IncInterval = window.setInterval(SetIdleTime, 1000);
updateInterval = window.setInterval(UpdateIdleTime, (PMA_commonParams.get('LoginCookieValidity')-5)*1000);
var interval = (PMA_commonParams.get('LoginCookieValidity') - 5) * 1000;
if (interval > Math.pow(2, 31) - 1) { // max value for setInterval() function
interval = Math.pow(2, 31) - 1;
}
updateInterval = window.setInterval(UpdateIdleTime, interval);
}
});
/**