Regenerate certificates for openssl tests

Fix null pointer deref in qprint-encode filter (bug #77231 )
Fix bug #77022 - use file mode or umask for new files
2026-11-12 03:30:50 +00:00 · 2018-12-04 12:43:47 -05:00 · 2018-12-04 10:43:38 -05:00 · 2018-12-04 10:43:38 -05:00 · 2018-12-04 10:43:37 -05:00 · 2018-11-24 13:27:28 -05:00
10024 changed files with 310254 additions and 305656 deletions
@@ -1,4 +1,3 @@
-
 version: "{branch}.build.{build}"

 image: Visual Studio 2017
@@ -8,22 +7,16 @@ branches:
                - PHP-5.6
                - PHP-7.0

-skip_commits:
-        files:
-                - NEWS
-                - UPGRADING*
-                - README.*
-
 clone_depth: 64

 cache:
        - c:\build-cache

 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.13
+        PHP_BUILD_SDK_BRANCH: php-sdk-2.1.9beta1
        PHP_BUILD_CRT: vc15
        # ext and env setup for tests
        #MYSQL_TEST_PASSWD: Password12!
@@ -54,4 +47,3 @@ build_script:

 test_script:
        - appveyor\test.bat
-
@@ -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
@@ -26,7 +26,6 @@
 *.tar.xz.asc
 .FBCIndex
 .FBCLockFolder
-.deps
 .libs
 phpt.*
 core
@@ -191,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
@@ -231,4 +231,3 @@ win32/wsyslog.h
 # special cases to invert previous ignore rules
 !ext/fileinfo/libmagic.patch
 !ext/mbstring/oniguruma.patch
-
@@ -1,6 +1,6 @@
 dist: trusty
 language: c
-sudo: false
+sudo: required
 addons:
  apt:
    packages:
@@ -19,7 +19,7 @@ addons:
      - libt1-dev

 notifications:
-    email: 
+    email:
       on_failure: change
    irc:
      template:
@@ -50,6 +50,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
@@ -59,7 +61,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

@@ -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'
@@ -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
@@ -1,7 +1,7 @@
-------------------------------------------------------------------- 
+--------------------------------------------------------------------
                  The PHP License, version 3.01
 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
@@ -1,4 +1,3 @@
-
 #
 # Zend
 #
@@ -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 $@

@@ -121,7 +121,7 @@ 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 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
@@ -1,6 +1,527 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 7.2.2
+06 Dec 2018, PHP 7.2.13
+
+- ftp:
+  . Fixed bug #77151 (ftp_close(): SSL_read on shutdown). (Remi)
+
+- CLI:
+  . Fixed bug #77111 (php-win.exe corrupts unicode symbols from cli
+    parameters). (Anatol)
+
+- Fileinfo:
+  . Fixed bug #77095 (slowness regression in 7.2/7.3 (compared to 7.1)).
+    (Anatol)
+
+- iconv:
+  . Fixed bug #77147 (Fixing 60494 ignored ICONV_MIME_DECODE_CONTINUE_ON_ERROR).
+    (cmb)
+
+- Core:
+  . Fixed bug #77231 (Segfault when using convert.quoted-printable-encode 
+    filter). (Stas)
+
+- IMAP:
+  . Fixed bug #77153 (imap_open allows to run arbitrary shell commands via
+    mailbox parameter). (Stas)
+
+- ODBC:
+  . Fixed bug #77079 (odbc_fetch_object has incorrect type signature).
+    (Jon Allen)
+
+- Opcache:
+  . Fixed bug #77058 (Type inference in opcache causes side effects). (Nikita)
+  . Fixed bug #77092 (array_diff_key() - segmentation fault). (Nikita)
+
+- Phar:
+  . Fixed bug #77022 (PharData always creates new files with mode 0666). (Stas)
+  . Fixed bug #77143 (Heap Buffer Overflow (READ: 4) in phar_parse_pharfile).
+    (Stas)
+
+- PGSQL:
+  . Fixed bug #77047 (pg_convert has a broken regex for the 'TIME WITHOUT
+    TIMEZONE' data type). (Andy Gajetzki)
+
+- SOAP:
+  . Fixed bug #50675 (SoapClient can't handle object references correctly).
+    (Cameron Porter)
+  . Fixed bug #76348 (WSDL_CACHE_MEMORY causes Segmentation fault). (cmb)
+  . Fixed bug #77141 (Signedness issue in SOAP when precision=-1). (cmb)
+
+- Sockets:
+  . Fixed bug #67619 (Validate length on socket_write). (thiagooak)
+
+08 Nov 2018, PHP 7.2.12
+
+- Core:
+  . Fixed bug #76846 (Segfault in shutdown function after memory limit error).
+    (Nikita)
+  . Fixed bug #76946 (Cyclic reference in generator not detected). (Nikita)
+  . Fixed bug #77035 (The phpize and ./configure create redundant .deps file).
+    (Peter Kokot)
+  . Fixed bug #77041 (buildconf should output error messages to stderr)
+    (Mizunashi Mana)
+
+- Date:
+  . Upgraded timelib to 2017.08. (Derick)
+  . Fixed bug #75851 (Year component overflow with date formats "c", "o", "r"
+    and "y"). (Adam Saponara)
+  . Fixed bug #77007 (fractions in `diff()` are not correctly normalized).
+    (Derick)
+
+- FCGI:
+  . Fixed #76948 (Failed shutdown/reboot or end session in Windows). (Anatol)
+  . Fixed bug #76954 (apache_response_headers removes last character from header
+    name). (stodorovic)
+
+- FTP:
+  . Fixed bug #76972 (Data truncation due to forceful ssl socket shutdown).
+    (Manuel Mausz)
+
+- intl:
+  . Fixed bug #76942 (U_ARGUMENT_TYPE_MISMATCH). (anthrax at unixuser dot org)
+
+- Reflection:
+  . Fixed bug #76936 (Objects cannot access their private attributes while
+    handling reflection errors). (Nikita)
+  . Fixed bug #66430 (ReflectionFunction::invoke does not invoke closure with
+    object scope). (Nikita)
+
+- Sodium:
+  . Some base64 outputs were truncated; this is not the case any more.
+    (jedisct1)
+  . block sizes >= 256 bytes are now supposed by sodium_pad() even
+    when an old version of libsodium has been installed. (jedisct1)
+  . Fixed bug #77008 (sodium_pad() could read (but not return nor write)
+    uninitialized memory when trying to pad an empty input). (jedisct1)
+
+- Standard:
+  . Fixed bug #76965 (INI_SCANNER_RAW doesn't strip trailing whitespace).
+    (Pierrick)
+
+- Tidy:
+  . Fixed bug #77027 (tidy::getOptDoc() not available on Windows). (cmb)
+
+- XML:
+  . Fixed bug #30875 (xml_parse_into_struct() does not resolve entities). (cmb)
+  . Add support for getting SKIP_TAGSTART and SKIP_WHITE options. (cmb)
+
+- XMLRPC:
+  . Fixed bug #75282 (xmlrpc_encode_request() crashes). (cmb)
+
+11 Oct 2018, PHP 7.2.11
+
+- Core:
+  . Fixed bug #76800 (foreach inconsistent if array modified during loop).
+    (Dmitry)
+  . Fixed bug #76901 (method_exists on SPL iterator passthrough method corrupts
+    memory). (Nikita)
+
+- CURL:
+  . Fixed bug #76480 (Use curl_multi_wait() so that timeouts are respected).
+    (Pierrick)
+
+- iconv:
+  . Fixed bug #66828 (iconv_mime_encode Q-encoding longer than it should be).
+    (cmb)
+
+- Opcache:
+  . Fixed bug #76832 (ZendOPcache.MemoryBase periodically deleted by the OS).
+    (Anatol)
+  . Fixed bug #76796 (Compile-time evaluation of disabled function in opcache
+    causes segfault). (Nikita)
+
+- POSIX:
+  . Fixed bug #75696 (posix_getgrnam fails to print details of group). (cmb)
+
+- Reflection:
+  . Fixed bug #74454 (Wrong exception being thrown when using ReflectionMethod).
+    (cmb)
+
+- Standard:
+  . Fixed bug #73457 (Wrong error message when fopen FTP wrapped fails to open
+    data connection). (Ville Hukkamäki)
+  . Fixed bug #74764 (Bindto IPv6 works with file_get_contents but fails with
+    stream_socket_client). (Ville Hukkamäki)
+  . Fixed bug #75533 (array_reduce is slow when $carry is large array).
+    (Manabu Matsui)
+
+- XMLRPC:
+  . Fixed bug #76886 (Can't build xmlrpc with expat). (Thomas Petazzoni, cmb)
+
+- Zlib:
+  . Fixed bug #75273 (php_zlib_inflate_filter() may not update bytes_consumed).
+    (Martin Burke, cmb)
+
+13 Sep 2018, PHP 7.2.10
+
+- Core:
+  . Fixed bug #76754 (parent private constant in extends class memory leak).
+    (Laruence)
+  . Fixed bug #72443 (Generate enabled extension). (petk)
+  . Fixed bug #75797 (Memory leak when using class_alias() in non-debug mode).
+    (Massimiliano Braglia)
+
+- Apache2:
+  . Fixed bug #76582 (Apache bucket brigade sometimes becomes invalid). (stas)
+
+- Bz2:
+  . Fixed arginfo for bzcompress. (Tyson Andre)
+
+- gettext:
+  . Fixed bug #76517 (incorrect restoring of LDFLAGS). (sji)
+
+- iconv:
+  . Fixed bug #68180 (iconv_mime_decode can return extra characters in a
+    header). (cmb)
+  . Fixed bug #63839 (iconv_mime_decode_headers function is skipping headers).
+    (cmb)
+  . Fixed bug #60494 (iconv_mime_decode does ignore special characters). (cmb)
+  . Fixed bug #55146 (iconv_mime_decode_headers() skips some headers). (cmb)
+
+- intl:
+  . Fixed bug #74484 (MessageFormatter::formatMessage memory corruption with
+    11+ named placeholders). (Anatol)
+
+- libxml:
+  . Fixed bug #76777 ("public id" parameter of libxml_set_external_entity_loader
+    callback undefined). (Ville Hukkamäki)
+
+- mbstring:
+  . Fixed bug #76704 (mb_detect_order return value varies based on argument
+    type). (cmb)
+
+- Opcache:
+  . Fixed bug #76747 (Opcache treats path containing "test.pharma.tld" as a phar
+    file). (Laruence)
+
+- OpenSSL:
+  . Fixed bug #76705 (unusable ssl => peer_fingerprint in
+    stream_context_create()). (Jakub Zelenka)
+
+- phpdbg:
+  . Fixed bug #76595 (phpdbg man page contains outdated information).
+    (Kevin Abel)
+
+- SPL:
+  . Fixed bug #68825 (Exception in DirectoryIterator::getLinkTarget()). (cmb)
+  . Fixed bug #68175 (RegexIterator pregFlags are NULL instead of 0). (Tim
+    Siebels)
+
+- Standard:
+  . Fixed bug #76778 (array_reduce leaks memory if callback throws exception).
+    (cmb)
+
+- zlib:
+  . Fixed bug #65988 (Zlib version check fails when an include/zlib/ style dir
+    is passed to the --with-zlib configure option). (Jay Bonci)
+  . Fixed bug #76709 (Minimal required zlib library is 1.2.0.4). (petk)
+
+16 Aug 2018, PHP 7.2.9
+
+- Calendar:
+  . Fixed bug #52974 (jewish.c: compile error under Windows with GBK charset).
+    (cmb)
+
+- Filter:
+  . Fixed bug #76366 (References in sub-array for filtering breaks the filter).
+    (ZiHang Gao)
+
+- PDO_Firebird:
+  . Fixed bug #76488 (Memory leak when fetching a BLOB field). (Simonov Denis)
+
+- PDO_PgSQL:
+  . Fixed bug #75402 (Possible Memory Leak using PDO::CURSOR_SCROLL option).
+    (Anatol)
+
+- SQLite3:
+  . Fixed #76665 (SQLite3Stmt::bindValue() with SQLITE3_FLOAT doesn't juggle).
+    (cmb)
+
+- Standard:
+  . Fixed bug #73817 (Incorrect entries in get_html_translation_table). (cmb)
+  . Fixed bug #68553 (array_column: null values in $index_key become incrementing
+    keys in result). (Laruence)
+  . Fixed bug #76643 (Segmentation fault when using `output_add_rewrite_var`).
+    (cmb)
+
+- Zip:
+  . Fixed bug #76524 (ZipArchive memory leak (OVERWRITE flag and empty archive)).
+    (Timur Ibragimov)
+
+19 Jul 2018, PHP 7.2.8
+
+- Core:
+  . Fixed bug #76534 (PHP hangs on 'illegal string offset on string references
+    with an error handler). (Laruence)
+  . Fixed bug #76520 (Object creation leaks memory when executed over HTTP).
+    (Nikita)
+  . Fixed bug #76502 (Chain of mixed exceptions and errors does not serialize
+    properly). (Nikita)
+
+- Date:
+  . Fixed bug #76462 (Undefined property: DateInterval::$f). (Anatol)
+
+- EXIF:
+  . Fixed bug #76409 (heap use after free in _php_stream_free). (cmb)
+  . Fixed bug #76423 (Int Overflow lead to Heap OverFlow in
+    exif_thumbnail_extract of exif.c). (Stas)
+  . Fixed bug #76557 (heap-buffer-overflow (READ of size 48) while reading exif
+    data). (Stas)
+
+- FPM:
+  . Fixed bug #73342 (Vulnerability in php-fpm by changing stdin to
+    non-blocking). (Nikita)
+
+- GMP:
+  . Fixed bug #74670 (Integer Underflow when unserializing GMP and possible
+    other classes). (Nikita)
+
+- intl:
+  . Fixed bug #76556 (get_debug_info handler for BreakIterator shows wrong
+    type). (cmb)
+
+- mbstring:
+  . Fixed bug #76532 (Integer overflow and excessive memory usage
+    in mb_strimwidth). (MarcusSchwarz)
+
+- Opcache:
+  . Fixed bug #76477 (Opcache causes empty return value).
+    (Nikita, Laruence)
+
+- PGSQL:
+  . Fixed bug #76548 (pg_fetch_result did not fetch the next row). (Anatol)
+
+- phpdbg:
+  . Fix arginfo wrt. optional/required parameters. (cmb)
+
+- Reflection:
+  . Fixed bug #76536 (PHP crashes with core dump when throwing exception in
+    error handler). (Laruence)
+  . Fixed bug #75231 (ReflectionProperty#getValue() incorrectly works with
+    inherited classes). (Nikita)
+
+- Standard:
+  . Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys).
+    (Laruence)
+  . Fixed bug #71848 (getimagesize with $imageinfo returns false). (cmb)
+
+- Win32:
+  . Fixed bug #76459 (windows linkinfo lacks openbasedir check). (Anatol)
+
+- ZIP:
+  . Fixed bug #76461 (OPSYS_Z_CPM defined instead of OPSYS_CPM).
+    (Dennis Birkholz, Remi)
+
+07 Jun 2018, PHP 7.2.7
+
+- Core:
+  . Fixed bug #76337 (segfault when opcache enabled + extension use
+    zend_register_class_alias). (xKhorasan)
+
+- CLI Server:
+  . Fixed bug #76333 (PHP built-in server does not find files if root path
+    contains special characters). (Anatol)
+
+- OpenSSL:
+  . Fixed bug #76296 (openssl_pkey_get_public does not respect open_basedir).
+    (Erik Lax, Jakub Zelenka)
+  . Fixed bug #76174 (openssl extension fails to build with LibreSSL 2.7).
+    (Jakub Zelenka)
+
+- SPL:
+  . Fixed bug #76367 (NoRewindIterator segfault 11). (Laruence)
+
+- Standard:
+  . Fixed bug #76410 (SIGV in zend_mm_alloc_small). (Laruence)
+  . Fixed bug #76335 ("link(): Bad file descriptor" with non-ASCII path).
+    (Anatol)
+
+24 May 2018, PHP 7.2.6
+
+- EXIF:
+  . Fixed bug #76164 (exif_read_data zend_mm_heap corrupted). (cmb)
+
+- FPM:
+  . Fixed bug #76075 --with-fpm-acl wrongly tries to find libacl on FreeBSD.
+    (mgorny)
+
+- intl:
+  . Fixed bug #74385 (Locale::parseLocale() broken with some arguments).
+    (Anatol)
+
+- Opcache:
+  . Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp). (Dmitry)
+  . Fixed bug #76275 (Assertion failure in file cache when unserializing empty
+    try_catch_array). (Nikita)
+  . Fixed bug #76281 (Opcache causes incorrect "undefined variable" errors).
+    (Nikita)
+
+- Reflection:
+  . Fixed arginfo of array_replace(_recursive) and array_merge(_recursive).
+    (carusogabriel)
+
+- Session:
+  . Fixed bug #74892 (Url Rewriting (trans_sid) not working on urls that start
+    with "#"). (Andrew Nester)
+
+26 Apr 2018, PHP 7.2.5
+
+- Core:
+  . Fixed bug #75722 (Convert valgrind detection to configure option).
+    (Michael Heimpold)
+
+- Date:
+  . Fixed bug #76131 (mismatch arginfo for date_create). (carusogabriel)
+
+- Exif:
+  . Fixed bug #76130 (Heap Buffer Overflow (READ: 1786) in exif_iif_add_value).
+    (Stas)
+
+- FPM:
+  . Fixed bug #68440 (ERROR: failed to reload: execvp() failed: Argument list
+    too long). (Jacob Hipps)
+  . Fixed incorrect write to getenv result in FPM reload. (Jakub Zelenka)
+
+- GD:
+  . Fixed bug #52070 (imagedashedline() - dashed line sometimes is not visible).
+    (cmb)
+
+- iconv:
+  . Fixed bug #76249 (stream filter convert.iconv leads to infinite loop on
+    invalid sequence). (Stas)
+
+- intl:
+  . Fixed bug #76153 (Intl compilation fails with icu4c 61.1). (Anatol)
+
+- ldap:
+  . Fixed bug #76248 (Malicious LDAP-Server Response causes Crash). (Stas)
+
+- mbstring:
+  . Fixed bug #75944 (Wrong cp1251 detection). (dmk001)
+  . Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1).
+    (chrullrich, cmb)
+
+- ODBC:
+  . Fixed bug #76088 (ODBC functions are not available by default on Windows).
+    (cmb)
+
+- Opcache:
+  . Fixed bug #76094 (Access violation when using opcache). (Laruence)
+
+- Phar:
+  . Fixed bug #76129 (fix for CVE-2018-5712 may not be complete). (Stas)
+
+- phpdbg:
+  . Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite). (Laruence)
+
+- SPL:
+  . Fixed bug #76131 (mismatch arginfo for splarray constructor).
+    (carusogabriel)
+
+- standard:
+  . Fixed bug #74139 (mail.add_x_header default inconsistent with docs). (cmb)
+  . Fixed bug #75996 (incorrect url in header for mt_rand). (tatarbj)
+
+29 Mar 2018, PHP 7.2.4
+
+- Core:
+  . Fixed bug #76025 (Segfault while throwing exception in error_handler).
+    (Dmitry, Laruence)
+  . Fixed bug #76044 ('date: illegal option -- -' in ./configure on FreeBSD).
+    (Anatol)
+
+- FPM:
+  . Fixed bug #75605 (Dumpable FPM child processes allow bypassing opcache
+    access controls). (Jakub Zelenka)
+
+- FTP:
+  . Fixed ftp_pasv arginfo. (carusogabriel)
+
+-GD:
+  . Fixed bug #73957 (signed integer conversion in imagescale()). (cmb)
+  . Fixed bug #76041 (null pointer access crashed php). (cmb)
+  . Fixed imagesetinterpolation arginfo. (Gabriel Caruso)
+
+- iconv:
+  . Fixed bug #75867 (Freeing uninitialized pointer). (Philip Prindeville)
+
+- Mbstring:
+  . Fixed bug #62545 (wrong unicode mapping in some charsets). (cmb)
+
+- Opcache:
+  . Fixed bug #75969 (Assertion failure in live range DCE due to block pass
+    misoptimization). (Nikita)
+
+- OpenSSL:
+  . Fixed openssl_* arginfos. (carusogabriel)
+
+- PCNTL:
+  . Fixed bug #75873 (pcntl_wexitstatus returns incorrect on Big_Endian platform
+    (s390x)). (Sam Ding)
+
+- Phar:
+  . Fixed bug #76085 (Segmentation fault in buildFromIterator when directory
+    name contains a \n). (Laruence)
+
+- Standard:
+  . Fixed bug #75961 (Strange references behavior). (Laruence)
+  . Fixed some arginfos. (carusogabriel)
+  . Fixed bug #76068 (parse_ini_string fails to parse "[foo]\nbar=1|>baz" with
+    segfault). (Anatol)
+
+01 Mar 2018, PHP 7.2.3
+
+- Core:
+  . Fixed bug #75864 ("stream_isatty" returns wrong value on s390x). (Sam Ding)
+
+- Apache2Handler:
+  . Fixed bug #75882 (a simple way for segfaults in threadsafe php just with
+    configuration). (Anatol)
+
+- Date:
+  . Fixed bug #75857 (Timezone gets truncated when formatted). (carusogabriel)
+  . Fixed bug #75928 (Argument 2 for `DateTimeZone::listIdentifiers()` should
+    accept `null`). (Pedro Lacerda)
+  . Fixed bug #68406 (calling var_dump on a DateTimeZone object modifies it).
+    (jhdxr)
+
+- LDAP:
+  . Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke)
+
+- libxml2:
+  . Fixed bug #75871 (use pkg-config where available). (pmmaga)
+
+- PGSQL:
+  . Fixed bug #75838 (Memory leak in pg_escape_bytea()). (ard_1 at mail dot ru)
+
+- Phar:
+  . Fixed bug #54289 (Phar::extractTo() does not accept specific directories to
+    be extracted). (bishop)
+  . Fixed bug #65414 (deal with leading slash while adding files correctly).
+    (bishopb)
+  . Fixed bug #65414 (deal with leading slash when adding files correctly).
+    (bishopb)
+
+- ODBC:
+  . Fixed bug #73725 (Unable to retrieve value of varchar(max) type). (Anatol)
+
+- Opcache:
+  . Fixed bug #75729 (opcache segfault when installing Bitrix). (Nikita)
+  . Fixed bug #75893 (file_get_contents $http_response_header variable bugged
+    with opcache). (Nikita)
+  . Fixed bug #75938 (Modulus value not stored in variable). (Nikita)
+
+- SPL:
+  . Fixed bug #74519 (strange behavior of AppendIterator). (jhdxr)
+
+- Standard:
+  . Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike,
+    Philip Sharp)
+  . Fixed bug #75981 (Prevent reading beyond buffer start in http wrapper).
+    (Stas)
+
+01 Feb 2018, PHP 7.2.2

 - Core:
  . Fixed bug #75742 (potential memleak in internal classes's static members).
@@ -21,9 +542,12 @@ PHP                                                                        NEWS
  . Fixed bug #75774 (imap_append HeapCorruction). (Anatol)

 - Opcache:
+  . Fixed bug #75720 (File cache not populated after SHM runs full). (Dmitry)
  . Fixed bug #75687 (var 8 (TMP) has array key type but not value type).
    (Nikita, Laruence)
  . Fixed bug #75698 (Using @ crashes php7.2-fpm). (Nikita)
+  . Fixed bug #75579 (Interned strings buffer overflow may cause crash).
+    (Dmitry)

 - PDO:
  . Fixed bug #75616 (PDO extension doesn't allow to be built shared on Darwin).
@@ -32,11 +556,6 @@ PHP                                                                        NEWS
 - PDO MySQL:
  . Fixed bug #75615 (PDO Mysql module can't be built as module). (jdolecek)

- Opcache:
-  . Fixed bug #75720 (File cache not populated after SHM runs full). (Dmitry)
-  . Fixed bug #75579 (Interned strings buffer overflow may cause crash).
-    (Dmitry)
-
 - PGSQL:
  . Fixed bug #75671 (pg_version() crashes when called on a connection to
    cockroach). (magicaltux at gmail dot com)
@@ -55,7 +574,7 @@ PHP                                                                        NEWS
  . Fixed bug #75502 (Segmentation fault in zend_string_release). (Nikita)

 - SPL:
