com php-src: Fixed test to work with recent libcurl versions: ext/standard/tests/file/bug52820.phpt

From: Date: Wed, 29 Oct 2014 10:28:27 +0000
Subject: com php-src: Fixed test to work with recent libcurl versions: ext/standard/tests/file/bug52820.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82837@lists.php.net to get a copy of this message
Commit: daf9357d272c810718aceae57e6e77cdc62e1be8 Author: Matteo Beccati <mbeccati@php.net> Wed, 29 Oct 2014 11:26:22 +0100 Parents: 71e200b338654b50142917f1baddd6da36e9eb5d Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=daf9357d272c810718aceae57e6e77cdc62e1be8 Log: Fixed test to work with recent libcurl versions Changed paths: M ext/standard/tests/file/bug52820.phpt Diff: diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt index 3a9f9c3..a00ebf5 100644 --- a/ext/standard/tests/file/bug52820.phpt +++ b/ext/standard/tests/file/bug52820.phpt @@ -1,71 +1,63 @@ ---TEST-- -Bug #52820 (writes to fopencookie FILE* not committed when seeking the stream) ---SKIPIF-- -<?php -if (!function_exists('leak_variable')) - die("skip only for debug builds"); -/* unfortunately no standard function does a cast to FILE*, so we need - * curl to test this */ -if (!extension_loaded("curl")) exit("skip curl extension not loaded"); -$handle=curl_init('http://127.0.0.1:37349/'); -curl_setopt($handle, CURLOPT_VERBOSE, true); -curl_setopt($handle, CURLOPT_RETURNTRANSFER, true); -if (!curl_setopt($handle, CURLOPT_STDERR, fopen("php://memory", "w+"))) - die("skip fopencookie not supported on this platform"); ---FILE-- -<?php -function do_stuff($url) { - $handle=curl_init('http://127.0.0.1:37349/'); - curl_setopt($handle, CURLOPT_VERBOSE, true); - curl_setopt($handle, CURLOPT_RETURNTRANSFER, true); - curl_setopt($handle, CURLOPT_STDERR, $o = fopen($url, "w+")); - curl_exec($handle); - echo "About to rewind!\n"; - rewind($o); - echo stream_get_contents($o); - return $o; -} - -echo "temp stream (close after):\n"; -fclose(do_stuff("php://temp")); - -echo "\nmemory stream (close after):\n"; -fclose(do_stuff("php://memory")); - -echo "\ntemp stream (leak):\n"; -leak_variable(do_stuff("php://temp"), true); - -echo "\nmemory stream (leak):\n"; -leak_variable(do_stuff("php://memory"), true); - -echo "\nDone.\n"; ---EXPECTF-- -temp stream (close after): -About to rewind! -* About to connect() to 127.0.0.1 port 37349%r.*%r -* Trying 127.0.0.1...%A* Connection refused -* couldn't connect to host%S -* Closing connection #0 - -memory stream (close after): -About to rewind! -* About to connect() to 127.0.0.1 port 37349%r.*%r -* Trying 127.0.0.1...%A* Connection refused -* couldn't connect to host%S -* Closing connection #0 - -temp stream (leak): -About to rewind! -* About to connect() to 127.0.0.1 port 37349%r.*%r -* Trying 127.0.0.1...%A* Connection refused -* couldn't connect to host%S -* Closing connection #0 - -memory stream (leak): -About to rewind! -* About to connect() to 127.0.0.1 port 37349%r.*%r -* Trying 127.0.0.1...%A* Connection refused -* couldn't connect to host%S -* Closing connection #0 - -Done. +--TEST-- +Bug #52820 (writes to fopencookie FILE* not committed when seeking the stream) +--SKIPIF-- +<?php +if (!function_exists('leak_variable')) + die("skip only for debug builds"); +/* unfortunately no standard function does a cast to FILE*, so we need + * curl to test this */ +if (!extension_loaded("curl")) exit("skip curl extension not loaded"); +$handle=curl_init('http://127.0.0.1:37349/'); +curl_setopt($handle, CURLOPT_VERBOSE, true); +curl_setopt($handle, CURLOPT_RETURNTRANSFER, true); +if (!curl_setopt($handle, CURLOPT_STDERR, fopen("php://memory", "w+"))) + die("skip fopencookie not supported on this platform"); +--FILE-- +<?php +function do_stuff($url) { + $handle=curl_init('http://127.0.0.1:37349/'); + curl_setopt($handle, CURLOPT_VERBOSE, true); + curl_setopt($handle, CURLOPT_RETURNTRANSFER, true); + curl_setopt($handle, CURLOPT_STDERR, $o = fopen($url, "w+")); + curl_exec($handle); + echo "About to rewind!\n"; + rewind($o); + echo stream_get_contents($o); + return $o; +} + +echo "temp stream (close after):\n"; +fclose(do_stuff("php://temp")); + +echo "\nmemory stream (close after):\n"; +fclose(do_stuff("php://memory")); + +echo "\ntemp stream (leak):\n"; +leak_variable(do_stuff("php://temp"), true); + +echo "\nmemory stream (leak):\n"; +leak_variable(do_stuff("php://memory"), true); + +echo "\nDone.\n"; +--EXPECTF-- +temp stream (close after): +About to rewind! +* %ATrying 127.0.0.1...%AConnection refused%A +* Closing connection%A%d + +memory stream (close after): +About to rewind! +* %ATrying 127.0.0.1...%AConnection refused%A +* Closing connection%A%d + +temp stream (leak): +About to rewind! +* %ATrying 127.0.0.1...%AConnection refused%A +* Closing connection%A%d + +memory stream (leak): +About to rewind! +* %ATrying 127.0.0.1...%AConnection refused%A +* Closing connection%A%d + +Done.

« previous php.cvs (#82837) next »