sync NEWS

Merge branch 'master' into PHP-7.0.0
* master: (24 commits) 5.5.29 next fix merge fix test fix merge fix test virtual_file_ex uses emalloc in 5.6+ __wakeup doesn't have to be final update NEWS fix test update NEWS Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fixed bug #70098 (Real memory usage doesn't decrease) Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes ...
2026-11-09 10:10:50 +00:00 · 2015-08-05 06:56:40 +02:00 · 2015-08-05 06:15:16 +02:00 · 2015-08-04 20:20:01 +02:00 · 2015-08-04 20:18:28 +02:00 · 2015-08-04 20:16:27 +02:00
12696 changed files with 173539 additions and 1387607 deletions
@@ -1,48 +0,0 @@
-version: "{branch}.build.{build}"
-
-image: Visual Studio 2015
-
-branches:
-        except:
-                - PHP-5.6
-                - PHP-7.0
-
-clone_depth: 64
-
-cache:
-        - c:\build-cache
-
-environment:
-        PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
-        PHP_BUILD_OBJ_DIR: c:\obj
-        PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
-        PHP_BUILD_SDK_BRANCH: php-sdk-2.1.9beta1
-        # ext and env setup for tests
-        #MYSQL_TEST_PASSWD: Password12!
-        #MYSQL_TEST_USER: root
-        #PDO_MYSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=root password=Password12!"
-        #PDO_MYSQL_TEST_USER: root
-        #PDO_MYSQL_TEST_PASS: Password12!
-        #PGSQL_TEST_CONNSTR: "host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!"
-        #PDO_PGSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=Password12!"
-        #build permutations
-        matrix:
-                - THREAD_SAFE: 0
-                  OPCACHE: 0
-                - THREAD_SAFE: 1
-                  OPCACHE: 1
-
-services:
-        # the setup scripts have to be touched, once some other db version is used
-        - mysql
-        - postgresql96
-
-platform:
-        - x64
-          #        - x86
-
-build_script:
-        - appveyor\build.bat
-
-test_script:
-        - appveyor\test.bat
@@ -1,35 +0,0 @@
-# http://editorconfig.org/
-
-root = true
-
-[*.{c,h,awk,w32,bat,mk,frag}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 4
-indent_style             = tab
-tab_width                = 4
-trim_trailing_whitespace = true
-insert_final_newline     = true
-
-[*.{php,phpt}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 4
-indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
-
-[*.{yml,m4,sh}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 2
-indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
-
-[*.md]
-charset                  = utf-8
-end_of_line              = lf
-indent_style             = space
-trim_trailing_whitespace = false
-insert_final_newline     = true
@@ -5,7 +5,7 @@ end
 document set_ts
 	set the ts resource, it is impossible for gdb to
 	call ts_resource_ex while no process is running,
-	but we could get the resource from the argument
+	but we could get the resource from the argument 
 	of frame info.
 end

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

@@ -31,33 +29,22 @@ document ____executor_globals
 end

 define print_cvs
-	if $argc == 0
-		____executor_globals
-		set $cv_ex_ptr = $eg.current_execute_data
-	else
-		set $cv_ex_ptr = (zend_execute_data *)$arg0
+	____executor_globals
+	set $p = $eg.current_execute_data.CVs
+	set $c = $eg.current_execute_data.op_array.last_var
+	set $v = $eg.current_execute_data.op_array.vars
+	set $i = 0
+
+	printf "Compiled variables count: %d\n", $c
+	while $i < $c
+		printf "%d = %s\n", $i, $v[$i].name
+		if $p[$i] != 0
+			printzv *$p[$i]
+		else
+			printf "*uninitialized*\n"
+		end
+		set $i = $i + 1
 	end
-	set $cv_count = $cv_ex_ptr.func.op_array.last_var
-	set $cv = $cv_ex_ptr.func.op_array.vars
-	set $cv_idx = 0
-	set $callFrameSize = (sizeof(zend_execute_data) + sizeof(zval) - 1) / sizeof(zval)
-
-	printf "Compiled variables count: %d\n\n", $cv_count
-	while $cv_idx < $cv_count
-		printf "[%d] '%s'\n", $cv_idx, $cv[$cv_idx].val
-		set $zvalue = ((zval *) $cv_ex_ptr) + $callFrameSize + $cv_idx
-		printzv $zvalue
-		set $cv_idx = $cv_idx + 1
-	end
-end
-
-document print_cvs
-	Prints the compiled variables and their values.
-	If a zend_execute_data pointer is set this will print the compiled
-	variables of that scope. If no parameter is used it will use
-	current_execute_data for scope.
-
-	usage: print_cvs [zend_execute_data *]
 end

 define dump_bt
@@ -114,7 +101,7 @@ define dump_bt
 					____print_str $zvalue->value.str->val $zvalue->value.str->len
 				end
 				if $type == 7
-					printf "array(%d)[%p]", $zvalue->value.arr->nNumOfElements, $zvalue
+					printf "array(%d)[%p]", $zvalue->value.arr->ht->nNumOfElements, $zvalue
 				end
 				if $type == 8
 					printf "object[%p]", $zvalue
@@ -153,7 +140,7 @@ end

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

 document printzv
@@ -165,15 +152,15 @@ define ____printzv_contents
 	set $type = $zvalue->u1.v.type

 	# 15 == IS_INDIRECT
-	if $type > 5 && $type != 15
-		printf "(refcount=%d) ", $zvalue->value.counted->gc.refcount
+	if $type >= 5 && $type != 15
+		printf "(refcount=%d) ", $zvalue->value.counted->refcount
 	end

 	if $type == 0
 		printf "UNDEF"
 	end
 	if $type == 1
-		printf "NULL"
+        printf "NULL"
 	end
 	if $type == 2
 		printf "bool: false"
@@ -181,20 +168,20 @@ define ____printzv_contents
 	if $type == 3
 		printf "bool: true"
 	end
-	if $type == 4
+    if $type == 4
 		printf "long: %ld", $zvalue->value.lval
-	end
-	if $type == 5
-		printf "double: %f", $zvalue->value.dval
-	end
-	if $type == 6
-		printf "string: %s", $zvalue->value.str->val
-	end
-	if $type == 7
+    end
+    if $type == 5
+        printf "double: %f", $zvalue->value.dval
+    end
+    if $type == 6
+       printf "string: %s", $zvalue->value.str->val
+    end
+	if $type == 7 
 		printf "array: "
 		if ! $arg1
 			set $ind = $ind + 1
-			____print_ht $zvalue->value.arr 1
+			____print_ht $zvalue->value.arr
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0
@@ -209,17 +196,12 @@ define ____printzv_contents
 		____executor_globals
 		set $handle = $zvalue->value.obj.handle
 		set $handlers = $zvalue->value.obj.handlers
-		set $zobj = $zvalue->value.obj
-		set $cname = $zobj->ce->name->val
+        set $zobj = $zvalue->value.obj
+        set $cname = $zobj->ce->name->val
 		printf "(%s) #%d", $cname, $handle
 		if ! $arg1
 			if $handlers->get_properties == &zend_std_get_properties
-				if $zobj->properties
-					set $ht = $zobj->properties
-				else
-					set $ht = &$zobj->ce->properties_info
-				end
-				printf "\nProperties "
+				set $ht = $zobj->properties
 				if $ht
 					set $ind = $ind + 1
 					____print_ht $ht 1
@@ -230,7 +212,7 @@ define ____printzv_contents
 						set $i = $i - 1
 					end
 				else
-					echo "not found"
+					echo "no properties found"
 				end
 			end
 		end
@@ -247,31 +229,25 @@ define ____printzv_contents
 		printf "const: %s", $zvalue->value.str->val
 	end
 	if $type == 12
-		printf "CONSTANT_AST"
+		printf "const_ast"
 	end
 	if $type == 13
-		printf "_BOOL"
+		printf "_IS_BOOL"
 	end
 	if $type == 14
-		printf "CALLABLE"
+		printf "IS_CALLABLE"
 	end
 	if $type == 15
 		printf "indirect: "
 		____printzv $zvalue->value.zv $arg1
 	end
+	if $type == 16
+		printf "string_offset"
+	end
 	if $type == 17
 		printf "pointer: %p", $zvalue->value.ptr
 	end
-	if $type == 18
-		printf "ITERABLE"
-	end
-	if $type == 19
-		printf "VOID"
-	end
-	if $type == 20
-		printf "_ERROR"
-	end
-	if $type == 16 || $type > 20
+	if $type > 17
 		printf "unknown type %d", $type
 	end
 	printf "\n"
@@ -287,32 +263,42 @@ define ____printzv
 	if $arg1
 		____printzv_contents $zcontents $arg1
 	else
-		____printzv_contents $zcontents 0
+		____printzv_contents $zcontents 0 
 	end
 end

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

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

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

-document print_const_table
-	Dumps elements of Constants HashTable
-	Example: print_const_table executor_globals.zend_constants
-end
-
 define ____print_ht
 	set $ht = (HashTable*)$arg0
 	set $n = $ind
@@ -340,7 +326,7 @@ define ____print_ht
 				set $n = $n - 1
 			end
 			printf "[%d] ", $i
-			if $p->key
+			if $p->key 
 				printf "%s => ", $p->key->val
 			else
 				printf "%d => ", $p->h
@@ -359,10 +345,6 @@ define ____print_ht
 				set $func = (zend_function*)$p->val.value.ptr
 				printf "\"%s\"\n", $func->common.function_name->val
 			end
-			if $arg1 == 4
-				set $const = (zend_constant *)$p->val.value.ptr
-				____printzv $const 1
-			end
 		end
 		set $i = $i + 1
 	end
@@ -389,7 +371,7 @@ document print_htptr
 end

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

@@ -473,13 +455,10 @@ define print_inh
 end

 define print_pi
-	set $pi = (zend_property_info *)$arg0
-	set $initial_offset = ((uint32_t)(zend_uintptr_t)(&((zend_object*)0)->properties_table[(0)]))
-	set $ptr_to_val = (zval*)((char*)$pi->ce->default_properties_table + $pi->offset - $initial_offset)
+	set $pi = $arg0
 	printf "[%p] {\n", $pi
-	printf "    offset = %p\n", $pi->offset
-	printf "    ce = [%p] %s\n", $pi->ce, $pi->ce->name->val
-	printf "    flags = 0x%x (", $pi->flags
+	printf "    h     = %lu\n", $pi->h
+	printf "    flags = %d (", $pi->flags
 	if $pi->flags & 0x100
 		printf "ZEND_ACC_PUBLIC"
 	else
@@ -490,40 +469,23 @@ define print_pi
 				printf "ZEND_ACC_PRIVATE"
 			else
 				if $pi->flags & 0x800
-					printf "ZEND_ACC_EARLY_BINDING"
-				else
-					if $pi->flags & 0x20000
-						printf "ZEND_ACC_SHADOW"
-					end
+					printf "ZEND_ACC_CHANGED"
 				end
 			end
 		end
 	end
 	printf ")\n"
 	printf "    name  = "
-	print_zstr $pi->name
-	printf "    default value: "
-	printzv $ptr_to_val
-	printf "}\n"
-end
-
-document print_pi
-	Takes a pointer to an object's property and prints the property information
-	usage: print_pi <ptr>
+	____print_str $pi->name $pi->name_length
+	printf "\n}\n"
 end

 define ____print_str
 	set $tmp = 0
 	set $str = $arg0
-	if $argc > 2
-		set $maxlen = $arg2
-	else
-		set $maxlen = 256
-	end
-
 	printf "\""
-	while $tmp < $arg1 && $tmp < $maxlen
-		if $str[$tmp] > 31 && $str[$tmp] < 127
+	while $tmp < $arg1 && $tmp < 256
+		if $str[$tmp] > 32 && $str[$tmp] < 127
 			printf "%c", $str[$tmp]
 		else
 			printf "\\%o", $str[$tmp]
@@ -543,10 +505,10 @@ define printzn
 	if $znode->op_type == 1
 		set $optype = "IS_CONST"
 	end
-	if $znode->op_type == 2
+	if $znode->op_type == 2 
 		set $optype = "IS_TMP_VAR"
 	end
-	if $znode->op_type == 4
+	if $znode->op_type == 4 
 		set $optype = "IS_VAR"
 	end
 	if $znode->op_type == 8
@@ -576,11 +538,11 @@ end

 document printzn
 	print type and content of znode.
-	usage: printzn &opline->op1
+	usage: printzn &opline->op1 
 end

 define printzops
-	printf "op1 => "
+	printf "op1 => " 
 	printzn &execute_data->opline.op1
 	printf "op2 => "
 	printzn &execute_data->opline.op2
@@ -592,23 +554,6 @@ document printzops
 	dump operands of the current opline
 end

-define print_zstr
-	set $zstr = (zend_string *)$arg0
-	if $argc == 2
-		set $maxlen = $arg1
-	else
-		set $maxlen = $zstr->len
-	end
-	printf "string(%d) ", $zstr->len
-	____print_str $zstr->val $zstr->len $maxlen
-	printf "\n"
-end
-
-document print_zstr
-	print the length and contents of a zend string
-	usage: print_zstr <ptr> [max length]
-end
-
 define zbacktrace
 	____executor_globals
 	dump_bt $eg.current_execute_data
@@ -621,6 +566,79 @@ document zbacktrace
 	> (gdb) dump_bt $eg.current_execute_data
 end

+define zmemcheck
+	set $p = alloc_globals.head
+	set $stat = "?"
+	set $total_size = 0
+	if $arg0 != 0
+		set $not_found = 1
+	else
+		set $not_found = 0
+	end
+	printf " block      size      status file:line\n"
+	printf "-------------------------------------------------------------------------------\n"
+	while $p
+		set $aptr = $p + sizeof(struct _zend_mem_header) + sizeof(align_test)
+		if $arg0 == 0 || (void *)$aptr == (void *)$arg0
+			if $p->magic == 0x7312f8dc 
+				set $stat = "OK"
+			end
+			if $p->magic == 0x99954317
+				set $stat = "FREED"
+			end
+			if $p->magic == 0xfb8277dc
+				set $stat = "CACHED"
+			end
+			set $filename = strrchr($p->filename->val, '/')
+			if !$filename
+				set $filename = $p->filename->val
+			else
+				set $filename = $filename + 1
+			end
+			printf " %p ", $aptr
+			if $p->size == sizeof(struct _zval_struct) && ((struct _zval_struct *)$aptr)->type >= 0 && ((struct _zval_struct *)$aptr)->type < 10
+				printf "ZVAL?(%-2d) ", $p->size
+			else
+				printf "%-9d ", $p->size
+			end
+			set $total_size = $total_size + $p->size
+			printf "%-06s %s:%d", $stat, $filename, $p->lineno
+			if $p->orig_filename
+				set $orig_filename = strrchr($p->orig_filename, '/')
+				if !$orig_filename
+					set $orig_filename = $p->orig_filename
+				else
+					set $orig_filename = $orig_filename + 1
+				end
+				printf " <= %s:%d\n", $orig_filename, $p->orig_lineno
+			else
+				printf "\n"
+			end
+			if $arg0 != 0
+				set $p = 0
+				set $not_found = 0
+			else
+				set $p = $p->pNext
+			end
+		else
+			set $p = $p->pNext
+		end
+	end
+	if $not_found
+		printf "no such block that begins at %p.\n", $aptr
+	end
+	if $arg0 == 0
+		printf "-------------------------------------------------------------------------------\n"
+		printf "     total: %d bytes\n", $total_size
+	end
+end
+
+document zmemcheck
+	show status of a memory block.
+	usage: zmemcheck [ptr].
+	if ptr is 0, all blocks will be listed.
+end
+
 define lookup_root
 	set $found = 0
 	if gc_globals->roots
@@ -15,8 +15,11 @@ ext/dba/libflatfile/flatfile.c  ident
 ext/dba/libcdb/cdb_make.c       ident
 ext/dba/libcdb/cdb.c            ident
 ext/filter/filter.c             ident
+ext/zip/php_zip.c               ident
 README.input_filter             ident
 run-tests.php                   ident
+sapi/nsapi/nsapi.c              ident
+sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
 ext/exif/exif.c                 ident
@@ -29,6 +32,7 @@ UPGRADING.INTERNALS             merge=NEWS
 /ext/bz2/tests/with_strings.phpt	-crlf
 /ext/dom/tests/bug40836.phpt	-crlf
 /ext/dom/tests/domelement.phpt	-crlf
+/ext/ereg/tests/eregi_basic_002.phpt	-crlf
 /ext/iconv/tests/iconv004.phpt	-crlf
 /ext/iconv/tests/iconv_basic.phpt	-crlf
 /ext/iconv/tests/iconv_strpos.phpt	-crlf
@@ -26,6 +26,7 @@
 *.tar.xz.asc
 .FBCIndex
 .FBCLockFolder
+.deps
 .libs
 phpt.*
 core
@@ -147,7 +148,6 @@ tests/*/*/*.sh
 */tests/*/*/*.sh
 */*/tests/*.diff
 */*/tests/*.out
-*/*/tests/*.out.png
 */*/tests/*.php
 */*/tests/*.exp
 */*/tests/*.log
@@ -245,6 +245,10 @@ ext/reflection/spl.chm
 ext/simplexml/examples/security.new.xml
 ext/spl/examples/.htaccess
 ext/spl/examples/*.phps
+ext/sqlite/weztest.sqlite
+ext/sqlite/libsqlite/src/sqlite.h
+ext/sqlite/libsqlite/src/parse.out
+ext/sqlite/libsqlite/src/libsqlite.dsw
 ext/sqlite3/tests/phpsql*
 ext/sqlite3/tests/*.db
 ext/sqlite3/tests/*.tmp
@@ -261,7 +265,9 @@ pear/phpize
 pear/run-tests
 pear/php-config
 pear/scripts
+sapi/apache/libphp7.module
 sapi/apache2handler/libphp7.module
+sapi/apache_hooks/libphp7.module
 sapi/cgi/php-cgi
 sapi/cgi/php-cgi.1
 sapi/cli/php.1
@@ -273,7 +279,6 @@ sapi/fpm/fpm/php-cgi
 sapi/phpdbg/phpdbg_parser.c
 sapi/phpdbg/phpdbg_parser.h
 sapi/phpdbg/phpdbg
-sapi/phpdbg/phpdbg.1
 scripts/php-config
 scripts/phpize
 scripts/man1/*.1
@@ -1,26 +1,11 @@
-dist: trusty
 language: c
-sudo: required
-addons:
-  apt:
-    packages:
-      - locales
-      - language-pack-de
-      - re2c
-      - libgmp-dev
-      - libicu-dev
-      - libmcrypt-dev
-      - libtidy-dev
-      - libenchant-dev
-      - libaspell-dev
-      - libpspell-dev
-      - librecode-dev
-      - libsasl2-dev
-      - libxpm-dev
-      - libt1-dev
+
+branches:
+    except:
+        - phpng

 notifications:
-    email:
+    email: 
       on_failure: change
    irc:
      template:
@@ -30,7 +15,7 @@ notifications:
      on_success: change
      on_failure: always

-cache:
+cache: 
    - apt

 env:
@@ -46,18 +31,24 @@ env:
      - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
      - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1

+before_install:
+    - sudo apt-get update -qq
+    - sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev libsasl2-dev libxpm-dev libt1-dev libc-client2007e-dev
+    - sudo cp ./travis/de /var/lib/locales/supported.d/de
+    - sudo dpkg-reconfigure locales
+    - ./travis/install.sh
+
 before_script:
-    # Enable IPv6
-    - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
    # Compile PHP
    - ./travis/compile.sh
-    # Setup Extensions
+    # Setup Extensions 
    - . ./travis/ext/mysql/setup.sh
    - . ./travis/ext/mysqli/setup.sh
    - . ./travis/ext/pdo_mysql/setup.sh
    - . ./travis/ext/pgsql/setup.sh
    - . ./travis/ext/pdo_pgsql/setup.sh
+    - . ./travis/ext/imap/setup.sh

-# Run PHPs run-tests.php
+# Run PHPs run-tests.php 
 script:
-    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
+    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 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
@@ -113,7 +113,7 @@ User Functions/Methods Naming Conventions
    of ``parent_*``::

    A family of 'foo' functions, for example:
-
+    
    Good:
    'foo_select_bar'
    'foo_insert_baz'
@@ -165,7 +165,7 @@ User Functions/Methods Naming Conventions
    'foobar'
    'foo_bar'

-Internal Function Naming Conventions
+Internal Function Naming Convensions
 ----------------------

 1.  Functions that are part of the external API should be named
@@ -178,7 +178,7 @@ Internal Function Naming Conventions
    Unexposed module function should be static and should not be defined in
    'php_modulename.h'.

-    static int php_session_destroy()
+    static int php_session_destroy(TSRMLS_D)

 2.  Main module source file must be named 'modulename.c'.

@@ -47,7 +47,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           fpm
-PRIMARY MAINTAINER:  Jakub Zelenka <bukka@php.net>
+PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>, Jerome Loyet <fat@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3.3
@@ -79,13 +79,13 @@ MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mysqli
-PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           mysqlnd
-PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>
+PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
@@ -99,7 +99,7 @@ EXTENSION:           odbc
 PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
-COMMENT:             Working
+COMMENT:             Working 
 -------------------------------------------------------------------------------
 EXTENSION:           pdo
 PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Wez Furlong <wez@php.net>
@@ -108,8 +108,8 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_dblib
-PRIMARY MAINTAINER:  Adam Baratz <adambaratz@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
@@ -132,7 +132,7 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_oci
-PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net>
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
@@ -195,12 +195,12 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           libxml
-PRIMARY MAINTAINER:   Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net>
+PRIMARY MAINTAINER:   Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net> 
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xmlreader
-PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net>
+PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net> 
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -286,7 +286,7 @@ MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gd
-PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>, Christoph M. Becker <cmb@php.net>
+PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -5,6 +5,7 @@ Installing PHP

     * General Installation Considerations
     * Installation on Unix systems
+          + Apache 1.3.x on Unix systems
          + Apache 2.x on Unix systems
          + Lighttpd 1.4 on Unix systems
          + Sun, iPlanet and Netscape servers on Sun Solaris
@@ -102,6 +103,7 @@ Installation on Unix systems

 Table of Contents

+     * Apache 1.3.x on Unix systems
     * Apache 2.x on Unix systems
     * Lighttpd 1.4 on Unix systems
     * Sun, iPlanet and Netscape servers on Sun Solaris
@@ -161,6 +163,208 @@ Table of Contents
   you can't figure out why, see the Problems section.
     __________________________________________________________________

+Apache 1.3.x on Unix systems
+
+   This  section  contains  notes and hints specific to Apache installs of
+   PHP on Unix platforms. We also have instructions and notes for Apache 2
+   on a separate page.
+
+   You  can select arguments to add to the configure on line 10 below from
+   the  list of core configure options and from extension specific options
+   described  at  the respective places in the manual. The version numbers
+   have  been  omitted here, to ensure the instructions are not incorrect.
+   You  will  need  to replace the 'xxx' here with the correct values from
+   your files.
+
+   Example #1 Installation Instructions (Apache Shared Module Version) for
+   PHP
+1.  gunzip apache_xxx.tar.gz
+2.  tar -xvf apache_xxx.tar
+3.  gunzip php-xxx.tar.gz
+4.  tar -xvf php-xxx.tar
+5.  cd apache_xxx
+6.  ./configure --prefix=/www --enable-module=so
+7.  make
+8.  make install
+9.  cd ../php-xxx
+
+10. Now, configure your PHP.  This is where you customize your PHP
+    with various options, like which extensions will be enabled.  Do a
+    ./configure --help for a list of available options.  In our example
+    we'll do a simple configure with Apache 1 and MySQL support.  Your
+    path to apxs may differ from our example.
+
+      ./configure --with-mysql --with-apxs=/www/bin/apxs
+
+11. make
+12. make install
+
+    If you decide to change your configure options after installation,
+    you only need to repeat the last three steps. You only need to
+    restart apache for the new module to take effect. A recompile of
+    Apache is not needed.
+
+    Note that unless told otherwise, 'make install' will also install PEAR,
+    various PHP tools such as phpize, install the PHP CLI, and more.
+
+13. Setup your php.ini file:
+
+      cp php.ini-development /usr/local/lib/php.ini
+
+    You may edit your .ini file to set PHP options.  If you prefer your
+    php.ini in another location, use --with-config-file-path=/some/path in
+    step 10.
+
+    If you instead choose php.ini-production, be certain to read the list
+    of changes within, as they affect how PHP behaves.
+
+14. Edit your httpd.conf to load the PHP module.  The path on the right hand
+    side of the LoadModule statement must point to the path of the PHP
+    module on your system.  The make install from above may have already
+    added this for you, but be sure to check.
+
+      LoadModule php7_module libexec/libphp7.so
+
+15. And in the AddModule section of httpd.conf, somewhere under the
+    ClearModuleList, add this:
+
+      AddModule mod_php7.c
+
+16. Tell Apache to parse certain extensions as PHP.  For example,
+    let's have Apache parse the .php extension as PHP.  You could
+    have any extension(s) parse as PHP by simply adding more, with
+    each separated by a space.  We'll add .phtml to demonstrate.
+
+      AddType application/x-httpd-php .php .phtml
+
+    It's also common to setup the .phps extension to show highlighted PHP
+    source, this can be done with:
+
+      AddType application/x-httpd-php-source .phps
+
+17. Use your normal procedure for starting the Apache server. (You must
+    stop and restart the server, not just cause the server to reload by
+    using a HUP or USR1 signal.)
+
+   Alternatively, to install PHP as a static object:
+
+   Example  #2  Installation  Instructions (Static Module Installation for
+   Apache) for PHP
+1.  gunzip -c apache_1.3.x.tar.gz | tar xf -
+2.  cd apache_1.3.x
+3.  ./configure
+4.  cd ..
+
+5.  gunzip -c php-5.x.y.tar.gz | tar xf -
+6.  cd php-5.x.y
+7.  ./configure --with-mysql --with-apache=../apache_1.3.x
+8.  make
+9.  make install
+
+10. cd ../apache_1.3.x
+
+11. ./configure --prefix=/www --activate-module=src/modules/php7/libphp7.a
+    (The above line is correct! Yes, we know libphp7.a does not exist at this
+    stage. It isn't supposed to. It will be created.)
+
+12. make
+    (you should now have an httpd binary which you can copy to your Apache bin d
+ir if
+    it is your first install then you need to "make install" as well)
+
+13. cd ../php-5.x.y
+14. cp php.ini-development /usr/local/lib/php.ini
+
+15. You can edit /usr/local/lib/php.ini file to set PHP options.
+    Edit your httpd.conf or srm.conf file and add:
+    AddType application/x-httpd-php .php
+
+   Depending  on  your  Apache  install  and  Unix variant, there are many
+   possible  ways  to  stop and restart the server. Below are some typical
+   lines   used  in  restarting  the  server,  for  different  apache/unix
+   installations.  You  should  replace  /path/to/  with the path to these
+   applications on your systems.
+
+   Example #3 Example commands for restarting Apache
+1. Several Linux and SysV variants:
+/etc/rc.d/init.d/httpd restart
+
+2. Using apachectl scripts:
+/path/to/apachectl stop
+/path/to/apachectl start
+
+3. httpdctl and httpsdctl (Using OpenSSL), similar to apachectl:
+/path/to/httpsdctl stop
+/path/to/httpsdctl start
+
+4. Using mod_ssl, or another SSL server, you may want to manually
+stop and start:
+/path/to/apachectl stop
+/path/to/apachectl startssl
+
+   The  locations of the apachectl and http(s)dctl binaries often vary. If
+   your  system  has locate or whereis or which commands, these can assist
+   you in finding your server control programs.
+
+   Different examples of compiling PHP for apache are as follows:
+./configure --with-apxs --with-pgsql
+
+   This will create a libphp7.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
+   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
+   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
+   binary.  The  PostgreSQL  support  is included directly into this httpd
+   binary, so the final result here is a single httpd binary that includes
+   all of Apache and all of PHP.
+
+./configure --with-apache=/path/to/apache_source --with-pgsql=shared
+
+   Same as before, except instead of including PostgreSQL support directly
+   into  the  final  httpd you will get a pgsql.so shared library that you
+   can load into PHP from either the php.ini file or directly using dl().
+
+   When  choosing  to build PHP in different ways, you should consider the
+   advantages  and  drawbacks  of each method. Building as a shared object
+   will  mean  that  you  can compile apache separately, and don't have to
+   recompile  everything  as you add to, or change, PHP. Building PHP into
+   apache  (static  method)  means  that PHP will load and run faster. For
+   more information, see the Apache » web page on DSO support.
+
+     Note:
+
+     Apache's  default  httpd.conf  currently  ships  with a section that
+     looks like this:
+
+User nobody
+Group "#-1"
+
+     Unless  you  change  that  to "Group nogroup" or something like that
+     ("Group  daemon"  is  also very common) PHP will not be able to open
+     files.
+
+     Note:
+
+     Make  sure  you  specify  the  installed  version of apxs when using
+     --with-apxs=/path/to/apxs  .  You must NOT use the apxs version that
+     is  in  the apache sources but the one that is actually installed on
+     your system.
+     __________________________________________________________________
+     __________________________________________________________________
+
 Apache 2.x on Unix systems

   This  section  contains notes and hints specific to Apache 2.x installs
@@ -1,7 +1,7 @@
--------------------------------------------------------------------
+-------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2018 The PHP Group. All rights reserved.
--------------------------------------------------------------------
+Copyright (c) 1999 - 2015 The PHP Group. All rights reserved.
+-------------------------------------------------------------------- 

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

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
-
+ 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
-
+ 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group@php.net.
-
+  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group@php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
-
+ 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
@@ -41,27 +41,27 @@ are met:
     "This product includes PHP software, freely available from
     <http://www.php.net/software/>".

-THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
+THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
 ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
 PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
-DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------
+-------------------------------------------------------------------- 

 This software consists of voluntary contributions made by many
 individuals on behalf of the PHP Group.

 The PHP Group can be contacted via Email at group@php.net.

-For more information on the PHP Group and the PHP project,
+For more information on the PHP Group and the PHP project, 
 please see <http://www.php.net>.

 PHP includes the Zend Engine, freely available at
@@ -1,3 +1,4 @@
+
 #
 # Zend
 #
@@ -1,3 +1,4 @@
+
 #
 # LCOV
 #
@@ -56,12 +57,12 @@ php_lcov.info: lcov-test
 			cp $$x.bbg  lcov_data/$$y.bbg ; \
 		fi; \
 	done; \
-	for dir in ext/bcmath/libbcmath ext/date/lib ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
+	for dir in ext/bcmath/libbcmath ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
 		if test -d lcov_data/$$dir; then \
 			rm -rf lcov_data/$$dir ; \
 		fi; \
 	done
-	@echo
+	@echo 
 	@echo "Generating $@"
 	@$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@

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

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

 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
+	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
 	rm -f php7.spec main/build-defs.h scripts/phpize
 	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
-	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
+	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1
 	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
 	rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
 	rm -f ext/phar/phar.phar ext/phar/phar.php
@@ -135,7 +135,7 @@ prof-gen:

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

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

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

   ./ext_skel --extname=module_name

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

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

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

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

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

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

@@ -172,7 +172,7 @@ PHP_FUNCTION(module_name_drawtext)
    zval *image = NULL;
    zval *font = NULL;

-    if (zend_parse_parameters(argc, "rsrll|l", &image, &text, &text_len, &font, &x, &y, &color) == FAILURE)
+    if (zend_parse_parameters(argc TSRMLS_CC, "rsrll|l", &image, &text, &text_len, &font, &x, &y, &color) == FAILURE)
        return;

    if (image) {
@@ -185,3 +185,4 @@ PHP_FUNCTION(module_name_drawtext)
    php_error(E_WARNING, "module_name_drawtext: not yet implemented");
 }
 /* }}} */
+
@@ -43,7 +43,7 @@ Having said that, here are the organizational rules::

 Currently we have the following branches in use::

-  master    The active development branch.
+  master    The active development branch. 

  PHP-5.6   Is used to release the PHP 5.6.x series. This is a current
            stable version and is open for bugfixes only.
@@ -79,7 +79,7 @@ The next few rules are more of a technical nature::
      should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but
      not master, which is not a public released version yet.

-   3. Do not commit multiple files and dump all messages in one commit. If you
+   3. Do not commit multiple file and dump all messages in one commit. If you
      modified several unrelated files, commit each group separately and
      provide a nice commit message for each one. See example below.

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

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

 API adjustment to the old output control code:

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

 	Checking output control layers status:
 		// Using OG()
-		php_output_get_status();
+		php_output_get_status(TSRMLS_C);

 	Starting the default output handler:
-		// php_start_ob_buffer(NULL, 0, 1);
-		php_output_start_default();
+		// php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
+		php_output_start_default(TSRMLS_C);

 	Starting an user handler by zval:
-		// php_start_ob_buffer(zhandler, chunk_size, erase);
-		php_output_start_user(zhandler, chunk_size, flags);
+		// php_start_ob_buffer(zhandler, chunk_size, erase TSRMLS_CC);
+		php_output_start_user(zhandler, chunk_size, flags TSRMLS_CC);

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

 	Starting an internal handler with context:
 		// not possible with old API
 		php_output_handler *h;
-		h = php_output_handler_create_internal(handler_name, handler_name_len, my_php_output_handler_context_func_t, chunk_size, flags);
+		h = php_output_handler_create_internal(handler_name, handler_name_len, my_php_output_handler_context_func_t, chunk_size, flags TSRMLS_CC);
 		php_output_handler_set_context(h, my_context, my_context_dtor);
-		php_output_handler_start(h);
+		php_output_handler_start(h TSRMLS_CC);

 	Testing whether a certain output handler has already been started:
-		// php_ob_handler_used("output handler name");
-		php_output_handler_started(handler_name, handler_name_len);
+		// php_ob_handler_used("output handler name" TSRMLS_CC);
+		php_output_handler_started(handler_name, handler_name_len TSRMLS_CC);

 	Flushing one output buffer:
-		// php_end_ob_buffer(1, 1);
-		php_output_flush();
+		// php_end_ob_buffer(1, 1 TSRMLS_CC);
+		php_output_flush(TSRMLS_C);

 	Flushing all output buffers:
 		// not possible with old API
-		php_output_flush_all();
+		php_output_flush_all(TSRMLS_C);

 	Cleaning one output buffer:
-		// php_ob_end_buffer(0, 1);
-		php_output_clean();
+		// php_ob_end_buffer(0, 1 TSRMLS_CC);
+		php_output_clean(TSRMLS_C);

 	Cleaning all output buffers:
 		// not possible with old API
-		php_output_clean_all();
+		php_output_clean_all(TSRMLS_C);

 	Discarding one output buffer:
-		// php_ob_end_buffer(0, 0);
-		php_output_discard();
+		// php_ob_end_buffer(0, 0 TSRMLS_CC);
+		php_output_discard(TSRMLS_C);

 	Discarding all output buffers:
-		// php_ob_end_buffers(0);
-		php_output_discard_all();
+		// php_ob_end_buffers(0 TSRMLS_CC);
+		php_output_discard_all(TSRMLS_C);

 	Stopping (and dropping) one output buffer:
-		// php_ob_end_buffer(1, 0)
-		php_output_end();
+		// php_ob_end_buffer(1, 0 TSRMLS_CC)
+		php_output_end(TSRMLS_C);

 	Stopping (and dropping) all output buffers:
-		// php_ob_end_buffers(1, 0);
-		php_output_end_all();
+		// php_ob_end_buffers(1, 0 TSRMLS_CC);
+		php_output_end_all(TSRMLS_C);

 	Retrieving output buffers contents:
-		// php_ob_get_buffer(zstring);
-		php_output_get_contents(zstring);
+		// php_ob_get_buffer(zstring TSRMLS_CC);
+		php_output_get_contents(zstring TSRMLS_CC);

 	Retrieving output buffers length:
-		// php_ob_get_length(zlength);
-		php_output_get_length(zlength);
+		// php_ob_get_length(zlength TSRMLS_CC);
+		php_output_get_length(zlength TSRMLS_CC);

 	Retrieving output buffering level:
 		// OG(nesting_level);
-		php_output_get_level();
+		php_output_get_level(TSRMLS_C);

 	Issue a warning because of an output handler conflict:
-		// php_ob_init_conflict("to be started handler name", "to be tested if already started handler name");
-		php_output_handler_conflict(new_handler_name, new_handler_name_len, set_handler_name, set_handler_name_len);
+		// php_ob_init_conflict("to be started handler name", "to be tested if already started handler name" TSRMLS_CC);
+		php_output_handler_conflict(new_handler_name, new_handler_name_len, set_handler_name, set_handler_name_len TSRMLS_CC);

 	Registering a conflict checking function, which will be checked prior starting the handler:
 		// not possible with old API, unless hardcoding into output.c
-		php_output_handler_conflict_register(handler_name, handler_name_len, my_php_output_handler_conflict_check_t);
+		php_output_handler_conflict_register(handler_name, handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);

 	Registering a reverse conflict checking function, which will be checked prior starting the specified foreign handler:
 		// not possible with old API
-		php_output_handler_reverse_conflict_register(foreign_handler_name, foreign_handler_name_len, my_php_output_handler_conflict_check_t);
+		php_output_handler_reverse_conflict_register(foreign_handler_name, foreign_handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);

 	Facilitating a context from within an output handler callable with ob_start():
 		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr TSRMLS_CC);

 	Disabling of the output handler by itself:
 		//not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL TSRMLS_CC);

 	Marking an output handler immutable by itself because of irreversibility of its operation:
 		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC);

 	Restarting the output handler because of a CLEAN operation:
 		// not possible with old API
@@ -134,7 +134,7 @@ Output handler hooks
 Open questions

 	Should the userland API be adjusted and unified?
-
+	
 	Many bits of the manual (and very first implementation) do not comply
 	with the behaviour of the current (to be obsoleted) code, thus should
 	the manual or the behaviour be adjusted?
@@ -13,8 +13,8 @@ meaningful error messages.
 Prototypes
 ----------
 /* Implemented. */
-int zend_parse_parameters(int num_args, char *type_spec, ...);
-int zend_parse_parameters_ex(int flags, int num_args, char *type_spec, ...);
+int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...);
+int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);

 The zend_parse_parameters() function takes the number of parameters
 passed to the extension function, the type specifier string, and the
