alphabetical order for NEWS blocks

We can not modify result since it can be copy of _zero_ or _one_, etc. and
"copy" in bcmath is just bumping the refcount.

Conflicts:
	main/php_version.h

.gdbinit

@@ -48,88 +48,110 @@ define print_cvs
 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
@@ -149,60 +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"
+		printf "NULL"
 	end
 	if $type == 1
-        printf "NULL"
+		printf "long: %ld", $zvalue->value.lval
 	end
 	if $type == 2
-		printf "bool: false"
+		printf "double: %f", $zvalue->value.dval
 	end
 	if $type == 3
-		printf "bool: true"
+		printf "bool: "
+		if $zvalue->value.lval
+			printf "true"
+		else
+			printf "false"
+		end
 	end
-    if $type == 4
-		printf "long: %ld", $zvalue->value.lval
-    end
-    if $type == 5
-        printf "double: %f", $zvalue->value.dval
-    end
-    if $type == 6
-       printf "string: %s", $zvalue->value.str->val
-    end
-	if $type == 7 
-		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
 				set $ht = $zobj->properties
 				if $ht
+					printf "(%d): ", $ht->nNumOfElements
+					printf "{\n"
 					set $ind = $ind + 1
 					____print_ht $ht 1
 					set $ind = $ind - 1
@@ -211,6 +241,7 @@ define ____printzv_contents
 						printf "  "
 						set $i = $i - 1
 					end
+					printf "}"
 				else
 					echo "no properties found"
 				end
@@ -218,36 +249,20 @@ define ____printzv_contents
 		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 "const_ast"
-	end
-	if $type == 13
-		printf "_IS_BOOL"
-	end
-	if $type == 14
-		printf "IS_CALLABLE"
-	end
-	if $type == 15
-		printf "indirect: "
-		____printzv $zvalue->value.zv $arg1
-	end
-	if $type == 16
-		printf "string_offset"
-	end
-	if $type == 17
-		printf "pointer: %p", $zvalue->value.ptr
-	end
-	if $type > 17
+	if $type > 9
 		printf "unknown type %d", $type
 	end
 	printf "\n"
@@ -259,6 +274,10 @@ define ____printzv
 
 	printf "[%p] ", $zvalue
 
+	if $zvalue == $eg.uninitialized_zval_ptr
+		printf "*uninitialized* "
+	end
+
 	set $zcontents = (zval*) $zvalue
 	if $arg1
 		____printzv_contents $zcontents $arg1
@@ -301,60 +320,42 @@ 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
+	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
@@ -362,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
@@ -371,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
@@ -397,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 ","
@@ -417,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
@@ -484,7 +516,7 @@ define ____print_str
 	set $tmp = 0
 	set $str = $arg0
 	printf "\""
-	while $tmp < $arg1 && $tmp < 256
+	while $tmp < $arg1
 		if $str[$tmp] > 32 && $str[$tmp] < 127
 			printf "%c", $str[$tmp]
 		else
@@ -492,9 +524,6 @@ define ____print_str
 		end
 		set $tmp = $tmp + 1
 	end
-	if $tmp != $arg1
-		printf "..."
-	end
 	printf "\""
 end
 
@@ -589,9 +618,9 @@ define zmemcheck
 			if $p->magic == 0xfb8277dc
 				set $stat = "CACHED"
 			end
-			set $filename = strrchr($p->filename->val, '/')
+			set $filename = strrchr($p->filename, '/')
 			if !$filename
-				set $filename = $p->filename->val
+				set $filename = $p->filename
 			else
 				set $filename = $filename + 1
 			end
@@ -638,28 +667,3 @@ document zmemcheck
 	usage: zmemcheck [ptr].
 	if ptr is 0, all blocks will be listed.
 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
-			end
-			set $current = $current->next
-		end
-		if $found != 0
-			printf "found root %p\n", $found
-		else
-			printf "not found\n"
-		end
-	end
-end
-
-document lookup_root
-	lookup a refcounted in root
-	usage: lookup_root [ptr].
-end

.gitattributes

@@ -49,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
@@ -86,7 +85,7 @@ mkinstalldirs
 modules
 php
 php-*.tar.gz
-php7.spec
+php5.spec
 php_lcov.info
 php_test_results_*.txt
 php_version.h
@@ -122,12 +121,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
@@ -140,12 +133,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
@@ -158,18 +145,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 +166,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,10 +219,6 @@ 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
@@ -260,14 +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/apache/libphp7.module
-sapi/apache2handler/libphp7.module
-sapi/apache_hooks/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
@@ -288,3 +258,5 @@ win32/*.positions
 win32/ext
 win32/phpts.def
 win32/wsyslog.h
+win32/win32.dsp
+win32/php.dsw

.travis.yml

@@ -14,9 +14,6 @@ addons:
       - libaspell-dev
       - libpspell-dev
       - librecode-dev
-      - libsasl2-dev
-      - libxpm-dev
-      - libt1-dev
 
 notifications:
     email: 
@@ -57,4 +54,5 @@ before_script:
 
 # Run PHPs run-tests.php 
 script:
-    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 1 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
+    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
+    - ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg

CODING_STANDARDS

@@ -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()
@@ -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'

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,6 +63,11 @@ 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
@@ -52,15 +79,50 @@ 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,10 +136,21 @@ 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>      
 MAINTENANCE:         Maintained
@@ -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 ==
@@ -323,13 +408,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,6 +428,22 @@ PRIMARY MAINTAINER:  Derick Rethans <derick@derickrethans.nl>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           mhash
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Scott MacVicar <scottmac@php.net>
+MAINTENANCE:         Unknown
+STATUS:              Working
+-------------------------------------------------------------------------------
+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:           opcache
 PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>, Xinchen Hui <laruence@php.net>
 MAINTENANCE:         Maintained

INSTALL

@@ -223,12 +223,12 @@ Apache 1.3.x on Unix systems
     module on your system.  The make install from above may have already
     added this for you, but be sure to check.
 
-      LoadModule php7_module libexec/libphp7.so
+      LoadModule php5_module libexec/libphp5.so
 
 15. And in the AddModule section of httpd.conf, somewhere under the
     ClearModuleList, add this:
 
-      AddModule mod_php7.c
+      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
@@ -263,8 +263,8 @@ Apache 1.3.x on Unix systems
 
 10. cd ../apache_1.3.x
 
-11. ./configure --prefix=/www --activate-module=src/modules/php7/libphp7.a
-    (The above line is correct! Yes, we know libphp7.a does not exist at this
+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
@@ -309,24 +309,24 @@ stop and start:
    Different examples of compiling PHP for apache are as follows:
 ./configure --with-apxs --with-pgsql
 
-   This will create a libphp7.so shared library that is loaded into Apache
+   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 libphp7.so shared library for Apache, but it will
+   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  libmodphp7.a  library,  a  mod_php7.c  and  some
-   accompanying files and copy this into the src/modules/php7 directory in
+   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/php7/libphp7.a   and   the  Apache  build
-   system  will  create  libphp7.a  and  link it statically into the httpd
+   --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.
@@ -450,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
@@ -461,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,
@@ -1004,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:
 
@@ -1027,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.
 
@@ -1137,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.
@@ -1148,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
@@ -1740,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>
@@ -1810,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
@@ -1912,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:
@@ -1954,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
@@ -1984,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.
@@ -2103,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,6 +1,6 @@
 -------------------------------------------------------------------- 
                   The PHP License, version 3.01
-Copyright (c) 1999 - 2015 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2016 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 
 
 Redistribution and use in source and binary forms, with or without

Makefile.frag

@@ -20,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.global

@@ -53,7 +53,7 @@ install-headers:
 			paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
 		done; \
 		$(mkinstalldirs) $$paths && \
-		echo "Installing header files:          $(INSTALL_ROOT)$(phpincludedir)/" && \
+		echo "Installing header files:           $(INSTALL_ROOT)$(phpincludedir)/" && \
 		for i in `echo $(INSTALL_HEADERS)`; do \
 			if test "$(PHP_PECL_EXTENSION)"; then \
 				src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \
@@ -119,7 +119,7 @@ clean:
 
 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 sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
-	rm -f php7.spec main/build-defs.h scripts/phpize
+	rm -f 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 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
@@ -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

@@ -164,11 +164,11 @@ 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;
 

README.GIT-RULES

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

@@ -34,7 +34,7 @@ API adjustment to the old output control code:
 		php_output_handler_started(handler_name, handler_name_len TSRMLS_CC);
 
 	Flushing one output buffer:
-		// php_end_ob_buffer(1, 1 TSRMLS_CC);
+		// php_ob_end_buffer(1, 1 TSRMLS_CC);
 		php_output_flush(TSRMLS_C);
 
 	Flushing all output buffers:

README.PARAMETER_PARSING_API

@@ -50,7 +50,7 @@ Type specifiers
  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)
@@ -58,16 +58,15 @@ Type specifiers
       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,26 +80,28 @@ 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. */
+  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. */
+  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 
@@ -112,9 +113,9 @@ 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() TSRMLS_CC, "lsz",
                           &l, &s, &s_len, &param) == FAILURE) {
@@ -150,16 +151,16 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
 }
 
 /* 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() TSRMLS_CC,
                              "lll", &l1, &l2, &l3) == SUCCESS) {
@@ -177,7 +178,7 @@ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
 /* 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() TSRMLS_CC, "*", &varargs, &num_varargs) == FAILURE) {
@@ -196,9 +197,9 @@ 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() TSRMLS_CC, "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
     return;
@@ -208,11 +209,16 @@ 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() TSRMLS_CC, "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
     return;
@@ -221,3 +227,8 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a*l", &array, &varargs, &n
 for (i = 0; i < num_varargs; i++) {
     /* do something with varargs[i] */
 }
+
+if (varargs) {
+    efree(varargs);
+}
+

README.RELEASE_PROCESS

@@ -266,9 +266,7 @@ 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 seperate email.

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

README.TESTING

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

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.input_filter

@@ -181,3 +181,4 @@ PHP_FUNCTION(my_get_raw)
         RETVAL_FALSE;
     }
 }
+

README.md

@@ -4,7 +4,7 @@ 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://secure.travis-ci.org/php/php-src.png?branch=master)](http://travis-ci.org/php/php-src)
 
 Pull Requests
 =============

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;
@@ -181,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]);
 					}
@@ -256,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;
@@ -277,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;
@@ -289,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) {
@@ -298,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);
@@ -397,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++) {
@@ -438,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);
@@ -462,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++) {
@@ -504,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++) {
@@ -550,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;
@@ -616,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());
@@ -645,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
@@ -679,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
 }
@@ -711,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
 }
 
@@ -798,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,39 +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()
-#else
-#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
-#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
 }
@@ -195,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/config.w32

@@ -2,5 +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/tsrm_nw.c

@@ -1,8 +1,8 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 7                                                        |
+   | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2016 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-2015 The PHP Group                                |
+   | Copyright (c) 1997-2016 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-2015 The PHP Group                                |
+   | Copyright (c) 1997-2016 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        |
@@ -40,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
@@ -62,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;
 
@@ -95,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;
 	}
 
@@ -128,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;
@@ -146,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;
 
@@ -194,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,6 +204,7 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 	BYTE * psec_desc = NULL;
 	BOOL fAccess = FALSE;
 
+	BOOL bucket_key_alloc = FALSE;
 	realpath_cache_bucket * bucket = NULL;
 	char * real_path = NULL;
 
@@ -217,7 +214,7 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 	} else {
 		if(!IS_ABSOLUTE_PATH(pathname, strlen(pathname)+1)) {
 			real_path = (char *)malloc(MAX_PATH);
-			if(tsrm_realpath(pathname, real_path) == NULL) {
+			if(tsrm_realpath(pathname, real_path TSRMLS_CC) == NULL) {
 				goto Finished;
 			}
 			pathname = real_path;
@@ -245,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;
@@ -281,14 +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(MAX_PATH);
-				if(tsrm_realpath(pathname, real_path) != NULL) {
+				if(tsrm_realpath(pathname, real_path TSRMLS_CC) != NULL) {
 					pathname = real_path;
-					bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t);
+					bucket = realpath_cache_lookup(pathname, strlen(pathname), t TSRMLS_CC);
 				}
 			}
  		}
@@ -383,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;
@@ -413,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) {
@@ -437,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;
 }
 
@@ -451,14 +449,15 @@ 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;
+	int fno, type_len = strlen(type), read, mode;
 	STARTUPINFO startup;
 	PROCESS_INFORMATION process;
 	SECURITY_ATTRIBUTES security;
@@ -478,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;
 	}
@@ -552,7 +551,7 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	}
 
 	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);
@@ -572,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;
 	}
 
@@ -599,25 +599,19 @@ 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 {
@@ -627,11 +621,6 @@ TSRM_API int shmget(int key, int size, int flags)
 	}
 
 	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);
@@ -733,52 +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;
-
-	hFile = CreateFile(filename, GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, NULL,
-				 OPEN_ALWAYS, FILE_FLAG_BACKUP_SEMANTICS, NULL);
-
-	/* 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-2015 The PHP Group                                |
+   | Copyright (c) 1997-2016 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.INTERNALS

@@ -1,324 +1,225 @@
-PHP 7.0 INTERNALS UPGRADE NOTES
+$Id$
+
+PHP 5.6 INTERNALS UPGRADE NOTES
 
-0. Wiki Examples
 1. Internal API changes
-  e. New data types
-  f. zend_parse_parameters() specs
-  g. sprintf() formats
-  h. HashTable API
-  i. New portable macros for large file support
-  j. New portable macros for integers
-  k. get_class_entry object handler info
-  l. get_class_name object handler info
-  m. Other portable macros info
-  n. ZEND_ENGINE_2 removal
-  o. Updated final class modifier
-  p. TSRM changes
-  q. gc_collect_cycles() is now hookable
-  r. PDO uses size_t for lengths
-  s. Resource API changes
-  t. Optimized strings concatenation.
-  u. Streams changes
-  v. Sort algorithm changes
+  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. New data types
+  a. Addition of do_operation and compare object handlers
 
-     String
+  Two new object handlers have been added:
 
-        Besides the old way of accepting the strings with 's', the new 'S' ZPP spec
-	was introduced. It expects an argument of the type zend_string *. String lengths
-	in it are bound to the size_t datatype.
+    do_operation:
+    typedef int (*zend_object_do_operation_t)(
+        zend_uchar opcode, zval *result, zval *op1, zval *op2 TSRMLS_DC
+    );
 
-     Integer types
+    compare:
+    typedef int (*zend_object_compare_zvals_t)(
+        zval *result, zval *op1, zval *op2 TSRMLS_DC
+    );
 
-	Integers do no more depend on the firm 'long' type. Instead a platform
-	dependent integer type is used, it is called zend_long. That datatype is
-	defined dynamically to guarantee the consistent 64 bit support. The zval 
-	field representing user land integer it bound to zend_long.
+  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.
 
-	Signed integer is defined as zend_long, unsigned integer as zend_ulong
-	inside Zend. 
+  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.
 
-     Other datatypes
+  Further docs in the RFC: https://wiki.php.net/rfc/operator_overloading_gmp
 
-	zend_off_t  - portable off_t analogue
-	zend_stat_t - portable 'struct stat' analogue
+  b. return_value_ptr now always available, RETVAL_ZVAL_FAST macros
 
-	These datatypes are declared to be portable across platforms. Thus, direct
-	usage of the functions like fseek, stat, etc. as well as direct usage of
-	off_t and struct stat is strongly not recommended. Instead the portable
-	macros should be used.
+  The 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:
 
-	zend_fseek - portable fseek equivalent
-	zend_ftell - portable ftell equivalent
-	zend_lseek - portable lseek equivalent
-	zend_fstat - portable fstat equivalent
-	zend_stat  - portable stat equivalent
+      RETVAL_ZVAL_FAST(zv); /* analog to RETVAL_ZVAL(zv, 1, 0) */
+      RETURN_ZVAL_FAST(zv); /* analog to RETURN_ZVAL(zv, 1, 0) */
 
-  f. zend_parse_parameters() specs
-
-       The new spec 'S' introduced, which expects an argument of type zend_string *.
-       The 'l' spec expects a parameter of the type zend_long, not long anymore.
-       The 's' spec expects parameters of the type char * and size_t, no int anymore.
-
-  g. sprintf() formats
-
-       New printf modifier 'p' was implemented to platform independently output zend_long,
-       zend_ulong and php_size_t datatypes. That modifier can be used with 'd', 'u', 'x' and 'o'
-       printf format specs with spprintf, snprintf and the wrapping printf implementations.
-       %pu is sufficient for both zend_ulong and php_size_t. the code using %p spec to output
-       pointer address might need to be enclosed into #ifdef when it unlickily followed by 'd',
-       'u', 'x' or 'o'.
-
-       The only exceptions are the snprintf and zend_sprintf functions yet, because in some cases
-       they can use the implemenations available on the system, not the PHP one. With snprintf the
-       macros ZEND_LONG_FMT and ZEND_ULONG_FMT should be used.
-
-  h. HashTable API
-
-       Datatype for array indexes was changed to zend_ulong, for string keys to zend_string *.
-
-  i. New portable macros for large file support
-
-      Function(s)       Alias           Comment
-      stat, _stat64     zend_stat   for use with zend_stat_t
-      fstat, _fstat64   zend_fstat  for use with zend_stat_t
-      lseek, _lseeki64  zend_lseek  for use with zend_off_t
-      ftell, _ftelli64  zend_ftell  for use with zend_off_t
-      fseek, _fseeki64  zend_fseek  for use with zend_off_t
-
-  j. New portable macros for integers
-
-      Function(s)                                         Alias             Comment
-      snprintf with "%ld" or "%lld", _ltoa_s, _i64toa_s   ZEND_LTOA         for use with zend_long
-      atol, atoll, _atoi64                                ZEND_ATOL         for use with zend_long
-      strtol, strtoll, _strtoi64                          ZEND_STRTOL       for use with zend_long
-      strtoul, strtoull, _strtoui64                       ZEND_STRTOUL      for use with zend_long
-      abs, llabs, _abs64                                  ZEND_ABS          for use with zend_long
-      -                                                   ZEND_LONG_MAX     replaces LONG_MAX where appropriate
-      -                                                   ZEND_LONG_MIN     replaces LONG_MIN where appropriate
-      -                                                   ZEND_ULONG_MAX    replaces ULONG_MAX where appropriate
-      -                                                   SIZEOF_ZEND_LONG  reworked SIZEOF_ZEND_LONG representing the size of zend_long datatype
-      -                                                   ZEND_SIZE_MAX     Max value of size_t
-      -                                                   Z_L               casts an integral constant to zend_long
-      -                                                   Z_UL              casts an integral constant to zend_ulong
-
-      The macro ZEND_ENABLE_ZVAL_LONG64 reveals whether zval operates on 64 or 32 bit integer.
-
-  k. The get_class_entry object handler is no longer available. Instead
-     zend_object.ce is always used.
-
-  l. The get_class_name object handler is now only used for displaying class
-     names in debugging functions like var_dump(). It is no longer used in
-     get_class(), get_parent_class() or similar.
-
-     The handler is now obligatory, no longer accepts a `parent` argument and
-     must return a non-NULL zend_string*, which will be released by the caller.
-
-  m. Other portable macros info
-
-     ZEND_SECURE_ZERO     - zeroes chunk of memory
-     ZEND_VALID_SOCKET    - validates a php_socket_t variable 
-
-     ZEND_FASTCALL is defined to use __vectorcall convention on VS2013 and above
-     ZEND_NORETURN is defined as __declspec(noreturn) on VS
-
-  n. The ZEND_ENGINE_2 macro has been removed. A ZEND_ENGINE_3 macro has been added.
+  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.
   
-  o. Removed ZEND_ACC_FINAL_CLASS in favour of ZEND_ACC_FINAL, turning final class
-     modifier now a different class entry flag. Update your extensions.
+  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. 
 
-  p. TSRM changes
+  d. Arginfo changes
 
-     The TSRM layer undergone significant changes. It is not necessary anymore to 
-     pass the tsrm_ls pointer explicitly. The TSRMLS_* macros should not be used
-     in any new developments.
+  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.
 
-     The recommended way accessing globals in TS builds is by implementing it
-     to use a local thread unique pointer to the corresponding data pool. These
-     are the new macros that serve to achieve this goal:
+  Instead a variadic argument is created using ZEND_ARG_VARIADIC_INFO():
 
-     - ZEND_TSRMG - based on TSRMG and if static pointer for data pool access is
-       implemented, will use it
-     - ZEND_TSRMLS_CACHE_EXTERN - to be used in a header shared across multiple
-       C/C++ files
-     - ZEND_TSRMLS_CACHE_DEFINE - to be used in the main extension C/C++ file
-     - ZEND_TSRMLS_CACHE_UPDATE - to be integrated at the top of the globals
-       ctor or RINIT function
-     - ZEND_ENABLE_STATIC_TSRMLS_CACHE - to be used in the config.[m4|w32] for
-       enabling the globals access per thread unique pointer
-     - TSRMLS_CACHE - expands to the variable name which links to the thread
-       unique data pool
+      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 */
 
-     Note that usually it will work without implementing the globals access per
-     a thread unique pointer, however it might cause a slowdown. The reason is
-     that the access model to the extension/SAPI own globals as well as the
-     access to the core globals is determined in the compilation phase depending
-     on whether ZEND_ENABLE_STATIC_TSRMLS_CACHE macro is defined. 
+  ZEND_ARG_VARIADIC_INFO() should only be used for the last argument.
 
-     Due to the current compiler evolution state, the TSRMLS_CACHE pointer
-     (when implemented) has to be present and updated in every binary unit which
-     is not compiled statically into PHP. So any DLL, DSO, EXE, etc. has to take
-     care about defining and updating it's TSRMLS cache. An update should happen
-     before any globals was accessed.
+  The following changes were applied to the zend_arg_info struct:
 
-     Porting an extension or SAPI is usually as easy as removing all the TSRMLS_*
-     occurrences and integrating the macros mentioned above. However if tsrm_ls
-     is used explicitly, its usage can be considered obsolete in most cases.
-     Additionally, if an extension triggers its own threads, TSRMLS_CACHE shouldn't
-     be passed to that threads directly.
+       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;
 
-     When working with CTOR/DTOR for the extension globals, only the data passed
-     as parameters should be touched. For example, don't use code like
-     free(MYEXT_G(vars)); inside globals destructor, as it possibly can destroy
-     the data from a wrong thread. Instead use the pointer to the data delivered
-     into the destructor. So the previous example could look like
-     free(my_struct->vars); given the income was casted to (struct my_struct *).
+  The following changes were applied to the zend_internal_function_info struct:
 
-     A new macro was introduced to simplify the declaration to the extension
-     globals. A simplified declaration looks as follows
+       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;
 
-     #define MYEXT_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(myext, v)
+  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.
 
-     Another new macro ZEND_MODULE_GLOBALS_BULK(myext) delivers the corresponding
-     globals struct as a whole.
+  e. tsrm_virtual_cwd.h moved to zend_virtual_cwd.h
 
-     Two new storage specifiers was introduced.
+  Memory allocation is now managed by emalloc/efree instead of malloc/free.
 
-     ZEND_EXT_TLS - expand to an appropriate thread specific storage specifier in
-                    the thread safe build, expands to empty in a non thread safe
-		    build. 
-     ZEND_TLS     - expands to an appropriate thread specific storage specifier
-                    with static visibility in the thread safe build, expands to
-                    static specifier in a non thread safe build. 
-     
-     Variables declared with these storage specifiers can not be shared across 
-     threads. While ZEND_TLS enforces the local scope visibility, ZEND_EXT_TLS
-     pertains to the visiblity across several compilation units. In both cases,
-     there's no portable way to achieve the visibility across shared objects.
-     Thus, these specifiers are not compatible with ZEND_API and PHPAPI specifiers.
+  f. empty strings are interned
 
-  q. gc_collect_cycles() is now a function pointer, and can be replaced in the
-     same manner as zend_execute_ex() if needed (for example, to include the
-     time spent in the garbage collector in a profiler). The default
-     implementation has been renamed to zend_gc_collect_cycles(), and is
-     exported with ZEND_API.
+  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.
 
-  r. In accordance with general use of size_t as string length, all PDO API
-     functions now use size_t for string length.
+  g. Additional str_* APIs
 
