]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Sun, 3 Dec 2017 11:28:41 +0000 (12:28 +0100)
committerAnatol Belski <ab@php.net>
Sun, 3 Dec 2017 11:28:41 +0000 (12:28 +0100)
* PHP-7.1:
  Fix compat with libcurl 7.56.1+ and file:// wrapper

1  2 
ext/curl/interface.c

Simple merge