-  . Fixed bug #75717 (RecursiveArrayIterator does not traverse arrays by 
+  . Fixed bug #75717 (RecursiveArrayIterator does not traverse arrays by
    reference). (Nikita)
  . Fixed bug #75242 (RecursiveArrayIterator doesn't have constants from parent
    class). (Nikita)
@@ -119,7 +638,7 @@ PHP                                                                        NEWS
    (Remi)
  . Fixed bug #75535 (Inappropriately parsing HTTP response leads to PHP
    segment fault). (Nikita)
-  . Fixed bug #75409 (accept EFAULT in addition to ENOSYS as indicator 
+  . Fixed bug #75409 (accept EFAULT in addition to ENOSYS as indicator
    that getrandom() is missing). (sarciszewski)
  . Fixed bug #73124 (php_ini_scanned_files() not reporting correctly).
    (John Stevenson)
@@ -174,7 +693,7 @@ PHP                                                                        NEWS
    (Anatol)
  . Implemented minor optimization in array_keys/array_values(). (Sara)
  . Added PHP_OS_FAMILY constant to determine on which OS we are. (Jan Altensen)
-  . Fixed bug #73987 (Method compatibility check looks to original 
+  . Fixed bug #73987 (Method compatibility check looks to original
    definition and not parent). (pmmaga)
  . Fixed bug #73991 (JSON_OBJECT_AS_ARRAY not respected). (Sara)
  . Fixed bug #74053 (Corrupted class entries on shutdown when a destructor
