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

Author: johannes

.appveyor.yml

@@ -23,7 +23,7 @@ environment:
         PHP_BUILD_CACHE_BASE_DIR: c:\build-cache  
         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_SDK_BRANCH: php-sdk-2.1.5
         PHP_BUILD_CRT: vc15
         # ext and env setup for tests
         #MYSQL_TEST_PASSWD: Password12!
@@ -39,6 +39,7 @@ environment:
                   OPCACHE: 0
                 - THREAD_SAFE: 1
                   OPCACHE: 1
+                  INTRINSICS: AVX
 
 services:
         # the setup scripts have to be touched, once some other db version is used

.gdbinit

@@ -16,9 +16,11 @@ define ____executor_globals
 		end
 		set $eg = ((zend_executor_globals*) (*((void ***) $tsrm_ls))[executor_globals_id-1])
 		set $cg = ((zend_compiler_globals*) (*((void ***) $tsrm_ls))[compiler_globals_id-1])
+		set $eg_ptr = $eg
 	else
 		set $eg = executor_globals
 		set $cg = compiler_globals
+		set $eg_ptr = (zend_executor_globals*) &executor_globals
 	end
 end
 
@@ -289,6 +291,16 @@ define ____printzv
 	end
 end
 
+define print_global_vars
+	____executor_globals
+	set $symtable = ((HashTable *)&($eg_ptr->symbol_table))
+	print_ht $symtable
+end
+
+document print_global_vars
+	Prints the global variables
+end
+
 define print_const_table
 	set $ind = 1
 	printf "[%p] {\n", $arg0

.gitattributes

@@ -1,26 +1,16 @@
 ext/mysqlnd/mysqlnd.h           ident
-ext/simplexml/simplexml.c       ident
 ext/iconv/php_iconv.h           ident
-ext/posix/posix.c               ident
-ext/recode/recode.c             ident
 ext/ext_skel.php                ident
 ext/phar/phar/pharcommand.inc   ident
 ext/phar/phar.c                 ident
-ext/sysvmsg/sysvmsg.c           ident
-ext/enchant/enchant.c           ident
-ext/reflection/php_reflection.c ident
 ext/oci8/oci8.c                 ident
 ext/dba/libinifile/inifile.c    ident
 ext/dba/libflatfile/flatfile.c  ident
 ext/dba/libcdb/cdb_make.c       ident
 ext/dba/libcdb/cdb.c            ident
-ext/filter/filter.c             ident
-README.input_filter             ident
 run-tests.php                   ident
 ext/exif/exif.c                 ident
-ext/ldap/ldap.c                 ident
 ext/pdo_pgsql/pdo_pgsql.c       ident
-ext/tidy/tidy.c                 ident
 NEWS                            merge=NEWS
 UPGRADING                       merge=NEWS
 UPGRADING.INTERNALS             merge=NEWS

.gitignore

@@ -137,7 +137,6 @@ Zend/zend_language_parser.h
 Zend/zend_language_parser.output
 
 # Extension specific ignores
-ext/*/configure.in
 ext/*/configure.ac
 ext/*/ltmain.sh
 ext/*/libs.mk

NEWS

@@ -5,8 +5,8 @@ PHP                                                                        NEWS
 - Core:
   . Improved PHP GC. (Dmitry, Nikita)
   . Redesigned the old ext_skel program written in PHP, run: 
-    'php ext_skel.php' for all options. This means there is no dependencies 
-    thrus making it work on Windows out of the box. (Kalle)
+    'php ext_skel.php' for all options. This means there are no dependencies,
+    thus making it work on Windows out of the box. (Kalle)
   . Removed support for BeOS. (Kalle)
   . Add PHP_VERSION to phpinfo() <title/>. (github/MattJeevas)
   . Add net_get_interfaces(). (Sara, Joe, Anatol)
