]> granicus.if.org Git - php/commit
Merge branch '5.6'
authorTjerk Meesters <datibbaw@php.net>
Fri, 28 Feb 2014 11:14:18 +0000 (19:14 +0800)
committerTjerk Meesters <datibbaw@php.net>
Fri, 28 Feb 2014 11:14:18 +0000 (19:14 +0800)
commit060643f5ba5cf10abf2a06064abfd1f291667026
tree207efec8e998ba40d7d1bd9e3c255d0326e1723d
parentbad0b4fc8cd0143dfe71442b2a36a2af4b373d08
parentcbb2dc07881691ce783b3367e5470583a3e10a36
Merge branch '5.6'

* 5.6:
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.