From: Stanislav Malyshev <stas@php.net>
Date: Mon, 12 May 2014 17:58:18 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~283
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7abe84d945c8e5cc805ced0868bf37f6b656b2a;p=php

Merge branch 'PHP-5.6'

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

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
---

c7abe84d945c8e5cc805ced0868bf37f6b656b2a