@@ -40,6 +40,7 @@ PHP                                                                        NEWS
   . Fixed bug #75765 (Fatal error instead of Error exception when base class is
     not found). (Timur Ibragimov)
   . Fixed bug #76198 (Wording: "iterable" is not a scalar type). (Levi Morrison)
+  . Fixed bug #76137 (config.guess/config.sub do not recognize RISC-V). (cmb)
 
 - BCMath:
   . Fixed bug #66364 (BCMath bcmul ignores scale parameter). (cmb)
@@ -105,14 +106,16 @@ PHP                                                                        NEWS
   . Fixed bug #73528 (Crash in zif_mb_send_mail). (Nikita)
   . Fixed bug #74929 (mbstring functions version 7.1.1 are slow compared to 5.3
     on Windows). (Nikita)
-  . Update to Oniguruma 6.8.1. (cmb)
+  . Fixed bug #76319 (mb_strtolower with invalid UTF-8 causes segmentation
+    fault). (Nikita)
+  . Updated to Oniguruma 6.8.2. (cmb)
 
 - ODBC:
   . Removed support for ODBCRouter. (Kalle)
   . Removed support for Birdstep. (Kalle)
 
 - OpenSSL:
-  . Fixed bug #75307 (Wrong reflection for openssl_open function). (villfa)
+  . Added openssl_pkey_derive function. (Jim Zubov)
 
 - PCRE:
   . Implemented https://wiki.php.net/rfc/pcre2-migration (Anatol, Dmitry)
@@ -181,7 +184,7 @@ PHP                                                                        NEWS
     (carusogabriel)
 
 - SQLite3:
-  . Updated bundled libsqlite to 3.23.1. (cmb)
+  . Updated bundled libsqlite to 3.24.0. (cmb)
 
 - Standard:
   . Added is_countable() function. (Gabriel Caruso)

README.REDIST.BINS

@@ -1,7 +1,7 @@
 1. libmagic (ext/fileinfo) see ext/fileinfo/libmagic/LICENSE
 2. Oniguruma (ext/mbstring) see ext/mbstring/oniguruma/COPYING
 3. libmbfl (ext/mbstring) see ext/mbstring/libmbfl/LICENSE
-4. pcrelib (ext/pcre) see ext/pcre/pcrelib/LICENCE
+4. pcre2lib (ext/pcre)
 5. ext/standard crypt
 6. ext/standard crypt's blowfish implementation
 7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
@@ -16,6 +16,106 @@
 16. main/strlcpy
 17. libgd see ext/gd/libgd/COPYING
 18. ext/phar portions of tar implementations
+19. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/COPYING.LIB
+
+
+4. pcre2lib (ext/pcre)
+
+PCRE2 LICENCE
+-------------
+
+PCRE2 is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+Release 10 of PCRE2 is distributed under the terms of the "BSD" licence, as
+specified below, with one exemption for certain binary redistributions. The
+documentation for PCRE2, supplied in the "doc" directory, is distributed under
+the same terms as the software itself. The data in the testdata directory is
+not copyrighted and is in the public domain.
+
+The basic library functions are written in C and are freestanding. Also
+included in the distribution is a just-in-time compiler that can be used to
+optimize pattern matching. This is an optional feature that can be omitted when
+the library is built.
+
+
+THE BASIC LIBRARY FUNCTIONS
+---------------------------
+
+Written by:       Philip Hazel
+Email local part: ph10
+Email domain:     cam.ac.uk
+
+University of Cambridge Computing Service,
+Cambridge, England.
+
+Copyright (c) 1997-2018 University of Cambridge
+All rights reserved.
+
+
+PCRE2 JUST-IN-TIME COMPILATION SUPPORT
+--------------------------------------
+
+Written by:       Zoltan Herczeg
+Email local part: hzmester
+Emain domain:     freemail.hu
+
+Copyright(c) 2010-2018 Zoltan Herczeg
+All rights reserved.
+
+
+STACK-LESS JUST-IN-TIME COMPILER
+--------------------------------
+
+Written by:       Zoltan Herczeg
+Email local part: hzmester
+Emain domain:     freemail.hu
+
+Copyright(c) 2009-2018 Zoltan Herczeg
+All rights reserved.
+
+
+THE "BSD" LICENCE
+-----------------
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notices,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notices, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of any
+      contributors may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+
+EXEMPTION FOR BINARY LIBRARY-LIKE PACKAGES
+------------------------------------------
+
+The second condition in the BSD licence (covering binary redistributions) does
+not apply all the way down a chain of software. If binary package A includes
+PCRE2, it must respect the condition, but if package B is software that
+includes package A, the condition is not imposed on package B unless it uses
+PCRE2 independently.
+
+End
+
 
 5. ext/standard crypt
 

