update the certificate used for the test, as it expired recently

Conflicts:
	ext/curl/interface.c

.appveyor.yml

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

.editorconfig

@@ -1,35 +0,0 @@
-# http://editorconfig.org/
-
-root = true
-
-[*.{c,h,awk,w32,bat,mk,frag}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 4
-indent_style             = tab
-tab_width                = 4
-trim_trailing_whitespace = true
-insert_final_newline     = true
-
-[*.{php,phpt}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 4
-indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
-
-[*.{yml,m4,sh}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 2
-indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
-
-[*.md]
-charset                  = utf-8
-end_of_line              = lf
-indent_style             = space
-trim_trailing_whitespace = false
-insert_final_newline     = true

.gdbinit

@@ -5,7 +5,7 @@ end
 document set_ts
 	set the ts resource, it is impossible for gdb to
 	call ts_resource_ex while no process is running,
-	but we could get the resource from the argument
+	but we could get the resource from the argument 
 	of frame info.
 end
 
@@ -16,11 +16,9 @@ define ____executor_globals
 		end
 		set $eg = ((zend_executor_globals*) (*((void ***) $tsrm_ls))[executor_globals_id-1])
 		set $cg = ((zend_compiler_globals*) (*((void ***) $tsrm_ls))[compiler_globals_id-1])
-		set $eg_ptr = $eg
 	else
 		set $eg = executor_globals
 		set $cg = compiler_globals
-		set $eg_ptr = (zend_executor_globals*) &executor_globals
 	end
 end
 
@@ -31,118 +29,129 @@ 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
-	set $ex = $arg0
-	while $ex
-		printf "[%p] ", $ex
-		set $func = $ex->func
-		if $func
-			if $ex->This->value.obj
-				if $func->common.scope
-					printf "%s->", $func->common.scope->name->val
+	set $t = $arg0
+	while $t
+		printf "[%p] ", $t
+		set $fst = $t->function_state
+		if $fst.function->common.function_name
+			if $fst.arguments
+				set $count = (int)*($fst.arguments)
+
+				if $t->object
+					if $fst.function.common.scope
+						printf "%s->", $fst.function.common.scope->name
+					else
+						if !$eg
+							____executor_globals
+						end
+
+						set $known_class = 0
+						if $eg
+							set $handle = $t->object.value.obj.handle
+							set $handlers = $t->object.value.obj.handlers
+							set $zobj = (zend_object *)$eg.objects_store.object_buckets[$handle].bucket.obj.object
+
+							if $handlers->get_class_entry == &zend_std_object_get_class
+								set $known_class = 1
+
+								if $handlers.get_class_name
+									if $handlers.get_class_name != &zend_std_object_get_class_name
+										set $known_class = 0
+									end
+								end
+
+								if $known_class
+									printf "%s->", $zobj->ce.name
+								end
+							end
+						end
+
+						if !$known_class
+							printf "(Unknown)->"
+						end
+					end
 				else
-					printf "%s->", $ex->This->value.obj->ce.name->val
+					if $fst.function.common.scope
+						printf "%s::", $fst.function.common.scope->name
+					end
 				end
+
+				printf "%s(", $fst.function->common.function_name
+				while $count > 0
+					set $zvalue = *(zval **)($fst.arguments - $count)
+					set $type = $zvalue->type
+					if $type == 0
+						printf "NULL"
+					end
+					if $type == 1
+						printf "%ld", $zvalue->value.lval
+					end
+					if $type == 2
+						printf "%f", $zvalue->value.dval
+					end
+					if $type == 3
+						if $zvalue->value.lval
+							printf "true"
+						else
+							printf "false"
+						end
+					end
+					if $type == 4
+						printf "array(%d)[%p]", $zvalue->value.ht->nNumOfElements, $zvalue
+					end
+					if $type == 5
+						printf "object[%p]", $zvalue
+					end
+					if $type == 6
+						____print_str $zvalue->value.str.val $zvalue->value.str.len
+					end
+					if $type == 7
+						printf "resource(#%d)", $zvalue->value.lval
+					end
+					if $type == 8
+						printf "constant"
+					end
+					if $type == 9
+						printf "const_array"
+					end
+					if $type > 9
+						printf "unknown type %d", $type
+					end
+					set $count = $count -1
+					if $count > 0
+						printf ", "
+					end
+				end
+				printf ") "
 			else
-				if $func->common.scope
-					printf "%s::", $func->common.scope->name->val
-				end
+				printf "%s() ", $fst.function->common.function_name
 			end
-
-			if $func->common.function_name
-				printf "%s(", $func->common.function_name->val
-			else
-				printf "(main"
-			end
-
-			set $callFrameSize = (sizeof(zend_execute_data) + sizeof(zval) - 1) / sizeof(zval)
-
-			set $count = $ex->This.u2.num_args
-			set $arg = 0
-			while $arg < $count
-				if $arg > 0
-					printf ", "
-				end
-
-				set $zvalue = (zval *) $ex + $callFrameSize + $arg
-				set $type = $zvalue->u1.v.type
-				if $type == 1
-					printf "NULL"
-				end
-				if $type == 2
-					printf "false"
-				end
-				if $type == 3
-					printf "true"
-				end
-				if $type == 4
-					printf "%ld", $zvalue->value.lval
-				end
-				if $type == 5
-					printf "%f", $zvalue->value.dval
-				end
-				if $type == 6
-					____print_str $zvalue->value.str->val $zvalue->value.str->len
-				end
-				if $type == 7
-					printf "array(%d)[%p]", $zvalue->value.arr->nNumOfElements, $zvalue
-				end
-				if $type == 8
-					printf "object[%p]", $zvalue
-				end
-				if $type == 9
-					printf "resource(#%d)", $zvalue->value.lval
-				end
-				if $type == 10
-					printf "reference"
-				end
-				if $type > 10
-					printf "unknown type %d", $type
-				end
-				set $arg = $arg + 1
-			end
-
-			printf ") "
 		else
 			printf "??? "
 		end
-		if $func != 0
-			if $func->type == 2
-				printf "%s:%d ", $func->op_array.filename->val, $ex->opline->lineno
-			else
-				printf "[internal function]"
-			end
+		if $t->op_array != 0
+			printf "%s:%d ", $t->op_array->filename, $t->opline->lineno
 		end
-		set $ex = $ex->prev_execute_data
+		set $t = $t->prev_execute_data
 		printf "\n"
 	end
 end
@@ -153,7 +162,7 @@ end
 
 define printzv
 	set $ind = 1
-	____printzv $arg0 0
+	____printzv $arg0 0 
 end
 
 document printzv
@@ -162,65 +171,68 @@ end
 
 define ____printzv_contents
 	set $zvalue = $arg0
-	set $type = $zvalue->u1.v.type
+	set $type = $zvalue->type
 
-	# 15 == IS_INDIRECT
-	if $type > 5 && $type != 15
-		printf "(refcount=%d) ", $zvalue->value.counted->gc.refcount
+	printf "(refcount=%d", $zvalue->refcount__gc
+	if $zvalue->is_ref__gc
+		printf ",is_ref"
 	end
-
+	printf ") "
 	if $type == 0
-		printf "UNDEF"
-	end
-	if $type == 1
 		printf "NULL"
 	end
-	if $type == 2
-		printf "bool: false"
-	end
-	if $type == 3
-		printf "bool: true"
-	end
-	if $type == 4
+	if $type == 1
 		printf "long: %ld", $zvalue->value.lval
 	end
-	if $type == 5
+	if $type == 2
 		printf "double: %f", $zvalue->value.dval
 	end
-	if $type == 6
-		printf "string: %s", $zvalue->value.str->val
+	if $type == 3
+		printf "bool: "
+		if $zvalue->value.lval
+			printf "true"
+		else
+			printf "false"
+		end
 	end
-	if $type == 7
-		printf "array: "
+	if $type == 4
+		printf "array(%d): ", $zvalue->value.ht->nNumOfElements
 		if ! $arg1
+			printf "{\n"
 			set $ind = $ind + 1
-			____print_ht $zvalue->value.arr 1
+			____print_ht $zvalue->value.ht 1
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0
 				printf "  "
 				set $i = $i - 1
 			end
+			printf "}"
 		end
 		set $type = 0
 	end
-	if $type == 8
+	if $type == 5
 		printf "object"
 		____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
+		if basic_functions_module.zts
+			set $zobj = zend_objects_get_address($zvalue, $tsrm_ls)
+		else
+			set $zobj = zend_objects_get_address($zvalue)
+		end
+		if $handlers->get_class_entry == &zend_std_object_get_class
+			set $cname = $zobj->ce.name
+		else
+			set $cname = "Unknown"
+		end
 		printf "(%s) #%d", $cname, $handle
 		if ! $arg1
 			if $handlers->get_properties == &zend_std_get_properties
-				if $zobj->properties
-					set $ht = $zobj->properties
-				else
-					set $ht = &$zobj->ce->properties_info
-				end
-				printf "\nProperties "
+				set $ht = $zobj->properties
 				if $ht
+					printf "(%d): ", $ht->nNumOfElements
+					printf "{\n"
 					set $ind = $ind + 1
 					____print_ht $ht 1
 					set $ind = $ind - 1
@@ -229,49 +241,28 @@ define ____printzv_contents
 						printf "  "
 						set $i = $i - 1
 					end
+					printf "}"
 				else
-					echo "not found"
+					echo "no properties found"
 				end
 			end
 		end
 		set $type = 0
 	end
+	if $type == 6
+		printf "string(%d): ", $zvalue->value.str.len
+		____print_str $zvalue->value.str.val $zvalue->value.str.len
+	end
+	if $type == 7
+		printf "resource: #%d", $zvalue->value.lval
+	end
+	if $type == 8 
+		printf "constant"
+	end
 	if $type == 9
-		printf "resource: #%d", $zvalue->value.res->handle
+		printf "const_array"
 	end
-	if $type == 10
-		printf "reference: "
-		____printzv &$zvalue->value.ref->val $arg1
-	end
-	if $type == 11
-		printf "const: %s", $zvalue->value.str->val
-	end
-	if $type == 12
-		printf "CONSTANT_AST"
-	end
-	if $type == 13
-		printf "_BOOL"
-	end
-	if $type == 14
-		printf "CALLABLE"
-	end
-	if $type == 15
-		printf "indirect: "
-		____printzv $zvalue->value.zv $arg1
-	end
-	if $type == 17
-		printf "pointer: %p", $zvalue->value.ptr
-	end
-	if $type == 18
-		printf "ITERABLE"
-	end
-	if $type == 19
-		printf "VOID"
-	end
-	if $type == 20
-		printf "_ERROR"
-	end
-	if $type == 16 || $type > 20
+	if $type > 9
 		printf "unknown type %d", $type
 	end
 	printf "\n"
@@ -283,96 +274,88 @@ define ____printzv
 
 	printf "[%p] ", $zvalue
 
+	if $zvalue == $eg.uninitialized_zval_ptr
+		printf "*uninitialized* "
+	end
+
 	set $zcontents = (zval*) $zvalue
 	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
-	while $n > 0
-		printf "  "
-		set $n = $n - 1
-	end
+	set $p = $ht->pListHead
 
-	if $ht->u.v.flags & 4
-		printf "Packed"
-	else
-		printf "Hash"
-	end
-	printf "(%d)[%p]: {\n", $ht->nNumOfElements, $ht
-
-	set $num = $ht->nNumUsed
-	set $i = 0
-	set $ind = $ind + 1
-	while $i < $num
-		set $p = (Bucket*)($ht->arData + $i)
-		set $n = $ind
-		if $p->val.u1.v.type > 0
-			while $n > 0
-				printf "  "
-				set $n = $n - 1
-			end
-			printf "[%d] ", $i
-			if $p->key
-				printf "%s => ", $p->key->val
-			else
-				printf "%d => ", $p->h
-			end
-			if $arg1 == 0
-				printf "%p\n", (zval *)&$p->val
-			end
-			if $arg1 == 1
-				set $zval = (zval *)&$p->val
-				____printzv $zval 1
-			end
-			if $arg1 == 2
-				printf "%s\n", (char*)$p->val.value.ptr
-			end
-			if $arg1 == 3
-				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
+	while $p != 0
+		set $i = $ind
+		while $i > 0
+			printf "  "
+			set $i = $i - 1
 		end
-		set $i = $i + 1
+
+		if $p->nKeyLength > 0
+			____print_str $p->arKey $p->nKeyLength
+			printf " => "
+		else
+			printf "%d => ", $p->h
+		end
+		
+		if $arg1 == 0
+			printf "%p\n", (void*)$p->pData
+		end
+		if $arg1 == 1
+			set $zval = *(zval **)$p->pData
+			____printzv $zval 1
+		end
+		if $arg1 == 2
+			printf "%s\n", (char*)$p->pData
+		end
+
+		set $p = $p->pListNext
 	end
-	set $ind = $ind - 1
-	printf "}\n"
 end
 
 define print_ht
-	set $ind = 0
+	set $ind = 1
+	printf "[%p] {\n", $arg0
 	____print_ht $arg0 1
+	printf "}\n"
 end
 
 document print_ht
@@ -380,8 +363,10 @@ document print_ht
 end
 
 define print_htptr
-	set $ind = 0
+	set $ind = 1
+	printf "[%p] {\n", $arg0
 	____print_ht $arg0 0
+	printf "}\n"
 end
 
 document print_htptr
@@ -389,17 +374,46 @@ document print_htptr
 end
 
 define print_htstr
-	set $ind = 0
+	set $ind = 1
+	printf "[%p] {\n", $arg0
 	____print_ht $arg0 2
+	printf "}\n"
 end
 
 document print_htstr
 	dumps elements of HashTable made of strings
 end
 
+define ____print_ft
+	set $ht = $arg0
+	set $p = $ht->pListHead
+
+	while $p != 0
+		set $func = (zend_function*)$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
+
+		printf "\"%s\"\n", $func->common.function_name
+		set $p = $p->pListNext
+	end
+end
+
 define print_ft
-	set $ind = 0
-	____print_ht $arg0 3
+	set $ind = 1
+	printf "[%p] {\n", $arg0
+	____print_ft $arg0
+	printf "}\n"
 end
 
 document print_ft
@@ -415,15 +429,15 @@ define ____print_inh_class
 			printf "final "
 		end
 	end
-	printf "class %s", $ce->name->val
+	printf "class %s", $ce->name
 	if $ce->parent != 0
-		printf " extends %s", $ce->parent->name->val
+		printf " extends %s", $ce->parent->name
 	end
 	if $ce->num_interfaces != 0
 		printf " implements"
 		set $tmp = 0
 		while $tmp < $ce->num_interfaces
-			printf " %s", $ce->interfaces[$tmp]->name->val
+			printf " %s", $ce->interfaces[$tmp]->name
 			set $tmp = $tmp + 1
 			if $tmp < $ce->num_interfaces
 				printf ","
@@ -435,10 +449,10 @@ end
 
 define ____print_inh_iface
 	set $ce = $arg0
-	printf "interface %s", $ce->name->val
+	printf "interface %s", $ce->name
 	if $ce->num_interfaces != 0
 		set $ce = $ce->interfaces[0]
-		printf " extends %s", $ce->name->val
+		printf " extends %s", $ce->name
 	else
 		set $ce = 0
 	end
@@ -473,13 +487,10 @@ define print_inh
 end
 
 define print_pi
-	set $pi = (zend_property_info *)$arg0
-	set $initial_offset = ((uint32_t)(zend_uintptr_t)(&((zend_object*)0)->properties_table[(0)]))
-	set $ptr_to_val = (zval*)((char*)$pi->ce->default_properties_table + $pi->offset - $initial_offset)
+	set $pi = $arg0
 	printf "[%p] {\n", $pi
-	printf "    offset = %p\n", $pi->offset
-	printf "    ce = [%p] %s\n", $pi->ce, $pi->ce->name->val
-	printf "    flags = 0x%x (", $pi->flags
+	printf "    h     = %lu\n", $pi->h
+	printf "    flags = %d (", $pi->flags
 	if $pi->flags & 0x100
 		printf "ZEND_ACC_PUBLIC"
 	else
@@ -490,49 +501,29 @@ 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
+		if $str[$tmp] > 32 && $str[$tmp] < 127
 			printf "%c", $str[$tmp]
 		else
 			printf "\\%o", $str[$tmp]
 		end
 		set $tmp = $tmp + 1
 	end
-	if $tmp != $arg1
-		printf "..."
-	end
 	printf "\""
 end
 
@@ -543,10 +534,10 @@ define printzn
 	if $znode->op_type == 1
 		set $optype = "IS_CONST"
 	end
-	if $znode->op_type == 2
+	if $znode->op_type == 2 
 		set $optype = "IS_TMP_VAR"
 	end
-	if $znode->op_type == 4
+	if $znode->op_type == 4 
 		set $optype = "IS_VAR"
 	end
 	if $znode->op_type == 8
@@ -576,11 +567,11 @@ end
 
 document printzn
 	print type and content of znode.
-	usage: printzn &opline->op1
+	usage: printzn &opline->op1 
 end
 
 define printzops
-	printf "op1 => "
+	printf "op1 => " 
 	printzn &execute_data->opline.op1
 	printf "op2 => "
 	printzn &execute_data->opline.op2
@@ -592,23 +583,6 @@ document printzops
 	dump operands of the current opline
 end
 
-define print_zstr
-	set $zstr = (zend_string *)$arg0
-	if $argc == 2
-		set $maxlen = $arg1
-	else
-		set $maxlen = $zstr->len
-	end
-	printf "string(%d) ", $zstr->len
-	____print_str $zstr->val $zstr->len $maxlen
-	printf "\n"
-end
-
-document print_zstr
-	print the length and contents of a zend string
-	usage: print_zstr <ptr> [max length]
-end
-
 define zbacktrace
 	____executor_globals
 	dump_bt $eg.current_execute_data
@@ -621,27 +595,75 @@ document zbacktrace
 	> (gdb) dump_bt $eg.current_execute_data
 end
 
-define lookup_root
-	set $found = 0
-	if gc_globals->roots
-		set $current = gc_globals->roots->next
-		printf "looking ref %p in roots\n", $arg0
-		while $current != &gc_globals->roots
-			if $current->ref == $arg0
-				set $found = $current
-				break
+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, '/')
+			if !$filename
+				set $filename = $p->filename
+			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
-			set $current = $current->next
-		end
-		if $found != 0
-			printf "found root %p\n", $found
 		else
-			printf "not found\n"
+			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 lookup_root
-	lookup a refcounted in root
-	usage: lookup_root [ptr].
+document zmemcheck
+	show status of a memory block.
+	usage: zmemcheck [ptr].
+	if ptr is 0, all blocks will be listed.
 end

.gitattributes

@@ -15,8 +15,11 @@ ext/dba/libflatfile/flatfile.c  ident
 ext/dba/libcdb/cdb_make.c       ident
 ext/dba/libcdb/cdb.c            ident
 ext/filter/filter.c             ident
+ext/zip/php_zip.c               ident
 README.input_filter             ident
 run-tests.php                   ident
+sapi/nsapi/nsapi.c              ident
+sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
 ext/exif/exif.c                 ident
@@ -29,6 +32,7 @@ UPGRADING.INTERNALS             merge=NEWS
 /ext/bz2/tests/with_strings.phpt	-crlf
 /ext/dom/tests/bug40836.phpt	-crlf
 /ext/dom/tests/domelement.phpt	-crlf
+/ext/ereg/tests/eregi_basic_002.phpt	-crlf
 /ext/iconv/tests/iconv004.phpt	-crlf
 /ext/iconv/tests/iconv_basic.phpt	-crlf
 /ext/iconv/tests/iconv_strpos.phpt	-crlf
@@ -45,6 +49,7 @@ UPGRADING.INTERNALS             merge=NEWS
 /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/general_functions/set_magic_quotes_runtime_error.phpt	-crlf
 /ext/standard/tests/strings/bug26817.phpt	-crlf
 /ext/standard/tests/strings/bug26973.phpt	-crlf
 /ext/standard/tests/strings/bug27457.phpt	-crlf

.gitignore

@@ -9,7 +9,6 @@
 *.gcno
 *.la
 *.lo
-*.loT
 *.o
 *.a
 *.ncb
@@ -20,12 +19,9 @@
 *.tgz
 *.tar.gz
 *.tar.bz2
-*.tar.xz
-*.tar.gz.asc
-*.tar.bz2.asc
-*.tar.xz.asc
 .FBCIndex
 .FBCLockFolder
+.deps
 .libs
 phpt.*
 core
@@ -85,7 +81,7 @@ mkinstalldirs
 modules
 php
 php-*.tar.gz
-php7.spec
+php5.spec
 php_lcov.info
 php_test_results_*.txt
 php_version.h
@@ -121,12 +117,6 @@ 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
@@ -139,15 +129,8 @@ tests/*/*/*.sh
 */tests/*/*.exp
 */tests/*/*.log
 */tests/*/*.sh
-*/tests/*/*/*.diff
-*/tests/*/*/*.out
-*/tests/*/*/*.php
-*/tests/*/*/*.exp
-*/tests/*/*/*.log
-*/tests/*/*/*.sh
 */*/tests/*.diff
 */*/tests/*.out
-*/*/tests/*.out.png
 */*/tests/*.php
 */*/tests/*.exp
 */*/tests/*.log
@@ -158,18 +141,6 @@ tests/*/*/*.sh
 */*/tests/*/*.exp
 */*/tests/*/*.log
 */*/tests/*/*.sh
-*/*/tests/*/*/*.diff
-*/*/tests/*/*/*.out
-*/*/tests/*/*/*.php
-*/*/tests/*/*/*.exp
-*/*/tests/*/*/*.log
-*/*/tests/*/*/*.sh
-*/*/tests/*/*/*/*.diff
-*/*/tests/*/*/*/*.out
-*/*/tests/*/*/*/*.php
-*/*/tests/*/*/*/*.exp
-*/*/tests/*/*/*/*.log
-*/*/tests/*/*/*/*.sh
 
 # Extension specifc ignores
 ext/*/configure.in
@@ -191,7 +162,6 @@ 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
@@ -245,6 +215,10 @@ 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
@@ -256,12 +230,14 @@ main/config.w32.h
 main/stamp-h1
 main/streams/build-defs.h
 main/streams/stamp-h1
-#pear/install-pear-nozlib.phar
+pear/install-pear-nozlib.phar
 pear/phpize
 pear/run-tests
 pear/php-config
 pear/scripts
-sapi/apache2handler/libphp7.module
+sapi/apache/libphp5.module
+sapi/apache2handler/libphp5.module
+sapi/apache_hooks/libphp5.module
 sapi/cgi/php-cgi
 sapi/cgi/php-cgi.1
 sapi/cli/php.1
@@ -273,7 +249,6 @@ sapi/fpm/fpm/php-cgi
 sapi/phpdbg/phpdbg_parser.c
 sapi/phpdbg/phpdbg_parser.h
 sapi/phpdbg/phpdbg
-sapi/phpdbg/phpdbg.1
 scripts/php-config
 scripts/phpize
 scripts/man1/*.1
@@ -283,3 +258,5 @@ win32/*.positions
 win32/ext
 win32/phpts.def
 win32/wsyslog.h
+win32/win32.dsp
+win32/php.dsw

.travis.yml

@@ -1,39 +1,14 @@
-git:
-  quiet: true
+language: php
 
-dist: trusty
-language: c
-sudo: required
-addons:
-  apt:
-    packages:
-      - locales
-      - language-pack-de
-      - re2c
-      - libgmp-dev
-      - libicu-dev
-      - libmcrypt-dev
-      - libtidy-dev
-      - libenchant-dev
-      - libaspell-dev
-      - libpspell-dev
-      - librecode-dev
-      - libsasl2-dev
-      - libxpm-dev
-      - libt1-dev
+php:
+    # We only specify one version so we only get one worker
+    - 5.4
 
 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:
+cache: 
     - apt
 
 env:
@@ -49,18 +24,23 @@ env:
       - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
       - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
 
+before_install:
+    - sudo apt-get update -qq
+    - sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev
+    - sudo cp ./travis/de /var/lib/locales/supported.d/de
+    - sudo dpkg-reconfigure locales
+
 before_script:
-    # Enable IPv6
-    - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
     # Compile PHP
     - ./travis/compile.sh
-    # Setup Extensions
+    # Setup Extensions 
     - . ./travis/ext/mysql/setup.sh
     - . ./travis/ext/mysqli/setup.sh
     - . ./travis/ext/pdo_mysql/setup.sh
     - . ./travis/ext/pgsql/setup.sh
     - . ./travis/ext/pdo_pgsql/setup.sh
 
-# Run PHPs run-tests.php
+# Run PHPs run-tests.php 
 script:
-    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
+    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120
+    - ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg

CODING_STANDARDS

@@ -18,7 +18,6 @@ Code Implementation
 
 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()
@@ -43,7 +42,7 @@ Exceptions:
 
 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
+    shouldn't be calculated with strlen().  Write your functions in a 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
@@ -113,7 +112,6 @@ User Functions/Methods Naming Conventions
     of ``parent_*``::
 
     A family of 'foo' functions, for example:
-
     Good:
     'foo_select_bar'
     'foo_insert_baz'
@@ -165,7 +163,7 @@ User Functions/Methods Naming Conventions
     'foobar'
     'foo_bar'
 
-Internal Function Naming Conventions
+Internal Function Naming Convensions
 ----------------------
 
 1.  Functions that are part of the external API should be named
@@ -178,7 +176,7 @@ Internal Function Naming Conventions
     Unexposed module function should be static and should not be defined in
     'php_modulename.h'.
 
-    static int php_session_destroy()
+    static int php_session_destroy(TSRMLS_D)
 
 2.  Main module source file must be named 'modulename.c'.
 

CONTRIBUTING.md

@@ -1,73 +0,0 @@
-# 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.
-
-## 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 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 to implement RFCs should be submitted against `master`.
-
-## Filing bugs
-
-Bugs can be filed on the [PHP bug tracker](https://bugs.php.net/). If this is
-the first time you've filed a bug, we suggest reading the
-[guide to reporting a bug](https://bugs.php.net/how-to-report.php).
-
-Where possible, please include a self-contained reproduction case!
-
-## Feature requests
-
-Feature requests are generally submitted in the form of
-[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).
-
-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.
-
-## Writing tests
-
-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.](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
-
-There are two ways to contribute to the PHP manual. You can edit the manual and
-send patches anonymously via [the online editor](https://edit.php.net/), or you
-can check the XML source out from Subversion and edit that and build it
-[per the instructions on the documentation site](http://doc.php.net/tutorial/).
-Patches created that way should be sent to the
-[documentation mailing list](mailto:phpdoc@lists.php.net).
-
-## Getting help
-
-If you are having trouble contributing to PHP, or just want to talk to a human
-about what you're working on, you can contact us via the
-[internals mailing list](mailto:internals@lists.php.net), or the
-[documentation mailing list](mailto:phpdoc@lists.php.net) for documentation
-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.

EXTENSIONS

@@ -26,12 +26,34 @@ Status legend
 
 == Server APIs ==
 
+-------------------------------------------------------------------------------
+EXTENSION:           aolserver
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           apache
+PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           apache_hooks
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           apache2filter
+PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           apache2handler
 PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           caudium
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
 EXTENSION:           cgi
 MAINTENANCE:         Unknown
 STATUS:              Working
@@ -41,26 +63,66 @@ MAINTENANCE:         Marcus Boerger <helly@php.net>, Edin Kadribasic <edink@php.
 STATUS:              Working
 SINCE:               4.3.0
 -------------------------------------------------------------------------------
+EXTENSION:           continuity
+PRIMARY MAINTAINER:  Alex Leigh <aleigh@php.net>
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
 EXTENSION:           embed
 PRIMARY MAINTAINER:  Edin Kadribasic <edink@php.net>
 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
 -------------------------------------------------------------------------------
+EXTENSION:           isapi
+MAINTENANCE:         Unknown
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           litespeed
 PRIMARY MAINTAINER:  George Wang <gwang@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
-EXTENSION:           phpdbg
-MAINTENANCE:         Joe Watkins <krakjoe@php.net>, Bob Weinand <bwoebi@php.net>
-STATUS:              5.6
+EXTENSION:           milter
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           nsapi
+PRIMARY MAINTAINER:  Uwe Schindler <thetaphi@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           phttpd
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           pi3web
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           roxen
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           thttpd
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
+MAINTENANCE:         Odd fixes
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           tux
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           webjames
+PRIMARY MAINTAINER:  Alex Waugh <alex@alexwaugh.com>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
 -------------------------------------------------------------------------------
 
 
@@ -74,18 +136,29 @@ STATUS:              Working
 COMMENT:             DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini
 -------------------------------------------------------------------------------
 EXTENSION:           interbase
-PRIMARY MAINTAINER:  Ard Biesheuvel <ard@ard.nu>
+PRIMARY MAINTAINER:  Ard Biesheuvel <ard@ard.nu>, Jouni Ahto <jouni.ahto@exdec.fi>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           mssql
+PRIMARY MAINTAINER:  Frank M. Kromann <fmk@swwwing.com>
+MAINTENANCE:         Maintained
+STATUS:              Working
+COMMENT:             Tested on phpts and isapi versions
+-------------------------------------------------------------------------------
+EXTENSION:           mysql
+PRIMARY MAINTAINER:  Zak Greant <zak@mysql.com>, 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
+-------------------------------------------------------------------------------
 EXTENSION:           mysqli
-PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           mysqlnd
-PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>
+PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
@@ -99,7 +172,7 @@ EXTENSION:           odbc
 PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
-COMMENT:             Working
+COMMENT:             Working 
 -------------------------------------------------------------------------------
 EXTENSION:           pdo
 PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Wez Furlong <wez@php.net>
@@ -108,8 +181,8 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_dblib
-PRIMARY MAINTAINER:  Adam Baratz <adambaratz@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
@@ -132,7 +205,7 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_oci
-PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net>
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
@@ -155,6 +228,13 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less have fatal bug.
 -------------------------------------------------------------------------------
+EXTENSION:           sqlite
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Wez Furlong <wez@php.net>, Ilia Alshanetsky <iliaa@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               5.0 (Since 4.3.2 in PECL)
+COMMENT:             Integrates SQLite 2 embeddable SQL database engine.
+-------------------------------------------------------------------------------
 EXTENSION:           sqlite3
 PRIMARY MAINTAINER:  Scott MacVicar <scottmac@php.net>
 MAINTENANCE:         Maintained
@@ -162,6 +242,11 @@ STATUS:              Working
 SINCE:               5.3
 COMMENT:             Integrates SQLite 3 embeddable SQL database engine.
 -------------------------------------------------------------------------------
+EXTENSION:           sybase_ct
+PRIMARY MAINTAINER:  Timm Friebe <thekid@thekid.de>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 
 
 == XML extensions ==
@@ -195,12 +280,12 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           libxml
-PRIMARY MAINTAINER:   Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net>
+PRIMARY MAINTAINER:   Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net> 
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xmlreader
-PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net>
+PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net> 
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -286,7 +371,7 @@ MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gd
-PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>, Christoph M. Becker <cmb@php.net>
+PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -300,12 +385,6 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
-EXTENSION:           hash
-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>
 MAINTENANCE:         Maintained
@@ -323,13 +402,13 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           json
-PRIMARY MAINTAINER:  Jakub Zelenka <bukka@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.2
 -------------------------------------------------------------------------------
 EXTENSION:           ldap
-PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>, Pierre-Alain Joye <pajoye@php.net>, Côme Bernigaud <mcmic@php.net>
+PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -343,11 +422,21 @@ PRIMARY MAINTAINER:  Derick Rethans <derick@derickrethans.nl>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           opcache
-PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>, Xinchen Hui <laruence@php.net>
-MAINTENANCE:         Maintained
+EXTENSION:           mhash
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Scott MacVicar <scottmac@php.net>
+MAINTENANCE:         Unknown
 STATUS:              Working
-SINCE:               5.5.0
+-------------------------------------------------------------------------------
+EXTENSION:           mime_magic
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Deprecated
+STATUS:              Experimental
+COMMENT:             Use the fileinfo extension instead
+-------------------------------------------------------------------------------
+EXTENSION:           ming
+PRIMARY MAINTAINER:  Frank M. Kromann
+MAINTENANCE:         Unknown
+STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           openssl
 PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>, Pierre-Alain Joye <pajoye@php.net>

INSTALL

@@ -5,6 +5,7 @@ Installing PHP
 
      * General Installation Considerations
      * Installation on Unix systems
+          + Apache 1.3.x on Unix systems
           + Apache 2.x on Unix systems
           + Lighttpd 1.4 on Unix systems
           + Sun, iPlanet and Netscape servers on Sun Solaris
@@ -102,6 +103,7 @@ Installation on Unix systems
 
 Table of Contents
 
+     * Apache 1.3.x on Unix systems
      * Apache 2.x on Unix systems
      * Lighttpd 1.4 on Unix systems
      * Sun, iPlanet and Netscape servers on Sun Solaris
@@ -153,7 +155,7 @@ Table of Contents
    a  list  of all available options along with short explanations running
    ./configure   --help.   Our  manual  documents  the  different  options
    separately.  You  will find the core options in the appendix, while the
-   different  extension  specific  options  are  described on the reference
+   different  extension  specific  options  are  descibed on the reference
    pages.
 
    When  PHP  is  configured,  you  are  ready  to build the module and/or
@@ -161,6 +163,208 @@ Table of Contents
    you can't figure out why, see the Problems section.
      __________________________________________________________________
 
+Apache 1.3.x on Unix systems
+
+   This  section  contains  notes and hints specific to Apache installs of
+   PHP on Unix platforms. We also have instructions and notes for Apache 2
+   on a separate page.
+
+   You  can select arguments to add to the configure on line 10 below from
+   the  list of core configure options and from extension specific options
+   described  at  the respective places in the manual. The version numbers
+   have  been  omitted here, to ensure the instructions are not incorrect.
+   You  will  need  to replace the 'xxx' here with the correct values from
+   your files.
+
+   Example #1 Installation Instructions (Apache Shared Module Version) for
+   PHP
+1.  gunzip apache_xxx.tar.gz
+2.  tar -xvf apache_xxx.tar
+3.  gunzip php-xxx.tar.gz
+4.  tar -xvf php-xxx.tar
+5.  cd apache_xxx
+6.  ./configure --prefix=/www --enable-module=so
+7.  make
+8.  make install
+9.  cd ../php-xxx
+
+10. Now, configure your PHP.  This is where you customize your PHP
+    with various options, like which extensions will be enabled.  Do a
+    ./configure --help for a list of available options.  In our example
+    we'll do a simple configure with Apache 1 and MySQL support.  Your
+    path to apxs may differ from our example.
+
+      ./configure --with-mysql --with-apxs=/www/bin/apxs
+
+11. make
+12. make install
+
+    If you decide to change your configure options after installation,
+    you only need to repeat the last three steps. You only need to
+    restart apache for the new module to take effect. A recompile of
+    Apache is not needed.
+
+    Note that unless told otherwise, 'make install' will also install PEAR,
+    various PHP tools such as phpize, install the PHP CLI, and more.
+
+13. Setup your php.ini file:
+
+      cp php.ini-development /usr/local/lib/php.ini
+
+    You may edit your .ini file to set PHP options.  If you prefer your
+    php.ini in another location, use --with-config-file-path=/some/path in
+    step 10.
+
+    If you instead choose php.ini-production, be certain to read the list
+    of changes within, as they affect how PHP behaves.
+
+14. Edit your httpd.conf to load the PHP module.  The path on the right hand
+    side of the LoadModule statement must point to the path of the PHP
+    module on your system.  The make install from above may have already
+    added this for you, but be sure to check.
+
+      LoadModule php5_module libexec/libphp5.so
+
+15. And in the AddModule section of httpd.conf, somewhere under the
+    ClearModuleList, add this:
+
+      AddModule mod_php5.c
+
+16. Tell Apache to parse certain extensions as PHP.  For example,
+    let's have Apache parse the .php extension as PHP.  You could
+    have any extension(s) parse as PHP by simply adding more, with
+    each separated by a space.  We'll add .phtml to demonstrate.
+
+      AddType application/x-httpd-php .php .phtml
+
+    It's also common to setup the .phps extension to show highlighted PHP
+    source, this can be done with:
+
+      AddType application/x-httpd-php-source .phps
+
+17. Use your normal procedure for starting the Apache server. (You must
+    stop and restart the server, not just cause the server to reload by
+    using a HUP or USR1 signal.)
+
+   Alternatively, to install PHP as a static object:
+
+   Example  #2  Installation  Instructions (Static Module Installation for
+   Apache) for PHP
+1.  gunzip -c apache_1.3.x.tar.gz | tar xf -
+2.  cd apache_1.3.x
+3.  ./configure
+4.  cd ..
+
+5.  gunzip -c php-5.x.y.tar.gz | tar xf -
+6.  cd php-5.x.y
+7.  ./configure --with-mysql --with-apache=../apache_1.3.x
+8.  make
+9.  make install
+
+10. cd ../apache_1.3.x
+
+11. ./configure --prefix=/www --activate-module=src/modules/php5/libphp5.a
+    (The above line is correct! Yes, we know libphp5.a does not exist at this
+    stage. It isn't supposed to. It will be created.)
+
+12. make
+    (you should now have an httpd binary which you can copy to your Apache bin d
+ir if
+    it is your first install then you need to "make install" as well)
+
+13. cd ../php-5.x.y
+14. cp php.ini-development /usr/local/lib/php.ini
+
+15. You can edit /usr/local/lib/php.ini file to set PHP options.
+    Edit your httpd.conf or srm.conf file and add:
+    AddType application/x-httpd-php .php
+
+   Depending  on  your  Apache  install  and  Unix variant, there are many
+   possible  ways  to  stop and restart the server. Below are some typical
+   lines   used  in  restarting  the  server,  for  different  apache/unix
+   installations.  You  should  replace  /path/to/  with the path to these
+   applications on your systems.
+
+   Example #3 Example commands for restarting Apache
+1. Several Linux and SysV variants:
+/etc/rc.d/init.d/httpd restart
+
+2. Using apachectl scripts:
+/path/to/apachectl stop
+/path/to/apachectl start
+
+3. httpdctl and httpsdctl (Using OpenSSL), similar to apachectl:
+/path/to/httpsdctl stop
+/path/to/httpsdctl start
+
+4. Using mod_ssl, or another SSL server, you may want to manually
+stop and start:
+/path/to/apachectl stop
+/path/to/apachectl startssl
+
+   The  locations of the apachectl and http(s)dctl binaries often vary. If
+   your  system  has locate or whereis or which commands, these can assist
+   you in finding your server control programs.
+
+   Different examples of compiling PHP for apache are as follows:
+./configure --with-apxs --with-pgsql
+
+   This will create a libphp5.so shared library that is loaded into Apache
+   using  a  LoadModule  line  in Apache's httpd.conf file. The PostgreSQL
+   support is embedded into this library.
+
+./configure --with-apxs --with-pgsql=shared
+
+   This  will  create  a libphp5.so shared library for Apache, but it will
+   also create a pgsql.so shared library that is loaded into PHP either by
+   using  the  extension  directive  in  php.ini  file  or  by  loading it
+   explicitly in a script using the dl() function.
+
+./configure --with-apache=/path/to/apache_source --with-pgsql
+
+   This  will  create  a  libmodphp5.a  library,  a  mod_php5.c  and  some
+   accompanying files and copy this into the src/modules/php5 directory in
+   the    Apache    source   tree.   Then   you   compile   Apache   using
+   --activate-module=src/modules/php5/libphp5.a   and   the  Apache  build
+   system  will  create  libphp5.a  and  link it statically into the httpd
+   binary.  The  PostgreSQL  support  is included directly into this httpd
+   binary, so the final result here is a single httpd binary that includes
+   all of Apache and all of PHP.
+
+./configure --with-apache=/path/to/apache_source --with-pgsql=shared
+
+   Same as before, except instead of including PostgreSQL support directly
+   into  the  final  httpd you will get a pgsql.so shared library that you
+   can load into PHP from either the php.ini file or directly using dl().
+
+   When  choosing  to build PHP in different ways, you should consider the
+   advantages  and  drawbacks  of each method. Building as a shared object
+   will  mean  that  you  can compile apache separately, and don't have to
+   recompile  everything  as you add to, or change, PHP. Building PHP into
+   apache  (static  method)  means  that PHP will load and run faster. For
+   more information, see the Apache » web page on DSO support.
+
+     Note:
+
+     Apache's  default  httpd.conf  currently  ships  with a section that
+     looks like this:
+
+User nobody
+Group "#-1"
+
+     Unless  you  change  that  to "Group nogroup" or something like that
+     ("Group  daemon"  is  also very common) PHP will not be able to open
+     files.
+
+     Note:
+
+     Make  sure  you  specify  the  installed  version of apxs when using
+     --with-apxs=/path/to/apxs  .  You must NOT use the apxs version that
+     is  in  the apache sources but the one that is actually installed on
+     your system.
+     __________________________________________________________________
+     __________________________________________________________________
+
 Apache 2.x on Unix systems
 
    This  section  contains notes and hints specific to Apache 2.x installs
@@ -246,7 +450,7 @@ cp php.ini-development /usr/local/lib/php.ini
        hand side of the LoadModule statement must point to the path of the
        PHP  module  on  your  system. The make install from above may have
        already added this for you, but be sure to check.
-LoadModule php7_module modules/libphp7.so
+LoadModule php5_module modules/libphp5.so
     8. Tell  Apache to parse certain extensions as PHP. For example, let's
        have  Apache  parse  .php  files  as PHP. Instead of only using the
        Apache  AddType  directive,  we want to avoid potentially dangerous
@@ -257,10 +461,10 @@ LoadModule php7_module modules/libphp7.so
 <FilesMatch \.php$>
     SetHandler application/x-httpd-php
 </FilesMatch>
-       Or,  if we wanted to allow .php, .php2, .php3, .php4, .php5, .php7,
+       Or,  if we wanted to allow .php, .php2, .php3, .php4, .php5, .php6,
        and  .phtml files to be executed as PHP, but nothing else, we'd use
        this:
-<FilesMatch "\.ph(p[2-7]?|tml)$">
+<FilesMatch "\.ph(p[2-6]?|tml)$">
     SetHandler application/x-httpd-php
 </FilesMatch>
        And  to  allow  .phps files to be handled by the php source filter,
@@ -800,16 +1004,16 @@ Debian GNU/Linux installation notes
 Using APT
 
    First,   note   that   other  related  packages  may  be  desired  like
-   libapache2-mod-php7 to integrate with Apache 2, and php-pear for PEAR.
+   libapache2-mod-php5 to integrate with Apache 2, and php-pear for PEAR.
 
    Second,  before  installing  a package, it's wise to ensure the package
    list  is  up  to  date.  Typically, this is done by running the command
    apt-get update.
 
    Example #1 Debian Install Example with Apache 2
-# apt-get install php7-common libapache2-mod-php7 php7-cli
+# apt-get install php5-common libapache2-mod-php5 php5-cli
 
-   APT will automatically install the PHP 7 module for Apache 2 and all of
+   APT will automatically install the PHP 5 module for Apache 2 and all of
    its  dependencies,  and then activate it. Apache should be restarted in
    order for the changes take place. For example:
 
@@ -823,23 +1027,23 @@ Better control of configuration
    very  likely  that  additional  modules will be desired, such as MySQL,
    cURL, GD, etc. These may also be installed via the apt-get command.
 
-   Example #3 Methods for listing additional PHP 7 packages
-# apt-cache search php7
-# aptitude search php7
-# aptitude search php7 |grep -i mysql
+   Example #3 Methods for listing additional PHP 5 packages
+# apt-cache search php5
+# aptitude search php5
+# aptitude search php5 |grep -i mysql
 
    The examples will show a lot of packages including several PHP specific
-   ones  like  php7-cgi, php7-cli and php7-dev. Determine which are needed
+   ones  like  php5-cgi, php5-cli and php5-dev. Determine which are needed
    and  install  them  like any other with either apt-get or aptitude. And
    because  Debian  performs  dependency checks, it'll prompt for those so
    for example to install MySQL and cURL:
 
    Example #4 Install PHP with MySQL, cURL
-# apt-get install php7-mysql php7-curl
+# apt-get install php5-mysql php5-curl
 
    APT  will  automatically  add  the  appropriate  lines to the different
-   php.ini      related      files     like     /etc/php7/apache2/php.ini,
-   /etc/php7/conf.d/pdo.ini,  etc. and depending on the extension will add
+   php.ini      related      files     like     /etc/php5/apache2/php.ini,
+   /etc/php5/conf.d/pdo.ini,  etc. and depending on the extension will add
    entries similar to extension=foo.so. However, restarting the web server
    (like Apache) is required before these changes take affect.
 
@@ -933,9 +1137,9 @@ Using the bundled PHP
     2. With  a  text  editor, uncomment the lines (by removing the #) that
        look  similar  to  the  following  (these  two  lines are often not
        together, locate them both in the file):
-# LoadModule php7_module libexec/httpd/libphp7.so
+# LoadModule php5_module libexec/httpd/libphp5.so
 
-# AddModule mod_php7.c
+# AddModule mod_php5.c
 
        Notice  the  location/path.  When  building  PHP in the future, the
        above files should be replaced or commented out.
@@ -944,7 +1148,7 @@ Using the bundled PHP
        Due  to  the following statement already existing in httpd.conf (as
        of   Mac  Panther),  once  PHP  is  enabled  the  .php  files  will
        automatically parse as PHP.
-<IfModule mod_php7.c>
+<IfModule mod_php5.c>
     # If php is turned on, we respect .php and .phps files.
     AddType application/x-httpd-php .php
     AddType application/x-httpd-php-source .phps
@@ -1536,7 +1740,7 @@ Running PHP as an Apache module
           php_admin_flag can not be overridden by .htaccess or ini_set().
 
    Example #1 Apache configuration example
-<IfModule mod_php7.c>
+<IfModule mod_php5.c>
   php_value include_path ".:/usr/local/lib/php"
   php_admin_flag engine on
 </IfModule>
@@ -1606,7 +1810,7 @@ Installation
        script file via my browser, I get a server 500 error.
     8. Some  operating  systems:  I have installed PHP without errors, but
        when  I  try  to  start  Apache  I  get  undefined  symbol  errors:
-       [mybox:user   /src/php7]   root#  apachectl  configtest  apachectl:
+       [mybox:user   /src/php5]   root#  apachectl  configtest  apachectl:
        /usr/local/apache/bin/httpd     Undefined     symbols:    _compress
        _uncompress
     9. Windows:  I  have  installed  PHP,  but  when I try to access a PHP
@@ -1708,7 +1912,7 @@ AddModule mod_perl.c
 
 # Extra Modules
 LoadModule php_module         modules/mod_php.so
-LoadModule php7_module        modules/libphp7.so
+LoadModule php5_module        modules/libphp5.so
 LoadModule perl_module        modules/libperl.so
 
           And add:
@@ -1750,7 +1954,7 @@ AddType application/x-httpd-php .php
    Some operating systems: I have installed PHP without errors, but when I
           try to start Apache I get undefined symbol errors:
 
-[mybox:user /src/php7] root# apachectl configtest
+[mybox:user /src/php5] root# apachectl configtest
  apachectl: /usr/local/apache/bin/httpd Undefined symbols:
   _compress
   _uncompress
@@ -1780,7 +1984,7 @@ cgi error:
           script via the browser again. If it still fails then it could be
           one of the following:
 
-          + File  permissions  on  your  PHP  script, php.exe, php7ts.dll,
+          + File  permissions  on  your  PHP  script, php.exe, php5ts.dll,
             php.ini  or any PHP extensions you are trying to load are such
             that  the  anonymous  internet  user ISUR_<machinename> cannot
             access them.
@@ -1899,7 +2103,7 @@ cgi error:
           to  choose  PHP  files from URL with no extension. In this case,
           replace the line AddType application/x-httpd-php .php with:
 
-AddHandler php7-script php
+AddHandler php5-script php
 AddType text/html php
 
           This  solution  doesn't  work for Apache 1 as PHP module doesn't

LICENSE

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

Makefile.frag

@@ -1,3 +1,4 @@
+
 #
 # Zend
 #
@@ -19,4 +20,4 @@ $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
 $(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
+$(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h

Makefile.gcov

@@ -1,3 +1,4 @@
+
 #
 # LCOV
 #
@@ -56,12 +57,12 @@ php_lcov.info: lcov-test
 			cp $$x.bbg  lcov_data/$$y.bbg ; \
 		fi; \
 	done; \
-	for dir in ext/bcmath/libbcmath ext/date/lib ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
+	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 
 	@echo "Generating $@"
 	@$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@
 

Makefile.global

@@ -5,7 +5,7 @@ INSTALL_DATA = $(INSTALL) -m 644
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
 
-all: $(all_targets)
+all: $(all_targets) 
 	@echo
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
@@ -112,16 +112,16 @@ test: all
 clean:
 	find . -name \*.gcno -o -name \*.gcda | xargs rm -f
 	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
-	rm -f php7.spec main/build-defs.h scripts/phpize
+	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 php5.spec main/build-defs.h scripts/phpize
 	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
-	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
+	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1
 	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
 	rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
 	rm -f ext/phar/phar.phar ext/phar/phar.php
@@ -130,18 +130,5 @@ distclean: clean
 	fi
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
 
-prof-gen:
-	CCACHE_DISABLE=1 $(MAKE) PROF_FLAGS=-fprofile-generate all
-
-prof-clean:
-	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f
-	find . -name \*.so | xargs rm -f
-	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
-
-prof-use:
-	CCACHE_DISABLE=1 $(MAKE) PROF_FLAGS=-fprofile-use all
-
-
-.PHONY: all clean install distclean test prof-gen prof-clean prof-use
+.PHONY: all clean install distclean test
 .NOEXPORT:

README.EXT_SKEL

@@ -1,6 +1,6 @@
 (NOTE: you may also want to take a look at the pear package
 	     PECL_Gen, a PHP-only alternative for this script that
-			 supports way more extension writing tasks and is
+			 supports way more extension writing tasks and is 
 			 supposed to replace ext_skel completely in the long run ...)
 
 WHAT IT IS
@@ -17,16 +17,16 @@ HOW TO USE IT
 
    ./ext_skel --extname=module_name
 
-  and everything you need is placed in directory module_name.
+  and everything you need is placed in directory module_name. 
 
-  [ Note that GNU awk is likely required for this script to work.  Debian
-    systems seem to default to using mawk, so you may need to change the
+  [ Note that GNU awk is likely required for this script to work.  Debian 
+    systems seem to default to using mawk, so you may need to change the 
     #! line in skeleton/create_stubs and the cat $proto | awk line in
     ext_skel to use gawk explicitly. ]
 
-  If you don't need to test the existence of any external header files,
-  libraries or functions in them, the module is already almost ready to be
-  compiled in PHP.  Just remove 3 comments in your_module_name/config.m4,
+  If you don't need to test the existence of any external header files, 
+  libraries or functions in them, the module is already almost ready to be 
+  compiled in PHP.  Just remove 3 comments in your_module_name/config.m4, 
   change back up to PHP sources top directory, and do
 
     ./buildconf; ./configure --enable-module_name; make
@@ -83,7 +83,7 @@ FORMAT OF FUNCTION DEFINITIONS FILE
   ']'s as there where '['s. Currently, it does not harm if you forget to do it
   or there is a wrong amount of ']'s, but this may change in the future.
 
-	An additional short description may be added after the parameters.
+	An additional short description may be added after the parameters. 
   If present it will be filled into the 'proto' header comments in the stubs
   code and the <refpurpose> tag in the XML documentation.
 
@@ -135,7 +135,7 @@ CURRENT LIMITATIONS, BUGS AND OTHER ODDITIES
   handled. For other types you must write the code yourself. And for type
   mixed, it wouldn't even be possible to write anything, because only you
   know what to expect.
-
+  
   It can't handle correctly, and probably never will, variable list of
   of arguments. (void foo(int bar [, ...])
 
@@ -164,15 +164,15 @@ PHP_FUNCTION(module_name_drawtext)
     char *text = NULL;
     int argc = ZEND_NUM_ARGS();
     int image_id = -1;
-    size_t text_len;
+    int text_len;
     int font_id = -1;
-    zend_long x;
-    zend_long y;
-    zend_long color;
+    long x;
+    long y;
+    long color;
     zval *image = NULL;
     zval *font = NULL;
 
-    if (zend_parse_parameters(argc, "rsrll|l", &image, &text, &text_len, &font, &x, &y, &color) == FAILURE)
+    if (zend_parse_parameters(argc TSRMLS_CC, "rsrll|l", &image, &text, &text_len, &font, &x, &y, &color) == FAILURE)
         return;
 
     if (image) {
@@ -185,3 +185,4 @@ PHP_FUNCTION(module_name_drawtext)
     php_error(E_WARNING, "module_name_drawtext: not yet implemented");
 }
 /* }}} */
+

README.GIT-RULES

@@ -12,7 +12,7 @@ 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
-      PHP itself.
+      Git itself.
 
    b. Keep the changes consistently well documented and easily trackable.
 
@@ -43,16 +43,16 @@ Having said that, here are the organizational rules::
 
 Currently we have the following branches in use::
 
-  master    The active development branch.
+  master    The active development branch. 
 
   PHP-5.6   Is used to release the PHP 5.6.x series. This is a current
             stable version and is open for bugfixes only.
 
-  PHP-5.5   Is used to release the PHP 5.5.x series. This is an old
-            stable version and is open for security fixes only.
+  PHP-5.5   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 an old
-            stable version and is open for security fixes 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.
 
@@ -67,7 +67,7 @@ Currently we have the following branches in use::
 
 The next few rules are more of a technical nature::
 
-   1. All changes should first go to the lowest branch (i.e. 5.6) and then
+   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.
@@ -79,7 +79,7 @@ The next few rules are more of a technical nature::
       should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but
       not master, which is not a public released version yet.
 
-   3. Do not commit multiple files and dump all messages in one commit. If you
+   3. Do not commit multiple file and dump all messages in one commit. If you
       modified several unrelated files, commit each group separately and
       provide a nice commit message for each one. See example below.
 
@@ -105,7 +105,7 @@ The format of the commit messages is pretty simple.
 An Example from the git project (commit 2b34e486bc):
 
 pack-objects: Fix compilation with NO_PTHREDS
-
+  
 It looks like commit 99fb6e04 (pack-objects: convert to use
 parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but
 hasn't noticed that the 'arg' variable no longer is available.
@@ -114,9 +114,9 @@ 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:
+Example::
 
-Fixed bug #14016 (pgsql notice handler double free crash bug.)
+  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.

README.NEW-OUTPUT-API

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

README.PARAMETER_PARSING_API

@@ -13,8 +13,8 @@ meaningful error messages.
 Prototypes
 ----------
 /* Implemented. */
-int zend_parse_parameters(int num_args, char *type_spec, ...);
-int zend_parse_parameters_ex(int flags, int num_args, char *type_spec, ...);
+int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...);
+int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);
 
 The zend_parse_parameters() function takes the number of parameters
 passed to the extension function, the type specifier string, and the
@@ -30,7 +30,7 @@ resources cannot be auto-converted.
 
 PHP 5.5 includes a new function:
 
-int zend_parse_parameter(int flags, int arg_num, zval **arg, const char *spec, ...);
+int zend_parse_parameter(int flags, int arg_num TSRMLS_DC, zval **arg, const char *spec, ...);
 
 This function behaves like zend_parse_parameters_ex() except that instead of
 reading the arguments from the stack, it receives a single zval to convert
@@ -42,32 +42,31 @@ See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse
 
 Type specifiers
 ---------------
- The following list shows the type specifier, its meaning and the parameter
+ The following list shows the type specifier, its meaning and the parameter 
  types that need to be passed by address. All passed parameters are set
- if the PHP parameter is non optional and untouched if optional and the
+ if the PHP parameter is non optional and untouched if optional and the 
  parameter is not present. The only exception is O where the zend_class_entry*
- has to be provided on input and is used to verify the PHP parameter is an
+ has to be provided on input and is used to verify the PHP parameter is an 
  instance of that class.
 
  a  - array (zval*)
- A  - array or object (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
+ 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)
+ l  - long (long)
+ L  - long, limits out-of-range numbers to LONG_MAX/LONG_MIN (long)
  o  - object of any type (zval*)
  O  - object of specific type given by class entry (zval*, zend_class_entry)
- p  - valid path (string without null bytes in the middle) and its length (char*, size_t)
- P  - valid path (string without null bytes in the middle) as zend_string (zend_string*)
+ p  - valid path (string without null bytes in the middle) and its length (char*, int)
  r  - resource (zval*)
- s  - string (with possible null bytes) and its length (char*, size_t)
- S  - string (with possible null bytes) as zend_string (zend_string*)
+ s  - string (with possible null bytes) and its length (char*, int)
  z  - the actual zval (zval*)
+ Z  - the actual zval (zval**)
  *  - variable arguments list (0 or more)
  +  - variable arguments list (1 or more)
 
@@ -81,29 +80,31 @@ Type specifiers
 		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
+		passed after the corresponding bool*, long* or double* arguments,
+		respectively. A non-zero value will be written to the zend_bool iif 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),
+Please do not forget that int and long are two different things on 64bit 
+OSes (int is 4 bytes and long is 8 bytes), so make sure you pass longs to "l" 
+and ints to strings length (i.e. for "s" you need to pass char * and int), 
 not the other way round!
+Remember: "l" is the only case when you need to pass long (and that's why 
+it's "l", not "i" btw).
 
-Both mistakes might cause memory corruptions and segfaults:
+Both mistakes cause memory corruptions and segfaults on 64bit OSes:
 1)
   char *str;
-  long str_len; /* XXX THIS IS WRONG!! Use size_t instead. */
-  zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str, &str_len)
+  long str_len; /* XXX THIS IS WRONG!! Use int 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(), "l", &num)
+  int num; /* XXX THIS IS WRONG!! Use 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
+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/
@@ -112,11 +113,11 @@ and their types (it can be found in ./scripts/dev/ directory of PHP sources):
 Examples
 --------
 /* Gets a long, a string and its length, and a zval */
-zend_long l;
+long l;
 char *s;
-size_t s_len;
+int s_len;
 zval *param;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "lsz",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
                           &l, &s, &s_len, &param) == FAILURE) {
     return;
 }
@@ -126,7 +127,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "lsz",
 zval *obj;
 double d = 0.5;
 zend_class_entry *my_ce;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|d",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
                           &obj, my_ce, &d) == FAILURE) {
     return;
 }
@@ -136,7 +137,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|d",
    If null is passed for object, obj will be set to NULL. */
 zval *obj;
 zval *arr;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "o!a",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a",
                           &obj, &arr) == FAILURE) {
     return;
 }
