Update versions for PHP 7.2.34

We have to check for NUL bytes if `getimagesize()` has been called.

.appveyor.yml

@@ -1,4 +1,3 @@
-
 version: "{branch}.build.{build}"
 
 image: Visual Studio 2017
@@ -8,23 +7,16 @@ branches:
                 - PHP-5.6
                 - PHP-7.0
 
-skip_commits:
-        files:
-                - NEWS
-                - UPGRADING*
-                - README.*
-
 clone_depth: 64
 
 cache:
         - c:\build-cache
-        - c:\build-cache\sdk -> .appveyor.yml
 
 environment:
-        PHP_BUILD_CACHE_BASE_DIR: c:\build-cache  
+        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.0.5
+        PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
         PHP_BUILD_CRT: vc15
         # ext and env setup for tests
         #MYSQL_TEST_PASSWD: Password12!
@@ -55,4 +47,3 @@ build_script:
 
 test_script:
         - appveyor\test.bat
-

.editorconfig

@@ -1,16 +1,34 @@
-; http://editorconfig.org/
+# https://editorconfig.org/
 
 root = true
 
-[*.{c,h}]
-charset                  = UTF-8
-end_of_line              = LF
+[*]
+trim_trailing_whitespace = true
+insert_final_newline     = true
+end_of_line              = lf
+charset                  = utf-8
+tab_width                = 4
+
+[{*.{awk,bat,c,cpp,d,h,l,mk,re,skl,w32,y},Makefile*}]
 indent_size              = 4
 indent_style             = tab
-insert_final_newline     = true
-tab_width                = 4
-trim_trailing_whitespace = true
 
-[*.yml]
+[*.{dtd,html,inc,php,phpt,rng,wsdl,xml,xsd,xsl}]
+indent_size              = 4
+indent_style             = space
+
+[*.{ac,m4,sh,yml}]
 indent_size              = 2
 indent_style             = space
+
+[*.md]
+indent_style             = space
+max_line_length          = 80
+
+[COMMIT_EDITMSG]
+indent_size              = 4
+indent_style             = space
+max_line_length          = 80
+
+[*.patch]
+trim_trailing_whitespace = false

.gdbinit

@@ -5,7 +5,7 @@ end
 document set_ts
 	set the ts resource, it is impossible for gdb to
 	call ts_resource_ex while no process is running,
-	but we could get the resource from the argument 
+	but we could get the resource from the argument
 	of frame info.
 end
 
@@ -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
 
@@ -151,7 +153,7 @@ end
 
 define printzv
 	set $ind = 1
-	____printzv $arg0 0 
+	____printzv $arg0 0
 end
 
 document printzv
@@ -171,7 +173,7 @@ define ____printzv_contents
 		printf "UNDEF"
 	end
 	if $type == 1
-        printf "NULL"
+		printf "NULL"
 	end
 	if $type == 2
 		printf "bool: false"
@@ -179,16 +181,16 @@ define ____printzv_contents
 	if $type == 3
 		printf "bool: true"
 	end
-    if $type == 4
+	if $type == 4
 		printf "long: %ld", $zvalue->value.lval
-    end
-    if $type == 5
-        printf "double: %f", $zvalue->value.dval
-    end
-    if $type == 6
-       printf "string: %s", $zvalue->value.str->val
-    end
-	if $type == 7 
+	end
+	if $type == 5
+		printf "double: %f", $zvalue->value.dval
+	end
+	if $type == 6
+		printf "string: %s", $zvalue->value.str->val
+	end
+	if $type == 7
 		printf "array: "
 		if ! $arg1
 			set $ind = $ind + 1
@@ -245,25 +247,31 @@ define ____printzv_contents
 		printf "const: %s", $zvalue->value.str->val
 	end
 	if $type == 12
-		printf "const_ast"
+		printf "CONSTANT_AST"
 	end
 	if $type == 13
-		printf "_IS_BOOL"
+		printf "_BOOL"
 	end
 	if $type == 14
-		printf "IS_CALLABLE"
+		printf "CALLABLE"
 	end
 	if $type == 15
 		printf "indirect: "
 		____printzv $zvalue->value.zv $arg1
 	end
-	if $type == 16
-		printf "string_offset"
-	end
 	if $type == 17
 		printf "pointer: %p", $zvalue->value.ptr
 	end
-	if $type > 17
+	if $type == 18
+		printf "ITERABLE"
+	end
+	if $type == 19
+		printf "VOID"
+	end
+	if $type == 20
+		printf "_ERROR"
+	end
+	if $type == 16 || $type > 20
 		printf "unknown type %d", $type
 	end
 	printf "\n"
@@ -279,42 +287,32 @@ define ____printzv
 	if $arg1
 		____printzv_contents $zcontents $arg1
 	else
-		____printzv_contents $zcontents 0 
+		____printzv_contents $zcontents 0
 	end
 end
 
-define ____print_const_table
-	set $ht = $arg0
-	set $p = $ht->pListHead
+define print_global_vars
+	____executor_globals
+	set $symtable = ((HashTable *)&($eg_ptr->symbol_table))
+	print_ht $symtable
+end
 
-	while $p != 0
-		set $const = (zend_constant *) $p->pData
-
-		set $i = $ind
-		while $i > 0
-			printf "  "
-			set $i = $i - 1
-		end
-
-		if $p->nKeyLength > 0
-			____print_str $p->arKey $p->nKeyLength
-			printf " => "
-		else
-			printf "%d => ", $p->h
-		end
-
-		____printzv_contents &$const->value 0
-		set $p = $p->pListNext
-	end
+document print_global_vars
+	Prints the global variables
 end
 
 define print_const_table
 	set $ind = 1
 	printf "[%p] {\n", $arg0
-	____print_const_table $arg0
+	____print_ht $arg0 4
 	printf "}\n"
 end
 
+document print_const_table
+	Dumps elements of Constants HashTable
+	Example: print_const_table executor_globals.zend_constants
+end
+
 define ____print_ht
 	set $ht = (HashTable*)$arg0
 	set $n = $ind
@@ -342,7 +340,7 @@ define ____print_ht
 				set $n = $n - 1
 			end
 			printf "[%d] ", $i
-			if $p->key 
+			if $p->key
 				printf "%s => ", $p->key->val
 			else
 				printf "%d => ", $p->h
@@ -361,6 +359,10 @@ define ____print_ht
 				set $func = (zend_function*)$p->val.value.ptr
 				printf "\"%s\"\n", $func->common.function_name->val
 			end
+			if $arg1 == 4
+				set $const = (zend_constant *)$p->val.value.ptr
+				____printzv $const 1
+			end
 		end
 		set $i = $i + 1
 	end
@@ -387,7 +389,7 @@ document print_htptr
 end
 
 define print_htstr
-	set $ind = 0 
+	set $ind = 0
 	____print_ht $arg0 2
 end
 
@@ -472,9 +474,12 @@ end
 
 define print_pi
 	set $pi = (zend_property_info *)$arg0
+	set $initial_offset = ((uint32_t)(zend_uintptr_t)(&((zend_object*)0)->properties_table[(0)]))
+	set $ptr_to_val = (zval*)((char*)$pi->ce->default_properties_table + $pi->offset - $initial_offset)
 	printf "[%p] {\n", $pi
+	printf "    offset = %p\n", $pi->offset
 	printf "    ce = [%p] %s\n", $pi->ce, $pi->ce->name->val
-	printf "    flags = %d (", $pi->flags
+	printf "    flags = 0x%x (", $pi->flags
 	if $pi->flags & 0x100
 		printf "ZEND_ACC_PUBLIC"
 	else
@@ -485,7 +490,11 @@ define print_pi
 				printf "ZEND_ACC_PRIVATE"
 			else
 				if $pi->flags & 0x800
-					printf "ZEND_ACC_CHANGED"
+					printf "ZEND_ACC_EARLY_BINDING"
+				else
+					if $pi->flags & 0x20000
+						printf "ZEND_ACC_SHADOW"
+					end
 				end
 			end
 		end
@@ -493,6 +502,8 @@ define print_pi
 	printf ")\n"
 	printf "    name  = "
 	print_zstr $pi->name
+	printf "    default value: "
+	printzv $ptr_to_val
 	printf "}\n"
 end
 
@@ -532,10 +543,10 @@ define printzn
 	if $znode->op_type == 1
 		set $optype = "IS_CONST"
 	end
-	if $znode->op_type == 2 
+	if $znode->op_type == 2
 		set $optype = "IS_TMP_VAR"
 	end
-	if $znode->op_type == 4 
+	if $znode->op_type == 4
 		set $optype = "IS_VAR"
 	end
 	if $znode->op_type == 8
@@ -565,11 +576,11 @@ end
 
 document printzn
 	print type and content of znode.
-	usage: printzn &opline->op1 
+	usage: printzn &opline->op1
 end
 
 define printzops
-	printf "op1 => " 
+	printf "op1 => "
 	printzn &execute_data->opline.op1
 	printf "op2 => "
 	printzn &execute_data->opline.op2

.gitattributes

@@ -15,11 +15,8 @@ ext/dba/libflatfile/flatfile.c  ident
 ext/dba/libcdb/cdb_make.c       ident
 ext/dba/libcdb/cdb.c            ident
 ext/filter/filter.c             ident
-ext/zip/php_zip.c               ident
 README.input_filter             ident
 run-tests.php                   ident
-sapi/nsapi/nsapi.c              ident
-sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
 ext/exif/exif.c                 ident
@@ -32,7 +29,6 @@ UPGRADING.INTERNALS             merge=NEWS
 /ext/bz2/tests/with_strings.phpt	-crlf
 /ext/dom/tests/bug40836.phpt	-crlf
 /ext/dom/tests/domelement.phpt	-crlf
-/ext/ereg/tests/eregi_basic_002.phpt	-crlf
 /ext/iconv/tests/iconv004.phpt	-crlf
 /ext/iconv/tests/iconv_basic.phpt	-crlf
 /ext/iconv/tests/iconv_strpos.phpt	-crlf

.gitignore

@@ -26,7 +26,6 @@
 *.tar.xz.asc
 .FBCIndex
 .FBCLockFolder
-.deps
 .libs
 phpt.*
 core
@@ -179,9 +178,7 @@ pear/phpize
 pear/run-tests
 pear/php-config
 pear/scripts
-sapi/apache/libphp7.module
 sapi/apache2handler/libphp7.module
-sapi/apache_hooks/libphp7.module
 sapi/cgi/php-cgi
 sapi/cgi/php-cgi.1
 sapi/cli/php.1
@@ -193,6 +190,7 @@ sapi/fpm/fpm/php-cgi
 sapi/phpdbg/phpdbg_parser.c
 sapi/phpdbg/phpdbg_parser.h
 sapi/phpdbg/phpdbg
+sapi/phpdbg/phpdbg.1
 scripts/php-config
 scripts/phpize
 scripts/man1/*.1
@@ -229,3 +227,7 @@ win32/wsyslog.h
 **/tests/**/*.db
 **/tests/**/*.txt
 **/tests/**/*.tmp
+
+# special cases to invert previous ignore rules
+!ext/fileinfo/libmagic.patch
+!ext/mbstring/oniguruma.patch

.travis.yml

@@ -1,5 +1,9 @@
+git:
+  quiet: true
+
+dist: trusty
 language: c
-sudo: false
+sudo: required
 addons:
   apt:
     packages:
@@ -18,7 +22,7 @@ addons:
       - libt1-dev
 
 notifications:
-    email: 
+    email:
        on_failure: change
     irc:
       template:
@@ -49,6 +53,8 @@ before_script:
     - ccache --version
     - ccache --zero-stats
     - export USE_CCACHE=1
+    # Enable IPv6
+    - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
     # Compile PHP
     - ./travis/compile.sh
     # Setup Extensions
@@ -58,7 +64,7 @@ before_script:
     - . ./travis/ext/pgsql/setup.sh
     - . ./travis/ext/pdo_pgsql/setup.sh
 
-# Run PHPs run-tests.php 
+# Run PHPs run-tests.php
 script:
     - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=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
 

CODING_STANDARDS

@@ -93,12 +93,12 @@ User Functions/Methods Naming Conventions
     readability of the function name itself::
 
     Good:
-    'mcrypt_enc_self_test'
-    'mysql_list_fields'
+    'str_word_count'
+    'array_key_exists'
 
     Ok:
-    'mcrypt_module_get_algo_supported_key_sizes'
-    (could be 'mcrypt_mod_get_algo_sup_key_sizes'?)
+    'date_interval_create_from_date_string'
+    (could be 'date_intvl_create_from_date_str'?)
     'get_html_translation_table'
     (could be 'html_get_trans_table'?)
 
@@ -113,7 +113,7 @@ User Functions/Methods Naming Conventions
     of ``parent_*``::
 
     A family of 'foo' functions, for example:
-    
+
     Good:
     'foo_select_bar'
     'foo_insert_baz'

EXTENSIONS

@@ -37,7 +37,7 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           cli
-MAINTENANCE:         Marcus Boerger <helly@php.net>, Edin Kadribasic <edink@php.net>
+MAINTENANCE:         Marcus Börger <helly@php.net>, Edin Kadribasic <edink@php.net>
 STATUS:              Working
 SINCE:               4.3.0
 -------------------------------------------------------------------------------
@@ -47,7 +47,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           fpm
-PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>, Jerome Loyet <fat@php.net>
+PRIMARY MAINTAINER:  Jakub Zelenka <bukka@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3.3
@@ -68,7 +68,7 @@ STATUS:              5.6
 
 -------------------------------------------------------------------------------
 EXTENSION:           dba
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>,Christopher Jones <sixd@php.net>, Pierre-Alain Joye <pajoye@php.net>
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>,Christopher Jones <sixd@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini
@@ -79,13 +79,13 @@ MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mysqli
-PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           mysqlnd
-PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
+PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
@@ -99,7 +99,7 @@ EXTENSION:           odbc
 PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
-COMMENT:             Working 
+COMMENT:             Working
 -------------------------------------------------------------------------------
 EXTENSION:           pdo
 PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Wez Furlong <wez@php.net>
@@ -120,7 +120,7 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_mysql
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Johannes Schlüter <johannes@php.net>, Andrey Hristov <andrey@php.net>,  Ulf Wendel <uw@php.net>
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Johannes Schlüter <johannes@php.net>, Andrey Hristov <andrey@php.net>,  Ulf Wendel <uw@php.net>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
@@ -150,7 +150,7 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pgsql
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Yasuo Ohgaki <yohgaki@php.net>
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>, Yasuo Ohgaki <yohgaki@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less have fatal bug.
@@ -168,13 +168,13 @@ COMMENT:             Integrates SQLite 3 embeddable SQL database engine.
 
 -------------------------------------------------------------------------------
 EXTENSION:           dom
-PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>, Marcus Boerger <helly@php.net>
+PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>, Marcus Börger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           simplexml
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
@@ -195,12 +195,12 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           libxml
-PRIMARY MAINTAINER:   Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net> 
+PRIMARY MAINTAINER:   Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xmlreader
-PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net> 
+PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -269,7 +269,7 @@ STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           exif
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
+PRIMARY MAINTAINER:  Kalle Sommer Nielsen <kalle@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.2
@@ -335,7 +335,7 @@ STATUS:              Working
 SINCE:               5.2
 -------------------------------------------------------------------------------
 EXTENSION:           ldap
-PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>, Pierre-Alain Joye <pajoye@php.net>, Côme Bernigaud <mcmic@php.net>
+PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>, Pierre-Alain Joye <pajoye@php.net>, Côme Bernigaud <mcmic@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -367,13 +367,13 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           phar
-PRIMARY MAINTAINER:  Greg Beaver <cellog@php.net>, Marcus Börger <helly@php.net>, Steph Fox <sfox@php.net>
+PRIMARY MAINTAINER:  Greg Beaver <cellog@php.net>, Marcus Börger <helly@php.net>, Steph Fox <sfox@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           posix
-PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
+PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -388,12 +388,12 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           recode
-PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
+PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           reflection
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>, Johannes Schlüter <johannes@php.net>
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>, Johannes Schlüter <johannes@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -419,8 +419,14 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
+EXTENSION:           sodium
+PRIMARY MAINTAINER:  Frank Denis <jedisct1@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               7.2.0
+-------------------------------------------------------------------------------
 EXTENSION:           spl
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Etienne Kneuss <colder@php.net>
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>, Etienne Kneuss <colder@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0.0

LICENSE

@@ -1,7 +1,7 @@
--------------------------------------------------------------------- 
+--------------------------------------------------------------------
                   The PHP License, version 3.01
-Copyright (c) 1999 - 2017 The PHP Group. All rights reserved.
--------------------------------------------------------------------- 
+Copyright (c) 1999 - 2018 The PHP Group. All rights reserved.
+--------------------------------------------------------------------
 
 Redistribution and use in source and binary forms, with or without
 modification, is permitted provided that the following conditions
@@ -9,22 +9,22 @@ are met:
 
   1. Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
- 
+
   2. Redistributions in binary form must reproduce the above copyright
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
- 
+
   3. The name "PHP" must not be used to endorse or promote products
      derived from this software without prior written permission. For
      written permission, please contact group@php.net.
-  
+
   4. Products derived from this software may not be called "PHP", nor
      may "PHP" appear in their name, without prior written permission
      from group@php.net.  You may indicate that your software works in
      conjunction with PHP by saying "Foo for PHP" instead of calling
      it "PHP Foo" or "phpfoo"
- 
+
   5. The PHP Group may publish revised and/or new versions of the
      license from time to time. Each version will be given a
      distinguishing version number.
@@ -41,27 +41,27 @@ are met:
      "This product includes PHP software, freely available from
      <http://www.php.net/software/>".
 
-THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
 ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
 PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
-DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+DEVELOPMENT TEAM OR ITS 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.
 
--------------------------------------------------------------------- 
+--------------------------------------------------------------------
 
 This software consists of voluntary contributions made by many
 individuals on behalf of the PHP Group.
 
 The PHP Group can be contacted via Email at group@php.net.
 
-For more information on the PHP Group and the PHP project, 
+For more information on the PHP Group and the PHP project,
 please see <http://www.php.net>.
 
 PHP includes the Zend Engine, freely available at

Makefile.frag

@@ -1,4 +1,3 @@
-
 #
 # Zend
 #

Makefile.gcov

@@ -1,4 +1,3 @@
-
 #
 # LCOV
 #
@@ -62,7 +61,7 @@ php_lcov.info: lcov-test
 			rm -rf lcov_data/$$dir ; \
 		fi; \
 	done
-	@echo 
+	@echo
 	@echo "Generating $@"
 	@$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@
 

Makefile.global

@@ -5,7 +5,7 @@ INSTALL_DATA = $(INSTALL) -m 644
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
 
-all: $(all_targets) 
+all: $(all_targets)
 	@echo
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
@@ -112,16 +112,16 @@ test: all
 clean:
 	find . -name \*.gcno -o -name \*.gcda | xargs rm -f
 	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f 
+	find . -name \*.la -o -name \*.a | xargs rm -f
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
+	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
 	rm -f php7.spec main/build-defs.h scripts/phpize
 	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
-	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1
+	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
 	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
 	rm -f 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_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
 	rm -f ext/phar/phar.phar ext/phar/phar.php
@@ -135,7 +135,7 @@ prof-gen:
 
 prof-clean:
 	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f 
+	find . -name \*.la -o -name \*.a | xargs rm -f
 	find . -name \*.so | xargs rm -f
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
 

README.EXT_SKEL

@@ -1,6 +1,6 @@
 (NOTE: you may also want to take a look at the pear package
 	     PECL_Gen, a PHP-only alternative for this script that
-			 supports way more extension writing tasks and is 
+			 supports way more extension writing tasks and is
 			 supposed to replace ext_skel completely in the long run ...)
 
 WHAT IT IS
@@ -17,16 +17,16 @@ HOW TO USE IT
 
    ./ext_skel --extname=module_name
 
-  and everything you need is placed in directory module_name. 
+  and everything you need is placed in directory module_name.
 
-  [ Note that GNU awk is likely required for this script to work.  Debian 
-    systems seem to default to using mawk, so you may need to change the 
+  [ Note that GNU awk is likely required for this script to work.  Debian
+    systems seem to default to using mawk, so you may need to change the
     #! line in skeleton/create_stubs and the cat $proto | awk line in
     ext_skel to use gawk explicitly. ]
 
-  If you don't need to test the existence of any external header files, 
-  libraries or functions in them, the module is already almost ready to be 
-  compiled in PHP.  Just remove 3 comments in your_module_name/config.m4, 
+  If you don't need to test the existence of any external header files,
+  libraries or functions in them, the module is already almost ready to be
+  compiled in PHP.  Just remove 3 comments in your_module_name/config.m4,
   change back up to PHP sources top directory, and do
 
     ./buildconf; ./configure --enable-module_name; make
@@ -83,7 +83,7 @@ FORMAT OF FUNCTION DEFINITIONS FILE
   ']'s as there where '['s. Currently, it does not harm if you forget to do it
   or there is a wrong amount of ']'s, but this may change in the future.
 
-	An additional short description may be added after the parameters. 
+	An additional short description may be added after the parameters.
   If present it will be filled into the 'proto' header comments in the stubs
   code and the <refpurpose> tag in the XML documentation.
 
@@ -135,7 +135,7 @@ CURRENT LIMITATIONS, BUGS AND OTHER ODDITIES
   handled. For other types you must write the code yourself. And for type
   mixed, it wouldn't even be possible to write anything, because only you
   know what to expect.
-  
+
   It can't handle correctly, and probably never will, variable list of
   of arguments. (void foo(int bar [, ...])
 
@@ -185,4 +185,3 @@ PHP_FUNCTION(module_name_drawtext)
     php_error(E_WARNING, "module_name_drawtext: not yet implemented");
 }
 /* }}} */
-

README.GIT-RULES

@@ -44,7 +44,7 @@ Having said that, here are the organizational rules::
 
 Currently we have the following branches in use::
 
-  master    The active development branch. 
+  master    The active development branch.
 
   PHP-7.1   Is used to release the PHP 7.1.x series. This is a prerelease
             version.
@@ -110,7 +110,7 @@ The format of the commit messages is pretty simple.
 An Example from the git project (commit 2b34e486bc):
 
 pack-objects: Fix compilation with NO_PTHREDS
-  
+
 It looks like commit 99fb6e04 (pack-objects: convert to use
 parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but
 hasn't noticed that the 'arg' variable no longer is available.

README.NEW-OUTPUT-API

@@ -3,7 +3,7 @@ $Id: README.NEW-OUTPUT-API 219039 2006-08-30 07:39:09Z mike $
 
 API adjustment to the old output control code:
 
-	Everything now resides beneath the php_output namespace, 
+	Everything now resides beneath the php_output namespace,
 	and there's an API call for every output handler op.
 
 	Checking output control layers status:
@@ -134,7 +134,7 @@ Output handler hooks
 Open questions
 
 	Should the userland API be adjusted and unified?
-	
+
 	Many bits of the manual (and very first implementation) do not comply
 	with the behaviour of the current (to be obsoleted) code, thus should
 	the manual or the behaviour be adjusted?

README.PARAMETER_PARSING_API

@@ -42,11 +42,11 @@ See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse
 
 Type specifiers
 ---------------
- The following list shows the type specifier, its meaning and the parameter 
+ The following list shows the type specifier, its meaning and the parameter
  types that need to be passed by address. All passed parameters are set
- if the PHP parameter is non optional and untouched if optional and the 
+ if the PHP parameter is non optional and untouched if optional and the
  parameter is not present. The only exception is O where the zend_class_entry*
- has to be provided on input and is used to verify the PHP parameter is an 
+ has to be provided on input and is used to verify the PHP parameter is an
  instance of that class.
 
  a  - array (zval*)
@@ -54,7 +54,7 @@ Type specifiers
  b  - boolean (zend_bool)
  C  - class (zend_class_entry*)
  d  - double (double)
- f  - function or array containing php method call info (returned as 
+ f  - function or array containing php method call info (returned as
       zend_fcall_info and zend_fcall_info_cache)
  h  - array (returned as HashTable*)
  H  - array or HASH_OF(object) (returned as HashTable*)
@@ -88,9 +88,9 @@ Type specifiers
 
 Note on 64bit compatibility
 ---------------------------
-Please note that since version 7 PHP uses zend_long as integer type and 
-zend_string with size_t as length, so make sure you pass zend_longs to "l" 
-and size_t to strings length (i.e. for "s" you need to pass char * and size_t), 
+Please note that since version 7 PHP uses zend_long as integer type and
+zend_string with size_t as length, so make sure you pass zend_longs to "l"
+and size_t to strings length (i.e. for "s" you need to pass char * and size_t),
 not the other way round!
 
 Both mistakes might cause memory corruptions and segfaults:
@@ -103,7 +103,7 @@ Both mistakes might cause memory corruptions and segfaults:
   int num; /* XXX THIS IS WRONG!! Use zend_long instead. */
   zend_parse_parameters(ZEND_NUM_ARGS(), "l", &num)
 
-If you're in doubt, use check_parameters.php script to the parameters 
+If you're in doubt, use check_parameters.php script to the parameters
 and their types (it can be found in ./scripts/dev/ directory of PHP sources):
 
 # php ./scripts/dev/check_parameters.php /path/to/your/sources/
@@ -152,7 +152,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!",
 /* Get either a set of 3 longs or a string. */
 zend_long l1, l2, l3;
 char *s;
-/* 
+/*
  * The function expects a pointer to a size_t in this case, not a long
  * or any other type.  If you specify a type which is larger
  * than a 'size_t', the upper bits might not be initialized

README.REDIST.BINS

@@ -46,7 +46,7 @@ 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.
- 
+
 
 6. ext/standard crypt's blowfish implementation
 
@@ -92,7 +92,7 @@ http://www.usenix.org/events/usenix99/provos.html
 Some of the tricks in BF_ROUND might be inspired by Eric Young's
 Blowfish library (I can't be sure if I would think of something if I
 hadn't seen his code).
- 
+
 
 7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
 
@@ -126,7 +126,7 @@ Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30.
 
 Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
 Copyright (C) 2000 - 2003, Richard J. Wagner
-All rights reserved.                          
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -139,8 +139,8 @@ are met:
 	 notice, this list of conditions and the following disclaimer in the
 	 documentation and/or other materials provided with the distribution.
 
-3. The names of its contributors may not be used to endorse or promote 
-	 products derived from this software without specific prior written 
+3. The names of its contributors may not 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
@@ -261,26 +261,26 @@ SUCH DAMAGE.
 
 12. libxmlrpc ext/xmlrpc
 
-Copyright 2000 Epinions, Inc. 
+Copyright 2000 Epinions, Inc.
 
-Subject to the following 3 conditions, Epinions, Inc.  permits you, free 
-of charge, to (a) use, copy, distribute, modify, perform and display this 
-software and associated documentation files (the "Software"), and (b) 
-permit others to whom the Software is furnished to do so as well.  
+Subject to the following 3 conditions, Epinions, Inc.  permits you, free
+of charge, to (a) use, copy, distribute, modify, perform and display this
+software and associated documentation files (the "Software"), and (b)
+permit others to whom the Software is furnished to do so as well.
 
-1) The above copyright notice and this permission notice shall be included 
-without modification in all copies or substantial portions of the 
-Software.  
+1) The above copyright notice and this permission notice shall be included
+without modification in all copies or substantial portions of the
+Software.
 
-2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF 
-ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY 
-IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE OR NONINFRINGEMENT.  
+2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF
+ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY
+IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE OR NONINFRINGEMENT.
 
-3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, 
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT 
-OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING 
-NEGLIGENCE), EVEN IF EPINIONS, INC.  IS AWARE OF THE POSSIBILITY OF SUCH 
+3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
+OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING
+NEGLIGENCE), EVEN IF EPINIONS, INC.  IS AWARE OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
 13. libzip ext/zip
@@ -414,4 +414,3 @@ 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.
-

README.RELEASE_PROCESS

@@ -32,7 +32,7 @@ team (Bjori) on hand.
 6. Verify the tags to be extra sure everything was tagged properly.
 
 7. Moving extensions from/to PECL requires write access to the destination.
-Most developers should have this. 
+Most developers should have this.
 
 Moving extensions from php-src to PECL
 - Checkout the pecl directory, most likely you want a sparse-root checkout
@@ -125,13 +125,13 @@ Getting the non stable release (alpha/beta/RC) announced
 
  b. ``$PHP_x_RC_DATE`` = "06 September 2007"
 
-3. Add a short notice to phpweb stating that there is a new release, and 
+3. Add a short notice to phpweb stating that there is a new release, and
 highlight the major important things (security fixes) and when it is important
 to upgrade.
 
  a. Call php bin/createNewsEntry in your local phpweb checkout
-    Use category "releases" for all non-stable releases.
-    Use category "frontpage" for X.Y.0 non-stable releases only.
+    Use category "releases" for all stable releases.
+    Use category "frontpage" for X.Y.0 non-stable releases only (news only).
 
  b. Add the content for the news entry. Be sure to include the text:
     "THIS IS A DEVELOPMENT PREVIEW - DO NOT USE IT IN PRODUCTION!"
@@ -140,7 +140,7 @@ to upgrade.
 
 *Wait for web and qa sites to update with new information before sending announce*
 
-5. Send an email **To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` 
+5. Send an email **To** ``internals@lists.php.net`` and ``php-general@lists.php.net``
 lists pointing out "the location of the release" and "the possible release date of
 either the next RC, or the final release". Include in this information the verification
 information output by ``gen_verify_stub``.
@@ -193,7 +193,7 @@ Check if the pear files are updated (phar).
   ``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx``
 
 11. Commit and push all the tarballs and signature files to web/php-distributions.git,
-    then update the git submodule reference in web/php.git: 
+    then update the git submodule reference in web/php.git:
     ``git submodule init;
     git submodule update;
     cd distributions;
@@ -263,7 +263,7 @@ f.e. ``ChangeLog-5.php`` from the NEWS file
   IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``
 
   V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
-  
+
   e. You may want to try php-web/bin/news2html to automate this task
 
 6. Add a short notice to phpweb stating that there is a new release, and
@@ -338,7 +338,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 eding 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.
@@ -346,4 +346,3 @@ New Release Manager Checklist
 5. Request moderation access to announce@php.net and primary-qa-tester@lists.php.net lists, to
    be able to moderate your release announcements. All the announcements should be sent from
    the @php.net alias.
-

README.SELF-CONTAINED-EXTENSIONS

@@ -23,7 +23,7 @@ PREPARING YOUR SYSTEM
     GNU libtool
     GNU m4
 
-  All of these are available from 
+  All of these are available from
 
     ftp://ftp.gnu.org/pub/gnu/
 
@@ -33,7 +33,7 @@ CONVERTING AN EXISTING EXTENSION
   extension, we will convert an embedded extension into a
   self-contained one. Install PHP and execute the following
   commands.
-  
+
      $ mkdir /tmp/newext
      $ cd /tmp/newext
 
@@ -56,7 +56,7 @@ CONVERTING AN EXISTING EXTENSION
             [--with-mysql=MYSQL-DIR]
      $ make install
 
-  The MySQL module will either use the embedded MySQL client 
+  The MySQL module will either use the embedded MySQL client
   library or the MySQL installation in MYSQL-DIR.
 
 
@@ -67,8 +67,8 @@ DEFINING THE NEW EXTENSION
   It consists of two source files "foo.c" and "bar.c"
   (and any arbitrary amount of header files, but that is not
   important here).
-  
-  The demo extension does not reference any external 
+
+  The demo extension does not reference any external
   libraries (that is important, because the user does not
   need to specify anything).
 
@@ -78,7 +78,7 @@ DEFINING THE NEW EXTENSION
 
 CREATING THE M4 CONFIGURATION FILE
 
-  The m4 configuration can perform additional checks. For a 
+  The m4 configuration can perform additional checks. For a
   self-contained extension, you do not need more than a few
   macro calls.
 
@@ -97,7 +97,7 @@ fi
   The first argument of PHP_NEW_EXTENSION describes the name of the
   extension.  The second names the source-code files.  The third passes
   $ext_shared which is set by PHP_ARG_ENABLE/WITH to PHP_NEW_EXTENSION.
-  
+
   Please use always PHP_ARG_ENABLE or PHP_ARG_WITH. Even if you do not
   plan to distribute your module with PHP, these facilities allow you
   to integrate your module easily into the main PHP module framework.
@@ -138,7 +138,7 @@ INSTALLING A SELF-CONTAINED EXTENSION
 ADDING SHARED MODULE SUPPORT TO A MODULE
 
   In order to be useful, a self-contained extension must be loadable
-  as a shared module. I will explain now how you can add shared module 
+  as a shared module. I will explain now how you can add shared module
   support to an existing module called foo.
 
   1. In config.m4, use PHP_ARG_WITH/PHP_ARG_ENABLE. Then you will
@@ -167,4 +167,3 @@ PECL SITE CONFORMITY
 
     This macros has to be used within your foo_module_entry to indicate the
     extension version.
-

README.STREAMS

@@ -28,7 +28,7 @@ The main functions are:
 PHPAPI size_t php_stream_read(php_stream * stream, char * buf, size_t count);
 PHPAPI size_t php_stream_write(php_stream * stream, const char * buf, size_t
         count);
-PHPAPI size_t php_stream_printf(php_stream * stream, 
+PHPAPI size_t php_stream_printf(php_stream * stream,
         const char * fmt, ...);
 PHPAPI int php_stream_eof(php_stream * stream);
 PHPAPI int php_stream_getc(php_stream * stream);
@@ -63,7 +63,7 @@ Where:
                            file/URL, use this option to arrange for the stream
                            to be copied (if needed) into a stream that can
                            be seek()ed.
-                           
+
     opened_path is used to return the path of the actual file opened,
     but if you used STREAM_MUST_SEEK, may not be valid.  You are
     responsible for efree()ing opened_path.  opened_path may be (and usually
@@ -95,7 +95,7 @@ PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short po
 PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent,
     struct timeval *timeout);
     Open a UNIX domain socket.
-   
+
 
 Stream Utilities
 ================
@@ -246,7 +246,7 @@ PHPAPI php_stream * php_stream_fopen(const char * filename, const char * mode)
 {
     FILE * fp = fopen(filename, mode);
     php_stream * ret;
-    
+
     if (fp) {
         ret = php_stream_alloc(&php_stream_stdio_ops, fp, 0, 0, mode);
         if (ret)
@@ -347,7 +347,7 @@ static size_t php_mysqlop_read(php_stream * stream, char * buf, size_t count)
         else
             return 0;
     }
-    
+
     /* pull out some data from the stream and put it in buf */
     ... mysql_fetch_row(state->result) ...
     /* we could do something strange, like format the data as XML here,

README.SUBMITTING_PATCH

@@ -128,7 +128,7 @@ How to create your PHP, PHP Documentation or PECL patch
 -------------------------------------------------------
 PHP and most PECL packages use Git for revision control. Some PECL
 packages use Subversion (SVN) Read http://www.php.net/git.php for help
-on using Git to get and build PHP source code.  We recommend to look 
+on using Git to get and build PHP source code.  We recommend to look
 at our workflow on https://wiki.php.net/vcs/gitworkflow and our FAQ
 https://wiki.php.net/vcs/gitfaq.
 

README.TESTING

@@ -9,7 +9,7 @@ it failed on your system without providing substantial backup information
 on *why* the test failed on your special setup. Thank you :-)
 
 
-[Testing Basics] 
+[Testing Basics]
 ----------------
  The easiest way to test your PHP build is to run "make test" from the
 command line after successfully compiling. This will run the complete
@@ -36,7 +36,7 @@ If you are running the run-tests.php script from the command line (as above)
 you must set the TEST_PHP_EXECUTABLE environment variable to explicitly
 select the PHP executable that is to be tested, that is, used to run the test scripts.
 
-If you run the tests using make test, the PHP CLI and CGI executables are 
+If you run the tests using make test, the PHP CLI and CGI executables are
 automatically set for you. "make test" executes "run-tests.php" script with the CLI binary.  Some
 test scripts such as session must be executed by CGI SAPI. Therefore,
 you must build PHP with CGI SAPI to perform all tests.
@@ -62,7 +62,7 @@ from the source root and any subdirectories below. If there are files,
 which have a "phpt" extension, "run-tests.php" looks at the sections
 in these files, determines whether it should run it, by evaluating
 the 'SKIP' section. If the test is eligible for execution, the 'FILE'
-section is extracted into a ".php" file (with the same name besides 
+section is extracted into a ".php" file (with the same name besides
 the extension) and gets executed.
 When an argument is given or TESTS environment variable is set, the
 GLOB is expanded by the shell and any file with extension "*.phpt" is
@@ -77,9 +77,9 @@ Examples:
 
 [Test results]
 --------------
- Test results are printed to standard output. If there is a failed test, 
+ Test results are printed to standard output. If there is a failed test,
 the "run-tests.php" script saves the result, the expected result and the
-code executed to the test script directory. For example, if 
+code executed to the test script directory. For example, if
 ext/myext/tests/myext.phpt fails to pass, the following files are created:
 
 ext/myext/tests/myext.php   - actual test file executed
@@ -151,20 +151,20 @@ advised to test for non-zero, rather then a specific value.
 
 [Creating new test files]
 -------------------------
- Writing test file is very easy if you are used to PHP. 
+ Writing test file is very easy if you are used to PHP.
 See the HOWTO at http://qa.php.net/write-test.php
 
 
 [How to help us]
 ----------------
- If you find bug in PHP, you can submit bug report AND test script 
+ If you find bug in PHP, you can submit bug report AND test script
 for us. You don't have to write complete script, just give us test
 script with following format. Please test the script and make sure
 you write the correct ACTUAL OUTPUT and EXPECTED OUTPUT before you
 submit.
 
 <?php
-/* 
+/*
 Bug #12345
 substr() bug. Do not return expected string.
 

README.TESTING2

@@ -1,13 +1,13 @@
 [IMPORTANT NOTICE]
 ------------------
-This is an addendum to README.TESTING with additional information 
+This is an addendum to README.TESTING with additional information
 specific to server-tests.php.
 
 server-tests.php is backward compatible with tests developed for
 the original run-tests.php script.  server-tests is *not* used by
 'make test'.  server-tests was developed to provide support for
 testing PHP under it's primary environment, HTTP, and can run the
-PHP tests under any of the SAPI modules that are direct executables, 
+PHP tests under any of the SAPI modules that are direct executables,
 or are accessible via HTTP.
 
 [New features]
@@ -25,7 +25,7 @@ or are accessible via HTTP.
   can be configured to run test scripts through an HTTP server running
   on localhost.  localhost is required since either the web server must
   alias a directory to the php source directory, or the test scripts
-  must be copied to a directory under the web server 
+  must be copied to a directory under the web server
   (see config options TEST_WEB_BASE_URL, TEST_BASE_PATH, and TEST_WEB_EXT)
 * New sections supported for test files (see below)
 
@@ -49,7 +49,7 @@ Some (but not all!) examples of usage:
 
 4. run tests over http, php sources have been aliased in web server
     php server-tests.php -w -u http://localhost/test
-    
+
 5. run tests using configuration file
     php server-tests.php -c /path/to/server-tests-config.php
 
@@ -59,10 +59,10 @@ Some (but not all!) examples of usage:
 
 NOTE: configuration as described in README.TESTING still works.
 
-[New Test Sections] 
+[New Test Sections]
 ----------------
-In addition to the traditional test sections 
-(see http://qa.php.net/write-test.php), several new sections are available 
+In addition to the traditional test sections
+(see http://qa.php.net/write-test.php), several new sections are available
 under server-tests.
 
 --POST--
@@ -78,7 +78,7 @@ in the test file.
 Not used for anything, just a section for documenting the test
 
 --ENV--
-This section get's eval()'d to help build an environment for the 
+This section get's eval()'d to help build an environment for the
 execution of the test.  This can be used to change environment
 vars that are used for CGI emulation, or simply to set env vars
 for cli testing.  A full example looks like:
@@ -132,6 +132,3 @@ regular expect sections.  For example:
 
   --EXPECTHEADERS--
   Status: 404
-
-
-

README.WIN32-BUILD-SYSTEM

@@ -1,6 +1,5 @@
 The Win32 Build System.
 
-See http://wiki.php.net/internals/windows/stepbystepbuild 
+See https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2
 
 vim:tw=78:sw=1:ts=1:et
-

README.input_filter

@@ -12,7 +12,7 @@ enforced.  It is implemented as a SAPI hook and is called from the
 treat_data and post handler functions.  To implement your own security
 policy you will need to write a standard PHP extension.  There is also
 a powerful standard implementation in ext/filter that should suit most
-peoples' needs.  However, if you want to implement your own security 
+peoples' needs.  However, if you want to implement your own security
 policy, read on.
 
 A simple implementation might look like the following.  This stores the

README.md

@@ -37,4 +37,3 @@ Guidelines for contributors
 - [README.GIT-RULES](/README.GIT-RULES)
 - [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES)
 - [README.RELEASE_PROCESS](/README.RELEASE_PROCESS)
-

TSRM/TSRM.c

@@ -94,7 +94,12 @@ static FILE *tsrm_error_file;
 	}
 #endif
 
-#if defined(PTHREADS)
+#if defined(GNUPTH)
+static pth_key_t tls_key;
+# define tsrm_tls_set(what)		pth_key_setdata(tls_key, (void*)(what))
+# define tsrm_tls_get()			pth_key_getdata(tls_key)
+
+#elif defined(PTHREADS)
 /* Thread local storage */
 static pthread_key_t tls_key;
 # define tsrm_tls_set(what)		pthread_setspecific(tls_key, (void*)(what))
@@ -125,9 +130,10 @@ TSRM_TLS uint8_t in_main_thread = 0;
 
 /* Startup TSRM (call once for the entire process) */
 TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename)
-{
+{/*{{{*/
 #if defined(GNUPTH)
 	pth_init();
+	pth_key_create(&tls_key, 0);
 #elif defined(PTHREADS)
 	pthread_key_create( &tls_key, 0 );
 #elif defined(TSRM_ST)
@@ -166,12 +172,12 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu
 
 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Started up TSRM, %d expected threads, %d expected resources", expected_threads, expected_resources));
 	return 1;
-}
+}/*}}}*/
 
 
 /* Shutdown TSRM (call once for the entire process) */
 TSRM_API void tsrm_shutdown(void)
-{
+{/*{{{*/
 	int i;
 
 	if (!in_main_thread) {
@@ -227,12 +233,12 @@ TSRM_API void tsrm_shutdown(void)
 	tsrm_new_thread_begin_handler = NULL;
 	tsrm_new_thread_end_handler = NULL;
 	tsrm_shutdown_handler = NULL;
-}
+}/*}}}*/
 
 
 /* allocates a new thread-safe-resource id */
 TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor)
-{
+{/*{{{*/
 	int i;
 
 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Obtaining a new resource id, %d bytes", size));
@@ -283,11 +289,11 @@ TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate
 
 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Successfully allocated new resource id %d", *rsrc_id));
 	return *rsrc_id;
-}
+}/*}}}*/
 
 
 static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_T thread_id)
-{
+{/*{{{*/
 	int i;
 
 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Creating data structures for thread %x", thread_id));
@@ -323,12 +329,12 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 	}
 
 	tsrm_mutex_unlock(tsmm_mutex);
-}
+}/*}}}*/
 
 
 /* fetches the requested resource for the current thread */
 TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
