Fix weird asm instruction order with gcc by marking as volatile in phpdbg

.appveyor.yml

@@ -1,60 +0,0 @@
-version: "{branch}.build.{build}"
-
-image: Visual Studio 2017
-
-branches:
-        except:
-                - PHP-5.6
-                - PHP-7.0
-
-clone_depth: 64
-
-skip_commits:
-  files:
-    - docs/*
-    - NEWS
-    - UPGRADING
-    - UPGRADING.INTERNALS
-
-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.0
-        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
-                  PARALLEL: -j2
-                - THREAD_SAFE: 1
-                  OPCACHE: 1
-                  PARALLEL: -j2
-                  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,34 +0,0 @@
-# https://editorconfig.org/
-
-root = true
-
-[*]
-trim_trailing_whitespace = true
-insert_final_newline     = true
-end_of_line              = lf
-charset                  = utf-8
-tab_width                = 4
-
-[{*.{awk,bat,c,cpp,d,h,l,re,skl,w32,y},Makefile*}]
-indent_size              = 4
-indent_style             = tab
-
-[*.{dtd,html,inc,php,phpt,rng,wsdl,xml,xsd,xsl}]
-indent_size              = 4
-indent_style             = space
-
-[*.{ac,m4,sh,yml}]
-indent_size              = 2
-indent_style             = space
-
-[*.md]
-indent_style             = space
-max_line_length          = 80
-
-[COMMIT_EDITMSG]
-indent_size              = 4
-indent_style             = space
-max_line_length          = 80
-
-[*.patch]
-trim_trailing_whitespace = false

.gdbinit

@@ -5,7 +5,7 @@ end
 document set_ts
 	set the ts resource, it is impossible for gdb to
 	call ts_resource_ex while no process is running,
-	but we could get the resource from the argument
+	but we could get the resource from the argument 
 	of frame info.
 end
 
@@ -16,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
@@ -114,7 +101,7 @@ define dump_bt
 					____print_str $zvalue->value.str->val $zvalue->value.str->len
 				end
 				if $type == 7
-					printf "array(%d)[%p]", $zvalue->value.arr->nNumOfElements, $zvalue
+					printf "array(%d)[%p]", $zvalue->value.arr->ht->nNumOfElements, $zvalue
 				end
 				if $type == 8
 					printf "object[%p]", $zvalue
@@ -153,7 +140,7 @@ end
 
 define printzv
 	set $ind = 1
-	____printzv $arg0 0
+	____printzv $arg0 0 
 end
 
 document printzv
@@ -165,15 +152,15 @@ define ____printzv_contents
 	set $type = $zvalue->u1.v.type
 
 	# 15 == IS_INDIRECT
-	if $type > 5 && $type < 12
-		printf "(refcount=%d) ", $zvalue->value.counted->gc.refcount
+	if $type >= 5 && $type != 15
+		printf "(refcount=%d) ", $zvalue->value.counted->refcount
 	end
 
 	if $type == 0
 		printf "UNDEF"
 	end
 	if $type == 1
-		printf "NULL"
+        printf "NULL"
 	end
 	if $type == 2
 		printf "bool: false"
@@ -181,20 +168,20 @@ 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
-			____print_ht $zvalue->value.arr 1
+			____print_ht $zvalue->value.arr
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0
@@ -209,14 +196,13 @@ 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
-					printf "\nProperties "
-					set $ht = $zobj->properties
+				set $ht = $zobj->properties
+				if $ht
 					set $ind = $ind + 1
 					____print_ht $ht 1
 					set $ind = $ind - 1
@@ -226,19 +212,7 @@ define ____printzv_contents
 						set $i = $i - 1
 					end
 				else
-					printf " {\n"
-					set $ht = &$zobj->ce->properties_info
-					set $k = 0
-					set $num = $ht->nNumUsed
-					while $k < $num
-						set $p = (Bucket*)($ht->arData + $k)
-						set $name = $p->key
-						set $prop = (zend_property_info*)$p->val.value.ptr
-						set $val = (zval*)((char*)$zobj + $prop->offset)
-						printf "%s => ", $name->val
-						printzv $val
-						set $k = $k + 1
-					end
+					echo "no properties found"
 				end
 			end
 		end
@@ -255,34 +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 "_IS_BOOL"
+	end
+	if $type == 14
+		printf "IS_CALLABLE"
+	end
+	if $type == 15
 		printf "indirect: "
 		____printzv $zvalue->value.zv $arg1
 	end
-	if $type == 14
-		printf "pointer: %p", $zvalue->value.ptr
-	end
-	if $type == 15
-		printf "_ERROR"
-	end
 	if $type == 16
-		printf "_BOOL"
+		printf "string_offset"
 	end
 	if $type == 17
-		printf "CALLABLE"
+		printf "pointer: %p", $zvalue->value.ptr
 	end
-	if $type == 18
-		printf "ITERABLE"
-	end
-	if $type == 19
-		printf "VOID"
-	end
-	if $type == 20
-		printf "_NUMBER"
-	end
-	if $type > 20
+	if $type > 17
 		printf "unknown type %d", $type
 	end
 	printf "\n"
@@ -298,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
@@ -351,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
@@ -370,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
@@ -400,7 +371,7 @@ document print_htptr
 end
 
 define print_htstr
-	set $ind = 0
+	set $ind = 0 
 	____print_ht $arg0 2
 end
 
@@ -484,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
@@ -501,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]
@@ -554,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
@@ -587,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
@@ -603,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
@@ -632,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,19 +1,180 @@
-# Replace $Id$ strings with 40-character hexadecimal blob object name.
-/ext/ext_skel.php               ident
-/ext/phar/phar/pharcommand.inc  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
-/run-tests.php                  ident
-
-# A custom merge driver to avoid automatic merges. These are manually merged.
-# See https://wiki.php.net/vcs/gitfaq
-/NEWS                merge=NEWS
-/UPGRADING           merge=NEWS
-/UPGRADING.INTERNALS merge=NEWS
-
-# Enable commit diffs for binary PHP test files. Some PHP test files include
-# special characters, such as ASCII control characters. Git recognizes these as
-# binary and wouldn't generate diffs.
-*.phpt diff
+ext/mysqlnd/mysqlnd.h           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
+/ext/iconv/tests/iconv_strpos_variation2.phpt	-crlf
+/ext/mbstring/tests/mb_strtoupper_error2.phpt	-crlf
+/ext/phar/tests/delete_in_phar_confirm.phpt	-crlf
+/ext/phar/tests/frontcontroller12.phpt	-crlf
+/ext/phar/tests/security.phpt	-crlf
+/ext/phar/tests/test_signaturealgos.phpt	-crlf
+/ext/reflection/tests/ReflectionMethod_invokeArgs_basic.phpt	-crlf
+/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt	-crlf
+/ext/spl/tests/dllist_007.phpt	-crlf
+/ext/spl/tests/iterator_012.phpt	-crlf
+/ext/spl/tests/SplArray_fromArray.phpt	-crlf
+/ext/standard/tests/dir/scandir_variation3.phpt	-crlf
+/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt	-crlf
+/ext/standard/tests/strings/bug26817.phpt	-crlf
+/ext/standard/tests/strings/bug26973.phpt	-crlf
+/ext/standard/tests/strings/bug27457.phpt	-crlf
+/ext/standard/tests/strings/bug28386.phpt	-crlf
+/ext/standard/tests/strings/bug37262.phpt	-crlf
+/ext/standard/tests/strings/bug40637.phpt	-crlf
+/ext/standard/tests/strings/bug40915.phpt	-crlf
+/ext/standard/tests/strings/bug61374.phpt	-crlf
+/ext/standard/tests/strings/chop_error.phpt	-crlf
+/ext/standard/tests/strings/chop_variation2.phpt	-crlf
+/ext/standard/tests/strings/chunk_split_variation10.phpt	-crlf
+/ext/standard/tests/strings/chunk_split_variation8.phpt	-crlf
+/ext/standard/tests/strings/count_chars_variation2.phpt	-crlf
+/ext/standard/tests/strings/dirname_error.phpt	-crlf
+/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt	-crlf
+/ext/standard/tests/strings/highlight_file.phpt	-crlf
+/ext/standard/tests/strings/htmlentities03.phpt	-crlf
+/ext/standard/tests/strings/htmlentities04.phpt	-crlf
+/ext/standard/tests/strings/htmlentities08.phpt	-crlf
+/ext/standard/tests/strings/htmlentities15.phpt	-crlf
+/ext/standard/tests/strings/http_build_query.phpt	-crlf
+/ext/standard/tests/strings/metaphone.phpt	-crlf
+/ext/standard/tests/strings/ord_error.phpt	-crlf
+/ext/standard/tests/strings/printf_basic2.phpt	-crlf
+/ext/standard/tests/strings/printf_variation2.phpt	-crlf
+/ext/standard/tests/strings/quoted_printable_decode_basic.phpt	-crlf
+/ext/standard/tests/strings/rtrim.phpt	-crlf
+/ext/standard/tests/strings/setlocale_variation1.phpt	-crlf
+/ext/standard/tests/strings/sha1_basic.phpt	-crlf
+/ext/standard/tests/strings/similar_text_basic.phpt	-crlf
+/ext/standard/tests/strings/soundex.phpt	-crlf
+/ext/standard/tests/strings/sprintf_basic1.phpt	-crlf
+/ext/standard/tests/strings/sprintf_basic4.phpt	-crlf
+/ext/standard/tests/strings/sprintf_basic7.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation12.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation28.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation29.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation30.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation31.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation38.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation42.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation6.phpt	-crlf
+/ext/standard/tests/strings/sscanf_basic2.phpt	-crlf
+/ext/standard/tests/strings/sscanf_basic3.phpt	-crlf
+/ext/standard/tests/strings/str_getcsv_001.phpt	-crlf
+/ext/standard/tests/strings/stripcslashes_basic.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation11.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation13.phpt	-crlf
+/ext/standard/tests/strings/stripslashes_variation1.phpt	-crlf
+/ext/standard/tests/strings/stripslashes_variation2.phpt	-crlf
+/ext/standard/tests/strings/stristr_error.phpt	-crlf
+/ext/standard/tests/strings/strnatcasecmp_basic.phpt	-crlf
+/ext/standard/tests/strings/strncasecmp_variation6.phpt	-crlf
+/ext/standard/tests/strings/strncasecmp_variation7.phpt	-crlf
+/ext/standard/tests/strings/strncasecmp_variation8.phpt	-crlf
+/ext/standard/tests/strings/strrchr_error.phpt	-crlf
+/ext/standard/tests/strings/strrchr.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation11.phpt	-crlf
+/ext/standard/tests/strings/strrpos_error.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation4.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation8.phpt	-crlf
+/ext/standard/tests/strings/strstr2.phpt	-crlf
+/ext/standard/tests/strings/strtok_error.phpt	-crlf
+/ext/standard/tests/strings/strtok_variation2.phpt	-crlf
+/ext/standard/tests/strings/strtolower-win32.phpt	-crlf
+/ext/standard/tests/strings/substr_compare.phpt	-crlf
+/ext/standard/tests/strings/ucwords_variation1.phpt	-crlf
+/ext/standard/tests/strings/unpack.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation12.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation7.phpt	-crlf
+/ext/standard/tests/strings/vprintf_basic2.phpt	-crlf
+/ext/standard/tests/strings/vprintf_basic7_64bit.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation10.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation14_64bit.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation17.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation4.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_basic4.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_basic8.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation17.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation7.phpt	-crlf
+/ext/standard/tests/strings/wordwrap.phpt	-crlf
+/ext/standard/tests/strings/wordwrap_variation5.phpt	-crlf
+/ext/standard/tests/url/rawurldecode_variation_001.phpt	-crlf
+/ext/tidy/tests/009.phpt	-crlf
+/ext/tidy/tests/013.phpt	-crlf
+/ext/tidy/tests/021.phpt	-crlf
+/ext/tidy/tests/tidy_error.phpt	-crlf
+/ext/tokenizer/tests/002.phpt	-crlf
+/ext/tokenizer/tests/bug26463.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_error.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation11.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation12.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation13.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation14.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation15.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation18.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation19.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation1.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation2.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation3.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation5.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation8.phpt	-crlf
+/ext/xml/tests/bug32001b.phpt		-crlf
+/ext/xmlwriter/tests/OO_003.phpt	-crlf
+/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt	-crlf
+/ext/zlib/tests/008.phpt			-crlf
+/ext/zlib/tests/gzopen_variation4.phpt	-crlf
+/ext/zlib/tests/gzrewind_error.phpt	-crlf
+/ext/zlib/tests/readgzfile_variation7.phpt	-crlf
+/ext/zlib/tests/readgzfile_variation8.phpt	-crlf
+/ext/zlib/tests/zlib_scheme_stat_basic.phpt	-crlf
+/sapi/cli/tests/006.phpt			-crlf
+/tests/run-test/test009.phpt		-crlf
+/Zend/tests/012.phpt				-crlf
+/Zend/tests/bug28072.phpt			-crlf
+/Zend/tests/bug38624.phpt			-crlf
+/Zend/tests/bug40784.phpt			-crlf
+/Zend/tests/bug43053.phpt			-crlf
+/Zend/tests/bug51176.phpt			-crlf
+/Zend/tests/each_003.phpt			-crlf
+/Zend/tests/errmsg_006.phpt			-crlf

.gitignore

@@ -1,283 +1,287 @@
-# These files are generated during building or development and are intentionally
-# untracked to ignore by Git. For other development environment specific files,
-# such as editor configuration, a good practice is to exclude them using the
-# .git/info/exclude in the cloned repository or a global .gitignore file.
-
-# ------------------------------------------------------------------------------
-# Common files ignored across the repository
-# ------------------------------------------------------------------------------
-
-# Backup copies created by various editors or development tools
+# General Ignores
 *~
-
-# Patches downloaded to patch files or to apply open source contributions
-*.patch
-
-# Swap files created by editors and tools to indicate a locked file
-*.swp
-
-# Various temporary generated files
-*.tmp
-
-# ------------------------------------------------------------------------------
-# Generated by the PHP build system
-# ------------------------------------------------------------------------------
-
-# Archive library containing .o files, generated during build process
-*.a
-
-# Libtool library files generated during build process
+.#*
+*.
+*.slo
+*.mk
+*.mem
+*.gcda
+*.gcno
 *.la
-
-# Directories created by Libtool for storing generated library files
-.libs/
-
-# Library object files generated during build process
 *.lo
-
-# Temporary library object files generated by compiler and libtool due to failure
 *.loT
-
-# Standard object files generated during build process
 *.o
-
-# Cache directories created by Autoconf tools
-autom4te.cache/
-
-# Cache file(s) generated by Autoconf's configure when run as `configure -C`
-config.cache
-
-# A log file(s) generated by Autoconf during *nix build system
-config.log
-
-# Helper(s) generated by *nix build system to save the last configure command
-config.nice
-
-# Generated by Autoconf's configure script for instantiating templates
-config.status
-
-# Main *nix build system configuration script(s) generated by Autoconf
-configure
-
-# Generated by `./configure` when test programs create temporary files
-confdefs.h
-conftest*
-
-# Generated by configure scripts on all systems
-/main/internal_functions.c
-/main/internal_functions_cli.c
-
-# The Libtool script(s) generated by the *nix build system
-libtool
-
-# Makefile(s) generated from Makefile fragment templates by `./configure`
+*.a
+*.ncb
+*.opt
+*.plg
+*swp
+*.patch
+*.tgz
+*.tar.gz
+*.tar.bz2
+*.tar.xz
+.FBCIndex
+.FBCLockFolder
+.deps
+.libs
+phpt.*
+core
+dynlib.m4
+Debug
+Debug_TS
 Makefile
 Makefile.fragments
 Makefile.objects
-
-# Directories for shared object files and headers generated by `./configure`
-include/
-libs/
-modules/
-
-# ------------------------------------------------------------------------------
-# Configuration headers generated by the PHP build system
-# ------------------------------------------------------------------------------
+Release
+Release_TS
+Release_TSDbg
+Release_TS_inline
+Release_inline
+ZendEngine1
+_libs
+acconfig.h
+aclocal.m4
+autom4te.cache
+bsd_converted
+buildconf.stamp
+buildmk.stamp
+confdefs.h
 config.h
+config.guess
+config.cache
 config.h.in
-/ext/date/lib/timelib_config.h
-/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_broken_ignore.h
-/ext/iconv/php_iconv_supports_errno.h
-/ext/iconv/php_php_iconv_h_path.h
-/ext/iconv/php_php_iconv_impl.h
-/main/build-defs.h
-/main/php_config.h.in
-/main/php_config.h
-/Zend/zend_config.h
-
-# ------------------------------------------------------------------------------
-# Manual (man 1 and 8) pages generated from templates for *nix alike systems
-# ------------------------------------------------------------------------------
-/ext/phar/phar.1
-/ext/phar/phar.phar.1
-/sapi/cgi/php-cgi.1
-/sapi/cli/php.1
-/sapi/fpm/php-fpm.1
-/sapi/fpm/php-fpm.8
-/sapi/phpdbg/phpdbg.1
-/scripts/man1/*.1
-
-# ------------------------------------------------------------------------------
-# SAPIs specific ignores
-# ------------------------------------------------------------------------------
-/sapi/apache2handler/libphp7.module
-/sapi/fpm/fpm/php-cgi
-/sapi/fpm/init.d.php-fpm
-/sapi/fpm/php-fpm.conf
-/sapi/fpm/php-fpm.service
-/sapi/fpm/status.html
-/sapi/fpm/www.conf
-
-# ------------------------------------------------------------------------------
-# Executable binaries and scripts generated during the build process
-# ------------------------------------------------------------------------------
-/ext/phar/phar.phar
-/ext/phar/phar.php
-/pear/install-pear-nozlib.phar
-/sapi/cgi/php-cgi
-/sapi/fpm/php-fpm
-/sapi/phpdbg/phpdbg
-/scripts/php-config
-/scripts/phpize
+config.log
+config.nice
+config.nice.bat
+config.status
+config.sub
+config_vars.mk
+configuration-parser.c
+configuration-parser.h
+configuration-parser.output
+configuration-scanner.c
+configure
+configure.bat
+configure.js
+conftest
+conftest.c
+debug.log
+diff
+generated_lists
+include
+install-sh
+internal_functions.c
+lcov_data
+lcov_html
+libs
+libtool
+meta_cc
+meta_ccld
+missing
+mkinstalldirs
+modules
 php
-
-# ------------------------------------------------------------------------------
-# Lexer files generated by re2c
-# ------------------------------------------------------------------------------
-/ext/json/json_scanner.c
-/ext/json/php_json_scanner_defs.h
-/ext/pdo/pdo_sql_parser.c
-/ext/phar/phar_path_check.c
-/ext/standard/url_scanner_ex.c
-/ext/standard/var_unserializer.c
-/sapi/phpdbg/phpdbg_lexer.c
-/Zend/zend_ini_scanner.c
-/Zend/zend_ini_scanner_defs.h
-/Zend/zend_language_scanner.c
-/Zend/zend_language_scanner_defs.h
-
-# ------------------------------------------------------------------------------
-# PHP parser files generated by bison during the build process
-# ------------------------------------------------------------------------------
-/ext/json/json_parser.tab.h
-/ext/json/json_parser.tab.c
-/sapi/phpdbg/phpdbg_parser.c
-/sapi/phpdbg/phpdbg_parser.h
-/sapi/phpdbg/phpdbg_parser.output
-/Zend/zend_ini_parser.c
-/Zend/zend_ini_parser.h
-/Zend/zend_ini_parser.output
-/Zend/zend_language_parser.c
-/Zend/zend_language_parser.h
-/Zend/zend_language_parser.output
-
-# ------------------------------------------------------------------------------
-# Extensions files additionally generated by `cd ext/name && phpize && ./configure`
-# ------------------------------------------------------------------------------
-/ext/*/build/
-/ext/*/configure.ac
-/ext/*/run-tests.php
-
-# ------------------------------------------------------------------------------
-# Generated by Windows build system
-# ------------------------------------------------------------------------------
-
-# Generated by `/buildconf.bat`
-/configure.bat
-/configure.js
-
-# Generated by `/configure.(bat|js)` (architecture dependend)
-/config.nice.bat
-
-# NTS debug build x86
-/Debug/
-
-# ZTS debug build x86
-/Debug_TS/
-
-# NTS build x86
-/Release/
-
-# ZTS build x86
-/Release_TS/
-
-# Generated by x64 compiler, includes Debug, Debug_TS, Release, Release_TS
-/x64/
-
-# Miscellaneous files generated by Windows build sytem
-/main/config.w32.h
-/win32/build/deplister.exe
-/win32/build/deplister.obj
-/win32/*.aps
-/win32/*.positions
-/win32/*.suo
-/win32/ext
-/win32/syslog.reg
-/win32/wsyslog.h
-
-# Standard object files generated by Visual Studio
-*.obj
-
-# ------------------------------------------------------------------------------
-# Tests
-# ------------------------------------------------------------------------------
-
-# Generated by `./run-tests.php` upon failure
-**/tests/**/*.diff
-**/tests/**/*.out*
-**/tests/**/*.php
-**/tests/**/*.exp
-**/tests/**/*.log
-**/tests/**/*.sh
-
-# Generated by some test cases
-**/tests/**/*.db
-
-# Microsoft Access database created for passing to tests
-/ext/pdo_odbc/tests/*.mdb
-
-# Files generated by `./run-tests.php -m` when checking for memory leaks
-**/tests/**/*.mem
-
-# Test results generated by `./run-tests.php`
+php-*.tar.gz
+php7.spec
+php_lcov.info
 php_test_results_*.txt
-
-# Temporary POST data placeholder files generated by `./run-tests.php`
-phpt.*
-
-# Temporary PHP INI configuration file(s) for tests, generated by `make test`
+php_version.h
+results.txt
+shlibtool
+stamp-h
+test.php3
 tmp-php.ini
+want_dependencies
+x64
+stamp-h.in
+scan_makefile_in.awk
+TSRM/tsrm_config.h
+Zend/zend_config.h
+Zend/zend_dtrace_gen.h
+Zend/zend_dtrace_gen.hbak
+Zend/zend_ini_parser.c
+Zend/zend_ini_parser.h
+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
 
-# ------------------------------------------------------------------------------
-# Generated by GCC's gcov and LCOV via build/Makefile.gcov and gcov.php.net
-# ------------------------------------------------------------------------------
-*.gcda
-*.gcno
-/gcovr.xml
-/gcovr_html/
-/lcov_html/
-/php_lcov.info
+# 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
 
-# ------------------------------------------------------------------------------
-# Archives generated during the PHP release process
-# ------------------------------------------------------------------------------
-/*.tar.gz
-/*.tar.bz2
-/*.tar.xz
-/*.tar.gz.asc
-/*.tar.bz2.asc
-/*.tar.xz.asc
+# Extension specifc ignores
+ext/*/configure.in
+ext/*/ltmain.sh
+ext/*/libs.mk
+ext/*/build
+ext/*/scan_makefile_in.awk
+ext/*/Makefile.global
+ext/*/acinclude.m4
+ext/*/config.sub
 
-# ------------------------------------------------------------------------------
-# Generated by `./configure --enable-dtrace` for using DTrace framework
-# ------------------------------------------------------------------------------
-/ext/oci8/oci8_dtrace_gen.h
-/ext/oci8/oci8_dtrace_gen.h.bak
-/Zend/zend_dtrace_gen.h
-/Zend/zend_dtrace_gen.h.bak
-
-# ------------------------------------------------------------------------------
-# Special cases to invert previous ignore patterns
-# ------------------------------------------------------------------------------
-!/ext/bcmath/libbcmath/src/config.h
-!/ext/fileinfo/libmagic/config.h
-!/ext/fileinfo/libmagic.patch
-!/ext/fileinfo/magicdata.patch
-!/ext/pcre/pcre2lib/config.h
-!/win32/build/Makefile
+# 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
+ext/iconv/php_php_iconv_h_path.h
+ext/iconv/php_have_glibc_iconv.h
+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/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/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/sqlite/weztest.sqlite
+ext/sqlite/libsqlite/src/sqlite.h
+ext/sqlite/libsqlite/src/parse.out
+ext/sqlite/libsqlite/src/libsqlite.dsw
+ext/sqlite3/tests/phpsql*
+ext/sqlite3/tests/*.db
+ext/sqlite3/tests/*.tmp
+ext/standard/tests/misc/*.txt
+ext/standard/tests/strings/*.txt
+main/build-defs.h
+main/internal_functions_cli.c
+main/config.w32.h
+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,58 +1,20 @@
-git:
-  quiet: true
-
-dist: xenial
 language: c
-sudo: required
-addons:
-  apt:
-    packages:
-      - locales
-      - language-pack-de
-      - re2c
-      - ccache
-      - mysql-server
-      - libaspell-dev
-      - libbz2-dev
-      - libcurl4-gnutls-dev
-      - libenchant-dev
-      - libfreetype6-dev
-      - libgmp-dev
-      - libicu-dev
-      - libjpeg-dev
-      - libkrb5-dev
-      - libonig-dev
-      - libpng-dev
-      - libpq-dev
-      - libpspell-dev
-      - libsasl2-dev
-      - libsqlite3-dev
-      - libtidy-dev
-      - libwebp-dev
-      - libxml2-dev
-      - libxpm-dev
-      - libxslt1-dev
-      - libzip-dev
 
-
-services:
-  - mysql
-  - postgresql
+branches:
+    except:
+        - phpng
 
 notifications:
-    email:
+    email: 
        on_failure: change
     irc:
-      template:
-        - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} -  Change view : %{compare_url} - Build details : %{build_url}"
       channels:
         - "irc.efnet.org#php.pecl"
       on_success: change
       on_failure: always
 
-cache:
-    apt: true
-    ccache: true
+cache: 
+    - apt
 
 env:
     global:
@@ -62,34 +24,30 @@ env:
       - PDO_MYSQL_TEST_USER=travis
       - PDO_MYSQL_TEST_PASS=
       - PDO_MYSQL_TEST_HOST=127.0.0.1
-      - PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres password="
       - REPORT_EXIT_STATUS=1
+    matrix:
+      - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
+      - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
 
-jobs:
-    include:
-        - env: ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
-          arch: amd64
-        - env: ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
-          arch: amd64
-        - env: ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
-          arch: arm64
+before_install:
+    - sudo apt-get update -qq
+    - sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev libsasl2-dev libxpm-dev libt1-dev libc-client2007e-dev
+    - sudo cp ./travis/de /var/lib/locales/supported.d/de
+    - sudo dpkg-reconfigure locales
+    - ./travis/install.sh
 
 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_wait ./travis/compile.sh
-    # Setup Extensions
-    - ./travis/setup-mysql.sh
-    - ./travis/setup-pgsql.sh
+    - ./travis/compile.sh
+    # 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
+    - . ./travis/ext/imap/setup.sh
 
-# Run PHPs run-tests.php
+# Run PHPs run-tests.php 
 script:
-    - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=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 -j$(nproc)
-    - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
-
-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
+    - ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg

CODING_STANDARDS

@@ -0,0 +1,302 @@
+========================
+  PHP Coding Standards
+========================
+
+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 (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
+-------------------
+
+0.  Document your code in source files and the manual. [tm]
+
+1.  Functions that are given pointers to resources should not free them
+
+For instance, ``function int mail(char *to, char *from)`` should NOT free
+to and/or from.
+
+Exceptions:
+
+- The function's designated behavior is freeing that resource.  E.g. efree()
+
+- The function is given a boolean argument, that controls whether or not
+  the function may free its arguments (if true - the function must free its
+  arguments, if false - it must not)
+
+- Low-level parser routines, that are tightly integrated with the token
+  cache and the bison code for minimum memory copying overhead.
+
+2.  Functions that are tightly integrated with other functions within the
+    same module, and rely on each other non-trivial behavior, should be
+    documented as such and declared 'static'.  They should be avoided if
+    possible.
+
+3.  Use definitions and macros whenever possible, so that constants have
+    meaningful names and can be easily manipulated.  The only exceptions
+    to this rule are 0 and 1, when used as false and true (respectively).
+    Any other use of a numeric constant to specify different behavior
+    or actions should be done through a #define.
+
+4.  When writing functions that deal with strings, be sure to remember
+    that PHP holds the length property of each string, and that it
+    shouldn't be calculated with strlen().  Write your functions in such
+    a way so that they'll take advantage of the length property, both
+    for efficiency and in order for them to be binary-safe.
+    Functions that change strings and obtain their new lengths while
+    doing so, should return that new length, so it doesn't have to be
+    recalculated with strlen() (e.g. php_addslashes())
+
+5.  NEVER USE strncat().  If you're absolutely sure you know what you're doing,
+    check its man page again, and only then, consider using it, and even then,
+    try avoiding it.
+
+6.  Use ``PHP_*`` macros in the PHP source, and ``ZEND_*`` macros in the Zend
+    part of the source. Although the ``PHP_*`` macro's are mostly aliased to the
+    ``ZEND_*`` macros it gives a better understanding on what kind of macro
+    you're calling.
+
+7.  When commenting out code using a #if statement, do NOT use 0 only. Instead
+    use "<git username here>_0". For example, #if FOO_0, where FOO is your
+    git user foo.  This allows easier tracking of why code was commented out,
+    especially in bundled libraries.
+
+8.  Do not define functions that are not available.  For instance, if a
+    library is missing a function, do not define the PHP version of the
+    function, and do not raise a run-time error about the function not
+    existing.  End users should use function_exists() to test for the
+    existence of a function
+
+9.  Prefer emalloc(), efree(), estrdup(), etc. to their standard C library
+    counterparts.  These functions implement an internal "safety-net"
+    mechanism that ensures the deallocation of any unfreed memory at the
+    end of a request.  They also provide useful allocation and overflow
+    information while running in debug mode.
+
+    In almost all cases, memory returned to the engine must be allocated
+    using emalloc().
+
+    The use of malloc() should be limited to cases where a third-party
+    library may need to control or free the memory, or when the memory in
+    question needs to survive between multiple requests.
+
+User Functions/Methods Naming Conventions
+------------------
+
+1.  Function names for user-level functions should be enclosed with in
+    the PHP_FUNCTION() macro. They should be in lowercase, with words
+    underscore delimited, with care taken to minimize the letter count.
+    Abbreviations should not be used when they greatly decrease the
+    readability of the function name itself::
+
+    Good:
+    'mcrypt_enc_self_test'
+    'mysql_list_fields'
+
+    Ok:
+    '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'?)
+
+    Bad:
+    'hw_GetObjectByQueryCollObj'
+    'pg_setclientencoding'
+    'jf_n_s_i'
+
+2.  If they are part of a "parent set" of functions, that parent should
+    be included in the user function name, and should be clearly related
+    to the parent program or function family. This should be in the form
+    of ``parent_*``::
+
+    A family of 'foo' functions, for example:
+    
+    Good:
+    'foo_select_bar'
+    'foo_insert_baz'
+    'foo_delete_baz'
+
+    Bad:
+    'fooselect_bar'
+    'fooinsertbaz'
+    'delete_foo_baz'
+
+3.  Function names used by user functions should be prefixed
+    with ``_php_``, and followed by a word or an underscore-delimited list of
+    words, in lowercase letters, that describes the function.  If applicable,
+    they should be declared 'static'.
+
+4.  Variable names must be meaningful.  One letter variable names must be
+    avoided, except for places where the variable has no real meaning or
+    a trivial meaning (e.g. for (i=0; i<100; i++) ...).
+
+5.  Variable names should be in lowercase.  Use underscores to separate
+    between words.
+
+6.  Method names follow the 'studlyCaps' (also referred to as 'bumpy case'
+    or 'camel caps') naming convention, with care taken to minimize the
+    letter count. The initial letter of the name is lowercase, and each
+    letter that starts a new 'word' is capitalized::
+
+    Good:
+    'connect()'
+    'getData()'
+    'buildSomeWidget()'
+
+    Bad:
+    'get_Data()'
+    'buildsomewidget'
+    'getI()'
+
+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 (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'
+    'FooBar'
+
+    Bad:
+    'foobar'
+    'foo_bar'
+
+Internal Function Naming Convensions
+----------------------
+
+1.  Functions that are part of the external API should be named
+    'php_modulename_function()' to avoid symbol collision. They should be in
+    lowercase, with words underscore delimited. Exposed API must be defined
+    in 'php_modulename.h'.
+
+    PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS);
+
+    Unexposed module function should be static and should not be defined in
+    'php_modulename.h'.
+
+    static int php_session_destroy(TSRMLS_D)
+
+2.  Main module source file must be named 'modulename.c'.
+
+3.  Header file that is used by other sources must be named 'php_modulename.h'.
+
+
+Syntax and indentation
+----------------------
+
+1.  Never use C++ style comments (i.e. // comment).  Always use C-style
+    comments instead.  PHP is written in C, and is aimed at compiling
+    under any ANSI-C compliant compiler.  Even though many compilers
+    accept C++-style comments in C code, you have to ensure that your
+    code would compile with other compilers as well.
+    The only exception to this rule is code that is Win32-specific,
+    because the Win32 port is MS-Visual C++ specific, and this compiler
+    is known to accept C++-style comments in C code.
+
+2.  Use K&R-style.  Of course, we can't and don't want to
+    force anybody to use a style he or she is not used to, but,
+    at the very least, when you write code that goes into the core
+    of PHP or one of its standard modules, please maintain the K&R
+    style.  This applies to just about everything, starting with
+    indentation and comment styles and up to function declaration
+    syntax. Also see Indentstyle.
+
+    Indentstyle: http://www.catb.org/~esr/jargon/html/I/indent-style.html
+
+3.  Be generous with whitespace and braces.  Keep one empty line between the
+    variable declaration section and the statements in a block, as well as
+    between logical statement groups in a block.  Maintain at least one empty
+    line between two functions, preferably two.  Always prefer::
+
+    if (foo) {
+        bar;
+    }
+
+    to:
+
+    if(foo)bar;
+
+4.  When indenting, use the tab character.  A tab is expected to represent
+    four spaces.  It is important to maintain consistency in indenture so
+    that definitions, comments, and control structures line up correctly.
+
+5.  Preprocessor statements (#if and such) MUST start at column one. To
+    indent preprocessor directives you should put the # at the beginning
+    of a line, followed by any number of whitespace.
+
+Testing
+-------
+
+1.  Extensions should be well tested using *.phpt tests. Read about that
+    in README.TESTING.
+
+Documentation and Folding Hooks
+-------------------------------
+
+In order to make sure that the online documentation stays in line with
+the code, each user-level function should have its user-level function
+prototype before it along with a brief one-line description of what the
+function does.  It would look like this::
+
+  /* {{{ proto int abs(int number)
+     Returns the absolute value of the number */
+  PHP_FUNCTION(abs)
+  {
+     ...
+  }
+  /* }}} */
+
+The {{{ symbols are the default folding symbols for the folding mode in
+Emacs and vim (set fdm=marker).  Folding is very useful when dealing with
+large files because you can scroll through the file quickly and just unfold
+the function you wish to work on.  The }}} at the end of each function marks
+the end of the fold, and should be on a separate line.
+
+The "proto" keyword there is just a helper for the doc/genfuncsummary script
+which generates a full function summary.  Having this keyword in front of the
+function prototypes allows us to put folds elsewhere in the code without
+messing up the function summary.
+
+Optional arguments are written like this::
+
+  /* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
+     Returns a header object with the defined parameters */
+
+And yes, please keep the prototype on a single line, even if that line
+is massive.
+
+New and Experimental Functions
+-----------------------------------
+To reduce the problems normally associated with the first public
+implementation of a new set of functions, it has been suggested
+that the first implementation include a file labeled 'EXPERIMENTAL'
+in the function directory, and that the functions follow the
+standard prefixing conventions during their initial implementation.
+
+The file labelled 'EXPERIMENTAL' should include the following
+information::
+
+  Any authoring information (known bugs, future directions of the module).
+  Ongoing status notes which may not be appropriate for Git comments.
+
+In general new features should go to PECL or experimental branches until
+there are specific reasons for directly adding it to the core distribution.
+
+Aliases & Legacy Documentation
+-----------------------------------
+You may also have some deprecated aliases with close to duplicate
+names, for example, somedb_select_result and somedb_selectresult. For
+documentation purposes, these will only be documented by the most
+current name, with the aliases listed in the documentation for
+the parent function. For ease of reference, user-functions with
+completely different names, that alias to the same function (such as
+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
+/phpdoc/README for more information on documentation.

CODING_STANDARDS.md

@@ -1,342 +0,0 @@
-# PHP coding standards
-
-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.
-
-## Code implementation
-
-1. Document your code in source files and the manual. (tm)
-
-2. Functions that are given pointers to resources should not free them.
-
-    For instance, `function int mail(char *to, char *from)` should NOT free to
-    and/or from.
-
-    Exceptions:
-
-    * The function's designated behavior is freeing that resource. E.g.
-      `efree()`
-
-    * The function is given a boolean argument, that controls whether or not the
-      function may free its arguments (if true - the function must free its
-      arguments, if false - it must not)
-
-    * Low-level parser routines, that are tightly integrated with the token
-      cache and the bison code for minimum memory copying overhead.
-
-3. Functions that are tightly integrated with other functions within the same
-    module, and rely on each other non-trivial behavior, should be documented as
-    such and declared `static`. They should be avoided if possible.
-
-4. Use definitions and macros whenever possible, so that constants have
-    meaningful names and can be easily manipulated. The only exceptions to this
-    rule are 0 and 1, when used as `false` and `true` (respectively). Any other
-    use of a numeric constant to specify different behavior or actions should be
-    done through a `#define`.
-
-5. When writing functions that deal with strings, be sure to remember that PHP
-    holds the length property of each string, and that it shouldn't be
-    calculated with `strlen()`. Write your functions in such a way so that
-    they'll take advantage of the length property, both for efficiency and in
-    order for them to be binary-safe. Functions that change strings and obtain
-    their new lengths while doing so, should return that new length, so it
-    doesn't have to be recalculated with `strlen()` (e.g. `php_addslashes()`).
-
-6. NEVER USE `strncat()`. If you're absolutely sure you know what you're doing,
-    check its man page again, and only then, consider using it, and even then,
-    try avoiding it.
-
-7. Use `PHP_*` macros in the PHP source, and `ZEND_*` macros in the Zend part of
-    the source. Although the `PHP_*` macros are mostly aliased to the `ZEND_*`
-    macros it gives a better understanding on what kind of macro you're calling.
-
-8. When commenting out code using a `#if` statement, do NOT use `0` only.
-    Instead use `"<git username here>_0"`. For example, `#if FOO_0`, where `FOO`
-    is your git user `foo`. This allows easier tracking of why code was
-    commented out, especially in bundled libraries.
-
-9. Do not define functions that are not available. For instance, if a library is
-    missing a function, do not define the PHP version of the function, and do
-    not raise a run-time error about the function not existing. End users should
-    use `function_exists()` to test for the existence of a function.
-
-10. Prefer `emalloc()`, `efree()`, `estrdup()`, etc. to their standard C library
-    counterparts. These functions implement an internal "safety-net" mechanism
-    that ensures the deallocation of any unfreed memory at the end of a request.
-    They also provide useful allocation and overflow information while running
-    in debug mode.
-
-    In almost all cases, memory returned to the engine must be allocated using
-    `emalloc()`.
-
-    The use of `malloc()` should be limited to cases where a third-party library
-    may need to control or free the memory, or when the memory in question needs
-    to survive between multiple requests.
-
-## User functions/methods naming conventions
-
-1. Function names for user-level functions should be enclosed with in the
-    `PHP_FUNCTION()` macro. They should be in lowercase, with words underscore
-    delimited, with care taken to minimize the letter count. Abbreviations
-    should not be used when they greatly decrease the readability of the
-    function name itself:
-
-    Good:
-
-    ```php
-    str_word_count
-    array_key_exists
-    ```
-
-    Ok:
-
-    ```php
-    date_interval_create_from_date_string
-    // Could be 'date_intvl_create_from_date_str'?
-    get_html_translation_table()
-    // Could be 'html_get_trans_table'?
-    ```
-
-    Bad:
-
-    ```php
-    hw_GetObjectByQueryCollObj
-    pg_setclientencoding
-    jf_n_s_i
-    ```
-
-2. If they are part of a "parent set" of functions, that parent should be
-    included in the user function name, and should be clearly related to the
-    parent program or function family. This should be in the form of `parent_*`:
-
-    A family of `foo` functions, for example:
-
-    Good:
-
-    ```php
-    foo_select_bar
-    foo_insert_baz
-    foo_delete_baz
-    ```
-
-    Bad:
-
-    ```php
-    fooselect_bar
-    fooinsertbaz
-    delete_foo_baz
-    ```
-
-3. Function names used by user functions should be prefixed with `_php_`, and
-    followed by a word or an underscore-delimited list of words, in lowercase
-    letters, that describes the function. If applicable, they should be declared
-    `static`.
-
-4. Variable names must be meaningful. One letter variable names must be avoided,
-    except for places where the variable has no real meaning or a trivial
-    meaning (e.g. `for (i=0; i<100; i++) ...`).
-
-5. Variable names should be in lowercase. Use underscores to separate between
-    words.
-
-6. Method names follow the *studlyCaps* (also referred to as *bumpy case* or
-    *camel caps*) naming convention, with care taken to minimize the letter
-    count. The initial letter of the name is lowercase, and each letter that
-    starts a new `word` is capitalized:
-
-    Good:
-
-    ```php
-    connect()
-    getData()
-    buildSomeWidget()
-    ```
-
-    Bad:
-
-    ```php
-    get_Data()
-    buildsomewidget()
-    getI()
-    ```
-
-7. Class names should be descriptive nouns in *PascalCase* and as short as
-    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.
-
-    Good:
-
-    ```php
-    Curl
-    CurlResponse
-    HTTPStatusCode
-    URL
-    BTreeMap // B-tree Map
-    Id // Identifier
-    ID // Identity Document
-    Char // Character
-    Intl // Internationalization
-    Radar // Radio Detecting and Ranging
-    ```
-
-    Bad:
-
-    ```php
-    curl
-    curl_response
-    HttpStatusCode
-    Url
-    BtreeMap
-    ID // Identifier
-    CHAR
-    INTL
-    RADAR // Radio Detecting and Ranging
-    ```
-
-## Internal function naming conventions
-
-1. Functions that are part of the external API should be named
-    `php_modulename_function()` to avoid symbol collision. They should be in
-    lowercase, with words underscore delimited. Exposed API must be defined in
-    `php_modulename.h`.
-
-    ```c
-    PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS);
-    ```
-
-    Unexposed module function should be static and should not be defined in
-    `php_modulename.h`.
-
-    ```c
-    static int php_session_destroy()
-    ```
-
-2. Main module source file must be named `modulename.c`.
-
-3. Header file that is used by other sources must be named `php_modulename.h`.
-
-## Syntax and indentation
-
-1. Never use C++ style comments (i.e. `//` comment). Always use C-style comments
-    instead. PHP is written in C, and is aimed at compiling under any ANSI-C
-    compliant compiler. Even though many compilers accept C++-style comments in
-    C code, you have to ensure that your code would compile with other compilers
-    as well. The only exception to this rule is code that is Win32-specific,
-    because the Win32 port is MS-Visual C++ specific, and this compiler is known
-    to accept C++-style comments in C code.
-
-2. Use K&R-style. Of course, we can't and don't want to force anybody to use a
-    style he or she is not used to, but, at the very least, when you write code
-    that goes into the core of PHP or one of its standard modules, please
-    maintain the K&R style. This applies to just about everything, starting with
-    indentation and comment styles and up to function declaration syntax. Also
-    see [Indentstyle](http://www.catb.org/~esr/jargon/html/I/indent-style.html).
-
-3. Be generous with whitespace and braces. Keep one empty line between the
-    variable declaration section and the statements in a block, as well as
-    between logical statement groups in a block. Maintain at least one empty
-    line between two functions, preferably two. Always prefer:
-
-    ```c
-    if (foo) {
-        bar;
-    }
-    ```
-
-    to:
-
-    ```c
-    if(foo)bar;
-    ```
-
-4. When indenting, use the tab character. A tab is expected to represent four
-    spaces. It is important to maintain consistency in indenture so that
-    definitions, comments, and control structures line up correctly.
-
-5. Preprocessor statements (`#if` and such) MUST start at column one. To indent
-    preprocessor directives you should put the `#` at the beginning of a line,
-    followed by any number of whitespace.
-
-## Testing
-
-1. Extensions should be well tested using `*.phpt` tests. Read about that at
-    [qa.php.net](https://qa.php.net/write-test.php) documentation.
-
-## Documentation and folding hooks
-
-In order to make sure that the online documentation stays in line with the code,
-each user-level function should have its user-level function prototype before it
-along with a brief one-line description of what the function does. It would look
-like this:
-
-```c
-/* {{{ proto int abs(int number)
-   Returns the absolute value of the number */
-PHP_FUNCTION(abs)
-{
-    ...
-}
-/* }}} */
-```
-
-The `{{{` symbols are the default folding symbols for the folding mode in Emacs
-and vim (`set fdm=marker`). Folding is very useful when dealing with large files
-because you can scroll through the file quickly and just unfold the function you
-wish to work on. The `}}}` at the end of each function marks the end of the
-fold, and should be on a separate line.
-
-The `proto` keyword there is just a helper for the `doc/genfuncsummary` script
-which generates a full function summary. Having this keyword in front of the
-function prototypes allows us to put folds elsewhere in the code without
-messing up the function summary.
-
-Optional arguments are written like this:
-
-```c
-/* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
-   Returns a header object with the defined parameters */
-```
-
-And yes, please keep the prototype on a single line, even if that line is
-massive.
-
-## New and experimental functions
-
-To reduce the problems normally associated with the first public implementation
-of a new set of functions, it has been suggested that the first implementation
-include a file labeled `EXPERIMENTAL` in the function directory, and that the
-functions follow the standard prefixing conventions during their initial
-implementation.
-
-The file labelled `EXPERIMENTAL` should include the following information:
-
-* Any authoring information (known bugs, future directions of the module).
-* Ongoing status notes which may not be appropriate for Git comments.
-
-In general new features should go to PECL or experimental branches until there
-are specific reasons for directly adding it to the core distribution.
-
-## Aliases & legacy documentation
-
-You may also have some deprecated aliases with close to duplicate names, for
-example, `somedb_select_result` and `somedb_selectresult`. For documentation
-purposes, these will only be documented by the most current name, with the
-aliases listed in the documentation for the parent function. For ease of
-reference, user-functions with completely different names, that alias to the
-same function (such as `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.

CONTRIBUTING.md

@@ -1,60 +1,25 @@
 # Contributing to PHP
 
 Anybody who programs in PHP can be a contributing member of the community that
-develops and deploys it; the task of deploying PHP, documentation and associated
-websites is a never ending one. With every release, or release candidate comes a
-wave of work, which takes a lot of organization and co-ordination.
-
-You don't need any special access to download, build, debug and begin submitting
-PHP or PECL code, tests or documentation. Once you've followed this guide and
-had several contributions accepted, commit privileges are often quickly granted.
-
-## Index
-
-* [Pull requests](#pull-requests)
-* [Filing bugs](#filing-bugs)
-* [Feature requests](#feature-requests)
-* [Writing tests](#writing-tests)
-* [Writing documentation](#writing-documentation)
-* [Getting help](#getting-help)
-* [PHP source code directory structure](#php-source-code-directory-structure)
-* [PHP internals](#php-internals)
-* [PECL extensions](#pecl-extensions)
-* [Checklist for submitting contribution](#checklist-for-submitting-contribution)
-* [What happens after submitting contribution?](#what-happens-after-submitting-contribution)
-* [What happens when your contribution is applied?](#what-happens-when-your-contribution-is-applied)
-* [Git commit rules](#git-commit-rules)
-* [Copyright and license headers](#copyright-and-license-headers)
+develops and deploys it; the task of deploying PHP, documentation and
+associated websites is a never ending one. With every release, or release
+candidate comes a wave of work, which takes a lot of organization and
+co-ordination.
 
 ## Pull requests
 
 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](https://www.php.net/supported-versions.php) are
-supported). For example, at the time of writing, the lowest supported version is
-PHP 7.3, which corresponds to the `PHP-7.3` 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`.
-
-Fork the official PHP repository and send a pull request. A notification will be
-sent to the pull request mailing list. Sending a note to PHP Internals list
-(internals@lists.php.net) may help getting more feedback and quicker turnaround.
-You can also add pull requests to [bug reports](https://bugs.php.net/).
-
-Read [Git access page](https://www.php.net/git.php) for help on using Git to get
-and build PHP source code. We recommend to look at our
-[workflow](https://wiki.php.net/vcs/gitworkflow) and our
-[FAQ](https://wiki.php.net/vcs/gitfaq).
+Pull requests to implement RFCs should be submitted against `master`.
 
 ## Filing bugs
 
@@ -67,19 +32,12 @@ Where possible, please include a self-contained reproduction case!
 ## Feature requests
 
 Feature requests are generally submitted in the form of
-[Requests for Comments (RFC)](https://wiki.php.net/rfc/howto), ideally
-accompanied by [pull requests](#pull-requests). You can find the extremely large
-list of RFCs that have been previously considered on the
+[Requests for Comment](https://wiki.php.net/rfc/howto), ideally accompanied by
+[pull requests](#pull-requests). You can find the extremely large list of RFCs
+that have been previously considered on the
 [PHP Wiki](https://wiki.php.net/rfc).
 
-To create a RFC, discuss it with the extension maintainer, and discuss it on the
-development mailing list internals@lists.php.net. RFC Wiki accounts can be
-requested on https://wiki.php.net/start?do=register. PHP extension maintainers
-can be found in the [EXTENSIONS](/EXTENSIONS) file in the PHP source code
-repository. Mailing list subscription is explained on the
-[mailing lists page](https://www.php.net/mailing-lists.php).
-
-You may also want to read
+You may want to read
 [The Mysterious PHP RFC Process](https://blogs.oracle.com/opal/entry/the_mysterious_php_rfc_process)
 for additional notes on the best way to approach submitting an RFC.
 
@@ -88,19 +46,10 @@ for additional notes on the best way to approach submitting an RFC.
 We love getting new tests! PHP is a huge project and improving code coverage is
 a huge win for every PHP user.
 
-[Our QA site includes a page detailing how to write test cases.](https://qa.php.net/write-test.php)
-
-Submitting test scripts helps us to understand what functionality has changed.
-It is important for the stability and maintainability of PHP that tests are
-comprehensive.
-
-Failure conditions of `zend_parse_parameters`, `ZEND_PARSE_PARAMETERS()` and
-similar functions should not be tested. These parameter parsing APIs are already
-extensively tested, and additional tests only complicate future modifications.
-
-For newly created tests, a `--CREDITS--` section should no longer be included,
-as test authorship is already accurately tracked by Git. If multiple authors
-should be credited, the `Co-authored-by` tag in the commit message may be used.
+[Our QA site includes a page detailing how to write test cases.](http://qa.php.net/write-test.php)
+Please note that the section on submitting pull requests is outdated: in
+addition to the process listed there, you can also
+[submit pull requests](#pull-requests).
 
 ## Writing documentation
 
@@ -121,310 +70,4 @@ issues.
 
 Although not a formal channel, you can also find a number of core developers on
 the #php.pecl channel on [EFnet](http://www.efnet.org/). Similarly, many
-documentation writers can be found on #php.doc. Windows development IRC channel
-is available at #winphp-dev on FreeNode.
-
-## PHP source code directory structure
-
-PHP source code also includes several files generated during development and
-several parts where maintenance is happening upstream in their respective
-locations.
-
-```bash
-<php-src>/
- ├─ .git/                           # Git configuration and source directory
- ├─ TSRM/                           # Thread Safe Resource Manager
- └─ Zend/                           # Zend Engine
-    ├─ zend_vm_execute.h            # Generated by `Zend/zend_vm_gen.php`
-    ├─ zend_vm_opcodes.c            # Generated by `Zend/zend_vm_gen.php`
-    ├─ zend_vm_opcodes.h            # Generated by `Zend/zend_vm_gen.php`
-    └─ ...
- ├─ appveyor/                       # Appveyor CI service files
- └─ build/                          # *nix build system files
-    ├─ ax_*.m4                      # https://github.com/autoconf-archive/autoconf-archive
-    ├─ config.guess                 # https://git.savannah.gnu.org/cgit/config.git
-    ├─ config.sub                   # https://git.savannah.gnu.org/cgit/config.git
-    ├─ libtool.m4                   # https://git.savannah.gnu.org/cgit/libtool.git
-    ├─ ltmain.sh                    # https://git.savannah.gnu.org/cgit/libtool.git
-    ├─ shtool                       # https://www.gnu.org/software/shtool/
-    └─ ...
- ├─ docs/                           # PHP internals and repository documentation
- └─ ext/                            # PHP core extensions
-    └─ bcmath/
-       ├─ libbcmath/                # Forked and maintained in php-src
-       └─ ...
-    └─ curl/
-       ├─ sync-constants.php        # The curl symbols checker
-       └─ ...
-    └─ date/
-       └─ lib/                      # Bundled datetime library https://github.com/derickr/timelib
-          ├─ parse_date.c           # Generated by re2c 0.15.3
-          ├─ parse_iso_intervals.c  # Generated by re2c 0.15.3
-          └─ ...
-       └─ ...
-    └─ ffi/
-       ├─ ffi_parser.c              # Generated by https://github.com/dstogov/llk
-       └─ ...
-    └─ fileinfo/
-       ├─ libmagic/                 # Modified libmagic https://github.com/file/file
-       ├─ data_file.c               # Generated by `ext/fileinfo/create_data_file.php`
-       ├─ libmagic.patch            # Modifications patch from upstream libmagic
-       ├─ magicdata.patch           # Modifications patch from upstream libmagic
-       └─ ...
-    └─ gd/
-       ├─ libgd/                    # Bundled and modified GD library https://github.com/libgd/libgd
-       └─ ...
-    └─ mbstring/
-       ├─ libmbfl/                  # Forked and maintained in php-src
-       ├─ unicode_data.h            # Generated by `ext/mbstring/ucgendat/ucgendat.php`
-       └─ ...
-    └─ pcre/
-       ├─ pcre2lib/                 # https://www.pcre.org/
-       └─ ...
-    └─ pdo_mysql/
-       ├─ php_pdo_mysql_sqlstate.h  # Generated by `ext/pdo_mysql/get_error_codes.php`
-       └─ ...
-    └─ skeleton/                    # Skeleton for developing new extensions with `ext/ext_skel.php`
-       └─ ...
-    └─ standard/
-       └─ html_tables/
-          ├─ mappings/              # https://www.unicode.org/Public/MAPPINGS/
-          └─ ...
-       ├─ credits_ext.h             # Generated by `scripts/dev/credits`
-       ├─ credits_sapi.h            # Generated by `scripts/dev/credits`
-       ├─ html_tables.h             # Generated by `ext/standard/html_tables/html_table_gen.php`
-       └─ ...
-    └─ tokenizer/
-       ├─ tokenizer_data.c          # Generated by `ext/tokenizer/tokenizer_data_gen.sh`
-       └─ ...
-    └─ xmlrpc/
-       ├─ libxmlrpc/                # Forked and maintained in php-src
-       └─ ...
-    └─ zend_test                    # For testing internal APIs. Not needed for regular builds.
-       └─ ...
-    └─ zip/                         # Bundled https://github.com/pierrejoye/php_zip
-       └─ ...
-    └─ ...
- └─ main/                           # Binding that ties extensions, SAPIs, and engine together
-    ├─ streams/                     # Streams layer subsystem
-    ├─ php_version.h                # Generated by release managers using `configure`
-    └─ ...
- ├─ pear/                           # PEAR installation
- └─ sapi/                           # PHP SAPI modules
-    └─ cli/
-       ├─ mime_type_map.h           # Generated by `sapi/cli/generate_mime_type_map.php`
-       └─ ...
-    └─ ...
- ├─ scripts/                        # php-config, phpize and internal development scripts
- ├─ tests/                          # Core features tests
- ├─ travis/                         # Travis CI service files
- └─ win32/                          # Windows build system files
-    ├─ cp_enc_map.c                 # Generated by `win32/cp_enc_map_gen.exe`
-    └─ ...
- └─ ...
-```
-
-## PHP internals
-
-For information on PHP internal C functions see
-[References about Maintaining and Extending PHP](https://wiki.php.net/internals/references).
-Various external resources can be found on the web. A standard printed reference
-is the book "Extending and Embedding PHP" by Sara Golemon.
-
-## PECL extensions
-
-If you are fixing broken functionality in a [PECL](https://pecl.php.net)
-extension then create a bug or identify an existing bug at
-[bugs.php.net](https://bugs.php.net). A bug can be used to track the change
-progress and prevent your changes getting lost in the PHP mail archives. Some
-PECL extensions have their own bug tracker locations and different contributing
-procedures.
-
-If your change is large then create a
-[Request for Comments (RFC)](https://wiki.php.net/rfc), discuss it with the
-extension maintainer, and discuss it on the development mailing list
-pecl-dev@lists.php.net depending on the extension. PECL mailing list
-subscription is explained on the
-[PECL support page](https://pecl.php.net/support.php).
-
-Update any open bugs and add a link to the source of your change. Send the patch
-or pointer to the bug to pecl-dev@lists.php.net. Also CC the extension
-maintainer. Explain what has been changed by your patch. Test scripts should be
-included.
-
-## Checklist for submitting contribution
-
-- Read [Coding standards](/CODING_STANDARDS.md) before you start working.
-- Update git source just before running your final `diff` and before testing.
-- Add in-line comments and/or have external documentation ready. Use only
-  `/* */` style comments, not `//`.
-- Create test scripts for use with `make test`.
-- Run `make test` to check your change doesn't break other features.
-- Rebuild PHP with `--enable-debug` which will show some kinds of memory errors
-  and check the PHP and web server error logs after running your PHP tests.
-- Rebuild PHP with `--enable-maintainer-zts` to check your change compiles on
-  multi-threaded web servers.
-- Review the change once more just before submitting it.
-
-## What happens after submitting contribution?
-
-If your change is easy to review and obviously has no side-effects, it might be
-committed relatively quickly.
-
-Because PHP is a volunteer-driven effort more complex changes will require
-patience on your side. If you do not receive feedback in a few days, consider
-bumping. Before doing this think about these questions:
-
-- Did I send the patch to the right mailing list?
-- Did I review the mailing list archives to see if these kind of changes had
-  been discussed before?
-- Did I explain my change clearly?
-- Is my change too hard to review? Because of what factors?
-
-## What happens when your contribution is applied?
-
-Your name will likely be included in the Git commit log. If your change affects
-end users, a brief description and your name might be added to the [NEWS](/NEWS)
-file.
-
-## Git commit rules
-
-This section refers to contributors that have Git push access and make commit
-changes themselves. We'll assume you're basically familiar with Git, but feel
-free to post your questions on the mailing list. Please have a look at the more
-detailed [information on Git](https://git-scm.com/).
-
-PHP is developed through the efforts of a large number of people. Collaboration
-is a Good Thing(tm), and Git lets us do this. Thus, following some basic rules
-with regards to Git usage will:
-
-* Make everybody happier, especially those responsible for maintaining PHP
-  itself.
-* Keep the changes consistently well documented and easily trackable.
-* Prevent some of those 'Oops' moments.
-* Increase the general level of good will on planet Earth.
-
-Having said that, here are the organizational rules:
-
-1. Respect other people working on the project.
-
-2. Discuss any significant changes on the list before committing and get
-   confirmation from the release manager for the given branch.
-
-3. Look at [EXTENSIONS](/EXTENSIONS) file to see who is the primary maintainer
-   of the code you want to contribute to.
-
-4. If you "strongly disagree" about something another person did, don't start
-   fighting publicly - take it up in private email.
-
-5. If you don't know how to do something, ask first!
-
-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.
-
-Currently we have the following branches in use:
-
-| Branch    |           |
-| --------- | --------- |
-| master    | Active development branch for PHP 8.0, which is open for backwards incompatible changes and major internal API changes. |
-| PHP-7.4   | Is used to release the PHP 7.4.x series. This is a current stable version and is open for bugfixes only. |
-| PHP-7.3   | Is used to release the PHP 7.3.x series. This is a current stable version and is open for bugfixes only. |
-| PHP-7.2   | Is used to release the PHP 7.2.x series. This is an old stable version and is open for security fixes only. |
-| PHP-7.1   | This branch is closed. |
-| PHP-7.0   | This branch is closed. |
-| PHP-5.6   | This branch is closed. |
-| 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. |
-| PHP-5.1   | This branch is closed. |
-| PHP-4.4   | This branch is closed. |
-| PHP-X.Y.Z | These branches are used for the release managers for tagging the releases, hence they are closed to the general public. |
-
-The next few rules are more of a technical nature:
-
-1. All non-security bugfix changes should first go to the lowest bugfix branch
-   (i.e. 7.3) and then get merged up to all other branches. All security fixes
-   should go to the lowest security fixes branch (i.e 7.2). If a change is not
-   needed for later branches (i.e. fixes for features which were dropped from
-   later branches) an empty merge should be done.
-
-2. All news updates intended for public viewing, such as new features, bug
-   fixes, improvements, etc., should go into the NEWS file of *any stable
-   release* version with the given change. In other words, news about a bug fix
-   which went into PHP-5.4, PHP-5.5 and master 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
-   modified several unrelated files, commit each group separately and provide a
-   nice commit message for each one. See example below.
-
-4. Do write your commit message in such a way that it makes sense even without
-   the corresponding diff. One should be able to look at it, and immediately
-   know what was modified. Definitely include the function name in the message
-   as shown below.
-
-5. In your commit messages, keep each line shorter than 80 characters. And try
-   to align your lines vertically, if they wrap. It looks bad otherwise.
-
-6. If you modified a function that is callable from PHP, prepend PHP to the
-   function name as shown below.
-
-The format of the commit messages is pretty simple.
-
-    <max 79 characters short description>\n
-    \n
-    <long description, 79 chars per line>
-    \n
-
-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.
-
-If you fix some bugs, you should note the bug ID numbers in your commit message.
-Bug ID should be prefixed by `#`.
-
-Example:
-
-    Fixed bug #14016 (pgsql notice handler double free crash bug.)
-
-When you change the NEWS file for a bug fix, then please keep the bugs sorted in
-decreasing order under the fixed version.
-
-You can use [gitweb](https://git.php.net/) to look at PHP Git repository in
-various ways.
-
-## Copyright and license headers
-
-New source code files should include the following header block:
-
-```c
-/*
-  +----------------------------------------------------------------------+
-  | PHP Version 7                                                        |
-  +----------------------------------------------------------------------+
-  | Copyright (c) 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:           |
-  | https://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.               |
-  +----------------------------------------------------------------------+
-  | Author:                                                              |
-  +----------------------------------------------------------------------+
-*/
-```
-
-Thank you for contributing to PHP!
+documentation writers can be found on #php.doc.

CREDITS

@@ -0,0 +1,2 @@
+For the list of people who've put work into PHP, please see
+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,8 +37,7 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           cli
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>, Edin Kadribasic <edink@php.net>
-MAINTENANCE:         Unknown
+MAINTENANCE:         Marcus Boerger <helly@php.net>, Edin Kadribasic <edink@php.net>
 STATUS:              Working
 SINCE:               4.3.0
 -------------------------------------------------------------------------------
@@ -47,7 +47,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           fpm
-PRIMARY MAINTAINER:  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
@@ -59,8 +59,7 @@ STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           phpdbg
-PRIMARY MAINTAINER:  Joe Watkins <krakjoe@php.net>, Bob Weinand <bwoebi@php.net>
-MAINTENANCE:         Unkown
+MAINTENANCE:         Joe Watkins <krakjoe@php.net>, Bob Weinand <bwoebi@php.net>
 STATUS:              5.6
 -------------------------------------------------------------------------------
 
@@ -69,66 +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>
+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
@@ -140,33 +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)
-                     Christoph M. Becker <cmb@php.net> (2016 - 2018)
+PRIMARY MAINTAINER:  Scott MacVicar <scottmac@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
@@ -178,56 +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>
+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> (2004 - 2010)
-                     Christian Stocker <chregu@php.net> (2004 - 2004)
+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)
-                     Pierre-Alain Joye <pajoye@php.net> (2005-2009)
+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
@@ -238,279 +226,233 @@ SINCE:               5.0
 
 -------------------------------------------------------------------------------
 EXTENSION:           bcmath
-PRIMARY MAINTAINER:  Andi Gutmans <andi@php.net> (2000 - 2004)
-MAINTENANCE:         Unknown
+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:           ffi
-PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@php.net> (2018 - 2019)
-MAINTENANCE:         Maintained
-STATUS:              Experimental
-SINCE:               7.4.0
--------------------------------------------------------------------------------
 EXTENSION:           fileinfo
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net> (2004 - 2008)
-                     Anatol Belski <ab@php.net> (2012 - 2019)
+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
 -------------------------------------------------------------------------------
 EXTENSION:           gettext
-PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gmp
-PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net> (2000 - 2018)
-                     Antony Dovgal <tony2001@php.net> (2005 - 2010)
-                     Nikita Popov <nikic@php.net> (2013 - 2019)
+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)
-                     Nikita Popov <nikic@php.net> (2017 - 2019)
+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)
-                     Nikita Popov <nikic@php.net> (2016 - 2019)
+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
 -------------------------------------------------------------------------------
 EXTENSION:           readline
-PRIMARY MAINTAINER:  Unkown
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           recode
+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
 -------------------------------------------------------------------------------
 EXTENSION:           sysvmsg
-PRIMARY MAINTAINER:  Unkown
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sysvsem
-PRIMARY MAINTAINER:  Unkown
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sysvshm
-PRIMARY MAINTAINER:  Unkown
 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)
-                     Nikita Popov <nikic@php.net> (2013 - 2019)
-MAINTENANCE:         Maintained
+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 - 2019 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

@@ -0,0 +1,23 @@
+
+#
+# Zend
+#
+
+$(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h
+$(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
+
+$(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
+	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l)
+
+$(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
+$(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
+	@$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o $@
+
+$(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c
+$(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
+	@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
+
+$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
+	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
+
+$(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h

Makefile.gcov

@@ -0,0 +1,79 @@
+
+#
+# LCOV
+#
+
+LCOV_INCLUDE="."
+
+lcov: lcov-html
+
+lcov-test: lcov-clean-data test
+
+php_lcov.info: lcov-test
+	@echo "Generating data for $@"
+	@rm -rf lcov_data/
+	@$(mkinstalldirs) lcov_data/
+	@echo
+	-@files=`find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.c -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | $(EGREP) $(LCOV_INCLUDE) | sed -e 's/.libs/zzzz/g' | sort | sed -e 's/zzzz/.libs/g' | uniq` ;\
+	for x in $$files; do \
+		echo -n . ;\
+		y=`echo $$x | sed -e 's!\.libs/!!'`; \
+		dir=lcov_data/`dirname $$x`; \
+		test -d "$$dir" || $(mkinstalldirs) "$$dir"; \
+		if test -f "$(top_srcdir)/$$y.c"; then \
+			ln -f -s $(top_srcdir)/$$y.c lcov_data/$$y.c; \
+		fi; \
+		if test -f "$(top_srcdir)/$$y.h"; then \
+			ln -f -s $(top_srcdir)/$$y.h lcov_data/$$y.h; \
+		fi; \
+		if test -f "$(top_srcdir)/$$y.re"; then \
+			ln -f -s $(top_srcdir)/$$y.re lcov_data/$$y.re; \
+		fi; \
+		if test -f "$(top_srcdir)/$$y.y"; then \
+		        ln -f -s $(top_srcdir)/$$y.y lcov_data/$$y.y; \
+		fi; \
+		if test -f "$(top_srcdir)/$$y.l"; then \
+		        ln -f -s $(top_srcdir)/$$y.l lcov_data/$$y.l; \
+		fi; \
+		if test -f "$(top_srcdir)/$$y"; then \
+		        ln -f -s $(top_srcdir)/$$y lcov_data/$$y; \
+		fi; \
+		if test -f "$(top_builddir)/$$y.c"; then \
+			ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
+		fi; \
+		if test -f "$$x.gcno"; then \
+			cp $$x.gcno lcov_data/$$y.gcno ; \
+		fi; \
+		if test -f "$$x.gcda"; then \
+			cp $$x.gcda lcov_data/$$y.gcda ; \
+		fi; \
+		if test -f "$$x.da"; then \
+			cp $$x.da   lcov_data/$$y.da ; \
+		fi; \
+		if test -f "$$x.bb"; then \
+			cp $$x.bb   lcov_data/$$y.bb ; \
+		fi; \
+		if test -f "$$x.bbg"; then \
+			cp $$x.bbg  lcov_data/$$y.bbg ; \
+		fi; \
+	done; \
+	for dir in ext/bcmath/libbcmath ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
+		if test -d lcov_data/$$dir; then \
+			rm -rf lcov_data/$$dir ; \
+		fi; \
+	done
+	@echo 
+	@echo "Generating $@"
+	@$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@
+
+lcov-html: php_lcov.info
+	@echo "Generating lcov HTML"
+	@$(LTP_GENHTML) --legend --output-directory lcov_html/ --title "PHP Code Coverage" php_lcov.info
+
+lcov-clean:
+	rm -f php_lcov.info
+	rm -rf lcov_data/
+	rm -rf lcov_html/
+
+lcov-clean-data:
+	@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f

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'."
@@ -80,7 +80,7 @@ PHP_TEST_SHARED_EXTENSIONS =  ` \
 	fi; \
 	if test "x$(PHP_ZEND_EX)" != "x"; then \
 		for i in $(PHP_ZEND_EX)""; do \
-			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d zend_extension=$(top_builddir)/modules/$$dlname"; \
+			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
 		done; \
 	fi`
 PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
@@ -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 Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h
-	rm -f main/build-defs.h scripts/phpize
-	rm -f ext/date/lib/timelib_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 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 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

@@ -0,0 +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 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 4 sources. If
+  you just need the basic framework and will be writing all the code in your
+  functions yourself, you can now do
+
+   ./ext_skel --extname=module_name
+
+  and everything you need is placed in directory module_name. 
+
+  [ Note that GNU awk is likely required for this script to work.  Debian 
+    systems seem to default to using mawk, so you may need to change the 
+    #! line in skeleton/create_stubs and the cat $proto | awk line in
+    ext_skel to use gawk explicitly. ]
+
+  If you don't need to test the existence of any external header files, 
+  libraries or functions in them, the module is already almost ready to be 
+  compiled in PHP.  Just remove 3 comments in your_module_name/config.m4, 
+  change back up to PHP sources top directory, and do
+
+    ./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
+
+  ./ext_skel generates 'module_name.c' and 'php_module_name.h' as main source
+  and header files. Keep these names.
+
+  Module functions (User functions) must be named
+
+  module_name_function()
+
+  When you need to expose module functions to other modules, expose functions
+  strictly needed by others. Exposed internal function must be named
+
+  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
+
+    --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

@@ -0,0 +1,133 @@
+====================
+  Git Commit Rules
+====================
+
+This is the first file you should be reading when contributing code via Git.
+We'll assume you're basically familiar with Git, but feel free to post
+your questions on the mailing list. Please have a look at
+http://git-scm.com/ for more detailed information on Git.
+
+PHP is developed through the efforts of a large number of people.
+Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following
+some basic rules with regards to Git usage will::
+
+   a. Make everybody happier, especially those responsible for maintaining
+      Git itself.
+
+   b. Keep the changes consistently well documented and easily trackable.
+
+   c. Prevent some of those 'Oops' moments.
+
+   d. Increase the general level of good will on planet Earth.
+
+Having said that, here are the organizational rules::
+
+   1. Respect other people working on the project.
+
+   2. Discuss any significant changes on the list before committing and get
+      confirmation from the release manager for the given branch.
+
+   3. Look at EXTENSIONS file to see who is the primary maintainer of
+      the code you want to contribute to.
+
+   4. If you "strongly disagree" about something another person did, don't
+      start fighting publicly - take it up in private email.
+
+   5. If you don't know how to do something, ask first!
+
+   6. Test your changes before committing them. We mean it. Really.
+      To do so use "make test".
+
+   7. For development use the --enable-maintainer-zts switch to ensure your
+      code handles TSRM correctly and doesn't break for those who need that.
+
+Currently we have the following branches in use::
+
+  master    The active development branch. 
+
+  PHP-5.6   Is used to release the PHP 5.6.x series. This is a current
+            stable version and is open for bugfixes only.
+
+  PHP-5.5   Is used to release the PHP 5.5.x series. This is a current
+            stable version and is open for bugfixes only.
+
+  PHP-5.4   Is used to release the PHP 5.4.x series. This is a current
+            stable version and is open for bugfixes only.
+
+  PHP-5.3   This branch is closed.
+
+  PHP-5.2   This branch is closed.
+
+  PHP-5.1   This branch is closed.
+
+  PHP-4.4   This branch is closed.
+
+  PHP-X.Y.Z These branches are used for the release managers for tagging
+            the releases, hence they are closed to the general public.
+
+The next few rules are more of a technical nature::
+
+   1. All changes should first go to the lowest branch (i.e. 5.4) and then
+      get merged up to all other branches. If a change is not needed for
+      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,
+      bug fixes, improvements, etc., should go into the NEWS file of *any
+      stable release* version with the given change. In other words,
+      news about a bug fix which went into PHP-5.4, PHP-5.5 and master
+      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 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.
+
+   4. Do write your commit message in such a way that it makes sense even
+      without the corresponding diff. One should be able to look at it, and
+      immediately know what was modified. Definitely include the function name
+      in the message as shown below.
+
+   5. In your commit messages, keep each line shorter than 80 characters. And
+      try to align your lines vertically, if they wrap. It looks bad otherwise.
+
+   6. If you modified a function that is callable from PHP, prepend PHP to
+      the function name as shown below.
+
+
+The format of the commit messages is pretty simple.
+
+<max 79 characters short description>\n
+\n
+<long description, 79 chars per line>
+\n
+
+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.
+
+If you fix some bugs, you should note the bug ID numbers in your
+commit message. Bug ID should be prefixed by "#" for easier access to
+bug report when developers are browsing CVS via LXR or Bonsai.
+
+Example:
+
+Fixed bug #14016 (pgsql notice handler double free crash bug.)
+
+When you change the NEWS file for a bug fix, then please keep the bugs
+sorted in decreasing order under the fixed version.
+
+You can use OpenGrok (http://lxr.php.net/) and gitweb (http://git.php.net/)
+to look at PHP Git repository in various ways.
+
+
+For further information on the process and further details please refer to
+https://wiki.php.net/vcs/gitworkflow and https://wiki.php.net/vcs/gitfaq
+
+Happy hacking,
+
+PHP Team

README.MAILINGLIST_RULES

@@ -0,0 +1,79 @@
+====================
+  Mailinglist Rules
+====================
+
+This is the first file you should be reading before doing any posts on PHP
+mailinglists. Following these rules is considered imperative to the success of
+the PHP project. Therefore expect your contributions to be of much less positive
+impact if you do not follow these rules. More importantly you can actually
+assume that not following these rules will hurt the PHP project.
+
+PHP is developed through the efforts of a large number of people.
+Collaboration is a Good Thing(tm), and mailinglists lets us do this. Thus,
+following some basic rules with regards to mailinglist usage will:
+
+   a. Make everybody happier, especially those responsible for developing PHP
+      itself.
+
+   b. Help in making sure we all use our time more efficiently.
+
+   c. Prevent you from making a fool of yourself in public.
+
+   d. Increase the general level of good will on planet Earth.
+
+
+Having said that, here are the organizational rules:
+
+   1. Respect other people working on the project.
+
+   2. Do not post when you are angry. Any post can wait a few hours. Review
+      your post after a good breather or a good nights sleep.
+
+   3. Make sure you pick the right mailinglist for your posting. Please review
+      the descriptions on the mailinglist overview page
+      (http://www.php.net/mailing-lists.php). When in doubt ask a friend or
+      someone you trust on IRC.
+
+   4. Make sure you know what you are talking about. PHP is a very large project
+      that strives to be very open. The flip side is that the core developers
+      are faced with a lot of requests. Make sure that you have done your
+      research before posting to the entire developer community.
+
+   5. Patches have a much greater chance of acceptance than just asking the
+      PHP developers to implement a feature for you. For one it makes the
+      discussion more concrete and it shows that the poster put thought and time
+      into the request.
+
+   6. If you are posting to an existing thread, make sure that you know what
+      previous posters have said. This is even more important the longer the
+      thread is already.
+
+   7. Please configure your email client to use a real name and keep message
+      signatures to a maximum of 2 lines if at all necessary.
+
+The next few rules are more some general hints:
+
+   1. If you notice that your posting ratio is much higher than that of other
+      people, double check the above rules. Try to wait a bit longer before
+      sending your replies to give other people more time to digest your answers
+      and more importantly give you the opportunity to make sure that you
+      aggregate your current position into a single mail instead of multiple
+      ones.
+
+   2. Consider taking a step back from a very active thread now and then. Maybe
+      talking to some friends and fellow developers will help in understanding
+      the other opinions better.
+
+   3. Do not top post. Place your answer underneath anyone you wish to quote
+      and remove any previous comment that is not relevant to your post.
+
+   4. Do not high-jack threads, by bringing up entirely new topics. Please
+      create an entirely new thread copying anything you wish to quote into the
+      new thread.
+
+Finally, additional hints on how to behave inside the virtual community can be
+found in RFC 1855 (http://www.faqs.org/rfcs/rfc1855.html).
+
+Happy hacking,
+
+PHP Team

README.NEW-OUTPUT-API

@@ -0,0 +1,142 @@
+$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, 
+	and there's an API call for every output handler op.
+
+	Checking output control layers status:
+		// Using OG()
+		php_output_get_status(TSRMLS_C);
+
+	Starting the default output handler:
+		// 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 TSRMLS_CC);
+		php_output_start_user(zhandler, chunk_size, flags TSRMLS_CC);
+
+	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 TSRMLS_CC);
+		php_output_handler_set_context(h, my_context, my_context_dtor);
+		php_output_handler_start(h TSRMLS_CC);
+
+	Testing whether a certain output handler has already been started:
+		// 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 TSRMLS_CC);
+		php_output_flush(TSRMLS_C);
+
+	Flushing all output buffers:
+		// not possible with old API
+		php_output_flush_all(TSRMLS_C);
+
+	Cleaning one output buffer:
+		// 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(TSRMLS_C);
+
+	Discarding one output buffer:
+		// php_ob_end_buffer(0, 0 TSRMLS_CC);
+		php_output_discard(TSRMLS_C);
+
+	Discarding all output buffers:
+		// 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 TSRMLS_CC)
+		php_output_end(TSRMLS_C);
+
+	Stopping (and dropping) all output buffers:
+		// php_ob_end_buffers(1, 0 TSRMLS_CC);
+		php_output_end_all(TSRMLS_C);
+
+	Retrieving output buffers contents:
+		// php_ob_get_buffer(zstring TSRMLS_CC);
+		php_output_get_contents(zstring TSRMLS_CC);
+
+	Retrieving output buffers length:
+		// 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(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" 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 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 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 TSRMLS_CC);
+
+	Disabling of the output handler by itself:
+		//not possible with old API
+		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 TSRMLS_CC);
+
+	Restarting the output handler because of a CLEAN operation:
+		// not possible with old API
+		if (flags & PHP_OUTPUT_HANDLER_CLEAN) { ... }
+
+	Recognizing by the output handler itself if it gets discarded:
+		// not possible with old API
+		if ((flags & PHP_OUTPUT_HANDLER_CLEAN) && (flags & PHP_OUTPUT_HANDLER_FINAL)) { ... }
+
+
+Output handler hooks
+
+	The output handler can change its abilities at runtime. Eg. the gz handler can
+	remove the CLEANABLE and REMOVABLE bits when the first output has passed through it;
+	or handlers implemented in C to be used with ob_start() can contain a non-global
+	context:
+		PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ
+			pass a void*** pointer as second arg to receive the address of a pointer
+			pointer to the opaque field of the output handler context
+		PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS
+			pass a int* pointer as second arg to receive the flags set for the output handler
+		PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL
+			pass a int* pointer as second arg to receive the level of this output handler
+			(starts with 0)
+		PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE
+			the second arg is ignored; marks the output handler to be neither cleanable
+			nor removable
+		PHP_OUTPUT_HANDLER_HOOK_DISABLE
+			the second arg is ignored; marks the output handler as disabled
+
+
+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?
+
+END

README.PARAMETER_PARSING_API

@@ -0,0 +1,223 @@
+New parameter parsing functions
+===============================
+
+It should be easier to parse input parameters to an extension function.
+Hence, borrowing from Python's example, there are now a set of functions
+that given the string of type specifiers, can parse the input parameters
+and store the results in the user specified variables. This avoids most
+of the IS_* checks and convert_to_* conversions. The functions also
+check for the appropriate number of parameters, and try to output
+meaningful error messages.
+
+
+Prototypes
+----------
+/* Implemented. */
+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
+list of pointers to variables to store the results in. The _ex() version
+also takes 'flags' argument -- current only ZEND_PARSE_PARAMS_QUIET can
+be used as 'flags' to specify that the function should operate quietly
+and not output any error messages.
+
+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.5 includes a new function:
+
+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
+(passed with double indirection). The passed zval may be changed in place as
+part of the conversion process.
+
+See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse_parameter
+
+
+Type specifiers
+---------------
+ 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 
+ 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 
+ instance of that class.
+
+ a  - array (zval*)
+ A  - array or object (zval*)
+ b  - boolean (zend_bool)
+ C  - class (zend_class_entry*)
+ d  - double (double)
+ 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*)
+ l  - long (zend_long)
+ L  - long, limits out-of-range numbers to LONG_MAX/LONG_MIN (zend_long, ZEND_LONG_MAX/ZEND_LONG_MIN)
+ 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)
+ 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)
+ z  - the actual zval (zval*)
+ *  - variable arguments list (0 or more)
+ +  - variable arguments list (1 or more)
+
+ The following characters also have a meaning in the specifier string:
+    | - indicates that the remaining parameters are optional, they
+        should be initialized to default values by the extension since they
+        will not be touched by the parsing function if they are not
+        passed to it.
+    / - use SEPARATE_ZVAL_IF_NOT_REF() on the parameter it follows
+    ! - the parameter it follows can be of specified type or NULL. If NULL is
+		passed and the output for such type is a pointer, then the output
+		pointer is set to a native NULL pointer.
+		For 'b', 'l' and 'd', an extra argument of type zend_bool* must be
+		passed after the corresponding bool*, zend_long* or double* arguments,
+		respectively. A non-zero value will be written to the zend_bool if a
+		PHP NULL is passed.
+
+
+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), 
+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() TSRMLS_CC, "s", &str, &str_len)
+
+2)
+  int num; /* XXX THIS IS WRONG!! Use zend_long instead. */
+  zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &num)
+
+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/
+
+
+Examples
+--------
+/* Gets a long, a string and its length, and a zval */
+zend_long l;
+char *s;
+size_t s_len;
+zval *param;
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
+                          &l, &s, &s_len, &param) == FAILURE) {
+    return;
+}
+
+
+/* Gets an object of class specified by my_ce, and an optional double. */
+zval *obj;
+double d = 0.5;
+zend_class_entry *my_ce;
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
+                          &obj, my_ce, &d) == FAILURE) {
+    return;
+}
+
+
+/* Gets an object or null, and an array.
+   If null is passed for object, obj will be set to NULL. */
+zval *obj;
+zval *arr;
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a",
+                          &obj, &arr) == FAILURE) {
+    return;
+}
+
+
+/* Gets a separated array which can also be null. */
+zval *arr;
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
+                          &arr) == FAILURE) {
+    return;
+}
+
+/* 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
+ * properly, leading to random crashes on platforms like
+ * Tru64 or Linux/Alpha.
+ */
+size_t length;
+
+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() TSRMLS_CC,
+                                    "s", &s, &length) == SUCCESS) {
+    /* manipulate string */
+} else {
+    /* output error */
+
+    return;
+}
+
+
+/* Function that accepts only varargs (0 or more) */
+
+int i, num_varargs;
+zval *varargs = NULL;
+
+
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "*", &varargs, &num_varargs) == FAILURE) {
+    return;
+}
+
+for (i = 0; i < num_varargs; i++) {
+    /* do something with varargs[i] */
+}
+
+if (varargs) {
+    efree(varargs);
+}
+
+
+/* Function that accepts a string, followed by varargs (1 or more) */
+
+char *str;
+size_t str_len;
+int i, num_varargs;
+zval *varargs = NULL;
+
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
+    return;
+}
+
+for (i = 0; i < num_varargs; i++) {
+    /* do something with varargs[i] */
+}
+
+/* Function that takes an array, followed by varargs, and ending with a long */
+zend_long num;
+zval *array;
+int i, num_varargs;
+zval *varargs = NULL;
+
+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] */
+}

README.REDIST.BINS

@@ -1,122 +1,23 @@
- 1. libmagic (ext/fileinfo) see ext/fileinfo/libmagic/LICENSE
- 2. libmbfl (ext/mbstring) see ext/mbstring/libmbfl/LICENSE
- 3. pcre2lib (ext/pcre)
- 4. ext/standard crypt
- 5. ext/standard crypt's blowfish implementation
- 6. ext/standard/rand
- 7. ext/standard/scanf
- 8. ext/standard/strnatcmp.c
- 9. ext/standard/uuencode
-10. libxmlrpc ext/xmlrpc
-11. main/snprintf.c
-12. main/strlcat
-13. main/strlcpy
-14. libgd (ext/gd)
-15. ext/phar portions of tar implementations
-16. ext/phar/zip.c portion extracted from libzip
-17. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/LICENSE
-18. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
+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. 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/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
 
-
-3. 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.
-
-Releases 10.00 and above of PCRE2 are 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-2019 University of Cambridge
-All rights reserved.
-
-
-PCRE2 JUST-IN-TIME COMPILATION SUPPORT
---------------------------------------
-
-Written by:       Zoltan Herczeg
-Email local part: hzmester
-Email domain:     freemail.hu
-
-Copyright(c) 2010-2019 Zoltan Herczeg
-All rights reserved.
-
-
-STACK-LESS JUST-IN-TIME COMPILER
---------------------------------
-
-Written by:       Zoltan Herczeg
-Email local part: hzmester
-Email domain:     freemail.hu
-
-Copyright(c) 2009-2019 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
-
-
-4. ext/standard crypt
+5. ext/standard crypt
 
 FreeSec: libcrypt for NetBSD
 
@@ -127,13 +28,13 @@ 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.
+	 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.
+	 notice, this list of conditions and the following disclaimer in the
+	 documentation and/or other materials provided with the distribution.
 3. Neither the name of the author nor the names of other contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
+	 may be used to endorse or promote products derived from this software
+	 without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -146,9 +47,9 @@ 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.
+ 
 
-
-5. ext/standard crypt's blowfish implementation
+6. ext/standard crypt's blowfish implementation
 
 The crypt_blowfish homepage is:
 
@@ -192,10 +93,42 @@ 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
+
+The author disclaims copyright to this source code.  In place of
+a legal notice, here is a blessing:
+  May you do good and not evil.
+  May you find forgiveness for yourself and forgive others.
+  May you share freely, never taking more than you give.
 
 
-6. 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
@@ -218,22 +151,22 @@ 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
 are met:
 
 1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+	 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.
+	 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
-   permission.
+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
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -248,8 +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.
 
 
-7. ext/standard/scanf
-
+10. ext/standard/scanf
 scanf.c --
 
 This file contains the base code which implements sscanf and by extension
@@ -295,8 +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.
 
-
-8. 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>
@@ -310,16 +241,14 @@ including commercial applications, and to alter it and redistribute it
 freely, subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
+	 claim that you wrote the original software. If you use this software
+	 in a product, an acknowledgment in the product documentation would be
+	 appreciated but is not required.
 2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
+	 misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 
-
-9. ext/standard/uuencode
-
+12. ext/standard/uuencode
 Portions of this code are based on Berkeley's uuencode/uudecode
 implementation.
 
@@ -330,17 +259,17 @@ 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.
+	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.
+	notice, this list of conditions and the following disclaimer in the
+	documentation and/or other materials provided with the distribution.
 3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
+	must display the following acknowledgement:
 This product includes software developed by the University of
 California, Berkeley and its contributors.
 4. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
+	may be used to endorse or promote products derived from this software
+	without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -355,33 +284,63 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
 
-10. 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.
 
+14. libzip ext/zip
+zip.h -- exported declarations.
+Copyright (C) 1999-2009 Dieter Baron and Thomas Klausner
 
-11. main/snprintf.c
+This file is part of libzip, a library to manipulate ZIP archives.
+The authors can be contacted at <libzip@nih.at>
 
+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.
+3. The names of the authors may not be used to endorse or promote
+	 products derived from this software without specific prior
+	 written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
+
+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
@@ -408,26 +367,26 @@ 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.
+	 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.
+	 notice, this list of conditions and the following disclaimer in
+	 the documentation and/or other materials provided with the
+	 distribution.
 
 3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the Apache Group
-   for use in the Apache HTTP server project (http://www.apache.org/)."
+	 software must display the following acknowledgment:
+	 "This product includes software developed by the Apache Group
+	 for use in the Apache HTTP server project (http://www.apache.org/)."
 
 4. The names "Apache Server" and "Apache Group" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission.
+	 endorse or promote products derived from this software without
+	 prior written permission.
 
 5. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the Apache Group
-   for use in the Apache HTTP server project (http://www.apache.org/)."
+	 acknowledgment:
+	 "This product includes software developed by the Apache Group
+	 for use in the Apache HTTP server project (http://www.apache.org/)."
 
 THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
 EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -454,10 +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.
 
-
-12. main/strlcat
-13. main/strlcpy
-
+16. main/strlcat
+17. main/strlcpy
 Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 All rights reserved.
 
@@ -465,12 +422,12 @@ 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.
+	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.
+	notice, this list of conditions and the following disclaimer in the
+	documentation and/or other materials provided with the distribution.
 3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
+	derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -483,186 +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.
 
-
-14. libgd (ext/gd)
-
-* Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004 by Cold Spring Harbor Laboratory. Funded under
-  Grant P41-RR02188 by the National Institutes of Health.
-
-* Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004 by Boutell.Com, Inc.
-
-* Portions relating to GD2 format copyright 1999, 2000, 2001, 2002,
-  2003, 2004 Philip Warner.
-
-* Portions relating to PNG copyright 1999, 2000, 2001, 2002, 2003,
-  2004 Greg Roelofs.
-
-* Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002,
-  2003, 2004 John Ellson (ellson@graphviz.org).
-
-* Portions relating to gdft.c copyright 2001, 2002, 2003, 2004 John
-  Ellson (ellson@graphviz.org).
-
-* Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-  Pierre-Alain Joye (pierre@libgd.org).
-
-* Portions relating to JPEG and to color quantization copyright
-  2000, 2001, 2002, 2003, 2004, Doug Becker and copyright (C) 1994,
-  1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Thomas
-  G. Lane. This software is based in part on the work of the
-  Independent JPEG Group. See the file README-JPEG.TXT for more
-  information.
-
-* Portions relating to GIF compression copyright 1989 by Jef
-  Poskanzer and David Rowley, with modifications for thread safety
-  by Thomas Boutell.
-
-* Portions relating to GIF decompression copyright 1990, 1991, 1993
-  by David Koblas, with modifications for thread safety by Thomas
-  Boutell.
-
-* Portions relating to WBMP copyright 2000, 2001, 2002, 2003, 2004
-  Maurice Szmurlo and Johan Van den Brande.
-
-* Portions relating to GIF animations copyright 2004 Jaakko Hyvätti
-  (jaakko.hyvatti@iki.fi)
-
-Permission has been granted to copy, distribute and modify gd in
-any context without fee, including a commercial application,
-provided that this notice is present in user-accessible supporting
-documentation.
-
-This does not affect your ownership of the derived work itself,
-and the intent is to assure proper credit for the authors of gd,
-not to interfere with your productive use of gd. If you have
-questions, ask. "Derived works" includes all programs that utilize
-the library. Credit must be given in user-accessible
-documentation.
-
-This software is provided "AS IS." The copyright holders disclaim
-all warranties, either express or implied, including but not
-limited to implied warranties of merchantability and fitness for a
-particular purpose, with respect to this code and accompanying
-documentation.
-
-Although their code does not appear in the current release, the
-authors wish to thank David Koblas, David Rowley, and Hutchison
-Avenue Software Corporation for their prior contributions.
-
-END OF COPYRIGHT STATEMENT
-
-
-15. 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.
-
-
-16. ext/phar/zip.c portion extracted from libzip
-
-zip_dirent.c -- read directory entry (local or central), clean dirent
-Copyright (C) 1999, 2003, 2004, 2005 Dieter Baron and Thomas Klausner
-
-This function is part of libzip, a library to manipulate ZIP archives.
-The authors can be contacted at <nih@giga.or.at>
-
-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.
-3. The names of the authors may not be used to endorse or promote
-   products derived from this software without specific prior
-   written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
-
-
-18. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
-
-The OpenLDAP Public License
-  Version 2.8, 17 August 2003
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions in source form must retain copyright statements
-   and notices,
-
-2. Redistributions in binary form must reproduce applicable copyright
-   statements and notices, this list of conditions, and the following
-   disclaimer in the documentation and/or other materials provided
-   with the distribution, and
-
-3. Redistributions must contain a verbatim copy of this document.
-
-The OpenLDAP Foundation may revise this license from time to time.
-Each revision is distinguished by a version number.  You may use
-this Software under terms of this license revision or under the
-terms of any subsequent revision of the license.
-
-THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
-CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED 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 OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
-OR OWNER(S) OF THE SOFTWARE 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.
-
-The names of the authors and copyright holders must not be used in
-advertising or otherwise to promote the sale, use or other dealing
-in this Software without specific, written prior permission.  Title
-to copyright in this Software shall at all times remain with copyright
-holders.
-
-OpenLDAP is a registered trademark of the OpenLDAP Foundation.
-
-Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
-California, USA.  All Rights Reserved.  Permission to copy and
-distribute verbatim copies of this document is granted.

README.RELEASE_PROCESS

@@ -0,0 +1,314 @@
+=======================
+  PHP Release Process
+=======================
+
+General notes and tips
+----------------------
+
+1. Do not release on Fridays, Saturdays or Sundays
+because the sysadmins can not upgrade stuff then.
+
+2. Package two days before a release. So if the release is to be on Thursday,
+package on Tuesday. Think about timezones as well.
+
+3. Ensure that the tests on Travis CI are green.
+See: https://travis-ci.org/php/php-src/builds
+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 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
+
+4. Ensure that Windows builds will work before packaging
+
+5. Follow all steps to the letter. When unclear ask previous RM's (David/Julien/
+Johannes/Stas/Derick/Ilia) before proceeding. Ideally make sure that for the
+first releases one of the previous RM's is around to answer questions. For the
+steps related to the php/QA/bug websites try to have someone from the webmaster
+team (Bjori) on hand.
+
+6. Verify the tags to be extra sure everything was tagged properly.
+
+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 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
+  svn mv https://svn.php.net/repository/php/php-src/trunk/ext/foo \
+         https://svn.php.net/repository/pecl/foo/trunk
+
+If the extension is still usable or not dead, in cooperation with the extension
+maintainers if any:
+- create the pecl.php.net/foo package and its content, license, maintainer
+- create the package.xml, commit
+- release the package
+
+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)
+--------------------------------------------
+
+1. Check windows snapshot builder logs (http://windows.php.net/downloads/snaps/ the last revision)
+
+2. Check the tests at https://travis-ci.org/php/php-src/builds
+
+3. run the "scripts/dev/credits" script in php-src and commit the changes in the
+credits files in ext/standard.
+
+4. Checkout the release branch for this release (e.g., PHP-5.4.2) from the main branch.
+
+5. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+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"``
+
+6. Compile and make test, with and without ZTS, using the right Bison version
+(for example, for 5.5, Bison 2.4.1 is used)
+
+7. Check ./sapi/cli/php -v output for version matching.
+
+8. If all is right, commit the changes to the release branch with ``git commit -a``.
+
+9. Tag the repository release branch with the version, e.g.:
+``git tag -u YOURKEYID php-5.4.2RC2``
+
+10. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and ``NEWS``
+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.
+Commit the changes to the main branch.
+
+11. Push the changes to the main repo, the tag, the main branch and the release branch :
+``git push --tags origin HEAD``
+``git push origin {main branch}``
+``git push origin {release branch}``
+
+12. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
+and build three tarballs (gz, bz2 and xz).
+
+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. Now the RC can be found on http://downloads.php.net/yourname,
+f.e. http://downloads.php.net/derick/
+
+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. 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".
+
+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``.
+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:
+
+``ssh lists.php.net``
+
+``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.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,
+merge to 5.4, 5.5 etc...). Then you can cherry-pick it in your release branch.
+Don't forget to update NEWS manually in an extra commit then.
+
+3. Commit those changes. Ensure the tests at https://travis-ci.org/php/php-src/builds are
+still passing.
+
+4. run the "scripts/dev/credits" script in php-src and commit the changes in the
+credits files in ext/standard.
+
+5. Compile and make test, with and without ZTS, using the right Bison version
+(for example, for 5.5, Bison 2.4.1 is used)
+
+6. Check ./sapi/cli/php -v output for version matching.
+
+7. tag the repository with the version f.e. "``git tag -u YOURKEYID -s php-5.4.1``"
+
+8. Push the tag f.e. "``git push origin php-5.4.1``"
+
+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).
+
+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: 
+    ``git submodule init;
+    git submodule update;
+    cd distributions;
+    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 the PHP Windows development team
+(internals-win@lists.php.net) so that Windows binaries can be created.
+
+Getting the stable release announced
+------------------------------------
+
+1. Update phpweb/include/releases.inc with the old release info
+  (updates the download archives)
+
+ a. You can run ``php bin/bumpRelease 5`` if you are making a release for the
+    highest branch, otherwise you have to do this manually, see point 1.b
+
+ b. In case multiple PHP minor versions are in active development you have
+    to manually copy the old information to include/releases.inc
+
+2. Edit ``phpweb/include/version.inc`` and change (X=major release number):
+
+ a. ``$PHP_X_VERSION`` to the correct version
+
+ b. ``$PHP_X_DATE`` to the release date
+
+ c. ``$PHP_X_MD5`` array and update all the md5 sums
+
+ d. ``$PHP_X_SHA256`` array and update all the SHA256 sums
+
+ e. set ``$PHP_X_RC`` to false!
+
+ f. Make sure there are no outdated "notes" or edited "date" keys in the
+ ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array
+
+ g. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")
+
+3. Create the release file (releases/x_y_z.php)
+   Usually we use the same content as for point 6, but included in php template
+   instead of the release xml.
+
+4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
+   (prepare for next RC)
+
+5. Update the ChangeLog file for the given major version
+f.e. ``ChangeLog-5.php`` from the NEWS file
+
+ a. go over the list and put every element on one line
+
+ b. check for &, < and > and escape them if necessary
+
+ c. remove all the names at the ends of lines
+
+ d. for marking up, you can do the following (with VI):
+
+  I. ``s/^- /<li>/``
+
+  II. ``s/$/<\/li>/``
+
+  III. ``s/Fixed bug #\([0-9]\+\)/<?php bugfix(\1); ?>/``
+
+  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
+highlight the major important things (security fixes) and when it is important
+to upgrade.
+
+ a. Call php bin/createNewsEntry in your local phpweb checkout
+
+ b. Add the content for the news entry
+
+7. **Check mirrors have been synced before announcing or pushing news**
+  Try, f.e. http://www.php.net/get/php-5.5.1.tar.bz2/from/a/mirror
+  Try several mirrors, mirrors may update slowly (may take an hour)
+
+8. Commit all the changes to their respective git repos
+
+9. Please note down the sha256 and the PGP signature (.asc). These *must* be
+   included in the release mail.
+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 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)
+--------------------------------------
+
+1. Commit the new binaries to ``phpweb/distributions/``
+
+2. Edit ``phpweb/include/version.inc`` and change (X=major release number):
+
+ a. If only releasing for one OS, make sure you edit only those variables
+
+ b. ``$PHP_X_VERSION`` to the correct version
+
+ c. ``$PHP_X_DATE`` to the release date
+
+ d. ``$PHP_X_MD5`` array and update all the md5 sums
+
+ e. ``$PHP_X_SHA256`` array and update all the SHA256 sums
+
+ f. Make sure there are no outdated "notes" or edited "date" keys in the
+ ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array
+
+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
+
+ b. Add the content for the news entry
+
+4. Commit all the changes (``include/version.inc``, ``archive/archive.xml``,
+``archive/entries/YYYY-MM-DD-N.xml``)
+
+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 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.

README.SELF-CONTAINED-EXTENSIONS

@@ -0,0 +1,170 @@
+$Id$
+=============================================================================
+
+HOW TO CREATE A SELF-CONTAINED PHP EXTENSION
+
+  A self-contained extension can be distributed independently of
+  the PHP source. To create such an extension, two things are
+  required:
+
+  - Configuration file (config.m4)
+  - Source code for your module
+
+  We will describe now how to create these and how to put things
+  together.
+
+PREPARING YOUR SYSTEM
+
+  While the result will run on any system, a developer's setup needs these
+  tools:
+
+    GNU autoconf
+    GNU automake
+    GNU libtool
+    GNU m4
+
+  All of these are available from 
+
+    ftp://ftp.gnu.org/pub/gnu/
+
+CONVERTING AN EXISTING EXTENSION
+
+  Just to show you how easy it is to create a self-contained
+  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
+
+  You now have an empty directory. We will copy the files from
+  the mysql extension:
+
+     $ cp -rp php-4.0.X/ext/mysql/* .
+
+  It is time to finish the module. Run:
+
+     $ phpize
+
+  You can now ship the contents of the directory - the extension
+  can live completely on its own.
+
+  The user instructions boil down to
+
+     $ ./configure \
+            [--with-php-config=/path/to/php-config] \
+            [--with-mysql=MYSQL-DIR]
+     $ make install
+
+  The MySQL module will either use the embedded MySQL client 
+  library or the MySQL installation in MYSQL-DIR.
+
+
+DEFINING THE NEW EXTENSION
+
+  Our demo extension is called "foobar".
+
+  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 
+  libraries (that is important, because the user does not
+  need to specify anything).
+
+
+  LTLIBRARY_SOURCES specifies the names of the sources files. You can
+  name an arbitrary number of source files here.
+
+CREATING THE M4 CONFIGURATION FILE
+
+  The m4 configuration can perform additional checks. For a 
+  self-contained extension, you do not need more than a few
+  macro calls.
+
+------------------------------------------------------------------------------
+PHP_ARG_ENABLE(foobar,whether to enable foobar,
+[  --enable-foobar            Enable foobar])
+
+if test "$PHP_FOOBAR" != "no"; then
+  PHP_NEW_EXTENSION(foobar, foo.c bar.c, $ext_shared)
+fi
+------------------------------------------------------------------------------
+
+  PHP_ARG_ENABLE will automatically set the correct variables, so
+  that the extension will be enabled by PHP_NEW_EXTENSION in shared mode.
+
+  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.
+
+CREATING SOURCE FILES
+
+  ext_skel can be of great help when creating the common code for all modules
+  in PHP for you and also writing basic function definitions and C code for
+  handling arguments passed to your functions. See README.EXT_SKEL for further
+  information.
+
+  As for the rest, you are currently alone here. There are a lot of existing
+  modules, use a simple module as a starting point and add your own code.
+
+
+CREATING THE SELF-CONTAINED EXTENSION
+
+  Put config.m4 and the source files into one directory. Then, run phpize
+  (this is installed during make install by PHP 4.0).
+
+  For example, if you configured PHP with --prefix=/php, you would run
+
+     $ /php/bin/phpize
+
+  This will automatically copy the necessary build files and create
+  configure from your config.m4.
+
+  And that's it. You now have a self-contained extension.
+
+INSTALLING A SELF-CONTAINED EXTENSION
+
+  An extension can be installed by running:
+
+     $ ./configure \
+            [--with-php-config=/path/to/php-config]
+     $ make install
+
+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 
+  support to an existing module called foo.
+
+  1. In config.m4, use PHP_ARG_WITH/PHP_ARG_ENABLE. Then you will
+     automatically be able to use --with-foo=shared[,..] or
+     --enable-foo=shared[,..].
+
+  2. In config.m4, use PHP_NEW_EXTENSION(foo,.., $ext_shared) to enable
+     building the extension.
+
+  3. Add the following lines to your C source file:
+
+        #ifdef COMPILE_DL_FOO
+        ZEND_GET_MODULE(foo)
+        #endif
+
+PECL SITE CONFORMITY
+
+  If you plan to release an extension to the PECL website, there are several
+  points to be regarded.
+
+ 1. Add LICENSE or COPYING to the package.xml
+
+ 2. The following should be defined in one of the extension header files
+
+        #define PHP_FOO_VERSION "1.2.3"
+
+    This macros has to be used within your foo_module_entry to indicate the
+    extension version.
+

README.STREAMS

@@ -0,0 +1,379 @@
+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
+the PHP manual - stay tuned...
+
+Please send comments to: Wez Furlong <wez@thebrainroom.com>
+
+Why Streams?
+============
+You may have noticed a shed-load of issock parameters flying around the PHP
+code; we don't want them - they are ugly and cumbersome and force you to
+special case sockets and files every time you need to work with a "user-level"
+PHP file pointer.
+Streams take care of that and present the PHP extension coder with an ANSI
+stdio-alike API that looks much nicer and can be extended to support non file
+based data sources.
+
+Using Streams
+=============
+Streams use a php_stream* parameter just as ANSI stdio (fread etc.) use a
+FILE* parameter.
+
+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 TSRMLS_DC, 
+        const char * fmt, ...);
+PHPAPI int php_stream_eof(php_stream * stream);
+PHPAPI int php_stream_getc(php_stream * stream);
+PHPAPI char *php_stream_gets(php_stream * stream, char *buf, size_t maxlen);
+PHPAPI int php_stream_close(php_stream * stream);
+PHPAPI int php_stream_flush(php_stream * stream);
+PHPAPI int php_stream_seek(php_stream * stream, off_t offset, int whence);
+PHPAPI off_t php_stream_tell(php_stream * stream);
+PHPAPI int php_stream_lock(php_stream * stream, int mode);
+
+These (should) behave in the same way as the ANSI stdio functions with similar
+names: fread, fwrite, fprintf, feof, fgetc, fgets, fclose, fflush, fseek, ftell, flock.
+
+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 TSRMLS_DC);
+
+Where:
+    path is the file or resource to open.
+    mode is the stdio compatible mode eg: "wb", "rb" etc.
+    options is a combination of the following values:
+        IGNORE_PATH  (default) - don't use include path to search for the file
+        USE_PATH        - use include path to search for the file
+        IGNORE_URL      - do not use plugin wrappers
+        REPORT_ERRORS   - show errors in a standard format if something
+                          goes wrong.
+        STREAM_MUST_SEEK - If you really need to be able to seek the stream
+                           and don't need to be able to write to the original
+                           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
+    is) NULL.
+
+If you need to open a specific stream, or convert standard resources into
+streams there are a range of functions to do this defined in php_streams.h.
+A brief list of the most commonly used functions:
+
+PHPAPI php_stream *php_stream_fopen_from_file(FILE *file, const char *mode);
+    Convert a FILE * into a stream.
+
+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 TSRMLS_DC);
+    Generate a temporary file name and open it.
+
+There are some network enabled relatives in php_network.h:
+
+PHPAPI php_stream *php_stream_sock_open_from_socket(int socket, int persistent);
+    Convert a socket into a stream.
+
+PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short port,
+		int socktype, int timeout, int persistent);
+    Open a connection to a host and return a stream.
+
+PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent,
+    struct timeval *timeout);
+    Open a UNIX domain socket.
+   
+
+Stream Utilities
+================
+
+If you need to copy some data from one stream to another, you will be please
+to know that the streams API provides a standard way to do this:
+
+PHPAPI size_t php_stream_copy_to_stream(php_stream *src,
+    php_stream *dest, size_t maxlen);
+
+If you want to copy all remaining data from the src stream, pass
+PHP_STREAM_COPY_ALL as the maxlen parameter, otherwise maxlen indicates the
+number of bytes to copy.
+This function will try to use mmap where available to make the copying more
+efficient.
+
+If you want to read the contents of a stream into an allocated memory buffer,
+you should use:
+
+PHPAPI size_t php_stream_copy_to_mem(php_stream *src, char **buf,
+    size_t maxlen, int persistent);
+
+This function will set buf to the address of the buffer that it allocated,
+which will be maxlen bytes in length, or will be the entire length of the
+data remaining on the stream if you set maxlen to PHP_STREAM_COPY_ALL.
+The buffer is allocated using pemalloc(); you need to call pefree() to
+release the memory when you are done.
+As with copy_to_stream, this function will try use mmap where it can.
+
+If you have an existing stream and need to be able to seek() it, you
+can use this function to copy the contents into a new stream that can
+be seek()ed:
+
+PHPAPI int php_stream_make_seekable(php_stream *origstream, php_stream **newstream);
+
+It returns one of the following values:
+#define PHP_STREAM_UNCHANGED	0 /* orig stream was seekable anyway */
+#define PHP_STREAM_RELEASED		1 /* newstream should be used; origstream is no longer valid */
+#define PHP_STREAM_FAILED		2 /* an error occurred while attempting conversion */
+#define PHP_STREAM_CRITICAL		3 /* an error occurred; origstream is in an unknown state; you should close origstream */
+
+make_seekable will always set newstream to be the stream that is valid
+if the function succeeds.
+When you have finished, remember to close the stream.
+
+NOTE: If you only need to seek forward, there is no need to call this
+function, as the php_stream_seek can emulate forward seeking when the
+whence parameter is SEEK_CUR.
+
+NOTE: Writing to the stream may not affect the original source, so it
+only makes sense to use this for read-only use.
+
+NOTE: If the origstream is network based, this function will block
+until the whole contents have been downloaded.
+
+NOTE: Never call this function with an origstream that is referenced
+as a resource! It will close the origstream on success, and this
+can lead to a crash when the resource is later used/released.
+
+NOTE: If you are opening a stream and need it to be seekable, use the
+STREAM_MUST_SEEK option to php_stream_open_wrapper();
+
+PHPAPI int php_stream_supports_lock(php_stream * stream);
+
+This function will return either 1 (success) or 0 (failure) indicating whether or
+not a lock can be set on this stream. Typically you can only set locks on stdio streams.
+
+Casting Streams
+===============
+What if your extension needs to access the FILE* of a user level file pointer?
+You need to "cast" the stream into a FILE*, and this is how you do it:
+
+FILE * fp;
+php_stream * stream; /* already opened */
+
+if (php_stream_cast(stream, PHP_STREAM_AS_STDIO, (void*)&fp, REPORT_ERRORS) == FAILURE)    {
+    RETURN_FALSE;
+}
+
+The prototype is:
+
+PHPAPI int php_stream_cast(php_stream * stream, int castas, void ** ret, int
+        show_err);
+
+The show_err parameter, if non-zero, will cause the function to display an
+appropriate error message of type E_WARNING if the cast fails.
+
+castas can be one of the following values:
+PHP_STREAM_AS_STDIO - a stdio FILE*
+PHP_STREAM_AS_FD - a generic file descriptor
+PHP_STREAM_AS_SOCKETD - a socket descriptor
+
+If you ask a socket stream for a FILE*, the abstraction will use fdopen to
+create it for you.  Be warned that doing so may cause buffered data to be lost
+if you mix ANSI stdio calls on the FILE* with php stream calls on the stream.
+
+If your system has the fopencookie function, php streams can synthesize a
+FILE* on top of any stream, which is useful for SSL sockets, memory based
+streams, data base streams etc. etc.
+
+In situations where this is not desirable, you should query the stream
+to see if it naturally supports FILE *.  You can use this code snippet
+for this purpose:
+
+    if (php_stream_is(stream, PHP_STREAM_IS_STDIO)) {
+        /* can safely cast to FILE* with no adverse side effects */
+    }
+
+You can use:
+
+PHPAPI int php_stream_can_cast(php_stream * stream, int castas)
+
+to find out if a stream can be cast, without actually performing the cast, so
+to check if a stream is a socket you might use:
+
+if (php_stream_can_cast(stream, PHP_STREAM_AS_SOCKETD) == SUCCESS)  {
+    /* it can be a socket */
+}
+
+Please note the difference between php_stream_is and php_stream_can_cast;
+stream_is tells you if the stream is a particular type of stream, whereas
+can_cast tells you if the stream can be forced into the form you request.
+The former doesn't change anything, while the later *might* change some
+state in the stream.
+
+Stream Internals
+================
+
+There are two main structures associated with a stream - the php_stream
+itself, which holds some state information (and possibly a buffer) and a
+php_stream_ops structure, which holds the "virtual method table" for the
+underlying implementation.
+
+The php_streams ops struct consists of pointers to methods that implement
+read, write, close, flush, seek, gets and cast operations.  Of these, an
+implementation need only implement write, read, close and flush.  The gets
+method is intended to be used for streams if there is an underlying method
+that can efficiently behave as fgets.  The ops struct also contains a label
+for the implementation that will be used when printing error messages - the
+stdio implementation has a label of "STDIO" for example.
+
+The idea is that a stream implementation defines a php_stream_ops struct, and
+associates it with a php_stream using php_stream_alloc.
+
+As an example, the php_stream_fopen() function looks like this:
+
+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)
+            return ret;
+
+        fclose(fp);
+    }
+    return NULL;
+}
+
+php_stream_stdio_ops is a php_stream_ops structure that can be used to handle
+FILE* based streams.
+
+A socket based stream would use code similar to that above to create a stream
+to be passed back to fopen_wrapper (or it's yet to be implemented successor).
+
+The prototype for php_stream_alloc is this:
+
+PHPAPI php_stream * php_stream_alloc(php_stream_ops * ops, void * abstract,
+        size_t bufsize, int persistent, const char * mode)
+
+ops is a pointer to the implementation,
+abstract holds implementation specific data that is relevant to this instance
+of the stream,
+bufsize is the size of the buffer to use - if 0, then buffering at the stream
+level will be disabled (recommended for underlying sources that implement
+their own buffering - such a FILE*),
+persistent controls how the memory is to be allocated - persistently so that
+it lasts across requests, or non-persistently so that it is freed at the end
+of a request (it uses pemalloc),
+mode is the stdio-like mode of operation - php streams places no real meaning
+in the mode parameter, except that it checks for a 'w' in the string when
+attempting to write (this may change).
+
+The mode parameter is passed on to fdopen/fopencookie when the stream is cast
+into a FILE*, so it should be compatible with the mode parameter of fopen().
+
+Writing your own stream implementation
+======================================
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+RULE #1: when writing your own streams: make sure you have configured PHP with
+--enable-debug.
+I've taken some great pains to hook into the Zend memory manager to help track
+down allocation problems.  It will also help you spot incorrect use of the
+STREAMS_DC, STREAMS_CC and the semi-private STREAMS_REL_CC macros for function
+definitions.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+RULE #2: Please use the stdio stream as a reference; it will help you
+understand the semantics of the stream operations, and it will always
+be more up to date than these docs :-)
+
+First, you need to figure out what data you need to associate with the
+php_stream.  For example, you might need a pointer to some memory for memory
+based streams, or if you were making a stream to read data from an RDBMS like
+MySQL, you might want to store the connection and rowset handles.
+
+The stream has a field called abstract that you can use to hold this data.
+If you need to store more than a single field of data, define a structure to
+hold it, allocate it (use pemalloc with the persistent flag set
+appropriately), and use the abstract pointer to refer to it.
+
+For structured state you might have this:
+
+struct my_state {
+    MYSQL conn;
+    MYSQL_RES * result;
+};
+
+struct my_state * state = pemalloc(sizeof(struct my_state), persistent);
+
+/* initialize the connection, and run a query, using the fields in state to
+ * hold the results */
+
+state->result = mysql_use_result(&state->conn);
+
+/* now allocate the stream itself */
+stream = php_stream_alloc(&my_ops, state, 0, persistent, "r");
+
+/* now stream->abstract == state */
+
+Once you have that part figured out, you can write your implementation and
+define the your own php_stream_ops struct (we called it my_ops in the above
+example).
+
+For example, for reading from this weird MySQL stream:
+
+static size_t php_mysqlop_read(php_stream * stream, char * buf, size_t count)
+{
+    struct my_state * state = (struct my_state*)stream->abstract;
+
+    if (buf == NULL && count == 0)  {
+        /* in this special case, php_streams is asking if we have reached the
+         * end of file */
+        if (... at end of file ...)
+            return EOF;
+        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,
+        and place that in the buf, but that brings in some complexities,
+        such as coping with a buffer size too small to hold the data,
+        so I won't even go in to how to do that here */
+}
+
+Implement the other operations - remember that write, read, close and flush
+are all mandatory.  The rest are optional.  Declare your stream ops struct:
+
+php_stream_ops my_ops = {
+    php_mysqlop_write, php_mysqlop_read, php_mysqlop_close,
+    php_mysqlop_flush, NULL, NULL, NULL,
+    "Strange MySQL example"
+}
+
+Thats it!
+
+Take a look at the STDIO implementation in streams.c for more information
+about how these operations work.
+The main thing to remember is that in your close operation you need to release
+and free the resources you allocated for the abstract field.  In the case of
+the example above, you need to use mysql_free_result on the rowset, close the
+connection and then use pefree to dispose of the struct you allocated.
+You may read the stream->persistent field to determine if your struct was
+allocated in persistent mode or not.
+
+vim:tw=78:et

README.SUBMITTING_PATCH

@@ -0,0 +1,194 @@
+Submitting Enhancements and Patches to PHP
+==========================================
+
+This document describes how to submit an enhancement or patch for PHP.
+It's easy!
+
+You don't need any login accounts or special access to download,
+build, debug and begin submitting PHP or PECL code, tests or
+documentation.  Once you've followed this README and had several
+patches accepted, commit privileges are often quickly granted.
+
+An excellent article to read first is:
+http://phpadvent.org/2008/less-whining-more-coding-by-elizabeth-smith
+
+
+Online Forums
+-------------
+There are several IRC channels where PHP developers are often
+available to discuss questions.  They include #php.pecl and #php.doc
+on the EFNet network and #winphp-dev on FreeNode.
+
+
+PHP Patches
+-----------
+If you are fixing broken functionality in PHP C source code first
+create a bug or identify an existing bug at http://bugs.php.net/.  A
+bug can be used to track the patch progress and prevent your changes
+getting lost in the PHP mail archives.
+
+If your change is large then create a Request For Comment (RFC) page
+on http://wiki.php.net/rfc, discuss it with the extension maintainer,
+and discuss it on the development mail list internals@lists.php.net.
+RFC Wiki accounts can be requested on
+http://wiki.php.net/start?do=register.  PHP extension maintainers can
+be found in the EXTENSIONS file in the PHP source.  Mail list
+subscription is explained on http://php.net/mailing-lists.php.
+
+Information on PHP internal C functions is at
+http://php.net/internals, though this is considered incomplete.
+Various external resources can be found on the web.  See
+https://wiki.php.net/internals for some references.  A standard
+printed reference is the book "Extending and Embedding PHP" by Sara
+Golemon.
+
+The preferred way to propose PHP patch is sending pull request from
+GitHub: https://github.com/php/php-src
+
+Fork the official PHP repository and send a pull request. A
+notification will be sent to the pull request mailing list. Sending a
+note to PHP Internals list (internals@lists.php.net) may help getting
+more feedback and quicker turnaround.  You can also add pull requests
+to bug reports at http://bugs.php.net/.
+
+If you are not using GitHub, attach your patch to a PHP bug and
+consider sending a notification email about the change to
+internals@lists.php.net.  If the bug is for an extension, also CC the
+extension maintainer.  Explain what has been changed by your patch.
+Test scripts should be included.
+
+Please make the mail subject prefix "[PATCH]".  If attaching a patch,
+ensure it has a file extension of ".txt".  This is because only MIME
+attachments of type 'text/*' are accepted.
+
+
+
+PHP Documentation Patches
+-------------------------
+If you are fixing incorrect PHP documentation first create a bug or
+identify an existing bug at http://bugs.php.net/.  A bug can be used
+to track the patch progress and prevent your changes getting lost in
+the PHP mail archives.
+
+If your change is large, then first discuss it with the mail list
+phpdoc@lists.php.net.  Subscription is explained on
+http://php.net/mailing-lists.php.
+
+Information on contributing to PHP documentation is at
+http://php.net/dochowto and http://wiki.php.net/doc/howto
+
+Attach the patch to the PHP bug and consider sending a notification
+email about the change to phpdoc@lists.php.net.  Explain what has been
+fixed/added/changed by your patch.
+
+Please make the mail subject prefix "[PATCH]".  Include the bug id(s)
+which can be closed by your patch.  If attaching a patch, ensure it
+has a file extension of ".txt".  This is because only MIME attachments
+of type 'text/*' are accepted.
+
+
+PECL Extension Patches: http://pecl.php.net/
+--------------------------------------------
+If you are fixing broken functionality in a PECL extension then create
+a bug or identify an existing bug at http://bugs.php.net/.  A bug
+can be used to track the patch progress and prevent your changes
+getting lost in the PHP mail archives.
+
+If your change is large then create a Request For Comment (RFC) page
+on http://wiki.php.net/rfc, discuss it with the extension maintainer,
+and discuss it on the development mail list pecl-dev@lists.php.net.
+PECL mail list subscription is explained on
+http://pecl.php.net/support.php.  RFC Wiki accounts can be requested
+on http://wiki.php.net/start?do=register
+
+Information on PHP internal C functions is at
+http://www.php.net/internals, though this is considered incomplete.
+Various external resources can be found on the web.  A standard
+printed reference is the book "Extending and Embedding PHP" by Sara
+Golemon.
+
+Update any open bugs and add a link to the source of your patch.  Send
+the patch or pointer to the bug to pecl-dev@lists.php.net.  Also CC
+the extension maintainer.  Explain what has been changed by your
+patch.  Test scripts should be included.
+
+Please make the mail subject prefix "[PATCH] ...".  Include the patch
+as an attachment with a file extension of ".txt".  This is because
+only MIME attachments of type 'text/*' are accepted.
+
+
+PEAR Package Patches: http://pear.php.net/
+------------------------------------------
+Information on contributing to PEAR is available at
+http://pear.php.net/manual/en/developers-newmaint.php and
+http://pear.php.net/manual/en/guide-developers.php
+
+
+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 
+at our workflow on https://wiki.php.net/vcs/gitworkflow and our FAQ
+https://wiki.php.net/vcs/gitfaq.
+
+Generally we ask that bug fix patches work on the current stable PHP
+development branches and on "master".  New PHP features only need to
+work on "master".
+
+Read CODING_STANDARDS before you start working.
+
+After modifying the source see README.TESTING and
+http://qa.php.net/write-test.php for how to test.  Submitting test
+scripts helps us to understand what functionality has changed.  It is
+important for the stability and maintainability of PHP that tests are
+comprehensive.
+
+After testing is finished, create a patch file using the command:
+
+  git diff > your_patch.txt
+
+For ease of review and later troubleshooting, submit individual
+patches for each bug or feature.
+
+
+Checklist for submitting your PHP or PECL code patch
+----------------------------------------------------
+ - Update git source just before running your final 'diff' and
+   before testing.
+ - Add in-line comments and/or have external documentation ready.
+   Use only "/* */" style comments, not "//".
+ - Create test scripts for use with "make test".
+ - Run "make test" to check your patch doesn't break other features.
+ - Rebuild PHP with --enable-debug (which will show some kinds of
+   memory errors) and check the PHP and web server error logs after
+   running your PHP tests.
+ - Rebuild PHP with --enable-maintainer-zts to check your patch
+   compiles on multi-threaded web servers.
+ - Review the patch once more just before submitting it.
+
+
+What happens after submitting your PHP, PHP Documentation or PECL patch
+-----------------------------------------------------------------------
+If your patch is easy to review and obviously has no side-effects,
+it might be committed relatively quickly.
+
+Because PHP is a volunteer-driven effort more complex patches will
+require patience on your side.  If you do not receive feedback in a
+few days, consider resubmitting the patch.  Before doing this think
+about these questions:
+
+ - Did I send the patch to the right mail list?
+ - Did I review the mail list archives to see if these kind of
+   changes had been discussed before?
+ - Did I explain my patch clearly?
+ - Is my patch too hard to review? Because of what factors?
+
+
+What happens when your PHP or PECL patch is applied
+---------------------------------------------------
+Your name will likely be included in the Git commit log.  If your
+patch affects end users, a brief description and your name might be
+added to the NEWS file.
+
+Thank you for patching PHP!

README.TESTING

@@ -0,0 +1,181 @@
+[IMPORTANT NOTICE]
+------------------
+ Failed tests usually indicate a problem with your local system setup
+and not within PHP itself (at least for official PHP release versions).
+You may decide to automatically submit a test summary to our QA workflow
+at the end of a test run.
+ Please do *not* submit a failed test as a bug or ask for help on why
+it failed on your system without providing substantial backup information
+on *why* the test failed on your special setup. Thank you :-)
+
+
+[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
+tests for all enabled functionalities and extensions using the PHP
+CLI binary.
+ To execute test scripts, you must build PHP with some SAPI, then you
+type "make test" to execute all or some test scripts saved under
+"tests" directory under source root directory.
+
+Usage:
+make test
+
+ "make test" basically executes "run-tests.php" script
+under the source root (parallel builds will not work). Therefore you
+can execute the script as follows:
+
+TEST_PHP_EXECUTABLE=sapi/cli/php \
+sapi/cli/php [-c /path/to/php.ini] run-tests.php [ext/foo/tests/GLOB]
+
+
+[Which "php" executable "make test" look for]
+---------------------------------------------
+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 
+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.
+
+NOTE: PHP binary executing "run-tests.php" and php binary used for
+executing test scripts may differ. If you use different PHP binary for
+executing "run-tests.php" script, you may get errors.
+
+
+[Which php.ini is used]
+-----------------------
+ "make test" uses the same php.ini file as it would once installed.
+The tests have been written to be independent of that php.ini file,
+so if you find a test that is affected by a setting, please report
+this, so we can address the issue.
+
+
+[Which test scripts are executed]
+---------------------------------
+ "run-tests.php" ("make test"), without any arguments executes all
+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 '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
+regarded as a test file.
+
+ Tester can easily execute tests selectively with as follows.
+
+Examples:
+./sapi/cli/php run-tests.php ext/mbstring/*
+./sapi/cli/php run-tests.php ext/mbstring/020.phpt
+
+
+[Test results]
+--------------
+ 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 
+ext/myext/tests/myext.phpt fails to pass, the following files are created:
+
+ext/myext/tests/myext.php   - actual test file executed
+ext/myext/tests/myext.log   - log of test execution (L)
+ext/myext/tests/myext.exp   - expected output (E)
+ext/myext/tests/myext.out   - output from test script (O)
+ext/myext/tests/myext.diff  - diff of .out and .exp (D)
+
+ Failed tests are always bugs. Either the test is bugged or not considering
+factors applying to the tester's environment, or there is a bug in PHP.
+If this is a known bug, we strive to provide bug numbers, in either the
+test name or the file name. You can check the status of such a bug, by
+going to: http://bugs.php.net/12345 where 12345 is the bug number.
+For clarity and automated processing, bug numbers are prefixed by a hash
+sign '#' in test names and/or test cases are named bug12345.phpt.
+
+NOTE: The files generated by tests can be selected by setting the
+environment variable TEST_PHP_LOG_FORMAT. For each file you want to be
+generated use the character in brackets as shown above (default is LEOD).
+The php file will be generated always.
+
+NOTE: You can set environment variable TEST_PHP_DETAILED to enable
+detailed test information.
+
+[Automated Testing]
+--------------
+ If you like to keep up to speed, with latest developments and quality
+assurance, setting the environment variable NO_INTERACTION to 1, will not
+prompt the tester for any user input.
+
+Normally, the exit status of "make test" is zero, regardless of the results
+of independent tests. Set the environment variable REPORT_EXIT_STATUS to 1,
+and "make test" will set the exit status ("$?") to non-zero, when an
+individual test has failed.
+
+Example script to be run by cron(1):
+========== qa-test.sh =============
+#!/bin/sh
+
+CO_DIR=$HOME/cvs/php7
+MYMAIL=qa-test@domain.com
+TMPDIR=/var/tmp
+TODAY=`date +"%Y%m%d"`
+
+# Make sure compilation environment is correct
+CONFIGURE_OPTS='--disable-all --enable-cli --with-pcre'
+export MAKE=gmake
+export CC=gcc
+
+# Set test environment
+export NO_INTERACTION=1
+export REPORT_EXIT_STATUS=1
+
+cd $CO_DIR
+cvs update . >>$TMPDIR/phpqatest.$TODAY
+./cvsclean ; ./buildconf ; ./configure $CONFIGURE_OPTS ; $MAKE
+$MAKE test >>$TMPDIR/phpqatest.$TODAY 2>&1
+if test $? -gt 0
+then
+        cat $TMPDIR/phpqatest.$TODAY | mail -s"PHP-QA Test Failed for $TODAY" $MYMAIL
+fi
+========== end of qa-test.sh =============
+
+NOTE: The exit status of run-tests.php will be 1 when
+REPORT_EXIT_STATUS is set. The result of "make test" may be higher
+than that. At present, gmake 3.79.1 returns 2, so it is
+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. 
+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 
+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.
+
+ACTUAL OUTPUT
+XYXA
+
+EXPECTED OUTPUT
+ABCD
+*/
+
+$str = "XYZABCD";
+echo substr($str,3,7);
+
+?>

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.UNIX-BUILD-SYSTEM

@@ -0,0 +1,123 @@
+PHP Build System V5 Overview
+
+- supports Makefile.ins during transition phase
+- not-really-portable Makefile includes have been eliminated
+- supports separate build directories without VPATH by using
+  explicit rules only
+- does not waste disk-space/CPU-time for building temporary libraries
+  => especially noticeable on slower systems
+- slow recursive make replaced with one global Makefile
+- eases integration of proper dependencies
+- adds PHP_DEFINE(what[, value]) which creates a single include-file
+  per what.  This will allow more fine-grained dependencies.
+- abandoning the "one library per directory" concept
+- improved integration of the CLI
+- several new targets
+  build-modules: builds and copies dynamic modules into modules/
+  install-cli: installs the CLI only, so that the install-sapi
+               target does only what its name says
+- finally abandoned automake (still requires aclocal at this time)
+- changed some configure-time constructs to run at buildconf-time
+- upgraded shtool to 1.5.4
+- removed $(moduledir) (use EXTENSION_DIR)
+
+The Reason For a New System
+
+It became more and more apparent that there is a severe need
+for addressing the portability concerns and improving the chance
+that your build is correct (how often have you been told to
+"make clean"? When this is done, you won't need to anymore).
+
+
+If You Build PHP on a Unix System
+
+
+You, as a user of PHP, will notice no changes.  Of course, the build
+system will be faster, look better and work smarter.
+
+
+
+If You Are Developing PHP
+
+
+
+
+Extension developers:
+
+Makefile.ins are abandoned.  The files which are to be compiled
+are specified in the config.m4 now using the following macro:
+
+PHP_NEW_EXTENSION(foo, foo.c bar.c baz.cpp, $ext_shared)
+
+E.g. this enables the extension foo which consists of three source-code
+modules, two in C and one in C++.  And, depending on the user's wishes,
+the extension will even be built as a dynamic module.
+
+The full syntax:
+
+PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags]]])
+
+Please have a look at acinclude.m4 for the gory details and meanings
+of the other parameters.
+
+And that's basically it for the extension side.
+
+If you previously built sub-libraries for this module, add
+the source-code files here as well.  If you need to specify
+separate include directories, do it this way:
+
+PHP_NEW_EXTENSION(foo, foo.c mylib/bar.c mylib/gregor.c,,,-I@ext_srcdir@/lib)
+
+E.g. this builds the three files which are located relative to the
+extension source directory and compiles all three files with the
+special include directive (@ext_srcdir@ is automatically replaced).
+
+Now, you need to tell the build system that you want to build files
+in a directory called $ext_builddir/lib:
+
+PHP_ADD_BUILD_DIR($ext_builddir/lib)
+
+Make sure to call this after PHP_NEW_EXTENSION, because $ext_builddir
+is only set by the latter.
+
+If you have a complex extension, you might to need add special
+Make rules.  You can do this by calling PHP_ADD_MAKEFILE_FRAGMENT
+in your config.m4 after PHP_NEW_EXTENSION.
+
+This will read a file in the source-dir of your extension called
+Makefile.frag.  In this file, $(builddir) and $(srcdir) will be
+replaced by the values which are correct for your extension
+and which are again determined by the PHP_NEW_EXTENSION macro.
+
+Make sure to prefix *all* relative paths correctly with either
+$(builddir) or $(srcdir).  Because the build system does not
+change the working directory anymore, we must use either
+absolute paths or relative ones to the top build-directory.
+Correct prefixing ensures that.
+
+
+SAPI developers:
+
+Instead of using PHP_SAPI=foo/PHP_BUILD_XYZ, you will need to type
+
+PHP_SELECT_SAPI(name, type, sources.c)
+
+I.e. specify the source-code files as above and also pass the
+information regarding how PHP is supposed to be built (shared
+module, program, etc).
+
+For example for APXS:
+
+PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php7.c php_apache.c)
+
+
+
+General info
+
+The foundation for the new system is the flexible handling of
+sources and their contexts.  With the help of macros you
+can define special flags for each source-file, where it is
+located, in which target context it can work, etc.
+
+Have a look at the well documented macros
+PHP_ADD_SOURCES(_X) in acinclude.m4.

