Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test - output can be chunked

Conflicts:
	ext/curl/tests/curl_basic_006.phpt

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--