com php-src: Merge branch 'PHP-7.1' into PHP-7.2: ext/curl/interface.c
| From: | Anatol Belski | Date: | Sun, 03 Dec 2017 11:28:41 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1' into PHP-7.2: ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-100472@lists.php.net to get a copy of this message | ||
Commit: 36f85e17e2f7823765dca68015e386af569a62ef
Author: Anatol Belski <ab@php.net> Sun, 3 Dec 2017 12:28:41 +0100
Parents: f9b8bd07c7d7e87051d0c6eda77d423672240c2e aaf00ae0a99b84f1fb9a053fa08aef2abdab9f2b
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=36f85e17e2f7823765dca68015e386af569a62ef
Log:
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix compat with libcurl 7.56.1+ and file:// wrapper
Changed paths:
MM ext/curl/interface.c
Diff: