Fix #80344: mysqlnd support for SASL SCRAM-SHA-1 and SCRAM-SHA-256 au…

.appveyor.yml

@@ -1,6 +1,6 @@
 version: "{branch}.build.{build}"
 
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 branches:
         except:
@@ -24,7 +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.2.0
-        PHP_BUILD_CRT: vc15
+        PHP_BUILD_CRT: vs16
         # ext and env setup for tests
         #MYSQL_TEST_PASSWD: Password12!
         #MYSQL_TEST_USER: root

.gdbinit

@@ -252,16 +252,13 @@ define ____printzv_contents
 		____printzv &$zvalue->value.ref->val $arg1
 	end
 	if $type == 11
-		printf "const: %s", $zvalue->value.str->val
-	end
-	if $type == 12
 		printf "CONSTANT_AST"
 	end
-	if $type == 13
+	if $type == 12
 		printf "indirect: "
 		____printzv $zvalue->value.zv $arg1
 	end
-	if $type == 14
+	if $type == 13
 		printf "pointer: %p", $zvalue->value.ptr
 	end
 	if $type == 15
@@ -271,18 +268,9 @@ define ____printzv_contents
 		printf "_BOOL"
 	end
 	if $type == 17
-		printf "CALLABLE"
-	end
-	if $type == 18
-		printf "ITERABLE"
-	end
-	if $type == 19
-		printf "VOID"
-	end
-	if $type == 20
 		printf "_NUMBER"
 	end
-	if $type > 20
+	if $type > 17
 		printf "unknown type %d", $type
 	end
 	printf "\n"

.gitignore

@@ -80,22 +80,15 @@ include/
 libs/
 modules/
 
+# Used by build/gen_stub.php
+build/PHP-Parser-*
+
 # ------------------------------------------------------------------------------
 # Configuration headers generated by the PHP build system
 # ------------------------------------------------------------------------------
 config.h
 config.h.in
 /ext/date/lib/timelib_config.h
-/ext/iconv/php_have_bsd_iconv.h
-/ext/iconv/php_have_glibc_iconv.h
-/ext/iconv/php_have_ibm_iconv.h
-/ext/iconv/php_have_iconv.h
-/ext/iconv/php_have_libiconv.h
-/ext/iconv/php_iconv_aliased_libiconv.h
-/ext/iconv/php_iconv_broken_ignore.h
-/ext/iconv/php_iconv_supports_errno.h
-/ext/iconv/php_php_iconv_h_path.h
-/ext/iconv/php_php_iconv_impl.h
 /main/build-defs.h
 /main/php_config.h.in
 /main/php_config.h
@@ -116,7 +109,7 @@ config.h.in
 # ------------------------------------------------------------------------------
 # SAPIs specific ignores
 # ------------------------------------------------------------------------------
-/sapi/apache2handler/libphp7.module
+/sapi/apache2handler/libphp.module
 /sapi/fpm/fpm/php-cgi
 /sapi/fpm/init.d.php-fpm
 /sapi/fpm/php-fpm.conf
@@ -168,8 +161,14 @@ php
 /Zend/zend_language_parser.output
 
 # ------------------------------------------------------------------------------
-# Extensions files additionally generated by `cd ext/name && phpize && ./configure`
+# Extensions files
 # ------------------------------------------------------------------------------
