Skip to content

Commit a2d1db9

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: fix merge [Intl] Update ICU data from 74.1 to 75.1 use DeprecatedCallableInfo for Twig callables if possible [Filesystem] Add a warning about `chown()` and `chgrp()` on Windows [String] Update wcswidth data with Unicode 16 PhpSubprocess: Add flag PREG_OFFSET_CAPTURE to preg_match to identify the offset Work around parse_url() bug [Ldap] Clean `ldap_connect()` call in `LdapTestCase` [HttpFoundation] Update links for X-Accel-Redirect and fail properly when X-Accel-Mapping is missing
2 parents d704e30 + 6fd79ab commit a2d1db9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

PhpSubprocess.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private function writeTmpIni(array $iniFiles, string $tmpDir): string
106106
throw new RuntimeException('Unable to read ini: '.$file);
107107
}
108108
// Check and remove directives after HOST and PATH sections
109-
if (preg_match('/^\s*\[(?:PATH|HOST)\s*=/mi', $data, $matches)) {
109+
if (preg_match('/^\s*\[(?:PATH|HOST)\s*=/mi', $data, $matches, \PREG_OFFSET_CAPTURE)) {
110110
$data = substr($data, 0, $matches[0][1]);
111111
}
112112

0 commit comments

Comments
 (0)