mirror of
https://github.com/php/php-src.git
synced 2025-08-18 23:18:56 +02:00
- Fixed bug #60570 (http wrapper leaks context resource if request fails/is
redirected).
This commit is contained in:
parent
8e0358d2b4
commit
d1be77edfb
2 changed files with 53 additions and 3 deletions
|
@ -787,9 +787,6 @@ finish:
|
||||||
if (location[0] != '\0')
|
if (location[0] != '\0')
|
||||||
php_stream_notify_info(context, PHP_STREAM_NOTIFY_REDIRECTED, location, 0);
|
php_stream_notify_info(context, PHP_STREAM_NOTIFY_REDIRECTED, location, 0);
|
||||||
|
|
||||||
if (context) { /* keep the context for the next try */
|
|
||||||
zend_list_addref(context->rsrc_id);
|
|
||||||
}
|
|
||||||
php_stream_close(stream);
|
php_stream_close(stream);
|
||||||
stream = NULL;
|
stream = NULL;
|
||||||
|
|
||||||
|
|
53
ext/standard/tests/http/bug60570.phpt
Normal file
53
ext/standard/tests/http/bug60570.phpt
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
--TEST--
|
||||||
|
Bug #60570 (Stream context leaks when http request fails)
|
||||||
|
--SKIPIF--
|
||||||
|
<?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>
|
||||||
|
--INI--
|
||||||
|
allow_url_fopen=1
|
||||||
|
allow_url_include=1
|
||||||
|
--FILE--
|
||||||
|
<?php
|
||||||
|
require 'server.inc';
|
||||||
|
|
||||||
|
function do_test() {
|
||||||
|
|
||||||
|
$responses = array(
|
||||||
|
"data://text/plain,HTTP/1.0 404 Not Found\r\n\r\n",
|
||||||
|
"data://text/plain,HTTP/1.0 404 Not Found\r\n\r\n",
|
||||||
|
"data://text/plain,HTTP/1.0 404 Not Found\r\n\r\n"
|
||||||
|
);
|
||||||
|
|
||||||
|
$pid = http_server("tcp://127.0.0.1:12342", $responses, $output);
|
||||||
|
|
||||||
|
$a = $b = null;
|
||||||
|
|
||||||
|
$i = 3;
|
||||||
|
while ($i--) {
|
||||||
|
$context = stream_context_create(array('http'=>array('timeout'=>1)));
|
||||||
|
file_get_contents('http://127.0.0.1:12342/', 0, $context);
|
||||||
|
unset($context);
|
||||||
|
|
||||||
|
$b = $a;
|
||||||
|
$a = memory_get_usage();
|
||||||
|
}
|
||||||
|
|
||||||
|
http_server_kill($pid);
|
||||||
|
|
||||||
|
echo "leak? penultimate iteration: $b, last one: $a\n";
|
||||||
|
var_dump($a == $b);
|
||||||
|
}
|
||||||
|
|
||||||
|
do_test();
|
||||||
|
|
||||||
|
--EXPECTF--
|
||||||
|
Warning: file_get_contents(http://127.0.0.1:12342/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found
|
||||||
|
in %s on line %d
|
||||||
|
|
||||||
|
Warning: file_get_contents(http://127.0.0.1:12342/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found
|
||||||
|
in %s on line %d
|
||||||
|
|
||||||
|
Warning: file_get_contents(http://127.0.0.1:12342/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found
|
||||||
|
in %s on line %d
|
||||||
|
leak? penultimate iteration: %d, last one: %d
|
||||||
|
bool(true)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue