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

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

2152e2f127cf1c42a3b57596512ebc999c6fc139