fix test
fix test - output can be chunked
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test - output can be chunked
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
Merge branch 'PHP-5.6'

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

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
Merge branch 'master' of git://github.com/php/php-src