@@ -30,7 +30,7 @@ resources cannot be auto-converted.

 PHP 5.5 includes a new function:

-int zend_parse_parameter(int flags, int arg_num, zval **arg, const char *spec, ...);
+int zend_parse_parameter(int flags, int arg_num TSRMLS_DC, zval **arg, const char *spec, ...);

 This function behaves like zend_parse_parameters_ex() except that instead of
 reading the arguments from the stack, it receives a single zval to convert
@@ -42,11 +42,11 @@ See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse

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

 a  - array (zval*)
@@ -54,7 +54,7 @@ Type specifiers
 b  - boolean (zend_bool)
 C  - class (zend_class_entry*)
 d  - double (double)
- f  - function or array containing php method call info (returned as
+ f  - function or array containing php method call info (returned as 
      zend_fcall_info and zend_fcall_info_cache)
 h  - array (returned as HashTable*)
 H  - array or HASH_OF(object) (returned as HashTable*)
@@ -63,10 +63,10 @@ Type specifiers
 o  - object of any type (zval*)
 O  - object of specific type given by class entry (zval*, zend_class_entry)
 p  - valid path (string without null bytes in the middle) and its length (char*, size_t)
- P  - valid path (string without null bytes in the middle) as zend_string (zend_string*)
+ P  - valid path (string without null bytes in the middle) as zend_string (zend_string)
 r  - resource (zval*)
 s  - string (with possible null bytes) and its length (char*, size_t)
- S  - string (with possible null bytes) as zend_string (zend_string*)
+ S  - string (with possible null bytes) as zend_string (zend_string)
 z  - the actual zval (zval*)
 *  - variable arguments list (0 or more)
 +  - variable arguments list (1 or more)
@@ -88,22 +88,22 @@ Type specifiers

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

 Both mistakes might cause memory corruptions and segfaults:
 1)
  char *str;
  long str_len; /* XXX THIS IS WRONG!! Use size_t instead. */
-  zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str, &str_len)
+  zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len)

 2)
  int num; /* XXX THIS IS WRONG!! Use zend_long instead. */
-  zend_parse_parameters(ZEND_NUM_ARGS(), "l", &num)
+  zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &num)

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

 # php ./scripts/dev/check_parameters.php /path/to/your/sources/
@@ -116,7 +116,7 @@ zend_long l;
 char *s;
 size_t s_len;
 zval *param;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "lsz",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
                          &l, &s, &s_len, &param) == FAILURE) {
    return;
 }
@@ -126,7 +126,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "lsz",
 zval *obj;
 double d = 0.5;
 zend_class_entry *my_ce;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|d",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
                          &obj, my_ce, &d) == FAILURE) {
    return;
 }
@@ -136,7 +136,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|d",
   If null is passed for object, obj will be set to NULL. */
 zval *obj;
 zval *arr;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "o!a",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a",
                          &obj, &arr) == FAILURE) {
    return;
 }
@@ -144,7 +144,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "o!a",

 /* Gets a separated array which can also be null. */
 zval *arr;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
                          &arr) == FAILURE) {
    return;
 }
@@ -152,7 +152,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!",
 /* Get either a set of 3 longs or a string. */
 zend_long l1, l2, l3;
 char *s;
-/*
+/* 
 * The function expects a pointer to a size_t in this case, not a long
 * or any other type.  If you specify a type which is larger
 * than a 'size_t', the upper bits might not be initialized
@@ -161,10 +161,10 @@ char *s;
 */
 size_t length;

