Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ext/curl/curl.stub.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3740,6 +3740,7 @@ final class CurlSharePersistentHandle
public readonly array $options;
}

#[\Deprecated(since: '8.5', message: "as it has no effect since PHP 8.0")]
function curl_close(CurlHandle $handle): void {}

/** @refcount 1 */
Expand Down
11 changes: 9 additions & 2 deletions ext/curl/curl_arginfo.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions ext/curl/tests/bug27023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,6 @@ $file = curl_file_create(__DIR__ . '/curl_testdata1.txt', "text/plain", "foo.txt
$params = array('file' => $file);
curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
var_dump(curl_exec($ch));


curl_close($ch);
?>
--EXPECTF--
string(%d) "curl_testdata1.txt|application/octet-stream|6"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48203.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl_setopt($ch, CURLOPT_URL, curl_cli_server_start());
fclose($fp); // <-- premature close of $fp caused a crash!

curl_exec($ch);
curl_close($ch);

echo "Ok\n";

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48207.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ try {
}

curl_exec($ch);
curl_close($ch);
is_file($tempfile) and @unlink($tempfile);
isset($tempname) and is_file($tempname) and @unlink($tempname);
?>
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug55767.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ open_basedir="/tmp"
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar"));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ curl
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "$base_dir/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "c:/xxx/bar"));
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug63795.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,6 @@ var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, true));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2));

curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
2 changes: 1 addition & 1 deletion ext/curl/tests/bug65458.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ for ($i = 0; $i < 10000; $i++) {
}

$preclose = memory_get_usage();
curl_close($ch);
$ch = null;

// This is a slightly tricky heuristic, but basically, we want to ensure
// $preclose - $init has a delta in the order of bytes, not megabytes. Given
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ if (ini_get('open_basedir')) exit("skip open_basedir is set");
<?php
$ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
curl_close($ch);
?>
--EXPECT--
bool(true)
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646_open_basedir_new.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ $ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
var_dump(curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_FILE));
var_dump(curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_FILE));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/bug66109.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ var_dump(curl_exec($ch));

curl_setopt($ch, CURLOPT_CUSTOMREQUEST, NULL);
var_dump(curl_exec($ch));

curl_close($ch);

?>
--EXPECT--
string(6) "DELETE"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECT--
NULL
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937_2.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECTF--
resource(%d) of type (stream)
1 change: 0 additions & 1 deletion ext/curl/tests/bug69316.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ curl
curl_setopt($ch, CURLOPT_FILE, $f_file);
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 2 additions & 0 deletions ext/curl/tests/bug72202.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,8 @@ object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
}

Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug76675.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ do {
if ($handle !== null) {
$transfers--;
curl_multi_remove_handle($mh, $handle);
curl_close($handle);
}
}
} while ($info);
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug77711.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ $params = array('file' => $file);
var_dump(curl_setopt($ch, CURLOPT_POSTFIELDS, $params));

var_dump(curl_exec($ch));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
4 changes: 0 additions & 4 deletions ext/curl/tests/bug77946.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@ do {
}
} while ($status === CURLM_CALL_MULTI_PERFORM || $active);

foreach ($urls as $i => $url) {
curl_close($conn[$i]);
}

curl_multi_close($mh);
?>
--EXPECTF--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug78775.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl_setopt_array(
);

var_dump(curl_exec($handle));
curl_close($handle);

fwrite($sock, "GET / HTTP/1.0\n\n");
var_dump(fread($sock, 8));
Expand Down
4 changes: 2 additions & 2 deletions ext/curl/tests/bug79199.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@ $mem_old = 0;
for($i = 0; $i < 50; ++$i) {
$c1 = curl_init();
$c2 = curl_copy_handle($c1);
curl_close($c2);
curl_close($c1);
$c2 = null;
$c1 = null;
$mem_new = memory_get_usage();
if ($mem_new <= $mem_old) {
break;
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_CURLOPT_READDATA.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,6 @@ if (false === $response = curl_exec($ch)) {
echo $response;
}

curl_close($ch);

// Clean the temporary file
@unlink($tempname);
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_001.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ curl
ob_start(); // start output buffering
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
$ok = curl_exec($ch);
curl_close($ch);
$curl_content = ob_get_contents();
ob_end_clean();

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_002.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_003.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_004.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_005.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_006.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl
});

curl_exec($ch);
curl_close($ch);
ob_end_flush();
echo "Data: $alldata";
?>
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_007.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ $ch = curl_init();
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "No URL set%A"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_008.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
%s resolve%s
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_009.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%Srotocol%s"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_010.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:|Unsupported proxy syntax in)%r %s"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_011.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_012.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_013.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_019.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl
curl_exec($ch);
$info = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
var_dump($url == $info);
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_020.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE));
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_021.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
curl_close($ch);
?>
--EXPECT--
string(24) "text/plain;charset=utf-8"
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_exec($ch);
var_dump(CURL_HTTP_VERSION_1_1 === curl_getinfo($ch, CURLINFO_HTTP_VERSION));
curl_close($ch);
?>
--EXPECT--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_024.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_exec($ch);
var_dump(CURLPROTO_HTTP === curl_getinfo($ch, CURLINFO_PROTOCOL));
var_dump(0 === curl_getinfo($ch, CURLINFO_PROXY_SSL_VERIFYRESULT));
var_dump(curl_getinfo($ch, CURLINFO_SCHEME));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[RFC] Deprecate curl_close() by DanielEScherzer · Pull Request #19451 · php/php-src · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ext/curl/curl.stub.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3740,6 +3740,7 @@ final class CurlSharePersistentHandle
public readonly array $options;
}

#[\Deprecated(since: '8.5', message: "as it has no effect since PHP 8.0")]
function curl_close(CurlHandle $handle): void {}

/** @refcount 1 */
Expand Down
11 changes: 9 additions & 2 deletions ext/curl/curl_arginfo.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions ext/curl/tests/bug27023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,6 @@ $file = curl_file_create(__DIR__ . '/curl_testdata1.txt', "text/plain", "foo.txt
$params = array('file' => $file);
curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
var_dump(curl_exec($ch));


curl_close($ch);
?>
--EXPECTF--
string(%d) "curl_testdata1.txt|application/octet-stream|6"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48203.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl_setopt($ch, CURLOPT_URL, curl_cli_server_start());
fclose($fp); // <-- premature close of $fp caused a crash!

curl_exec($ch);
curl_close($ch);

echo "Ok\n";

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48207.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ try {
}

curl_exec($ch);
curl_close($ch);
is_file($tempfile) and @unlink($tempfile);
isset($tempname) and is_file($tempname) and @unlink($tempname);
?>
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug55767.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ open_basedir="/tmp"
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar"));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ curl
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "$base_dir/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "c:/xxx/bar"));
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug63795.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,6 @@ var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, true));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2));

curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
2 changes: 1 addition & 1 deletion ext/curl/tests/bug65458.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ for ($i = 0; $i < 10000; $i++) {
}

$preclose = memory_get_usage();
curl_close($ch);
$ch = null;

// This is a slightly tricky heuristic, but basically, we want to ensure
// $preclose - $init has a delta in the order of bytes, not megabytes. Given
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ if (ini_get('open_basedir')) exit("skip open_basedir is set");
<?php
$ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
curl_close($ch);
?>
--EXPECT--
bool(true)
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646_open_basedir_new.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ $ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
var_dump(curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_FILE));
var_dump(curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_FILE));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/bug66109.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ var_dump(curl_exec($ch));

curl_setopt($ch, CURLOPT_CUSTOMREQUEST, NULL);
var_dump(curl_exec($ch));

curl_close($ch);

?>
--EXPECT--
string(6) "DELETE"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECT--
NULL
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937_2.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECTF--
resource(%d) of type (stream)
1 change: 0 additions & 1 deletion ext/curl/tests/bug69316.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ curl
curl_setopt($ch, CURLOPT_FILE, $f_file);
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 2 additions & 0 deletions ext/curl/tests/bug72202.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,8 @@ object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
}

Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug76675.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ do {
if ($handle !== null) {
$transfers--;
curl_multi_remove_handle($mh, $handle);
curl_close($handle);
}
}
} while ($info);
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug77711.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ $params = array('file' => $file);
var_dump(curl_setopt($ch, CURLOPT_POSTFIELDS, $params));

var_dump(curl_exec($ch));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
4 changes: 0 additions & 4 deletions ext/curl/tests/bug77946.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@ do {
}
} while ($status === CURLM_CALL_MULTI_PERFORM || $active);

foreach ($urls as $i => $url) {
curl_close($conn[$i]);
}

curl_multi_close($mh);
?>
--EXPECTF--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug78775.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl_setopt_array(
);

var_dump(curl_exec($handle));
curl_close($handle);

fwrite($sock, "GET / HTTP/1.0\n\n");
var_dump(fread($sock, 8));
Expand Down
4 changes: 2 additions & 2 deletions ext/curl/tests/bug79199.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@ $mem_old = 0;
for($i = 0; $i < 50; ++$i) {
$c1 = curl_init();
$c2 = curl_copy_handle($c1);
curl_close($c2);
curl_close($c1);
$c2 = null;
$c1 = null;
$mem_new = memory_get_usage();
if ($mem_new <= $mem_old) {
break;
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_CURLOPT_READDATA.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,6 @@ if (false === $response = curl_exec($ch)) {
echo $response;
}

curl_close($ch);

// Clean the temporary file
@unlink($tempname);
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_001.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ curl
ob_start(); // start output buffering
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
$ok = curl_exec($ch);
curl_close($ch);
$curl_content = ob_get_contents();
ob_end_clean();

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_002.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_003.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_004.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_005.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_006.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl
});

