Fix bugs #75120 and #69625

.appveyor.yml

@@ -1,7 +1,7 @@
 
 version: "{branch}.build.{build}"
 
-image: Visual Studio 2015
+image: Visual Studio 2017
 
 branches:
         except:
@@ -24,6 +24,7 @@ environment:
         PHP_BUILD_OBJ_DIR: c:\obj
         PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
         PHP_BUILD_SDK_BRANCH: php-sdk-2.1.3
+        PHP_BUILD_CRT: vc15
         # ext and env setup for tests
         #MYSQL_TEST_PASSWD: Password12!
         #MYSQL_TEST_USER: root
@@ -42,7 +43,8 @@ environment:
 services:
         # the setup scripts have to be touched, once some other db version is used
         - mysql
-        - postgresql96
+        - postgresql101
+        - mssql2017
 
 platform:
         - x64

.gitattributes

@@ -3,7 +3,7 @@ ext/simplexml/simplexml.c       ident
 ext/iconv/php_iconv.h           ident
 ext/posix/posix.c               ident
 ext/recode/recode.c             ident
-ext/skeleton/create_stubs       ident
+ext/ext_skel.php                ident
 ext/phar/phar/pharcommand.inc   ident
 ext/phar/phar.c                 ident
 ext/sysvmsg/sysvmsg.c           ident
@@ -17,8 +17,6 @@ ext/dba/libcdb/cdb.c            ident
 ext/filter/filter.c             ident
 README.input_filter             ident
 run-tests.php                   ident
-Zend/RFCs/002.txt               ident
-Zend/RFCs/003.txt               ident
 ext/exif/exif.c                 ident
 ext/ldap/ldap.c                 ident
 ext/pdo_pgsql/pdo_pgsql.c       ident

.gitignore

@@ -1,4 +1,4 @@
-# General Ignores
+# General ignores
 *~
 .#*
 *.
@@ -31,17 +31,9 @@
 phpt.*
 core
 dynlib.m4
-Debug
-Debug_TS
 Makefile
 Makefile.fragments
 Makefile.objects
-Release
-Release_TS
-Release_TSDbg
-Release_TS_inline
-Release_inline
-ZendEngine1
 _libs
 acconfig.h
 aclocal.m4
@@ -56,7 +48,6 @@ config.cache
 config.h.in
 config.log
 config.nice
-config.nice.bat
 config.status
 config.sub
 config_vars.mk
@@ -65,8 +56,6 @@ configuration-parser.h
 configuration-parser.output
 configuration-scanner.c
 configure
-configure.bat
-configure.js
 conftest
 conftest.c
 debug.log
@@ -85,7 +74,6 @@ missing
 mkinstalldirs
 modules
 php
-php-*.tar.gz
 php7.spec
 php_lcov.info
 php_test_results_*.txt
@@ -95,11 +83,49 @@ shlibtool
 stamp-h
 test.php3
 tmp-php.ini
-want_dependencies
-x64
 stamp-h.in
 scan_makefile_in.awk
