Update versions for PHP 7.3.0alpha3

2026-11-09 18:20:50 +00:00 · 2018-07-03 10:51:56 +00:00
10815 changed files with 265090 additions and 290292 deletions
@@ -1,3 +1,4 @@
+
 version: "{branch}.build.{build}"

 image: Visual Studio 2017
@@ -13,10 +14,10 @@ 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.2.0beta6
+        PHP_BUILD_SDK_BRANCH: php-sdk-2.1.7beta1
        PHP_BUILD_CRT: vc15
        # ext and env setup for tests
        #MYSQL_TEST_PASSWD: Password12!
@@ -49,3 +50,4 @@ build_script:

 test_script:
        - appveyor\test.bat
+
@@ -1,34 +1,35 @@
-# https://editorconfig.org/
+# http://editorconfig.org/

 root = true

-[*]
-trim_trailing_whitespace = true
-insert_final_newline     = true
-end_of_line              = lf
+[*.{c,h,awk,w32,bat,mk,frag}]
 charset                  = utf-8
-tab_width                = 4
-
-[{*.{awk,bat,c,cpp,d,h,l,mk,re,skl,w32,y},Makefile*}]
+end_of_line              = lf
 indent_size              = 4
 indent_style             = tab
+tab_width                = 4
+trim_trailing_whitespace = true
+insert_final_newline     = true

-[*.{dtd,html,inc,php,phpt,rng,wsdl,xml,xsd,xsl}]
+[*.{php,phpt}]
+charset                  = utf-8
+end_of_line              = lf
 indent_size              = 4
 indent_style             = space
+trim_trailing_whitespace = true
+insert_final_newline     = true

-[*.{ac,m4,sh,yml}]
+[*.{yml,m4,sh}]
+charset                  = utf-8
+end_of_line              = lf
 indent_size              = 2
 indent_style             = space
+trim_trailing_whitespace = true
+insert_final_newline     = true

 [*.md]
+charset                  = utf-8
+end_of_line              = lf
 indent_style             = space
-max_line_length          = 80
-
-[COMMIT_EDITMSG]
-indent_size              = 4
-indent_style             = space
-max_line_length          = 80
-
-[*.patch]
 trim_trailing_whitespace = false
+insert_final_newline     = true
@@ -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

@@ -153,7 +153,7 @@ end

 define printzv
 	set $ind = 1
-	____printzv $arg0 0
+	____printzv $arg0 0 
 end

 document printzv
@@ -190,7 +190,7 @@ define ____printzv_contents
 	if $type == 6
 		printf "string: %s", $zvalue->value.str->val
 	end
-	if $type == 7
+	if $type == 7 
 		printf "array: "
 		if ! $arg1
 			set $ind = $ind + 1
@@ -287,7 +287,7 @@ define ____printzv
 	if $arg1
 		____printzv_contents $zcontents $arg1
 	else
-		____printzv_contents $zcontents 0
+		____printzv_contents $zcontents 0 
 	end
 end

@@ -340,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
@@ -389,7 +389,7 @@ document print_htptr
 end

 define print_htstr
-	set $ind = 0
+	set $ind = 0 
 	____print_ht $arg0 2
 end

@@ -543,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
@@ -576,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,6 +26,7 @@
 *.tar.xz.asc
 .FBCIndex
 .FBCLockFolder
+.deps
 .libs
 phpt.*
 core
@@ -113,7 +114,6 @@ sapi/fpm/www.conf
 sapi/phpdbg/phpdbg_parser.c
 sapi/phpdbg/phpdbg_parser.h
 sapi/phpdbg/phpdbg
-sapi/phpdbg/phpdbg.1
 sapi/phpdbg/build
 sapi/phpdbg/*.output
 scripts/php-config
@@ -156,6 +156,22 @@ ext/iconv/php_have_iconv.h
 ext/iconv/php_iconv_supports_errno.h
 ext/iconv/php_iconv_broken_ignore.h
 ext/iconv/php_iconv_aliased_libiconv.h
+ext/mbstring/libmbfl/Makefile.in
+ext/mbstring/libmbfl/autoscan.log
+ext/mbstring/libmbfl/config.sub
+ext/mbstring/libmbfl/depcomp
+ext/mbstring/libmbfl/ltmain.sh
+ext/mbstring/libmbfl/stamp-h1
+ext/mbstring/libmbfl/*.dll
+ext/mbstring/libmbfl/*.lib
+ext/mbstring/libmbfl/*.RES
+ext/mbstring/libmbfl/*.res
+ext/mbstring/libmbfl/*.obj
+ext/mbstring/libmbfl/*.tds
+ext/mbstring/libmbfl/filters/Makefile.in
+ext/mbstring/libmbfl/mbfl/Makefile.in
+ext/mbstring/libmbfl/mbfl/EastAsianWidth.txt
+ext/mbstring/libmbfl/nls/Makefile.in
 ext/mbstring/oniguruma/oniguruma.h
 ext/oci8/tests/*.vglog
 ext/pdo/conftest*
@@ -207,4 +223,5 @@ ext/sqlite3/tests/phpsql*
 # Special cases to invert previous ignore rules
 !ext/fileinfo/libmagic.patch
 !ext/mbstring/oniguruma.patch
+!scripts/dev/generate-phpt/tests/*.php
 !ext/pcre/pcre2lib/config.h
@@ -1,9 +1,6 @@
-git:
-  quiet: true
-
 dist: trusty
 language: c
-sudo: required
+sudo: false
 addons:
  apt:
    packages:
@@ -23,7 +20,7 @@ addons:
      - libzip-dev

 notifications:
-    email:
+    email: 
       on_failure: change
    irc:
      template:
@@ -65,10 +62,9 @@ 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 -d extension=`pwd`/modules/zend_test.so $(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
-    - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
+    - ./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

 after_success:
    - ccache --show-stats
@@ -112,7 +112,7 @@ User Functions/Methods Naming Conventions
    of ``parent_*``::

    A family of 'foo' functions, for example:
-
+    
    Good:
    'foo_select_bar'
    'foo_insert_baz'
@@ -150,39 +150,19 @@ User Functions/Methods Naming Conventions
    'buildsomewidget'
    'getI()'

-7.  Class names should be descriptive nouns in PascalCase and as short as
+7.  Classes should be given descriptive names. Avoid using abbreviations where
    possible. Each word in the class name should start with a capital letter,
-    without underscore delimiters. The class name should be prefixed with the
-    name of the "parent set" (e.g. the name of the extension) if no namespaces
-    are used. Abbreviations and acronyms as well as initialisms should be
-    avoided wherever possible, unless they are much more widely used than the
-    long form (e.g. HTTP or URL). Abbreviations start with a capital letter
-    followed by lowercase letters, whereas acronyms and initialisms are written
-    according to their standard notation. Usage of acronyms and initialisms is
-    not allowed if they are not widely adopted and recognized as such.
+    without underscore delimiters (CamelCaps starting with a capital letter).
+    The class name should be prefixed with the name of the 'parent set' (e.g.
+    the name of the extension)::

    Good:
    'Curl'
-    'CurlResponse'
-    'HTTPStatusCode'
-    'URL'
-    'BTreeMap' (B-tree Map)
-    'Id' (Identifier)
-    'ID' (Identity Document)
-    'Char' (Character)
-    'Intl' (Internationalization)
-    'Radar' (Radio Detecting and Ranging)
+    'FooBar'

    Bad:
-    'curl'
-    'curl_response'
-    'HttpStatusCode'
-    'Url'
-    'BtreeMap'
-    'ID' (Identifier)
-    'CHAR'
-    'INTL'
-    'RADAR' (Radio Detecting and Ranging)
+    'foobar'
+    'foo_bar'

 Internal Function Naming Conventions
 ----------------------
@@ -3,6 +3,7 @@

 Maintenance legend
 ------------------
+    Supported:       Someone is actually paid to look after this.
    Maintained:      Someone actually looks after it.
    Odd Fixes:       It has a maintainer but they don't have time to do
                     much other than throw the odd patch in. See below.
@@ -67,71 +68,59 @@ STATUS:              5.6

 -------------------------------------------------------------------------------
 EXTENSION:           dba
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net> (2002 - 2007)
-                     Christopher Jones <sixd@php.net> (2008 - 2013)
-                     Pierre-Alain Joye <pajoye@php.net> (2011 - 2011)
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>,Christopher Jones <sixd@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini
 -------------------------------------------------------------------------------
 EXTENSION:           interbase
-PRIMARY MAINTAINER:  Ard Biesheuvel <ard@ard.nu> (2003 - 2005)
+PRIMARY MAINTAINER:  Ard Biesheuvel <ard@ard.nu>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mysqli
-PRIMARY MAINTAINER:  Georg Richter <georg@php.net> (2003 - 2006)
-                     Andrey Hristov <andrey@php.net> (2003 - 2016)
-                     Johannes Schlüter <johannes@php.net> (2008 - 2014)
-                     Ulf Wendel <uw@php.net> (2007 - 2013)
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           mysqlnd
-PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net> (2007 - 2017)
-                     Johannes Schlüter <johannes@php.net> (2008 - 2018)
-                     Ulf Wendel <uw@php.net> (2009 - 2011)
+PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           oci8
-PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net> (2007 - 2017)
-                     Antony Dovgal <tony2001@php.net> (2003 - 2009)
+PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net>, Antony Dovgal <tony2001@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           odbc
-PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net> (2000 - 2004)
+PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             Working
 -------------------------------------------------------------------------------
 EXTENSION:           pdo
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net> (2004 - 2011)
-                     Wez Furlong <wez@php.net> (2004 - 2006)
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Wez Furlong <wez@php.net>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_dblib
-PRIMARY MAINTAINER:  Adam Baratz <adambaratz@php.net> (2016 - 2017)
+PRIMARY MAINTAINER:  Adam Baratz <adambaratz@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_firebird
-PRIMARY MAINTAINER:  Lars Westermann <lwe@php.net> (2007 - 2007)
+PRIMARY MAINTAINER:  Lars Westermann <lwe@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_mysql
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net> (2004 - 2010)
-                     Johannes Schlüter <johannes@php.net> (2008 - 2014)
-                     Andrey Hristov <andrey@php.net> (2005 - 2015)
-                     Ulf Wendel <uw@php.net> (2008 - 2012)
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Johannes Schlüter <johannes@php.net>, Andrey Hristov <andrey@php.net>,  Ulf Wendel <uw@php.net>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
@@ -143,32 +132,31 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_oci
-PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net> (2007 - 2017)
+PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_pgsql
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net> (2004 - 2011)
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_sqlite
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net> (2005 - 2011)
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pgsql
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net> (2002 - 2007)
-                     Yasuo Ohgaki <yohgaki@php.net> (2001 - 2015)
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>, Yasuo Ohgaki <yohgaki@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less have fatal bug.
 -------------------------------------------------------------------------------
 EXTENSION:           sqlite3
-PRIMARY MAINTAINER:  Scott MacVicar <scottmac@php.net> (2008 - 2011)
+PRIMARY MAINTAINER:  Scott MacVicar <scottmac@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
@@ -180,38 +168,34 @@ COMMENT:             Integrates SQLite 3 embeddable SQL database engine.

 -------------------------------------------------------------------------------
 EXTENSION:           dom
-PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net> (2003 - 2011)
-                     Rob Richards <rrichards@php.net> (2003 - 2012)
-                     Marcus Börger <helly@php.net> (2003 - 2006)
+PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>, Marcus Börger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           simplexml
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net> (2003 - 2008)
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           soap
-PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@php.net> (2004 - 2018)
+PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           wddx
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net> (1999 - 2003)
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Orphaned
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xml
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net> (1999 - 2002)
-                     Rob Richards <rrichards@php.net> (2003 - 2013)
+PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>,  Rob Richards <rrichards@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           libxml
-PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net> (2003 - 2009)
-                     Christian Stocker <chregu@php.net> (2004 - 2011)
+PRIMARY MAINTAINER:   Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -221,19 +205,17 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xmlrpc
-PRIMARY MAINTAINER:  Unknown
+PRIMARY MAINTAINER:  Dan Libby
 MAINTENANCE:         Orphaned
 STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           xmlwriter
-PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net> (2004 - 2010)
-                     Christian Stocker <chregu@php.net> (2004 - 2004)
+PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xsl
-PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net> (2003 - 2011)
-                     Rob Richards <rrichards@php.net> (2003 - 2010)
+PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
@@ -244,41 +226,39 @@ SINCE:               5.0

 -------------------------------------------------------------------------------
 EXTENSION:           bcmath
-MAINTENANCE:         Andi Gutmans <andi@php.net> (2000 - 2004)
+MAINTENANCE:         Andi Gutmans <andi@zend.com>
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           bz2
-PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net> (2004 - 2004)
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
 MAINTENANCE:         Odd Fixes
 STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
 EXTENSION:           calendar
-PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net> (2000 - 2004)
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
 MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           com_dotnet
-PRIMARY MAINTAINER:  Wez Furlong <wez@php.net> (2003 - 2005)
+PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Windows
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           ctype
-PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net> (2000 - 2004)
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           curl
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net> (2000 - 2004)
-                     Ilia Alshanetsky <iliaa@php.net> (2002 - 2011)
-                     Pierrick Charron <pierrick@php.net> (2010 - 2016)
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>, Ilia Alshanetsky <iliaa@php.net>, Pierrick Charron <pierrick@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           date
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net> (2005 - 2018)
+PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -289,22 +269,19 @@ STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           exif
-PRIMARY MAINTAINER:  Kalle Sommer Nielsen <kalle@php.net> (2010 - 2018)
+PRIMARY MAINTAINER:  Kalle Sommer Nielsen <kalle@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.2
 -------------------------------------------------------------------------------
 EXTENSION:           fileinfo
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net> (2004 - 2008)
-                     Anatol Belski <ab@php.net> (2012 - 2018)
+PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           filter
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net> (2006 - 2006)
-                     Pierre-Alain Joye <pajoye@php.net> (2006 - 2011)
-                     Ilia Alshanetsky <iliaa@php.net> (2006 - 2011)
+PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>, Pierre-Alain Joye <pajoye@php.net>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.2
@@ -315,8 +292,7 @@ MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gd
-PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net> (2002 - 2016)
-                     Christoph M. Becker <cmb@php.net> (2015 - 2018)
+PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>, Christoph M. Becker <cmb@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -325,99 +301,84 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gmp
-PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net> (2000 - 2018)
-                     Antony Dovgal <tony2001@php.net> (2005 - 2010)
+PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net>, Antony Dovgal <tony2001@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
 EXTENSION:           hash
-PRIMARY MAINTAINER:  Sara Golemon <pollita@php.net> (2005 - 2017)
-                     Mike Wallner <mike@php.net> (2005 - 2013)
-                     Anatol Belski <ab@php.net> (2014 - 2018)
+PRIMARY MAINTAINER:  Sara Golemon <pollita@php.net>, Mike Wallner <mike@php.net>, Anatol Belski <ab@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.1.2
 -------------------------------------------------------------------------------
 EXTENSION:           iconv
-PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net> (2002 - 2010)
+PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           intl
-PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net> (2008 - 2018)
-                     Anatol Belski <ab@php.net> (2017 - 2018)
+PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           imap
-PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org> (1999 - 2004)
-                     Ilia Alshanetsky <iliaa@php.net> (2002 - 2010)
-                     Pierre-Alain Joye <pajoye@php.net> (2008 - 2010)
+PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>, Ilia Alshanetsky <iliaa@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           json
-PRIMARY MAINTAINER:  Jakub Zelenka <bukka@php.net> (2014 - 2018)
+PRIMARY MAINTAINER:  Jakub Zelenka <bukka@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.2
 -------------------------------------------------------------------------------
 EXTENSION:           ldap
-PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net> (2000 - 2002)
-                     Douglas Goldstein <cardoe@php.net> (2007 - 2007)
-                     Pierre-Alain Joye <pajoye@php.net> (2008 - 2010)
-                     Côme Bernigaud <mcmic@php.net> (2015 - 2017)
+PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>, Pierre-Alain Joye <pajoye@php.net>, Côme Bernigaud <mcmic@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mbstring
-PRIMARY MAINTAINER:  Rui Hirokawa <hirokawa@php.net> (2001 - 2013)
+PRIMARY MAINTAINER:  Rui Hirokawa <hirokawa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           opcache
-PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@php.net> (2013 - 2018)
-                     Xinchen Hui <laruence@php.net> (2013 - 2018)
+PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>, Xinchen Hui <laruence@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.5.0
 -------------------------------------------------------------------------------
 EXTENSION:           openssl
-PRIMARY MAINTAINER:  Wez Furlong <wez@php.net> (2001 - 2006)
-                     Pierre-Alain Joye <pajoye@php.net> (2006 - 2011)
-                     Jakub Zelenka <bukka@php.net> (2015 - 2019)
+PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
 EXTENSION:           pcntl
-PRIMARY MAINTAINER:  Arnaud Le Blanc <lbarnaud@php.net> (2008 - 2010)
+PRIMARY MAINTAINER:  Arnaud Le Blanc <lbarnaud@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           pcre
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net> (1999 - 2006)
-                     Nuno Lopes <nlopess@php.net> (2006 - 2009)
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>, Nuno Lopes <nlopess@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           phar
-PRIMARY MAINTAINER:  Greg Beaver <cellog@php.net> (2008 - 2009)
-                     Marcus Börger <helly@php.net> (2008 - 2008)
-                     Steph Fox <sfox@php.net> (2008 - 2008)
+PRIMARY MAINTAINER:  Greg Beaver <cellog@php.net>, Marcus Börger <helly@php.net>, Steph Fox <sfox@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           posix
-PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de> (2000 - 2000)
+PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           pspell
-PRIMARY MAINTAINER:  Vlad Krupin <phpdevel@echospace.com> (2000 - 2004)
+PRIMARY MAINTAINER:  Vlad Krupin <phpdevel@echospace.com>
 MAINTENANCE:         Unknown
 STATUS:              Working
 SINCE:               4.0.2
@@ -427,50 +388,45 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           recode
-PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de> (2000 - 2000)
+PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           reflection
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net> (2003 - 2009)
-                     Johannes Schlüter <johannes@php.net> (2006 - 2014)
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>, Johannes Schlüter <johannes@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           session
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx> (1999 - 2004)
-                     Ilia Alshanetsky <iliaa@php.net> (2002 - 2012)
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           shmop
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net> (2002 - 2008)
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
 EXTENSION:           snmp
-PRIMARY MAINTAINER:  Boris Lytochkin <lytboris@php.net> (2011 - 2013)
-                     Rasmus Lerdorf <rasmus@php.net> (1999 - 2002)
-                     Pierre-Alain Joye <pajoye@php.net> (2010 - 2011)
+PRIMARY MAINTAINER:  Boris Lytochkin <lytboris@php.net>, Rasmus Lerdorf <rasmus@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sockets
-PRIMARY MAINTAINER:  Chris Vandomelen <chrisv@b0rked.dhs.org> (2000 - 2000)
+PRIMARY MAINTAINER:  Chris Vandomelen <chrisv@b0rked.dhs.org>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           sodium
-PRIMARY MAINTAINER:  Frank Denis <jedisct1@php.net> (2017 - 2017)
+PRIMARY MAINTAINER:  Frank Denis <jedisct1@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               7.2.0
 -------------------------------------------------------------------------------
 EXTENSION:           spl
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net> (2003 - 2009)
-                     Etienne Kneuss <colder@php.net> (2008 - 2014)
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>, Etienne Kneuss <colder@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0.0
@@ -488,24 +444,22 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           tidy
-PRIMARY MAINTAINER:  John Coggeshall <john@php.net> (2003 - 2006)
-                     Ilia Alshanetsky <iliaa@php.net> (2003 - 2009)
-                     Nuno Lopes <nlopess@php.net> (2006 - 2012)
+PRIMARY MAINTAINER:  John Coggeshall <john@php.net>, Ilia Alshanetsky <iliaa@php.net>, Nuno Lopes <nlopess@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           tokenizer
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net> (2002 - 2002)
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           zip
-PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net> (2006 - 2011)
+PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           zlib
-PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de> (1999 - 2003)
+PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -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,3 +1,4 @@
+
 #
 # Zend
 #
@@ -1,3 +1,4 @@
+
 #
 # LCOV
 #
@@ -61,7 +62,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 sapi/phpdbg/phpdbg.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 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
@@ -11,8 +11,8 @@ HOW TO USE IT

  and everything you need will be placed in directory ext/extension_name.

-  If you don't need to test the existence of any external header files,
-  libraries or functions in them, the extension is ready to be compiled in
+  If you don't need to test the existence of any external header files, 
+  libraries or functions in them, the extension is ready to be compiled in 
  PHP. To compile the extension, run the following:

    ./buildconf; ./configure --enable-extension_name; make
@@ -24,7 +24,7 @@ HOW TO USE IT

 SOURCE AND HEADER FILE NAME

-  The ext_skel.php script generates 'extension_name.c' and 'php_extension_name.h'
+  The ext_skel.php script generates 'extension_name.c' and 'php_extension_name.h' 
  as the main source and header files. Keep these names.

  extension functions (User functions) must be named
@@ -41,3 +41,4 @@ SOURCE AND HEADER FILE NAME
 OTHER OPTIONS

  Run php ext_skel.php --help to see the available options.
+
@@ -1,6 +1,6 @@
 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:
@@ -131,7 +131,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?
@@ -28,13 +28,6 @@ Both functions return SUCCESS or FAILURE depending on the result.
 The auto-conversions are performed as necessary. Arrays, objects, and
 resources cannot be auto-converted.

-PHP 5.3 includes a new function (actually implemented as macro):
-
-int zend_parse_parameters_none();
-
-This returns SUCCESS if no argument has been passed to the function,
-FAILURE otherwise.
-
 PHP 5.5 includes a new function:

 int zend_parse_parameter(int flags, int arg_num, zval **arg, const char *spec, ...);
@@ -49,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*)
@@ -61,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*)
@@ -95,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:
@@ -110,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/
@@ -159,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
@@ -228,8 +221,3 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a*l", &array, &varargs, &num_varargs
 for (i = 0; i < num_varargs; i++) {
    /* do something with varargs[i] */
 }
-
-/* Function that doesn't accept any arguments */
-if (zend_parse_parameters_none() == FAILURE) {
-    return;
-}
@@ -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,14 +140,14 @@ to upgrade.

 *Wait for web and qa sites to update with new information before sending announce*

-5. Send **separate** emails **To** ``internals@lists.php.net`` and ``php-general@lists.php.net``
+5. Send **separate** emails **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``.

 6. Send **separate** emails (see example here http://news.php.net/php.pear.qa/5201) **To**
 ``php-qa@lists.php.net`` and ``primary-qa-tester@lists.php.net``.
-These emails are to notify the selected projects about a new release so that they
+This emails are to notify the selected projects about a new release so that they
 can make sure their projects keep working. Make sure that you have been setup
 as a moderator for ``primary-qa-tester@lists.php.net`` by having someone (Hannes, Dan,
 Derick) run the following commands for you:
@@ -194,7 +194,7 @@ can be influenced by defining the environment variable TAR_OPTIONS='--format=gnu
  ``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;
@@ -265,7 +265,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
@@ -362,7 +362,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 edit main/php_version.h. Possibly karma for other restricted parts of
+3. Request karma to edit main/php_version.h. Possibly karma for other restricted parts of 
   php-src might come in question.

 4. Request karma for web/qa.git and web/php.git for publishing release announcements.
@@ -370,3 +370,4 @@ 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.
+
@@ -1,3 +1,6 @@
+$Id$
+=============================================================================
+
 HOW TO CREATE A SELF-CONTAINED PHP EXTENSION

  A self-contained extension can be distributed independently of
@@ -20,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/

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

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


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

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

@@ -94,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.
@@ -135,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
@@ -164,3 +167,4 @@ PECL SITE CONFORMITY

    This macros has to be used within your foo_module_entry to indicate the
    extension version.
+
@@ -1,5 +1,6 @@
 An Overview of the PHP Streams abstraction
 ==========================================
+$Id$

 WARNING: some prototypes in this file are out of date.
 The information contained here is being integrated into
@@ -27,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);
@@ -62,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
@@ -94,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
 ================
@@ -245,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)
@@ -346,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.

@@ -3,3 +3,4 @@ The Win32 Build System.
 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,3 +37,4 @@ Guidelines for contributors
 - [README.GIT-RULES](/README.GIT-RULES)
 - [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES)
 - [README.RELEASE_PROCESS](/README.RELEASE_PROCESS)
+
@@ -6,7 +6,7 @@
   | This source file is subject to the TSRM license, that is bundled     |
   | with this package in the file LICENSE                                |
   +----------------------------------------------------------------------+
-   | Authors:  Zeev Suraski <zeev@php.net>                                |
+   | Authors:  Zeev Suraski <zeev@zend.com>                               |
   +----------------------------------------------------------------------+
 */

@@ -6,7 +6,7 @@
   | This source file is subject to the TSRM license, that is bundled     |
   | with this package in the file LICENSE                                |
   +----------------------------------------------------------------------+
-   | Authors:  Zeev Suraski <zeev@php.net>                                |
+   | Authors:  Zeev Suraski <zeev@zend.com>                               |
   +----------------------------------------------------------------------+
 */

@@ -167,7 +167,13 @@ TSRM_API const char *tsrm_api_name(void);
 #define TSRMG_BULK_STATIC(id, type)	((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
 #define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
 #define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
+#if ZEND_DEBUG
 #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
+#define TSRMLS_CACHE_RESET()
+#else
+#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
+#define TSRMLS_CACHE_RESET()  TSRMLS_CACHE = NULL
+#endif
 #define TSRMLS_CACHE _tsrm_ls_cache

 /* BC only */
@@ -1,3 +1,5 @@
+
 AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
+
@@ -4,6 +4,9 @@
 #        make -f build.mk
 #
 # Written by Sascha Schumann
+#
+# $Id$ 
+

 LT_TARGETS = ltmain.sh ltconfig

@@ -31,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
@@ -1,4 +1,6 @@
 // vim:ft=javascript
+// $Id$

 ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_win32.c");
 ADD_FLAG("CFLAGS_BD_TSRM", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+
@@ -1,3 +1,4 @@
+dnl $Id$
 dnl
 dnl Minimalistic configure.ac for TSRM.
 dnl
@@ -11,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])
@@ -31,5 +32,4 @@ unistd.h \
 limits.h
 )

-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+AC_OUTPUT(Makefile)
@@ -1,6 +1,6 @@
-# ==================================================================================
-#  https://www.gnu.org/software/autoconf-archive/ax_func_which_gethostbyname_r.html
-# ==================================================================================
+# =================================================================================
+#  http://www.gnu.org/software/autoconf-archive/ax_func_which_gethostbyname_r.html
+# =================================================================================
 #
 # SYNOPSIS
 #
@@ -46,7 +46,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
@@ -61,7 +61,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.