curl_exec($ch);
curl_close($ch);
ob_end_flush();
echo "Data: $alldata";
?>
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_007.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ $ch = curl_init();
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "No URL set%A"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_008.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
%s resolve%s
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_009.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%Srotocol%s"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_010.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:|Unsupported proxy syntax in)%r %s"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_011.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_012.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_013.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_019.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl
curl_exec($ch);
$info = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
var_dump($url == $info);
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_020.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE));
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_021.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
curl_close($ch);
?>
--EXPECT--
string(24) "text/plain;charset=utf-8"
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_exec($ch);
var_dump(CURL_HTTP_VERSION_1_1 === curl_getinfo($ch, CURLINFO_HTTP_VERSION));
curl_close($ch);
?>
--EXPECT--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_024.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_exec($ch);
var_dump(CURLPROTO_HTTP === curl_getinfo($ch, CURLINFO_PROTOCOL));
var_dump(0 === curl_getinfo($ch, CURLINFO_PROXY_SSL_VERIFYRESULT));
var_dump(curl_getinfo($ch, CURLINFO_SCHEME));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [RFC] Deprecate curl_close() by DanielEScherzer · Pull Request #19451 · php/php-src · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ext/curl/curl.stub.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3740,6 +3740,7 @@ final class CurlSharePersistentHandle
public readonly array $options;
}

#[\Deprecated(since: '8.5', message: "as it has no effect since PHP 8.0")]
function curl_close(CurlHandle $handle): void {}

/** @refcount 1 */
Expand Down
11 changes: 9 additions & 2 deletions ext/curl/curl_arginfo.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions ext/curl/tests/bug27023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,6 @@ $file = curl_file_create(__DIR__ . '/curl_testdata1.txt', "text/plain", "foo.txt
$params = array('file' => $file);
curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
var_dump(curl_exec($ch));


curl_close($ch);
?>
--EXPECTF--
string(%d) "curl_testdata1.txt|application/octet-stream|6"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48203.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl_setopt($ch, CURLOPT_URL, curl_cli_server_start());
fclose($fp); // <-- premature close of $fp caused a crash!

curl_exec($ch);
curl_close($ch);

echo "Ok\n";

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48207.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ try {
}

curl_exec($ch);
curl_close($ch);
is_file($tempfile) and @unlink($tempfile);
isset($tempname) and is_file($tempname) and @unlink($tempname);
?>
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug55767.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ open_basedir="/tmp"
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar"));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ curl
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "$base_dir/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "c:/xxx/bar"));
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug63795.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,6 @@ var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, true));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2));

curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
2 changes: 1 addition & 1 deletion ext/curl/tests/bug65458.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ for ($i = 0; $i < 10000; $i++) {
}

$preclose = memory_get_usage();
curl_close($ch);
$ch = null;

// This is a slightly tricky heuristic, but basically, we want to ensure
// $preclose - $init has a delta in the order of bytes, not megabytes. Given
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ if (ini_get('open_basedir')) exit("skip open_basedir is set");
<?php
$ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
curl_close($ch);
?>
--EXPECT--
bool(true)
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646_open_basedir_new.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ $ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
var_dump(curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_FILE));
var_dump(curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_FILE));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/bug66109.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ var_dump(curl_exec($ch));

curl_setopt($ch, CURLOPT_CUSTOMREQUEST, NULL);
var_dump(curl_exec($ch));

curl_close($ch);

?>
--EXPECT--
string(6) "DELETE"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECT--
NULL
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937_2.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECTF--
resource(%d) of type (stream)
1 change: 0 additions & 1 deletion ext/curl/tests/bug69316.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ curl
curl_setopt($ch, CURLOPT_FILE, $f_file);
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 2 additions & 0 deletions ext/curl/tests/bug72202.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,8 @@ object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
}

Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug76675.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ do {
if ($handle !== null) {
$transfers--;
curl_multi_remove_handle($mh, $handle);
curl_close($handle);
}
}
} while ($info);
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug77711.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ $params = array('file' => $file);
var_dump(curl_setopt($ch, CURLOPT_POSTFIELDS, $params));

var_dump(curl_exec($ch));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
4 changes: 0 additions & 4 deletions ext/curl/tests/bug77946.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@ do {
}
} while ($status === CURLM_CALL_MULTI_PERFORM || $active);

foreach ($urls as $i => $url) {
curl_close($conn[$i]);
}

curl_multi_close($mh);
?>
--EXPECTF--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug78775.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl_setopt_array(
);

var_dump(curl_exec($handle));
curl_close($handle);

fwrite($sock, "GET / HTTP/1.0\n\n");
var_dump(fread($sock, 8));
Expand Down
4 changes: 2 additions & 2 deletions ext/curl/tests/bug79199.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@ $mem_old = 0;
for($i = 0; $i < 50; ++$i) {
$c1 = curl_init();
$c2 = curl_copy_handle($c1);
curl_close($c2);
curl_close($c1);
$c2 = null;
$c1 = null;
$mem_new = memory_get_usage();
if ($mem_new <= $mem_old) {
break;
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_CURLOPT_READDATA.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,6 @@ if (false === $response = curl_exec($ch)) {
echo $response;
}

curl_close($ch);

// Clean the temporary file
@unlink($tempname);
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_001.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ curl
ob_start(); // start output buffering
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
$ok = curl_exec($ch);
curl_close($ch);
$curl_content = ob_get_contents();
ob_end_clean();

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_002.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_003.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_004.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_005.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_006.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl
});