-  s. Removed ZEND_REGISTER/FETCH_RESOURCE, use zend_fetch_resource and
-     and zend_register_resource instead, zend_fetch_resource accepts a zend_resource *
-     as first argument, if you still need to fetch a resource from zval, use 
-     zend_fetch_resource_ex. More details can be found in Zend/zend_list.c.
+  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:
 
-  t. Optimized strings concatenation.
-     ZEND_ADD_STRING/VAR/CHAR are replaced with ZEND_ROPE_INIT, ZEND_ROPE_ADD,
-     ZEND_ROPE_END.
-     Instead of reallocation and copying string on each ZEND_ADD_STRING/VAR/CAHR,
-     collect all the strings and then allocate and construct the resulting string once.
+      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
 
-  u. Streams changes
-     - It is possible to do blocking reads on Windows pipes. It can be done either
-       using context stream option PHP_STREAM_OPTION_PIPE_BLOCKING or 
-       adding STREAM_USE_BLOCKING_PIPE when opening the stream.
+  h. Addition of zend_hash_reindex
 
-  v. Sort algorithm changes
-     - Improved zend_qsort(using hybrid sorting algo) for better performance,
-       and also renamed zend_qsort to zend_sort.
-     - Added stable sorting algo zend_insert_sort.
+  A zend_hash_reindex() function with the following prototype has been added:
 
-  w. Tick functions internal API change
-     Tick functions have different declaration now. They expect a single
-	 parameter while before they were parameterless. When registering the
-	 tick function a value for this parameter must be passed. This value will be
-	 provided to the tick function on every execution.
+      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
-
-     - Besides Visual Studio, building with Clang or Intel Composer is now
-       possible. To enable an alternative toolset, add the option
-       --with-toolset=[vs,clang,icc] to the configure line. The default
-       toolset is vs. Still clang or icc need the correct environment
-       which involves many tools from the vs toolset.
-
-       The toolset option is supported by phpize as well.
-
-       AWARENESS The only recommended and supported toolset to produce production
-       ready binaries is Visual Studio. Still other compilers can be used now for
-       testing and analyzing purposes.
-
-     - configure.js now produces response files which are passed to the linker
-       and library manager. This solves the issues with the long command lines
-       which can exceed the OS limit.
-
-     - with clang toolset, an option --with-uncritical-warn-choke is available,
-       which suppresses the most frequent false positive warnings
-
-     - the --with-mp option will by default utilize all the available cores. It's
-       enabled by default for release builds and can be disabled with the special
-       "disable" keyword.
-
-========================
-3. Module changes
-========================
-
-  Session:
-
-    - PS_MOD_UPDATE_TIMESTAMP() session save handler definition is added. New
-      save handler should use PS_MOD_UPDATE_TIMESTAMP() definition. Save handler
-      must not refer/change PS() variables directly from save handler. Use
-      parameters.
-    - PS_MOD()/PS_MOD_SID() macro exist only for transition. Beware these
-      save handlers are less secure and slower than PS_MOD_UPDATE_TIMESTAMP().
-    - PS(invalid_session_id) was removed. It was never worked as it supposed.
-      To report invalid session ID, use PS_VALIDATE_SID() handler.
-    - PS_VALIDATE_SID() defines session ID validation handler. This handler
-      must validate if requested session ID exists in session data storage or not.
-      Do not access PS(id) directly, but use this handler and it's parameter.
-    - PS_UPDATE_TIMESTAMP() defines timestamp updating handler. This handler
-      must update session data timestamp for GC if it is needed. e.g. Memcache
-      updates timestamp on read, so it does not need to update timestamp. Return
-      SUCCESS simply for this case.
-    - PS_CREATE_SID() should check session ID collision. Return NULL for failure.
-    - More documentation can be found in ext/session/mod_files.c as comments.
-      mod_files.c may be used as reference implementation.
- 
-  Openssl:
-    - several ext/openssl functions require the inclusion of the applink shim
-      as documented in the OpenSSL FAQ https://www.openssl.org/support/faq.html#PROG2
-      to properly work on Windows. While this primarily affects the OpenSSL
-      functionality, the shim needs to be included into the executable file
-      which loads the extension DLL, not into the extension DLL itself. Alternatively
-      it can be compiled and linked with the main program as a separate object file.
-      More information and explanation in the linked OpenSSL FAQ.
-
-      Thus, this primarily affects any WAMP or other redistributions bundling the
-      official PHP release zipballs or building from sources. The applink shim is
-      already integrated with all the PHP executables from the official distribution
-      starting with 7.0.0beta1.
-
+    - 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/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@
 

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

@@ -153,6 +153,14 @@ AC_ARG_ENABLE(debug,
 
 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
@@ -168,6 +176,9 @@ AC_ARG_ENABLE(inline-optimization,
   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"
@@ -401,68 +425,11 @@ if test -r "/dev/urandom" && test -c "/dev/urandom"; then
   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) 
+  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 
-
-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)

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

@@ -9,7 +9,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
   # non-working versions, e.g. "3.0 3.2";
   # remove "none" when introducing the first incompatible bison version an 
   # separate any following additions by spaces
-  bison_version_exclude=""
+  bison_version_exclude="3.0"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed

Zend/configure.in

@@ -90,10 +90,10 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #define zend_isinf(a) 0
 #endif
 
-#if defined(HAVE_ISFINITE) || defined(isfinite)
-#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/tests/001.phpt

@@ -44,7 +44,7 @@ int(0)
 int(2)
 int(0)
 
-Warning: Missing argument 2 for test3()%s
+Warning: Missing argument 2 for test3() in %s on line %d
 int(1)
 int(2)
 int(1)

Zend/tests/002.phpt

@@ -85,7 +85,7 @@ bool(false)
 Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
 bool(false)
 
-Warning: Missing argument 2 for test3()%s
+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

Zend/tests/003.phpt

