sync NEWS

Proposed patch for bug #71270

.appveyor.yml

@@ -1,51 +0,0 @@
-version: "{branch}.build.{build}"
-
-image: Visual Studio 2017
-
-branches:
-        except:
-                - PHP-5.6
-                - PHP-7.0
-
-clone_depth: 64
-
-cache:
-        - c:\build-cache
-
-environment:
-        PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
-        PHP_BUILD_OBJ_DIR: c:\obj
-        PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
-        PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0beta3
-        PHP_BUILD_CRT: vc15
-        # ext and env setup for tests
-        #MYSQL_TEST_PASSWD: Password12!
-        #MYSQL_TEST_USER: root
-        #PDO_MYSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=root password=Password12!"
-        #PDO_MYSQL_TEST_USER: root
-        #PDO_MYSQL_TEST_PASS: Password12!
-        #PGSQL_TEST_CONNSTR: "host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!"
-        #PDO_PGSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=Password12!"
-        #build permutations
-        matrix:
-                - THREAD_SAFE: 0
-                  OPCACHE: 0
-                - THREAD_SAFE: 1
-                  OPCACHE: 1
-                  INTRINSICS: AVX
-
-services:
-        # the setup scripts have to be touched, once some other db version is used
-        - mysql
-        - postgresql101
-        - mssql2017
-
-platform:
-        - x64
-          #        - x86
-
-build_script:
-        - appveyor\build.bat
-
-test_script:
-        - appveyor\test.bat

.editorconfig

@@ -1,35 +0,0 @@
-# http://editorconfig.org/
-
-root = true
-
-[*.{c,h,awk,w32,bat,mk,frag}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 4
-indent_style             = tab
-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
-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

.gdbinit

@@ -5,7 +5,7 @@ end
 document set_ts
 	set the ts resource, it is impossible for gdb to
 	call ts_resource_ex while no process is running,
-	but we could get the resource from the argument
+	but we could get the resource from the argument 
 	of frame info.
 end
 
@@ -16,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
 
@@ -31,33 +29,22 @@ document ____executor_globals
 end
 
 define print_cvs
-	if $argc == 0
-		____executor_globals
-		set $cv_ex_ptr = $eg.current_execute_data
-	else
-		set $cv_ex_ptr = (zend_execute_data *)$arg0
+	____executor_globals
+	set $p = $eg.current_execute_data.CVs
+	set $c = $eg.current_execute_data.op_array.last_var
+	set $v = $eg.current_execute_data.op_array.vars
+	set $i = 0
+
+	printf "Compiled variables count: %d\n", $c
+	while $i < $c
+		printf "%d = %s\n", $i, $v[$i].name
+		if $p[$i] != 0
+			printzv *$p[$i]
+		else
+			printf "*uninitialized*\n"
+		end
+		set $i = $i + 1
 	end
-	set $cv_count = $cv_ex_ptr.func.op_array.last_var
-	set $cv = $cv_ex_ptr.func.op_array.vars
-	set $cv_idx = 0
-	set $callFrameSize = (sizeof(zend_execute_data) + sizeof(zval) - 1) / sizeof(zval)
-
-	printf "Compiled variables count: %d\n\n", $cv_count
-	while $cv_idx < $cv_count
-		printf "[%d] '%s'\n", $cv_idx, $cv[$cv_idx].val
-		set $zvalue = ((zval *) $cv_ex_ptr) + $callFrameSize + $cv_idx
-		printzv $zvalue
-		set $cv_idx = $cv_idx + 1
-	end
-end
-
-document print_cvs
-	Prints the compiled variables and their values.
-	If a zend_execute_data pointer is set this will print the compiled
-	variables of that scope. If no parameter is used it will use
-	current_execute_data for scope.
-
-	usage: print_cvs [zend_execute_data *]
 end
 
 define dump_bt
@@ -153,7 +140,7 @@ end
 
 define printzv
 	set $ind = 1
-	____printzv $arg0 0
+	____printzv $arg0 0 
 end
 
 document printzv
@@ -173,7 +160,7 @@ define ____printzv_contents
 		printf "UNDEF"
 	end
 	if $type == 1
-		printf "NULL"
+        printf "NULL"
 	end
 	if $type == 2
 		printf "bool: false"
@@ -181,16 +168,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
@@ -209,17 +196,12 @@ define ____printzv_contents
 		____executor_globals
 		set $handle = $zvalue->value.obj.handle
 		set $handlers = $zvalue->value.obj.handlers
-		set $zobj = $zvalue->value.obj
-		set $cname = $zobj->ce->name->val
+        set $zobj = $zvalue->value.obj
+        set $cname = $zobj->ce->name->val
 		printf "(%s) #%d", $cname, $handle
 		if ! $arg1
 			if $handlers->get_properties == &zend_std_get_properties
-				if $zobj->properties
-					set $ht = $zobj->properties
-				else
-					set $ht = &$zobj->ce->properties_info
-				end
-				printf "\nProperties "
+				set $ht = $zobj->properties
 				if $ht
 					set $ind = $ind + 1
 					____print_ht $ht 1
@@ -230,7 +212,7 @@ define ____printzv_contents
 						set $i = $i - 1
 					end
 				else
-					echo "not found"
+					echo "no properties found"
 				end
 			end
 		end
@@ -247,31 +229,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 +263,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 +326,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 +345,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 +371,7 @@ document print_htptr
 end
 
 define print_htstr
-	set $ind = 0
+	set $ind = 0 
 	____print_ht $arg0 2
 end
 
@@ -473,13 +455,10 @@ define print_inh
 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)
+	set $pi = $arg0
 	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 "    h     = %lu\n", $pi->h
+	printf "    flags = %d (", $pi->flags
 	if $pi->flags & 0x100
 		printf "ZEND_ACC_PUBLIC"
 	else
@@ -490,40 +469,23 @@ 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
 	end
 	printf ")\n"
 	printf "    name  = "
-	print_zstr $pi->name
-	printf "    default value: "
-	printzv $ptr_to_val
-	printf "}\n"
-end
-
-document print_pi
-	Takes a pointer to an object's property and prints the property information
-	usage: print_pi <ptr>
+	____print_str $pi->name $pi->name_length
+	printf "\n}\n"
 end
 
 define ____print_str
 	set $tmp = 0
 	set $str = $arg0
-	if $argc > 2
-		set $maxlen = $arg2
-	else
-		set $maxlen = 256
-	end
-
 	printf "\""
-	while $tmp < $arg1 && $tmp < $maxlen
-		if $str[$tmp] > 31 && $str[$tmp] < 127
+	while $tmp < $arg1 && $tmp < 256
+		if $str[$tmp] > 32 && $str[$tmp] < 127
 			printf "%c", $str[$tmp]
 		else
 			printf "\\%o", $str[$tmp]
@@ -543,10 +505,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 +538,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
@@ -592,23 +554,6 @@ document printzops
 	dump operands of the current opline
 end
 
-define print_zstr
-	set $zstr = (zend_string *)$arg0
-	if $argc == 2
-		set $maxlen = $arg1
-	else
-		set $maxlen = $zstr->len
-	end
-	printf "string(%d) ", $zstr->len
-	____print_str $zstr->val $zstr->len $maxlen
-	printf "\n"
-end
-
-document print_zstr
-	print the length and contents of a zend string
-	usage: print_zstr <ptr> [max length]
-end
-
 define zbacktrace
 	____executor_globals
 	dump_bt $eg.current_execute_data
@@ -621,6 +566,79 @@ document zbacktrace
 	> (gdb) dump_bt $eg.current_execute_data
 end
 
+define zmemcheck
+	set $p = alloc_globals.head
+	set $stat = "?"
+	set $total_size = 0
+	if $arg0 != 0
+		set $not_found = 1
+	else
+		set $not_found = 0
+	end
+	printf " block      size      status file:line\n"
+	printf "-------------------------------------------------------------------------------\n"
+	while $p
+		set $aptr = $p + sizeof(struct _zend_mem_header) + sizeof(align_test)
+		if $arg0 == 0 || (void *)$aptr == (void *)$arg0
+			if $p->magic == 0x7312f8dc 
+				set $stat = "OK"
+			end
+			if $p->magic == 0x99954317
+				set $stat = "FREED"
+			end
+			if $p->magic == 0xfb8277dc
+				set $stat = "CACHED"
+			end
+			set $filename = strrchr($p->filename->val, '/')
+			if !$filename
+				set $filename = $p->filename->val
+			else
+				set $filename = $filename + 1
+			end
+			printf " %p ", $aptr
+			if $p->size == sizeof(struct _zval_struct) && ((struct _zval_struct *)$aptr)->type >= 0 && ((struct _zval_struct *)$aptr)->type < 10
+				printf "ZVAL?(%-2d) ", $p->size
+			else
+				printf "%-9d ", $p->size
+			end
+			set $total_size = $total_size + $p->size
+			printf "%-06s %s:%d", $stat, $filename, $p->lineno
+			if $p->orig_filename
+				set $orig_filename = strrchr($p->orig_filename, '/')
+				if !$orig_filename
+					set $orig_filename = $p->orig_filename
+				else
+					set $orig_filename = $orig_filename + 1
+				end
+				printf " <= %s:%d\n", $orig_filename, $p->orig_lineno
+			else
+				printf "\n"
+			end
+			if $arg0 != 0
+				set $p = 0
+				set $not_found = 0
+			else
+				set $p = $p->pNext
+			end
+		else
+			set $p = $p->pNext
+		end
+	end
+	if $not_found
+		printf "no such block that begins at %p.\n", $aptr
+	end
+	if $arg0 == 0
+		printf "-------------------------------------------------------------------------------\n"
+		printf "     total: %d bytes\n", $total_size
+	end
+end
+
+document zmemcheck
+	show status of a memory block.
+	usage: zmemcheck [ptr].
+	if ptr is 0, all blocks will be listed.
+end
+
 define lookup_root
 	set $found = 0
 	if gc_globals->roots

.gitattributes

@@ -1,17 +1,38 @@
 ext/mysqlnd/mysqlnd.h           ident
-ext/ext_skel.php                ident
+ext/simplexml/simplexml.c       ident
+ext/iconv/php_iconv.h           ident
+ext/posix/posix.c               ident
+ext/recode/recode.c             ident
+ext/skeleton/create_stubs       ident
 ext/phar/phar/pharcommand.inc   ident
+ext/phar/phar.c                 ident
+ext/sysvmsg/sysvmsg.c           ident
+ext/enchant/enchant.c           ident
+ext/reflection/php_reflection.c ident
+ext/oci8/oci8.c                 ident
 ext/dba/libinifile/inifile.c    ident
 ext/dba/libflatfile/flatfile.c  ident
 ext/dba/libcdb/cdb_make.c       ident
 ext/dba/libcdb/cdb.c            ident
+ext/filter/filter.c             ident
+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
+ext/ldap/ldap.c                 ident
+ext/pdo_pgsql/pdo_pgsql.c       ident
+ext/tidy/tidy.c                 ident
 NEWS                            merge=NEWS
 UPGRADING                       merge=NEWS
 UPGRADING.INTERNALS             merge=NEWS
 /ext/bz2/tests/with_strings.phpt	-crlf
 /ext/dom/tests/bug40836.phpt	-crlf
 /ext/dom/tests/domelement.phpt	-crlf
+/ext/ereg/tests/eregi_basic_002.phpt	-crlf
 /ext/iconv/tests/iconv004.phpt	-crlf
 /ext/iconv/tests/iconv_basic.phpt	-crlf
 /ext/iconv/tests/iconv_strpos.phpt	-crlf

.gitignore

@@ -1,4 +1,4 @@
-# General ignores
+# General Ignores
 *~
 .#*
 *.
@@ -26,13 +26,22 @@
 *.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
@@ -47,6 +56,7 @@ config.cache
 config.h.in
 config.log
 config.nice
+config.nice.bat
 config.status
 config.sub
 config_vars.mk
@@ -55,6 +65,8 @@ configuration-parser.h
 configuration-parser.output
 configuration-scanner.c
 configure
+configure.bat
+configure.js
 conftest
 conftest.c
 debug.log
@@ -73,6 +85,7 @@ missing
 mkinstalldirs
 modules
 php
+php-*.tar.gz
 php7.spec
 php_lcov.info
 php_test_results_*.txt
@@ -82,50 +95,11 @@ shlibtool
 stamp-h
 test.php3
 tmp-php.ini
+want_dependencies
+x64
 stamp-h.in
 scan_makefile_in.awk
-main/php_config.h
-main/php_config.h.in
-main/build-defs.h
-main/internal_functions_cli.c
-main/config.w32.h
-main/stamp-h1
-main/streams/build-defs.h
-main/streams/stamp-h1
-pear/install-pear-nozlib.phar
-pear/phpize
-pear/run-tests
-pear/php-config
-pear/scripts
-sapi/apache2handler/libphp7.module
-sapi/cgi/php-cgi
-sapi/cgi/php-cgi.1
-sapi/cli/php.1
-sapi/fpm/php-fpm
-sapi/fpm/php-fpm.1
-sapi/fpm/init.d.php-fpm
-sapi/fpm/php-fpm.conf
-sapi/fpm/fpm/php-cgi
-sapi/fpm/php-fpm.8
-sapi/fpm/php-fpm.service
-sapi/fpm/status.html
-sapi/fpm/www.conf
-sapi/phpdbg/phpdbg_parser.c
-sapi/phpdbg/phpdbg_parser.h
-sapi/phpdbg/phpdbg
-sapi/phpdbg/phpdbg.1
-sapi/phpdbg/build
-sapi/phpdbg/*.output
-scripts/php-config
-scripts/phpize
-scripts/man1/*.1
 TSRM/tsrm_config.h
-win32/*.suo
-win32/*.aps
-win32/*.positions
-win32/ext
-win32/phpts.def
-win32/wsyslog.h
 Zend/zend_config.h
 Zend/zend_dtrace_gen.h
 Zend/zend_dtrace_gen.hbak
@@ -135,9 +109,70 @@ Zend/zend_ini_parser.output
 Zend/zend_language_parser.c
 Zend/zend_language_parser.h
 Zend/zend_language_parser.output
+ext/date/lib/timelib_config.h
+ext/iconv/php_iconv_aliased_libiconv.h
+ext/phar/phar.php
+main/php_config.h
+main/php_config.h.in
 
-# Extension specific ignores
-ext/*/configure.ac
+# 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/*.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/*/ltmain.sh
 ext/*/libs.mk
 ext/*/build
@@ -145,7 +180,9 @@ ext/*/scan_makefile_in.awk
 ext/*/Makefile.global
 ext/*/acinclude.m4
 ext/*/config.sub
-ext/date/lib/timelib_config.h
+
+# Extension specific
+ext/iconv/scan_makefile_in.awk
 ext/iconv/php_have_bsd_iconv.h
 ext/iconv/php_have_ibm_iconv.h
 ext/iconv/php_have_libiconv.h
@@ -155,56 +192,95 @@ ext/iconv/php_php_iconv_impl.h
 ext/iconv/php_have_iconv.h
 ext/iconv/php_iconv_supports_errno.h
 ext/iconv/php_iconv_broken_ignore.h
-ext/iconv/php_iconv_aliased_libiconv.h
-ext/mbstring/oniguruma/oniguruma.h
+ext/mbstring/libmbfl/Makefile.in
+ext/mbstring/libmbfl/autoscan.log
+ext/mbstring/libmbfl/config.sub
+ext/mbstring/libmbfl/depcomp
+ext/mbstring/libmbfl/ltmain.sh
+ext/mbstring/libmbfl/stamp-h1
+ext/mbstring/libmbfl/*.dll
+ext/mbstring/libmbfl/*.lib
+ext/mbstring/libmbfl/*.RES
+ext/mbstring/libmbfl/*.res
+ext/mbstring/libmbfl/*.obj
+ext/mbstring/libmbfl/*.tds
+ext/mbstring/libmbfl/filters/Makefile.in
+ext/mbstring/libmbfl/mbfl/Makefile.in
+ext/mbstring/libmbfl/mbfl/EastAsianWidth.txt
+ext/mbstring/libmbfl/nls/Makefile.in
+ext/mssql/#*#
+ext/mssql/Makefile.global
+ext/mssql/acinclude.m4
+ext/mssql/config.sub
+ext/mssql/configure.in
+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/phar/phar.php
+ext/pspell/tests/*.tmp
 ext/reflection/xml
 ext/reflection/html
 ext/reflection/spl.chm
+ext/simplexml/examples/security.new.xml
 ext/spl/examples/.htaccess
 ext/spl/examples/*.phps
 ext/sqlite3/tests/phpsql*
-
-# ------------------------------------------------------------------------------ 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
-!ext/pcre/pcre2lib/config.h
+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
+main/stamp-h1
+main/streams/build-defs.h
+main/streams/stamp-h1
+#pear/install-pear-nozlib.phar
+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
+sapi/fpm/php-fpm
+sapi/fpm/php-fpm.1
+sapi/fpm/init.d.php-fpm
+sapi/fpm/php-fpm.conf
+sapi/fpm/fpm/php-cgi
+sapi/phpdbg/phpdbg_parser.c
+sapi/phpdbg/phpdbg_parser.h
+sapi/phpdbg/phpdbg
+scripts/php-config
+scripts/phpize
+scripts/man1/*.1
+win32/*.suo
+win32/*.aps
+win32/*.positions
+win32/ext
+win32/phpts.def
+win32/wsyslog.h

.travis.yml

@@ -1,9 +1,5 @@
-git:
-  quiet: true
-
-dist: trusty
 language: c
-sudo: required
+sudo: false
 addons:
   apt:
     packages:
@@ -12,6 +8,7 @@ addons:
       - re2c
       - libgmp-dev
       - libicu-dev
+      - libmcrypt-dev
       - libtidy-dev
       - libenchant-dev
       - libaspell-dev
@@ -20,10 +17,9 @@ addons:
       - libsasl2-dev
       - libxpm-dev
       - libt1-dev
-      - libzip-dev
 
 notifications:
-    email:
+    email: 
        on_failure: change
     irc:
       template:
@@ -33,9 +29,8 @@ notifications:
       on_success: change
       on_failure: always
 
-cache:
-    apt: true
-    ccache: true
+cache: 
+    - apt
 
 env:
     global:
@@ -51,23 +46,15 @@ env:
       - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
 
 before_script:
-    - ccache --version
-    - ccache --zero-stats
-    - export USE_CCACHE=1
-    # Enable IPv6
-    - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
     # Compile PHP
     - ./travis/compile.sh
-    # Setup Extensions
+    # Setup Extensions 
     - . ./travis/ext/mysql/setup.sh
     - . ./travis/ext/mysqli/setup.sh
     - . ./travis/ext/pdo_mysql/setup.sh
     - . ./travis/ext/pgsql/setup.sh
     - . ./travis/ext/pdo_pgsql/setup.sh
 
-# Run PHPs run-tests.php
+# Run PHPs run-tests.php 
 script:
-    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120
-
-after_success:
-    - ccache --show-stats
+    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 1 ]; 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

CODING_STANDARDS

@@ -4,9 +4,10 @@
 
 This file lists several standards that any programmer adding or changing
 code in PHP should follow.  Since this file was added at a very late
-stage of the development of PHP v3.0, the code base does not fully
-follow it, but new features are going in that general direction.  Many
-sections have been recoded to use these rules.
+stage of the development of PHP v3.0, the code base does not (yet) fully
+follow it, but it's going in that general direction.  Since we are now
+well into version 5 releases, many sections have been recoded to use
+these rules.
 
 Code Implementation
 -------------------
@@ -92,12 +93,12 @@ User Functions/Methods Naming Conventions
     readability of the function name itself::
 
     Good:
-    'str_word_count'
-    'array_key_exists'
+    'mcrypt_enc_self_test'
+    'mysql_list_fields'
 
     Ok:
-    'date_interval_create_from_date_string'
-    (could be 'date_intvl_create_from_date_str'?)
+    'mcrypt_module_get_algo_supported_key_sizes'
+    (could be 'mcrypt_mod_get_algo_sup_key_sizes'?)
     'get_html_translation_table'
     (could be 'html_get_trans_table'?)
 
@@ -112,7 +113,7 @@ User Functions/Methods Naming Conventions
     of ``parent_*``::
 
     A family of 'foo' functions, for example:
-
+    
     Good:
     'foo_select_bar'
     'foo_insert_baz'
@@ -150,41 +151,21 @@ User Functions/Methods Naming Conventions
     'buildsomewidget'
     'getI()'
 
-7.  Class names should be descriptive nouns in PascalCase and as short as
+7.  Classes should be given descriptive names. Avoid using abbreviations where
     possible. Each word in the class name should start with a capital letter,
-    without underscore delimiters. The class name should be prefixed with the
-    name of the "parent set" (e.g. the name of the extension) if no namespaces
-    are used. Abbreviations and acronyms as well as initialisms should be
-    avoided wherever possible, unless they are much more widely used than the
-    long form (e.g. HTTP or URL). Abbreviations start with a capital letter
-    followed by lowercase letters, whereas acronyms and initialisms are written
-    according to their standard notation. Usage of acronyms and initialisms is
-    not allowed if they are not widely adopted and recognized as such.
+    without underscore delimiters (CamelCaps starting with a capital letter).
+    The class name should be prefixed with the name of the 'parent set' (e.g.
+    the name of the extension)::
 
     Good:
     'Curl'
-    'CurlResponse'
-    'HTTPStatusCode'
-    'URL'
-    'BTreeMap' (B-tree Map)
-    'Id' (Identifier)
-    'ID' (Identity Document)
-    'Char' (Character)
-    'Intl' (Internationalization)
-    'Radar' (Radio Detecting and Ranging)
+    'FooBar'
 
     Bad:
-    'curl'
-    'curl_response'
-    'HttpStatusCode'
-    'Url'
-    'BtreeMap'
-    'ID' (Identifier)
-    'CHAR'
-    'INTL'
-    'RADAR' (Radio Detecting and Ranging)
+    'foobar'
+    'foo_bar'
 
-Internal Function Naming Conventions
+Internal Function Naming Convensions
 ----------------------
 
 1.  Functions that are part of the external API should be named
@@ -197,7 +178,7 @@ Internal Function Naming Conventions
     Unexposed module function should be static and should not be defined in
     'php_modulename.h'.
 
-    static int php_session_destroy()
+    static int php_session_destroy(TSRMLS_D)
 
 2.  Main module source file must be named 'modulename.c'.
 
@@ -317,6 +298,5 @@ highlight_file and show_source), will be separately documented. The
 proto should still be included, describing which function is aliased.
 
 Backwards compatible functions and names should be maintained as long
-as the code can be reasonably be kept as part of the codebase. See the
-README in the PHP documentation repository for more information on
-documentation.
+as the code can be reasonably be kept as part of the codebase. See
+/phpdoc/README for more information on documentation.

CONTRIBUTING.md

@@ -11,20 +11,15 @@ 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 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 early-2018, the lowest supported version is
-PHP 7.1, which corresponds to the `PHP-7.1` 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 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/).
 
-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`.
+Pull requests to implement RFCs should be submitted against `master`.
 
 ## Filing bugs
 

CREDITS

@@ -1,3 +1,2 @@
 For the list of people who've put work into PHP, please see
-
-https://www.php.net/credits.php
+http://www.php.net/credits.php

EXTENSIONS

@@ -3,6 +3,7 @@
 
 Maintenance legend
 ------------------
+    Supported:       Someone is actually paid to look after this.
     Maintained:      Someone actually looks after it.
     Odd Fixes:       It has a maintainer but they don't have time to do
                      much other than throw the odd patch in. See below.
@@ -36,7 +37,7 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           cli
-MAINTENANCE:         Marcus Börger <helly@php.net>, Edin Kadribasic <edink@php.net>
+MAINTENANCE:         Marcus Boerger <helly@php.net>, Edin Kadribasic <edink@php.net>
 STATUS:              Working
 SINCE:               4.3.0
 -------------------------------------------------------------------------------
@@ -46,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
@@ -67,71 +68,59 @@ STATUS:              5.6
 
 -------------------------------------------------------------------------------
 EXTENSION:           dba
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net> (2002 - 2007)
-                     Christopher Jones <sixd@php.net> (2008 - 2013)
-                     Pierre-Alain Joye <pajoye@php.net> (2011 - 2011)
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>,Christopher Jones <sixd@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini
 -------------------------------------------------------------------------------
 EXTENSION:           interbase
-PRIMARY MAINTAINER:  Ard Biesheuvel <ard@ard.nu> (2003 - 2005)
+PRIMARY MAINTAINER:  Ard Biesheuvel <ard@ard.nu>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mysqli
-PRIMARY MAINTAINER:  Georg Richter <georg@php.net> (2003 - 2006)
-                     Andrey Hristov <andrey@php.net> (2003 - 2016)
-                     Johannes Schlüter <johannes@php.net> (2008 - 2014)
-                     Ulf Wendel <uw@php.net> (2007 - 2013)
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           mysqlnd
-PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net> (2007 - 2017)
-                     Johannes Schlüter <johannes@php.net> (2008 - 2018)
-                     Ulf Wendel <uw@php.net> (2009 - 2011)
+PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           oci8
-PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net> (2007 - 2017)
-                     Antony Dovgal <tony2001@php.net> (2003 - 2009)
+PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net>, Antony Dovgal <tony2001@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           odbc
-PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net> (2000 - 2004)
+PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
-COMMENT:             Working
+COMMENT:             Working 
 -------------------------------------------------------------------------------
 EXTENSION:           pdo
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net> (2004 - 2011)
-                     Wez Furlong <wez@php.net> (2004 - 2006)
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Wez Furlong <wez@php.net>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_dblib
-PRIMARY MAINTAINER:  Adam Baratz <adambaratz@php.net> (2016 - 2017)
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_firebird
-PRIMARY MAINTAINER:  Lars Westermann <lwe@php.net> (2007 - 2007)
+PRIMARY MAINTAINER:  Lars Westermann <lwe@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_mysql
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net> (2004 - 2010)
-                     Johannes Schlüter <johannes@php.net> (2008 - 2014)
-                     Andrey Hristov <andrey@php.net> (2005 - 2015)
-                     Ulf Wendel <uw@php.net> (2008 - 2012)
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Johannes Schlüter <johannes@php.net>, Andrey Hristov <andrey@php.net>,  Ulf Wendel <uw@php.net>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
@@ -143,32 +132,31 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_oci
-PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net> (2007 - 2017)
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_pgsql
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net> (2004 - 2011)
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_sqlite
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net> (2005 - 2011)
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pgsql
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net> (2002 - 2007)
-                     Yasuo Ohgaki <yohgaki@php.net> (2001 - 2015)
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Yasuo Ohgaki <yohgaki@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less have fatal bug.
 -------------------------------------------------------------------------------
 EXTENSION:           sqlite3
-PRIMARY MAINTAINER:  Scott MacVicar <scottmac@php.net> (2008 - 2011)
+PRIMARY MAINTAINER:  Scott MacVicar <scottmac@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
@@ -180,60 +168,54 @@ COMMENT:             Integrates SQLite 3 embeddable SQL database engine.
 
 -------------------------------------------------------------------------------
 EXTENSION:           dom
-PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net> (2003 - 2011)
-                     Rob Richards <rrichards@php.net> (2003 - 2012)
-                     Marcus Börger <helly@php.net> (2003 - 2006)
+PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>, Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           simplexml
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net> (2003 - 2008)
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           soap
-PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@php.net> (2004 - 2018)
+PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           wddx
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net> (1999 - 2003)
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Orphaned
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xml
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net> (1999 - 2002)
-                     Rob Richards <rrichards@php.net> (2003 - 2013)
+PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>,  Rob Richards <rrichards@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           libxml
-PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net> (2003 - 2009)
-                     Christian Stocker <chregu@php.net> (2004 - 2011)
+PRIMARY MAINTAINER:   Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net> 
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 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
 -------------------------------------------------------------------------------
 EXTENSION:           xmlrpc
-PRIMARY MAINTAINER:  Unknown
+PRIMARY MAINTAINER:  Dan Libby
 MAINTENANCE:         Orphaned
 STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           xmlwriter
-PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net> (2004 - 2010)
-                     Christian Stocker <chregu@php.net> (2004 - 2004)
+PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xsl
-PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net> (2003 - 2011)
-                     Rob Richards <rrichards@php.net> (2003 - 2010)
+PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
@@ -244,79 +226,67 @@ SINCE:               5.0
 
 -------------------------------------------------------------------------------
 EXTENSION:           bcmath
-MAINTENANCE:         Andi Gutmans <andi@php.net> (2000 - 2004)
+MAINTENANCE:         Andi Gutmans <andi@zend.com>
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           bz2
-PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net> (2004 - 2004)
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
 MAINTENANCE:         Odd Fixes
 STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
 EXTENSION:           calendar
-PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net> (2000 - 2004)
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
 MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           com_dotnet
-PRIMARY MAINTAINER:  Wez Furlong <wez@php.net> (2003 - 2005)
+PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Windows
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           ctype
-PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net> (2000 - 2004)
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           curl
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net> (2000 - 2004)
-                     Ilia Alshanetsky <iliaa@php.net> (2002 - 2011)
-                     Pierrick Charron <pierrick@php.net> (2010 - 2016)
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>, Ilia Alshanetsky <iliaa@php.net>, Pierrick Charron <pierrick@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           date
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net> (2005 - 2018)
+PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           enchant
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.3
--------------------------------------------------------------------------------
 EXTENSION:           exif
-PRIMARY MAINTAINER:  Kalle Sommer Nielsen <kalle@php.net> (2010 - 2018)
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.2
 -------------------------------------------------------------------------------
 EXTENSION:           fileinfo
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net> (2004 - 2008)
-                     Anatol Belski <ab@php.net> (2012 - 2018)
+PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           filter
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net> (2006 - 2006)
-                     Pierre-Alain Joye <pajoye@php.net> (2006 - 2011)
-                     Ilia Alshanetsky <iliaa@php.net> (2006 - 2011)
+PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>, Pierre-Alain Joye <pajoye@php.net>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.2
 -------------------------------------------------------------------------------
 EXTENSION:           ftp
-PRIMARY MAINTAINER:  Unknown
+PRIMARY MAINTAINER:  Stefan Esser <sesser@php.net>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gd
-PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net> (2002 - 2016)
-                     Christoph M. Becker <cmb@php.net> (2015 - 2018)
+PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -325,99 +295,89 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gmp
-PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net> (2000 - 2018)
-                     Antony Dovgal <tony2001@php.net> (2005 - 2010)
+PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net>, Antony Dovgal <tony2001@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
 EXTENSION:           hash
-PRIMARY MAINTAINER:  Sara Golemon <pollita@php.net> (2005 - 2017)
-                     Mike Wallner <mike@php.net> (2005 - 2013)
-                     Anatol Belski <ab@php.net> (2014 - 2018)
+PRIMARY MAINTAINER:  Sara Golemon <pollita@php.net>, Mike Wallner <mike@php.net>, Anatol Belski <ab@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.1.2
 -------------------------------------------------------------------------------
 EXTENSION:           iconv
-PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net> (2002 - 2010)
+PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           intl
-PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net> (2008 - 2018)
-                     Anatol Belski <ab@php.net> (2017 - 2018)
+PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           imap
-PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org> (1999 - 2004)
-                     Ilia Alshanetsky <iliaa@php.net> (2002 - 2010)
-                     Pierre-Alain Joye <pajoye@php.net> (2008 - 2010)
+PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>, Ilia Alshanetsky <iliaa@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           json
-PRIMARY MAINTAINER:  Jakub Zelenka <bukka@php.net> (2014 - 2018)
+PRIMARY MAINTAINER:  Jakub Zelenka <bukka@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.2
 -------------------------------------------------------------------------------
 EXTENSION:           ldap
-PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net> (2000 - 2002)
-                     Douglas Goldstein <cardoe@php.net> (2007 - 2007)
-                     Pierre-Alain Joye <pajoye@php.net> (2008 - 2010)
-                     Côme Bernigaud <mcmic@php.net> (2015 - 2017)
+PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>, Pierre-Alain Joye <pajoye@php.net>, Côme Bernigaud <mcmic@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mbstring
-PRIMARY MAINTAINER:  Rui Hirokawa <hirokawa@php.net> (2001 - 2013)
+PRIMARY MAINTAINER:  Rui Hirokawa <hirokawa@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           mcrypt
+PRIMARY MAINTAINER:  Derick Rethans <derick@derickrethans.nl>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           opcache
-PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@php.net> (2013 - 2018)
-                     Xinchen Hui <laruence@php.net> (2013 - 2018)
+PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>, Xinchen Hui <laruence@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.5.0
 -------------------------------------------------------------------------------
 EXTENSION:           openssl
-PRIMARY MAINTAINER:  Wez Furlong <wez@php.net> (2001 - 2006)
-                     Pierre-Alain Joye <pajoye@php.net> (2006 - 2011)
-                     Jakub Zelenka <bukka@php.net> (2015 - 2019)
+PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
 EXTENSION:           pcntl
-PRIMARY MAINTAINER:  Arnaud Le Blanc <lbarnaud@php.net> (2008 - 2010)
+PRIMARY MAINTAINER:  Arnaud Le Blanc <lbarnaud@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           pcre
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net> (1999 - 2006)
-                     Nuno Lopes <nlopess@php.net> (2006 - 2009)
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>, Nuno Lopes <nlopess@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           phar
-PRIMARY MAINTAINER:  Greg Beaver <cellog@php.net> (2008 - 2009)
-                     Marcus Börger <helly@php.net> (2008 - 2008)
-                     Steph Fox <sfox@php.net> (2008 - 2008)
+PRIMARY MAINTAINER:  Greg Beaver <cellog@php.net>, Marcus Börger <helly@php.net>, Steph Fox <sfox@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           posix
-PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de> (2000 - 2000)
+PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           pspell
-PRIMARY MAINTAINER:  Vlad Krupin <phpdevel@echospace.com> (2000 - 2004)
+PRIMARY MAINTAINER:  Vlad Krupin <phpdevel@echospace.com>
 MAINTENANCE:         Unknown
 STATUS:              Working
 SINCE:               4.0.2
@@ -427,50 +387,39 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           recode
-PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de> (2000 - 2000)
+PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           reflection
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net> (2003 - 2009)
-                     Johannes Schlüter <johannes@php.net> (2006 - 2014)
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>, Johannes Schlüter <johannes@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           session
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx> (1999 - 2004)
-                     Ilia Alshanetsky <iliaa@php.net> (2002 - 2012)
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           shmop
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net> (2002 - 2008)
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
 EXTENSION:           snmp
-PRIMARY MAINTAINER:  Boris Lytochkin <lytboris@php.net> (2011 - 2013)
-                     Rasmus Lerdorf <rasmus@php.net> (1999 - 2002)
-                     Pierre-Alain Joye <pajoye@php.net> (2010 - 2011)
+PRIMARY MAINTAINER:  Boris Lytochkin <lytboris@php.net>, Rasmus Lerdorf <rasmus@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sockets
-PRIMARY MAINTAINER:  Chris Vandomelen <chrisv@b0rked.dhs.org> (2000 - 2000)
+PRIMARY MAINTAINER:  Chris Vandomelen <chrisv@b0rked.dhs.org>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
-EXTENSION:           sodium
-PRIMARY MAINTAINER:  Frank Denis <jedisct1@php.net> (2017 - 2017)
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               7.2.0
--------------------------------------------------------------------------------
 EXTENSION:           spl
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net> (2003 - 2009)
-                     Etienne Kneuss <colder@php.net> (2008 - 2014)
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Etienne Kneuss <colder@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0.0
@@ -488,24 +437,22 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           tidy
-PRIMARY MAINTAINER:  John Coggeshall <john@php.net> (2003 - 2006)
-                     Ilia Alshanetsky <iliaa@php.net> (2003 - 2009)
-                     Nuno Lopes <nlopess@php.net> (2006 - 2012)
+PRIMARY MAINTAINER:  John Coggeshall <john@php.net>, Ilia Alshanetsky <iliaa@php.net>, Nuno Lopes <nlopess@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           tokenizer
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net> (2002 - 2002)
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           zip
-PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net> (2006 - 2011)
+PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           zlib
-PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de> (1999 - 2003)
+PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------

LICENSE

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

Makefile.frag

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

Makefile.gcov

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

Makefile.global

@@ -5,7 +5,7 @@ INSTALL_DATA = $(INSTALL) -m 644
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
 
-all: $(all_targets)
+all: $(all_targets) 
 	@echo
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
@@ -112,16 +112,16 @@ test: all
 clean:
 	find . -name \*.gcno -o -name \*.gcda | xargs rm -f
 	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
-	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
+	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,9 +135,9 @@ 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_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
+	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/*
 
 prof-use:
 	CCACHE_DISABLE=1 $(MAKE) PROF_FLAGS=-fprofile-use all

README.EXT_SKEL

@@ -1,43 +1,188 @@
+(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 
+			 supposed to replace ext_skel completely in the long run ...)
+
 WHAT IT IS
 
-  It's a tool for automatically creating the basic framework for a PHP extension.
+  It's a tool for automatically creating the basic framework for a PHP module
+  and writing C code handling arguments passed to your functions from a simple
+  configuration file. See an example at the end of this file.
 
 HOW TO USE IT
 
-  Very simple. First, change to the ext/ directory of the PHP sources. Then
-  run the following
+  Very simple. First, change to the ext/ directory of the PHP 4 sources. If
+  you just need the basic framework and will be writing all the code in your
+  functions yourself, you can now do
 
-   php ext_skel.php --ext extension_name
+   ./ext_skel --extname=module_name
 
-  and everything you need will be placed in directory ext/extension_name.
+  and everything you need is placed in directory module_name. 
 
-  If you don't need to test the existence of any external header files,
-  libraries or functions in them, the extension is ready to be compiled in
-  PHP. To compile the extension, run the following:
+  [ 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. ]
 
-    ./buildconf; ./configure --enable-extension_name; make
+  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
 
-  The definition of PHP_extension_NAME_VERSION will be present in the
-  php_extension_name.h and injected into the zend_extension_entry definition. This
+    ./buildconf; ./configure --enable-module_name; make
+
+  The definition of PHP_MODULE_NAME_VERSION will be present in the
+  php_module_name.h and injected into the zend_module_entry definition. This
   is required by the PECL website for the version string conformity checks
   against package.xml
 
+  But if you already have planned the overall scheme of your module, what
+  functions it will contain, their return types and the arguments they take
+  (a very good idea) and don't want to bother yourself with creating function
+  definitions and handling arguments passed yourself, it's time to create a
+  function definitions file, which you will give as an argument to ext_skel
+  with option
+
+    --proto=filename.
+
 SOURCE AND HEADER FILE NAME
 
-  The ext_skel.php script generates 'extension_name.c' and 'php_extension_name.h'
-  as the main source and header files. Keep these names.
+  ./ext_skel generates 'module_name.c' and 'php_module_name.h' as main source
+  and header files. Keep these names.
 
-  extension functions (User functions) must be named
+  Module functions (User functions) must be named
 
-  extension_name_function()
+  module_name_function()
 
-  When you need to expose extension functions to other extensions, expose functions
+  When you need to expose module functions to other modules, expose functions
   strictly needed by others. Exposed internal function must be named
 
-  php_extension_name_function()
+  php_module_name_function()
 
   See also CODING_STANDARDS.
 
+
+FORMAT OF FUNCTION DEFINITIONS FILE
+
+  All the definitions must be on one line. In it's simplest form, it's just
+  the function name, e.g.
+
+    module_name_function
+
+  but then you'll be left with an almost empty function body without any
+  argument handling.
+
+  Arguments are given in parenthesis after the function name, and are of
+  the form 'argument_type argument_name'. Arguments are separated from each
+  other with a comma and optional space. Argument_type can be one of int,
+  bool, double, float, string, array, object or mixed.
+
+  An optional argument is separated from the previous by an optional space,
+  then '[' and of course comma and optional space, like all the other
+  arguments. You should close a row of optional arguments with same amount of
+  ']'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. 
+  If present it will be filled into the 'proto' header comments in the stubs
+  code and the <refpurpose> tag in the XML documentation.
+
+  An example:
+
+    module_name_function(int arg1, int arg2 [, int arg3 [, int arg4]])
+
+  Arguments arg1 and arg2 are required.
+  Arguments arg3 and arg4 are optional.
+
+  If possible, the function definition should also contain it's return type
+  in front of the definition. It's not actually used for any C code generating
+  purposes but PHP in-source documentation instead, and as such, very useful.
+  It can be any of int, double, string, bool, array, object, resource, mixed
+  or void.
+
+  The file must contain nothing else but function definitions, no comments or
+  empty lines.
+
 OTHER OPTIONS
 
-  Run php ext_skel.php --help to see the available options.
+    --no-help
+
+  By default, ext_skel creates both comments in the source code and a test
+  function to help first time module writers to get started and testing
+  configuring and compiling their module. This option turns off all such things
+  which may just annoy experienced PHP module coders. Especially useful with
+
+    --stubs=file
+
+  which will leave out also all module specific stuff and write just function
+  stubs with function value declarations and passed argument handling, and
+  function entries and definitions at the end of the file, for copying and
+  pasting into an already existing module.
+
+    --xml[=file]
+
+  Creates the basics for phpdoc .xml file.
+
+    --full-xml
+
+  Not implemented yet. When or if there will ever be created a framework for
+  self-contained extensions to use phpdoc system for their documentation, this
+  option enables it on the created xml file.
+
+CURRENT LIMITATIONS, BUGS AND OTHER ODDITIES
+
+  Only arguments of types int, bool, double, float, string and array are
+  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 [, ...])
+
+  Don't trust the generated code too much. It tries to be useful in most of
+  the situations you might encounter, but automatic code generation will never
+  beat a programmer who knows the real situation at hand. ext_skel is generally
+  best suited for quickly generating a wrapper for c-library functions you
+  might want to have available in PHP too.
+
+  This program doesn't have a --help option. It has --no-help instead.
+
+EXAMPLE
+
+  The following _one_ line
+
+  bool module_name_drawtext(resource image, string text, resource font, int x, int y [, int color])
+
+  will create this function definition for you (note that there are a few
+  question marks to be replaced by you, and you must of course add your own
+  value definitions too):
+
+/* {{{ proto bool module_name_drawtext(resource image, string text, resource font, int x, int y [, int color])
+    */
+PHP_FUNCTION(module_name_drawtext)
+{
+    char *text = NULL;
+    int argc = ZEND_NUM_ARGS();
+    int image_id = -1;
+    size_t text_len;
+    int font_id = -1;
+    zend_long x;
+    zend_long y;
+    zend_long color;
+    zval *image = NULL;
+    zval *font = NULL;
+
+    if (zend_parse_parameters(argc TSRMLS_CC, "rsrll|l", &image, &text, &text_len, &font, &x, &y, &color) == FAILURE)
+        return;
+
+    if (image) {
+        ZEND_FETCH_RESOURCE(???, ???, image, image_id, "???", ???_rsrc_id);
+    }
+    if (font) {
+        ZEND_FETCH_RESOURCE(???, ???, font, font_id, "???", ???_rsrc_id);
+    }
+
+    php_error(E_WARNING, "module_name_drawtext: not yet implemented");
+}
+/* }}} */
+

README.GIT-RULES

@@ -38,30 +38,22 @@ 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-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.
+   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.
 
 Currently we have the following branches in use::
 
-  master    The active development branch.
+  master    The active development branch. 
 
-  PHP-7.2   Is used to release the PHP 7.2.x series. This is a current
+  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-7.1   Is used to release the PHP 7.1.x series. This is a current
-            stable version and is open for bugfixes only.
-
-  PHP-7.0   Is used to release the PHP 7.0.x series. This is an old
+  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.6   Is used to release the PHP 5.6.x series. This is an old
+  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.5   This branch is closed.
-
-  PHP-5.4   This branch is closed.
-
   PHP-5.3   This branch is closed.
 
   PHP-5.2   This branch is closed.
@@ -77,7 +69,7 @@ The next few rules are more of a technical nature::
 
    1. All changes should first go to the lowest branch (i.e. 5.6) and then
       get merged up to all other branches. If a change is not needed for
-      later branches (i.e. fixes for features which were dropped from later
+      later branches (i.e. fixes for features which where dropped from later
       branches) an empty merge should be done.
 
    2. All news updates intended for public viewing, such as new features,
@@ -87,7 +79,7 @@ The next few rules are more of a technical nature::
       should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but
       not master, which is not a public released version yet.
 
-   3. Do not commit multiple files and dump all messages in one commit. If you
+   3. Do not commit multiple file and dump all messages in one commit. If you
       modified several unrelated files, commit each group separately and
       provide a nice commit message for each one. See example below.
 
@@ -113,7 +105,7 @@ The format of the commit messages is pretty simple.
 An Example from the git project (commit 2b34e486bc):
 
 pack-objects: Fix compilation with NO_PTHREDS
-
+  
 It looks like commit 99fb6e04 (pack-objects: convert to use
 parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but
 hasn't noticed that the 'arg' variable no longer is available.

README.NEW-OUTPUT-API

@@ -1,102 +1,105 @@
+$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:
 		// Using OG()
-		php_output_get_status();
+		php_output_get_status(TSRMLS_C);
 
 	Starting the default output handler:
-		// php_start_ob_buffer(NULL, 0, 1);
-		php_output_start_default();
+		// php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
+		php_output_start_default(TSRMLS_C);
 
 	Starting an user handler by zval:
-		// php_start_ob_buffer(zhandler, chunk_size, erase);
-		php_output_start_user(zhandler, chunk_size, flags);
+		// php_start_ob_buffer(zhandler, chunk_size, erase TSRMLS_CC);
+		php_output_start_user(zhandler, chunk_size, flags TSRMLS_CC);
 
-	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);
+	Starting an internal handler whithout context:
+		// php_ob_set_internal_handler(my_php_output_handler_func_t, buffer_size, "output handler name", erase TSRMLS_CC);
+		php_output_start_internal(handler_name, handler_name_len, my_php_output_handler_func_t, chunk_size, flags TSRMLS_CC);
 
 	Starting an internal handler with context:
 		// not possible with old API
 		php_output_handler *h;
-		h = php_output_handler_create_internal(handler_name, handler_name_len, my_php_output_handler_context_func_t, chunk_size, flags);
+		h = php_output_handler_create_internal(handler_name, handler_name_len, my_php_output_handler_context_func_t, chunk_size, flags TSRMLS_CC);
 		php_output_handler_set_context(h, my_context, my_context_dtor);
-		php_output_handler_start(h);
+		php_output_handler_start(h TSRMLS_CC);
 
 	Testing whether a certain output handler has already been started:
-		// php_ob_handler_used("output handler name");
-		php_output_handler_started(handler_name, handler_name_len);
+		// php_ob_handler_used("output handler name" TSRMLS_CC);
+		php_output_handler_started(handler_name, handler_name_len TSRMLS_CC);
 
 	Flushing one output buffer:
-		// php_end_ob_buffer(1, 1);
-		php_output_flush();
+		// php_end_ob_buffer(1, 1 TSRMLS_CC);
+		php_output_flush(TSRMLS_C);
 
 	Flushing all output buffers:
 		// not possible with old API
-		php_output_flush_all();
+		php_output_flush_all(TSRMLS_C);
 
 	Cleaning one output buffer:
-		// php_ob_end_buffer(0, 1);
-		php_output_clean();
+		// php_ob_end_buffer(0, 1 TSRMLS_CC);
+		php_output_clean(TSRMLS_C);
 
 	Cleaning all output buffers:
 		// not possible with old API
-		php_output_clean_all();
+		php_output_clean_all(TSRMLS_C);
 
 	Discarding one output buffer:
-		// php_ob_end_buffer(0, 0);
-		php_output_discard();
+		// php_ob_end_buffer(0, 0 TSRMLS_CC);
+		php_output_discard(TSRMLS_C);
 
 	Discarding all output buffers:
-		// php_ob_end_buffers(0);
-		php_output_discard_all();
+		// php_ob_end_buffers(0 TSRMLS_CC);
+		php_output_discard_all(TSRMLS_C);
 
 	Stopping (and dropping) one output buffer:
-		// php_ob_end_buffer(1, 0)
-		php_output_end();
+		// php_ob_end_buffer(1, 0 TSRMLS_CC)
+		php_output_end(TSRMLS_C);
 
 	Stopping (and dropping) all output buffers:
-		// php_ob_end_buffers(1, 0);
-		php_output_end_all();
+		// php_ob_end_buffers(1, 0 TSRMLS_CC);
+		php_output_end_all(TSRMLS_C);
 
 	Retrieving output buffers contents:
-		// php_ob_get_buffer(zstring);
-		php_output_get_contents(zstring);
+		// php_ob_get_buffer(zstring TSRMLS_CC);
+		php_output_get_contents(zstring TSRMLS_CC);
 
 	Retrieving output buffers length:
-		// php_ob_get_length(zlength);
-		php_output_get_length(zlength);
+		// php_ob_get_length(zlength TSRMLS_CC);
+		php_output_get_length(zlength TSRMLS_CC);
 
 	Retrieving output buffering level:
 		// OG(nesting_level);
-		php_output_get_level();
+		php_output_get_level(TSRMLS_C);
 
 	Issue a warning because of an output handler conflict:
-		// php_ob_init_conflict("to be started handler name", "to be tested if already started handler name");
-		php_output_handler_conflict(new_handler_name, new_handler_name_len, set_handler_name, set_handler_name_len);
+		// php_ob_init_conflict("to be started handler name", "to be tested if already started handler name" TSRMLS_CC);
+		php_output_handler_conflict(new_handler_name, new_handler_name_len, set_handler_name, set_handler_name_len TSRMLS_CC);
 
 	Registering a conflict checking function, which will be checked prior starting the handler:
 		// not possible with old API, unless hardcoding into output.c
-		php_output_handler_conflict_register(handler_name, handler_name_len, my_php_output_handler_conflict_check_t);
+		php_output_handler_conflict_register(handler_name, handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);
 
 	Registering a reverse conflict checking function, which will be checked prior starting the specified foreign handler:
 		// not possible with old API
-		php_output_handler_reverse_conflict_register(foreign_handler_name, foreign_handler_name_len, my_php_output_handler_conflict_check_t);
+		php_output_handler_reverse_conflict_register(foreign_handler_name, foreign_handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);
 
 	Facilitating a context from within an output handler callable with ob_start():
 		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr TSRMLS_CC);
 
 	Disabling of the output handler by itself:
 		//not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL TSRMLS_CC);
 
 	Marking an output handler immutable by itself because of irreversibility of its operation:
 		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC);
 
 	Restarting the output handler because of a CLEAN operation:
 		// not possible with old API
@@ -131,7 +134,7 @@ Output handler hooks
 Open questions
 
 	Should the userland API be adjusted and unified?
-
+	
 	Many bits of the manual (and very first implementation) do not comply
 	with the behaviour of the current (to be obsoleted) code, thus should
 	the manual or the behaviour be adjusted?

README.PARAMETER_PARSING_API

@@ -13,8 +13,8 @@ meaningful error messages.
 Prototypes
 ----------
 /* Implemented. */
-int zend_parse_parameters(int num_args, char *type_spec, ...);
-int zend_parse_parameters_ex(int flags, int num_args, char *type_spec, ...);
+int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...);
+int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);
 
 The zend_parse_parameters() function takes the number of parameters
 passed to the extension function, the type specifier string, and the
@@ -28,16 +28,9 @@ Both functions return SUCCESS or FAILURE depending on the result.
 The auto-conversions are performed as necessary. Arrays, objects, and
 resources cannot be auto-converted.
 
-PHP 5.3 includes a new function (actually implemented as macro):
-
-int zend_parse_parameters_none();
-
-This returns SUCCESS if no argument has been passed to the function,
-FAILURE otherwise.
-
 PHP 5.5 includes a new function:
 
-int zend_parse_parameter(int flags, int arg_num, zval **arg, const char *spec, ...);
+int zend_parse_parameter(int flags, int arg_num TSRMLS_DC, zval **arg, const char *spec, ...);
 
 This function behaves like zend_parse_parameters_ex() except that instead of
 reading the arguments from the stack, it receives a single zval to convert
@@ -49,11 +42,11 @@ See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse
 
 Type specifiers
 ---------------
- The following list shows the type specifier, its meaning and the parameter
+ The following list shows the type specifier, its meaning and the parameter 
  types that need to be passed by address. All passed parameters are set
- if the PHP parameter is non optional and untouched if optional and the
+ if the PHP parameter is non optional and untouched if optional and the 
  parameter is not present. The only exception is O where the zend_class_entry*
- has to be provided on input and is used to verify the PHP parameter is an
+ has to be provided on input and is used to verify the PHP parameter is an 
  instance of that class.
 
  a  - array (zval*)
@@ -61,7 +54,7 @@ Type specifiers
  b  - boolean (zend_bool)
  C  - class (zend_class_entry*)
  d  - double (double)
- f  - function or array containing php method call info (returned as
+ f  - function or array containing php method call info (returned as 
       zend_fcall_info and zend_fcall_info_cache)
  h  - array (returned as HashTable*)
  H  - array or HASH_OF(object) (returned as HashTable*)
@@ -70,10 +63,10 @@ Type specifiers
  o  - object of any type (zval*)
  O  - object of specific type given by class entry (zval*, zend_class_entry)
  p  - valid path (string without null bytes in the middle) and its length (char*, size_t)
- P  - valid path (string without null bytes in the middle) as zend_string (zend_string*)
+ P  - valid path (string without null bytes in the middle) as zend_string (zend_string)
  r  - resource (zval*)
  s  - string (with possible null bytes) and its length (char*, size_t)
- S  - string (with possible null bytes) as zend_string (zend_string*)
+ S  - string (with possible null bytes) as zend_string (zend_string)
  z  - the actual zval (zval*)
  *  - variable arguments list (0 or more)
  +  - variable arguments list (1 or more)
@@ -95,22 +88,22 @@ 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:
 1)
   char *str;
   long str_len; /* XXX THIS IS WRONG!! Use size_t instead. */
-  zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str, &str_len)
+  zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len)
 
 2)
   int num; /* XXX THIS IS WRONG!! Use zend_long instead. */
-  zend_parse_parameters(ZEND_NUM_ARGS(), "l", &num)
+  zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "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/
@@ -123,7 +116,7 @@ zend_long l;
 char *s;
 size_t s_len;
 zval *param;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "lsz",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
                           &l, &s, &s_len, &param) == FAILURE) {
     return;
 }
@@ -133,7 +126,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "lsz",
 zval *obj;
 double d = 0.5;
 zend_class_entry *my_ce;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|d",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
                           &obj, my_ce, &d) == FAILURE) {
     return;
 }
@@ -143,7 +136,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|d",
    If null is passed for object, obj will be set to NULL. */
 zval *obj;
 zval *arr;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "o!a",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a",
                           &obj, &arr) == FAILURE) {
     return;
 }
@@ -151,7 +144,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "o!a",
 
 /* Gets a separated array which can also be null. */
 zval *arr;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
                           &arr) == FAILURE) {
     return;
 }
@@ -159,7 +152,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!",
 /* Get either a set of 3 longs or a string. */
 zend_long l1, l2, l3;
 char *s;
-/*
+/* 
  * The function expects a pointer to a size_t in this case, not a long
  * or any other type.  If you specify a type which is larger
  * than a 'size_t', the upper bits might not be initialized
@@ -168,10 +161,10 @@ char *s;
  */
 size_t length;
 
-if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
+if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
                              "lll", &l1, &l2, &l3) == SUCCESS) {
     /* manipulate longs */
-} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
+} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
                                     "s", &s, &length) == SUCCESS) {
     /* manipulate string */
 } else {
@@ -187,7 +180,7 @@ int i, num_varargs;
 zval *varargs = NULL;
 
 
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &varargs, &num_varargs) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "*", &varargs, &num_varargs) == FAILURE) {
     return;
 }
 
@@ -207,7 +200,7 @@ size_t str_len;
 int i, num_varargs;
 zval *varargs = NULL;
 
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
     return;
 }
 
@@ -221,15 +214,10 @@ zval *array;
 int i, num_varargs;
 zval *varargs = NULL;
 
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
     return;
 }
 
 for (i = 0; i < num_varargs; i++) {
     /* do something with varargs[i] */
 }
-
-/* Function that doesn't accept any arguments */
-if (zend_parse_parameters_none() == FAILURE) {
-    return;
-}

README.REDIST.BINS

@@ -1,121 +1,21 @@
 1. libmagic (ext/fileinfo) see ext/fileinfo/libmagic/LICENSE
 2. Oniguruma (ext/mbstring) see ext/mbstring/oniguruma/COPYING
 3. libmbfl (ext/mbstring) see ext/mbstring/libmbfl/LICENSE
-4. pcre2lib (ext/pcre)
+4. pcrelib (ext/pcre) see ext/pcre/pcrelib/LICENCE
 5. ext/standard crypt
 6. ext/standard crypt's blowfish implementation
 7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
-8. ext/standard/rand
-9. ext/standard/scanf
-10. ext/standard/strnatcmp.c
-11. ext/standard/uuencode
-12. libxmlrpc ext/xmlrpc
-13. libzip ext/zip
-14. main/snprintf.c
-15. main/strlcat
-16. main/strlcpy
-17. libgd see ext/gd/libgd/COPYING
-18. ext/phar portions of tar implementations
-19. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/COPYING.LIB
-
-
-4. pcre2lib (ext/pcre)
-
-PCRE2 LICENCE
--------------
-
-PCRE2 is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-Release 10 of PCRE2 is distributed under the terms of the "BSD" licence, as
-specified below, with one exemption for certain binary redistributions. The
-documentation for PCRE2, supplied in the "doc" directory, is distributed under
-the same terms as the software itself. The data in the testdata directory is
-not copyrighted and is in the public domain.
-
-The basic library functions are written in C and are freestanding. Also
-included in the distribution is a just-in-time compiler that can be used to
-optimize pattern matching. This is an optional feature that can be omitted when
-the library is built.
-
-
-THE BASIC LIBRARY FUNCTIONS
----------------------------
-
-Written by:       Philip Hazel
-Email local part: ph10
-Email domain:     cam.ac.uk
-
-University of Cambridge Computing Service,
-Cambridge, England.
-
-Copyright (c) 1997-2018 University of Cambridge
-All rights reserved.
-
-
-PCRE2 JUST-IN-TIME COMPILATION SUPPORT
---------------------------------------
-
-Written by:       Zoltan Herczeg
-Email local part: hzmester
-Emain domain:     freemail.hu
-
-Copyright(c) 2010-2018 Zoltan Herczeg
-All rights reserved.
-
-
-STACK-LESS JUST-IN-TIME COMPILER
---------------------------------
-
-Written by:       Zoltan Herczeg
-Email local part: hzmester
-Emain domain:     freemail.hu
-
-Copyright(c) 2009-2018 Zoltan Herczeg
-All rights reserved.
-
-
-THE "BSD" LICENCE
------------------
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notices,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notices, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of any
-      contributors may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
-EXEMPTION FOR BINARY LIBRARY-LIKE PACKAGES
-------------------------------------------
-
-The second condition in the BSD licence (covering binary redistributions) does
-not apply all the way down a chain of software. If binary package A includes
-PCRE2, it must respect the condition, but if package B is software that
-includes package A, the condition is not imposed on package B unless it uses
-PCRE2 independently.
-
-End
-
+8. ext/json/json_parser
+9. ext/standard/rand
+10. ext/standard/scanf
+11. ext/standard/strnatcmp.c
+12. ext/standard/uuencode
+13. libxmlrpc ext/xmlrpc
+14. libzip ext/zip
+15. main/snprintf.c
+16. main/strlcat
+17. main/strlcpy
+18. libgd see ext/gd/libgd/COPYING
 
 5. ext/standard crypt
 
@@ -147,7 +47,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
 
@@ -193,7 +93,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
 
@@ -204,7 +104,31 @@ a legal notice, here is a blessing:
   May you share freely, never taking more than you give.
 
 
-8. ext/standard/rand
+8. ext/json/json_parser
+Copyright (c) 2005 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+9. ext/standard/rand
 The following php_mt_...() functions are based on a C++ class MTRand by
 Richard J. Wagner. For more information see the web page at
 http://www-personal.engin.umich.edu/~wagnerr/MersenneTwister.html
@@ -227,7 +151,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
@@ -240,8 +164,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
@@ -257,7 +181,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-9. ext/standard/scanf
+10. ext/standard/scanf
 scanf.c --
 
 This file contains the base code which implements sscanf and by extension
@@ -303,7 +227,7 @@ authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
 terms specified in this license.
 
-10. ext/standard/strnatcmp.c
+11. ext/standard/strnatcmp.c
 
 strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
 Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
@@ -324,7 +248,7 @@ freely, subject to the following restrictions:
 	 misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 
-11. ext/standard/uuencode
+12. ext/standard/uuencode
 Portions of this code are based on Berkeley's uuencode/uudecode
 implementation.
 
@@ -360,31 +284,31 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
 
-12. libxmlrpc ext/xmlrpc
+13. 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
+14. libzip ext/zip
 zip.h -- exported declarations.
 Copyright (C) 1999-2009 Dieter Baron and Thomas Klausner
 
@@ -416,7 +340,7 @@ 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.
 
-14. main/snprintf.c
+15. main/snprintf.c
 Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com>
 
 Permission to use, copy, modify, and distribute this software for any
@@ -489,8 +413,8 @@ This code is based on, and used with the permission of, the
 SIO stdio-replacement strx_* functions by Panos Tsirigotis
 <panos@alumni.cs.colorado.edu> for xinetd.
 
-15. main/strlcat
-16. main/strlcpy
+16. main/strlcat
+17. main/strlcpy
 Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 All rights reserved.
 
@@ -516,30 +440,3 @@ 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.
 
-18. ext/phar portions of tar implementations
-
-portions of tar implementations in ext/phar - phar_tar_octal() are based on an
-implementation by Tim Kientzle from libarchive, licensed with this license:
-
- Copyright (c) 2003-2007 Tim Kientzle
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are 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 disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR(S) 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.

README.RELEASE_PROCESS

@@ -17,7 +17,7 @@ It is recommended to do so a couple of days before the packaging day, to
 have enough time to investigate failures, communicate with the authors and
 commit the fixes.
 The RM for the branch is also responsible for keeping the CI green on
-ongoing basis between the releases. Check the CI status for your branch
+ongoing bases between the releases. Check the CI status for your branch
 periodically and resolve the failures ASAP. See more in:
 https://wiki.php.net/rfc/travis_ci
 
@@ -31,13 +31,13 @@ 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.
+7. Moving extensions from/to PECL requires write acces to the destination.
+Most developers should have this. 
 
 Moving extensions from php-src to PECL
 - Checkout the pecl directory, most likely you want a sparse-root checkout
   svn co --depth=empty https://svn.php.net/repository/pecl
-- Create a directory for the extension incl. branch and tag structure,
+- Create an directory for the extension incl. branch and tag structure,
   no trunk at this point and commit this to svn
   cd pecl; mkdir foo foo/tags foo/branches; svn add foo; svn commit
 - Move the extension from php-src to the new location
@@ -50,7 +50,7 @@ maintainers if any:
 - create the package.xml, commit
 - release the package
 
-For Moving extensions from PECL to php-src the svn mv has to be done the other
+For Moving extensions from PECL to php-src the svn mv has to be tone the other
 way round.
 
 Rolling a non stable release (alpha/beta/RC)
@@ -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.ac`` and possibly ``NEWS``.
+5. Bump the version numbers in ``main/php_version.h``, ``configure.in`` 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.ac`` and ``NEWS``
+10. Bump the version numbers in ``main/php_version.h``, ``configure.in`` 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.
@@ -93,61 +93,28 @@ Commit the changes to the main branch.
 12. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
 and build three tarballs (gz, bz2 and xz).
 
-13. run ``scripts/dev/gen_verify_stub <version> [identity]``, this will sign the tarballs
-and output verification information to be included in announcement email
+13. 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.
 
-14. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
-directory "public_html/". Copy them into there, so that the system can generate
-MD5 sums. If you do not have this directory, create it.
+14. 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 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
+15. 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.
 
 Getting the non stable release (alpha/beta/RC) announced
 --------------------------------------------------------
 
-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.
+1. Send an email (see example here: http://news.php.net/php.internals/19486)
+**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".
 
-   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 **separate** emails **To** ``internals@lists.php.net`` and ``php-general@lists.php.net``
-lists pointing out "the location of the release" and "the possible release date of
-either the next RC, or the final release". Include in this information the verification
-information output by ``gen_verify_stub``.
-
-6. Send **separate** emails (see example here http://news.php.net/php.pear.qa/5201) **To**
+2. 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``.
-These emails are to notify the selected projects about a new release so that they
+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
 as a moderator for ``primary-qa-tester@lists.php.net`` by having someone (Hannes, Dan,
 Derick) run the following commands for you:
@@ -156,11 +123,33 @@ 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
+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.ac`` and possibly ``NEWS``.
+and bump the version numbers in ``main/php_version.h``, ``configure.in`` 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,
@@ -184,30 +173,25 @@ credits files in ext/standard.
 
 9. run: ``PHPROOT=. ./makedist php 5.4.1``, this will export the tag, create configure
 and build three tarballs (gz, bz2 and xz).
-   Check if the pear files are updated (phar).
-   On some systems the behavior of GNU tar can default to produce POSIX compliant archives
-with PAX headers. As not every application is compatible with that format, creation of
-archives with PAX headers should be avoided. When packaging on such a system, the GNU tar
-can be influenced by defining the environment variable TAR_OPTIONS='--format=gnu'.
+Check if the pear files are updated (phar).
 
 10. Generate the GPG signature files for the archives.
   ``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;
-    git fetch;
-    git pull --rebase origin master;
+    git pull origin master;
     cd ..;
     git commit distributions;
     git push;``
 This is to fetch the last commit id from php-distributions.git and commit this
 last commit id to web/php.git, then, mirrors will now sync
 
-12. Once the release has been tagged, contact release managers, windows builders, and package maintainers
-so that they can build releases. Do not send this announcement to any public lists.
+12. Once the release has been tagged, contact the PHP Windows development team
+(internals-win@lists.php.net) so that Windows binaries can be created.
 
 Getting the stable release announced
 ------------------------------------
@@ -265,7 +249,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
@@ -287,8 +271,8 @@ to upgrade.
 10. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 http://news.php.net/php.internals/17222.
-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@
+Please make sure that the mail to php-announce@ is its own completely seperate email.
+This is to make sure that repiles to the announcement on php-general@ or internals@
 will not accidentally hit the php-announce@ mailinglist.
 
 Re-releasing the same version (or -pl)
@@ -325,48 +309,6 @@ to upgrade.
 5. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 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@
+Please make sure that the mail to php-announce@ is its own completely seperate email.
+This is to make sure that repiles to the announcement on php-general@ or internals@
 will not accidentally hit the php-announce@ mailinglist.
-
-Forking a new release branch
-----------------------------
-
-1. One week prior to cutting X.Y.0beta1, warn internals@ that your version's branch
-   is about to be cut, and that PHP-X.Y will be moving into feature freeze.
-   Try to be specific about when the branch will be cut.
-      Example: http://news.php.net/php.internals/99864
-
-2. Just prior to cutting X.Y.0beta1, create the new branch locally.
-   Add a commit on master after the branch point clearing the NEWS file, and updating
-     main/php_versions.h and Zend/zend.h to update versions.
-     Example: https://github.com/php/php-src/commit/5230541ef59e0637d5522293a7d099bf18ce6af3
-   Push the new branch and the commit just added to master.
-
-3. Immediately notify internals@ of the branch cut and advise the new merging order:
-     Example: http://news.php.net/php.internals/99903
-
-4. Update php-web:git.php and wiki.php.net/vcs/gitworkflow to reflect the new branch:
-     Example: https://github.com/php/web-php/commit/74bcad4c770d95f21b7fbeeedbd76d943bb83f23
-
-5. Notify nlopess@ to add PHP_X_Y tag to gcov.php.net
-
-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 edit main/php_version.h. Possibly karma for other restricted parts of
-   php-src might come in question.
-
-4. Request karma for web/qa.git and web/php.git for publishing release announcements.
-
-5. Request moderation access to announce@php.net and primary-qa-tester@lists.php.net lists, to
-   be able to moderate your release announcements. All the announcements should be sent from
-   the @php.net alias.

README.SELF-CONTAINED-EXTENSIONS

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

README.STREAMS

@@ -1,5 +1,6 @@
 An Overview of the PHP Streams abstraction
 ==========================================
+$Id$
 
 WARNING: some prototypes in this file are out of date.
 The information contained here is being integrated into
@@ -27,7 +28,7 @@ The main functions are:
 PHPAPI size_t php_stream_read(php_stream * stream, char * buf, size_t count);
 PHPAPI size_t php_stream_write(php_stream * stream, const char * buf, size_t
         count);
-PHPAPI size_t php_stream_printf(php_stream * stream,
+PHPAPI size_t php_stream_printf(php_stream * stream TSRMLS_DC, 
         const char * fmt, ...);
 PHPAPI int php_stream_eof(php_stream * stream);
 PHPAPI int php_stream_getc(php_stream * stream);
@@ -46,7 +47,7 @@ Opening Streams
 In most cases, you should use this API:
 
 PHPAPI php_stream *php_stream_open_wrapper(const char *path, const char *mode,
-    int options, char **opened_path);
+    int options, char **opened_path TSRMLS_DC);
 
 Where:
     path is the file or resource to open.
@@ -62,7 +63,7 @@ Where:
                            file/URL, use this option to arrange for the stream
                            to be copied (if needed) into a stream that can
                            be seek()ed.
-
+                           
     opened_path is used to return the path of the actual file opened,
     but if you used STREAM_MUST_SEEK, may not be valid.  You are
     responsible for efree()ing opened_path.  opened_path may be (and usually
@@ -79,7 +80,7 @@ PHPAPI php_stream *php_stream_fopen_tmpfile(void);
     Open a FILE * with tmpfile() and convert into a stream.
 
 PHPAPI php_stream *php_stream_fopen_temporary_file(const char *dir,
-    const char *pfx, char **opened_path);
+    const char *pfx, char **opened_path TSRMLS_DC);
     Generate a temporary file name and open it.
 
 There are some network enabled relatives in php_network.h:
@@ -94,7 +95,7 @@ PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short po
 PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent,
     struct timeval *timeout);
     Open a UNIX domain socket.
-
+   
 
 Stream Utilities
 ================
@@ -245,7 +246,7 @@ PHPAPI php_stream * php_stream_fopen(const char * filename, const char * mode)
 {
     FILE * fp = fopen(filename, mode);
     php_stream * ret;
-
+    
     if (fp) {
         ret = php_stream_alloc(&php_stream_stdio_ops, fp, 0, 0, mode);
         if (ret)
@@ -346,7 +347,7 @@ static size_t php_mysqlop_read(php_stream * stream, char * buf, size_t count)
         else
             return 0;
     }
-
+    
     /* pull out some data from the stream and put it in buf */
     ... mysql_fetch_row(state->result) ...
     /* we could do something strange, like format the data as XML here,

README.SUBMITTING_PATCH

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

README.TESTING

@@ -9,7 +9,7 @@ it failed on your system without providing substantial backup information
 on *why* the test failed on your special setup. Thank you :-)
 
 
-[Testing Basics]
+[Testing Basics] 
 ----------------
  The easiest way to test your PHP build is to run "make test" from the
 command line after successfully compiling. This will run the complete
@@ -36,7 +36,7 @@ If you are running the run-tests.php script from the command line (as above)
 you must set the TEST_PHP_EXECUTABLE environment variable to explicitly
 select the PHP executable that is to be tested, that is, used to run the test scripts.
 
-If you run the tests using make test, the PHP CLI and CGI executables are
+If you run the tests using make test, the PHP CLI and CGI executables are 
 automatically set for you. "make test" executes "run-tests.php" script with the CLI binary.  Some
 test scripts such as session must be executed by CGI SAPI. Therefore,
 you must build PHP with CGI SAPI to perform all tests.
@@ -61,8 +61,8 @@ test scripts by extracting all directories named "tests"
 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 'SKIPIF' section. If the test is eligible for execution, the 'FILE'
-section is extracted into a ".php" file (with the same name besides
+the 'SKIP' section. If the test is eligible for execution, the 'FILE'
+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.
 
@@ -179,138 +179,3 @@ $str = "XYZABCD";
 echo substr($str,3,7);
 
 ?>
-
-[IMPORTANT NOTICE]
-------------------
-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,
-or are accessible via HTTP.
-
-[New features]
-----------------
-* Command line interface:
-  You can run 'php server-tests.php -h' to get all the possible options.
-* Configuration file:
-  the -c argument will allow you to use a configuration file.  This is
-  handy if you are testing multiple environments and need various options
-  depending on the environment.
-  see server-tests-config.php for details.
-* CGI Emulation:
-  Will emulate a CGI environment when testing with the cgi sapi executable.
-* HTTP testing:
-  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
-  (see config options TEST_WEB_BASE_URL, TEST_BASE_PATH, and TEST_WEB_EXT)
-* New sections supported for test files (see below)
-
-When running tests over http, tests that require ini settings different that what
-the web server runs under will be skipped.  Since the test harness defines a number
-of ini settings by default, the web server may require special configuration to
-make testing work.
-
-[Example Usage]
-----------------
-Some (but not all!) examples of usage:
-
-1. run tests from the php source directory
-    php server-tests.php -p /path/to/php-cli
-
-2. run tests using cgi emulation
-    php server-tests.php -p /path/to/php-cgi
-
-3. run tests over http, copying test files into document root
-    php server-tests.php -w -u http://localhost/test -m /path/to/htdocs/test
-
-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
-
-6. run tests using configuration file, but overriding some settings:
-   (config file must be first)
-    php server-tests.php -c /path/to/server-tests-config.php -w -t 3 -d /path/to/testdir
-
-NOTE: configuration as described in README.TESTING still works.
-
-[New Test Sections]
-----------------
-In addition to the traditional test sections
-(see http://qa.php.net/write-test.php), several new sections are available
-under server-tests.
-
---POST--
-This is not a new section, but not multipart posts are supported for testing
-file uploads, or other types of POST data.
-
---CGI--
-This section takes no value.  It merely provides a simple marker for tests
-that MUST be run as CGI, even if there is no --POST-- or --GET-- sections
-in the test file.
-
---DESCRIPTION--
-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
-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:
-
-  --ENV--
-  return <<<END
-  PATH_TRANSLATED=$filename
-  PATH_INFO=$scriptname
-  SCRIPT_NAME=$scriptname
-  END;
-
-Some variables are made easily available for use in this section, they
-include:
-  $filename     full native path to file, will become PATH_TRANSLATED
-  $filepath     =dirname($filename)
-  $scriptname   this is what will become SCRIPT_NAME unless you override it
-  $docroot      the equivalent of DOCUMENT_ROOT under Apache
-  $cwd          the directory that the test is being initiated from
-  $this->conf   all server-tests configuration vars
-  $this->env    all environment variables that will get passed to the test
-
-
---REQUEST--
-This section is also eval'd, and is similar in nature to --ENV--.  However,
-this section is used to build the url used in an HTTP request.  Valid values
-to set in this section would include:
-  SCRIPT_NAME   The initial part of the request url
-  PATH_INFO     The pathinfo part of a request url
-  FRAGMENT      The fragment section of a url (after #)
-  QUERY_STRING  The query part of a url (after ?)
-
-  --REQUEST--
-  return <<<END
-  PATH_INFO=/path/info
-  END;
-
---HEADERS--
-This section is also eval'd.  It is used to provide additional headers sent
-in an HTTP request, such as content type for multipart posts, cookies, etc.
-
-  --HEADERS--
-  return <<<END
-  Content-Type=multipart/form-data; boundary=---------------------------240723202011929
-  Content-Length=100
-  END;
-
---EXPECTHEADERS--
-This section can be used to define what headers are required to be
-received back from a request, and is checked in addition to the
-regular expect sections.  For example:
-
-  --EXPECTHEADERS--
-  Status: 404

README.TESTING2

@@ -0,0 +1,137 @@
+[IMPORTANT NOTICE]
+------------------
+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, 
+or are accessible via HTTP.
+
+[New features]
+----------------
+* Command line interface:
+  You can run 'php server-tests.php -h' to get all the possible options.
+* Configuration file:
+  the -c argument will allow you to use a configuration file.  This is
+  handy if you are testing multiple environments and need various options
+  depending on the environment.
+  see server-tests-config.php for details.
+* CGI Emulation:
+  Will emulate a CGI environment when testing with the cgi sapi executable.
+* HTTP testing:
+  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 
+  (see config options TEST_WEB_BASE_URL, TEST_BASE_PATH, and TEST_WEB_EXT)
+* New sections supported for test files (see below)
+
+When running tests over http, tests that require ini settings different that what
+the web server runs under will be skipped.  Since the test harness defines a number
+of ini settings by default, the web server may require special configuration to
+make testing work.
+
+[Example Usage]
+----------------
+Some (but not all!) examples of usage:
+
+1. run tests from the php source directory
+    php server-tests.php -p /path/to/php-cli
+
+2. run tests using cgi emulation
+    php server-tests.php -p /path/to/php-cgi
+
+3. run tests over http, copying test files into document root
+    php server-tests.php -w -u http://localhost/test -m /path/to/htdocs/test
+
+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
+
+6. run tests using configuration file, but overriding some settings:
+   (config file must be first)
+    php server-tests.php -c /path/to/server-tests-config.php -w -t 3 -d /path/to/testdir
+
+NOTE: configuration as described in README.TESTING still works.
+
+[New Test Sections] 
+----------------
+In addition to the traditional test sections 
+(see http://qa.php.net/write-test.php), several new sections are available 
+under server-tests.
+
+--POST--
+This is not a new section, but not multipart posts are supported for testing
+file uploads, or other types of POST data.
+
+--CGI--
+This section takes no value.  It merely provides a simple marker for tests
+that MUST be run as CGI, even if there is no --POST-- or --GET-- sections
+in the test file.
+
+--DESCRIPTION--
+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 
+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:
+
+  --ENV--
+  return <<<END
+  PATH_TRANSLATED=$filename
+  PATH_INFO=$scriptname
+  SCRIPT_NAME=$scriptname
+  END;
+
+Some variables are made easily available for use in this section, they
+include:
+  $filename     full native path to file, will become PATH_TRANSLATED
+  $filepath     =dirname($filename)
+  $scriptname   this is what will become SCRIPT_NAME unless you override it
+  $docroot      the equivalent of DOCUMENT_ROOT under Apache
+  $cwd          the directory that the test is being initiated from
+  $this->conf   all server-tests configuration vars
+  $this->env    all environment variables that will get passed to the test
+
+
+--REQUEST--
+This section is also eval'd, and is similar in nature to --ENV--.  However,
+this section is used to build the url used in an HTTP request.  Valid values
+to set in this section would include:
+  SCRIPT_NAME   The initial part of the request url
+  PATH_INFO     The pathinfo part of a request url
+  FRAGMENT      The fragment section of a url (after #)
+  QUERY_STRING  The query part of a url (after ?)
+
+  --REQUEST--
+  return <<<END
+  PATH_INFO=/path/info
+  END;
+
+--HEADERS--
+This section is also eval'd.  It is used to provide additional headers sent
+in an HTTP request, such as content type for multipart posts, cookies, etc.
+
+  --HEADERS--
+  return <<<END
+  Content-Type=multipart/form-data; boundary=---------------------------240723202011929
+  Content-Length=100
+  END;
+
+--EXPECTHEADERS--
+This section can be used to define what headers are required to be
+received back from a request, and is checked in addition to the
+regular expect sections.  For example:
+
+  --EXPECTHEADERS--
+  Status: 404
+
+
+

README.WIN32-BUILD-SYSTEM

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

README.input_filter

@@ -12,7 +12,7 @@ enforced.  It is implemented as a SAPI hook and is called from the
 treat_data and post handler functions.  To implement your own security
 policy you will need to write a standard PHP extension.  There is also
 a powerful standard implementation in ext/filter that should suit most
-peoples' needs.  However, if you want to implement your own security
+peoples' needs.  However, if you want to implement your own security 
 policy, read on.
 
 A simple implementation might look like the following.  This stores the
@@ -86,6 +86,7 @@ PHP_MINFO_FUNCTION(my_input_filter)
 {
     php_info_print_table_start();
     php_info_print_table_row( 2, "My Input Filter Support", "enabled" );
+    php_info_print_table_row( 2, "Revision", "$Id$");
     php_info_print_table_end();
 }
 
@@ -137,7 +138,7 @@ SAPI_INPUT_FILTER_FUNC(my_sapi_input_filter)
     strcpy(raw_var, "RAW_");
     strlcat(raw_var,var,var_len+5);
 
-    php_register_variable_ex(raw_var, &new_var, array_ptr);
+    php_register_variable_ex(raw_var, &new_var, array_ptr TSRMLS_DC);
 
     php_strip_tags(*val, val_len, NULL, NULL, 0);
 
@@ -153,7 +154,7 @@ PHP_FUNCTION(my_get_raw)
     zval **tmp;
     zval *array_ptr = NULL;
 
-    if(zend_parse_parameters(2, "ls", &arg, &var, &var_len) == FAILURE) {
+    if(zend_parse_parameters(2 TSRMLS_CC, "ls", &arg, &var, &var_len) == FAILURE) {
         return;
     }
 

README.md

@@ -2,16 +2,15 @@ The PHP Interpreter
 ===================
 
 This is the github mirror of the official PHP repository located at
-https://git.php.net.
+http://git.php.net.
 
 [![Build Status](https://secure.travis-ci.org/php/php-src.svg?branch=master)](http://travis-ci.org/php/php-src)
-[![Build status](https://ci.appveyor.com/api/projects/status/meyur6fviaxgdwdy?svg=true)](https://ci.appveyor.com/project/php/php-src)
 
 Pull Requests
 =============
 PHP accepts pull requests via github. Discussions are done on github, but
 depending on the topic can also be relayed to the official PHP developer
-mailing list internals@lists.php.net.
+mailinglist internals@lists.php.net.
 
 New features require an RFC and must be accepted by the developers.
 See https://wiki.php.net/rfc and https://wiki.php.net/rfc/voting for more
@@ -28,7 +27,7 @@ open a ticket at https://bugs.php.net and reference the bug id using #NNNNNN.
     time. The patch removes this warning
 
 We do not merge pull requests directly on github. All PRs will be
-pulled and pushed through https://git.php.net.
+pulled and pushed through http://git.php.net.
 
 
 Guidelines for contributors
@@ -37,3 +36,4 @@ Guidelines for contributors
 - [README.GIT-RULES](/README.GIT-RULES)
 - [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES)
 - [README.RELEASE_PROCESS](/README.RELEASE_PROCESS)
+

README.namespaces

@@ -0,0 +1,174 @@
+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?
+

TSRM/TODO

@@ -0,0 +1,2 @@
+- Improve the lock in ts_resource_ex() in order to cover less code.
+  This can probably be done by more careful hash table access

TSRM/TSRM.c

@@ -6,7 +6,7 @@
    | This source file is subject to the TSRM license, that is bundled     |
    | with this package in the file LICENSE                                |
    +----------------------------------------------------------------------+
-   | Authors:  Zeev Suraski <zeev@php.net>                                |
+   | Authors:  Zeev Suraski <zeev@zend.com>                               |
    +----------------------------------------------------------------------+
 */
 
@@ -55,9 +55,8 @@ 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 = NULL;
-static tsrm_thread_end_func_t tsrm_new_thread_end_handler = NULL;
-static tsrm_shutdown_func_t tsrm_shutdown_handler = NULL;
+static tsrm_thread_begin_func_t tsrm_new_thread_begin_handler;
+static tsrm_thread_end_func_t tsrm_new_thread_end_handler;
 
 /* Debug support */
 int tsrm_error(int level, const char *format, ...);
@@ -94,12 +93,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))
@@ -115,20 +109,22 @@ static DWORD tls_key;
 # define tsrm_tls_set(what)		TlsSetValue(tls_key, (void*)(what))
 # define tsrm_tls_get()			TlsGetValue(tls_key)
 
+#elif defined(BETHREADS)
+static int32 tls_key;
+# define tsrm_tls_set(what)		tls_set(tls_key, (void*)(what))
+# define tsrm_tls_get()			(tsrm_tls_entry*)tls_get(tls_key)
+
 #else
 # define tsrm_tls_set(what)
 # define tsrm_tls_get()			NULL
 # 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)
@@ -136,11 +132,10 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu
 	st_key_create(&tls_key, 0);
 #elif defined(TSRM_WIN32)
 	tls_key = TlsAlloc();
+#elif defined(BETHREADS)
+	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;
@@ -163,21 +158,18 @@ 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;
@@ -220,18 +212,12 @@ 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));
@@ -244,15 +230,13 @@ TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate
 
 	/* store the new resource type in the resource sizes table */
 	if (resource_types_table_size < id_count) {
-		tsrm_resource_type *_tmp;
-		_tmp = (tsrm_resource_type *) realloc(resource_types_table, sizeof(tsrm_resource_type)*id_count);
-		if (!_tmp) {
+		resource_types_table = (tsrm_resource_type *) realloc(resource_types_table, sizeof(tsrm_resource_type)*id_count);
+		if (!resource_types_table) {
 			tsrm_mutex_unlock(tsmm_mutex);
 			TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate storage for resource"));
 			*rsrc_id = 0;
 			return 0;
 		}
-		resource_types_table = _tmp;
 		resource_types_table_size = id_count;
 	}
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].size = size;
@@ -284,11 +268,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));
@@ -324,16 +308,25 @@ 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
@@ -387,12 +380,15 @@ 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;
 
@@ -411,10 +407,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();
@@ -427,12 +423,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;
 
@@ -446,12 +442,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();
@@ -488,12 +484,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();
@@ -534,12 +530,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);
 
@@ -568,7 +564,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));
-}/*}}}*/
+}
 
 
 
@@ -579,22 +575,28 @@ 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)
 	return pth_self();
 #elif defined(PTHREADS)
 	return pthread_self();
+#elif defined(NSAPI)
+	return systhread_current();
+#elif defined(PI3WEB)
+	return PIThread_getCurrent();
 #elif defined(TSRM_ST)
 	return st_thread_self();
+#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));
@@ -605,19 +607,27 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 #elif defined(PTHREADS)
 	mutexp = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t));
 	pthread_mutex_init(mutexp,NULL);
+#elif defined(NSAPI)
+	mutexp = crit_init();
+#elif defined(PI3WEB)
+	mutexp = PIPlatform_allocLocalMutex();
 #elif defined(TSRM_ST)
 	mutexp = st_mutex_new();
+#elif defined(BETHREADS)
+	mutexp = (beos_ben*)malloc(sizeof(beos_ben));
+	mutexp->ben = 0;
+	mutexp->sem = create_sem(1, "PHP sempahore");
 #endif
 #ifdef THR_DEBUG
 	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);
@@ -627,14 +637,21 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 #elif defined(PTHREADS)
 		pthread_mutex_destroy(mutexp);
 		free(mutexp);
+#elif defined(NSAPI)
+		crit_terminate(mutexp);
+#elif defined(PI3WEB)
+		PISync_delete(mutexp);
 #elif defined(TSRM_ST)
 		st_mutex_destroy(mutexp);
+#elif defined(BETHREADS)
+		delete_sem(mutexp->sem);
+		free(mutexp);
 #endif
 	}
 #ifdef THR_DEBUG
 	printf("Mutex freed thread: %d\n",mythreadid());
 #endif
-}/*}}}*/
+}
 
 
 /*
@@ -642,7 +659,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);
@@ -654,10 +671,19 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 	return -1;
 #elif defined(PTHREADS)
 	return pthread_mutex_lock(mutexp);
+#elif defined(NSAPI)
+	crit_enter(mutexp);
+	return 0;
+#elif defined(PI3WEB)
+	return PISync_lock(mutexp);
 #elif defined(TSRM_ST)
 	return st_mutex_lock(mutexp);
+#elif defined(BETHREADS)
+	if (atomic_add(&mutexp->ben, 1) != 0)
+		return acquire_sem(mutexp->sem);
+	return 0;
 #endif
-}/*}}}*/
+}
 
 
 /*
@@ -665,7 +691,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);
@@ -677,17 +703,26 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 	return -1;
 #elif defined(PTHREADS)
 	return pthread_mutex_unlock(mutexp);
+#elif defined(NSAPI)
+	crit_exit(mutexp);
+	return 0;
+#elif defined(PI3WEB)
+	return PISync_unlock(mutexp);
 #elif defined(TSRM_ST)
 	return st_mutex_unlock(mutexp);
+#elif defined(BETHREADS)
+	if (atomic_add(&mutexp->ben, -1) != 1)
+		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
@@ -695,36 +730,28 @@ 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
@@ -732,7 +759,7 @@ TSRM_API void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler)
 
 #if TSRM_DEBUG
 int tsrm_error(int level, const char *format, ...)
-{/*{{{*/
+{
 	if (level<=tsrm_error_level) {
 		va_list args;
 		int size;
@@ -747,12 +774,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
@@ -769,40 +796,11 @@ 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;
-}/*}}}*/
-
-TSRM_API const char *tsrm_api_name(void)
-{/*{{{*/
-#if defined(GNUPTH)
-	return "GNU Pth";
-#elif defined(PTHREADS)
-	return "POSIX Threads";
-#elif defined(TSRM_ST)
-	return "State Threads";
-#elif defined(TSRM_WIN32)
-	return "Windows Threads";
-#else
-	return "Unknown";
-#endif
-}/*}}}*/
+}
 
 #endif /* ZTS */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/TSRM.h

@@ -6,7 +6,7 @@
    | This source file is subject to the TSRM license, that is bundled     |
    | with this package in the file LICENSE                                |
    +----------------------------------------------------------------------+
-   | Authors:  Zeev Suraski <zeev@php.net>                                |
+   | Authors:  Zeev Suraski <zeev@zend.com>                               |
    +----------------------------------------------------------------------+
 */
 
@@ -69,9 +69,22 @@ typedef int ts_rsrc_id;
 #elif defined(PTHREADS)
 # define THREAD_T pthread_t
 # define MUTEX_T pthread_mutex_t *
+#elif defined(NSAPI)
+# define THREAD_T SYS_THREAD
+# define MUTEX_T CRITICAL
+#elif defined(PI3WEB)
+# define THREAD_T PIThread *
+# define MUTEX_T PISync *
 #elif defined(TSRM_ST)
 # define THREAD_T st_thread_t
 # define MUTEX_T st_mutex_t
+#elif defined(BETHREADS)
+# define THREAD_T thread_id
+typedef struct {
+  sem_id sem;
+  int32 ben;
+} beos_ben;
+# define MUTEX_T beos_ben *
 #endif
 
 #ifdef HAVE_SIGNAL_H
@@ -115,7 +128,6 @@ 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, ...);
@@ -133,7 +145,6 @@ 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. */
@@ -142,17 +153,11 @@ 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);
-TSRM_API const char *tsrm_api_name(void);
 
-#if defined(__cplusplus) && __cplusplus > 199711L
-# define TSRM_TLS thread_local
+#ifdef TSRM_WIN32
+# define TSRM_TLS __declspec(thread)
 #else
-# ifdef TSRM_WIN32
-#  define TSRM_TLS __declspec(thread)
-# else
-#  define TSRM_TLS __thread
-# endif
+# define TSRM_TLS __thread
 #endif
 
 #define TSRM_SHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)+1)
@@ -165,14 +170,12 @@ TSRM_API const char *tsrm_api_name(void);
 
 #define TSRMG_STATIC(id, type, element)	(TSRMG_BULK_STATIC(id, type)->element)
 #define TSRMG_BULK_STATIC(id, type)	((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
-#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
-#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
+#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE
+#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL
 #if ZEND_DEBUG
 #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
-#define TSRMLS_CACHE_RESET()
 #else
 #define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
-#define TSRMLS_CACHE_RESET()  TSRMLS_CACHE = NULL
 #endif
 #define TSRMLS_CACHE _tsrm_ls_cache
 
@@ -210,12 +213,3 @@ TSRM_API const char *tsrm_api_name(void);
 #endif /* ZTS */
 
 #endif /* TSRM_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/acinclude.m4

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

TSRM/build.mk

@@ -4,6 +4,9 @@
 #        make -f build.mk
 #
 # Written by Sascha Schumann
+#
+# $Id$ 
+
 
 LT_TARGETS = ltmain.sh ltconfig
 
@@ -27,14 +30,14 @@ $(LT_TARGETS):
 $(makefile_in_files): $(makefile_am_files)
 	automake -a -i $(AMFLAGS) $(makefile_files)
 
-aclocal.m4: configure.ac acinclude.m4
+aclocal.m4: configure.in acinclude.m4
 	aclocal
 
-$(config_h_in): configure.ac
-# explicitly remove target since autoheader does not seem to work
+$(config_h_in): configure.in
+# explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
 	autoheader
 
-configure: aclocal.m4 configure.ac
+configure: aclocal.m4 configure.in
 	autoconf

TSRM/config.w32

@@ -1,4 +1,6 @@
 // vim:ft=javascript
+// $Id$
 
 ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_win32.c");
 ADD_FLAG("CFLAGS_BD_TSRM", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+

TSRM/configure.ac

@@ -1,35 +0,0 @@
-dnl
-dnl Minimalistic configure.ac for TSRM.
-dnl
-
-AC_INIT(TSRM.c)
-AM_INIT_AUTOMAKE(TSRM, 1.0, nodefine)
-AM_CONFIG_HEADER(tsrm_config.h)
-
-AH_TOP([
-#undef PTHREADS
-])
-
-sinclude(tsrm.m4)
-
-TSRM_BASIC_CHECKS
-TSRM_THREADS_CHECKS
-
-AM_PROG_LIBTOOL
-if test "$enable_debug" != "yes"; then
-  AM_SET_LIBTOOL_VARIABLE([--silent])
-fi
-
-dnl TSRM_PTHREAD
-
-AC_CHECK_HEADERS(
-utime.h \
-dirent.h \
-stdarg.h \
-alloca.h \
-unistd.h \
-limits.h
-)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT

TSRM/configure.in

@@ -0,0 +1,35 @@
+dnl $Id$
+dnl
+dnl Minimalistic configure.in for TSRM.
+dnl
+
+AC_INIT(TSRM.c)
+AM_INIT_AUTOMAKE(TSRM, 1.0, nodefine)
+AM_CONFIG_HEADER(tsrm_config.h)
+
+AH_TOP([
+#undef PTHREADS
+])
+
+sinclude(tsrm.m4)
+	
+TSRM_BASIC_CHECKS
+TSRM_THREADS_CHECKS
+	
+AM_PROG_LIBTOOL
+if test "$enable_debug" != "yes"; then
+  AM_SET_LIBTOOL_VARIABLE([--silent])
+fi
+
+dnl TSRM_PTHREAD
+
+AC_CHECK_HEADERS(
+utime.h \
+dirent.h \
+stdarg.h \
+alloca.h \
+unistd.h \
+limits.h
+)
+
+AC_OUTPUT(Makefile)

TSRM/m4/ax_func_which_gethostbyname_r.m4

@@ -1,196 +0,0 @@
-# ==================================================================================
-#  https://www.gnu.org/software/autoconf-archive/ax_func_which_gethostbyname_r.html
-# ==================================================================================
-#
-# SYNOPSIS
-#
-#   AX_FUNC_WHICH_GETHOSTBYNAME_R
-#
-# DESCRIPTION
-#
-#   Determines which historical variant of the gethostbyname_r() call
-#   (taking three, five, or six arguments) is available on the system and
-#   defines one of the following macros accordingly:
-#
-#     HAVE_FUNC_GETHOSTBYNAME_R_6
-#     HAVE_FUNC_GETHOSTBYNAME_R_5
-#     HAVE_FUNC_GETHOSTBYNAME_R_3
-#
-#   as well as
-#
-#     HAVE_GETHOSTBYNAME_R
-#
-#   If used in conjunction with gethostname.c, the API demonstrated in
-#   test.c can be used regardless of which gethostbyname_r() is available.
-#   These example files can be found at
-#   http://www.csn.ul.ie/~caolan/publink/gethostbyname_r
-#
-#   based on David Arnold's autoconf suggestion in the threads faq
-#
-#   Originally named "AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten for
-#   Autoconf 2.5x, and updated for 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Caolan McNamara <caolan@skynet.ie>
-#   Copyright (c) 2008 Daniel Richard G. <skunk@iskunk.org>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 8
-
-AC_DEFUN([AX_FUNC_WHICH_GETHOSTBYNAME_R], [
-
-    AC_LANG_PUSH([C])
-    AC_MSG_CHECKING([how many arguments gethostbyname_r() takes])
-
-    AC_CACHE_VAL([ac_cv_func_which_gethostbyname_r], [
-
-################################################################
-
-ac_cv_func_which_gethostbyname_r=unknown
-
-#
-# ONE ARGUMENT (sanity check)
-#
-
-# This should fail, as there is no variant of gethostbyname_r() that takes
-# a single argument. If it actually compiles, then we can assume that
-# netdb.h is not declaring the function, and the compiler is thereby
-# assuming an implicit prototype. In which case, we're out of luck.
-#
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
-        [
-            char *name = "www.gnu.org";
-            (void)gethostbyname_r(name) /* ; */
-        ])],
-    [ac_cv_func_which_gethostbyname_r=no])
-
-#
-# SIX ARGUMENTS
-# (e.g. Linux)
-#
-
-if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
-
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
-        [
-            char *name = "www.gnu.org";
-            struct hostent ret, *retp;
-            char buf@<:@1024@:>@;
-            int buflen = 1024;
-            int my_h_errno;
-            (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
-        ])],
-    [ac_cv_func_which_gethostbyname_r=six])
-
-fi
-
-#
-# FIVE ARGUMENTS
-# (e.g. Solaris)
-#
-
-if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
-
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
-        [
-            char *name = "www.gnu.org";
-            struct hostent ret;
-            char buf@<:@1024@:>@;
-            int buflen = 1024;
-            int my_h_errno;
-            (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
-        ])],
-    [ac_cv_func_which_gethostbyname_r=five])
-
-fi
-
-#
-# THREE ARGUMENTS
-# (e.g. AIX, HP-UX, Tru64)
-#
-
-if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
-
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
-        [
-            char *name = "www.gnu.org";
-            struct hostent ret;
-            struct hostent_data data;
-            (void)gethostbyname_r(name, &ret, &data) /* ; */
-        ])],
-    [ac_cv_func_which_gethostbyname_r=three])
-
-fi
-
-################################################################
-
-]) dnl end AC_CACHE_VAL
-
-case "$ac_cv_func_which_gethostbyname_r" in
-    three|five|six)
-    AC_DEFINE([HAVE_GETHOSTBYNAME_R], [1],
-              [Define to 1 if you have some form of gethostbyname_r().])
-    ;;
-esac
-
-case "$ac_cv_func_which_gethostbyname_r" in
-    three)
-    AC_MSG_RESULT([three])
-    AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_3], [1],
-              [Define to 1 if you have the three-argument form of gethostbyname_r().])
-    ;;
-
-    five)
-    AC_MSG_RESULT([five])
-    AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_5], [1],
-              [Define to 1 if you have the five-argument form of gethostbyname_r().])
-    ;;
-
-    six)
-    AC_MSG_RESULT([six])
-    AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_6], [1],
-              [Define to 1 if you have the six-argument form of gethostbyname_r().])
-    ;;
-
-    no)
-    AC_MSG_RESULT([cannot find function declaration in netdb.h])
-    ;;
-
-    unknown)
-    AC_MSG_RESULT([can't tell])
-    ;;
-
-    *)
-    AC_MSG_ERROR([internal error])
-    ;;
-esac
-
-AC_LANG_POP
-
-]) dnl end AC_DEFUN

TSRM/readdir.h

@@ -1,3 +1,45 @@
-/* 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"
+#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 */

TSRM/threads.m4

@@ -1,17 +1,17 @@
 dnl  Copyright (c) 1999, 2000 Sascha Schumann. All rights reserved.
-dnl
+dnl 
 dnl  Redistribution and use in source and binary forms, with or without
 dnl  modification, are permitted provided that the following conditions
 dnl  are met:
-dnl
+dnl 
 dnl  1. Redistributions of source code must retain the above copyright
 dnl     notice, this list of conditions and the following disclaimer.
-dnl
+dnl 
 dnl  2. Redistributions in binary form must reproduce the above copyright
 dnl     notice, this list of conditions and the following disclaimer in
 dnl     the documentation and/or other materials provided with the
 dnl     distribution.
-dnl
+dnl 
 dnl  THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY
 dnl  EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 dnl  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -66,7 +66,7 @@ dnl
 dnl Check whether the current setup can use POSIX threads calls
 dnl
 AC_DEFUN([PTHREADS_CHECK_COMPILE], [
-AC_LINK_IFELSE([ AC_LANG_SOURCE([
+AC_TRY_RUN( [
 #include <pthread.h>
 #include <stddef.h>
 
@@ -80,11 +80,18 @@ int main() {
     int data = 1;
     pthread_mutexattr_init(&mattr);
     return pthread_create(&thd, NULL, thread_routine, &data);
-} ]) ], [
-  pthreads_checked=yes
+} ], [
+  pthreads_working=yes
   ], [
-  pthreads_checked=no
-  ]
+  pthreads_working=no
+  ], [
+  dnl For cross compiling running this test is of no use. NetWare supports pthreads
+  pthreads_working=no
+  case $host_alias in
+  *netware*)
+    pthreads_working=yes
+  esac
+]
 ) ] )dnl
 dnl
 dnl PTHREADS_CHECK()
@@ -97,44 +104,49 @@ 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
 AC_DEFUN([PTHREADS_CHECK],[
 
-save_CFLAGS=$CFLAGS
-save_LIBS=$LIBS
-PTHREADS_ASSIGN_VARS
-PTHREADS_CHECK_COMPILE
-LIBS=$save_LIBS
-CFLAGS=$save_CFLAGS
+if test "$beos_threads" = "1"; then
+  pthreads_working="yes"
+  ac_cv_pthreads_cflags=""
+else
+  save_CFLAGS=$CFLAGS
+  save_LIBS=$LIBS
+  PTHREADS_ASSIGN_VARS
+  PTHREADS_CHECK_COMPILE
+  LIBS=$save_LIBS
+  CFLAGS=$save_CFLAGS
 
-AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[
-ac_cv_pthreads_cflags=
-if test "$pthreads_working" != "yes"; then
-  for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
-    ac_save=$CFLAGS
-    CFLAGS="$CFLAGS $flag"
-    PTHREADS_CHECK_COMPILE
-    CFLAGS=$ac_save
-    if test "$pthreads_checked" = "yes"; then
-      ac_cv_pthreads_cflags=$flag
-      break
-    fi
-  done
+  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 
+      ac_save=$CFLAGS
+      CFLAGS="$CFLAGS $flag"
+      PTHREADS_CHECK_COMPILE
+      CFLAGS=$ac_save
+      if test "$pthreads_working" = "yes"; then
+        ac_cv_pthreads_cflags=$flag
+        break
+      fi
+    done
+  fi
 fi
 ])
 
 AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
 ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
- for lib in pthread pthreads c_r; do
+  for lib in pthread pthreads c_r; do
     ac_save=$LIBS
     LIBS="$LIBS -l$lib"
     PTHREADS_CHECK_COMPILE
     LIBS=$ac_save
-    if test "$pthreads_checked" = "yes"; then
+    if test "$pthreads_working" = "yes"; then
       ac_cv_pthreads_lib=$lib
       break
     fi
@@ -142,10 +154,6 @@ if test "$pthreads_working" != "yes"; then
 fi
 ])
 
-if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
-  pthreads_working="yes"
-fi
-
 if test "$pthreads_working" = "yes"; then
   threads_result="POSIX-Threads found"
 else

TSRM/tsrm.m4

@@ -1,4 +1,25 @@
-m4_include([TSRM/m4/ax_func_which_gethostbyname_r.m4])
+
+dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
+AC_DEFUN([TSRM_CHECK_GCC_ARG],[
+  gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
+  AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
+  echo 'void somefunc() { };' > conftest.c
+  cmd='$CC $1 -c conftest.c'
+  if eval $cmd 2>&1 | egrep -e $1 >/dev/null ; then
+    ac_result=no
+  else
+    ac_result=yes
+  fi
+  eval $gcc_arg_name=$ac_result
+  rm -f conftest.*
+  ])
+  if eval test "\$$gcc_arg_name" = "yes"; then
+    $2
+  else
+    :
+    $3
+  fi
+])
 
 AC_DEFUN([TSRM_BASIC_CHECKS],[
 
@@ -11,8 +32,6 @@ AC_CHECK_HEADERS(stdarg.h)
 
 AC_CHECK_FUNCS(sigprocmask)
 
-AX_FUNC_WHICH_GETHOSTBYNAME_R()
-
 ])
 
 
@@ -53,19 +72,24 @@ AC_DEFUN([TSRM_CHECK_ST],[
 sinclude(threads.m4)
 
 AC_DEFUN([TSRM_CHECK_PTHREADS],[
-
+		
 PTHREADS_CHECK
 
-if test "$pthreads_working" != "yes"; then
-  AC_MSG_ERROR(Your system seems to lack POSIX threads.)
+if test "$beos_threads" = "1"; then 
+  AC_DEFINE(BETHREADS, 1, Whether to use native BeOS threads)
+else		
+  if test "$pthreads_working" != "yes"; then
+    AC_MSG_ERROR(Your system seems to lack POSIX threads.)
+  fi
+
+  AC_DEFINE(PTHREADS, 1, Whether to use Pthreads)
+
+  AC_MSG_CHECKING(for POSIX threads)
+  AC_MSG_RESULT(yes)
 fi
-
-AC_DEFINE(PTHREADS, 1, Whether to use Pthreads)
-
-AC_MSG_CHECKING(for POSIX threads)
-AC_MSG_RESULT(yes)
 ])
 
+
 AC_DEFUN([TSRM_THREADS_CHECKS],[
 
 dnl For the thread implementations, we always use --with-*

TSRM/tsrm_config.w32.h

@@ -6,18 +6,10 @@
 
 #define HAVE_UTIME 1
 #define HAVE_ALLOCA 1
+#define HAVE_REALPATH 1
 
 #include <malloc.h>
 #include <stdlib.h>
 #include <crtdbg.h>
 
 #endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/tsrm_config_common.h

@@ -25,7 +25,9 @@
 #pragma alloca
 #  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
+#    ifndef NETWARE
 char *alloca ();
+#    endif
 #   endif
 #  endif
 # endif
@@ -40,10 +42,7 @@ char *alloca ();
 #endif
 
 #ifndef MAXPATHLEN
-# if _WIN32
-#  include "win32/ioutil.h"
-#  define MAXPATHLEN PHP_WIN32_IOUTIL_MAXPATHLEN
-# elif PATH_MAX
+# ifdef PATH_MAX
 #  define MAXPATHLEN PATH_MAX
 # elif defined(MAX_PATH)
 #  define MAXPATHLEN MAX_PATH
@@ -69,12 +68,3 @@ char *alloca ();
 #endif
 
 #endif /* TSRM_CONFIG_COMMON_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/tsrm_nw.c

@@ -0,0 +1,240 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 7                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2015 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 */

TSRM/tsrm_nw.h

@@ -0,0 +1,29 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 7                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2015 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>                   |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef TSRM_NW_H
+#define TSRM_NW_H
+
+#include "TSRM.h"
+
+TSRM_API FILE* popen(const char *command, const char *type);
+TSRM_API int pclose(FILE* stream);
+
+#endif

TSRM/tsrm_strtok_r.c

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

TSRM/tsrm_win32.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2015 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        |
@@ -16,6 +16,8 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <io.h>
@@ -31,7 +33,6 @@
 #include <Sddl.h>
 #include "tsrm_win32.h"
 #include "zend_virtual_cwd.h"
-#include "win32/ioutil.h"
 
 #ifdef ZTS
 static ts_rsrc_id win32_globals_id;
@@ -40,7 +41,7 @@ static tsrm_win32_globals win32_globals;
 #endif
 
 static void tsrm_win32_ctor(tsrm_win32_globals *globals)
-{/*{{{*/
+{
 #ifdef ZTS
 TSRMLS_CACHE_UPDATE();
 #endif
@@ -59,10 +60,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) {
@@ -87,48 +88,51 @@ static void tsrm_win32_dtor(tsrm_win32_globals *globals)
 	if (globals->impersonation_token_sid) {
 		free(globals->impersonation_token_sid);
 	}
-}/*}}}*/
+}
 
 TSRM_API void tsrm_win32_startup(void)
-{/*{{{*/
+{
 #ifdef ZTS
 	ts_allocate_id(&win32_globals_id, sizeof(tsrm_win32_globals), (ts_allocate_ctor)tsrm_win32_ctor, (ts_allocate_ctor)tsrm_win32_dtor);
 #else
 	tsrm_win32_ctor(&win32_globals);
 #endif
-}/*}}}*/
+}
 
 TSRM_API void tsrm_win32_shutdown(void)
-{/*{{{*/
+{
 #ifndef ZTS
 	tsrm_win32_dtor(&win32_globals);
 #endif
-}/*}}}*/
+}
 
-char * tsrm_win32_get_path_sid_key(const char *pathname, size_t pathname_len, size_t *key_len)
-{/*{{{*/
+char * tsrm_win32_get_path_sid_key(const char *pathname)
+{
 	PSID pSid = TWG(impersonation_token_sid);
-	char *ptcSid = NULL;
+	TCHAR *ptcSid = NULL;
 	char *bucket_key = NULL;
-	size_t ptc_sid_len;
+	size_t ptc_sid_len, pathname_len;
+
+	pathname_len = strlen(pathname);
 
 	if (!pSid) {
-		*key_len = pathname_len;
-		return pathname;
+		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;
 	}
 
 	if (!ConvertSidToStringSid(pSid, &ptcSid)) {
-		*key_len = 0;
 		return NULL;
 	}
 
 
 	ptc_sid_len = strlen(ptcSid);
-	*key_len = pathname_len + ptc_sid_len;
-	bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *key_len + 1);
+	bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pathname_len + ptc_sid_len + 1);
 	if (!bucket_key) {
 		LocalFree(ptcSid);
-		*key_len = 0;
 		return NULL;
 	}
 
@@ -137,11 +141,11 @@ char * tsrm_win32_get_path_sid_key(const char *pathname, size_t pathname_len, si
 
 	LocalFree(ptcSid);
 	return bucket_key;
-}/*}}}*/
+}
 
 
 PSID tsrm_win32_get_token_sid(HANDLE hToken)
-{/*{{{*/
+{
 	DWORD dwLength = 0;
 	PTOKEN_USER pTokenUser = NULL;
 	DWORD sid_len;
@@ -188,10 +192,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;
@@ -205,175 +209,182 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 	BOOL fAccess = FALSE;
 
 	realpath_cache_bucket * bucket = NULL;
-	char real_path[MAXPATHLEN] = {0};
+	char * real_path = NULL;
 
-	if(!IS_ABSOLUTE_PATH(pathname, strlen(pathname)+1)) {
-		if(tsrm_realpath(pathname, real_path) == NULL) {
-			SET_ERRNO_FROM_WIN32_CODE(ERROR_FILE_NOT_FOUND);
-			return -1;
+	if (mode == 1 /*X_OK*/) {
+		DWORD type;
+		return GetBinaryType(pathname, &type) ? 0 : -1;
+	} else {
+		if(!IS_ABSOLUTE_PATH(pathname, strlen(pathname)+1)) {
+			real_path = (char *)malloc(MAX_PATH);
+			if(tsrm_realpath(pathname, real_path) == NULL) {
+				goto Finished;
+			}
+			pathname = real_path;
+ 		}
+
+		if(access(pathname, mode)) {
+			free(real_path);
+			return errno;
 		}
-		pathname = real_path;
-	}
 
-	PHP_WIN32_IOUTIL_INIT_W(pathname)
-	if (!pathw) {
-		return -1;
-	}
-
-	/* Either access call failed, or the mode was asking for a specific check.*/
-	int ret = php_win32_ioutil_access_w(pathw, mode);
-	if (0 > ret || X_OK == mode || F_OK == mode) {
-		PHP_WIN32_IOUTIL_CLEANUP_W()
-		return ret;
-	}
+ 		/* If only existence check is made, return now */
+ 		if (mode == 0) {
+			free(real_path);
+			return 0;
+		}
 
 /* Only in NTS when impersonate==1 (aka FastCGI) */
 
-	/*
-	 AccessCheck() requires an impersonation token.  We first get a primary
-	 token and then create a duplicate impersonation token.  The
-	 impersonation token is not actually assigned to the thread, but is
-	 used in the call to AccessCheck.  Thus, this function itself never
-	 impersonates, but does use the identity of the thread.  If the thread
-	 was impersonating already, this function uses that impersonation context.
-	*/
-	if(!OpenThreadToken(GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, &thread_token)) {
-		if (GetLastError() == ERROR_NO_TOKEN) {
-			if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &thread_token)) {
-				 TWG(impersonation_token) = NULL;
-				 goto Finished;
-			 }
-		}
-	}
-
-	/* token_sid will be freed in tsrmwin32_dtor */
-	token_sid = tsrm_win32_get_token_sid(thread_token);
-	if (!token_sid) {
-		if (TWG(impersonation_token_sid)) {
-			free(TWG(impersonation_token_sid));
-		}
-		TWG(impersonation_token_sid) = NULL;
-		goto Finished;
-	}
-
-	/* Different identity, we need a new impersontated token as well */
-	if (!TWG(impersonation_token_sid) || !EqualSid(token_sid, TWG(impersonation_token_sid))) {
-		if (TWG(impersonation_token_sid)) {
-			free(TWG(impersonation_token_sid));
-		}
-		TWG(impersonation_token_sid) = token_sid;
-
-		/* Duplicate the token as impersonated token */
-		if (!DuplicateToken(thread_token, SecurityImpersonation, &TWG(impersonation_token))) {
-			goto Finished;
-		}
-	} else {
-		/* we already have it, free it then */
-		free(token_sid);
-	}
-
-	if (CWDG(realpath_cache_size_limit)) {
-		t = time(0);
-		bucket = realpath_cache_lookup(pathname, strlen(pathname), t);
-		if(bucket == NULL && !real_path[0]) {
-			/* We used the pathname directly. Call tsrm_realpath */
-			/* so that entry is created in realpath cache */
-			if(tsrm_realpath(pathname, real_path) != NULL) {
-				pathname = real_path;
-				bucket = realpath_cache_lookup(pathname, strlen(pathname), t);
-				PHP_WIN32_IOUTIL_REINIT_W(pathname);
+		/*
+		 AccessCheck() requires an impersonation token.  We first get a primary
+		 token and then create a duplicate impersonation token.  The
+		 impersonation token is not actually assigned to the thread, but is
+		 used in the call to AccessCheck.  Thus, this function itself never
+		 impersonates, but does use the identity of the thread.  If the thread
+		 was impersonating already, this function uses that impersonation context.
+		*/
+		if(!OpenThreadToken(GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, &thread_token)) {
+			if (GetLastError() == ERROR_NO_TOKEN) {
+				if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &thread_token)) {
+					 TWG(impersonation_token) = NULL;
+					 goto Finished;
+				 }
 			}
 		}
-	}
 
-	/* Do a full access check because access() will only check read-only attribute */
-	if(mode == 0 || mode > 6) {
-		if(bucket != NULL && bucket->is_rvalid) {
-			fAccess = bucket->is_readable;
+		/* token_sid will be freed in tsrmwin32_dtor */
+		token_sid = tsrm_win32_get_token_sid(thread_token);
+		if (!token_sid) {
+			if (TWG(impersonation_token_sid)) {
+				free(TWG(impersonation_token_sid));
+			}
+			TWG(impersonation_token_sid) = NULL;
 			goto Finished;
 		}
-		desired_access = FILE_GENERIC_READ;
-	} else if(mode <= 2) {
-		if(bucket != NULL && bucket->is_wvalid) {
-			fAccess = bucket->is_writable;
+
+		/* Different identity, we need a new impersontated token as well */
+		if (!TWG(impersonation_token_sid) || !EqualSid(token_sid, TWG(impersonation_token_sid))) {
+			if (TWG(impersonation_token_sid)) {
+				free(TWG(impersonation_token_sid));
+			}
+			TWG(impersonation_token_sid) = token_sid;
+
+			/* Duplicate the token as impersonated token */
+			if (!DuplicateToken(thread_token, SecurityImpersonation, &TWG(impersonation_token))) {
+				goto Finished;
+			}
+		} else {
+			/* we already have it, free it then */
+			free(token_sid);
+		}
+
+		if (CWDG(realpath_cache_size_limit)) {
+			t = time(0);
+			bucket = realpath_cache_lookup(pathname, (int)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(MAX_PATH);
+				if(tsrm_realpath(pathname, real_path) != NULL) {
+					pathname = real_path;
+					bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t);
+				}
+			}
+ 		}
+
+ 		/* Do a full access check because access() will only check read-only attribute */
+ 		if(mode == 0 || mode > 6) {
+			if(bucket != NULL && bucket->is_rvalid) {
+				fAccess = bucket->is_readable;
+				goto Finished;
+			}
+ 			desired_access = FILE_GENERIC_READ;
+ 		} else if(mode <= 2) {
+			if(bucket != NULL && bucket->is_wvalid) {
+				fAccess = bucket->is_writable;
+				goto Finished;
+			}
+			desired_access = FILE_GENERIC_WRITE;
+ 		} else if(mode <= 4) {
+			if(bucket != NULL && bucket->is_rvalid) {
+				fAccess = bucket->is_readable;
+				goto Finished;
+			}
+			desired_access = FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS;
+ 		} else { // if(mode <= 6)
+			if(bucket != NULL && bucket->is_rvalid && bucket->is_wvalid) {
+				fAccess = bucket->is_readable & bucket->is_writable;
+				goto Finished;
+			}
+			desired_access = FILE_GENERIC_READ | FILE_GENERIC_WRITE;
+ 		}
+
+		if(TWG(impersonation_token) == NULL) {
 			goto Finished;
 		}
-		desired_access = FILE_GENERIC_WRITE;
-	} else if(mode <= 4) {
-		if(bucket != NULL && bucket->is_rvalid) {
-			fAccess = bucket->is_readable;
+
+		/* Get size of security buffer. Call is expected to fail */
+		if(GetFileSecurity(pathname, sec_info, NULL, 0, &sec_desc_length)) {
 			goto Finished;
 		}
-		desired_access = FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS;
-	} else { // if(mode <= 6)
-		if(bucket != NULL && bucket->is_rvalid && bucket->is_wvalid) {
-			fAccess = bucket->is_readable & bucket->is_writable;
+
+		psec_desc = (BYTE *)malloc(sec_desc_length);
+		if(psec_desc == NULL ||
+			 !GetFileSecurity(pathname, sec_info, (PSECURITY_DESCRIPTOR)psec_desc, sec_desc_length, &sec_desc_length)) {
 			goto Finished;
 		}
-		desired_access = FILE_GENERIC_READ | FILE_GENERIC_WRITE;
-	}
 
-	if(TWG(impersonation_token) == NULL) {
-		goto Finished;
-	}
+		MapGenericMask(&desired_access, &gen_map);
 
-	/* Get size of security buffer. Call is expected to fail */
-	if(GetFileSecurityW(pathw, sec_info, NULL, 0, &sec_desc_length)) {
-		goto Finished;
-	}
-
-	psec_desc = (BYTE *)malloc(sec_desc_length);
-	if(psec_desc == NULL ||
-		 !GetFileSecurityW(pathw, sec_info, (PSECURITY_DESCRIPTOR)psec_desc, sec_desc_length, &sec_desc_length)) {
-		goto Finished;
-	}
-
-	MapGenericMask(&desired_access, &gen_map);
-
-	if(!AccessCheck((PSECURITY_DESCRIPTOR)psec_desc, TWG(impersonation_token), desired_access, &gen_map, &privilege_set, &priv_set_length, &granted_access, &fAccess)) {
-		goto Finished_Impersonate;
-	}
-
-	/* Keep the result in realpath_cache */
-	if(bucket != NULL) {
-		if(desired_access == (FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS)) {
-			bucket->is_rvalid = 1;
-			bucket->is_readable = fAccess;
+		if(!AccessCheck((PSECURITY_DESCRIPTOR)psec_desc, TWG(impersonation_token), desired_access, &gen_map, &privilege_set, &priv_set_length, &granted_access, &fAccess)) {
+			goto Finished_Impersonate;
 		}
-		else if(desired_access == FILE_GENERIC_WRITE) {
-			bucket->is_wvalid = 1;
-			bucket->is_writable = fAccess;
-		} else if (desired_access == (FILE_GENERIC_READ | FILE_GENERIC_WRITE)) {
-			bucket->is_rvalid = 1;
-			bucket->is_readable = fAccess;
-			bucket->is_wvalid = 1;
-			bucket->is_writable = fAccess;
+
+		/* Keep the result in realpath_cache */
+		if(bucket != NULL) {
+			if(desired_access == (FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS)) {
+				bucket->is_rvalid = 1;
+				bucket->is_readable = fAccess;
+			}
+			else if(desired_access == FILE_GENERIC_WRITE) {
+				bucket->is_wvalid = 1;
+				bucket->is_writable = fAccess;
+			} else if (desired_access == (FILE_GENERIC_READ | FILE_GENERIC_WRITE)) {
+				bucket->is_rvalid = 1;
+				bucket->is_readable = fAccess;
+				bucket->is_wvalid = 1;
+				bucket->is_writable = fAccess;
+			}
 		}
-	}
 
 Finished_Impersonate:
-	if(psec_desc != NULL) {
-		free(psec_desc);
-		psec_desc = NULL;
-	}
+		if(psec_desc != NULL) {
+			free(psec_desc);
+			psec_desc = NULL;
+		}
 
 Finished:
-	if(thread_token != NULL) {
-		CloseHandle(thread_token);
-	}
+		if(thread_token != NULL) {
+			CloseHandle(thread_token);
+		}
+		if(real_path != NULL) {
+			free(real_path);
+			real_path = NULL;
+		}
 
-	PHP_WIN32_IOUTIL_CLEANUP_W()
-	if(fAccess == FALSE) {
-		errno = EACCES;
-		return errno;
-	} else {
-		return 0;
+		if(fAccess == FALSE) {
+			errno = EACCES;
+			return errno;
+		} else {
+			return 0;
+		}
 	}
-}/*}}}*/
+}
 
 
 static process_pair *process_get(FILE *stream)
-{/*{{{*/
+{
 	process_pair *ptr;
 	process_pair *newptr;
 
@@ -396,10 +407,10 @@ static process_pair *process_get(FILE *stream)
 	ptr = newptr + TWG(process_size);
 	TWG(process_size)++;
 	return ptr;
-}/*}}}*/
+}
 
-static shm_pair *shm_get(key_t key, void *addr)
-{/*{{{*/
+static shm_pair *shm_get(int key, void *addr)
+{
 	shm_pair *ptr;
 	shm_pair *newptr;
 
@@ -428,36 +439,34 @@ static shm_pair *shm_get(key_t key, void *addr)
 	TWG(shm_size)++;
 	memset(ptr, 0, sizeof(*ptr));
 	return ptr;
-}/*}}}*/
+}
 
-static HANDLE dupHandle(HANDLE fh, BOOL inherit)
-{/*{{{*/
+static HANDLE dupHandle(HANDLE fh, BOOL inherit) {
 	HANDLE copy, self = GetCurrentProcess();
 	if (!DuplicateHandle(self, fh, self, &copy, 0, inherit, DUPLICATE_SAME_ACCESS|DUPLICATE_CLOSE_SOURCE)) {
 		return NULL;
 	}
 	return copy;
-}/*}}}*/
+}
 
 TSRM_API FILE *popen(const char *command, const char *type)
-{/*{{{*/
+{
 
 	return popen_ex(command, type, NULL, NULL);
-}/*}}}*/
+}
 
 TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env)
-{/*{{{*/
+{
 	FILE *stream = NULL;
 	int fno, type_len, read, mode;
-	STARTUPINFOW startup;
+	STARTUPINFO startup;
 	PROCESS_INFORMATION process;
 	SECURITY_ATTRIBUTES security;
 	HANDLE in, out;
 	DWORD dwCreateFlags = 0;
 	BOOL res;
 	process_pair *proc;
-	char *cmd = NULL;
-	wchar_t *cmdw = NULL, *cwdw = NULL, *envw = NULL;
+	char *cmd;
 	int i;
 	char *ptype = (char *)type;
 	HANDLE thread_token = NULL;
@@ -481,42 +490,18 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 		ptype++;
 	}
 
-	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
-	if (!cmd) {
-		return NULL;
-	}
-
-	sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
-	cmdw = php_win32_cp_any_to_w(cmd);
-	if (!cmdw) {
-		free(cmd);
-		return NULL;
-	}
-
-	if (cwd) {
-		cwdw = php_win32_ioutil_any_to_w(cwd);
-		if (!cwdw) {
-			free(cmd);
-			free(cmdw);
-			return NULL;
-		}
-	}
-
 	security.nLength				= sizeof(SECURITY_ATTRIBUTES);
 	security.bInheritHandle			= TRUE;
 	security.lpSecurityDescriptor	= NULL;
 
 	if (!type_len || !CreatePipe(&in, &out, &security, 2048L)) {
-		free(cmdw);
-		free(cwdw);
-		free(cmd);
 		return NULL;
 	}
 
-	memset(&startup, 0, sizeof(STARTUPINFOW));
+	memset(&startup, 0, sizeof(STARTUPINFO));
 	memset(&process, 0, sizeof(PROCESS_INFORMATION));
 
-	startup.cb			= sizeof(STARTUPINFOW);
+	startup.cb			= sizeof(STARTUPINFO);
 	startup.dwFlags		= STARTF_USESTDHANDLES;
 	startup.hStdError	= GetStdHandle(STD_ERROR_HANDLE);
 
@@ -548,28 +533,19 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 		}
 	}
 
-	envw = php_win32_cp_env_any_to_w(env);
-	if (envw) {
-		dwCreateFlags |= CREATE_UNICODE_ENVIRONMENT;
-	} else {
-		if (env) {
-			free(cmd);
-			free(cmdw);
-			free(cwdw);
-			return NULL;
-		}
+	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
+	if (!cmd) {
+		return NULL;
 	}
 
+	sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
 	if (asuser) {
-		res = CreateProcessAsUserW(token_user, NULL, cmdw, &security, &security, security.bInheritHandle, dwCreateFlags, envw, cwdw, &startup, &process);
+		res = CreateProcessAsUser(token_user, NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
 		CloseHandle(token_user);
 	} else {
-		res = CreateProcessW(NULL, cmdw, &security, &security, security.bInheritHandle, dwCreateFlags, envw, cwdw, &startup, &process);
+		res = CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
 	}
 	free(cmd);
-	free(cmdw);
-	free(cwdw);
-	free(envw);
 
 	if (!res) {
 		return NULL;
@@ -590,10 +566,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;
 
@@ -610,15 +586,19 @@ TSRM_API int pclose(FILE *stream)
 	CloseHandle(process->prochnd);
 
 	return termstat;
-}/*}}}*/
+}
 
-TSRM_API int shmget(key_t key, size_t size, int flags)
-{/*{{{*/
+TSRM_API int shmget(int key, int 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);
 
@@ -627,14 +607,7 @@ TSRM_API int shmget(key_t key, size_t size, int flags)
 
 	if (!shm_handle && !info_handle) {
 		if (flags & IPC_CREAT) {
-#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);
+			shm_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, size, shm_segment);
 			info_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(shm->descriptor), shm_info);
 			created		= TRUE;
 		}
@@ -649,12 +622,6 @@ TSRM_API int shmget(key_t key, size_t size, int flags)
 		}
 	} else {
 		if (flags & IPC_EXCL) {
-			if (shm_handle) {
-				CloseHandle(shm_handle);
-			}
-			if (info_handle) {
-				CloseHandle(info_handle);
-			}
 			return -1;
 		}
 	}
@@ -693,33 +660,27 @@ TSRM_API int shmget(key_t key, size_t size, int flags)
 	}
 
 	return key;
-}/*}}}*/
+}
 
 TSRM_API void *shmat(int key, const void *shmaddr, int flags)
-{/*{{{*/
+{
 	shm_pair *shm = shm_get(key, NULL);
 
 	if (!shm->segment) {
 		return (void*)-1;
 	}
 
-	shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
-
-	if (NULL == shm->addr) {
-		int err = GetLastError();
-		SET_ERRNO_FROM_WIN32_CODE(err);
-		return (void*)-1;
-	}
-
 	shm->descriptor->shm_atime = time(NULL);
 	shm->descriptor->shm_lpid  = getpid();
 	shm->descriptor->shm_nattch++;
 
+	shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
+
 	return shm->addr;
-}/*}}}*/
+}
 
 TSRM_API int shmdt(const void *shmaddr)
-{/*{{{*/
+{
 	shm_pair *shm = shm_get(0, (void*)shmaddr);
 
 	if (!shm->segment) {
@@ -731,10 +692,9 @@ 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) {
@@ -762,7 +722,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) /* {{{ */
@@ -780,17 +749,10 @@ TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
 {
 	FILETIME mtime, atime;
 	HANDLE hFile;
-	PHP_WIN32_IOUTIL_INIT_W(filename)
 
-	if (!pathw) {
-		return -1;
-	}
-
-	hFile = CreateFileW(pathw, GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, NULL,
+	hFile = CreateFile(filename, GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, NULL,
 				 OPEN_ALWAYS, FILE_FLAG_BACKUP_SEMANTICS, NULL);
 
-	PHP_WIN32_IOUTIL_CLEANUP_W()
-
 	/* OPEN_ALWAYS mode sets the last error to ERROR_ALREADY_EXISTS but
 	   the CreateFile operation succeeds */
 	if (GetLastError() == ERROR_ALREADY_EXISTS) {
@@ -820,12 +782,3 @@ TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
 /* }}} */
 #endif
 #endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/tsrm_win32.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2015 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        |
@@ -16,6 +16,8 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
+
 #ifndef TSRM_WIN32_H
 #define TSRM_WIN32_H
 
@@ -24,10 +26,9 @@
 #if HAVE_UTIME
 # include <sys/utime.h>
 #endif
-#include "win32/ipc.h"
 
 struct ipc_perm {
-	key_t		key;
+	int			key;
 	unsigned short	uid;
 	unsigned short	gid;
 	unsigned short	cuid;
@@ -38,7 +39,7 @@ struct ipc_perm {
 
 struct shmid_ds {
 	struct	ipc_perm	shm_perm;
-	size_t			shm_segsz;
+	int				shm_segsz;
 	time_t			shm_atime;
 	time_t			shm_dtime;
 	time_t			shm_ctime;
@@ -71,7 +72,7 @@ typedef struct {
 
 #ifdef ZTS
 # define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v)
-TSRMLS_CACHE_EXTERN()
+TSRMLS_CACHE_EXTERN();
 #else
 # define TWG(v) (win32_globals.v)
 #endif
@@ -93,7 +94,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, size_t pathname_len, size_t *key_len);
+char * tsrm_win32_get_path_sid_key(const char *pathname );
 
 TSRM_API void tsrm_win32_startup(void);
 TSRM_API void tsrm_win32_shutdown(void);
@@ -104,17 +105,10 @@ 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(key_t key, size_t size, int flags);
+TSRM_API int shmget(int key, int 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);
-#endif
 
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
+TSRM_API char *realpath(char *orig_path, char *buffer);
+#endif

UPGRADING.INTERNALS

@@ -1,208 +1,324 @@
-PHP 7.3 INTERNALS UPGRADE NOTES
+PHP 7.0 INTERNALS UPGRADE NOTES
 
+0. Wiki Examples
 1. Internal API changes
-  a. array_init() and array_init_size()
-  b. Run-time constant operand addressing
-  c. Array/Object recursion protection
-  d. HASH_FLAG_PERSISTENT
-  e. AST and IS_CONSTANT
-  f. GC_REFCOUNT()
-  g. zend_get_parameters()
-  h. zend_register_persistent_resource()
-  i. RAND_RANGE()
-  j. cast_object() with _IS_NUMBER
-  k. zend_fcall_info_cache.initialized
-  l. php_hrtime_current()
-  m. zend_cpu_supports()
-  n. IS_TYPE_COPYABLE
-  o. IS_UNUSED
-  p. VM instruction operands (FETCH_CLASS, FETCH_CONSTANT, CATCH)
-  q. sapi_cli_single_write()
-  r. php_url
-  s. zend_function.reserved[]
-  t. zif_handler
-  u. GC_G
-  v. php_add[c]slashes
-  w. zend_class_entry.iterator_funcs
-  x. Class declaration opcodes (DECLARE_INHERITED_CLASS ...)
-  y. zend_constant
-  z. HAVE_ST_BLKSIZE and HAVE_ST_RDEV
-  aa. RETSIGTYPE
-  bb. php_setcookie
+  e. New data types
+  f. zend_parse_parameters() specs
+  g. sprintf() formats
+  h. HashTable API
+  i. New portable macros for large file support
+  j. New portable macros for integers
+  k. get_class_entry object handler info
+  l. get_class_name object handler info
+  m. Other portable macros info
+  n. ZEND_ENGINE_2 removal
+  o. Updated final class modifier
+  p. TSRM changes
+  q. gc_collect_cycles() is now hookable
+  r. PDO uses size_t for lengths
+  s. Resource API changes
+  t. Optimized strings concatenation.
+  u. Streams changes
+  v. Sort algorithm changes
 
 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
 ========================
 
-  a. array_init() and array_init_size() are not functions anymore.
-     They don't return any values.
+  e. New data types
 
-  b. In 64-bit builds PHP-7.2 and below used relative run-time constant operand
-     addressing. E.g. opline->op1.constant kept an offset from start of literals
-     table - op_array->literals. To speedup access op_array->literals was cached
-     in execute_data->literals. So the resulting address calculated as
-     EX(literals) + opline->op1.constant.
+     String
 
-     Now at run-time literals allocated close to opcodes, and addressed
-     relatively from current opline. This eliminates load of EX(literals) on
-     each constant access as well as EX(literals) initialization on each call.
+        Besides the old way of accepting the strings with 's', the new 'S' ZPP spec
+	was introduced. It expects an argument of the type zend_string *. String lengths
+	in it are bound to the size_t datatype.
 
-     As result some related macros were removed (ZEND_EX_USE_LITERALS,
-     EX_LOAD_LITERALS, EX_LITERALS, RT_CONSTANT_EX, EX_CONSTANT) or changed
-     (RT_CONSTANT, ZEND_PASS_TWO_UPDATE_CONSTANT, ZEND_PASS_TWO_UNDO_CONSTANT).
-     This change may affect only some "system" extensions. EX_LITERALS,
-     RT_CONSTANT_EX, EX_CONSTANT should be substituted by RT_CONSTANT, and now
-     use "opline" (instead of "op_array") as first argument.
+     Integer types
 
-  c. Protection from recursion during processing circular data structures was
-     refactored. HashTable.nApplyCount and IS_OBJ_APPLY_COUNT are replaced by
-     single flag GC_PROTECTED. Corresponding macros Z_OBJ_APPLY_COUNT,
-     Z_OBJ_INC_APPLY_COUNT, Z_OBJ_DEC_APPLY_COUNT, ZEND_HASH_GET_APPLY_COUNT,
-     ZEND_HASH_INC_APPLY_COUNT, ZEND_HASH_DEC_APPLY_COUNT are replaced with
-     GC_IS_RECURSIVE, GC_PROTECT_RECURSION, GC_UNPROTECT_RECURSION,
-     Z_IS_RECURSIVE, Z_PROTECT_RECURSION, Z_UNPROTECT_RECURSION.
+	Integers do no more depend on the firm 'long' type. Instead a platform
+	dependent integer type is used, it is called zend_long. That datatype is
+	defined dynamically to guarantee the consistent 64 bit support. The zval 
+	field representing user land integer it bound to zend_long.
 
-     HASH_FLAG_APPLY_PROTECTION flag and ZEND_HASH_APPLY_PROTECTION() macro
-     are removed. All mutable arrays should use recursion protection.
-     Corresponding checks should be replaced by Z_REFCOUNTED() or
-     !(GC_FLAGS(p) & GC_IMMUTABLE).
+	Signed integer is defined as zend_long, unsigned integer as zend_ulong
+	inside Zend. 
 
-  d. HASH_FLAG_PERSISTENT renamed into IS_ARRAY_PERSISTENT and moved into
-     GC_FLAGS (to be consistent with IS_STR_PERSISTENT).
+     Other datatypes
 
-  e. zend_ast_ref structure is changed to use only one allocation.
-     zend_ast_copy() now returns zend_ast_ref (instead of zend_asr).
-     zend_ast_destroy_and_free() is removed. ZVAL_NEW_AST() is replaced
-     by ZVAL_AST().
+	zend_off_t  - portable off_t analogue
+	zend_stat_t - portable 'struct stat' analogue
 
-     IS_CONSTANT type and Z_CONST_FLAGS() are removed. Now constants are always
-     represented using IS_CONSTANT_AST (ZEND_AST_CONSTANT kind). AST node
-     attributes are used instead of constant flags. IS_TYPE_CONSTANT flag is
-     removed, but Z_CONSTANT() macro is kept for compatibility.
+	These datatypes are declared to be portable across platforms. Thus, direct
+	usage of the functions like fseek, stat, etc. as well as direct usage of
+	off_t and struct stat is strongly not recommended. Instead the portable
+	macros should be used.
 
-  f. GC_REFCOUNT() is turned into inline function and can't be modified direcly.
-     All reference-counting operations should be done through corresponding
-     macros GC_SET_REFCOUNT(), GC_ADDREF() and GC_DELREF().
+	zend_fseek - portable fseek equivalent
+	zend_ftell - portable ftell equivalent
+	zend_lseek - portable lseek equivalent
+	zend_fstat - portable fstat equivalent
+	zend_stat  - portable stat equivalent
 
-     GC_REFCOUNT(p)++ should be changed into GC_ADDREF(p),
-     GC_REFCOUNT(p)-- into GC_DELREF(p),
-     GC_REFCOUNT(p) = 1 into GC_SET_REFCOUNT(p, 1).
+  f. zend_parse_parameters() specs
 
-  g. The zend_get_parameters() and zend_get_parameters_ex() functions were
-     removed. Instead zend_parse_parameters() should be used.
+       The new spec 'S' introduced, which expects an argument of type zend_string *.
+       The 'l' spec expects a parameter of the type zend_long, not long anymore.
+       The 's' spec expects parameters of the type char * and size_t, no int anymore.
 
-  h. New functions zend_register_persistent_resource() or
-     zend_register_persistent_resource_ex() should beused to register
-     persistent resources, instead of manual insertion into EG(persistent_list).
+  g. sprintf() formats
 
-  i. The RAND_RANGE() macro has been removed. php_mt_rand_range() should be
-     used instead.
+       New printf modifier 'p' was implemented to platform independently output zend_long,
+       zend_ulong and php_size_t datatypes. That modifier can be used with 'd', 'u', 'x' and 'o'
+       printf format specs with spprintf, snprintf and the wrapping printf implementations.
+       %pu is sufficient for both zend_ulong and php_size_t. the code using %p spec to output
+       pointer address might need to be enclosed into #ifdef when it unlickily followed by 'd',
+       'u', 'x' or 'o'.
 
-  j. The cast_object() object handler now also accepts the _IS_NUMBER type. The
-     handler should return either an integer or float value in this case,
-     whichever is more appropriate.
+       The only exceptions are the snprintf and zend_sprintf functions yet, because in some cases
+       they can use the implemenations available on the system, not the PHP one. With snprintf the
+       macros ZEND_LONG_FMT and ZEND_ULONG_FMT should be used.
 
-  k. zend_fcall_info_cache.initialized is removed. zend_fcall_info_cache is
-     initialized if zend_fcall_info_cache.function_handler is set.
+  h. HashTable API
 
-  l. php_hrtime_current() delivers the number of nanoseconds since an uncertain
-     point in the past.
+       Datatype for array indexes was changed to zend_ulong, for string keys to zend_string *.
 
-  m. zend_cpu_supports() determines if a feature is supported by current cpu.
-     Also serial inline zend_cpu_supports_xxx() are added, which is designed for
-     ifunc resolver function, as resolver function should not depend on any
-     external function.
+  i. New portable macros for large file support
 
-  n. IS_TYPE_COPYABLE flag is removed. IS_STRING zvals didn't need to be
-     duplication by zval_copy_ctor(), ZVAL_DUP() and SEPARATE_ZVAL*() macros.
-     Interned strings didn't set IS_TYPE_COPYABLE, so they aren't affected at
-     all. Now instead of checking for IS_TYPE_COPYABLE, engine checks for
-     IS_ARRAY type (it may be IS_TYPE_REFCOUNTED or not). All the related
-     macros: Z_COPYABLE..., Z_IMMUTABLE... are kept for compatibility.
+      Function(s)       Alias           Comment
+      stat, _stat64     zend_stat   for use with zend_stat_t
+      fstat, _fstat64   zend_fstat  for use with zend_stat_t
+      lseek, _lseeki64  zend_lseek  for use with zend_off_t
+      ftell, _ftelli64  zend_ftell  for use with zend_off_t
+      fseek, _fseeki64  zend_fseek  for use with zend_off_t
 
-  o. IS_UNUSED became zero and can't be used as a bitmask (there were no such
-     usages in PHP sources).
+  j. New portable macros for integers
 
-  p. Operands of few VM instructions were changed
-    - FETCH_CLASS     op1<fetch-flags>, op2<name>, result<var>
-    - FETCH_CONSTANT  op1<fetch-flags>, op2<name>, result<tmp>
-    - CATCH           ext<last-flag>, op1<name>, op2<jump_addr>, result<cv>
+      Function(s)                                         Alias             Comment
+      snprintf with "%ld" or "%lld", _ltoa_s, _i64toa_s   ZEND_LTOA         for use with zend_long
+      atol, atoll, _atoi64                                ZEND_ATOL         for use with zend_long
+      strtol, strtoll, _strtoi64                          ZEND_STRTOL       for use with zend_long
+      strtoul, strtoull, _strtoui64                       ZEND_STRTOUL      for use with zend_long
+      abs, llabs, _abs64                                  ZEND_ABS          for use with zend_long
+      -                                                   ZEND_LONG_MAX     replaces LONG_MAX where appropriate
+      -                                                   ZEND_LONG_MIN     replaces LONG_MIN where appropriate
+      -                                                   ZEND_ULONG_MAX    replaces ULONG_MAX where appropriate
+      -                                                   SIZEOF_ZEND_LONG  reworked SIZEOF_ZEND_LONG representing the size of zend_long datatype
+      -                                                   ZEND_SIZE_MAX     Max value of size_t
+      -                                                   Z_L               casts an integral constant to zend_long
+      -                                                   Z_UL              casts an integral constant to zend_ulong
 
- q.  sapi_cli_single_write() now returns ssize_t instead of size_t.
+      The macro ZEND_ENABLE_ZVAL_LONG64 reveals whether zval operates on 64 or 32 bit integer.
 
- r.  fields of php_url struct change from char * to zend_string *
+  k. The get_class_entry object handler is no longer available. Instead
+     zend_object.ce is always used.
 
- s. Special purpose zend_functions marked by ZEND_ACC_CALL_VIA_TRAMPOLINE or
-    ZEND_ACC_FAKE_CLOSURE flags use reserved[0] for internal purpose.
-    Third party extensions must not modify reserved[] fields of these functions.
+  l. The get_class_name object handler is now only used for displaying class
+     names in debugging functions like var_dump(). It is no longer used in
+     get_class(), get_parent_class() or similar.
 
- t. For internal functions the typedef zif_handler has been introduced.  It is
-    recommended to use this from now on, instead of defining own handler types.
+     The handler is now obligatory, no longer accepts a `parent` argument and
+     must return a non-NULL zend_string*, which will be released by the caller.
 
- u. The GC globals (GC_G) are now private. Use the new zend_gc_get_status() to
-    retrieve status information of the GC.
+  m. Other portable macros info
 
- v. The should_free argument of the php_add[c]slashes functions has been
-    removed.  It is now always the caller's responsibility to free the passed
-    string.
+     ZEND_SECURE_ZERO     - zeroes chunk of memory
+     ZEND_VALID_SOCKET    - validates a php_socket_t variable 
 
- w. zend_class_entry.iterator_funcs have been replaced by iterator_funcs_ptr.
-    You don't have to set its value, setting parent.funcs in the get_iterator
-    function is enough.
+     ZEND_FASTCALL is defined to use __vectorcall convention on VS2013 and above
+     ZEND_NORETURN is defined as __declspec(noreturn) on VS
 
- x. Class declaration opcode formats were changed
-  - DECLARE_INHERITED_CLASS and DECLARE_ANON_INHERITED_CLASS now encode parent
-    class name in second operand directly (as IS_CONST operand). Previously,
-    parent class was fetched by the prior FETCH_CLASS opcode.
-  - ADD_INTERFACE and ADD_TRAIT don't use run-time cache to keep interface or
-    trait. These instructions are executed once, and caching is useless.
+  n. The ZEND_ENGINE_2 macro has been removed. A ZEND_ENGINE_3 macro has been added.
+  
+  o. Removed ZEND_ACC_FINAL_CLASS in favour of ZEND_ACC_FINAL, turning final class
+     modifier now a different class entry flag. Update your extensions.
 
- y. zend_constant.flags and zend_constant.module_number are packed into
-    reserved space inside zend_constant.value. They should be accessed using
-    ZEND_CONSTANT_FLAGS(), ZEND_CONSTANT_MODULE_NUMBER() and
-    ZEND_CONSTANT_SET_FLAGS() macros.
+  p. TSRM changes
 
- z. HAVE_ST_BLKSIZE must be replaced with HAVE_STRUCT_STAT_ST_BLKSIZE and
-    HAVE_ST_RDEV must be replaced with HAVE_STRUCT_STAT_ST_RDEV.
+     The TSRM layer undergone significant changes. It is not necessary anymore to 
+     pass the tsrm_ls pointer explicitly. The TSRMLS_* macros should not be used
+     in any new developments.
 
- aa. RETSIGTYPE has been removed from the generated php_config.h and should be
-    replaced with void.
+     The recommended way accessing globals in TS builds is by implementing it
+     to use a local thread unique pointer to the corresponding data pool. These
+     are the new macros that serve to achieve this goal:
 
- bb. php_setcookie() now expects an additional samesite argument, and the
-    url_encode parameter has been moved to the end. The signature is now:
-    int php_setcookie(zend_string *name, zend_string *value, time_t expires,
-                      zend_string *path, zend_string *domain, int secure,
-                      int httponly, zend_string *samesite, int url_encode);
+     - ZEND_TSRMG - based on TSRMG and if static pointer for data pool access is
+       implemented, will use it
+     - ZEND_TSRMLS_CACHE_EXTERN - to be used in a header shared across multiple
+       C/C++ files
+     - ZEND_TSRMLS_CACHE_DEFINE - to be used in the main extension C/C++ file
+     - ZEND_TSRMLS_CACHE_UPDATE - to be integrated at the top of the globals
+       ctor or RINIT function
+     - ZEND_ENABLE_STATIC_TSRMLS_CACHE - to be used in the config.[m4|w32] for
+       enabling the globals access per thread unique pointer
+     - TSRMLS_CACHE - expands to the variable name which links to the thread
+       unique data pool
+
+     Note that usually it will work without implementing the globals access per
+     a thread unique pointer, however it might cause a slowdown. The reason is
+     that the access model to the extension/SAPI own globals as well as the
+     access to the core globals is determined in the compilation phase depending
+     on whether ZEND_ENABLE_STATIC_TSRMLS_CACHE macro is defined. 
+
+     Due to the current compiler evolution state, the TSRMLS_CACHE pointer
+     (when implemented) has to be present and updated in every binary unit which
+     is not compiled statically into PHP. So any DLL, DSO, EXE, etc. has to take
+     care about defining and updating it's TSRMLS cache. An update should happen
+     before any globals was accessed.
+
+     Porting an extension or SAPI is usually as easy as removing all the TSRMLS_*
+     occurrences and integrating the macros mentioned above. However if tsrm_ls
+     is used explicitly, its usage can be considered obsolete in most cases.
+     Additionally, if an extension triggers its own threads, TSRMLS_CACHE shouldn't
+     be passed to that threads directly.
+
+     When working with CTOR/DTOR for the extension globals, only the data passed
+     as parameters should be touched. For example, don't use code like
+     free(MYEXT_G(vars)); inside globals destructor, as it possibly can destroy
+     the data from a wrong thread. Instead use the pointer to the data delivered
+     into the destructor. So the previous example could look like
+     free(my_struct->vars); given the income was casted to (struct my_struct *).
+
+     A new macro was introduced to simplify the declaration to the extension
+     globals. A simplified declaration looks as follows
+
+     #define MYEXT_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(myext, v)
+
+     Another new macro ZEND_MODULE_GLOBALS_BULK(myext) delivers the corresponding
+     globals struct as a whole.
+
+     Two new storage specifiers was introduced.
+
+     ZEND_EXT_TLS - expand to an appropriate thread specific storage specifier in
+                    the thread safe build, expands to empty in a non thread safe
+		    build. 
+     ZEND_TLS     - expands to an appropriate thread specific storage specifier
+                    with static visibility in the thread safe build, expands to
+                    static specifier in a non thread safe build. 
+     
+     Variables declared with these storage specifiers can not be shared across 
+     threads. While ZEND_TLS enforces the local scope visibility, ZEND_EXT_TLS
+     pertains to the visiblity across several compilation units. In both cases,
+     there's no portable way to achieve the visibility across shared objects.
+     Thus, these specifiers are not compatible with ZEND_API and PHPAPI specifiers.
+
+  q. gc_collect_cycles() is now a function pointer, and can be replaced in the
+     same manner as zend_execute_ex() if needed (for example, to include the
+     time spent in the garbage collector in a profiler). The default
+     implementation has been renamed to zend_gc_collect_cycles(), and is
+     exported with ZEND_API.
+
+  r. In accordance with general use of size_t as string length, all PDO API
+     functions now use size_t for string length.
+
+  s. Removed ZEND_REGISTER/FETCH_RESOURCE, use zend_fetch_resource and
+     and zend_register_resource instead, zend_fetch_resource accepts a zend_resource *
+     as first argument, if you still need to fetch a resource from zval, use 
+     zend_fetch_resource_ex. More details can be found in Zend/zend_list.c.
+
+  t. Optimized strings concatenation.
+     ZEND_ADD_STRING/VAR/CHAR are replaced with ZEND_ROPE_INIT, ZEND_ROPE_ADD,
+     ZEND_ROPE_END.
+     Instead of reallocation and copying string on each ZEND_ADD_STRING/VAR/CAHR,
+     collect all the strings and then allocate and construct the resulting string once.
+
+  u. Streams changes
+     - It is possible to do blocking reads on Windows pipes. It can be done either
+       using context stream option PHP_STREAM_OPTION_PIPE_BLOCKING or 
+       adding STREAM_USE_BLOCKING_PIPE when opening the stream.
+
+  v. Sort algorithm changes
+     - Improved zend_qsort(using hybrid sorting algo) for better performance,
+       and also renamed zend_qsort to zend_sort.
+     - Added stable sorting algo zend_insert_sort.
+
+  w. Tick functions internal API change
+     Tick functions have different declaration now. They expect a single
+	 parameter while before they were parameterless. When registering the
+	 tick function a value for this parameter must be passed. This value will be
+	 provided to the tick function on every execution.
 
 ========================
 2. Build system changes
 ========================
 
   a. Unix build system changes
-    - PHP_PROG_LEX, TSRM_CHECK_GCC_ARG, and LIBZEND_CPLUSPLUS_CHECKS Autoconf
-      macros have been removed.
-    - Minimum Autoconf version is 2.68+ for generating the configure script.
 
   b. Windows build system changes
-    - ZEND_WIN32_FORCE_INLINE doesn't affect C++ anymore. zend_always_inline is
-      still usable in C++, but anything else inlining related is up to
-      compiler.
-    - ZEND_WIN32_KEEP_INLINE was removed, it was only needed for C++
-      convenience and is now default behavior with C++.
-    - New configure option --enable-native-intrinsics accepts a list of the
-      intrinsic optimizations to enable. It affects both the code generation
-      and the explicit optimizations guarded by preprocessor macros.
-    - The configure option --with-codegen-arch accepts only ia32 as a value.
-      Use it, to produce builds suitable for older processors without SSE2 or
-      even SSE support.
+
+     - Besides Visual Studio, building with Clang or Intel Composer is now
+       possible. To enable an alternative toolset, add the option
+       --with-toolset=[vs,clang,icc] to the configure line. The default
+       toolset is vs. Still clang or icc need the correct environment
+       which involves many tools from the vs toolset.
+
+       The toolset option is supported by phpize as well.
+
+       AWARENESS The only recommended and supported toolset to produce production
+       ready binaries is Visual Studio. Still other compilers can be used now for
+       testing and analyzing purposes.
+
+     - configure.js now produces response files which are passed to the linker
+       and library manager. This solves the issues with the long command lines
+       which can exceed the OS limit.
+
+     - with clang toolset, an option --with-uncritical-warn-choke is available,
+       which suppresses the most frequent false positive warnings
+
+     - the --with-mp option will by default utilize all the available cores. It's
+       enabled by default for release builds and can be disabled with the special
+       "disable" keyword.
 
 ========================
 3. Module changes
 ========================
+
+  Session:
+
+    - PS_MOD_UPDATE_TIMESTAMP() session save handler definition is added. New
+      save handler should use PS_MOD_UPDATE_TIMESTAMP() definition. Save handler
+      must not refer/change PS() variables directly from save handler. Use
+      parameters.
+    - PS_MOD()/PS_MOD_SID() macro exist only for transition. Beware these
+      save handlers are less secure and slower than PS_MOD_UPDATE_TIMESTAMP().
+    - PS(invalid_session_id) was removed. It was never worked as it supposed.
+      To report invalid session ID, use PS_VALIDATE_SID() handler.
+    - PS_VALIDATE_SID() defines session ID validation handler. This handler
+      must validate if requested session ID exists in session data storage or not.
+      Do not access PS(id) directly, but use this handler and it's parameter.
+    - PS_UPDATE_TIMESTAMP() defines timestamp updating handler. This handler
+      must update session data timestamp for GC if it is needed. e.g. Memcache
+      updates timestamp on read, so it does not need to update timestamp. Return
+      SUCCESS simply for this case.
+    - PS_CREATE_SID() should check session ID collision. Return NULL for failure.
+    - More documentation can be found in ext/session/mod_files.c as comments.
+      mod_files.c may be used as reference implementation.
+ 
+  Openssl:
+    - several ext/openssl functions require the inclusion of the applink shim
+      as documented in the OpenSSL FAQ https://www.openssl.org/support/faq.html#PROG2
+      to properly work on Windows. While this primarily affects the OpenSSL
+      functionality, the shim needs to be included into the executable file
+      which loads the extension DLL, not into the extension DLL itself. Alternatively
+      it can be compiled and linked with the main program as a separate object file.
+      More information and explanation in the linked OpenSSL FAQ.
+
+      Thus, this primarily affects any WAMP or other redistributions bundling the
+      official PHP release zipballs or building from sources. The applink shim is
+      already integrated with all the PHP executables from the official distribution
+      starting with 7.0.0beta1.
+

Zend/LICENSE

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

Zend/Makefile.am

@@ -18,7 +18,7 @@ libZend_la_SOURCES=\
 	zend_default_classes.c \
 	zend_iterators.c zend_interfaces.c zend_exceptions.c \
 	zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c \
-	zend_generators.c zend_virtual_cwd.c zend_ast.c zend_smart_str.c zend_cpuinfo.c
+	zend_generators.c zend_virtual_cwd.c zend_ast.c zend_smart_str.c
 
 libZend_la_CFLAGS = -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1
 libZend_la_LDFLAGS =
@@ -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
+

Zend/OBJECTS2_HOWTO

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

Zend/README.ZEND_VM

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

Zend/RFCs/001.txt

@@ -0,0 +1,136 @@
+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.
+

Zend/RFCs/002.txt

@@ -0,0 +1,169 @@
+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

Zend/RFCs/003.txt

@@ -0,0 +1,72 @@
+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.
+
+
+
+

Zend/Zend.m4

@@ -1,27 +1,29 @@
 dnl
+dnl $Id$
+dnl
 dnl This file contains Zend specific autoconf functions.
 dnl
 
 AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[
 AC_MSG_CHECKING(for $1)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#if HAVE_SYS_TYPES_H
+AC_TRY_COMPILE([
+#if HAVE_SYS_TYPES_H  
 #include <sys/types.h>
 #endif
-#if HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H  
 #include <inttypes.h>
 #elif HAVE_STDINT_H
 #include <stdint.h>
-#endif]],
-[[if (($1 *) 0)
+#endif],
+[if (($1 *) 0)
   return 0;
 if (sizeof ($1))
   return 0;
-]])],[
+],[
   AC_DEFINE_UNQUOTED([HAVE_]translit($1,a-z_-,A-Z__), 1,[Define if $1 type is present. ])
   AC_MSG_RESULT(yes)
-], [AC_MSG_RESULT(no)
-])dnl
+], AC_MSG_RESULT(no)
+)dnl
 ])
 
 AC_DEFUN([LIBZEND_BASIC_CHECKS],[
@@ -58,10 +60,10 @@ sys/time.h \
 signal.h \
 unix.h \
 stdlib.h \
-cpuid.h \
 dlfcn.h)
 
 AC_TYPE_SIZE_T
+AC_TYPE_SIGNAL
 
 AC_DEFUN([LIBZEND_LIBDL_CHECKS],[
 AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
@@ -98,7 +100,7 @@ AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp)
 AC_ZEND_BROKEN_SPRINTF
 
-AC_CHECK_DECLS([isfinite, isnan, isinf], [], [], [[#include <math.h>]])
+AC_CHECK_FUNCS(finite isfinite isinf isnan)
 
 ZEND_FP_EXCEPT
 
@@ -107,7 +109,7 @@ ZEND_CHECK_FLOAT_PRECISION
 dnl test whether double cast to long preserves least significant bits
 AC_MSG_CHECKING(whether double cast to long preserves least significant bits)
 
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_TRY_RUN([
 #include <limits.h>
 
 int main()
@@ -127,7 +129,7 @@ int main()
 	}
 	exit(1);
 }
-]])], [
+], [
   AC_DEFINE([ZEND_DVAL_TO_LVAL_CAST_OK], 1, [Define if double cast to long preserves least significant bits])
   AC_MSG_RESULT(yes)
 ], [
@@ -135,7 +137,7 @@ int main()
 ], [
   AC_MSG_RESULT(no)
 ])
-
+	
 ])
 
 AC_DEFUN([LIBZEND_ENABLE_DEBUG],[
@@ -145,7 +147,7 @@ AC_ARG_ENABLE(debug,
   ZEND_DEBUG=$enableval
 ],[
   ZEND_DEBUG=no
-])
+])  
 
 ])
 
@@ -156,10 +158,10 @@ AC_ARG_ENABLE(maintainer-zts,
   ZEND_MAINTAINER_ZTS=$enableval
 ],[
   ZEND_MAINTAINER_ZTS=no
-])
+])  
 
 AC_ARG_ENABLE(inline-optimization,
-[  --disable-inline-optimization
+[  --disable-inline-optimization 
                           If building zend_execute.lo fails, try this switch],[
   ZEND_INLINE_OPTIMIZATION=$enableval
 ],[
@@ -193,7 +195,8 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
   AC_DEFINE(ZTS,1,[ ])
   CFLAGS="$CFLAGS -DZTS"
-fi
+  LIBZEND_CPLUSPLUS_CHECKS
+fi  
 
 changequote({,})
 if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
@@ -219,7 +222,7 @@ dnl test and set the alignment define for ZEND_MM
 dnl this also does the logarithmic test for ZEND_MM.
 AC_MSG_CHECKING(for MM alignment and log values)
 
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_TRY_RUN([
 #include <stdio.h>
 
 typedef union _mm_align_test {
@@ -246,16 +249,16 @@ int main()
   }
 
   fp = fopen("conftest.zend", "w");
-  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);
+  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);  
   fclose(fp);
 
   exit(0);
 }
-]])], [
+], [
   LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
   LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
   AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ])
-  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ])
+  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ]) 
 ], [], [
   dnl cross-compile needs something here
   LIBZEND_MM_ALIGN=8
@@ -266,7 +269,7 @@ AC_MSG_RESULT(done)
 dnl test for memory allocation using mmap(MAP_ANON)
 AC_MSG_CHECKING(for memory allocation using mmap(MAP_ANON))
 
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_TRY_RUN([
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -298,7 +301,7 @@ int main()
 	}
 	return 0;
 }
-]])], [
+], [
   AC_DEFINE([HAVE_MEM_MMAP_ANON], 1, [Define if the target system has support for memory allocation using mmap(MAP_ANON)])
   AC_MSG_RESULT(yes)
 ], [
@@ -311,7 +314,7 @@ int main()
 dnl test for memory allocation using mmap("/dev/zero")
 AC_MSG_CHECKING(for memory allocation using mmap("/dev/zero"))
 
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_TRY_RUN([
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -353,7 +356,7 @@ int main()
 	}
 	return 0;
 }
-]])], [
+], [
   AC_DEFINE([HAVE_MEM_MMAP_ZERO], 1, [Define if the target system has support for memory allocation using mmap("/dev/zero")])
   AC_MSG_RESULT(yes)
 ], [
@@ -367,11 +370,11 @@ AC_CHECK_FUNCS(mremap)
 
 
 AC_ARG_ENABLE(zend-signals,
-[  --disable-zend-signals  whether to enable zend signal handling],[
+[  --enable-zend-signals   Use zend signal handling],[
   ZEND_SIGNALS=$enableval
 ],[
-  ZEND_SIGNALS=yes
-])
+  ZEND_SIGNALS=no
+])  
 
 AC_CHECK_FUNC(sigaction, [
 	AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available])
@@ -388,24 +391,28 @@ AC_MSG_RESULT($ZEND_SIGNALS)
 
 ])
 
-AC_MSG_CHECKING(whether /dev/urandom exists)
-if test -r "/dev/urandom" && test -c "/dev/urandom"; then
+AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
+
+])
+
+AC_MSG_CHECKING(whether /dev/urandom exists) 
+if test -r "/dev/urandom" && test -c "/dev/urandom"; then 
   AC_DEFINE([HAVE_DEV_URANDOM], 1, [Define if the target system has /dev/urandom device])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
+  AC_MSG_RESULT(yes) 
+else 
+  AC_MSG_RESULT(no) 
 fi
 
-AC_MSG_CHECKING(whether /dev/arandom exists)
-if test -r "/dev/arandom" && test -c "/dev/arandom"; then
+AC_MSG_CHECKING(whether /dev/arandom exists) 
+if test -r "/dev/arandom" && test -c "/dev/arandom"; then 
   AC_DEFINE([HAVE_DEV_ARANDOM], 1, [Define if the target system has /dev/arandom device])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
+  AC_MSG_RESULT(yes) 
+else 
+  AC_MSG_RESULT(no) 
+fi 
 
 AC_ARG_ENABLE(gcc-global-regs,
-[  --disable-gcc-global-regs
+[  --disable-gcc-global-regs 
                           whether to enable GCC global register variables],[
   ZEND_GCC_GLOBAL_REGS=$enableval
 ],[
@@ -413,7 +420,7 @@ AC_ARG_ENABLE(gcc-global-regs,
 ])
 AC_MSG_CHECKING(for global register variables support)
 if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+  AC_TRY_COMPILE([
 #if defined(__GNUC__)
 # define ZEND_GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
 #else
@@ -446,8 +453,8 @@ int emu(const opcode_handler_t *ip, void *fp) {
 	FP = orig_fp;
 	IP = orig_ip;
 }
-  ]], [[
-  ]])], [
+  ], [
+  ], [
     ZEND_GCC_GLOBAL_REGS=yes
   ], [
     ZEND_GCC_GLOBAL_REGS=no
@@ -459,158 +466,3 @@ 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_RUN_IFELSE([AC_LANG_SOURCE([[
-#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_RUN_IFELSE([AC_LANG_SOURCE([[
-#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_RUN_IFELSE([AC_LANG_SOURCE([[
-#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_RUN_IFELSE([AC_LANG_SOURCE([[
-#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
-
-dnl
-dnl Check whether __cpuid_count is available
-dnl
-AC_CACHE_CHECK(whether __cpuid_count is available, ac_cv_cpuid_count_available, [
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-  #include <cpuid.h>
-]], [[
-  unsigned eax, ebx, ecx, edx;
-  __cpuid_count(0, 0, eax, ebx, ecx, edx);
-]])], [
-  ac_cv_cpuid_count_available=yes
-], [
-  ac_cv_cpuid_count_available=no
-])])
-if test "$ac_cv_cpuid_count_available" = "yes"; then
-  AC_DEFINE([HAVE_CPUID_COUNT], 1, [whether __cpuid_count is available])
-fi

Zend/ZendCore.dep

@@ -0,0 +1,258 @@
+# Microsoft Developer Studio Generated Dependency File, included by ZendCore.mak
+
+.\zend_alloc.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	
+
+.\alloca.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_config.w32.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_compile.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+.\zend_constants.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_operators.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_execute.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+.\zend_highlight.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_highlight.h"\
+	".\zend_llist.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_language_parser.tab.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_llist.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_llist.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_opcode.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+.\zend_operators.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_ptr_stack.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_ptr_stack.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_stack.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_stack.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_variables.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	".\zend_list.h"\
+	
+
+.\zend.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_operators.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_API.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	".\zend_list.h"\
+	
+
+.\zend_hash.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_config.w32.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_ini.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+

Zend/acinclude.m4

@@ -1,3 +1,5 @@
+dnl $Id$
+dnl
 dnl This file contains local autoconf functions.
 
 AC_DEFUN([LIBZEND_BISON_CHECK],[
@@ -5,7 +7,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
   # min: 2.4 (i.e. 204, major * 100 + minor for easier comparison)
   bison_version_min="204"
   # non-working versions, e.g. "3.0 3.2";
-  # remove "none" when introducing the first incompatible bison version an
+  # remove "none" when introducing the first incompatible bison version an 
   # separate any following additions by spaces
   bison_version_exclude=""
 
@@ -44,14 +46,16 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
 
 AC_DEFUN([ZEND_FP_EXCEPT],[
   AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+    AC_TRY_COMPILE([
 #include <floatingpoint.h>
-]],[[
+],[
 fp_except x = (fp_except) 0;
-]])],[
+],[
      ac_cv_type_fp_except=yes
 ],[
      ac_cv_type_fp_except=no
+],[
+     ac_cv_type_fp_except=no
 ])])
   if test "$ac_cv_type_fp_except" = "yes"; then
     AC_DEFINE(HAVE_FP_EXCEPT, 1, [whether floatingpoint.h defines fp_except])
@@ -63,7 +67,7 @@ dnl Check for broken sprintf()
 dnl
 AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
   AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
-    AC_RUN_IFELSE([AC_LANG_SOURCE([[main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }]])],[
+    AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
       ac_cv_broken_sprintf=no
     ],[
       ac_cv_broken_sprintf=yes
@@ -87,7 +91,8 @@ AC_DEFUN([AC_ZEND_C_BIGENDIAN],
 [AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian_php,
  [
   ac_cv_c_bigendian_php=unknown
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+  AC_TRY_RUN(
+  [
 int main(void)
 {
         short one = 1;
@@ -99,10 +104,10 @@ int main(void)
                 return(1);
         }
 }
-  ]])], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown])
+  ], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown])
  ])
  if test $ac_cv_c_bigendian_php = yes; then