+main/php_config.h
+main/php_config.h.in
+main/build-defs.h
+main/internal_functions_cli.c
+main/config.w32.h
+main/stamp-h1
+main/streams/build-defs.h
+main/streams/stamp-h1
+pear/install-pear-nozlib.phar
+pear/phpize
+pear/run-tests
+pear/php-config
+pear/scripts
+sapi/apache2handler/libphp7.module
+sapi/cgi/php-cgi
+sapi/cgi/php-cgi.1
+sapi/cli/php.1
+sapi/fpm/php-fpm
+sapi/fpm/php-fpm.1
+sapi/fpm/init.d.php-fpm
+sapi/fpm/php-fpm.conf
+sapi/fpm/fpm/php-cgi
+sapi/fpm/php-fpm.8
+sapi/fpm/php-fpm.service
+sapi/fpm/status.html
+sapi/fpm/www.conf
+sapi/phpdbg/phpdbg_parser.c
+sapi/phpdbg/phpdbg_parser.h
+sapi/phpdbg/phpdbg
+sapi/phpdbg/build
+sapi/phpdbg/*.output
+scripts/php-config
+scripts/phpize
+scripts/man1/*.1
 TSRM/tsrm_config.h
+win32/*.suo
+win32/*.aps
+win32/*.positions
+win32/ext
+win32/phpts.def
+win32/wsyslog.h
 Zend/zend_config.h
 Zend/zend_dtrace_gen.h
 Zend/zend_dtrace_gen.hbak
@@ -109,81 +135,18 @@ Zend/zend_ini_parser.output
 Zend/zend_language_parser.c
 Zend/zend_language_parser.h
 Zend/zend_language_parser.output
-ext/date/lib/timelib_config.h
-ext/iconv/php_iconv_aliased_libiconv.h
-ext/phar/phar.php
-main/php_config.h
-main/php_config.h.in
 
-# Test specific Ignores
-tests/*/*.diff
-tests/*/*.out
-tests/*/*.php
-tests/*/*.exp
-tests/*/*.log
-tests/*/*.sh
-tests/*/*/*.diff
-tests/*/*/*.out
-tests/*/*/*.php
-tests/*/*/*.exp
-tests/*/*/*.log
-tests/*/*/*.sh
-*/tests/*.diff
-*/tests/*.out
-*/tests/*.php
-*/tests/*.exp
-*/tests/*.log
-*/tests/*.sh
-*/tests/*/*.diff
-*/tests/*/*.out
-*/tests/*/*.php
-*/tests/*/*.exp
-*/tests/*/*.log
-*/tests/*/*.sh
-*/tests/*/*/*.diff
-*/tests/*/*/*.out
-*/tests/*/*/*.php
-*/tests/*/*/*.exp
-*/tests/*/*/*.log
-*/tests/*/*/*.sh
-*/*/tests/*.diff
-*/*/tests/*.out
-*/*/tests/*.out.png
-*/*/tests/*.php
-*/*/tests/*.exp
-*/*/tests/*.log
-*/*/tests/*.sh
-*/*/tests/*/*.diff
-*/*/tests/*/*.out
-*/*/tests/*/*.php
-*/*/tests/*/*.exp
-*/*/tests/*/*.log
-*/*/tests/*/*.sh
-*/*/tests/*/*/*.diff
-*/*/tests/*/*/*.out
-*/*/tests/*/*/*.php
-*/*/tests/*/*/*.exp
-*/*/tests/*/*/*.log
-*/*/tests/*/*/*.sh
-*/*/tests/*/*/*/*.diff
-*/*/tests/*/*/*/*.out
-*/*/tests/*/*/*/*.php
-*/*/tests/*/*/*/*.exp
-*/*/tests/*/*/*/*.log
-*/*/tests/*/*/*/*.sh
-
-# Extension specifc ignores
+# Extension specific ignores
 ext/*/configure.in
+ext/*/configure.ac
 ext/*/ltmain.sh
 ext/*/libs.mk
 ext/*/build
 ext/*/scan_makefile_in.awk
 ext/*/Makefile.global
 ext/*/acinclude.m4
 ext/*/config.sub
-
-# Extension specific
-ext/iconv/scan_makefile_in.awk
+ext/date/lib/timelib_config.h
 ext/iconv/php_have_bsd_iconv.h
 ext/iconv/php_have_ibm_iconv.h
 ext/iconv/php_have_libiconv.h
@@ -193,6 +156,7 @@ ext/iconv/php_php_iconv_impl.h
 ext/iconv/php_have_iconv.h
 ext/iconv/php_iconv_supports_errno.h
 ext/iconv/php_iconv_broken_ignore.h
+ext/iconv/php_iconv_aliased_libiconv.h
 ext/mbstring/libmbfl/Makefile.in
 ext/mbstring/libmbfl/autoscan.log
 ext/mbstring/libmbfl/config.sub
@@ -209,77 +173,56 @@ ext/mbstring/libmbfl/filters/Makefile.in
 ext/mbstring/libmbfl/mbfl/Makefile.in
 ext/mbstring/libmbfl/mbfl/EastAsianWidth.txt
 ext/mbstring/libmbfl/nls/Makefile.in