@@ -144,27 +145,27 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "o!a",
 
 /* Gets a separated array which can also be null. */
 zval *arr;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
                           &arr) == FAILURE) {
     return;
 }
 
 /* Get either a set of 3 longs or a string. */
-zend_long l1, l2, l3;
+long l1, l2, l3;
 char *s;
-/*
- * The function expects a pointer to a size_t in this case, not a long
+/* 
+ * The function expects a pointer to a integer 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
+ * than a 'int', the upper bits might not be initialized
  * properly, leading to random crashes on platforms like
  * Tru64 or Linux/Alpha.
  */
-size_t length;
+int length;
 
-if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
+if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
                              "lll", &l1, &l2, &l3) == SUCCESS) {
     /* manipulate longs */
-} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
+} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
                                     "s", &s, &length) == SUCCESS) {
     /* manipulate string */
 } else {
@@ -177,10 +178,10 @@ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
 /* Function that accepts only varargs (0 or more) */
 
 int i, num_varargs;
-zval *varargs = NULL;
+zval ***varargs = NULL;
 
 
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &varargs, &num_varargs) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "*", &varargs, &num_varargs) == FAILURE) {
     return;
 }
 
@@ -196,11 +197,11 @@ if (varargs) {
 /* Function that accepts a string, followed by varargs (1 or more) */
 
 char *str;
-size_t str_len;
+int str_len;
 int i, num_varargs;
-zval *varargs = NULL;
+zval ***varargs = NULL;
 
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
     return;
 }
 
@@ -208,16 +209,26 @@ for (i = 0; i < num_varargs; i++) {
     /* do something with varargs[i] */
 }
 
+if (varargs) {
+    efree(varargs);
+}
+
+
 /* Function that takes an array, followed by varargs, and ending with a long */
-zend_long num;
+long num;
 zval *array;
 int i, num_varargs;
-zval *varargs = NULL;
+zval ***varargs = NULL;
 
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
     return;
 }
 
 for (i = 0; i < num_varargs; i++) {
     /* do something with varargs[i] */
 }
+
+if (varargs) {
+    efree(varargs);
+}
+

README.REDIST.BINS

@@ -5,16 +5,17 @@
 5. ext/standard crypt
 6. ext/standard crypt's blowfish implementation
 7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
-8. ext/standard/rand
-9. ext/standard/scanf
-10. ext/standard/strnatcmp.c
-11. ext/standard/uuencode
-12. libxmlrpc ext/xmlrpc
-13. libzip ext/zip
-14. main/snprintf.c
-15. main/strlcat
-16. main/strlcpy
-17. libgd see ext/gd/libgd/COPYING
+8. ext/json/json_parser
+9. ext/standard/rand
+10. ext/standard/scanf
+11. ext/standard/strnatcmp.c
+12. ext/standard/uuencode
+13. libxmlrpc ext/xmlrpc
+14. libzip ext/zip
+15. main/snprintf.c
+16. main/strlcat
+17. main/strlcpy
+18. libgd see ext/gd/libgd/COPYING
 
 5. ext/standard crypt
 
@@ -46,7 +47,7 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
-
+ 
 
 6. ext/standard crypt's blowfish implementation
 
@@ -92,7 +93,7 @@ http://www.usenix.org/events/usenix99/provos.html
 Some of the tricks in BF_ROUND might be inspired by Eric Young's
 Blowfish library (I can't be sure if I would think of something if I
 hadn't seen his code).
-
+ 
 
 7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
 
@@ -103,7 +104,31 @@ a legal notice, here is a blessing:
   May you share freely, never taking more than you give.
 
 
-8. ext/standard/rand
+8. ext/json/json_parser
+Copyright (c) 2005 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+9. ext/standard/rand
 The following php_mt_...() functions are based on a C++ class MTRand by
 Richard J. Wagner. For more information see the web page at
 http://www-personal.engin.umich.edu/~wagnerr/MersenneTwister.html
@@ -126,7 +151,7 @@ Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30.
 
 Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
 Copyright (C) 2000 - 2003, Richard J. Wagner
-All rights reserved.
+All rights reserved.                          
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -139,8 +164,8 @@ are met:
 	 notice, this list of conditions and the following disclaimer in the
 	 documentation and/or other materials provided with the distribution.
 
-3. The names of its contributors may not be used to endorse or promote
-	 products derived from this software without specific prior written
+3. The names of its contributors may not be used to endorse or promote 
+	 products derived from this software without specific prior written 
 	 permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -156,7 +181,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-9. ext/standard/scanf
+10. ext/standard/scanf
 scanf.c --
 
 This file contains the base code which implements sscanf and by extension
@@ -202,7 +227,7 @@ authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
 terms specified in this license.
 
-10. ext/standard/strnatcmp.c
+11. ext/standard/strnatcmp.c
 
 strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
 Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
@@ -223,7 +248,7 @@ freely, subject to the following restrictions:
 	 misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 
-11. ext/standard/uuencode
+12. ext/standard/uuencode
 Portions of this code are based on Berkeley's uuencode/uudecode
 implementation.
 
@@ -259,31 +284,31 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
 
-12. libxmlrpc ext/xmlrpc
+13. libxmlrpc ext/xmlrpc
 
-Copyright 2000 Epinions, Inc.
+Copyright 2000 Epinions, Inc. 
 
-Subject to the following 3 conditions, Epinions, Inc.  permits you, free
-of charge, to (a) use, copy, distribute, modify, perform and display this
-software and associated documentation files (the "Software"), and (b)
-permit others to whom the Software is furnished to do so as well.
+Subject to the following 3 conditions, Epinions, Inc.  permits you, free 
+of charge, to (a) use, copy, distribute, modify, perform and display this 
+software and associated documentation files (the "Software"), and (b) 
+permit others to whom the Software is furnished to do so as well.  
 
-1) The above copyright notice and this permission notice shall be included
-without modification in all copies or substantial portions of the
-Software.
+1) The above copyright notice and this permission notice shall be included 
+without modification in all copies or substantial portions of the 
+Software.  
 
-2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF
-ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY
-IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE OR NONINFRINGEMENT.
+2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF 
+ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY 
+IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR 
+PURPOSE OR NONINFRINGEMENT.  
 
-3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT,
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
-OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING
-NEGLIGENCE), EVEN IF EPINIONS, INC.  IS AWARE OF THE POSSIBILITY OF SUCH
+3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, 
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT 
+OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING 
+NEGLIGENCE), EVEN IF EPINIONS, INC.  IS AWARE OF THE POSSIBILITY OF SUCH 
 DAMAGES.
 
-13. libzip ext/zip
+14. libzip ext/zip
 zip.h -- exported declarations.
 Copyright (C) 1999-2009 Dieter Baron and Thomas Klausner
 
@@ -315,7 +340,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-14. main/snprintf.c
+15. main/snprintf.c
 Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com>
 
 Permission to use, copy, modify, and distribute this software for any
@@ -388,8 +413,8 @@ This code is based on, and used with the permission of, the
 SIO stdio-replacement strx_* functions by Panos Tsirigotis
 <panos@alumni.cs.colorado.edu> for xinetd.
 
-15. main/strlcat
-16. main/strlcpy
+16. main/strlcat
+17. main/strlcpy
 Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 All rights reserved.
 
@@ -414,3 +439,4 @@ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

README.RELEASE_PROCESS

@@ -17,7 +17,7 @@ It is recommended to do so a couple of days before the packaging day, to
 have enough time to investigate failures, communicate with the authors and
 commit the fixes.
 The RM for the branch is also responsible for keeping the CI green on
-ongoing basis between the releases. Check the CI status for your branch
+ongoing bases between the releases. Check the CI status for your branch
 periodically and resolve the failures ASAP. See more in:
 https://wiki.php.net/rfc/travis_ci
 
@@ -31,8 +31,8 @@ team (Bjori) on hand.
 
 6. Verify the tags to be extra sure everything was tagged properly.
 
-7. Moving extensions from/to PECL requires write access to the destination.
-Most developers should have this.
+7. Moving extensions from/to PECL requires write acces to the destination.
+Most developers should have this. 
 
 Moving extensions from php-src to PECL
 - Checkout the pecl directory, most likely you want a sparse-root checkout
@@ -93,27 +93,24 @@ Commit the changes to the main branch.
 12. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
 and build three tarballs (gz, bz2 and xz).
 
-13. run ``scripts/dev/gen_verify_stub <version> [identity]``, this will sign the tarballs
-and output verification information to be included in announcement email
-
-14. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
+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.
 
-15. Now the RC can be found on http://downloads.php.net/yourname,
+14. Now the RC can be found on http://downloads.php.net/yourname,
 f.e. http://downloads.php.net/derick/
 
-16. Once the release has been tagged, contact the PHP Windows development team
+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 **To** ``internals@lists.php.net`` and ``php-general@lists.php.net``
-lists pointing out "the location of the release" and "the possible release date of
-either the next RC, or the final release". Include in this information the verification
-information output by ``gen_verify_stub``.
+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``.
@@ -182,7 +179,7 @@ Check if the pear files are updated (phar).
   ``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx``
 
 11. Commit and push all the tarballs and signature files to web/php-distributions.git,
-    then update the git submodule reference in web/php.git:
+    then update the git submodule reference in web/php.git: 
     ``git submodule init;
     git submodule update;
     cd distributions;
@@ -193,17 +190,17 @@ Check if the pear files are updated (phar).
 This is to fetch the last commit id from php-distributions.git and commit this
 last commit id to web/php.git, then, mirrors will now sync
 
-12. Once the release has been tagged, contact release managers, windows builders, and package maintainers
-so that they can build releases. Do not send this announcement to any public lists.
+12. Once the release has been tagged, contact the PHP Windows development team
+(internals-win@lists.php.net) so that Windows binaries can be created.
 
 Getting the stable release announced
 ------------------------------------
 
-1. Update phpweb/include/releases.inc with the old release info
-  (updates the download archives)
+1. Run the bumpRelease script for phpweb on your local checkout
 
- 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
+ a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
+    The release announcement file should list in detail security fixes and
+    changes in behavior (whether due to a bug fix or not).
 
  b. In case multiple PHP minor versions are in active development you have
     to manually copy the old information to include/releases.inc
@@ -216,18 +213,15 @@ Getting the stable release announced
 
  c. ``$PHP_X_MD5`` array and update all the md5 sums
 
- d. ``$PHP_X_SHA256`` array and update all the SHA256 sums
+ d. set ``$PHP_X_RC`` to false!
 
- e. set ``$PHP_X_RC`` to false!
-
- f. Make sure there are no outdated "notes" or edited "date" keys in the
+ e. 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")
+ f. 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.
+3. Update phpweb/include/releases.php with the old release info
+  (updates the download archives)
 
 4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
    (prepare for next RC)
@@ -252,7 +246,7 @@ f.e. ``ChangeLog-5.php`` from the NEWS file
   IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``
 
   V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
-
+  
   e. You may want to try php-web/bin/news2html to automate this task
 
 6. Add a short notice to phpweb stating that there is a new release, and
@@ -269,14 +263,9 @@ to upgrade.
 
 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,
+9. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 http://news.php.net/php.internals/17222.
-Please make sure that the mail to php-announce@ is its own completely separate email.
-This is to make sure that replies to the announcement on php-general@ or internals@
-will not accidentally hit the php-announce@ mailinglist.
 
 Re-releasing the same version (or -pl)
 --------------------------------------
@@ -293,9 +282,7 @@ Re-releasing the same version (or -pl)
 
  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
+ e. 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
@@ -312,6 +299,3 @@ to upgrade.
 5. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 the news entry.
