From: Remi Collet <remi@php.net>
Date: Mon, 29 May 2017 07:54:29 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.2.0alpha1~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7bb6b6b6d248908e22af72fe40ed888a4ddb295e;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (150 commits)
  Fix Bug #74386Phar::__construct(): wrong number of parameters by reflection
  Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection
  Fixed typo
  fix typo
  fix resetting cursor data if dba_firstkey failed
  fix wrong define
  fix c/p issue
  enable ext/dba on AppVeyor
  implement support for LMDB in ext/dba
  fix identiation
  Bugfix #74556 stream_socket_get_name() returns empty string
  Fix abstract name handling to be binary safe
  Added more EXIF MAKERNOTE formats:  - AGFA,  - Kyocera  - Ricoh  - Epson
  Replace slow generic sha3 implementation by https://github.com/gvanas/KeccakCodePackage
  Bugfix #74598 ftp:// ignores context
  Improve conditions and visibility
  [ci skip] update NEWS
  Fix test
  Fixed bug #72885 flatfile: dba_fetch() fails to read replaced entry
  Update NEWS
  ...
---

7bb6b6b6d248908e22af72fe40ed888a4ddb295e