README.WIN32-BUILD-SYSTEM

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

README.input_filter

@@ -0,0 +1,183 @@
+Input Filter Support in PHP 5
+-----------------------------
+
+XSS (Cross Site Scripting) hacks are becoming more and more prevalent,
+and can be quite difficult to prevent.  Whenever you accept user data
+and somehow display this data back to users, you are likely vulnerable
+to XSS hacks.
+
+The Input Filter support in PHP 5 is aimed at providing the framework
+through which a company-wide or site-wide security policy can be
+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 
+policy, read on.
+
+A simple implementation might look like the following.  This stores the
+original raw user data and adds a my_get_raw() function while the normal
+$_POST, $_GET and $_COOKIE arrays are only populated with stripped
+data.  In this simple example all I am doing is calling strip_tags() on
+the data.
+
+ZEND_BEGIN_MODULE_GLOBALS(my_input_filter)
+        zval *post_array;
+        zval *get_array;
+        zval *cookie_array;
+ZEND_END_MODULE_GLOBALS(my_input_filter)
+
+#ifdef ZTS
+#define IF_G(v) TSRMG(my_input_filter_globals_id, zend_my_input_filter_globals *, v)
+#else
+#define IF_G(v) (my_input_filter_globals.v)
+#endif
+
+ZEND_DECLARE_MODULE_GLOBALS(my_input_filter)
+
+zend_function_entry my_input_filter_functions[] = {
+    PHP_FE(my_get_raw,   NULL)
+    {NULL, NULL, NULL}
+};
+
+zend_module_entry my_input_filter_module_entry = {
+    STANDARD_MODULE_HEADER,
+    "my_input_filter",
+    my_input_filter_functions,
+    PHP_MINIT(my_input_filter),
+    PHP_MSHUTDOWN(my_input_filter),
+    NULL,
+    PHP_RSHUTDOWN(my_input_filter),
+    PHP_MINFO(my_input_filter),
+    "0.1",
+    STANDARD_MODULE_PROPERTIES
+};
+
+PHP_MINIT_FUNCTION(my_input_filter)
+{
+    ZEND_INIT_MODULE_GLOBALS(my_input_filter, php_my_input_filter_init_globals, NULL);
+
+    REGISTER_LONG_CONSTANT("POST", PARSE_POST, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("GET", PARSE_GET, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("COOKIE", PARSE_COOKIE, CONST_CS | CONST_PERSISTENT);
+
+    sapi_register_input_filter(my_sapi_input_filter);
+    return SUCCESS;
+}
+
+PHP_RSHUTDOWN_FUNCTION(my_input_filter)
+{
+    if(IF_G(get_array)) {
+        zval_ptr_dtor(&IF_G(get_array));
+        IF_G(get_array) = NULL;
+    }
+    if(IF_G(post_array)) {
+        zval_ptr_dtor(&IF_G(post_array));
+        IF_G(post_array) = NULL;
+    }
+    if(IF_G(cookie_array)) {
+        zval_ptr_dtor(&IF_G(cookie_array));
+        IF_G(cookie_array) = NULL;
+    }
+    return SUCCESS;
+}
+
+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();
+}
+
+/* The filter handler. If you return 1 from it, then PHP also registers the
+ * (modified) variable. Returning 0 prevents PHP from registering the variable;
+ * you can use this if your filter already registers the variable under a
+ * different name, or if you just don't want the variable registered at all. */
+SAPI_INPUT_FILTER_FUNC(my_sapi_input_filter)
+{
+    zval new_var;
+    zval *array_ptr = NULL;
+    char *raw_var;
+    int var_len;
+
+    assert(*val != NULL);
+
+    switch(arg) {
+        case PARSE_GET:
+            if(!IF_G(get_array)) {
+                ALLOC_ZVAL(array_ptr);
+                array_init(array_ptr);
+                INIT_PZVAL(array_ptr);
+            }
+            IF_G(get_array) = array_ptr;
+            break;
+        case PARSE_POST:
+            if(!IF_G(post_array)) {
+                ALLOC_ZVAL(array_ptr);
+                array_init(array_ptr);
+                INIT_PZVAL(array_ptr);
+            }
+            IF_G(post_array) = array_ptr;
+            break;
+        case PARSE_COOKIE:
+            if(!IF_G(cookie_array)) {
+                ALLOC_ZVAL(array_ptr);
+                array_init(array_ptr);
+                INIT_PZVAL(array_ptr);
+            }
+            IF_G(cookie_array) = array_ptr;
+            break;
+    }
+    Z_STRLEN(new_var) = val_len;
+    Z_STRVAL(new_var) = estrndup(*val, val_len);
+    Z_TYPE(new_var) = IS_STRING;
+
+    var_len = strlen(var);
+    raw_var = emalloc(var_len+5);  /* RAW_ and a \0 */
+    strcpy(raw_var, "RAW_");
+    strlcat(raw_var,var,var_len+5);
+
+    php_register_variable_ex(raw_var, &new_var, array_ptr TSRMLS_DC);
+
+    php_strip_tags(*val, val_len, NULL, NULL, 0);
+
+    *new_val_len = strlen(*val);
+    return 1;
+}
+
+PHP_FUNCTION(my_get_raw)
+{
+    long arg;
+    char *var;
+    int var_len;
+    zval **tmp;
+    zval *array_ptr = NULL;
+
+    if(zend_parse_parameters(2 TSRMLS_CC, "ls", &arg, &var, &var_len) == FAILURE) {
+        return;
+    }
+
+    switch(arg) {
+        case PARSE_GET:
+            array_ptr = IF_G(get_array);
+            break;
+        case PARSE_POST:
+            array_ptr = IF_G(post_array);
+            break;
+        case PARSE_COOKIE:
+            array_ptr = IF_G(post_array);
+            break;
+    }
+
+    if(!array_ptr) {
+        RETURN_FALSE;
+    }
+
+    if(zend_hash_find(HASH_OF(array_ptr), var, var_len+5, (void **)&tmp) == SUCCESS) {
+        *return_value = **tmp;
+        zval_copy_ctor(return_value);
+    } else {
+        RETVAL_FALSE;
+    }
+}

README.md

@@ -1,134 +1,39 @@
-<div align="center">
-    <a href="https://php.net">
-        <img
-            alt="PHP"
-            src="https://www.php.net/images/logos/new-php-logo.svg"
-            width="150">
-    </a>
-</div>
+The PHP Interpreter
+===================
 
-# The PHP Interpreter
+This is the github mirror of the official PHP repository located at
+http://git.php.net.
 
-PHP is a popular general-purpose scripting language that is especially suited to
-web development. Fast, flexible and pragmatic, PHP powers everything from your
-blog to the most popular websites in the world. PHP is distributed under the PHP
-License v3.01.
+[![Build Status](https://secure.travis-ci.org/php/php-src.svg?branch=master)](http://travis-ci.org/php/php-src)
 
-[![Build status](https://travis-ci.org/php/php-src.svg?branch=master)](https://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)
-[![Build Status](https://dev.azure.com/phpazuredevops/php/_apis/build/status/php.php-src?branchName=PHP-7.4)](https://dev.azure.com/phpazuredevops/php/_build/latest?definitionId=1&branchName=PHP-7.4)
+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
+mailinglist internals@lists.php.net.
 
-## Documentation
+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
+information on the process.
 
-The PHP manual is available at [php.net/docs](https://php.net/docs).
-
-## Installation
-
-### Prebuilt packages and binaries
-
-Prebuilt packages and binaries can be used to get up and running fast with PHP.
-
-For Windows, the PHP binaries can be obtained from
-[windows.php.net](https://windows.php.net). After extracting the archive the
-`*.exe` files are ready to use.
-
-For other systems, see the [installation chapter](https://php.net/install).
-
-### Building PHP source code
-
-*For Windows, see [Build your own PHP on Windows](https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2).*
-
-PHP uses autotools on Unix systems to configure the build:
-
-    ./buildconf
-    ./configure [options]
-
-*See `./configure -h` for configuration options.*
-
-    make [options]
-
-*See `make -h` for make options.*
-
-The `-j` option shall set the maximum number of jobs `make` can use for the
-build:
-
-    make -j4
-
-Shall run `make` with a maximum of 4 concurrent jobs: Generally the maximum
-number of jobs should not exceed the number of cores available.
-
-## Testing PHP source code
-
-PHP ships with an extensive test suite, the command `make test` is used after
-successful compilation of the sources to run this test suite.
-
-It is possible to run tests using multiple cores by setting `-jN` in
-`TEST_PHP_ARGS`:
-
-    make TEST_PHP_ARGS=-j4 test
-
-Shall run `make test` with a maximum of 4 concurrent jobs: Generally the maximum
-number of jobs should not exceed the number of cores available.
-
-The [qa.php.net](https://qa.php.net) site provides more detailed info about
-testing and quality assurance.
-
-## Installing PHP built from source
-
-After a successful build (and test), PHP may be installed with:
-
-    make install
-
-Depending on your permissions and prefix, `make install` may need super user
-permissions.
-
-## PHP extensions
-
-Extensions provide additional functionality on top of PHP. PHP consists of many
-essential bundled extensions. Additional extensions can be found in the PHP
-Extension Community Library - [PECL](https://pecl.php.net).
-
-## Contributing
-
-The PHP source code is located in the Git repository at
-[git.php.net](https://git.php.net). Contributions are most welcome by forking
-the [GitHub mirror repository](https://github.com/php/php-src) and sending a
-pull request.
-
-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.
-
-New features require an RFC and must be accepted by the developers. See
-[Request for comments - RFC](https://wiki.php.net/rfc) and
-[Voting on PHP features](https://wiki.php.net/rfc/voting) for more information
-on the process.
-
-Bug fixes **do not** require an RFC but require a bug tracker ticket. Open a
-ticket at [bugs.php.net](https://bugs.php.net) and reference the bug id using
-`#NNNNNN`.
+Bug fixes **do not** require an RFC, but require a bugtracker ticket. Always
+open a ticket at https://bugs.php.net and reference the bug id using #NNNNNN.
 
     Fix #55371: get_magic_quotes_gpc() throws deprecation warning
 
-    After removing magic quotes, the get_magic_quotes_gpc function caused a
-    deprecated warning. get_magic_quotes_gpc can be used to detect the
-    magic_quotes behavior and therefore should not raise a warning at any time.
-    The patch removes this warning.
+    After removing magic quotes, the get_magic_quotes_gpc function caused
+    a deprecate warning. get_magic_quotes_gpc can be used to detected
+    the magic_quotes behavior and therefore should not raise a warning at any
+    time. The patch removes this warning
 
-Pull requests are not merged directly on GitHub. All PRs will be pulled and
-pushed through [git.php.net](https://git.php.net). See
-[Git workflow](https://wiki.php.net/vcs/gitworkflow) for more details.
+We do not merge pull requests directly on github. All PRs will be
+pulled and pushed through http://git.php.net.
 
-### Guidelines for contributors
 
-See further documents in the repository for more information on how to
-contribute:
+Guidelines for contributors
+===========================
+- [CODING_STANDARDS](/CODING_STANDARDS)
+- [README.GIT-RULES](/README.GIT-RULES)
+- [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES)
+- [README.RELEASE_PROCESS](/README.RELEASE_PROCESS)
 
-- [Contributing to PHP](/CONTRIBUTING.md)
-- [PHP coding standards](/CODING_STANDARDS.md)
-- [Mailinglist rules](/docs/mailinglist-rules.md)
-- [PHP release process](/docs/release-process.md)
-
-## Credits
-
-For the list of people who've put work into PHP, please see the
-[PHP credits page](https://php.net/credits.php).

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/Makefile.am

@@ -0,0 +1,6 @@
+## process this file with automake to produce Makefile.am
+AUTOMAKE_OPTIONS=foreign
+noinst_LTLIBRARIES=libtsrm.la
+libtsrm_la_SOURCES = TSRM.c tsrm_strtok_r.c
+
+depend:

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>                               |
    +----------------------------------------------------------------------+
 */
 
@@ -15,19 +15,16 @@
 #ifdef ZTS
 
 #include <stdio.h>
-#include <stdarg.h>
 
-#ifdef ZEND_DEBUG
-# include <assert.h>
-# define TSRM_ASSERT assert
-#else
-# define TSRM_ASSERT
+#if HAVE_STDARG_H
+#include <stdarg.h>
 #endif
 
 typedef struct _tsrm_tls_entry tsrm_tls_entry;
 
+#if defined(TSRM_WIN32)
 /* TSRMLS_CACHE_DEFINE; is already done in Zend, this is being always compiled statically. */
-TSRMLS_CACHE_EXTERN();
+#endif
 
 struct _tsrm_tls_entry {
 	void **storage;
@@ -41,7 +38,6 @@ typedef struct {
 	size_t size;
 	ts_allocate_ctor ctor;
 	ts_allocate_dtor dtor;
-	size_t fast_offset;
 	int done;
 } tsrm_resource_type;
 
@@ -55,17 +51,12 @@ static ts_rsrc_id		id_count;
 static tsrm_resource_type	*resource_types_table=NULL;
 static int					resource_types_table_size;
 
-/* Reserved space for fast globals access */
-static size_t tsrm_reserved_pos  = 0;
-static size_t tsrm_reserved_size = 0;
 
-static MUTEX_T tsmm_mutex;	  /* thread-safe memory manager mutex */
-static MUTEX_T tsrm_env_mutex; /* tsrm environ mutex */
+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, ...);
@@ -102,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))
@@ -123,21 +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;
-TSRM_TLS uint8_t is_thread_shutdown = 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)
@@ -145,12 +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;
-	is_thread_shutdown = 0;
-
 	tsrm_error_file = stderr;
 	tsrm_error_set(debug_level, debug_filename);
 	tsrm_tls_table_size = expected_threads;
@@ -158,7 +143,6 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu
 	tsrm_tls_table = (tsrm_tls_entry **) calloc(tsrm_tls_table_size, sizeof(tsrm_tls_entry *));
 	if (!tsrm_tls_table) {
 		TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate TLS table"));
-		is_thread_shutdown = 1;
 		return 0;
 	}
 	id_count=0;
@@ -167,67 +151,55 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu
 	resource_types_table = (tsrm_resource_type *) calloc(resource_types_table_size, sizeof(tsrm_resource_type));
 	if (!resource_types_table) {
 		TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate resource types table"));
-		is_thread_shutdown = 1;
 		free(tsrm_tls_table);
+		tsrm_tls_table = NULL;
 		return 0;
 	}
 
 	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));
-
-	tsrm_reserved_pos  = 0;
-	tsrm_reserved_size = 0;
-
-	tsrm_env_mutex = tsrm_mutex_alloc();
-
 	return 1;
-}/*}}}*/
+}
 
 
 /* Shutdown TSRM (call once for the entire process) */
 TSRM_API void tsrm_shutdown(void)
-{/*{{{*/
+{
 	int i;
 
-	if (is_thread_shutdown) {
-		/* shutdown must only occur once */
-		return;
-	}
+	if (tsrm_tls_table) {
+		for (i=0; i<tsrm_tls_table_size; i++) {
+			tsrm_tls_entry *p = tsrm_tls_table[i], *next_p;
 
-	is_thread_shutdown = 1;
+			while (p) {
+				int j;
 
-	if (!in_main_thread) {
-		/* only the main thread may shutdown tsrm */
-		return;
-	}
-
-	for (i=0; i<tsrm_tls_table_size; i++) {
-		tsrm_tls_entry *p = tsrm_tls_table[i], *next_p;
-
-		while (p) {
-			int j;
-
-			next_p = p->next;
-			for (j=0; j<p->count; j++) {
-				if (p->storage[j]) {
-					if (resource_types_table && !resource_types_table[j].done && resource_types_table[j].dtor) {
-						resource_types_table[j].dtor(p->storage[j]);
-					}
-					if (!resource_types_table[j].fast_offset) {
+				next_p = p->next;
+				for (j=0; j<p->count; j++) {
+					if (p->storage[j]) {
+						if (resource_types_table && !resource_types_table[j].done && resource_types_table[j].dtor) {
+							resource_types_table[j].dtor(p->storage[j]);
+						}
 						free(p->storage[j]);
 					}
 				}
+				free(p->storage);
+				free(p);
+				p = next_p;
 			}
-			free(p->storage);
-			free(p);
-			p = next_p;
 		}
+		free(tsrm_tls_table);
+		tsrm_tls_table = NULL;
+	}
+	if (resource_types_table) {
+		free(resource_types_table);
+		resource_types_table=NULL;
 	}
-	free(tsrm_tls_table);
-	free(resource_types_table);
 	tsrm_mutex_free(tsmm_mutex);
-	tsrm_mutex_free(tsrm_env_mutex);
+	tsmm_mutex = NULL;
 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Shutdown TSRM"));
 	if (tsrm_error_file!=stderr) {
 		fclose(tsrm_error_file);
@@ -240,61 +212,14 @@ 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;
-
-	tsrm_reserved_pos  = 0;
-	tsrm_reserved_size = 0;
-}/*}}}*/
-
-/* {{{ */
-/* environ lock api */
-TSRM_API void tsrm_env_lock() {
-    tsrm_mutex_lock(tsrm_env_mutex);
 }
 
-TSRM_API void tsrm_env_unlock() {
-    tsrm_mutex_unlock(tsrm_env_mutex);
-} /* }}} */
-
-/* enlarge the arrays for the already active threads */
-static void tsrm_update_active_threads(void)
-{/*{{{*/
-	int i;
-
-	for (i=0; i<tsrm_tls_table_size; i++) {
-		tsrm_tls_entry *p = tsrm_tls_table[i];
-
-		while (p) {
-			if (p->count < id_count) {
-				int j;
-
-				p->storage = (void *) realloc(p->storage, sizeof(void *)*id_count);
-				for (j=p->count; j<id_count; j++) {
-					if (resource_types_table[j].fast_offset) {
-						p->storage[j] = (void *) (((char*)p) + resource_types_table[j].fast_offset);
-					} else {
-						p->storage[j] = (void *) malloc(resource_types_table[j].size);
-					}
-					if (resource_types_table[j].ctor) {
-						resource_types_table[j].ctor(p->storage[j]);
-					}
-				}
-				p->count = id_count;
-			}
-			p = p->next;
-		}
-	}
-}/*}}}*/
-
 
 /* 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));
 
 	tsrm_mutex_lock(tsmm_mutex);
@@ -305,95 +230,53 @@ 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;
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].ctor = ctor;
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].dtor = dtor;
-	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].fast_offset = 0;
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].done = 0;
 
-	tsrm_update_active_threads();
-	tsrm_mutex_unlock(tsmm_mutex);
+	/* enlarge the arrays for the already active threads */
+	for (i=0; i<tsrm_tls_table_size; i++) {
+		tsrm_tls_entry *p = tsrm_tls_table[i];
 
-	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Successfully allocated new resource id %d", *rsrc_id));
-	return *rsrc_id;
-}/*}}}*/
+		while (p) {
+			if (p->count < id_count) {
+				int j;
 
-
-/* Reserve space for fast thread-safe-resources */
-TSRM_API void tsrm_reserve(size_t size)
-{/*{{{*/
-	tsrm_reserved_pos  = 0;
-	tsrm_reserved_size = TSRM_ALIGNED_SIZE(size);
-}/*}}}*/
-
-
-/* allocates a new fast thread-safe-resource id */
-TSRM_API ts_rsrc_id ts_allocate_fast_id(ts_rsrc_id *rsrc_id, size_t *offset, size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor)
-{/*{{{*/
-	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Obtaining a new fast resource id, %d bytes", size));
-
-	tsrm_mutex_lock(tsmm_mutex);
-
-	/* obtain a resource id */
-	*rsrc_id = TSRM_SHUFFLE_RSRC_ID(id_count++);
-	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Obtained resource id %d", *rsrc_id));
-
-	size = TSRM_ALIGNED_SIZE(size);
-	if (tsrm_reserved_size - tsrm_reserved_pos < size) {
-		tsrm_mutex_unlock(tsmm_mutex);
-		TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate space for fast resource"));
-		*rsrc_id = 0;
-		*offset = 0;
-		return 0;
-	}
-
-	*offset = TSRM_ALIGNED_SIZE(sizeof(tsrm_tls_entry)) + tsrm_reserved_pos;
-	tsrm_reserved_pos += size;
-
-	/* 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) {
-			tsrm_mutex_unlock(tsmm_mutex);
-			TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate storage for resource"));
-			*rsrc_id = 0;
-			return 0;
+				p->storage = (void *) realloc(p->storage, sizeof(void *)*id_count);
+				for (j=p->count; j<id_count; j++) {
+					p->storage[j] = (void *) malloc(resource_types_table[j].size);
+					if (resource_types_table[j].ctor) {
+						resource_types_table[j].ctor(p->storage[j]);
+					}
+				}
+				p->count = id_count;
+			}
+			p = p->next;
 		}
-		resource_types_table = _tmp;
-		resource_types_table_size = id_count;
 	}
-	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].size = size;
-	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].ctor = ctor;
-	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].dtor = dtor;
-	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].fast_offset = *offset;
-	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].done = 0;
-
-	tsrm_update_active_threads();
 	tsrm_mutex_unlock(tsmm_mutex);
 
 	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));
-	(*thread_resources_ptr) = (tsrm_tls_entry *) malloc(TSRM_ALIGNED_SIZE(sizeof(tsrm_tls_entry)) + tsrm_reserved_size);
+	(*thread_resources_ptr) = (tsrm_tls_entry *) malloc(sizeof(tsrm_tls_entry));
 	(*thread_resources_ptr)->storage = NULL;
 	if (id_count > 0) {
 		(*thread_resources_ptr)->storage = (void **) malloc(sizeof(void *)*id_count);
@@ -404,7 +287,6 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 
 	/* Set thread local storage to this new thread resources structure */
 	tsrm_tls_set(*thread_resources_ptr);
-	TSRMLS_CACHE = *thread_resources_ptr;
 
 	if (tsrm_new_thread_begin_handler) {
 		tsrm_new_thread_begin_handler(thread_id);
@@ -412,12 +294,9 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 	for (i=0; i<id_count; i++) {
 		if (resource_types_table[i].done) {
 			(*thread_resources_ptr)->storage[i] = NULL;
-		} else {
-			if (resource_types_table[i].fast_offset) {
-				(*thread_resources_ptr)->storage[i] = (void *) (((char*)(*thread_resources_ptr)) + resource_types_table[i].fast_offset);
-			} else {
-				(*thread_resources_ptr)->storage[i] = (void *) malloc(resource_types_table[i].size);
-			}
+		} else
+		{
+			(*thread_resources_ptr)->storage[i] = (void *) malloc(resource_types_table[i].size);
 			if (resource_types_table[i].ctor) {
 				resource_types_table[i].ctor((*thread_resources_ptr)->storage[i]);
 			}
@@ -429,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
@@ -492,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;
 
@@ -510,18 +401,16 @@ void tsrm_free_interpreter_context(void *context)
 			}
 		}
 		for (i=0; i<thread_resources->count; i++) {
-			if (!resource_types_table[i].fast_offset) {
-				free(thread_resources->storage[i]);
-			}
+			free(thread_resources->storage[i]);
 		}
 		free(thread_resources->storage);
 		free(thread_resources);
 		thread_resources = next;
 	}
-}/*}}}*/
+}
 
 void *tsrm_set_interpreter_context(void *new_ctx)
-{/*{{{*/
+{
 	tsrm_tls_entry *current;
 
 	current = tsrm_tls_get();
@@ -534,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;
 
@@ -553,20 +442,18 @@ 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();
 	int hash_value;
 	tsrm_tls_entry *last=NULL;
 
-	TSRM_ASSERT(!in_main_thread);
-
 	tsrm_mutex_lock(tsmm_mutex);
 	hash_value = THREAD_HASH_OF(thread_id, tsrm_tls_table_size);
 	thread_resources = tsrm_tls_table[hash_value];
@@ -579,9 +466,7 @@ void ts_free_thread(void)
 				}
 			}
 			for (i=0; i<thread_resources->count; i++) {
-				if (!resource_types_table[i].fast_offset) {
-					free(thread_resources->storage[i]);
-				}
+				free(thread_resources->storage[i]);
 			}
 			free(thread_resources->storage);
 			if (last) {
@@ -599,11 +484,58 @@ 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();
+	int hash_value;
+	tsrm_tls_entry *last=NULL;
+
+	tsrm_mutex_lock(tsmm_mutex);
+	hash_value = THREAD_HASH_OF(thread_id, tsrm_tls_table_size);
+	thread_resources = tsrm_tls_table[hash_value];
+
+	while (thread_resources) {
+		if (thread_resources->thread_id != thread_id) {
+			for (i=0; i<thread_resources->count; i++) {
+				if (resource_types_table[i].dtor) {
+					resource_types_table[i].dtor(thread_resources->storage[i]);
+				}
+			}
+			for (i=0; i<thread_resources->count; i++) {
+				free(thread_resources->storage[i]);
+			}
+			free(thread_resources->storage);
+			if (last) {
+				last->next = thread_resources->next;
+			} else {
+				tsrm_tls_table[hash_value] = thread_resources->next;
+			}
+			free(thread_resources);
+			if (last) {
+				thread_resources = last->next;
+			} else {
+				thread_resources = tsrm_tls_table[hash_value];
+			}
+		} else {
+			if (thread_resources->next) {
+				last = thread_resources;
+			}
+			thread_resources = thread_resources->next;
+		}
+	}
+	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);
 
@@ -620,9 +552,7 @@ void ts_free_id(ts_rsrc_id id)
 					if (resource_types_table && resource_types_table[j].dtor) {
 						resource_types_table[j].dtor(p->storage[j]);
 					}
-					if (!resource_types_table[j].fast_offset) {
-						free(p->storage[j]);
-					}
+					free(p->storage[j]);
 					p->storage[j] = NULL;
 				}
 				p = p->next;
@@ -634,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));
-}/*}}}*/
+}
 
 
 
@@ -645,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));
@@ -671,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);
@@ -693,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
-}/*}}}*/
+}
 
 
 /*
@@ -708,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);
@@ -720,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
-}/*}}}*/
+}
 
 
 /*
@@ -731,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);
@@ -743,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
@@ -761,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
@@ -798,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;
@@ -813,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
@@ -835,36 +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 uint8_t tsrm_is_shutdown(void)
-{/*{{{*/
-    return is_thread_shutdown;
-}/*}}}*/
-
-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 */

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>                               |
    +----------------------------------------------------------------------+
 */
 
@@ -15,9 +15,9 @@
 
 #if !defined(__CYGWIN__) && defined(WIN32)
 # define TSRM_WIN32
-# include "Zend/zend_config.w32.h"
+# include "tsrm_config.w32.h"
 #else
-# include "main/php_config.h"
+# include <tsrm_config.h>
 #endif
 
 #include "main/php_stdint.h"
@@ -52,14 +52,9 @@ typedef uintptr_t tsrm_uintptr_t;
 # include <pthread.h>
 #elif defined(TSRM_ST)
 # include <st.h>
-#endif
-
-#if SIZEOF_SIZE_T == 4
-# define TSRM_ALIGNED_SIZE(size) \
-	(((size) + INT32_C(15)) & ~INT32_C(15))
-#else
-# define TSRM_ALIGNED_SIZE(size) \
-	(((size) + INT64_C(15)) & ~INT64_C(15))
+#elif defined(BETHREADS)
+#include <kernel/OS.h>
+#include <TLS.h>
 #endif
 
 typedef int ts_rsrc_id;
@@ -74,12 +69,27 @@ 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
 #include <signal.h>
+#endif
 
 typedef void (*ts_allocate_ctor)(void *);
 typedef void (*ts_allocate_dtor)(void *);
@@ -94,17 +104,9 @@ extern "C" {
 TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename);
 TSRM_API void tsrm_shutdown(void);
 
-/* environ lock API */
-TSRM_API void tsrm_env_lock();
-TSRM_API void tsrm_env_unlock();
-
 /* 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);
 
-/* Fast resource in reserved (pre-allocated) space */
-TSRM_API void tsrm_reserve(size_t size);
-TSRM_API ts_rsrc_id ts_allocate_fast_id(ts_rsrc_id *rsrc_id, size_t *offset, size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor);
-
 /* fetches the requested resource for the current thread */
 TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id);
 #define ts_resource(id)			ts_resource_ex(id, NULL)
@@ -112,6 +114,9 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id);
 /* frees all resources allocated for the current thread */
 TSRM_API void ts_free_thread(void);
 
+/* frees all resources allocated for all threads except current */
+void ts_free_worker_threads(void);
+
 /* deallocates all occurrences of a given id */
 TSRM_API void ts_free_id(ts_rsrc_id id);
 
@@ -123,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, ...);
@@ -141,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. */
@@ -150,9 +153,6 @@ 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 uint8_t tsrm_is_shutdown(void);
-TSRM_API const char *tsrm_api_name(void);
 
 #ifdef TSRM_WIN32
 # define TSRM_TLS __declspec(thread)
@@ -165,18 +165,16 @@ TSRM_API const char *tsrm_api_name(void);
 
 #define TSRMLS_FETCH_FROM_CTX(ctx)	void ***tsrm_ls = (void ***) ctx
 #define TSRMLS_SET_CTX(ctx)		ctx = (void ***) tsrm_get_ls_cache()
-#define TSRMG(id, type, element)	(TSRMG_BULK(id, type)->element)
-#define TSRMG_BULK(id, type)	((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])
-#define TSRMG_FAST(offset, type, element)	(TSRMG_FAST_BULK(offset, type)->element)
-#define TSRMG_FAST_BULK(offset, type)	((type) (((char*) tsrm_get_ls_cache())+(offset)))
+#define TSRMG(id, type, element)	(((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
 
-#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 TSRMG_FAST_STATIC(offset, type, element)	(TSRMG_FAST_BULK_STATIC(offset, type)->element)
-#define TSRMG_FAST_BULK_STATIC(offset, type)	((type) (((char*) TSRMLS_CACHE)+(offset)))
-#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
-#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
+#define TSRMG_STATIC(id, type, element)	(((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
+#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE
+#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL
+#if ZEND_DEBUG
 #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
+#else
+#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
+#endif
 #define TSRMLS_CACHE _tsrm_ls_cache
 
 /* BC only */
@@ -192,9 +190,6 @@ TSRM_API const char *tsrm_api_name(void);
 
 #else /* non ZTS */
 
-#define tsrm_env_lock()
-#define tsrm_env_unlock()
-
 #define TSRMLS_FETCH()
 #define TSRMLS_FETCH_FROM_CTX(ctx)
 #define TSRMLS_SET_CTX(ctx)
@@ -205,8 +200,6 @@ TSRM_API const char *tsrm_api_name(void);
 #define TSRMLS_CACHE_UPDATE()
 #define TSRMLS_CACHE
 
-#define TSRM_TLS
-
 /* BC only */
 #define TSRMLS_D	void
 #define TSRMLS_DC

TSRM/acinclude.m4

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

TSRM/build.mk

@@ -0,0 +1,43 @@
+# Makefile to generate build tools
+#
+# Standard usage:
+#        make -f build.mk
+#
+# Written by Sascha Schumann
+#
+# $Id$ 
+
+
+LT_TARGETS = ltmain.sh ltconfig
+
+config_h_in = tsrm_config.h.in
+
+makefile_am_files = Makefile.am
+makefile_in_files = $(makefile_am_files:.am=.in)
+makefile_files    = $(makefile_am_files:e.am=e)
+
+targets = $(makefile_in_files) $(LT_TARGETS) configure $(config_h_in)
+
+all: $(targets)
+
+clean:
+	rm -f $(targets)
+
+$(LT_TARGETS):
+	rm -f $(LT_TARGETS)
+	libtoolize --automake $(AMFLAGS) -f
+
+$(makefile_in_files): $(makefile_am_files)
+	automake -a -i $(AMFLAGS) $(makefile_files)
+
+aclocal.m4: configure.in acinclude.m4
+	aclocal
+
+$(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.in
+	autoconf

TSRM/buildconf

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+case "$1" in
+--copy)
+	automake_flags=--copy
+	shift
+;;
+esac
+
+libtoolize --force --automake $automake_flags
+
+mv aclocal.m4 aclocal.m4.old 2>/dev/null
+aclocal
+if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then
+    echo "buildconf: keeping ${1}aclocal.m4"
+    mv aclocal.m4.old aclocal.m4
+else
+    echo "buildconf: created or modified ${1}aclocal.m4"
+fi
+
+autoheader
+
+automake --add-missing --include-deps $automake_flags
+
+mv configure configure.old 2>/dev/null
+autoconf
+if cmp configure.old configure > /dev/null 2>&1; then
+    echo "buildconf: keeping ${1}configure"
+    mv configure.old configure
+else
+    echo "buildconf: created or modified ${1}configure"
+fi
+

TSRM/config.w32

@@ -1,4 +1,6 @@
 // vim:ft=javascript
+// $Id$
 
-ADD_SOURCES("TSRM", "TSRM.c tsrm_win32.c");
+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.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/readdir.h

@@ -0,0 +1,45 @@
+#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
@@ -28,7 +28,7 @@ dnl  OF THE POSSIBILITY OF SUCH DAMAGE.
 dnl
 dnl PTHREADS_FLAGS
 dnl
-dnl Set some magic defines to achieve POSIX threads conformance.
+dnl Set some magic defines to achieve POSIX threads conformance
 dnl
 AC_DEFUN([PTHREADS_FLAGS],[
   if test -z "$host_alias" && test -n "$host"; then
@@ -52,20 +52,21 @@ AC_DEFUN([PTHREADS_FLAGS],[
     PTHREAD_FLAGS=-D_REENTRANT;;
   *sco*)
     PTHREAD_FLAGS=-D_REENTRANT;;
+dnl Solves sigwait() problem, creates problems with u_long etc.
+dnl    PTHREAD_FLAGS="-D_REENTRANT -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE_EXTENDED=1";;
   esac
 
   if test -n "$PTHREAD_FLAGS"; then
     CPPFLAGS="$CPPFLAGS $PTHREAD_FLAGS"
   fi
-])
-
+])dnl
 dnl
 dnl PTHREADS_CHECK_COMPILE
 dnl
-dnl Check whether the current setup can use POSIX threads calls.
+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>
 
@@ -79,17 +80,23 @@ 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
+dnl PTHREADS_CHECK()
 dnl
-dnl Try to find a way to enable POSIX threads.
+dnl Try to find a way to enable POSIX threads
 dnl
 dnl  Magic flags
 dnl  -kthread          gcc (FreeBSD)
@@ -97,36 +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],[
-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
+
+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_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
@@ -134,7 +154,20 @@ 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"
+if test "$pthreads_working" = "yes"; then
+  threads_result="POSIX-Threads found"
+else
+  threads_result="POSIX-Threads not found"
 fi
-])
+])dnl
+dnl
+dnl
+AC_DEFUN([PTHREADS_ASSIGN_VARS],[
+if test -n "$ac_cv_pthreads_lib"; then
+  LIBS="$LIBS -l$ac_cv_pthreads_lib"
+fi
+
+if test -n "$ac_cv_pthreads_cflags"; then
+  CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
+fi
+])dnl

TSRM/tsrm.m4

@@ -1,9 +1,42 @@
-dnl This file contains TSRM specific autoconf macros.
 
-dnl
-dnl TSRM_CHECK_PTH
-dnl
+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],[
+
+AC_REQUIRE([AC_PROG_CC])dnl
+dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
+AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
+
+AC_CHECK_HEADERS(stdarg.h)
+
+AC_CHECK_FUNCS(sigprocmask)
+
+])
+
+
 AC_DEFUN([TSRM_CHECK_PTH],[
+
 AC_MSG_CHECKING(for GNU Pth)
 PTH_PREFIX="`$1 --prefix`"
 if test -z "$PTH_PREFIX"; then
@@ -16,11 +49,9 @@ LIBS="$LIBS `$1 --libs`"
 
 AC_DEFINE(GNUPTH, 1, [Whether you use GNU Pth])
 AC_MSG_RESULT(yes - installed in $PTH_PREFIX)
+
 ])
 
-dnl
-dnl TSRM_CHECK_ST
-dnl
 AC_DEFUN([TSRM_CHECK_ST],[
   if test -r "$1/include/st.h"; then
     CPPFLAGS="$CPPFLAGS -I$1/include"
@@ -38,46 +69,53 @@ AC_DEFUN([TSRM_CHECK_ST],[
   AC_DEFINE(TSRM_ST, 1, [ ])
 ])
 
-dnl
-dnl TSRM_CHECK_PTHREADS
-dnl
+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)
 ])
 
-dnl
-dnl TSRM_THREADS_CHECKS
-dnl
-dnl For the thread implementations, we always use --with-* to maintain
-dnl consistency.
-dnl
+
 AC_DEFUN([TSRM_THREADS_CHECKS],[
-AC_ARG_WITH([tsrm-pth],
-  [AS_HELP_STRING([[--with-tsrm-pth[=pth-config]]],
-    [Use GNU Pth])],
-  [TSRM_PTH=$withval],
-  [TSRM_PTH=no])
 
-AC_ARG_WITH([tsrm-st],
-  [AS_HELP_STRING([--with-tsrm-st],
-    [Use SGI's State Threads])],
-  [TSRM_ST=$withval],
-  [TSRM_ST=no])
+dnl For the thread implementations, we always use --with-*
+dnl to maintain consistency
 
-AC_ARG_WITH([tsrm-pthreads],
-  [AS_HELP_STRING([--with-tsrm-pthreads],
-    [Use POSIX threads (default)])],
-  [TSRM_PTHREADS=$withval],
-  [TSRM_PTHREADS=yes])
+AC_ARG_WITH(tsrm-pth,
+[  --with-tsrm-pth[=pth-config]
+                          Use GNU Pth],[
+  TSRM_PTH=$withval
+],[
+  TSRM_PTH=no
+])
+
+AC_ARG_WITH(tsrm-st,
+[  --with-tsrm-st          Use SGI's State Threads],[
+  TSRM_ST=$withval
+],[
+  TSRM_ST=no
+])
+
+AC_ARG_WITH(tsrm-pthreads,
+[  --with-tsrm-pthreads    Use POSIX threads (default)],[
+  TSRM_PTHREADS=$withval
+],[
+  TSRM_PTHREADS=yes
+])
 
 test "$TSRM_PTH" = "yes" && TSRM_PTH=pth-config
 
@@ -88,4 +126,5 @@ elif test "$TSRM_ST" != "no"; then
 elif test "$TSRM_PTHREADS" != "no"; then
   TSRM_CHECK_PTHREADS
 fi
+
 ])

TSRM/tsrm_config.w32.h

@@ -0,0 +1,15 @@
+#ifndef TSRM_CONFIG_W32_H
+#define TSRM_CONFIG_W32_H
+
+#include <../main/config.w32.h>
+#include "Zend/zend_config.w32.h"
+
+#define HAVE_UTIME 1
+#define HAVE_ALLOCA 1
+#define HAVE_REALPATH 1
+
+#include <malloc.h>
+#include <stdlib.h>
+#include <crtdbg.h>
+
+#endif

TSRM/tsrm_config_common.h

@@ -0,0 +1,70 @@
+#ifndef TSRM_CONFIG_COMMON_H
+#define TSRM_CONFIG_COMMON_H
+
+#ifndef __CYGWIN__
+# ifdef _WIN32
+#  define TSRM_WIN32
+# endif
+#endif
+
+#ifdef TSRM_WIN32
+# include "tsrm_config.w32.h"
+#else
+# include <tsrm_config.h>
+# include <sys/param.h>
+#endif
+
+#if HAVE_ALLOCA_H && !defined(_ALLOCA_H)
+#  include <alloca.h>
+#endif
+
+/* AIX requires this to be the first thing in the file.  */
+#ifndef __GNUC__
+# ifndef HAVE_ALLOCA_H
+#  ifdef _AIX
+#pragma alloca
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+#    ifndef NETWARE
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#if HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
+#ifndef MAXPATHLEN
+# ifdef PATH_MAX
+#  define MAXPATHLEN PATH_MAX
+# elif defined(MAX_PATH)
+#  define MAXPATHLEN MAX_PATH
+# else
+#  define MAXPATHLEN 256
+# endif
+#endif
+
+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2))
+# define TSRM_ALLOCA_MAX_SIZE 4096
+# define TSRM_ALLOCA_FLAG(name) \
+	int name;
+# define tsrm_do_alloca_ex(size, limit, use_heap) \
+	((use_heap = ((size) > (limit))) ? malloc(size) : alloca(size))
+# define tsrm_do_alloca(size, use_heap) \
+	tsrm_do_alloca_ex(size, TSRM_ALLOCA_MAX_SIZE, use_heap)
+# define tsrm_free_alloca(p, use_heap) \
+	do { if (use_heap) free(p); } while (0)
+#else
+# define TSRM_ALLOCA_FLAG(name)
+# define tsrm_do_alloca(p, use_heap)	malloc(p)
+# define tsrm_free_alloca(p, use_heap)	free(p)
+#endif
+
+#endif /* TSRM_CONFIG_COMMON_H */

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

@@ -0,0 +1,63 @@
+#include <stdio.h>
+
+#include "tsrm_config_common.h"
+#include "tsrm_strtok_r.h"
+
+static inline int in_character_class(char ch, const char *delim)
+{
+	while (*delim) {
+		if (*delim == ch) {
+			return 1;
+		}
+		delim++;
+	}
+	return 0;
+}
+
+TSRM_API char *tsrm_strtok_r(char *s, const char *delim, char **last)
+{
+	char *token;
+
+	if (s == NULL) {
+		s = *last;
+	}
+
+	while (*s && in_character_class(*s, delim)) {
+		s++;
+	}
+	if (!*s) {
+		return NULL;
+	}
+
+	token = s;
+
+	while (*s && !in_character_class(*s, delim)) {
+		s++;
+	}
+	if (!*s) {
+		*last = s;
+	} else {
+		*s = '\0';
+		*last = s + 1;
+	}
+	return token;
+}
+
+#if 0
+
+main()
+{
+	char foo[] = "/foo/bar//\\barbara";
+	char *last;
+	char *token;
+
+	token = tsrm_strtok_r(foo, "/\\", &last);
+	while (token) {
+		printf ("Token = '%s'\n", token);
+		token = tsrm_strtok_r(NULL, "/\\", &last);
+	}
+
+	return 0;
+}
+
+#endif

TSRM/tsrm_strtok_r.h

@@ -0,0 +1,8 @@
+#ifndef TSRM_STRTOK_R
+#define TSRM_STRTOK_R
+
+#include "TSRM.h"
+
+TSRM_API char *tsrm_strtok_r(char *s, const char *delim, char **last);
+
+#endif

TSRM/tsrm_win32.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 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
@@ -48,7 +49,7 @@ TSRMLS_CACHE_UPDATE();
 	globals->shm	 = NULL;
 	globals->process_size = 0;
 	globals->shm_size	  = 0;
-	globals->comspec = _strdup("cmd.exe");
+	globals->comspec = _strdup((GetVersion()<0x80000000)?"cmd.exe":"command.com");
 
 	/* Set it to INVALID_HANDLE_VALUE
 	 * It will be initialized correctly in tsrm_win32_access or set to
@@ -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;
 
@@ -426,38 +437,36 @@ static shm_pair *shm_get(key_t key, void *addr)
 	TWG(shm) = newptr;
 	ptr = newptr + TWG(shm_size);
 	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;
 	HANDLE token_user = NULL;
@@ -467,38 +476,17 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 		return NULL;
 	}
 
+	/*The following two checks can be removed once we drop XP support */
 	type_len = (int)strlen(type);
-	if (type_len < 1 || type_len > 2) {
+	if (type_len <1 || type_len > 2) {
 		return NULL;
 	}
 
-	if (ptype[0] != 'r' && ptype[0] != 'w') {
-		return NULL;
-	}
-
-	if (type_len > 1 && (ptype[1] != 'b' && ptype[1] != 't')) {
-		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);
-	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);
+	for (i=0; i < type_len; i++) {
+		if (!(*ptype == 'r' || *ptype == 'w' || *ptype == 'b' || *ptype == 't')) {
 			return NULL;
 		}
+		ptype++;
 	}
 
 	security.nLength				= sizeof(SECURITY_ATTRIBUTES);
@@ -506,16 +494,13 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	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);
 
@@ -547,28 +532,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;
@@ -589,10 +565,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;
 
@@ -609,61 +585,41 @@ 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;
 
-	snprintf(shm_segment, sizeof(shm_segment), "TSRM_SHM_SEGMENT:%d", key);
-	snprintf(shm_info, sizeof(shm_info), "TSRM_SHM_DESCRIPTOR:%d", key);
+	if (size < 0) {
+		return -1;
+	}
+
+	sprintf(shm_segment, "TSRM_SHM_SEGMENT:%d", key);
+	sprintf(shm_info, "TSRM_SHM_DESCRIPTOR:%d", key);
 
 	shm_handle  = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment);
 	info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);
 
 	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;
 		}
 		if (!shm_handle || !info_handle) {
-			if (shm_handle) {
-				CloseHandle(shm_handle);
-			}
-			if (info_handle) {
-				CloseHandle(info_handle);
-			}
 			return -1;
 		}
 	} else {
 		if (flags & IPC_EXCL) {
-			if (shm_handle) {
-				CloseHandle(shm_handle);
-			}
-			if (info_handle) {
-				CloseHandle(info_handle);
-			}
 			return -1;
 		}
 	}
 
 	shm = shm_get(key, NULL);
-	if (!shm) {
-		CloseHandle(shm_handle);
-		CloseHandle(info_handle);
-		return -1;
-	}
 	shm->segment = shm_handle;
 	shm->info	 = info_handle;
 	shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
@@ -692,35 +648,28 @@ 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);
-	int ret;
 
 	if (!shm->segment) {
 		return -1;
@@ -730,16 +679,10 @@ TSRM_API int shmdt(const void *shmaddr)
 	shm->descriptor->shm_lpid  = getpid();
 	shm->descriptor->shm_nattch--;
 
-	ret = UnmapViewOfFile(shm->addr) ? 0 : -1;
-	if (!ret  && shm->descriptor->shm_nattch <= 0) {
-		ret = UnmapViewOfFile(shm->descriptor) ? 0 : -1;
-		shm->descriptor = NULL;
-	}
-	return ret;
-}/*}}}*/
+	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) {
@@ -767,7 +710,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) /* {{{ */
@@ -775,7 +727,7 @@ static zend_always_inline void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {
 	// Note that LONGLONG is a 64-bit value
 	LONGLONG ll;
 
-	ll = t * 10000000LL + 116444736000000000LL;
+	ll = Int32x32To64(t, 10000000) + 116444736000000000;
 	pft->dwLowDateTime = (DWORD)ll;
 	pft->dwHighDateTime = ll >> 32;
 }
@@ -785,17 +737,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) {

TSRM/tsrm_win32.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 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,8 +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);
+
+TSRM_API char *realpath(char *orig_path, char *buffer);
 #endif

UPGRADING.INTERNALS

@@ -1,327 +1,291 @@
-PHP 7.4 INTERNALS UPGRADE NOTES
+$Id$
 
+PHP 7.0 INTERNALS UPGRADE NOTES
+
+0. Wiki Examples
 1. Internal API changes
-  a. php_sys_symlink() and php_sys_link()
-  b. zend_lookup_class_ex() and zend_fetch_class_by_name()
-  c. Function/property/class flags
-  d. Removed zend_check_private()
-  e. php_win32_error_to_msg() memory management
-  f. get_properties_for() handler / Z_OBJDEBUG_P
-  g. Required object handlers
-  h. Immutable classes and op_arrays
-  i. php_fgetcsv() and php_fputcsv()
-  j. Removed add_get_assoc_*() and add_get_index_*()
-  k. Class declaration opcodes
-  l. HASH_FLAG_INITIALIZED
-  m. write_property return value
-  n. Assignments to references
-  o. ZEND_COMPILE_EXTENDED_INFO split
-  p. ZEND_EXT_FCALL_BEGIN can access arguments
-  q. ZEND_COMPILE_IGNORE_USER_FUNCTIONS and ZEND_COMPILE_IGNORE_INTERNAL_FUNCTIONS
-  r. TSRM environment locking
-  s. Typed references support
-  t. Exceptions thrown by string conversions.
-  u. Removed uint and ulong typedefs
-  v. Compound assignment opcodes
-  w. APACHE symbol removed
-  x. php_error_docref0() renamed to php_error_docref()
-  y. Stream wrapper read/write ops
+  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
 
 2. Build system changes
-  a. Abstract
-  b. Unix build system changes
-  c. Windows build system changes
+  a. Unix build system changes
+  b. Windows build system changes
 
 3. Module changes
-  a. ext/xml
-  b. ext/hash
+
+================
+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. php_sys_symlink() and php_sys_link() portability macros have been
-    added, which behave like POSIX's symlink() and link(), respectively, on
-    POSIX compliant systems and on Windows.
+  e. New data types
 
- b. zend_lookup_class_ex() and zend_fetch_class_by_name() prototypes were
-    changed to accept optional lower-case class name as zend_string*,
-    instead of zval*.
+     String
 
- c. Function/property/class flags changes
-    - ZEND_ACC_IMPLEMENTED_ABSTRACT is removed (it was used only internally
-      during inheritance).
-    - ZEND_ACC_IMPLICIT_PUBLIC is removed (it was used only for reflection)
-    - ZEND_ACC_SHADOW property flag is removed. Instead of creating shadow
-      clone, now we use the same private property_info, and should also
-      check property_info->ce (in the same way as with methods).
-    - ZEND_ACC_ANON_BOUND is replaced with ZEND_ACC_LINKED. This flag is set
-      not only during anonymous classes declaration, but also during any
-      run-time or compile-time class declaration.
-    - ZEND_ACC_NO_RT_ARENA renamed into ZEND_ACC_HEAP_RT_CACHE. Now it's used
-      not only for closures, but also for pseudo-main op_arrays.
-    - ZEND_ACC_... flags are re-numbered.
+        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.
 
-  d. zend_check_private() is removed. Use (func->common.scope == scope) instead.
+     Integer types
 
-  e. Pointers returned by php_win32_error_to_msg() have to be freed using
-     php_win32_error_msg_free(). Same regarding php_win_err() vs.
-     php_win_err_free().
+	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.
 
-  f. A new, optional object handler with the signature
+	Signed integer is defined as zend_long, unsigned integer as zend_ulong
+	inside Zend. 
 
-         HashTable *get_properties_for(zval *obj, zend_prop_purpose purpose)
+     Other datatypes
 
-     has been introduced, where zend_prop_purpose (currently) takes one of:
+	zend_off_t  - portable off_t analogue
+	zend_stat_t - portable 'struct stat' analogue
 
-         ZEND_PROP_PURPOSE_DEBUG       // var_dump etc.
-         ZEND_PROP_PURPOSE_ARRAY_CAST  // (array) $obj
-         ZEND_PROP_PURPOSE_SERIALIZE   // "O"-format serialization (__wakeup)
-         ZEND_PROP_PURPOSE_VAR_EXPORT  // var_export (__set_state)
-         ZEND_PROP_PURPOSE_JSON        // json_encode
+	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.
 
-     The handler returns a non-null HashTable with increased refcounted, and
-     the return value must be released using zend_release_properties().
+	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
 
-     This handler serves the same general function as get_properties(), but
-     provides more control over different property uses, while also making
-     it possible to return a temporary property table.
+  f. zend_parse_parameters() specs
 
-     get_properties() is still used in cases where none of the above purposes
-     apply, but overloading get_properties() is generally discouraged. If you
-     want to provide purposes for general usage rather than just debugging or
-     serialization, please prefer using properly declared properties.
+       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.
 
-     get_debug_info() is superseded by get_properties_for() with the
-     ZEND_PROP_PURPOSE_DEBUG purpose, but remains available for backwards-
-     compatibility reasons. However, while it is fine to define this handler,
-     it should never be directly called by consuming code.
+  g. sprintf() formats
 
-     The Z_OBJDEBUG_P macro has been removed. It should be replaced by calls to
-     zend_get_properties_for() with the ZEND_PROP_PURPOSE_DEBUG purpose:
+       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'.
 
-         // OLD
-         int is_temp;
-         HashTable *ht = Z_OBJDEBUG_P(obj, is_temp);
-         // ...
-         if (is_temp) {
-            zend_hash_destroy(ht);
-            FREE_HASHTABLE(ht);
-         }
+       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_INT_FMT and ZEND_UINT_FMT should be used.
 
-         // NEW
-         HashTable *ht = zend_get_properties_for(obj, ZEND_PROP_PURPOSE_DEBUG);
-         // ...
-         zend_release_properties(ht);
+  h. HashTable API
 
-  g. The following object handlers are now required (must be non-NULL):
+       Datatype for array indexes was changed to zend_ulong, for string keys to zend_string *.
 
-       * free_obj
-       * dtor_obj
-       * read_property
-       * write_property
-       * read_dimension
-       * write_dimension
-       * get_property_ptr_ptr
-       * has_property
-       * unset_property
-       * has_dimension
-       * unset_dimension
-       * get_properties
-       * get_method
-       * get_constructor
-       * get_class_name
-       * get_gc
+  i. New portable macros for large file support
 
-     It is recommended to initialize object handler structures by copying the
-     std object handlers and only overwriting those you want to change.
+      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
 
-  h. Opcache may make classes and op_arrays immutable. Such classes are marked
-     by ZEND_ACC_IMMUTABLE flag, they are not going to be copied from opcache
-     shared memory to process memory and must not be modified at all.
-     Few related data structures were changed to allow addressing mutable data
-     structures from immutable ones. This access is implemented through
-     ZEND_MAP_PTR... abstraction macros and, basically, uses additional level of
-     indirection. op_array->run_time_cache, op_array->static_variables_ptr and
-     class_entry->static_members_table now have to be accessed through
-     ZEND_MAP_PTR... macros.
-     It's also not allowed to change op_array->reserved[] handles of immutable
-     op_arrays. Instead, now you have to reserve op_array handle using
-     zend_get_op_array_extension_handle() during MINIT and access its value
-     using ZEND_OP_ARRAY_EXTENSION(op_array, handle).
+  j. New portable macros for integers
 
-  i. The type of the escape parameter of php_fgetcsv() and php_fputcsv() has
-     been changed from char to int. This allows to pass the new constant macro
-     PHP_CSV_NO_ESCAPE to this parameter, to disable PHP's proprietary escape
-     mechanism.
+      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
 
-  j. add_get_assoc_*() and add_get_index_*() are removed. Use add_assoc*(),
-     add_index*() or zend_hash_*() API functions instead.
+      The macro ZEND_ENABLE_ZVAL_LONG64 reveals whether zval operates on 64 or 32 bit integer.
 
-  k. Complex class declaration opcodes ZEND_ADD_INTERFACE, ZEND_ADD_TRAIT,
-     ZEND_BIND_TRAITS and ZEND_VERIFY_ABSTRACT_CLASS were removed. Information
-     about interfaces and traits is kept in zend_class_entry structure and
-     actual linked performed by ZEND_DECLARE_...CLASS... opcode(s).
-     Linked classes have ZEND_ACC_LINKED flag set.
+  k. The get_class_entry object handler is no longer available. Instead
+     zend_object.ce is always used.
 
-  l. HASH_FLAG_INITIALIZED was reverted into HASH_FLAG_UNINITIALIZED. Special
-     HT_IS_INITIALIZED() and HT_INVALIDATE() macro were introduced to hide
-     implementation details.
+  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.
 
-  m. The write_property() object handler now returns the assigned value (after
-     possible type coercions) rather than void. For extensions, it should
-     usually be sufficient to return whatever was passed as the argument.
+     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.
 
-  n. Assignments to references now need to ensure that they respect property
-     types that affect the reference. This means that references should no
-     longer be directly assigned to, and instead a set of specialized macros of
-     the form ZEND_TRY_ASSIGN* needs to be used. You can find detailed porting
-     instructions as well as a compatibility shim in the wiki:
-     https://wiki.php.net/rfc/typed_properties_v2#assignments_to_references
+  m. Other portable macros info
 
-  o. ZEND_COMPILE_EXTENDED_INFO has been split into:
-       ZEND_COMPILE_EXTENDED_FCALL and ZEND_COMPILE_EXTENDED_STMT
-     This allows tooling to choose between profiling and debugging behaviour
-     ZEND_COMPILE_EXTENDED_INFO remains and preserves behaviour.
+     ZEND_SECURE_ZERO     - zeroes chunk of memory
+     ZEND_VALID_SOCKET    - validates a php_socket_t variable 
 
-  p. ZEND_EXT_BEGIN_FCALL is emitted after arguments are sent, this means
-     that handlers may access arguments.
+     ZEND_FASTCALL is defined to use __vectorcall convention on VS2013 and above
+     ZEND_NORETURN is defined as __declspec(noreturn) on VS
 
-  q. ZEND_COMPILE_IGNORE_USER_FUNCTIONS and ZEND_COMPILE_IGNORE_INTERNAL_FUNCTIONS
-     are respected by zend_get_call_op such that when set, the only possible
-     call opcodes are ZEND_DO_FCALL and ZEND_DO_FCALL_BY_NAME, previously they
-     were ignored by zend_get_call_op.
+  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.
 
-  r. TSRM adds tsrm_env_lock() and tsrm_env_unlock() for ZTS:
-     code that may change environ and may run concurrently with user code in ZTS
-     is expected to use this exclusion API to maintain as much safety as
-     reasonable. This results in "thread safe" getenv/putenv in Windows and
-     Unix, however functions that may read the environment without exclusion
-     still exist, for example:
-       - setlocale
-       - mktime
-       - tzset
-     The above is not an exhaustive list of such functions, while getenv/putenv
-     will behave as if they are safe, care should still be taken in
-     multi-threaded environments.
+  p. TSRM changes
 
-  s. Correct support for typed properties requires the use of new macros to
-     assign values to references. For more information see
-     https://wiki.php.net/rfc/typed_properties_v2#impact_on_extensions.
+     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.
 
-  t. convert_to_string() and zval_get_string() are now more likely to result in
-     an exception. For instructions on how to gracefully handle this see
-     https://wiki.php.net/rfc/tostring_exceptions#extension_guidelines.
+     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:
 
-  u. The typedefs uint and ulong are no longer guaranteed to be available, and
-     have to be replaced with standard types.
+     - 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
 
-  v. Compound assignment opcodes were changed. Instead of ZEND_ASSIGN_ADD (and
-     others) with 0, ZEND_ASSIGN_DIM, ZEND_ASSIGN_OBJ or
-     ZEND_ASSIGN_STATIC_PROP in extended value, now we use ZEND_ASSIGN_OP,
-     ZEND_ASSIGN_DIM_OP, ZEND_ASSIGN_OBJ_OP and ZEND_ASSIGN_STATIC_PROP_OP with
-     ZEND_ADD (or other) in extended_value.
+     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. 
 
-  w. APACHE symbol has been removed and is no longer 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.
 
-  x. php_error_docref0() has been removed and renamed to php_error_docref().
+     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.
 
-  y. The read and write operations of php_stream_ops now return ssize_t, with
-     negative values indicating an error.
+     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 *).
+
+  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.
 
 ========================
 2. Build system changes
 ========================
 
-  a. Abstract
-    - The hash extension is now always available, meaning the --enable-hash
-        configure argument has been removed.
-    - The filter extension no longer exposes the --with-pcre-dir configure
-      argument and therefore allows shared builds with ./configure for Unix
-      builds.
-    - Symbols HAVE_DATE, HAVE_REFLECTION, and HAVE_SPL have been removed. It
-      should be considered to have these extensions always available.
-    - Removed unused build time symbols: PHP_ADA_INCLUDE, PHP_ADA_LFLAGS,
-      PHP_ADA_LIBS, PHP_APACHE_INCLUDE, PHP_APACHE_TARGET, PHP_FHTTPD_INCLUDE,
-      PHP_FHTTPD_LIB, PHP_FHTTPD_TARGET, PHP_CFLAGS, PHP_DBASE_LIB,
-      PHP_BUILD_DEBUG, PHP_GDBM_INCLUDE, PHP_IBASE_INCLUDE, PHP_IBASE_LFLAGS,
-      PHP_IBASE_LIBS, PHP_IFX_INCLUDE, PHP_IFX_LFLAGS, PHP_IFX_LIBS,
-      PHP_INSTALL_IT, PHP_IODBC_INCLUDE, PHP_IODBC_LFLAGS, PHP_IODBC_LIBS,
-      PHP_MSQL_LFLAGS, PHP_MSQL_INCLUDE, PHP_MSQL_LFLAGS, PHP_MSQL_LIBS,
-      PHP_MYSQL_INCLUDE, PHP_MYSQL_LIBS, PHP_MYSQL_TYPE, PHP_OCI8_SHARED_LIBADD,
-      PHP_ORACLE_SHARED_LIBADD, PHP_ORACLE_DIR, PHP_ORACLE_VERSION,
-      PHP_PGSQL_INCLUDE, PHP_PGSQL_LFLAGS, PHP_PGSQL_LIBS, PHP_SOLID_INCLUDE,
-      PHP_SOLID_LIBS, PHP_EMPRESS_INCLUDE, PHP_EMPRESS_LIBS, PHP_SYBASE_INCLUDE,
-      PHP_SYBASE_LFLAGS, PHP_SYBASE_LIBS, PHP_DBM_TYPE, PHP_DBM_LIB,
-      PHP_LDAP_LFLAGS, PHP_LDAP_INCLUDE, PHP_LDAP_LIBS.
-    - Removed unused symbols: HAVE_CURL_EASY_STRERROR, HAVE_CURL_MULTI_STRERROR,
-      HAVE_MPIR, HAVE_MBSTR_CN, HAVE_MBSTR_JA, HAVE_MBSTR_KR, HAVE_MBSTR_RU,
-      HAVE_MBSTR_TW.
+  a. Unix build system changes
 
-  b. Unix build system changes
-    - Added --ini-path and --ini-dir options to php-config.
-    - configure --help now also outputs --program-suffix and --program-prefix
-      information by using the Autoconf AC_ARG_PROGRAM macro.
-    - Obsolescent macros AC_FUNC_VPRINTF and AC_FUNC_UTIME_NULL have been
-      removed. Symbols HAVE_VPRINTF and HAVE_UTIME_NULL are no longer defined
-      since they are not needed on the current systems.
-    - Local PHP m4 unused or obsolete macros have been removed:
-      PHP_TARGET_RDYNAMIC, PHP_SOLARIS_PIC_WEIRDNESS, PHP_SYS_LFS,
-      PHP_AC_BROKEN_SPRINTF, PHP_EXTENSION, PHP_DECLARED_TIMEZONE,
-      PHP_CHECK_TYPES, PHP_CHECK_64BIT, PHP_READDIR_R_TYPE,
-      PHP_SETUP_KERBEROS.
-    - Local PHP_TM_GMTOFF m4 macro replaced with Autoconf's AC_CHECK_MEMBERS.
-      The HAVE_TM_GMTOFF symbol is replaced with HAVE_STRUCT_TM_TM_GMTOFF and
-      HAVE_TM_ZONE symbol is replaced with HAVE_STRUCT_TM_TM_ZONE.
-    - new --enable-rtld-now build option allow to switch dlopen behavior
-      from RTLD_LAZY to RTLD_NOW
-    - Minimum Bison version is 3.0+ for generating parser files.
-    - PHP_PROG_BISON macro now takes two optional arguments - minimum required
-      version and excluded versions that aren't supported.
-    - PHP_PROG_RE2C is not called in the generated configure.ac for extensions
-      anymore and now takes one optional argument - minimum required version.
-    - with-pcre-valgrind and with-valgrind are merged, and valgrind detected by
-      pkgconfig
-    - Removed unused AC_PROG_CC_C_O check and the NO_MINUS_C_MINUS_O symbol.
-    - Obsolescant checks for headers and functions that are part of C89 have
-      been removed. The following symbols are therefore no longer defined by the
-      PHP build system at the configure step and shouldn't be used anymore:
-      HAVE_SETLOCALE, HAVE_LOCALECONV, HAVE_STRSTR, HAVE_STRTOL, HAVE_STRBRK,
-      HAVE_PERROR, HAVE_STRFTIME, HAVE_TZNAME, HAVE_STDARG_H, HAVE_STRING_H,
-      HAVE_STDLIB_H, HAVE_SYS_VARARGS_H, HAVE_ASSERT_H, HAVE_SYS_DIR_H,
-      TM_IN_SYS_TIME, HAVE_STRTOD, HAVE_STRCOLL, HAVE_ERRNO_H, HAVE_MEMCPY,
-      HAVE_SNPRINTF, HAVE_STDIO_H, HAVE_STRPBRK, HAVE_TIME_H, HAVE_LIMITS_H,
-      HAVE_STRTOUL, HAVE_SYS_NDIR_H, HAVE_SYS_TIMES_H, PHP_HAVE_STDINT_TYPES,
-      HAVE_SIGNAL_H, HAVE_STRERROR.
-    - Removed unused check for dev/arandom and the HAVE_DEV_ARANDOM symbol.
-    - Remove unused functions checks: HAVE_MBSINIT, HAVE_MEMPCPY, HAVE_SETPGID,
-      HAVE_STRPNCPY, HAVE_STRTOULL, HAVE_VSNPRINTF, HAVE_CUSERID, HAVE_LRAND48,
-      HAVE_RANDOM, HAVE_SRAND48, HAVE_SRANDOM, HAVE_STRDUP, HAVE_GCVT,
-      HAVE_ISASCII, HAVE_LINK, HAVE_LOCKF, HAVE_SOCKOPT, HAVE_SETVBUF, HAVE_SIN,
-      HAVE_TEMPNAM.
-    - Unused check for struct cmsghdr and symbol HAVE_CMSGHDR have been removed.
-    - Unused ApplicationServices/ApplicationServices.h headers check and
-      HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H symbol have been removed.
-    - PHP_DEBUG_MACRO macro has been removed.
-    - PHP_CHECK_CONFIGURE_OPTIONS macro has been removed. Default Autoconf's
-      --enable-option-checking=fatal option can be used in the configure step
-      to enable error when invalid options are used.
-    - Removed unused check and symbols HAVE_SHM_MMAP_ZERO, HAVE_SHM_MMAP_FILE.
-    - Removed unused check and symbol MISSING_MSGHDR_MSGFLAGS.
+  b. Windows build system changes
 
-  c. Windows build system changes
+     - 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.
 
-    . Visual Studio 2019 is utilized for the Windows builds
-    . Removed unused defined symbol HAVE_LIBBIND.
+       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
 ========================
 
-  a. ext/xml
-    - The public (internal) API of the ext/xml extension has been removed. All
-      functions and structures are private to the extension now.
+  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.
 
-  b. ext/hash
-    - The hash extension is now always available, allowing extensions to rely
-      on its functionality to be available without compile time checks.

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

@@ -0,0 +1,56 @@
+## Process this file with automake to produce Makefile.in -*- makefile -*-
+
+#CLEANFILES = zend_language_parser.c zend_language_parser.h zend_language_scanner.c zend_language_parser.output zend_ini_parser.c zend_ini_parser.h zend_ini_scanner.c zend_ini_parser.output
+
+AUTOMAKE_OPTIONS=foreign
+noinst_LTLIBRARIES=libZend.la
+
+libZend_la_SOURCES=\
+	zend_language_parser.y zend_language_scanner.l \
+	zend_ini_parser.y zend_ini_scanner.l \
+	zend_alloc.c zend_compile.c zend_constants.c \
+	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
+	zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
+	zend_list.c zend_builtin_functions.c zend_sprintf.c \
+	zend_ini.c zend_sort.c zend_objects.c zend_object_handlers.c \
+	zend_objects_API.c zend_ts_hash.c zend_stream.c \
+	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
+
+libZend_la_CFLAGS = -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1
+libZend_la_LDFLAGS =
+libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
+
+# automake isn't too clever about "non-standard" use of lex and yacc
+
+$(libZend_la_OBJECTS): zend_language_parser.h
+
+zend_ini_scanner.lo: zend_ini_parser.h
+
+# Language parser/scanner rules
+
+zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
+	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt $(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
+
+zend_language_parser.h: zend_language_parser.c
+zend_language_parser.c: $(srcdir)/zend_language_parser.y
+	$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o zend_language_parser.c
+
+# INI parser/scanner rules
+
+zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
+	$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c
+
+zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
+	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt $(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
+
+zend_ini_parser.h: zend_ini_parser.c
+
+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/Makefile.frag

@@ -1,37 +1 @@
-#
-# Zend
-#
-
-$(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h
-$(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
-
-$(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l)
-
-$(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
-$(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
-# Tweak zendparse to be exported through ZEND_API. This has to be revisited once
-# bison supports foreign skeletons and that bison version is used. Read
-# https://git.savannah.gnu.org/cgit/bison.git/tree/data/README.md for more.
-	@$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o $@
-	@$(SED) -e 's,^int zendparse\(.*\),ZEND_API int zendparse\1,g' < $@ \
-	> $@.tmp && \
-	mv $@.tmp $@
-	@$(SED) -e 's,^int zendparse\(.*\),ZEND_API int zendparse\1,g' < $(srcdir)/zend_language_parser.h \
-	> $(srcdir)/zend_language_parser.h.tmp && \
-	mv $(srcdir)/zend_language_parser.h.tmp $(srcdir)/zend_language_parser.h
-	@nlinit=`echo 'nl="'; echo '"'`; eval "$$nlinit"; \
-	$(SED) -e "s/^#ifndef YYTOKENTYPE/#include \"zend.h\"\\$${nl}#ifndef YYTOKENTYPE/" < $(srcdir)/zend_language_parser.h \
-	> $(srcdir)/zend_language_parser.h.tmp && \
-	mv $(srcdir)/zend_language_parser.h.tmp $(srcdir)/zend_language_parser.h
-
-$(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c
-$(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
-	@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
-
-$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
-
-$(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
-
 Zend/zend_execute.lo: $(srcdir)/zend_vm_execute.h $(srcdir)/zend_vm_opcodes.h

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_MM

@@ -0,0 +1,43 @@
+Zend Memory Manager
+===================
+
+General:
+--------
+
+The goal of the new memory manager (available since PHP 5.2) is to reduce memory
+allocation overhead and speedup memory management.
+
+The new manager's "configure" has no "--disable-zend-memory-manager" option,
+but it has "--enable-malloc-mm" instead.  It is enabled by default in DEBUG
+build and disabled by default in RELEASE build. When enabled it allows selecting
+between malloc and emalloc at runtime so you can use internal and external memory
+debuggers without recompilation.
+
+Debugging:
+----------
+
+Normal:
+
+    $ sapi/cli/php -r 'leak();'
+
+Zend MM disabled:
+
+    $ USE_ZEND_ALLOC=0 valgrind --leak-check=full sapi/cli/php -r 'leak();'
+
+Shared extensions:
+------------------
+
+Since PHP 5.3.11 it is possible to prevent shared extensions from unloading so
+that valgrind can correctly track the memory leaks in shared extensions. For
+this there is the ZEND_DONT_UNLOAD_MODULES environment variable. If set, then
+DL_UNLOAD() is skipped during the shutdown of shared extensions.
+
+
+Tweaking:
+---------
+
+The Zend MM can be tweaked using ZEND_MM_MEM_TYPE and ZEND_MM_SEG_SIZE environment
+variables.  Default values are "malloc" and "256K". Dependent on target system you
+can also use "mmap_anon", "mmap_zero" and "win32" storage managers.
+
+	$ ZEND_MM_MEM_TYPE=mmap_anon ZEND_MM_SEG_SIZE=1M sapi/cli/php ..etc.

Zend/README.ZEND_VM

@@ -0,0 +1,108 @@
+ZEND_VM
+=======
+
+ZEND_VM architecture allows specializing opcode handlers according to op_type
+fields and using different execution methods (call threading, switch threading
+and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
+code execution (with specialized executor and direct threading execution
+method). As in most PHP applications raw execution speed isn't the limiting
+factor but system calls and database calls are, your mileage with this patch
+will vary.
+
+Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can
+find opcode handlers and helpers. The typical opcode handler template looks
+like this:
+
+ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>)
+{
+	<HANDLER'S CODE>
+}
+
+<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 
+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
+same as in old zend_execute.c, but now it uses macros to access opcode operands
+and some internal executor data.
+
+You can see the conformity of new macros to old code in the following list:
+
+EXECUTE_DATA
+	execute_data
+ZEND_VM_DISPATCH_TO_HANDLER(<OP>)
+	return <OP>_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
+ZEND_VM_DISPATCH_TO_HELPER(<NAME>) 
+	return <NAME>(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
+ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>) 
+	return <NAME>(<VAL>, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
+ZEND_VM_CONTINUE()
+	return 0
+ZEND_VM_NEXT_OPCODE()
+	NEXT_OPCODE()
+ZEND_VM_SET_OPCODE(<TARGET>
+	SET_OPCODE(<TARGET>
+ZEND_VM_INC_OPCODE()
+	INC_OPCOD()
+ZEND_VM_RETURN_FROM_EXECUTE_LOOP()
+	RETURN_FROM_EXECUTE_LOOP()
+ZEND_VM_C_LABEL(<LABEL>):
+	<LABEL>:
+ZEND_VM_C_GOTO(<LABEL>)
+	goto <LABEL>
+OP<X>_TYPE
+	opline->op<X>.op_type
+GET_OP<X>_ZVAL_PTR(<TYPE>)
+	get_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
+GET_OP<X>_ZVAL_PTR_PTR(<TYPE>)
+	get_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
+GET_OP<X>_OBJ_ZVAL_PTR(<TYPE>)
+	get_obj_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
+GET_OP<X>_OBJ_ZVAL_PTR_PTR(<TYPE>)
+	get_obj_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
+IS_OP<X>_TMP_FREE()
+	IS_TMP_FREE(free_op<X>)
+FREE_OP<X>()
+	FREE_OP(free_op<X>)
+FREE_OP<X>_IF_VAR()
+	FREE_VAR(free_op<X>)
+FREE_OP<X>_VAR_PTR()
+	FREE_VAR_PTR(free_op<X>)
+
+
+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>)
+{
+	<HELPER'S CODE>
+}
+
+ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>)
+{
+	<HELPER'S CODE>
+}
+
+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 
+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 
+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
+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/README.md

@@ -1,139 +0,0 @@
-# Zend Engine
-
-## Zend memory manager
-
-### General
-
-The goal of the new memory manager (available since PHP 5.2) is to reduce memory
-allocation overhead and speedup memory management.
-
-### Debugging
-
-Normal:
-
-```bash
-sapi/cli/php -r 'leak();'
-```
-
-Zend MM disabled:
-
-```bash
-USE_ZEND_ALLOC=0 valgrind --leak-check=full sapi/cli/php -r 'leak();'
-```
-
-### Shared extensions
-
-Since PHP 5.3.11 it is possible to prevent shared extensions from unloading so
-that valgrind can correctly track the memory leaks in shared extensions. For
-this there is the `ZEND_DONT_UNLOAD_MODULES` environment variable. If set, then
-`DL_UNLOAD()` is skipped during the shutdown of shared extensions.
-
-## ZEND_VM
-
-`ZEND_VM` architecture allows specializing opcode handlers according to
-`op_type` fields and using different execution methods (call threading, switch
-threading and direct threading). As a result ZE2 got more than 20% speedup on
-raw PHP code execution (with specialized executor and direct threading execution
-method). As in most PHP applications raw execution speed isn't the limiting
-factor but system calls and database calls are, your mileage with this patch
-will vary.
-
-Most parts of the old zend_execute.c go into `zend_vm_def.h`. Here you can find
-opcode handlers and helpers. The typical opcode handler template looks like
-this:
-
-```c
-ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>)
-{
-    <HANDLER'S CODE>
-}
-```
-
-`<OPCODE-NUMBER>` is a opcode number (0, 1, ...)
-`<OPCODE>` is an opcode name (ZEN_NOP, ZEND_ADD, :)
-`<OP1_TYPES>` and `<OP2_TYPES>` are masks for allowed operand op_types.
-Specializer 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
-same as in old `zend_execute.c`, but now it uses macros to access opcode
-operands and some internal executor data.
-
-You can see the conformity of new macros to old code in the following list:
-
-```c
-EXECUTE_DATA
-    execute_data
-ZEND_VM_DISPATCH_TO_HANDLER(<OP>)
-    return <OP>_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_DISPATCH_TO_HELPER(<NAME>)
-    return <NAME>(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>)
-    return <NAME>(<VAL>, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_CONTINUE()
-    return 0
-ZEND_VM_NEXT_OPCODE()
-    NEXT_OPCODE()
-ZEND_VM_SET_OPCODE(<TARGET>
-    SET_OPCODE(<TARGET>
-ZEND_VM_INC_OPCODE()
-    INC_OPCOD()
-ZEND_VM_RETURN_FROM_EXECUTE_LOOP()
-    RETURN_FROM_EXECUTE_LOOP()
-ZEND_VM_C_LABEL(<LABEL>):
-    <LABEL>:
-ZEND_VM_C_GOTO(<LABEL>)
-    goto <LABEL>
-OP<X>_TYPE
-    opline->op<X>.op_type
-GET_OP<X>_ZVAL_PTR(<TYPE>)
-    get_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
-GET_OP<X>_ZVAL_PTR_PTR(<TYPE>)
-    get_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
-GET_OP<X>_OBJ_ZVAL_PTR(<TYPE>)
-    get_obj_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
-GET_OP<X>_OBJ_ZVAL_PTR_PTR(<TYPE>)
-    get_obj_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
-IS_OP<X>_TMP_FREE()
-    IS_TMP_FREE(free_op<X>)
-FREE_OP<X>()
-    FREE_OP(free_op<X>)
-FREE_OP<X>_IF_VAR()
-    FREE_VAR(free_op<X>)
-FREE_OP<X>_VAR_PTR()
-    FREE_VAR_PTR(free_op<X>)
-```
-
-Executor's helpers can be defined without parameters or with one parameter. This
-is done with the following constructs:
-
-```c
-ZEND_VM_HELPER(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>)
-{
-    <HELPER'S CODE>
-}
-
-ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>)
-{
-    <HELPER'S CODE>
-}
-```
-
-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 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 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 `zend_vm_execute.h`. Debugging with original
-file requires `--with-lines` option. By default ZE2 uses the following command
-to generate executor:
-
-```bash
-php zend_vm_gen.php --with-vm-kind=CALL
-```

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,139 +1,79 @@
-dnl This file contains Zend specific autoconf macros.
-
 dnl
-dnl ZEND_CHECK_FLOAT_PRECISION
+dnl $Id$
 dnl
-dnl x87 floating point internal precision control checks
-dnl See: http://wiki.php.net/rfc/rounding
+dnl This file contains Zend specific autoconf functions.
 dnl
-AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
-  AC_MSG_CHECKING([for usable _FPU_SETCW])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-    #include <fpu_control.h>
-  ]],[[
-    fpu_control_t fpu_oldcw, fpu_cw;
-    volatile double result;
-    double a = 2877.0;
-    volatile double b = 1000000.0;
 
-    _FPU_GETCW(fpu_oldcw);
-    fpu_cw = (fpu_oldcw & ~_FPU_EXTENDED & ~_FPU_SINGLE) | _FPU_DOUBLE;
-    _FPU_SETCW(fpu_cw);
-    result = a / b;
-    _FPU_SETCW(fpu_oldcw);
-  ]])],[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([[
-    #include <machine/ieeefp.h>
-  ]],[[
-    fp_prec_t fpu_oldprec;
-    volatile double result;
-    double a = 2877.0;
-    volatile double b = 1000000.0;
-
-    fpu_oldprec = fpgetprec();
-    fpsetprec(FP_PD);
-    result = a / b;
-    fpsetprec(fpu_oldprec);
-  ]])], [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)
-  else
-    AC_MSG_RESULT(no)
-  fi
-
-  AC_MSG_CHECKING([for usable _controlfp])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-    #include <float.h>
-  ]],[[
-    unsigned int fpu_oldcw;
-    volatile double result;
-    double a = 2877.0;
-    volatile double b = 1000000.0;
-
-    fpu_oldcw = _controlfp(0, 0);
-    _controlfp(_PC_53, _MCW_PC);
-    result = a / b;
-    _controlfp(fpu_oldcw, _MCW_PC);
-  ]])], [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)
-  else
-    AC_MSG_RESULT(no)
-  fi
-
-  AC_MSG_CHECKING([for usable _controlfp_s])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-   #include <float.h>
-  ]],[[
-    unsigned int fpu_oldcw, fpu_cw;
-    volatile double result;
-    double a = 2877.0;
-    volatile double b = 1000000.0;
-
-    _controlfp_s(&fpu_cw, 0, 0);
-    fpu_oldcw = fpu_cw;
-    _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])
-  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)
-  else
-    AC_MSG_RESULT(no)
-  fi
-
-  AC_MSG_CHECKING([whether FPU control word can be manipulated by inline assembler])
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-    /* nothing */
-  ]],[[
-    unsigned int oldcw, cw;
-    volatile double result;
-    double a = 2877.0;
-    volatile double b = 1000000.0;
-
-    __asm__ __volatile__ ("fnstcw %0" : "=m" (*&oldcw));
-    cw = (oldcw & ~0x0 & ~0x300) | 0x200;
-    __asm__ __volatile__ ("fldcw %0" : : "m" (*&cw));
-
-    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])
-  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)
-  else
-    AC_MSG_RESULT(no)
-  fi
+AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[
+AC_MSG_CHECKING(for $1)
+AC_TRY_COMPILE([
+#if HAVE_SYS_TYPES_H  
+#include <sys/types.h>
+#endif
+#if HAVE_INTTYPES_H  
+#include <inttypes.h>
+#elif HAVE_STDINT_H
+#include <stdint.h>
+#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
 ])
 
-dnl
-dnl LIBZEND_BASIC_CHECKS
-dnl
-dnl Basic checks specific for the Zend engine library.
-dnl
 AC_DEFUN([LIBZEND_BASIC_CHECKS],[
+
+AC_REQUIRE([AC_PROG_YACC])
 AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CC_C_O])
+AC_REQUIRE([AC_HEADER_STDC])
 
-AC_CHECK_HEADERS([cpuid.h])
+LIBZEND_BISON_CHECK
 
-dnl
-dnl LIBZEND_DLSYM_CHECK
+dnl Ugly hack to get around a problem with gcc on AIX.
+if test "$CC" = "gcc" -a "$ac_cv_prog_cc_g" = "yes" -a \
+   "`uname -sv`" = "AIX 4"; then
+	CFLAGS=`echo $CFLAGS | sed -e 's/-g//'`
+fi
+
+dnl Hack to work around a Mac OS X cpp problem
+dnl Known versions needing this workaround are 5.3 and 5.4
+if test "$ac_cv_prog_gcc" = "yes" -a "`uname -s`" = "Rhapsody"; then
+        CPPFLAGS="$CPPFLAGS -traditional-cpp"
+fi
+
+AC_CHECK_HEADERS(
+inttypes.h \
+stdint.h \
+limits.h \
+malloc.h \
+string.h \
+unistd.h \
+stdarg.h \
+sys/types.h \
+sys/time.h \
+signal.h \
+unix.h \
+stdlib.h \
+dlfcn.h)
+
+AC_TYPE_SIZE_T
+AC_TYPE_SIGNAL
+
+AC_DEFUN([LIBZEND_LIBDL_CHECKS],[
+AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
+AC_CHECK_FUNC(dlopen,[AC_DEFINE(HAVE_LIBDL, 1,[ ])])
+])
+
+AC_DEFUN([LIBZEND_DLSYM_CHECK],[
 dnl
 dnl Ugly hack to check if dlsym() requires a leading underscore in symbol name.
 dnl
-AC_DEFUN([LIBZEND_DLSYM_CHECK],[
 AC_MSG_CHECKING([whether dlsym() requires a leading underscore in symbol names])
 _LT_AC_TRY_DLOPEN_SELF([
   AC_MSG_RESULT(no)
@@ -145,17 +85,31 @@ _LT_AC_TRY_DLOPEN_SELF([
 ], [])
 ])
 
-dnl Checks for library functions.
-AC_CHECK_FUNCS(getpid kill finite sigsetjmp)
+dnl This is required for QNX and may be some BSD derived systems
+AC_CHECK_TYPE( uint, unsigned int )
+AC_CHECK_TYPE( ulong, unsigned long )
 
-AC_CHECK_DECLS([isfinite, isnan, isinf], [], [], [[#include <math.h>]])
+dnl Check if int32_t and uint32_t are defined
+LIBZEND_CHECK_INT_TYPE(int32_t)
+LIBZEND_CHECK_INT_TYPE(uint32_t)
+
+dnl Checks for library functions.
+AC_FUNC_VPRINTF
+AC_FUNC_MEMCMP
+AC_FUNC_ALLOCA
+AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp)
+AC_ZEND_BROKEN_SPRINTF
+
+AC_CHECK_FUNCS(finite isfinite isinf isnan)
+
+ZEND_FP_EXCEPT
 
 ZEND_CHECK_FLOAT_PRECISION
 
-dnl Test whether double cast to long preserves least significant bits.
+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()
@@ -175,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)
 ], [
@@ -183,25 +137,36 @@ int main()
 ], [
   AC_MSG_RESULT(no)
 ])
+	
+])
+
+AC_DEFUN([LIBZEND_ENABLE_DEBUG],[
+
+AC_ARG_ENABLE(debug,
+[  --enable-debug          Compile with debugging symbols],[
+  ZEND_DEBUG=$enableval
+],[
+  ZEND_DEBUG=no
+])  
 
 ])
 
-dnl
-dnl LIBZEND_OTHER_CHECKS
-dnl
 AC_DEFUN([LIBZEND_OTHER_CHECKS],[
 
-AC_ARG_ENABLE([maintainer-zts],
-  [AS_HELP_STRING([--enable-maintainer-zts],
-    [Enable thread safety - for code maintainers only!!])],
-  [ZEND_MAINTAINER_ZTS=$enableval],
-  [ZEND_MAINTAINER_ZTS=no])
+AC_ARG_ENABLE(maintainer-zts,
+[  --enable-maintainer-zts Enable thread safety - for code maintainers only!!],[
+  ZEND_MAINTAINER_ZTS=$enableval
+],[
+  ZEND_MAINTAINER_ZTS=no
+])  
 
-AC_ARG_ENABLE([inline-optimization],
-  [AS_HELP_STRING([--disable-inline-optimization],
-    [If building zend_execute.lo fails, try this switch])],
-  [ZEND_INLINE_OPTIMIZATION=$enableval],
-  [ZEND_INLINE_OPTIMIZATION=yes])
+AC_ARG_ENABLE(inline-optimization,
+[  --disable-inline-optimization 
+                          If building zend_execute.lo fails, try this switch],[
+  ZEND_INLINE_OPTIMIZATION=$enableval
+],[
+  ZEND_INLINE_OPTIMIZATION=yes
+])
 
 AC_MSG_CHECKING(whether to enable thread-safety)
 AC_MSG_RESULT($ZEND_MAINTAINER_ZTS)
@@ -218,17 +183,20 @@ if test "$ZEND_DEBUG" = "yes"; then
   if test "$CFLAGS" = "-g -O2"; then
   	CFLAGS=-g
   fi
+  test -n "$GCC" && DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall"
+  test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes" && \
+    DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations"
 else
   AC_DEFINE(ZEND_DEBUG,0,[ ])
 fi
 
-test -n "$GCC" && CFLAGS="$CFLAGS -Wall -Wno-strict-aliasing"
 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
@@ -250,11 +218,11 @@ else
   AC_MSG_RESULT(no)
 fi
 
-dnl Test and set the alignment define for ZEND_MM. This also does the
-dnl logarithmic test for ZEND_MM.
+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 {
@@ -281,33 +249,137 @@ 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 compilation needs something here.
+  dnl cross-compile needs something here
   LIBZEND_MM_ALIGN=8
 ])
 
 AC_MSG_RESULT(done)
 
+dnl test for memory allocation using mmap(MAP_ANON)
+AC_MSG_CHECKING(for memory allocation using mmap(MAP_ANON))
+
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <stdlib.h>
+#include <stdio.h>
+#ifndef MAP_ANON
+# ifdef MAP_ANONYMOUS
+#  define MAP_ANON MAP_ANONYMOUS
+# endif
+#endif
+#ifndef MREMAP_MAYMOVE
+# define MREMAP_MAYMOVE 0
+#endif
+#ifndef MAP_FAILED
+# define MAP_FAILED ((void*)-1)
+#endif
+
+#define SEG_SIZE (256*1024)
+
+int main()
+{
+	void *seg = mmap(NULL, SEG_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+	if (seg == MAP_FAILED) {
+		return 1;
+	}
+	if (munmap(seg, SEG_SIZE) != 0) {
+		return 2;
+	}
+	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)
+], [
+  AC_MSG_RESULT(no)
+], [
+  dnl cross-compile needs something here
+  AC_MSG_RESULT(no)
+])
+
+dnl test for memory allocation using mmap("/dev/zero")
+AC_MSG_CHECKING(for memory allocation using mmap("/dev/zero"))
+
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <stdlib.h>
+#include <stdio.h>
+#ifndef MAP_ANON
+# ifdef MAP_ANONYMOUS
+#  define MAP_ANON MAP_ANONYMOUS
+# endif
+#endif
+#ifndef MREMAP_MAYMOVE
+# define MREMAP_MAYMOVE 0
+#endif
+#ifndef MAP_FAILED
+# define MAP_FAILED ((void*)-1)
+#endif
+
+#define SEG_SIZE (256*1024)
+
+int main()
+{
+	int fd;
+	void *seg;
+
+	fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR);
+	if (fd < 0) {
+		return 1;
+	}
+	seg = mmap(NULL, SEG_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
+	if (seg == MAP_FAILED) {
+		return 2;
+	}
+	if (munmap(seg, SEG_SIZE) != 0) {
+		return 3;
+	}
+	if (close(fd) != 0) {
+		return 4;
+	}
+	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)
+], [
+  AC_MSG_RESULT(no)
+], [
+  dnl cross-compile needs something here
+  AC_MSG_RESULT(no)
+])
+
 AC_CHECK_FUNCS(mremap)
 
-AC_ARG_ENABLE([zend-signals],
-  [AS_HELP_STRING([--disable-zend-signals],
-    [whether to enable zend signal handling])],
-  [ZEND_SIGNALS=$enableval],
-  [ZEND_SIGNALS=yes])
 
-AC_CHECK_FUNCS([sigaction], [], [
+AC_ARG_ENABLE(zend-signals,
+[  --enable-zend-signals   Use zend signal handling],[
+  ZEND_SIGNALS=$enableval
+],[
   ZEND_SIGNALS=no
+])  
+
+AC_CHECK_FUNC(sigaction, [
+	AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available])
+], [
+	ZEND_SIGNALS=no
 ])
 if test "$ZEND_SIGNALS" = "yes"; then
 	AC_DEFINE(ZEND_SIGNALS, 1, [Use zend signal handling])
@@ -319,23 +391,37 @@ 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_ARG_ENABLE([gcc-global-regs],
-  [AS_HELP_STRING([--disable-gcc-global-regs],
-    [whether to enable GCC global register variables])],
-  [ZEND_GCC_GLOBAL_REGS=$enableval],
-  [ZEND_GCC_GLOBAL_REGS=yes])
+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_ARG_ENABLE(gcc-global-regs,
+[  --disable-gcc-global-regs 
+                          whether to enable GCC global register variables],[
+  ZEND_GCC_GLOBAL_REGS=$enableval
+],[
+  ZEND_GCC_GLOBAL_REGS=yes
+])
 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
@@ -350,12 +436,6 @@ if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
 #elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__powerpc64__)
 # define ZEND_VM_FP_GLOBAL_REG "r28"
 # define ZEND_VM_IP_GLOBAL_REG "r29"
-#elif defined(__IBMC__) && ZEND_GCC_VERSION >= 4002 && defined(__powerpc64__)
-# define ZEND_VM_FP_GLOBAL_REG "r28"
-# define ZEND_VM_IP_GLOBAL_REG "r29"
-#elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__aarch64__)
-# define ZEND_VM_FP_GLOBAL_REG "x27"
-# define ZEND_VM_IP_GLOBAL_REG "x28"
 #else
 # error "global register variables are not supported"
 #endif
@@ -371,8 +451,7 @@ 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
@@ -384,148 +463,3 @@ else
   HAVE_GCC_GLOBAL_REGS=no
 fi
 AC_MSG_RESULT($ZEND_GCC_GLOBAL_REGS)
-
-dnl Check if atof() accepts NAN.
-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 Check if atof() accepts INF.
-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 Check if HUGE_VAL == INF.
-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 Check if HUGE_VAL + -HUGEVAL == NAN.
-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 Check whether __cpuid_count is available.
-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

@@ -0,0 +1,230 @@
+dnl $Id$
+dnl
+dnl This file contains local autoconf functions.
+
+AC_DEFUN([LIBZEND_BISON_CHECK],[
+  # we only support certain bison versions;
+  # 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 
+  # separate any following additions by spaces
+  bison_version_exclude=""
+
+  # for standalone build of Zend Engine
+  test -z "$SED" && SED=sed
+
+  bison_version=none
+  if test "$YACC"; then
+    AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
+      bison_version_vars=`$YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /g' | tr -d a-z`
+      php_cv_bison_version=invalid
+      if test -n "$bison_version_vars"; then
+        set $bison_version_vars
+        bison_version="${1}.${2}"
+        bison_version_num="`expr ${1} \* 100 + ${2}`"
+        if test $bison_version_num -ge $bison_version_min; then
+          php_cv_bison_version="$bison_version (ok)"
+          for bison_check_version in $bison_version_exclude; do
+            if test "$bison_version" = "$bison_check_version"; then
+              php_cv_bison_version=invalid
+              break
+            fi
+          done
+        fi
+      fi
+    ])
+  fi
+  case $php_cv_bison_version in
+    ""|invalid[)]
+      bison_msg="This bison version is not supported for regeneration of the Zend/PHP parsers (found: $bison_version, min: $bison_version_min, excluded: $bison_version_exclude)."
+      AC_MSG_WARN([$bison_msg])
+      YACC="exit 0;"
+      ;;
+  esac
+])
+
+AC_DEFUN([ZEND_FP_EXCEPT],[
+  AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
+    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])
+  fi
+])
+
+dnl
+dnl Check for broken sprintf()
+dnl
+AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
+  AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
+    AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
+      ac_cv_broken_sprintf=no
+    ],[
+      ac_cv_broken_sprintf=yes
+    ],[
+      ac_cv_broken_sprintf=no
+    ])
+  ])
+  if test "$ac_cv_broken_sprintf" = "yes"; then
+    ac_result=1
+  else
+    ac_result=0
+  fi
+  AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken])
+])
+
+dnl
+dnl AC_ZEND_C_BIGENDIAN
+dnl Replacement macro for AC_C_BIGENDIAN
+dnl
+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_TRY_RUN(
+  [
+int main(void)
+{
+        short one = 1;
+        char *cp = (char *)&one;
+
+        if (*cp == 0) {
+                return(0);
+        } else {
+                return(1);
+        }
+}
+  ], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown])
+ ])
+ if test $ac_cv_c_bigendian_php = yes; then
+   AC_DEFINE(WORDS_BIGENDIAN, [], [Define if processor uses big-endian word])
+ fi
+])
+
+AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
+  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
+])
+
+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_TRY_LINK([
+    #include <fpu_control.h>
+  ],[
+    fpu_control_t fpu_oldcw, fpu_cw;
+    volatile double result;
+    double a = 2877.0;
+    volatile double b = 1000000.0;
+
+    _FPU_GETCW(fpu_oldcw);
+    fpu_cw = (fpu_oldcw & ~_FPU_EXTENDED & ~_FPU_SINGLE) | _FPU_DOUBLE;
+    _FPU_SETCW(fpu_cw);
+    result = a / b;
+    _FPU_SETCW(fpu_oldcw);
+  ], [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_TRY_LINK([
+    #include <machine/ieeefp.h>
+  ],[
+    fp_prec_t fpu_oldprec;
+    volatile double result;
+    double a = 2877.0;
+    volatile double b = 1000000.0;
+
+    fpu_oldprec = fpgetprec();
+    fpsetprec(FP_PD);
+    result = a / b;
+    fpsetprec(fpu_oldprec);
+  ], [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)
+  else
+    AC_MSG_RESULT(no)
+  fi
+
+  AC_MSG_CHECKING([for usable _controlfp])
+  AC_TRY_LINK([
+    #include <float.h>
+  ],[
+    unsigned int fpu_oldcw;
+    volatile double result;
+    double a = 2877.0;
+    volatile double b = 1000000.0;
+
+    fpu_oldcw = _controlfp(0, 0);
+    _controlfp(_PC_53, _MCW_PC);
+    result = a / b;
+    _controlfp(fpu_oldcw, _MCW_PC);
+  ], [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)
+  else
+    AC_MSG_RESULT(no)
+  fi
+
+  AC_MSG_CHECKING([for usable _controlfp_s])
+  AC_TRY_LINK([
+   #include <float.h>
+  ],[
+    unsigned int fpu_oldcw, fpu_cw;
+    volatile double result;
+    double a = 2877.0;
+    volatile double b = 1000000.0;
+
+    _controlfp_s(&fpu_cw, 0, 0);
+    fpu_oldcw = fpu_cw;
+    _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])
+  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)
+  else
+    AC_MSG_RESULT(no)
+  fi
+
+  AC_MSG_CHECKING([whether FPU control word can be manipulated by inline assembler])
+  AC_TRY_LINK([
+    /* nothing */
+  ],[
+    unsigned int oldcw, cw;
+    volatile double result;
+    double a = 2877.0;
+    volatile double b = 1000000.0;
+
+    __asm__ __volatile__ ("fnstcw %0" : "=m" (*&oldcw));
+    cw = (oldcw & ~0x0 & ~0x300) | 0x200;
+    __asm__ __volatile__ ("fldcw %0" : : "m" (*&cw));
+
+    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])
+  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)
+  else
+    AC_MSG_RESULT(no)
+  fi
+])

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

@@ -0,0 +1,43 @@
+# Makefile to generate build tools
+#
+# Standard usage:
+#        make -f build.mk
+#
+# Written by Sascha Schumann
+#
+# $Id$ 
+
+
+LT_TARGETS = ltmain.sh ltconfig
+
+config_h_in = zend_config.h.in
+
+makefile_am_files = Makefile.am
+makefile_in_files = $(makefile_am_files:.am=.in)
+makefile_files    = $(makefile_am_files:e.am=e)
+
+targets = $(makefile_in_files) $(LT_TARGETS) configure $(config_h_in)
+
+all: $(targets)
+
+clean:
+	rm -f $(targets)
+
+$(LT_TARGETS):
+	rm -f $(LT_TARGETS)
+	libtoolize --automake $(AMFLAGS) -f
+
+$(makefile_in_files): $(makefile_am_files)
+	automake -a -i $(AMFLAGS) $(makefile_files)
+
+aclocal.m4: configure.in acinclude.m4
+	aclocal
+
+$(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.in
+	autoconf

Zend/buildconf

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+case "$1" in
+--copy)
+	automake_flags=--copy
+	shift
+;;
+esac
+
+libtoolize --force --automake $automake_flags
+
+mv aclocal.m4 aclocal.m4.old 2>/dev/null
+aclocal
+if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then
+    echo "buildconf: keeping ${1}aclocal.m4"
+    mv aclocal.m4.old aclocal.m4
+else
+    echo "buildconf: created or modified ${1}aclocal.m4"
+fi
+
+autoheader
+
+automake --add-missing --include-deps $automake_flags
+
+mv configure configure.old 2>/dev/null
+autoconf
+if cmp configure.old configure > /dev/null 2>&1; then
+    echo "buildconf: keeping ${1}configure"
+    mv configure.old configure
+else
+    echo "buildconf: created or modified ${1}configure"
+fi
+

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

@@ -0,0 +1,19 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend 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.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | 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

@@ -5,22 +5,22 @@ get_included_files() tests
 
 var_dump(get_included_files());
 
-include(__DIR__."/014.inc");
+include(dirname(__FILE__)."/014.inc");
 var_dump(get_included_files());
 
 var_dump(get_included_files(1,1));
 
-include_once(__DIR__."/014.inc");
+include_once(dirname(__FILE__)."/014.inc");
 var_dump(get_included_files());
 
 var_dump(get_included_files(1));
 
-include(__DIR__."/014.inc");
+include(dirname(__FILE__)."/014.inc");
 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,14 +144,14 @@ 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)
 }
 
-echo "\n*** Testing unset(), empty() & isset() with resource variables ***\n";
+echo "\n*** Testing unset(), emtpy() & isset() with resource variables ***\n";
 $fp = fopen(__FILE__, "r");
-$dfp = opendir( __DIR__ );
+$dfp = opendir( dirname(__FILE__) );
 $resources = array (
   $fp,
   $dfp
@@ -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);
@@ -1184,7 +1184,7 @@ bool(false)
 bool(false)
 bool(true)
 
-*** Testing unset(), empty() & isset() with resource variables ***
+*** Testing unset(), emtpy() & isset() with resource variables ***
 -- Iteration 1 --
 resource(%d) of type (stream)
 bool(true)

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

@@ -16,23 +16,19 @@ var_dump($a->$b->{$c[1]});
 ?>
 --EXPECTF--
 Notice: Undefined variable: a in %s on line %d
-
-Notice: Trying to access array offset on value of type null in %s on line %d
 NULL
 
-Notice: Undefined variable: a in %s on line %d
+Notice: Undefined variable: %s in %s on line %d
 
-Notice: Undefined variable: c in %s on line %d
-
-Notice: Trying to access array offset on value of type null in %s on line %d
+Notice: Undefined variable: %s in %s on line %d
 NULL
 
 Notice: Undefined variable: a in %s on line %d
 int(1)
 
-Notice: Undefined variable: a in %s on line %d
+Notice: Undefined variable: %s in %s on line %d
 
-Notice: Undefined variable: b in %s on line %d
+Notice: Undefined variable: %s in %s on line %d
 int(0)
 
 Notice: Undefined variable: a in %s on line %d
@@ -41,17 +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 access array offset on value of type null in %s on line %d
+Notice: Trying to get property of non-object in %s on line %d
 
-Notice: Trying to get property '1' of non-object in %s on line %d
-
-Notice: Trying to get property '' of non-object in %s on line %d
+Notice: Trying to get property of non-object in %s on line %d
 NULL

Zend/tests/026.phpt

@@ -18,7 +18,7 @@ print "ok\n";
 
 ?>
 --EXPECTF--
-Notice: Trying to get property '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[]);