php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1' into PHP-8.2

Browse Source 
* PHP-8.1:
  Fix EXPECT for bug52820.phpt on newer curl versions
  Fix curl_basic_009.phpt for newer curl versions
This commit is contained in:
Ilija Tovilo
2023-08-10 15:52:14 +02:00
parent 57417bbc3f 0e843c5d82
commit 1aae59cf43
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ext/curl/tests/curl_basic_009.phpt
View File

@@ -7,7 +7,8 @@ curl
--FILE--
<?php
$url = substr(uniqid(),0,7)."://www.".uniqid().".".uniqid();
// Make sure the scheme always starts with an alphabetic character.
$url = 'a' . substr(uniqid(),0,6)."://www.example.com";
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);

28
ext/standard/tests/file/bug52820.phpt
View File

@@ -42,25 +42,25 @@ zend_leak_variable(do_stuff("php://memory"));
echo "\nDone.\n";
?>
--EXPECTF--
temp stream (close after):
--EXPECTREGEX--
temp stream \(close after\):
About to rewind!
* Couldn't open file /i_dont_exist/
* Closing connection%A%d
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
\* Closing connection( -?\d+)?
memory stream (close after):
memory stream \(close after\):
About to rewind!
* Couldn't open file /i_dont_exist/
* Closing connection%A%d
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
\* Closing connection( -?\d+)?
temp stream (leak):
temp stream \(leak\):
About to rewind!
* Couldn't open file /i_dont_exist/
* Closing connection%A%d
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
\* Closing connection( -?\d+)?
memory stream (leak):
memory stream \(leak\):
About to rewind!
* Couldn't open file /i_dont_exist/
* Closing connection%A%d
(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
\* Closing connection( -?\d+)?
Done.
Done\.