curl_exec($ch);
curl_close($ch);
ob_end_flush();
echo "Data: $alldata";
?>
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_007.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ $ch = curl_init();
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "No URL set%A"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_008.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
%s resolve%s
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_009.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%Srotocol%s"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_010.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:|Unsupported proxy syntax in)%r %s"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_011.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_012.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_013.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_019.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl
curl_exec($ch);
$info = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
var_dump($url == $info);
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_020.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE));
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_021.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
curl_close($ch);
?>
--EXPECT--
string(24) "text/plain;charset=utf-8"
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_exec($ch);
var_dump(CURL_HTTP_VERSION_1_1 === curl_getinfo($ch, CURLINFO_HTTP_VERSION));
curl_close($ch);
?>
--EXPECT--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_024.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_exec($ch);
var_dump(CURLPROTO_HTTP === curl_getinfo($ch, CURLINFO_PROTOCOL));
var_dump(0 === curl_getinfo($ch, CURLINFO_PROXY_SSL_VERIFYRESULT));
var_dump(curl_getinfo($ch, CURLINFO_SCHEME));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [RFC] Deprecate curl_close() by DanielEScherzer · Pull Request #19451 · php/php-src · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ext/curl/curl.stub.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3740,6 +3740,7 @@ final class CurlSharePersistentHandle
public readonly array $options;
}

#[\Deprecated(since: '8.5', message: "as it has no effect since PHP 8.0")]
function curl_close(CurlHandle $handle): void {}

/** @refcount 1 */
Expand Down
11 changes: 9 additions & 2 deletions ext/curl/curl_arginfo.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions ext/curl/tests/bug27023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,6 @@ $file = curl_file_create(__DIR__ . '/curl_testdata1.txt', "text/plain", "foo.txt
$params = array('file' => $file);
curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
var_dump(curl_exec($ch));


curl_close($ch);
?>
--EXPECTF--
string(%d) "curl_testdata1.txt|application/octet-stream|6"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48203.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl_setopt($ch, CURLOPT_URL, curl_cli_server_start());
fclose($fp); // <-- premature close of $fp caused a crash!

curl_exec($ch);
curl_close($ch);

echo "Ok\n";

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48207.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ try {
}

curl_exec($ch);
curl_close($ch);
is_file($tempfile) and @unlink($tempfile);
isset($tempname) and is_file($tempname) and @unlink($tempname);
?>
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug55767.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ open_basedir="/tmp"
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar"));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ curl
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "$base_dir/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "c:/xxx/bar"));
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug63795.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,6 @@ var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, true));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2));

curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
2 changes: 1 addition & 1 deletion ext/curl/tests/bug65458.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ for ($i = 0; $i < 10000; $i++) {
}

$preclose = memory_get_usage();
curl_close($ch);
$ch = null;

// This is a slightly tricky heuristic, but basically, we want to ensure
// $preclose - $init has a delta in the order of bytes, not megabytes. Given
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ if (ini_get('open_basedir')) exit("skip open_basedir is set");
<?php
$ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
curl_close($ch);
?>
--EXPECT--
bool(true)
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646_open_basedir_new.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ $ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
var_dump(curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_FILE));
var_dump(curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_FILE));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/bug66109.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ var_dump(curl_exec($ch));

curl_setopt($ch, CURLOPT_CUSTOMREQUEST, NULL);
var_dump(curl_exec($ch));

curl_close($ch);

?>
--EXPECT--
string(6) "DELETE"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECT--
NULL
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937_2.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECTF--
resource(%d) of type (stream)
1 change: 0 additions & 1 deletion ext/curl/tests/bug69316.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ curl
curl_setopt($ch, CURLOPT_FILE, $f_file);
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 2 additions & 0 deletions ext/curl/tests/bug72202.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,8 @@ object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
}

Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug76675.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ do {
if ($handle !== null) {
$transfers--;
curl_multi_remove_handle($mh, $handle);
curl_close($handle);
}
}
} while ($info);
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug77711.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ $params = array('file' => $file);
var_dump(curl_setopt($ch, CURLOPT_POSTFIELDS, $params));

var_dump(curl_exec($ch));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
4 changes: 0 additions & 4 deletions ext/curl/tests/bug77946.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@ do {
}
} while ($status === CURLM_CALL_MULTI_PERFORM || $active);

foreach ($urls as $i => $url) {
curl_close($conn[$i]);
}

curl_multi_close($mh);
?>
--EXPECTF--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug78775.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl_setopt_array(
);

var_dump(curl_exec($handle));
curl_close($handle);

