Merge branch 'PHP-5.6' into PHP-7.0

diff --cc ext/dba/config.w32
index 4abba8dbf4bdbf9e5ed8cf5ff9de2c683b849459,c7473232212c60313704c7eec22c62f856401137..ac0e1f70b9d0bc1188f374e35acfeb0607f372a3
--- 1/ext/dba/config.w32
--- 2/ext/dba/config.w32
+++ b/ext/dba/config.w32
@@@ -4,15 -4,16 +4,16 @@@
  ARG_WITH("dba", "DBA support", "no");
  
  if (PHP_DBA != "no") {
 -      if (CHECK_LIB("libdb31s.lib", "dba", PHP_DBA) &&
+       EXTENSION("dba", "dba.c dba_cdb.c dba_db1.c dba_db2.c dba_db3.c dba_dbm.c dba_flatfile.c dba_gdbm.c dba_ndbm.c dba_inifile.c");
+       ADD_SOURCES("ext/dba/libcdb", "cdb.c cdb_make.c uint32.c", "dba");
+       ADD_SOURCES("ext/dba/libflatfile", "flatfile.c", "dba");
+       ADD_SOURCES("ext/dba/libinifile", "inifile.c", "dba");
+       AC_DEFINE('HAVE_DBA', 1, 'DBA support');
+       ADD_FLAG("CFLAGS_DBA", "/D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /D DBA_INIFILE=1");
 +      if (CHECK_LIB("libdb31s.lib;libdb61.lib", "dba", PHP_DBA) &&
                CHECK_HEADER_ADD_INCLUDE("db.h", "CFLAGS_DBA")) {
-               EXTENSION("dba", "dba.c dba_cdb.c dba_db1.c dba_db2.c dba_db3.c dba_dbm.c dba_flatfile.c dba_gdbm.c dba_ndbm.c dba_inifile.c");
-               ADD_SOURCES("ext/dba/libcdb", "cdb.c cdb_make.c uint32.c", "dba");
-               ADD_SOURCES("ext/dba/libflatfile", "flatfile.c", "dba");
-               ADD_SOURCES("ext/dba/libinifile", "inifile.c", "dba");
-               AC_DEFINE('HAVE_DBA', 1, 'DBA support');
-               ADD_FLAG("CFLAGS_DBA", "/D DBA_DB1=0 /D DB1_VERSION=\"\\\"Berkeley DB 1.85 emulation in DB3\\\"\" /D DB1_INCLUDE_FILE=\"\\\"db_185.h\\\"\" /D DBA_DB3=1 /D DB3_INCLUDE_FILE=\"\\\"db.h\\\"\" /D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /D DBA_INIFILE=1");
-       } else {
-               WARNING("dba not enabled; libraries and headers not found");
+               ADD_FLAG("CFLAGS_DBA", "/D DBA_DB1=0 /D DB1_VERSION=\"\\\"Berkeley DB 1.85 emulation in DB3\\\"\" /D DB1_INCLUDE_FILE=\"\\\"db_185.h\\\"\" /D DBA_DB3=1 /D DB3_INCLUDE_FILE=\"\\\"db.h\\\"\"");
+       } else if (PHP_DBA != "yes") {
+               WARNING("dba: db handlers not enabled; libraries and headers not found");
        }
  }