Update versions for PHP 7.2.0beta1

Update NEWS for PHP 7.2.0beta1
Bump all API numbers in prep for 7.2 fork
2026-11-09 10:10:50 +00:00 · 2017-07-18 15:40:26 +00:00 · 2017-07-18 15:40:26 +00:00 · 2017-07-18 10:45:02 -04:00 · 2017-07-18 14:42:15 +02:00 · 2017-07-18 12:53:18 +02:00
12088 changed files with 418099 additions and 257726 deletions
@@ -1,22 +1,31 @@
+
 version: "{branch}.build.{build}"

-image: Visual Studio 2015
+image: Visual Studio 2017

 branches:
        except:
                - PHP-5.6
                - PHP-7.0

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

 cache:
        - c:\build-cache
+        - c:\build-cache\sdk -> .appveyor.yml

 environment:
-        PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
+        PHP_BUILD_CACHE_BASE_DIR: c:\build-cache  
        PHP_BUILD_OBJ_DIR: c:\obj
        PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
-        PHP_BUILD_SDK_BRANCH: php-sdk-2.1.9beta1
+        PHP_BUILD_SDK_BRANCH: php-sdk-2.0.7
+        PHP_BUILD_CRT: vc15
        # ext and env setup for tests
        #MYSQL_TEST_PASSWD: Password12!
        #MYSQL_TEST_USER: root
@@ -46,3 +55,4 @@ build_script:

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

 root = true

-[*.{c,h,awk,w32,bat,mk,frag}]
-charset                  = utf-8
-end_of_line              = lf
+[*.{c,h}]
+charset                  = UTF-8
+end_of_line              = LF
 indent_size              = 4
 indent_style             = tab
+insert_final_newline     = true
 tab_width                = 4
 trim_trailing_whitespace = true
-insert_final_newline     = true

-[*.{php,phpt}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 4
-indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
-
-[*.{yml,m4,sh}]
-charset                  = utf-8
-end_of_line              = lf
+[*.yml]
 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
-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

@@ -16,11 +16,9 @@ define ____executor_globals
 		end
 		set $eg = ((zend_executor_globals*) (*((void ***) $tsrm_ls))[executor_globals_id-1])
 		set $cg = ((zend_compiler_globals*) (*((void ***) $tsrm_ls))[compiler_globals_id-1])
-		set $eg_ptr = $eg
 	else
 		set $eg = executor_globals
 		set $cg = compiler_globals
-		set $eg_ptr = (zend_executor_globals*) &executor_globals
 	end
 end

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

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

 document printzv
@@ -173,7 +171,7 @@ define ____printzv_contents
 		printf "UNDEF"
 	end
 	if $type == 1
-		printf "NULL"
+        printf "NULL"
 	end
 	if $type == 2
 		printf "bool: false"
@@ -181,16 +179,16 @@ define ____printzv_contents
 	if $type == 3
 		printf "bool: true"
 	end
-	if $type == 4
+    if $type == 4
 		printf "long: %ld", $zvalue->value.lval
-	end
-	if $type == 5
-		printf "double: %f", $zvalue->value.dval
-	end
-	if $type == 6
-		printf "string: %s", $zvalue->value.str->val
-	end
-	if $type == 7
+    end
+    if $type == 5
+        printf "double: %f", $zvalue->value.dval
+    end
+    if $type == 6
+       printf "string: %s", $zvalue->value.str->val
+    end
+	if $type == 7 
 		printf "array: "
 		if ! $arg1
 			set $ind = $ind + 1
@@ -247,31 +245,25 @@ define ____printzv_contents
 		printf "const: %s", $zvalue->value.str->val
 	end
 	if $type == 12
-		printf "CONSTANT_AST"
+		printf "const_ast"
 	end
 	if $type == 13
-		printf "_BOOL"
+		printf "_IS_BOOL"
 	end
 	if $type == 14
-		printf "CALLABLE"
+		printf "IS_CALLABLE"
 	end
 	if $type == 15
 		printf "indirect: "
 		____printzv $zvalue->value.zv $arg1
 	end
+	if $type == 16
+		printf "string_offset"
+	end
 	if $type == 17
 		printf "pointer: %p", $zvalue->value.ptr
 	end
-	if $type == 18
-		printf "ITERABLE"
-	end
-	if $type == 19
-		printf "VOID"
-	end
-	if $type == 20
-		printf "_ERROR"
-	end
-	if $type == 16 || $type > 20
+	if $type > 17
 		printf "unknown type %d", $type
 	end
 	printf "\n"
@@ -287,32 +279,42 @@ define ____printzv
 	if $arg1
 		____printzv_contents $zcontents $arg1
 	else
-		____printzv_contents $zcontents 0
+		____printzv_contents $zcontents 0 
 	end
 end

-define print_global_vars
-	____executor_globals
-	set $symtable = ((HashTable *)&($eg_ptr->symbol_table))
-	print_ht $symtable
-end
+define ____print_const_table
+	set $ht = $arg0
+	set $p = $ht->pListHead

-document print_global_vars
-	Prints the global variables
+	while $p != 0
+		set $const = (zend_constant *) $p->pData
+
+		set $i = $ind
+		while $i > 0
+			printf "  "
+			set $i = $i - 1
+		end
+
+		if $p->nKeyLength > 0
+			____print_str $p->arKey $p->nKeyLength
+			printf " => "
+		else
+			printf "%d => ", $p->h
+		end
+
+		____printzv_contents &$const->value 0
+		set $p = $p->pListNext
+	end
 end

 define print_const_table
 	set $ind = 1
 	printf "[%p] {\n", $arg0
-	____print_ht $arg0 4
+	____print_const_table $arg0
 	printf "}\n"
 end

-document print_const_table
-	Dumps elements of Constants HashTable
-	Example: print_const_table executor_globals.zend_constants
-end
-
 define ____print_ht
 	set $ht = (HashTable*)$arg0
 	set $n = $ind
@@ -340,7 +342,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
@@ -359,10 +361,6 @@ define ____print_ht
 				set $func = (zend_function*)$p->val.value.ptr
 				printf "\"%s\"\n", $func->common.function_name->val
 			end
-			if $arg1 == 4
-				set $const = (zend_constant *)$p->val.value.ptr
-				____printzv $const 1
-			end
 		end
 		set $i = $i + 1
 	end
@@ -389,7 +387,7 @@ document print_htptr
 end

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

@@ -474,12 +472,9 @@ end

 define print_pi
 	set $pi = (zend_property_info *)$arg0
-	set $initial_offset = ((uint32_t)(zend_uintptr_t)(&((zend_object*)0)->properties_table[(0)]))
-	set $ptr_to_val = (zval*)((char*)$pi->ce->default_properties_table + $pi->offset - $initial_offset)
 	printf "[%p] {\n", $pi
-	printf "    offset = %p\n", $pi->offset
 	printf "    ce = [%p] %s\n", $pi->ce, $pi->ce->name->val
-	printf "    flags = 0x%x (", $pi->flags
+	printf "    flags = %d (", $pi->flags
 	if $pi->flags & 0x100
 		printf "ZEND_ACC_PUBLIC"
 	else
@@ -490,11 +485,7 @@ define print_pi
 				printf "ZEND_ACC_PRIVATE"
 			else
 				if $pi->flags & 0x800
-					printf "ZEND_ACC_EARLY_BINDING"
-				else
-					if $pi->flags & 0x20000
-						printf "ZEND_ACC_SHADOW"
-					end
+					printf "ZEND_ACC_CHANGED"
 				end
 			end
 		end
@@ -502,8 +493,6 @@ define print_pi
 	printf ")\n"
 	printf "    name  = "
 	print_zstr $pi->name
-	printf "    default value: "
-	printzv $ptr_to_val
 	printf "}\n"
 end

@@ -543,10 +532,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 +565,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
@@ -15,8 +15,11 @@ ext/dba/libflatfile/flatfile.c  ident
 ext/dba/libcdb/cdb_make.c       ident
 ext/dba/libcdb/cdb.c            ident
 ext/filter/filter.c             ident
+ext/zip/php_zip.c               ident
 README.input_filter             ident
 run-tests.php                   ident
+sapi/nsapi/nsapi.c              ident
+sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
 ext/exif/exif.c                 ident
@@ -29,6 +32,7 @@ UPGRADING.INTERNALS             merge=NEWS
 /ext/bz2/tests/with_strings.phpt	-crlf
 /ext/dom/tests/bug40836.phpt	-crlf
 /ext/dom/tests/domelement.phpt	-crlf
+/ext/ereg/tests/eregi_basic_002.phpt	-crlf
 /ext/iconv/tests/iconv004.phpt	-crlf
 /ext/iconv/tests/iconv_basic.phpt	-crlf
 /ext/iconv/tests/iconv_strpos.phpt	-crlf
@@ -26,21 +26,14 @@
 *.tar.xz.asc
 .FBCIndex
 .FBCLockFolder
+.deps
 .libs
 phpt.*
 core
 dynlib.m4
-Debug
-Debug_TS
 Makefile
 Makefile.fragments
 Makefile.objects
-Release
-Release_TS
-Release_TSDbg
-Release_TS_inline
-Release_inline
-ZendEngine1
 _libs
 acconfig.h
 aclocal.m4
@@ -55,7 +48,6 @@ config.cache
 config.h.in
 config.log
 config.nice
-config.nice.bat
 config.status
 config.sub
 config_vars.mk
@@ -64,8 +56,6 @@ configuration-parser.h
 configuration-parser.output
 configuration-scanner.c
 configure
-configure.bat
-configure.js
 conftest
 conftest.c
 debug.log
@@ -95,7 +85,6 @@ stamp-h
 test.php3
 tmp-php.ini
 want_dependencies
-x64
 stamp-h.in
 scan_makefile_in.awk
 TSRM/tsrm_config.h
@@ -114,65 +103,9 @@ ext/phar/phar.php
 main/php_config.h
 main/php_config.h.in

-# Test specific Ignores
-tests/*/*.diff
-tests/*/*.out
-tests/*/*.php
-tests/*/*.exp
-tests/*/*.log
-tests/*/*.sh
-tests/*/*/*.diff
-tests/*/*/*.out
-tests/*/*/*.php
-tests/*/*/*.exp
-tests/*/*/*.log
-tests/*/*/*.sh
-*/tests/*.diff
-*/tests/*.out
-*/tests/*.php
-*/tests/*.exp
-*/tests/*.log
-*/tests/*.sh
-*/tests/*/*.diff
-*/tests/*/*.out
-*/tests/*/*.php
-*/tests/*/*.exp
-*/tests/*/*.log
-*/tests/*/*.sh
-*/tests/*/*/*.diff
-*/tests/*/*/*.out
-*/tests/*/*/*.php
-*/tests/*/*/*.exp
-*/tests/*/*/*.log
-*/tests/*/*/*.sh
-*/*/tests/*.diff
-*/*/tests/*.out
-*/*/tests/*.out.png
-*/*/tests/*.php
-*/*/tests/*.exp
-*/*/tests/*.log
-*/*/tests/*.sh
-*/*/tests/*/*.diff
-*/*/tests/*/*.out
-*/*/tests/*/*.php
-*/*/tests/*/*.exp
-*/*/tests/*/*.log
-*/*/tests/*/*.sh
-*/*/tests/*/*/*.diff
-*/*/tests/*/*/*.out
-*/*/tests/*/*/*.php
-*/*/tests/*/*/*.exp
-*/*/tests/*/*/*.log
-*/*/tests/*/*/*.sh
-*/*/tests/*/*/*/*.diff
-*/*/tests/*/*/*/*.out
-*/*/tests/*/*/*/*.php
-*/*/tests/*/*/*/*.exp
-*/*/tests/*/*/*/*.log
-*/*/tests/*/*/*/*.sh
-
 # Extension specifc ignores
 ext/*/configure.in
+ext/*/configure.ac
 ext/*/ltmain.sh
 ext/*/libs.mk
 ext/*/build
@@ -213,32 +146,21 @@ ext/mssql/Makefile.global
 ext/mssql/acinclude.m4
 ext/mssql/config.sub
 ext/mssql/configure.in
+ext/mssql/configure.ac
 ext/mssql/ltmain.sh
 ext/mysql/weztest.sqlite
-ext/oci8/tests/*.tmp
 ext/oci8/tests/*.vglog
 ext/pdo/conftest*
-ext/pdo/tests/*.db
-ext/pdo/tests/*.tmp
 ext/pdo_firebird/conftest*
 ext/pdo_mysql/conftest*
-ext/pdo_mysql/tests/*.db
-ext/pdo_mysql/tests/*.tmp
 ext/pdo_oci/conftest*
-ext/pdo_odbc/tests/*.db
-ext/pdo_odbc/tests/*.tmp
 ext/pdo_odbc/tests/*.mdb
 ext/pdo_pgsql/conftest*
-ext/pdo_pgsql/tests/*.db
-ext/pdo_pgsql/tests/*.tmp
 ext/pdo_sqlite/conftest*
 ext/pdo_sqlite/sqlite3.h
-ext/pdo_sqlite/tests/*.db
-ext/pdo_sqlite/tests/*.tmp
 ext/phar/phar.phar
 ext/phar/phar.1
 ext/phar/phar.phar.1
-ext/pspell/tests/*.tmp
 ext/reflection/xml
 ext/reflection/html
 ext/reflection/spl.chm
@@ -246,10 +168,6 @@ ext/simplexml/examples/security.new.xml
 ext/spl/examples/.htaccess
 ext/spl/examples/*.phps
 ext/sqlite3/tests/phpsql*
-ext/sqlite3/tests/*.db
-ext/sqlite3/tests/*.tmp
-ext/standard/tests/misc/*.txt
-ext/standard/tests/strings/*.txt
 main/build-defs.h
 main/internal_functions_cli.c
 main/config.w32.h
@@ -261,7 +179,9 @@ pear/phpize
 pear/run-tests
 pear/php-config
 pear/scripts
+sapi/apache/libphp7.module
 sapi/apache2handler/libphp7.module
+sapi/apache_hooks/libphp7.module
 sapi/cgi/php-cgi
 sapi/cgi/php-cgi.1
 sapi/cli/php.1
@@ -273,7 +193,6 @@ sapi/fpm/fpm/php-cgi
 sapi/phpdbg/phpdbg_parser.c
 sapi/phpdbg/phpdbg_parser.h
 sapi/phpdbg/phpdbg
-sapi/phpdbg/phpdbg.1
 scripts/php-config
 scripts/phpize
 scripts/man1/*.1
@@ -283,3 +202,35 @@ win32/*.positions
 win32/ext
 win32/phpts.def
 win32/wsyslog.h
+
+# ------------------------------------------------------------------------------ Windows
+# Generated by `/buildconf.bat`
+/configure.bat
+/configure.js
+
+# Generated by `/configure.(bat|js)` (architecture dependend)
+/config.nice.bat
+/Debug/
+/Debug_TS/
+/Release/
+/Release_TS/
+/x64/
+
+# ------------------------------------------------------------------------------ Tests
+# Generated by `/run-tests.php` upon failure.
+**/tests/**/*.diff
+**/tests/**/*.out*
+**/tests/**/*.php
+**/tests/**/*.exp
+**/tests/**/*.log
+**/tests/**/*.sh
+
+# Used by some test cases.
+**/tests/**/*.db
+**/tests/**/*.txt
+**/tests/**/*.tmp
+
+# special cases to invert previous ignore rules
+!ext/fileinfo/libmagic.patch
+!ext/mbstring/oniguruma.patch
+
@@ -1,9 +1,5 @@
-git:
-  quiet: true
-
-dist: trusty
 language: c
-sudo: required
+sudo: false
 addons:
  apt:
    packages:
@@ -12,7 +8,6 @@ addons:
      - re2c
      - libgmp-dev
      - libicu-dev
-      - libmcrypt-dev
      - libtidy-dev
      - libenchant-dev
      - libaspell-dev
@@ -23,7 +18,7 @@ addons:
      - libt1-dev

 notifications:
-    email:
+    email: 
       on_failure: change
    irc:
      template:
@@ -34,7 +29,8 @@ notifications:
      on_failure: always

 cache:
-    - apt
+    apt: true
+    ccache: true

 env:
    global:
@@ -50,8 +46,9 @@ env:
      - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1

 before_script:
-    # Enable IPv6
-    - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
+    - ccache --version
+    - ccache --zero-stats
+    - export USE_CCACHE=1
    # Compile PHP
    - ./travis/compile.sh
    # Setup Extensions
@@ -61,6 +58,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 `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 --set-timeout 120
+    - ./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
@@ -113,7 +113,7 @@ User Functions/Methods Naming Conventions
    of ``parent_*``::

    A family of 'foo' functions, for example:
-
+    
    Good:
    'foo_select_bar'
    'foo_insert_baz'
@@ -11,15 +11,20 @@ co-ordination.
 PHP welcomes pull requests to [add tests](#writing-tests), fix bugs and to
 implement RFCs. Please be sure to include tests as appropriate!

-If you are fixing a bug, then please submit your PR against the lowest branch
-of PHP that the bug affects, or the oldest fully supported version (the first
-green branch on
-[the supported version page](http://php.net/supported-versions.php). For
-example, at the time of writing in mid-2015, this is PHP 5.5, which corresponds
-to the `PHP-5.5` branch in Git. Please also make sure you add a link to the PR
-in the bug on [the bug tracker](https://bugs.php.net/).
+If you are fixing a bug, then please submit your PR against the lowest actively
+supported branch of PHP that the bug affects (only green branches on
+[the supported version page](http://php.net/supported-versions.php) are supported).
+For example, at the time of writing in mid-2017, the lowest supported version is
+PHP 7.0, which corresponds to the `PHP-7.0` branch in Git. Please also make sure you
+add a link to the PR in the bug on [the bug tracker](https://bugs.php.net/).

-Pull requests to implement RFCs should be submitted against `master`.
+Pull requests implementing RFCs should be submitted against `master`.
+
+Pull requests should *never* be submitted against `PHP-x.y.z` branches, as
+these are only used for release management.
+
+If your pull request exhibits conflicts with the base branch, please resolve them
+by using `git rebase` instead of `git merge`.

 ## Filing bugs

@@ -47,7 +47,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           fpm
-PRIMARY MAINTAINER:  Jakub Zelenka <bukka@php.net>
+PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>, Jerome Loyet <fat@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3.3
@@ -79,13 +79,13 @@ MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mysqli
-PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           mysqlnd
-PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>
+PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
@@ -99,7 +99,7 @@ EXTENSION:           odbc
 PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
-COMMENT:             Working
+COMMENT:             Working 
 -------------------------------------------------------------------------------
 EXTENSION:           pdo
 PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Wez Furlong <wez@php.net>
@@ -195,12 +195,12 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           libxml
-PRIMARY MAINTAINER:   Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net>
+PRIMARY MAINTAINER:   Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net> 
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xmlreader
-PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net>
+PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net> 
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -262,8 +262,14 @@ PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           enchant
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               5.3
+-------------------------------------------------------------------------------
 EXTENSION:           exif
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
+PRIMARY MAINTAINER:  Kalle Sommer Nielsen <kalle@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.2
@@ -281,7 +287,7 @@ STATUS:              Working
 SINCE:               5.2
 -------------------------------------------------------------------------------
 EXTENSION:           ftp
-PRIMARY MAINTAINER:  Stefan Esser <sesser@php.net>
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -338,11 +344,6 @@ PRIMARY MAINTAINER:  Rui Hirokawa <hirokawa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           mcrypt
-PRIMARY MAINTAINER:  Derick Rethans <derick@derickrethans.nl>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
 EXTENSION:           opcache
 PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>, Xinchen Hui <laruence@php.net>
 MAINTENANCE:         Maintained
@@ -418,6 +419,12 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
+EXTENSION:           sodium
+PRIMARY MAINTAINER:  Frank Denis <jedisct1@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               7.2.0
+-------------------------------------------------------------------------------
 EXTENSION:           spl
 PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Etienne Kneuss <colder@php.net>
 MAINTENANCE:         Maintained
@@ -1,7 +1,7 @@
--------------------------------------------------------------------
+-------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2018 The PHP Group. All rights reserved.
--------------------------------------------------------------------
+Copyright (c) 1999 - 2017 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 $@

@@ -5,7 +5,7 @@ INSTALL_DATA = $(INSTALL) -m 644
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)

-all: $(all_targets)
+all: $(all_targets) 
 	@echo
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
@@ -112,16 +112,16 @@ test: all
 clean:
 	find . -name \*.gcno -o -name \*.gcda | xargs rm -f
 	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*

 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
+	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
 	rm -f 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
@@ -135,7 +135,7 @@ prof-gen:

 prof-clean:
 	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*

@@ -1,6 +1,6 @@
 (NOTE: you may also want to take a look at the pear package
 	     PECL_Gen, a PHP-only alternative for this script that
-			 supports way more extension writing tasks and is
+			 supports way more extension writing tasks and is 
 			 supposed to replace ext_skel completely in the long run ...)

 WHAT IT IS
@@ -17,16 +17,16 @@ HOW TO USE IT

   ./ext_skel --extname=module_name

-  and everything you need is placed in directory module_name.
+  and everything you need is placed in directory module_name. 

-  [ Note that GNU awk is likely required for this script to work.  Debian
-    systems seem to default to using mawk, so you may need to change the
+  [ Note that GNU awk is likely required for this script to work.  Debian 
+    systems seem to default to using mawk, so you may need to change the 
    #! line in skeleton/create_stubs and the cat $proto | awk line in
    ext_skel to use gawk explicitly. ]

-  If you don't need to test the existence of any external header files,
-  libraries or functions in them, the module is already almost ready to be
-  compiled in PHP.  Just remove 3 comments in your_module_name/config.m4,
+  If you don't need to test the existence of any external header files, 
+  libraries or functions in them, the module is already almost ready to be 
+  compiled in PHP.  Just remove 3 comments in your_module_name/config.m4, 
  change back up to PHP sources top directory, and do

    ./buildconf; ./configure --enable-module_name; make
@@ -83,7 +83,7 @@ FORMAT OF FUNCTION DEFINITIONS FILE
  ']'s as there where '['s. Currently, it does not harm if you forget to do it
  or there is a wrong amount of ']'s, but this may change in the future.

-	An additional short description may be added after the parameters.
+	An additional short description may be added after the parameters. 
  If present it will be filled into the 'proto' header comments in the stubs
  code and the <refpurpose> tag in the XML documentation.

@@ -135,7 +135,7 @@ CURRENT LIMITATIONS, BUGS AND OTHER ODDITIES
  handled. For other types you must write the code yourself. And for type
  mixed, it wouldn't even be possible to write anything, because only you
  know what to expect.
-
+  
  It can't handle correctly, and probably never will, variable list of
  of arguments. (void foo(int bar [, ...])

@@ -185,3 +185,4 @@ PHP_FUNCTION(module_name_drawtext)
    php_error(E_WARNING, "module_name_drawtext: not yet implemented");
 }
 /* }}} */
+
@@ -38,21 +38,26 @@ Having said that, here are the organizational rules::
   6. Test your changes before committing them. We mean it. Really.
      To do so use "make test".

-   7. For development use the --enable-maintainer-zts switch to ensure your
-      code handles TSRM correctly and doesn't break for those who need that.
+   7. For development use the --enable-debug switch to avoid memory leaks
+      and the --enable-maintainer-zts switch to ensure your code handles
+      TSRM correctly and doesn't break for those who need that.

 Currently we have the following branches in use::

-  master    The active development branch.
+  master    The active development branch. 
+
+  PHP-7.1   Is used to release the PHP 7.1.x series. This is a prerelease
+            version.
+
+  PHP-7.0   Is used to release the PHP 7.0.x series. This is a current
+            stable version and is open for bugfixes only.

  PHP-5.6   Is used to release the PHP 5.6.x series. This is a current
            stable version and is open for bugfixes only.

-  PHP-5.5   Is used to release the PHP 5.5.x series. This is an old
-            stable version and is open for security fixes only.
+  PHP-5.5   This branch is closed.

-  PHP-5.4   Is used to release the PHP 5.4.x series. This is an old
-            stable version and is open for security fixes only.
+  PHP-5.4   This branch is closed.

  PHP-5.3   This branch is closed.

@@ -105,7 +110,7 @@ The format of the commit messages is pretty simple.
 An Example from the git project (commit 2b34e486bc):

 pack-objects: Fix compilation with NO_PTHREDS
-
+  
 It looks like commit 99fb6e04 (pack-objects: convert to use
 parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but
 hasn't noticed that the 'arg' variable no longer is available.
@@ -3,7 +3,7 @@ $Id: README.NEW-OUTPUT-API 219039 2006-08-30 07:39:09Z mike $

 API adjustment to the old output control code:

-	Everything now resides beneath the php_output namespace,
+	Everything now resides beneath the php_output namespace, 
 	and there's an API call for every output handler op.

 	Checking output control layers status:
@@ -18,7 +18,7 @@ API adjustment to the old output control code:
 		// php_start_ob_buffer(zhandler, chunk_size, erase);
 		php_output_start_user(zhandler, chunk_size, flags);

-	Starting an internal handler whithout context:
+	Starting an internal handler without context:
 		// php_ob_set_internal_handler(my_php_output_handler_func_t, buffer_size, "output handler name", erase);
 		php_output_start_internal(handler_name, handler_name_len, my_php_output_handler_func_t, chunk_size, flags);

@@ -134,7 +134,7 @@ Output handler hooks
 Open questions

 	Should the userland API be adjusted and unified?
-
+	
 	Many bits of the manual (and very first implementation) do not comply
 	with the behaviour of the current (to be obsoleted) code, thus should
 	the manual or the behaviour be adjusted?
@@ -42,11 +42,11 @@ See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse

 Type specifiers
 ---------------
- The following list shows the type specifier, its meaning and the parameter
+ The following list shows the type specifier, its meaning and the parameter 
 types that need to be passed by address. All passed parameters are set
- if the PHP parameter is non optional and untouched if optional and the
+ if the PHP parameter is non optional and untouched if optional and the 
 parameter is not present. The only exception is O where the zend_class_entry*
- has to be provided on input and is used to verify the PHP parameter is an
+ has to be provided on input and is used to verify the PHP parameter is an 
 instance of that class.

 a  - array (zval*)
@@ -54,7 +54,7 @@ Type specifiers
 b  - boolean (zend_bool)
 C  - class (zend_class_entry*)
 d  - double (double)
- f  - function or array containing php method call info (returned as
+ f  - function or array containing php method call info (returned as 
      zend_fcall_info and zend_fcall_info_cache)
 h  - array (returned as HashTable*)
 H  - array or HASH_OF(object) (returned as HashTable*)
@@ -88,9 +88,9 @@ Type specifiers

 Note on 64bit compatibility
 ---------------------------
-Please note that since version 7 PHP uses zend_long as integer type and
-zend_string with size_t as length, so make sure you pass zend_longs to "l"
-and size_t to strings length (i.e. for "s" you need to pass char * and size_t),
+Please note that since version 7 PHP uses zend_long as integer type and 
+zend_string with size_t as length, so make sure you pass zend_longs to "l" 
+and size_t to strings length (i.e. for "s" you need to pass char * and size_t), 
 not the other way round!

 Both mistakes might cause memory corruptions and segfaults:
@@ -103,7 +103,7 @@ Both mistakes might cause memory corruptions and segfaults:
  int num; /* XXX THIS IS WRONG!! Use zend_long instead. */
  zend_parse_parameters(ZEND_NUM_ARGS(), "l", &num)

-If you're in doubt, use check_parameters.php script to the parameters
+If you're in doubt, use check_parameters.php script to the parameters 
 and their types (it can be found in ./scripts/dev/ directory of PHP sources):

 # php ./scripts/dev/check_parameters.php /path/to/your/sources/
@@ -152,7 +152,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!",
 /* Get either a set of 3 longs or a string. */
 zend_long l1, l2, l3;
 char *s;
-/*
+/* 
 * The function expects a pointer to a size_t in this case, not a long
 * or any other type.  If you specify a type which is larger
 * than a 'size_t', the upper bits might not be initialized
@@ -46,7 +46,7 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
-
+ 

 6. ext/standard crypt's blowfish implementation

@@ -92,7 +92,7 @@ http://www.usenix.org/events/usenix99/provos.html
 Some of the tricks in BF_ROUND might be inspired by Eric Young's
 Blowfish library (I can't be sure if I would think of something if I
 hadn't seen his code).
-
+ 

 7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite

@@ -126,7 +126,7 @@ Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30.

 Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
 Copyright (C) 2000 - 2003, Richard J. Wagner
-All rights reserved.
+All rights reserved.                          

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -139,8 +139,8 @@ are met:
 	 notice, this list of conditions and the following disclaimer in the
 	 documentation and/or other materials provided with the distribution.

-3. The names of its contributors may not be used to endorse or promote
-	 products derived from this software without specific prior written
+3. The names of its contributors may not be used to endorse or promote 
+	 products derived from this software without specific prior written 
 	 permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -261,26 +261,26 @@ SUCH DAMAGE.

 12. libxmlrpc ext/xmlrpc

-Copyright 2000 Epinions, Inc.
+Copyright 2000 Epinions, Inc. 

-Subject to the following 3 conditions, Epinions, Inc.  permits you, free
-of charge, to (a) use, copy, distribute, modify, perform and display this
-software and associated documentation files (the "Software"), and (b)
-permit others to whom the Software is furnished to do so as well.
+Subject to the following 3 conditions, Epinions, Inc.  permits you, free 
+of charge, to (a) use, copy, distribute, modify, perform and display this 
+software and associated documentation files (the "Software"), and (b) 
+permit others to whom the Software is furnished to do so as well.  

-1) The above copyright notice and this permission notice shall be included
-without modification in all copies or substantial portions of the
-Software.
+1) The above copyright notice and this permission notice shall be included 
+without modification in all copies or substantial portions of the 
+Software.  

-2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF
-ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY
-IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE OR NONINFRINGEMENT.
+2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF 
+ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY 
+IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR 
+PURPOSE OR NONINFRINGEMENT.  

-3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT,
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
-OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING
-NEGLIGENCE), EVEN IF EPINIONS, INC.  IS AWARE OF THE POSSIBILITY OF SUCH
+3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, 
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT 
+OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING 
+NEGLIGENCE), EVEN IF EPINIONS, INC.  IS AWARE OF THE POSSIBILITY OF SUCH 
 DAMAGES.

 13. libzip ext/zip
@@ -414,3 +414,4 @@ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
@@ -32,7 +32,7 @@ team (Bjori) on hand.
 6. Verify the tags to be extra sure everything was tagged properly.

 7. Moving extensions from/to PECL requires write access to the destination.
-Most developers should have this.
+Most developers should have this. 

 Moving extensions from php-src to PECL
 - Checkout the pecl directory, most likely you want a sparse-root checkout
@@ -65,7 +65,7 @@ credits files in ext/standard.

 4. Checkout the release branch for this release (e.g., PHP-5.4.2) from the main branch.

-5. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+5. Bump the version numbers in ``main/php_version.h``, ``configure.ac`` and possibly ``NEWS``.
 Do not use abbreviations for alpha and beta. Do not use dashes, you should
 ``#define PHP_VERSION "5.4.22RC1"`` and not ``#define PHP_VERSION "5.4.22-RC1"``

@@ -79,7 +79,7 @@ Do not use abbreviations for alpha and beta. Do not use dashes, you should
 9. Tag the repository release branch with the version, e.g.:
 ``git tag -u YOURKEYID php-5.4.2RC2``

-10. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and ``NEWS``
+10. Bump the version numbers in ``main/php_version.h``, ``configure.ac`` and ``NEWS``
 in the *main* branch (PHP-5.4 for example) to prepare for the **next** version.
 F.e. if the RC is "5.4.1RC1" then the new one should be "5.4.2-dev" - regardless if we get
 a new RC or not. This is to make sure ``version_compare()`` can correctly work.
@@ -97,25 +97,55 @@ and build three tarballs (gz, bz2 and xz).
 and output verification information to be included in announcement email

 14. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
-directory "downloads/". Copy them into there, so that the system can generate
-MD5 sums. If you do not have this directory, talk to Derick or Dan.
+directory "public_html/". Copy them into there, so that the system can generate
+MD5 sums. If you do not have this directory, create it.

-15. Now the RC can be found on http://downloads.php.net/yourname,
-f.e. http://downloads.php.net/derick/
+15. Now the RC can be found on http://downloads.php.net/~yourname,
+f.e. http://downloads.php.net/~derick/

-16. Once the release has been tagged, contact the PHP Windows development team
-(internals-win@lists.php.net) so that Windows binaries can be created. Once
-those are made, they should be placed into the same directory as the source snapshots.
+16. Once the release has been tagged, contact the release-managers@ distribution list
+so that Windows binaries can be created.  Once those are made, they can be found at
+http://windows.php.net/download

 Getting the non stable release (alpha/beta/RC) announced
 --------------------------------------------------------

-1. Send an email **To** ``internals@lists.php.net`` and ``php-general@lists.php.net``
+1. Update ``qa.git/include/release-qa.php`` with the appropriate information.
+   See the documentation within release-qa.php for more information, but all releases
+   and RCs are configured here. Only $QA_RELEASES needs to be edited.
+
+   Example: When rolling an RC, set the 'rc' with appropriate information for the
+   given version.
+
+   Note: Remember to update the MD5 and sha256 checksum information.
+
+2. Update ``web/php.git/include/version.inc`` (x=major version number)
+
+ a. ``$PHP_x_RC`` = "5.4.0RC1"  (should be set to "false" before)
+
+ b. ``$PHP_x_RC_DATE`` = "06 September 2007"
+
+3. Add a short notice to phpweb stating that there is a new release, and 
+highlight the major important things (security fixes) and when it is important
+to upgrade.
+
+ a. Call php bin/createNewsEntry in your local phpweb checkout
+    Use category "releases" for all stable releases.
+    Use category "frontpage" for X.Y.0 non-stable releases only (news only).
+
+ b. Add the content for the news entry. Be sure to include the text:
+    "THIS IS A DEVELOPMENT PREVIEW - DO NOT USE IT IN PRODUCTION!"
+
+4. Commit and push changes to qa and web
+
+*Wait for web and qa sites to update with new information before sending announce*
+
+5. Send an email **To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` 
 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``.

-2. Send an email (see example here http://news.php.net/php.pear.qa/5201) **To**
+6. Send an email (see example here http://news.php.net/php.pear.qa/5201) **To**
 ``php-qa@lists.php.net`` and ``primary-qa-tester@lists.php.net``.
 This email is 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
@@ -126,33 +156,14 @@ Derick) run the following commands for you:

 ``sudo -u ezmlm ezmlm-sub ~ezmlm/primary-qa-tester/mod moderator-email-address``

-3. Update ``qa.git/include/release-qa.php`` with the appropriate information.
-   See the documentation within release-qa.php for more information, but all releases
-   and RCs are configured here. Only $QA_RELEASES needs to be edited.
-
-   Example: When rolling an RC, set the 'rc' with appropriate information for the
-   given version.
-
-   Note: Remember to update the MD5 checksum information.
-
-4. Update ``web/php.git/include/version.inc`` (x=major version number)
-
- a. ``$PHP_x_RC`` = "5.4.0RC1"  (should be set to "false" before)
-
- b. ``$PHP_x_RC_DATE`` = "06 September 2007"
-
-5. Commit and push those changes:
-
- a. ``git commit -a && git push origin master``
-
-6. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
+7. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
 INSTALL and win32/install.txt files which are generated from the PHP manual sources.

 Rolling a stable release
 ------------------------

 1. Checkout your release branch, you should have created when releasing previous RC
-and bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+and bump the version numbers in ``main/php_version.h``, ``configure.ac`` and possibly ``NEWS``.

 2. If a CVE commit needs to be merged to the release, then have it committed to
 the base branches and merged upwards as usual (f.e commit the CVE fix to 5.3,
@@ -182,7 +193,7 @@ Check if the pear files are updated (phar).
  ``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx``

 11. Commit and push all the tarballs and signature files to web/php-distributions.git,
-    then update the git submodule reference in web/php.git:
+    then update the git submodule reference in web/php.git: 
    ``git submodule init;
    git submodule update;
    cd distributions;
@@ -252,7 +263,7 @@ f.e. ``ChangeLog-5.php`` from the NEWS file
  IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``

  V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
-
+  
  e. You may want to try php-web/bin/news2html to automate this task

 6. Add a short notice to phpweb stating that there is a new release, and
@@ -315,3 +326,24 @@ the news entry.
 Please make sure that the mail to php-announce@ is its own completely separate email.
 This is to make sure that replies to the announcement on php-general@ or internals@
 will not accidentally hit the php-announce@ mailinglist.
+
+New Release Manager Checklist
+-----------------------------
+
+1. Email systems@ to get setup for access to downloads.php.net and to be added to the
+   release-managers@ distribution list.
+
+2. Create a GPG key for your @php.net address and publish it by editing `include/gpg-keys.inc`
+   in the `web-php` repository, adding the output of `gpg --fingerprint "$USER@php.net"`. Let
+   one or more of the previous RMs sign your key. Publish your public key to pgp.mit.edu with:
+   `gpg --keyserver pgp.mit.edu --send-keys $KEYID`
+
+3. Request karma to eding main/php_version.h. Possibly karma for other restricted parts of 
+   php-src might come in question.
+
+4. Request karma for web/qa.git and web/php.git for publishing release announcements.
+
+5. Request moderation access to announce@php.net and primary-qa-tester@lists.php.net lists, to
+   be able to moderate your release announcements. All the announcements should be sent from
+   the @php.net alias.
+
@@ -23,7 +23,7 @@ PREPARING YOUR SYSTEM
    GNU libtool
    GNU m4

-  All of these are available from
+  All of these are available from 

    ftp://ftp.gnu.org/pub/gnu/

@@ -33,7 +33,7 @@ CONVERTING AN EXISTING EXTENSION
  extension, we will convert an embedded extension into a
  self-contained one. Install PHP and execute the following
  commands.
-
+  
     $ mkdir /tmp/newext
     $ cd /tmp/newext

@@ -56,7 +56,7 @@ CONVERTING AN EXISTING EXTENSION
            [--with-mysql=MYSQL-DIR]
     $ make install

-  The MySQL module will either use the embedded MySQL client
+  The MySQL module will either use the embedded MySQL client 
  library or the MySQL installation in MYSQL-DIR.


@@ -67,8 +67,8 @@ DEFINING THE NEW EXTENSION
  It consists of two source files "foo.c" and "bar.c"
  (and any arbitrary amount of header files, but that is not
  important here).
-
-  The demo extension does not reference any external
+  
+  The demo extension does not reference any external 
  libraries (that is important, because the user does not
  need to specify anything).

@@ -78,7 +78,7 @@ DEFINING THE NEW EXTENSION

 CREATING THE M4 CONFIGURATION FILE

-  The m4 configuration can perform additional checks. For a
+  The m4 configuration can perform additional checks. For a 
  self-contained extension, you do not need more than a few
  macro calls.

@@ -97,7 +97,7 @@ fi
  The first argument of PHP_NEW_EXTENSION describes the name of the
  extension.  The second names the source-code files.  The third passes
  $ext_shared which is set by PHP_ARG_ENABLE/WITH to PHP_NEW_EXTENSION.
-
+  
  Please use always PHP_ARG_ENABLE or PHP_ARG_WITH. Even if you do not
  plan to distribute your module with PHP, these facilities allow you
  to integrate your module easily into the main PHP module framework.
@@ -138,7 +138,7 @@ INSTALLING A SELF-CONTAINED EXTENSION
 ADDING SHARED MODULE SUPPORT TO A MODULE

  In order to be useful, a self-contained extension must be loadable
-  as a shared module. I will explain now how you can add shared module
+  as a shared module. I will explain now how you can add shared module 
  support to an existing module called foo.

  1. In config.m4, use PHP_ARG_WITH/PHP_ARG_ENABLE. Then you will
@@ -167,3 +167,4 @@ PECL SITE CONFORMITY

    This macros has to be used within your foo_module_entry to indicate the
    extension version.
+
@@ -28,7 +28,7 @@ The main functions are:
 PHPAPI size_t php_stream_read(php_stream * stream, char * buf, size_t count);
 PHPAPI size_t php_stream_write(php_stream * stream, const char * buf, size_t
        count);
-PHPAPI size_t php_stream_printf(php_stream * stream,
+PHPAPI size_t php_stream_printf(php_stream * stream, 
        const char * fmt, ...);
 PHPAPI int php_stream_eof(php_stream * stream);
 PHPAPI int php_stream_getc(php_stream * stream);
@@ -63,7 +63,7 @@ Where:
                           file/URL, use this option to arrange for the stream
                           to be copied (if needed) into a stream that can
                           be seek()ed.
-
+                           
    opened_path is used to return the path of the actual file opened,
    but if you used STREAM_MUST_SEEK, may not be valid.  You are
    responsible for efree()ing opened_path.  opened_path may be (and usually
@@ -95,7 +95,7 @@ PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short po
 PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent,
    struct timeval *timeout);
    Open a UNIX domain socket.
-
+   

 Stream Utilities
 ================
@@ -246,7 +246,7 @@ PHPAPI php_stream * php_stream_fopen(const char * filename, const char * mode)
 {
    FILE * fp = fopen(filename, mode);
    php_stream * ret;
-
+    
    if (fp) {
        ret = php_stream_alloc(&php_stream_stdio_ops, fp, 0, 0, mode);
        if (ret)
@@ -347,7 +347,7 @@ static size_t php_mysqlop_read(php_stream * stream, char * buf, size_t count)
        else
            return 0;
    }
-
+    
    /* pull out some data from the stream and put it in buf */
    ... mysql_fetch_row(state->result) ...
    /* we could do something strange, like format the data as XML here,
@@ -128,7 +128,7 @@ How to create your PHP, PHP Documentation or PECL patch
 -------------------------------------------------------
 PHP and most PECL packages use Git for revision control. Some PECL
 packages use Subversion (SVN) Read http://www.php.net/git.php for help
-on using Git to get and build PHP source code.  We recommend to look
+on using Git to get and build PHP source code.  We recommend to look 
 at our workflow on https://wiki.php.net/vcs/gitworkflow and our FAQ
 https://wiki.php.net/vcs/gitfaq.

@@ -9,7 +9,7 @@ it failed on your system without providing substantial backup information
 on *why* the test failed on your special setup. Thank you :-)


-[Testing Basics]
+[Testing Basics] 
 ----------------
 The easiest way to test your PHP build is to run "make test" from the
 command line after successfully compiling. This will run the complete
@@ -36,7 +36,7 @@ If you are running the run-tests.php script from the command line (as above)
 you must set the TEST_PHP_EXECUTABLE environment variable to explicitly
 select the PHP executable that is to be tested, that is, used to run the test scripts.

-If you run the tests using make test, the PHP CLI and CGI executables are
+If you run the tests using make test, the PHP CLI and CGI executables are 
 automatically set for you. "make test" executes "run-tests.php" script with the CLI binary.  Some
 test scripts such as session must be executed by CGI SAPI. Therefore,
 you must build PHP with CGI SAPI to perform all tests.
@@ -62,7 +62,7 @@ from the source root and any subdirectories below. If there are files,
 which have a "phpt" extension, "run-tests.php" looks at the sections
 in these files, determines whether it should run it, by evaluating
 the 'SKIP' section. If the test is eligible for execution, the 'FILE'
-section is extracted into a ".php" file (with the same name besides
+section is extracted into a ".php" file (with the same name besides 
 the extension) and gets executed.
 When an argument is given or TESTS environment variable is set, the
 GLOB is expanded by the shell and any file with extension "*.phpt" is
@@ -77,9 +77,9 @@ Examples:

 [Test results]
 --------------
- Test results are printed to standard output. If there is a failed test,
+ Test results are printed to standard output. If there is a failed test, 
 the "run-tests.php" script saves the result, the expected result and the
-code executed to the test script directory. For example, if
+code executed to the test script directory. For example, if 
 ext/myext/tests/myext.phpt fails to pass, the following files are created:

 ext/myext/tests/myext.php   - actual test file executed
@@ -151,20 +151,20 @@ advised to test for non-zero, rather then a specific value.

 [Creating new test files]
 -------------------------
- Writing test file is very easy if you are used to PHP.
+ Writing test file is very easy if you are used to PHP. 
 See the HOWTO at http://qa.php.net/write-test.php


 [How to help us]
 ----------------
- If you find bug in PHP, you can submit bug report AND test script
+ If you find bug in PHP, you can submit bug report AND test script 
 for us. You don't have to write complete script, just give us test
 script with following format. Please test the script and make sure
 you write the correct ACTUAL OUTPUT and EXPECTED OUTPUT before you
 submit.

 <?php
-/*
+/* 
 Bug #12345
 substr() bug. Do not return expected string.

@@ -1,13 +1,13 @@
 [IMPORTANT NOTICE]
 ------------------
-This is an addendum to README.TESTING with additional information
+This is an addendum to README.TESTING with additional information 
 specific to server-tests.php.

 server-tests.php is backward compatible with tests developed for
 the original run-tests.php script.  server-tests is *not* used by
 'make test'.  server-tests was developed to provide support for
 testing PHP under it's primary environment, HTTP, and can run the
-PHP tests under any of the SAPI modules that are direct executables,
+PHP tests under any of the SAPI modules that are direct executables, 
 or are accessible via HTTP.

 [New features]
@@ -25,7 +25,7 @@ or are accessible via HTTP.
  can be configured to run test scripts through an HTTP server running
  on localhost.  localhost is required since either the web server must
  alias a directory to the php source directory, or the test scripts
-  must be copied to a directory under the web server
+  must be copied to a directory under the web server 
  (see config options TEST_WEB_BASE_URL, TEST_BASE_PATH, and TEST_WEB_EXT)
 * New sections supported for test files (see below)

@@ -49,7 +49,7 @@ Some (but not all!) examples of usage:

 4. run tests over http, php sources have been aliased in web server
    php server-tests.php -w -u http://localhost/test
-
+    
 5. run tests using configuration file
    php server-tests.php -c /path/to/server-tests-config.php

@@ -59,10 +59,10 @@ Some (but not all!) examples of usage:

 NOTE: configuration as described in README.TESTING still works.

-[New Test Sections]
+[New Test Sections] 
 ----------------
-In addition to the traditional test sections
-(see http://qa.php.net/write-test.php), several new sections are available
+In addition to the traditional test sections 
+(see http://qa.php.net/write-test.php), several new sections are available 
 under server-tests.

 --POST--
@@ -78,7 +78,7 @@ in the test file.
 Not used for anything, just a section for documenting the test

 --ENV--
-This section get's eval()'d to help build an environment for the
+This section get's eval()'d to help build an environment for the 
 execution of the test.  This can be used to change environment
 vars that are used for CGI emulation, or simply to set env vars
 for cli testing.  A full example looks like:
@@ -132,3 +132,6 @@ regular expect sections.  For example:

  --EXPECTHEADERS--
  Status: 404
+
+
+
@@ -1,5 +1,6 @@
 The Win32 Build System.

-See http://wiki.php.net/internals/windows/stepbystepbuild
+See http://wiki.php.net/internals/windows/stepbystepbuild 

 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)
+
@@ -1,173 +0,0 @@
-Design
-======
-
-Main assumption of the model is that the problem that we are to solve is the
-problem of the very long class names in PHP libraries. We would not attempt
-to take autoloader's job or create packaging model - only make names
-manageable.
-
-Namespaces are defined the following way:
-
-Zend/DB/Connection.php:
-<?php
-namespace Zend\DB;
-
-class Connection {
-}
-
-function connect() {
-}
-?>
-
-Namespace definition does the following:
-All class and function names inside are automatically prefixed with
-namespace name. Inside namespace, local name always takes precedence over
-global name. Several files may be using the same namespace.
-The namespace declaration statement must be the very first statement in
-the file. The only exception is "declare" statement that can be used before.
-
-Every class and function in a namespace can be referred to by the full name
- e.g. Zend\DB\Connection or Zend\DB\connect - at any time.
-
-<?php
-require 'Zend/Db/Connection.php';
-$x = new Zend\DB\Connection;
-Zend\DB\connect();
-?>
-
-Namespace or class name can be imported:
-
-<?php
-require 'Zend/Db/Connection.php';
-use Zend\DB;
-use Zend\DB\Connection as DbConnection;
-
-$x = new Zend\DB\Connection();
-$y = new DB\connection();
-$z = new DbConnection();
-DB\connect();
-?>
-
-The use statement only defines name aliasing. It may create name alias for
-namespace or class. The simple form of statement "use A\B\C\D;" is
-equivalent to "use A\B\C\D as D;". The use statement can be used at any
-time in the global scope (not inside function/class) and takes effect from
-the point of definition down to the end of file. It is recommended however to
-place the use statements at the beginning of the file. The use statements have
-effect only on the file where they appear.
-
-The special "empty" namespace (\ prefix) is useful as explicit global
-namespace qualification. All class and function names started from \
-interpreted as global.
-
-<?php
-namespace A\B\C;
-
-$con = \mysql_connect(...);
-?>
-
-A special constant __NAMESPACE__ contains the name of the current namespace.
-It can be used to construct fully-qualified names to pass them as callbacks.
-
-<?php
-namespace A\B\C;
-
-function foo() {
-}
-
-set_error_handler(__NAMESPACE__ . "\foo");
-?>
-
-In global namespace __NAMESPACE__ constant has the value of empty string.
-
-Names inside namespace are resolved according to the following rules:
-
-1) all qualified names are translated during compilation according to
-current import rules. So if we have "use A\B\C" and then "C\D\e()"
-it is translated to "A\B\C\D\e()".
-2) unqualified class names translated during compilation according to
-current import rules. So if we have "use A\B\C" and then "new C()" it
-is translated to "new A\B\C()".
-3) inside namespace, calls to unqualified functions that are defined in
-current namespace (and are known at the time the call is parsed) are
-interpreted as calls to these namespace functions.
-4) inside namespace, calls to unqualified functions that are not defined
-in current namespace are resolved at run-time. The call to function foo()
-inside namespace (A\B) first tries to find and call function from current
-namespace A\B\foo() and if it doesn't exist PHP tries to call internal
-function foo(). Note that using foo() inside namespace you can call only
-internal PHP functions, however using \foo() you are able to call any
-function from the global namespace.
-5) unqualified class names are resolved at run-time. E.q. "new Exception()"
-first tries to use (and autoload) class from current namespace and in case
-of failure uses internal PHP class. Note that using "new A" in namespace
-you can only create class from this namespace or internal PHP class, however
-using "new \A" you are able to create any class from the global namespace.
-6) Calls to qualified functions are resolved at run-time. Call to
-A\B\foo() first tries to call function foo() from namespace A\B, then
-it tries to find class A\B (__autoload() it if necessary) and call its
-static method foo()
-7) qualified class names are interpreted as class from corresponding
-namespace. So "new A\B\C()" refers to class C from namespace A\B.
-
-Examples
--------
-<?php
-namespace A;
-foo();   // first tries to call "foo" defined in namespace "A"
-         // then calls internal function "foo"
-\foo(); // calls function "foo" defined in global scope
-?>
-
-<?php
-namespace A;
-new B();   // first tries to create object of class "B" defined in namespace "A"
-           // then creates object of internal class "B"
-new \B(); // creates object of class "B" defined in global scope
-?>
-
-<?php
-namespace A;
-new A(); // first tries to create object of class "A" from namespace "A" (A\A)
-         // then creates object of internal class "A"
-?>
-
-<?php
-namespace A;
-B\foo();   // first tries to call function "foo" from namespace "A\B"
-            // then calls method "foo" of internal class "B"
-\B\foo(); // first tries to call function "foo" from namespace "B"
-            // then calls method "foo" of class "B" from global scope
-?>
-
-The worst case if class name conflicts with namespace name
-<?php
-namespace A;
-A\foo();   // first tries to call function "foo" from namespace "A\A"
-            // then tries to call method "foo" of class "A" from namespace "A"
-            // then tries to call function "foo" from namespace "A"
-            // then calls method "foo" of internal class "A"
-\A\foo(); // first tries to call function "foo" from namespace "A"
-            // then calls method "foo" of class "A" from global scope
-?>
-
-TODO
-====
-
-* Support for namespace constants?
-
-* performance problems
-  - calls to internal functions in namespaces are slower, because PHP first
-    looks for such function in current namespace
-  - calls to static methods are slower, because PHP first tries to look
-    for corresponding function in namespace
-
-* Extend the Reflection API?
-  * Add ReflectionNamespace class
-    + getName()
-    + getClasses()
-    + getFunctions()
-    + getFiles()
-  * Add getNamespace() methods to ReflectionClass and ReflectionFunction
-
-* Rename namespaces to packages?
@@ -55,8 +55,9 @@ static int					resource_types_table_size;
 static MUTEX_T tsmm_mutex;	/* thread-safe memory manager mutex */

 /* New thread handlers */
-static tsrm_thread_begin_func_t tsrm_new_thread_begin_handler;
-static tsrm_thread_end_func_t tsrm_new_thread_end_handler;
+static tsrm_thread_begin_func_t tsrm_new_thread_begin_handler = NULL;
+static tsrm_thread_end_func_t tsrm_new_thread_end_handler = NULL;
+static tsrm_shutdown_func_t tsrm_shutdown_handler = NULL;

 /* Debug support */
 int tsrm_error(int level, const char *format, ...);
@@ -93,12 +94,7 @@ static FILE *tsrm_error_file;
 	}
 #endif

-#if defined(GNUPTH)
-static pth_key_t tls_key;
-# define tsrm_tls_set(what)		pth_key_setdata(tls_key, (void*)(what))
-# define tsrm_tls_get()			pth_key_getdata(tls_key)
-
-#elif defined(PTHREADS)
+#if defined(PTHREADS)
 /* Thread local storage */
 static pthread_key_t tls_key;
 # define tsrm_tls_set(what)		pthread_setspecific(tls_key, (void*)(what))
@@ -125,12 +121,13 @@ static int32 tls_key;
 # warning tsrm_set_interpreter_context is probably broken on this platform
 #endif

+TSRM_TLS uint8_t in_main_thread = 0;
+
 /* Startup TSRM (call once for the entire process) */
 TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename)
-{
+{/*{{{*/
 #if defined(GNUPTH)
 	pth_init();
-	pth_key_create(&tls_key, 0);
 #elif defined(PTHREADS)
 	pthread_key_create( &tls_key, 0 );
 #elif defined(TSRM_ST)
@@ -142,6 +139,9 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu
 	tls_key = tls_allocate();
 #endif

+	/* ensure singleton */
+	in_main_thread = 1;
+
 	tsrm_error_file = stderr;
 	tsrm_error_set(debug_level, debug_filename);
 	tsrm_tls_table_size = expected_threads;
@@ -164,18 +164,21 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu

 	tsmm_mutex = tsrm_mutex_alloc();

-	tsrm_new_thread_begin_handler = tsrm_new_thread_end_handler = NULL;
-
 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Started up TSRM, %d expected threads, %d expected resources", expected_threads, expected_resources));
 	return 1;
-}
+}/*}}}*/


 /* Shutdown TSRM (call once for the entire process) */
 TSRM_API void tsrm_shutdown(void)
-{
+{/*{{{*/
 	int i;

+	if (!in_main_thread) {
+		/* ensure singleton */
+		return;
+	}
+
 	if (tsrm_tls_table) {
 		for (i=0; i<tsrm_tls_table_size; i++) {
 			tsrm_tls_entry *p = tsrm_tls_table[i], *next_p;
@@ -218,12 +221,18 @@ TSRM_API void tsrm_shutdown(void)
 #elif defined(TSRM_WIN32)
 	TlsFree(tls_key);
 #endif
-}
+	if (tsrm_shutdown_handler) {
+		tsrm_shutdown_handler();
+	}
+	tsrm_new_thread_begin_handler = NULL;
+	tsrm_new_thread_end_handler = NULL;
+	tsrm_shutdown_handler = NULL;
+}/*}}}*/


 /* allocates a new thread-safe-resource id */
 TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor)
-{
+{/*{{{*/
 	int i;

 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Obtaining a new resource id, %d bytes", size));
@@ -274,11 +283,11 @@ TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate

 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Successfully allocated new resource id %d", *rsrc_id));
 	return *rsrc_id;
-}
+}/*}}}*/


 static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_T thread_id)
-{
+{/*{{{*/
 	int i;

 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Creating data structures for thread %x", thread_id));
@@ -314,25 +323,16 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 	}

 	tsrm_mutex_unlock(tsmm_mutex);
-}
+}/*}}}*/


 /* fetches the requested resource for the current thread */
 TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
-{
+{/*{{{*/
 	THREAD_T thread_id;
 	int hash_value;
 	tsrm_tls_entry *thread_resources;

-#ifdef NETWARE
-	/* The below if loop is added for NetWare to fix an abend while unloading PHP
-	 * when an Apache unload command is issued on the system console.
-	 * While exiting from PHP, at the end for some reason, this function is called
-	 * with tsrm_tls_table = NULL. When this happened, the server abends when
-	 * tsrm_tls_table is accessed since it is NULL.
-	 */
-	if(tsrm_tls_table) {
-#endif
 	if (!th_id) {
 		/* Fast path for looking up the resources for the current
 		 * thread. Its used by just about every call to
@@ -386,15 +386,12 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 	 * changes to the structure as we read it.
 	 */
 	TSRM_SAFE_RETURN_RSRC(thread_resources->storage, id, thread_resources->count);
-#ifdef NETWARE
-	}	/* if(tsrm_tls_table) */
-#endif
-}
+}/*}}}*/

 /* frees an interpreter context.  You are responsible for making sure that
 * it is not linked into the TSRM hash, and not marked as the current interpreter */
 void tsrm_free_interpreter_context(void *context)
-{
+{/*{{{*/
 	tsrm_tls_entry *next, *thread_resources = (tsrm_tls_entry*)context;
 	int i;

@@ -413,10 +410,10 @@ void tsrm_free_interpreter_context(void *context)
 		free(thread_resources);
 		thread_resources = next;
 	}
-}
+}/*}}}*/

 void *tsrm_set_interpreter_context(void *new_ctx)
-{
+{/*{{{*/
 	tsrm_tls_entry *current;

 	current = tsrm_tls_get();
@@ -429,12 +426,12 @@ void *tsrm_set_interpreter_context(void *new_ctx)

 	/* return old context, so caller can restore it when they're done */
 	return current;
-}
+}/*}}}*/


 /* allocates a new interpreter context */
 void *tsrm_new_interpreter_context(void)
-{
+{/*{{{*/
 	tsrm_tls_entry *new_ctx, *current;
 	THREAD_T thread_id;

@@ -448,12 +445,12 @@ void *tsrm_new_interpreter_context(void)
 	/* switch back to the context that was in use prior to our creation
 	 * of the new one */
 	return tsrm_set_interpreter_context(current);
-}
+}/*}}}*/


 /* frees all resources allocated for the current thread */
 void ts_free_thread(void)
-{
+{/*{{{*/
 	tsrm_tls_entry *thread_resources;
 	int i;
 	THREAD_T thread_id = tsrm_thread_id();
@@ -490,12 +487,12 @@ void ts_free_thread(void)
 		thread_resources = thread_resources->next;
 	}
 	tsrm_mutex_unlock(tsmm_mutex);
-}
+}/*}}}*/


 /* frees all resources allocated for all threads except current */
 void ts_free_worker_threads(void)
-{
+{/*{{{*/
 	tsrm_tls_entry *thread_resources;
 	int i;
 	THREAD_T thread_id = tsrm_thread_id();
@@ -536,12 +533,12 @@ void ts_free_worker_threads(void)
 		}
 	}
 	tsrm_mutex_unlock(tsmm_mutex);
-}
+}/*}}}*/


 /* deallocates all occurrences of a given id */
 void ts_free_id(ts_rsrc_id id)
-{
+{/*{{{*/
 	int i;
 	int j = TSRM_UNSHUFFLE_RSRC_ID(id);

@@ -570,7 +567,7 @@ void ts_free_id(ts_rsrc_id id)
 	tsrm_mutex_unlock(tsmm_mutex);

 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Successfully freed resource id %d", id));
-}
+}/*}}}*/



@@ -581,7 +578,7 @@ void ts_free_id(ts_rsrc_id id)

 /* Obtain the current thread id */
 TSRM_API THREAD_T tsrm_thread_id(void)
-{
+{/*{{{*/
 #ifdef TSRM_WIN32
 	return GetCurrentThreadId();
 #elif defined(GNUPTH)
@@ -597,12 +594,12 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 #elif defined(BETHREADS)
 	return find_thread(NULL);
 #endif
-}
+}/*}}}*/


 /* Allocate a mutex */
 TSRM_API MUTEX_T tsrm_mutex_alloc(void)
-{
+{/*{{{*/
 	MUTEX_T mutexp;
 #ifdef TSRM_WIN32
 	mutexp = malloc(sizeof(CRITICAL_SECTION));
@@ -628,12 +625,12 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 	printf("Mutex created thread: %d\n",mythreadid());
 #endif
 	return( mutexp );
-}
+}/*}}}*/


 /* Free a mutex */
 TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
-{
+{/*{{{*/
 	if (mutexp) {
 #ifdef TSRM_WIN32
 		DeleteCriticalSection(mutexp);
@@ -657,7 +654,7 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 #ifdef THR_DEBUG
 	printf("Mutex freed thread: %d\n",mythreadid());
 #endif
-}
+}/*}}}*/


 /*
@@ -665,7 +662,7 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
  A return value of 0 indicates success
 */
 TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
-{
+{/*{{{*/
 	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Mutex locked thread: %ld", tsrm_thread_id()));
 #ifdef TSRM_WIN32
 	EnterCriticalSection(mutexp);
@@ -689,7 +686,7 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 		return acquire_sem(mutexp->sem);
 	return 0;
 #endif
-}
+}/*}}}*/


 /*
@@ -697,7 +694,7 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
  A return value of 0 indicates success
 */
 TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
-{
+{/*{{{*/
 	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Mutex unlocked thread: %ld", tsrm_thread_id()));
 #ifdef TSRM_WIN32
 	LeaveCriticalSection(mutexp);
@@ -721,14 +718,14 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 		return release_sem(mutexp->sem);
 	return 0;
 #endif
-}
+}/*}}}*/

 /*
  Changes the signal mask of the calling thread
 */
 #ifdef HAVE_SIGPROCMASK
 TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset)
-{
+{/*{{{*/
 	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Changed sigmask in thread: %ld", tsrm_thread_id()));
 	/* TODO: add support for other APIs */
 #ifdef PTHREADS
@@ -736,28 +733,36 @@ TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset)
 #else
 	return sigprocmask(how, set, oldset);
 #endif
-}
+}/*}}}*/
 #endif


 TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler)
-{
+{/*{{{*/
 	void *retval = (void *) tsrm_new_thread_begin_handler;

 	tsrm_new_thread_begin_handler = new_thread_begin_handler;
 	return retval;
-}
+}/*}}}*/


 TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler)
-{
+{/*{{{*/
 	void *retval = (void *) tsrm_new_thread_end_handler;

 	tsrm_new_thread_end_handler = new_thread_end_handler;
 	return retval;
-}
+}/*}}}*/


+TSRM_API void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler)
+{/*{{{*/
+	void *retval = (void *) tsrm_shutdown_handler;
+
+	tsrm_shutdown_handler = shutdown_handler;
+	return retval;
+}/*}}}*/
+

 /*
 * Debug support
@@ -765,7 +770,7 @@ TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread

 #if TSRM_DEBUG
 int tsrm_error(int level, const char *format, ...)
-{
+{/*{{{*/
 	if (level<=tsrm_error_level) {
 		va_list args;
 		int size;
@@ -780,12 +785,12 @@ int tsrm_error(int level, const char *format, ...)
 	} else {
 		return 0;
 	}
-}
+}/*}}}*/
 #endif


 void tsrm_error_set(int level, char *debug_filename)
-{
+{/*{{{*/
 	tsrm_error_level = level;

 #if TSRM_DEBUG
@@ -802,11 +807,25 @@ void tsrm_error_set(int level, char *debug_filename)
 		tsrm_error_file = stderr;
 	}
 #endif
-}
+}/*}}}*/

 TSRM_API void *tsrm_get_ls_cache(void)
-{
+{/*{{{*/
 	return tsrm_tls_get();
-}
+}/*}}}*/
+
+TSRM_API uint8_t tsrm_is_main_thread(void)
+{/*{{{*/
+	return in_main_thread;
+}/*}}}*/

 #endif /* ZTS */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
@@ -128,6 +128,7 @@ TSRM_API void ts_free_id(ts_rsrc_id id);

 typedef void (*tsrm_thread_begin_func_t)(THREAD_T thread_id);
 typedef void (*tsrm_thread_end_func_t)(THREAD_T thread_id);
+typedef void (*tsrm_shutdown_func_t)(void);


 TSRM_API int tsrm_error(int level, const char *format, ...);
@@ -145,6 +146,7 @@ TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset);

 TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler);
 TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
+TSRM_API void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler);

 /* these 3 APIs should only be used by people that fully understand the threading model
 * used by PHP/Zend and the selected SAPI. */
@@ -153,6 +155,7 @@ TSRM_API void *tsrm_set_interpreter_context(void *new_ctx);
 TSRM_API void tsrm_free_interpreter_context(void *context);

 TSRM_API void *tsrm_get_ls_cache(void);
+TSRM_API uint8_t tsrm_is_main_thread(void);

 #ifdef TSRM_WIN32
 # define TSRM_TLS __declspec(thread)
@@ -174,10 +177,8 @@ TSRM_API void *tsrm_get_ls_cache(void);
 #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

@@ -215,3 +216,12 @@ TSRM_API void *tsrm_get_ls_cache(void);
 #endif /* ZTS */

 #endif /* TSRM_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
@@ -1,3 +1,5 @@
+
 AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
+
@@ -5,7 +5,7 @@
 #
 # Written by Sascha Schumann
 #
-# $Id$
+# $Id$ 


 LT_TARGETS = ltmain.sh ltconfig
@@ -30,14 +30,14 @@ $(LT_TARGETS):
 $(makefile_in_files): $(makefile_am_files)
 	automake -a -i $(AMFLAGS) $(makefile_files)

-aclocal.m4: configure.in acinclude.m4
+aclocal.m4: configure.ac acinclude.m4
 	aclocal

-$(config_h_in): configure.in
-# explicitly remove target since autoheader does not seem to work
+$(config_h_in): configure.ac
+# explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
 	autoheader

-configure: aclocal.m4 configure.in
+configure: aclocal.m4 configure.ac
 	autoconf
@@ -3,3 +3,4 @@

 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,6 +1,6 @@
 dnl $Id$
 dnl
-dnl Minimalistic configure.in for TSRM.
+dnl Minimalistic configure.ac for TSRM.
 dnl

 AC_INIT(TSRM.c)
@@ -12,10 +12,10 @@ AH_TOP([
 ])

 sinclude(tsrm.m4)
-
+	
 TSRM_BASIC_CHECKS
 TSRM_THREADS_CHECKS
-
+	
 AM_PROG_LIBTOOL
 if test "$enable_debug" != "yes"; then
  AM_SET_LIBTOOL_VARIABLE([--silent])
@@ -194,3 +194,4 @@ esac
 AC_LANG_POP

 ]) dnl end AC_DEFUN
+
@@ -1,45 +1,3 @@
-#ifndef READDIR_H
-#define READDIR_H
-
-
-/*
- * Structures and types used to implement opendir/readdir/closedir
- * on Windows 95/NT.
- */
-
-#include <windows.h>
-
-#include <io.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <direct.h>
-
-/* struct dirent - same as Unix */
-
-struct dirent {
-	long d_ino;					/* inode (always 1 in WIN32) */
-	off_t d_off;				/* offset to this dirent */
-	unsigned short d_reclen;	/* length of d_name */
-	char d_name[_MAX_FNAME + 1];	/* filename (null terminated) */
-};
-
-
-/* typedef DIR - not the same as Unix */
-typedef struct {
-	HANDLE handle;				/* _findfirst/_findnext handle */
-	short offset;				/* offset into directory */
-	short finished;				/* 1 if there are not more files */
-	WIN32_FIND_DATA fileinfo;	/* from _findfirst/_findnext */
-	char *dir;					/* the dir we are reading */
-	struct dirent dent;			/* the dirent to return */
-} DIR;
-
-/* Function prototypes */
-DIR *opendir(const char *);
-struct dirent *readdir(DIR *);
-int readdir_r(DIR *, struct dirent *, struct dirent **);
-int closedir(DIR *);
-int rewinddir(DIR *);
-
-#endif /* READDIR_H */
+/* Keep this header for compatibility with external code, it's currently not
+	used anywhere in the core and there are no implementations in TSRM. */
+#include "win32/readdir.h"
@@ -1,17 +1,17 @@
 dnl  Copyright (c) 1999, 2000 Sascha Schumann. All rights reserved.
-dnl
+dnl 
 dnl  Redistribution and use in source and binary forms, with or without
 dnl  modification, are permitted provided that the following conditions
 dnl  are met:
-dnl
+dnl 
 dnl  1. Redistributions of source code must retain the above copyright
 dnl     notice, this list of conditions and the following disclaimer.
-dnl
+dnl 
 dnl  2. Redistributions in binary form must reproduce the above copyright
 dnl     notice, this list of conditions and the following disclaimer in
 dnl     the documentation and/or other materials provided with the
 dnl     distribution.
-dnl
+dnl 
 dnl  THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY
 dnl  EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 dnl  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -97,7 +97,7 @@ dnl  -Kthread          UDK cc (UnixWare)
 dnl  -mt               WorkShop cc (Solaris)
 dnl  -mthreads         gcc (AIX)
 dnl  -pthread          gcc (Linux, FreeBSD, NetBSD, OpenBSD)
-dnl  -pthreads         gcc (Solaris)
+dnl  -pthreads         gcc (Solaris) 
 dnl  -qthreaded        AIX cc V5
 dnl  -threads          gcc (HP-UX)
 dnl
@@ -117,7 +117,7 @@ else
  AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[
  ac_cv_pthreads_cflags=
  if test "$pthreads_working" != "yes"; then
-    for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
+    for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 
      ac_save=$CFLAGS
      CFLAGS="$CFLAGS $flag"
      PTHREADS_CHECK_COMPILE
@@ -1,6 +1,6 @@
 m4_include([TSRM/m4/gethostbyname.m4])

-dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)
+dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
 AC_DEFUN([TSRM_CHECK_GCC_ARG],[
  gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
  AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
@@ -75,12 +75,12 @@ AC_DEFUN([TSRM_CHECK_ST],[
 sinclude(threads.m4)

 AC_DEFUN([TSRM_CHECK_PTHREADS],[
-
+		
 PTHREADS_CHECK

-if test "$beos_threads" = "1"; then
+if test "$beos_threads" = "1"; then 
  AC_DEFINE(BETHREADS, 1, Whether to use native BeOS threads)
-else
+else		
  if test "$pthreads_working" != "yes"; then
    AC_MSG_ERROR(Your system seems to lack POSIX threads.)
  fi
@@ -13,3 +13,12 @@
 #include <crtdbg.h>

 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
@@ -25,9 +25,7 @@
 #pragma alloca
 #  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
-#    ifndef NETWARE
 char *alloca ();
-#    endif
 #   endif
 #  endif
 # endif
@@ -71,3 +69,12 @@ char *alloca ();
 #endif

 #endif /* TSRM_CONFIG_COMMON_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
@@ -1,240 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 7                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Authors: Venkat Raghavan S <rvenkat@novell.com>                      |
-   |          Anantha Kesari H Y <hyanantha@novell.com>                   |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#include "TSRM.h"
-
-#ifdef NETWARE
-
-#ifdef USE_MKFIFO
-#include <sys/stat.h>
-#elif !defined(USE_PIPE_OPEN)   /* NXFifoOpen */
-#include <nks/fsio.h>
-#endif
-
-#include <nks/vm.h>
-#include <nks/memory.h>
-
-#include <string.h>
-
-#include "mktemp.h"
-
-/* strtok() call in LibC is abending when used in a different address space
- * -- hence using PHP's version itself for now
- */
-#include "tsrm_strtok_r.h"
-#define tsrm_strtok_r(a,b,c) strtok((a),(b))
-
-#define WHITESPACE  " \t"
-#define MAX_ARGS    10
-
-
-TSRM_API FILE* popen(const char *commandline, const char *type)
-{
-	char *command = NULL, *argv[MAX_ARGS] = {'\0'}, **env = NULL;
-	char *tempName = "sys:/php/temp/phpXXXXXX.tmp";
-	char *filePath = NULL;
-	char *ptr = NULL;
-	int ptrLen = 0, argc = 0, i = 0, envCount = 0, err = 0;
-	FILE *stream = NULL;
-#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-	int pipe_handle;
-	int mode = O_RDONLY;
-#else
-	NXHandle_t pipe_handle;
-	NXMode_t mode = NX_O_RDONLY;
-#endif
-	NXExecEnvSpec_t envSpec;
-	NXNameSpec_t nameSpec;
-	NXVmId_t newVM = 0;
-
-	/* Check for validity of input parameters */
-	if (!commandline || !type)
-		return NULL;
-
-	/* Get temporary file name */
-	filePath = mktemp(tempName);
-	if (!filePath)
-		return NULL;
-
-	/* Set pipe mode according to type -- for now allow only "r" or "w" */
-	if (strcmp(type, "r") == 0)
-#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-		mode = O_RDONLY;
-#else
-		mode = NX_O_RDONLY;
-#endif
-	else if (strcmp(type, "w") == 0)
-#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-		mode = O_WRONLY;
-#else
-		mode = NX_O_WRONLY;
-#endif
-	else
-		return NULL;
-
-#ifdef USE_PIPE_OPEN
-	pipe_handle = pipe_open(filePath, mode);
-	if (pipe_handle == -1)
-		return NULL;
-#elif defined(USE_MKFIFO)
-	pipe_handle = mkfifo(filePath, mode);
-	if (pipe_handle == -1)
-		return NULL;
-#else
-	/* - NetWare doesn't require first parameter
-	 * - Allowing LibC to choose the buffer size for now
-	 */
-	err = NXFifoOpen(0, filePath, mode, 0, &pipe_handle);
-	if (err)
-		return NULL;
-#endif
-
-	/* Copy the environment variables in preparation for the spawn call */
-	envCount = NXGetEnvCount() + 1;  /* add one for NULL */
-	env = (char **) NXMemAlloc(sizeof(char *) * envCount, 0);
-	if (!env)
-		return NULL;
-
-	err = NXCopyEnv(env, envCount);
-	if (err) {
-		NXMemFree (env);
-		return NULL;
-	}
-
-	/* Separate commandline string into words */
-	ptr = tsrm_strtok_r((char*)commandline, WHITESPACE, NULL);
-	ptrLen = strlen(ptr);
-
-	command = (char*)malloc(ptrLen + 1);
-	if (!command) {
-		NXMemFree (env);
-		return NULL;
-	}
-
-	strcpy (command, ptr);
-
-	ptr = tsrm_strtok_r(NULL, WHITESPACE, NULL);
-	while (ptr && (argc < MAX_ARGS)) {
-		ptrLen = strlen(ptr);
-
-		argv[argc] = (char*)malloc(ptrLen + 1);
-		if (!argv[argc]) {
-			NXMemFree (env);
-			if (command)
-				free (command);
-
-			for (i = 0; i < argc; i++) {
-				if (argv[i])
-					free (argv[i]);
-			}
-
-			return NULL;
-		}
-
-		strcpy (argv[argc], ptr);
-		argc++;
-		ptr = tsrm_strtok_r(NULL, WHITESPACE, NULL);
-	}
-
-	/* Setup the execution environment and spawn new process */
-	envSpec.esFlags = 0;    /* Not used */
-	envSpec.esArgc = argc;
-	envSpec.esArgv = (void **) argv;
-	envSpec.esEnv = (void **) env;
-
-/*	envSpec.esStdin.ssType = */
-	envSpec.esStdout.ssType = NX_OBJ_FIFO;
-	envSpec.esStderr.ssType = NX_OBJ_FILE;
-
-	/* 'ssHandle' is not a struct/union/class member */
-/*
-	envSpec.esStdin.ssHandle =
-	envSpec.esStdout.ssHandle =
-	envSpec.esStderr.ssHandle = -1;
-*/
-	envSpec.esStdin.ssPathCtx = NULL;
-	envSpec.esStdout.ssPathCtx = NULL;
-	envSpec.esStderr.ssPathCtx = NULL;
-
-#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-	if (mode == O_RDONLY) {
-#else
-	if (mode == NX_O_RDONLY) {
-#endif
-		envSpec.esStdin.ssPath = filePath;
-		envSpec.esStdout.ssPath = stdout;
-	} else { /* Write Only */
-		envSpec.esStdin.ssPath = stdin;
-		envSpec.esStdout.ssPath = filePath;
-	}
-
-	envSpec.esStderr.ssPath = stdout;
-
-	nameSpec.ssType = NX_OBJ_FIFO;
-/*	nameSpec.ssHandle = 0; */	/* 'ssHandle' is not a struct/union/class member */
-	nameSpec.ssPathCtx = NULL;  /* Not used */
-	nameSpec.ssPath = argv[0];
-	err = NXVmSpawn(&nameSpec, &envSpec, 0, &newVM);
-	if (!err)
-		/* Get file pointer corresponding to the pipe (file) opened */
-		stream = fdopen(pipe_handle, type);
-
-	/* Clean-up */
-	if (env)
-		NXMemFree (env);
-
-	if (pipe_handle)
-#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-		close(pipe_handle);
-#else
-		NXClose(pipe_handle);
-#endif
-
-	if (command)
-		free (command);
-
-	for (i = 0; i < argc; i++) {
-		if (argv[i])
-			free (argv[i]);
-	}
-
-	return stream;
-}
-
-TSRM_API int pclose(FILE* stream)
-{
-	int err = 0;
-	NXHandle_t fd = 0;
-
-	/* Get the process associated with this pipe (file) handle and terminate it */
-	fd = fileno(stream);
-	NXClose (fd);
-
-	err = fclose(stream);
-
-	return err;
-}
-
-#endif	/* NETWARE */
@@ -4,7 +4,7 @@
 #include "tsrm_strtok_r.h"

 static inline int in_character_class(char ch, const char *delim)
-{
+{/*{{{*/
 	while (*delim) {
 		if (*delim == ch) {
 			return 1;
@@ -12,10 +12,10 @@ static inline int in_character_class(char ch, const char *delim)
 		delim++;
 	}
 	return 0;
-}
+}/*}}}*/

 TSRM_API char *tsrm_strtok_r(char *s, const char *delim, char **last)
-{
+{/*{{{*/
 	char *token;

 	if (s == NULL) {
@@ -41,7 +41,7 @@ TSRM_API char *tsrm_strtok_r(char *s, const char *delim, char **last)
 		*last = s + 1;
 	}
 	return token;
-}
+}/*}}}*/

 #if 0

@@ -61,3 +61,12 @@ main()
 }

 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2017 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -42,7 +42,7 @@ static tsrm_win32_globals win32_globals;
 #endif

 static void tsrm_win32_ctor(tsrm_win32_globals *globals)
-{
+{/*{{{*/
 #ifdef ZTS
 TSRMLS_CACHE_UPDATE();
 #endif
@@ -61,10 +61,10 @@ TSRMLS_CACHE_UPDATE();
 	 */
 	globals->impersonation_token = INVALID_HANDLE_VALUE;
 	globals->impersonation_token_sid = NULL;
-}
+}/*}}}*/

 static void tsrm_win32_dtor(tsrm_win32_globals *globals)
-{
+{/*{{{*/
 	shm_pair *ptr;

 	if (globals->process) {
@@ -89,51 +89,48 @@ static void tsrm_win32_dtor(tsrm_win32_globals *globals)
 	if (globals->impersonation_token_sid) {
 		free(globals->impersonation_token_sid);
 	}
-}
+}/*}}}*/

 TSRM_API void tsrm_win32_startup(void)
-{
+{/*{{{*/
 #ifdef ZTS
 	ts_allocate_id(&win32_globals_id, sizeof(tsrm_win32_globals), (ts_allocate_ctor)tsrm_win32_ctor, (ts_allocate_ctor)tsrm_win32_dtor);
 #else
 	tsrm_win32_ctor(&win32_globals);
 #endif
-}
+}/*}}}*/

 TSRM_API void tsrm_win32_shutdown(void)
-{
+{/*{{{*/
 #ifndef ZTS
 	tsrm_win32_dtor(&win32_globals);
 #endif
-}
+}/*}}}*/

-char * tsrm_win32_get_path_sid_key(const char *pathname)
-{
+char * tsrm_win32_get_path_sid_key(const char *pathname, size_t pathname_len, size_t *key_len)
+{/*{{{*/
 	PSID pSid = TWG(impersonation_token_sid);
-	TCHAR *ptcSid = NULL;
+	char *ptcSid = NULL;
 	char *bucket_key = NULL;
-	size_t ptc_sid_len, pathname_len;
-
-	pathname_len = strlen(pathname);
+	size_t ptc_sid_len;

 	if (!pSid) {
-		bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pathname_len + 1);
-		if (!bucket_key) {
-			return NULL;
-		}
-		memcpy(bucket_key, pathname, pathname_len);
-		return bucket_key;
+		*key_len = pathname_len;
+		return pathname;
 	}

 	if (!ConvertSidToStringSid(pSid, &ptcSid)) {
+		*key_len = 0;
 		return NULL;
 	}


 	ptc_sid_len = strlen(ptcSid);
-	bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pathname_len + ptc_sid_len + 1);
+	*key_len = pathname_len + ptc_sid_len;
+	bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *key_len + 1);
 	if (!bucket_key) {
 		LocalFree(ptcSid);
+		*key_len = 0;
 		return NULL;
 	}

@@ -142,11 +139,11 @@ char * tsrm_win32_get_path_sid_key(const char *pathname)

 	LocalFree(ptcSid);
 	return bucket_key;
-}
+}/*}}}*/


 PSID tsrm_win32_get_token_sid(HANDLE hToken)
-{
+{/*{{{*/
 	DWORD dwLength = 0;
 	PTOKEN_USER pTokenUser = NULL;
 	DWORD sid_len;
@@ -193,10 +190,10 @@ Finished:
 		HeapFree(GetProcessHeap(), 0, (LPVOID)pTokenUser);
 	}
 	return NULL;
-}
+}/*}}}*/

 TSRM_API int tsrm_win32_access(const char *pathname, int mode)
-{
+{/*{{{*/
 	time_t t;
 	HANDLE thread_token = NULL;
 	PSID token_sid;
@@ -208,6 +205,7 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 	DWORD sec_desc_length = 0, desired_access = 0, granted_access = 0;
 	BYTE * psec_desc = NULL;
 	BOOL fAccess = FALSE;
+
 	realpath_cache_bucket * bucket = NULL;
 	char * real_path = NULL;

@@ -295,14 +293,14 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)

 		if (CWDG(realpath_cache_size_limit)) {
 			t = time(0);
-			bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t);
+			bucket = realpath_cache_lookup(pathname, strlen(pathname), t);
 			if(bucket == NULL && real_path == NULL) {
 				/* We used the pathname directly. Call tsrm_realpath */
 				/* so that entry is created in realpath cache */
 				real_path = (char *)malloc(MAXPATHLEN);
 				if(tsrm_realpath(pathname, real_path) != NULL) {
 					pathname = real_path;
-					bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t);
+					bucket = realpath_cache_lookup(pathname, strlen(pathname), t);
 					PHP_WIN32_IOUTIL_REINIT_W(pathname);
 				}
 			}
@@ -396,11 +394,11 @@ Finished:
 			return 0;
 		}
 	}
-}
+}/*}}}*/


 static process_pair *process_get(FILE *stream)
-{
+{/*{{{*/
 	process_pair *ptr;
 	process_pair *newptr;

@@ -423,10 +421,10 @@ static process_pair *process_get(FILE *stream)
 	ptr = newptr + TWG(process_size);
 	TWG(process_size)++;
 	return ptr;
-}
+}/*}}}*/

-static shm_pair *shm_get(int key, void *addr)
-{
+static shm_pair *shm_get(key_t key, void *addr)
+{/*{{{*/
 	shm_pair *ptr;
 	shm_pair *newptr;

@@ -455,24 +453,25 @@ static shm_pair *shm_get(int key, void *addr)
 	TWG(shm_size)++;
 	memset(ptr, 0, sizeof(*ptr));
 	return ptr;
-}
+}/*}}}*/

-static HANDLE dupHandle(HANDLE fh, BOOL inherit) {
+static HANDLE dupHandle(HANDLE fh, BOOL inherit)
+{/*{{{*/
 	HANDLE copy, self = GetCurrentProcess();
 	if (!DuplicateHandle(self, fh, self, &copy, 0, inherit, DUPLICATE_SAME_ACCESS|DUPLICATE_CLOSE_SOURCE)) {
 		return NULL;
 	}
 	return copy;
-}
+}/*}}}*/

 TSRM_API FILE *popen(const char *command, const char *type)
-{
+{/*{{{*/

 	return popen_ex(command, type, NULL, NULL);
-}
+}/*}}}*/

 TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env)
-{
+{/*{{{*/
 	FILE *stream = NULL;
 	int fno, type_len, read, mode;
 	STARTUPINFOW startup;
@@ -616,10 +615,10 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	proc->prochnd = process.hProcess;
 	proc->stream = stream;
 	return stream;
-}
+}/*}}}*/

 TSRM_API int pclose(FILE *stream)
-{
+{/*{{{*/
 	DWORD termstat = 0;
 	process_pair *process;

@@ -636,19 +635,15 @@ TSRM_API int pclose(FILE *stream)
 	CloseHandle(process->prochnd);

 	return termstat;
-}
+}/*}}}*/

-TSRM_API int shmget(int key, int size, int flags)
-{
+TSRM_API int shmget(key_t key, size_t size, int flags)
+{/*{{{*/
 	shm_pair *shm;
 	char shm_segment[26], shm_info[29];
 	HANDLE shm_handle, info_handle;
 	BOOL created = FALSE;

-	if (size < 0) {
-		return -1;
-	}
-
 	snprintf(shm_segment, sizeof(shm_segment), "TSRM_SHM_SEGMENT:%d", key);
 	snprintf(shm_info, sizeof(shm_info), "TSRM_SHM_DESCRIPTOR:%d", key);

@@ -657,7 +652,14 @@ TSRM_API int shmget(int key, int size, int flags)

 	if (!shm_handle && !info_handle) {
 		if (flags & IPC_CREAT) {
-			shm_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, size, shm_segment);
+#if SIZEOF_SIZE_T == 8
+			DWORD high = size >> 32;
+			DWORD low = (DWORD)size;
+#else
+			DWORD high = 0;
+			DWORD low = size;
+#endif
+			shm_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, high, low, shm_segment);
 			info_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(shm->descriptor), shm_info);
 			created		= TRUE;
 		}
@@ -716,10 +718,10 @@ TSRM_API int shmget(int key, int size, int flags)
 	}

 	return key;
-}
+}/*}}}*/

 TSRM_API void *shmat(int key, const void *shmaddr, int flags)
-{
+{/*{{{*/
 	shm_pair *shm = shm_get(key, NULL);

 	if (!shm->segment) {
@@ -739,10 +741,10 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags)
 	shm->descriptor->shm_nattch++;

 	return shm->addr;
-}
+}/*}}}*/

 TSRM_API int shmdt(const void *shmaddr)
-{
+{/*{{{*/
 	shm_pair *shm = shm_get(0, (void*)shmaddr);

 	if (!shm->segment) {
@@ -754,9 +756,10 @@ TSRM_API int shmdt(const void *shmaddr)
 	shm->descriptor->shm_nattch--;

 	return UnmapViewOfFile(shm->addr) ? 0 : -1;
-}
+}/*}}}*/

-TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf) {
+TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf)
+{/*{{{*/
 	shm_pair *shm = shm_get(key, NULL);

 	if (!shm->segment) {
@@ -784,16 +787,16 @@ TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf) {
 		default:
 			return -1;
 	}
-}
+}/*}}}*/

 TSRM_API char *realpath(char *orig_path, char *buffer)