README.RELEASE_PROCESS

@@ -37,7 +37,7 @@ Most developers should have this.
 Moving extensions from php-src to PECL
 - Checkout the pecl directory, most likely you want a sparse-root checkout
   svn co --depth=empty https://svn.php.net/repository/pecl
-- Create an directory for the extension incl. branch and tag structure,
+- Create a directory for the extension incl. branch and tag structure,
   no trunk at this point and commit this to svn
   cd pecl; mkdir foo foo/tags foo/branches; svn add foo; svn commit
 - Move the extension from php-src to the new location
@@ -50,7 +50,7 @@ maintainers if any:
 - create the package.xml, commit
 - release the package
 
-For Moving extensions from PECL to php-src the svn mv has to be tone the other
+For Moving extensions from PECL to php-src the svn mv has to be done the other
 way round.
 
 Rolling a non stable release (alpha/beta/RC)
@@ -188,7 +188,7 @@ credits files in ext/standard.
 9. run: ``PHPROOT=. ./makedist php 5.4.1``, this will export the tag, create configure
 and build three tarballs (gz, bz2 and xz).
    Check if the pear files are updated (phar).
-   On some systems the behavior of GNU tar can default to produce POSIX complaint archives
+   On some systems the behavior of GNU tar can default to produce POSIX compliant archives
 with PAX headers. As not every application is compatible with that format, creation of
 archives with PAX headers should be avoided. When packaging on such a system, the GNU tar
 can be influenced by defining the environment variable TAR_OPTIONS='--format=gnu'.
@@ -365,7 +365,7 @@ New Release Manager Checklist
    one or more of the previous RMs sign your key. Publish your public key to pgp.mit.edu with:
    `gpg --keyserver pgp.mit.edu --send-keys $KEYID`
 
-3. Request karma to eding main/php_version.h. Possibly karma for other restricted parts of 
+3. Request karma to edit main/php_version.h. Possibly karma for other restricted parts of 
    php-src might come in question.
 
 4. Request karma for web/qa.git and web/php.git for publishing release announcements.

README.input_filter

@@ -86,7 +86,6 @@ PHP_MINFO_FUNCTION(my_input_filter)
 {
     php_info_print_table_start();
     php_info_print_table_row( 2, "My Input Filter Support", "enabled" );
-    php_info_print_table_row( 2, "Revision", "$Id$");
     php_info_print_table_end();
 }
 

UPGRADING

@@ -30,6 +30,20 @@ Core:
     thrown exceptions.
   . TypeError now reports wrong types as `int` and `bool` instead of `integer`
     and `boolean`.
+  . Due to the introduction of flexible heredoc/nowdoc syntax (see New Features
+    section), doc strings that contain the ending label inside their body may
+    cause syntax errors or change in interpretation. For example in
+
+        $str = <<<FOO
+        abcdefg
+            FOO
+        FOO;
+
+    the indented occurrence of "FOO" did not previously have any special
+    meaning. Now it will be interpreted as the end of the heredoc string and
+    the following "FOO;" will cause a syntax error. This issue can always be
+    resolved by choosing an ending label that does not occur within the contents
+    of the string.
 
 BCMath:
   . All warnings thrown by BCMath functions are now using PHP's error handling.