-{
+{/*{{{*/
 	THREAD_T thread_id;
 	int hash_value;
 	tsrm_tls_entry *thread_resources;
@@ -386,12 +392,12 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 	 * changes to the structure as we read it.
 	 */
 	TSRM_SAFE_RETURN_RSRC(thread_resources->storage, id, thread_resources->count);
-}
+}/*}}}*/
 
 /* frees an interpreter context.  You are responsible for making sure that
  * it is not linked into the TSRM hash, and not marked as the current interpreter */
 void tsrm_free_interpreter_context(void *context)
-{
+{/*{{{*/
 	tsrm_tls_entry *next, *thread_resources = (tsrm_tls_entry*)context;
 	int i;
 
@@ -410,10 +416,10 @@ void tsrm_free_interpreter_context(void *context)
 		free(thread_resources);
 		thread_resources = next;
 	}
-}
+}/*}}}*/
 
 void *tsrm_set_interpreter_context(void *new_ctx)
-{
+{/*{{{*/
 	tsrm_tls_entry *current;
 
 	current = tsrm_tls_get();
@@ -426,12 +432,12 @@ void *tsrm_set_interpreter_context(void *new_ctx)
 
 	/* return old context, so caller can restore it when they're done */
 	return current;
-}
+}/*}}}*/
 
 
 /* allocates a new interpreter context */
 void *tsrm_new_interpreter_context(void)
-{
+{/*{{{*/
 	tsrm_tls_entry *new_ctx, *current;
 	THREAD_T thread_id;
 
@@ -445,12 +451,12 @@ void *tsrm_new_interpreter_context(void)
 	/* switch back to the context that was in use prior to our creation
 	 * of the new one */
 	return tsrm_set_interpreter_context(current);
-}
+}/*}}}*/
 
 
 /* frees all resources allocated for the current thread */
 void ts_free_thread(void)
-{
+{/*{{{*/
 	tsrm_tls_entry *thread_resources;
 	int i;
 	THREAD_T thread_id = tsrm_thread_id();
@@ -487,12 +493,12 @@ void ts_free_thread(void)
 		thread_resources = thread_resources->next;
 	}
 	tsrm_mutex_unlock(tsmm_mutex);
-}
+}/*}}}*/
 
 
 /* frees all resources allocated for all threads except current */
 void ts_free_worker_threads(void)
-{
+{/*{{{*/
 	tsrm_tls_entry *thread_resources;
 	int i;
 	THREAD_T thread_id = tsrm_thread_id();
@@ -533,12 +539,12 @@ void ts_free_worker_threads(void)
 		}
 	}
 	tsrm_mutex_unlock(tsmm_mutex);
-}
+}/*}}}*/
 
 
 /* deallocates all occurrences of a given id */
 void ts_free_id(ts_rsrc_id id)
-{
+{/*{{{*/
 	int i;
 	int j = TSRM_UNSHUFFLE_RSRC_ID(id);
 
@@ -567,7 +573,7 @@ void ts_free_id(ts_rsrc_id id)
 	tsrm_mutex_unlock(tsmm_mutex);
 
 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Successfully freed resource id %d", id));
-}
+}/*}}}*/
 
 
 
@@ -578,7 +584,7 @@ void ts_free_id(ts_rsrc_id id)
 
 /* Obtain the current thread id */
 TSRM_API THREAD_T tsrm_thread_id(void)
-{
+{/*{{{*/
 #ifdef TSRM_WIN32
 	return GetCurrentThreadId();
 #elif defined(GNUPTH)
@@ -594,12 +600,12 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 #elif defined(BETHREADS)
 	return find_thread(NULL);
 #endif
-}
+}/*}}}*/
 
 
 /* Allocate a mutex */
 TSRM_API MUTEX_T tsrm_mutex_alloc(void)
-{
+{/*{{{*/
 	MUTEX_T mutexp;
 #ifdef TSRM_WIN32
 	mutexp = malloc(sizeof(CRITICAL_SECTION));
@@ -625,12 +631,12 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 	printf("Mutex created thread: %d\n",mythreadid());
 #endif
 	return( mutexp );
-}
+}/*}}}*/
 
 
 /* Free a mutex */
 TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
-{
+{/*{{{*/
 	if (mutexp) {
 #ifdef TSRM_WIN32
 		DeleteCriticalSection(mutexp);
@@ -654,7 +660,7 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 #ifdef THR_DEBUG
 	printf("Mutex freed thread: %d\n",mythreadid());
 #endif
-}
+}/*}}}*/
 
 
 /*
@@ -662,7 +668,7 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
   A return value of 0 indicates success
 */
 TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
-{
+{/*{{{*/
 	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Mutex locked thread: %ld", tsrm_thread_id()));
 #ifdef TSRM_WIN32
 	EnterCriticalSection(mutexp);
@@ -686,7 +692,7 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 		return acquire_sem(mutexp->sem);
 	return 0;
 #endif
-}
+}/*}}}*/
 
 
 /*
@@ -694,7 +700,7 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
   A return value of 0 indicates success
 */
 TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
-{
+{/*{{{*/
 	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Mutex unlocked thread: %ld", tsrm_thread_id()));
 #ifdef TSRM_WIN32
 	LeaveCriticalSection(mutexp);
@@ -718,14 +724,14 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 		return release_sem(mutexp->sem);
 	return 0;
 #endif
-}
+}/*}}}*/
 
 /*
   Changes the signal mask of the calling thread
 */
 #ifdef HAVE_SIGPROCMASK
 TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset)
-{
+{/*{{{*/
 	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Changed sigmask in thread: %ld", tsrm_thread_id()));
 	/* TODO: add support for other APIs */
 #ifdef PTHREADS
@@ -733,35 +739,35 @@ TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset)
 #else
 	return sigprocmask(how, set, oldset);
 #endif
-}
+}/*}}}*/
 #endif
 
 
 TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler)
-{
+{/*{{{*/
 	void *retval = (void *) tsrm_new_thread_begin_handler;
 
 	tsrm_new_thread_begin_handler = new_thread_begin_handler;
 	return retval;
-}
+}/*}}}*/
 
 
 TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler)
-{
+{/*{{{*/
 	void *retval = (void *) tsrm_new_thread_end_handler;
 
 	tsrm_new_thread_end_handler = new_thread_end_handler;
 	return retval;
-}
+}/*}}}*/
 
 
 TSRM_API void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler)
-{
+{/*{{{*/
 	void *retval = (void *) tsrm_shutdown_handler;
 
 	tsrm_shutdown_handler = shutdown_handler;
 	return retval;
-}
+}/*}}}*/
 
 
 /*
@@ -770,7 +776,7 @@ TSRM_API void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler)
 
 #if TSRM_DEBUG
 int tsrm_error(int level, const char *format, ...)
-{
+{/*{{{*/
 	if (level<=tsrm_error_level) {
 		va_list args;
 		int size;
@@ -785,12 +791,12 @@ int tsrm_error(int level, const char *format, ...)
 	} else {
 		return 0;
 	}
-}
+}/*}}}*/
 #endif
 
 
 void tsrm_error_set(int level, char *debug_filename)
-{
+{/*{{{*/
 	tsrm_error_level = level;
 
 #if TSRM_DEBUG
@@ -807,16 +813,25 @@ void tsrm_error_set(int level, char *debug_filename)
 		tsrm_error_file = stderr;
 	}
 #endif
-}
+}/*}}}*/
 
 TSRM_API void *tsrm_get_ls_cache(void)
-{
+{/*{{{*/
 	return tsrm_tls_get();
-}
+}/*}}}*/
 
 TSRM_API uint8_t tsrm_is_main_thread(void)
-{
+{/*{{{*/
 	return in_main_thread;
-}
+}/*}}}*/
 
 #endif /* ZTS */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

TSRM/TSRM.h

@@ -157,10 +157,14 @@ TSRM_API void tsrm_free_interpreter_context(void *context);
 TSRM_API void *tsrm_get_ls_cache(void);
 TSRM_API uint8_t tsrm_is_main_thread(void);
 
-#ifdef TSRM_WIN32
-# define TSRM_TLS __declspec(thread)
+#if defined(__cplusplus) && __cplusplus > 199711L
+# define TSRM_TLS thread_local
 #else
-# define TSRM_TLS __thread
+# ifdef TSRM_WIN32
+#  define TSRM_TLS __declspec(thread)
+# else
+#  define TSRM_TLS __thread
+# endif
 #endif
 
 #define TSRM_SHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)+1)
@@ -175,11 +179,7 @@ TSRM_API uint8_t tsrm_is_main_thread(void);
 #define TSRMG_BULK_STATIC(id, type)	((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
 #define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
 #define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
-#if ZEND_DEBUG
 #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
-#else
-#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
-#endif
 #define TSRMLS_CACHE _tsrm_ls_cache
 
 /* BC only */
@@ -216,3 +216,12 @@ TSRM_API uint8_t tsrm_is_main_thread(void);
 #endif /* ZTS */
 
 #endif /* TSRM_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

TSRM/acinclude.m4

@@ -1,5 +1,3 @@
-
 AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
   LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
-

TSRM/build.mk

@@ -5,7 +5,7 @@
 #
 # Written by Sascha Schumann
 #
-# $Id$ 
+# $Id$
 
 
 LT_TARGETS = ltmain.sh ltconfig
@@ -34,7 +34,7 @@ aclocal.m4: configure.ac acinclude.m4
 	aclocal
 
 $(config_h_in): configure.ac
-# explicitly remove target since autoheader does not seem to work 
+# explicitly remove target since autoheader does not seem to work
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
 	autoheader

TSRM/config.w32

@@ -3,4 +3,3 @@
 
 ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_win32.c");
 ADD_FLAG("CFLAGS_BD_TSRM", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
-

TSRM/configure.ac

@@ -12,10 +12,10 @@ AH_TOP([
 ])
 
 sinclude(tsrm.m4)
-	
+
 TSRM_BASIC_CHECKS
 TSRM_THREADS_CHECKS
-	
+
 AM_PROG_LIBTOOL
 if test "$enable_debug" != "yes"; then
   AM_SET_LIBTOOL_VARIABLE([--silent])

TSRM/m4/gethostbyname.m4

@@ -194,4 +194,3 @@ esac
 AC_LANG_POP
 
 ]) dnl end AC_DEFUN
-

TSRM/threads.m4

@@ -1,17 +1,17 @@
 dnl  Copyright (c) 1999, 2000 Sascha Schumann. All rights reserved.
