]> granicus.if.org Git - php/commit
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)
commit36f85e17e2f7823765dca68015e386af569a62ef
tree8a5e61dcfc529709f0740240c34cdb1ac4c15330
parentf9b8bd07c7d7e87051d0c6eda77d423672240c2e
parentaaf00ae0a99b84f1fb9a053fa08aef2abdab9f2b
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix compat with libcurl 7.56.1+ and file:// wrapper
ext/curl/interface.c