From b8b5fb074d2f816c3613224abc8b000fda7f4bcd Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Thu, 19 Mar 2026 12:05:37 +0100 Subject: [PATCH] Fix expected output for bug52820.phpt Newer versions of curl seem to omit the "Closing connection ..." message. Make the entire line optional. --- ext/standard/tests/file/bug52820.phpt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt index 06aa3463c4e..1157d8cb2db 100644 --- a/ext/standard/tests/file/bug52820.phpt +++ b/ext/standard/tests/file/bug52820.phpt @@ -45,22 +45,18 @@ echo "\nDone.\n"; --EXPECTREGEX-- temp stream \(close after\): About to rewind! -(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/ -\* [Cc]losing connection( #?-?\d+)? +(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/(\n\* [Cc]losing connection( #?-?\d+)?)? memory stream \(close after\): About to rewind! -(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/ -\* [Cc]losing connection( #?-?\d+)? +(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/(\n\* [Cc]losing connection( #?-?\d+)?)? temp stream \(leak\): About to rewind! -(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/ -\* [Cc]losing connection( #?-?\d+)? +(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/(\n\* [Cc]losing connection( #?-?\d+)?)? memory stream \(leak\): About to rewind! -(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/ -\* [Cc]losing connection( #?-?\d+)? +(\* processing: file:\/\/\/i_dont_exist\/\n)?\* (Couldn't|Could not) open file \/i_dont_exist\/(\n\* [Cc]losing connection( #?-?\d+)?)? Done\.