fwrite($sock, "GET / HTTP/1.0\n\n");
var_dump(fread($sock, 8));
Expand Down
4 changes: 2 additions & 2 deletions ext/curl/tests/bug79199.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@ $mem_old = 0;
for($i = 0; $i < 50; ++$i) {
$c1 = curl_init();
$c2 = curl_copy_handle($c1);
curl_close($c2);
curl_close($c1);
$c2 = null;
$c1 = null;
$mem_new = memory_get_usage();
if ($mem_new <= $mem_old) {
break;
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_CURLOPT_READDATA.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,6 @@ if (false === $response = curl_exec($ch)) {
echo $response;
}

curl_close($ch);

// Clean the temporary file
@unlink($tempname);
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_001.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ curl
ob_start(); // start output buffering
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
$ok = curl_exec($ch);
curl_close($ch);
$curl_content = ob_get_contents();
ob_end_clean();

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_002.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_003.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_004.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_005.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_006.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl
});

curl_exec($ch);
curl_close($ch);
ob_end_flush();
echo "Data: $alldata";
?>
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_007.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ $ch = curl_init();
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "No URL set%A"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_008.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
%s resolve%s
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_009.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%Srotocol%s"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_010.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:|Unsupported proxy syntax in)%r %s"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_011.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_012.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_013.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_019.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl
curl_exec($ch);
$info = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
var_dump($url == $info);
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_020.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE));
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_021.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
curl_close($ch);
?>
--EXPECT--
string(24) "text/plain;charset=utf-8"
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_exec($ch);
var_dump(CURL_HTTP_VERSION_1_1 === curl_getinfo($ch, CURLINFO_HTTP_VERSION));
curl_close($ch);
?>
--EXPECT--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_024.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_exec($ch);
var_dump(CURLPROTO_HTTP === curl_getinfo($ch, CURLINFO_PROTOCOL));
var_dump(0 === curl_getinfo($ch, CURLINFO_PROXY_SSL_VERIFYRESULT));
var_dump(curl_getinfo($ch, CURLINFO_SCHEME));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' [RFC] Deprecate curl_close() by DanielEScherzer · Pull Request #19451 · php/php-src · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ext/curl/curl.stub.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3740,6 +3740,7 @@ final class CurlSharePersistentHandle
public readonly array $options;
}

#[\Deprecated(since: '8.5', message: "as it has no effect since PHP 8.0")]
function curl_close(CurlHandle $handle): void {}

/** @refcount 1 */
Expand Down
11 changes: 9 additions & 2 deletions ext/curl/curl_arginfo.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions ext/curl/tests/bug27023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,6 @@ $file = curl_file_create(__DIR__ . '/curl_testdata1.txt', "text/plain", "foo.txt
$params = array('file' => $file);
curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
var_dump(curl_exec($ch));


curl_close($ch);
?>
--EXPECTF--
string(%d) "curl_testdata1.txt|application/octet-stream|6"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48203.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl_setopt($ch, CURLOPT_URL, curl_cli_server_start());
fclose($fp); // <-- premature close of $fp caused a crash!

curl_exec($ch);
curl_close($ch);

echo "Ok\n";

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48207.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ try {
}

curl_exec($ch);
curl_close($ch);
is_file($tempfile) and @unlink($tempfile);
isset($tempname) and is_file($tempname) and @unlink($tempname);
?>
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug55767.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ open_basedir="/tmp"
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar"));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ curl
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "$base_dir/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "c:/xxx/bar"));
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug63795.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,6 @@ var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, true));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2));

curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
2 changes: 1 addition & 1 deletion ext/curl/tests/bug65458.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ for ($i = 0; $i < 10000; $i++) {
}

$preclose = memory_get_usage();
curl_close($ch);
$ch = null;

// This is a slightly tricky heuristic, but basically, we want to ensure
// $preclose - $init has a delta in the order of bytes, not megabytes. Given
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ if (ini_get('open_basedir')) exit("skip open_basedir is set");
<?php
$ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
curl_close($ch);
?>
--EXPECT--
bool(true)
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646_open_basedir_new.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ $ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
var_dump(curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_FILE));
var_dump(curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_FILE));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/bug66109.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ var_dump(curl_exec($ch));

curl_setopt($ch, CURLOPT_CUSTOMREQUEST, NULL);
var_dump(curl_exec($ch));

curl_close($ch);

?>
--EXPECT--
string(6) "DELETE"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECT--
NULL
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937_2.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECTF--
resource(%d) of type (stream)
1 change: 0 additions & 1 deletion ext/curl/tests/bug69316.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ curl
curl_setopt($ch, CURLOPT_FILE, $f_file);
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 2 additions & 0 deletions ext/curl/tests/bug72202.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,8 @@ object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
}

Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug76675.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ do {
if ($handle !== null) {
$transfers--;
curl_multi_remove_handle($mh, $handle);
curl_close($handle);
}
}
} while ($info);
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug77711.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ $params = array('file' => $file);
var_dump(curl_setopt($ch, CURLOPT_POSTFIELDS, $params));

var_dump(curl_exec($ch));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
4 changes: 0 additions & 4 deletions ext/curl/tests/bug77946.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@ do {
}
} while ($status === CURLM_CALL_MULTI_PERFORM || $active);

foreach ($urls as $i => $url) {
curl_close($conn[$i]);
}

curl_multi_close($mh);
?>
--EXPECTF--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug78775.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl_setopt_array(
);

var_dump(curl_exec($handle));
curl_close($handle);

fwrite($sock, "GET / HTTP/1.0\n\n");
var_dump(fread($sock, 8));
Expand Down
4 changes: 2 additions & 2 deletions ext/curl/tests/bug79199.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@ $mem_old = 0;
for($i = 0; $i < 50; ++$i) {
$c1 = curl_init();
$c2 = curl_copy_handle($c1);
curl_close($c2);
curl_close($c1);
$c2 = null;
$c1 = null;
$mem_new = memory_get_usage();
if ($mem_new <= $mem_old) {
break;
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_CURLOPT_READDATA.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,6 @@ if (false === $response = curl_exec($ch)) {
echo $response;
}

curl_close($ch);

// Clean the temporary file
@unlink($tempname);
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_001.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ curl
ob_start(); // start output buffering
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
$ok = curl_exec($ch);
curl_close($ch);
$curl_content = ob_get_contents();
ob_end_clean();

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_002.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_003.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_004.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_005.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_006.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl
});

curl_exec($ch);
curl_close($ch);
ob_end_flush();
echo "Data: $alldata";
?>
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_007.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ $ch = curl_init();
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "No URL set%A"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_008.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
%s resolve%s
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_009.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%Srotocol%s"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_010.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:|Unsupported proxy syntax in)%r %s"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_011.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_012.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_013.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_019.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl
curl_exec($ch);
$info = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
var_dump($url == $info);
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_020.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE));
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_021.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
curl_close($ch);
?>
--EXPECT--
string(24) "text/plain;charset=utf-8"
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_exec($ch);
var_dump(CURL_HTTP_VERSION_1_1 === curl_getinfo($ch, CURLINFO_HTTP_VERSION));
curl_close($ch);
?>
--EXPECT--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_024.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_exec($ch);
var_dump(CURLPROTO_HTTP === curl_getinfo($ch, CURLINFO_PROTOCOL));
var_dump(0 === curl_getinfo($ch, CURLINFO_PROXY_SSL_VERIFYRESULT));
var_dump(curl_getinfo($ch, CURLINFO_SCHEME));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [RFC] Deprecate curl_close() by DanielEScherzer · Pull Request #19451 · php/php-src · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ext/curl/curl.stub.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3740,6 +3740,7 @@ final class CurlSharePersistentHandle
public readonly array $options;
}

#[\Deprecated(since: '8.5', message: "as it has no effect since PHP 8.0")]
function curl_close(CurlHandle $handle): void {}

/** @refcount 1 */
Expand Down
11 changes: 9 additions & 2 deletions ext/curl/curl_arginfo.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions ext/curl/tests/bug27023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,6 @@ $file = curl_file_create(__DIR__ . '/curl_testdata1.txt', "text/plain", "foo.txt
$params = array('file' => $file);
curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
var_dump(curl_exec($ch));


curl_close($ch);
?>
--EXPECTF--
string(%d) "curl_testdata1.txt|application/octet-stream|6"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48203.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl_setopt($ch, CURLOPT_URL, curl_cli_server_start());
fclose($fp); // <-- premature close of $fp caused a crash!

curl_exec($ch);
curl_close($ch);

echo "Ok\n";

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48207.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ try {
}

curl_exec($ch);
curl_close($ch);
is_file($tempfile) and @unlink($tempfile);
isset($tempname) and is_file($tempname) and @unlink($tempname);
?>
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug55767.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ open_basedir="/tmp"
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar"));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ curl
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "$base_dir/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "c:/xxx/bar"));
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug63795.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,6 @@ var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, true));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2));

curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
2 changes: 1 addition & 1 deletion ext/curl/tests/bug65458.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ for ($i = 0; $i < 10000; $i++) {
}

$preclose = memory_get_usage();
curl_close($ch);
$ch = null;

// This is a slightly tricky heuristic, but basically, we want to ensure
// $preclose - $init has a delta in the order of bytes, not megabytes. Given
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ if (ini_get('open_basedir')) exit("skip open_basedir is set");
<?php
$ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
curl_close($ch);
?>
--EXPECT--
bool(true)
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646_open_basedir_new.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ $ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
var_dump(curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_FILE));
var_dump(curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_FILE));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/bug66109.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ var_dump(curl_exec($ch));

curl_setopt($ch, CURLOPT_CUSTOMREQUEST, NULL);
var_dump(curl_exec($ch));

curl_close($ch);

?>
--EXPECT--
string(6) "DELETE"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECT--
NULL
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937_2.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECTF--
resource(%d) of type (stream)
1 change: 0 additions & 1 deletion ext/curl/tests/bug69316.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ curl
curl_setopt($ch, CURLOPT_FILE, $f_file);
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 2 additions & 0 deletions ext/curl/tests/bug72202.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,8 @@ object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
}

Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug76675.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ do {
if ($handle !== null) {
$transfers--;
curl_multi_remove_handle($mh, $handle);
curl_close($handle);
}
}
} while ($info);
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug77711.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ $params = array('file' => $file);
var_dump(curl_setopt($ch, CURLOPT_POSTFIELDS, $params));