@@ -60,7 +60,7 @@ array(2) {
 array(0) {
 }
 
-Warning: Missing argument 2 for test3()%s
+Warning: Missing argument 2 for test3() in %s on line %d
 array(1) {
   [0]=>
   int(1)

Zend/tests/008.phpt

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

@@ -30,10 +30,10 @@ 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
+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/019.phpt

@@ -201,7 +201,7 @@ class Point
   var $y;
   var $lable;
   
-  function __construct($x, $y) {
+  function Point($x, $y) {
     $this->x = $x;
     $this->y = $y;
   }
@@ -1271,7 +1271,7 @@ bool(false)
 bool(true)
 array(3) {
   [0]=>
-  string(11) "__construct"
+  string(5) "Point"
   [1]=>
   string(8) "setLable"
   [2]=>

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/034.phpt

@@ -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/abstract-static.phpt

@@ -10,4 +10,5 @@ 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_003.phpt

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

Zend/tests/access_modifiers_010.phpt

@@ -28,9 +28,4 @@ new c;
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Call to private method d::test2() from context 'a' in %s:%d
-Stack trace:
-#0 %s(%d): a->test()
-#1 %s(%d): c->__construct()
-#2 {main}
-  thrown in %s on line %d
+Fatal error: Call to private method d::test2() from context 'a' in %s on line %d

Zend/tests/access_modifiers_013.phpt

@@ -1,12 +0,0 @@
---TEST--
-Prevent abstract and final in the same class declaration
---FILE--
-<?php
-
-final abstract class C {
-	private function priv() { }
-}
-
-?>
---EXPECTF--
-Fatal error: Cannot use the final modifier on an abstract class in %s on line %d

Zend/tests/add_002.phpt

@@ -8,25 +8,12 @@ $a = array(1,2,3);
 $o = new stdclass;
 $o->prop = "value";
 
-try {
-	var_dump($a + $o);
-} catch (Error $e) {
-	echo "\nException: " . $e->getMessage() . "\n";
-}
-
 $c = $a + $o;
 var_dump($c);
 
 echo "Done\n";
 ?>
 --EXPECTF--	
-Notice: Object of class stdClass could not be converted to int in %sadd_002.php on line %d
-
-Exception: Unsupported operand types
-
 Notice: Object of class stdClass could not be converted to int in %s on line %d
 
-Fatal error: Uncaught Error: Unsupported operand types in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
+Fatal error: Unsupported operand types in %s on line %d

Zend/tests/add_003.phpt

@@ -8,25 +8,12 @@ $a = array(1,2,3);
 $o = new stdclass;
 $o->prop = "value";
 
-try {
-	var_dump($o + $a);
-} catch (Error $e) {
-	echo "\nException: " . $e->getMessage() . "\n";
-}
-
 $c = $o + $a;
 var_dump($c);
 
 echo "Done\n";
 ?>
 --EXPECTF--	
-Notice: Object of class stdClass could not be converted to int in %sadd_003.php on line %d
-
-Exception: Unsupported operand types
-
 Notice: Object of class stdClass could not be converted to int in %s on line %d
 
-Fatal error: Uncaught Error: Unsupported operand types in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
+Fatal error: Unsupported operand types in %s on line %d

Zend/tests/add_004.phpt

@@ -5,21 +5,10 @@ adding numbers to arrays
 
 $a = array(1,2,3);
 
-try {
-	var_dump($a + 5);
-} catch (Error $e) {
-	echo "\nException: " . $e->getMessage() . "\n";
-}
-
 $c = $a + 5;
 var_dump($c);
 
 echo "Done\n";
 ?>
 --EXPECTF--	
-Exception: Unsupported operand types
-
-Fatal error: Uncaught Error: Unsupported operand types in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
+Fatal error: Unsupported operand types in %s on line %d

Zend/tests/add_007.phpt

@@ -7,21 +7,10 @@ $a = array(1,2,3);
 
 $s1 = "some string";
 
-try {
-	var_dump($a + $s1);
-} catch (Error $e) {
-	echo "\nException: " . $e->getMessage() . "\n";
-}
-
 $c = $a + $s1;
 var_dump($c);
 
 echo "Done\n";
 ?>
 --EXPECTF--	
-Exception: Unsupported operand types
-
-Fatal error: Uncaught Error: Unsupported operand types in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
+Fatal error: Unsupported operand types in %s on line %d

Zend/tests/anon/001.phpt

@@ -1,10 +0,0 @@
---TEST--
-declare bare anonymous class
---FILE--
-<?php
-var_dump(new class{});
---EXPECTF--
-object(class@%s)#%d (0) {
-}
-
-

Zend/tests/anon/002.phpt

@@ -1,21 +0,0 @@
---TEST--
-declare anonymous class extending another
---FILE--
-<?php
-class A{}
-
-interface B{
-    public function method();
-}
-
-$a = new class extends A implements B {
-    public function method(){
-        return true;
-    }
-};
-
-var_dump($a instanceof A, $a instanceof B);
---EXPECTF--
-bool(true)
-bool(true)
-

Zend/tests/anon/003.phpt

@@ -1,54 +0,0 @@
---TEST--
-reusing anonymous classes
---FILE--
-<?php
-while (@$i++<10) {
-    var_dump(new class($i) {
-
-        public function __construct($i) {
-            $this->i = $i;
-        }
-    });
-}
---EXPECTF--
-object(class@%s)#1 (1) {
-  ["i"]=>
-  int(1)
-}
-object(class@%s)#1 (1) {
-  ["i"]=>
-  int(2)
-}
-object(class@%s)#1 (1) {
-  ["i"]=>
-  int(3)
-}
-object(class@%s)#1 (1) {
-  ["i"]=>
-  int(4)
-}
-object(class@%s)#1 (1) {
-  ["i"]=>
-  int(5)
-}
-object(class@%s)#1 (1) {
-  ["i"]=>
-  int(6)
-}
-object(class@%s)#1 (1) {
-  ["i"]=>
-  int(7)
-}
-object(class@%s)#1 (1) {
-  ["i"]=>
-  int(8)
-}
-object(class@%s)#1 (1) {
-  ["i"]=>
-  int(9)
-}
-object(class@%s)#1 (1) {
-  ["i"]=>
-  int(10)
-}
-

Zend/tests/anon/004.phpt

@@ -1,30 +0,0 @@
---TEST--
-testing anonymous inheritance
---FILE--
-<?php
-class Outer {
-    protected $data;
-
-    public function __construct($data) {
-        $this->data = $data;
-    }
-
-    public function getArrayAccess() {
-        /* create a proxy object implementing array access */
-        return new class($this->data) extends Outer implements ArrayAccess {
-            public function offsetGet($offset)          { return $this->data[$offset]; }
-            public function offsetSet($offset, $data)   { return ($this->data[$offset] = $data); }
-            public function offsetUnset($offset)        { unset($this->data[$offset]); }
-            public function offsetExists($offset)       { return isset($this->data[$offset]); }
-        };
-    }
-}
-
-$outer = new Outer(array(
-    rand(1, 100)
-));
-
-/* not null because inheritance */
-var_dump($outer->getArrayAccess()[0]);
---EXPECTF--
-int(%d)

Zend/tests/anon/005.phpt

@@ -1,36 +0,0 @@
---TEST--
-testing reusing anons that implement an interface
---FILE--
-<?php
-class Outer {
-    protected $data;
-
-    public function __construct(&$data) {
-        /* array access will be implemented by the time we get to here */
-        $this->data = &$data;
-    }
-
-    public function getArrayAccess() {
-        /* create a child object implementing array access */
-        /* this grants you access to protected methods and members */
-        return new class($this->data) implements ArrayAccess {
-            public function offsetGet($offset) { return $this->data[$offset]; }
-            public function offsetSet($offset, $data) { return ($this->data[$offset] = $data); }
-            public function offsetUnset($offset) { unset($this->data[$offset]); }
-            public function offsetExists($offset) { return isset($this->data[$offset]); }
-        };
-    }
-}
-
-$data = array(
-    rand(1, 100),
-    rand(2, 200)
-);
-
-$outer = new Outer($data);
-$proxy = $outer->getArrayAccess();
-
-/* null because no inheritance, so no access to protected member */
-var_dump(@$outer->getArrayAccess()[0]);
---EXPECT--
-NULL

Zend/tests/anon/006.phpt

@@ -1,15 +0,0 @@
---TEST--
-testing anon classes inside namespaces
---FILE--
-<?php
-namespace lone {
-   $hello = new class{} ;
-}
-
-namespace {
-    var_dump ($hello);
-}
---EXPECTF--
-object(class@%s)#1 (0) {
-}
-

Zend/tests/anon/007.phpt

@@ -1,23 +0,0 @@
---TEST--
-testing anon classes in functions outside of classes in namespaces
---FILE--
-<?php
-namespace lone {
-    function my_factory() {
-        return new class{};
-    }
-
-    class Outer {
-
-        public function __construct() {
-             var_dump(
-                my_factory());
-        }
-    }
-
-    new Outer();
-}
---EXPECTF--
-object(class@%s)#2 (0) {
-}
-

Zend/tests/anon/008.phpt

@@ -1,23 +0,0 @@
---TEST--
-testing static access for methods and properties in anon classes
---FILE--
-<?php
-$anonClass = new class("cats", "dogs") {
-    public static $foo;
-    private static $bar;
-
-    public function __construct($foo, $bar) {
-        static::$foo = $foo;
-        static::$bar = $bar;
-    }
-
-    public static function getBar() {
-        return static::$bar;
-    }
-};
-
-var_dump($anonClass::$foo);
-var_dump($anonClass::getBar());
---EXPECT--
-string(4) "cats"
-string(4) "dogs"

Zend/tests/anon/009.phpt

@@ -1,18 +0,0 @@
---TEST--
-testing traits in anon classes
---FILE--
-<?php
-
-trait Foo {
-    public function someMethod() {
-      return "bar";
-    }
-}
-
-$anonClass = new class {
-    use Foo;
-};
-
-var_dump($anonClass->someMethod());
---EXPECT--
-string(3) "bar"

Zend/tests/anon/010.phpt

@@ -1,23 +0,0 @@
---TEST--
-Trait binding after anon class
---FILE--
-<?php
-
-trait T {
-    public function m1() { return 42; }
-}
-
-class C {
-    public function m2() {
-        return new class {};
-    }
-
-    use T;
-}
-
-$c = new C;
-var_dump($c->m1());
-
-?>
---EXPECT--
-int(42)

Zend/tests/anon/011.phpt