+
+# Miscellaneous extensions files
+/ext/opcache/jit/zend_jit_x86.c
+/ext/opcache/minilua
+
+# Generated by `cd ext/name && phpize && ./configure`
 /ext/*/build/
 /ext/*/configure.ac
 /ext/*/run-tests.php
@@ -182,7 +181,7 @@ php
 /configure.bat
 /configure.js
 
-# Generated by `/configure.(bat|js)` (architecture dependend)
+# Generated by `/configure.(bat|js)` (architecture dependent)
 /config.nice.bat
 
 # NTS debug build x86
@@ -200,7 +199,7 @@ php
 # Generated by x64 compiler, includes Debug, Debug_TS, Release, Release_TS
 /x64/
 
-# Miscellaneous files generated by Windows build sytem
+# Miscellaneous files generated by Windows build system
 /main/config.w32.h
 /win32/build/deplister.exe
 /win32/build/deplister.obj
@@ -238,6 +237,9 @@ php
 # Test results generated by `./run-tests.php`
 php_test_results_*.txt
 
+# Temporary test information generated by `./run-tests.php`
+/run-test-info.php
+
 # Temporary POST data placeholder files generated by `./run-tests.php`
 phpt.*
 

.travis.yml

@@ -1,9 +1,9 @@
 git:
   quiet: true
 
-dist: xenial
+dist: bionic
 language: c
-sudo: required
+os: linux
 addons:
   apt:
     packages:
@@ -68,12 +68,16 @@ env:
 
 jobs:
     include:
-        - env: ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
+        - env: ENABLE_ZTS=0 ENABLE_DEBUG=0
           arch: amd64
-        - env: ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
+        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1
           arch: amd64
-        - env: ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
+        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
           arch: arm64
+          if: type = cron
+        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1
+          arch: s390x
+          if: type = cron
 
 before_script:
     - ccache --version
@@ -91,7 +95,7 @@ before_script:
 script:
     # ARM64 CI reports nproc=32, which is excessive.
     - if [ -z "$ARM64" ]; then export JOBS=$(nproc); else export JOBS=16; fi
-    - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 -j$JOBS
+    - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 -j$JOBS
     - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
 
 after_success:

CODING_STANDARDS.md

@@ -272,44 +272,23 @@ use these rules.
 1. Extensions should be well tested using `*.phpt` tests. Read about that at
     [qa.php.net](https://qa.php.net/write-test.php) documentation.
 
-## Documentation and folding hooks
+## Folding hooks
 
-In order to make sure that the online documentation stays in line with the code,
-each user-level function should have its user-level function prototype before it
-along with a brief one-line description of what the function does. It would look
-like this:
+Use `{{{` symbols for the folding mode in Emacs and vim (`set fdm=marker`).
+Folding is very useful when dealing with large files because you can scroll
+through the file quickly and just unfold the function you wish to work on.
+The `}}}` at the end of each function marks the end of the fold, and should
+be on a separate line.
 
 ```c
-/* {{{ proto int abs(int number)
-   Returns the absolute value of the number */
+/* {{{ Returns the absolute value of the number */
 PHP_FUNCTION(abs)
 {
     ...
 }
 /* }}} */
 ```
 
-The `{{{` symbols are the default folding symbols for the folding mode in Emacs
-and vim (`set fdm=marker`). Folding is very useful when dealing with large files
-because you can scroll through the file quickly and just unfold the function you
-wish to work on. The `}}}` at the end of each function marks the end of the
-fold, and should be on a separate line.
-
-The `proto` keyword there is just a helper for the `doc/genfuncsummary` script
-which generates a full function summary. Having this keyword in front of the
-function prototypes allows us to put folds elsewhere in the code without
-messing up the function summary.
-
-Optional arguments are written like this:
-
-```c
-/* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
-   Returns a header object with the defined parameters */
-```
-
-And yes, please keep the prototype on a single line, even if that line is
-massive.
-
 ## New and experimental functions
 
 To reduce the problems normally associated with the first public implementation
@@ -334,8 +313,7 @@ purposes, these will only be documented by the most current name, with the
 aliases listed in the documentation for the parent function. For ease of
 reference, user-functions with completely different names, that alias to the
 same function (such as `highlight_file` and `show_source`), will be separately
-documented. The proto should still be included, describing which function is
-aliased.
+documented.
 
 Backwards compatible functions and names should be maintained as long as the
 code can be reasonably be kept as part of the codebase. See the `README` in the

CONTRIBUTING.md

@@ -197,9 +197,6 @@ locations.
     └─ tokenizer/
        ├─ tokenizer_data.c          # Generated by `ext/tokenizer/tokenizer_data_gen.sh`
        └─ ...
-    └─ xmlrpc/
-       ├─ libxmlrpc/                # Forked and maintained in php-src
-       └─ ...
     └─ zend_test                    # For testing internal APIs. Not needed for regular builds.
        └─ ...
     └─ zip/                         # Bundled https://github.com/pierrejoye/php_zip
@@ -262,8 +259,8 @@ included.
 - Run `make test` to check your change doesn't break other features.
 - Rebuild PHP with `--enable-debug` which will show some kinds of memory errors
   and check the PHP and web server error logs after running your PHP tests.
-- Rebuild PHP with `--enable-maintainer-zts` to check your change compiles on
-  multi-threaded web servers.
+- Rebuild PHP with `--enable-zts` to check your change compiles and operates
+  correctly in a thread safe PHP.
 - Review the change once more just before submitting it.
 
 ## What happens after submitting contribution?
@@ -323,14 +320,15 @@ Having said that, here are the organizational rules:
    `make test`.
 
 7. For development use the `--enable-debug` switch to avoid memory leaks and the
-   `--enable-maintainer-zts` switch to ensure your code handles TSRM correctly
-   and doesn't break for those who need that.
+   `--enable-zts` switch to ensure your code handles TSRM correctly and doesn't
+   break for those who need that.
 
 Currently we have the following branches in use:
 
 | Branch    |           |
 | --------- | --------- |
-| master    | Active development branch for PHP 8.0, which is open for backwards incompatible changes and major internal API changes. |
+| master    | Active development branch for PHP 8.1, which is open for backwards incompatible changes and major internal API changes. |
+| PHP-8.0   | Is used to release the PHP 8.0.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-7.4   | Is used to release the PHP 7.4.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-7.3   | Is used to release the PHP 7.3.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-7.2   | Is used to release the PHP 7.2.x series. This is an old stable version and is open for security fixes only. |
@@ -409,8 +407,6 @@ New source code files should include the following header block:
 
 ```c
 /*
-  +----------------------------------------------------------------------+
-  | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
   +----------------------------------------------------------------------+