@@ -38,7 +52,7 @@ BCMath:
     the returned numbers may have omitted trailing decimal zeroes.
 
 Reflection:
-  . Reflection results now return `int` and `bool` instead of `integer`
+  . Reflection export to string now uses `int` and `bool` instead of `integer`
     and `boolean`.
 
 SPL:
@@ -75,6 +89,39 @@ Core:
 BCMath:
   . bcscale() can now also be used as getter to retrieve the current scale in use.
 
+MBString:
+  . Support for full case-mapping and case-folding has been added. Unlike simple
+    case-mapping, full case-mapping may change the length of the string. For
+    example:
+
+      mb_strtoupper("Straße")
+      // Produces STRAßE on PHP 7.2
+      // Produces STRASSE on PHP 7.3
+
+    The different casing mapping and folding modes are available through
+    mb_convert_case():
+
+      . MB_CASE_LOWER (used by mb_strtolower)
+      . MB_CASE_UPPER (used by mb_strtoupper)
+      . MB_CASE_TITLE
+      . MB_CASE_FOLD
+      . MB_CASE_LOWER_SIMPLE
+      . MB_CASE_UPPER_SIMPLE
+      . MB_CASE_TITLE_SIMPLE
+      . MB_CASE_FOLD_SIMPLE (used by case-insensitive operations)
+
+    Only unconditional, language agnostic full case-mapping is performed.
+  . Case-insensitive string operations now use case-folding instead of case-
+    mapping during comparisons. This means that more characters will be
+    considered (case insensitively) equal now.
+  . mb_convert_case() with MB_CASE_TITLE now performs title-case conversion
+    based on the Cased and CaseIgnorable derived Unicode properties. In
+    particular this also improves handling of quotes and apostophes.
+  . Data tables have been updated for Unicode 10.
+  . Mbstring now correctly supports strings larger than 2GB.
+  . Performance of the mbstring extension has been significantly improved
+    across the board. The largest improvements are in case conversion functions.
+
 readline:
   . Support for the completion_append_character and completion_suppress_append
     options has been added to readline_info(). These options are only available
@@ -88,6 +135,9 @@ readline:
 4. Deprecated Functionality
 ========================================
 
+Intl:
+  . Usage of the Normalizer::NONE form throws a deprecation warning, if PHP is linked with ICU >= 56.
+
 ========================================
 5. Changed Functions
 ========================================
@@ -149,6 +199,25 @@ Intl:
   . Added Normalizer::getRawDecomposition() and normalizer_get_raw_decomposition(),
     to retrieve the Decomposition_Mapping property of a character.
 
+OpenSSL:
+  . Added openssl_pkey_derive that derives a shared secret for DH, ECDH and
+    possibly other future algorithms supported by EVP_PKEY_derive.
+
+Sockets:
+  . Added functions to import/export the WSAPROTOCOL_INFO info struct. This
+    implementation complements the already supported SCM_RIGHTS as in
+    man 3 cmsg and is Windows specific. For the import/export, the default
+    system securities apply for the SHM reading/writing. The socket becomes
+    invalid, when the last reference to it is closed.
+    - socket_wsaprotocol_info_export(resource $sock, int $pid) - exports the
+      WSAPROTOCOL_INFO structure into shared memory and returns an identifier
+      to be used for the import, or false on failure. The exported ID is
+      only valid for the dedicated PID.
+    - socket_wsaprotocol_info_import(string $id) - returns a duplicated
+      socket as per the passed identifier, or false on failure.
+    - socket_wsaprotocol_info_release(string $id) - releases the shared memory
+      corresponding to the passed identifier.
+
 Standard:
   . Added is_countable() function, to check whether a value may be passed to
     count().