]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Mon, 21 Mar 2016 08:44:42 +0000 (16:44 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 21 Mar 2016 08:44:42 +0000 (16:44 +0800)
* PHP-7.0:
  Update NEWS
  Update NEWS for efacdc3
  FIX #71831: CURLOPT_NOPROXY applied as long instead of string

1  2 
ext/curl/interface.c

Simple merge