-dnl 
+dnl
 dnl  Redistribution and use in source and binary forms, with or without
 dnl  modification, are permitted provided that the following conditions
 dnl  are met:
-dnl 
+dnl
 dnl  1. Redistributions of source code must retain the above copyright
 dnl     notice, this list of conditions and the following disclaimer.
-dnl 
+dnl
 dnl  2. Redistributions in binary form must reproduce the above copyright
 dnl     notice, this list of conditions and the following disclaimer in
 dnl     the documentation and/or other materials provided with the
 dnl     distribution.
-dnl 
+dnl
 dnl  THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY
 dnl  EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 dnl  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -97,7 +97,7 @@ dnl  -Kthread          UDK cc (UnixWare)
 dnl  -mt               WorkShop cc (Solaris)
 dnl  -mthreads         gcc (AIX)
 dnl  -pthread          gcc (Linux, FreeBSD, NetBSD, OpenBSD)
-dnl  -pthreads         gcc (Solaris) 
+dnl  -pthreads         gcc (Solaris)
 dnl  -qthreaded        AIX cc V5
 dnl  -threads          gcc (HP-UX)
 dnl
@@ -117,7 +117,7 @@ else
   AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[
   ac_cv_pthreads_cflags=
   if test "$pthreads_working" != "yes"; then
-    for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 
+    for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
       ac_save=$CFLAGS
       CFLAGS="$CFLAGS $flag"
       PTHREADS_CHECK_COMPILE

TSRM/tsrm.m4

@@ -1,6 +1,6 @@
 m4_include([TSRM/m4/gethostbyname.m4])
 
-dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
+dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)
 AC_DEFUN([TSRM_CHECK_GCC_ARG],[
   gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
   AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
@@ -75,12 +75,12 @@ AC_DEFUN([TSRM_CHECK_ST],[
 sinclude(threads.m4)
 
 AC_DEFUN([TSRM_CHECK_PTHREADS],[
-		
+
 PTHREADS_CHECK
 
-if test "$beos_threads" = "1"; then 
+if test "$beos_threads" = "1"; then
   AC_DEFINE(BETHREADS, 1, Whether to use native BeOS threads)
-else		
+else
   if test "$pthreads_working" != "yes"; then
     AC_MSG_ERROR(Your system seems to lack POSIX threads.)
   fi

TSRM/tsrm_config.w32.h

@@ -13,3 +13,12 @@
 #include <crtdbg.h>
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

TSRM/tsrm_config_common.h

@@ -69,3 +69,12 @@ char *alloca ();
 #endif
 
 #endif /* TSRM_CONFIG_COMMON_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

TSRM/tsrm_strtok_r.c

@@ -4,7 +4,7 @@
 #include "tsrm_strtok_r.h"
 
 static inline int in_character_class(char ch, const char *delim)
-{
+{/*{{{*/
 	while (*delim) {
 		if (*delim == ch) {
 			return 1;
@@ -12,10 +12,10 @@ static inline int in_character_class(char ch, const char *delim)
 		delim++;
 	}
 	return 0;
-}
+}/*}}}*/
 
 TSRM_API char *tsrm_strtok_r(char *s, const char *delim, char **last)
-{
+{/*{{{*/
 	char *token;
 
 	if (s == NULL) {
@@ -41,7 +41,7 @@ TSRM_API char *tsrm_strtok_r(char *s, const char *delim, char **last)
 		*last = s + 1;
 	}
 	return token;
-}
+}/*}}}*/
 
 #if 0
 
@@ -61,3 +61,12 @@ main()
 }
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

TSRM/tsrm_win32.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2017 The PHP Group                                |
+   | Copyright (c) 1997-2018 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -42,7 +42,7 @@ static tsrm_win32_globals win32_globals;
 #endif
 
 static void tsrm_win32_ctor(tsrm_win32_globals *globals)
-{
+{/*{{{*/
 #ifdef ZTS
 TSRMLS_CACHE_UPDATE();
 #endif
@@ -61,10 +61,10 @@ TSRMLS_CACHE_UPDATE();
 	 */
 	globals->impersonation_token = INVALID_HANDLE_VALUE;
 	globals->impersonation_token_sid = NULL;
-}
+}/*}}}*/
 
 static void tsrm_win32_dtor(tsrm_win32_globals *globals)
-{
+{/*{{{*/
 	shm_pair *ptr;
 
 	if (globals->process) {
@@ -89,26 +89,26 @@ static void tsrm_win32_dtor(tsrm_win32_globals *globals)
 	if (globals->impersonation_token_sid) {
 		free(globals->impersonation_token_sid);
 	}
-}
+}/*}}}*/
 
 TSRM_API void tsrm_win32_startup(void)
-{
+{/*{{{*/
 #ifdef ZTS
 	ts_allocate_id(&win32_globals_id, sizeof(tsrm_win32_globals), (ts_allocate_ctor)tsrm_win32_ctor, (ts_allocate_ctor)tsrm_win32_dtor);
 #else
 	tsrm_win32_ctor(&win32_globals);
 #endif
-}
+}/*}}}*/
 
 TSRM_API void tsrm_win32_shutdown(void)
-{
+{/*{{{*/
 #ifndef ZTS
 	tsrm_win32_dtor(&win32_globals);
 #endif
-}
+}/*}}}*/
 
 char * tsrm_win32_get_path_sid_key(const char *pathname, size_t pathname_len, size_t *key_len)
-{
+{/*{{{*/
 	PSID pSid = TWG(impersonation_token_sid);
 	char *ptcSid = NULL;
 	char *bucket_key = NULL;
@@ -139,11 +139,11 @@ char * tsrm_win32_get_path_sid_key(const char *pathname, size_t pathname_len, si
 
 	LocalFree(ptcSid);
 	return bucket_key;
-}
+}/*}}}*/
 
 
 PSID tsrm_win32_get_token_sid(HANDLE hToken)
-{
+{/*{{{*/
 	DWORD dwLength = 0;
 	PTOKEN_USER pTokenUser = NULL;
 	DWORD sid_len;
@@ -190,10 +190,10 @@ Finished:
 		HeapFree(GetProcessHeap(), 0, (LPVOID)pTokenUser);
 	}
 	return NULL;
-}
+}/*}}}*/
 
 TSRM_API int tsrm_win32_access(const char *pathname, int mode)
-{
+{/*{{{*/
 	time_t t;
 	HANDLE thread_token = NULL;
 	PSID token_sid;
@@ -394,11 +394,11 @@ Finished:
 			return 0;
 		}
 	}
-}
+}/*}}}*/
 
 
 static process_pair *process_get(FILE *stream)
-{
+{/*{{{*/
 	process_pair *ptr;
 	process_pair *newptr;
 
@@ -421,10 +421,10 @@ static process_pair *process_get(FILE *stream)
 	ptr = newptr + TWG(process_size);
 	TWG(process_size)++;
 	return ptr;
-}
+}/*}}}*/
 
 static shm_pair *shm_get(key_t key, void *addr)
-{
+{/*{{{*/
 	shm_pair *ptr;
 	shm_pair *newptr;
 
@@ -453,24 +453,25 @@ static shm_pair *shm_get(key_t key, void *addr)
 	TWG(shm_size)++;
 	memset(ptr, 0, sizeof(*ptr));
 	return ptr;
-}
+}/*}}}*/
 
-static HANDLE dupHandle(HANDLE fh, BOOL inherit) {
+static HANDLE dupHandle(HANDLE fh, BOOL inherit)
+{/*{{{*/
 	HANDLE copy, self = GetCurrentProcess();
 	if (!DuplicateHandle(self, fh, self, &copy, 0, inherit, DUPLICATE_SAME_ACCESS|DUPLICATE_CLOSE_SOURCE)) {
 		return NULL;
 	}
 	return copy;
-}
+}/*}}}*/
 
 TSRM_API FILE *popen(const char *command, const char *type)
-{
+{/*{{{*/
 
 	return popen_ex(command, type, NULL, NULL);
-}
+}/*}}}*/
 
 TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env)
-{
+{/*{{{*/
 	FILE *stream = NULL;
 	int fno, type_len, read, mode;
 	STARTUPINFOW startup;
@@ -614,10 +615,10 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	proc->prochnd = process.hProcess;
 	proc->stream = stream;
 	return stream;
-}
+}/*}}}*/
 
 TSRM_API int pclose(FILE *stream)
-{
+{/*{{{*/
 	DWORD termstat = 0;
 	process_pair *process;
 
@@ -634,10 +635,10 @@ TSRM_API int pclose(FILE *stream)
 	CloseHandle(process->prochnd);
 
 	return termstat;
-}
+}/*}}}*/
 
 TSRM_API int shmget(key_t key, size_t size, int flags)
-{
+{/*{{{*/
 	shm_pair *shm;
 	char shm_segment[26], shm_info[29];
 	HANDLE shm_handle, info_handle;
@@ -717,10 +718,10 @@ TSRM_API int shmget(key_t key, size_t size, int flags)
 	}
 
 	return key;
-}
+}/*}}}*/
 
 TSRM_API void *shmat(int key, const void *shmaddr, int flags)
-{
+{/*{{{*/
 	shm_pair *shm = shm_get(key, NULL);
 
 	if (!shm->segment) {
@@ -740,10 +741,10 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags)
 	shm->descriptor->shm_nattch++;
 
 	return shm->addr;
-}
+}/*}}}*/
 
 TSRM_API int shmdt(const void *shmaddr)
-{
+{/*{{{*/
 	shm_pair *shm = shm_get(0, (void*)shmaddr);
 
 	if (!shm->segment) {
@@ -755,9 +756,10 @@ TSRM_API int shmdt(const void *shmaddr)
 	shm->descriptor->shm_nattch--;
 
 	return UnmapViewOfFile(shm->addr) ? 0 : -1;
-}
+}/*}}}*/
 
-TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf) {
+TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf)
+{/*{{{*/
 	shm_pair *shm = shm_get(key, NULL);
 
 	if (!shm->segment) {
@@ -785,16 +787,16 @@ TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf) {
 		default:
 			return -1;
 	}
-}
+}/*}}}*/
 
 TSRM_API char *realpath(char *orig_path, char *buffer)
-{
+{/*{{{*/
 	int ret = GetFullPathName(orig_path, _MAX_PATH, buffer, NULL);
 	if(!ret || ret > _MAX_PATH) {
 		return NULL;
 	}
 	return buffer;
-}
+}/*}}}*/
 
 #if HAVE_UTIME
 static zend_always_inline void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {{{ */
@@ -802,7 +804,7 @@ static zend_always_inline void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {
 	// Note that LONGLONG is a 64-bit value
 	LONGLONG ll;
 
-	ll = Int32x32To64(t, 10000000) + 116444736000000000;
+	ll = t * 10000000LL + 116444736000000000LL;
 	pft->dwLowDateTime = (DWORD)ll;
 	pft->dwHighDateTime = ll >> 32;
 }
@@ -852,3 +854,12 @@ TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
 /* }}} */
 #endif
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

TSRM/tsrm_win32.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2017 The PHP Group                                |
+   | Copyright (c) 1997-2018 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -113,3 +113,12 @@ TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf);
 
 TSRM_API char *realpath(char *orig_path, char *buffer);
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

UPGRADING

@@ -24,8 +24,8 @@ PHP 7.2 UPGRADE NOTES
     closed resources.
   . is_object() will now return true for objects of class
     __PHP_Incomplete_Class.
-  . Support for Netware operating systems have been removed.
-  . Casting arrays to objects (with (object) or settype()) will now covert
+  . Support for Netware operating systems has been removed.
+  . Casting arrays to objects (with (object) or settype()) will now convert
     integer keys to string property names. This fixes the behaviour of previous
     versions, where integer keys would become inaccessible properties with
     integer names.
@@ -41,6 +41,7 @@ PHP 7.2 UPGRADE NOTES
   . Minimum supported Windows versions are Windows 7/Server 2008 R2.
   . Initial trait property value compatibility check will no longer perform
     any casts. (Bug #74269)
+  . "object" (in any case) can no longer be used as a class name.
 
 - BCMath:
   . The bcmod() function no longer truncates fractional numbers to integers. As
@@ -48,14 +49,19 @@ PHP 7.2 UPGRADE NOTES
     example `bcmod('4', '3.5')` now returns '0.5' instead of '1'.
 
 - Hash:
-  . The hash_hmac(), hash_hmac_file() and hash_pbkdf2() functions no longer
-    accept non-cryptographic hashes.
+  . The hash_hmac(), hash_hmac_file(), hash_pbkdf2() and hash_init() (with
+    HASH_HMAC) functions no longer accept non-cryptographic hashes.
 
-- JSON
+- JSON:
   . The json_decode() option JSON_OBJECT_AS_ARRAY is used if the second
     parameter (assoc) is null. Previously JSON_OBJECT_AS_ARRAY was always
     ignored.
 
+- SAPI:
+  . Starting with 7.2.34, incoming cookie names are not url-decoded. This was never 
+    required by the standard, outgoing cookie names aren't encoded and this leads 
+    to security issues (CVE-2020-7070).
+
 - Session:
   . Removed register_globals related code and "!" can be used as $_SESSION key name.
   . Session is made to manage session status correctly and prevents invalid operations.
@@ -68,7 +74,7 @@ PHP 7.2 UPGRADE NOTES
         session_unset(), session_write_close()/session_commit(), session_abort(),
         session_reset()
     . Functions prohibit invalid operations with regard to session status and
-      HTTP header status, returns correct bool return value.
+      HTTP header status, return correct bool return value.
         session_start(), session_set_cookie_params(), session_name(), session_module_name(),
         session_set_save_handler(), session_regenerate_id(), session_cache_limiter(),
         session_cache_expire(), session_unset(), session_destroy(),
@@ -85,7 +91,25 @@ PHP 7.2 UPGRADE NOTES
         session_start()
     . Session no longer initialize $_SESSION for invalid and useless session.
         session_start()
+    . When headers are already sent and try to set new INI values, session_name(),
+      session_module_name(), session_save_path(), session_cache_limiter() and
+      session_cache_expire() no longer work. Older PHPs accept new values even
+      if new values will not be effective.
+      This new corrected behavior may affect command line mode CLI scripts that manage
+      sessions. Use output buffer just like web applications to resolve problems on
+      CLI scripts.
 
+- Standard:
+  . Sequences generated by mt_rand() and rand() for a specific seed may differ
+    from PHP 7.1 on 64-bit machines. This change was necessary to resolve a
+    modulo bias bug in the implementation.
+
+- IMAP:
+  Starting with 7.2.13, rsh/ssh logins are disabled by default. Use
+  imap.enable_insecure_rsh if you want to enable them. Note that the IMAP
+  library does not filter mailbox names before passing them to rsh/ssh
+  command, thus passing untrusted data to this function with rsh/ssh enabled
+  is insecure.
 
 ========================================
 2. New Features
@@ -101,10 +125,17 @@ PHP 7.2 UPGRADE NOTES
     (https://wiki.php.net/rfc/allow-abstract-function-override)
   . A trailing comma in group use statements is now allowed.
     (https://wiki.php.net/rfc/list-syntax-trailing-commas)
+  . The "object" type annotation is now supported.
+    (https://wiki.php.net/rfc/object-typehint)
 
 - DBA:
   . Implemented support for the LMDB backend.
 
+- JSON:
+  . Added JSON_INVALID_UTF8_IGNORE and JSON_INVALID_UTF8_SUBSTITUTE options for
+    json_encode() and json_decode() to ignore and replace invalid UTF-8 byte
+    sequences, respectively.
+
 - OCI8:
   . Added Oracle Database Transparent Application Failover (TAF) callback support.
 
@@ -114,6 +145,9 @@ PHP 7.2 UPGRADE NOTES
     subpatterns and empty matches by reporting NULL and "" (empty string),
     respectively.
 
+- Sodium
+  . New cryptographic extension
+
 - SQLite3:
   . Implemented writing to BLOBs.
 
@@ -133,6 +167,8 @@ PHP 7.2 UPGRADE NOTES
       ZipArchive::EM_AES_192
       ZipArchive::EM_AES_256
   . accept 'password' from zip stream context
+  . ZipArchive implements countable, added ZipArchive::count() method.
+
 
 ========================================
 3. Changes in SAPI modules
@@ -146,7 +182,7 @@ All the deprecated functionality listed in the following will be removed in
 PHP 8.0.
 
 - Core:
-  . The trace_errors ini directive has been deprecated.
+  . The track_errors ini directive has been deprecated.
   . The __autoload() mechanism has been deprecated, use spl_autoload_register()
     instead.
   . The (unset) cast has been deprecated. This does not affect the unset($var)
@@ -154,6 +190,11 @@ PHP 8.0.
   . The create_function() function has been deprecated, use anonymous functions
     instead.
   . The each() function has been deprecated, use a foreach loop instead.
+  . The $errcontext error handler argument has been deprecated. However, using
+    it does not trigger a deprecation warning for technical reasons.
+
+- EXIF:
+  . The read_exif_data() alias has been deprecated, use exif_read_data() instead.
 
 - GD:
   . png2wbmp() and jpeg2wbmp() have been deprecated.
@@ -181,14 +222,14 @@ See also: https://wiki.php.net/rfc/deprecations_php_7_2
 ========================================
 
 - Standard:
-  . password_hash() can generate Argon2i hashes when the algorithm is set to PASSWORD_ARGON2I. 
-    When using PASSWORD_ARGON2I, the following cost factors may be set: 'memory_cost', 'time_cost', 
-    and 'threads'. These cost factors will default to 'PASSWORD_ARGON2_DEFAULT_MEMORY_COST', 
+  . password_hash() can generate Argon2i hashes when the algorithm is set to PASSWORD_ARGON2I.
+    When using PASSWORD_ARGON2I, the following cost factors may be set: 'memory_cost', 'time_cost',
+    and 'threads'. These cost factors will default to 'PASSWORD_ARGON2_DEFAULT_MEMORY_COST',
     'PASSWORD_ARGON2_DEFAULT_TIME_COST', and 'PASSWORD_ARGON2_DEFAULT_THREADS' respectively if not set.
   . password_verify() can verify Argon2i hashes.
   . password_get_info() and password_needs_rehash() can accept Argon2i hashes.
   . mail()/mb_send_mail() accept array $extra_header. Array parameter is checked against RFC 2822.
-    Array format is 
+    Array format is
     $extra_headers = [
       'Header-Name' => 'Header value',
       'Multiple' => ['One header', 'Another header'],
@@ -211,24 +252,37 @@ See also: https://wiki.php.net/rfc/deprecations_php_7_2
   . Added stream_isatty().
   . Added sapi_windows_vt100_support().
 
+- DOM:
+  . DomNodeList implements Countable, added DomNodeList::count().
+  . DOMNamedNodeMap implements Countable, added DOMNamedNodeMap::count().
+
+- FTP:
+  . Added ftp_append().
+
 - GD:
   . Added imagesetclip() and imagegetclip().
   . Added imageopenpolygon().
   . Added imageresolution().
   . Added imagecreatefrombmp() and imagebmp().
 
+- Hash:
+  . Added hash_hmac_algos().
+
 - Mbstring:
   . Added mb_chr() and mb_ord().
-  . Added mb_scurb() that scrub broken multibyte strings.
+  . Added mb_scrub() that scrubs broken multibyte strings.
 
 - OCI8:
-  . Added oci_register_taf_callback() and oci_disable_taf_callback() for
+  . Added oci_register_taf_callback() and oci_unregister_taf_callback() for
     Oracle Database TAF callback support.
 
 - Sockets:
   . Added socket_addrinfo_lookup(), socket_addrinfo_connect(),
     socket_addrinfo_bind() and socket_addrinfo_explain().
 
+- SPL:
+  . Added spl_object_id().
+
 ========================================
 7. New Classes and Interfaces
 ========================================
@@ -248,9 +302,11 @@ See also: https://wiki.php.net/rfc/deprecations_php_7_2
 ========================================
 
 - EXIF:
-   . Added extended exif tag support for the following formats: 
-     Samsung, DJI, Panasonic, Sony, Pentax, Minolta, Sigma/Foveon, 
+   . Added extended exif tag support for the following formats:
+     Samsung, DJI, Panasonic, Sony, Pentax, Minolta, Sigma/Foveon,
 	 AGFA, Kyocera, Ricoh & Epson.
+   . exif_read_data() and exif_thumbnail() now supports a passed streams as their
+     first parameter.
 
 - GD:
   . Removed --enable-gd-native-ttf configuration option which was unused as
@@ -307,11 +363,16 @@ See also: https://wiki.php.net/rfc/deprecations_php_7_2
 ========================================
 
 - sql.safe_mode
-  . This INI directive have been removed.
+  . This INI directive has been removed.
 
 - realpath_cache_size
   . Set to 4096k by default
 
+- opcache.fast_shutdown
+  . This INI directive has been removed. A variant of the fast_shutdown
+    process has been integrated into PHP core and is always enabled for
+    production builds if possible.
+
 ========================================
 12. Windows Support
 ========================================
@@ -327,3 +388,6 @@ See also: https://wiki.php.net/rfc/deprecations_php_7_2
 13. Other Changes
 ========================================
 
+- Build system
+
+  Autoconf minimal version is now 2.64.

UPGRADING.INTERNALS

@@ -1,9 +1,14 @@
-PHP 7.1 INTERNALS UPGRADE NOTES
+PHP 7.2 INTERNALS UPGRADE NOTES
 
 1. Internal API changes
   a. Path related functions
   b. php_win32_get_random_bytes()
   c. nice() Windows implementation
+  d. ZEND_ACC_CLONE removed
+  e. IS_TYPE_IMMUTABLE removed
+  f. zend_arg_info.class_name removed
+  g. ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX changed
+  h. valid_symbol_table removed
 
 2. Build system changes
   a. Unix build system changes
@@ -26,9 +31,22 @@ PHP 7.1 INTERNALS UPGRADE NOTES
     The internal randomness source on Windows switched to use CNG API.
 
   c. nice() now have a Windows alternative that is implemented in win32/nice.c, using
-	   SetPriorityClass(). See the implementation for more in-depth details. This also 
+	   SetPriorityClass(). See the implementation for more in-depth details. This also
 	   defines HAVE_NICE.
 
+  d. ZEND_ACC_CLONE is removed, but was not used in previous versions
+
+  e. IS_TYPE_IMMUTABLE is removed, IS_TYPE_COPYABLE can be used instead
+     Z_IMMUTABLE() check function is still available
+
+  f. zend_arg_info class_name member is removed, use ZEND_TYPE_NAME instead
+
+  g. ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX classname option is removed
+     use ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX for simple type
+     use ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX for object
+
+  h. valid_symbol_table is removed from executor_globals.
+     Use EG(active) instead of removed EG(valid_symbol_table)
 
 ========================
 2. Build system changes
@@ -49,6 +67,12 @@ PHP 7.1 INTERNALS UPGRADE NOTES
 3. Module changes
 ========================
 
+- Pcre:
+  . php_pcre_replace and php_pcre_replace_impl expect a zend_string instead of a zval and
+    is_callable_replace options is removed:
+    - PHPAPI zend_string *php_pcre_replace(zend_string *regex, zend_string *subject_str, char *subject, int subject_len, zend_string *replace_str, int limit, int *replace_count);
+    - PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, zend_string *subject_str, char *subject, int subject_len, zend_string *replace_str, int limit, int *replace_count);
+
 - Session:
   . php_session_start()/session_reset_id() return value is changed from void to int.
     It returns SUCCESS/FAILURE.
@@ -56,4 +80,3 @@ PHP 7.1 INTERNALS UPGRADE NOTES
 
 - OpenSSL:
   . Windows builds ship with OpenSSL 1.1 by default, lower versions are still supported with custom deps.
-

Zend/LICENSE

@@ -1,25 +1,25 @@
--------------------------------------------------------------------- 
+--------------------------------------------------------------------
                 The Zend Engine License, Version 2.00
 Copyright (c) 1999-2006 Zend Technologies Ltd. All rights reserved.
--------------------------------------------------------------------- 
+--------------------------------------------------------------------
 
 Redistribution and use in source and binary forms, with or without
 modification, is permitted provided that the following conditions
 are met:
 
   1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer. 
- 
-  2. Redistributions in binary form must reproduce the above 
-     copyright notice, this list of conditions and the following 
+     notice, this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following
      disclaimer in the documentation and/or other materials provided
      with the distribution.
- 
+
   3. The names "Zend" and "Zend Engine" must not be used to endorse
      or promote products derived from this software without prior
      permission from Zend Technologies Ltd. For written permission,
-     please contact license@zend.com. 
- 
+     please contact license@zend.com.
+
   4. Zend Technologies Ltd. may publish revised and/or new versions
      of the license from time to time. Each version will be given a
      distinguishing version number.
@@ -40,9 +40,9 @@ are met:
      software must display the following acknowledgment:
      "The Zend Engine is freely available at http://www.zend.com"
 
-THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND 
+THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND
 ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
 PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ZEND
 TECHNOLOGIES LTD.  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
@@ -53,4 +53,4 @@ 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.
 
--------------------------------------------------------------------- 
+--------------------------------------------------------------------

Zend/Makefile.am

@@ -53,4 +53,3 @@ depend:
 
 zend_execute.lo: $(srcdir)/zend_execute.c
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(INLINE_CFLAGS) -c $(srcdir)/zend_execute.c
-

Zend/README.ZEND_VM

@@ -21,7 +21,7 @@ ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>)
 <OPCODE-NUMBER> is a opcode number (0, 1, ...)
 <OPCODE> is an opcode name (ZEN_NOP, ZEND_ADD, :)
 <OP1_TYPES> & <OP2_TYPES> are masks for allowed operand op_types. Specializer
-will generate code only for defined combination of types. You can use any 
+will generate code only for defined combination of types. You can use any
 combination of the following op_types UNUSED, CONST, VAR, TMP and  CV also
 you can use ANY mask to disable specialization according operand's op_type.
 <HANDLER'S CODE> is a handler's code itself. For most handlers it stills the
@@ -34,9 +34,9 @@ EXECUTE_DATA
 	execute_data
 ZEND_VM_DISPATCH_TO_HANDLER(<OP>)
 	return <OP>_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_DISPATCH_TO_HELPER(<NAME>) 
+ZEND_VM_DISPATCH_TO_HELPER(<NAME>)
 	return <NAME>(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>) 
+ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>)
 	return <NAME>(<VAL>, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
 ZEND_VM_CONTINUE()
 	return 0
@@ -72,7 +72,7 @@ FREE_OP<X>_VAR_PTR()
 	FREE_VAR_PTR(free_op<X>)
 
 
-Executor's helpers can be defined without parameters or with one parameter. 
+Executor's helpers can be defined without parameters or with one parameter.
 This is done with the following constructs:
 
 ZEND_VM_HELPER(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>)
@@ -86,13 +86,13 @@ ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>)
 }
 
 Executor's code is generated by PHP script zend_vm_gen.php it uses zend_vm_def.h
-and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and 
-zend_vm_execute.h. The first file is a list of opcode definitions. It is 
+and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and
+zend_vm_execute.h. The first file is a list of opcode definitions. It is
 included from zend_compile.h. The second one is an executor code itself. It is
 included from zend_execute.c.
 
-zend_vm_gen.php can produce different kind of executors. You can select 
-different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can 
+zend_vm_gen.php can produce different kind of executors. You can select
+different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can
 disable opcode specialization using --without-specializer. You can include or
 exclude old executor together with specialized one using --without-old-executor.
 At last you can debug executor using original zend_vm_def.h or generated file
@@ -105,4 +105,3 @@ Zend Engine II currently includes two executors during the build process, one
 is the specialized version and the other is the old one non-specialized with
 function handlers. By default Zend Engine II uses the specialized one but you
 can switch to the old executor at runtime by calling zend_vm_use_old_executor().
-

Zend/Zend.m4

@@ -7,10 +7,10 @@ dnl
 AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[
 AC_MSG_CHECKING(for $1)
 AC_TRY_COMPILE([
-#if HAVE_SYS_TYPES_H  
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#if HAVE_INTTYPES_H  
+#if HAVE_INTTYPES_H
 #include <inttypes.h>
 #elif HAVE_STDINT_H
 #include <stdint.h>
@@ -137,7 +137,7 @@ int main()
 ], [
   AC_MSG_RESULT(no)
 ])
-	
+
 ])
 
 AC_DEFUN([LIBZEND_ENABLE_DEBUG],[
@@ -147,7 +147,7 @@ AC_ARG_ENABLE(debug,
   ZEND_DEBUG=$enableval
 ],[
   ZEND_DEBUG=no
-])  
+])
 
 ])
 
@@ -158,10 +158,10 @@ AC_ARG_ENABLE(maintainer-zts,
   ZEND_MAINTAINER_ZTS=$enableval
 ],[
   ZEND_MAINTAINER_ZTS=no
-])  
+])
 
 AC_ARG_ENABLE(inline-optimization,
-[  --disable-inline-optimization 
+[  --disable-inline-optimization
                           If building zend_execute.lo fails, try this switch],[
   ZEND_INLINE_OPTIMIZATION=$enableval
 ],[
@@ -196,7 +196,7 @@ if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
   AC_DEFINE(ZTS,1,[ ])
   CFLAGS="$CFLAGS -DZTS"
   LIBZEND_CPLUSPLUS_CHECKS
-fi  
+fi
 
 changequote({,})
 if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
@@ -249,7 +249,7 @@ int main()
   }
 
   fp = fopen("conftest.zend", "w");
-  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);  
+  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);
   fclose(fp);
 
   exit(0);
