]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65ae744 c9c8e70)
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Mon, 21 Mar 2016 08:43:55 +0000 (16:43 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 21 Mar 2016 08:43:55 +0000 (16:43 +0800)
* PHP-5.6:
  Update NEWS for efacdc3
  FIX #71831: CURLOPT_NOPROXY applied as long instead of string

1  2 
ext/curl/interface.c patch | diff1 | diff2 | blob | history

diff --cc ext/curl/interface.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.