Fix $i could be affected by the socket settings not being of the same length

williamdes · williamdes · commit a0e0282c9123 · 2025-01-07T22:29:19.000+01:00
Sync all variants Ref: 12b0f34 "Looping through $sockets using the same index variable $i interferes with $i--; on the following line. PMA_HOSTS & PMA_SOCKETS may not be of equal length."
diff --git a/apache/config.inc.php b/apache/config.inc.php
@@ -205,9 +205,10 @@
     $cfg['Servers'][$i]['compress'] = false;
     $cfg['Servers'][$i]['AllowNoPassword'] = true;
 }
-for ($i = 1; isset($sockets[$i - 1]); $i++) {
-    $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
-    $cfg['Servers'][$i]['host'] = 'localhost';
+// Avoid overwriting the last server id $i, use another variable name
+for ($socketHostId = 1; isset($sockets[$socketHostId - 1]); $socketHostId++) {
+    $cfg['Servers'][$socketHostId]['socket'] = $sockets[$socketHostId - 1];
+    $cfg['Servers'][$socketHostId]['host'] = 'localhost';
 }
 /*
  * Revert back to last configured server to make
diff --git a/fpm-alpine/config.inc.php b/fpm-alpine/config.inc.php
@@ -205,9 +205,10 @@
     $cfg['Servers'][$i]['compress'] = false;
     $cfg['Servers'][$i]['AllowNoPassword'] = true;
 }
-for ($i = 1; isset($sockets[$i - 1]); $i++) {
-    $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
-    $cfg['Servers'][$i]['host'] = 'localhost';
+// Avoid overwriting the last server id $i, use another variable name
+for ($socketHostId = 1; isset($sockets[$socketHostId - 1]); $socketHostId++) {
+    $cfg['Servers'][$socketHostId]['socket'] = $sockets[$socketHostId - 1];
+    $cfg['Servers'][$socketHostId]['host'] = 'localhost';
 }
 /*
  * Revert back to last configured server to make
diff --git a/fpm/config.inc.php b/fpm/config.inc.php
@@ -205,9 +205,10 @@
     $cfg['Servers'][$i]['compress'] = false;
     $cfg['Servers'][$i]['AllowNoPassword'] = true;
 }
-for ($i = 1; isset($sockets[$i - 1]); $i++) {
-    $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
-    $cfg['Servers'][$i]['host'] = 'localhost';
+// Avoid overwriting the last server id $i, use another variable name
+for ($socketHostId = 1; isset($sockets[$socketHostId - 1]); $socketHostId++) {
+    $cfg['Servers'][$socketHostId]['socket'] = $sockets[$socketHostId - 1];
+    $cfg['Servers'][$socketHostId]['host'] = 'localhost';
 }
 /*
  * Revert back to last configured server to make

Original file line number	Diff line number	Diff line change
`@@ -205,9 +205,10 @@`
`205`	`205`	`$cfg['Servers'][$i]['compress'] = false;`
`206`	`206`	`$cfg['Servers'][$i]['AllowNoPassword'] = true;`
`207`	`207`	`}`
`208`		`-for ($i = 1; isset($sockets[$i - 1]); $i++) {`
`209`		`- $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];`
`210`		`- $cfg['Servers'][$i]['host'] = 'localhost';`
	`208`	`+// Avoid overwriting the last server id $i, use another variable name`
	`209`	`+for ($socketHostId = 1; isset($sockets[$socketHostId - 1]); $socketHostId++) {`
	`210`	`+ $cfg['Servers'][$socketHostId]['socket'] = $sockets[$socketHostId - 1];`
	`211`	`+ $cfg['Servers'][$socketHostId]['host'] = 'localhost';`
`211`	`212`	`}`
`212`	`213`	`/*`
`213`	`214`	`* Revert back to last configured server to make`