@@ -258,7 +258,7 @@ int main()
   LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
   LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
   AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ])
-  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ]) 
+  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ])
 ], [], [
   dnl cross-compile needs something here
   LIBZEND_MM_ALIGN=8
@@ -374,7 +374,7 @@ AC_ARG_ENABLE(zend-signals,
   ZEND_SIGNALS=$enableval
 ],[
   ZEND_SIGNALS=yes
-])  
+])
 
 AC_CHECK_FUNC(sigaction, [
 	AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available])
@@ -395,24 +395,24 @@ AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
 
 ])
 
-AC_MSG_CHECKING(whether /dev/urandom exists) 
-if test -r "/dev/urandom" && test -c "/dev/urandom"; then 
+AC_MSG_CHECKING(whether /dev/urandom exists)
+if test -r "/dev/urandom" && test -c "/dev/urandom"; then
   AC_DEFINE([HAVE_DEV_URANDOM], 1, [Define if the target system has /dev/urandom device])
-  AC_MSG_RESULT(yes) 
-else 
-  AC_MSG_RESULT(no) 
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
 fi
 
-AC_MSG_CHECKING(whether /dev/arandom exists) 
-if test -r "/dev/arandom" && test -c "/dev/arandom"; then 
+AC_MSG_CHECKING(whether /dev/arandom exists)
+if test -r "/dev/arandom" && test -c "/dev/arandom"; then
   AC_DEFINE([HAVE_DEV_ARANDOM], 1, [Define if the target system has /dev/arandom device])
