Merge branch 'dev-7.0' into master

diff --cc php.spec
index 7a86ee9810073f207a4fbe59c06ea3fe3040873e,1c1b23fbc9d8522757de9e83cd33ba21d6e812bc..0340f764ca7c3ad2976597cad15630195ab99db0
--- 1/php.spec
--- 2/php.spec
+++ b/php.spec
@@@ -77,13 -61,10 +75,13 @@@
  %bcond_without        imap            # without IMAP extension module
  %bcond_without        interbase       # without InterBase extension module
  %bcond_without        intl            # without Intl extension module
 +%bcond_without        json            # without json extension module
  %bcond_without        ldap            # without LDAP extension module
 +%bcond_without        mbstring        # without mbstring extension module
 +%bcond_without        mcrypt          # without mbcrypt extension module
  %bcond_without        mhash           # without mhash extension (supported by hash extension)
- %bcond_without        mssql           # without MS SQL extension module
- %bcond_without        mysql           # without ext/mysql support
+ %bcond_with   mssql           # without MS SQL extension module (ext removed)
+ %bcond_with   mysql           # without ext/mysql support (ext removed)
  %bcond_without        mysqli          # without mysqli support (Requires mysql > 4.1)
  %bcond_without        mysqlnd         # without mysqlnd support in mysql related extensions
  %bcond_with   oci             # with Oracle oci8 extension module     (BR: proprietary libs)
@@@ -266,10 -241,10 +266,10 @@@ BuildRequires:  libjpeg-deve
  BuildRequires:        libltdl-devel >= 1.4
  BuildRequires:        libmcrypt-devel >= 2.4.4
  BuildRequires:        libpng-devel >= 1.0.8
- %{?with_webp:BuildRequires:   libvpx-devel}
+ %{?with_webp:BuildRequires:   libwebp-devel}
  BuildRequires:        tokyocabinet-devel
  %if "%{pld_release}" != "ac"
 -BuildRequires:        libtool >= 2:2.2
 +BuildRequires:        libtool >= 2:2.4.6
  %else
  BuildRequires:        libtool >= 1.4.3
  %endif