]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 12 May 2014 05:44:30 +0000 (22:44 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 12 May 2014 06:03:21 +0000 (23:03 -0700)
commit89798f57d4a6552b08efeee24bf54079b072c771
tree1c2fceef5857096e214cf351e0576dc883196fe1
parent997be125eb0228c5b1b6dd278f617791e71192c6
parentc507c9f01b10d7d991e38af55d22fad122dfbdf8
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  improve CURL tests to allow testing without separate server
ext/curl/tests/curl_file_upload.phpt