archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.4.40' into PHP-5.5.24

Browse source 
* PHP-5.4.40:
  fix memory leak & add test
  Fix tests
This commit is contained in:
Stanislav Malyshev 2015-04-12 23:49:16 -07:00
commit ba15e8dfd0
6 changed files with 72 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/gd/tests/imageloadfont_error1.phpt
View file

@ -11,5 +11,5 @@ Neveo Harrison <neveoo [at] gmail [dot] com> #testfest #tek11
var_dump( imageloadfont(array()) );
?>
--EXPECTF--
Warning: imageloadfont() expects parameter 1 to be string, array given in %s on line %d
Warning: imageloadfont() expects parameter 1 to be a valid path, array given in %s on line %d
NULL

7
ext/standard/http_fopen_wrapper.c
View file

@ -922,9 +922,14 @@ out:
if (transfer_encoding) {
php_stream_filter_append(&stream->readfilters, transfer_encoding);
}
} else if (transfer_encoding) {
} else {
if(response_header) {
Z_DELREF_P(response_header);
}
if (transfer_encoding) {
php_stream_filter_free(transfer_encoding TSRMLS_CC);
}
}
return stream;
}

41
ext/standard/tests/http/bug69337.phpt Normal file
View 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==

12
ext/zlib/tests/gzopen_variation1.phpt
View file

@ -158,19 +158,19 @@ Error: 2 - gzopen(0.5): failed to open stream: No such file or directory, %s(%d)
bool(false)
--empty array--
Error: 2 - gzopen() expects parameter 1 to be string, array given, %s(%d)
Error: 2 - gzopen() expects parameter 1 to be a valid path, array given, %s(%d)
NULL
--int indexed array--
Error: 2 - gzopen() expects parameter 1 to be string, array given, %s(%d)
Error: 2 - gzopen() expects parameter 1 to be a valid path, array given, %s(%d)
NULL
--associative array--
Error: 2 - gzopen() expects parameter 1 to be string, array given, %s(%d)
Error: 2 - gzopen() expects parameter 1 to be a valid path, array given, %s(%d)
NULL
--nested arrays--
Error: 2 - gzopen() expects parameter 1 to be string, array given, %s(%d)
Error: 2 - gzopen() expects parameter 1 to be a valid path, array given, %s(%d)
NULL
--uppercase NULL--
@ -210,7 +210,7 @@ Error: 2 - gzopen(Class A object): failed to open stream: No such file or direct
bool(false)
--instance of classWithoutToString--
Error: 2 - gzopen() expects parameter 1 to be string, object given, %s(%d)
Error: 2 - gzopen() expects parameter 1 to be a valid path, object given, %s(%d)
NULL
--undefined var--
@ -222,7 +222,7 @@ Error: 2 - gzopen(): Filename cannot be empty, %s(%d)
bool(false)
--resource--
Error: 2 - gzopen() expects parameter 1 to be string, resource given, %s(%d)
Error: 2 - gzopen() expects parameter 1 to be a valid path, resource given, %s(%d)
NULL
===DONE===

8
ext/zlib/tests/readgzfile_variation1.phpt
View file

@ -29,15 +29,15 @@ foreach ( $variation as $var ) {
===DONE===
--EXPECTF--
Warning: readgzfile() expects parameter 1 to be string, array given in %s on line %d
Warning: readgzfile() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
Warning: readgzfile() expects parameter 1 to be string, array given in %s on line %d
Warning: readgzfile() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
Warning: readgzfile() expects parameter 1 to be string, array given in %s on line %d
Warning: readgzfile() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
Warning: readgzfile() expects parameter 1 to be string, array given in %s on line %d
Warning: readgzfile() expects parameter 1 to be a valid path, array given in %s on line %d
NULL
===DONE===

2
ext/zlib/tests/readgzfile_variation6.phpt
View file

@ -45,5 +45,5 @@ foreach ( $variation as $var ) {
--EXPECTF--
Error: 2 - readgzfile(Class A object): failed to open stream: No such file or directory, %s(%d)
bool(false)
Error: 2 - readgzfile() expects parameter 1 to be string, object given, %s(%d)
Error: 2 - readgzfile() expects parameter 1 to be a valid path, object given, %s(%d)
NULL