-#serial 8
+#serial 7

 AC_DEFUN([AX_FUNC_WHICH_GETHOSTBYNAME_R], [

@@ -194,3 +194,4 @@ 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
@@ -113,7 +113,7 @@ CFLAGS=$save_CFLAGS
 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,4 +1,26 @@
-m4_include([TSRM/m4/ax_func_which_gethostbyname_r.m4])
+m4_include([TSRM/m4/gethostbyname.m4])
+
+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_), [
+  echo 'void somefunc() { };' > conftest.c
+  cmd='$CC $1 -c conftest.c'
+  if eval $cmd 2>&1 | egrep -e $1 >/dev/null ; then
+    ac_result=no
+  else
+    ac_result=yes
+  fi
+  eval $gcc_arg_name=$ac_result
+  rm -f conftest.*
+  ])
+  if eval test "\$$gcc_arg_name" = "yes"; then
+    $2
+  else
+    :
+    $3
+  fi
+])

 AC_DEFUN([TSRM_BASIC_CHECKS],[

@@ -53,9 +75,9 @@ AC_DEFUN([TSRM_CHECK_ST],[
 sinclude(threads.m4)

 AC_DEFUN([TSRM_CHECK_PTHREADS],[
-
+		
 PTHREADS_CHECK
-
+	
 if test "$pthreads_working" != "yes"; then
  AC_MSG_ERROR(Your system seems to lack POSIX threads.)
 fi
@@ -16,6 +16,8 @@
   +----------------------------------------------------------------------+
 */

+/* $Id$ */
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <io.h>
@@ -16,6 +16,8 @@
   +----------------------------------------------------------------------+
 */

+/* $Id$ */
+
 #ifndef TSRM_WIN32_H
 #define TSRM_WIN32_H

@@ -22,7 +22,7 @@ PHP 7.3 UPGRADE NOTES
 Core:
  . The ext_skel utility has been completely redesigned with new options and
    some old options removed. This is now written in PHP and has no external
-    dependencies.
+	dependencies.
  . Support for BeOS has been dropped.
  . Exceptions thrown due to automatic conversion of warnings into exceptions
    in EH_THROW mode (e.g. some DateTime exceptions) no longer populate
@@ -44,21 +44,8 @@ Core:
    the following "FOO;" will cause a syntax error. This issue can always be
    resolved by choosing an ending label that does not occur within the contents
    of the string.
-  . "continue" statements targeting "switch" control flow structures will now
-    generate a warning. In PHP such "continue" statements are equivalent to
-    "break", while they behave as "continue 2" in other languages.
-
-        while ($foo) {
-            switch ($bar) {
-                case "baz":
-                    continue;
-                    // Warning: "continue" targeting switch is equivalent to
-                    //          "break". Did you mean to use "continue 2"?
-            }
-        }
-
  . Array accesses of type $obj["123"], where $obj implements ArrayAccess and
-    "123" is an integer string literal will no longer result in an implicit
+    "123" is an integral string literal will no longer result in an implicit
    conversion to integer, i.e., $obj->offsetGet("123") will be called instead
    of $obj->offsetGet(123). This matches existing behavior for non-literals.
    The behavior of arrays is not affected in any way, they continue to
@@ -93,37 +80,12 @@ Core:
    note that reading and writing a value inside a single expression remains
    undefined behavior and may change again in the future.

-  . Argument unpacking stopped working with Traversables with non-integer keys.
-    The following code worked in PHP 7.0-7.2 by accident.
-
-        function foo(...$args) {
-            var_dump($args);
-        }
-        function gen() {
-            yield 1.23 => 123;
-        }
-        foo(...gen());
-
-    Now it generates an exception.
-
 BCMath:
  . All warnings thrown by BCMath functions are now using PHP's error handling.
    Formerly some warnings have directly been written to stderr.
  . bcmul() and bcpow() now return numbers with the requested scale. Formerly,
    the returned numbers may have omitted trailing decimal zeroes.

-IMAP:
-  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.
-
-MBString:
-  . Due to added support for named captures, mb_ereg_*() patterns using named
-    captures will behave differently. In particular named captures will be part
-    of matches and mb_ereg_replace() will interpret additional syntax. See
-    "New Features" section for more information.
-
 mysqli:
  . Prepared statements now properly report the fractional seconds for DATETIME/
    TIME/TIMESTAMP columns with decimals specifier (e.g. TIMESTAMP(6) when using
@@ -158,10 +120,8 @@ SimpleXML:
 Standard:
  . Undefined variables passed to compact() will now be reported as a notice.
  . getimagesize() and related functions now report the mime type of BMP images
-    as image/bmp instead of image/x-ms-bmp, since the former has been registered
-    with the IANA (see RFC 7903).
-  . stream_socket_get_name() will now return IPv6 addresses wrapped in brackets.
-    For example "[::1]:1337" will be returned instead of "::1:1337".
+	  as image/bmp instead of image/x-ms-bmp, since the former has been registered
+		with the IANA (see RFC 7903).

 ========================================
 2. New Features
@@ -183,8 +143,6 @@ Core:
    of generating a fatal error. Currently this only affects compilation errors
    that may be thrown by token_get_all() in TOKEN_PARSE mode, but more errors
    may be converted in the future.
-  . Trailing commas in function and method calls are now allowed.
-    (RFC: https://wiki.php.net/rfc/trailing-comma-function-calls)

 BCMath:
  . bcscale() can now also be used as getter to retrieve the current scale in use.
@@ -221,21 +179,6 @@ MBString:
  . Mbstring now correctly supports strings larger than 2GB.
  . Performance of the mbstring extension has been significantly improved
    across the board. The largest improvements are in case conversion functions.
-  . mb_ereg_*() functions now support named captures. Matching functions like
-    mb_ereg() will now return named captures both using their group number and
-    their name, similar to PCRE:
-
-        mb_ereg('(?<word>\w+)', '国', $matches);
-        // => [0 => "国", 1 => "国", "word" => "国"];
-
-    Additionally, mb_ereg_replace() now supports the \k<> and \k'' notations
-    to reference named captures in the replacement string:
-
-        mb_ereg_replace('\s*(?<word>\w+)\s*', "_\k<word>_\k'word'_", ' foo ');
-        // => "_foo_foo_"
-
-    \k<> and \k'' can also be used for numbered references, which also works
-    with group numbers greater than 9.

 readline:
  . Support for the completion_append_character and completion_suppress_append
@@ -243,17 +186,13 @@ readline:
    if PHP is linked against libreadline (rather than libedit).

 Standard:
-  . The --with-password-argon2[=dir] configure argument now provides support for
-    both Argon2i and Argon2id hashes in the password_hash(), password_verify(),
+  . The -–with-password-argon2[=dir] configure argument now provides support for 
+    both Argon2i and Argon2id hashes in the password_hash(), password_verify(), 
    password_get_info(), and password_needs_rehash() functions. Passwords may be
    hashed and verified using the PASSWORD_ARGON2ID constant.
    Support for both Argon2i and Argon2id in the password_* functions now requires
    PHP be linked against libargon2 reference library >= 20161029.
-    (RFC: https://wiki.php.net/rfc/argon2_password_hash_enhancements).
-
-LDAP:
-  . Full support for LDAP Controls has been added to LDAP querying functions
-    and ldap_parse_result
+    (RFC: https://wiki.php.net/rfc/argon2_password_hash_enhancements). 

 ========================================
 3. Changes in SAPI modules
@@ -263,82 +202,15 @@ phpdbg:
  . The unused constants PHPDBG_FILE, PHPDBG_METHOD, PHPDBG_LINENO and
    PHPDBG_FUNC have been removed.

-FPM:
-  . A new global option log_limit has been added. It can be used for setting
-    log limit for logged line which allows to log messages longer than 1024
-    characters without wrapping. It also fixes various wrapping issues.
-  . A new global option log_buffering has been added. It allows an experimental
-    logging without extra buffering.
-  . A new pool option decorate_workers_output has been added. It allows
-    disabling output decoration for workers output when catch_workers_output
-    enabled.
-  . The getallheaders() function is now also available.
-
 ========================================
 4. Deprecated Functionality
 ========================================

-Core:
-  . The declaration of case-insensitive constants has been deprecated. Passing
-    true as the third argument to define() will now generate a deprecation
-    warning. The use of case-insensitive constants with a case that differs from
-    the declaration is also deprecated.
-    (RFC: https://wiki.php.net/rfc/case_insensitive_constant_deprecation)
-  . Declaring a function called assert() inside a namespace is deprecated.
-    The assert() function is subject to special handling by the engine, which
-    may lead to inconsistent behavior when defining a namespaced function with
-    the same name.
-
-Filter:
-  . The explicit usage of the constants FILTER_FLAG_SCHEME_REQUIRED and
-    FILTER_FLAG_HOST_REQUIRED is now deprecated; both are implied for
-    FILTER_VALIDATE_URL anyway.
-
 GD:
  . image2wbmp() has been deprecated.

 Intl:
-  . Usage of the Normalizer::NONE form throws a deprecation warning, if PHP is
-    linked with ICU >= 56.
-
-Mbstring:
-  . The following undocumented mbereg_*() aliases have been deprecated. Use the
-    corresponding mb_ereg_*() variants instead.
-     . mbregex_encoding()
-     . mbereg()
-     . mberegi()
-     . mbereg_replace()
-     . mberegi_replace()
-     . mbsplit()
-     . mbereg_match()
-     . mbereg_search()
-     . mbereg_search_pos()
-     . mbereg_search_regs()
-     . mbereg_search_init()
-     . mbereg_search_getregs()
-     . mbereg_search_getpos()
-     . mbereg_search_setpos()
-
-PDO ODBC:
-  . The pdo_odbc.db2_instance_name ini setting has been formally deprecated. It
-    has already been deprecated in the documentation since PHP 5.1.1.
-
-Standard:
-  . Passing a non-string needle to string search functions is deprecated. In the
-    future the needle will be interpreted as a string instead of an ASCII codepoint.
-    Depending on the intended behavior, you should either explicitly cast the
-    needle to string or perform an explicit call to chr(). The following functions
-    are affected:
-      . strpos()
-      . strrpos()
-      . stripos()
-      . strripos()
-      . strstr()
-      . strchr()
-      . strrchr()
-      . stristr()
-  . The fgetss() function and the string.strip_tags stream filter have been deprecated.
-    This also affects the SplFileObject::fgetss() method and gzgetss() function.
+  . Usage of the Normalizer::NONE form throws a deprecation warning, if PHP is linked with ICU >= 56.

 ========================================
 5. Changed Functions
@@ -352,37 +224,15 @@ JSON:
    precedence over JSON_THROW_ON_ERROR.
    (RFC: https://wiki.php.net/rfc/json_throw_on_error)

-Session:
-  . session_set_cookie_params() now also supports the following signature:
-    session_set_cookie_params(array $options)
-    where $options is an associative array which may have any of the keys
-    "lifetime", "path", "domain", "secure", "httponly" and "samesite".
-    Accordingly, the return value of session_get_cookie_params() now also has an
-    element with the key "samesite".
-
 Standard:
  . debug_zval_dump() was changed to display recursive arrays and objects
    in the same way as var_dump(). Now, it doesn't display them twice.
  . array_push() and array_unshift() can now also be called with a single
    argument, which is particularly convenient wrt. the spread operator.
-  . setcookie() and setrawcookie() now also support the following signature:
-    set(raw)cookie(string $name, [string $value, [array $options]])
-    where $options is an associative array which may have any of the keys
-    "expires", "path", "domain", "secure", "httponly" and "samesite".

 PCRE:
  . preg_quote() now also escapes the '#' character.

-LDAP:
-  . Added a serverctrls parameter to send controls to the server in ldap_add,
-    ldap_mod_replace, ldap_mod_add, ldap_mod_del, ldap_rename,
-    ldap_compare, ldap_delete, ldap_modify_batch,
-    ldap_search, ldap_list, ldap_read
-  . Added an out parameter to get controls from the server in ldap_parse_result
-  . Fixed support for LDAP_OPT_SERVER_CONTROLS and LDAP_OPT_CLIENT_CONTROLS in
-    ldap_get_option and ldap_set_option.
-
-
 ========================================
 6. New Functions
 ========================================
@@ -397,18 +247,11 @@ Core:
    are available under Linux, FreeBSD, Windows, Mac, SunOS, AIX and their
    derivatives. If no required timers are provided by a corresponding
    platform, the function returns false.
-  . Added net_get_interfaces() to retrieve an array of available network
-    interfaces including several details.
-  . Added the gc_status() function to retrieve status information regarding the
-    cyclic GC.

 Date:
  . Added the DateTime::createFromImmutable() method, which mirrors
    DateTimeImmutable::createFromMutable().

-FPM:
-  . Added fpm_get_status() function which returns FPM status info array.
-
 GMP:
  . Added gmp_binomial(n, k) for calculating binomial coefficients.
  . Added gmp_lcm(a, b) for calculating the least common multiple.
@@ -430,10 +273,6 @@ Intl:
  . Added Normalizer::getRawDecomposition() and normalizer_get_raw_decomposition(),
    to retrieve the Decomposition_Mapping property of a character.

-LDAP:
-  . Added ldap_exop_refresh() to conveniently perform a Refresh extended
-    operation.
-
 OpenSSL:
  . Added openssl_pkey_derive that derives a shared secret for DH, ECDH and
    possibly other future algorithms supported by EVP_PKEY_derive.
@@ -457,16 +296,6 @@ Standard:
  . Added is_countable() function, to check whether a value may be passed to
    count().
    (RFC: https://wiki.php.net/rfc/is-countable)
-  . Added array_key_first() and array_key_last() which retrieve the first and
-    last key of an array, respectively.
-    (RFC: <https://wiki.php.net/rfc/array_key_first_last>)
-
-LDAP:
-  . Added functions ldap_add_ext, ldap_bind_ext, ldap_delete_ext, ldap_mod_add_ext,
-    ldap_mod_replace_ext, ldap_mod_del_ext, ldap_rename_ext
-    which gives access to the result object to be able to parse it
-    with ldap_parse_result and get more information than just success/failure.
-

 ========================================
 7. New Classes and Interfaces
@@ -490,9 +319,6 @@ JSON:
  . FILTER_VALIDATE_FLOAT now also supports a `thousand` option, which
    defines the set of allowed thousand separator chars.  The default (`"',."`)
    is fully backward compatible with former PHP versions.
-  . FILTER_SANITIZE_ADD_SLASHES has been added as an alias of the 'magic_quotes'
-    filter (FILTER_SANITIZE_MAGIC_QUOTES). The 'magic_quotes' filter is subject
-  	to removal in future versions of PHP.

 FTP:
  . Set default transfer mode to binary
@@ -509,157 +335,25 @@ JSON:
  . Support for ODBCRouter has been removed.
  . Support for Birdstep has been removed.

- OpenSSL:
-  . The min_proto_version and max_proto_version ssl stream options as well as
-    related constants for possible TLS protocol values have been added.
-    See <https://github.com/php/php-src/pull/3317>.
-
- PCRE:
+PCRE:
  . The PCRE extension has been upgraded to PCRE2, which may cause minor
-    behavioral changes (for instance, character ranges in classes are now more
-    strictly interpreted), and augments the existing regular expression syntax.
+    behavioral changes, and augments the existing regular expression syntax.
    See <https://wiki.php.net/rfc/pcre2-migration> for details.

- PDO_DBLIB:
-  . Added the attribute PDO::DBLIB_ATTR_SKIP_EMPTY_ROWSETS to enable automatic
-    skipping of empty rowsets.
-  . Exposed the TDS version via the PDO::DBLIB_ATTR_TDS_VERSION attribute.
-  . DATETIME2 columns are now treated like DATETIME columns.
-
- PDO_SQLite:
-  . SQLite3 databases can now be opened in read-only mode by setting the
-    new PDO::SQLITE_ATTR_OPEN_FLAGS attribute to PDO::SQLITE_READONLY.
-
- Standard:
-  . var_export() now exports stdClass objects as an array casted to an object
-    (`(object) array( ... )`), rather than using the nonexistent method
-    stdClass::__setState().
-
- Tidy:
-  . Building against tidyp (<https://github.com/petdance/tidyp>) is now also
-    supported transparently. Since tidyp offers no API to get the release date,
-    tidy_get_release() and tidy::getRelease() return 'unknown' in this case.
-
- XML:
-  . The return value of the `xml_set_external_entity_ref_handler()` callback is
-    now also heeded if the extension has been built against libxml. Formerly,
-    the return value has been ignored, and parsing did never stop.
-
- Zip:
-  . Building against the bundled libzip is discouraged, but still possible by
-    adding `--without-libzip` to the configuration.
-
- zlib:
-  . Added the zlib/level context option for the compress.zlib wrapper to
-    facilitate setting the desired compression level.
+ ZIP:
+  . Bundled libzip has been dropped,
+    system library is now required.

 ========================================
 10. New Global Constants
 ========================================

 Curl:
-  . CURLAUTH_BEARER
-  . CURLAUTH_GSSAPI
-  . CURLE_WEIRD_SERVER_REPLY
-  . CURLINFO_APPCONNECT_TIME_T
-  . CURLINFO_CONNECT_TIME_T
-  . CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
-  . CURLINFO_CONTENT_LENGTH_UPLOAD_T
-  . CURLINFO_FILETIME_T
-  . CURLINFO_HTTP_VERSION
-  . CURLINFO_NAMELOOKUP_TIME_T
-  . CURLINFO_PRETRANSFER_TIME_T
-  . CURLINFO_PROTOCOL
-  . CURLINFO_PROXY_SSL_VERIFYRESULT
-  . CURLINFO_REDIRECT_TIME_T
-  . CURLINFO_SCHEME
-  . CURLINFO_SIZE_DOWNLOAD_T
-  . CURLINFO_SIZE_UPLOAD_T
-  . CURLINFO_SPEED_DOWNLOAD_T
-  . CURLINFO_SPEED_UPLOAD_T
-  . CURLINFO_STARTTRANSFER_TIME_T
-  . CURLINFO_TOTAL_TIME_T
-  . CURL_LOCK_DATA_CONNECT
-  . CURL_LOCK_DATA_PSL
-  . CURL_MAX_READ_SIZE
-  . CURLOPT_ABSTRACT_UNIX_SOCKET
-  . CURLOPT_DISALLOW_USERNAME_IN_URL
-  . CURLOPT_DNS_SHUFFLE_ADDRESSES
-  . CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS
-  . CURLOPT_HAPROXYPROTOCOL
-  . CURLOPT_KEEP_SENDING_ON_ERROR
-  . CURLOPT_PRE_PROXY
-  . CURLOPT_PROXY_CAINFO
-  . CURLOPT_PROXY_CAPATH
-  . CURLOPT_PROXY_CRLFILE
-  . CURLOPT_PROXY_KEYPASSWD
-  . CURLOPT_PROXY_PINNEDPUBLICKEY
-  . CURLOPT_PROXY_SSLCERT
-  . CURLOPT_PROXY_SSLCERTTYPE
-  . CURLOPT_PROXY_SSL_CIPHER_LIST
-  . CURLOPT_PROXY_SSLKEY
-  . CURLOPT_PROXY_SSLKEYTYPE
-  . CURLOPT_PROXY_SSL_OPTIONS
-  . CURLOPT_PROXY_SSL_VERIFYHOST
-  . CURLOPT_PROXY_SSL_VERIFYPEER
-  . CURLOPT_PROXY_SSLVERSION
-  . CURLOPT_PROXY_TLS13_CIPHERS
-  . CURLOPT_PROXY_TLSAUTH_PASSWORD
-  . CURLOPT_PROXY_TLSAUTH_TYPE
-  . CURLOPT_PROXY_TLSAUTH_USERNAME
  . CURLOPT_REQUEST_TARGET
-  . CURLOPT_SOCKS5_AUTH
-  . CURLOPT_SSH_COMPRESSION
-  . CURLOPT_SUPPRESS_CONNECT_HEADERS
-  . CURLOPT_TIMEVALUE_LARGE
-  . CURLOPT_TLS13_CIPHERS
-  . CURLPROXY_HTTPS
-  . CURLSSH_AUTH_GSSAPI
-  . CURL_SSLVERSION_MAX_DEFAULT
-  . CURL_SSLVERSION_MAX_NONE
-  . CURL_SSLVERSION_MAX_TLSv1_0
-  . CURL_SSLVERSION_MAX_TLSv1_1
-  . CURL_SSLVERSION_MAX_TLSv1_2
-  . CURL_SSLVERSION_MAX_TLSv1_3
-  . CURL_SSLVERSION_TLSv1_3
-  . CURL_VERSION_ALTSVC
-  . CURL_VERSION_ASYNCHDNS
-  . CURL_VERSION_BROTLI
-  . CURL_VERSION_CONV
-  . CURL_VERSION_CURLDEBUG
-  . CURL_VERSION_DEBUG
-  . CURL_VERSION_GSSAPI
-  . CURL_VERSION_GSSNEGOTIATE
-  . CURL_VERSION_HTTPS_PROXY
-  . CURL_VERSION_IDN
-  . CURL_VERSION_LARGEFILE
-  . CURL_VERSION_MULTI_SSL
-  . CURL_VERSION_NTLM
-  . CURL_VERSION_NTLM_WB
-  . CURL_VERSION_PSL
-  . CURL_VERSION_SPNEGO
-  . CURL_VERSION_SSPI
-  . CURL_VERSION_TLSAUTH_SRP
-
-Filter:
-  . FILTER_SANITIZE_ADD_SLASHES

 JSON:
  . JSON_THROW_ON_ERROR

-OpenSSL:
-  . STREAM_CRYPTO_PROTO_SSLv3
-  . STREAM_CRYPTO_PROTO_TLSv1_0
-  . STREAM_CRYPTO_PROTO_TLSv1_1
-  . STREAM_CRYPTO_PROTO_TLSv1_2
-
-MBString:
-  . MB_CASE_FOLD
-  . MB_CASE_LOWER_SIMPLE
-  . MB_CASE_UPPER_SIMPLE
-  . MB_CASE_TITLE_SIMPLE
-  . MB_CASE_FOLD_SIMPLE
-
 PGSQL:
  . Requires Postgres 9.3
    - PGSQL_DIAG_SCHEMA_NAME
@@ -673,34 +367,6 @@ PGSQL:
 Standard:
  . PASSWORD_ARGON2ID

-LDAP:
-  . LDAP_CONTROL_MANAGEDSAIT
-  . LDAP_CONTROL_PROXY_AUTHZ
-  . LDAP_CONTROL_SUBENTRIES
-  . LDAP_CONTROL_VALUESRETURNFILTER
-  . LDAP_CONTROL_ASSERT
-  . LDAP_CONTROL_PRE_READ
-  . LDAP_CONTROL_POST_READ
-  . LDAP_CONTROL_SORTREQUEST
-  . LDAP_CONTROL_SORTRESPONSE
-  . LDAP_CONTROL_PAGEDRESULTS
-  . LDAP_CONTROL_AUTHZID_REQUEST
-  . LDAP_CONTROL_AUTHZID_RESPONSE
-  . LDAP_CONTROL_SYNC
-  . LDAP_CONTROL_SYNC_STATE
-  . LDAP_CONTROL_SYNC_DONE
-  . LDAP_CONTROL_DONTUSECOPY
-  . LDAP_CONTROL_PASSWORDPOLICYREQUEST
-  . LDAP_CONTROL_PASSWORDPOLICYRESPONSE
-  . LDAP_CONTROL_X_INCREMENTAL_VALUES
-  . LDAP_CONTROL_X_DOMAIN_SCOPE
-  . LDAP_CONTROL_X_PERMISSIVE_MODIFY
-  . LDAP_CONTROL_X_SEARCH_OPTIONS
-  . LDAP_CONTROL_X_TREE_DELETE
-  . LDAP_CONTROL_X_EXTENDED_DN
-  . LDAP_CONTROL_VLVREQUEST
-  . LDAP_CONTROL_VLVRESPONSE
-
 ========================================
 11. Changes to INI File Handling
 ========================================
@@ -712,28 +378,14 @@ LDAP:
  . This INI directive has been removed. The value has already been ignored
    since PHP 5.3.0.

- session.cookie_samesite
-  . New INI option to allow to set the SameSite directive for cookies. Defaults
-    to "" (empty string), so no SameSite directive is set. Can be set to "Lax"
-    or "Strict", which sets the respective SameSite directive.
-
 - syslog.facility
  - New INI to set syslog facility which specifies what type of program is
    logging the message. It is used only when error_log is set to syslog.

- syslog.filter
-  . New INI to set syslog filter type to filter the logged messages. There are
-    3 supported filter types - all, no-ctrl and ascii. It is used only when
-    error_log is set to syslog.
-
 - syslog.ident
  . New INI to set syslog ident string which is prepended to every message. It
    is used only when error_log is set syslog.

- mbstring.regex_stack_limit
-  . New INI directive (since 7.3.5) limiting stack depth of mbstring/oniguruma
-  regular expressions.
-
 ========================================
 12. Windows Support
 ========================================
@@ -749,5 +401,3 @@ LDAP:
 13. Other Changes
 ========================================

-. The cyclic GC has been enhanced, which may result in considerable performance
-  improvements.
@@ -21,14 +21,6 @@ PHP 7.3 INTERNALS UPGRADE NOTES
  r. php_url
  s. zend_function.reserved[]
  t. zif_handler
-  u. GC_G
-  v. php_add[c]slashes
-  w. zend_class_entry.iterator_funcs
-  x. Class declaration opcodes (DECLARE_INHERITED_CLASS ...)
-  y. zend_constant
-  z. HAVE_ST_BLKSIZE and HAVE_ST_RDEV
-  aa. RETSIGTYPE
-  bb. php_setcookie

 2. Build system changes
  a. Unix build system changes
@@ -57,8 +49,8 @@ PHP 7.3 INTERNALS UPGRADE NOTES
     As result some related macros were removed (ZEND_EX_USE_LITERALS,
     EX_LOAD_LITERALS, EX_LITERALS, RT_CONSTANT_EX, EX_CONSTANT) or changed
     (RT_CONSTANT, ZEND_PASS_TWO_UPDATE_CONSTANT, ZEND_PASS_TWO_UNDO_CONSTANT).
-     This change may affect only some "system" extensions. EX_LITERALS,
-     RT_CONSTANT_EX, EX_CONSTANT should be substituted by RT_CONSTANT, and now
+     This change way affect only some "system" extensions. EX_LITERALS,
+     RT_CONSTANT_EX, EX_CONSTANT should be substituted by RT_CONSTANT than now
     use "opline" (instead of "op_array") as first argument.

  c. Protection from recursion during processing circular data structures was
@@ -72,7 +64,7 @@ PHP 7.3 INTERNALS UPGRADE NOTES
     HASH_FLAG_APPLY_PROTECTION flag and ZEND_HASH_APPLY_PROTECTION() macro
     are removed. All mutable arrays should use recursion protection.
     Corresponding checks should be replaced by Z_REFCOUNTED() or
-     !(GC_FLAGS(p) & GC_IMMUTABLE).
+     !(GC_GLAGS(p) & GC_IMMUTABLE).

  d. HASH_FLAG_PERSISTENT renamed into IS_ARRAY_PERSISTENT and moved into
     GC_FLAGS (to be consistent with IS_STR_PERSISTENT).
@@ -102,7 +94,7 @@ PHP 7.3 INTERNALS UPGRADE NOTES
     zend_register_persistent_resource_ex() should beused to register
     persistent resources, instead of manual insertion into EG(persistent_list).

-  i. The RAND_RANGE() macro has been removed. php_mt_rand_range() should be
+  i. The RANGE_RANGE() macro has been removed. php_mt_rand_range() should be
     used instead.

  j. The cast_object() object handler now also accepts the _IS_NUMBER type. The
@@ -122,7 +114,7 @@ PHP 7.3 INTERNALS UPGRADE NOTES

  n. IS_TYPE_COPYABLE flag is removed. IS_STRING zvals didn't need to be
     duplication by zval_copy_ctor(), ZVAL_DUP() and SEPARATE_ZVAL*() macros.
-     Interned strings didn't set IS_TYPE_COPYABLE, so they aren't affected at
+     Interned strings didn't set IS_TYPE_COPYALE, so they aren't affected at
     all. Now instead of checking for IS_TYPE_COPYABLE, engine checks for
     IS_ARRAY type (it may be IS_TYPE_REFCOUNTED or not). All the related
     macros: Z_COPYABLE..., Z_IMMUTABLE... are kept for compatibility.
@@ -146,49 +138,11 @@ PHP 7.3 INTERNALS UPGRADE NOTES
 t. For internal functions the typedef zif_handler has been introduced.  It is
    recommended to use this from now on, instead of defining own handler types.

- u. The GC globals (GC_G) are now private. Use the new zend_gc_get_status() to
-    retrieve status information of the GC.
-
- v. The should_free argument of the php_add[c]slashes functions has been
-    removed.  It is now always the caller's responsibility to free the passed
-    string.
-
- w. zend_class_entry.iterator_funcs have been replaced by iterator_funcs_ptr.
-    You don't have to set its value, setting parent.funcs in the get_iterator
-    function is enough.
-
- x. Class declaration opcode formats were changed
-  - DECLARE_INHERITED_CLASS and DECLARE_ANON_INHERITED_CLASS now encode parent
-    class name in second operand directly (as IS_CONST operand). Previously,
-    parent class was fetched by the prior FETCH_CLASS opcode.
-  - ADD_INTERFACE and ADD_TRAIT don't use run-time cache to keep interface or
-    trait. These instructions are executed once, and caching is useless.
-
- y. zend_constant.flags and zend_constant.module_number are packed into
-    reserved space inside zend_constant.value. They should be accessed using
-    ZEND_CONSTANT_FLAGS(), ZEND_CONSTANT_MODULE_NUMBER() and
-    ZEND_CONSTANT_SET_FLAGS() macros.
-
- z. HAVE_ST_BLKSIZE must be replaced with HAVE_STRUCT_STAT_ST_BLKSIZE and
-    HAVE_ST_RDEV must be replaced with HAVE_STRUCT_STAT_ST_RDEV.
-
- aa. RETSIGTYPE has been removed from the generated php_config.h and should be
-    replaced with void.
-
- bb. php_setcookie() now expects an additional samesite argument, and the
-    url_encode parameter has been moved to the end. The signature is now:
-    int php_setcookie(zend_string *name, zend_string *value, time_t expires,
-                      zend_string *path, zend_string *domain, int secure,
-                      int httponly, zend_string *samesite, int url_encode);
-
 ========================
 2. Build system changes
 ========================

  a. Unix build system changes
-    - PHP_PROG_LEX, TSRM_CHECK_GCC_ARG, and LIBZEND_CPLUSPLUS_CHECKS Autoconf
-      macros have been removed.
-    - Minimum Autoconf version is 2.68+ for generating the configure script.

  b. Windows build system changes
    - ZEND_WIN32_FORCE_INLINE doesn't affect C++ anymore. zend_always_inline is
@@ -206,3 +160,4 @@ PHP 7.3 INTERNALS UPGRADE NOTES
 ========================
 3. Module changes
 ========================
+
@@ -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,3 +53,4 @@ depend:

 zend_execute.lo: $(srcdir)/zend_execute.c
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(INLINE_CFLAGS) -c $(srcdir)/zend_execute.c
+
@@ -0,0 +1,195 @@
+Creating an object
+------------------
+
+Object can be created in the following ways:
+
+1. As a result of a function call. E.g.:
+
+$foo = create_new_foo("parameter");
+$foo->run();
+
+The function should create a new zval, create new object and get the
+handle for it, set handle and handler table as needed. Note that the
+handle is the only ID of the object, so it should be enough to
+identify it.
+
+2. Overriding create_object handler for class. E.g.:
+
+$foo = new Java("some.Class.here", "parameter");
+$foo->run();
+
+The  create_object handler function should create a new zval, create
+new object and get the handle for it, set handle and handler table as
+needed, and also provide constructor method that would handle
+constructor call. The get_constructor handler table entry should be
+used for that. Do not rely class entry's constructor, unless you refer
+to it from get_constructor handler.
+
+Object maintenance
+------------------
+
+The handlers add_ref and del_ref are called when a new zval referring
+to the object is created. This does not create a new object - both
+zvals still refer to the same object.
+
+clone_obj handler should create a new object, identical to an old one, 
+but being a separate entity.
+
+delete_obj should destroy an object, all references to it become
+invalid.
+
+Object access - read
+--------------------
+
+read_property is used to read object's property. This value is not
+meant to be changed. The handler returns zval * with the value.
+
+Object access - write
+---------------------
+
+write_property is used to directly write object's property by
+name.  This handler is used to assign property variables or to change them 
+in operations like += or ++ (unless get_property_zval_ptr is also set).
+
+get_property_zval_ptr is used to obtain pointer to modifiable zval for 
+operations like += or ++. This should be used only if your object model 
+stores properties as real zval's that can be modified from outside. 
+Otherwise this handler should be NULL and the engine will use 
+read_property and write_property instead.
+
+get_property_ptr is used to obtain zval ** for future writing to
+it. If your object properties are stored as zval*, return real place
+where the property is stored. If the aren't, the best way is to create 
+proxy object and handle it via get and set methods (see below). 
+This method is meant to be used for send-by-reference and assign-by-reference
+use of object properties. If you don;t want to implement property
+referencing for your objects, you can set this handler to NULL. 
+
+get and set handlers are used when engine needs to access the object
+as a value. E.g., in the following situation:
+
+$foo =& $obj->bar;
+$foo = 1;
+
+if $foo is an object (e.g., proxy object from get_property_ptr) it
+would be accessed using write handler.
+
+Object access - method call
+---------------------------
+
+get_method handler is used to find method description by name. It
+should set right type, function name and parameter mask for the
+method. If the type is ZEND_OVERLOADED_FUNCTION, the method would be
+called via call_method handler, otherwise it would be called with
+standard Zend means.
+
+get_constructor performs the same function as get_method, but for the
+object constructor. 
+
+call_method handler is used to perform method call. Parameters are
+passed like to any other Zend internal function. 
+
+Object - comparison
+-------------------
+
+Objects can be compared via compare_objects handler. This is used with 
+== operation, === compares objects by handles, i.e., return true if
+and only if it's really the same object. Note that objects from
+different object types (i.e., having different handlers) can not be
+compared. 
+
+Objects - reflection
+--------------------
+
+get_class_name is used to retrieve class name of the object. 
+get_class_entry returns class entry (zend_class_entry) for the object,
+in case there exists PHP class for it.
+No other reflection functions are currently implemented.
+
+Objects - data structures and handlers
+---------------------------------------
+
+The object is represented by the following structure:
+
+struct _zend_object_value {
+	zend_object_handle handle;
+	zend_object_handlers *handlers;
+};
+
+handle is an ID of the object among the objects of the same type (not
+class!). The type of the object and how it behaves is determined by
+the handler table.
+
+typedef struct _zend_object_handlers {
+	zend_object_add_ref_t                    add_ref;
+	zend_object_del_ref_t                    del_ref;
+	zend_object_delete_obj_t                 delete_obj;
+	zend_object_clone_obj_t                  clone_obj;	
+	zend_object_read_property_t              read_property;
+	zend_object_write_property_t             write_property;
+	zend_object_get_property_ptr_t           get_property_ptr;
+	zend_object_get_property_zval_ptr_t      get_property_zval_ptr;
+	zend_object_get_t                        get;
+	zend_object_set_t                        set;
+	zend_object_has_property_t               has_property;
+	zend_object_unset_property_t             unset_property;
+	zend_object_get_properties_t             get_properties;
+	zend_object_get_method_t                 get_method;
+	zend_object_call_method_t                call_method;
+	zend_object_get_constructor_t            get_constructor;
+	zend_object_get_class_entry_t            get_class_entry;
+	zend_object_get_class_name_t             get_class_name;
+	zend_object_compare_t                    compare_objects;
+} zend_object_handlers;
+
+See zend_object_handlers.h for prototypes. All objects are passed as zval's.
+
+Handlers explained:
+
+add_ref - called when a copy of the object handle is created.
+
+del_ref - called when a copy of the object handle is destroyed.
+
+delete_obj - called when an object needs to be destroyed.
+
+clone_obj - called when a new object identical to an old one should be 
+created (unlike Zend Engine 1, this never happens unless explicitly
+asked for).
+
+read_property - returns zval *, containing the value of the
+property. Is used when value of the property should be retrieved for
+reading.
+
+write_property - assigns value to certain property of the object. 
+
+get_property_zval_ptr - retrieves zval** for being directly modified by 
+the engine. If your properties are not zval's, don't define it.
+
+get_property_ptr - retrieves zval** for the property of the value, to
+be used for read and write. If object properties are not zval's
+natively, this method should create and return proxy object for use
+with get and set methods.
+
+get - retrieves zval* for object contents. To be used mainly with
+proxy objects from get_property_ptr, but also may be used for
+convert_to_* functions.
+
+set - sets value for object contents. To be used mainly with
+proxy objects from get_property_ptr.
+
+has_property - checks if the object has certain property set.
+
+unset_property - removes value for the property of the object
+
+get_method - retrieves description of the method
+
+call_method - calls the method (parameters should be put on stack like 
+for any other PHP internal function).
+
+get_constructor - get description for the object constructor method
+
+get_class_entry - should return the class entry for the object
+
+get_class_name - get the name of the class the object belongs to
+
+compare_objects - compares if two objects are equal
@@ -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
@@ -1,27 +1,29 @@
 dnl
+dnl $Id$
+dnl
 dnl This file contains Zend specific autoconf functions.
 dnl

 AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[
 AC_MSG_CHECKING(for $1)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#if HAVE_SYS_TYPES_H
+AC_TRY_COMPILE([
+#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>
-#endif]],
-[[if (($1 *) 0)
+#endif],
+[if (($1 *) 0)
  return 0;
 if (sizeof ($1))
  return 0;
-]])],[
+],[
  AC_DEFINE_UNQUOTED([HAVE_]translit($1,a-z_-,A-Z__), 1,[Define if $1 type is present. ])
  AC_MSG_RESULT(yes)
-], [AC_MSG_RESULT(no)
-])dnl
+], AC_MSG_RESULT(no)
+)dnl
 ])

 AC_DEFUN([LIBZEND_BASIC_CHECKS],[
@@ -58,10 +60,10 @@ sys/time.h \
 signal.h \
 unix.h \
 stdlib.h \
-cpuid.h \
 dlfcn.h)

 AC_TYPE_SIZE_T
+AC_TYPE_SIGNAL

 AC_DEFUN([LIBZEND_LIBDL_CHECKS],[
 AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
@@ -107,7 +109,7 @@ ZEND_CHECK_FLOAT_PRECISION
 dnl test whether double cast to long preserves least significant bits
 AC_MSG_CHECKING(whether double cast to long preserves least significant bits)

-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_TRY_RUN([
 #include <limits.h>

 int main()
@@ -127,7 +129,7 @@ int main()
 	}
 	exit(1);
 }
-]])], [
+], [
  AC_DEFINE([ZEND_DVAL_TO_LVAL_CAST_OK], 1, [Define if double cast to long preserves least significant bits])
  AC_MSG_RESULT(yes)
 ], [
@@ -135,7 +137,7 @@ int main()
 ], [
  AC_MSG_RESULT(no)
 ])
-
+	
 ])

 AC_DEFUN([LIBZEND_ENABLE_DEBUG],[
@@ -145,7 +147,7 @@ AC_ARG_ENABLE(debug,
  ZEND_DEBUG=$enableval
 ],[
  ZEND_DEBUG=no
-])
+])  

 ])

@@ -156,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
 ],[
@@ -193,7 +195,8 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
  AC_DEFINE(ZTS,1,[ ])
  CFLAGS="$CFLAGS -DZTS"
-fi
+  LIBZEND_CPLUSPLUS_CHECKS
+fi  

 changequote({,})
 if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
@@ -219,7 +222,7 @@ dnl test and set the alignment define for ZEND_MM
 dnl this also does the logarithmic test for ZEND_MM.
 AC_MSG_CHECKING(for MM alignment and log values)

-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_TRY_RUN([
 #include <stdio.h>

 typedef union _mm_align_test {
@@ -246,16 +249,16 @@ 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);
 }
-]])], [
+], [
  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
@@ -266,7 +269,7 @@ AC_MSG_RESULT(done)
 dnl test for memory allocation using mmap(MAP_ANON)
 AC_MSG_CHECKING(for memory allocation using mmap(MAP_ANON))

-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_TRY_RUN([
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -298,7 +301,7 @@ int main()
 	}
 	return 0;
 }
-]])], [
+], [
  AC_DEFINE([HAVE_MEM_MMAP_ANON], 1, [Define if the target system has support for memory allocation using mmap(MAP_ANON)])
  AC_MSG_RESULT(yes)
 ], [
@@ -311,7 +314,7 @@ int main()
 dnl test for memory allocation using mmap("/dev/zero")
 AC_MSG_CHECKING(for memory allocation using mmap("/dev/zero"))

-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_TRY_RUN([
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -353,7 +356,7 @@ int main()
 	}
 	return 0;
 }
-]])], [
+], [
  AC_DEFINE([HAVE_MEM_MMAP_ZERO], 1, [Define if the target system has support for memory allocation using mmap("/dev/zero")])
  AC_MSG_RESULT(yes)
 ], [
@@ -371,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])
@@ -388,24 +391,28 @@ AC_MSG_RESULT($ZEND_SIGNALS)

 ])