-   AC_DEFINE(WORDS_BIGENDIAN, 1, [Define if processor uses big-endian word])
+   AC_DEFINE(WORDS_BIGENDIAN, [], [Define if processor uses big-endian word])
  fi
 ])
 
@@ -114,9 +119,9 @@ dnl x87 floating point internal precision control checks
 dnl See: http://wiki.php.net/rfc/rounding
 AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
   AC_MSG_CHECKING([for usable _FPU_SETCW])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+  AC_TRY_LINK([
     #include <fpu_control.h>
-  ]],[[
+  ],[
     fpu_control_t fpu_oldcw, fpu_cw;
     volatile double result;
     double a = 2877.0;
@@ -127,18 +132,18 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
     _FPU_SETCW(fpu_cw);
     result = a / b;
     _FPU_SETCW(fpu_oldcw);
-  ]])],[ac_cfp_have__fpu_setcw=yes],[ac_cfp_have__fpu_setcw=no])
+  ], [ac_cfp_have__fpu_setcw=yes], [ac_cfp_have__fpu_setcw=no])
   if test "$ac_cfp_have__fpu_setcw" = "yes" ; then
     AC_DEFINE(HAVE__FPU_SETCW, 1, [whether _FPU_SETCW is present and usable])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
   fi
-
+  
   AC_MSG_CHECKING([for usable fpsetprec])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+  AC_TRY_LINK([
     #include <machine/ieeefp.h>
-  ]],[[
+  ],[
     fp_prec_t fpu_oldprec;
     volatile double result;
     double a = 2877.0;
@@ -148,7 +153,7 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
     fpsetprec(FP_PD);
     result = a / b;
     fpsetprec(fpu_oldprec);
-  ]])], [ac_cfp_have_fpsetprec=yes], [ac_cfp_have_fpsetprec=no])
+  ], [ac_cfp_have_fpsetprec=yes], [ac_cfp_have_fpsetprec=no])
   if test "$ac_cfp_have_fpsetprec" = "yes" ; then
     AC_DEFINE(HAVE_FPSETPREC, 1, [whether fpsetprec is present and usable])
     AC_MSG_RESULT(yes)
@@ -157,9 +162,9 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
   fi
 
   AC_MSG_CHECKING([for usable _controlfp])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+  AC_TRY_LINK([
     #include <float.h>
-  ]],[[
+  ],[
     unsigned int fpu_oldcw;
     volatile double result;
     double a = 2877.0;
@@ -169,7 +174,7 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
     _controlfp(_PC_53, _MCW_PC);
     result = a / b;
     _controlfp(fpu_oldcw, _MCW_PC);
-  ]])], [ac_cfp_have__controlfp=yes], [ac_cfp_have__controlfp=no])
+  ], [ac_cfp_have__controlfp=yes], [ac_cfp_have__controlfp=no])
   if test "$ac_cfp_have__controlfp" = "yes" ; then
     AC_DEFINE(HAVE__CONTROLFP, 1, [whether _controlfp is present usable])
     AC_MSG_RESULT(yes)
@@ -178,9 +183,9 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
   fi
 
   AC_MSG_CHECKING([for usable _controlfp_s])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+  AC_TRY_LINK([
    #include <float.h>
-  ]],[[
+  ],[
     unsigned int fpu_oldcw, fpu_cw;
     volatile double result;
     double a = 2877.0;
@@ -191,7 +196,7 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
     _controlfp_s(&fpu_cw, _PC_53, _MCW_PC);
     result = a / b;
     _controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC);
-  ]])], [ac_cfp_have__controlfp_s=yes], [ac_cfp_have__controlfp_s=no])
+  ], [ac_cfp_have__controlfp_s=yes], [ac_cfp_have__controlfp_s=no])
   if test "$ac_cfp_have__controlfp_s" = "yes" ; then
     AC_DEFINE(HAVE__CONTROLFP_S, 1, [whether _controlfp_s is present and usable])
     AC_MSG_RESULT(yes)
@@ -200,9 +205,9 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
   fi
 
   AC_MSG_CHECKING([whether FPU control word can be manipulated by inline assembler])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+  AC_TRY_LINK([
     /* nothing */
-  ]],[[
+  ],[
     unsigned int oldcw, cw;
     volatile double result;
     double a = 2877.0;
@@ -215,7 +220,7 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
     result = a / b;
 
     __asm__ __volatile__ ("fldcw %0" : : "m" (*&oldcw));
-  ]])], [ac_cfp_have_fpu_inline_asm_x86=yes], [ac_cfp_have_fpu_inline_asm_x86=no])
+  ], [ac_cfp_have_fpu_inline_asm_x86=yes], [ac_cfp_have_fpu_inline_asm_x86=no])
   if test "$ac_cfp_have_fpu_inline_asm_x86" = "yes" ; then
     AC_DEFINE(HAVE_FPU_INLINE_ASM_X86, 1, [whether FPU control word can be manipulated by inline assembler])
     AC_MSG_RESULT(yes)

Zend/bench.php

@@ -5,18 +5,18 @@ if (function_exists("date_default_timezone_set")) {
 
 function simple() {
   $a = 0;
-  for ($i = 0; $i < 1000000; $i++)
+  for ($i = 0; $i < 1000000; $i++) 
     $a++;
 
   $thisisanotherlongname = 0;
-  for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++)
+  for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++) 
     $thisisanotherlongname++;
 }
 
 /****/
 
 function simplecall() {
-  for ($i = 0; $i < 1000000; $i++)
+  for ($i = 0; $i < 1000000; $i++) 
     strlen("hallo");
 }
 
@@ -26,14 +26,14 @@ function hallo($a) {
 }
 
 function simpleucall() {
-  for ($i = 0; $i < 1000000; $i++)
+  for ($i = 0; $i < 1000000; $i++) 
     hallo("hallo");
 }
 
 /****/
 
 function simpleudcall() {
-  for ($i = 0; $i < 1000000; $i++)
+  for ($i = 0; $i < 1000000; $i++) 
     hallo2("hallo");
 }
 
@@ -345,22 +345,22 @@ function strcat($n) {
 
 /*****/
 
-function gethrtime()
+function getmicrotime()
 {
-  $hrtime = hrtime();
-  return (($hrtime[0]*1000000000 + $hrtime[1]) / 1000000000);
+  $t = gettimeofday();
+  return ($t['sec'] + $t['usec'] / 1000000);
 }
 
 function start_test()
 {
 	ob_start();
-  return gethrtime();
+  return getmicrotime();
 }
 
 function end_test($start, $name)
 {
   global $total;
-  $end = gethrtime();
+  $end = getmicrotime();
   ob_end_clean();
   $total += $end-$start;
   $num = number_format($end-$start,3);
@@ -368,7 +368,7 @@ function end_test($start, $name)
 
   echo $name.$pad.$num."\n";
 	ob_start();
-  return gethrtime();
+  return getmicrotime();
 }
 
 function total()
@@ -418,5 +418,5 @@ sieve(30);
 $t = end_test($t, "sieve(30)");
 strcat(200000);
 $t = end_test($t, "strcat(200000)");
-total();
+total($t0, "Total");
 ?>

Zend/build.mk

@@ -4,6 +4,8 @@
 #        make -f build.mk
 #
 # Written by Sascha Schumann
+#
+# $Id$ 
 
 
 LT_TARGETS = ltmain.sh ltconfig
@@ -28,14 +30,14 @@ $(LT_TARGETS):
 $(makefile_in_files): $(makefile_am_files)
 	automake -a -i $(AMFLAGS) $(makefile_files)
 
-aclocal.m4: configure.ac acinclude.m4
+aclocal.m4: configure.in acinclude.m4
 	aclocal
 
-$(config_h_in): configure.ac
-# explicitly remove target since autoheader does not seem to work
+$(config_h_in): configure.in
+# explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
 	autoheader
 
-configure: aclocal.m4 configure.ac
+configure: aclocal.m4 configure.in
 	autoconf

Zend/buildconf

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

Zend/configure.ac

@@ -1,133 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(zend.c)
-AM_INIT_AUTOMAKE(zend, 0.80A, nodefine)
-AM_CONFIG_HEADER(zend_config.h)
-AM_SANITY_CHECK
-AM_MAINTAINER_MODE
-AC_PROG_CC
-AM_PROG_CC_STDC
-ZEND_VERSION=$VERSION
-AC_ZEND_C_BIGENDIAN
-
-AH_TOP([
-#if defined(__GNUC__) && __GNUC__ >= 4
-# define ZEND_API __attribute__ ((visibility("default")))
-# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
-#else
-# define ZEND_API
-# define ZEND_DLEXPORT
-#endif
-
-#define ZEND_DLIMPORT
-
-#undef uint
-#undef ulong
-])
-
-AH_BOTTOM([
-#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifdef HAVE_IEEEFP_H
-# include <ieeefp.h>
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#if ZEND_BROKEN_SPRINTF
-int zend_sprintf(char *buffer, const char *format, ...);
-#else
-# define zend_sprintf sprintf
-#endif
-
-#include <math.h>
-
-#ifndef zend_isnan
-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
-#define zend_isnan(a) isnan(a)
-#elif defined(HAVE_FPCLASS)
-#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
-#else
-#define zend_isnan(a) ((a) != (a))
-#endif
-#endif
-
-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
-#define zend_isinf(a) isinf(a)
-#elif defined(INFINITY)
-/* Might not work, but is required by ISO C99 */
-#define zend_isinf(a) (((a)==INFINITY || (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
-
-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
-#define zend_finite(a) isfinite(a)
-#elif defined(HAVE_FINITE)
-#define zend_finite(a) finite(a)
-#elif defined(fpclassify)
-#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
-#else
-#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
-#endif
-
-#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
-
-])
-
-dnl We want this one before the checks, so the checks can modify CFLAGS.
-test -z "$CFLAGS" && auto_cflags=1
-
-AC_CHECK_SIZEOF(long, 8)
-AC_CHECK_SIZEOF(int, 4)
-
-sinclude(Zend.m4)
-
-LIBZEND_BASIC_CHECKS
-LIBZEND_LIBDL_CHECKS
-LIBZEND_DLSYM_CHECK
-
-AM_PROG_LIBTOOL
-if test "$enable_debug" != "yes"; then
-  AM_SET_LIBTOOL_VARIABLE([--silent])
-fi
-
-dnl
-dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary
-dnl and source packages.  This should be harmless on other OSs.
-dnl
-if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
-       CFLAGS="$CFLAGS -I/usr/pkg/include"
-       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
-fi
-
-LIBZEND_ENABLE_DEBUG
-LIBZEND_OTHER_CHECKS
-
-ZEND_EXTRA_LIBS="$LIBS"
-LIBS=""
-AC_SUBST(ZEND_EXTRA_LIBS)
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-
-# Local Variables:
-# tab-width: 4
-# End:

Zend/configure.in

@@ -0,0 +1,149 @@
+dnl $Id$
+dnl Process this file with autoconf to produce a configure script.
+
+AC_INIT(zend.c)
+AM_INIT_AUTOMAKE(zend, 0.80A, nodefine)
+AM_CONFIG_HEADER(zend_config.h)
+AM_SANITY_CHECK
+AM_MAINTAINER_MODE
+AC_PROG_CC
+AM_PROG_CC_STDC
+ZEND_VERSION=$VERSION
+AC_ZEND_C_BIGENDIAN
+
+AH_TOP([
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define ZEND_API __attribute__ ((visibility("default")))
+# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
+#else
+# define ZEND_API
+# define ZEND_DLEXPORT
+#endif
+
+#define ZEND_DLIMPORT
+
+#undef uint
+#undef ulong
+
+/* Define if you want to enable memory limit support */
+#define MEMORY_LIMIT 0
+])
+
+AH_BOTTOM([
+#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifdef HAVE_IEEEFP_H
+# include <ieeefp.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#if ZEND_BROKEN_SPRINTF
+int zend_sprintf(char *buffer, const char *format, ...);
+#else
+# define zend_sprintf sprintf
+#endif
+
+#include <math.h>
+
+/* To enable the is_nan, is_infinite and is_finite PHP functions */
+#ifdef NETWARE
+	#define HAVE_ISNAN 1
+	#define HAVE_ISINF 1
+	#define HAVE_ISFINITE 1
+#endif
+
+#ifndef zend_isnan
+#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
+#endif
+
+#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
+
+#if defined(HAVE_ISFINITE) || defined(isfinite)
+#define zend_finite(a) isfinite(a)
+#elif defined(HAVE_FINITE)
+#define zend_finite(a) finite(a)
+#elif defined(fpclassify)
+#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
+#else
+#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
+#endif
+
+#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.
+test -z "$CFLAGS" && auto_cflags=1
+
+AC_CHECK_SIZEOF(long, 8)
+AC_CHECK_SIZEOF(int, 4)
+
+sinclude(Zend.m4)
+
+LIBZEND_BASIC_CHECKS
+LIBZEND_LIBDL_CHECKS
+LIBZEND_DLSYM_CHECK
+
+AM_PROG_LIBTOOL
+if test "$enable_debug" != "yes"; then
+  AM_SET_LIBTOOL_VARIABLE([--silent])
+fi
+
+dnl
+dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary
+dnl and source packages.  This should be harmless on other OSs.
+dnl
+if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
+       CFLAGS="$CFLAGS -I/usr/pkg/include"
+       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+fi
+
+LIBZEND_ENABLE_DEBUG
+LIBZEND_OTHER_CHECKS
+
+ZEND_EXTRA_LIBS="$LIBS"
+LIBS=""
+AC_SUBST(ZEND_EXTRA_LIBS)
+AC_OUTPUT(Makefile)
+
+# Local Variables:
+# tab-width: 4
+# End:

Zend/header

@@ -15,3 +15,5 @@
    | Authors:                                                             |
    +----------------------------------------------------------------------+
 */
+
+/* $Id$ */

Zend/micro_bench.php

@@ -4,12 +4,12 @@ function hallo() {
 }
 
 function simpleucall($n) {
-  for ($i = 0; $i < $n; $i++)
+  for ($i = 0; $i < $n; $i++) 
     hallo();
 }
 
 function simpleudcall($n) {
-  for ($i = 0; $i < $n; $i++)
+  for ($i = 0; $i < $n; $i++) 
     hallo2();
 }
 
@@ -17,7 +17,7 @@ function hallo2() {
 }
 
 function simpleicall($n) {
-  for ($i = 0; $i < $n; $i++)
+  for ($i = 0; $i < $n; $i++) 
     func_num_args();
 }
 
@@ -238,23 +238,23 @@ function empty_loop($n) {
 	}
 }
 
-function gethrtime()
+function getmicrotime()
 {
-  $hrtime = hrtime();
-  return (($hrtime[0]*1000000000 + $hrtime[1]) / 1000000000);
+  $t = gettimeofday();
+  return ($t['sec'] + $t['usec'] / 1000000);
 }
 
 function start_test()
 {
   ob_start();
-  return gethrtime();
+  return getmicrotime();
 }
 
 function end_test($start, $name, $overhead = null)
 {
   global $total;
   global $last_time;
-  $end = gethrtime();
+  $end = getmicrotime();
   ob_end_clean();
   $last_time = $end-$start;
   $total += $last_time;
@@ -267,7 +267,7 @@ function end_test($start, $name, $overhead = null)
     echo $name.$pad.$num."    ".$num2."\n";
   }
   ob_start();
-  return gethrtime();
+  return getmicrotime();
 }
 
 function total()

Zend/tests/001.phpt

@@ -17,20 +17,11 @@ function test3($a, $b) {
 
 test1();
 test2(1);
-try {
-	test2();
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
-
+test2();
 test3(1,2);
 
 call_user_func("test1");
-try {
-	call_user_func("test3", 1);
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
+call_user_func("test3", 1);
 call_user_func("test3", 1, 2);
 
 class test {
@@ -44,13 +35,17 @@ 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
+
+Warning: Missing argument 1 for test2(), called in %s on line %d
+int(0)
 int(2)
 int(0)
-Exception: Too few arguments to function test3(), 1 passed in %s001.php on line 27 and exactly 2 expected
+
+Warning: Missing argument 2 for test3()%s
+int(1)
 int(2)
 int(1)
 

Zend/tests/002.phpt

@@ -23,19 +23,11 @@ function test3($a, $b) {
 test1();
 test1(10);
 test2(1);
-try {
-	test2();
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
+test2();
 test3(1,2);
 
 call_user_func("test1");
-try {
-	call_user_func("test3", 1);
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
+call_user_func("test3", 1);
 call_user_func("test3", 1, 2);
 
 class test {
@@ -50,7 +42,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)
 
@@ -70,7 +62,14 @@ int(1)
 
 Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
 bool(false)
-Exception: Too few arguments to function test2(), 0 passed in %s002.php on line %d and exactly 1 expected
+
+Warning: Missing argument 1 for test2(), called in %s on line %d and defined in %s on line %d
+
+Warning: func_get_arg():  Argument 0 not passed to function in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
+bool(false)
 int(1)
 int(2)
 
@@ -85,7 +84,15 @@ bool(false)
 
 Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
 bool(false)
-Exception: Too few arguments to function test3(), 1 passed in %s002.php on line %d and exactly 2 expected
+
+Warning: Missing argument 2 for test3()%s
+int(1)
+
+Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  Argument 2 not passed to function in %s on line %d
+bool(false)
 int(1)
 int(2)
 

Zend/tests/003.phpt

@@ -18,19 +18,11 @@ function test3($a, $b) {
 test1();
 test1(10);
 test2(1);
-try {
-	test2();
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
+test2();
 test3(1,2);
 
 call_user_func("test1");
-try {
-	call_user_func("test3", 1);
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
+call_user_func("test3", 1);
 call_user_func("test3", 1, 2);
 
 class test {
@@ -44,7 +36,7 @@ var_dump(func_get_args());
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECTF--	
 array(0) {
 }
 array(1) {
@@ -55,7 +47,10 @@ array(1) {
   [0]=>
   int(1)
 }
-Exception: Too few arguments to function test2(), 0 passed in %s003.php on line %d and exactly 1 expected
+
+Warning: Missing argument 1 for test2(), called in %s on line %d and defined in %s on line %d
+array(0) {
+}
 array(2) {
   [0]=>
   int(1)
@@ -64,7 +59,12 @@ array(2) {
 }
 array(0) {
 }
-Exception: Too few arguments to function test3(), 1 passed in %s003.php on line %d and exactly 2 expected
+
+Warning: Missing argument 2 for test3()%s
+array(1) {
+  [0]=>
+  int(1)
+}
 array(2) {
   [0]=>
   int(1)

Zend/tests/004.phpt

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

Zend/tests/005.phpt

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

Zend/tests/006.phpt

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

Zend/tests/007.phpt

@@ -21,12 +21,10 @@ 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
 

Zend/tests/008.phpt

@@ -14,8 +14,7 @@ var_dump(define("[[[", 2));
 var_dump(define("test const", 3));
 var_dump(define("test const", 3));
 var_dump(define("test", array(1)));
-var_dump(define("test1", fopen(__FILE__, 'r')));
-var_dump(define("test2", new stdclass));
+var_dump(define("test1", new stdclass));
 
 var_dump(constant(" "));
 var_dump(constant("[[["));
@@ -23,7 +22,7 @@ var_dump(constant("test const"));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECTF--	
 Warning: define() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
@@ -31,7 +30,7 @@ Warning: define() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 bool(true)
 
-Warning: define() expects parameter 3 to be bool, array given in %s on line %d
+Warning: define() expects parameter 3 to be boolean, array given in %s on line %d
 NULL
 
 Warning: define() expects parameter 1 to be string, array given in %s on line %d
@@ -43,9 +42,8 @@ bool(true)
 Notice: Constant test const already defined in %s on line %d
 bool(false)
 bool(true)
-bool(true)
 
-Warning: Constants may only evaluate to scalar values, arrays or resources in %s on line %d
+Warning: Constants may only evaluate to scalar values or arrays in %s on line %d
 bool(false)
 int(1)
 int(2)

Zend/tests/009.phpt

@@ -7,10 +7,6 @@ class foo {
 	function bar () {
 		var_dump(get_class());
 	}
-    function testNull ()
-    {
-        var_dump(get_class(null));
-    }
 }
 
 class foo2 extends foo {
@@ -31,11 +27,9 @@ 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"
 
@@ -51,7 +45,4 @@ 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

Zend/tests/010.phpt

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

Zend/tests/011.phpt

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

Zend/tests/012.phpt

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

Zend/tests/013.phpt

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

Zend/tests/014.phpt

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

Zend/tests/015.phpt

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

Zend/tests/016.phpt

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

Zend/tests/017.phpt

@@ -26,6 +26,7 @@ var_dump(count(get_defined_constants()));
 function test () {
 }
 
+var_dump(get_defined_functions(true));
 var_dump(gettype(get_defined_functions()));
 var_dump(count(get_defined_functions()));
 
@@ -43,7 +44,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
 
@@ -64,6 +65,9 @@ NULL
 string(5) "array"
 string(5) "array"
 int(%d)
+
+Warning: get_defined_functions() expects exactly 0 parameters, 1 given in %s on line %d
+NULL
 string(5) "array"
 int(%d)
 

Zend/tests/018.phpt

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

Zend/tests/019.phpt

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

Zend/tests/020.phpt

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

Zend/tests/024.phpt

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

Zend/tests/026.phpt

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

Zend/tests/030.phpt

@@ -7,7 +7,7 @@ class foo {
 	public $test = 0;
 	private $test_2 = 1;
 	protected $test_3 = 2;
-
+	
 	public function bar() {
 		try {
 			throw new Exception('foo');
@@ -15,13 +15,13 @@ class foo {
 			var_dump($this);
 		}
 
-		$this->baz();
+		$this->baz();		
 	}
-
+	
 	public function baz() {
 		foreach ($this as $k => $v) {
 			printf("'%s' => '%s'\n", $k, $v);
-		}
+		}		
 		print "ok\n";
 	}
 }
@@ -31,4 +31,40 @@ $test->bar();
 
 ?>
 --EXPECTF--
-Fatal error: Cannot re-assign $this in %s030.php on line 11
+object(Exception)#%d (7) {
+  ["message":protected]=>
+  string(3) "foo"
+  ["string":"Exception":private]=>
+  string(0) ""
+  ["code":protected]=>
+  int(0)
+  ["file":protected]=>
+  string(%d) "%s030.php"
+  ["line":protected]=>
+  int(%d)
+  ["trace":"Exception":private]=>
+  array(1) {
+    [0]=>
+    array(6) {
+      ["file"]=>
+      string(%d) "%s030.php"
+      ["line"]=>
+      int(%d)
+      ["function"]=>
+      string(3) "bar"
+      ["class"]=>
+      string(3) "foo"
+      ["type"]=>
+      string(2) "->"
+      ["args"]=>
+      array(0) {
+      }
+    }
+  }
+  ["previous":"Exception":private]=>
+  NULL
+}
+'test' => '0'
+'test_2' => '1'
+'test_3' => '2'
+ok

Zend/tests/031.phpt

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

Zend/tests/032.phpt

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

Zend/tests/033.phpt

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

Zend/tests/034.phpt

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

Zend/tests/ArrayAccess_indirect_append.phpt

@@ -1,43 +0,0 @@
---TEST--
-Using indirect append on ArrayAccess object
---FILE--
-<?php
-
-class AA implements ArrayAccess {
-    private $data = [];
-    public function &offsetGet($name) {
-        if (null === $name) {
-            return $this->data[];
-        } else {
-            return $this->data[$name];
-        }
-    }
-    public function offsetSet($name, $value) {
-        $this->data[$name] = $value;
-    }
-    public function offsetUnset($name) {}
-    public function offsetExists($name) {}
-}
-
-$aa = new AA;
-$aa[3] = 1;
-$aa[][][0] = 2;
-var_dump($aa);
-
-?>
---EXPECT--
-object(AA)#1 (1) {
-  ["data":"AA":private]=>
-  array(2) {
-    [3]=>
-    int(1)
-    [4]=>
-    array(1) {
-      [0]=>
-      array(1) {
-        [0]=>
-        int(2)
-      }
-    }
-  }
-}

Zend/tests/abstract-static.phpt

@@ -8,5 +8,6 @@ abstract class TestClass
 }
 ?>
 ===DONE===
---EXPECT--
+--EXPECTF--
+
 ===DONE===