@@ -204,7 +723,7 @@ PHP                                                                        NEWS
  . Added new VM instuctions ISSET_ISEMPTY_CV and UNSET_CV. Previously they
    were implemented as ISSET_ISEMPTY_VAR and UNSET_VAR variants with
    ZEND_QUICK_SET flag. (Nikita, Dmitry)
-  . Fixed bug #49649 (unserialize() doesn't handle changes in property 
+  . Fixed bug #49649 (unserialize() doesn't handle changes in property
    visibility). (pmmaga)
  . Fixed #74866 (extension_dir = "./ext" now use current directory for base).
    (Francois Laupretre)
@@ -237,7 +756,7 @@ PHP                                                                        NEWS

 - EXIF:
  . Added support for vendor specific tags for the following formats:
-    Samsung, DJI, Panasonic, Sony, Pentax, Minolta, Sigma/Foveon, AGFA, 
+    Samsung, DJI, Panasonic, Sony, Pentax, Minolta, Sigma/Foveon, AGFA,
 	Kyocera, Ricoh & Epson. (Kalle)
  . Fixed bug #72682 (exif_read_data() fails to read all data for some
    images). (Kalle)
@@ -249,15 +768,15 @@ PHP                                                                        NEWS
    reached for some cameras). (Kalle)
  . Fixed Redhat bug #1362571 (PHP not returning full results for
    exif_read_data function). (Kalle)