-AC_MSG_CHECKING(whether /dev/urandom exists)
-if test -r "/dev/urandom" && test -c "/dev/urandom"; then
+AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
+
+])
+
+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
 ],[
@@ -413,7 +420,7 @@ AC_ARG_ENABLE(gcc-global-regs,
 ])
 AC_MSG_CHECKING(for global register variables support)
 if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+  AC_TRY_COMPILE([
 #if defined(__GNUC__)
 # define ZEND_GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
 #else
@@ -446,8 +453,8 @@ int emu(const opcode_handler_t *ip, void *fp) {
 	FP = orig_fp;
 	IP = orig_ip;
 }
-  ]], [[
-  ]])], [
+  ], [
+  ], [
    ZEND_GCC_GLOBAL_REGS=yes
  ], [
    ZEND_GCC_GLOBAL_REGS=no
@@ -464,7 +471,7 @@ dnl
 dnl Check if atof() accepts NAN
 dnl
 AC_CACHE_CHECK(whether atof() accepts NAN, ac_cv_atof_accept_nan,[
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_TRY_RUN([
 #include <math.h>
 #include <stdlib.h>

@@ -480,7 +487,7 @@ int main(int argc, char** argv)
 {
 	return zend_isnan(atof("NAN")) ? 0 : 1;
 }
-]])],[
+],[
  ac_cv_atof_accept_nan=yes
 ],[
  ac_cv_atof_accept_nan=no
@@ -495,7 +502,7 @@ dnl
 dnl Check if atof() accepts INF
 dnl
 AC_CACHE_CHECK(whether atof() accepts INF, ac_cv_atof_accept_inf,[
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_TRY_RUN([
 #include <math.h>
 #include <stdlib.h>

@@ -514,7 +521,7 @@ int main(int argc, char** argv)
 {
 	return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1;
 }
-]])],[
+],[
  ac_cv_atof_accept_inf=yes
 ],[
  ac_cv_atof_accept_inf=no
@@ -529,7 +536,7 @@ dnl
 dnl Check if HUGE_VAL == INF
 dnl
 AC_CACHE_CHECK(whether HUGE_VAL == INF, ac_cv_huge_val_inf,[
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_TRY_RUN([
 #include <math.h>
 #include <stdlib.h>

@@ -548,7 +555,7 @@ int main(int argc, char** argv)
 {
 	return zend_isinf(HUGE_VAL) ? 0 : 1;
 }
-]])],[
+],[
  ac_cv_huge_val_inf=yes
 ],[
  ac_cv_huge_val_inf=no
@@ -564,7 +571,7 @@ dnl
 dnl Check if HUGE_VAL + -HUGEVAL == NAN
 dnl
 AC_CACHE_CHECK(whether HUGE_VAL + -HUGEVAL == NAN, ac_cv_huge_val_nan,[
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_TRY_RUN([
 #include <math.h>
 #include <stdlib.h>

@@ -585,7 +592,7 @@ int main(int argc, char** argv)
 	return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1;
 #endif
 }
-]])],[
+],[
  ac_cv_huge_val_nan=yes
 ],[
  ac_cv_huge_val_nan=no
@@ -596,21 +603,3 @@ dnl This is the most probable fallback so we assume yes in case of cross compile
 if test "$ac_cv_huge_val_nan" = "yes"; then
  AC_DEFINE([HAVE_HUGE_VAL_NAN], 1, [whether HUGE_VAL + -HUGEVAL == NAN])
 fi
-
-dnl
-dnl Check whether __cpuid_count is available
-dnl
-AC_CACHE_CHECK(whether __cpuid_count is available, ac_cv_cpuid_count_available, [
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-  #include <cpuid.h>
-]], [[
-  unsigned eax, ebx, ecx, edx;
-  __cpuid_count(0, 0, eax, ebx, ecx, edx);
-]])], [
-  ac_cv_cpuid_count_available=yes
-], [
-  ac_cv_cpuid_count_available=no
-])])
-if test "$ac_cv_cpuid_count_available" = "yes"; then
-  AC_DEFINE([HAVE_CPUID_COUNT], 1, [whether __cpuid_count is available])
-fi
@@ -0,0 +1,258 @@
+# Microsoft Developer Studio Generated Dependency File, included by ZendCore.mak
+
+.\zend_alloc.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	
+
+.\alloca.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_config.w32.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_compile.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+.\zend_constants.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_operators.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_execute.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+.\zend_highlight.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_highlight.h"\
+	".\zend_llist.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_language_parser.tab.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_llist.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_llist.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_opcode.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+.\zend_operators.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_ptr_stack.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_ptr_stack.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_stack.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_stack.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_variables.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	".\zend_list.h"\
+	
+
+.\zend.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_operators.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_API.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	".\zend_list.h"\
+	
+
+.\zend_hash.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_config.w32.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_ini.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
@@ -1,3 +1,5 @@
+dnl $Id$
+dnl
 dnl This file contains local autoconf functions.

 AC_DEFUN([LIBZEND_BISON_CHECK],[
@@ -5,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=""

@@ -44,14 +46,16 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[

 AC_DEFUN([ZEND_FP_EXCEPT],[
  AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+    AC_TRY_COMPILE([
 #include <floatingpoint.h>
-]],[[
+],[
 fp_except x = (fp_except) 0;
-]])],[
+],[
     ac_cv_type_fp_except=yes
 ],[
     ac_cv_type_fp_except=no
+],[
+     ac_cv_type_fp_except=no
 ])])
  if test "$ac_cv_type_fp_except" = "yes"; then
    AC_DEFINE(HAVE_FP_EXCEPT, 1, [whether floatingpoint.h defines fp_except])
