]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc3cdd0 efacdc3)
Merge branch 'PHP-5.6' of https://github.com/msierks/php-src into PHP-5.6
authorXinchen Hui <laruence@gmail.com>
Mon, 21 Mar 2016 08:39:22 +0000 (16:39 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 21 Mar 2016 08:39:22 +0000 (16:39 +0800)
* 'PHP-5.6' of https://github.com/msierks/php-src:
  FIX #71831: CURLOPT_NOPROXY applied as long instead of string


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.