var_dump(curl_exec($ch));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
4 changes: 0 additions & 4 deletions ext/curl/tests/bug77946.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@ do {
}
} while ($status === CURLM_CALL_MULTI_PERFORM || $active);

foreach ($urls as $i => $url) {
curl_close($conn[$i]);
}

curl_multi_close($mh);
?>
--EXPECTF--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug78775.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl_setopt_array(
);

var_dump(curl_exec($handle));
curl_close($handle);

fwrite($sock, "GET / HTTP/1.0\n\n");
var_dump(fread($sock, 8));
Expand Down
4 changes: 2 additions & 2 deletions ext/curl/tests/bug79199.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@ $mem_old = 0;
for($i = 0; $i < 50; ++$i) {
$c1 = curl_init();
$c2 = curl_copy_handle($c1);
curl_close($c2);
curl_close($c1);
$c2 = null;
$c1 = null;
$mem_new = memory_get_usage();
if ($mem_new <= $mem_old) {
break;
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_CURLOPT_READDATA.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,6 @@ if (false === $response = curl_exec($ch)) {
echo $response;
}

curl_close($ch);

// Clean the temporary file
@unlink($tempname);
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_001.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ curl
ob_start(); // start output buffering
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
$ok = curl_exec($ch);
curl_close($ch);
$curl_content = ob_get_contents();
ob_end_clean();

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_002.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_003.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_004.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_005.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_006.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl
});

curl_exec($ch);
curl_close($ch);
ob_end_flush();
echo "Data: $alldata";
?>
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_007.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ $ch = curl_init();
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "No URL set%A"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_008.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
%s resolve%s
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_009.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%Srotocol%s"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_010.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:|Unsupported proxy syntax in)%r %s"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_011.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_012.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_013.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_019.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl
curl_exec($ch);
$info = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
var_dump($url == $info);
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_020.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE));
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_021.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
curl_close($ch);
?>
--EXPECT--
string(24) "text/plain;charset=utf-8"
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_exec($ch);
var_dump(CURL_HTTP_VERSION_1_1 === curl_getinfo($ch, CURLINFO_HTTP_VERSION));
curl_close($ch);
?>
--EXPECT--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_024.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_exec($ch);
var_dump(CURLPROTO_HTTP === curl_getinfo($ch, CURLINFO_PROTOCOL));
var_dump(0 === curl_getinfo($ch, CURLINFO_PROXY_SSL_VERIFYRESULT));
var_dump(curl_getinfo($ch, CURLINFO_SCHEME));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); [RFC] Deprecate curl_close() by DanielEScherzer · Pull Request #19451 · php/php-src · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ext/curl/curl.stub.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3740,6 +3740,7 @@ final class CurlSharePersistentHandle
public readonly array $options;
}

#[\Deprecated(since: '8.5', message: "as it has no effect since PHP 8.0")]
function curl_close(CurlHandle $handle): void {}

/** @refcount 1 */
Expand Down
11 changes: 9 additions & 2 deletions ext/curl/curl_arginfo.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions ext/curl/tests/bug27023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,9 +33,6 @@ $file = curl_file_create(__DIR__ . '/curl_testdata1.txt', "text/plain", "foo.txt
$params = array('file' => $file);
curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
var_dump(curl_exec($ch));


curl_close($ch);
?>
--EXPECTF--
string(%d) "curl_testdata1.txt|application/octet-stream|6"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48203.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl_setopt($ch, CURLOPT_URL, curl_cli_server_start());
fclose($fp); // <-- premature close of $fp caused a crash!

curl_exec($ch);
curl_close($ch);

echo "Ok\n";

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug48207.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ try {
}

curl_exec($ch);
curl_close($ch);
is_file($tempfile) and @unlink($tempfile);
isset($tempname) and is_file($tempname) and @unlink($tempname);
?>
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,8 +34,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug54798.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@ function checkForClosedFilePointer($host, $curl_option, $description) {

curl_exec($ch);

curl_close($ch);

echo "Ok for $description\n";
}

Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug55767.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948-unix.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ open_basedir="/tmp"
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar"));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug61948.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ curl
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "$base_dir/foo"));
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "c:/xxx/bar"));
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/bug63795.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,6 @@ var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, true));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2));

curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
2 changes: 1 addition & 1 deletion ext/curl/tests/bug65458.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ for ($i = 0; $i < 10000; $i++) {
}

$preclose = memory_get_usage();
curl_close($ch);
$ch = null;