@@ -63,7 +67,7 @@ dnl Check for broken sprintf()
 dnl
 AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
  AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
-    AC_RUN_IFELSE([AC_LANG_SOURCE([[main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }]])],[
+    AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
      ac_cv_broken_sprintf=no
    ],[
      ac_cv_broken_sprintf=yes
@@ -87,7 +91,8 @@ AC_DEFUN([AC_ZEND_C_BIGENDIAN],
 [AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian_php,
 [
  ac_cv_c_bigendian_php=unknown
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+  AC_TRY_RUN(
+  [
 int main(void)
 {
        short one = 1;
@@ -99,7 +104,7 @@ int main(void)
                return(1);
        }
 }
-  ]])], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown])
+  ], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown])
 ])
 if test $ac_cv_c_bigendian_php = yes; then
   AC_DEFINE(WORDS_BIGENDIAN, 1, [Define if processor uses big-endian word])
@@ -114,9 +119,9 @@ dnl x87 floating point internal precision control checks
 dnl See: http://wiki.php.net/rfc/rounding
 AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
  AC_MSG_CHECKING([for usable _FPU_SETCW])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+  AC_TRY_LINK([
    #include <fpu_control.h>
-  ]],[[
+  ],[
    fpu_control_t fpu_oldcw, fpu_cw;
    volatile double result;
    double a = 2877.0;
@@ -127,18 +132,18 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
    _FPU_SETCW(fpu_cw);
    result = a / b;
    _FPU_SETCW(fpu_oldcw);
-  ]])],[ac_cfp_have__fpu_setcw=yes],[ac_cfp_have__fpu_setcw=no])
+  ], [ac_cfp_have__fpu_setcw=yes], [ac_cfp_have__fpu_setcw=no])
  if test "$ac_cfp_have__fpu_setcw" = "yes" ; then
    AC_DEFINE(HAVE__FPU_SETCW, 1, [whether _FPU_SETCW is present and usable])
    AC_MSG_RESULT(yes)
  else
    AC_MSG_RESULT(no)
  fi
