Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Conflicts: htdocs/core/class/utils.class.php
Fix infinit logs
2022-03-10 15:49:51 +01:00 · 2022-03-10 15:46:00 +01:00 · 2022-01-07 15:35:33 +01:00
1 changed files with 13 additions and 11 deletions
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -291,6 +291,7 @@ class Utils
 				$ok=0;
 				dol_syslog("Run command ".$fullcommandcrypted);
 				$handlein = popen($fullcommandclear, 'r');
+				if ($handlein) {
 					$i=0;
 					while (!feof($handlein))
 					{
@@ -303,6 +304,7 @@ class Utils
 						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
 					}
 					pclose($handlein);
+				}

 				if ($compression == 'none') fclose($handle);
 				if ($compression == 'gz')   gzclose($handle);
Author	SHA1	Message	Date
Laurent Destailleur	af6e95aa79	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/class/utils.class.php	2022-03-10 15:49:51 +01:00
Laurent Destailleur	5d942c9d1a	Fix infinit logs	2022-03-10 15:46:00 +01:00
Laurent Destailleur	10e32c056e	FIX avoid infinite loop on dump with popen	2022-01-07 15:35:33 +01:00