@@ -1,14 +0,0 @@
---TEST--
-Ensure proper inheritance with get_class(anon class instance) used via class_alias (see also bug #70106)
---FILE--
-<?php
-
-class_alias(get_class(new class { protected $foo = 1; }), "AnonBase");
-var_dump((new class extends AnonBase {
-	function getFoo() {
-		return $this->foo;
-	}
-})->getFoo());
-?>
---EXPECT--
-int(1)

Zend/tests/anon/012.phpt

@@ -1,11 +0,0 @@
---TEST--
-Ensure correct unmangling of private property names for anonymous class instances
---FILE--
-<?php
-var_dump(new class { private $foo; });
-?>
---EXPECT--
-object(class@anonymous)#1 (1) {
-  ["foo":"class@anonymous":private]=>
-  NULL
-}

Zend/tests/arg_unpack/string_keys.phpt

@@ -7,18 +7,14 @@ set_error_handler(function($errno, $errstr) {
     var_dump($errstr);
 });
 
-try {
-	var_dump(...[1, 2, "foo" => 3, 4]);
-} catch (Error $ex) {
-	var_dump($ex->getMessage());
-}
-try {
-	var_dump(...new ArrayIterator([1, 2, "foo" => 3, 4]));
-} catch (Error $ex) {
-	var_dump($ex->getMessage());
-}
+var_dump(...[1, 2, "foo" => 3, 4]);
+var_dump(...new ArrayIterator([1, 2, "foo" => 3, 4]));
 
 ?>
 --EXPECTF--
 string(36) "Cannot unpack array with string keys"
+int(1)
+int(2)
 string(42) "Cannot unpack Traversable with string keys"
+int(1)
+int(2)

Zend/tests/argument_restriction_001.phpt

@@ -13,4 +13,4 @@ class Sub extends Base {
 }
 ?>
 --EXPECTF--
