]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 12 May 2014 17:58:18 +0000 (10:58 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 12 May 2014 17:58:18 +0000 (10:58 -0700)
commitc7abe84d945c8e5cc805ced0868bf37f6b656b2a
tree534c99e562048097e06776c174652e3bdfa28f50
parentdb354091366409df6e5e1b703f369fcc32b18ffc
parent2152e2f127cf1c42a3b57596512ebc999c6fc139
Merge branch 'PHP-5.6'

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

Conflicts:
ext/curl/tests/curl_basic_006.phpt