]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4691cbe 09a3da8)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Wed, 20 Dec 2017 18:45:06 +0000 (21:45 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 20 Dec 2017 18:45:06 +0000 (21:45 +0300)
* 'master' of git.php.net:php-src:
  Templatize driver name in the expected string
  Bump libcurl requirement to 7.12.1
  Avoid strlen call
  NEWS
  display headers (buildtime) and library (runtime) versions in phpinfo (libzip >= 1.3.1)


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