-
+  
  AC_MSG_CHECKING([for usable fpsetprec])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+  AC_TRY_LINK([
    #include <machine/ieeefp.h>
-  ]],[[
+  ],[
    fp_prec_t fpu_oldprec;
    volatile double result;
    double a = 2877.0;
@@ -148,7 +153,7 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
    fpsetprec(FP_PD);
    result = a / b;
    fpsetprec(fpu_oldprec);
-  ]])], [ac_cfp_have_fpsetprec=yes], [ac_cfp_have_fpsetprec=no])
+  ], [ac_cfp_have_fpsetprec=yes], [ac_cfp_have_fpsetprec=no])
  if test "$ac_cfp_have_fpsetprec" = "yes" ; then
    AC_DEFINE(HAVE_FPSETPREC, 1, [whether fpsetprec is present and usable])
    AC_MSG_RESULT(yes)
@@ -157,9 +162,9 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
  fi

  AC_MSG_CHECKING([for usable _controlfp])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+  AC_TRY_LINK([
    #include <float.h>
-  ]],[[
+  ],[
    unsigned int fpu_oldcw;
    volatile double result;
    double a = 2877.0;
@@ -169,7 +174,7 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
    _controlfp(_PC_53, _MCW_PC);
    result = a / b;
    _controlfp(fpu_oldcw, _MCW_PC);
-  ]])], [ac_cfp_have__controlfp=yes], [ac_cfp_have__controlfp=no])
+  ], [ac_cfp_have__controlfp=yes], [ac_cfp_have__controlfp=no])
  if test "$ac_cfp_have__controlfp" = "yes" ; then
    AC_DEFINE(HAVE__CONTROLFP, 1, [whether _controlfp is present usable])
    AC_MSG_RESULT(yes)