-Please make sure that the mail to php-announce@ is its own completely separate email.
-This is to make sure that replies to the announcement on php-general@ or internals@
-will not accidentally hit the php-announce@ mailinglist.

README.SELF-CONTAINED-EXTENSIONS

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

README.STREAMS

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

README.SUBMITTING_PATCH

@@ -17,7 +17,7 @@ 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.
+on the EFNet network and #php-dev-win on FreeNode.
 
 
 PHP Patches
@@ -33,27 +33,16 @@ 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.
+subscription is explained on http://www.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
+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.
 
-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
+Attach the patch to the PHP bug and consider sending a notification
+email about the change to internals@lists.php.net.  Also CC the
 extension maintainer.  Explain what has been changed by your patch.
 Test scripts should be included.
 
@@ -61,6 +50,16 @@ 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.
 
+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/.
 
 
 PHP Documentation Patches
@@ -72,7 +71,7 @@ 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.
+http://www.php.net/mailing-lists.php.
 
 Information on contributing to PHP documentation is at
 http://php.net/dochowto and http://wiki.php.net/doc/howto
@@ -128,7 +127,7 @@ How to create your PHP, PHP Documentation or PECL patch
 -------------------------------------------------------
 PHP and most PECL packages use Git for revision control. Some PECL
 packages use Subversion (SVN) Read http://www.php.net/git.php for help
-on using Git to get and build PHP source code.  We recommend to look
+on using Git to get and build PHP source code.  We recommend to look 
 at our workflow on https://wiki.php.net/vcs/gitworkflow and our FAQ
 https://wiki.php.net/vcs/gitfaq.
 

README.TESTING

@@ -9,7 +9,7 @@ it failed on your system without providing substantial backup information
 on *why* the test failed on your special setup. Thank you :-)
 
 
-[Testing Basics]
+[Testing Basics] 
 ----------------
  The easiest way to test your PHP build is to run "make test" from the
 command line after successfully compiling. This will run the complete
@@ -36,7 +36,7 @@ If you are running the run-tests.php script from the command line (as above)
 you must set the TEST_PHP_EXECUTABLE environment variable to explicitly
 select the PHP executable that is to be tested, that is, used to run the test scripts.
 
-If you run the tests using make test, the PHP CLI and CGI executables are
+If you run the tests using make test, the PHP CLI and CGI executables are 
 automatically set for you. "make test" executes "run-tests.php" script with the CLI binary.  Some
 test scripts such as session must be executed by CGI SAPI. Therefore,
 you must build PHP with CGI SAPI to perform all tests.
@@ -62,7 +62,7 @@ from the source root and any subdirectories below. If there are files,
 which have a "phpt" extension, "run-tests.php" looks at the sections
 in these files, determines whether it should run it, by evaluating
 the 'SKIP' section. If the test is eligible for execution, the 'FILE'
-section is extracted into a ".php" file (with the same name besides
+section is extracted into a ".php" file (with the same name besides 
 the extension) and gets executed.
 When an argument is given or TESTS environment variable is set, the
 GLOB is expanded by the shell and any file with extension "*.phpt" is
@@ -77,9 +77,9 @@ Examples:
 
 [Test results]
 --------------
- Test results are printed to standard output. If there is a failed test,
+ Test results are printed to standard output. If there is a failed test, 
 the "run-tests.php" script saves the result, the expected result and the
-code executed to the test script directory. For example, if
+code executed to the test script directory. For example, if 
 ext/myext/tests/myext.phpt fails to pass, the following files are created:
 
 ext/myext/tests/myext.php   - actual test file executed
@@ -104,8 +104,7 @@ The php file will be generated always.
 NOTE: You can set environment variable TEST_PHP_DETAILED to enable
 detailed test information.
 
-[Automated Testing]
---------------
+[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.
@@ -119,12 +118,12 @@ Example script to be run by cron(1):
 ========== qa-test.sh =============
 #!/bin/sh
 
-CO_DIR=$HOME/cvs/php7
+CO_DIR=$HOME/cvs/php5
 MYMAIL=qa-test@domain.com
 TMPDIR=/var/tmp
 TODAY=`date +"%Y%m%d"`
 
-# Make sure compilation environment is correct
+# Make sure compilation enviroment is correct
 CONFIGURE_OPTS='--disable-all --enable-cli --with-pcre'
 export MAKE=gmake
 export CC=gcc
@@ -143,7 +142,7 @@ then
 fi
 ========== end of qa-test.sh =============
 
-NOTE: The exit status of run-tests.php will be 1 when
+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.
@@ -151,20 +150,20 @@ advised to test for non-zero, rather then a specific value.
 
 [Creating new test files]
 -------------------------
- Writing test file is very easy if you are used to PHP.
+ Writing test file is very easy if you are used to PHP. 
 See the HOWTO at http://qa.php.net/write-test.php
 
 
 [How to help us]
 ----------------
- If you find bug in PHP, you can submit bug report AND test script
+ If you find bug in PHP, you can submit bug report AND test script 
 for us. You don't have to write complete script, just give us test
 script with following format. Please test the script and make sure
 you write the correct ACTUAL OUTPUT and EXPECTED OUTPUT before you
 submit.
 
 <?php
-/*
+/* 
 Bug #12345
 substr() bug. Do not return expected string.
 

README.TESTING2

@@ -1,14 +1,14 @@
 [IMPORTANT NOTICE]
 ------------------
-This is an addendum to README.TESTING with additional information
+This is an addendum to README.TESTING with additional information 
 specific to server-tests.php.
 
 server-tests.php is backward compatible with tests developed for
 the original run-tests.php script.  server-tests is *not* used by
 'make test'.  server-tests was developed to provide support for
 testing PHP under it's primary environment, HTTP, and can run the
-PHP tests under any of the SAPI modules that are direct executables,
-or are accessible via HTTP.
+PHP tests under any of the SAPI modules that are direct executables, 
+or are accessable via HTTP.
 
 [New features]
 ----------------
@@ -25,7 +25,7 @@ or are accessible via HTTP.
   can be configured to run test scripts through an HTTP server running
   on localhost.  localhost is required since either the web server must
   alias a directory to the php source directory, or the test scripts
-  must be copied to a directory under the web server
+  must be copied to a directory under the web server 
   (see config options TEST_WEB_BASE_URL, TEST_BASE_PATH, and TEST_WEB_EXT)
 * New sections supported for test files (see below)
 
@@ -49,7 +49,7 @@ Some (but not all!) examples of usage:
 
 4. run tests over http, php sources have been aliased in web server
     php server-tests.php -w -u http://localhost/test
-
+    
 5. run tests using configuration file
     php server-tests.php -c /path/to/server-tests-config.php
 
@@ -59,10 +59,10 @@ Some (but not all!) examples of usage:
 
 NOTE: configuration as described in README.TESTING still works.
 
-[New Test Sections]
+[New Test Sections] 
 ----------------
-In addition to the traditional test sections
-(see http://qa.php.net/write-test.php), several new sections are available
+In addition to the traditional test sections 
+(see http://qa.php.net/write-test.php), several new sections are available 
 under server-tests.
 
 --POST--
@@ -78,7 +78,7 @@ in the test file.
 Not used for anything, just a section for documenting the test
 
 --ENV--
-This section get's eval()'d to help build an environment for the
+This section get's eval()'d to help build an environment for the 
 execution of the test.  This can be used to change environment
 vars that are used for CGI emulation, or simply to set env vars
 for cli testing.  A full example looks like:
@@ -95,7 +95,7 @@ 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
+  $docroot      the equivelant 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
@@ -105,7 +105,7 @@ include:
 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
+  SCRIPT_NAME   The inital 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 ?)
@@ -132,3 +132,6 @@ regular expect sections.  For example:
 
   --EXPECTHEADERS--
   Status: 404
+
+
+

README.UNIX-BUILD-SYSTEM

@@ -108,7 +108,7 @@ module, program, etc).
 
 For example for APXS:
 
-PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php7.c php_apache.c)
+PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php5.c php_apache.c)
 
 
 

README.WIN32-BUILD-SYSTEM

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

README.input_filter

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

README.md

@@ -4,14 +4,13 @@ The PHP Interpreter
 This is the github mirror of the official PHP repository located at
 http://git.php.net.
 
-[![Build Status](https://secure.travis-ci.org/php/php-src.svg?branch=master)](http://travis-ci.org/php/php-src)
-[![Build status](https://ci.appveyor.com/api/projects/status/meyur6fviaxgdwdy?svg=true)](https://ci.appveyor.com/project/php/php-src)
+[![Build Status](https://secure.travis-ci.org/php/php-src.png?branch=master)](http://travis-ci.org/php/php-src)
 
 Pull Requests
 =============
 PHP accepts pull requests via github. Discussions are done on github, but
 depending on the topic can also be relayed to the official PHP developer
-mailing list internals@lists.php.net.
+mailinglist internals@lists.php.net.
 
 New features require an RFC and must be accepted by the developers.
 See https://wiki.php.net/rfc and https://wiki.php.net/rfc/voting for more
@@ -37,3 +36,4 @@ Guidelines for contributors
 - [README.GIT-RULES](/README.GIT-RULES)
 - [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES)
 - [README.RELEASE_PROCESS](/README.RELEASE_PROCESS)
+

README.namespaces

@@ -51,7 +51,7 @@ 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
+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.
@@ -60,13 +60,13 @@ The special "empty" namespace (\ prefix) is useful as explicit global
 namespace qualification. All class and function names started from \
 interpreted as global.
 
-<?php
+<?php 
 namespace A\B\C;
 
 $con = \mysql_connect(...);
 ?>
 
-A special constant __NAMESPACE__ contains the name of the current namespace.
+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
@@ -88,19 +88,19 @@ 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
+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
+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
+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
+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
@@ -171,3 +171,4 @@ TODO
   * Add getNamespace() methods to ReflectionClass and ReflectionFunction
 
 * Rename namespaces to packages?
+

TSRM/TSRM.c

@@ -22,10 +22,6 @@
 
 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. */
-#endif
-
 struct _tsrm_tls_entry {
 	void **storage;
 	int count;
@@ -93,12 +89,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))
@@ -130,7 +121,6 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu
 {
 #if defined(GNUPTH)
 	pth_init();
-	pth_key_create(&tls_key, 0);
 #elif defined(PTHREADS)
 	pthread_key_create( &tls_key, 0 );
 #elif defined(TSRM_ST)
@@ -187,7 +177,7 @@ TSRM_API void tsrm_shutdown(void)
 				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]);
+							resource_types_table[j].dtor(p->storage[j], &p->storage);
 						}
 						free(p->storage[j]);
 					}
@@ -262,7 +252,7 @@ TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate
 				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]);
+						resource_types_table[j].ctor(p->storage[j], &p->storage);
 					}
 				}
 				p->count = id_count;
@@ -283,10 +273,7 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 
 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Creating data structures for thread %x", thread_id));
 	(*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);
-	}
+	(*thread_resources_ptr)->storage = (void **) malloc(sizeof(void *)*id_count);
 	(*thread_resources_ptr)->count = id_count;
 	(*thread_resources_ptr)->thread_id = thread_id;
 	(*thread_resources_ptr)->next = NULL;
@@ -295,7 +282,7 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 	tsrm_tls_set(*thread_resources_ptr);
 
 	if (tsrm_new_thread_begin_handler) {
-		tsrm_new_thread_begin_handler(thread_id);
+		tsrm_new_thread_begin_handler(thread_id, &((*thread_resources_ptr)->storage));
 	}
 	for (i=0; i<id_count; i++) {
 		if (resource_types_table[i].done) {
@@ -304,13 +291,13 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 		{
 			(*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]);
+				resource_types_table[i].ctor((*thread_resources_ptr)->storage[i], &(*thread_resources_ptr)->storage);
 			}
 		}
 	}
 
 	if (tsrm_new_thread_end_handler) {
-		tsrm_new_thread_end_handler(thread_id);
+		tsrm_new_thread_end_handler(thread_id, &((*thread_resources_ptr)->storage));
 	}
 
 	tsrm_mutex_unlock(tsmm_mutex);
@@ -403,7 +390,7 @@ void tsrm_free_interpreter_context(void *context)
 
 		for (i=0; i<thread_resources->count; i++) {
 			if (resource_types_table[i].dtor) {
-				resource_types_table[i].dtor(thread_resources->storage[i]);
+				resource_types_table[i].dtor(thread_resources->storage[i], &thread_resources->storage);
 			}
 		}
 		for (i=0; i<thread_resources->count; i++) {
@@ -444,7 +431,7 @@ void *tsrm_new_interpreter_context(void)
 	current = tsrm_tls_get();
 
 	allocate_new_resource(&new_ctx, thread_id);
-
+	
 	/* switch back to the context that was in use prior to our creation
 	 * of the new one */
 	return tsrm_set_interpreter_context(current);
@@ -468,7 +455,7 @@ void ts_free_thread(void)
 		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]);
+					resource_types_table[i].dtor(thread_resources->storage[i], &thread_resources->storage);
 				}
 			}
 			for (i=0; i<thread_resources->count; i++) {
@@ -510,7 +497,7 @@ void ts_free_worker_threads(void)
 		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]);
+					resource_types_table[i].dtor(thread_resources->storage[i], &thread_resources->storage);
 				}
 			}
 			for (i=0; i<thread_resources->count; i++) {
@@ -556,7 +543,7 @@ void ts_free_id(ts_rsrc_id id)
 			while (p) {
 				if (p->count > j && p->storage[j]) {
 					if (resource_types_table && resource_types_table[j].dtor) {
-						resource_types_table[j].dtor(p->storage[j]);
+						resource_types_table[j].dtor(p->storage[j], &p->storage);
 					}
 					free(p->storage[j]);
 					p->storage[j] = NULL;
@@ -622,7 +609,7 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 #elif defined(BETHREADS)
 	mutexp = (beos_ben*)malloc(sizeof(beos_ben));
 	mutexp->ben = 0;
-	mutexp->sem = create_sem(1, "PHP sempahore");
+	mutexp->sem = create_sem(1, "PHP sempahore"); 
 #endif
 #ifdef THR_DEBUG
 	printf("Mutex created thread: %d\n",mythreadid());
@@ -651,7 +638,7 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 		st_mutex_destroy(mutexp);
 #elif defined(BETHREADS)
 		delete_sem(mutexp->sem);
-		free(mutexp);
+		free(mutexp);  
 #endif
 	}
 #ifdef THR_DEBUG
@@ -685,8 +672,8 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T 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);
+	if (atomic_add(&mutexp->ben, 1) != 0)  
+		return acquire_sem(mutexp->sem);   
 	return 0;
 #endif
 }
@@ -717,9 +704,9 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 #elif defined(TSRM_ST)
 	return st_mutex_unlock(mutexp);
 #elif defined(BETHREADS)
-	if (atomic_add(&mutexp->ben, -1) != 1)
+	if (atomic_add(&mutexp->ben, -1) != 1) 
 		return release_sem(mutexp->sem);
-	return 0;
+	return 0;   
 #endif
 }
 
@@ -804,9 +791,4 @@ void tsrm_error_set(int level, char *debug_filename)
 #endif
 }
 
-TSRM_API void *tsrm_get_ls_cache(void)
-{
-	return tsrm_tls_get();
-}
-
 #endif /* ZTS */

TSRM/TSRM.dsp

@@ -0,0 +1,178 @@
+# Microsoft Developer Studio Project File - Name="TSRM" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=TSRM - Win32 Debug_TS
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "TSRM.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "TSRM.mak" CFG="TSRM - Win32 Debug_TS"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "TSRM - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "TSRM - Win32 Release_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "TSRM - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")
+!MESSAGE "TSRM - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "TSRM - Win32 Debug_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "TSRM___Win32_Debug_TS"
+# PROP BASE Intermediate_Dir "TSRM___Win32_Debug_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_TS"
+# PROP Intermediate_Dir "Debug_TS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "C:\Projects\TSRM" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=1 /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40d /d "_DEBUG"
+# ADD RSC /l 0x40d /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "TSRM - Win32 Release_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "TSRM___Win32_Release_TS"
+# PROP BASE Intermediate_Dir "TSRM___Win32_Release_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_TS"
+# PROP Intermediate_Dir "Release_TS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
+# ADD BASE RSC /l 0x40d /d "NDEBUG"
+# ADD RSC /l 0x40d /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "TSRM - Win32 Release_TS_inline"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "TSRM___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "TSRM___Win32_Release_TS_inline"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_TS_inline"
+# PROP Intermediate_Dir "Release_TS_inline"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "TSRM_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
+# ADD BASE RSC /l 0x40d /d "NDEBUG"
+# ADD RSC /l 0x40d /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "TSRM - Win32 Release_TSDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "TSRM___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "TSRM___Win32_Release_TSDbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_TSDbg"
+# PROP Intermediate_Dir "Release_TSDbg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
+# ADD BASE RSC /l 0x40d /d "NDEBUG"
+# ADD RSC /l 0x40d /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "TSRM - Win32 Debug_TS"
+# Name "TSRM - Win32 Release_TS"
+# Name "TSRM - Win32 Release_TS_inline"
+# Name "TSRM - Win32 Release_TSDbg"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\TSRM.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_strtok_r.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_win32.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\readdir.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TSRM.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_config.w32.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_config_common.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_strtok_r.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_win32.h
+# End Source File
+# End Group
+# End Target
+# End Project

TSRM/TSRM.h

@@ -20,8 +20,6 @@
 # include <tsrm_config.h>
 #endif
 
-#include "main/php_stdint.h"
-
 #ifdef TSRM_WIN32
 #	ifdef TSRM_EXPORTS
 #		define TSRM_API __declspec(dllexport)
@@ -34,8 +32,13 @@
 #	define TSRM_API
 #endif
 
-typedef intptr_t tsrm_intptr_t;
-typedef uintptr_t tsrm_uintptr_t;
+#ifdef _WIN64
+typedef __int64 tsrm_intptr_t;
+typedef unsigned __int64 tsrm_uintptr_t;
+#else
+typedef long tsrm_intptr_t;
+typedef unsigned long tsrm_uintptr_t;
+#endif
 
 /* Only compile multi-threading functions if we're in ZTS mode */
 #ifdef ZTS
@@ -53,7 +56,7 @@ typedef uintptr_t tsrm_uintptr_t;
 #elif defined(TSRM_ST)
 # include <st.h>
 #elif defined(BETHREADS)
-#include <kernel/OS.h>
+#include <kernel/OS.h> 
 #include <TLS.h>
 #endif
 
@@ -84,15 +87,15 @@ typedef struct {
   sem_id sem;
   int32 ben;
 } beos_ben;
-# define MUTEX_T 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 *);
+typedef void (*ts_allocate_ctor)(void *, void ***);
+typedef void (*ts_allocate_dtor)(void *, void ***);
 
 #define THREAD_HASH_OF(thr,ts)  (unsigned long)thr%(unsigned long)ts
 
@@ -126,8 +129,8 @@ TSRM_API void ts_free_id(ts_rsrc_id id);
 #define TSRM_ERROR_LEVEL_CORE	2
 #define TSRM_ERROR_LEVEL_INFO	3
 
-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_thread_begin_func_t)(THREAD_T thread_id, void ***tsrm_ls);
+typedef void (*tsrm_thread_end_func_t)(THREAD_T thread_id, void ***tsrm_ls);
 
 
 TSRM_API int tsrm_error(int level, const char *format, ...);
@@ -152,41 +155,17 @@ TSRM_API void *tsrm_new_interpreter_context(void);
 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);
-
-#ifdef TSRM_WIN32
-# define TSRM_TLS __declspec(thread)
-#else
-# define TSRM_TLS __thread
-#endif
-
 #define TSRM_SHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)+1)
 #define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)-1)
 
+#define TSRMLS_FETCH()			void ***tsrm_ls = (void ***) ts_resource_ex(0, NULL)
 #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_STATIC(id, type, element)	(TSRMG_BULK_STATIC(id, type)->element)
-#define TSRMG_BULK_STATIC(id, type)	((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
-#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
-#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
-#if ZEND_DEBUG
-#define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
-#define TSRMLS_CACHE_RESET()
-#else
-#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
-#define TSRMLS_CACHE_RESET()  TSRMLS_CACHE = NULL
-#endif
-#define TSRMLS_CACHE _tsrm_ls_cache
-
-/* BC only */
-#define TSRMLS_D void
-#define TSRMLS_DC
-#define TSRMLS_C
-#define TSRMLS_CC
-#define TSRMLS_FETCH()
+#define TSRMLS_SET_CTX(ctx)		ctx = (void ***) tsrm_ls
+#define TSRMG(id, type, element)	(((type) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
+#define TSRMLS_D	void ***tsrm_ls
+#define TSRMLS_DC	, TSRMLS_D
+#define TSRMLS_C	tsrm_ls
+#define TSRMLS_CC	, TSRMLS_C
 
 #ifdef __cplusplus
 }
@@ -197,16 +176,6 @@ TSRM_API void *tsrm_get_ls_cache(void);
 #define TSRMLS_FETCH()
 #define TSRMLS_FETCH_FROM_CTX(ctx)
 #define TSRMLS_SET_CTX(ctx)
-
-#define TSRMG_STATIC(id, type, element)
-#define TSRMLS_CACHE_EXTERN()
-#define TSRMLS_CACHE_DEFINE()
-#define TSRMLS_CACHE_UPDATE()
-#define TSRMLS_CACHE
-
-#define TSRM_TLS
-
-/* BC only */
 #define TSRMLS_D	void
 #define TSRMLS_DC
 #define TSRMLS_C

TSRM/acinclude.m4

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

TSRM/build.mk

@@ -5,7 +5,7 @@
 #
 # Written by Sascha Schumann
 #
-# $Id$
+# $Id$ 
 
 
 LT_TARGETS = ltmain.sh ltconfig
@@ -34,7 +34,7 @@ aclocal.m4: configure.in acinclude.m4
 	aclocal
 
 $(config_h_in): configure.in
-# explicitly remove target since autoheader does not seem to work
+# explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
 	autoheader

TSRM/config.w32

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

TSRM/configure.in

@@ -12,10 +12,10 @@ AH_TOP([
 ])
 
 sinclude(tsrm.m4)
-
+	
 TSRM_BASIC_CHECKS
 TSRM_THREADS_CHECKS
-
+	
 AM_PROG_LIBTOOL
 if test "$enable_debug" != "yes"; then
   AM_SET_LIBTOOL_VARIABLE([--silent])

TSRM/m4/gethostbyname.m4

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

TSRM/threads.m4

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

TSRM/tsrm.m4

@@ -1,6 +1,5 @@
-m4_include([TSRM/m4/gethostbyname.m4])
 
-dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)
+dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
 AC_DEFUN([TSRM_CHECK_GCC_ARG],[
   gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
   AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
@@ -33,8 +32,6 @@ AC_CHECK_HEADERS(stdarg.h)
 
 AC_CHECK_FUNCS(sigprocmask)
 
-AX_FUNC_WHICH_GETHOSTBYNAME_R()
-
 ])
 
 