-{
+{/*{{{*/
 	int ret = GetFullPathName(orig_path, _MAX_PATH, buffer, NULL);
 	if(!ret || ret > _MAX_PATH) {
 		return NULL;
 	}
 	return buffer;
-}
+}/*}}}*/

 #if HAVE_UTIME
 static zend_always_inline void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {{{ */
@@ -851,3 +854,12 @@ TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
 /* }}} */
 #endif
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2017 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -26,9 +26,10 @@
 #if HAVE_UTIME
 # include <sys/utime.h>
 #endif
+#include "win32/ipc.h"

 struct ipc_perm {
-	int			key;
+	key_t		key;
 	unsigned short	uid;
 	unsigned short	gid;
 	unsigned short	cuid;
@@ -39,7 +40,7 @@ struct ipc_perm {

 struct shmid_ds {
 	struct	ipc_perm	shm_perm;
-	int				shm_segsz;
+	size_t			shm_segsz;
 	time_t			shm_atime;
 	time_t			shm_dtime;
 	time_t			shm_ctime;
@@ -94,7 +95,7 @@ TSRMLS_CACHE_EXTERN()
 #define	SHM_RND		FILE_MAP_WRITE
 #define	SHM_REMAP	FILE_MAP_COPY

-char * tsrm_win32_get_path_sid_key(const char *pathname );
+char * tsrm_win32_get_path_sid_key(const char *pathname, size_t pathname_len, size_t *key_len);

 TSRM_API void tsrm_win32_startup(void);
 TSRM_API void tsrm_win32_shutdown(void);
@@ -105,10 +106,19 @@ TSRM_API int pclose(FILE *stream);
 TSRM_API int tsrm_win32_access(const char *pathname, int mode);
 TSRM_API int win32_utime(const char *filename, struct utimbuf *buf);

-TSRM_API int shmget(int key, int size, int flags);
+TSRM_API int shmget(key_t key, size_t size, int flags);
 TSRM_API void *shmat(int key, const void *shmaddr, int flags);
 TSRM_API int shmdt(const void *shmaddr);
 TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf);

 TSRM_API char *realpath(char *orig_path, char *buffer);
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
@@ -1,4 +1,4 @@
-PHP 7.1 UPGRADE NOTES
+PHP 7.2 UPGRADE NOTES

 1. Backward Incompatible Changes
 2. New Features
@@ -20,269 +20,236 @@ PHP 7.1 UPGRADE NOTES
 ========================================

 - Core:
-  . 'void' can no longer be used as the name of a class, interface, or trait.
-    This applies to declarations, class_alias() and use statements.
-  . 'iterable' can no longer be used as the name of a class, interface, or
-    trait. This applies to declarations, class_alias() and use statements.
-    (RFC: https://wiki.php.net/rfc/iterable)
-  . (int), intval() where $base is 10 or unspecified, settype(), decbin(),
-    decoct(), dechex(), integer operators and other conversions now always
-    respect scientific notation in numeric strings.
-    (RFC: https://wiki.php.net/rfc/invalid_strings_in_arithmetic)
-  . The ASCII 0x7F Delete control character is no longer permitted in unquoted
-    identifiers in source code.
-  . The following functions may no longer be called dynamically using $func(),
-    call_user_func(), array_map() or similar:
-     . extract()
-     . compact()
-     . get_defined_vars()
-     . func_get_args()
-     . func_get_arg()
-     . func_num_args()
-     . parse_str() with one argument
-     . mb_parse_str() with one argument
-     . assert() with a string argument
-    (RFC: https://wiki.php.net/rfc/forbid_dynamic_scope_introspection)
-  . If the error_log is set to syslog, the PHP error levels are mapped to the
-    syslog error levels. This brings finer differentiation in the error logs
-    in contrary to the previous approach where all the errors are loggged with
-    the notice level only.
-  . Don't call destructors of incompletely constructed objects, even if they
-    are kept referenced. See bug #29368 and Zend/tests/bug29368_1.phpt.
-  . call_user_func() will now consistently throw a warning if a function with
-    reference arguments is called. However, call_user_func() will no longer
-    abort the call in this case.
-  . rand() and srand() are now aliases of mt_rand() and mt_srand().
-    Consequently the output of the following functions has changed:
-     . rand()
-     . shuffle()
-     . str_shuffle()
-     . array_rand()
-  . Fixes to random number generators mean that mt_rand() now produces a
-    different sequence of outputs to previous versions. If you relied on
-    mt_srand() to produce a deterministic sequence, it can be called using
-    mt_srand($seed, MT_RAND_PHP) to produce the old sequences.
-  . URL rewriter has been improved.
-     . Use dedicated buffer for Session module rewrite and User rewrite.
-     . Full path URL rewrite is supported. Allowed domain can be specified.
-       $_SERVER['HTTP_HOST'] is allowed by default when host whitelist is empty.
-     . Use session.trans_sid_tags and session.trans_sid_hosts to control
-       session rewrite.
-     . Use url_rewriter.tags and url_rewriter.hosts to control user rewrite.
-     . <form>'s "action" attribute is used to check if URL rewrite is allowed
-       and listed under hosts whitelist.
-     . <fieldset> is no longer considered as a special tag. <form> is the
-       only tag considered special.
-  . Calling a function with less arguments than mandatory declared ones in
-    signature now issues a Fatal Error (Error Exception) instead of a Warning.
-    (RFC https://wiki.php.net/rfc/too_few_args).
-  . The error message for E_RECOVERABLE errors has been changed from "Catchable
-    fatal error" to "Recoverable fatal error".
-  . The empty index operator (e.g. $str[] = $x) is not supported for strings
-    anymore, and throws a fatal error instead of silently converting to array.
-  . Array elements or object properties that are automatically created during
-    by-reference assignments will now result in a different order. For example
+  . gettype() will now return "resource (closed)" instead of "unknown type" for
+    closed resources.
+  . is_object() will now return true for objects of class
+    __PHP_Incomplete_Class.
+  . Support for Netware operating systems have been removed.
+  . Casting arrays to objects (with (object) or settype()) will now covert
+    integer keys to string property names. This fixes the behaviour of previous
+    versions, where integer keys would become inaccessible properties with
+    integer names.
+  . Casting objects to arrays (with (array) or settype()), and retrieving
+    object properties in an array with get_object_vars(), will now convert
+    numeric string property names (that is, property names of the format
+    /^(0|(-?[1-9][0-9]*))$/ where PHP_INT_MIN <= n <= PHP_INT_MAX) to integer
+    keys. This fixes the behaviour of previous versions, where numeric string
+    property names would become inaccessible string keys.
+  . Unqualified references to undefined constants now generate a Warning instead
+    of a notice. They will generate an Error in a future version of PHP.
+    (https://wiki.php.net/rfc/deprecate-bareword-strings)
+  . Minimum supported Windows versions are Windows 7/Server 2008 R2.
+  . Initial trait property value compatibility check will no longer perform
+    any casts. (Bug #74269)
+  . "object" (in any case) can no longer be used as a class name.

-        $array = [];
-        $array["a"] =& $array["b"];
-        $array["b"] = 1;
-        var_dump($array);
+- BCMath:
+  . The bcmod() function no longer truncates fractional numbers to integers. As
+    such, its behavior now follows fmod() rather than the `%` operator. For
+    example `bcmod('4', '3.5')` now returns '0.5' instead of '1'.

-    now results in the array ["b" => 1, "a" => 1], while for PHP 7.0 the result
-    was ["a" => 1, "b" => 1].
-  . The allowed_classes element of the $options parameter of unserialize() is
-    now strictly typed, i.e. if anything other than an array or a boolean is
-    given, unserialize() returns FALSE and issues an E_WARNING.
-  . $this, autoglobals, and variables with the same name as a parameter can no
-    longer be bound to a closure via the use construct.
+- Hash:
+  . The hash_hmac(), hash_hmac_file(), hash_pbkdf2() and hash_init() (with
+    HASH_HMAC) functions no longer accept non-cryptographic hashes.

- JSON:
-  . The serialize_precision is used instead of precision when encoding double
-    values.
-  . An empty key is decoded as an empty property name instead of using _empty_
-    property name when decoding object to stdClass.
-  . When calling json_encode with JSON_UNESCAPED_UNICODE option, U+2028 and
-    U+2029 are escaped.
-
- mbstring:
-  . mb_ereg() and mb_eregi() will now set the $regs argument to an empty array,
-    if nothing matched. Formerly, $regs was not modified in that case.
-
- OpenSSL:
-  . Dropped sslv2 stream.
+- JSON
+  . The json_decode() option JSON_OBJECT_AS_ARRAY is used if the second
+    parameter (assoc) is null. Previously JSON_OBJECT_AS_ARRAY was always
+    ignored.

 - Session:
-  . Session ID is generated from CSPRNG directly. As a result, Session ID length
-    could be any length between 22 and 256. Note: Max size of session ID depends
-    on save handler you are using.
-  . Following INIs are removed
-     . session.hash_function
-     . session.hash_bits_per_character
-     . session.entropy_file
-     . session.entropy_length
-  . New INIs and defaults
-     . session.sid_length (Number of session ID characters - 22 to 256.
-       php.ini-* default: 26 Compiled default: 32)
-     . session.sid_bits_per_character (Bits used per character - 4 to 6.
-       php.ini-* default: 5 Compiled default: 4)
-  . Length of old session ID string is determined as follows
-     . Used hash function's bits.
-        . session.hash_function=0 - MD5 128 bits (This was default)
-        . session.hash_function=1 - SHA1 160 bits
-     . Bits per character. (4, 5 or 6 bits per character)
-     . Examples
-         MD5 and 4 bits = 32 chars,  ceil(128/4)=32
-         MD5 and 5 bits = 26 chars,  ceil(128/5)=26
-         MD5 and 6 bits = 22 chars,  ceil(128/6)=22
-         SHA1 and 4 bits = 40 chars, ceil(160/4)=40
-         SHA1 and 5 bits = 32 chars, ceil(160/5)=32
-         SHA1 and 6 bits = 27 chars, ceil(160/6)=27
-         and so on.
-  . session_start() returns FALSE and no longer initializes $_SESSION when
-    it failed to start session.
+  . Removed register_globals related code and "!" can be used as $_SESSION key name.
+  . Session is made to manage session status correctly and prevents invalid operations.
+    Only inappropriate codes are affected by this change. If you have problems with this,
+    it means you have problem in your code.
+    . Functions are made to set or return correct session status.
+        session_start(), session_status(), session_regenerate_id()
+    . Functions are made to return bool from null. These functions have void parameter
+      and void parameter is checked.
+        session_unset(), session_write_close()/session_commit(), session_abort(),
+        session_reset()
+    . Functions prohibit invalid operations with regard to session status and
+      HTTP header status, returns correct bool return value.
+        session_start(), session_set_cookie_params(), session_name(), session_module_name(),
+        session_set_save_handler(), session_regenerate_id(), session_cache_limiter(),
+        session_cache_expire(), session_unset(), session_destroy(),
+        session_write_close()/session_commit(), session_reset()
+    . INI value change by ini_set() returns update status correctly.　Invalid INI modifications
+      are checked and made to fail.
+        session.name, session.save_path, session.cookie_lifetime, session.cookie_path,
+        session.cookie_domain, session.cookie_httponly, session.cookie_secure,
+        session.use_cookies, session.use_only_cookies, session.use_strict_mode,
+        session.referer_check, session.cache_limiter, session.cache_expire,
+        session.lazy_write, session.save_handler, session.serialize_handler,
+        session.gc_probability, session.gc_divior, session.gc_maxlifetime,
+    . Some E_ERRORs are changed to E_WARNING since session status is managed correctly.
+        session_start()
+    . Session no longer initialize $_SESSION for invalid and useless session.
+        session_start()
+    . When headers are already sent and try to set new INI values, session_name(),
+      session_module_name(), session_save_path(), session_cache_limiter() and
+      session_cache_expire() are no longer works. Older PHPs accepts new values even
+      if new values will not be effective.
+      This new corrected behavior may affect command line mode CLI scripts that manage
+      sessions. Use output buffer just like web applications to resolve problems on
+      CLI scripts.

- Reflection:
-  . The behavior of ReflectionMethod::invoke() and ::invokeArgs() has been
-    aligned, which causes slightly different behavior than before for some
-    pathological cases.
-
- IMAP:
-  Starting with 7.1.25, rsh/ssh logins are disabled by default. Use
-  imap.enable_insecure_rsh if you want to enable them. Note that the IMAP
-  library does not filter mailbox names before passing them to rsh/ssh
-  command, thus passing untrusted data to this function with rsh/ssh enabled
-  is insecure.

 ========================================
 2. New Features
 ========================================
- Core
-  . Added void return type, which requires that a function not return a value.
-    (RFC: https://wiki.php.net/rfc/void_return_type)
-  . Added iterable pseudo-type accepting any array or object implementing
-    Traversable.
-    (RFC: https://wiki.php.net/rfc/iterable)
-  . String offset access now supports negative references, which will be
-    counted from the end of the string.
-    (RFC: https://wiki.php.net/rfc/negative-string-offsets)
-  . Added a form of the list() construct where keys can be specified.
-    (RFC: https://wiki.php.net/rfc/list_keys)
-  . Added [] = as alternative construct to list() =.
-    (RFC: https://wiki.php.net/rfc/short_list_syntax)
-  . Number operators taking numeric strings now emit "A non well formed numeric
-    value encountered" E_NOTICEs for leading-numeric strings, and "A
-    non-numeric value encountered" E_WARNINGs for non-numeric strings.
-    This always applies to the +, -, *, /, **, %, << and >> operators, and
-    their assignment counterparts +=, -=, *=, /=, **=, %=, <<= and >>=.
-    For the bitwise operators |, & and ^, and their assignment counterparts
-    |=, &= and ^=, this only applies where only one operand is a string.
-    Note that this never applies to the bitwise NOT operator, ~, which does not
-    handle numeric strings, nor to the increment and decrement operators
-    ++ and --, which have a unique approach to handling numeric strings.
-    (RFC: https://wiki.php.net/rfc/invalid_strings_in_arithmetic)
-  . Closure::fromCallable (RFC: https://wiki.php.net/rfc/closurefromcallable)
-  . Added support for class constant visibility modifiers.
-    (RFC: https://wiki.php.net/rfc/class_const_visibility)
-  . TypeError messages for arg_info type checks will now say "must be ...
-    or null", or "must ... or be null" where the parameter or return type
-    accepts null. arg_info type checks are used by all userland functions with
-    type declarations, and some internal functions. Both nullable type
-    declarations (?int) and parameters with default values of null
-    (int $foo = NULL) are considered to "accept null" for this purpose.
-  . The simple syntax for variable parsing inside of string literals now
-    supports negative offsets.
+
+- Core:
+  . It is now possible to remove argument type annotations when overriding an
+    inherited method. This complies with contravariance of method argument types
+    under the Liskov Substitution Principle.
+    (https://wiki.php.net/rfc/parameter-no-type-variance)
+  . It is now allowed to override an abstract method with another abstract
+    method in a child class.
+    (https://wiki.php.net/rfc/allow-abstract-function-override)
+  . A trailing comma in group use statements is now allowed.
+    (https://wiki.php.net/rfc/list-syntax-trailing-commas)
+  . The "object" type annotation is now supported.
+    (https://wiki.php.net/rfc/object-typehint)
+
+- DBA:
+  . Implemented support for the LMDB backend.
+
+- OCI8:
+  . Added Oracle Database Transparent Application Failover (TAF) callback support.
+
+- PCRE:
+  . Added `J` modifier for setting PCRE_DUPNAMES.
+  . Added `PREG_UNMATCHED_AS_NULL` flag to allow distinguish between unmatched
+    subpatterns and empty matches by reporting NULL and "" (empty string),
+    respectively.
+
+- Sodium
+  . New cryptographic extension
+
+- SQLite3:
+  . Implemented writing to BLOBs.
+
+- Standard:
+  . Simplified password hashing API updated to support Argon2i hashes when PHP is compiled with libargon2
+    (https://wiki.php.net/rfc/argon2_password_hash).
+  . proc_nice() is now supported on Windows platforms.
+
+- Zip:
+  . read/write encrypted archive, relying on libzip 1.2.0,
+    using new methods:
+      ZipArchive::setEncryptionName($name, $method [, $password]);
+      ZipArchive::setEncryptionIndex($index, $method [, $password]);
+    and new constants:
+      ZipArchive::EM_NONE
+      ZipArchive::EM_AES_128
+      ZipArchive::EM_AES_192
+      ZipArchive::EM_AES_256
+  . accept 'password' from zip stream context
+  . ZipArchive implements countable, added ZipArchive::count() method.
+

 ========================================
 3. Changes in SAPI modules
 ========================================
- apache2handler:
-  . Implemented per module logging.
-  . Implemented error level mapping between PHP and Apache for the error logs.

 ========================================
 4. Deprecated Functionality
 ========================================

- 'e' option of mb_ereg_replace() and mb_eregi_replace().
- ext/mcrypt is now fully deprecated.
+All the deprecated functionality listed in the following will be removed in
+PHP 8.0.
+
+- Core:
+  . The trace_errors ini directive has been deprecated.
+  . The __autoload() mechanism has been deprecated, use spl_autoload_register()
+    instead.
+  . The (unset) cast has been deprecated. This does not affect the unset($var)
+    language construct.
+  . The create_function() function has been deprecated, use anonymous functions
+    instead.
+  . The each() function has been deprecated, use a foreach loop instead.
+  
+- EXIF:
+  . The read_exif_data() alias have been deprecated, use exif_read_data() instead.
+
+- GD:
+  . png2wbmp() and jpeg2wbmp() have been deprecated.
+
+- GMP:
+  . The gmp_random() function has been deprecated, use gmp_random_bits() or
+    gmp_random_range() instead.
+
+- Intl:
+  . INTL_IDNA_VARIANT_2003 has been deprecated; use INTL_IDNA_VARIANT_UTS46
+    instead.
+
+- Mbstring:
+  . The mbstring.func_overload ini directive has been deprecated.
+
+- Standard:
+  . Calling parse_str() without the result argument has been deprecated.
+  . Calling assert() with a string argument has been deprecated, use an ordinary
+    expression instead.
+
+See also: https://wiki.php.net/rfc/deprecations_php_7_2

 ========================================
 5. Changed Functions
 ========================================
- get_headers() has an extra parameter which allows passing a custom stream
-  context.
- The first $varname argument for getenv() is no longer mandatory, the
-  current environment variables will be returned as an associative array
-  when omitted.
- json_encode() accepts new option JSON_UNESCAPED_LINE_TERMINATORS that
-  disables escaping of U+2028 and U+2029 characters when
-  JSON_UNESCAPED_UNICODE is supplied.
- long2ip() accepts integer as parameter now
- openssl_encrypt and openssl_decrypt have extra parameters for handling
-  authenticated encryption (tag, aad, tag_length) and decryption (tag, aad).
- pg_last_notice() accepts optional long parameter to specify operation.
-  PGSQL_NOTICE_LAST - Get last notice (Default)
-  PGSQL_NOTICE_ALL - Get all stored notices
-  PGSQL_NOTICE_CLEAR - Remove all stored notices
-  It returns empty string or array on successful PGSQL_NOTICE_LAST/ALL calls.
-  It returned FALSE for empty notice previously.
- pg_fetch_all() accepts 2nd optional result type parameter like
-  pg_fetch_row().
- pg_select() accepts 4th optional result type parameter like pg_fetch_row().
- parse_url() is more restrictive now and supports RFC3986.
- unpack() accepts an additional optional $offset argument. '@' format code
-  (that specifes an absolute position) is applyed to input data after
-  the $offset argument.
- strpos(), stripos(), substr_count(), grapheme_strpos(), grapheme_stripos(),
-  grapheme_extract(), iconv_strpos(), mb_strimwidth(), mb_ereg_search_setpos(),
-  mb_strpos() and mb_stripos() now accept negative string offsets.
- substr_count() and mb_strimwidth() additionally also accept negative length.
- file_get_contents() accepts a negative seek offset if the stream is seekable.
- tempnam() throws a notice when failing back to the system temp dir.
- getopt() has an extra by-ref parameter : optind
- mb_ereg() and mb_ereg_replace() reject illegal byte sequences.
- FILTER_FLAG_EMAIL_UNICODE can be used with filter_var() for email validation
-  according to RFC 6531.
- output_reset_rewrite_vars() no longer reset session URL rewrite vars.
- the lasinsertid() in pdo_pgsql extension triggers an error, when no nextval()
-  were called in in the current session.
- fopen()
-  Since 7.1.2, mode 'e' was added, which sets the close-on-exec flag
-  on the opened file descriptor. This mode is only available in PHP compiled on
-  POSIX.1-2008 conform systems.

+- Standard:
+  . password_hash() can generate Argon2i hashes when the algorithm is set to PASSWORD_ARGON2I. 
+    When using PASSWORD_ARGON2I, the following cost factors may be set: 'memory_cost', 'time_cost', 
+    and 'threads'. These cost factors will default to 'PASSWORD_ARGON2_DEFAULT_MEMORY_COST', 
+    'PASSWORD_ARGON2_DEFAULT_TIME_COST', and 'PASSWORD_ARGON2_DEFAULT_THREADS' respectively if not set.
+  . password_verify() can verify Argon2i hashes.
+  . password_get_info() and password_needs_rehash() can accept Argon2i hashes.
+  . mail()/mb_send_mail() accept array $extra_header. Array parameter is checked against RFC 2822.
+    Array format is 
+    $extra_headers = [
+      'Header-Name' => 'Header value',
+      'Multiple' => ['One header', 'Another header'],
+      'Multiline' = "FirstLine\r\n SecondLine",
+    ];
+  . count() now raises a warning when an invalid parameter is passed.
+    Only arrays and objects implementing the Countable interface should be passed.
+  . pack() and unpack() now support float and double in both little and big endian.
+  . number_format() ensures zero values never contain a negative sign.
+
+- XML:
+  . utf8_encode() and utf8_decode() have been moved to the Standard extension
+    as string functions.

 ========================================
 6. New Functions
 ========================================
+
 - Core:
-  . Added sapi_windows_cp_set(), sapi_windows_cp_get(), sapi_windows_cp_is_utf8(),
-    sapi_windows_cp_conv() for codepage handling.
+  . Added stream_isatty().
+  . Added sapi_windows_vt100_support().

- cURL:
-  . Added curl_multi_errno() and curl_share_errno() to return the last error
-    number of curl_multi and curl_share resources.
-  . Added curl_share_strerror() to convert error code to error message text
-    describing the error.
+- DOM:
+  . DomNodeList implements Countable, added DomNodeList::count().
+  . DOMNamedNodeMap implements Countable, added DOMNamedNodeMap::count().

- Hash:
-  . In PHP 7.1.2: Added hash_hkdf() function, which implements the HMAC-based
-    Key Derivation Function (HKDF) algorithm according to RFC 5869. The
-    implementation combines the Extract and Expand steps.
+- GD:
+  . Added imagesetclip() and imagegetclip().
+  . Added imageopenpolygon().
+  . Added imageresolution().
+  . Added imagecreatefrombmp() and imagebmp().

- pcntl:
-  . Added pcntl_signal_get_handler() that returns the current signal handler
-    for a particular signal.
+- Mbstring:
+  . Added mb_chr() and mb_ord().
+  . Added mb_scurb() that scrub broken multibyte strings.

- Session:
-  . Added session_gc() that performs session data garbage collection.
-    https://wiki.php.net/rfc/session-gc
-  . Added session_create_id() for creating custom session ID.
-    https://wiki.php.net/rfc/session-create-id
+- OCI8:
+  . Added oci_register_taf_callback() and oci_disable_taf_callback() for
+    Oracle Database TAF callback support.

- Standard:
-  . Added is_iterable() that determines if a value will be accepted by the new
-    iterable pseudo-type.
+- Sockets:
+  . Added socket_addrinfo_lookup(), socket_addrinfo_connect(),
+    socket_addrinfo_bind() and socket_addrinfo_explain().

 ========================================
 7. New Classes and Interfaces
@@ -292,151 +259,79 @@ PHP 7.1 UPGRADE NOTES
 8. Removed Extensions and SAPIs
 ========================================

+- Mcrypt:
+  . The deprecated mcrypt extension has been moved to PECL.
+  . libmcrypt has not been maintained since 2007 and the continued use of this
+    extension is strongly discouraged.
+  . Users are advised to use alternatives such as OpenSSL or libsodium.
+
 ========================================
 9. Other Changes to Extensions
 ========================================

- Date:
-  . Invalid serialization data for a DateTime or DatePeriod object will now
-    throw an instance of Error from __wakeup() or __set_state() instead of
-    resulting in a fatal error.
-  . Timezone initialization failure from serialized data will now throw an
-    instance of Error from __wakeup() or __set_state() instead of resulting in
-    a fatal error.
-  . DateTime and DateTimeImmutable now properly incorporate microseconds when
-    constructed from the current time, either explicitly or with a relative
-    string (e.g. "first day of next month"). This means that naive comparisons
-    of two newly created instances will now more likely return FALSE instead of
-    TRUE:
-      new DateTime() == new DateTime();
-
- DBA:
-  . Data modification functions (e.g.: dba_insert()) now throw an instance of
-    Error instead of triggering a catchable fatal error if the key does not
-    contain exactly two elements.
-
- DOM:
-  . Invalid schema or RelaxNG validation contexts will throw an instance of
-    Error instead of resulting in a fatal error.
-  . Attempting to register a node class that does not extend the appropriate
-    base class will now throw an instance of Error instead of resulting in a
-    fatal error.
-  . Attempting to read an invalid or write to a readonly property will throw
-    an instance of Error instead of resulting in a fatal error.
+- EXIF:
+   . Added extended exif tag support for the following formats: 
+     Samsung, DJI, Panasonic, Sony, Pentax, Minolta, Sigma/Foveon, 
+	 AGFA, Kyocera, Ricoh & Epson.
+   . exif_read_data() and exif_thumbnail() now supports a passed streams as their 
+     first parameter.

 - GD:
-  . Changed the default of the ini setting gd.jpeg_ignore_warning to 1.
+  . Removed --enable-gd-native-ttf configuration option which was unused as
+    of PHP 5.5.0 anyway.
+  . imagegd() stores truecolor images as real truecolor images. Formerly, they
+    have been converted to palette.
+  . imageantialias() is now also available if compiled with a system libgd.

- IMAP:
-  . An email address longer than 16385 bytes will throw an instance of Error
-    instead of resulting in a fatal error.
+- Mbstring
+  . mb_check_encoding() accepts array parameter. Both key and value
+    encodings are checked recursively.
+  . mb_convert_encoding() accepts array parameter. Only value encodings
+    are converted recursively.

- Intl:
-  . Failure to call the parent constructor in a class extending Collator
-    before invoking the parent methods will throw an instance of Error
-    instead of resulting in a recoverable fatal error.
-  . Cloning a Transliterator object may will now throw an instance of Error
-    instead of resulting in a fatal error if cloning the internal
-    transliterator fails.
+- PDO_OCI:
+  . The '--with-pdo-oci' configure syntax no longer needs the vesion number of the
+    Oracle Instant Client.

- LDAP:
-  . Providing an unknown modification type to ldap_batch_modify() will now
-    throw an instance of Error instead of resulting in a fatal error.
-
- Mbstring:
-  . mb_ereg() and mb_eregi() will now throw an instance of ParseError if an
-    invalid PHP expression is provided and the 'e' option is used.
-
- Mcrypt:
-  . mcrypt_encrypt() and mcrypt_decrypt() will throw an instance of Error
-    instead of resulting in a fatal error if mcrypt cannot be initialized.
-
- Mysqli:
-  . Attempting to read an invalid or write to a readonly property will throw
-    an instance of Error instead of resulting in a fatal error.
-
- PDO_Firebird
-  As of PHP 7.1.2, the fetched data for integer fields is aware of the Firebird
-  datatypes. Previously all integers was fetched as strings, starting with
-  aforementioned PHP version integer fields are translated to the PHP integer
-  datatype. The 64-bit integers are still fetched as strings in 32-bit PHP
-  builds.
-
- Reflection:
-  . Failure to retrieve a reflection object or retrieve an object property
-    will now throw an instance of Error instead of resulting in a fatal error.
-
- Session:
-  . Custom session handlers that do not return strings for session IDs will
-    now throw an instance of Error instead of resulting in a fatal error
-    when a function is called that must generate a session ID.
-  . Only CSPRNG is used to generate session ID.
-
- SimpleXML:
-  . Creating an unnamed or duplicate attribute will throw an instance of Error
-    instead of resulting in a fatal error.
-
- SPL:
-  . Attempting to clone an SplDirectory object will throw an instance of Error
-    instead of resulting in a fatal error.
-  . Calling ArrayIterator::append() when iterating over an object will throw an
-    instance of Error instead of resulting in a fatal error.
-
- SQLite3:
-  . Upgraded bundled SQLite lib to 3.13.0
-
- Standard:
-  . assert() will throw a ParseError when evaluating a string given as the first
-    argument if the PHP code is invalid instead of resulting in a catchable
-    fatal error.
-  . Calling forward_static_call() outside of a class scope will now throw an
-    instance of Error instead of resulting in a fatal error.
-
- Tidy:
-  . Creating a tidyNode manually will now throw an instance of Error instead of
-    resulting in a fatal error.
-
- WDDX:
-  . A circular reference when serializing will now throw an instance of Error
-    instead of resulting in a fatal error.
-
- XML-RPC:
-  . A circular reference when serializing will now throw an instance of Error
-    instead of resulting in a fatal error.
-
- Zip:
-  . ZipArchive::addGlob() will throw an instance of Error instead of resulting
-    in a fatal error if glob support is not available.
+- pdo_sqlite
+  . Use sqlite3_prepare_v2() and sqlite3_close_v2() functions instead of their
+    legacy counterparts.

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

 - Core:
-  . PHP_FD_SETSIZE
+  . PHP_FLOAT_DIG     number of decimal digits, that can be rounded into a
+                      float and back without precision loss
+  . PHP_FLOAT_EPSILON smallest representable positive number x, so then
+                      x + 1.0 != 1.0
+  . PHP_FLOAT_MIN     min representable float number
+  . PHP_FLOAT_MAX     max representable float number
+  . PHP_OS_FAMILY     current operating system family

- JSON:
-  . JSON_UNESCAPED_LINE_TERMINATORS
+- Fileinfo:
+  . FILEINFO_EXTENSION include list of possible file extensions

- Pgsql:
-  PGSQL_NOTICE_LAST
-  PGSQL_NOTICE_ALL
-  PGSQL_NOTICE_CLEAR
+- GD:
+  . IMG_EFFECT_MULTIPLY
+  . IMG_BMP
+
+- PCRE
+  . PREG_UNMATCHED_AS_NULL

 - Standard:
-  . IMAGETYPE_WEBP
+  . PASSWORD_ARGON2_DEFAULT_MEMORY_COST
+  . PASSWORD_ARGON2_DEFAULT_TIME_COST
+  . PASSWORD_ARGON2_DEFAULT_THREADS
+  . PASSWORD_ARGON2I

 ========================================
 11. Changes to INI File Handling
 ========================================

- serialize_precision
-  . If the value is set to -1, then the dtoa mode 0 is used. The value -1
-    is now used by default.
-
- precision
-  . If the value is set to -1, then the dtoa mode 0 is used. No changes
-    in default value which is still 14.
+- sql.safe_mode
+  . This INI directive have been removed.

 - realpath_cache_size
  . Set to 4096k by default
@@ -445,88 +340,14 @@ PHP 7.1 UPGRADE NOTES
 12. Windows Support
 ========================================

- Core:
-  . Support for long and UTF-8 path;
+- Support for VT100 console mode

-    If a web application is UTF-8 conform, no further action is required. For
-    applications depending on paths in non UTF-8 encodings for I/O, an explicit
-    INI directive has to be set. The encoding INI settings check relies on the
-    order in the core:
-      - internal_encoding
-      - default_charset
-      - zend.multibyte
-
-    Several functions for codepage handling were itroduced:
-      - sapi_windows_cp_set() to set the default codepage
-      - sapi_windows_cp_get() to retrieve the current codepage
-      - sapi_windows_cp_is_utf8()
-      - sapi_windows_cp_conv() to convert between codepages, using iconv()
-        compatible signature
-    These functions are thread safe.
-
-    The console output codepage is adjusted depending on the encoding used in
-    PHP. Depending on the concrete system OEM codepage, the visible output
-    might or might be not correct. For example, in the default cmd.exe and on
-    a system with the OEM codepage 437, outputs in codepages 1251, 1252, 1253
-    and some others can be shown correctly when using UTF-8. On the same system,
-    chars in codepage like 20932 probably won't be shown correctly. This refers
-    to the particular system rules for codepage, font compatibility and the
-    particular console program used. PHP automatically sets the console codepage
-    according to the encoding rules from php.ini. Using alternative consoles
-    instead of cmd.exe directly might bring better experience in some cases.
-
-    Nevertheless be aware, runtime codepage switch after the request start
-    might bring unexpected side effects on CLI. The preferrable way is php.ini,
-    When PHP CLI is used in a console emulator, that doesn't support Unicode,
-    it might possibly be required, to avoid changing the console codepage. The
-    best way to achieve it is by setting the default or internal encoding to
-    correspond the ANSI codepage. Another method is to set the INI directives
-    output_encoding and input_encoding to the required codepage, in which case
-    however the difference between internal and I/O codepage is likely to cause
-    mojibake. In rare cases, if PHP happens to crash gracefully, the original
-    console codepage might be not restored. In this case, the chcp command
-    can be used, to restore it manually.
-
-    Special awareness for the DBCS systems - the codepage switch on runtime
-    using ini_set() is likely to cause display issues. The difference to the
-    non DBCS systems is, that the extended characters require two console cells
-    to be displayed. In certain case, only the mapping of the characters into
-    the glyph set of the font could happen, no actual font change. This is the
-    nature of DBCS systems, the most simple way to prevent display issues is
-    to avoid usage of ini_set() for the codepage change.
-
-    As a result of UTF-8 support in the streams, PHP scripts are not limited
-    to ASCII or ANSI filenames anymore. This is supported out of the box on
-    CLI. For other SAPI, the documentation for the corresponding server
-    is useful.
-
-    Long paths support is transparent. Paths longer than 260 bytes get
-    automatically prefixed with \\?\. The max path length is limited to
-    2048 bytes. Be aware, that the path segment limit (basename length) still
-    persists.
-
-    For the best portability, it is strongely recommended to handle filenames,
-    I/O and other related topics UTF-8. Additionally, for the console applications,
-    the usage of a TrueType font is preferrable and the usage of ini_set() for
-    the codepage change is discouraged.
-
-  . Support for ftok()
-
- FCGI
-  . PHP_FCGI_CHILDREN is respected. If this environment variable is defined,
-    the first php-fcgi.exe process will exec the specified number of children.
-    Those will share the same TCP socket.
-
- readline:
-  . The readline extension is supported through the WinEditLine library
-    (http://mingweditline.sourceforge.net/). Thereby, the interactive CLI
-    shell is supported as well (php.exe -a).
-
-    It is well known, but nevertheless is worth mentioning again, that
-    the readline extension is not thread safe and will never be. Thus,
-    the usage of it with any true thread safe SAPI (like Apache mod_winnt) is
-    strongely discouraged.
+  On systems starting with 10.0.10586, cmd.exe supports ANSI escape sequences.
+  The corresponding console mode is enabled by default on CLI on suitable
+  systems. As well, the function sapi_windows_vt100_support() is provided,
+  to control and query the corresponding information in the scripts.

 ========================================
 13. Other Changes
 ========================================
+
@@ -1,79 +1,52 @@
-PHP 7.1 INTERNALS UPGRADE NOTES
+PHP 7.2 INTERNALS UPGRADE NOTES

-0. Wiki Examples
 1. Internal API changes
-  e. Codepage handling on Windows
-  f. Path handling on Windows
-  g. SAPI logging
+  a. Path related functions
+  b. php_win32_get_random_bytes()
+  c. nice() Windows implementation
+  d. ZEND_ACC_CLONE removed
+  e. IS_TYPE_IMMUTABLE removed
+  f. zend_arg_info.class_name removed
+  g. ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX changed
+  h. valid_symbol_table removed

 2. Build system changes
  a. Unix build system changes
  b. Windows build system changes

+
 3. Module changes

-================
-0. Wiki Examples
-================
-
-The wiki contains multiple examples and further explanations of the internal
-changes. See: https://wiki.php.net/phpng-upgrading
-
-
 ========================
 1. Internal API changes
 ========================

-  e. Codepage handling on Windows
+  a. Path related functions
+    - CWD_API void realpath_cache_del(const char *path, size_t path_len);
+    - CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, size_t path_len, time_t t);
+    - PHPAPI void php_clear_stat_cache(zend_bool clear_realpath_cache, const char *filename, size_t filename_len);
+    - PHPAPI void php_stat(const char *filename, size_t filename_length, int type, zval *return_value);

-    A set of new APIs was introduced, which allows to handle codepage
-    conversions. The corresponding prototypes and macros are contained
-    in win32/codepage.h.
+  b. php_win32_get_random_bytes()
+    The internal randomness source on Windows switched to use CNG API.

-    Functions with php_win32_cp_* signatures provide handling for various
-    codepage aspects. Primarily they are in use at various places in the
-    I/O utils code and directly in the core where necessary, providing
-    conversions to/from UTF-16. Arbitrary conversions between codepages
-    are possible as well, whereby UTF-16 will be always an intermediate
-    state in this case.
+  c. nice() now have a Windows alternative that is implemented in win32/nice.c, using
+	   SetPriorityClass(). See the implementation for more in-depth details. This also 
+	   defines HAVE_NICE.

-    For input length arguments, the macro PHP_WIN32_CP_IGNORE_LEN can be
-    passed, then the API will calculate the length.  For output length
-    arguments, the macro PHP_WIN32_CP_IGNORE_LEN_P can be passed, then
-    the API won't set the output length.
+  d. ZEND_ACC_CLONE is removed, but was not used in previous versions

-    The mapping between encodings and codepages is provided by the predefined
-    array of data contained in win32/cp_enc_map.c. To change the data,
-    a generator win32/cp_enc_map_gen.c needs to be edited and run.
+  e. IS_TYPE_IMMUTABLE is removed, IS_TYPE_COPYABLE can be used instead
+     Z_IMMUTABLE() check function is still available

-  f. Path handling on Windows
+  f. zend_arg_info class_name member is removed, use ZEND_TYPE_NAME instead

-    A set of new APIs was introduced, which allows to handle UTF-8 paths. The
-    corresponding prototypes and macros are contained in win32/ioutil.h.
-
-    Functions with php_win32_ioutil_* signatures provide POSIX I/O analogues.
-    These functions are integrated in various places across the code base to
-    support Unicode filenames. While accepting char * arguments, internally
-    the conversion to wchar_t * happens. Internally almost no ANSI APIs are
-    used, but directly their wide equivalents. The string conversion rules
-    correspond to those already present in the core and depend on the current
-    encoding settings. Doing so allows to move away from the ANSI Windows API
-    with its dependency on the system OEM/ANSI codepage.
-
-    Thanks to the wide API usage, the long paths are now supported as well. The
-    PHP_WIN32_IOUTIL_MAXPATHLEN macro is defined to 2048 bytes and will override
-    the MAXPATHLEN in files where the header is included.
-
-    The most optimal use case for scripts is utilizing UTF-8 for any I/O
-    related functions. UTF-8 filenames are supported on any system disregarding
-    the system OEM/ANSI codepage.
-
-  g. SAPI logging
-    The log_message callback in the SAPI struct was extended with the severity
-    argument. This allows SAPI modules to implement mapping between PHP and
-    corresponding server error levels. A reference mapping implementation
-    can be found in apache2handler.
+  g. ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX classname option is removed
+     use ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX for simple type
+     use ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX for object

+  h. valid_symbol_table is removed from executor_globals.
+     Use EG(active) instead of removed EG(valid_symbol_table)

 ========================
 2. Build system changes
@@ -82,9 +55,29 @@ changes. See: https://wiki.php.net/phpng-upgrading
  a. Unix build system changes

  b. Windows build system changes
-    Static analysis with clang and Cppcheck is supported by passing "clang" or
-    "cppcheck" keyword to the --with-analyzer configure option.
+
+    .  Minimum supported Windows versions are Windows 7/Server 2008 R2.
+    . --enable-one-shot configure option is removed, --with-mp is usable.
+    . The new binary tools SDK is required for Windows builds, the
+      documentation is available under https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2
+    . Visual Studio 2017 is utilized for the Windows builds
+    . Clang build with ASAN is supported with clang 5+

 ========================
 3. Module changes
 ========================
+
+- Pcre:
+  . php_pcre_replace and php_pcre_replace_impl expect a zend_string instead of a zval and
+    is_callable_replace options is removed:
+    - PHPAPI zend_string *php_pcre_replace(zend_string *regex, zend_string *subject_str, char *subject, int subject_len, zend_string *replace_str, int limit, int *replace_count);
+    - PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, zend_string *subject_str, char *subject, int subject_len, zend_string *replace_str, int limit, int *replace_count);
+
+- Session:
+  . php_session_start()/session_reset_id() return value is changed from void to int.
+    It returns SUCCESS/FAILURE.
+  . Session module manages session status correctly.
+
+- OpenSSL:
+  . Windows builds ship with OpenSSL 1.1 by default, lower versions are still supported with custom deps.
+
@@ -1,25 +1,25 @@
--------------------------------------------------------------------
+-------------------------------------------------------------------- 
                The Zend Engine License, Version 2.00
 Copyright (c) 1999-2006 Zend Technologies Ltd. All rights reserved.
--------------------------------------------------------------------
+-------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
 modification, is permitted provided that the following conditions
 are met:

  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above
-     copyright notice, this list of conditions and the following
+     notice, this list of conditions and the following disclaimer. 
+ 
+  2. Redistributions in binary form must reproduce the above 
+     copyright notice, this list of conditions and the following 
     disclaimer in the documentation and/or other materials provided
     with the distribution.
-
+ 
  3. The names "Zend" and "Zend Engine" must not be used to endorse
     or promote products derived from this software without prior
     permission from Zend Technologies Ltd. For written permission,
-     please contact license@zend.com.
-
+     please contact license@zend.com. 
+ 
  4. Zend Technologies Ltd. may publish revised and/or new versions
     of the license from time to time. Each version will be given a
     distinguishing version number.
@@ -40,9 +40,9 @@ are met:
     software must display the following acknowledgment:
     "The Zend Engine is freely available at http://www.zend.com"

-THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND
+THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND 
 ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
 PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ZEND
 TECHNOLOGIES LTD.  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
@@ -53,4 +53,4 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.

--------------------------------------------------------------------
+-------------------------------------------------------------------- 
@@ -53,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
+
@@ -21,7 +21,7 @@ ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>)
 <OPCODE-NUMBER> is a opcode number (0, 1, ...)
 <OPCODE> is an opcode name (ZEN_NOP, ZEND_ADD, :)
 <OP1_TYPES> & <OP2_TYPES> are masks for allowed operand op_types. Specializer
-will generate code only for defined combination of types. You can use any
+will generate code only for defined combination of types. You can use any 
 combination of the following op_types UNUSED, CONST, VAR, TMP and  CV also
 you can use ANY mask to disable specialization according operand's op_type.
 <HANDLER'S CODE> is a handler's code itself. For most handlers it stills the
@@ -34,9 +34,9 @@ EXECUTE_DATA
 	execute_data
 ZEND_VM_DISPATCH_TO_HANDLER(<OP>)
 	return <OP>_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_DISPATCH_TO_HELPER(<NAME>)
+ZEND_VM_DISPATCH_TO_HELPER(<NAME>) 
 	return <NAME>(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>)
+ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>) 
 	return <NAME>(<VAL>, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
 ZEND_VM_CONTINUE()
 	return 0
@@ -72,7 +72,7 @@ FREE_OP<X>_VAR_PTR()
 	FREE_VAR_PTR(free_op<X>)


-Executor's helpers can be defined without parameters or with one parameter.
+Executor's helpers can be defined without parameters or with one parameter. 
 This is done with the following constructs:

 ZEND_VM_HELPER(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>)
@@ -86,13 +86,13 @@ ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>)
 }

 Executor's code is generated by PHP script zend_vm_gen.php it uses zend_vm_def.h
-and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and
-zend_vm_execute.h. The first file is a list of opcode definitions. It is
+and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and 
+zend_vm_execute.h. The first file is a list of opcode definitions. It is 
 included from zend_compile.h. The second one is an executor code itself. It is
 included from zend_execute.c.

-zend_vm_gen.php can produce different kind of executors. You can select
-different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can
+zend_vm_gen.php can produce different kind of executors. You can select 
+different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can 
 disable opcode specialization using --without-specializer. You can include or
 exclude old executor together with specialized one using --without-old-executor.
 At last you can debug executor using original zend_vm_def.h or generated file
@@ -105,3 +105,4 @@ Zend Engine II currently includes two executors during the build process, one
 is the specialized version and the other is the old one non-specialized with
 function handlers. By default Zend Engine II uses the specialized one but you
 can switch to the old executor at runtime by calling zend_vm_use_old_executor().
+
@@ -1,135 +0,0 @@
-Revamped object model using object handles
-===========================================
-
-Background
----------
-
-In the Zend Engine 1.0 (and its predecessor the PHP 3 scripting
-engine) the object model's design is that instantiated objects are
-language values. This means that when programmers are performing
-operations, such variable assignment and passing parameters to
-functions, objects are handled very similarly to the way other
-primitive types are handled such as integers and strings.
-Semantically this means that the whole object is being copied. The
-approach Java takes is different where one refers to objects by handle
-and not by value (one can think of a handle as an objects' ID).
-
-Need
----
-
-Unfortunately, the approach taken up to now has severely limited the
-Zend Engine's object oriented model, both feature and simplicity
-wise. One of the main problems with the former approach is that object
-instantiation and duplication is very hard to control, a problem which
-can not only lead to inefficient development but also often to strange
-run-time behavior. Changing the object model to a handle oriented
-model will allow the addressing of many needs such as destructors,
-de-referencing method return values, tight control of object
-duplication and more.
-
-Overview
--------
-
-The proposed object model is very much influenced by the Java
-model. In general, when you create a new object you will be getting a
-handle to the object instead of the object itself. When this handle is
-sent to functions, assigned and copied it is only the handle which is
-copied/sent/assigned. The object itself is never copied nor
-duplicated. This results in all handles of this object to always point
-at the same object making it a very consistent solution and saving
-unnecessary duplication and confusing behavior.
-
-Functionality
-------------
-
-After this change the basic use of objects will be almost identical to
-previous versions of the scripting engine.  However, you won't bump
-into awkward and confusing copying & destructing of objects.  In order
-to create and use a new object instance you will do the following:
-$object = new MyClass(); $object->method();
-
-The previous code will assign $object the handle of a new instance of
-the class MyClass and call one of its methods.
-
-
-Consider the following code:
-
-1	class MyClass
-2	{
-3		function setMember($value)
-4		{
-5			$this->member = $value;
-6		}
-7
-8		function getMember()
-9		{
-10			return $this->member;
-11		}
-12	}
-13
-14	function foo($obj)
-15	{
-16		$obj->setMember("foo");
-17	}
-18
-19	$object = new MyClass();
-20	$object->setMember("bar");
-21	foo($object);
-22	print $object->getMember();
-
-Without the new Java-like handles, at line 20 the objects' data member
-member is set to the string value of "bar".  Because of the internal
-representation of objects in the Zend Engine 1.0, the object is marked
-as a reference, and when it is sent by value to the function foo, it
-is duplicated (!).  Therefore, the call to foo() on line 21 will
-result in the $obj->setMember("foo") call being called on a duplicate
-of $object. Line 22 will then result in "bar" being printed.
-
-This is how the scripting engine has worked until today. Most
-developers are probably unaware of the fact that they aren't always
-talking to the same object but often duplicates; others may have
-realized this can usually be solved by always passing objects by
-reference (unless a replica is actually desired, which is uncommon).
-
-The new object model will allow for a much more intuitive
-implementation of the code.  On line 21, the object's handle (ID) is
-passed to foo() by value. Inside foo(), the object is fetched
-according to this handle and, therefore, the setMember() method is
-called on the originally instantiated object and not a copy.  Line 22
-will therefore result in "foo" being printed.  This approach gives
-developers tighter control of when objects are created and duplicated.
-An additional not-as-important benefit is that the object handle will
-be passed to foo() by value, which most probably will also save
-unnecessary duplication of the value containing the ID itself and thus
-additionally improving run-time performance.
-
-This was just a simple description of why the new object model solves
-awkward behavior and makes object handling much easier, intuitive and
-efficient.  The importance of this change goes far beyond what is
-mentioned in this section as you will see in further sections which
-describe new features with a majority of them being based on this
-change.
-
-Compatibility Notes
--------------------
-
-Many PHP programmers aren't even aware of the copying quirks of the
-current object model and, therefore, there is a relatively good chance
-that the amount of PHP applications that will work out of the box or
-after a very small amount of modifications would be high.
-
-To simplify migration, version 2.0 will support an optional
-'auto-clone' feature, which will perform a cloning of the object
-whenever it would have been copied in version 1.0.  Optionally, it
-will also be possible to request that the engine will emit an E_NOTICE
-message whenever such an automatic clone occurs, in order to allow
-developers to gradually migrate to the version 2.0-style behavior
-(without automatic clones).
-
-Dependencies
------------
-
-The new object model is not dependent on other features.  Many of the
-other Zend Engine 2.0 features, such as the $foo->bar()->barbara()
-syntax, destructors and others completely rely on this new object
-model.
@@ -1,169 +0,0 @@
-Title:           Zend 2.0 Namespaces
-Version:         $Id$
-Status:          declined
-Maintainer:      Stig S. Bakken <ssb@php.net>
-Created:         2001-09-08
-Modified:        2001-09-08
-
-
-1. Background/Need
-==================
-
-PHP and Zend 1.0 have come to a point where a lot of reusable code is
-being written; from simple functions and classes to entire application
-frameworks.  It is becoming increasingly difficult to avoid symbol
-name collisions with the current scoping methods.
-
-The symbol scopes available in Zend 1.0 are the global scope, the
-class scope and the function scope.  All scopes but classes may
-contain variables, only the class and global scopes may contain
-functions, while only the global scope may contain constants and
-classes.  This means that all of Zend 1.0's scoping methods are
-inherently limited for solving symbol name collision problems.
-
-
-2. Overview
-===========
-
-Namespaces in Zend 2.0 provide a way to manage the symbol collision
-problem by making it possible to define multiple symbol tables able to
-contain all types of symbols.  Zend will get the notion of a current
-namespace, defaulting to the current global one.  The current name
-space may be changed on a file-by-file basis.  Symbols in other name
-spaces than the current one may be referenced using a new namespace
-operator.  It will be possible to "import" symbols from one namespace
-into another.
-
-
-3. Functionality
-================
-
-3.1. Namespace Syntax
-=====================
-
-The namespace operator ":" is used to refer to symbols in other
-namespaces than the current one:
-
-Class:          Namespace:class
-Function:       Namespace:function
-Static method:  Namespace:class::method
-Variable:       $Namespace:variable
-Constant:       Namespace:CONSTANT
-Class variable: $Namespace:class::variable
-
-To refer to symbols in the global namespace, symbols are prefixed with
-only the namespace operator:
-
-Class:          :class
-Function:       :function
-Static method:  :class::method
-Variable:       $:variable
-Constant:       :CONSTANT
-Class variable: $:class::variable
-
-Note: $:variable will effectively be just another syntax for
-$GLOBALS['variable'].
-
-A namespace may have a name containing a ":", it is always the last
-":" character in the symbol qualifier that is the actual namespace
-operator:
-
-Class:          Name:Space:class
-Function:       Name:Space:function
-Static method:  Name:Space:class::method
-Variable:       $Name:Space:variable
-Constant:       Name:Space:CONSTANT
-Class variable: $Name:Space:class::variable
-
-(Here, the ":" between "Name" and "Space" is part of the name, it is
-the one after "Space" that is the namespace operator.)
-
-
-3.2. Defining Namespaces
-========================
-
-Individual files may define a namespace that will apply to the entire
-file.  If no "namespace" operator occurs in the file, it will be in
-the global namespace:
-
- 1 namespace HTML;
- 2
- 3 class Form {
- 4     function Form() {
- 5         // constructor
- 6     }
- 7     // ...
- 8 }
-
-Or with the "nested" name syntax:
-
- 1 namespace HTML:Form;
- 2
- 3 class Image {
- 4     var $src;
- 5     function Image($src) {
- 6         $this->src = $src;
- 7     }
- 8     // ...
- 9 }
-
-Code executed within the "HTML" namespace may refer to the Form class
-as just "Form".  Code executed from within other namespaces has to
-refer to it as "HTML:Form".  The "namespace" statement must occur
-before any other statements in the file.
-
-# [ssb 2001-09-08]:
-# Should it be possible to "add" symbols to a namespace by including a
-# second file with the same namespace statement?
-
-
-3.3. Importing Symbols
-======================
-
-It is possible to import symbols from another namespace into the
-current one with the "import" statement:
-
-  import * from HTML;          // all symbols
-
-  import Form from HTML;       // single symbols
-
-  import Form,Table from HTML; // multiple symbols
-
-There is a potential for name clashes between symols of different
-types that have the same qualifier syntax.  These are resolved in this
-order: class, function, constant.
-
-Optionally, the symbol type may be explicitly given to import (as
-"class", "function", "variable" or "constant"):
-
-  import class Form from HTML;
-
-And finally, you may import all symbols of a given type:
-
-  import constant * from HTML:Table;
-
-The namespace with its symbols must already be defined before using
-"import".
-
-
-4. Compatibility Notes
-======================
-
-Old code that does not take advantage of namespaces will run without
-modifications.
-
-
-5. Dependencies
-===============
-
-The class variable syntax depends on this class variables being
-implemented in the new ZE2 object model.
-
-
-6. Acknowledgements
-===================
-
-Andi Gutmans <andi@zend.com> and Zeev Suraski <zeev@zend.com> for
-initial ZE2 namespaces proposal
-
-Dean Hall <php@apt7.com> for the initial symbol qualification syntax
@@ -1,68 +0,0 @@
-Title:           Loose type requirements for functions
-Version:         $Id$
-Status:          draft
-Maintainer:      Brian Moon <brianm@dealnews.com>
-Created:         2001-09-17
-Modified:        2001-09-17
-
-
-1. Background/Need
-==================
-
-Many internal functions of PHP will reject parameters because of their
-type (the array and variable function come to mind).  For userland
-this is not an easy task as there is no uniform way to do it.  An
-addition to the engine for requiring loose types would allow
-developers to know that the data passed to their functions are of the
-correct type and reduce the need for duplicating the same code in
-every function to check for the type of data.
-
-
-2. Overview
-===========
-
-Loose typing mostly means evaluating the contents of the variable and
-not the type of the variable itself.  The requirements for this would
-and should work much like several of the is_* functions do now.
-
-The typing of parameters would be optional and those not typed would
-simply continue to be treated as they are now.
-
-3. Functionality
-================
-
-3.1. Allowed Types
-==================
-
-Only loose types should be needed to ensure the data is usable by the
-function.  Duplicating the functionallity of is_scalar, is_resource,
-is_array and is_object should give developers all the information they
-need to use a variable correctly.
-
-3.2. Syntax
-===========
-
-The current function syntax should be expanded to allow typing of
-variables inline in a C style.
-
-function foo ($var){
-}
-
-could be changed to require an array such as:
-
-function foo (array $var){
-}
-
-3.3. Errors
-===========
-
-Mis-matches in type should be reported as fatal errors and should halt
-the execution of a script as that function cannot be run and code
-following could not reliably run.
-
-
-4. Compatibility Notes
-======================
-
-Old code that does not take advantage of this will run without
-modifications.
@@ -7,10 +7,10 @@ dnl
 AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[
 AC_MSG_CHECKING(for $1)
 AC_TRY_COMPILE([
-#if HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H  
 #include <sys/types.h>
 #endif
-#if HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H  
 #include <inttypes.h>
 #elif HAVE_STDINT_H
 #include <stdint.h>
@@ -137,7 +137,7 @@ int main()
 ], [
  AC_MSG_RESULT(no)
 ])
-
+	
 ])

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

 ])

@@ -158,10 +158,10 @@ AC_ARG_ENABLE(maintainer-zts,
  ZEND_MAINTAINER_ZTS=$enableval
 ],[
  ZEND_MAINTAINER_ZTS=no
-])
+])  

 AC_ARG_ENABLE(inline-optimization,
-[  --disable-inline-optimization
+[  --disable-inline-optimization 
                          If building zend_execute.lo fails, try this switch],[
  ZEND_INLINE_OPTIMIZATION=$enableval
 ],[
@@ -196,7 +196,7 @@ if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
  AC_DEFINE(ZTS,1,[ ])
  CFLAGS="$CFLAGS -DZTS"
  LIBZEND_CPLUSPLUS_CHECKS
-fi
+fi  

 changequote({,})
 if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
@@ -249,7 +249,7 @@ int main()
  }

  fp = fopen("conftest.zend", "w");
-  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);
+  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);  
  fclose(fp);

  exit(0);
@@ -258,7 +258,7 @@ int main()
  LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
  LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ])
-  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ])
+  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ]) 
 ], [], [
  dnl cross-compile needs something here
  LIBZEND_MM_ALIGN=8
@@ -374,7 +374,7 @@ AC_ARG_ENABLE(zend-signals,
  ZEND_SIGNALS=$enableval
 ],[
  ZEND_SIGNALS=yes
-])
+])  

 AC_CHECK_FUNC(sigaction, [
 	AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available])
@@ -395,24 +395,24 @@ AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[

 ])

-AC_MSG_CHECKING(whether /dev/urandom exists)
-if test -r "/dev/urandom" && test -c "/dev/urandom"; then
+AC_MSG_CHECKING(whether /dev/urandom exists) 
+if test -r "/dev/urandom" && test -c "/dev/urandom"; then 
  AC_DEFINE([HAVE_DEV_URANDOM], 1, [Define if the target system has /dev/urandom device])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
+  AC_MSG_RESULT(yes) 
+else 
+  AC_MSG_RESULT(no) 
 fi

-AC_MSG_CHECKING(whether /dev/arandom exists)
-if test -r "/dev/arandom" && test -c "/dev/arandom"; then
+AC_MSG_CHECKING(whether /dev/arandom exists) 
+if test -r "/dev/arandom" && test -c "/dev/arandom"; then 
  AC_DEFINE([HAVE_DEV_ARANDOM], 1, [Define if the target system has /dev/arandom device])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
+  AC_MSG_RESULT(yes) 
+else 
+  AC_MSG_RESULT(no) 
+fi 

 AC_ARG_ENABLE(gcc-global-regs,
-[  --disable-gcc-global-regs
+[  --disable-gcc-global-regs 
                          whether to enable GCC global register variables],[
  ZEND_GCC_GLOBAL_REGS=$enableval
 ],[
@@ -466,3 +466,140 @@ else
  HAVE_GCC_GLOBAL_REGS=no
 fi
 AC_MSG_RESULT($ZEND_GCC_GLOBAL_REGS)
+
+dnl
+dnl Check if atof() accepts NAN
+dnl
+AC_CACHE_CHECK(whether atof() accepts NAN, ac_cv_atof_accept_nan,[
+AC_TRY_RUN([
+#include <math.h>
+#include <stdlib.h>
+
+#ifdef HAVE_ISNAN
+#define zend_isnan(a) isnan(a)
+#elif defined(HAVE_FPCLASS)
+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+#else
+#define zend_isnan(a) 0
+#endif
+
+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
+],[
+  ac_cv_atof_accept_nan=no
+])])
+if test "$ac_cv_atof_accept_nan" = "yes"; then
+  AC_DEFINE([HAVE_ATOF_ACCEPTS_NAN], 1, [whether atof() accepts NAN])
+fi
+
+dnl
+dnl Check if atof() accepts INF
+dnl
+AC_CACHE_CHECK(whether atof() accepts INF, ac_cv_atof_accept_inf,[
+AC_TRY_RUN([
+#include <math.h>
+#include <stdlib.h>
+
+#ifdef HAVE_ISINF
+#define zend_isinf(a) isinf(a)
+#elif defined(INFINITY)
+/* Might not work, but is required by ISO C99 */
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
+#else
+#define zend_isinf(a) 0
+#endif
+
+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
+],[
+  ac_cv_atof_accept_inf=no
+])])
+if test "$ac_cv_atof_accept_inf" = "yes"; then
+  AC_DEFINE([HAVE_ATOF_ACCEPTS_INF], 1, [whether atof() accepts INF])
+fi
+
+dnl
+dnl Check if HUGE_VAL == INF
+dnl
+AC_CACHE_CHECK(whether HUGE_VAL == INF, ac_cv_huge_val_inf,[
+AC_TRY_RUN([
+#include <math.h>
+#include <stdlib.h>
+
+#ifdef HAVE_ISINF
+#define zend_isinf(a) isinf(a)
+#elif defined(INFINITY)
+/* Might not work, but is required by ISO C99 */
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
+#else
+#define zend_isinf(a) 0
+#endif
+
+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
+],[
+  ac_cv_huge_val_inf=yes
+])])
+dnl This is the most probable fallback so we assume yes in case of cross compile.
+if test "$ac_cv_huge_val_inf" = "yes"; then
+  AC_DEFINE([HAVE_HUGE_VAL_INF], 1, [whether HUGE_VAL == INF])
+fi
+
+dnl
+dnl Check if HUGE_VAL + -HUGEVAL == NAN
+dnl
+AC_CACHE_CHECK(whether HUGE_VAL + -HUGEVAL == NAN, ac_cv_huge_val_nan,[
+AC_TRY_RUN([
+#include <math.h>
+#include <stdlib.h>
+
+#ifdef HAVE_ISNAN
+#define zend_isnan(a) isnan(a)
+#elif defined(HAVE_FPCLASS)
+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+#else
+#define zend_isnan(a) 0
+#endif
+
+int main(int argc, char** argv)
+{
+#if defined(__sparc__) && !(__GNUC__ >= 3)
+	/* prevent bug #27830 */
+	return 1;
+#else
+	return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1;
+#endif
+}
+],[
+  ac_cv_huge_val_nan=yes
+],[
+  ac_cv_huge_val_nan=no
+],[
+  ac_cv_huge_val_nan=yes
+])])
+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
@@ -7,7 +7,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
  # min: 2.4 (i.e. 204, major * 100 + minor for easier comparison)
  bison_version_min="204"
  # non-working versions, e.g. "3.0 3.2";
-  # remove "none" when introducing the first incompatible bison version an
+  # remove "none" when introducing the first incompatible bison version an 
  # separate any following additions by spaces
  bison_version_exclude=""

@@ -107,7 +107,7 @@ int main(void)
  ], [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, [], [Define if processor uses big-endian word])
+   AC_DEFINE(WORDS_BIGENDIAN, 1, [Define if processor uses big-endian word])
 fi
 ])

@@ -139,7 +139,7 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
  else
    AC_MSG_RESULT(no)
  fi
-
+  
  AC_MSG_CHECKING([for usable fpsetprec])
  AC_TRY_LINK([
    #include <machine/ieeefp.h>
@@ -5,18 +5,18 @@ if (function_exists("date_default_timezone_set")) {

 function simple() {
  $a = 0;
-  for ($i = 0; $i < 1000000; $i++)
+  for ($i = 0; $i < 1000000; $i++) 
    $a++;

  $thisisanotherlongname = 0;
-  for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++)
+  for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++) 
    $thisisanotherlongname++;
 }

 /****/

 function simplecall() {
-  for ($i = 0; $i < 1000000; $i++)
+  for ($i = 0; $i < 1000000; $i++) 
    strlen("hallo");
 }

@@ -26,14 +26,14 @@ function hallo($a) {
 }

 function simpleucall() {
-  for ($i = 0; $i < 1000000; $i++)
+  for ($i = 0; $i < 1000000; $i++) 
    hallo("hallo");
 }

 /****/

 function simpleudcall() {
-  for ($i = 0; $i < 1000000; $i++)
+  for ($i = 0; $i < 1000000; $i++) 
    hallo2("hallo");
 }

@@ -5,7 +5,7 @@
 #
 # Written by Sascha Schumann
 #
-# $Id$
+# $Id$ 


 LT_TARGETS = ltmain.sh ltconfig
@@ -30,14 +30,14 @@ $(LT_TARGETS):
 $(makefile_in_files): $(makefile_am_files)
 	automake -a -i $(AMFLAGS) $(makefile_files)

-aclocal.m4: configure.in acinclude.m4
+aclocal.m4: configure.ac acinclude.m4
 	aclocal

-$(config_h_in): configure.in
-# explicitly remove target since autoheader does not seem to work
+$(config_h_in): configure.ac
+# explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
 	autoheader

-configure: aclocal.m4 configure.in
+configure: aclocal.m4 configure.ac
 	autoconf
@@ -30,3 +30,4 @@ if cmp configure.old configure > /dev/null 2>&1; then
 else
    echo "buildconf: created or modified ${1}configure"
 fi
+
@@ -24,9 +24,6 @@ AH_TOP([

 #undef uint
 #undef ulong
-
-/* Define if you want to enable memory limit support */
-#define MEMORY_LIMIT 0
 ])

 AH_BOTTOM([
@@ -62,15 +59,8 @@ int zend_sprintf(char *buffer, const char *format, ...);

 #include <math.h>

-/* To enable the is_nan, is_infinite and is_finite PHP functions */
-#ifdef NETWARE
-	#define HAVE_DECL_ISNAN 1
-	#define HAVE_DECL_ISINF 1
-	#define HAVE_DECL_ISFINITE 1
-#endif
-
 #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))
@@ -79,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 */
@@ -90,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)
@@ -102,12 +92,6 @@ int zend_sprintf(char *buffer, const char *format, ...);

 #endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */

-#ifdef NETWARE
-#ifdef USE_WINSOCK
-#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
-#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
-#endif
-#endif
 ])

 dnl We want this one before the checks, so the checks can modify CFLAGS.
@@ -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,10 +21,12 @@ var_dump(each($a));

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

+Deprecated: The each() function is deprecated. This message will be suppressed on further calls in %s on line %d
+
 Warning: Variable passed to each() is not an array or object in %s on line %d
 NULL

@@ -22,7 +22,7 @@ var_dump(constant("test const"));

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

@@ -7,6 +7,10 @@ class foo {
 	function bar () {
 		var_dump(get_class());
 	}
+    function testNull ()
+    {
+        var_dump(get_class(null));
+    }
 }

 class foo2 extends foo {
@@ -27,9 +31,11 @@ var_dump(get_class("qwerty"));
 var_dump(get_class($f1));
 var_dump(get_class($f2));

+$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"

@@ -45,4 +51,7 @@ Warning: get_class() expects parameter 1 to be object, string given in %s on lin
 bool(false)
 string(3) "foo"
 string(4) "foo2"
+
+Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
+bool(false)
 Done
@@ -41,7 +41,7 @@ var_dump(get_parent_class(1));

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 bool(false)
 bool(false)
 string(3) "foo"
@@ -52,7 +52,7 @@ $bar->test();

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

@@ -18,7 +18,7 @@ var_dump(class_exists("stdClass"));

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

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

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

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

@@ -3,10 +3,10 @@ isset() with object properties when operating on non-object
 --FILE--
 <?php

-$foo = NULL;
+$foo = NULL; 
 isset($foo->bar->bar);

 echo "Done\n";
 ?>
--EXPECT--
+--EXPECT--	
 Done
@@ -43,7 +43,7 @@ var_dump(count(get_extension_funcs("zend")));

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

@@ -17,7 +17,7 @@ var_dump(constant("TEST_CONST2"));

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

@@ -16,7 +16,7 @@ echo "*** Testing unset(), empty() & isset() with scalar variables ***\n";

 // testing scalar variables
 $scalar_variables = array(
-  0,
+  0,    
  1,
  +1
  -1,
@@ -52,23 +52,23 @@ foreach ($scalar_variables as $scalar_var) {
  echo "-- Iteration $loop_counter --\n"; $loop_counter++;

  // checking with isset before unsetting, expected: bool(true)
-  var_dump( isset($scalar_var) );
-  var_dump( isset($scalar_var, $set_var) );
+  var_dump( isset($scalar_var) ); 
+  var_dump( isset($scalar_var, $set_var) );  
  // checking if the var is empty, expected: bool(false) on most
  // except "", 0, "0", NULL, FALSE
-  var_dump( empty($scalar_var) );
-
+  var_dump( empty($scalar_var) );  
+  
  // destroy the variable using unset
-  unset( $scalar_var );
-  // dump and see if its destroyed, expcted: NULL
-  var_dump( $scalar_var );
+  unset( $scalar_var );   
+  // dump and see if its destroyed, expcted: NULL 
+  var_dump( $scalar_var ); 

  // check using isset to see if unset, expected: bool(false)
-  var_dump( isset($scalar_var) );
-  var_dump( isset($scalar_var, $set_var) );
+  var_dump( isset($scalar_var) ); 
+  var_dump( isset($scalar_var, $set_var) ); 

  // empty to check if empty, expecting bool(true)
-  var_dump( empty($scalar_var) );
+  var_dump( empty($scalar_var) ); 

  // isset() with two args, one arg only unset, expected: bool(false)
  var_dump( isset($scalar_var, $set_var) );
@@ -90,36 +90,36 @@ $array_variables = array(
  array(1 => "One", 2 => "two"),
  array("Name" => "Jack", "Age" => "30"),
  array(1,2, "One" => "1", 2 => "two", ""=>"empty", "" => '')
-);
+);  

 $outer_loop_counter = 1;
 foreach ($array_variables as $array_var) {
  echo "--- Outerloop Iteration $outer_loop_counter ---\n";
-
+  
  // check the isset and unset on non existing key
  $var = 1;  // a var which is defined
  // try to unset the element which is non-existent
-  unset($array_var['non_existent']);
+  unset($array_var['non_existent']); 
  // check using isset() & empty() on a non_existent element in the array
  var_dump( isset($array_var['non_existent']) );
  var_dump( isset($array_var['non_existent'], $var) );
  var_dump( isset($array_var['non_existent'], $array_var['none']) );
  var_dump( empty($array_var['non_existent']) );

-  // testing empty and isset on arrays
+  // testing empty and isset on arrays 
  var_dump( empty($array_var) ); // expecting bool(false), except: array(), which is considered empty
  var_dump( isset($array_var) ); // expecting bool(true), except: array(), which is not set

-  // get the keys of the $array_var
+  // get the keys of the $array_var 
  $keys = array_keys($array_var);
  // unset each element in the array and see the working of unset, isset & empty
  $inner_loop_counter = 1;
  foreach ($keys as $key_value) {
-    echo "-- Innerloop Iteration $inner_loop_counter of Outerloop Iteration $outer_loop_counter --\n";
+    echo "-- Innerloop Iteration $inner_loop_counter of Outerloop Iteration $outer_loop_counter --\n"; 
    $inner_loop_counter++;

    // unset the element
-    unset($array_var[$key_value]);
+    unset($array_var[$key_value]); 
    // dump the array after element was unset
    var_dump($array_var);
    // check using isset for the element that was unset
@@ -127,10 +127,10 @@ foreach ($array_variables as $array_var) {
    // calling isset with more args
    var_dump( isset($array_var[$key_val], $array_var) ); //expected: bool(false)

-    // calling empty, expected bool(true)
+    // calling empty, expected bool(true) 
    var_dump( empty($array_var[$key_val]) );

-    // dump the array to see that that array did not get modified
+    // dump the array to see that that array did not get modified 
    // because of using isset, empty and unset on its element
    var_dump($array_var);
  }
@@ -144,7 +144,7 @@ foreach ($array_variables as $array_var) {
  // use isset to see that array is not set
  var_dump( isset($array_var) ); //expected: bool(false)
  var_dump( isset($array_var, $array_var[$key_val]) ); // expected: bool(false)
-
+  
  // empty() to see if the array is empty
  var_dump( empty($array_var) ); // expected: bool(true)
 }
@@ -183,12 +183,12 @@ foreach ($resources as $resource) {
  unset($temp_var);
  // now the isset() with both the args as unset
  var_dump( isset($resource, $temp_var) ); // expected: bool(false);
-
-  // dump the resource to see if there any effect on it
+  
+  // dump the resource to see if there any effect on it 
  var_dump($resource);
 }
 // unset and dump the array containing all the resources to see that
-// unset works correctly
+// unset works correctly 
 unset($resources);
 var_dump($resources);
 var_dump( isset($resources) );  //expected: bool(false)
@@ -200,12 +200,12 @@ class Point
  var $x;
  var $y;
  var $lable;
-
+  
  function __construct($x, $y) {
    $this->x = $x;
    $this->y = $y;
  }
-
+  
  function setLable($lable) {
    $this->lable = $lable;
  }
@@ -215,8 +215,8 @@ class Point
 }
 $point1 = new Point(30,40);

-// use unset/empty/isset to check the object
-var_dump($point1); // dump the object
+// use unset/empty/isset to check the object 
+var_dump($point1); // dump the object 

 // check the object and member that is not set
 var_dump( isset($point1) );  // expected: bool(true)
@@ -229,7 +229,7 @@ $point1->setLable("Point1");
 var_dump( isset($point1->$lable) );  //expected: bool(true)
 var_dump( empty($point1->$lable) );  //expected: bool(false)

-// dump the object to see that obj was not harmed
+// dump the object to see that obj was not harmed 
 // because of the usage of the isset & empty
 var_dump($point1);

@@ -270,36 +270,36 @@ var_dump($point2);

 /* testing variation in operation for isset(), empty() & unset().
 Note: Most of the variation for function unset() is testing by a
-      set of testcases named "Zend/tests/unset_cv??.phpt", only
+      set of testcases named "Zend/tests/unset_cv??.phpt", only 
      variation not tested are attempted here */

 echo "\n*** Testing possible variation in operation for isset(), empty() & unset() ***\n";
-/* unset() variation1: checking unset on static variable inside a function.
+/* unset() variation1: checking unset on static variable inside a function. 
 * unset() destroys the variable only in the context of the rest of a function
 * Following calls will restore the previous value of a variable.
 */
 echo "\n** Testing unset() variation 1: unset on static variable inside a function **\n";
 function test_unset1() {
  static $static_var;
-
+  
  // increment the value of the static. this change is in function context
  $static_var ++;
-
-  echo "value of static_var before unset: $static_var\n";
-  // check using isset and empty
+ 
+  echo "value of static_var before unset: $static_var\n"; 
+  // check using isset and empty 
  var_dump( isset($static_var) );
  var_dump( empty($static_var) );
-
+  
  // unset the static var
  unset($static_var);
-  echo "value of static_var after unset: $static_var\n";
-  // check using isset and empty
+  echo "value of static_var after unset: $static_var\n"; 
+  // check using isset and empty 
  var_dump( isset($static_var) );
  var_dump( empty($static_var) );

  // assign a value to static var
  $static_var = 20;
-  echo "value of static_var after new assignment: $static_var\n";
+  echo "value of static_var after new assignment: $static_var\n"; 
 }
 // call the functiont
 test_unset1();
@@ -308,10 +308,10 @@ test_unset1();


 echo "\n** Testing unset() variation 2: unset on a variable passed by ref. inside of a function **\n";
-/* unset() variation2: Pass by reference
- * If a variable that is PASSED BY REFERENCE is unset() inside of a function,
+/* unset() variation2: Pass by reference  
+ * If a variable that is PASSED BY REFERENCE is unset() inside of a function, 
 * only the local variable is destroyed. The variable in the calling environment
- * will retain the same value as before unset()  was called.
+ * will retain the same value as before unset()  was called. 
 */
 function test_unset2( &$ref_val ) {
  // unset the variable passed
@@ -329,7 +329,7 @@ var_dump($value);
 test_unset2($value);
 var_dump($value);

-
+ 
 echo "\n** Testing unset() variation 3: unset on a global variable inside of a function **\n";
 /* unset() variation2: unset on a global variable inside a function
 * If a globalized variable is unset() inside of a function, only the
@@ -340,17 +340,17 @@ $global_var = 10;

 function test_unset3() {
  global $global_var;
-
-  // check the $global_var using isset and empty
-  var_dump( isset($global_var) );
-  var_dump( empty($global_var) );
-
+   
+  // check the $global_var using isset and empty 
+  var_dump( isset($global_var) ); 
+  var_dump( empty($global_var) ); 
+ 
  // unset the global var
  unset($global_var);
-
-  // check the $global_var using isset and empty
-  var_dump( isset($global_var) );
-  var_dump( empty($global_var) );
+ 
+  // check the $global_var using isset and empty 
+  var_dump( isset($global_var) ); 
+  var_dump( empty($global_var) ); 
 }

 var_dump($global_var);
@@ -19,7 +19,7 @@ foo(1,2);

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

@@ -7,7 +7,7 @@ class foo {
 	public $test = 0;
 	private $test_2 = 1;
 	protected $test_3 = 2;
-
+	
 	public function bar() {
 		try {
 			throw new Exception('foo');
@@ -15,13 +15,13 @@ class foo {
 			var_dump($this);
 		}

-		$this->baz();
+		$this->baz();		
 	}
-
+	
 	public function baz() {
 		foreach ($this as $k => $v) {
 			printf("'%s' => '%s'\n", $k, $v);
-		}
+		}		
 		print "ok\n";
 	}
 }
@@ -1,7 +1,7 @@
 --TEST--
 Testing array with '[]' passed as argument by value
 --FILE--
-<?php
+<?php 

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

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

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

@@ -17,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:
@@ -9,4 +9,5 @@ abstract class TestClass
 ?>
 ===DONE===
 --EXPECTF--
+
 ===DONE===
@@ -0,0 +1,12 @@
+--TEST--
+Allow abstract function override
+--FILE--
+<?php
+
+abstract class A           { abstract function bar($x); }
+abstract class B extends A { abstract function bar($x); }
+
+echo "DONE";
+?>
+--EXPECT--	
+DONE
@@ -0,0 +1,12 @@
+--TEST--
+Allow abstract function override
+--FILE--
+<?php
+
+abstract class A           { abstract function bar($x); }
+abstract class B extends A { abstract function bar($x, $y = 0); }
+
+echo "DONE";
+?>
+--EXPECT--	
+DONE
@@ -0,0 +1,12 @@
+--TEST--
+Allow abstract function override
+--FILE--
+<?php
+
+abstract class A           { abstract function bar($x, $y = 0); }
+abstract class B extends A { abstract function bar($x); }
+
+echo "DONE";
+?>
+--EXPECTF--	
+Fatal error: Declaration of B::bar($x) must be compatible with A::bar($x, $y = 0) in %s
@@ -10,5 +10,5 @@ class test {

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

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

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

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

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

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

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 Fatal error: Cannot use the final modifier on an abstract class member in %s on line %d
@@ -21,7 +21,7 @@ abstract class b extends a {
 class c extends b {
 	public function __construct() {
 		$this->test();
-	}
+	}	
 }

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

 ?>
--EXPECTF--
+--EXPECTF--	
 var1 value
 var2 value
 in func1