-ext/mssql/#*#
-ext/mssql/Makefile.global
-ext/mssql/acinclude.m4
-ext/mssql/config.sub
-ext/mssql/configure.in
-ext/mssql/ltmain.sh
-ext/mysql/weztest.sqlite
-ext/oci8/tests/*.tmp
+ext/mbstring/oniguruma/oniguruma.h
 ext/oci8/tests/*.vglog
 ext/pdo/conftest*
-ext/pdo/tests/*.db
-ext/pdo/tests/*.tmp
 ext/pdo_firebird/conftest*
 ext/pdo_mysql/conftest*
-ext/pdo_mysql/tests/*.db
-ext/pdo_mysql/tests/*.tmp
 ext/pdo_oci/conftest*
-ext/pdo_odbc/tests/*.db
-ext/pdo_odbc/tests/*.tmp
 ext/pdo_odbc/tests/*.mdb
 ext/pdo_pgsql/conftest*
-ext/pdo_pgsql/tests/*.db
-ext/pdo_pgsql/tests/*.tmp
 ext/pdo_sqlite/conftest*
 ext/pdo_sqlite/sqlite3.h
-ext/pdo_sqlite/tests/*.db
-ext/pdo_sqlite/tests/*.tmp
 ext/phar/phar.phar
 ext/phar/phar.1
 ext/phar/phar.phar.1
-ext/pspell/tests/*.tmp
+ext/phar/phar.php
 ext/reflection/xml
 ext/reflection/html
 ext/reflection/spl.chm
-ext/simplexml/examples/security.new.xml
 ext/spl/examples/.htaccess
 ext/spl/examples/*.phps
 ext/sqlite3/tests/phpsql*
-ext/sqlite3/tests/*.db
-ext/sqlite3/tests/*.tmp
-ext/standard/tests/misc/*.txt
-ext/standard/tests/strings/*.txt
-main/build-defs.h
-main/internal_functions_cli.c
-main/config.w32.h
-main/stamp-h1
-main/streams/build-defs.h
-main/streams/stamp-h1
-#pear/install-pear-nozlib.phar
-pear/phpize
-pear/run-tests
-pear/php-config
-pear/scripts
-sapi/apache2handler/libphp7.module
-sapi/cgi/php-cgi
-sapi/cgi/php-cgi.1
-sapi/cli/php.1
-sapi/fpm/php-fpm
-sapi/fpm/php-fpm.1
-sapi/fpm/init.d.php-fpm
-sapi/fpm/php-fpm.conf
-sapi/fpm/fpm/php-cgi
-sapi/phpdbg/phpdbg_parser.c
-sapi/phpdbg/phpdbg_parser.h
-sapi/phpdbg/phpdbg
-scripts/php-config
-scripts/phpize
-scripts/man1/*.1
-win32/*.suo
-win32/*.aps
-win32/*.positions
-win32/ext
-win32/phpts.def
-win32/wsyslog.h
+
+# ------------------------------------------------------------------------------ Windows
+# Generated by `/buildconf.bat`
+/configure.bat
+/configure.js
+
+# Generated by `/configure.(bat|js)` (architecture dependend)
+/config.nice.bat
+/Debug/
+/Debug_TS/
+/Release/
+/Release_TS/
+/x64/
+
+# ------------------------------------------------------------------------------ Tests
+# Generated by `/run-tests.php` upon failure
+**/tests/**/*.diff
+**/tests/**/*.out*
+**/tests/**/*.php
+**/tests/**/*.exp
+**/tests/**/*.log
+**/tests/**/*.sh
+
+# Used by some test cases.
+**/tests/**/*.db
+**/tests/**/*.txt
+**/tests/**/*.tmp
+
+# Special cases to invert previous ignore rules
+!ext/fileinfo/libmagic.patch
+!ext/mbstring/oniguruma.patch
+!scripts/dev/generate-phpt/tests/*.php
+!ext/pcre/pcre2lib/config.h