@@ -178,9 +183,9 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
  fi

  AC_MSG_CHECKING([for usable _controlfp_s])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+  AC_TRY_LINK([
   #include <float.h>
-  ]],[[
+  ],[
    unsigned int fpu_oldcw, fpu_cw;
    volatile double result;
    double a = 2877.0;
@@ -191,7 +196,7 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
    _controlfp_s(&fpu_cw, _PC_53, _MCW_PC);
    result = a / b;
    _controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC);
-  ]])], [ac_cfp_have__controlfp_s=yes], [ac_cfp_have__controlfp_s=no])
+  ], [ac_cfp_have__controlfp_s=yes], [ac_cfp_have__controlfp_s=no])
  if test "$ac_cfp_have__controlfp_s" = "yes" ; then
    AC_DEFINE(HAVE__CONTROLFP_S, 1, [whether _controlfp_s is present and usable])
    AC_MSG_RESULT(yes)
@@ -200,9 +205,9 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
  fi

  AC_MSG_CHECKING([whether FPU control word can be manipulated by inline assembler])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+  AC_TRY_LINK([
    /* nothing */
-  ]],[[
+  ],[
    unsigned int oldcw, cw;
    volatile double result;
    double a = 2877.0;
@@ -215,7 +220,7 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
    result = a / b;

    __asm__ __volatile__ ("fldcw %0" : : "m" (*&oldcw));
-  ]])], [ac_cfp_have_fpu_inline_asm_x86=yes], [ac_cfp_have_fpu_inline_asm_x86=no])
+  ], [ac_cfp_have_fpu_inline_asm_x86=yes], [ac_cfp_have_fpu_inline_asm_x86=no])
  if test "$ac_cfp_have_fpu_inline_asm_x86" = "yes" ; then
    AC_DEFINE(HAVE_FPU_INLINE_ASM_X86, 1, [whether FPU control word can be manipulated by inline assembler])
    AC_MSG_RESULT(yes)
@@ -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");
 }

@@ -4,6 +4,8 @@
 #        make -f build.mk
 #
 # Written by Sascha Schumann
+#
+# $Id$ 


 LT_TARGETS = ltmain.sh ltconfig
@@ -32,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,3 +30,4 @@ if cmp configure.old configure > /dev/null 2>&1; then
 else
    echo "buildconf: created or modified ${1}configure"
 fi
+
@@ -1,3 +1,4 @@
+dnl $Id$
 dnl Process this file with autoconf to produce a configure script.

 AC_INIT(zend.c)
@@ -59,7 +60,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #include <math.h>

 #ifndef zend_isnan
-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
+#if HAVE_DECL_ISNAN
 #define zend_isnan(a) isnan(a)
 #elif defined(HAVE_FPCLASS)
 #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
@@ -68,7 +69,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #endif
 #endif

-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
+#if HAVE_DECL_ISINF
 #define zend_isinf(a) isinf(a)
 #elif defined(INFINITY)
 /* Might not work, but is required by ISO C99 */
@@ -79,7 +80,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #define zend_isinf(a) 0
 #endif

-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
+#if HAVE_DECL_ISFINITE
 #define zend_finite(a) isfinite(a)
 #elif defined(HAVE_FINITE)
 #define zend_finite(a) finite(a)
@@ -125,8 +126,7 @@ LIBZEND_OTHER_CHECKS
 ZEND_EXTRA_LIBS="$LIBS"
 LIBS=""
 AC_SUBST(ZEND_EXTRA_LIBS)
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+AC_OUTPUT(Makefile)

 # Local Variables:
 # tab-width: 4
@@ -15,3 +15,5 @@
   | Authors:                                                             |
   +----------------------------------------------------------------------+
 */
+
+/* $Id$ */
@@ -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

@@ -14,8 +14,7 @@ var_dump(define("[[[", 2));
 var_dump(define("test const", 3));
 var_dump(define("test const", 3));
 var_dump(define("test", array(1)));
-var_dump(define("test1", fopen(__FILE__, 'r')));
-var_dump(define("test2", new stdclass));
+var_dump(define("test1", new stdclass));

 var_dump(constant(" "));
 var_dump(constant("[[["));
@@ -23,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

@@ -43,9 +42,8 @@ bool(true)
 Notice: Constant test const already defined in %s on line %d
 bool(false)
 bool(true)
-bool(true)

-Warning: Constants may only evaluate to scalar values, arrays or resources in %s on line %d
+Warning: Constants may only evaluate to scalar values or arrays in %s on line %d
 bool(false)
 int(1)
 int(2)
@@ -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";
 ?>
--EXPECT--
+--EXPECT--	
 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,6 +17,7 @@ $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,4 +9,5 @@ abstract class TestClass
 ?>
 ===DONE===
 --EXPECT--
+
 ===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";

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

 echo "Done\n";
 ?>
--EXPECT--
+--EXPECT--	
 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 number 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 number 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";
 ?>
--EXPECT--
+--EXPECT--	
 float(2834756759.1231)
 float(2834756759.1231)
 Done
@@ -37,7 +37,8 @@ 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,7 +18,8 @@ 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";
 ?>
--EXPECT--
+--EXPECT--	
 string(3) "020"
 string(4) "pead"
 string(4) "pead"
@@ -6,3 +6,5 @@ var_dump(new class{});
 --EXPECTF--
 object(class@%s)#%d (0) {
 }
+
+
@@ -18,3 +18,4 @@ var_dump($a instanceof A, $a instanceof B);
 --EXPECT--
 bool(true)
 bool(true)
+
@@ -51,3 +51,4 @@ object(class@%s)#1 (1) {
  ["i"]=>
  int(10)
 }
+
@@ -12,3 +12,4 @@ namespace {
 --EXPECTF--
 object(class@%s)#1 (0) {
 }
+
@@ -20,3 +20,4 @@ namespace lone {
 --EXPECTF--
 object(class@%s)#2 (0) {
 }
+