// This is a slightly tricky heuristic, but basically, we want to ensure
// $preclose - $init has a delta in the order of bytes, not megabytes. Given
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ if (ini_get('open_basedir')) exit("skip open_basedir is set");
<?php
$ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
curl_close($ch);
?>
--EXPECT--
bool(true)
1 change: 0 additions & 1 deletion ext/curl/tests/bug65646_open_basedir_new.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,6 @@ $ch = curl_init();
var_dump(curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true));
var_dump(curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_FILE));
var_dump(curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_FILE));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/bug66109.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ var_dump(curl_exec($ch));

curl_setopt($ch, CURLOPT_CUSTOMREQUEST, NULL);
var_dump(curl_exec($ch));

curl_close($ch);

?>
--EXPECT--
string(6) "DELETE"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECT--
NULL
1 change: 0 additions & 1 deletion ext/curl/tests/bug68937_2.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ function curl_read($ch, $fp, $len) {
}

curl_exec($ch);
curl_close($ch);
?>
--EXPECTF--
resource(%d) of type (stream)
1 change: 0 additions & 1 deletion ext/curl/tests/bug69316.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@ curl
curl_setopt($ch, CURLOPT_FILE, $f_file);
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
curl_close($ch);
?>
--CLEAN--
<?php
Expand Down
2 changes: 2 additions & 0 deletions ext/curl/tests/bug72202.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,8 @@ object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
}

Deprecated: Function curl_close() is deprecated since 8.5, as it has no effect since PHP 8.0 in %s on line %d
object(CurlHandle)#1 (0) {
}
object(CurlHandle)#1 (0) {
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug76675.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ do {
if ($handle !== null) {
$transfers--;
curl_multi_remove_handle($mh, $handle);
curl_close($handle);
}
}
} while ($info);
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug77711.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ $params = array('file' => $file);
var_dump(curl_setopt($ch, CURLOPT_POSTFIELDS, $params));

var_dump(curl_exec($ch));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
4 changes: 0 additions & 4 deletions ext/curl/tests/bug77946.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@ do {
}
} while ($status === CURLM_CALL_MULTI_PERFORM || $active);

foreach ($urls as $i => $url) {
curl_close($conn[$i]);
}

curl_multi_close($mh);
?>
--EXPECTF--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/bug78775.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl_setopt_array(
);

var_dump(curl_exec($handle));
curl_close($handle);

fwrite($sock, "GET / HTTP/1.0\n\n");
var_dump(fread($sock, 8));
Expand Down
4 changes: 2 additions & 2 deletions ext/curl/tests/bug79199.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@ $mem_old = 0;
for($i = 0; $i < 50; ++$i) {
$c1 = curl_init();
$c2 = curl_copy_handle($c1);
curl_close($c2);
curl_close($c1);
$c2 = null;
$c1 = null;
$mem_new = memory_get_usage();
if ($mem_new <= $mem_old) {
break;
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_CURLOPT_READDATA.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,8 +32,6 @@ if (false === $response = curl_exec($ch)) {
echo $response;
}

curl_close($ch);

// Clean the temporary file
@unlink($tempname);
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_001.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@ curl
ob_start(); // start output buffering
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
$ok = curl_exec($ch);
curl_close($ch);
$curl_content = ob_get_contents();
ob_end_clean();

Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_002.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_003.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_004.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
2 changes: 0 additions & 2 deletions ext/curl/tests/curl_basic_005.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
--EXPECT--
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_006.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ curl
});

curl_exec($ch);
curl_close($ch);
ob_end_flush();
echo "Data: $alldata";
?>
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_007.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ $ch = curl_init();
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "No URL set%A"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_008.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
%s resolve%s
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_009.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%Srotocol%s"
Expand Down
3 changes: 0 additions & 3 deletions ext/curl/tests/curl_basic_010.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_error($ch));
var_dump(curl_errno($ch));
curl_close($ch);


?>
--EXPECTF--
string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:|Unsupported proxy syntax in)%r %s"
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_011.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_012.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_013.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use

$curl_content = curl_exec($ch);
curl_close($ch);

var_dump( $curl_content );
?>
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_019.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ curl
curl_exec($ch);
$info = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
var_dump($url == $info);
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_020.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE));
curl_close($ch);
?>
--EXPECT--
Hello World!
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_021.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ curl
curl_setopt($ch, CURLOPT_URL, $url);
curl_exec($ch);
var_dump(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
curl_close($ch);
?>
--EXPECT--
string(24) "text/plain;charset=utf-8"
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_023.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_exec($ch);
var_dump(CURL_HTTP_VERSION_1_1 === curl_getinfo($ch, CURLINFO_HTTP_VERSION));
curl_close($ch);
?>
--EXPECT--
bool(true)
Expand Down
1 change: 0 additions & 1 deletion ext/curl/tests/curl_basic_024.phpt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@ curl_exec($ch);
var_dump(CURLPROTO_HTTP === curl_getinfo($ch, CURLINFO_PROTOCOL));
var_dump(0 === curl_getinfo($ch, CURLINFO_PROXY_SSL_VERIFYRESULT));
var_dump(curl_getinfo($ch, CURLINFO_SCHEME));
curl_close($ch);
?>
--EXPECTF--
bool(true)
Expand Down
Loading