-  . Implemented #65187 (exif_read_data/thumbnail: add support for stream 
+  . Implemented #65187 (exif_read_data/thumbnail: add support for stream
    resource). (Kalle)
  . Deprecated the read_exif_data() alias. (Kalle)
-  . Fixed bug #74428 (exif_read_data(): "Illegal IFD size" warning occurs with 
+  . Fixed bug #74428 (exif_read_data(): "Illegal IFD size" warning occurs with
    correct exif format). (bradpiccho at gmail dot com, Kalle)
  . Fixed bug #72819 (EXIF thumbnails not read anymore). (Kalle)
-  . Fixed bug #62523 (php crashes with segfault when exif_read_data called). 
+  . Fixed bug #62523 (php crashes with segfault when exif_read_data called).
    (Kalle)
-  . Fixed bug #50660 (exif_read_data(): Illegal IFD offset (works fine with 
+  . Fixed bug #50660 (exif_read_data(): Illegal IFD offset (works fine with
    other exif readers). (skinny dot bravo at gmail dot com, Kalle)

 - Fileinfo:
@@ -287,7 +806,7 @@ PHP                                                                        NEWS
  . Fixed Bug #75284 (sha3 is not supported on bigendian machine). (Remi)

 - IMAP:
-  . Fixed bug #72324 (imap_mailboxmsginfo() return wrong size). 
+  . Fixed bug #72324 (imap_mailboxmsginfo() return wrong size).
    (ronaldpoon at udomain dot com dot hk, Kalle)

 - Intl:
