mirror of
https://github.com/php/php-src.git
synced 2025-08-20 09:24:05 +02:00
fix memory leak & add test
This commit is contained in:
parent
a643ccfb90
commit
45facd15fb
2 changed files with 48 additions and 2 deletions
|
@ -922,8 +922,13 @@ out:
|
||||||
if (transfer_encoding) {
|
if (transfer_encoding) {
|
||||||
php_stream_filter_append(&stream->readfilters, transfer_encoding);
|
php_stream_filter_append(&stream->readfilters, transfer_encoding);
|
||||||
}
|
}
|
||||||
} else if (transfer_encoding) {
|
} else {
|
||||||
php_stream_filter_free(transfer_encoding TSRMLS_CC);
|
if(response_header) {
|
||||||
|
Z_DELREF_P(response_header);
|
||||||
|
}
|
||||||
|
if (transfer_encoding) {
|
||||||
|
php_stream_filter_free(transfer_encoding TSRMLS_CC);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return stream;
|
return stream;
|
||||||
|
|
41
ext/standard/tests/http/bug69337.phpt
Normal file
41
ext/standard/tests/http/bug69337.phpt
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
--TEST--
|
||||||
|
Bug #69337 (Stream context leaks when http request fails)
|
||||||
|
--SKIPIF--
|
||||||
|
<?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:22345'); ?>
|
||||||
|
--INI--
|
||||||
|
allow_url_fopen=1
|
||||||
|
allow_url_include=1
|
||||||
|
--FILE--
|
||||||
|
<?php
|
||||||
|
require 'server.inc';
|
||||||
|
|
||||||
|
function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max)
|
||||||
|
{
|
||||||
|
if($notification_code == STREAM_NOTIFY_REDIRECTED) {
|
||||||
|
// $http_response_header is now a string, but will be used as an array
|
||||||
|
// by php_stream_url_wrap_http_ex() later on
|
||||||
|
$GLOBALS['http_response_header'] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\0\0\0\0";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$ctx = stream_context_create();
|
||||||
|
stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
|
||||||
|
|
||||||
|
$responses = array(
|
||||||
|
"data://text/plain,HTTP/1.0 302 Found\r\nLocation: http://127.0.0.1:22345/try-again\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:22345", $responses, $output);
|
||||||
|
|
||||||
|
$f = file_get_contents('http://127.0.0.1:22345/', 0, $ctx);
|
||||||
|
|
||||||
|
http_server_kill($pid);
|
||||||
|
var_dump($f);
|
||||||
|
?>
|
||||||
|
==DONE==
|
||||||
|
--EXPECTF--
|
||||||
|
string(26) "HTTP/1.0 404 Not Found
|
||||||
|
|
||||||
|
"
|
||||||
|
==DONE==
|
Loading…
Add table
Add a link
Reference in a new issue