@@ -75,12 +72,12 @@ AC_DEFUN([TSRM_CHECK_ST],[
 sinclude(threads.m4)
 
 AC_DEFUN([TSRM_CHECK_PTHREADS],[
-
+		
 PTHREADS_CHECK
 
-if test "$beos_threads" = "1"; then
+if test "$beos_threads" = "1"; then 
   AC_DEFINE(BETHREADS, 1, Whether to use native BeOS threads)
-else
+else		
   if test "$pthreads_working" != "yes"; then
     AC_MSG_ERROR(Your system seems to lack POSIX threads.)
   fi
@@ -92,6 +89,7 @@ else
 fi
 ])
 
+
 AC_DEFUN([TSRM_THREADS_CHECKS],[
 
 dnl For the thread implementations, we always use --with-*

TSRM/tsrm_config_common.h

@@ -42,10 +42,7 @@ char *alloca ();
 #endif
 
 #ifndef MAXPATHLEN
-# if _WIN32
-#  include "win32/ioutil.h"
-#  define MAXPATHLEN PHP_WIN32_IOUTIL_MAXPATHLEN
-# elif PATH_MAX
+# ifdef PATH_MAX
 #  define MAXPATHLEN PATH_MAX
 # elif defined(MAX_PATH)
 #  define MAXPATHLEN MAX_PATH

TSRM/tsrm_nw.c

@@ -1,8 +1,8 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 7                                                        |
+   | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2014 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        |

TSRM/tsrm_nw.h

@@ -1,8 +1,8 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 7                                                        |
+   | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2014 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        |

TSRM/tsrm_strtok_r.c

@@ -14,7 +14,7 @@ static inline int in_character_class(char ch, const char *delim)
 	return 0;
 }
 
-TSRM_API char *tsrm_strtok_r(char *s, const char *delim, char **last)
+char *tsrm_strtok_r(char *s, const char *delim, char **last)
 {
 	char *token;
 
@@ -56,7 +56,7 @@ main()
 		printf ("Token = '%s'\n", token);
 		token = tsrm_strtok_r(NULL, "/\\", &last);
 	}
-
+	
 	return 0;
 }
 

TSRM/tsrm_strtok_r.h

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

TSRM/tsrm_win32.c

@@ -1,8 +1,8 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 7                                                        |
+   | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2014 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        |
@@ -33,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;
@@ -41,19 +40,16 @@ static ts_rsrc_id win32_globals_id;
 static tsrm_win32_globals win32_globals;
 #endif
 
-static void tsrm_win32_ctor(tsrm_win32_globals *globals)
+static void tsrm_win32_ctor(tsrm_win32_globals *globals TSRMLS_DC)
 {
-#ifdef ZTS
-TSRMLS_CACHE_UPDATE();
-#endif
 	globals->process = NULL;
 	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
+	 * It will be initialized correctly in tsrm_win32_access or set to 
 	 * NULL if no impersonation has been done.
 	 * the impersonated token can't be set here as the impersonation
 	 * will happen later, in fcgi_accept_request (or whatever is the
@@ -63,7 +59,7 @@ TSRMLS_CACHE_UPDATE();
 	globals->impersonation_token_sid = NULL;
 }
 
-static void tsrm_win32_dtor(tsrm_win32_globals *globals)
+static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC)
 {
 	shm_pair *ptr;
 
@@ -96,32 +92,30 @@ 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);
+	tsrm_win32_ctor(&win32_globals TSRMLS_CC);
 #endif
 }
 
 TSRM_API void tsrm_win32_shutdown(void)
 {
 #ifndef ZTS
-	tsrm_win32_dtor(&win32_globals);
+	tsrm_win32_dtor(&win32_globals TSRMLS_CC);
 #endif
 }
 
-char * tsrm_win32_get_path_sid_key(const char *pathname)
+char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC)
 {
 	PSID pSid = TWG(impersonation_token_sid);
+	DWORD sid_len = pSid ? GetLengthSid(pSid) : 0;
 	TCHAR *ptcSid = NULL;
 	char *bucket_key = NULL;
-	size_t ptc_sid_len, pathname_len;
-
-	pathname_len = strlen(pathname);
 
 	if (!pSid) {
-		bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pathname_len + 1);
+		bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + 1);
 		if (!bucket_key) {
 			return NULL;
 		}
-		memcpy(bucket_key, pathname, pathname_len);
+		memcpy(bucket_key, pathname, strlen(pathname));
 		return bucket_key;
 	}
 
@@ -129,16 +123,14 @@ char * tsrm_win32_get_path_sid_key(const char *pathname)
 		return NULL;
 	}
 
-
-	ptc_sid_len = strlen(ptcSid);
-	bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pathname_len + ptc_sid_len + 1);
+	bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + strlen(ptcSid) + 1);
 	if (!bucket_key) {
 		LocalFree(ptcSid);
 		return NULL;
 	}
 
-	memcpy(bucket_key, ptcSid, ptc_sid_len);
-	memcpy(bucket_key + ptc_sid_len, pathname, pathname_len + 1);
+	memcpy(bucket_key, ptcSid, strlen(ptcSid));
+	memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1);
 
 	LocalFree(ptcSid);
 	return bucket_key;
@@ -147,8 +139,11 @@ char * tsrm_win32_get_path_sid_key(const char *pathname)
 
 PSID tsrm_win32_get_token_sid(HANDLE hToken)
 {
+	BOOL bSuccess = FALSE;
 	DWORD dwLength = 0;
 	PTOKEN_USER pTokenUser = NULL;
+	PSID sid;
+	PSID *ppsid = &sid;
 	DWORD sid_len;
 	PSID pResultSid = NULL;
 
@@ -195,7 +190,7 @@ Finished:
 	return NULL;
 }
 