@@ -392,7 +911,7 @@ PHP                                                                        NEWS
    read-only/getter mode). (Yasuo)
  . Fixed bug #74936 (session_cache_expire/cache_limiter/save_path() trigger a
    warning in read mode). (morozov)
-  . Fixed bug #74941 (session fails to start after having headers sent). 
+  . Fixed bug #74941 (session fails to start after having headers sent).
    (morozov)

 - Sodium:
@@ -475,7 +994,7 @@ PHP                                                                        NEWS
  . Fixed bug #75437 (Wrong reflection on imagewebp). (Fabien Villepinte)

 - intl:
-  . Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead 
+  . Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead
    of destination). (andrewnester)

 - interbase:
@@ -513,7 +1032,7 @@ PHP                                                                        NEWS
  . Fixed bug #75236 (infinite loop when printing an error-message). (Andrea)
  . Fixed bug #75252 (Incorrect token formatting on two parse errors in one
    request). (Nikita)
-  . Fixed bug #75220 (Segfault when calling is_callable on parent). 
+  . Fixed bug #75220 (Segfault when calling is_callable on parent).
    (andrewnester)
  . Fixed bug #75290 (debug info of Closures of internal functions contain
    garbage argument names). (Andrea)
@@ -533,7 +1052,7 @@ PHP                                                                        NEWS
    optional). (cmb)

 - litespeed:
-  . Fixed bug #75248 (Binary directory doesn't get created when building 
+  . Fixed bug #75248 (Binary directory doesn't get created when building
    only litespeed SAPI). (petk)
  . Fixed bug #75251 (Missing program prefix and suffix). (petk)

@@ -660,7 +1179,7 @@ PHP                                                                        NEWS
  . Fixed bug #75049 (spl_autoload_unregister can't handle
    spl_autoload_functions results). (Laruence)
  . Fixed bug #74669 (Unserialize ArrayIterator broken). (Andrew Nester)
-  . Fixed bug #74977 (Appending AppendIterator leads to segfault). 
+  . Fixed bug #74977 (Appending AppendIterator leads to segfault).
    (Andrew Nester)
  . Fixed bug #75015 (Crash in recursive iterator destructors). (Julien)

@@ -681,9 +1200,9 @@ PHP                                                                        NEWS
 03 Aug 2017, PHP 7.1.8

 - Core:
-  . Fixed bug #74832 (Loading PHP extension with already registered function 
+  . Fixed bug #74832 (Loading PHP extension with already registered function
    name leads to a crash). (jpauli)
-  . Fixed bug #74780 (parse_url() broken when query string contains colon). 
+  . Fixed bug #74780 (parse_url() broken when query string contains colon).
    (jhdxr)
  . Fixed bug #74761 (Unary operator expected error on some systems). (petk)
  . Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic)
@@ -692,7 +1211,7 @@ PHP                                                                        NEWS
  . Fixed bug #74906 (fixed incorrect errno.h include). (petk)

 - Date:
-  . Fixed bug #74852 (property_exists returns true on unknown DateInterval 
+  . Fixed bug #74852 (property_exists returns true on unknown DateInterval
    property). (jhdxr)

 - OCI8:
@@ -903,7 +1422,7 @@ PHP                                                                        NEWS
    (Jakub Zelenka)

 - phar:
-  . Fixed bug #74383 (phar method parameters reflection correction). 
+  . Fixed bug #74383 (phar method parameters reflection correction).
    (mhagstrand)

 - Readline:
@@ -1075,7 +1594,7 @@ PHP                                                                        NEWS
  . Fixed bug #72898 (PHP_FCGI_CHILDREN is not included in phpinfo()). (Anatol)

 - FPM:
-  . Fixed bug #69865 (php-fpm does not close stderr when using syslog). 
+  . Fixed bug #69865 (php-fpm does not close stderr when using syslog).
    (m6w6)

 - GD:
@@ -1083,7 +1602,7 @@ PHP                                                                        NEWS

 - GMP:
  . Fixed bug #69993 (test for gmp.h needs to test machine includes).
-    (Jordan Gigov) 
+    (Jordan Gigov)

 - Hash:
  . Added hash_hkdf() function. (Andrey Andreev)
@@ -1117,7 +1636,7 @@ PHP                                                                        NEWS
  . Implemented FR #72583 (All data are fetched as strings). (Dorin Marcoci)

 - PDO_PgSQL:
-  . Fixed bug #73959 (lastInsertId fails to throw an exception for wrong 
+  . Fixed bug #73959 (lastInsertId fails to throw an exception for wrong
    sequence name). (andrewnester)

 - Phar:
@@ -1181,7 +1700,7 @@ PHP                                                                        NEWS
 - Mysqlnd:
  . Optimized handling of BIT fields - less memory copies and lower memory
    usage. (Andrey)
-  . Fixed bug #73800 (sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE). 
+  . Fixed bug #73800 (sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE).
 	(vanviegen)

 - Opcache:
@@ -1687,7 +2206,7 @@ PHP                                                                        NEWS
 - PCRE:
  . Fixed bug #73483 (Segmentation fault on pcre_replace_callback). (Laruence)
  . Fixed bug #73612 (preg_*() may leak memory). (cmb)
-  . Fixed bug #73392 (A use-after-free in zend allocator management). 
+  . Fixed bug #73392 (A use-after-free in zend allocator management).
    (Laruence)
  . Fixed bug #73121 (Bundled PCRE doesn't compile because JIT isn't supported
    on s390). (Anatol)
@@ -1783,7 +2302,7 @@ PHP                                                                        NEWS
  . Implemented RFC: Session ID without hashing. (Yasuo)
    https://wiki.php.net/rfc/session-id-without-hashing
  . Fixed bug #72531 (ps_files_cleanup_dir Buffer overflow). (Laruence)
-  . Custom session handlers that do not return strings for session IDs will 
+  . Custom session handlers that do not return strings for session IDs will
    now throw an instance of Error instead of resulting in a fatal error
    when a function is called that must generate a session ID.
    (Aaron Piotrowski)
@@ -1819,7 +2338,7 @@ PHP                                                                        NEWS
    unserialize()). (Stas)

 - Soap:
-  . Fixed bug #73538 (SoapClient::__setSoapHeaders doesn't overwrite SOAP 
+  . Fixed bug #73538 (SoapClient::__setSoapHeaders doesn't overwrite SOAP
    headers). (duncan3dc)
  . Fixed bug #73452 (Segfault (Regression for #69152)). (Dmitry)
  . Fixed bug #73037 (SoapServer reports Bad Request when gzipped). (Anatol)
@@ -1827,7 +2346,7 @@ PHP                                                                        NEWS
    (Keith Smiley)
  . Fixed bug #69137 (Peer verification fails when using a proxy with SoapClient)
    (Keith Smiley)
-  . Fixed bug #71711 (Soap Server Member variables reference bug). (Nikita) 
+  . Fixed bug #71711 (Soap Server Member variables reference bug). (Nikita)
  . Fixed bug #71996 (Using references in arrays doesn't work like expected).
    (Nikita)

@@ -1972,4 +2491,3 @@ PHP                                                                        NEWS
    php_stream_zip_opener). (Stas)
  . ZipArchive::addGlob() will throw an instance of Error instead of resulting
    in a fatal error if glob support is not available. (Aaron Piotrowski)
-
@@ -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");
 }
 /* }}} */
-
@@ -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.
@@ -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?
@@ -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
@@ -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.
-
@@ -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,7 +125,7 @@ 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.

@@ -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.
-
@@ -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.
-
@@ -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,
@@ -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.

@@ -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.

@@ -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
-
-
-
@@ -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
-
@@ -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
@@ -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)
-
@@ -1,5 +1,3 @@
-
 AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
-
@@ -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
@@ -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");
-
@@ -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])
@@ -194,4 +194,3 @@ esac
 AC_LANG_POP

 ]) dnl end AC_DEFUN
-
@@ -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
@@ -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
@@ -99,6 +99,13 @@ PHP 7.2 UPGRADE NOTES
    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.1.25, 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
 ========================================
@@ -180,7 +187,7 @@ PHP 8.0.
  . 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.

@@ -210,14 +217,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'],
@@ -290,10 +297,10 @@ 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 
+   . exif_read_data() and exif_thumbnail() now supports a passed streams as their
     first parameter.

 - GD:
@@ -31,7 +31,7 @@ PHP 7.2 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
@@ -80,4 +80,3 @@ PHP 7.2 INTERNALS UPGRADE NOTES

 - OpenSSL:
  . Windows builds ship with OpenSSL 1.1 by default, lower versions are still supported with custom deps.
-
@@ -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.

-------------------------------------------------------------------- 
+--------------------------------------------------------------------
@@ -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
-
@@ -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().
-
@@ -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
 ],[
@@ -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>
@@ -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");
 }

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

@@ -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
@@ -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)

@@ -44,7 +44,7 @@ var_dump(func_get_args());

 echo "Done\n";
 ?>
--EXPECTF--	
+--EXPECTF--
 array(0) {
 }
 array(1) {
@@ -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)
@@ -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)
@@ -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

@@ -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

@@ -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

@@ -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"

@@ -41,7 +41,7 @@ var_dump(get_parent_class(1));

 echo "Done\n";
 ?>
--EXPECTF--	
+--EXPECTF--
 bool(false)
 bool(false)
 string(3) "foo"
@@ -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

@@ -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)
@@ -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)
@@ -20,7 +20,7 @@ var_dump(get_included_files());

 echo "Done\n";
 ?>
--EXPECTF--	
+--EXPECTF--
 array(1) {
  [0]=>
  string(%d) "%s"
@@ -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

@@ -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
@@ -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

@@ -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

@@ -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);
@@ -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

@@ -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";
 	}
 }
@@ -1,7 +1,7 @@
 --TEST--
 Testing array with '[]' passed as argument by value
 --FILE--
-<?php 
+<?php

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

 function test(&$var) { }
 test($arr[]);
@@ -1,7 +1,7 @@
 --TEST--
 Using undefined multidimensional array
 --FILE--
-<?php 
+<?php

 $arr[1][2][3][4][5];

@@ -17,7 +17,6 @@ $arr[][]->bar = 2;

 ?>
 --EXPECTF--
-
 Notice: Undefined variable: arr in %s on line %d

 Notice: Undefined variable: arr in %s on line %d
@@ -1,7 +1,7 @@
 --TEST--
 Testing multiples 'default:' in switch
 --FILE--
-<?php 
+<?php

 switch (1) {
 	case 2:
@@ -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);
-    }    
+    }
 }

 ?>
@@ -9,5 +9,4 @@ abstract class TestClass
 ?>
 ===DONE===
 --EXPECTF--
-
 ===DONE===
@@ -8,5 +8,5 @@ abstract class B extends A { abstract function bar($x); }

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

 echo "DONE";
 ?>
--EXPECT--	
+--EXPECT--
 DONE
@@ -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
@@ -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
@@ -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
@@ -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
@@ -10,5 +10,5 @@ class test {

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

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

 echo "Done\n";
 ?>
--EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple static modifiers are not allowed in %s on line %d
@@ -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
@@ -21,7 +21,7 @@ abstract class b extends a {
 class c extends b {
 	public function __construct() {
 		$this->test();
-	}	
+	}
 }

 new c;
@@ -32,7 +32,7 @@ echo $a->func1(),"\n";
 echo $a->func2(),"\n";

 ?>
--EXPECTF--	
+--EXPECTF--
 var1 value
 var2 value
 in func1
@@ -29,7 +29,7 @@ var_dump($c);

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

 echo "Done\n";
 ?>
--EXPECTF--	
+--EXPECTF--
 float(2834756759.1231)
 float(2834756759.1231)
 Done
@@ -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)

@@ -1,5 +1,5 @@
 --TEST--
-adding strings to arrays 
+adding strings to arrays
 --FILE--
 <?php

@@ -18,8 +18,7 @@ var_dump($c);

 echo "Done\n";
 ?>
--EXPECTF--	
-
+--EXPECTF--
 Warning: A non-numeric value encountered in %s on line %d

 Exception: Unsupported operand types
@@ -30,7 +30,7 @@ var_dump($s);

 echo "Done\n";
 ?>
--EXPECTF--	
+--EXPECTF--
 string(3) "020"
 string(4) "pead"
 string(4) "pead"
@@ -6,5 +6,3 @@ var_dump(new class{});
 --EXPECTF--
 object(class@%s)#%d (0) {
 }
-
-
@@ -18,4 +18,3 @@ var_dump($a instanceof A, $a instanceof B);
 --EXPECTF--
 bool(true)
 bool(true)
-
@@ -51,4 +51,3 @@ object(class@%s)#1 (1) {
  ["i"]=>
  int(10)
 }
-
@@ -12,4 +12,3 @@ namespace {
 --EXPECTF--
 object(class@%s)#1 (0) {
 }
-
@@ -20,4 +20,3 @@ namespace lone {
 --EXPECTF--
 object(class@%s)#2 (0) {
 }
-
@@ -1,12 +1,12 @@
 --TEST--
 Testing calls to anonymous function
 --FILE--
-<?php 
+<?php

 for ($i = 0; $i < 10; $i++) {
 	$a = create_function('', 'return '. $i .';');
 	var_dump($a());
-	
+
 	$b = "\0lambda_". ($i + 1);
 	var_dump($b());
 }
@@ -1,7 +1,7 @@
 --TEST--
 Testing anonymous function return as array key and accessing $GLOBALS
 --FILE--
-<?php 
+<?php

 $test = create_function('$v', 'return $v;');

@@ -1,7 +1,7 @@
 --TEST--
 Using throw $var with anonymous function return
 --FILE--
-<?php 
+<?php

 try {
 	$a = create_function('', 'return new Exception("test");');
@@ -4,12 +4,12 @@ Bug #55719 (Argument restriction should come with a more specific error message)
 <?php
 Class Base {
 	public function &test($foo, array $bar, $option = NULL, $extra = "lllllllllllllllllllllllllllllllllllllllllllllllllll") {
-	}	
+	}
 }

 class Sub extends Base {
 	public function &test() {
-	}	
+	}
 }
 ?>
 --EXPECTF--