-  AC_MSG_RESULT(yes) 
-else 
-  AC_MSG_RESULT(no) 
-fi 
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
 
 AC_ARG_ENABLE(gcc-global-regs,
-[  --disable-gcc-global-regs 
+[  --disable-gcc-global-regs
                           whether to enable GCC global register variables],[
   ZEND_GCC_GLOBAL_REGS=$enableval
 ],[

Zend/acinclude.m4

@@ -7,7 +7,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
   # min: 2.4 (i.e. 204, major * 100 + minor for easier comparison)
   bison_version_min="204"
   # non-working versions, e.g. "3.0 3.2";
-  # remove "none" when introducing the first incompatible bison version an 
+  # remove "none" when introducing the first incompatible bison version an
   # separate any following additions by spaces
   bison_version_exclude=""
 
@@ -139,7 +139,7 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
   else
     AC_MSG_RESULT(no)
   fi
-  
+
   AC_MSG_CHECKING([for usable fpsetprec])
   AC_TRY_LINK([
     #include <machine/ieeefp.h>

Zend/bench.php

@@ -5,18 +5,18 @@ if (function_exists("date_default_timezone_set")) {
 
 function simple() {
   $a = 0;
-  for ($i = 0; $i < 1000000; $i++) 
+  for ($i = 0; $i < 1000000; $i++)
     $a++;
 
   $thisisanotherlongname = 0;
-  for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++) 
+  for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++)
     $thisisanotherlongname++;
 }
 
 /****/
 
 function simplecall() {
-  for ($i = 0; $i < 1000000; $i++) 
+  for ($i = 0; $i < 1000000; $i++)
     strlen("hallo");
 }
 
@@ -26,14 +26,14 @@ function hallo($a) {
 }
 
 function simpleucall() {
-  for ($i = 0; $i < 1000000; $i++) 
+  for ($i = 0; $i < 1000000; $i++)
     hallo("hallo");
 }
 
 /****/
 
 function simpleudcall() {
-  for ($i = 0; $i < 1000000; $i++) 
+  for ($i = 0; $i < 1000000; $i++)
     hallo2("hallo");
 }
 

Zend/build.mk

@@ -5,7 +5,7 @@
 #
 # Written by Sascha Schumann
 #
-# $Id$ 
+# $Id$
 
 
 LT_TARGETS = ltmain.sh ltconfig
@@ -34,7 +34,7 @@ aclocal.m4: configure.ac acinclude.m4
 	aclocal
 
 $(config_h_in): configure.ac
-# explicitly remove target since autoheader does not seem to work 
+# explicitly remove target since autoheader does not seem to work
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
 	autoheader

Zend/buildconf

@@ -30,4 +30,3 @@ if cmp configure.old configure > /dev/null 2>&1; then
 else
     echo "buildconf: created or modified ${1}configure"
 fi
-

Zend/configure.ac

@@ -60,7 +60,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #include <math.h>
 
 #ifndef zend_isnan
-#if HAVE_DECL_ISNAN
+#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
 #define zend_isnan(a) isnan(a)
 #elif defined(HAVE_FPCLASS)
 #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
@@ -69,7 +69,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #endif
 #endif
 
-#if HAVE_DECL_ISINF
+#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
 #define zend_isinf(a) isinf(a)
 #elif defined(INFINITY)
 /* Might not work, but is required by ISO C99 */
@@ -80,7 +80,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #define zend_isinf(a) 0
 #endif
 
-#if HAVE_DECL_ISFINITE
+#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
 #define zend_finite(a) isfinite(a)
 #elif defined(HAVE_FINITE)
 #define zend_finite(a) finite(a)

Zend/micro_bench.php

@@ -4,12 +4,12 @@ function hallo() {
 }
 
 function simpleucall($n) {
-  for ($i = 0; $i < $n; $i++) 
+  for ($i = 0; $i < $n; $i++)
     hallo();
 }
 
 function simpleudcall($n) {
-  for ($i = 0; $i < $n; $i++) 
+  for ($i = 0; $i < $n; $i++)
     hallo2();
 }
 
@@ -17,7 +17,7 @@ function hallo2() {
 }
 
 function simpleicall($n) {
-  for ($i = 0; $i < $n; $i++) 
+  for ($i = 0; $i < $n; $i++)
     func_num_args();
 }
 

Zend/tests/001.phpt

@@ -44,7 +44,7 @@ var_dump(func_num_args());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(0)
 int(1)
 Exception: Too few arguments to function test2(), 0 passed in %s001.php on line 18 and exactly 1 expected

Zend/tests/002.phpt

@@ -50,7 +50,7 @@ var_dump(func_get_arg(1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
 bool(false)
 

Zend/tests/003.phpt

@@ -44,7 +44,7 @@ var_dump(func_get_args());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(0) {
 }
 array(1) {

Zend/tests/004.phpt

@@ -12,7 +12,7 @@ var_dump(strncmp("qwerty", "qwerty123", 7));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: strncmp() expects exactly 3 parameters, 2 given in %s on line %d
 NULL
 int(0)

Zend/tests/005.phpt

@@ -14,7 +14,7 @@ var_dump(strcasecmp("01", "01"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: strcasecmp() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 int(0)

Zend/tests/006.phpt

@@ -15,7 +15,7 @@ var_dump(strncasecmp("01", "01", 1000));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: strncasecmp() expects exactly 3 parameters, 1 given in %s on line %d
 NULL
 

Zend/tests/007.phpt

@@ -21,7 +21,7 @@ var_dump(each($a));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: each() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 

Zend/tests/008.phpt

@@ -22,7 +22,7 @@ var_dump(constant("test const"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: define() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 

Zend/tests/009.phpt

@@ -35,7 +35,7 @@ $f1->testNull();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Deprecated: Non-static method foo::bar() should not be called statically in %s on line %d
 string(3) "foo"
 

Zend/tests/010.phpt

@@ -41,7 +41,7 @@ var_dump(get_parent_class(1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(false)
 bool(false)
 string(3) "foo"

Zend/tests/011.phpt

@@ -52,7 +52,7 @@ $bar->test();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: property_exists() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 

Zend/tests/012.phpt

@@ -18,7 +18,7 @@ var_dump(class_exists("stdClass"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: class_exists() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 bool(false)

Zend/tests/013.phpt

@@ -18,7 +18,7 @@ var_dump(interface_exists("stdClass"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: interface_exists() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 bool(false)

Zend/tests/014.phpt

@@ -20,7 +20,7 @@ var_dump(get_included_files());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(1) {
   [0]=>
   string(%d) "%s"

Zend/tests/015.phpt

@@ -13,7 +13,7 @@ var_dump(trigger_error("error", E_USER_DEPRECATED));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: trigger_error() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 

Zend/tests/016.phpt

@@ -3,10 +3,10 @@ isset() with object properties when operating on non-object
 --FILE--
 <?php
 
-$foo = NULL; 
+$foo = NULL;
 isset($foo->bar->bar);
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 Done

Zend/tests/017.phpt

@@ -43,7 +43,7 @@ var_dump(count(get_extension_funcs("zend")));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: get_resource_type() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 

Zend/tests/018.phpt

@@ -17,7 +17,7 @@ var_dump(constant("TEST_CONST2"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: constant() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 

Zend/tests/019.phpt

@@ -16,7 +16,7 @@ echo "*** Testing unset(), empty() & isset() with scalar variables ***\n";
 
 // testing scalar variables
 $scalar_variables = array(
-  0,    
+  0,
   1,
   +1
   -1,
@@ -52,23 +52,23 @@ foreach ($scalar_variables as $scalar_var) {
   echo "-- Iteration $loop_counter --\n"; $loop_counter++;
 
   // checking with isset before unsetting, expected: bool(true)
-  var_dump( isset($scalar_var) ); 
-  var_dump( isset($scalar_var, $set_var) );  
+  var_dump( isset($scalar_var) );
+  var_dump( isset($scalar_var, $set_var) );
   // checking if the var is empty, expected: bool(false) on most
   // except "", 0, "0", NULL, FALSE
-  var_dump( empty($scalar_var) );  
-  
+  var_dump( empty($scalar_var) );
+
   // destroy the variable using unset
-  unset( $scalar_var );   
-  // dump and see if its destroyed, expcted: NULL 
-  var_dump( $scalar_var ); 
+  unset( $scalar_var );
+  // dump and see if its destroyed, expcted: NULL
+  var_dump( $scalar_var );
 
   // check using isset to see if unset, expected: bool(false)
-  var_dump( isset($scalar_var) ); 
-  var_dump( isset($scalar_var, $set_var) ); 
+  var_dump( isset($scalar_var) );
+  var_dump( isset($scalar_var, $set_var) );
 
   // empty to check if empty, expecting bool(true)
-  var_dump( empty($scalar_var) ); 
+  var_dump( empty($scalar_var) );
 
   // isset() with two args, one arg only unset, expected: bool(false)
   var_dump( isset($scalar_var, $set_var) );
@@ -90,36 +90,36 @@ $array_variables = array(
   array(1 => "One", 2 => "two"),
   array("Name" => "Jack", "Age" => "30"),
   array(1,2, "One" => "1", 2 => "two", ""=>"empty", "" => '')
-);  
+);
 
 $outer_loop_counter = 1;
 foreach ($array_variables as $array_var) {
   echo "--- Outerloop Iteration $outer_loop_counter ---\n";
-  
+
   // check the isset and unset on non existing key
   $var = 1;  // a var which is defined
   // try to unset the element which is non-existent
-  unset($array_var['non_existent']); 
+  unset($array_var['non_existent']);
   // check using isset() & empty() on a non_existent element in the array
   var_dump( isset($array_var['non_existent']) );
   var_dump( isset($array_var['non_existent'], $var) );
   var_dump( isset($array_var['non_existent'], $array_var['none']) );
   var_dump( empty($array_var['non_existent']) );
 
-  // testing empty and isset on arrays 
+  // testing empty and isset on arrays
   var_dump( empty($array_var) ); // expecting bool(false), except: array(), which is considered empty
   var_dump( isset($array_var) ); // expecting bool(true), except: array(), which is not set
 
-  // get the keys of the $array_var 
+  // get the keys of the $array_var
   $keys = array_keys($array_var);
   // unset each element in the array and see the working of unset, isset & empty
   $inner_loop_counter = 1;
   foreach ($keys as $key_value) {
-    echo "-- Innerloop Iteration $inner_loop_counter of Outerloop Iteration $outer_loop_counter --\n"; 
+    echo "-- Innerloop Iteration $inner_loop_counter of Outerloop Iteration $outer_loop_counter --\n";
     $inner_loop_counter++;
 
     // unset the element
-    unset($array_var[$key_value]); 
+    unset($array_var[$key_value]);
     // dump the array after element was unset
     var_dump($array_var);
     // check using isset for the element that was unset
@@ -127,10 +127,10 @@ foreach ($array_variables as $array_var) {
     // calling isset with more args
     var_dump( isset($array_var[$key_val], $array_var) ); //expected: bool(false)
 
-    // calling empty, expected bool(true) 
+    // calling empty, expected bool(true)
     var_dump( empty($array_var[$key_val]) );
 
-    // dump the array to see that that array did not get modified 
+    // dump the array to see that that array did not get modified
     // because of using isset, empty and unset on its element
     var_dump($array_var);
   }
@@ -144,7 +144,7 @@ foreach ($array_variables as $array_var) {
   // use isset to see that array is not set
   var_dump( isset($array_var) ); //expected: bool(false)
   var_dump( isset($array_var, $array_var[$key_val]) ); // expected: bool(false)
-  
+
   // empty() to see if the array is empty
   var_dump( empty($array_var) ); // expected: bool(true)
 }
@@ -183,12 +183,12 @@ foreach ($resources as $resource) {
   unset($temp_var);
   // now the isset() with both the args as unset
   var_dump( isset($resource, $temp_var) ); // expected: bool(false);
-  
-  // dump the resource to see if there any effect on it 
+
+  // dump the resource to see if there any effect on it
   var_dump($resource);
 }
 // unset and dump the array containing all the resources to see that
-// unset works correctly 
+// unset works correctly
 unset($resources);
 var_dump($resources);
 var_dump( isset($resources) );  //expected: bool(false)
@@ -200,12 +200,12 @@ class Point
   var $x;
   var $y;
   var $lable;
-  
+
   function __construct($x, $y) {
     $this->x = $x;
     $this->y = $y;
   }
-  
+
   function setLable($lable) {
     $this->lable = $lable;
   }
@@ -215,8 +215,8 @@ class Point
 }
 $point1 = new Point(30,40);
 
-// use unset/empty/isset to check the object 
-var_dump($point1); // dump the object 
+// use unset/empty/isset to check the object
+var_dump($point1); // dump the object
 
 // check the object and member that is not set
 var_dump( isset($point1) );  // expected: bool(true)
@@ -229,7 +229,7 @@ $point1->setLable("Point1");
 var_dump( isset($point1->$lable) );  //expected: bool(true)
 var_dump( empty($point1->$lable) );  //expected: bool(false)
 
-// dump the object to see that obj was not harmed 
+// dump the object to see that obj was not harmed
 // because of the usage of the isset & empty
 var_dump($point1);
 
@@ -270,36 +270,36 @@ var_dump($point2);
 
 /* testing variation in operation for isset(), empty() & unset().
 Note: Most of the variation for function unset() is testing by a
-      set of testcases named "Zend/tests/unset_cv??.phpt", only 
+      set of testcases named "Zend/tests/unset_cv??.phpt", only
       variation not tested are attempted here */
 
 echo "\n*** Testing possible variation in operation for isset(), empty() & unset() ***\n";
-/* unset() variation1: checking unset on static variable inside a function. 
+/* unset() variation1: checking unset on static variable inside a function.
  * unset() destroys the variable only in the context of the rest of a function
  * Following calls will restore the previous value of a variable.
  */
 echo "\n** Testing unset() variation 1: unset on static variable inside a function **\n";
 function test_unset1() {
   static $static_var;
-  
+
   // increment the value of the static. this change is in function context
   $static_var ++;
- 
-  echo "value of static_var before unset: $static_var\n"; 
-  // check using isset and empty 
+
+  echo "value of static_var before unset: $static_var\n";
+  // check using isset and empty
   var_dump( isset($static_var) );
   var_dump( empty($static_var) );
-  
+
   // unset the static var
   unset($static_var);
-  echo "value of static_var after unset: $static_var\n"; 
-  // check using isset and empty 
+  echo "value of static_var after unset: $static_var\n";
+  // check using isset and empty
   var_dump( isset($static_var) );
   var_dump( empty($static_var) );
 
   // assign a value to static var
   $static_var = 20;
-  echo "value of static_var after new assignment: $static_var\n"; 
+  echo "value of static_var after new assignment: $static_var\n";
 }
 // call the functiont
 test_unset1();
@@ -308,10 +308,10 @@ test_unset1();
 
 
 echo "\n** Testing unset() variation 2: unset on a variable passed by ref. inside of a function **\n";
-/* unset() variation2: Pass by reference  
- * If a variable that is PASSED BY REFERENCE is unset() inside of a function, 
+/* unset() variation2: Pass by reference
+ * If a variable that is PASSED BY REFERENCE is unset() inside of a function,
  * only the local variable is destroyed. The variable in the calling environment
- * will retain the same value as before unset()  was called. 
+ * will retain the same value as before unset()  was called.
  */
 function test_unset2( &$ref_val ) {
   // unset the variable passed
@@ -329,7 +329,7 @@ var_dump($value);
 test_unset2($value);
 var_dump($value);
 
- 
+
 echo "\n** Testing unset() variation 3: unset on a global variable inside of a function **\n";
 /* unset() variation2: unset on a global variable inside a function
  * If a globalized variable is unset() inside of a function, only the
@@ -340,17 +340,17 @@ $global_var = 10;
 
 function test_unset3() {
   global $global_var;
-   
-  // check the $global_var using isset and empty 
-  var_dump( isset($global_var) ); 
-  var_dump( empty($global_var) ); 
- 
+
+  // check the $global_var using isset and empty
+  var_dump( isset($global_var) );
+  var_dump( empty($global_var) );
+
   // unset the global var
   unset($global_var);
- 
-  // check the $global_var using isset and empty 
-  var_dump( isset($global_var) ); 
-  var_dump( empty($global_var) ); 
+
+  // check the $global_var using isset and empty
+  var_dump( isset($global_var) );
+  var_dump( empty($global_var) );
 }
 
 var_dump($global_var);

Zend/tests/020.phpt

@@ -19,7 +19,7 @@ foo(1,2);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: func_get_arg() expects exactly 1 parameter, 3 given in %s on line %d
 NULL
 

Zend/tests/024.phpt

@@ -37,15 +37,15 @@ NULL
 Notice: Undefined variable: b in %s on line %d
 int(1)
 
-Notice: Trying to get property of non-object in %s on line %d
+Notice: Trying to get property '1' of non-object in %s on line %d
 NULL
 
-Notice: Trying to get property of non-object in %s on line %d
+Notice: Trying to get property '1' of non-object in %s on line %d
 NULL
 
 Notice: Undefined variable: c in %s on line %d
 
-Notice: Trying to get property of non-object in %s on line %d
+Notice: Trying to get property '1' of non-object in %s on line %d
 
-Notice: Trying to get property of non-object in %s on line %d
+Notice: Trying to get property '' of non-object in %s on line %d
 NULL

Zend/tests/026.phpt

@@ -18,7 +18,7 @@ print "ok\n";
 
 ?>
 --EXPECTF--
-Notice: Trying to get property of non-object in %s on line %d
+Notice: Trying to get property 'a' of non-object in %s on line %d
 ok
 
 Warning: Creating default object from empty value in %s on line %d

Zend/tests/030.phpt

@@ -7,7 +7,7 @@ class foo {
 	public $test = 0;
 	private $test_2 = 1;
 	protected $test_3 = 2;
-	
+
 	public function bar() {
 		try {
 			throw new Exception('foo');
@@ -15,13 +15,13 @@ class foo {
 			var_dump($this);
 		}
 
-		$this->baz();		
+		$this->baz();
 	}
-	
+
 	public function baz() {
 		foreach ($this as $k => $v) {
 			printf("'%s' => '%s'\n", $k, $v);
-		}		
+		}
 		print "ok\n";
 	}
 }

Zend/tests/031.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Testing array with '[]' passed as argument by value
 --FILE--
-<?php 
+<?php
 
 function test($var) { }
 test($arr[]);

Zend/tests/032.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Testing array with '[]' passed as argument by reference
 --FILE--
-<?php 
+<?php
 
 function test(&$var) { }
 test($arr[]);

Zend/tests/033.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Using undefined multidimensional array
 --FILE--
-<?php 
+<?php
 
 $arr[1][2][3][4][5];
 
@@ -17,14 +17,13 @@ $arr[][]->bar = 2;
 
 ?>
 --EXPECTF--
-
 Notice: Undefined variable: arr in %s on line %d
 
 Notice: Undefined variable: arr in %s on line %d
 
 Notice: Undefined variable: arr in %s on line %d
 
-Notice: Trying to get property of non-object in %s on line %d
+Notice: Trying to get property 'foo' of non-object in %s on line %d
 
 Warning: Creating default object from empty value in %s on line %d
 

Zend/tests/034.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Testing multiples 'default:' in switch
 --FILE--
-<?php 
+<?php
 
 switch (1) {
 	case 2:

Zend/tests/ErrorException_getSeverity.phpt

@@ -649,7 +649,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -665,7 +665,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -681,7 +681,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 
@@ -698,7 +698,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -714,7 +714,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -730,7 +730,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -746,7 +746,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -762,7 +762,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -778,7 +778,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -794,7 +794,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -810,7 +810,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -826,7 +826,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -842,7 +842,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -858,7 +858,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 ?>

Zend/tests/abstract-static.phpt

@@ -9,5 +9,4 @@ abstract class TestClass
 ?>
 ===DONE===
 --EXPECTF--
-
 ===DONE===

Zend/tests/abstract_inheritance_001.phpt

@@ -8,5 +8,5 @@ abstract class B extends A { abstract function bar($x); }
 
 echo "DONE";
 ?>
---EXPECT--	
+--EXPECT--
 DONE

Zend/tests/abstract_inheritance_002.phpt

@@ -8,5 +8,5 @@ abstract class B extends A { abstract function bar($x, $y = 0); }
 
 echo "DONE";
 ?>
---EXPECT--	
+--EXPECT--
 DONE

Zend/tests/abstract_inheritance_003.phpt

@@ -8,5 +8,5 @@ abstract class B extends A { abstract function bar($x); }
 
 echo "DONE";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Declaration of B::bar($x) must be compatible with A::bar($x, $y = 0) in %s

Zend/tests/access_modifiers_001.phpt

@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple access type modifiers are not allowed in %s on line %d

Zend/tests/access_modifiers_002.phpt

@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple access type modifiers are not allowed in %s on line %d

Zend/tests/access_modifiers_003.phpt

@@ -9,5 +9,5 @@ final final class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple final modifiers are not allowed in %s on line %d

Zend/tests/access_modifiers_004.phpt

@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple abstract modifiers are not allowed in %s on line %d

Zend/tests/access_modifiers_005.phpt

@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple final modifiers are not allowed in %s on line %d

Zend/tests/access_modifiers_006.phpt

@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple static modifiers are not allowed in %s on line %d

Zend/tests/access_modifiers_007.phpt

@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use the final modifier on an abstract class member in %s on line %d

Zend/tests/access_modifiers_010.phpt

@@ -21,7 +21,7 @@ abstract class b extends a {
 class c extends b {
 	public function __construct() {
 		$this->test();
-	}	
+	}
 }
 
 new c;

Zend/tests/access_modifiers_011.phpt

@@ -32,7 +32,7 @@ echo $a->func1(),"\n";
 echo $a->func2(),"\n";
 
 ?>
---EXPECTF--	
+--EXPECTF--
 var1 value
 var2 value
 in func1

Zend/tests/add_001.phpt

@@ -29,7 +29,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {
   [0]=>
   int(1)

Zend/tests/add_002.phpt

@@ -19,7 +19,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Object of class stdClass could not be converted to int in %sadd_002.php on line %d
 
 Exception: Unsupported operand types

Zend/tests/add_003.phpt

@@ -1,5 +1,5 @@
 --TEST--
-adding arrays to objects 
+adding arrays to objects
 --FILE--
 <?php
 
@@ -19,7 +19,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Object of class stdClass could not be converted to int in %sadd_003.php on line %d
 
 Exception: Unsupported operand types

Zend/tests/add_004.phpt

@@ -16,7 +16,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Exception: Unsupported operand types
 
 Fatal error: Uncaught Error: Unsupported operand types in %s:%d

Zend/tests/add_005.phpt

@@ -16,7 +16,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(2834756759.1231)
 float(2834756759.1231)
 Done

Zend/tests/add_006.phpt

@@ -37,8 +37,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
-
+--EXPECTF--
 Warning: A non-numeric value encountered in %s on line %d
 int(75636)