-TSRM_API int tsrm_win32_access(const char *pathname, int mode)
+TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
 {
 	time_t t;
 	HANDLE thread_token = NULL;
@@ -208,42 +203,30 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 	DWORD sec_desc_length = 0, desired_access = 0, granted_access = 0;
 	BYTE * psec_desc = NULL;
 	BOOL fAccess = FALSE;
+
+	BOOL bucket_key_alloc = FALSE;
 	realpath_cache_bucket * bucket = NULL;
 	char * real_path = NULL;
 
-	PHP_WIN32_IOUTIL_INIT_W(pathname)
-	if (!pathw) {
-		return -1;
-	}
-
 	if (mode == 1 /*X_OK*/) {
 		DWORD type;
-		int ret;
-
-		ret = GetBinaryTypeW(pathw, &type) ? 0 : -1;
-
-		PHP_WIN32_IOUTIL_CLEANUP_W()
-
-		return ret;
+		return GetBinaryType(pathname, &type) ? 0 : -1;
 	} else {
 		if(!IS_ABSOLUTE_PATH(pathname, strlen(pathname)+1)) {
-			real_path = (char *)malloc(MAXPATHLEN);
-			if(tsrm_realpath(pathname, real_path) == NULL) {
+			real_path = (char *)malloc(MAX_PATH);
+			if(tsrm_realpath(pathname, real_path TSRMLS_CC) == NULL) {
 				goto Finished;
 			}
 			pathname = real_path;
-			PHP_WIN32_IOUTIL_REINIT_W(pathname);
  		}
 
-		if(php_win32_ioutil_access(pathname, mode)) {
-			PHP_WIN32_IOUTIL_CLEANUP_W()
+		if(access(pathname, mode)) {
 			free(real_path);
 			return errno;
 		}
 
  		/* If only existence check is made, return now */
  		if (mode == 0) {
-			PHP_WIN32_IOUTIL_CLEANUP_W()
 			free(real_path);
 			return 0;
 		}
@@ -259,6 +242,7 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 		 was impersonating already, this function uses that impersonation context.
 		*/
 		if(!OpenThreadToken(GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, &thread_token)) {
+			DWORD err = GetLastError();
 			if (GetLastError() == ERROR_NO_TOKEN) {
 				if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &thread_token)) {
 					 TWG(impersonation_token) = NULL;
@@ -295,15 +279,14 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 
 		if (CWDG(realpath_cache_size_limit)) {
 			t = time(0);
-			bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t);
+			bucket = realpath_cache_lookup(pathname, strlen(pathname), t TSRMLS_CC);
 			if(bucket == NULL && real_path == NULL) {
 				/* We used the pathname directly. Call tsrm_realpath */
 				/* so that entry is created in realpath cache */
-				real_path = (char *)malloc(MAXPATHLEN);
-				if(tsrm_realpath(pathname, real_path) != NULL) {
+				real_path = (char *)malloc(MAX_PATH);
+				if(tsrm_realpath(pathname, real_path TSRMLS_CC) != NULL) {
 					pathname = real_path;
-					bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t);
-					PHP_WIN32_IOUTIL_REINIT_W(pathname);
+					bucket = realpath_cache_lookup(pathname, strlen(pathname), t TSRMLS_CC);
 				}
 			}
  		}
@@ -340,13 +323,13 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 		}
 
 		/* Get size of security buffer. Call is expected to fail */
-		if(GetFileSecurityW(pathw, sec_info, NULL, 0, &sec_desc_length)) {
+		if(GetFileSecurity(pathname, 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)) {
+			 !GetFileSecurity(pathname, sec_info, (PSECURITY_DESCRIPTOR)psec_desc, sec_desc_length, &sec_desc_length)) {
 			goto Finished;
 		}
 
@@ -388,7 +371,6 @@ Finished:
 			real_path = NULL;
 		}
 
-		PHP_WIN32_IOUTIL_CLEANUP_W()
 		if(fAccess == FALSE) {
 			errno = EACCES;
 			return errno;
@@ -399,7 +381,7 @@ Finished:
 }
 
 
-static process_pair *process_get(FILE *stream)
+static process_pair *process_get(FILE *stream TSRMLS_DC)
 {
 	process_pair *ptr;
 	process_pair *newptr;
@@ -429,6 +411,7 @@ static shm_pair *shm_get(int key, void *addr)
 {
 	shm_pair *ptr;
 	shm_pair *newptr;
+	TSRMLS_FETCH();
 
 	for (ptr = TWG(shm); ptr < (TWG(shm) + TWG(shm_size)); ptr++) {
 		if (!ptr->descriptor) {
@@ -453,7 +436,6 @@ static shm_pair *shm_get(int key, void *addr)
 	TWG(shm) = newptr;
 	ptr = newptr + TWG(shm_size);
 	TWG(shm_size)++;
-	memset(ptr, 0, sizeof(*ptr));
 	return ptr;
 }
 
@@ -467,23 +449,23 @@ static HANDLE dupHandle(HANDLE fh, BOOL inherit) {
 
 TSRM_API FILE *popen(const char *command, const char *type)
 {
+	TSRMLS_FETCH();
 
-	return popen_ex(command, type, NULL, NULL);
+	return popen_ex(command, type, NULL, NULL TSRMLS_CC);
 }
 
-TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env)
+TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC)
 {
 	FILE *stream = NULL;
-	int fno, type_len, read, mode;
-	STARTUPINFOW startup;
+	int fno, type_len = strlen(type), read, mode;
+	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;
@@ -495,7 +477,7 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	}
 
 	/*The following two checks can be removed once we drop XP support */
-	type_len = (int)strlen(type);
+	type_len = strlen(type);
 	if (type_len <1 || type_len > 2) {
 		return NULL;
 	}
@@ -507,42 +489,18 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 		ptype++;
 	}
 
-	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
-	if (!cmd) {
-		return NULL;
-	}
-
-	sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
-	cmdw = php_win32_cp_any_to_w(cmd);
-	if (!cmdw) {
-		free(cmd);
-		return NULL;
-	}
-
-	if (cwd) {
-		cwdw = php_win32_ioutil_any_to_w(cwd);
-		if (!cwdw) {
-			free(cmd);
-			free(cmdw);
-			return NULL;
-		}
-	}
-
 	security.nLength				= sizeof(SECURITY_ATTRIBUTES);
 	security.bInheritHandle			= TRUE;
 	security.lpSecurityDescriptor	= NULL;
 
 	if (!type_len || !CreatePipe(&in, &out, &security, 2048L)) {
-		free(cmdw);
-		free(cwdw);
-		free(cmd);
 		return NULL;
 	}
 
-	memset(&startup, 0, sizeof(STARTUPINFOW));
+	memset(&startup, 0, sizeof(STARTUPINFO));
 	memset(&process, 0, sizeof(PROCESS_INFORMATION));
 
-	startup.cb			= sizeof(STARTUPINFOW);
+	startup.cb			= sizeof(STARTUPINFO);
 	startup.dwFlags		= STARTF_USESTDHANDLES;
 	startup.hStdError	= GetStdHandle(STD_ERROR_HANDLE);
 
@@ -574,35 +532,26 @@ 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;
 	}
 
 	CloseHandle(process.hThread);
-	proc = process_get(NULL);
+	proc = process_get(NULL TSRMLS_CC);
 
 	if (read) {
 		fno = _open_osfhandle((tsrm_intptr_t)in, _O_RDONLY | mode);
@@ -622,8 +571,9 @@ TSRM_API int pclose(FILE *stream)
 {
 	DWORD termstat = 0;
 	process_pair *process;
+	TSRMLS_FETCH();
 
-	if ((process = process_get(stream)) == NULL) {
+	if ((process = process_get(stream TSRMLS_CC)) == NULL) {
 		return 0;
 	}
 
@@ -649,45 +599,28 @@ TSRM_API int shmget(int key, int size, int flags)
 		return -1;
 	}
 
-	snprintf(shm_segment, sizeof(shm_segment), "TSRM_SHM_SEGMENT:%d", key);
-	snprintf(shm_info, sizeof(shm_info), "TSRM_SHM_DESCRIPTOR:%d", key);
+	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 ((!shm_handle && !info_handle)) {
 		if (flags & IPC_CREAT) {
 			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);
-			}
+		if ((!shm_handle || !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);
@@ -726,18 +659,12 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags)
 		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;
 }
 
@@ -795,59 +722,4 @@ TSRM_API char *realpath(char *orig_path, char *buffer)
 	return buffer;
 }
 
-#if HAVE_UTIME
-static zend_always_inline void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {{{ */
-{
-	// Note that LONGLONG is a 64-bit value
-	LONGLONG ll;
-
-	ll = Int32x32To64(t, 10000000) + 116444736000000000;
-	pft->dwLowDateTime = (DWORD)ll;
-	pft->dwHighDateTime = ll >> 32;
-}
-/* }}} */
-
-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,
-				 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) {
-		SetLastError(0);
-	}
-
-	if ( hFile == INVALID_HANDLE_VALUE ) {
-		return -1;
-	}
-
-	if (!buf) {
-		SYSTEMTIME st;
-		GetSystemTime(&st);
-		SystemTimeToFileTime(&st, &mtime);
-		atime = mtime;
-	} else {
-		UnixTimeToFileTime(buf->modtime, &mtime);
-		UnixTimeToFileTime(buf->actime, &atime);
-	}
-	if (!SetFileTime(hFile, NULL, &atime, &mtime)) {
-		CloseHandle(hFile);
-		return -1;
-	}
-	CloseHandle(hFile);
-	return 1;
-}
-/* }}} */
-#endif
 #endif

TSRM/tsrm_win32.h

@@ -1,8 +1,8 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 7                                                        |
+   | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2014 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        |
@@ -23,9 +23,6 @@
 
 #include "TSRM.h"
 #include <windows.h>
-#if HAVE_UTIME
-# include <sys/utime.h>
-#endif
 
 struct ipc_perm {
 	int			key;
@@ -71,8 +68,7 @@ typedef struct {
 } tsrm_win32_globals;
 
 #ifdef ZTS
-# define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v)
-TSRMLS_CACHE_EXTERN()
+# define TWG(v) TSRMG(win32_globals_id, tsrm_win32_globals *, v)
 #else
 # define TWG(v) (win32_globals.v)
 #endif
@@ -94,15 +90,15 @@ TSRMLS_CACHE_EXTERN()
 #define	SHM_RND		FILE_MAP_WRITE
 #define	SHM_REMAP	FILE_MAP_COPY
 
-char * tsrm_win32_get_path_sid_key(const char *pathname );
+char * tsrm_win32_get_path_sid_key(const char *pathname  TSRMLS_DC);
 
 TSRM_API void tsrm_win32_startup(void);
 TSRM_API void tsrm_win32_shutdown(void);
 
-TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env);
+TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC);
 TSRM_API FILE *popen(const char *command, const char *type);
 TSRM_API int pclose(FILE *stream);
-TSRM_API int tsrm_win32_access(const char *pathname, int mode);
+TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC);
 TSRM_API int win32_utime(const char *filename, struct utimbuf *buf);
 
 TSRM_API int shmget(int key, int size, int flags);

UPGRADING

@@ -1,4 +1,6 @@
-PHP 7.1 UPGRADE NOTES
+$Id$
+
+PHP 5.6 UPGRADE NOTES
 
 1. Backward Incompatible Changes
 2. New Features
@@ -7,12 +9,11 @@ PHP 7.1 UPGRADE NOTES
 5. Changed Functions
 6. New Functions
 7. New Classes and Interfaces
-8. Removed Extensions and SAPIs
+8. Removed Extensions
 9. Other Changes to Extensions
 10. New Global Constants
 11. Changes to INI File Handling
-12. Windows Support
-13. Other Changes
+12. Other Changes
 
 
 ========================================
@@ -20,513 +21,481 @@ PHP 7.1 UPGRADE NOTES
 ========================================
 
 - Core:
-  . 'void' can no longer be used as the name of a class, interface, or trait.
-    This applies to declarations, class_alias() and use statements.
-  . 'iterable' can no longer be used as the name of a class, interface, or
-    trait. This applies to declarations, class_alias() and use statements.
-    (RFC: https://wiki.php.net/rfc/iterable)
-  . (int), intval() where $base is 10 or unspecified, settype(), decbin(),
-    decoct(), dechex(), integer operators and other conversions now always
-    respect scientific notation in numeric strings.
-    (RFC: https://wiki.php.net/rfc/invalid_strings_in_arithmetic)
-  . The ASCII 0x7F Delete control character is no longer permitted in unquoted
-    identifiers in source code.
-  . The following functions may no longer be called dynamically using $func(),
-    call_user_func(), array_map() or similar:
-     . extract()
-     . compact()
-     . get_defined_vars()
-     . func_get_args()
-     . func_get_arg()
-     . func_num_args()
-     . parse_str() with one argument
-     . mb_parse_str() with one argument
-     . assert() with a string argument
-    (RFC: https://wiki.php.net/rfc/forbid_dynamic_scope_introspection)
-  . If the error_log is set to syslog, the PHP error levels are mapped to the
-    syslog error levels. This brings finer differentiation in the error logs
-    in contrary to the previous approach where all the errors are loggged with
-    the notice level only.
-  . Don't call destructors of incompletely constructed objects, even if they
-    are kept referenced. See bug #29368 and Zend/tests/bug29368_1.phpt.
-  . call_user_func() will now consistently throw a warning if a function with
-    reference arguments is called. However, call_user_func() will no longer
-    abort the call in this case.
-  . rand() and srand() are now aliases of mt_rand() and mt_srand().
-    Consequently the output of the following functions has changed:
-     . rand()
-     . shuffle()
-     . str_shuffle()
-     . array_rand()
-  . Fixes to random number generators mean that mt_rand() now produces a
-    different sequence of outputs to previous versions. If you relied on
-    mt_srand() to produce a deterministic sequence, it can be called using
-    mt_srand($seed, MT_RAND_PHP) to produce the old sequences.
-  . URL rewriter has been improved.
-     . Use dedicated buffer for Session module rewrite and User rewrite.
-     . Full path URL rewrite is supported. Allowed domain can be specified.
-       $_SERVER['HTTP_HOST'] is allowed by default when host whitelist is empty.
-     . Use session.trans_sid_tags and session.trans_sid_hosts to control
-       session rewrite.
-     . Use url_rewriter.tags and url_rewriter.hosts to control user rewrite.
-     . <form>'s "action" attribute is used to check if URL rewrite is allowed
-       and listed under hosts whitelist.
-     . <fieldset> is no longer considered as a special tag. <form> is the
-       only tag considered special.
-  . Calling a function with less arguments than mandatory declared ones in
-    signature now issues a Fatal Error (Error Exception) instead of a Warning.
-    (RFC https://wiki.php.net/rfc/too_few_args).
-  . The error message for E_RECOVERABLE errors has been changed from "Catchable
-    fatal error" to "Recoverable fatal error".
-  . The empty index operator (e.g. $str[] = $x) is not supported for strings
-    anymore, and throws a fatal error instead of silently converting to array.
-  . Array elements or object properties that are automatically created during
-    by-reference assignments will now result in a different order. For example
-
-        $array = [];
-        $array["a"] =& $array["b"];
-        $array["b"] = 1;
-        var_dump($array);
-
-    now results in the array ["b" => 1, "a" => 1], while for PHP 7.0 the result
-    was ["a" => 1, "b" => 1].
-  . The allowed_classes element of the $options parameter of unserialize() is
-    now strictly typed, i.e. if anything other than an array or a boolean is
-    given, unserialize() returns FALSE and issues an E_WARNING.
-  . $this, autoglobals, and variables with the same name as a parameter can no
-    longer be bound to a closure via the use construct.
+  By fixing bug #66015 it is no longer possible to overwrite keys in static scalar
+  arrays. Quick example to illustrate:
+  class Test {
+       const FIRST = 1;
+       public $array = array(
+           self::FIRST => 'first',
+           'second',
+           'third'
+       );
+  }
+  Test::$array will have as expected three array keys (1, 2, 3) and no longer
+  two (0, 1). self::FIRST will no longer overwrite 'third' having key 1 then,
+  but will mark the beginning of indexing. 
 
 - JSON:
-  . The serialize_precision is used instead of precision when encoding double
-    values.
-  . An empty key is decoded as an empty property name instead of using _empty_
-    property name when decoding object to stdClass.
-  . When calling json_encode with JSON_UNESCAPED_UNICODE option, U+2028 and
-    U+2029 are escaped.
-
-- mbstring:
-  . mb_ereg() and mb_eregi() will now set the $regs argument to an empty array,
-    if nothing matched. Formerly, $regs was not modified in that case.
+  json_decode() no longer accepts non-lowercase variants of lone JSON true,
+  false or null values. For example, True or FALSE will now cause json_decode to
+  return NULL and set an error value you can fetch with json_last_error().
+  This affects JSON texts consisting solely of true, false or null. Text
+  containing non-lowercase values inside JSON arrays or objects has never been
+  accepted.
 
 - OpenSSL:
-  . Dropped sslv2 stream.
+  To prevent man-in-the-middle attacks against encrypted transfers client
+  streams now verify peer certificates by default. Previous versions
+  required users to manually enable peer verification. As a result of this
+  change, existing code using ssl:// or tls:// stream wrappers (e.g.
+  file_get_contents(), fsockopen(), stream_socket_client()) may no longer
+  connect successfully without manually disabling peer verification via the
+  stream context's "verify_peer" setting. Encrypted transfers delegate to
+  operating system certificate stores by default if not overridden via the
+  new openssl.cafile and openssl.cafile ini directives or via call-time SSL
+  context options, so most users should be unaffected by this transparent
+  security enhancement. (https://wiki.php.net/rfc/tls-peer-verification)
 
-- Session:
-  . Session ID is generated from CSPRNG directly. As a result, Session ID length
-    could be any length between 22 and 256. Note: Max size of session ID depends
-    on save handler you are using.
-  . Following INIs are removed
-     . session.hash_function
-     . session.hash_bits_per_character
-     . session.entropy_file
-     . session.entropy_length
-  . New INIs and defaults
-     . session.sid_length (Number of session ID characters - 22 to 256.
-       php.ini-* default: 26 Compiled default: 32)
-     . session.sid_bits_per_character (Bits used per character - 4 to 6.
-       php.ini-* default: 5 Compiled default: 4)
-  . Length of old session ID string is determined as follows
-     . Used hash function's bits.
-        . session.hash_function=0 - MD5 128 bits (This was default)
-        . session.hash_function=1 - SHA1 160 bits
-     . Bits per character. (4, 5 or 6 bits per character)
-     . Examples
-         MD5 and 4 bits = 32 chars,  ceil(128/4)=32
-         MD5 and 5 bits = 26 chars,  ceil(128/5)=26
-         MD5 and 6 bits = 22 chars,  ceil(128/6)=22
-         SHA1 and 4 bits = 40 chars, ceil(160/4)=40
-         SHA1 and 5 bits = 32 chars, ceil(160/5)=32
-         SHA1 and 6 bits = 27 chars, ceil(160/6)=27
-         and so on.
-  . session_start() returns FALSE and no longer initializes $_SESSION when
-    it failed to start session.
-
-- Reflection:
-  . The behavior of ReflectionMethod::invoke() and ::invokeArgs() has been
-    aligned, which causes slightly different behavior than before for some
-    pathological cases.
-
-- IMAP:
-  Starting with 7.1.25, rsh/ssh logins are disabled by default. Use
-  imap.enable_insecure_rsh if you want to enable them. Note that the IMAP
-  library does not filter mailbox names before passing them to rsh/ssh
-  command, thus passing untrusted data to this function with rsh/ssh enabled
-  is insecure.
+- Mcrypt:
+  The mcrypt_encrypt(), mcrypt_decrypt() and mcrypt_{MODE}() functions no
+  longer accept keys or IVs with incorrect sizes. Furthermore an IV is now
+  required if the used block cipher mode requires it.
 
 ========================================
 2. New Features
 ========================================
-- Core
-  . Added void return type, which requires that a function not return a value.
-    (RFC: https://wiki.php.net/rfc/void_return_type)
-  . Added iterable pseudo-type accepting any array or object implementing
-    Traversable.
-    (RFC: https://wiki.php.net/rfc/iterable)
-  . String offset access now supports negative references, which will be
-    counted from the end of the string.
-    (RFC: https://wiki.php.net/rfc/negative-string-offsets)
-  . Added a form of the list() construct where keys can be specified.
-    (RFC: https://wiki.php.net/rfc/list_keys)
-  . Added [] = as alternative construct to list() =.
-    (RFC: https://wiki.php.net/rfc/short_list_syntax)
-  . Number operators taking numeric strings now emit "A non well formed numeric
-    value encountered" E_NOTICEs for leading-numeric strings, and "A
-    non-numeric value encountered" E_WARNINGs for non-numeric strings.
-    This always applies to the +, -, *, /, **, %, << and >> operators, and
-    their assignment counterparts +=, -=, *=, /=, **=, %=, <<= and >>=.
-    For the bitwise operators |, & and ^, and their assignment counterparts
-    |=, &= and ^=, this only applies where only one operand is a string.
-    Note that this never applies to the bitwise NOT operator, ~, which does not
-    handle numeric strings, nor to the increment and decrement operators
-    ++ and --, which have a unique approach to handling numeric strings.
-    (RFC: https://wiki.php.net/rfc/invalid_strings_in_arithmetic)
-  . Closure::fromCallable (RFC: https://wiki.php.net/rfc/closurefromcallable)
-  . Added support for class constant visibility modifiers.
-    (RFC: https://wiki.php.net/rfc/class_const_visibility)
-  . TypeError messages for arg_info type checks will now say "must be ...
-    or null", or "must ... or be null" where the parameter or return type
-    accepts null. arg_info type checks are used by all userland functions with
-    type declarations, and some internal functions. Both nullable type
-    declarations (?int) and parameters with default values of null
-    (int $foo = NULL) are considered to "accept null" for this purpose.
-  . The simple syntax for variable parsing inside of string literals now
-    supports negative offsets.
+
+- Added constant scalar expressions syntax.
+  (https://wiki.php.net/rfc/const_scalar_exprs)
+
+- Added dedicated syntax for variadic functions.
+  (https://wiki.php.net/rfc/variadics)
+
+- Added support for argument unpacking to complement the variadic syntax.
+  (https://wiki.php.net/rfc/argument_unpacking)
+
+- Added an exponentiation operator (**).
+  (https://wiki.php.net/rfc/pow-operator)
+
+- Added unified default encoding. default_charset=UTF-8 and functions/extensions
+  use encoding settings honor default_charset.
+
+- The php://input stream is now re-usable and can be used concurrently with
+  enable_post_data_reading=0.
+
+- Added use function and use const.
+  (https://wiki.php.net/rfc/use_function)
+
+- Added a function for timing attack safe string comparison
+  (https://wiki.php.net/rfc/timing_attack)
+
+- Added the __debugInfo() magic method to allow userland classes to implement
+  the get_debug_info API previously available only to extensions.
+  (https://wiki.php.net/rfc/debug-info)
+
+- Added gost-crypto (CryptoPro S-box) hash algorithm.
+
+- Stream wrappers verify peer certificates and host names by default in
+  encrypted client streams.
+
+- Added openssl certificate fingerprint support (inclusive stream context
+  option).
+
+- Added support for SAN x509 extension matching when verifing host names in
+  encrypted streams.
+
+- Added a range of new SSL context options for improved encrypted stream
+  server security (https://wiki.php.net/rfc/improved-tls-defaults):
+
+    . "honor_cipher_order" allows servers to prioritize cipher suites of their
+      choosing when negotiating SSL/TLS handshakes.
+    . "single_ecdh_use" and "single_dh_use" allow for improved forward
+      secrecy in encrypted stream servers.
+    . "dh_param" allows specification of pre-generated key generation
+       parameters when negotiating ephemeral DHE ciphers in stream servers.
+    . "ecdh_curve" allows stream servers to specify which curve to use when
+       negotiating ephemeral ECDHE ciphers (defaults to NIST P-256).
+    . "rsa_key_size" SSL context option gives stream servers control
+      over the key size (in bits) used when negotiating RSA ciphers.
+    . "capture_session_meta" if specified stores an array of data describing
+      the TLS session's protocol/cipher in the "session_meta" SSL context key.
+
+- Added automatic mitigation against client-initated TLS renegotiation DoS
+  attacks in encrypted server streams. Renegotiation limiting may be
+  customized via three new SSL context options:
+
+    . "reneg_limit" (number of allowed renegotiations per time window)
+    . "reneg_window" (renegotiation time window in seconds)
+    . "reneg_limit_callback" (optional notification callback on limiting)
+
+- Encrypted TLS servers now support the server name indication (SNI) TLS
+  extension via the new "SNI_server_certs" SSL context option.
+
+- Added "crypto_method" SSL context option for use in encrypted streams.
+
+- Added "peer_name" SSL context option to better reflect peer certificate
+  name matching using SAN extension (replaces deprecated "CN_match").
+
+- Added stream wrapper support when specifying "cafile" SSL context paths.
+
+- Independent peer cert and peer name validation is now available via a new
+  boolean "verify_peer_name" SSL context option. This option is enabled by
+  default in encrypted client streams.
+
+- Added protocol-specific tlsv1.0://, tlsv1.1:// and tlsv1.2:// encryption
+  stream wrappers. tls:// wrapper now supports TLSv1.1 and TLSv1.2 (previously
+  only supported TLSv1).
+
+- Stream crypto method specification now accepts flags instead of values
+  allowing support for multiple discrete protocols in a given stream.
+
+- PostgreSQL database connections may now be established asynchronously using
+  new constants and polling functions in ext/pgsql.
+
+- Non-blocking read/write query behavior now optionally available in database
+  operations using the ext/pgsql extension.
 
 ========================================
 3. Changes in SAPI modules
 ========================================
-- apache2handler:
-  . Implemented per module logging.
-  . Implemented error level mapping between PHP and Apache for the error logs.
+
+- Added phpdbg SAPI.
+  (https://wiki.php.net/rfc/phpdbg)
+
+- Support for FPM workers changing the apparmor profile through the pool configuration.
+  (https://wiki.php.net/rfc/fpm_change_hat)
+
+- Support for several XML MIME types in the built-in CLI server. For static
+  files with extensions .xml, .xsl, .xsd the Content-Type header
+  application/xml is now sent automatically.
 
 ========================================
 4. Deprecated Functionality
 ========================================
 
-- 'e' option of mb_ereg_replace() and mb_eregi_replace().
-- ext/mcrypt is now fully deprecated.
+- Incompatible context calls:
+  Instance calls from an incompatible context are now deprecated and issue
+  E_DEPRECATED instead of E_STRICT. See https://wiki.php.net/rfc/incompat_ctx
+
+- The "CN_match" and "SNI_server_name" SSL context options are deprecated in
+  favor of the new "peer_name" option. Name verification now checks certificate
+  SAN names as well as the CN field and the specific name fields are deprecated
+  to avoid confusion. Their use triggers E_DEPRECATED but continues to work as
+  before. If specified, the specific values take precedence over the general
+  "peer_name" value.
+
+- Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT, an
+  undocument constant effectively equivalent to PDO::ATTR_EMULATE_PREPARES.
+
+- Deprecated INIs: Following INIs are deprecated in favour of new
+  internal_encoding/input_encoding/output_encoding. Refer to "Changes to
+  encodings in PHP 5.6" in "11. Other Changes" section for more details.
+
+    iconv.input_encoding
+    iconv.output_encoding
+    iconv.internal_encoding
+    mbstring.http_input
+    mbstring.http_output
+    mbstring.internal_encoding
 
 ========================================
 5. Changed Functions
 ========================================
-- get_headers() has an extra parameter which allows passing a custom stream
-  context.
-- The first $varname argument for getenv() is no longer mandatory, the
-  current environment variables will be returned as an associative array
-  when omitted.
-- json_encode() accepts new option JSON_UNESCAPED_LINE_TERMINATORS that
-  disables escaping of U+2028 and U+2029 characters when
-  JSON_UNESCAPED_UNICODE is supplied.
-- long2ip() accepts integer as parameter now
-- openssl_encrypt and openssl_decrypt have extra parameters for handling
-  authenticated encryption (tag, aad, tag_length) and decryption (tag, aad).
-- pg_last_notice() accepts optional long parameter to specify operation.
-  PGSQL_NOTICE_LAST - Get last notice (Default)
-  PGSQL_NOTICE_ALL - Get all stored notices
-  PGSQL_NOTICE_CLEAR - Remove all stored notices
-  It returns empty string or array on successful PGSQL_NOTICE_LAST/ALL calls.
-  It returned FALSE for empty notice previously.
-- pg_fetch_all() accepts 2nd optional result type parameter like
-  pg_fetch_row().
-- pg_select() accepts 4th optional result type parameter like pg_fetch_row().
-- parse_url() is more restrictive now and supports RFC3986.
-- unpack() accepts an additional optional $offset argument. '@' format code
-  (that specifes an absolute position) is applyed to input data after
-  the $offset argument.
-- strpos(), stripos(), substr_count(), grapheme_strpos(), grapheme_stripos(),
-  grapheme_extract(), iconv_strpos(), mb_strimwidth(), mb_ereg_search_setpos(),
-  mb_strpos() and mb_stripos() now accept negative string offsets.
-- substr_count() and mb_strimwidth() additionally also accept negative length.
-- file_get_contents() accepts a negative seek offset if the stream is seekable.
-- tempnam() throws a notice when failing back to the system temp dir.
-- getopt() has an extra by-ref parameter : optind
-- mb_ereg() and mb_ereg_replace() reject illegal byte sequences.
-- FILTER_FLAG_EMAIL_UNICODE can be used with filter_var() for email validation
-  according to RFC 6531.
-- output_reset_rewrite_vars() no longer reset session URL rewrite vars.
-- the lasinsertid() in pdo_pgsql extension triggers an error, when no nextval()
-  were called in in the current session.
-- fopen()
-  Since 7.1.2, mode 'e' was added, which sets the close-on-exec flag
-  on the opened file descriptor. This mode is only available in PHP compiled on
-  POSIX.1-2008 conform systems.
 
+- cURL:
+  CURLOPT_SAFE_UPLOAD is now turned on by default and uploads with @file 
+  do not work unless it is explicitly set to false.
+
+  curl_setopt() now supports the following nullable settings (>= 5.5.11): 
+    . CURLOPT_CUSTOMREQUEST
+    . CURLOPT_FTPPORT
+    . CURLOPT_RANGE
+    . CURLOPT_FTP_ACCOUNT
+    . CURLOPT_RTSP_SESSION_ID
+    . CURLOPT_KRBLEVEL
+    . CURLOPT_KRB4LEVEL
+
+- Strings:
+  substr_compare() now allows $length to be zero.
+
+- Crypt:
+  crypt() will now raise an E_NOTICE error if the salt parameter is omitted.
+  See: https://wiki.php.net/rfc/crypt_function_salt
+
+- Mcrypt:
+  The $source parameter of mcrypt_create_iv() now defaults to
+  MCRYPT_DEV_URANDOM instead of MCRYPT_DEV_RANDOM.
+
+- OpenSSL:
+  The $crypto_type parameter is now optional in stream_socket_enable_crypto()
+  if the stream's SSL context specifies the new "crypto_type" option. The
+  crypto method from the context is used as a fallback if no crypto method is
+  specified at call-time.
+
+- Reflection:
+  ReflectionClass::newInstanceWithoutConstructor previously didn't allow the
+  instantiation of any internal class which used custom object storage
+  (overriding the default create_object handler), this was changed to only
+  reject the instantiation of such classes if the class is also marked as
+  final.
+
+- XMLReader:
+  XMLReader::getAttributeNs and XMLReader::getAttributeNo now return NULL if
+  the attribute could not be found, just like XMLReader::getAttribute.
+
+- Pgsql:
+  pg_insert()/pg_select()/pg_update()/pg_delete() are no longer EXPERIMENTAL.
+  The following functions no longer block until query write completion if the
+  socket stream underlying a database connection is set to non-blocking mode:
+    . pg_send_execute()
+    . pg_send_prepare()
+    . pg_send_query()
+    . pg_send_query_params()
+
+- unserialize:
+  Manipulated serialization strings for objects implementing Serializable by
+  replacing "C:" with "O:" at the start will now produce an error.
+
+- parse_ini_file():
+- parse_ini_string():
+  Added scanner mode INI_SCANNER_TYPED to yield typed .ini values. 
+  For PHP >= 5.6.1
 
 ========================================
 6. New Functions
 ========================================
-- Core:
-  . Added sapi_windows_cp_set(), sapi_windows_cp_get(), sapi_windows_cp_is_utf8(),
-    sapi_windows_cp_conv() for codepage handling.
 
-- cURL:
-  . Added curl_multi_errno() and curl_share_errno() to return the last error
-    number of curl_multi and curl_share resources.
-  . Added curl_share_strerror() to convert error code to error message text
-    describing the error.
+- GMP:
+  Added gmp_root($a, $nth) and gmp_rootrem($a, $nth) for calculating nth roots.
+  Added gmp_import($data, $word_size = 1, $options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN) in PHP 5.6.1.
+  Added gmp_export($gmpnumber, $word_size = 1, $options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN) in PHP 5.6.1.
 
-- Hash:
-  . In PHP 7.1.2: Added hash_hkdf() function, which implements the HMAC-based
-    Key Derivation Function (HKDF) algorithm according to RFC 5869. The
-    implementation combines the Extract and Expand steps.
+- Hash
+  Added hash_equals($known_string, $user_string)
 
-- pcntl:
-  . Added pcntl_signal_get_handler() that returns the current signal handler
-    for a particular signal.
+- OpenSSL:
+  Added string openssl_x509_fingerprint($x509, $type, $binary).
+  Added string openssl_spki_new($private_key, $challenge, $algorithm)
+  Added bool openssl_spki_verify($spkac)
+  Added string openssl_spki_export($spkac)
+  Added string openssl_spki_export_challenge($spkac)
+  Added array openssl_get_cert_locations()
 
-- Session:
-  . Added session_gc() that performs session data garbage collection.
-    https://wiki.php.net/rfc/session-gc
-  . Added session_create_id() for creating custom session ID.
-    https://wiki.php.net/rfc/session-create-id
+- LDAP:
+  Added ldap_escape($value, $ignore = "", $flags = 0).
+  Added ldap_modify_batch($link_identifier, $dn, $modifications) described in 
+  https://wiki.php.net/rfc/ldap_modify_batch.
 
-- Standard:
-  . Added is_iterable() that determines if a value will be accepted by the new
-    iterable pseudo-type.
+- Pgsql:
+  Added pg_socket($connection) to allow async connections and non-blocking IO
+  Added pg_connect_poll($connection) for establishing async connections
+  Added pg_consume_input($connection) for non-blocking query result consumption
+  Added pg_flush($connection) for non-blocking query write completion
+
+- PDO_pgsql
+  Added PDO::pgsqlGetNotify($result_type = PDO::FETCH_USE_DEFAULT, $ms_timeout = 0)
+  Added PDO::pgsqlGetPid()
+
+- Zip:
+  Added ZipArchive::setPassword($password)
+
+- SPL
+  Added SplFileObject::fread($length) to complement fwrite() method (>= 5.5.11)
 
 ========================================
 7. New Classes and Interfaces
 ========================================
 
+
 ========================================
-8. Removed Extensions and SAPIs
+8. Removed Extensions
 ========================================
 
+
 ========================================
 9. Other Changes to Extensions
 ========================================
 
-- Date:
-  . Invalid serialization data for a DateTime or DatePeriod object will now
-    throw an instance of Error from __wakeup() or __set_state() instead of
-    resulting in a fatal error.
-  . Timezone initialization failure from serialized data will now throw an
-    instance of Error from __wakeup() or __set_state() instead of resulting in
-    a fatal error.
-  . DateTime and DateTimeImmutable now properly incorporate microseconds when
-    constructed from the current time, either explicitly or with a relative
-    string (e.g. "first day of next month"). This means that naive comparisons
-    of two newly created instances will now more likely return FALSE instead of
-    TRUE:
-      new DateTime() == new DateTime();
+- cURL:
+  - The following constants have been removed as they are now marked "obsolete"
+    in the underlying library and never had any effect to begin with:
+      . CURLOPT_CLOSEPOLICY
+      . CURLCLOSEPOLICY_CALLBACK
+      . CURLCLOSEPOLICY_LEAST_RECENTLY_USED
+      . CURLCLOSEPOLICY_LEAST_TRAFFIC
+      . CURLCLOSEPOLICY_OLDEST
+      . CURLCLOSEPOLICY_SLOWEST
 
-- DBA:
-  . Data modification functions (e.g.: dba_insert()) now throw an instance of
-    Error instead of triggering a catchable fatal error if the key does not
-    contain exactly two elements.
+- GMP:
+  The GMP extension now uses objects as the underlying data structure, rather
+  than resources. GMP instances now support dumping, serialization, cloning,
+  casts to primitive types and have overloaded operators.
+  (RFC: https://wiki.php.net/rfc/operator_overloading_gmp)
+
+- OCI8:
+  - Added Implicit Result Set support for Oracle Database 12c with a
+    new oci_get_implicit_resultset() function.
+  - Using 'oci_execute($s, OCI_NO_AUTO_COMMIT)' for a SELECT no longer
+    unnecessarily initiates an internal ROLLBACK during connection
+    close.
+  - Multi-row OCI_RETURN_LOB queries require fewer "round trips" to the database.
+  - Added DTrace probes enabled with PHP's generic --enable-dtrace
+  - The oci_internal_debug() function is now a no-op.
+  - The phpinfo() output format for OCI8 has changed.
+
+- OpenSSL:
+  - The "SNI_enabled" SSL stream context option is now set to TRUE by default
+    if supported by the underlying openssl library.
+
+- PCRE:
+  - The information collected by the (*MARK) backtracking control verb is now
+    collected into the "MARK" index of the $matches array for preg_match(),
+    preg_match_all() and preg_replace_callback().
+
+- Pgsql:
+  - pg_insert()/pg_select()/pg_update()/pg_delete()/pg_meta_data()/pg_convert()
+    are no longer EXPERIMENTAL
+  - Added PGSQL_DML_ESCAPE option for pg_insert()/pg_select()/pg_update()/pg_delete()
+    that simply escapes all supplied parameters. These functions can be as fast as
+    native query. Unvalidated data(Unknown data types) is passed as string.
+    JSON/Array/etc are supported both PGSQL_DML_ESCAPE and pg_convert() as string.
+  - pg_select() returns PostgreSQL query resource when query is executed.
+  - Added extended flag parameter for pg_meta_data(). pg_meta_data() always
+    returns "is enum" attribute.
+  - The new pg_socket() function returns a socket stream with no behavior other
+    than to allow IO-readiness polling on a DB connection socket. Calling
+    stream_set_blocking() on its result enables non-blocking behavior.
+  - Passing the new PGSQL_CONNECT_ASYNC flag to pg_connect() allows applications
+    to poll for IO readiness via pg_connect_poll() and establish connections
+    asynchronously.
+
+- PDO_pgsql:
+  - Added PDO::PGSQL_ATTR_DISABLE_PREPARES constant to execute the queries
+    without preparing them, while still passing parameters separately from
+    the command text using PQexecParams.
+  - Added LISTEN/NOTIFY support via PDO::pgsqlGetNotify / PDO::pgsqlGetPid()
+    as described in https://bugs.php.net/bug.php?id=42614.
 
 - DOM:
-  . Invalid schema or RelaxNG validation contexts will throw an instance of
-    Error instead of resulting in a fatal error.
-  . Attempting to register a node class that does not extend the appropriate
-    base class will now throw an instance of Error instead of resulting in a
-    fatal error.
-  . Attempting to read an invalid or write to a readonly property will throw
-    an instance of Error instead of resulting in a fatal error.
-
-- GD:
-  . Changed the default of the ini setting gd.jpeg_ignore_warning to 1.
-
-- IMAP:
-  . An email address longer than 16385 bytes will throw an instance of Error
-    instead of resulting in a fatal error.
-
-- Intl:
-  . Failure to call the parent constructor in a class extending Collator
-    before invoking the parent methods will throw an instance of Error
-    instead of resulting in a recoverable fatal error.
-  . Cloning a Transliterator object may will now throw an instance of Error
-    instead of resulting in a fatal error if cloning the internal
-    transliterator fails.
-
-- LDAP:
-  . Providing an unknown modification type to ldap_batch_modify() will now
-    throw an instance of Error instead of resulting in a fatal error.
-
-- Mbstring:
-  . mb_ereg() and mb_eregi() will now throw an instance of ParseError if an
-    invalid PHP expression is provided and the 'e' option is used.
-
-- Mcrypt:
-  . mcrypt_encrypt() and mcrypt_decrypt() will throw an instance of Error
-    instead of resulting in a fatal error if mcrypt cannot be initialized.
-
-- Mysqli:
-  . Attempting to read an invalid or write to a readonly property will throw
-    an instance of Error instead of resulting in a fatal error.
-
-- PDO_Firebird
-  As of PHP 7.1.2, the fetched data for integer fields is aware of the Firebird
-  datatypes. Previously all integers was fetched as strings, starting with
-  aforementioned PHP version integer fields are translated to the PHP integer
-  datatype. The 64-bit integers are still fetched as strings in 32-bit PHP
-  builds.
-
-- Reflection:
-  . Failure to retrieve a reflection object or retrieve an object property
-    will now throw an instance of Error instead of resulting in a fatal error.
-
-- Session:
-  . Custom session handlers that do not return strings for session IDs will
-    now throw an instance of Error instead of resulting in a fatal error
-    when a function is called that must generate a session ID.
-  . Only CSPRNG is used to generate session ID.
-
-- SimpleXML:
-  . Creating an unnamed or duplicate attribute will throw an instance of Error
-    instead of resulting in a fatal error.
-
-- SPL:
-  . Attempting to clone an SplDirectory object will throw an instance of Error
-    instead of resulting in a fatal error.
-  . Calling ArrayIterator::append() when iterating over an object will throw an
-    instance of Error instead of resulting in a fatal error.
-
-- SQLite3:
-  . Upgraded bundled SQLite lib to 3.13.0
-
-- Standard:
-  . assert() will throw a ParseError when evaluating a string given as the first
-    argument if the PHP code is invalid instead of resulting in a catchable
-    fatal error.
-  . Calling forward_static_call() outside of a class scope will now throw an
-    instance of Error instead of resulting in a fatal error.
-
-- Tidy:
-  . Creating a tidyNode manually will now throw an instance of Error instead of
-    resulting in a fatal error.
-
-- WDDX:
-  . A circular reference when serializing will now throw an instance of Error
-    instead of resulting in a fatal error.
-
-- XML-RPC:
-  . A circular reference when serializing will now throw an instance of Error
-    instead of resulting in a fatal error.
-
-- Zip:
-  . ZipArchive::addGlob() will throw an instance of Error instead of resulting
-    in a fatal error if glob support is not available.
+  - DOMNode::textContent is now a writeable property. (>= 5.6.1)
 
 ========================================
 10. New Global Constants
 ========================================
 
-- Core:
-  . PHP_FD_SETSIZE
-
-- JSON:
-  . JSON_UNESCAPED_LINE_TERMINATORS
+- LDAP:
+  LDAP_ESCAPE_FILTER int(1)
+  LDAP_ESCAPE_DN     int(2)
 
 - Pgsql:
-  PGSQL_NOTICE_LAST
-  PGSQL_NOTICE_ALL
-  PGSQL_NOTICE_CLEAR
+  PGSQL_DML_ESCAPE   int(4096)
+  PGSQL_CONNECT_ASYNC
+  PGSQL_CONNECTION_STARTED
+  PGSQL_CONNECTION_MADE
+  PGSQL_CONNECTION_AWAITING_RESPONSE
+  PGSQL_CONNECTION_AUTH_OK
+  PGSQL_CONNECTION_SSL_STARTUP
+  PGSQL_CONNECTION_SETENV
+  PGSQL_POLLING_FAILED
+  PGSQL_POLLING_READING
+  PGSQL_POLLING_WRITING
+  PGSQL_POLLING_OK
+  PGSQL_POLLING_ACTIVE
 
-- Standard:
-  . IMAGETYPE_WEBP
+- OpenSSL:
+  STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT   int(9)
+  STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT   int(17)
+  STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT   int(33)
+  STREAM_CRYPTO_METHOD_ANY_CLIENT       int(63)
+  STREAM_CRYPTO_METHOD_TLSv1_0_SERVER   int(8)
+  STREAM_CRYPTO_METHOD_TLSv1_1_SERVER   int(16)
+  STREAM_CRYPTO_METHOD_TLSv1_2_SERVER   int(32)
+  STREAM_CRYPTO_METHOD_ANY_SERVER       int(62)
+  OPENSSL_DEFAULT_STREAM_CIPHERS        string
 
 ========================================
 11. Changes to INI File Handling
 ========================================
 
-- serialize_precision
-  . If the value is set to -1, then the dtoa mode 0 is used. The value -1
-    is now used by default.
-
-- precision
-  . If the value is set to -1, then the dtoa mode 0 is used. No changes
-    in default value which is still 14.
-
-- realpath_cache_size
-  . Set to 4096k by default
-
-========================================
-12. Windows Support
-========================================
-
 - Core:
-  . Support for long and UTF-8 path;
+  Changed always_populate_raw_post_data to throw a deprecation warning when
+  enabled and to recognize the value -1 for never populating the global 
+  $HTTP_RAW_POST_DATA variable, which will be default in future PHP versions.
 
-    If a web application is UTF-8 conform, no further action is required. For
-    applications depending on paths in non UTF-8 encodings for I/O, an explicit
-    INI directive has to be set. The encoding INI settings check relies on the
-    order in the core:
-      - internal_encoding
-      - default_charset
-      - zend.multibyte
+  default_charset is set to UTF-8. It was empty previously. default_charset
+  is used where it is applicable. Iconv/Mbstring/htmlentities/htmlspecialchars/
+  html_entity_decode use default_charset as default encoding.
 
-    Several functions for codepage handling were itroduced:
-      - sapi_windows_cp_set() to set the default codepage
-      - sapi_windows_cp_get() to retrieve the current codepage
-      - sapi_windows_cp_is_utf8()
-      - sapi_windows_cp_conv() to convert between codepages, using iconv()
-        compatible signature
-    These functions are thread safe.
+  internal_encoding/input_encoding/output_encoding is added for encoding
+  handling modules. Refer to "Changes to encodings in PHP 5.6" in "11. Other Changes"
+  section for more details.
 
-    The console output codepage is adjusted depending on the encoding used in
-    PHP. Depending on the concrete system OEM codepage, the visible output
-    might or might be not correct. For example, in the default cmd.exe and on
-    a system with the OEM codepage 437, outputs in codepages 1251, 1252, 1253
-    and some others can be shown correctly when using UTF-8. On the same system,
-    chars in codepage like 20932 probably won't be shown correctly. This refers
-    to the particular system rules for codepage, font compatibility and the
-    particular console program used. PHP automatically sets the console codepage
-    according to the encoding rules from php.ini. Using alternative consoles
-    instead of cmd.exe directly might bring better experience in some cases.
+- cURL:
+  If the new openssl.cafile ini directive is specified ext/curl will give the
+  openssl path precedence over its own curl.cainfo directive.
 
-    Nevertheless be aware, runtime codepage switch after the request start
-    might bring unexpected side effects on CLI. The preferrable way is php.ini,
-    When PHP CLI is used in a console emulator, that doesn't support Unicode,
-    it might possibly be required, to avoid changing the console codepage. The
-    best way to achieve it is by setting the default or internal encoding to
-    correspond the ANSI codepage. Another method is to set the INI directives
-    output_encoding and input_encoding to the required codepage, in which case
-    however the difference between internal and I/O codepage is likely to cause
-    mojibake. In rare cases, if PHP happens to crash gracefully, the original
-    console codepage might be not restored. In this case, the chcp command
-    can be used, to restore it manually.
-
-    Special awareness for the DBCS systems - the codepage switch on runtime
-    using ini_set() is likely to cause display issues. The difference to the
-    non DBCS systems is, that the extended characters require two console cells
-    to be displayed. In certain case, only the mapping of the characters into
-    the glyph set of the font could happen, no actual font change. This is the
-    nature of DBCS systems, the most simple way to prevent display issues is
-    to avoid usage of ini_set() for the codepage change.
-
-    As a result of UTF-8 support in the streams, PHP scripts are not limited
-    to ASCII or ANSI filenames anymore. This is supported out of the box on
-    CLI. For other SAPI, the documentation for the corresponding server
-    is useful.
-
-    Long paths support is transparent. Paths longer than 260 bytes get
-    automatically prefixed with \\?\. The max path length is limited to
-    2048 bytes. Be aware, that the path segment limit (basename length) still
-    persists.
-
-    For the best portability, it is strongely recommended to handle filenames,
-    I/O and other related topics UTF-8. Additionally, for the console applications,
-    the usage of a TrueType font is preferrable and the usage of ini_set() for
-    the codepage change is discouraged.
-
-  . Support for ftok()
-
-- FCGI
-  . PHP_FCGI_CHILDREN is respected. If this environment variable is defined,
-    the first php-fcgi.exe process will exec the specified number of children.
-    Those will share the same TCP socket.
-
-- readline:
-  . The readline extension is supported through the WinEditLine library
-    (http://mingweditline.sourceforge.net/). Thereby, the interactive CLI
-    shell is supported as well (php.exe -a).
-
-    It is well known, but nevertheless is worth mentioning again, that
-    the readline extension is not thread safe and will never be. Thus,
-    the usage of it with any true thread safe SAPI (like Apache mod_winnt) is
-    strongely discouraged.
+- OpenSSL:
+  openssl.cafile and openssl.capath ini directives have been added to allow
+  global CA default specification as necessary.
 
 ========================================
-13. Other Changes
+12. Other Changes
 ========================================
+
+- File upload:
+  Uploads equal or greater than 2GB in size are now accepted.
+
+- HTTP stream wrapper:
+  HTTP 1.1 requests now include a Connection: close header unless explicitly
+  overridden by setting a Connection header via the header context option.
+
+- PDO_pgsql
+  A libpq version providing PQexecParams, PQprepare, PQescapeStringConn,
+  PQescapeByteaConn is now required. According to the release notes that means
+  8.0.8+ or 8.1.4+. 
+
+- Zip:
+  New --with-libzip option allow to use system libzip. Version > 0.11 required,
+  Version >= 0.11.2 recommended for all features.
+
+- Changes to encodings in PHP 5.6
+  The default value of default_charset is now UTF-8 when it is not
+  explicitly set in php.ini
+
+  The following php.ini parameters were added:
+    internal_encoding
+    input_encoding
+    output_encoding
+
+  The values of the following php.ini parameters have become empty in
+  PHP 5.6 (previously they were all ISO-8859-1)
+
+    iconv.input_encoding
+    iconv.output_encoding
+    iconv.internal_encoding
+
+  Changes were made to character set handling in:
+   - the iconv and mbstring extensions,
+   - and htmlentities(), htmlspecialchars(), html_entity_decode() functions
+
+  The precedence for these is now:
+
+   default_charset < internal/input/output_encoding < (mbstring.* || iconv.*) < function parameter
+
+  For example, the easiest way to use the UTF-8 encoding is to set
+  default_charset=UTF-8 and leave the following php.ini parameters
+
+  empty:
+
+    iconv.input_encoding
+    iconv.output_encoding
+    iconv.internal_encoding
+    mbstring.http_input
+    mbstring.http_output
+    mbstring.internal_encoding
+    internal_encoding
+    input_encoding
+    output_encoding
+
+  The mb_regex_encoding() default setting is changed from EUC-JP to UTF-8.
+

UPGRADING.INTERNALS

@@ -1,90 +1,225 @@
-PHP 7.1 INTERNALS UPGRADE NOTES
+$Id$
+
+PHP 5.6 INTERNALS UPGRADE NOTES
 
-0. Wiki Examples
 1. Internal API changes
-  e. Codepage handling on Windows
-  f. Path handling on Windows
-  g. SAPI logging
+  a. Addition of do_operation and compare object handlers
+  b. return_value_ptr now always available, RETVAL_ZVAL_FAST macros
+  c. POST data handling
+  d. Arginfo changes
+  e. tsrm_virtual_cwd.h moved to zend_virtual_cwd.h
+  f. empty strings are interned
+  g. Additional str_* APIs
+  h. Addition of zend_hash_reindex
+  i. Addition of zend_hash_splice
+  j. Unserialization of manipulated object strings
+  k. Removal of IS_CONSTANT_ARRAY and IS_CONSTANT_INDEX hack
 
 2. Build system changes
   a. Unix build system changes
   b. Windows build system changes
 
-3. Module changes
-
-================
-0. Wiki Examples
-================
-
-The wiki contains multiple examples and further explanations of the internal
-changes. See: https://wiki.php.net/phpng-upgrading
-
 
 ========================
 1. Internal API changes
 ========================
 
-  e. Codepage handling on Windows
+  a. Addition of do_operation and compare object handlers
 
-    A set of new APIs was introduced, which allows to handle codepage
-    conversions. The corresponding prototypes and macros are contained
-    in win32/codepage.h.
+  Two new object handlers have been added:
 
-    Functions with php_win32_cp_* signatures provide handling for various
-    codepage aspects. Primarily they are in use at various places in the
-    I/O utils code and directly in the core where necessary, providing
-    conversions to/from UTF-16. Arbitrary conversions between codepages
-    are possible as well, whereby UTF-16 will be always an intermediate
-    state in this case.
+    do_operation:
+    typedef int (*zend_object_do_operation_t)(
+        zend_uchar opcode, zval *result, zval *op1, zval *op2 TSRMLS_DC
+    );
 
-    For input length arguments, the macro PHP_WIN32_CP_IGNORE_LEN can be
-    passed, then the API will calculate the length.  For output length
-    arguments, the macro PHP_WIN32_CP_IGNORE_LEN_P can be passed, then
-    the API won't set the output length.
+    compare:
+    typedef int (*zend_object_compare_zvals_t)(
+        zval *result, zval *op1, zval *op2 TSRMLS_DC
+    );
 
-    The mapping between encodings and codepages is provided by the predefined
-    array of data contained in win32/cp_enc_map.c. To change the data,
-    a generator win32/cp_enc_map_gen.c needs to be edited and run.
+  The first handler is used to overload arithmetic operations. The first
+  argument specifies the opcode of the operator, result is the target zval,
+  op1 the first operand and op2 the second operand. For unary operations
+  op2 is NULL. If the handler returns FAILURE PHP falls back to the default
+  behavior for the operation.
 
-  f. Path handling on Windows
+  The second handler is used to perform comparison operations with
+  non-objects. The value written into result must be an IS_LONG with value
+  -1 (smaller), 0 (equal) or 1 (greater). The return value is a SUCCESS/FAILURE
+  return code. The difference between this handler and compare_objects is
+  that it will be triggered for comparisons with non-objects and objects of
+  different types. It takes precedence over compare_objects.
 
-    A set of new APIs was introduced, which allows to handle UTF-8 paths. The
-    corresponding prototypes and macros are contained in win32/ioutil.h.
+  Further docs in the RFC: https://wiki.php.net/rfc/operator_overloading_gmp
 
-    Functions with php_win32_ioutil_* signatures provide POSIX I/O analogues.
-    These functions are integrated in various places across the code base to
-    support Unicode filenames. While accepting char * arguments, internally
-    the conversion to wchar_t * happens. Internally almost no ANSI APIs are
-    used, but directly their wide equivalents. The string conversion rules
-    correspond to those already present in the core and depend on the current
-    encoding settings. Doing so allows to move away from the ANSI Windows API
-    with its dependency on the system OEM/ANSI codepage.
+  b. return_value_ptr now always available, RETVAL_ZVAL_FAST macros
 
-    Thanks to the wide API usage, the long paths are now supported as well. The
-    PHP_WIN32_IOUTIL_MAXPATHLEN macro is defined to 2048 bytes and will override
-    the MAXPATHLEN in files where the header is included.
+  The return_value_ptr argument to internal functions is now always set.
+  Previously it was only available for functions returning by-reference.
+  return_value_ptr can now be used to return zvals without copying them.
+  For this purpose two new macros are provided:
 
-    The most optimal use case for scripts is utilizing UTF-8 for any I/O
-    related functions. UTF-8 filenames are supported on any system disregarding
-    the system OEM/ANSI codepage.
+      RETVAL_ZVAL_FAST(zv); /* analog to RETVAL_ZVAL(zv, 1, 0) */
+      RETURN_ZVAL_FAST(zv); /* analog to RETURN_ZVAL(zv, 1, 0) */
 
-  g. SAPI logging
-    The log_message callback in the SAPI struct was extended with the severity
-    argument. This allows SAPI modules to implement mapping between PHP and
-    corresponding server error levels. A reference mapping implementation
-    can be found in apache2handler.
+  The macros behave similarly to the non-FAST variants with copy=1 and
+  dtor=0, but will try to return the zval without making a copy by utilizing
+  return_value_ptr.
+  
+  c. POST data handling
+  
+  The sapi_request_info's members post_data, post_data_len and raw_post_data as 
+  well as raw_post_data_len have been replaced with a temp PHP stream 
+  request_body.
+  
+  The recommended way to access raw POST data is to open and use a php://input 
+  stream wrapper.  It is safe to be used concurrently and more than once. 
 
+  d. Arginfo changes
+
+  The pass_rest_by_reference argument of the ZEND_BEGIN_ARG_INFO and
+  ZEND_BEGIN_ARG_INFO_EX() is no longer used. The value passed to it is ignored.
+
+  Instead a variadic argument is created using ZEND_ARG_VARIADIC_INFO():
+
+      ZEND_ARG_VARIADIC_INFO(0, name) /* pass rest by value */
+      ZEND_ARG_VARIADIC_INFO(1, name) /* pass rest by reference */
+      ZEND_ARG_VARIADIC_INFO(ZEND_SEND_PREFER_REF, name)
+          /* pass rest by prefer-ref */
+
+  ZEND_ARG_VARIADIC_INFO() should only be used for the last argument.
+
+  The following changes were applied to the zend_arg_info struct:
+
+       typedef struct _zend_arg_info {
+           const char *class_name;
+           zend_uint class_name_len;
+           zend_uchar type_hint;
+      +    zend_uchar pass_by_reference;
+           zend_bool allow_null;
+      -    zend_bool pass_by_reference;
+      +    zend_bool is_variadic;
+       } zend_arg_info;
+
+  The following changes were applied to the zend_internal_function_info struct:
+
+       typedef struct _zend_internal_function_info {
+           zend_uint required_num_args;
+           zend_uchar _type_hint;
+           zend_bool return_reference;
+      -    zend_bool pass_rest_by_reference;
+      +    zend_bool _allow_null;
+      +    zend_bool _is_variadic;
+       } zend_internal_function_info;
+
+  The CHECK_ARG_SEND_TYPE(), ARG_MUST_BE_SENT_BY_REF(),
+  ARG_SHOULD_BE_SENT_BY_REF() and ARG_MAY_BE_SENT_BY_REF() macros now assume
+  that the argument passed to them is a zend_function* and that it is non-NULL.
+
+  e. tsrm_virtual_cwd.h moved to zend_virtual_cwd.h
+
+  Memory allocation is now managed by emalloc/efree instead of malloc/free.
+
+  f. empty strings are interned
+
+  String created using STR_EMPTY_ALLOC() are now interned.
+  convert_to_string use STR_EMPTY_ALLOC() for zval when IS_NULL.
+  str_efree() shoud be preferred as efree() on such strings can cause memory
+  corruption.
+
+  g. Additional str_* APIs
+
+  In addition to the previously existing str_free() and str_efree() macros, the
+  following macros have been introduced to simplify dealing with potentially
+  interned strings:
+
+      str_efree_rel(str)         - efree_rel() if not interned
+      str_erealloc(str, new_len) - erealloc() or emalloc+memcpy if interned
+      str_estrndup(str, len)     - estrndup() if not interned
+      str_strndup(str, len)      - zend_strndup() if not interned
+      str_hash(str, len)         - INTERNED_HASH(str) if interned,
+                                   zend_hash_func(str, len+1) otherwise
+
+  h. Addition of zend_hash_reindex
+
+  A zend_hash_reindex() function with the following prototype has been added:
+
+      void zend_hash_reindex(HashTable *ht, zend_bool only_integer_keys);
+
+  If only_integer_keys==0, this function will change all keys to be continuous,
+  zero-based integers in hash order. If only_integer_keys==1 the same will be
+  done only for keys that were already integers previously, while leaving
+  string keys alone.
+
+  i. Addition of zend_hash_splice
+
+  A zend_hash_splice() macro with the following prototype has been added:
+
+      void zend_hash_splice(
+          HashTable *ht, uint nDataSize, copy_ctor_func_t pCopyConstructor,
+          uint offset, uint length,
+          void **list, uint list_count, HashTable *removed
+      );
+
+  This function performs an in-place splice operation on a hashtable:
+
+  The elements between offset and offset+length are removed and the elements in
+  list[list_count] are inserted in their place. The removed elements can be
+  optionally collected into a hashtable.
+
+  This operation reindexes the hashtable, i.e. integer keys will be zero-based
+  and sequential, while string keys stay intact. The same applies to the
+  elements inserted into the removed HT.
+
+  As a side-effect of this addition the signature of the php_splice() function
+  changed:
+
+      void php_splice(
+          HashTable *ht, zend_uint offset, zend_uint length,
+          zval ***list, zend_uint list_count, HashTable *removed TSRMLS_DC
+      )
+  
+  This function now directly forwards to zend_hash_splice(), resets the
+  IAP of ht (for compatibility with the previous implementation) and resets
+  CVs if the passed hashtable is the global symbol table.
+
+  j. Unserialization of manipulated object strings
+
+  Strings requiring unserialization of objects are now explicitly checked
+  whether the object they contain implements the Serializable interface.
+  This solves the situation where manipulated strings could be passed for
+  objects using Serializable to disallow serialization. An object
+  implementing Serializable will always start with "C:" in the serialized
+  string, all other objects are represented with starting "O:". Objects
+  implementing Serializable to disable serialization using
+  zend_class_unserialize_deny and zend_class_serialize_deny, when
+  instantiated from the serializer with a manipulated "O:" string at the
+  start, will most likely be defectively initialized. This is now
+  fixed at the appropriate place by checking for the presence of the
+  serialize callback in the class entry.
+
+  k. Removal of IS_CONSTANT_ARRAY and IS_CONSTANT_INDEX hack
+
+  These two #defines disappeared. Instead we have now IS_CONSTANT_AST which
+  covers also the functionality IS_CONSTANT_ARRAY bid and furthermore the
+  hack for marking zvals as constant index with IS_CONSTANT_INDEX is now
+  superfluous and so removed.
+  Please note that IS_CONSTANT_AST now has the same value than
+  IS_CONSTANT_ARRAY had.
 
 ========================
 2. Build system changes
 ========================
 
   a. Unix build system changes
+    - The bison version check is now a blacklist instead of a whitelist.
+    - The bison binary can be specified through the YACC environment/configure
+      variable. Previously `bison` was assumed to be in $PATH. 
 
   b. Windows build system changes
-    Static analysis with clang and Cppcheck is supported by passing "clang" or
-    "cppcheck" keyword to the --with-analyzer configure option.
-
-========================
-3. Module changes
-========================
+    - The configure option --enable-static-analyze isn't available anymore.
+      The new option was introduced --with-analyzer.
+    - It is possible to disable PGO for single extensions, to do that
+      define a global variable PHP_MYMODULE_PGO evaluating to false
+      inside config.w32

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

@@ -8,19 +8,18 @@ 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_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.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_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
+	zend_ini.c zend_qsort.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
+	zend_generators.c zend_virtual_cwd.c zend_ast.c
 
-libZend_la_CFLAGS = -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1
 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
 
@@ -53,3 +52,4 @@ depend:
 
 zend_execute.lo: $(srcdir)/zend_execute.c
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(INLINE_CFLAGS) -c $(srcdir)/zend_execute.c
+

Zend/README.ZEND_VM

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

Zend/RFCs/001.txt

@@ -51,7 +51,7 @@ $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
@@ -60,18 +60,18 @@ Consider the following code:
 4		{
 5			$this->member = $value;
 6		}
-7
+7	
 8		function getMember()
 9		{
 10			return $this->member;
 11		}
 12	}
-13
+13	
 14	function foo($obj)
 15	{
 16		$obj->setMember("foo");
 17	}
-18
+18	
 19	$object = new MyClass();
 20	$object->setMember("bar");
 21	foo($object);
@@ -133,3 +133,4 @@ 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

@@ -4,7 +4,7 @@ Status:          declined
 Maintainer:      Stig S. Bakken <ssb@php.net>
 Created:         2001-09-08
 Modified:        2001-09-08
-
+                  
 
 1. Background/Need
 ==================
@@ -87,7 +87,7 @@ file.  If no "namespace" operator occurs in the file, it will be in
 the global namespace:
 
  1 namespace HTML;
- 2
+ 2 
  3 class Form {
  4     function Form() {
  5         // constructor
@@ -98,7 +98,7 @@ the global namespace:
 Or with the "nested" name syntax:
 
  1 namespace HTML:Form;
- 2
+ 2 
  3 class Image {
  4     var $src;
  5     function Image($src) {

Zend/RFCs/003.txt

@@ -66,3 +66,7 @@ following could not reliably run.
 
 Old code that does not take advantage of this will run without
 modifications.
+
+
+
+

Zend/ZEND_CHANGES

@@ -1103,7 +1103,7 @@ Changes in the Zend Engine 1.0
       Use ob_start() to begin output buffering, ob_end_flush() to end
       buffering and send out the buffered contents, ob_end_clean() to
       end buffering without sending the buffered contents, and
-      ob_get_contents() to retrieve the current contents of the output
+      ob_get_contents() to retreive the current contents of the output
       buffer. Header information (header(), content type, cookies) are
       not buffered. By turning on output buffering, you can
       effectively send header information all throughout your file,

Zend/Zend.dsp

@@ -0,0 +1,622 @@
+# Microsoft Developer Studio Project File - Name="Zend" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=Zend - Win32 Release_inline
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "Zend.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Release_inline"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDebug" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D ZEND_DEBUG=0 /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug"
+# ADD RSC /l 0x40d /d "NDebug"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_Debug" /D "_LIB" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40d /d "_Debug"
+# ADD RSC /l 0x40d /d "_Debug"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Zend___Win32_Release_inline"
+# PROP BASE Intermediate_Dir "Zend___Win32_Release_inline"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release_inline"
+# PROP Intermediate_Dir "Release_inline"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D ZEND_DEBUG=0 /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug"
+# ADD RSC /l 0x40d /d "NDebug"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Zend - Win32 Release"
+# Name "Zend - Win32 Debug"
+# Name "Zend - Win32 Release_inline"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\zend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ast.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_builtin_functions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_closures.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_default_classes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_dynamic_array.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_float.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_generators.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_interfaces.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.c"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_object_handlers.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_opcode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_qsort.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_sprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stream.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_string.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_strtod.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ts_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_vm_opcodes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_virtual_cwd.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\FlexLexer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_builtin_functions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_config.w32.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_default_classes.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_dynamic_array.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_errors.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute_locks.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_globals.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_globals_macros.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_interfaces.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_istdiostream.h
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.h"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_modules.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_object_handlers.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects_API.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_qsort.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stream.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_string.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_strtod.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ts_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.h
+# End Source File
+# End Group
+# Begin Group "Parsers"
+
+# PROP Default_Filter "y"
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.y
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.y"
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Scanners"
+
+# PROP Default_Filter "l"
+# Begin Source File
+
+SOURCE=.\flex.skl
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.l
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.l"
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Text Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\ZEND_BUGS
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_CHANGES
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_TODO
+# End Source File
+# End Group
+# Begin Group "Resources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\zend.ico
+# End Source File
+# End Group
+# End Target
+# End Project

Zend/Zend.m4

@@ -7,10 +7,10 @@ dnl
 AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[
 AC_MSG_CHECKING(for $1)
 AC_TRY_COMPILE([
-#if HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H  
 #include <sys/types.h>
 #endif
-#if HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H  
 #include <inttypes.h>
 #elif HAVE_STDINT_H
 #include <stdint.h>
@@ -100,7 +100,7 @@ AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp)
 AC_ZEND_BROKEN_SPRINTF
 
-AC_CHECK_DECLS([isfinite, isnan, isinf], [], [], [[#include <math.h>]])
+AC_CHECK_FUNCS(finite isfinite isinf isnan)
 
 ZEND_FP_EXCEPT
 
@@ -137,7 +137,7 @@ int main()
 ], [
   AC_MSG_RESULT(no)
 ])
-
+	
 ])
 
 AC_DEFUN([LIBZEND_ENABLE_DEBUG],[
@@ -147,27 +147,38 @@ AC_ARG_ENABLE(debug,
   ZEND_DEBUG=$enableval
 ],[
   ZEND_DEBUG=no
-])
+])  
 
 ])
 
 AC_DEFUN([LIBZEND_OTHER_CHECKS],[
 
+AC_ARG_WITH(zend-vm,
+[  --with-zend-vm=TYPE     Set virtual machine dispatch method. Type is
+                          one of "CALL", "SWITCH" or "GOTO" [TYPE=CALL]],[
+  PHP_ZEND_VM=$withval
+],[
+  PHP_ZEND_VM=CALL
+])
+
 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,
-[  --disable-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([virtual machine dispatch method])
+AC_MSG_RESULT($PHP_ZEND_VM)
+
 AC_MSG_CHECKING(whether to enable thread-safety)
 AC_MSG_RESULT($ZEND_MAINTAINER_ZTS)
 
@@ -177,6 +188,19 @@ AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION)
 AC_MSG_CHECKING(whether to enable Zend debugging)
 AC_MSG_RESULT($ZEND_DEBUG)
 
+case $PHP_ZEND_VM in
+  SWITCH)
+    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method])
+    ;;
+  GOTO)
+    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_GOTO,[virtual machine dispatch method])
+    ;;
+  *)
+    PHP_ZEND_VM=CALL
+    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_CALL,[virtual machine dispatch method])
+    ;;
+esac
+
 if test "$ZEND_DEBUG" = "yes"; then
   AC_DEFINE(ZEND_DEBUG,1,[ ])
   echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
@@ -196,7 +220,7 @@ if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
   AC_DEFINE(ZTS,1,[ ])
   CFLAGS="$CFLAGS -DZTS"
   LIBZEND_CPLUSPLUS_CHECKS
-fi
+fi  
 
 changequote({,})
 if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
@@ -249,7 +273,7 @@ int main()
   }
 
   fp = fopen("conftest.zend", "w");
-  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);
+  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);  
   fclose(fp);
 
   exit(0);
@@ -258,7 +282,7 @@ int main()
   LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
   LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
   AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ])
-  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ])
+  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ]) 
 ], [], [
   dnl cross-compile needs something here
   LIBZEND_MM_ALIGN=8
@@ -370,11 +394,11 @@ AC_CHECK_FUNCS(mremap)
 
 
 AC_ARG_ENABLE(zend-signals,
-[  --disable-zend-signals  whether to enable zend signal handling],[
+[  --enable-zend-signals   Use zend signal handling],[
   ZEND_SIGNALS=$enableval
 ],[
-  ZEND_SIGNALS=yes
-])
+  ZEND_SIGNALS=no
+])  
 
 AC_CHECK_FUNC(sigaction, [
 	AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available])
@@ -395,74 +419,17 @@ AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
 
 ])
 
-AC_MSG_CHECKING(whether /dev/urandom exists)
-if test -r "/dev/urandom" && test -c "/dev/urandom"; then
+AC_MSG_CHECKING(whether /dev/urandom exists) 
+if test -r "/dev/urandom" && test -c "/dev/urandom"; then 
   AC_DEFINE([HAVE_DEV_URANDOM], 1, [Define if the target system has /dev/urandom device])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-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_TRY_COMPILE([
-#if defined(__GNUC__)
-# define ZEND_GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
-#else
-# define ZEND_GCC_VERSION 0
-#endif
-#if defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(i386)
-# define ZEND_VM_FP_GLOBAL_REG "%esi"
-# define ZEND_VM_IP_GLOBAL_REG "%edi"
-#elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__x86_64__)
-# define ZEND_VM_FP_GLOBAL_REG "%r14"
-# define ZEND_VM_IP_GLOBAL_REG "%r15"
-#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"
-#else
-# error "global register variables are not supported"
-#endif
-typedef int (*opcode_handler_t)(void);
-register void *FP  __asm__(ZEND_VM_FP_GLOBAL_REG);
-register const opcode_handler_t *IP __asm__(ZEND_VM_IP_GLOBAL_REG);
-int emu(const opcode_handler_t *ip, void *fp) {
-	const opcode_handler_t *orig_ip = IP;
-	void *orig_fp = FP;
-	IP = ip;
-	FP = fp;
-	while ((*ip)());
-	FP = orig_fp;
-	IP = orig_ip;
-}
-  ], [
-  ], [
-    ZEND_GCC_GLOBAL_REGS=yes
-  ], [
-    ZEND_GCC_GLOBAL_REGS=no
-  ])
-fi
-if test "$ZEND_GCC_GLOBAL_REGS" = "yes"; then
-  AC_DEFINE([HAVE_GCC_GLOBAL_REGS], 1, [Define if the target system has support for global register variables])
-else
-  HAVE_GCC_GLOBAL_REGS=no
-fi
-AC_MSG_RESULT($ZEND_GCC_GLOBAL_REGS)
+  AC_MSG_RESULT(yes) 
+else 
+  AC_MSG_RESULT(no) 
+  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 
+fi 

Zend/ZendTS.dsp

@@ -0,0 +1,748 @@
+# Microsoft Developer Studio Project File - Name="ZendTS" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=ZendTS - Win32 Release_TSDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "ZendTS.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "ZendTS.mak" CFG="ZendTS - Win32 Release_TSDbg"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "ZendTS - Win32 Release_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "ZendTS - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "ZendTS - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")
+!MESSAGE "ZendTS - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Release_TS"
+# PROP BASE Intermediate_Dir "Release_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release_TS"
+# PROP Intermediate_Dir "Release_TS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDebug_TS" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug_TS"
+# ADD RSC /l 0x40d /d "NDebug_TS"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Debug_TS"
+# PROP BASE Intermediate_Dir "Debug_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Debug_TS"
+# PROP Intermediate_Dir "Debug_TS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug_TS" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_Debug_TS" /D ZEND_DEBUG=1 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40d /d "_Debug_TS"
+# ADD RSC /l 0x40d /d "_Debug_TS"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "ZendTS___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "ZendTS___Win32_Release_TS_inline"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release_TS_inline"
+# PROP Intermediate_Dir "Release_TS_inline"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug_TS"
+# ADD RSC /l 0x40d /d "NDebug_TS"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "ZendTS___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "ZendTS___Win32_Release_TSDbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release_TSDbg"
+# PROP Intermediate_Dir "Release_TSDbg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug_TS"
+# ADD RSC /l 0x40d /d "NDebug_TS"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "ZendTS - Win32 Release_TS"
+# Name "ZendTS - Win32 Debug_TS"
+# Name "ZendTS - Win32 Release_TS_inline"
+# Name "ZendTS - Win32 Release_TSDbg"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\zend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ast.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_builtin_functions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_closures.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_default_classes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_dynamic_array.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_exceptions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.c
+# ADD CPP /I "..\TSRM"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_generators.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_interfaces.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_iterators.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.c"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_object_handlers.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_opcode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_qsort.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_sprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stream.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_string.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_strtod.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ts_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_vm_opcodes.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\FlexLexer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_builtin_functions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_config.w32.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_default_classes.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_dynamic_array.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_errors.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_exceptions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_globals.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_globals_macros.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_interfaces.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_istdiostream.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_iterators.h
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.h"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_modules.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_object_handlers.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects_API.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_qsort.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stream.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_string.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_strtod.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ts_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.h
+# End Source File
+# End Group
+# Begin Group "Parsers"
+
+# PROP Default_Filter "y"
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.y
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.y"
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Scanners"
+
+# PROP Default_Filter "l"
+# Begin Source File
+
+SOURCE=.\flex.skl
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.l
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.l"
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Text Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\LICENSE
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_BUGS
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_CHANGES
+# End Source File
+# End Group
+# Begin Group "Resources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\zend.ico
+# End Source File
+# End Group
+# End Target
+# End Project

Zend/acinclude.m4

@@ -7,9 +7,9 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
   # min: 2.4 (i.e. 204, major * 100 + minor for easier comparison)
   bison_version_min="204"
   # non-working versions, e.g. "3.0 3.2";
-  # remove "none" when introducing the first incompatible bison version an
+  # remove "none" when introducing the first incompatible bison version an 
   # separate any following additions by spaces
-  bison_version_exclude=""
+  bison_version_exclude="3.0"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed
@@ -139,7 +139,7 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
   else
     AC_MSG_RESULT(no)
   fi
-
+  
   AC_MSG_CHECKING([for usable fpsetprec])
   AC_TRY_LINK([
     #include <machine/ieeefp.h>

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");
 }
 

Zend/build.mk

@@ -5,7 +5,7 @@
 #
 # Written by Sascha Schumann
 #
-# $Id$
+# $Id$ 
 
 
 LT_TARGETS = ltmain.sh ltconfig
@@ -34,7 +34,7 @@ aclocal.m4: configure.in acinclude.m4
 	aclocal
 
 $(config_h_in): configure.in
-# explicitly remove target since autoheader does not seem to work
+# explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
 	autoheader

Zend/buildconf

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

Zend/configure.in

@@ -64,36 +64,36 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 /* To enable the is_nan, is_infinite and is_finite PHP functions */
 #ifdef NETWARE
-	#define HAVE_DECL_ISNAN 1
-	#define HAVE_DECL_ISINF 1
-	#define HAVE_DECL_ISFINITE 1
+	#define HAVE_ISNAN 1
+	#define HAVE_ISINF 1
+	#define HAVE_ISFINITE 1
 #endif
 
 #ifndef zend_isnan
-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
+#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) ((a) != (a))
+#define zend_isnan(a) 0
 #endif
 #endif
 
-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
+#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 || (a)==-INFINITY)?1:0)
+#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 HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
-#define zend_finite(a) isfinite(a)
-#elif defined(HAVE_FINITE)
+#ifdef HAVE_FINITE
 #define zend_finite(a) finite(a)
+#elif defined(HAVE_ISFINITE) || defined(isfinite)
+#define zend_finite(a) isfinite(a)
 #elif defined(fpclassify)
 #define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
 #else

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();
 }
 

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() in %s on line %d
+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() in %s on line %d
+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() in %s on line %d
+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,7 +21,7 @@ var_dump(each($a));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECTF--	
 Warning: each() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 

Zend/tests/008.phpt

@@ -22,7 +22,7 @@ var_dump(constant("test const"));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECTF--	
 Warning: define() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
@@ -41,9 +41,11 @@ bool(true)
 
 Notice: Constant test const already defined in %s on line %d
 bool(false)
-bool(true)
 
-Warning: Constants may only evaluate to scalar values or arrays in %s on line %d
+Warning: Constants may only evaluate to scalar values in %s on line %d
+bool(false)
+
+Warning: Constants may only evaluate to scalar values in %s on line %d
 bool(false)
 int(1)
 int(2)

Zend/tests/009.phpt

@@ -29,11 +29,11 @@ var_dump(get_class($f2));
 
 echo "Done\n";
 ?>
---EXPECTF--
-Deprecated: Non-static method foo::bar() should not be called statically in %s on line %d
+--EXPECTF--	
+Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
 string(3) "foo"
 
-Deprecated: Non-static method foo::bar() should not be called statically in %s on line %d
+Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
 string(3) "foo"
 string(3) "foo"
 string(3) "foo"

Zend/tests/010.phpt

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

Zend/tests/011.phpt

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

Zend/tests/012.phpt

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

Zend/tests/013.phpt

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

Zend/tests/014.phpt

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

Zend/tests/015.phpt

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

Zend/tests/016.phpt

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

Zend/tests/017.phpt

@@ -26,6 +26,7 @@ var_dump(count(get_defined_constants()));
 function test () {
 }
 
+var_dump(get_defined_functions(true));
 var_dump(gettype(get_defined_functions()));
 var_dump(count(get_defined_functions()));
 
@@ -43,7 +44,7 @@ var_dump(count(get_extension_funcs("zend")));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECTF--	
 Warning: get_resource_type() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
@@ -64,6 +65,9 @@ NULL
 string(5) "array"
 string(5) "array"
 int(%d)
+
+Warning: get_defined_functions() expects exactly 0 parameters, 1 given in %s on line %d
+NULL
 string(5) "array"
 int(%d)
 

Zend/tests/018.phpt

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

Zend/tests/019.phpt

@@ -16,7 +16,7 @@ echo "*** Testing unset(), empty() & isset() with scalar variables ***\n";
 
 // testing scalar variables
 $scalar_variables = array(
-  0,
+  0,    
   1,
   +1
   -1,
@@ -52,23 +52,23 @@ foreach ($scalar_variables as $scalar_var) {
   echo "-- Iteration $loop_counter --\n"; $loop_counter++;
 
   // checking with isset before unsetting, expected: bool(true)
-  var_dump( isset($scalar_var) );
-  var_dump( isset($scalar_var, $set_var) );
+  var_dump( isset($scalar_var) ); 
+  var_dump( isset($scalar_var, $set_var) );  
   // checking if the var is empty, expected: bool(false) on most
   // except "", 0, "0", NULL, FALSE
-  var_dump( empty($scalar_var) );
-
+  var_dump( empty($scalar_var) );  
+  
   // destroy the variable using unset
-  unset( $scalar_var );
-  // dump and see if its destroyed, expcted: NULL
-  var_dump( $scalar_var );
+  unset( $scalar_var );   
+  // dump and see if its destroyed, expcted: NULL 
+  var_dump( $scalar_var ); 
 
   // check using isset to see if unset, expected: bool(false)
-  var_dump( isset($scalar_var) );
-  var_dump( isset($scalar_var, $set_var) );
+  var_dump( isset($scalar_var) ); 
+  var_dump( isset($scalar_var, $set_var) ); 
 
   // empty to check if empty, expecting bool(true)
-  var_dump( empty($scalar_var) );
+  var_dump( empty($scalar_var) ); 
 
   // isset() with two args, one arg only unset, expected: bool(false)
   var_dump( isset($scalar_var, $set_var) );
@@ -90,36 +90,36 @@ $array_variables = array(
   array(1 => "One", 2 => "two"),
   array("Name" => "Jack", "Age" => "30"),
   array(1,2, "One" => "1", 2 => "two", ""=>"empty", "" => '')
-);
+);  
 
 $outer_loop_counter = 1;
 foreach ($array_variables as $array_var) {
   echo "--- Outerloop Iteration $outer_loop_counter ---\n";
-
+  
   // check the isset and unset on non existing key
   $var = 1;  // a var which is defined
   // try to unset the element which is non-existent
-  unset($array_var['non_existent']);
+  unset($array_var['non_existent']); 
   // check using isset() & empty() on a non_existent element in the array
   var_dump( isset($array_var['non_existent']) );
   var_dump( isset($array_var['non_existent'], $var) );
   var_dump( isset($array_var['non_existent'], $array_var['none']) );
   var_dump( empty($array_var['non_existent']) );
 
-  // testing empty and isset on arrays
+  // testing empty and isset on arrays 
   var_dump( empty($array_var) ); // expecting bool(false), except: array(), which is considered empty
   var_dump( isset($array_var) ); // expecting bool(true), except: array(), which is not set
 
-  // get the keys of the $array_var
+  // get the keys of the $array_var 
   $keys = array_keys($array_var);
   // unset each element in the array and see the working of unset, isset & empty
   $inner_loop_counter = 1;
   foreach ($keys as $key_value) {
-    echo "-- Innerloop Iteration $inner_loop_counter of Outerloop Iteration $outer_loop_counter --\n";
+    echo "-- Innerloop Iteration $inner_loop_counter of Outerloop Iteration $outer_loop_counter --\n"; 
     $inner_loop_counter++;
 
     // unset the element
-    unset($array_var[$key_value]);
+    unset($array_var[$key_value]); 
     // dump the array after element was unset
     var_dump($array_var);
     // check using isset for the element that was unset
@@ -127,10 +127,10 @@ foreach ($array_variables as $array_var) {
     // calling isset with more args
     var_dump( isset($array_var[$key_val], $array_var) ); //expected: bool(false)
 
-    // calling empty, expected bool(true)
+    // calling empty, expected bool(true) 
     var_dump( empty($array_var[$key_val]) );
 
-    // dump the array to see that that array did not get modified
+    // dump the array to see that that array did not get modified 
     // because of using isset, empty and unset on its element
     var_dump($array_var);
   }
@@ -144,7 +144,7 @@ foreach ($array_variables as $array_var) {
   // use isset to see that array is not set
   var_dump( isset($array_var) ); //expected: bool(false)
   var_dump( isset($array_var, $array_var[$key_val]) ); // expected: bool(false)
-
+  
   // empty() to see if the array is empty
   var_dump( empty($array_var) ); // expected: bool(true)
 }
@@ -183,12 +183,12 @@ foreach ($resources as $resource) {
   unset($temp_var);
   // now the isset() with both the args as unset
   var_dump( isset($resource, $temp_var) ); // expected: bool(false);
-
-  // dump the resource to see if there any effect on it
+  
+  // dump the resource to see if there any effect on it 
   var_dump($resource);
 }
 // unset and dump the array containing all the resources to see that
-// unset works correctly
+// unset works correctly 
 unset($resources);
 var_dump($resources);
 var_dump( isset($resources) );  //expected: bool(false)
@@ -200,12 +200,12 @@ class Point
   var $x;
   var $y;
   var $lable;
-
-  function __construct($x, $y) {
+  
+  function Point($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);
@@ -1271,7 +1271,7 @@ bool(false)
 bool(true)
 array(3) {
   [0]=>
-  string(11) "__construct"
+  string(5) "Point"
   [1]=>
   string(8) "setLable"
   [2]=>

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

@@ -11,7 +11,7 @@ var_dump($a++);
 var_dump(++$b);
 var_dump($a->$b);
 var_dump($a->$b);
-var_dump($a->$b->{$c[1]});
+var_dump($a->$b->$c[1]);
 
 ?>
 --EXPECTF--

Zend/tests/028.phpt

@@ -20,7 +20,4 @@ bool(true)
 
 Notice: Undefined offset: 2 in %s on line %d
 
-Fatal error: Uncaught Error: Function name must be a string in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
+Fatal error: Function name must be a string in %s on line %d

Zend/tests/030.phpt

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

Zend/tests/031.phpt

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

Zend/tests/032.phpt

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

Zend/tests/033.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Using undefined multidimensional array
 --FILE--
-<?php
+<?php 
 
 $arr[1][2][3][4][5];
 
@@ -17,6 +17,7 @@ $arr[][]->bar = 2;
 
 ?>
 --EXPECTF--
+
 Notice: Undefined variable: arr in %s on line %d
 
 Notice: Undefined variable: arr in %s on line %d

Zend/tests/034.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Testing multiples 'default:' in switch
 --FILE--
-<?php
+<?php 
 
 switch (1) {
 	case 2:
@@ -22,5 +22,5 @@ switch (1) {
 }
 
 ?>
---EXPECTF--
-Fatal error: Switch statements may only contain one default clause in %s on line 13
+--EXPECT--
+3

Zend/tests/037.phpt

@@ -16,7 +16,4 @@ var_dump($x::$x);
 --EXPECTF--
 int(1)
 
-Fatal error: Uncaught Error: Access to undeclared static property: Closure::$x in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
+Fatal error: Access to undeclared static property: Closure::$x in %s on line %d

Zend/tests/ArrayAccess_indirect_append.phpt

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

Zend/tests/abstract-static.phpt

@@ -9,4 +9,6 @@ abstract class TestClass
 ?>
 ===DONE===
 --EXPECTF--
+
+Strict Standards: Static function TestClass::getName() should not be abstract in %sabstract-static.php on line %d
 ===DONE===

Zend/tests/access_modifiers_001.phpt

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

Zend/tests/access_modifiers_002.phpt

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

Zend/tests/access_modifiers_003.phpt

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

Zend/tests/access_modifiers_004.phpt

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