diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-05-12 10:58:18 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-05-12 10:58:18 -0700 |
| commit | c7abe84d945c8e5cc805ced0868bf37f6b656b2a (patch) | |
| tree | 534c99e562048097e06776c174652e3bdfa28f50 | |
| parent | db354091366409df6e5e1b703f369fcc32b18ffc (diff) | |
| parent | 2152e2f127cf1c42a3b57596512ebc999c6fc139 (diff) | |
| download | php-git-c7abe84d945c8e5cc805ced0868bf37f6b656b2a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix test - output can be chunked
fix test
Conflicts:
ext/curl/tests/curl_basic_006.phpt
| -rw-r--r-- | ext/curl/tests/curl_basic_006.phpt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/curl/tests/curl_basic_006.phpt b/ext/curl/tests/curl_basic_006.phpt index cae9877924..e48a5ba70d 100644 --- a/ext/curl/tests/curl_basic_006.phpt +++ b/ext/curl/tests/curl_basic_006.phpt @@ -21,17 +21,18 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> $url = "{$host}/get.php?test=get"; $ch = curl_init(); - + $alldata = ''; ob_start(); // start output buffering curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use curl_setopt($ch, CURLOPT_WRITEFUNCTION, function ($ch, $data) { - echo 'Data: '.$data; + $GLOBALS['alldata'] .= $data; return strlen ($data); }); - + curl_exec($ch); curl_close($ch); ob_end_flush(); + echo "Data: $alldata"; ?> ===DONE=== --EXPECTF-- |