-if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
+if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
                             "lll", &l1, &l2, &l3) == SUCCESS) {
    /* manipulate longs */
-} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
+} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
                                    "s", &s, &length) == SUCCESS) {
    /* manipulate string */
 } else {
@@ -180,7 +180,7 @@ int i, num_varargs;
 zval *varargs = NULL;


-if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &varargs, &num_varargs) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "*", &varargs, &num_varargs) == FAILURE) {
    return;
 }

@@ -200,7 +200,7 @@ size_t str_len;
 int i, num_varargs;
 zval *varargs = NULL;

-if (zend_parse_parameters(ZEND_NUM_ARGS(), "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
    return;
 }

@@ -214,7 +214,7 @@ zval *array;
 int i, num_varargs;
 zval *varargs = NULL;

-if (zend_parse_parameters(ZEND_NUM_ARGS(), "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
    return;
 }

@@ -5,16 +5,17 @@
 5. ext/standard crypt
 6. ext/standard crypt's blowfish implementation
 7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
-8. ext/standard/rand
-9. ext/standard/scanf
-10. ext/standard/strnatcmp.c
-11. ext/standard/uuencode
-12. libxmlrpc ext/xmlrpc
-13. libzip ext/zip
-14. main/snprintf.c
-15. main/strlcat
-16. main/strlcpy
-17. libgd see ext/gd/libgd/COPYING
+8. ext/json/json_parser
+9. ext/standard/rand
+10. ext/standard/scanf
+11. ext/standard/strnatcmp.c
+12. ext/standard/uuencode
+13. libxmlrpc ext/xmlrpc
+14. libzip ext/zip
+15. main/snprintf.c
+16. main/strlcat
+17. main/strlcpy
+18. libgd see ext/gd/libgd/COPYING

 5. ext/standard crypt

@@ -46,7 +47,7 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
-
+ 

 6. ext/standard crypt's blowfish implementation

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

 7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite

@@ -103,7 +104,31 @@ a legal notice, here is a blessing:
  May you share freely, never taking more than you give.


-8. ext/standard/rand
+8. ext/json/json_parser
+Copyright (c) 2005 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+9. ext/standard/rand
 The following php_mt_...() functions are based on a C++ class MTRand by
 Richard J. Wagner. For more information see the web page at
 http://www-personal.engin.umich.edu/~wagnerr/MersenneTwister.html
@@ -126,7 +151,7 @@ Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30.

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

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

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

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -156,7 +181,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


-9. ext/standard/scanf
+10. ext/standard/scanf
 scanf.c --

 This file contains the base code which implements sscanf and by extension
@@ -202,7 +227,7 @@ authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
 terms specified in this license.

-10. ext/standard/strnatcmp.c
+11. ext/standard/strnatcmp.c

 strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
 Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
@@ -223,7 +248,7 @@ freely, subject to the following restrictions:
 	 misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.

-11. ext/standard/uuencode
+12. ext/standard/uuencode
 Portions of this code are based on Berkeley's uuencode/uudecode
 implementation.

@@ -259,31 +284,31 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.


-12. libxmlrpc ext/xmlrpc
+13. libxmlrpc ext/xmlrpc

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

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

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

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

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

-13. libzip ext/zip
+14. libzip ext/zip
 zip.h -- exported declarations.
 Copyright (C) 1999-2009 Dieter Baron and Thomas Klausner

@@ -315,7 +340,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-14. main/snprintf.c
+15. main/snprintf.c
 Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com>

 Permission to use, copy, modify, and distribute this software for any
@@ -388,8 +413,8 @@ This code is based on, and used with the permission of, the
 SIO stdio-replacement strx_* functions by Panos Tsirigotis
 <panos@alumni.cs.colorado.edu> for xinetd.

-15. main/strlcat
-16. main/strlcpy
+16. main/strlcat
+17. main/strlcpy
 Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 All rights reserved.

@@ -414,3 +439,4 @@ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
@@ -17,7 +17,7 @@ It is recommended to do so a couple of days before the packaging day, to
 have enough time to investigate failures, communicate with the authors and
 commit the fixes.
 The RM for the branch is also responsible for keeping the CI green on
-ongoing basis between the releases. Check the CI status for your branch
+ongoing bases between the releases. Check the CI status for your branch
 periodically and resolve the failures ASAP. See more in:
 https://wiki.php.net/rfc/travis_ci

@@ -31,8 +31,8 @@ team (Bjori) on hand.

 6. Verify the tags to be extra sure everything was tagged properly.

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

 Moving extensions from php-src to PECL
 - Checkout the pecl directory, most likely you want a sparse-root checkout
@@ -93,27 +93,24 @@ Commit the changes to the main branch.
 12. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
 and build three tarballs (gz, bz2 and xz).

-13. run ``scripts/dev/gen_verify_stub <version> [identity]``, this will sign the tarballs
-and output verification information to be included in announcement email
-
-14. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
+13. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
 directory "downloads/". Copy them into there, so that the system can generate
 MD5 sums. If you do not have this directory, talk to Derick or Dan.

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

-16. Once the release has been tagged, contact the PHP Windows development team
+15. Once the release has been tagged, contact the PHP Windows development team
 (internals-win@lists.php.net) so that Windows binaries can be created. Once
 those are made, they should be placed into the same directory as the source snapshots.

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

-1. Send an email **To** ``internals@lists.php.net`` and ``php-general@lists.php.net``
-lists pointing out "the location of the release" and "the possible release date of
-either the next RC, or the final release". Include in this information the verification
-information output by ``gen_verify_stub``.
+1. Send an email (see example here: http://news.php.net/php.internals/19486)
+**To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` lists
+pointing out "the location of the release" and "the possible release date of
+either the next RC, or the final release".

 2. Send an email (see example here http://news.php.net/php.pear.qa/5201) **To**
 ``php-qa@lists.php.net`` and ``primary-qa-tester@lists.php.net``.
@@ -182,7 +179,7 @@ Check if the pear files are updated (phar).
  ``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx``

 11. Commit and push all the tarballs and signature files to web/php-distributions.git,
-    then update the git submodule reference in web/php.git:
+    then update the git submodule reference in web/php.git: 
    ``git submodule init;
    git submodule update;
    cd distributions;
@@ -193,8 +190,8 @@ Check if the pear files are updated (phar).
 This is to fetch the last commit id from php-distributions.git and commit this
 last commit id to web/php.git, then, mirrors will now sync

-12. Once the release has been tagged, contact release managers, windows builders, and package maintainers
-so that they can build releases. Do not send this announcement to any public lists.
+12. Once the release has been tagged, contact the PHP Windows development team
+(internals-win@lists.php.net) so that Windows binaries can be created.

 Getting the stable release announced
 ------------------------------------
@@ -252,7 +249,7 @@ f.e. ``ChangeLog-5.php`` from the NEWS file
  IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``

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

 6. Add a short notice to phpweb stating that there is a new release, and
@@ -274,8 +271,8 @@ to upgrade.
 10. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 http://news.php.net/php.internals/17222.
-Please make sure that the mail to php-announce@ is its own completely separate email.
-This is to make sure that replies to the announcement on php-general@ or internals@
+Please make sure that the mail to php-announce@ is its own completely seperate email.
+This is to make sure that repiles to the announcement on php-general@ or internals@
 will not accidentally hit the php-announce@ mailinglist.

 Re-releasing the same version (or -pl)
@@ -312,6 +309,6 @@ to upgrade.
 5. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 the news entry.
-Please make sure that the mail to php-announce@ is its own completely separate email.
-This is to make sure that replies to the announcement on php-general@ or internals@
+Please make sure that the mail to php-announce@ is its own completely seperate email.
+This is to make sure that repiles to the announcement on php-general@ or internals@
 will not accidentally hit the php-announce@ mailinglist.
@@ -23,7 +23,7 @@ PREPARING YOUR SYSTEM
    GNU libtool
    GNU m4

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

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

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

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

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


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

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

 CREATING THE M4 CONFIGURATION FILE

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

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

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

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

    This macros has to be used within your foo_module_entry to indicate the
    extension version.
+
@@ -28,7 +28,7 @@ The main functions are:
 PHPAPI size_t php_stream_read(php_stream * stream, char * buf, size_t count);
 PHPAPI size_t php_stream_write(php_stream * stream, const char * buf, size_t
        count);
-PHPAPI size_t php_stream_printf(php_stream * stream,
+PHPAPI size_t php_stream_printf(php_stream * stream TSRMLS_DC, 
        const char * fmt, ...);
 PHPAPI int php_stream_eof(php_stream * stream);
 PHPAPI int php_stream_getc(php_stream * stream);
@@ -47,7 +47,7 @@ Opening Streams
 In most cases, you should use this API:

 PHPAPI php_stream *php_stream_open_wrapper(const char *path, const char *mode,
-    int options, char **opened_path);
+    int options, char **opened_path TSRMLS_DC);

 Where:
    path is the file or resource to open.
@@ -63,7 +63,7 @@ Where:
                           file/URL, use this option to arrange for the stream
                           to be copied (if needed) into a stream that can
                           be seek()ed.
-
+                           
    opened_path is used to return the path of the actual file opened,
    but if you used STREAM_MUST_SEEK, may not be valid.  You are
    responsible for efree()ing opened_path.  opened_path may be (and usually
@@ -80,7 +80,7 @@ PHPAPI php_stream *php_stream_fopen_tmpfile(void);
    Open a FILE * with tmpfile() and convert into a stream.

 PHPAPI php_stream *php_stream_fopen_temporary_file(const char *dir,
-    const char *pfx, char **opened_path);
+    const char *pfx, char **opened_path TSRMLS_DC);
    Generate a temporary file name and open it.

 There are some network enabled relatives in php_network.h:
@@ -95,7 +95,7 @@ PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short po
 PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent,
    struct timeval *timeout);
    Open a UNIX domain socket.
-
+   

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

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


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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

 vim:tw=78:sw=1:ts=1:et
+
@@ -12,7 +12,7 @@ enforced.  It is implemented as a SAPI hook and is called from the
 treat_data and post handler functions.  To implement your own security
 policy you will need to write a standard PHP extension.  There is also
 a powerful standard implementation in ext/filter that should suit most
-peoples' needs.  However, if you want to implement your own security
+peoples' needs.  However, if you want to implement your own security 
 policy, read on.

 A simple implementation might look like the following.  This stores the
@@ -138,7 +138,7 @@ SAPI_INPUT_FILTER_FUNC(my_sapi_input_filter)
    strcpy(raw_var, "RAW_");
    strlcat(raw_var,var,var_len+5);

-    php_register_variable_ex(raw_var, &new_var, array_ptr);
+    php_register_variable_ex(raw_var, &new_var, array_ptr TSRMLS_DC);

    php_strip_tags(*val, val_len, NULL, NULL, 0);

@@ -154,7 +154,7 @@ PHP_FUNCTION(my_get_raw)
    zval **tmp;
    zval *array_ptr = NULL;

-    if(zend_parse_parameters(2, "ls", &arg, &var, &var_len) == FAILURE) {
+    if(zend_parse_parameters(2 TSRMLS_CC, "ls", &arg, &var, &var_len) == FAILURE) {
        return;
    }

@@ -5,13 +5,12 @@ This is the github mirror of the official PHP repository located at
 http://git.php.net.

 [![Build Status](https://secure.travis-ci.org/php/php-src.svg?branch=master)](http://travis-ci.org/php/php-src)
-[![Build status](https://ci.appveyor.com/api/projects/status/meyur6fviaxgdwdy?svg=true)](https://ci.appveyor.com/project/php/php-src)

 Pull Requests
 =============
 PHP accepts pull requests via github. Discussions are done on github, but
 depending on the topic can also be relayed to the official PHP developer
-mailing list internals@lists.php.net.
+mailinglist internals@lists.php.net.

 New features require an RFC and must be accepted by the developers.
 See https://wiki.php.net/rfc and https://wiki.php.net/rfc/voting for more
@@ -37,3 +36,4 @@ Guidelines for contributors
 - [README.GIT-RULES](/README.GIT-RULES)
 - [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES)
 - [README.RELEASE_PROCESS](/README.RELEASE_PROCESS)
+
@@ -51,7 +51,7 @@ DB\connect();
 The use statement only defines name aliasing. It may create name alias for
 namespace or class. The simple form of statement "use A\B\C\D;" is
 equivalent to "use A\B\C\D as D;". The use statement can be used at any
-time in the global scope (not inside function/class) and takes effect from
+time in the global scope (not inside function/class) and takes effect from 
 the point of definition down to the end of file. It is recommended however to
 place the use statements at the beginning of the file. The use statements have
 effect only on the file where they appear.
@@ -60,13 +60,13 @@ The special "empty" namespace (\ prefix) is useful as explicit global
 namespace qualification. All class and function names started from \
 interpreted as global.

-<?php
+<?php 
 namespace A\B\C;

 $con = \mysql_connect(...);
 ?>

-A special constant __NAMESPACE__ contains the name of the current namespace.
+A special constant __NAMESPACE__ contains the name of the current namespace. 
 It can be used to construct fully-qualified names to pass them as callbacks.

 <?php
@@ -88,19 +88,19 @@ it is translated to "A\B\C\D\e()".
 2) unqualified class names translated during compilation according to
 current import rules. So if we have "use A\B\C" and then "new C()" it
 is translated to "new A\B\C()".
-3) inside namespace, calls to unqualified functions that are defined in
-current namespace (and are known at the time the call is parsed) are
+3) inside namespace, calls to unqualified functions that are defined in 
+current namespace (and are known at the time the call is parsed) are 
 interpreted as calls to these namespace functions.
-4) inside namespace, calls to unqualified functions that are not defined
-in current namespace are resolved at run-time. The call to function foo()
-inside namespace (A\B) first tries to find and call function from current
+4) inside namespace, calls to unqualified functions that are not defined 
+in current namespace are resolved at run-time. The call to function foo() 
+inside namespace (A\B) first tries to find and call function from current 
 namespace A\B\foo() and if it doesn't exist PHP tries to call internal
-function foo(). Note that using foo() inside namespace you can call only
+function foo(). Note that using foo() inside namespace you can call only 
 internal PHP functions, however using \foo() you are able to call any
 function from the global namespace.
 5) unqualified class names are resolved at run-time. E.q. "new Exception()"
-first tries to use (and autoload) class from current namespace and in case
-of failure uses internal PHP class. Note that using "new A" in namespace
+first tries to use (and autoload) class from current namespace and in case 
+of failure uses internal PHP class. Note that using "new A" in namespace 
 you can only create class from this namespace or internal PHP class, however
 using "new \A" you are able to create any class from the global namespace.
 6) Calls to qualified functions are resolved at run-time. Call to
@@ -171,3 +171,4 @@ TODO
  * Add getNamespace() methods to ReflectionClass and ReflectionFunction

 * Rename namespaces to packages?
+
@@ -93,12 +93,7 @@ static FILE *tsrm_error_file;
 	}
 #endif

-#if defined(GNUPTH)
-static pth_key_t tls_key;
-# define tsrm_tls_set(what)		pth_key_setdata(tls_key, (void*)(what))
-# define tsrm_tls_get()			pth_key_getdata(tls_key)
-
-#elif defined(PTHREADS)
+#if defined(PTHREADS)
 /* Thread local storage */
 static pthread_key_t tls_key;
 # define tsrm_tls_set(what)		pthread_setspecific(tls_key, (void*)(what))
@@ -130,7 +125,6 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu
 {
 #if defined(GNUPTH)
 	pth_init();
-	pth_key_create(&tls_key, 0);
 #elif defined(PTHREADS)
 	pthread_key_create( &tls_key, 0 );
 #elif defined(TSRM_ST)
@@ -170,14 +170,12 @@ TSRM_API void *tsrm_get_ls_cache(void);

 #define TSRMG_STATIC(id, type, element)	(TSRMG_BULK_STATIC(id, type)->element)
 #define TSRMG_BULK_STATIC(id, type)	((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
-#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
-#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
+#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE
+#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL
 #if ZEND_DEBUG
 #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
-#define TSRMLS_CACHE_RESET()
 #else
 #define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
-#define TSRMLS_CACHE_RESET()  TSRMLS_CACHE = NULL
 #endif
 #define TSRMLS_CACHE _tsrm_ls_cache

@@ -204,8 +202,6 @@ TSRM_API void *tsrm_get_ls_cache(void);
 #define TSRMLS_CACHE_UPDATE()
 #define TSRMLS_CACHE

-#define TSRM_TLS
-
 /* BC only */
 #define TSRMLS_D	void
 #define TSRMLS_DC
@@ -1,3 +1,5 @@
+
 AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
+
@@ -5,7 +5,7 @@
 #
 # Written by Sascha Schumann
 #
-# $Id$
+# $Id$ 


 LT_TARGETS = ltmain.sh ltconfig
@@ -34,7 +34,7 @@ aclocal.m4: configure.in acinclude.m4
 	aclocal

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

 ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_win32.c");
 ADD_FLAG("CFLAGS_BD_TSRM", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+
@@ -12,10 +12,10 @@ AH_TOP([
 ])

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

@@ -80,11 +80,18 @@ int main() {
    int data = 1;
    pthread_mutexattr_init(&mattr);
    return pthread_create(&thd, NULL, thread_routine, &data);
-} ]) ], [
-  pthreads_checked=yes
+} ], [
+  pthreads_working=yes
  ], [
-  pthreads_checked=no
-  ]
+  pthreads_working=no
+  ], [
+  dnl For cross compiling running this test is of no use. NetWare supports pthreads
+  pthreads_working=no
+  case $host_alias in
+  *netware*)
+    pthreads_working=yes
+  esac
+]
 ) ] )dnl
 dnl
 dnl PTHREADS_CHECK()
@@ -97,7 +104,7 @@ dnl  -Kthread          UDK cc (UnixWare)
 dnl  -mt               WorkShop cc (Solaris)
 dnl  -mthreads         gcc (AIX)
 dnl  -pthread          gcc (Linux, FreeBSD, NetBSD, OpenBSD)
-dnl  -pthreads         gcc (Solaris)
+dnl  -pthreads         gcc (Solaris) 
 dnl  -qthreaded        AIX cc V5
 dnl  -threads          gcc (HP-UX)
 dnl
@@ -117,39 +124,35 @@ else
  AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[
  ac_cv_pthreads_cflags=
  if test "$pthreads_working" != "yes"; then
-    for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
+    for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 
      ac_save=$CFLAGS
      CFLAGS="$CFLAGS $flag"
      PTHREADS_CHECK_COMPILE
      CFLAGS=$ac_save
-      if test "$pthreads_checked" = "yes"; then
+      if test "$pthreads_working" = "yes"; then
        ac_cv_pthreads_cflags=$flag
        break
      fi
    done
  fi
-  ])
-
-  AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
-  ac_cv_pthreads_lib=
-  if test "$pthreads_working" != "yes"; then
-   for lib in pthread pthreads c_r; do
-      ac_save=$LIBS
-      LIBS="$LIBS -l$lib"
-      PTHREADS_CHECK_COMPILE
-      LIBS=$ac_save
-      if test "$pthreads_checked" = "yes"; then
-        ac_cv_pthreads_lib=$lib
-        break
-      fi
-    done
-  fi
-  ])
-
-  if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
-    pthreads_working="yes"
-  fi
 fi
+])
+
+AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
+ac_cv_pthreads_lib=
+if test "$pthreads_working" != "yes"; then
+  for lib in pthread pthreads c_r; do
+    ac_save=$LIBS
+    LIBS="$LIBS -l$lib"
+    PTHREADS_CHECK_COMPILE
+    LIBS=$ac_save
+    if test "$pthreads_working" = "yes"; then
+      ac_cv_pthreads_lib=$lib
+      break
+    fi
+  done
+fi
+])

 if test "$pthreads_working" = "yes"; then
  threads_result="POSIX-Threads found"
@@ -1,6 +1,5 @@
-m4_include([TSRM/m4/gethostbyname.m4])

-dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)
+dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
 AC_DEFUN([TSRM_CHECK_GCC_ARG],[
  gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
  AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
@@ -33,8 +32,6 @@ AC_CHECK_HEADERS(stdarg.h)

 AC_CHECK_FUNCS(sigprocmask)

-AX_FUNC_WHICH_GETHOSTBYNAME_R()
-
 ])


@@ -75,12 +72,12 @@ AC_DEFUN([TSRM_CHECK_ST],[
 sinclude(threads.m4)

 AC_DEFUN([TSRM_CHECK_PTHREADS],[
-
+		
 PTHREADS_CHECK

-if test "$beos_threads" = "1"; then
+if test "$beos_threads" = "1"; then 
  AC_DEFINE(BETHREADS, 1, Whether to use native BeOS threads)
-else
+else		
  if test "$pthreads_working" != "yes"; then
    AC_MSG_ERROR(Your system seems to lack POSIX threads.)
  fi
@@ -92,6 +89,7 @@ else
 fi
 ])

+
 AC_DEFUN([TSRM_THREADS_CHECKS],[

 dnl For the thread implementations, we always use --with-*
@@ -42,10 +42,7 @@ char *alloca ();
 #endif

 #ifndef MAXPATHLEN
-# if _WIN32
-#  include "win32/ioutil.h"
-#  define MAXPATHLEN PHP_WIN32_IOUTIL_MAXPATHLEN
-# elif PATH_MAX
+# ifdef PATH_MAX
 #  define MAXPATHLEN PATH_MAX
 # elif defined(MAX_PATH)
 #  define MAXPATHLEN MAX_PATH
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -33,7 +33,6 @@
 #include <Sddl.h>
 #include "tsrm_win32.h"
 #include "zend_virtual_cwd.h"
-#include "win32/ioutil.h"

 #ifdef ZTS
 static ts_rsrc_id win32_globals_id;
@@ -50,7 +49,7 @@ TSRMLS_CACHE_UPDATE();
 	globals->shm	 = NULL;
 	globals->process_size = 0;
 	globals->shm_size	  = 0;
-	globals->comspec = _strdup("cmd.exe");
+	globals->comspec = _strdup((GetVersion()<0x80000000)?"cmd.exe":"command.com");

 	/* Set it to INVALID_HANDLE_VALUE
 	 * It will be initialized correctly in tsrm_win32_access or set to
@@ -208,42 +207,29 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 	DWORD sec_desc_length = 0, desired_access = 0, granted_access = 0;
 	BYTE * psec_desc = NULL;
 	BOOL fAccess = FALSE;
+
 	realpath_cache_bucket * bucket = NULL;
 	char * real_path = NULL;

-	PHP_WIN32_IOUTIL_INIT_W(pathname)
-	if (!pathw) {
-		return -1;
-	}
-
 	if (mode == 1 /*X_OK*/) {
 		DWORD type;
-		int ret;
-
-		ret = GetBinaryTypeW(pathw, &type) ? 0 : -1;
-
-		PHP_WIN32_IOUTIL_CLEANUP_W()
-
-		return ret;
+		return GetBinaryType(pathname, &type) ? 0 : -1;
 	} else {
 		if(!IS_ABSOLUTE_PATH(pathname, strlen(pathname)+1)) {
-			real_path = (char *)malloc(MAXPATHLEN);
+			real_path = (char *)malloc(MAX_PATH);
 			if(tsrm_realpath(pathname, real_path) == NULL) {
 				goto Finished;
 			}
 			pathname = real_path;
-			PHP_WIN32_IOUTIL_REINIT_W(pathname);
 		}

-		if(php_win32_ioutil_access(pathname, mode)) {
-			PHP_WIN32_IOUTIL_CLEANUP_W()
+		if(access(pathname, mode)) {
 			free(real_path);
 			return errno;
 		}

 		/* If only existence check is made, return now */
 		if (mode == 0) {
-			PHP_WIN32_IOUTIL_CLEANUP_W()
 			free(real_path);
 			return 0;
 		}
@@ -299,11 +285,10 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 			if(bucket == NULL && real_path == NULL) {
 				/* We used the pathname directly. Call tsrm_realpath */
 				/* so that entry is created in realpath cache */
-				real_path = (char *)malloc(MAXPATHLEN);
+				real_path = (char *)malloc(MAX_PATH);
 				if(tsrm_realpath(pathname, real_path) != NULL) {
 					pathname = real_path;
 					bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t);
-					PHP_WIN32_IOUTIL_REINIT_W(pathname);
 				}
 			}
 		}
@@ -340,13 +325,13 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 		}

 		/* Get size of security buffer. Call is expected to fail */
-		if(GetFileSecurityW(pathw, sec_info, NULL, 0, &sec_desc_length)) {
+		if(GetFileSecurity(pathname, sec_info, NULL, 0, &sec_desc_length)) {
 			goto Finished;
 		}

 		psec_desc = (BYTE *)malloc(sec_desc_length);
 		if(psec_desc == NULL ||
-			 !GetFileSecurityW(pathw, sec_info, (PSECURITY_DESCRIPTOR)psec_desc, sec_desc_length, &sec_desc_length)) {
+			 !GetFileSecurity(pathname, sec_info, (PSECURITY_DESCRIPTOR)psec_desc, sec_desc_length, &sec_desc_length)) {
 			goto Finished;
 		}

@@ -388,7 +373,6 @@ Finished:
 			real_path = NULL;
 		}

-		PHP_WIN32_IOUTIL_CLEANUP_W()
 		if(fAccess == FALSE) {
 			errno = EACCES;
 			return errno;
@@ -453,7 +437,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;
 }

@@ -475,15 +458,14 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 {
 	FILE *stream = NULL;
 	int fno, type_len, read, mode;
-	STARTUPINFOW startup;
+	STARTUPINFO startup;
 	PROCESS_INFORMATION process;
 	SECURITY_ATTRIBUTES security;
 	HANDLE in, out;
 	DWORD dwCreateFlags = 0;
 	BOOL res;
 	process_pair *proc;
-	char *cmd = NULL;
-	wchar_t *cmdw = NULL, *cwdw = NULL, *envw = NULL;
+	char *cmd;
 	int i;
 	char *ptype = (char *)type;
 	HANDLE thread_token = NULL;
@@ -507,42 +489,18 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 		ptype++;
 	}

-	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
-	if (!cmd) {
-		return NULL;
-	}
-
-	sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
-	cmdw = php_win32_cp_any_to_w(cmd);
-	if (!cmdw) {
-		free(cmd);
-		return NULL;
-	}
-
-	if (cwd) {
-		cwdw = php_win32_ioutil_any_to_w(cwd);
-		if (!cwdw) {
-			free(cmd);
-			free(cmdw);
-			return NULL;
-		}
-	}
-
 	security.nLength				= sizeof(SECURITY_ATTRIBUTES);
 	security.bInheritHandle			= TRUE;
 	security.lpSecurityDescriptor	= NULL;

 	if (!type_len || !CreatePipe(&in, &out, &security, 2048L)) {
-		free(cmdw);
-		free(cwdw);
-		free(cmd);
 		return NULL;
 	}

-	memset(&startup, 0, sizeof(STARTUPINFOW));
+	memset(&startup, 0, sizeof(STARTUPINFO));
 	memset(&process, 0, sizeof(PROCESS_INFORMATION));

-	startup.cb			= sizeof(STARTUPINFOW);
+	startup.cb			= sizeof(STARTUPINFO);
 	startup.dwFlags		= STARTF_USESTDHANDLES;
 	startup.hStdError	= GetStdHandle(STD_ERROR_HANDLE);

@@ -574,28 +532,19 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 		}
 	}

-	envw = php_win32_cp_env_any_to_w(env);
-	if (envw) {
-		dwCreateFlags |= CREATE_UNICODE_ENVIRONMENT;
-	} else {
-		if (env) {
-			free(cmd);
-			free(cmdw);
-			free(cwdw);
-			return NULL;
-		}
+	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
+	if (!cmd) {
+		return NULL;
 	}

+	sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
 	if (asuser) {
-		res = CreateProcessAsUserW(token_user, NULL, cmdw, &security, &security, security.bInheritHandle, dwCreateFlags, envw, cwdw, &startup, &process);
+		res = CreateProcessAsUser(token_user, NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
 		CloseHandle(token_user);
 	} else {
-		res = CreateProcessW(NULL, cmdw, &security, &security, security.bInheritHandle, dwCreateFlags, envw, cwdw, &startup, &process);
+		res = CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
 	}
 	free(cmd);
-	free(cmdw);
-	free(cwdw);
-	free(envw);

 	if (!res) {
 		return NULL;
@@ -649,8 +598,8 @@ 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);
@@ -662,32 +611,15 @@ TSRM_API int shmget(int key, int size, int flags)
 			created		= TRUE;
 		}
 		if (!shm_handle || !info_handle) {
-			if (shm_handle) {
-				CloseHandle(shm_handle);
-			}
-			if (info_handle) {
-				CloseHandle(info_handle);
-			}
 			return -1;
 		}
 	} else {
 		if (flags & IPC_EXCL) {
-			if (shm_handle) {
-				CloseHandle(shm_handle);
-			}
-			if (info_handle) {
-				CloseHandle(info_handle);
-			}
 			return -1;
 		}
 	}

 	shm = shm_get(key, NULL);
-	if (!shm) {
-		CloseHandle(shm_handle);
-		CloseHandle(info_handle);
-		return -1;
-	}
 	shm->segment = shm_handle;
 	shm->info	 = info_handle;
 	shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
@@ -726,18 +658,12 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags)
 		return (void*)-1;
 	}

-	shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
-
-	if (NULL == shm->addr) {
-		int err = GetLastError();
-		SET_ERRNO_FROM_WIN32_CODE(err);
-		return (void*)-1;
-	}
-
 	shm->descriptor->shm_atime = time(NULL);
 	shm->descriptor->shm_lpid  = getpid();
 	shm->descriptor->shm_nattch++;

+	shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
+
 	return shm->addr;
 }

@@ -811,17 +737,10 @@ TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
 {
 	FILETIME mtime, atime;
 	HANDLE hFile;
-	PHP_WIN32_IOUTIL_INIT_W(filename)

-	if (!pathw) {
-		return -1;
-	}
-
-	hFile = CreateFileW(pathw, GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, NULL,
+	hFile = CreateFile(filename, GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, NULL,
 				 OPEN_ALWAYS, FILE_FLAG_BACKUP_SEMANTICS, NULL);

-	PHP_WIN32_IOUTIL_CLEANUP_W()
-
 	/* OPEN_ALWAYS mode sets the last error to ERROR_ALREADY_EXISTS but
 	   the CreateFile operation succeeds */
 	if (GetLastError() == ERROR_ALREADY_EXISTS) {
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -72,7 +72,7 @@ typedef struct {

 #ifdef ZTS
 # define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v)
-TSRMLS_CACHE_EXTERN()
+TSRMLS_CACHE_EXTERN();
 #else
 # define TWG(v) (win32_globals.v)
 #endif
@@ -1,10 +1,26 @@
-PHP 7.1 INTERNALS UPGRADE NOTES
+$Id$
+
+PHP 7.0 INTERNALS UPGRADE NOTES

 0. Wiki Examples
 1. Internal API changes
-  e. Codepage handling on Windows
-  f. Path handling on Windows
-  g. SAPI logging
+  e. New data types
+  f. zend_parse_parameters() specs
+  g. sprintf() formats
+  h. HashTable API
+  i. New portable macros for large file support
+  j. New portable macros for integers
+  k. get_class_entry object handler info
+  l. get_class_name object handler info
+  m. Other portable macros info
+  n. ZEND_ENGINE_2 removal
+  o. Updated final class modifier
+  p. TSRM changes
+  q. gc_collect_cycles() is now hookable
+  r. PDO uses size_t for lengths
+  s. Resource API changes
+  t. Optimized strings concatenation.
+  u. Streams changes

 2. Build system changes
  a. Unix build system changes
@@ -24,56 +40,207 @@ changes. See: https://wiki.php.net/phpng-upgrading
 1. Internal API changes
 ========================

-  e. Codepage handling on Windows
+  e. New data types

-    A set of new APIs was introduced, which allows to handle codepage
-    conversions. The corresponding prototypes and macros are contained
-    in win32/codepage.h.
+     String

-    Functions with php_win32_cp_* signatures provide handling for various
-    codepage aspects. Primarily they are in use at various places in the
-    I/O utils code and directly in the core where necessary, providing
-    conversions to/from UTF-16. Arbitrary conversions between codepages
-    are possible as well, whereby UTF-16 will be always an intermediate
-    state in this case.
+        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.

-    For input length arguments, the macro PHP_WIN32_CP_IGNORE_LEN can be
-    passed, then the API will calculate the length.  For output length
-    arguments, the macro PHP_WIN32_CP_IGNORE_LEN_P can be passed, then
-    the API won't set the output length.
+     Integer types

-    The mapping between encodings and codepages is provided by the predefined
-    array of data contained in win32/cp_enc_map.c. To change the data,
-    a generator win32/cp_enc_map_gen.c needs to be edited and run.
+	Integers do no more depend on the firm 'long' type. Instead a platform
+	dependent integer type is used, it is called zend_long. That datatype is
+	defined dynamically to guarantee the consistent 64 bit support. The zval 
+	field representing user land integer it bound to zend_long.

-  f. Path handling on Windows
+	Signed integer is defined as zend_long, unsigned integer as zend_ulong
+	inside Zend. 

-    A set of new APIs was introduced, which allows to handle UTF-8 paths. The
-    corresponding prototypes and macros are contained in win32/ioutil.h.
+     Other datatypes

-    Functions with php_win32_ioutil_* signatures provide POSIX I/O analogues.
-    These functions are integrated in various places across the code base to
-    support Unicode filenames. While accepting char * arguments, internally
-    the conversion to wchar_t * happens. Internally almost no ANSI APIs are
-    used, but directly their wide equivalents. The string conversion rules
-    correspond to those already present in the core and depend on the current
-    encoding settings. Doing so allows to move away from the ANSI Windows API
-    with its dependency on the system OEM/ANSI codepage.
+	zend_off_t  - portable off_t analogue
+	zend_stat_t - portable 'struct stat' analogue

-    Thanks to the wide API usage, the long paths are now supported as well. The
-    PHP_WIN32_IOUTIL_MAXPATHLEN macro is defined to 2048 bytes and will override
-    the MAXPATHLEN in files where the header is included.
+	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 most optimal use case for scripts is utilizing UTF-8 for any I/O
-    related functions. UTF-8 filenames are supported on any system disregarding
-    the system OEM/ANSI codepage.
+	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

-  g. SAPI logging
-    The log_message callback in the SAPI struct was extended with the severity
-    argument. This allows SAPI modules to implement mapping between PHP and
-    corresponding server error levels. A reference mapping implementation
-    can be found in apache2handler.
+  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_INT_FMT and ZEND_UINT_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.
+  
+  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.
+
+  p. TSRM 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 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:
+
+     - ZEND_TSRMG - based on TSRMG and if static pointer for data pool access is
+       implemented, will use it
+     - ZEND_TSRMLS_CACHE_EXTERN - to be used in a header shared across multiple
+       C/C++ files
+     - ZEND_TSRMLS_CACHE_DEFINE - to be used in the main extension C/C++ file
+     - ZEND_TSRMLS_CACHE_UPDATE - to be integrated at the top of the globals
+       ctor or RINIT function
+     - ZEND_ENABLE_STATIC_TSRMLS_CACHE - to be used in the config.[m4|w32] for
+       enabling the globals access per thread unique pointer
+     - TSRMLS_CACHE - expands to the variable name which links to the thread
+       unique data pool
+
+     Note that usually it will work without implementing the globals access per
+     a thread unique pointer, however it might cause a slowdown. The reason is
+     that the access model to the extension/SAPI own globals as well as the
+     access to the core globals is determined in the compilation phase depending
+     on whether ZEND_ENABLE_STATIC_TSRMLS_CACHE macro is defined. 
+
+     Due to the current compiler evolution state, the TSRMLS_CACHE pointer
+     (when implemented) has to be present and updated in every binary unit which
+     is not compiled statically into PHP. So any DLL, DSO, EXE, etc. has to take
+     care about defining and updating it's TSRMLS cache. An update should happen
+     before any globals was accessed.
+
+     Porting an extension or SAPI is usually as easy as removing all the TSRMLS_*
+     occurrences and integrating the macros mentioned above. However if tsrm_ls
+     is used explicitly, its usage can be considered obsolete in most cases.
+     Additionally, if an extension triggers its own threads, TSRMLS_CACHE shouldn't
+     be passed to that threads directly.
+
+     When working with CTOR/DTOR for the extension globals, only the data passed
+     as parameters should be touched. For example, don't use code like
+     free(MYEXT_G(vars)); inside globals destructor, as it possibly can destroy
+     the data from a wrong thread. Instead use the pointer to the data delivered
+     into the destructor. So the previous example could look like
+     free(my_struct->vars); given the income was casted to (struct my_struct *).
+
+     A new macro was introduced to simplify the declaration to the extension
+     globals. A simplified declaration looks as follows
+
+     #define MYEXT_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(myext, v)
+
+     Another new macro ZEND_MODULE_GLOBALS_BULK(myext) delivers the corresponding
+     globals struct as a whole.
+
+     Two new storage specifiers was introduced.
+
+     ZEND_EXT_TLS - expand to an appropriate thread specific storage specifier in
+                    the thread safe build, expands to empty in a non thread safe
+		    build. 
+     ZEND_TLS     - expands to an appropriate thread specific storage specifier
+                    with static visibility in the thread safe build, expands to
+                    static specifier in a non thread safe build. 
+     
+     Variables declared with these storage specifiers can not be shared across 
+     threads. While ZEND_TLS enforces the local scope visibility, ZEND_EXT_TLS
+     pertains to the visiblity across several compilation units. In both cases,
+     there's no portable way to achieve the visibility across shared objects.
+     Thus, these specifiers are not compatible with ZEND_API and PHPAPI specifiers.
+
+  q. gc_collect_cycles() is now a function pointer, and can be replaced in the
+     same manner as zend_execute_ex() if needed (for example, to include the
+     time spent in the garbage collector in a profiler). The default
+     implementation has been renamed to zend_gc_collect_cycles(), and is
+     exported with ZEND_API.
+
+  r. In accordance with general use of size_t as string length, all PDO API
+     functions now use size_t for string length.
+
+  s. Removed ZEND_REGISTER/FETCH_RESOURCE, use zend_fetch_resource and
+     and zend_register_resource instead, zend_fetch_resource accepts a zend_resource *
+     as first argument, if you still need to fetch a resource from zval, use 
+     zend_fetch_resource_ex. More details can be found in Zend/zend_list.c.
+
+  t. Optimized strings concatenation.
+     ZEND_ADD_STRING/VAR/CHAR are replaced with ZEND_ROPE_INIT, ZEND_ROPE_ADD,
+     ZEND_ROPE_END.
+     Instead of reallocation and copying string on each ZEND_ADD_STRING/VAR/CAHR,
+     collect all the strings and then allocate and construct the resulting string once.
+
+  u. Streams changes
+     - It is possible to do blocking reads on Windows pipes. It can be done either
+       using context stream option PHP_STREAM_OPTION_PIPE_BLOCKING or 
+       adding STREAM_USE_BLOCKING_PIPE when opening the stream.

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

  b. Windows build system changes
-    Static analysis with clang and Cppcheck is supported by passing "clang" or
-    "cppcheck" keyword to the --with-analyzer configure option.
+
+     - 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.
+
@@ -1,25 +1,25 @@
--------------------------------------------------------------------
+-------------------------------------------------------------------- 
                The Zend Engine License, Version 2.00
 Copyright (c) 1999-2006 Zend Technologies Ltd. All rights reserved.
--------------------------------------------------------------------
+-------------------------------------------------------------------- 

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

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

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

--------------------------------------------------------------------
+-------------------------------------------------------------------- 
@@ -53,3 +53,4 @@ depend:

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


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

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

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

-zend_vm_gen.php can produce different kind of executors. You can select
-different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can
+zend_vm_gen.php can produce different kind of executors. You can select 
+different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can 
 disable opcode specialization using --without-specializer. You can include or
 exclude old executor together with specialized one using --without-old-executor.
 At last you can debug executor using original zend_vm_def.h or generated file
@@ -105,3 +105,4 @@ Zend Engine II currently includes two executors during the build process, one
 is the specialized version and the other is the old one non-specialized with
 function handlers. By default Zend Engine II uses the specialized one but you
 can switch to the old executor at runtime by calling zend_vm_use_old_executor().
+
@@ -51,7 +51,7 @@ $object = new MyClass(); $object->method();
 The previous code will assign $object the handle of a new instance of
 the class MyClass and call one of its methods.

-
+ 
 Consider the following code:

 1	class MyClass
@@ -60,18 +60,18 @@ Consider the following code:
 4		{
 5			$this->member = $value;
 6		}
-7
+7	
 8		function getMember()
 9		{
 10			return $this->member;
 11		}
 12	}
-13
+13	
 14	function foo($obj)
 15	{
 16		$obj->setMember("foo");
 17	}
-18
+18	
 19	$object = new MyClass();
 20	$object->setMember("bar");
 21	foo($object);
@@ -133,3 +133,4 @@ The new object model is not dependent on other features.  Many of the
 other Zend Engine 2.0 features, such as the $foo->bar()->barbara()
 syntax, destructors and others completely rely on this new object
 model.
+
@@ -4,7 +4,7 @@ Status:          declined
 Maintainer:      Stig S. Bakken <ssb@php.net>
 Created:         2001-09-08
 Modified:        2001-09-08
-
+                  

 1. Background/Need
 ==================
@@ -87,7 +87,7 @@ file.  If no "namespace" operator occurs in the file, it will be in
 the global namespace:

 1 namespace HTML;
- 2
+ 2 
 3 class Form {
 4     function Form() {
 5         // constructor
@@ -98,7 +98,7 @@ the global namespace:
 Or with the "nested" name syntax:

 1 namespace HTML:Form;
- 2
+ 2 
 3 class Image {
 4     var $src;
 5     function Image($src) {
@@ -66,3 +66,7 @@ following could not reliably run.

 Old code that does not take advantage of this will run without
 modifications.
+
+
+
+
@@ -7,10 +7,10 @@ dnl
 AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[
 AC_MSG_CHECKING(for $1)
 AC_TRY_COMPILE([
-#if HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H  
 #include <sys/types.h>
 #endif
-#if HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H  
 #include <inttypes.h>
 #elif HAVE_STDINT_H
 #include <stdint.h>
@@ -100,7 +100,7 @@ AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp)
 AC_ZEND_BROKEN_SPRINTF

-AC_CHECK_DECLS([isfinite, isnan, isinf], [], [], [[#include <math.h>]])
+AC_CHECK_FUNCS(finite isfinite isinf isnan)

 ZEND_FP_EXCEPT

@@ -137,7 +137,7 @@ int main()
 ], [
  AC_MSG_RESULT(no)
 ])
-
+	
 ])

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

 ])

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

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

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

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

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


 AC_ARG_ENABLE(zend-signals,
-[  --disable-zend-signals  whether to enable zend signal handling],[
+[  --enable-zend-signals   Use zend signal handling],[
  ZEND_SIGNALS=$enableval
 ],[
-  ZEND_SIGNALS=yes
-])
+  ZEND_SIGNALS=no
+])  

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

 ])

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

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

 AC_ARG_ENABLE(gcc-global-regs,
-[  --disable-gcc-global-regs
+[  --disable-gcc-global-regs 
                          whether to enable GCC global register variables],[
  ZEND_GCC_GLOBAL_REGS=$enableval
 ],[
@@ -421,6 +421,7 @@ AC_ARG_ENABLE(gcc-global-regs,
 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
@@ -435,9 +436,6 @@ if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
 #elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__powerpc64__)
 # define ZEND_VM_FP_GLOBAL_REG "r28"
 # define ZEND_VM_IP_GLOBAL_REG "r29"
-#elif defined(__IBMC__) && ZEND_GCC_VERSION >= 4002 && defined(__powerpc64__)
-# define ZEND_VM_FP_GLOBAL_REG "r28"
-# define ZEND_VM_IP_GLOBAL_REG "r29"
 #else
 # error "global register variables are not supported"
 #endif
@@ -453,7 +451,6 @@ int emu(const opcode_handler_t *ip, void *fp) {
 	FP = orig_fp;
 	IP = orig_ip;
 }
-  ], [
  ], [
    ZEND_GCC_GLOBAL_REGS=yes
  ], [
@@ -7,7 +7,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
  # min: 2.4 (i.e. 204, major * 100 + minor for easier comparison)
  bison_version_min="204"
  # non-working versions, e.g. "3.0 3.2";
-  # remove "none" when introducing the first incompatible bison version an
+  # remove "none" when introducing the first incompatible bison version an 
  # separate any following additions by spaces
  bison_version_exclude=""

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

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

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

 /****/

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

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

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

 /****/

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

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


 LT_TARGETS = ltmain.sh ltconfig
@@ -34,7 +34,7 @@ aclocal.m4: configure.in acinclude.m4
 	aclocal

 $(config_h_in): configure.in
-# explicitly remove target since autoheader does not seem to work
+# explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
 	autoheader
@@ -30,3 +30,4 @@ if cmp configure.old configure > /dev/null 2>&1; then
 else
    echo "buildconf: created or modified ${1}configure"
 fi
+
@@ -64,33 +64,33 @@ int zend_sprintf(char *buffer, const char *format, ...);

 /* To enable the is_nan, is_infinite and is_finite PHP functions */
 #ifdef NETWARE
-	#define HAVE_DECL_ISNAN 1
-	#define HAVE_DECL_ISINF 1
-	#define HAVE_DECL_ISFINITE 1
+	#define HAVE_ISNAN 1
+	#define HAVE_ISINF 1
+	#define HAVE_ISFINITE 1
 #endif

 #ifndef zend_isnan
-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
+#ifdef HAVE_ISNAN
 #define zend_isnan(a) isnan(a)
 #elif defined(HAVE_FPCLASS)
 #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
 #else
-#define zend_isnan(a) ((a) != (a))
+#define zend_isnan(a) 0
 #endif
 #endif

-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
+#ifdef HAVE_ISINF
 #define zend_isinf(a) isinf(a)
 #elif defined(INFINITY)
 /* Might not work, but is required by ISO C99 */
-#define zend_isinf(a) (((a)==INFINITY || (a)==-INFINITY)?1:0)
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
 #elif defined(HAVE_FPCLASS)
 #define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
 #else
 #define zend_isinf(a) 0
 #endif

-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
+#if defined(HAVE_ISFINITE) || defined(isfinite)
 #define zend_finite(a) isfinite(a)
 #elif defined(HAVE_FINITE)
 #define zend_finite(a) finite(a)
@@ -4,12 +4,12 @@ function hallo() {
 }

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

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

@@ -17,7 +17,7 @@ function hallo2() {
 }

 function simpleicall($n) {
-  for ($i = 0; $i < $n; $i++)
+  for ($i = 0; $i < $n; $i++) 
    func_num_args();
 }

@@ -17,20 +17,11 @@ function test3($a, $b) {

 test1();
 test2(1);
-try {
-	test2();
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
-
+test2();
 test3(1,2);

 call_user_func("test1");
-try {
-	call_user_func("test3", 1);
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
+call_user_func("test3", 1);
 call_user_func("test3", 1, 2);

 class test {
@@ -44,13 +35,17 @@ var_dump(func_num_args());

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 int(0)
 int(1)
-Exception: Too few arguments to function test2(), 0 passed in %s001.php on line 18 and exactly 1 expected
+
+Warning: Missing argument 1 for test2(), called in %s on line %d
+int(0)
 int(2)
 int(0)
-Exception: Too few arguments to function test3(), 1 passed in %s001.php on line 27 and exactly 2 expected
+
+Warning: Missing argument 2 for test3()%s
+int(1)
 int(2)
 int(1)

@@ -23,19 +23,11 @@ function test3($a, $b) {
 test1();
 test1(10);
 test2(1);
-try {
-	test2();
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
+test2();
 test3(1,2);

 call_user_func("test1");
-try {
-	call_user_func("test3", 1);
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
+call_user_func("test3", 1);
 call_user_func("test3", 1, 2);

 class test {
@@ -50,7 +42,7 @@ var_dump(func_get_arg(1));

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
 bool(false)

@@ -70,7 +62,14 @@ int(1)

 Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
 bool(false)
-Exception: Too few arguments to function test2(), 0 passed in %s002.php on line %d and exactly 1 expected
+
+Warning: Missing argument 1 for test2(), called in %s on line %d and defined in %s on line %d
+
+Warning: func_get_arg():  Argument 0 not passed to function in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
+bool(false)
 int(1)
 int(2)

@@ -85,7 +84,15 @@ bool(false)

 Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
 bool(false)
-Exception: Too few arguments to function test3(), 1 passed in %s002.php on line %d and exactly 2 expected
+
+Warning: Missing argument 2 for test3()%s
+int(1)
+
+Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  Argument 2 not passed to function in %s on line %d
+bool(false)
 int(1)
 int(2)

@@ -18,19 +18,11 @@ function test3($a, $b) {
 test1();
 test1(10);
 test2(1);
-try {
-	test2();
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
+test2();
 test3(1,2);

 call_user_func("test1");
-try {
-	call_user_func("test3", 1);
-} catch (Throwable $e) {
-	echo "Exception: " . $e->getMessage() . "\n";
-}
+call_user_func("test3", 1);
 call_user_func("test3", 1, 2);

 class test {
@@ -44,7 +36,7 @@ var_dump(func_get_args());

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 array(0) {
 }
 array(1) {
@@ -55,7 +47,10 @@ array(1) {
  [0]=>
  int(1)
 }
-Exception: Too few arguments to function test2(), 0 passed in %s003.php on line %d and exactly 1 expected
+
+Warning: Missing argument 1 for test2(), called in %s on line %d and defined in %s on line %d
+array(0) {
+}
 array(2) {
  [0]=>
  int(1)
@@ -64,7 +59,12 @@ array(2) {
 }
 array(0) {
 }
-Exception: Too few arguments to function test3(), 1 passed in %s003.php on line %d and exactly 2 expected
+
+Warning: Missing argument 2 for test3()%s
+array(1) {
+  [0]=>
+  int(1)
+}
 array(2) {
  [0]=>
  int(1)
@@ -12,7 +12,7 @@ var_dump(strncmp("qwerty", "qwerty123", 7));

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

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

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

@@ -21,7 +21,7 @@ var_dump(each($a));

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

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

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

@@ -29,7 +29,7 @@ var_dump(get_class($f2));

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 Deprecated: Non-static method foo::bar() should not be called statically in %s on line %d
 string(3) "foo"

@@ -41,7 +41,7 @@ var_dump(get_parent_class(1));

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

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

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

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

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

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

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

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

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

 echo "Done\n";
 ?>
--EXPECT--
+--EXPECT--	
 Done
@@ -26,6 +26,7 @@ var_dump(count(get_defined_constants()));
 function test () {
 }

+var_dump(get_defined_functions(true));
 var_dump(gettype(get_defined_functions()));
 var_dump(count(get_defined_functions()));

@@ -43,7 +44,7 @@ var_dump(count(get_extension_funcs("zend")));

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

@@ -64,6 +65,9 @@ NULL
 string(5) "array"
 string(5) "array"
 int(%d)
+
+Warning: get_defined_functions() expects exactly 0 parameters, 1 given in %s on line %d
+NULL
 string(5) "array"
 int(%d)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

-		$this->baz();
+		$this->baz();		
 	}
-
+	
 	public function baz() {
 		foreach ($this as $k => $v) {
 			printf("'%s' => '%s'\n", $k, $v);
-		}
+		}		
 		print "ok\n";
 	}
 }
@@ -31,4 +31,40 @@ $test->bar();

 ?>
 --EXPECTF--
-Fatal error: Cannot re-assign $this in %s030.php on line 11
+object(Exception)#%d (7) {
+  ["message":protected]=>
+  string(3) "foo"
+  ["string":"Exception":private]=>
+  string(0) ""
+  ["code":protected]=>
+  int(0)
+  ["file":protected]=>
+  string(%d) "%s030.php"
+  ["line":protected]=>
+  int(%d)
+  ["trace":"Exception":private]=>
+  array(1) {
+    [0]=>
+    array(6) {
+      ["file"]=>
+      string(%d) "%s030.php"
+      ["line"]=>
+      int(%d)
+      ["function"]=>
+      string(3) "bar"
+      ["class"]=>
+      string(3) "foo"
+      ["type"]=>
+      string(2) "->"
+      ["args"]=>
+      array(0) {
+      }
+    }
+  }
+  ["previous":"Exception":private]=>
+  NULL
+}
+'test' => '0'
+'test_2' => '1'
+'test_3' => '2'
+ok
@@ -1,7 +1,7 @@
 --TEST--
 Testing array with '[]' passed as argument by value
 --FILE--
-<?php
+<?php 

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

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

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

@@ -17,6 +17,7 @@ $arr[][]->bar = 2;

 ?>
 --EXPECTF--
+
 Notice: Undefined variable: arr in %s on line %d

 Notice: Undefined variable: arr in %s on line %d
@@ -1,7 +1,7 @@
 --TEST--
 Testing multiples 'default:' in switch
 --FILE--
-<?php
+<?php 

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

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

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

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

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

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

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

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

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

 ?>
--EXPECTF--
+--EXPECTF--	
 var1 value
 var2 value
 in func1
@@ -29,7 +29,7 @@ var_dump($c);

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 array(3) {
  [0]=>
  int(1)
@@ -19,7 +19,7 @@ var_dump($c);

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 Notice: Object of class stdClass could not be converted to int in %sadd_002.php on line %d

 Exception: Unsupported operand types
@@ -1,5 +1,5 @@
 --TEST--
-adding arrays to objects
+adding arrays to objects 
 --FILE--
 <?php

@@ -19,7 +19,7 @@ var_dump($c);

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 Notice: Object of class stdClass could not be converted to int in %sadd_003.php on line %d

 Exception: Unsupported operand types
@@ -16,7 +16,7 @@ var_dump($c);

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 Exception: Unsupported operand types

 Fatal error: Uncaught Error: Unsupported operand types in %s:%d
@@ -16,7 +16,7 @@ var_dump($c);

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 float(2834756759.1231)
 float(2834756759.1231)
 Done
@@ -37,19 +37,12 @@ var_dump($c);

 echo "Done\n";
 ?>
--EXPECTF--
-Warning: A non-numeric value encountered in %s on line %d
+--EXPECTF--	
 int(75636)
-
-Notice: A non well formed numeric value encountered in %s on line %d
 int(951858)
 int(48550510)
 float(75661.68)
-
-Warning: A non-numeric value encountered in %s on line %d
 int(75636)
-
-Notice: A non well formed numeric value encountered in %s on line %d
 int(951858)
 int(48550510)
 float(75661.68)
Author	SHA1	Message	Date
Anatol Belski	1674bd9b15	sync NEWS	2015-08-05 06:56:40 +02:00
Anatol Belski	69168b4d0c	Merge branch 'master' into PHP-7.0.0 * master: (24 commits) 5.5.29 next fix merge fix test fix merge fix test virtual_file_ex uses emalloc in 5.6+ __wakeup doesn't have to be final update NEWS fix test update NEWS Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fixed bug #70098 (Real memory usage doesn't decrease) Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes ...	2015-08-05 06:15:16 +02:00
Anatol Belski	02f762f146	sync NEWS	2015-08-04 20:20:01 +02:00
Anatol Belski	738729274f	set versions	2015-08-04 20:18:28 +02:00
Anatol Belski	72bbde5e78	Merge branch 'master' into PHP-7.0.0 * master: run credits script	2015-08-04 20:16:27 +02:00
Anatol Belski	29f0493075	Merge branch 'master' into PHP-7.0.0 * master: (174 commits) Fixed possible access to uninitialized data (prevents valgrind issues in Zend/tests/bug70089.phpt) Added NEWS entry Get rid of ZEND_FAST_CALL_UNBOUND Move most "finally" related code-generation from pass_two() to compiler. Try to fix finally issue Fix further leaks Fix valgrind errors in phpdbg Fix last invalid read Also revert debugging run-tests.php changes... Fix a few valgrind errors in phpdbg Fix breaking on HANDLE_EXCEPTION (opline_before_exception) Remove unneded space(s) Fixed tests (system dependent numbers are replaced with %d) Fixed test updated UPGRADING Give better credit in NEWS Fixed bug #70182 (Segfault in ZEND_ASSIGN_OP handlers) more info for UPGRADING.INTERNALS updated NEWS Fixed bug #70183 null pointer deref (segfault) in zend_eval_const_expr fix inconsistent dll linkage ...	2015-08-04 11:38:46 +02:00
Anatol Belski	0f60a746e4	fix merge mistake	2015-07-21 05:55:54 -07:00
Anatol Belski	735a7c6a56	one more test from `ef1b588f6a`	2015-07-21 05:52:12 -07:00
Anatol Belski	94e7c770ba	readd test from `3bb70fe290`	2015-07-21 05:51:09 -07:00
Anatol Belski	26abfc8bc9	readd commit `3bb70fe290`	2015-07-21 05:49:36 -07:00
Anatol Belski	ec4350e4c8	bump versions	2015-07-21 12:40:58 +02:00
Anatol Belski	3e971e7d5c	sync NEWS	2015-07-21 12:34:30 +02:00
Anatol Belski	b148ef4496	Merge branch 'master' into PHP-7.0.0 * master: (204 commits) Reverted `ad4533fdba` update UPGRADING updated NEWS fix comment libwebp support for linux Replaced libvpx by libwebp (first draft; Windows only) update news with bug #70022 Change E_ERROR and some E_WARNING to E_RECOVERABLE_ERROR. Add tests for json_last_error()/json_last_error_msg() failures updated NEWS updated NEWS Exclude opcache from a few opcode related tests updated NEWS updated NEWS Fix #66387: Stack overflow with imagefilltoborder Fix various Windows issues (e.g. dir separators) Remove bogus exception_save() from FETCH_CLASS Fix readline/libedit build Do not use readline when not having a tty This is important for e.g. run-tests.php Add show_unexecuted option to phpdbg_end_oplog() ... Conflicts: Zend/tests/temporary_cleaning_001.phpt Zend/tests/temporary_cleaning_003.phpt Zend/tests/temporary_cleaning_004.phpt Zend/tests/temporary_cleaning_005.phpt Zend/zend_compile.c Zend/zend_compile.h sapi/phpdbg/phpdbg_opcode.c	2015-07-21 12:27:50 +02:00
Anatol Belski	ad8a73dd55	Revert "Fixed bug #62210 (Exceptions can leak temporary variables. As a part of the fix serious refactoring was done. op_array->brk_cont_array was removed, and replaced with more general and speed efficient op_array->T_liveliness. ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time). (Bob, Dmitry, Laruence)" This reverts commit `5ee8413259`.	2015-07-10 12:06:56 +02:00
Anatol Belski	ceefc0947a	Revert "Tuned off dubugging of live ranges" This reverts commit `404dc93d35`.	2015-07-10 12:06:33 +02:00
Anatol Belski	2928e412e6	Revert "Remove loop_var_stack" This reverts commit `b3a4c05071`.	2015-07-10 12:06:06 +02:00
Anatol Belski	770571bce9	Revert "ZEND_SEPARATE reuses temporaries" This reverts commit `dfe6fdaa72`.	2015-07-10 12:05:43 +02:00
Anatol Belski	6cdf477254	Revert "Add assertion in liveliness computation" This reverts commit `62062dcd0e`.	2015-07-10 12:05:35 +02:00
Anatol Belski	5784b8f8e6	Revert "Fixed invalid live-range detection" This reverts commit `724e98498a`.	2015-07-10 12:05:26 +02:00
Anatol Belski	ee573eba67	fixed NEWS	2015-07-09 17:34:49 +02:00
Dmitry Stogov	724e98498a	Fixed invalid live-range detection	2015-07-09 17:26:01 +02:00
Nikita Popov	62062dcd0e	Add assertion in liveliness computation Assert that a live-range does not start, while one for the same variable is already active. To satisfy this constraint, explicitly exclude writes from JMP_SET and COALESCE. They were previously also handled correctly, because their result variable was only killed after the second write to it after the false branch. This just makes it more explicit.	2015-07-09 17:25:42 +02:00
Nikita Popov	dfe6fdaa72	ZEND_SEPARATE reuses temporaries	2015-07-09 17:25:26 +02:00
Anatol Belski	8d09c84bd3	update NEWS	2015-07-08 01:35:42 +02:00
Anatol Belski	955303ddc8	bump the versions	2015-07-08 01:20:10 +02:00
Anatol Belski	2a0e037c0d	Merge branch 'master' into PHP-7.0.0 * master: (282 commits) Remove loop_var_stack SQLite3::open/__construct has 2 optional args Better fix for bug #69958 Better fix for bug #69958 Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Use NULL where possible for exception class Allow NULL for exception_ce fix C89 compat Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file fix C89 compat added info about the user space stream context for pipes mention pcre.jit in the supplied php.ini-* Fix test related to `c22da81` add missing second argument for ucfirst to the proto ...	2015-07-08 01:17:19 +02:00
Anatol Belski	9876b2c2cf	sync NEWS	2015-06-23 19:33:33 +02:00
Anatol Belski	5ea2b70645	bump version	2015-06-23 19:32:58 +02:00
Anatol Belski	29711264a8	Merge branch 'master' into PHP-7.0.0 * master: (239 commits) Moved NEWS entry for bug #69864 to proper category Moved NEWS entry for bug #69864 to proper category Moved NEWS entry for bug #69864 to proper category updated NEWS updated NEWS Fixed two errors in LDAP tests Fixed two errors in LDAP tests Revert "Simplify php_implode(). Fill the resulting string in direct order." The patch slightly improved performance of string imploding, but reduced speed of integers imploding. Encapsulate FastCGI implementation details. Previously fcgi_request defined in main/fastcgi.h might be treated differently in different files, because of different behavior of #ifdef TCP_NODELAY. This leaded to stack memory corruption and unpredictable crashes. Fixed bug #69905 (null ptr deref and segfault in ZEND_FETCH_DIM_RW_SPEC_VAR_UNUSED_HANDLER) updated NEWS Fixed bug #69864 (Segfault in preg_replace_callback) Simplify php_implode(). Fill the resulting string in direct order. bump API version to 6.8 bump API version to 6.8 bump API version to 6.8 Drop duplicate object-to-type notices Added comments Drop superfluous __toString handling code This macro is defined in zend_virtual_cwd.h, avoid redef ...	2015-06-23 18:49:42 +02:00
Ferenc Kovacs	dbf30365aa	Merge remote-tracking branch 'origin/master' into PHP-7.0.0 * origin/master: add missing NEWS entries add missing NEWS entries Fixed bug #69646 (OS command injection vulnerability in escapeshellarg) add NEWS Fixed bug #68776 fix test update NEWS fix typo Fix bug #69646 OS command injection vulnerability in escapeshellarg Fix #69719 - more checks for nulls in paths fix test description Fixed Buf #68812 Unchecked return value.	2015-06-10 10:49:51 +02:00
Ferenc Kovacs	9cb8cb4797	Merge branch 'master' into PHP-7.0.0 * master: fix hard-coded path in test	2015-06-09 16:42:24 +02:00
Ferenc Kovacs	8a884d628b	7.0.0alpha1	2015-06-09 14:24:39 +02:00