-Warning: Declaration of & Sub::test() should be compatible with & Base::test($foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_001.php on line %d 
+Strict Standards: Declaration of Sub::test() should be compatible with & Base::test($foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_001.php on line %d 

Zend/tests/argument_restriction_002.phpt

@@ -13,4 +13,4 @@ class Sub extends Base {
 }
 ?>
 --EXPECTF--
-Warning: Declaration of Sub::test($foo, array &$bar) should be compatible with Base::test($foo, array &$bar, $option = NULL, $extra = 3.1415926535898) in %sargument_restriction_002.php on line %d
+Strict Standards: Declaration of Sub::test() should be compatible with Base::test($foo, array &$bar, $option = NULL, $extra = 3.1415926535898) in %sargument_restriction_002.php on line %d

Zend/tests/argument_restriction_003.phpt

@@ -16,4 +16,4 @@ class Sub extends Base {
 }
 ?>
 --EXPECTF--
-Warning: Declaration of Sub::test() should be compatible with Base::test(Foo $foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_003.php on line %d
+Strict Standards: Declaration of Sub::test() should be compatible with Base::test(Foo $foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_003.php on line %d

Zend/tests/argument_restriction_006.phpt

@@ -13,4 +13,4 @@ class Sub extends Base {
 }
 ?>
 --EXPECTF--
-Warning: Declaration of Sub::test($foo, $extra) should be compatible with Base::test($foo, $extra = Array) in %sargument_restriction_006.php on line %d
+Strict Standards: Declaration of Sub::test() should be compatible with Base::test($foo, $extra = Array) in %sargument_restriction_006.php on line %d

Zend/tests/array_hash_zero.phpt

@@ -1,20 +0,0 @@
---TEST--
-Accept hashes being equal to zero
---FILE--
-<?php
-
-$hashes = [
-	"\x8e\x1a\x63\x0f\x61" => 32,
-	"\xf7\x17\x7f\x7f\x7f\x7f\x7f\x7f\x7f\x6b\x03\x6a\x13\x63\x17\x6b\x1d\x67" => 64,
-];
-
-foreach ($hashes as $hash => $bits) {
-	var_dump($hashes[$hash], $bits);
-}
-
-?>
---EXPECT--
-int(32)
-int(32)
-int(64)
-int(64)

Zend/tests/array_offset.phpt

@@ -1,21 +0,0 @@
---TEST--
-Ensure "undefined offset" notice formats message corectly when undefined key is negative
---FILE--
-<?php
-
-[][-1];
-[][-1.1];
-(new ArrayObject)[-1];
-(new ArrayObject)[-1.1];
-
-echo "Done\n";
-?>
---EXPECTF--	
-Notice: Undefined offset: -1 in %s on line 3
-
-Notice: Undefined offset: -1 in %s on line 4
-
-Notice: Undefined offset: -1 in %s on line 5
-
-Notice: Undefined offset: -1 in %s on line 6
-Done

Zend/tests/array_type_hint_001.phpt

@@ -12,8 +12,4 @@ foo(123);
 --EXPECTF--
 3
 
-Fatal error: Uncaught TypeError: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php:2
-Stack trace:
-#0 %s(%d): foo(123)
-#1 {main}
-  thrown in %sarray_type_hint_001.php on line 2
+Catchable fatal error: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2

Zend/tests/array_with_refs_identical.phpt

@@ -1,13 +0,0 @@
---TEST--
-Identical comparison of array with references
---FILE--
-<?php
-
-$foo = 42;
-$array1 = [&$foo];
-$array2 = [$foo];
-var_dump($array1 === $array2);
-
-?>
---EXPECT--
-bool(true)

Zend/tests/assert/bug70208.phpt

@@ -1,23 +0,0 @@
---TEST--
-Bug #70208 (scope information must be preserved with assert())
---FILE--
-<?php
-
-function non_class_scope() {
-	return true;
-}
-
-class test {
-	protected $prop = 1;
-
-	public function __construct() {
-		assert('non_class_scope();');
-		var_dump($this->prop);
-	}
-}
-
-new test;
-
-?>
---EXPECT--
-int(1)

Zend/tests/assert/bug70528.phpt

@@ -1,23 +0,0 @@
---TEST--
-Bug #70528 (assert() with instanceof adds apostrophes around class name)
---INI--
-zend.assertions=1
-assert.exception=0
-assert.warning=1
---FILE--
-<?php
-
-namespace Foo;
-class Bar {}
-
-$bar = "Bar";
-assert(new \stdClass instanceof $bar);
-assert(new \stdClass instanceof Bar);
-assert(new \stdClass instanceof \Foo\Bar);
-?>
---EXPECTF--
-Warning: assert(): assert(new \stdClass() instanceof $bar) failed in %sbug70528.php on line %d
-
-Warning: assert(): assert(new \stdClass() instanceof Bar) failed in %sbug70528.php on line %d
-
-Warning: assert(): assert(new \stdClass() instanceof \Foo\Bar) failed in %sbug70528.php on line %d

Zend/tests/assert/expect_001.phpt

@@ -1,12 +0,0 @@
---TEST--
-test passing assertion
---INI--
-zend.assertions=1
-assert.exception=1
---FILE--
-<?php
-assert(true);
-var_dump(true);
-?>
---EXPECTF--
-bool(true)

Zend/tests/assert/expect_002.phpt

@@ -1,16 +0,0 @@
---TEST--
-test failing assertion
---INI--
-zend.assertions=1
-assert.exception=1
---FILE--
-<?php
-assert(false);
-var_dump(true);
-?>
---EXPECTF--
-Fatal error: Uncaught AssertionError: assert(false) in %sexpect_002.php:%d
-Stack trace:
-#0 %sexpect_002.php(%d): assert(false, 'assert(false)')
-#1 {main}
-  thrown in %sexpect_002.php on line %d

Zend/tests/assert/expect_003.phpt

@@ -1,15 +0,0 @@
---TEST--
-test catching failed assertion
---INI--
-zend.assertions=1
-assert.exception=1
---FILE--
-<?php
-try {
-    assert(false);
-} catch (AssertionError $ex) {
-    var_dump($ex->getMessage());
-}
-?>
---EXPECT--
-string(13) "assert(false)"

Zend/tests/assert/expect_004.phpt

@@ -1,15 +0,0 @@
---TEST--
-test providing reason (fail)
---INI--
-zend.assertions=1
-assert.exception=1
---FILE--
-<?php
-try {
-    assert(false, "I require this to succeed");
-} catch (AssertionError $ex) {
-    var_dump($ex->getMessage());
-}
-?>
---EXPECT--
-string(25) "I require this to succeed"

Zend/tests/assert/expect_005.phpt

@@ -1,17 +0,0 @@
---TEST--
-test providing reason (pass)
---INI--
-zend.assertions=1
-assert.exception=1
---FILE--
-<?php
-try {
-    /* by passing we test there are no leaks upon success */
-    assert(true, "I require this to succeed");
-} catch (AssertionError $ex) {
-    var_dump($ex->getMessage());
-}
-var_dump(true);
-?>
---EXPECT--
-bool(true)

Zend/tests/assert/expect_006.phpt

@@ -1,14 +0,0 @@
---TEST--
-test looping assert (pass)
---INI--
-zend.assertions=1
-assert.exception=1
---FILE--
-<?php
-for($i=0; $i<100000; $i++) {
-    assert ($i < 100000, "The universe should make sense");
-}
-var_dump(true);
-?>
---EXPECT--
-bool(true)

Zend/tests/assert/expect_007.phpt

@@ -1,22 +0,0 @@
---TEST--
-test compiled reason
---INI--
-zend.assertions=1
-assert.exception=1
---FILE--
-<?php
-$next = 1;
-$data = array(
-    "key" => "X-HTTP ",
-    "value" => "testing"
-);
-
-class HeaderMalfunctionError extends AssertionError {}
-
-assert (preg_match("~^([a-zA-Z0-9-]+)$~", $data["key"]), new HeaderMalfunctionError("malformed key found at {$next} \"{$data["key"]}\""));
-?>
---EXPECTF--
-Fatal error: Uncaught HeaderMalfunctionError: malformed key found at 1 "X-HTTP " in %sexpect_007.php:10
-Stack trace:
-#0 {main}
-  thrown in %sexpect_007.php on line 10

Zend/tests/assert/expect_008.phpt

@@ -1,34 +0,0 @@
---TEST--
-test disabled expectations have no ill side effects
---INI--
-zend.assertions=0
-assert.exception=1
---FILE--
-<?php
-class One {
-    public function __construct() {
-        assert($this || 0);
-    }
-}
-class Two extends One {}
-
-class OdEar extends AssertionError {}
-
-function blah(){ return 1; }
-
-$variable = 1;
-assert(true, "constant message");
-assert(($variable && $variable) || php_sapi_name(), new OdEar("constant message"));
-assert(false);
-assert(blah(), blah());
-
-new Two();
-new Two();
-new Two();
-
-assert (blah() || blah() || blah(), blah() || blah() || blah() || blah());
-
-var_dump(true);
-?>
---EXPECT--
-bool(true)

Zend/tests/assert/expect_009.phpt

@@ -1,25 +0,0 @@
---TEST--
-test stack trace is correct from failed exception in extended class
---INI--
-zend.assertions=1
-assert.exception=1
---FILE--
-<?php
-class One {
-    public function __construct() {
-    }
-}
-class Two extends One {
-    public function __construct() {
-        assert(false);
-    }
-}
-new Two();
-?>
---EXPECTF--
-Fatal error: Uncaught AssertionError: assert(false) in %sexpect_009.php:%d
-Stack trace:
-#0 %sexpect_009.php(%d): assert(false, 'assert(false)')
-#1 %sexpect_009.php(%d): Two->__construct()
-#2 {main}
-  thrown in %sexpect_009.php on line %d

Zend/tests/assert/expect_010.phpt

@@ -1,23 +0,0 @@
---TEST--
-test stack trace is correct from failed exception in extended class (parent implementing constructor)
---INI--
-zend.assertions=1
-assert.exception=1
---FILE--
-<?php
-class One {
-    public function __construct() {
-        assert(false);
-    }
-}
-class Two extends One {}
-
-new Two();
-?>
---EXPECTF--
-Fatal error: Uncaught AssertionError: assert(false) in %sexpect_010.php:%d
-Stack trace:
-#0 %sexpect_010.php(%d): assert(false, 'assert(false)')
-#1 %sexpect_010.php(%d): One->__construct()
-#2 {main}
-  thrown in %sexpect_010.php on line %d

Zend/tests/assert/expect_011.phpt

@@ -1,30 +0,0 @@
---TEST--
-test overloaded __toString on custom exception
---INI--
-zend.assertions=1
-assert.exception=1
---FILE--
-<?php
-class MyExpectations extends AssertionError {
-    public function __toString() {
-        return sprintf(
-            "[Message]: %s", __CLASS__);
-    }
-}
-
-class One {
-    public function __construct() {
-        assert(false, (string) new MyExpectations());
-    }
-}
-class Two extends One {}
-
-new Two();
-?>
---EXPECTF--
-Fatal error: Uncaught AssertionError: [Message]: MyExpectations in %sexpect_011.php:%d
-Stack trace:
-#0 %sexpect_011.php(%d): assert(false, '[Message]: MyEx...')
-#1 %sexpect_011.php(%d): One->__construct()
-#2 {main}
-  thrown in %sexpect_011.php on line %d

Zend/tests/assert/expect_012.phpt

@@ -1,21 +0,0 @@
---TEST--
-test enable/disable assertions at runtime
---INI--
-zend.assertions=1
-assert.exception=1
---FILE--
-<?php
-var_dump((integer)ini_get("zend.assertions"));
-ini_set("zend.assertions", 0);
-var_dump((integer)ini_get("zend.assertions"));
-assert(false);
-ini_set("zend.assertions", 1);
-var_dump((integer)ini_get("zend.assertions"));
-assert(true);
-var_dump(true);
-?>
---EXPECT--
-int(1)
-int(0)
-int(1)
-bool(true)

Zend/tests/assert/expect_013.phpt

@@ -1,11 +0,0 @@
---TEST--
-test failing assertion when disabled (with return value)
---INI--
-zend.assertions=0
-assert.exception=1
---FILE--
-<?php
-var_dump(assert(false));
-?>
---EXPECT--
-bool(true)

Zend/tests/assert/expect_014.phpt

@@ -1,12 +0,0 @@
---TEST--
-test failing assertion when disabled
---INI--
-zend.assertions=0
-assert.exception=1
---FILE--
-<?php
-assert(false);
-var_dump(true);
-?>
---EXPECT--
-bool(true)

Zend/tests/assert/expect_015.phpt

@@ -1,295 +0,0 @@
---TEST--
-AST pretty-peinter
---INI--
-zend.assertions=1
-assert.exception=0
---FILE--
-<?php
-assert(0 && ($a = function () {
-	global $a, $$b;
-	static $c, $d = 0;
-	unset($e);
-	$x = isset($a) && !empty($b) || eval($c);
-	$x = $a ? $b : $c;
-	$x = $a ?: $c;
-	$x = $a ?? $b;
-	list($a, $b, $c) = [1, 2=>'x', 'z'=>'c'];
-	@foo();
-	$y = clone $x;
-	yield 1 => 2;
-	yield from $x;
-}));
-
-assert(0 && ($a = function &(array &$a, X $b = null) use ($c,&$d) : X {
-	abstract class A extends B implements C, D {
-		const X = 12;
-		const Y = self::X, Z = "aaa";
-
-		public $a = 1, $b;
-		protected $c;
-		static private $d = null;
-
-		abstract function foo();
-
-		static private function f1() {
-			for ($i = 0, $j = 100; $i < $j; $i++, --$j) {
-				$s[$i] = $a[$j];
-			}
-			foreach ($a as $key => &$val) {
-				print "$key => $val\n";
-			}
-			while ($s[$i]) {
-				$i++;
-			}
-			do {
-				$i--;
-			} while ($s[$i]);
-			$x = foo($a + 1, 4, ...[1,2,3]);
-			$x = ${$a . "_1"}();
-			$x = A::foo();
-			$x = ${$a . "_1"}::foo();
-			$x = A::${$a . "_1"}();
-			$x = $x->foo();
-			$x = ${$a . "_1"}->foo();
-			$x = $x->{$a . "_1"}();
-			$x->a = C::C;
-			${$a . "_1"}->a = ${$a . "_1"}::C;
-			$x->{a . "_1"} = C::C;
-			$x = C::$z;
-			$x = ${$a . "_1"}::$z;
-			$x = C::${$z . "_1"};
-		}
-	}
-}));
-
-assert(0 && ($a = function &(array &$a, X $b = null) use ($c,&$d) : X {
-	final class A {
-		final protected function f2() {
-			if (!$x) {
-				return 0;
-			}
-			if ($x == 1) {
-				return 1;
-			} else if ($x == 2) {
-				return 2;
-			} else if ($x == 3) {
-				return 3;
-			} else {
-				if ($x == 9) {
-					return 9;
-				}
-L0:
-                do {
-					switch ($x) {
-						case 4: break;
-						case 5: continue;
-						case 6: break 2;
-						case 7: continue 2;
-						case 8: goto L0;
-						default: return;
-					}
-				} while (0);
-			}
-		}
-	}
-}));
-
-assert(0 && ($a = function &(array &$a, X $b = null) use ($c,&$d) : X {
-	class A {
-		use T1, T2 {
-			T1::foo insteadof foo;
-			T2::foo as bar;
-			baz as public;
-			ops as protected x;
-		}
-		use T3;
-	}
-}));
-
-assert(0 && ($a = function &(array &...$a) {
-	declare(A=1,B=2);
-	try {
-		$i++;
-	} catch (MyException $e) {
-		echo 1;
-	} catch (Exception $e) {
-		echo 2;
-	} finally {
-		echo 3;
-	}
-}));
-
-assert(0 && ($a = function () {
-	declare(C=1) { echo 1; }
-	$x = '\'"`$a';
-	$x = "'\"`$a";
-	$x = `'"\`$a`;
-	$x = "{$a}b";
-	$x = "${a}b";
-	$x = " {$foo->bar} ${$foo->bar} ";
-	$x = " ${'---'} ";
-	foo();
-	\foo();
-	namespace\foo();
-	$x = foo;
-	$x = \foo;
-	$x = namespace\foo;
-	$x = new foo();
-	$x = new \foo();
-	$x = new namespace\foo();
-    if ($a) {
-    } elseif ($b) {
-    }
-}));
-
-?>
---EXPECTF--
-Warning: assert(): assert(0 && ($a = function () {
-    global $a;
-    global $$b;
-    static $c;
-    static $d = 0;
-    unset($e);
-    $x = isset($a) && !empty($b) || eval($c);
-    $x = $a ? $b : $c;
-    $x = $a ?: $c;
-    $x = $a ?? $b;
-    list($a, $b, $c) = [1, 2 => 'x', 'z' => 'c'];
-    @foo();
-    $y = clone $x;
-    yield 1 => 2;
-    yield from $x;
-})) failed in %sexpect_015.php on line %d
-
-Warning: assert(): assert(0 && ($a = function &(array &$a, X $b = null) use($c, &$d): X {
-    abstract class A extends B implements C, D {
-        const X = 12;
-        const Y = self::X, Z = 'aaa';
-        public $a = 1, $b;
-        protected $c;
-        private static $d = null;
-        public abstract function foo();
-
-        private static function f1() {
-            for ($i = 0, $j = 100; $i < $j; $i++, --$j) {
-                $s[$i] = $a[$j];
-            }
-            foreach ($a as $key => &$val) {
-                print "$key => $val\n";
-            }
-            while ($s[$i]) {
-                $i++;
-            }
-            do {
-                $i--;
-            } while ($s[$i]);
-            $x = foo($a + 1, 4, ...[1, 2, 3]);
-            $x = ${$a . '_1'}();
-            $x = A::foo();
-            $x = ${$a . '_1'}::foo();
-            $x = A::${$a . '_1'}();
-            $x = $x->foo();
-            $x = ${$a . '_1'}->foo();
-            $x = $x->{$a . '_1'}();
-            $x->a = C::C;
-            ${$a . '_1'}->a = ${$a . '_1'}::C;
-            $x->{a . '_1'} = C::C;
-            $x = C::$z;
-            $x = ${$a . '_1'}::$z;
-            $x = C::${$z . '_1'};
-        }
-
-    }
-
-})) failed in %sexpect_015.php on line %d
-
-Warning: assert(): assert(0 && ($a = function &(array &$a, X $b = null) use($c, &$d): X {
-    final class A {
-        protected final function f2() {
-            if (!$x) {
-                return 0;
-            }
-            if ($x == 1) {
-                return 1;
-            } else if ($x == 2) {
-                return 2;
-            } else if ($x == 3) {
-                return 3;
-            } else {
-                if ($x == 9) {
-                    return 9;
-                }
-                L0:
-                do {
-                    switch ($x) {
-                        case 4:
-                            break;
-                        case 5:
-                            continue;
-                        case 6:
-                            break 2;
-                        case 7:
-                            continue 2;
-                        case 8:
-                            goto L0;
-                        default:
-                            return;
-                    }
-                } while (0);
-            }
-        }
-
-    }
-
-})) failed in %sexpect_015.php on line %d
-
-Warning: assert(): assert(0 && ($a = function &(array &$a, X $b = null) use($c, &$d): X {
-    class A {
-        use T1, T2 {
-            T1::foo insteadof foo;
-            T2::foo as bar;
-            baz as public;
-            ops as protected x;
-        }
-        use T3;
-    }
-
-})) failed in %sexpect_015.php on line %d
-
-Warning: assert(): assert(0 && ($a = function &(array &...$a) {
-    declare(A = 1, B = 2);
-    try {
-        $i++;
-    } catch (MyException $e) {
-        echo 1;
-    } catch (Exception $e) {
-        echo 2;
-    } finally {
-        echo 3;
-    }
-})) failed in %sexpect_015.php on line %d
-
-Warning: assert(): assert(0 && ($a = function () {
-    declare(C = 1) {
-        echo 1;
-    }
-    $x = '\'"`$a';
-    $x = "'\"`$a";
-    $x = `'"\`$a`;
-    $x = "{$a}b";
-    $x = "{$a}b";
-    $x = " {$foo->bar} {${$foo->bar}} ";
-    $x = " ${---} ";
-    foo();
-    \foo();
-    namespace\foo();
-    $x = foo;
-    $x = \foo;
-    $x = namespace\foo;
-    $x = new foo();
-    $x = new \foo();
-    $x = new namespace\foo();
-    if ($a) {
-    } elseif ($b) {
-    }
-})) failed in %sexpect_015.php on line %d

Zend/tests/assert/expect_016.phpt

@@ -1,24 +0,0 @@
---TEST--
-test enable/disable assertions at runtime (assertions not completely disabled)
---INI--
-zend.assertions=0
-assert.exception=0
---FILE--
-<?php
-ini_set("zend.assertions", 0);
-var_dump(assert(false));
-var_dump(assert(true));
-ini_set("zend.assertions", 1);
-var_dump(assert(false));
-var_dump(assert(true));
-ini_set("zend.assertions", -1);
-?>
---EXPECTF--
-bool(true)
-bool(true)
-
-Warning: assert(): assert(false) failed in %sexpect_016.php on line 6
-bool(false)
-bool(true)
-
-Warning: zend.assertions may be completely enabled or disabled only in php.ini in %sexpect_016.php on line 8

Zend/tests/assert/expect_017.phpt

@@ -1,19 +0,0 @@
---TEST--
-test enable/disable assertions at runtime (assertions completely disabled)
---INI--
-zend.assertions=-1
-assert.exception=0
---FILE--
-<?php
-var_dump(assert(false));
-var_dump(assert(true));
-ini_set("zend.assertions", 0);
-ini_set("zend.assertions", 1);
-?>
---EXPECTF--
-bool(true)
-bool(true)
-
-Warning: zend.assertions may be completely enabled or disabled only in php.ini in %sexpect_017.php on line 4
-
-Warning: zend.assertions may be completely enabled or disabled only in php.ini in %sexpect_017.php on line 5

Zend/tests/assert/expect_018.phpt

@@ -1,33 +0,0 @@
---TEST--
-test assertions in namespace
---INI--
-zend.assertions=1
-assert.exception=0
---FILE--
-<?php
-namespace Foo;
-
-ini_set("zend.assertions", 0);
-var_dump(\assert(false));
-var_dump(\assert(true));
-var_dump(assert(false));
-var_dump(assert(true));
-ini_set("zend.assertions", 1);
-var_dump(\assert(false));
-var_dump(\assert(true));
-var_dump(assert(false));
-var_dump(assert(true));
-?>
---EXPECTF--
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-
-Warning: assert(): assert(false) failed in %sexpect_018.php on line 10
-bool(false)
-bool(true)
-
-Warning: assert(): assert(false) failed in %sexpect_018.php on line 12
-bool(false)
-bool(true)