This commit was manufactured by cvs2svn to create tag

'BEFORE_NEW_OUTPUT_API'.
2026-11-08 17:50:50 +00:00 · 2006-06-02 16:15:59 +00:00
15625 changed files with 479167 additions and 1902642 deletions
@@ -1,150 +1,23 @@
-define set_ts
-	set $tsrm_ls = $arg0
-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 
-	of frame info.
-end
-
 define ____executor_globals
 	if basic_functions_module.zts
-		if !$tsrm_ls
-			set $tsrm_ls = ts_resource_ex(0, 0)
-		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 $tsrm_ls = ts_resource_ex(0, 0)
+		set $eg = ((zend_executor_globals) (*((void ***) $tsrm_ls))[executor_globals_id-1])
 	else
 		set $eg = executor_globals
-		set $cg = compiler_globals
 	end
 end

 document ____executor_globals
-	portable way of accessing executor_globals, set $eg
-	this also sets compiler_globals to $cg
+	portable way of accessing executor_globals
 	ZTS detection is automatically based on ext/standard module struct
 end

-define print_cvs
-	____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
-end
-
 define dump_bt
 	set $t = $arg0
 	while $t
-		printf "[%p] ", $t
-		set $fst = $t->function_state
-		if $fst.function->common.function_name
-			if $fst.arguments
-				set $count = (int)*($fst.arguments)
-
-				if $t->object
-					if $fst.function.common.scope
-						printf "%s->", $fst.function.common.scope->name
-					else
-						if !$eg
-							____executor_globals
-						end
-
-						set $known_class = 0
-						if $eg
-							set $handle = $t->object.value.obj.handle
-							set $handlers = $t->object.value.obj.handlers
-							set $zobj = (zend_object *)$eg.objects_store.object_buckets[$handle].bucket.obj.object
-
-							if $handlers->get_class_entry == &zend_std_object_get_class
-								set $known_class = 1
-
-								if $handlers.get_class_name
-									if $handlers.get_class_name != &zend_std_object_get_class_name
-										set $known_class = 0
-									end
-								end
-
-								if $known_class
-									printf "%s->", $zobj->ce.name
-								end
-							end
-						end
-
-						if !$known_class
-							printf "(Unknown)->"
-						end
-					end
-				else
-					if $fst.function.common.scope
-						printf "%s::", $fst.function.common.scope->name
-					end
-				end
-
-				printf "%s(", $fst.function->common.function_name
-				while $count > 0
-					set $zvalue = *(zval **)($fst.arguments - $count)
-					set $type = $zvalue->type
-					if $type == 0
-						printf "NULL"
-					end
-					if $type == 1
-						printf "%ld", $zvalue->value.lval
-					end
-					if $type == 2
-						printf "%lf", $zvalue->value.dval
-					end
-					if $type == 3
-						if $zvalue->value.lval
-							printf "true"
-						else
-							printf "false"
-						end
-					end
-					if $type == 4
-						printf "array(%d)[%p]", $zvalue->value.ht->nNumOfElements, $zvalue
-					end
-					if $type == 5
-						printf "object[%p]", $zvalue
-					end
-					if $type == 6
-						____print_str $zvalue->value.str.val $zvalue->value.str.len
-					end
-					if $type == 7
-						printf "resource(#%d)", $zvalue->value.lval
-					end
-					if $type == 8
-						printf "constant"
-					end
-					if $type == 9
-						printf "const_array"
-					end
-					if $type > 9
-						printf "unknown type %d", $type
-					end
-					set $count = $count -1
-					if $count > 0
-						printf ", "
-					end
-				end
-				printf ") "
-			else
-				printf "%s() ", $fst.function->common.function_name
-			end
+		printf "[0x%08x] ", $t
+		if $t->function_state.function->common.function_name
+			printf "%s() ", $t->function_state.function->common.function_name
 		else
 			printf "??? "
 		end
@@ -160,6 +33,55 @@ document dump_bt
 	dumps the current execution stack. usage: dump_bt executor_globals.current_execute_data
 end

+define printztype
+	____printz_type $arg0
+	printf "\n"
+end
+
+document printztype
+	prints the type name of a zval type
+end
+
+define ____printz_type
+	set $type = $arg0
+	if $type == 0
+		printf "NULL"
+	end
+	if $type == 1
+		printf "long"
+	end
+	if $type == 2
+		printf "double"
+	end
+	if $type == 3
+		printf "bool"
+	end
+	if $type == 4
+		printf "array"
+	end
+	if $type == 5
+		printf "object"
+	end
+	if $type == 6
+		printf "string"
+	end
+	if $type == 7
+		printf "resource"
+	end
+	if $type == 8 
+		printf "constant"
+	end
+	if $type == 9
+		printf "const_array"
+	end
+	if $type == 10
+		printf "unicode string"
+	end
+	if $type > 10
+		printf "unknown type %d", $type
+	end
+end
+
 define printzv
 	set $ind = 1
 	____printzv $arg0 0 
@@ -173,34 +95,30 @@ define ____printzv_contents
 	set $zvalue = $arg0
 	set $type = $zvalue->type

-	printf "(refcount=%d", $zvalue->refcount__gc
-	if $zvalue->is_ref__gc
-		printf ",is_ref"
-	end
-	printf ") "
+	printf "(refcount=%d) ", $zvalue->refcount
 	if $type == 0
 		printf "NULL"
 	end
+	____printz_type $type
 	if $type == 1
-		printf "long: %ld", $zvalue->value.lval
+		printf ": %ld", $zvalue->value.lval
 	end
 	if $type == 2
-		printf "double: %lf", $zvalue->value.dval
+		printf ": %lf", $zvalue->value.dval
 	end
 	if $type == 3
-		printf "bool: "
 		if $zvalue->value.lval
-			printf "true"
+			printf ": true"
 		else
-			printf "false"
+			printf ": false"
 		end
 	end
 	if $type == 4
-		printf "array(%d): ", $zvalue->value.ht->nNumOfElements
+		printf "(%d): ", $zvalue->value.ht->nNumOfElements
 		if ! $arg1
 			printf "{\n"
 			set $ind = $ind + 1
-			____print_ht $zvalue->value.ht 1
+			____print_ht $zvalue->value.ht 0
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0
@@ -212,7 +130,6 @@ define ____printzv_contents
 		set $type = 0
 	end
 	if $type == 5
-		printf "object"
 		____executor_globals
 		set $handle = $zvalue->value.obj.handle
 		set $handlers = $zvalue->value.obj.handlers
@@ -222,7 +139,7 @@ define ____printzv_contents
 			set $zobj = zend_objects_get_address($zvalue)
 		end
 		if $handlers->get_class_entry == &zend_std_object_get_class
-			set $cname = $zobj->ce.name
+			set $cname = $zobj->ce.name.s
 		else
 			set $cname = "Unknown"
 		end
@@ -250,20 +167,19 @@ define ____printzv_contents
 		set $type = 0
 	end
 	if $type == 6
-		printf "string(%d): ", $zvalue->value.str.len
-		____print_str $zvalue->value.str.val $zvalue->value.str.len
+		printf "(%d): \"%s\"", $zvalue->value.str.len, $zvalue->value.str.val
 	end
 	if $type == 7
-		printf "resource: #%d", $zvalue->value.lval
+		printf ": #%d", $zvalue->value.lval
 	end
 	if $type == 8 
-		printf "constant"
 	end
 	if $type == 9
-		printf "const_array"
 	end
-	if $type > 9
-		printf "unknown type %d", $type
+	if $type == 10
+		printf "(%d): [%p]", $zvalue->value.str.len, $zvalue->value.str.val
+	end
+	if $type > 10
 	end
 	printf "\n"
 end
@@ -272,7 +188,7 @@ define ____printzv
 	____executor_globals
 	set $zvalue = $arg0

-	printf "[%p] ", $zvalue
+	printf "[0x%08x] ", $zvalue

 	if $zvalue == $eg.uninitialized_zval_ptr
 		printf "*uninitialized* "
@@ -299,9 +215,8 @@ define ____print_const_table
 			set $i = $i - 1
 		end

-		if $p->nKeyLength > 0
-			____print_str $p->arKey $p->nKeyLength
-			printf " => "
+		if $p->nKeyLength > 0 
+			printf "\"%s\" => ", $p->key.arKey.s
 		else
 			printf "%d => ", $p->h
 		end
@@ -313,16 +228,19 @@ end

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

 define ____print_ht
-	set $ht = (HashTable*)$arg0
+	set $ht = $arg0
+	set $obj = $arg1
 	set $p = $ht->pListHead

 	while $p != 0
+		set $zval = *(zval **)$p->pData
+
 		set $i = $ind
 		while $i > 0
 			printf "  "
@@ -330,31 +248,32 @@ define ____print_ht
 		end

 		if $p->nKeyLength > 0
-			____print_str $p->arKey $p->nKeyLength
-			printf " => "
+			if $obj && $p->key.arKey.s[0] == 0
+				if $p->key.arKey.s[1] == '*'
+					printf "\"protected %s\" => ", $p->key.arKey.s+3
+				else
+					set $n = 1
+					while $n < $p->nKeyLength && $p->key.arKey.s[$n] != 0
+						set $n = $n + 1
+					end
+					printf "\"private %s::%s\" => ", $p->key.arKey.s+1, $p->key.arKey.s+$n+1
+				end
+			else
+				printf "\"%s\" => ", $p->key.arKey.s
+			end
 		else
 			printf "%d => ", $p->h
 		end
-		
-		if $arg1 == 0
-			printf "%p\n", (void*)$p->pData
-		end
-		if $arg1 == 1
-			set $zval = *(zval **)$p->pData
-			____printzv $zval 1
-		end
-		if $arg1 == 2
-			printf "%s\n", (char*)$p->pData
-		end

+		____printzv $zval 1
 		set $p = $p->pListNext
 	end
 end

 define print_ht
 	set $ind = 1
-	printf "[%p] {\n", $arg0
-	____print_ht $arg0 1
+	printf "[0x%08x] {\n", $arg0
+	____print_ht $arg0 0
 	printf "}\n"
 end

@@ -362,28 +281,6 @@ document print_ht
 	dumps elements of HashTable made of zval
 end

-define print_htptr
-	set $ind = 1
-	printf "[%p] {\n", $arg0
-	____print_ht $arg0 0
-	printf "}\n"
-end
-
-document print_htptr
-	dumps elements of HashTable made of pointers
-end
-
-define print_htstr
-	set $ind = 1
-	printf "[%p] {\n", $arg0
-	____print_ht $arg0 2
-	printf "}\n"
-end
-
-document print_htstr
-	dumps elements of HashTable made of strings
-end
-
 define ____print_ft
 	set $ht = $arg0
 	set $p = $ht->pListHead
@@ -397,9 +294,8 @@ define ____print_ft
 			set $i = $i - 1
 		end

-		if $p->nKeyLength > 0
-			____print_str $p->arKey $p->nKeyLength
-			printf " => "
+		if $p->nKeyLength > 0 
+			printf "\"%s\" => ", $p->key.arKey.s
 		else
 			printf "%d => ", $p->h
 		end
@@ -411,7 +307,7 @@ end

 define print_ft
 	set $ind = 1
-	printf "[%p] {\n", $arg0
+	printf "[0x%08x] {\n", $arg0
 	____print_ft $arg0
 	printf "}\n"
 end
@@ -420,113 +316,6 @@ document print_ft
 	dumps a function table (HashTable)
 end

-define ____print_inh_class
-	set $ce = $arg0
-	if $ce->ce_flags & 0x10 || $ce->ce_flags & 0x20
-		printf "abstract "
-	else
-		if $ce->ce_flags & 0x40
-			printf "final "
-		end
-	end
-	printf "class %s", $ce->name
-	if $ce->parent != 0
-		printf " extends %s", $ce->parent->name
-	end
-	if $ce->num_interfaces != 0
-		printf " implements"
-		set $tmp = 0
-		while $tmp < $ce->num_interfaces
-			printf " %s", $ce->interfaces[$tmp]->name
-			set $tmp = $tmp + 1
-			if $tmp < $ce->num_interfaces
-				printf ","
-			end
-		end
-	end
-	set $ce = $ce->parent
-end
-
-define ____print_inh_iface
-	set $ce = $arg0
-	printf "interface %s", $ce->name
-	if $ce->num_interfaces != 0
-		set $ce = $ce->interfaces[0]
-		printf " extends %s", $ce->name
-	else
-		set $ce = 0
-	end
-end
-
-define print_inh
-	set $ce = $arg0
-	set $depth = 0
-	while $ce != 0
-		set $tmp = $depth
-		while $tmp != 0
-			printf " "
-			set $tmp = $tmp - 1
-		end
-		set $depth = $depth + 1
-		if $ce->ce_flags & 0x80
-			____print_inh_iface $ce
-		else
-			____print_inh_class $ce
-		end
-		printf " {\n"
-	end
-	while $depth != 0
-		set $tmp = $depth
-		while $tmp != 1
-			printf " "
-			set $tmp = $tmp - 1
-		end
-		printf "}\n"
-		set $depth = $depth - 1
-	end
-end
-
-define print_pi
-	set $pi = $arg0
-	printf "[%p] {\n", $pi
-	printf "    h     = %lu\n", $pi->h
-	printf "    flags = %d (", $pi->flags
-	if $pi->flags & 0x100
-		printf "ZEND_ACC_PUBLIC"
-	else
-		if $pi->flags & 0x200
-			printf "ZEND_ACC_PROTECTED"
-		else
-			if $pi->flags & 0x400
-				printf "ZEND_ACC_PRIVATE"
-			else
-				if $pi->flags & 0x800
-					printf "ZEND_ACC_CHANGED"
-				end
-			end
-		end
-	end
-	printf ")\n"
-	printf "    name  = "
-	____print_str $pi->name $pi->name_length
-	printf "\n}\n"
-end
-
-define ____print_str
-	set $tmp = 0
-	set $str = $arg0
-	printf "\""
-	while $tmp < $arg1
-		if $str[$tmp] > 32 && $str[$tmp] < 127
-			printf "%c", $str[$tmp]
-		else
-			printf "\\%o", $str[$tmp]
-		end
-		set $tmp = $tmp + 1
-	end
-	printf "\""
-end
-
 define printzn
 	____executor_globals
 	set $ind = 0
@@ -544,7 +333,7 @@ define printzn
 		set $optype = "IS_UNUSED"
 	end

-	printf "[%p] %s", $znode, $optype
+	printf "[0x%08x] %s", $znode, $optype

 	if $znode->op_type == 1
 		printf ": "
@@ -624,7 +413,7 @@ define zmemcheck
 			else
 				set $filename = $filename + 1
 			end
-			printf " %p ", $aptr
+			printf " 0x%08x ", $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
@@ -654,7 +443,7 @@ define zmemcheck
 		end
 	end
 	if $not_found
-		printf "no such block that begins at %p.\n", $aptr
+		printf "no such block that begins at 0x%08x.\n", $aptr 
 	end
 	if $arg0 == 0
 		printf "-------------------------------------------------------------------------------\n"
@@ -1,177 +0,0 @@
-ext/mysqlnd/mysqlnd.h           ident
-ext/simplexml/simplexml.c       ident
-ext/iconv/php_iconv.h           ident
-ext/posix/posix.c               ident
-ext/recode/recode.c             ident
-ext/skeleton/create_stubs       ident
-ext/phar/phar/pharcommand.inc   ident
-ext/phar/phar.c                 ident
-ext/sysvmsg/sysvmsg.c           ident
-ext/enchant/enchant.c           ident
-ext/reflection/php_reflection.c ident
-ext/oci8/oci8.c                 ident
-ext/dba/libinifile/inifile.c    ident
-ext/dba/libflatfile/flatfile.c  ident
-ext/dba/libcdb/cdb_make.c       ident
-ext/dba/libcdb/cdb.c            ident
-ext/filter/filter.c             ident
-ext/zip/php_zip.c               ident
-README.input_filter             ident
-run-tests.php                   ident
-sapi/nsapi/nsapi.c              ident
-sapi/continuity/capi.c          ident
-Zend/RFCs/002.txt               ident
-Zend/RFCs/003.txt               ident
-NEWS                            merge=NEWS
-UPGRADING                       merge=NEWS
-UPGRADING.INTERNALS             merge=NEWS
-/ext/bz2/tests/with_strings.phpt	-crlf
-/ext/dom/tests/bug40836.phpt	-crlf
-/ext/dom/tests/domelement.phpt	-crlf
-/ext/ereg/tests/eregi_basic_002.phpt	-crlf
-/ext/iconv/tests/iconv004.phpt	-crlf
-/ext/iconv/tests/iconv_basic.phpt	-crlf
-/ext/iconv/tests/iconv_strpos.phpt	-crlf
-/ext/iconv/tests/iconv_strpos_variation2.phpt	-crlf
-/ext/mbstring/tests/mb_strtoupper_error2.phpt	-crlf
-/ext/phar/tests/delete_in_phar_confirm.phpt	-crlf
-/ext/phar/tests/frontcontroller12.phpt	-crlf
-/ext/phar/tests/security.phpt	-crlf
-/ext/phar/tests/test_signaturealgos.phpt	-crlf
-/ext/reflection/tests/ReflectionMethod_invokeArgs_basic.phpt	-crlf
-/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt	-crlf
-/ext/spl/tests/dllist_007.phpt	-crlf
-/ext/spl/tests/iterator_012.phpt	-crlf
-/ext/spl/tests/SplArray_fromArray.phpt	-crlf
-/ext/standard/tests/dir/scandir_variation3.phpt	-crlf
-/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt	-crlf
-/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt	-crlf
-/ext/standard/tests/strings/bug26817.phpt	-crlf
-/ext/standard/tests/strings/bug26973.phpt	-crlf
-/ext/standard/tests/strings/bug27457.phpt	-crlf
-/ext/standard/tests/strings/bug28386.phpt	-crlf
-/ext/standard/tests/strings/bug37262.phpt	-crlf
-/ext/standard/tests/strings/bug40637.phpt	-crlf
-/ext/standard/tests/strings/bug40915.phpt	-crlf
-/ext/standard/tests/strings/bug61374.phpt	-crlf
-/ext/standard/tests/strings/chop_error.phpt	-crlf
-/ext/standard/tests/strings/chop_variation2.phpt	-crlf
-/ext/standard/tests/strings/chunk_split_variation10.phpt	-crlf
-/ext/standard/tests/strings/chunk_split_variation8.phpt	-crlf
-/ext/standard/tests/strings/count_chars_variation2.phpt	-crlf
-/ext/standard/tests/strings/dirname_error.phpt	-crlf
-/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt	-crlf
-/ext/standard/tests/strings/highlight_file.phpt	-crlf
-/ext/standard/tests/strings/htmlentities03.phpt	-crlf
-/ext/standard/tests/strings/htmlentities04.phpt	-crlf
-/ext/standard/tests/strings/htmlentities08.phpt	-crlf
-/ext/standard/tests/strings/htmlentities15.phpt	-crlf
-/ext/standard/tests/strings/http_build_query.phpt	-crlf
-/ext/standard/tests/strings/metaphone.phpt	-crlf
-/ext/standard/tests/strings/ord_error.phpt	-crlf
-/ext/standard/tests/strings/printf_basic2.phpt	-crlf
-/ext/standard/tests/strings/printf_variation2.phpt	-crlf
-/ext/standard/tests/strings/quoted_printable_decode_basic.phpt	-crlf
-/ext/standard/tests/strings/rtrim.phpt	-crlf
-/ext/standard/tests/strings/setlocale_variation1.phpt	-crlf
-/ext/standard/tests/strings/sha1_basic.phpt	-crlf
-/ext/standard/tests/strings/similar_text_basic.phpt	-crlf
-/ext/standard/tests/strings/soundex.phpt	-crlf
-/ext/standard/tests/strings/sprintf_basic1.phpt	-crlf
-/ext/standard/tests/strings/sprintf_basic4.phpt	-crlf
-/ext/standard/tests/strings/sprintf_basic7.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation12.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation28.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation29.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation30.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation31.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation38.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation42.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation6.phpt	-crlf
-/ext/standard/tests/strings/sscanf_basic2.phpt	-crlf
-/ext/standard/tests/strings/sscanf_basic3.phpt	-crlf
-/ext/standard/tests/strings/str_getcsv_001.phpt	-crlf
-/ext/standard/tests/strings/stripcslashes_basic.phpt	-crlf
-/ext/standard/tests/strings/stripos_variation11.phpt	-crlf
-/ext/standard/tests/strings/stripos_variation13.phpt	-crlf
-/ext/standard/tests/strings/stripslashes_variation1.phpt	-crlf
-/ext/standard/tests/strings/stripslashes_variation2.phpt	-crlf
-/ext/standard/tests/strings/stristr_error.phpt	-crlf
-/ext/standard/tests/strings/strnatcasecmp_basic.phpt	-crlf
-/ext/standard/tests/strings/strncasecmp_variation6.phpt	-crlf
-/ext/standard/tests/strings/strncasecmp_variation7.phpt	-crlf
-/ext/standard/tests/strings/strncasecmp_variation8.phpt	-crlf
-/ext/standard/tests/strings/strrchr_error.phpt	-crlf
-/ext/standard/tests/strings/strrchr.phpt	-crlf
-/ext/standard/tests/strings/strrchr_variation11.phpt	-crlf
-/ext/standard/tests/strings/strrpos_error.phpt	-crlf
-/ext/standard/tests/strings/strrpos_variation4.phpt	-crlf
-/ext/standard/tests/strings/strrpos_variation8.phpt	-crlf
-/ext/standard/tests/strings/strstr2.phpt	-crlf
-/ext/standard/tests/strings/strtok_error.phpt	-crlf
-/ext/standard/tests/strings/strtok_variation2.phpt	-crlf
-/ext/standard/tests/strings/strtolower-win32.phpt	-crlf
-/ext/standard/tests/strings/substr_compare.phpt	-crlf
-/ext/standard/tests/strings/ucwords_variation1.phpt	-crlf
-/ext/standard/tests/strings/unpack.phpt	-crlf
-/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt	-crlf
-/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt	-crlf
-/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt	-crlf
-/ext/standard/tests/strings/vfprintf_variation12.phpt	-crlf
-/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt	-crlf
-/ext/standard/tests/strings/vfprintf_variation7.phpt	-crlf
-/ext/standard/tests/strings/vprintf_basic2.phpt	-crlf
-/ext/standard/tests/strings/vprintf_basic7_64bit.phpt	-crlf
-/ext/standard/tests/strings/vprintf_variation10.phpt	-crlf
-/ext/standard/tests/strings/vprintf_variation14_64bit.phpt	-crlf
-/ext/standard/tests/strings/vprintf_variation17.phpt	-crlf
-/ext/standard/tests/strings/vprintf_variation4.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_basic4.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_basic8.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_variation17.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_variation7.phpt	-crlf
-/ext/standard/tests/strings/wordwrap.phpt	-crlf
-/ext/standard/tests/strings/wordwrap_variation5.phpt	-crlf
-/ext/standard/tests/url/rawurldecode_variation_001.phpt	-crlf
-/ext/tidy/tests/009.phpt	-crlf
-/ext/tidy/tests/013.phpt	-crlf
-/ext/tidy/tests/021.phpt	-crlf
-/ext/tidy/tests/tidy_error.phpt	-crlf
-/ext/tokenizer/tests/002.phpt	-crlf
-/ext/tokenizer/tests/bug26463.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_error.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation11.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation12.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation13.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation14.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation15.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation18.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation19.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation1.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation2.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation3.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation5.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation8.phpt	-crlf
-/ext/xml/tests/bug32001b.phpt		-crlf
-/ext/xmlwriter/tests/OO_003.phpt	-crlf
-/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt	-crlf
-/ext/zlib/tests/008.phpt			-crlf
-/ext/zlib/tests/gzopen_variation4.phpt	-crlf
-/ext/zlib/tests/gzrewind_error.phpt	-crlf
-/ext/zlib/tests/readgzfile_variation7.phpt	-crlf
-/ext/zlib/tests/readgzfile_variation8.phpt	-crlf
-/ext/zlib/tests/zlib_scheme_stat_basic.phpt	-crlf
-/sapi/cli/tests/006.phpt			-crlf
-/tests/run-test/test009.phpt		-crlf
-/Zend/tests/012.phpt				-crlf
-/Zend/tests/bug28072.phpt			-crlf
-/Zend/tests/bug38624.phpt			-crlf
-/Zend/tests/bug40784.phpt			-crlf
-/Zend/tests/bug43053.phpt			-crlf
-/Zend/tests/bug51176.phpt			-crlf
-/Zend/tests/each_003.phpt			-crlf
-/Zend/tests/errmsg_006.phpt			-crlf
@@ -1,256 +0,0 @@
-# General Ignores
-*~
-.#*
-*.
-*.slo
-*.mk
-*.mem
-*.gcda
-*.gcno
-*.la
-*.lo
-*.o
-*.a
-*.ncb
-*.opt
-*.plg
-*swp
-*.patch
-*.tgz
-*.tar.gz
-*.tar.bz2
-.FBCIndex
-.FBCLockFolder
-.deps
-.libs
-phpt.*
-core
-dynlib.m4
-Debug
-Debug_TS
-Makefile
-Makefile.fragments
-Makefile.objects
-Release
-Release_TS
-Release_TSDbg
-Release_TS_inline
-Release_inline
-ZendEngine1
-_libs
-acconfig.h
-aclocal.m4
-autom4te.cache
-bsd_converted
-buildconf.stamp
-buildmk.stamp
-confdefs.h
-config.h
-config.guess
-config.cache
-config.h.in
-config.log
-config.nice
-config.nice.bat
-config.status
-config.sub
-config_vars.mk
-configuration-parser.c
-configuration-parser.h
-configuration-parser.output
-configuration-scanner.c
-configure
-configure.bat
-configure.js
-conftest
-conftest.c
-debug.log
-diff
-generated_lists
-include
-install-sh
-internal_functions.c
-lcov_data
-lcov_html
-libs
-libtool
-meta_cc
-meta_ccld
-missing
-mkinstalldirs
-modules
-php
-php-*.tar.gz
-php5.spec
-php_lcov.info
-php_test_results_*.txt
-php_version.h
-results.txt
-shlibtool
-stamp-h
-test.php3
-tmp-php.ini
-want_dependencies
-x64
-stamp-h.in
-scan_makefile_in.awk
-TSRM/tsrm_config.h
-Zend/zend_config.h
-Zend/zend_dtrace_gen.h
-Zend/zend_dtrace_gen.hbak
-Zend/zend_ini_parser.c
-Zend/zend_ini_parser.h
-Zend/zend_ini_parser.output
-Zend/zend_language_parser.c
-Zend/zend_language_parser.h
-Zend/zend_language_parser.output
-ext/date/lib/timelib_config.h
-ext/iconv/php_iconv_aliased_libiconv.h
-ext/phar/phar.php
-main/php_config.h
-main/php_config.h.in
-
-# Test specific Ignores
-tests/*/*.diff
-tests/*/*.out
-tests/*/*.php
-tests/*/*.exp
-tests/*/*.log
-tests/*/*.sh
-*/tests/*.diff
-*/tests/*.out
-*/tests/*.php
-*/tests/*.exp
-*/tests/*.log
-*/tests/*.sh
-*/tests/*/*.diff
-*/tests/*/*.out
-*/tests/*/*.php
-*/tests/*/*.exp
-*/tests/*/*.log
-*/tests/*/*.sh
-*/*/tests/*.diff
-*/*/tests/*.out
-*/*/tests/*.php
-*/*/tests/*.exp
-*/*/tests/*.log
-*/*/tests/*.sh
-*/*/tests/*/*.diff
-*/*/tests/*/*.out
-*/*/tests/*/*.php
-*/*/tests/*/*.exp
-*/*/tests/*/*.log
-*/*/tests/*/*.sh
-
-# Extension specifc ignores
-ext/*/configure.in
-ext/*/ltmain.sh
-ext/*/libs.mk
-ext/*/build
-ext/*/scan_makefile_in.awk
-ext/*/Makefile.global
-ext/*/acinclude.m4
-ext/*/config.sub
-
-# Extension specific
-ext/iconv/scan_makefile_in.awk
-ext/iconv/php_have_bsd_iconv.h
-ext/iconv/php_have_ibm_iconv.h
-ext/iconv/php_have_libiconv.h
-ext/iconv/php_php_iconv_h_path.h
-ext/iconv/php_have_glibc_iconv.h
-ext/iconv/php_php_iconv_impl.h
-ext/iconv/php_have_iconv.h
-ext/iconv/php_iconv_supports_errno.h
-ext/mbstring/libmbfl/Makefile.in
-ext/mbstring/libmbfl/autoscan.log
-ext/mbstring/libmbfl/config.sub
-ext/mbstring/libmbfl/depcomp
-ext/mbstring/libmbfl/ltmain.sh
-ext/mbstring/libmbfl/stamp-h1
-ext/mbstring/libmbfl/*.dll
-ext/mbstring/libmbfl/*.lib
-ext/mbstring/libmbfl/*.RES
-ext/mbstring/libmbfl/*.res
-ext/mbstring/libmbfl/*.obj
-ext/mbstring/libmbfl/*.tds
-ext/mbstring/libmbfl/filters/Makefile.in
-ext/mbstring/libmbfl/mbfl/Makefile.in
-ext/mbstring/libmbfl/mbfl/EastAsianWidth.txt
-ext/mbstring/libmbfl/nls/Makefile.in
-ext/mssql/#*#
-ext/mssql/Makefile.global
-ext/mssql/acinclude.m4
-ext/mssql/config.sub
-ext/mssql/configure.in
-ext/mssql/ltmain.sh
-ext/mysql/weztest.sqlite
-ext/oci8/tests/*.tmp
-ext/oci8/tests/*.vglog
-ext/pdo/conftest*
-ext/pdo/tests/*.db
-ext/pdo/tests/*.tmp
-ext/pdo_firebird/conftest*
-ext/pdo_mysql/conftest*
-ext/pdo_mysql/tests/*.db
-ext/pdo_mysql/tests/*.tmp
-ext/pdo_oci/conftest*
-ext/pdo_odbc/tests/*.db
-ext/pdo_odbc/tests/*.tmp
-ext/pdo_odbc/tests/*.mdb
-ext/pdo_pgsql/conftest*
-ext/pdo_pgsql/tests/*.db
-ext/pdo_pgsql/tests/*.tmp
-ext/pdo_sqlite/conftest*
-ext/pdo_sqlite/sqlite3.h
-ext/pdo_sqlite/tests/*.db
-ext/pdo_sqlite/tests/*.tmp
-ext/phar/phar.phar
-ext/pspell/tests/*.tmp
-ext/reflection/xml
-ext/reflection/html
-ext/reflection/spl.chm
-ext/simplexml/examples/security.new.xml
-ext/spl/examples/.htaccess
-ext/spl/examples/*.phps
-ext/sqlite/weztest.sqlite
-ext/sqlite/libsqlite/src/sqlite.h
-ext/sqlite/libsqlite/src/parse.out
-ext/sqlite/libsqlite/src/libsqlite.dsw
-ext/sqlite3/tests/phpsql*
-ext/sqlite3/tests/*.db
-ext/sqlite3/tests/*.tmp
-ext/standard/tests/misc/*.txt
-ext/standard/tests/strings/*.txt
-main/build-defs.h
-main/internal_functions_cli.c
-main/config.w32.h
-main/stamp-h1
-main/streams/build-defs.h
-main/streams/stamp-h1
-pear/install-pear-nozlib.phar
-pear/phpize
-pear/run-tests
-pear/php-config
-pear/scripts
-sapi/apache/libphp5.module
-sapi/apache2handler/libphp5.module
-sapi/apache_hooks/libphp5.module
-sapi/cgi/php-cgi
-sapi/cli/php.1
-sapi/fpm/php-fpm
-sapi/fpm/php-fpm.1
-sapi/fpm/init.d.php-fpm
-sapi/fpm/php-fpm.conf
-sapi/fpm/fpm/php-cgi
-scripts/php-config
-scripts/phpize
-scripts/man1/*.1
-win32/*.suo
-win32/*.aps
-win32/*.positions
-win32/ext
-win32/phpts.def
-win32/wsyslog.h
-win32/win32.dsp
-win32/php.dsw
@@ -1,32 +0,0 @@
-language: php
-
-php:
-    # We only specify one version so we only get one worker
-    - 5.4
-
-notifications:
-    email: false
-
-env:
-    global:
-      - MYSQL_TEST_HOST=127.0.0.1
-      - MYSQL_TEST_USER=travis
-      - PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
-      - PDO_MYSQL_TEST_USER=travis
-      - PDO_MYSQL_TEST_PASS=
-      - PDO_MYSQL_TEST_HOST=127.0.0.1
-    matrix:
-      - REPORT_EXIT_STATUS=1
-
-before_script:
-    # Compile PHP
-    - ./travis/compile.sh
-    # Setup Extensions 
-    - . ./travis/ext/mysql/setup.sh
-    - . ./travis/ext/mysqli/setup.sh
-    - . ./travis/ext/pdo_mysql/setup.sh
-    - . ./travis/ext/pgsql/setup.sh
-    - . ./travis/ext/pdo_pgsql/setup.sh
-
-# Run PHPs run-tests.php 
-script: ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120
@@ -1,46 +1,45 @@
-========================
-  PHP Coding Standards
-========================
+PHP Coding Standards
+====================

-This file lists several standards that any programmer adding or changing
-code in PHP should follow.  Since this file was added at a very late
+
+This file lists several standards that any programmer, adding or changing
+code in PHP, should follow.  Since this file was added at a very late
 stage of the development of PHP v3.0, the code base does not (yet) fully
 follow it, but it's going in that general direction.  Since we are now
-well into version 5 releases, many sections have been recoded to use
+well into the version 4 releases, many sections have been recoded to use
 these rules.

+
 Code Implementation
 -------------------

-0.  Document your code in source files and the manual. [tm]
+[0] Document your code in source files and the manual. [tm]

-1.  Functions that are given pointers to resources should not free them
+[1] Functions that are given pointers to resources should not free them

-For instance, ``function int mail(char *to, char *from)`` should NOT free
+For instance, function int mail(char *to, char *from) should NOT free
 to and/or from.
 Exceptions:

- The function's designated behavior is freeing that resource.  E.g. efree()
-
- The function is given a boolean argument, that controls whether or not
-  the function may free its arguments (if true - the function must free its
-  arguments, if false - it must not)
-
- Low-level parser routines, that are tightly integrated with the token
-  cache and the bison code for minimum memory copying overhead.
-
-2.  Functions that are tightly integrated with other functions within the
+  - The function's designated behavior is freeing that resource.  E.g. efree()
+  - The function is given a boolean argument, that controls whether or not
+    the function may free its arguments (if true - the function must free its
+    arguments, if false - it must not)
+  - Low-level parser routines, that are tightly integrated with the token
+    cache and the bison code for minimum memory copying overhead.
+    
+[2] Functions that are tightly integrated with other functions within the
    same module, and rely on each other non-trivial behavior, should be
    documented as such and declared 'static'.  They should be avoided if
    possible.

-3.  Use definitions and macros whenever possible, so that constants have
+[3] Use definitions and macros whenever possible, so that constants have
    meaningful names and can be easily manipulated.  The only exceptions
    to this rule are 0 and 1, when used as false and true (respectively).
    Any other use of a numeric constant to specify different behavior
    or actions should be done through a #define.

-4.  When writing functions that deal with strings, be sure to remember
+[4] When writing functions that deal with strings, be sure to remember
    that PHP holds the length property of each string, and that it
    shouldn't be calculated with strlen().  Write your functions in a such
    a way so that they'll take advantage of the length property, both
@@ -49,47 +48,47 @@ Exceptions:
    doing so, should return that new length, so it doesn't have to be
    recalculated with strlen() (e.g. php_addslashes())

-5.  NEVER USE strncat().  If you're absolutely sure you know what you're doing,
+[5] NEVER USE strncat().  If you're absolutely sure you know what you're doing,
    check its man page again, and only then, consider using it, and even then,
    try avoiding it.

-6.  Use ``PHP_*`` macros in the PHP source, and ``ZEND_*`` macros in the Zend
-    part of the source. Although the ``PHP_*`` macro's are mostly aliased to the
-    ``ZEND_*`` macros it gives a better understanding on what kind of macro
-    you're calling.
+[6] Use PHP_* macros in the PHP source, and ZEND_* macros in the Zend
+    part of the source. Although the PHP_* macro's are mostly aliased to the
+    ZEND_* macros it gives a better understanding on what kind of macro you're
+    calling.

-7.  When commenting out code using a #if statement, do NOT use 0 only. Instead
-    use "<git username here>_0". For example, #if FOO_0, where FOO is your
-    git user foo.  This allows easier tracking of why code was commented out,
-    especially in bundled libraries.
+[7] When commenting out code using a #if statement, do NOT use 0 only. Instead
+    use "<cvs username here>_0". For example, #if FOO_0, where FOO is your
+    cvs user foo.  This allows easier tracking of why code was commented out, 
+    especially in bundled libraries.  

-8.  Do not define functions that are not available.  For instance, if a
-    library is missing a function, do not define the PHP version of the
-    function, and do not raise a run-time error about the function not
-    existing.  End users should use function_exists() to test for the
-    existence of a function
+[8] Do not define functions that are not available.  For instance, if a
+     library is missing a function, do not define the PHP version of the
+     function, and do not raise a run-time error about the function not
+     existing.  End users should use function_exists() to test for the
+     existence of a function

-9.  Prefer emalloc(), efree(), estrdup(), etc. to their standard C library
-    counterparts.  These functions implement an internal "safety-net"
-    mechanism that ensures the deallocation of any unfreed memory at the
-    end of a request.  They also provide useful allocation and overflow
-    information while running in debug mode.
+[9] Prefer emalloc(), efree(), estrdup(), etc. to their standard C library
+     counterparts.  These functions implement an internal "safety-net"
+     mechanism that ensures the deallocation of any unfreed memory at the
+     end of a request.  They also provide useful allocation and overflow
+     information while running in debug mode.

-    In almost all cases, memory returned to the engine must be allocated
-    using emalloc().
+     In almost all cases, memory returned to the engine must be allocated
+     using emalloc().

-    The use of malloc() should be limited to cases where a third-party
-    library may need to control or free the memory, or when the memory in
-    question needs to survive between multiple requests.
+     The use of malloc() should be limited to cases where a third-party
+     library may need to control or free the memory, or when the memory in
+     question needs to survive between multiple requests.

 Naming Conventions
 ------------------

-1.  Function names for user-level functions should be enclosed with in
+[1] Function names for user-level functions should be enclosed with in
    the PHP_FUNCTION() macro. They should be in lowercase, with words
    underscore delimited, with care taken to minimize the letter count.
    Abbreviations should not be used when they greatly decrease the
-    readability of the function name itself::
+    readability of the function name itself.

    Good:
    'mcrypt_enc_self_test'
@@ -99,18 +98,18 @@ Naming Conventions
    'mcrypt_module_get_algo_supported_key_sizes'
    (could be 'mcrypt_mod_get_algo_sup_key_sizes'?)
    'get_html_translation_table'
-    (could be 'html_get_trans_table'?)
+    (could be 'html_get_trans_table'?) 

    Bad:
    'hw_GetObjectByQueryCollObj'
    'pg_setclientencoding'
    'jf_n_s_i'

-2.  If they are part of a "parent set" of functions, that parent should
+[2] If they are part of a "parent set" of functions, that parent should
    be included in the user function name, and should be clearly related
    to the parent program or function family. This should be in the form
-    of ``parent_*``::
-
+    of parent_*.
+    
    A family of 'foo' functions, for example:
    Good:
    'foo_select_bar'
@@ -122,22 +121,22 @@ Naming Conventions
    'fooinsertbaz'
    'delete_foo_baz'

-3.  Function names used by user functions should be prefixed
-    with ``_php_``, and followed by a word or an underscore-delimited list of
+[3] Function names used by user functions should be prefixed
+    with "_php_", and followed by a word or an underscore-delimited list of
    words, in lowercase letters, that describes the function.  If applicable,
    they should be declared 'static'.

-4.  Variable names must be meaningful.  One letter variable names must be
+[4] Variable names must be meaningful.  One letter variable names must be
    avoided, except for places where the variable has no real meaning or
    a trivial meaning (e.g. for (i=0; i<100; i++) ...).

-5.  Variable names should be in lowercase.  Use underscores to separate
+[5] Variable names should be in lowercase.  Use underscores to separate
    between words.

-6.  Method names follow the 'studlyCaps' (also referred to as 'bumpy case'
+[6] Method names follow the 'studlyCaps' (also referred to as 'bumpy case'
    or 'camel caps') naming convention, with care taken to minimize the
    letter count. The initial letter of the name is lowercase, and each
-    letter that starts a new 'word' is capitalized::
+    letter that starts a new 'word' is capitalized.

    Good:
    'connect()'
@@ -149,11 +148,11 @@ Naming Conventions
    'buildsomewidget'
    'getI()'

-7.  Classes should be given descriptive names. Avoid using abbreviations where
-    possible. Each word in the class name should start with a capital letter,
-    without underscore delimiters (CamelCaps starting with a capital letter).
-    The class name should be prefixed with the name of the 'parent set' (e.g.
-    the name of the extension)::
+[7] Classes should be given descriptive names. Avoid using abbreviations where
+    possible. Each word in the class name should start with a capital letter, 
+    without underscore delimiters (CampelCaps starting with a capital letter). 
+    The class name should be prefixed with the name of the 'parent set' (e.g. 
+    the name of the extension).

    Good:
    'Curl'
@@ -166,7 +165,7 @@ Naming Conventions
 Syntax and indentation
 ----------------------

-1.  Never use C++ style comments (i.e. // comment).  Always use C-style
+[1] Never use C++ style comments (i.e. // comment).  Always use C-style
    comments instead.  PHP is written in C, and is aimed at compiling
    under any ANSI-C compliant compiler.  Even though many compilers
    accept C++-style comments in C code, you have to ensure that your
@@ -175,20 +174,17 @@ Syntax and indentation
    because the Win32 port is MS-Visual C++ specific, and this compiler
    is known to accept C++-style comments in C code.

-2.  Use K&R-style.  Of course, we can't and don't want to
+[2] Use K&R-style.  Of course, we can't and don't want to
    force anybody to use a style he or she is not used to, but,
    at the very least, when you write code that goes into the core
    of PHP or one of its standard modules, please maintain the K&R
    style.  This applies to just about everything, starting with
    indentation and comment styles and up to function declaration
-    syntax. Also see Indentstyle_.
+    syntax.

-.. _Indentstyle: http://www.catb.org/~esr/jargon/html/I/indent-style.html
-
-3.  Be generous with whitespace and braces.  Keep one empty line between the
-    variable declaration section and the statements in a block, as well as
-    between logical statement groups in a block.  Maintain at least one empty
-    line between two functions, preferably two.  Always prefer::
+    (see also http://www.catb.org/~esr/jargon/html/I/indent-style.html)
+    
+[3] Be generous with whitespace and braces.  Always prefer:

    if (foo) {
        bar;
@@ -198,18 +194,23 @@ Syntax and indentation

    if(foo)bar;

-4.  When indenting, use the tab character.  A tab is expected to represent
+    Keep one empty line between the variable declaration section and
+    the statements in a block, as well as between logical statement
+    groups in a block.  Maintain at least one empty line between
+    two functions, preferably two.
+
+[4] When indenting, use the tab character.  A tab is expected to represent
    four spaces.  It is important to maintain consistency in indenture so
    that definitions, comments, and control structures line up correctly.

-5.  Preprocessor statements (#if and such) MUST start at column one. To
+[5] Preprocessor statements (#if and such) MUST start at column one. To
    indent preprocessor directives you should put the # at the beginning
    of a line, followed by any number of whitespace.

 Testing
 -------

-1.  Extensions should be well tested using *.phpt tests. Read about that
+[1] Extensions should be well tested using *.phpt tests. Read about that
    in README.TESTING.

 Documentation and Folding Hooks
@@ -218,20 +219,20 @@ Documentation and Folding Hooks
 In order to make sure that the online documentation stays in line with
 the code, each user-level function should have its user-level function
 prototype before it along with a brief one-line description of what the
-function does.  It would look like this::
+function does.  It would look like this:

-  /* {{{ proto int abs(int number)
-     Returns the absolute value of the number */
-  PHP_FUNCTION(abs)
-  {
-     ...
-  }
-  /* }}} */
+/* {{{ proto int abs(int number)
+   Returns the absolute value of the number */
+PHP_FUNCTION(abs)
+{
+   ...
+}
+/* }}} */

 The {{{ symbols are the default folding symbols for the folding mode in
-Emacs and vim (set fdm=marker).  Folding is very useful when dealing with
-large files because you can scroll through the file quickly and just unfold
-the function you wish to work on.  The }}} at the end of each function marks
+Emacs and vim (set fdm=marker).  Folding is very useful when dealing with 
+large files because you can scroll through the file quickly and just unfold 
+the function you wish to work on.  The }}} at the end of each function marks 
 the end of the fold, and should be on a separate line.

 The "proto" keyword there is just a helper for the doc/genfuncsummary script
@@ -239,10 +240,10 @@ which generates a full function summary.  Having this keyword in front of the
 function prototypes allows us to put folds elsewhere in the code without
 messing up the function summary.

-Optional arguments are written like this::
+Optional arguments are written like this:

-  /* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
-     Returns a header object with the defined parameters */
+/* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
+   Returns a header object with the defined parameters */

 And yes, please keep the prototype on a single line, even if that line
 is massive.
@@ -256,10 +257,9 @@ in the function directory, and that the functions follow the
 standard prefixing conventions during their initial implementation.

 The file labelled 'EXPERIMENTAL' should include the following
-information::
-
-  Any authoring information (known bugs, future directions of the module).
-  Ongoing status notes which may not be appropriate for SVN comments.
+information:
+   Any authoring information (known bugs, future directions of the module).
+   Ongoing status notes which may not be appropriate for CVS comments.

 Aliases & Legacy Documentation
 -----------------------------------
@@ -73,22 +73,10 @@ PRIMARY MAINTAINER:  Edin Kadribasic <edink@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           fpm
-PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>, Jerome Loyet <fat@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.3.3
-------------------------------------------------------------------------------
 EXTENSION:           isapi
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           litespeed
-PRIMARY MAINTAINER:  George Wang <gwang@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.3
-------------------------------------------------------------------------------
 EXTENSION:           milter
 MAINTENANCE:         Unknown
 STATUS:              Unknown
@@ -130,14 +118,45 @@ STATUS:              Experimental

 -------------------------------------------------------------------------------
 EXTENSION:           dba
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>,Christopher Jones <sixd@php.net>, Pierre-Alain Joye <pajoye@php.net>
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini
 -------------------------------------------------------------------------------
+EXTENSION:           dbase
+MAINTENANCE:         Orphaned
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           dbx
+PRIMARY MAINTAINER:  Marc Boeren <M.Boeren@guidance.nl>
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               4.0.6
+COMMENT:             DB abstraction for odbc, mysql, pgsql, mssql, fbsql and more, see documentation
+-------------------------------------------------------------------------------
+EXTENSION:           fbsql
+PRIMARY MAINTAINER:  Frank M. Kromann <fmk@swwwing.com>
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           informix
+PRIMARY MAINTAINER:  Danny Heijl <Danny.Heijl@cevi.be>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           ingres_ii
+PRIMARY MAINTAINER:  David Hénot <henot@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
+SINCE:               4.0.2
+-------------------------------------------------------------------------------
 EXTENSION:           interbase
 PRIMARY MAINTAINER:  Ard Biesheuvel <ard@ard.nu>, Jouni Ahto <jouni.ahto@exdec.fi>
-MAINTENANCE:         Odd fixes
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           msql
+MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mssql
@@ -147,24 +166,18 @@ STATUS:              Working
 COMMENT:             Tested on phpts and isapi versions
 -------------------------------------------------------------------------------
 EXTENSION:           mysql
-PRIMARY MAINTAINER:  Zak Greant <zak@mysql.com>, Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>,  Ulf Wendel <uw@php.net>
+PRIMARY MAINTAINER:  Zak Greant <zak@mysql.com>, Georg Richter <georg@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mysqli
-PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               5.0
 -------------------------------------------------------------------------------
-EXTENSION:           mysqlnd
-PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.3
-------------------------------------------------------------------------------
 EXTENSION:           oci8
-PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net>, Antony Dovgal <tony2001@php.net>
+PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -174,53 +187,14 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             Working 
 -------------------------------------------------------------------------------
-EXTENSION:           pdo
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Wez Furlong <wez@php.net>
-MAINTENANCE:         Odd fixes
+EXTENSION:           oracle
+MAINTENANCE:         Orphaned
 STATUS:              Working
-SINCE:               5.1
+COMMENT:             Using the new OCI8 driver is encouraged where possible.
 -------------------------------------------------------------------------------
-EXTENSION:           pdo_dblib
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Odd fixes
-STATUS:              Working
-SINCE:               5.1
-------------------------------------------------------------------------------
-EXTENSION:           pdo_firebird
-PRIMARY MAINTAINER:  Lars Westermann <lwe@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.1
-------------------------------------------------------------------------------
-EXTENSION:           pdo_mysql
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Johannes Schlüter <johannes@php.net>, Andrey Hristov <andrey@php.net>,  Ulf Wendel <uw@php.net>
-MAINTENANCE:         Odd fixes
-STATUS:              Working
-SINCE:               5.1
-------------------------------------------------------------------------------
-EXTENSION:           pdo_odbc
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Odd fixes
-STATUS:              Working
-SINCE:               5.1
-------------------------------------------------------------------------------
-EXTENSION:           pdo_oci
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Odd fixes
-STATUS:              Working
-SINCE:               5.1
-------------------------------------------------------------------------------
-EXTENSION:           pdo_pgsql
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
-MAINTENANCE:         Odd fixes
-STATUS:              Working
-SINCE:               5.1
-------------------------------------------------------------------------------
-EXTENSION:           pdo_sqlite
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
-MAINTENANCE:         Odd fixes
-STATUS:              Working
-SINCE:               5.1
+EXTENSION:           ovrimos
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           pgsql
 PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Yasuo Ohgaki <yohgaki@php.net>
@@ -229,22 +203,18 @@ STATUS:              Working
 COMMENT:             Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less have fatal bug.
 -------------------------------------------------------------------------------
 EXTENSION:           sqlite
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Wez Furlong <wez@php.net>, Ilia Alshanetsky <iliaa@php.net>
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Wez Furlong <wez@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0 (Since 4.3.2 in PECL)
-COMMENT:             Integrates SQLite 2 embeddable SQL database engine.
+COMMENT:             Integrates SQLite embeddable SQL database engine.
 -------------------------------------------------------------------------------
-EXTENSION:           sqlite3
-PRIMARY MAINTAINER:  Scott MacVicar <scottmac@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.3
-COMMENT:             Integrates SQLite 3 embeddable SQL database engine.
+EXTENSION:           sybase
+MAINTENANCE:         Unknown
+STATUS:              Not Working
 -------------------------------------------------------------------------------
 EXTENSION:           sybase_ct
-PRIMARY MAINTAINER:  Timm Friebe <thekid@thekid.de>
-MAINTENANCE:         Maintained
+MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------

@@ -259,7 +229,7 @@ STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           simplexml
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
@@ -267,38 +237,23 @@ SINCE:               5.0
 EXTENSION:           soap
 PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           wddx
 PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
-MAINTENANCE:         Orphaned
+MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xml
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>,  Rob Richards <rrichards@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           libxml
-PRIMARY MAINTAINER:   Rob Richards <rrichards@php.net>, 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:  Thies C. Arntzen <thies@thieso.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xmlrpc
 PRIMARY MAINTAINER:  Dan Libby
-MAINTENANCE:         Orphaned
+MAINTENANCE:         UNKNOWN
 STATUS:              Experimental
 -------------------------------------------------------------------------------
-EXTENSION:           xmlwriter
-PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Pierre-Alain Joye <pajoye@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
 EXTENSION:           xsl
 PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>
 MAINTENANCE:         Maintained
@@ -311,8 +266,8 @@ SINCE:               5.0

 -------------------------------------------------------------------------------
 EXTENSION:           bcmath
-MAINTENANCE:         Andi Gutmans <andi@zend.com>
-STATUS:              Working
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           bz2
 PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
@@ -331,13 +286,18 @@ MAINTENANCE:         Maintained
 STATUS:              Windows
 SINCE:               5.0
 -------------------------------------------------------------------------------
+EXTENSION:           cpdf
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           ctype
 PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           curl
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>, Ilia Alshanetsky <iliaa@php.net>, Pierrick Charron <pierrick@php.net>
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>,Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
@@ -353,25 +313,27 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.2
 -------------------------------------------------------------------------------
-EXTENSION:           fileinfo
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.3
+EXTENSION:           fam
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           filter
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>, Pierre-Alain Joye <pajoye@php.net>, Ilia Alshanetsky <iliaa@php.net>
+EXTENSION:           fdf
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.2
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           filepro
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           ftp
-PRIMARY MAINTAINER:  Stefan Esser <sesser@php.net>
-MAINTENANCE:         Odd fixes
+PRIMARY MAINTAINER:  Stefan Esser (sesser@php.net)
+MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gd
-PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
+PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -380,35 +342,32 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gmp
-PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net>, Antony Dovgal <tony2001@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
+EXTENSION:           hwapi
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
 EXTENSION:           iconv
 PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           intl
-PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.3
-------------------------------------------------------------------------------
 EXTENSION:           imap
-PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>, Ilia Alshanetsky <iliaa@php.net>, Pierre-Alain Joye <pajoye@php.net>
+PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           json
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Odd fixes
-STATUS:              Working
-SINCE:               5.2
+EXTENSION:           ircg
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           ldap
-PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>, Pierre-Alain Joye <pajoye@php.net>
+PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -422,43 +381,68 @@ PRIMARY MAINTAINER:  Derick Rethans <derick@derickrethans.nl>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           mhash
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Scott MacVicar <scottmac@php.net>
+EXTENSION:           mcve
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           mhash
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
+MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mime_magic
 PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Deprecated
 STATUS:              Experimental
-COMMENT:             Use the fileinfo extension instead
+COMMENT:             Use PECL's fileinfo extension instead
 -------------------------------------------------------------------------------
 EXTENSION:           ming
 PRIMARY MAINTAINER:  Frank M. Kromann
 MAINTENANCE:         Unknown
 STATUS:              Experimental
 -------------------------------------------------------------------------------
-EXTENSION:           openssl
-PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>, Pierre-Alain Joye <pajoye@php.net>
+EXTENSION:           mnogosearch
+PRIMARY MAINTAINER:  Sergey Kartashoff <gluke@mail.ru>
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           mono
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           msession
+PRIMARY MAINTAINER   Mark L. Woodward <mlwmohawk@mohawksoft.com>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Working/Experimental
+COMMENT:             Tested on Linux, should work on other UNIX platforms. Backend server code can compile under Windows.
+-------------------------------------------------------------------------------
+EXTENSION:           ncurses
+PRIMARY MAINTAINER   Ilia Alshanetsky <iliaa@php.net>, Wez Furlong <wez@php.net>, Hartmut Holzgraefe <hholzgra@php.net>, Georg Richter <georg@php.net>
+MAINTENANCE:         Unknown
+STATUS:              Experimental
+-------------------------------------------------------------------------------
+EXTENSION:           openssl
+PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
 EXTENSION:           pcntl
-PRIMARY MAINTAINER:  Arnaud Le Blanc <lbarnaud@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
+MAINTENANCE:         Unknown
+STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           pcre
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>, Nuno Lopes <nlopess@php.net>
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           phar
-PRIMARY MAINTAINER:  Greg Beaver <cellog@php.net>, Marcus Börger <helly@php.net>, Steph Fox <sfox@php.net>
+EXTENSION:           pfpro
+PRIMARY MAINTAINER:  David Croft <david@infotrek.co.uk>
 MAINTENANCE:         Maintained
 STATUS:              Working
-SINCE:               5.3
+SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           posix
 PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
@@ -468,23 +452,18 @@ STATUS:              Working
 EXTENSION:           pspell
 PRIMARY MAINTAINER:  Vlad Krupin <phpdevel@echospace.com>
 MAINTENANCE:         Unknown
-STATUS:              Working
+STATUS:              Unknown
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           readline
 MAINTENANCE:         Unknown
-STATUS:              Working
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           recode
 PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           reflection
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>, Johannes Schlüter <johannes@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
 EXTENSION:           session
 PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
@@ -493,52 +472,53 @@ STATUS:              Working
 EXTENSION:           shmop
 PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
 EXTENSION:           snmp
-PRIMARY MAINTAINER:  Boris Lytochkin <lytboris@php.net>, Rasmus Lerdorf <rasmus@php.net>, Pierre-Alain Joye <pajoye@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
+MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sockets
 PRIMARY MAINTAINER:  Chris Vandomelen <chrisv@b0rked.dhs.org>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           spl
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Etienne Kneuss <colder@php.net>
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0.0
 -------------------------------------------------------------------------------
 EXTENSION:           sysvmsg
 MAINTENANCE:         Unknown
-STATUS:              Working
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           sysvsem
 MAINTENANCE:         Unknown
-STATUS:              Working
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           sysvshm
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           tidy
-PRIMARY MAINTAINER:  John Coggeshall <john@php.net>, Ilia Alshanetsky <iliaa@php.net>, Nuno Lopes <nlopess@php.net>
+PRIMARY MAINTAINER:  John Coggeshall <john@php.net>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           tokenizer
 PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Unknown
-STATUS:              Working
+STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           zip
-PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
+EXTENSION:           yaz
+PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Unknown
+SINCE:               4.0.1
 -------------------------------------------------------------------------------
 EXTENSION:           zlib
 PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de>
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -3,21 +3,21 @@
 # Zend
 #

-$(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h
-$(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
+$(builddir)/zend_language_scanner.lo: $(builddir)/zend_language_parser.h
+$(builddir)/zend_ini_scanner.lo: $(builddir)/zend_ini_parser.h

-$(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l)
+$(builddir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
+	@$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l

-$(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
-$(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
+$(builddir)/zend_language_parser.h: $(builddir)/zend_language_parser.c
+$(builddir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
 	@$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o $@

-$(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c
-$(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
+$(builddir)/zend_ini_parser.h: $(builddir)/zend_ini_parser.c
+$(builddir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
 	@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@

-$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
+$(builddir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
+	@$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l

-$(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
+$(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(builddir)/zend_language_parser.h
@@ -3,19 +3,33 @@
 # LCOV
 #

-LCOV_INCLUDE="."
-
 lcov: lcov-html

-lcov-test: lcov-clean-data test
+lcov-test: all
+	@echo "Running test suite"
+	@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
+	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
+		NO_INTERACTION=1 \
+		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
+	elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
+		NO_INTERACTION=1 \
+		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
+	else \
+		echo "ERROR: Cannot run tests without CLI sapi."; \
+	fi

 php_lcov.info: lcov-test
 	@echo "Generating data for $@"
 	@rm -rf lcov_data/
 	@$(mkinstalldirs) lcov_data/
 	@echo
-	-@files=`find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.c -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | $(EGREP) $(LCOV_INCLUDE) | uniq` ;\
-	for x in $$files; do \
+	-@find . -name \*.gcda -o -name \*.gcno -o -name \*.da | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq | while read x; do \
 		echo -n . ;\
 		y=`echo $$x | sed -e 's!\.libs/!!'`; \
 		dir=lcov_data/`dirname $$x`; \
@@ -23,9 +37,6 @@ php_lcov.info: lcov-test
 		if test -f "$(top_srcdir)/$$y.c"; then \
 			ln -f -s $(top_srcdir)/$$y.c lcov_data/$$y.c; \
 		fi; \
-		if test -f "$(top_srcdir)/$$y.h"; then \
-			ln -f -s $(top_srcdir)/$$y.h lcov_data/$$y.h; \
-		fi; \
 		if test -f "$(top_srcdir)/$$y.re"; then \
 			ln -f -s $(top_srcdir)/$$y.re lcov_data/$$y.re; \
 		fi; \
@@ -35,32 +46,14 @@ php_lcov.info: lcov-test
 		if test -f "$(top_srcdir)/$$y.l"; then \
 		        ln -f -s $(top_srcdir)/$$y.l lcov_data/$$y.l; \
 		fi; \
-		if test -f "$(top_srcdir)/$$y"; then \
-		        ln -f -s $(top_srcdir)/$$y lcov_data/$$y; \
-		fi; \
 		if test -f "$(top_builddir)/$$y.c"; then \
 			ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
 		fi; \
-		if test -f "$$x.gcno"; then \
-			cp $$x.gcno lcov_data/$$y.gcno ; \
-		fi; \
-		if test -f "$$x.gcda"; then \
-			cp $$x.gcda lcov_data/$$y.gcda ; \
-		fi; \
-		if test -f "$$x.da"; then \
-			cp $$x.da   lcov_data/$$y.da ; \
-		fi; \
-		if test -f "$$x.bb"; then \
-			cp $$x.bb   lcov_data/$$y.bb ; \
-		fi; \
-		if test -f "$$x.bbg"; then \
-			cp $$x.bbg  lcov_data/$$y.bbg ; \
-		fi; \
-	done; \
-	for dir in ext/bcmath/libbcmath ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
-		if test -d lcov_data/$$dir; then \
-			rm -rf lcov_data/$$dir ; \
-		fi; \
+		test -f "$$x.gcno" && cp $$x.gcno lcov_data/$$y.gcno ; \
+		test -f "$$x.gcda" && cp $$x.gcda lcov_data/$$y.gcda ; \
+		test -f "$$x.da"   && cp $$x.da   lcov_data/$$y.da ; \
+		test -f "$$x.bb"   && cp $$x.bb   lcov_data/$$y.bb ; \
+		test -f "$$x.bbg"  && cp $$x.bbg  lcov_data/$$y.bbg ; \
 	done
 	@echo 
 	@echo "Generating $@"
@@ -68,12 +61,10 @@ php_lcov.info: lcov-test

 lcov-html: php_lcov.info
 	@echo "Generating lcov HTML"
-	@$(LTP_GENHTML) --legend --output-directory lcov_html/ --title "PHP Code Coverage" php_lcov.info
+	@$(LTP_GENHTML) --legend --output-directory lcov_html/ --title "PHP Code Coverage" --show-details php_lcov.info

 lcov-clean:
 	rm -f php_lcov.info
 	rm -rf lcov_data/
 	rm -rf lcov_html/

-lcov-clean-data:
-	@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
@@ -8,37 +8,33 @@ COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORK
 all: $(all_targets) 
 	@echo
 	@echo "Build complete."
-	@echo "Don't forget to run 'make test'."
+	@echo "(It is safe to ignore warnings about tempnam and tmpnam)."
 	@echo
+	
+build-modules: $(PHP_MODULES)

-build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
-
-build-binaries: $(PHP_BINARIES)
-
-libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
+	-@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1

-libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-	$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp$(PHP_MAJOR_VERSION).so
+libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+	$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp5.so

 install: $(all_targets) $(install_targets)

 install-sapi: $(OVERALL_TARGET)
 	@echo "Installing PHP SAPI module:       $(PHP_SAPI)"
 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-	-@if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
+	-@if test ! -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); then \
 		for i in 0.0.0 0.0 0; do \
-			if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
-				$(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
+			if test -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+				$(LN_S) $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); \
 				break; \
 			fi; \
 		done; \
 	fi
 	@$(INSTALL_IT)

-install-binaries: build-binaries $(install_binary_targets)
-
 install-modules: build-modules
 	@test -d modules && \
 	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
@@ -71,40 +67,37 @@ install-headers:
 		done; \
 	fi

-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
-PHP_TEST_SHARED_EXTENSIONS =  ` \
-	if test "x$(PHP_MODULES)" != "x"; then \
-		for i in $(PHP_MODULES)""; do \
-			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
-		done; \
-	fi; \
-	if test "x$(PHP_ZEND_EX)" != "x"; then \
-		for i in $(PHP_ZEND_EX)""; do \
-			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
-		done; \
-	fi`
-PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
-
-test: all
-	@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
-		INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
-		if test "$$INI_FILE"; then \
-			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
-		else \
-			echo > $(top_builddir)/tmp-php.ini; \
-		fi; \
-		INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
-		if test "$$INI_SCANNED_PATH"; then \
-			INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
-			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
-		fi; \
+test: all 
+	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
 		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
-			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
-		TEST_RESULT_EXIT_CODE=$$?; \
-		rm $(top_builddir)/tmp-php.ini; \
-		exit $$TEST_RESULT_EXIT_CODE; \
+			$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
+	elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
+		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -U $(TESTS); \
+	else \
+		echo "ERROR: Cannot run tests without CLI sapi."; \
+	fi
+
+utest: all
+	-@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \
+		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -u $(TESTS); \
+	else \
+		echo "ERROR: Cannot run tests without CLI sapi."; \
+	fi
+
+ntest: all
+	-@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \
+		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -N $(TESTS); \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi
@@ -115,20 +108,12 @@ clean:
 	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/*
+	rm -f libphp5.la $(SAPI_CLI_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 sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
-	rm -f php5.spec main/build-defs.h scripts/phpize
-	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/mysqlnd/php_mysqlnd_config.h
-	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
-	if test "$(srcdir)" != "$(builddir)"; then \
-	  rm -f ext/phar/phar/phar.inc; \
-	fi
+	rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp5.module buildmk.stamp
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
+	find . -name Makefile | xargs rm -f

 .PHONY: all clean install distclean test
 .NOEXPORT:
@@ -0,0 +1,123 @@
+This is the first file you should be reading after you get your CVS account.
+We'll assume you're basically familiar with CVS, but feel free to post
+your questions on the mailing list. Please have a look at 
+http://cvsbook.red-bean.com/ for more detailed information on CVS.
+
+PHP is developed through the efforts of a large number of people.
+Collaboration is a Good Thing(tm), and CVS lets us do this. Thus, following
+some basic rules with regards to CVS usage will:
+
+   a. Make everybody happier, especially those responsible for maintaining
+      the CVS itself.
+   b. Keep the changes consistently well documented and easily trackable.
+   c. Prevent some of those 'Oops' moments.
+   d. Increase the general level of good will on planet Earth.
+
+
+Having said that, here are the organizational rules:
+
+   1. Respect other people working on the project.
+
+   2. Discuss any significant changes on the list before committing. 
+
+   3. Look at EXTENSIONS file to see who is the primary maintainer of
+      the code you want to contribute to.
+
+   4. If you "strongly disagree" about something another person did, don't
+      start fighting publicly - take it up in private email.
+
+   5. If you don't know how to do something, ask first!
+
+   6. Test your changes before committing them. We mean it. Really.
+      To do so use "make test".
+   
+   7. For development use the --enable-maintainer-zts switch to ensure your
+      code handles TSRM correctly and doesn't break for thos who need that.
+
+Currently we have the following branches in use:
+HEAD     Will become PHP 6.0. This CVS branch is for active development.
+PHP_5_2  Is used to release the PHP 5.2.x series. Only minor feature
+         enhancements may go in here, but please keep that as infrequent as
+         possible.
+PHP_5_1  Is used to release the PHP 5.1.x series. Only bugfixes are permitted
+         on this branch (Consult the releasemaster prior to commit).
+PHP_5_0  This branch is closed.
+PHP_4_4  Is used to release the PHP 4.4.x series. Only bugfixes are permitted
+         on this branch (Consult the releasemaster prior to commit).
+PHP_4_3  This branch is closed.
+
+The next few rules are more of a technical nature.
+
+   1. DO NOT TOUCH ChangeLog! It is automagically updated from the commit
+      messages every day. Woe be to those who attempt to mess with it.
+
+   2. All news updates intended for public viewing, such as new features,
+      bug fixes, improvements, etc., should go into the NEWS file. 
+	  
+      NB! Lines, starting with @ will go automagically into NEWS file, but
+      this is NOT recommended, though. Please, add news entries directly to 
+      NEWS file and don't forget to keep them adjusted and sorted.
+
+   3. Do not commit multiple file and dump all messages in one commit. If you
+      modified several unrelated files, commit each group separately and
+      provide a nice commit message for each one. See example below.
+
+   4. Do write your commit message in such a way that it makes sense even
+      without the corresponding diff. One should be able to look at it, and
+      immediately know what was modified. Definitely include the function name
+      in the message as shown below.
+
+   5. In your commit messages, keep each line shorter than 80 characters. And
+      try to align your lines vertically, if they wrap. It looks bad otherwise.
+
+   6. If you modified a function that is callable from PHP, prepend PHP to
+      the function name as shown below.
+
+
+The format of the commit messages is pretty simple.
+
+Use a - to start a new item in your commit message.
+
+If a line begins with #, it is taken to be a comment and will not appear
+in the ChangeLog. Everything else goes into the ChangeLog.
+
+It is important to note that if your comment or news logline spans multiple
+lines, you have to put # at the beginning of _every_ such line. 
+
+Example. Say you modified two files, datetime.c and string.c. In datetime.c you
+added a new format option for the date() function, and in string.c you fixed a
+memory leak in php_trim(). Don't commit both of these at once. Commit them
+separately and try to make sure your commit messages look something like the
+following.
+
+For datetime.c:
+- Added new 'K' format modifier to date() for printing out number of days until
+  New Year's Eve.
+
+For string.c:
+- Fixed a memory leak in php_trim() resulting from improper use of zval_dtor().
+#- Man, that thing was leaking all over the place!
+
+The # lines will be omitted from the ChangeLog automagically.
+
+If you fix some bugs, you should note the bug ID numbers in your
+commit message. Bug ID should be prefixed by "#" for easier access to
+bug report when developers are browsing CVS via. LXR or Bonsai.
+
+Example:
+
+Fixed bug #14016 (pgsql notice handler double free crash bug.)
+
+If you don't see your messages in ChangeLog right away, don't worry!
+These files are updated once a day, so your stuff will not show up until
+somewhat later. 
+
+You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
+to look at PHP CVS repository in various ways.
+
+To receive daily updates to ChangeLog and NEWS, send an empty message to
+php-cvs-daily-subscribe@lists.php.net.
+
+Happy hacking,
+
+PHP Team
@@ -30,7 +30,7 @@ zend_module_entry foo_module_entry = {
    PHP_RSHUTDOWN(foo),   /* per-request shutdown function */
    PHP_MINFO(foo),       /* information function */
 #if ZEND_MODULE_API_NO >= 20010901
-    PHP_FOO_VERSION,      /* extension version number (string) */
+    FOO_VERSION,          /* extension version number (string) */
 #endif
    STANDARD_MODULE_PROPERTIES
 };
@@ -31,11 +31,6 @@ HOW TO USE IT

    ./buildconf; ./configure --enable-module_name; make

-  The definition of PHP_MODULE_NAME_VERSION will be present in the
-  php_module_name.h and injected into the zend_module_entry definition. This
-  is required by the PECL website for the version string conformity checks
-  against package.xml
-
  But if you already have planned the overall scheme of your module, what
  functions it will contain, their return types and the arguments they take
  (a very good idea) and don't want to bother yourself with creating function
@@ -101,7 +96,29 @@ OTHER OPTIONS
  function entries and definitions at the end of the file, for copying and
  pasting into an already existing module.

-    --xml[=file]
+    --assign-params
+    --string-lens
+
+  By default, function proto 'void foo(string bar)' creates the following:
+     ...
+     zval **bar;
+     ... (zend_get_parameters_ex() called in the middle...)
+     convert_to_string_ex(bar);
+
+  Specifying both of these options changes the generated code to:
+     ...
+     zval **bar_arg;
+     int bar_len;
+     char *bar = NULL;
+     ... (zend_get_parameters_ex() called in the middle...)
+     convert_to_string_ex(bar_arg);
+     bar = Z_STRVAL_PP(bar_arg);
+     bar_len = Z_STRLEN_PP(bar_arg);
+
+  You shouldn't have to ask what happens if you leave --string-lens out. If you
+  have to, it's questionable whether you should be reading this document.
+
+    --with-xml[=file]

  Creates the basics for phpdoc .xml file.

@@ -139,32 +156,39 @@ EXAMPLE
  question marks to be replaced by you, and you must of course add your own
  value definitions too):

-/* {{{ proto bool my_drawtext(resource image, string text, resource font, int x, int y [, int color])
+/* {{{ proto bool my_drawtext(resource image, string text, resource font, int x, int y[, int color])
    */
 PHP_FUNCTION(my_drawtext)
 {
-    char *text = NULL;
-    int argc = ZEND_NUM_ARGS();
-    int image_id = -1;
-    int text_len;
-    int font_id = -1;
-    long x;
-    long y;
-    long color;
-    zval *image = NULL;
-    zval *font = NULL;
+	zval **image, **text, **font, **x, **y, **color;
+	int argc;
+	int image_id = -1;
+	int font_id = -1;

-    if (zend_parse_parameters(argc TSRMLS_CC, "rsrll|l", &image, &text, &text_len, &font, &x, &y, &color) == FAILURE)
-        return;
+	argc = ZEND_NUM_ARGS();
+	if (argc < 5 || argc > 6 || zend_get_parameters_ex(argc, &image, &text, &font, &x, &y, &color) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}

-    if (image) {
-        ZEND_FETCH_RESOURCE(???, ???, image, image_id, "???", ???_rsrc_id);
-    }
-    if (font) {
-        ZEND_FETCH_RESOURCE(???, ???, font, font_id, "???", ???_rsrc_id);
-    }
+	ZEND_FETCH_RESOURCE(???, ???, image, image_id, "???", ???_rsrc_id);
+	ZEND_FETCH_RESOURCE(???, ???, font, font_id, "???", ???_rsrc_id);

-    php_error(E_WARNING, "my_drawtext: not yet implemented");
+	switch (argc) {
+		case 6:
+			convert_to_long_ex(color);
+			/* Fall-through. */
+		case 5:
+			convert_to_long_ex(y);
+			convert_to_long_ex(x);
+			/* font: fetching resources already handled. */
+			convert_to_string_ex(text);
+			/* image: fetching resources already handled. */
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+	}
+
+	php_error(E_WARNING, "my_drawtext: not yet implemented");
 }
 /* }}} */

@@ -1,129 +0,0 @@
-====================
-  Git Commit Rules
-====================
-
-This is the first file you should be reading when contributing code via Git.
-We'll assume you're basically familiar with Git, but feel free to post
-your questions on the mailing list. Please have a look at
-http://git-scm.com/ for more detailed information on Git.
-
-PHP is developed through the efforts of a large number of people.
-Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following
-some basic rules with regards to Git usage will::
-
-   a. Make everybody happier, especially those responsible for maintaining
-      Git itself.
-
-   b. Keep the changes consistently well documented and easily trackable.
-
-   c. Prevent some of those 'Oops' moments.
-
-   d. Increase the general level of good will on planet Earth.
-
-Having said that, here are the organizational rules::
-
-   1. Respect other people working on the project.
-
-   2. Discuss any significant changes on the list before committing and get
-      confirmation from the release manager for the given branch.
-
-   3. Look at EXTENSIONS file to see who is the primary maintainer of
-      the code you want to contribute to.
-
-   4. If you "strongly disagree" about something another person did, don't
-      start fighting publicly - take it up in private email.
-
-   5. If you don't know how to do something, ask first!
-
-   6. Test your changes before committing them. We mean it. Really.
-      To do so use "make test".
-
-   7. For development use the --enable-maintainer-zts switch to ensure your
-      code handles TSRM correctly and doesn't break for those who need that.
-
-Currently we have the following branches in use::
-
-  master    The active development branch. 
-
-  PHP-5.5   Is used to release the PHP 5.5.x series. This is a current
-            stable version and is open for bugfixes only.
-
-  PHP-5.4   Is used to release the PHP 5.4.x series. This is a current
-            stable version and is open for bugfixes only.
-
-  PHP-5.3   Is used to release the PHP 5.3.x series. This is currently 
-            in extended support and open forsecurity fixes only. Triaged
-            via security@php.net
-
-  PHP-5.2   This branch is closed.
-
-  PHP-5.1   This branch is closed.
-
-  PHP-4.4   This branch is closed.
-
-The next few rules are more of a technical nature::
-
-   1. All changes should first go to the lowest branch (i.e. 5.3) and then 
-      get merged up to all other branches. If a change is not needed for
-      later branches (i.e. fixes for features which where dropped from later
-      branches) an empty merge should be done.
-
-   2. All news updates intended for public viewing, such as new features,
-      bug fixes, improvements, etc., should go into the NEWS file of *any
-      stable release* version with the given change. In other words,
-      news about a bug fix which went into PHP-5.4, PHP-5.5 and master
-      should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but
-      not master, which is not a public released version yet.
-
-   3. Do not commit multiple file and dump all messages in one commit. If you
-      modified several unrelated files, commit each group separately and
-      provide a nice commit message for each one. See example below.
-
-   4. Do write your commit message in such a way that it makes sense even
-      without the corresponding diff. One should be able to look at it, and
-      immediately know what was modified. Definitely include the function name
-      in the message as shown below.
-
-   5. In your commit messages, keep each line shorter than 80 characters. And
-      try to align your lines vertically, if they wrap. It looks bad otherwise.
-
-   6. If you modified a function that is callable from PHP, prepend PHP to
-      the function name as shown below.
-
-
-The format of the commit messages is pretty simple.
-
-<max 79 characters short description>\n
-\n
-<long description, 79 chars per line>
-\n
-
-An Example from the git project (commit 2b34e486bc):
-
-pack-objects: Fix compilation with NO_PTHREDS
-  
-It looks like commit 99fb6e04 (pack-objects: convert to use
-parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but
-hasn't noticed that the 'arg' variable no longer is available.
-
-If you fix some bugs, you should note the bug ID numbers in your
-commit message. Bug ID should be prefixed by "#" for easier access to
-bug report when developers are browsing CVS via LXR or Bonsai.
-
-Example::
-
-  Fixed bug #14016 (pgsql notice handler double free crash bug.)
-
-When you change the NEWS file for a bug fix, then please keep the bugs
-sorted in decreasing order under the fixed version.
-
-You can use OpenGrok (http://lxr.php.net/) and gitweb (http://git.php.net/)
-to look at PHP Git repository in various ways.
-
-
-For further information on the process and further details please refer to
-https://wiki.php.net/vcs/gitworkflow and https://wiki.php.net/vcs/gitfaq
-
-Happy hacking,
-
-PHP Team
@@ -1,79 +0,0 @@
-====================
-  Mailinglist Rules
-====================
-
-This is the first file you should be reading before doing any posts on PHP
-mailinglists. Following these rules is considered imperative to the success of
-the PHP project. Therefore expect your contributions to be of much less positive
-impact if you do not follow these rules. More importantly you can actually
-assume that not following these rules will hurt the PHP project.
-
-PHP is developed through the efforts of a large number of people.
-Collaboration is a Good Thing(tm), and mailinglists lets us do this. Thus,
-following some basic rules with regards to mailinglist usage will:
-
-   a. Make everybody happier, especially those responsible for developing PHP
-      itself.
-
-   b. Help in making sure we all use our time more efficiently.
-
-   c. Prevent you from making a fool of yourself in public.
-
-   d. Increase the general level of good will on planet Earth.
-
-
-Having said that, here are the organizational rules:
-
-   1. Respect other people working on the project.
-
-   2. Do not post when you are angry. Any post can wait a few hours. Review
-      your post after a good breather or a good nights sleep.
-
-   3. Make sure you pick the right mailinglist for your posting. Please review
-      the descriptions on the mailinglist overview page
-      (http://www.php.net/mailing-lists.php). When in doubt ask a friend or
-      someone you trust on IRC.
-
-   4. Make sure you know what you are talking about. PHP is a very large project
-      that strives to be very open. The flip side is that the core developers
-      are faced with a lot of requests. Make sure that you have done your
-      research before posting to the entire developer community.
-
-   5. Patches have a much greater chance of acceptance than just asking the
-      PHP developers to implement a feature for you. For one it makes the
-      discussion more concrete and it shows that the poster put thought and time
-      into the request.
-
-   6. If you are posting to an existing thread, make sure that you know what
-      previous posters have said. This is even more important the longer the
-      thread is already.
-
-   7. Please configure your email client to use a real name and keep message
-      signatures to a maximum of 2 lines if at all necessary.
-
-The next few rules are more some general hints:
-
-   1. If you notice that your posting ratio is much higher than that of other
-      people, double check the above rules. Try to wait a bit longer before
-      sending your replies to give other people more time to digest your answers
-      and more importantly give you the opportunity to make sure that you
-      aggregate your current position into a single mail instead of multiple
-      ones.
-
-   2. Consider taking a step back from a very active thread now and then. Maybe
-      talking to some friends and fellow developers will help in understanding
-      the other opinions better.
-
-   3. Do not top post. Place your answer underneath anyone you wish to quote
-      and remove any previous comment that is not relevant to your post.
-
-   4. Do not high-jack threads, by bringing up entirely new topics. Please
-      create an entirely new thread copying anything you wish to quote into the
-      new thread.
-
-Finally, additional hints on how to behave inside the virtual community can be
-found in RFC 1855 (http://www.faqs.org/rfcs/rfc1855.html).
-
-Happy hacking,
-
-PHP Team
@@ -1,142 +0,0 @@
-$Id: README.NEW-OUTPUT-API 219039 2006-08-30 07:39:09Z mike $
-
-
-API adjustment to the old output control code:
-
-	Everything now resides beneath the php_output namespace, 
-	and there's an API call for every output handler op.
-
-	Checking output control layers status:
-		// Using OG()
-		php_output_get_status(TSRMLS_C);
-
-	Starting the default output handler:
-		// php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
-		php_output_start_default(TSRMLS_C);
-
-	Starting an user handler by zval:
-		// php_start_ob_buffer(zhandler, chunk_size, erase TSRMLS_CC);
-		php_output_start_user(zhandler, chunk_size, flags TSRMLS_CC);
-
-	Starting an internal handler whithout context:
-		// php_ob_set_internal_handler(my_php_output_handler_func_t, buffer_size, "output handler name", erase TSRMLS_CC);
-		php_output_start_internal(handler_name, handler_name_len, my_php_output_handler_func_t, chunk_size, flags TSRMLS_CC);
-
-	Starting an internal handler with context:
-		// not possible with old API
-		php_output_handler *h;
-		h = php_output_handler_create_internal(handler_name, handler_name_len, my_php_output_handler_context_func_t, chunk_size, flags TSRMLS_CC);
-		php_output_handler_set_context(h, my_context, my_context_dtor);
-		php_output_handler_start(h TSRMLS_CC);
-
-	Testing whether a certain output handler has already been started:
-		// php_ob_handler_used("output handler name" TSRMLS_CC);
-		php_output_handler_started(handler_name, handler_name_len TSRMLS_CC);
-
-	Flushing one output buffer:
-		// php_ob_end_buffer(1, 1 TSRMLS_CC);
-		php_output_flush(TSRMLS_C);
-
-	Flushing all output buffers:
-		// not possible with old API
-		php_output_flush_all(TSRMLS_C);
-
-	Cleaning one output buffer:
-		// php_ob_end_buffer(0, 1 TSRMLS_CC);
-		php_output_clean(TSRMLS_C);
-
-	Cleaning all output buffers:
-		// not possible with old API
-		php_output_clean_all(TSRMLS_C);
-
-	Discarding one output buffer:
-		// php_ob_end_buffer(0, 0 TSRMLS_CC);
-		php_output_discard(TSRMLS_C);
-
-	Discarding all output buffers:
-		// php_ob_end_buffers(0 TSRMLS_CC);
-		php_output_discard_all(TSRMLS_C);
-
-	Stopping (and dropping) one output buffer:
-		// php_ob_end_buffer(1, 0 TSRMLS_CC)
-		php_output_end(TSRMLS_C);
-
-	Stopping (and dropping) all output buffers:
-		// php_ob_end_buffers(1, 0 TSRMLS_CC);
-		php_output_end_all(TSRMLS_C);
-
-	Retrieving output buffers contents:
-		// php_ob_get_buffer(zstring TSRMLS_CC);
-		php_output_get_contents(zstring TSRMLS_CC);
-
-	Retrieving output buffers length:
-		// php_ob_get_length(zlength TSRMLS_CC);
-		php_output_get_length(zlength TSRMLS_CC);
-
-	Retrieving output buffering level:
-		// OG(nesting_level);
-		php_output_get_level(TSRMLS_C);
-
-	Issue a warning because of an output handler conflict:
-		// php_ob_init_conflict("to be started handler name", "to be tested if already started handler name" TSRMLS_CC);
-		php_output_handler_conflict(new_handler_name, new_handler_name_len, set_handler_name, set_handler_name_len TSRMLS_CC);
-
-	Registering a conflict checking function, which will be checked prior starting the handler:
-		// not possible with old API, unless hardcoding into output.c
-		php_output_handler_conflict_register(handler_name, handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);
-
-	Registering a reverse conflict checking function, which will be checked prior starting the specified foreign handler:
-		// not possible with old API
-		php_output_handler_reverse_conflict_register(foreign_handler_name, foreign_handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);
-
-	Facilitating a context from within an output handler callable with ob_start():
-		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr TSRMLS_CC);
-
-	Disabling of the output handler by itself:
-		//not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL TSRMLS_CC);
-
-	Marking an output handler immutable by itself because of irreversibility of its operation:
-		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC);
-
-	Restarting the output handler because of a CLEAN operation:
-		// not possible with old API
-		if (flags & PHP_OUTPUT_HANDLER_CLEAN) { ... }
-
-	Recognizing by the output handler itself if it gets discarded:
-		// not possible with old API
-		if ((flags & PHP_OUTPUT_HANDLER_CLEAN) && (flags & PHP_OUTPUT_HANDLER_FINAL)) { ... }
-
-
-Output handler hooks
-
-	The output handler can change its abilities at runtime. Eg. the gz handler can
-	remove the CLEANABLE and REMOVABLE bits when the first output has passed through it;
-	or handlers implemented in C to be used with ob_start() can contain a non-global
-	context:
-		PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ
-			pass a void*** pointer as second arg to receive the address of a pointer
-			pointer to the opaque field of the output handler context
-		PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS
-			pass a int* pointer as second arg to receive the flags set for the output handler
-		PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL
-			pass a int* pointer as second arg to receive the level of this output handler
-			(starts with 0)
-		PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE
-			the second arg is ignored; marks the output handler to be neither cleanable
-			nor removable
-		PHP_OUTPUT_HANDLER_HOOK_DISABLE
-			the second arg is ignored; marks the output handler as disabled
-
-
-Open questions
-
-	Should the userland API be adjusted and unified?
-	
-	Many bits of the manual (and very first implementation) do not comply
-	with the behaviour of the current (to be obsoleted) code, thus should
-	the manual or the behaviour be adjusted?
-
-END
@@ -28,87 +28,43 @@ Both functions return SUCCESS or FAILURE depending on the result.
 The auto-conversions are performed as necessary. Arrays, objects, and
 resources cannot be auto-converted.

-PHP 5.5 includes a new function:
-
-int zend_parse_parameter(int flags, int arg_num TSRMLS_DC, zval **arg, const char *spec, ...);
-
-This function behaves like zend_parse_parameters_ex() except that instead of
-reading the arguments from the stack, it receives a single zval to convert
-(passed with double indirection). The passed zval may be changed in place as
-part of the conversion process.
-
-See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse_parameter
-

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

- a  - array (zval*)
- A  - array or object (zval *)
- b  - boolean (zend_bool)
- C  - class (zend_class_entry*)
- d  - double (double)
- f  - function or array containing php method call info (returned as 
-      zend_fcall_info and zend_fcall_info_cache)
- h  - array (returned as HashTable*)
- H  - array or HASH_OF(object) (returned as HashTable*)
- l  - long (long)
- L  - long, limits out-of-range numbers to LONG_MAX/LONG_MIN (long)
- o  - object of any type (zval*)
- O  - object of specific type given by class entry (zval*, zend_class_entry)
- p  - valid path (string without null bytes in the middle) and its length (char*, int)
- r  - resource (zval*)
- s  - string (with possible null bytes) and its length (char*, int)
- z  - the actual zval (zval*)
- Z  - the actual zval (zval**)
- *  - variable arguments list (0 or more)
- +  - variable arguments list (1 or more)
+ l	- long (long)
+ d	- double (double)
+ s	- string (with possible null bytes) and its length (char*, int)
+ u	- unicode (UChar*, int)
+ t	- text (void * (char*/Uchar*), int (length), zend_uchar (IS_STRING/..))
+  	  actual type is controled by ini unicode setting
+ T	- text (void * (char*/Uchar*), int (length), zend_uchar (IS_STRING/..))
+  	  actual type controlled by first s or u
+ b	- boolean (zend_bool)
+ r	- resource (zval*)
+ a	- array (zval*)
+ h	- array (returned as HashTable*)
+ o	- object of any type (zval*)
+ O	- object of specific type given by class entry (zval*, zend_class_entry)
+ C	- class (zend_class_entry*)
+ z	- the actual zval (zval*)
+ Z	- the actual zval (zval**)

 The following characters also have a meaning in the specifier string:
-    | - indicates that the remaining parameters are optional, they
-        should be initialized to default values by the extension since they
-        will not be touched by the parsing function if they are not
-        passed to it.
-    / - use SEPARATE_ZVAL_IF_NOT_REF() on the parameter it follows
-    ! - the parameter it follows can be of specified type or NULL. If NULL is
-		passed and the output for such type is a pointer, then the output
-		pointer is set to a native NULL pointer.
-		For 'b', 'l' and 'd', an extra argument of type zend_bool* must be
-		passed after the corresponding bool*, long* or double* arguments,
-		respectively. A non-zero value will be written to the zend_bool iif a
-		PHP NULL is passed.
-
-
-Note on 64bit compatibility
---------------------------
-Please do not forget that int and long are two different things on 64bit 
-OSes (int is 4 bytes and long is 8 bytes), so make sure you pass longs to "l" 
-and ints to strings length (i.e. for "s" you need to pass char * and int), 
-not the other way round!
-Remember: "l" is the only case when you need to pass long (and that's why 
-it's "l", not "i" btw).
-
-Both mistakes cause memory corruptions and segfaults on 64bit OSes:
-1)
-  char *str;
-  long str_len; /* XXX THIS IS WRONG!! Use int instead. */
-  zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len)
-
-2)
-  int num; /* XXX THIS IS WRONG!! Use long instead. */
-  zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &num)
-
-If you're in doubt, use check_parameters.php script to the parameters 
-and their types (it can be found in ./scripts/dev/ directory of PHP sources):
-
-# php ./scripts/dev/check_parameters.php /path/to/your/sources/
-
+	| - indicates that the remaining parameters are optional, they
+	    should be initialized to default values by the extension since they
+	    will not be touched by the parsing function if they are not
+	    passed to it.
+	/ - use SEPARATE_ZVAL_IF_NOT_REF() on the parameter it follows
+	! - the parameter it follows can be of specified type or NULL (only applies
+	    to 'a', 'o', 'O', 'r', and 'z'). If NULL is passed, the results
+	    pointer is set to NULL as well.

 Examples
 --------
@@ -118,18 +74,18 @@ char *s;
 int s_len;
 zval *param;
 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
-                          &l, &s, &s_len, &param) == FAILURE) {
-    return;
+						  &l, &s, &s_len, &param) == FAILURE) {
+	return;
 }


 /* Gets an object of class specified by my_ce, and an optional double. */
 zval *obj;
 double d = 0.5;
-zend_class_entry *my_ce;
+zend_class_entry my_ce;
 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
-                          &obj, my_ce, &d) == FAILURE) {
-    return;
+						  &obj, my_ce, &d) == FAILURE) {
+	return;
 }


@@ -138,18 +94,29 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
 zval *obj;
 zval *arr;
 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a",
-                          &obj, &arr) == FAILURE) {
-    return;
+						  &obj, &arr) == FAILURE) {
+	return;
 }


 /* Gets a separated array which can also be null. */
 zval *arr;
 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
-                          &arr) == FAILURE) {
-    return;
+						  &arr) == FAILURE) {
+	return;
 }

+
+/* Get only the first three parameters (useful for varargs functions). */
+zval *z;
+zend_bool b;
+zval *r;
+if (zend_parse_parameters(3 TSRMLS_CC, "zbr!",
+						  &z, &b, &r) == FAILURE) {
+	return;
+}
+
+
 /* Get either a set of 3 longs or a string. */
 long l1, l2, l3;
 char *s;
@@ -163,72 +130,13 @@ char *s;
 int length;

 if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
-                             "lll", &l1, &l2, &l3) == SUCCESS) {
-    /* manipulate longs */
+							 "lll", &l1, &l2, &l3) == SUCCESS) {
+	/* manipulate longs */
 } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
-                                    "s", &s, &length) == SUCCESS) {
-    /* manipulate string */
+									"s", &s, &length) == SUCCESS) {
+	/* manipulate string */
 } else {
-    /* output error */
+	/* output error */

-    return;
+	return;
 }
-
-
-/* Function that accepts only varargs (0 or more) */
-
-int i, num_varargs;
-zval ***varargs = NULL;
-
-
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "*", &varargs, &num_varargs) == FAILURE) {
-    return;
-}
-
-for (i = 0; i < num_varargs; i++) {
-    /* do something with varargs[i] */
-}
-
-if (varargs) {
-    efree(varargs);
-}
-
-
-/* Function that accepts a string, followed by varargs (1 or more) */
-
-char *str;
-int str_len;
-int i, num_varargs;
-zval ***varargs = NULL;
-
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
-    return;
-}
-
-for (i = 0; i < num_varargs; i++) {
-    /* do something with varargs[i] */
-}
-
-if (varargs) {
-    efree(varargs);
-}
-
-
-/* Function that takes an array, followed by varargs, and ending with a long */
-long num;
-zval *array;
-int i, num_varargs;
-zval ***varargs = NULL;
-
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
-    return;
-}
-
-for (i = 0; i < num_varargs; i++) {
-    /* do something with varargs[i] */
-}
-
-if (varargs) {
-    efree(varargs);
-}
-
@@ -0,0 +1,11 @@
+To install the PEAR installer, please use go-pear.
+
+On linux:
+$ lynx -source http://go-pear.org/ | php
+
+or save the setup script under go-pear.php and run:
+
+php go-pear.php
+
+For more informations see the PEAR manual:
+http://pear.php.net/manual/en/installation.getting.php
@@ -0,0 +1,57 @@
+QNX4 Installation Notes
+-----------------------
+
+NOTE: General installation instructions are in the INSTALL file 
+
+
+1. To compile and test PHP3 you have to grab, compile and install:
+	- GNU dbm library or another db library;
+	- GNU bison (1.25 or later; 1.25 tested);
+	- GNU flex (any version supporting -o and -P options; 2.5.4 tested);
+	- GNU diffutils (any version supporting -w option; 2.7 tested);
+
+2. To use CVS version you may need also:
+	- GNU CVS (1.9 tested);
+	- GNU autoconf (2.12 tested);
+	- GNU m4 (1.3 or later preferable; 1.4 tested);
+
+3. To run configure define -lunix in command line:
+	LDFLAGS=-lunix ./configure
+
+4. To use Sybase SQL Anywhere define ODBC_QNX and CUSTOM_ODBC_LIBS in
+	command line and run configure with --with-custom-odbc:
+	CFLAGS=-DODBC_QNX LDFLAGS=-lunix CUSTOM_ODBC_LIBS="-ldblib -lodbc" ./configure --with-custom-odbc=/usr/lib/sqlany50
+   If you have SQL Anywhere version 5.5.00, then you have to add 
+	CFLAGS=-DSQLANY_BUG
+   to workaround its SQLFreeEnv() bug. Other versions has not been tested,
+   so try without this flag first.
+
+5. To build the Apache module, you may have to hardcode an include path for 
+   alloc.h in your Apache base directory:
+	- APACHE_DIRECTORY/src/httpd.h: 
+		change	#include "alloc.h"
+		to 		#include "APACHE_DIRECTORY/src/alloc.h"
+   Unless you want to use system regex library, you have to hardcode also
+   a path to regex.h:
+	- APACHE_DIRECTORY/src/conf.h:  
+		change  #include <regex.h>
+		to		#include "APACHE_DIRECTORY/src/regex/regex.h"
+   I don't know so far why this required for QNX, may be it is Watcom 
+   compiler problem.
+
+  If you building Apache module with SQL Anywhere support, you'll get
+  symbol conflict with BOOL. It is defined in Apache (httpd.h) and in 
+  SQL Anywhere (odbc.h). This has nothing to do with PHP, so you have to 
+  fix it yourself someway.
+
+6. With above precautions, it should compile as is and pass regression
+	tests completely:
+		make
+		make check
+		make install
+
+	Don't bother me unless you really sure you made	that all but it 
+	still doesn't work.
+
+June 28, 1998
+Igor Kovalenko -- owl@infomarket.ru
@@ -1,442 +0,0 @@
-1. libmagic (ext/fileinfo) see ext/fileinfo/libmagic/LICENSE
-2. Oniguruma (ext/mbstring) see ext/mbstring/oniguruma/COPYING
-3. libmbfl (ext/mbstring) see ext/mbstring/libmbfl/LICENSE
-4. pcrelib (ext/pcre) see ext/pcre/pcrelib/LICENCE
-5. ext/standard crypt
-6. ext/standard crypt's blowfish implementation
-7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
-8. ext/json/json_parser
-9. ext/standard/rand
-10. ext/standard/scanf
-11. ext/standard/strnatcmp.c
-12. ext/standard/uuencode
-13. libxmlrpc ext/xmlrpc
-14. libzip ext/zip
-15. main/snprintf.c
-16. main/strlcat
-17. main/strlcpy
-18. libgd see ext/gd/libgd/COPYING
-
-5. ext/standard crypt
-
-FreeSec: libcrypt for NetBSD
-
-Copyright (c) 1994 David Burren
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-	 notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-	 notice, this list of conditions and the following disclaimer in the
-	 documentation and/or other materials provided with the distribution.
-3. Neither the name of the author nor the names of other contributors
-	 may be used to endorse or promote products derived from this software
-	 without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
- 
-
-6. ext/standard crypt's blowfish implementation
-
-The crypt_blowfish homepage is:
-
-http://www.openwall.com/crypt/
-
-This code comes from John the Ripper password cracker, with reentrant
-and crypt(3) interfaces added, but optimizations specific to password
-cracking removed.
-
-Written by Solar Designer <solar at openwall.com> in 1998-2011.
-No copyright is claimed, and the software is hereby placed in the public
-domain. In case this attempt to disclaim copyright and place the software
-in the public domain is deemed null and void, then the software is
-Copyright (c) 1998-2011 Solar Designer and it is hereby released to the
-general public under the following terms:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted.
-
-There's ABSOLUTELY NO WARRANTY, express or implied.
-
-It is my intent that you should be able to use this on your system,
-as part of a software package, or anywhere else to improve security,
-ensure compatibility, or for any other purpose. I would appreciate
-it if you give credit where it is due and keep your modifications in
-the public domain as well, but I don't require that in order to let
-you place this code and any modifications you make under a license
-of your choice.
-
-This implementation is mostly compatible with OpenBSD's bcrypt.c (prefix
-"$2a$") by Niels Provos <provos at citi.umich.edu>, and uses some of his
-ideas. The password hashing algorithm was designed by David Mazieres
-<dm at lcs.mit.edu>. For more information on the level of compatibility,
-please refer to the comments in BF_set_key() and to the crypt(3) man page
-included in the crypt_blowfish tarball.
-
-There's a paper on the algorithm that explains its design decisions:
-
-http://www.usenix.org/events/usenix99/provos.html
-
-Some of the tricks in BF_ROUND might be inspired by Eric Young's
-Blowfish library (I can't be sure if I would think of something if I
-hadn't seen his code).
- 
-
-7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
-
-The author disclaims copyright to this source code.  In place of
-a legal notice, here is a blessing:
-  May you do good and not evil.
-  May you find forgiveness for yourself and forgive others.
-  May you share freely, never taking more than you give.
-
-
-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
-
-Mersenne Twister random number generator -- a C++ class MTRand
-Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus
-Richard J. Wagner  v1.0  15 May 2003  rjwagner@writeme.com
-
-The Mersenne Twister is an algorithm for generating random numbers.  It
-was designed with consideration of the flaws in various other generators.
-The period, 2^19937-1, and the order of equidistribution, 623 dimensions,
-are far greater.  The generator is also fast; it avoids multiplication and
-division, and it benefits from caches and pipelines.  For more information
-see the inventors' web page at http://www.math.keio.ac.jp/~matumoto/emt.html
-
-Reference
-M. Matsumoto and T. Nishimura, "Mersenne Twister: A 623-Dimensionally
-Equidistributed Uniform Pseudo-Random Number Generator", ACM Transactions on
-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.                          
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-	 notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-	 notice, this list of conditions and the following disclaimer in the
-	 documentation and/or other materials provided with the distribution.
-
-3. The names of its contributors may not be used to endorse or promote 
-	 products derived from this software without specific prior written 
-	 permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-10. ext/standard/scanf
-scanf.c --
-
-This file contains the base code which implements sscanf and by extension
-fscanf. Original code is from TCL8.3.0 and bears the following copyright:
-
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., Scriptics Corporation,
-and other parties.  The following terms apply to all files associated
-with the software unless explicitly disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-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.
-
-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>
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-	 claim that you wrote the original software. If you use this software
-	 in a product, an acknowledgment in the product documentation would be
-	 appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-	 misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
-12. ext/standard/uuencode
-Portions of this code are based on Berkeley's uuencode/uudecode
-implementation.
-
-Copyright (c) 1983, 1993
-The Regents of the University of California.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-	notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-	notice, this list of conditions and the following disclaimer in the
-	documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-	must display the following acknowledgement:
-This product includes software developed by the University of
-California, Berkeley and its contributors.
-4. Neither the name of the University nor the names of its contributors
-	may be used to endorse or promote products derived from this software
-	without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-
-13. libxmlrpc ext/xmlrpc
-
-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.  
-
-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.  
-
-3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, 
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT 
-OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING 
-NEGLIGENCE), EVEN IF EPINIONS, INC.  IS AWARE OF THE POSSIBILITY OF SUCH 
-DAMAGES.
-
-14. libzip ext/zip
-zip.h -- exported declarations.
-Copyright (C) 1999-2009 Dieter Baron and Thomas Klausner
-
-This file is part of libzip, a library to manipulate ZIP archives.
-The authors can be contacted at <libzip@nih.at>
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-	 notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-	 notice, this list of conditions and the following disclaimer in
-	 the documentation and/or other materials provided with the
-	 distribution.
-3. The names of the authors may not be used to endorse or promote
-	 products derived from this software without specific prior
-	 written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-15. main/snprintf.c
-Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Sponsored in part by the Defense Advanced Research Projects
-Agency (DARPA) and Air Force Research Laboratory, Air Force
-Materiel Command, USAF, under agreement number F39502-99-1-0512.
-
-main/spprintf
-Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-	 notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-	 notice, this list of conditions and the following disclaimer in
-	 the documentation and/or other materials provided with the
-	 distribution.
-
-3. All advertising materials mentioning features or use of this
-	 software must display the following acknowledgment:
-	 "This product includes software developed by the Apache Group
-	 for use in the Apache HTTP server project (http://www.apache.org/)."
-
-4. The names "Apache Server" and "Apache Group" must not be used to
-	 endorse or promote products derived from this software without
-	 prior written permission.
-
-5. Redistributions of any form whatsoever must retain the following
-	 acknowledgment:
-	 "This product includes software developed by the Apache Group
-	 for use in the Apache HTTP server project (http://www.apache.org/)."
-
-THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP 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 Apache Group and was originally based
-on public domain software written at the National Center for
-Supercomputing Applications, University of Illinois, Urbana-Champaign.
-For more information on the Apache Group and the Apache HTTP server
-project, please see <http://www.apache.org/>.
-
-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.
-
-16. main/strlcat
-17. main/strlcpy
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-	notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-	notice, this list of conditions and the following disclaimer in the
-	documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-	derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-THE AUTHOR 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.
-
@@ -1,288 +0,0 @@
-=======================
-  PHP Release Process
-=======================
-
-General notes and tips
----------------------
-
-1. Do not release on Fridays, Saturdays or Sundays
-because the sysadmins can not upgrade stuff then.
-
-2. Package two days before a release. So if the release is to be on Thursday,
-package on Tuesday. Think about timezones as well.
-
-3. Ensure that Windows builds will work before packaging
-
-4. Follow all steps to the letter. When unclear ask previous RM's (David/Julien/
-Johannes/Stas/Derick/Ilia) before proceeding. Ideally make sure that for the
-first releases one of the previous RM's is around to answer questions. For the
-steps related to the php/QA/bug websites try to have someone from the webmaster
-team (Bjori) on hand.
-
-5. Verify the tags to be extra sure everything was tagged properly.
-
-6. Moving extensions from/to PECL requires write acces to the destination.
-Most developers should have this. 
-
-Moving extensions from php-src to PECL
- Checkout the pecl directory, most likely you want a sparse-root checkout
-  svn co --depth=empty https://svn.php.net/repository/pecl
- Create an directory for the extension incl. branch and tag structure,
-  no trunk at this point and commit this to svn
-  cd pecl; mkdir foo foo/tags foo/branches; svn add foo; svn commit
- Move the extension from php-src to the new location
-  svn mv https://svn.php.net/repository/php/php-src/trunk/ext/foo \
-         https://svn.php.net/repository/pecl/foo/trunk
-
-If the extension is still usable or not dead, in cooperation with the extension
-maintainers if any:
- create the pecl.php.net/foo package and its content, license, maintainer
- create the package.xml, commit
- release the package
-
-For Moving extensions from PECL to php-src the svn mv has to be tone the other
-way round.
-
-Rolling a non stable release (alpha/beta/RC)
--------------------------------------------
-
-1. Check windows snapshot builder logs (http://windows.php.net/downloads/snaps/ the last revision)
-
-2. run the "scripts/dev/credits" script in php-src and commit the changes in the
-credits files in ext/standard.
-
-3. Checkout the release branch for this release (e.g., PHP-5.4.2) from the main branch.
-
-4. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
-Do not use abbreviations for alpha and beta. Do not use dashes, you should
-``#define PHP_VERSION "5.4.22RC1"`` and not ``#define PHP_VERSION "5.4.22-RC1"``
-
-5. Compile and make test, with and without ZTS, using the right Bison version
-(for example, for 5.5, Bison 2.4.1 is used)
-
-6. Check ./sapi/cli/php -v output for version matching.
-
-7. If all is right, commit the changes to the release branch with ``git commit -a``.
-
-8. Tag the repository release branch with the version, e.g.: 
-``git tag -u YOURKEYID php-5.4.2RC2``
-
-9. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and ``NEWS``
-in the *main* branch (PHP-5.4 for example) to prepare for the **next** version.
-F.e. if the RC is "5.4.1RC1" then the new one should be "5.4.2-dev" - regardless if we get
-a new RC or not. This is to make sure ``version_compare()`` can correctly work.
-Commit the changes to the main branch.
-
-10. Push the changes to the main repo, the tag, the main branch and the release branch :
-``git push --tags origin HEAD``
-``git push origin {main branch}``
-``git push origin {release branch}``
-
-11. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
-and build three tarballs (gz, bz2 and xz).
-
-12. 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.
-
-13. Now the RC can be found on http://downloads.php.net/yourname,
-f.e. http://downloads.php.net/derick/
-
-14. Once the release has been tagged, contact the PHP Windows development team
-(internals-win@lists.php.net) so that Windows binaries can be created. Once
-those are made, they should be placed into the same directory as the source snapshots.
-
-Getting the non stable release (alpha/beta/RC) announced
--------------------------------------------------------
-
-1. Send an email (see example here: http://news.php.net/php.internals/19486)
-**To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` lists
-pointing out "the location of the release" and "the possible release date of
-either the next RC, or the final release".
-
-2. Send an email (see example here http://news.php.net/php.pear.qa/5201) **To**
-``php-qa@lists.php.net`` and ``primary-qa-tests@lists.php.net``.
-This email is to notify the selected projects about a new release so that they
-can make sure their projects keep working. Make sure that you have been setup
-as a moderator for ``primary-qa-tests@lists.php.net`` by having someone (Wez,
-Derick) run the following commands for you:
-
-``ssh lists.php.net``
-
-``sudo -u ezmlm ezmlm-sub ~ezmlm/primary-qa-tester/mod moderator-email-address``
-
-3. Update ``qa.git/include/release-qa.php`` with the appropriate information.
-   See the documentation within release-qa.php for more information, but all releases
-   and RCs are configured here. Only $QA_RELEASES needs to be edited.
-
-   Example: When rolling an RC, set the 'rc' with appropriate information for the
-   given version.
-
-   Note: Remember to update the MD5 checksum information.
-
-4. Update ``web/php.git/include/version.inc`` (x=major version number)
-
- a. ``$PHP_x_RC`` = "5.4.0RC1"  (should be set to "false" before)
-
- b. ``$PHP_x_RC_DATE`` = "06 September 2007"
-
-5. Commit and push those changes:
-
- a. ``git commit -a && git push origin master``
-
-6. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
-INSTALL and win32/install.txt files which are generated from the PHP manual sources.
-
-Rolling a stable release
------------------------
-
-1. Checkout your release branch, you should have created when releasing previous RC
-and bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
-
-2. If a CVE commit needs to be merged to the release, then have it commited to
-the base branches and merged upwards as usual (f.e commit the CVE fix to 5.3,
-merge to 5.4, 5.5 etc...). Then you can cherry-pick it in your release branch.
-Don't forget to update NEWS manually in an extra commit then.
-
-3. Commit those changes
-
-4. run the "scripts/dev/credits" script in php-src and commit the changes in the
-credits files in ext/standard.
-
-5. Compile and make test, with and without ZTS, using the right Bison version
-(for example, for 5.5, Bison 2.4.1 is used)
-
-6. Check ./sapi/cli/php -v output for version matching.
-
-7. tag the repository with the version f.e. "``git tag -s php-5.4.1``"
-
-8. Push the tag f.e. "``git push origin php-5.4.1``"
-
-9. run: ``PHPROOT=. ./makedist php 5.4.1``, this will export the tag, create configure
-and build three tarballs (gz, bz2 and xz).
-Check if the pear files are updated (phar).
-
-10. Generate the GPG signature files for the archives.
-  ``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx``
-
-11. Commit and push all the tarballs and signature files to web/php-distributions.git,
-    then update the git submodule reference in web/php.git: 
-    ``git submodule init;
-    git submodule update;
-    cd distributions;
-    git pull origin master;
-    cd ..;
-    git commit distributions;
-    git push;``
-This is to fetch the last commit id from php-distributions.git and commit this
-last commit id to web/php.git, then, mirrors will now sync
-
-12. Once the release has been tagged, contact the PHP Windows development team
-(internals-win@lists.php.net) so that Windows binaries can be created.
-
-Getting the stable release announced
------------------------------------
-
-1. Run the bumpRelease script for phpweb on your local checkout
-
- a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
-    The release announcement file should list in detail security fixes and
-    changes in behavior (whether due to a bug fix or not).
-
- b. In case multiple PHP minor versions are in active development you have
-    to manually copy the old information to include/releases.inc
-
-2. Edit ``phpweb/include/version.inc`` and change (X=major release number):
-
- a. ``$PHP_X_VERSION`` to the correct version
-
- b. ``$PHP_X_DATE`` to the release date
-
- c. ``$PHP_X_MD5`` array and update all the md5 sums
-
- d. set ``$PHP_X_RC`` to false!
-
- e. Make sure there are no outdated "notes" or edited "date" keys in the
- ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array
-
- f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")
-
-3. Update phpweb/include/releases.php with the old release info
-  (updates the download archives)
-
-4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
-   (prepare for next RC)
-
-5. Update the ChangeLog file for the given major version
-f.e. ``ChangeLog-5.php`` from the NEWS file
-
- a. go over the list and put every element on one line
-
- b. check for &, < and > and escape them if necessary
-
- c. remove all the names at the ends of lines
-
- d. for marking up, you can do the following (with VI):
-
-  I. ``s/^- /<li>/``
-
-  II. ``s/$/<\/li>/``
-
-  III. ``s/Fixed bug #\([0-9]\+\)/<?php bugfix(\1); ?>/``
-
-  IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``
-
-  V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
-  
-  e. You may want to try php-web/bin/news2html to automate this task
-
-6. Add a short notice to phpweb stating that there is a new release, and
-highlight the major important things (security fixes) and when it is important
-to upgrade.
-
- a. Call php bin/createNewsEntry in your local phpweb checkout
-
- b. Add the content for the news entry
-
-7. **Check mirrors have been synced before announcing or pushing news**
-  Try, f.e. http://www.php.net/get/php-5.5.1.tar.bz2/from/a/mirror
-  Try several mirrors, mirrors may update slowly (may take an hour)
-
-8. Commit all the changes to their respective git repos
-
-9. 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.
-
-Re-releasing the same version (or -pl)
--------------------------------------
-
-1. Commit the new binaries to ``phpweb/distributions/``
-
-2. Edit ``phpweb/include/version.inc`` and change (X=major release number):
-
- a. If only releasing for one OS, make sure you edit only those variables
-
- b. ``$PHP_X_VERSION`` to the correct version
-
- c. ``$PHP_X_DATE`` to the release date
-
- d. ``$PHP_X_MD5`` array and update all the md5 sums
-
- e. Make sure there are no outdated "notes" or edited "date" keys in the
- ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array
-
-3. Add a short notice to phpweb stating that there is a new release, and
-highlight the major important things (security fixes) and when it is important
-to upgrade.
-
- a. Call php bin/createNewsEntry in your local phpweb checkout
-
- b. Add the content for the news entry
-
-4. Commit all the changes (``include/version.inc``, ``archive/archive.xml``,
-``archive/entries/YYYY-MM-DD-N.xml``)
-
-5. Wait an hour or two, then send a mail to php-announce@lists.php.net,
-php-general@lists.php.net and internals@lists.php.net with a text similar to
-the news entry.
@@ -153,18 +153,3 @@ ADDING SHARED MODULE SUPPORT TO A MODULE
        #ifdef COMPILE_DL_FOO
        ZEND_GET_MODULE(foo)
        #endif
-
-PECL SITE CONFORMITY
-
-  If you plan to release an extension to the PECL website, there are several
-  points to be regarded.
-
- 1. Add LICENSE or COPYING to the package.xml
-
- 2. The following should be defined in one of the extension header files
-
-        #define PHP_FOO_VERSION "1.2.3"
-
-    This macros has to be used within your foo_module_entry to indicate the
-    extension version.
-
@@ -1,182 +1,126 @@
-Submitting Enhancements and Patches to PHP
-==========================================
+Submitting Patch for PHP
+========================

-This document describes how to submit an enhancement or patch for PHP.
-It's easy!
+This document describes how to submit a patch for PHP. Since you are
+reading this document, you are willing to submit a patch for PHP.
+Please keep reading! Submitting a patch for PHP is easy. The hard
+part is making it acceptable for inclusion into our repository. :-)

-You don't need any login accounts or special access to download,
-build, debug and begin submitting PHP, PECL or PEAR code, tests or
-documentation.  Once you've followed this README and had several
-patches accepted, commit privileges are often quickly granted.
+How to create patch?  
+-------------------- 
+We are working with CVS. You need to get CVS source to create a patch
+that we accept.  Visit http://www.php.net/anoncvs.php to get CVS
+source. You can check out older versions, but make sure you get
+the default branch (i.e. Do not use -r option when you check out the 
+CVS source)

-An excellent article to read first is:
-http://phpadvent.org/2008/less-whining-more-coding-by-elizabeth-smith
+Read CODING_STANDARDS file before you start working.
+
+Now you are ready to create a patch. Modify source to fix a bug in PHP or
+add a new feature to PHP. After you finished editing, please test your
+patch. Read README.TESTING for testing.
+
+After you finish testing your patch, take diff file using 
+"cvs diff > your.patch" command.
+
+Read README.TESTING for submitting a test script for your patch. This is
+not strictly required, but it is preferred to submit a test script along
+with your patch. Making new test script is very easy. It also helps us
+to understand what you have been fixed or added to PHP.


-Online Forums
-------------
-There are several IRC channels where PHP developers are often
-available to discuss questions.  They include #php.pecl, #php.doc and
-#pear on the EFNet network and #php-dev-win on FreeNode.
+Tips for creating patch 
+----------------------- 
+If you would like to fix multiple bugs. It is easier for us if you
+could create 1 patch for 1 bug, but this is not strictly required.
+Note though that you might get little response, if your patch is
+too hard to review.
+
+If you would like change/add many lines, it is better to ask module
+maintainer and/or internals@lists.php.net, or pear-dev@lists.php.net if
+you are patching PEAR. Official module maintainers can be found in
+EXTENSIONS file in PHP source.
+
+If you are new to CVS (Concurrent Versions System), visit 
+http://cvshome.org/ for details.


-PHP Patches
-----------
-If you are fixing broken functionality in PHP C source code first
-create a bug or identify an existing bug at http://bugs.php.net/.  A
-bug can be used to track the patch progress and prevent your changes
-getting lost in the PHP mail archives.
+Recommended CVS client settings for creating patch file
+------------------------------------------------------
+Recommended ~/.cvsrc file setting is:
+------
+cvs -z3
+update -d -P
+checkout -P
+diff -u

-If your change is large then create a Request For Comment (RFC) page
-on http://wiki.php.net/rfc, discuss it with the extension maintainer,
-and discuss it on the development mail list internals@lists.php.net.
-RFC Wiki accounts can be requested on
-http://wiki.php.net/start?do=register.  PHP extension maintainers can
-be found in the EXTENSIONS file in the PHP source.  Mail list
-subscription is explained on http://www.php.net/mailing-lists.php.
+------
+diff -u means:
+ -u     Use the unified output format.

-Information on PHP internal C functions is at
-http://www.php.net/internals, though this is considered incomplete.
-Various external resources can be found on the web.  A standard
-printed reference is the book "Extending and Embedding PHP" by Sara
-Golemon.
-
-Attach the patch to the PHP bug and consider sending a notification
-email about the change to internals@lists.php.net.  Also CC the
-extension maintainer.  Explain what has been changed by your patch.
-Test scripts should be included.
-
-Please make the mail subject prefix "[PATCH]".  If attaching a patch,
-ensure it has a file extension of ".txt".  This is because only MIME
-attachments of type 'text/*' are accepted.
+With this CVS setting, you don't have to worry about adding/deleting
+newlines and spaces.


-PHP Documentation Patches
+Check list for submitting patch
+-------------------------------
+ - Did you run "make test" to check if your patch didn't break
+   other features?
+ - Did you compile PHP with --enable-debug and check the PHP and
+   web server error logs when you test your patch?
+ - Did you build PHP for multi-threaded web servers. (Optional)
+ - Did you create test script for "make test"? (Recommended)
+ - Did you check your patch is unified format and it does not 
+   contain white space changes? (If you are not using recommended 
+   cvs setting)
+ - Did you update CVS source before you take final patch?
+ - Did you read the patch again?
+
+
+Where to send your patch?
 -------------------------
-If you are fixing incorrect PHP documentation first create a bug or
-identify an existing bug at http://bugs.php.net/.  A bug can be used
-to track the patch progress and prevent your changes getting lost in
-the PHP mail archives.
+If you are patching C source, send the patch to internals@lists.php.net. 
+If you are patching a module, you should also send the patch to the 
+maintainer. Official module maintainers are listed in EXTENSION file 
+in source.

-If your change is large, then first discuss it with the mail list
-phpdoc@lists.php.net.  Subscription is explained on
-http://www.php.net/mailing-lists.php.
+If you are patching PEAR, send the patch to pear-dev@lists.php.net.

-Information on contributing to PHP documentation is at
-http://php.net/dochowto and http://wiki.php.net/doc/howto
+Please add the prefix "[PATCH]" to your email subject and make sure
+to include the patch as a MIME attachment even if it is short. 

-Attach the patch to the PHP bug and consider sending a notification
-email about the change to phpdoc@lists.php.net.  Explain what has been
-fixed/added/changed by your patch.
+NOTE: only MIME attachments of type 'text/*' are accepted. The
+      easiest way to accomplish this, is to make the extension
+      '.txt'.

-Please make the mail subject prefix "[PATCH]".  Include the bug id(s)
-which can be closed by your patch.  If attaching a patch, ensure it
-has a file extension of ".txt".  This is because only MIME attachments
-of type 'text/*' are accepted.
+Test scripts should be included in the same email.
+Explain what has been fixed/added/changed by your patch.
+
+Finally, add the bug Id(s) which can be closed by your patch, if any.


-PECL Extension Patches: http://pecl.php.net/
--------------------------------------------
-If you are fixing broken functionality in a PECL extension then create
-a bug or identify an existing bug at http://pecl.php.net/bugs/.  A bug
-can be used to track the patch progress and prevent your changes
-getting lost in the PHP mail archives.
+What happens after you submit your patch
+---------------------------------------- 
+If your patch is easy to review and has obviously no side-effects,
+it might take up to a few hours until someone commits it.

-If your change is large then create a Request For Comment (RFC) page
-on http://wiki.php.net/rfc, discuss it with the extension maintainer,
-and discuss it on the development mail list pecl-dev@lists.php.net.
-PECL mail list subscription is explained on
-http://pecl.php.net/support.php.  RFC Wiki accounts can be requested
-on http://wiki.php.net/start?do=register
+Because this is a volunteer-driven effort, more complex patches will
+require more patience on your side. 

-Information on PHP internal C functions is at
-http://www.php.net/internals, though this is considered incomplete.
-Various external resources can be found on the web.  A standard
-printed reference is the book "Extending and Embedding PHP" by Sara
-Golemon.
+If you did not receive any feedback in a few days, please consider
+resubmitting the description of your patch, along-side with
+these questions:

-Update any open bugs and add a link to the source of your patch.  Send
-the patch or pointer to the bug to pecl-dev@lists.php.net.  Also CC
-the extension maintainer.  Explain what has been changed by your
-patch.  Test scripts should be included.
-
-Please make the mail subject prefix "[PATCH] ...".  Include the patch
-as an attachment with a file extension of ".txt".  This is because
-only MIME attachments of type 'text/*' are accepted.
+- Is my patch too hard to review? Because of which factors?
+- Should I split it up in multiple parts?
+- Are there any unwanted whitespace changes?


-PEAR Package Patches: http://pear.php.net/
------------------------------------------
-Information on contributing to PEAR is available at
-http://pear.php.net/manual/en/developers-newmaint.php and
-http://pear.php.net/manual/en/guide-developers.php
+What happens when your patch is applied?
+---------------------------------------- 
+Your name will be included together with your email address in the CVS 
+commit log. If your patch affects end-users, a brief description
+and your name might be added to the NEWS file.


-How to create your PHP, PHP Documentation or PECL patch
-------------------------------------------------------
-PHP and PECL use Subversion (SVN) for revision control.  Read
-http://www.php.net/svn.php for help on using SVN to get and build PHP
-source code.  We recommend using a Sparse Directory checkout described
-in http://wiki.php.net/vcs/svnfaq.  If you are new to SVN, read
-http://svnbook.red-bean.com.
-
-Generally we ask that bug fix patches work on the current stable PHP
-development branches and on "trunk".  New PHP features only need to
-work on "trunk".
-
-Read CODING_STANDARDS before you start working.
-
-After modifying the source see README.TESTING and
-http://qa.php.net/write-test.php for how to test.  Submitting test
-scripts helps us to understand what functionality has changed.  It is
-important for the stability and maintainability of PHP that tests are
-comprehensive.
-
-After testing is finished, create a patch file using the command:
-
-  svn diff > your_patch.txt
-
-For ease of review and later troubleshooting, submit individual
-patches for each bug or feature.
-
-
-Checklist for submitting your PHP or PECL code patch
----------------------------------------------------
- - Update SVN source just before running your final 'diff' and
-   before testing.
- - Add in-line comments and/or have external documentation ready.
-   Use only "/* */" style comments, not "//".
- - Create test scripts for use with "make test".
- - Run "make test" to check your patch doesn't break other features.
- - Rebuild PHP with --enable-debug (which will show some kinds of
-   memory errors) and check the PHP and web server error logs after
-   running your PHP tests.
- - Rebuild PHP with --enable-maintainer-zts to check your patch
-   compiles on multi-threaded web servers.
- - Review the patch once more just before submitting it.
-
-
-What happens after submitting your PHP, PHP Documentation or PECL patch
-----------------------------------------------------------------------
-If your patch is easy to review and obviously has no side-effects,
-it might be committed relatively quickly.
-
-Because PHP is a volunteer-driven effort more complex patches will
-require patience on your side.  If you do not receive feedback in a
-few days, consider resubmitting the patch.  Before doing this think
-about these questions:
-
- - Did I send the patch to the right mail list?
- - Did I review the mail list archives to see if these kind of
-   changes had been discussed before?
- - Did I explain my patch clearly?
- - Is my patch too hard to review? Because of what factors?
-
-
-What happens when your PHP or PECL patch is applied
---------------------------------------------------
-Your name will likely be included in the SVN commit log.  If your
-patch affects end users, a brief description and your name might be
-added to the NEWS file.
-
-Thank you for patching PHP!
+Thank you for submitting patch for PHP!
@@ -1,6 +1,6 @@
 [IMPORTANT NOTICE]
 ------------------
- Failed tests usually indicate a problem with your local system setup
+ Failed tests usualy indicate a problem with your local system setup
 and not within PHP itself (at least for official PHP release versions).
 You may decide to automaticaly submit a test summary to our QA workflow
 at the end of a test run.
@@ -32,12 +32,11 @@ sapi/cli/php [-c /path/to/php.ini] run-tests.php [ext/foo/tests/GLOB]

 [Which "php" executable "make test" look for]
 ---------------------------------------------
-If you are running the run-tests.php script from the command line (as above)
-you must set the TEST_PHP_EXECUTABLE environment variable to explicitly
-select the PHP executable that is to be tested, that is, used to run the test scripts.
+ You must use TEST_PHP_EXECUTABLE environment variable to explicitly
+select the php executable to be used to run the tests. That can either
+be the CLI or CGI executable.

-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
+ "make test" executes "run-tests.php" script with "php" 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.

@@ -1,11 +1,11 @@
 [IMPORTANT NOTICE]
 ------------------
 This is an addendum to README.TESTING with additional information 
-specific to server-tests.php.
+specific to run-tests2.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
+run-tests2.php is backward compatible with tests developed for
+the original run-tests.php script.  run-tests2 is *not* used by
+'make test'.  run-tests2 was developed to provide support for
 testing PHP under it's primary environment, HTTP, and can run the
 PHP tests under any of the SAPI modules that are direct executables, 
 or are accessable via HTTP.
@@ -13,12 +13,12 @@ or are accessable via HTTP.
 [New features]
 ----------------
 * Command line interface:
-  You can run 'php server-tests.php -h' to get all the possible options.
+  You can run 'php run-tests2.php -h' to get all the possible options.
 * Configuration file:
  the -c argument will allow you to use a configuration file.  This is
  handy if you are testing multiple environments and need various options
  depending on the environment.
-  see server-tests-config.php for details.
+  see run-tests-config.php for details.
 * CGI Emulation:
  Will emulate a CGI environment when testing with the cgi sapi executable.
 * HTTP testing:
@@ -39,23 +39,23 @@ make testing work.
 Some (but not all!) examples of usage:

 1. run tests from the php source directory
-    php server-tests.php -p /path/to/php-cli
+    php run-tests2.php -p /path/to/php-cli

 2. run tests using cgi emulation
-    php server-tests.php -p /path/to/php-cgi
+    php run-tests2.php -p /path/to/php-cgi

 3. run tests over http, copying test files into document root
-    php server-tests.php -w -u http://localhost/test -m /path/to/htdocs/test
+    php run-tests2.php -w -u http://localhost/test -m /path/to/htdocs/test

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

 6. run tests using configuration file, but overriding some settings:
   (config file must be first)
-    php server-tests.php -c /path/to/server-tests-config.php -w -t 3 -d /path/to/testdir
+    php run-tests2.php -c /path/to/run-tests-config.php -w -t 3 -d /path/to/testdir

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

@@ -63,7 +63,7 @@ NOTE: configuration as described in README.TESTING still works.
 ----------------
 In addition to the traditional test sections 
 (see http://qa.php.net/write-test.php), several new sections are available 
-under server-tests.
+under run-tests2.

 --POST--
 This is not a new section, but not multipart posts are supported for testing
@@ -97,7 +97,7 @@ include:
  $scriptname   this is what will become SCRIPT_NAME unless you override it
  $docroot      the equivelant of DOCUMENT_ROOT under Apache
  $cwd          the directory that the test is being initiated from
-  $this->conf   all server-tests configuration vars
+  $this->conf   all run-tests2 configuration vars
  $this->env    all environment variables that will get passed to the test


@@ -0,0 +1,709 @@
+Introduction
+============
+
+As successful as PHP has proven to be in the past several years, it is still
+the only remaining member of the P-trinity of scripting languages - Perl and
+Python being the other two - that remains blithely ignorant of the
+multilingual and multinational environment around it. The software
+development community has been moving towards Unicode Standard for some time
+now, and PHP can no longer afford to be outside of this movement. Surely,
+some steps have been taken recently to allow for easier processing of
+multibyte data with the mbstring extension, but it is not enabled in PHP by
+default and is not as intuitive or transparent as it could be.
+
+The basic goal of this document is to describe how PHP 6 will support the
+Unicode Standard natively. Since the full implementation of the Unicode
+Standard is very involved, the idea is to use the already existing,
+well-tested, full-featured, and freely available ICU (International
+Components for Unicode) library. This will allow us to concentrate on the
+details of PHP integration and speed up the implementation.
+
+General Remarks
+===============
+
+Backwards Compatibility
+-----------------------
+Throughout the design and implementation of Unicode support, backwards
+compatibility must be of paramount concern. PHP is used on an enormous number of
+sites and the upgrade to Unicode-enabled PHP has to be transparent. This means
+that the existing data types and functions must work as they have always
+done. However, the speed of certain operations may be affected, due to
+increased complexity of the code overall.
+
+Unicode Encoding
+----------------
+The initial version will not support Byte Order Mark. Characters are
+expected to be composed, Normalization Form C. Later versions will support
+BOM, and decomposed and other characters.
+
+
+Implementation Approach
+=======================
+
+The implementation is done in phases. This allows for more basic and
+low-level implementation issues to be ironed out and tested before
+proceeding to more advanced topics.
+
+Legend:
+ - TODO
+ + finished
+ * in progress
+
+  Phase I
+  -------
+    + Basic Unicode string support, including instantiation, concatenation,
+      indexing
+
+    + Simple output of Unicode strings via 'print' and 'echo' statements
+      with appropriate output encoding conversion
+
+    + Conversion of Unicode strings to/from various encodings via encode() and
+      decode() functions
+
+    + Determining length of Unicode strings via strlen() function, some
+      simple string functions ported (substr).
+
+
+  Phase II
+  --------
+    * HTTP input request decoding
+
+    + Fixing remaining string-aware operators (assignment to {}, etc)
+
+    + Comparison (collation) of Unicode strings with built-in operators
+
+    * Support for Unicode and binary strings in PHP streams
+
+    + Support for Unicode identifiers
+
+    * Configurable handling of conversion failures
+
+    + \C{} escape sequence in strings
+
+
+  Phase III
+  ---------
+    * Exposing ICU API
+
+    - Porting all remaining functions to support Unicode and/or binary
+      strings
+
+
+Encoding Names
+==============
+All the encoding settings discussed in this document accept any valid
+encoding name supported by ICU. See ICU online documentation for the full
+list of encodings.
+
+
+Internal Encoding
+=================
+
+UTF-16 is the internal encoding used for Unicode strings. UTF-16 consumes
+two bytes for any Unicode character in the Basic Multilingual Plane, which
+is where most of the current world's languages are represented. While being
+less memory efficient for basic ASCII text it simplifies the processing and
+makes interfacing with ICU easier, since ICU uses UTF-16 for its internal
+processing as well.
+
+
+Fallback Encoding
+=================
+
+This setting specifies the "fallback" encoding for all the other ones. So if
+a specific encoding setting is not set, PHP defaults it to the fallback
+encoding. If the fallback_encoding is not specified either, it is set to
+UTF-8.
+
+  fallback_encoding = "iso-8859-1"
+
+
+Runtime Encoding
+================
+
+Currently PHP neither specifies nor cares what the encoding of its strings
+is. However, the Unicode implementation needs to know what this encoding is
+for several reasons, including type coersion and encoding conversion for
+strings generated at runtime via function calls and casting. This setting
+specifies this runtime encoding.
+
+  runtime_encoding = "iso-8859-1"
+
+
+Output Encoding
+===============
+
+Automatic output encoding conversion is supported on the standard output
+stream.  Therefore, command such as 'print' and 'echo' automatically convert
+their arguments to the specified encoding. No automatic output encoding is
+performed for anything else. Therefore, when writing to files or external
+resources, the developer has to manually encode the data using functions
+provided by the unicode extension or rely on stream encoding filters. The
+unicode extension provides necessary stream filters to make developers'
+lives easier.
+
+The existing default_charset setting so far has been used only for
+specifying the charset portion of the Content-Type MIME header. For several
+reasons, this setting is deprecated. Now it is only used when the Unicode
+semantics switch is disabled and does not affect the actual transcoding of
+the output stream. The output encoding setting takes precedence in all other
+cases.
+
+  output_encoding = "utf-8"
+
+
+HTTP Input Encoding
+===================
+
+To make accessing HTTP input variables easier, PHP automatically decodes
+HTTP GET and POST requests based on the specified encoding. If the HTTP
+request contains the encoding specification in the headers, then it will be
+used instead of this setting. If the HTTP input encoding setting is not
+specified, PHP falls back onto the output encoding setting, because modern
+browsers are supposed to return the data in the same encoding as they
+received it in.
+
+If the actual encoding is passed in the request itself or is found
+elsewhere, then the application can ask PHP to re-decode the raw input
+explicitly.
+
+  http_input_encoding = "utf-8"
+
+
+Script Encoding
+===============
+
+PHP scripts may be written in any encoding supported by ICU. The encoding
+of the scripts can be specified site-wide via an INI directive
+script_encoding, or with a 'declare' pragma at the beginning of the script.
+The reason for pragma is that an application written in Shift-JIS, for
+example, should be executable on a system where the INI directive cannot be
+changed by the application itself. The pragma setting is valid only for the
+script it occurs in, and does not propagate to the included files.
+
+  pragma:
+   <?php declare(encoding = 'utf-8'); ?>
+
+  INI setting:
+   script_encoding = utf-8
+
+
+Conversion Semantics
+====================
+
+Not all characters can be converted between Unicode and legacy encodings.
+Normally, when downconverting from Unicode, the default behavior of ICU
+converters is to substitute the missing sequence with the appropriate
+substitution sequence for that codepage, such as 0x1A (Control-Z) in
+ISO-8859-1. When upconverting to Unicode, if an encoding has a character
+which cannot be converted into Unicode, that sequence is replaced by the
+Unicode substitution character (U+FFFD).
+
+The conversion failure behavior can be customized:
+
+  - perform substitution as described above with a custom substitution
+    character
+  - skip any invalid characters
+  - stop the conversion, raise an error, and return partial conversion
+    results
+  - replace the missing character with a diagnostic character and continue,
+    e.g. [U+hhhh]
+
+There are two INI settings that control this.
+
+  unicode.from_error_mode = U_INVALID_SUBSTITUTE
+                            U_INVALID_SKIP
+                            U_INVALID_STOP
+                            U_INVALID_ESCAPE
+
+  unicode.from_error_subst_char = a2
+
+The second setting is supposed to contain the Unicode code point value for
+the substitution character. This value has to be representable in the target
+encoding.
+
+Note that PHP always tries to convert as much as of the data as possible and
+returns the converted results even if an error happens.
+
+
+Unicode Switch
+==============
+
+Obviously, PHP cannot simply impose new Unicode support on everyone. There
+are many applications that do not care about Unicode and do not need it.
+Consequently, there is a switch that enables certain fundamental language
+changes related to Unicode. This switch is available as a site-wide, or
+per-dir INI setting only.
+
+Note that having switch turned off does not imply that PHP is unaware of
+Unicode at all and that no Unicode string can exist. It only affects certain
+aspects of the language, and Unicode strings can always be created
+programmatically.
+
+    unicode_semantics = On
+
+ [TODO: list areas that are affected by this switch]
+
+
+Unicode String Type
+===================
+
+Unicode string type (IS_UNICODE) is supposed to contain text data encoded in
+UTF-16 format. It is the main string type in PHP when Unicode semantics
+switch is turned on. Unicode strings can exist when the switch is off, but
+they have to be produced programmatically, via calls to functions that
+return Unicode type.
+
+The operational unit when working with Unicode strings is a code point, not
+code unit or byte. One code point in UTF-16 may be comprised of 1 or 2 code
+units, each of which is a 16-bit word. Working on the code point level is
+necessary because doing otherwise would mean offloading the processing of
+surrogate pairs onto PHP users, and that is less than desirable.
+
+The repercussions are that one cannot expect code point N to be at offset
+N in the Unicode string. Instead, one has to iterate from the beginning from
+the string using U16_FWD() macro until the desired codepoint is reached.
+
+The codepoint access is one of the primary areas targeted for optimization.
+
+
+Native Encoding String Type
+===========================
+
+Native encoding string type (IS_STRING) serves two purposes: backwards
+compatibility when Unicode semantics switch is off, and for representing
+strings in non-Unicode encodings (native encodings) when it is on. It is
+processsed on the byte level.
+
+
+Binary String Type
+==================
+
+Binary string type (IS_BINARY) can be used for storing images, PDFs, or
+other binary data intended to be processed on a byte-level and that cannot
+be intepreted as text.
+
+Binary data type does not participate in implicit conversions, and cannot be
+explicitly upconverted to other string types, although the inverse is
+possible.
+
+Printing binary data to the standard output passes it through as-is,
+independent of the output encoding.
+
+When Unicode semantics switch is off, binary string literals and binary
+strings returned by functions actually resolve to IS_STRING type, for
+backwards compatibility reasons.
+
+
+Zval Structure Changes
+======================
+
+PHP is a type-agnostic language. Its data values are encapsulated in a zval
+(Zend value) structure that can change as necessary to accomodate various types.
+
+struct _zval_struct {
+    /* Variable information */
+    union {
+        long lval;                  /* long value */
+        double dval;                /* double value */
+        struct {
+            char *val;
+            int len;
+        } str;                      /* string value */
+        HashTable *ht;              /* hash table value */
+        zend_object_value obj;      /* object value */
+    } value;
+    zend_uint refcount;
+    zend_uchar type;                /* active type */
+    zend_uchar is_ref;
+};
+
+The type field determines what is stored in the union, IS_STRING being the only
+data type pertinent to this discussion. In the current version, the strings
+are binary-safe, but, for all intents and purposes, are assumed to be
+comprised of 8-bit characters. It is possible to treat the string value as
+an opaque type containing arbitrary binary data, and in fact that is how
+mbstring extension uses it, in order to store multibyte strings.  However,
+many extensions and the Zend engine itself manipulate the string value
+directly without regard to its internals. Needless to say, this can lead to
+problems.
+
+For IS_UNICODE type, we need to add another structure to the union:
+
+    union {
+    ....
+        struct {
+            UChar *val;            /* Unicode string value */
+            int32_t len;           /* number of UChar's */
+    ....
+    } value;
+
+This cleanly separates the two types of strings and helps preserve backwards
+compatibility. For IS_BINARY type, we can re-use the str union.
+
+
+Language Modifications
+======================
+
+If a Unicode switch is turned on, PHP string literals - single-quoted,
+double-quoted, and heredocs -  become Unicode strings (IS_UNICODE type).
+They support all the same escape sequences and variable interpolations as
+previously, with the addition of some new escape sequences.
+
+The contents of the strings are interpreted as follows:
+
+  - all non-escaped characters are interpreted as a corresponding Unicode
+    codepoint based on the current script encoding, e.g. ASCII 'a' (0x51) =>
+    U+0061, Shift-JIS (0x92 0x69) => U+4E2D
+ 
+  - existing PHP escape sequences are also interpreted as Unicode codepoints,
+    including \xXX (hex) and \OOO (octal) numbers, e.g. "\x20" => U+0020
+
+  - two new escape sequences, \uXXXX and \UXXXXXX are interpreted as a 4 or
+    6-hex Unicode codepoint value, e.g. \u0221 => U+0221, \U010410 =>
+    U+10410
+
+  - a new escape sequence allows specifying a character by its full
+    Unicode name, e.g. \C{THAI CHARACTER PHO SAMPHAO} => U+0E20
+
+The single-quoted string is more restrictive than the other two types: so
+far the only escape sequence allowed inside of it was \', which specifies
+a literal single quote. However, single quoted strings now support the new
+Unicode character escape sequences as well.
+
+PHP allows variable interpolation inside the double-quoted and heredoc strings.
+However, the parser separates the string into literal and variable chunks during
+compilation, e.g. "abc $var def" -> "abc" . $var . "def". This means that the
+literal chunks can be handled in the normal way for as far as Unicode
+support is concerned.
+
+Since all string literals become Unicode by default, one loses the ability
+to specify byte-oriented or binary strings. In order to create binary string
+literals, a new syntax is necessary: prefixing a string literal with letter
+'b' creates a binary string.
+
+    $var = b'abc\001';
+    $var = b"abc\001";
+    $var = b<<<EOD
+      abc\001
+    EOD;
+
+The binary string literals support the same escape sequences as the current
+PHP strings. If the Unicode switch is turned off, then the binary string
+literals generate normal string (IS_STRING) type internally, without any
+effect on the application.
+
+The string operators have been changed to accomodate the new IS_UNICODE and
+IS_BINARY types. In more detail:
+
+  - The concatenation (.) operator has been changed to automatically coerce
+    IS_STRING type to the more precise IS_UNICODE if its operands are of two
+    different string types. It does not perform coersion for IS_BINARY type,
+    however, since binary data is not considered to be in any encoding.  To
+    concatenate string with binary data, strings have to be cast to binary
+    type first. The coersion uses the conversion matrix specified later in
+    this document.
+
+  - The concatenation assignment operator (.=) has been changed similarly.
+
+  - The string indexing operators {}/[] have been changed to accomodate
+    IS_UNICODE type strings and extract the specified character. Note that
+    the index specifies a code point, not a byte, or a code unit, thus
+    supporting supplementary characters as well.
+
+  - Both Unicode and binary string types can be used as array keys.  If the
+    Unicode switch is on, the native encoding strings are converted to
+    Unicode, if they are used as hash keys, but binary strings are not.
+    Note that this means if Unicode switch is off, then Unicode string "abc"
+    and native string "abc" do not hash to the same value.
+
+  - Bitwise operators and increment/decrement operators do not work on
+    Unicode strings. They do work on binary strings.
+
+  - Two new casting operators are introduced, (unicode) and (binary).
+    They use the conversion matrix specified later in this document.
+
+  - The comparison operators when applied to Unicode strings, perform
+    comparison in binary code point order. They also do appropriate coersion
+    if the strings are of differing types.
+
+  - The arithmetic operators use the same semantic as today for converting
+    strings to numbers. A Unicode string is considered numeric if it
+    represents a long or a double number in en_US_POSIX locale.
+
+
+Inline HTML
+===========
+Because inline HTML blocks are intermixed with PHP ones, they are also
+written in the script encoding. PHP transcodes the HTML blocks to the output
+encoding as needed, resulting in direct passthrough if the script encoding
+matches output encoding.
+
+
+Identifiers
+===========
+Considering that scripts may be written in various encodings, we do not
+restrict identifiers to be ASCII-only. PHP allows any valid identifier based
+on the Unicode Standard Annex #31. The identifiers are case folded when
+necessary (class and function names) and converted to normalization form
+NFKC, so that two identifiers written in two compatible ways refer to the
+same thing.
+
+
+Numbers
+=======
+Unlike identifiers, we restrict numbers to consist only of ASCII digits and
+do not interpret them as written in a specific locale. The numbers are
+expected to adhere to en_US_POSIX or C locale, i.e. having no thousands
+separator and fractional separator being (.) "full stop". Numeric strings
+are supposed to adhere to the same rules, i.e. "10,3" is not interpreted as
+a number even if the current locale's fractional separator is comma.
+
+
+Parameter Parsing API Modifications
+===================================
+
+Internal PHP functions largely uses zend_parse_parameters() API in order to
+obtain the parameters passed to them by the user. For example:
+
+    char *str;
+    int len;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len) == FAILURE) {
+        return;
+    }
+
+This forces the input parameter to be a string, and its value and length are
+stored in the variables specified by the caller.
+
+There are now three new specifiers: 't', 'u', and 'T'.
+
+  't' specifier
+  -------------
+  This specifier indicates that the caller requires the incoming parameter
+  to be string data (IS_STRING, IS_UNICODE, IS_BINARY). The caller has to provide
+  the storage for string value, length, and type.
+
+    void *str;
+    int len;
+    zend_uchar type;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t", &str, &len, &type) == FAILURE) {
+        return;
+    }
+    if (type == IS_UNICODE) {
+       /* process UTF-16 data */
+    } else {
+       /* process native string or binary data */
+    }
+
+  For IS_STRING and IS_BINARY types, the length represents the number of
+  bytes, and for IS_UNICODE the number of UChar's. When converting other
+  types (numbers, booleans, etc) to strings, the exact behavior depends on
+  the Unicode semantics switch: if on, they are converted to IS_UNICODE,
+  otherwise to IS_STRING.
+
+
+  'u' specifier
+  -------------
+  This specifier indicates that the caller requires the incoming parameter
+  to be a Unicode UTF-16 encoded string. If a non-Unicode string is passed,
+  the engine creates a copy of the string and automatically convert it
+  to Unicode type before passing it to the internal function. No such
+  conversion is necessary for Unicode strings, obviously. Binary type cannot
+  be upconverted, and the engine issues an error in such case.
+
+    UChar *str;
+    int32_t len;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "u", &str, &len) == FAILURE) {
+        return;
+    }
+    /* process UTF-16 data */
+
+    
+  'T' specifier
+  -------------
+  This specifier is useful when the function takes two or more strings and
+  operates on them. Using 't' specifier for each one would be somewhat
+  problematic if the passed-in strings are of mixed types, and multiple
+  checks need to be performed in order to do anything. All parameters
+  marked by the 'T' specifier are promoted to the same type.
+  
+  Binary type is generally speaking the most precise one. However, we do not
+  want to convert Unicode strings to binary ones, so an error is thrown
+  if the incoming list of parameters has both Unicode and binary strings in
+  it.
+
+  If there are no binary strings, and at least one of the strings is of
+  Unicode type, then all the rest of the strings are upconverted to Unicode.
+
+  Otherwise the promotion is to IS_STRING type.
+
+
+  void *str1, *str2;
+  int len1, len2;
+  zend_uchar type1, type2;
+
+  if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "TT", &str1, &len1,
+                           &type1, &str2, &len2, &type2) == FAILURE) {
+     return;
+  }
+  if (type1 == IS_UNICODE) {
+     /* process as Unicode, str2 is guaranteed to be Unicode as well */
+  } else {
+     /* process as native string, str2 is guaranteed to be the same */
+  }
+
+
+The existing 's' specifier has been modified as well. If a Unicode string is
+passed in, it automatically copies and converts the string to the runtime
+encoding, and issues a warning. If a binary type is passed-in, no conversion
+is necessary.
+
+
+Upgrading Existing Functions
+============================
+
+Upgrading functions to work with new data types will be a deliberate and
+involved process, because one needs to consider not only the mechanisms for
+processing Unicode characters, for example, but also the semantics of
+the function.
+
+The main tenet of the upgrade process should be that when processing Unicode
+strings, the unit of operation is a code point, not a code unit or a byte.
+For example, strlen() returns the number of code points in the string.
+
+  strlen('abc') = 3
+  strlen('ab\U010000') = 3
+  strlen('ab\uD800\uDC00') = 3 /* not 4 */
+
+Function upgrade guidelines are available in a separate document.
+
+
+Unicode Extension
+=================
+
+There will be one or more extensions that provide Unicode and i18n services
+to PHP. In phase I only the conversion service is necessary. The Unicode
+extension is 'ext/unicode' and its functions should be prefixed with 'unicode'
+or 'icu'.
+
+  Conversion Functions
+  --------------------
+
+  string unicode_encode(unicode $input, text $encoding)
+    
+    Takes a UTF-16 Unicode string and converts it to the the target
+    encoding, returning the result.
+
+  unicode unicode_decode(string $input, text $encoding)
+  
+    Takes a string in the source encoding and converts it to a UTF-16
+    Unicode string, returning the result.
+
+
+Type Conversion Matrix
+======================
+
+         to |   IS_STRING     |   IS_UNICODE     |   IS_BINARY
+from        |                 |                  |
+-------------------------------------------------------------------
+            |                 |                  |
+IS_STRING   |      n/a        |   implicit=yes   |   explicit=yes
+            |                 |   explicit=yes   |   implicit=no
+            |                 |                  |
+-------------------------------------------------------------------
+            |                 |                  |
+IS_UNICODE  |   explicit=yes  |       n/a        |   explicit=yes
+            |   implicit=no   |                  |   implicit=no
+            |                 |                  |
+------------------------------|------------------------------------
+            |                 |                  |
+IS_BINARY   |   explicit=no   |   explicit=no    |       n/a
+            |   implicit=no   |   implicit=no    |
+            |                 |                  |
+
+explicit = casting
+implicit = for concatenation, etc
+
+IS_STRING  <-> IS_UNICODE uses runtime-encoding
+IS_UNICODE  -> IS_BINARY converts to runtime encoding first, then to binary
+
+
+Implementation Details That Need Expanding
+==========================================
+- Streams support for Unicode - What stream filters will we be providing?
+- Conversion errors behavior - Need to define the default.
+- INI files encoding - Do we support BOMs?
+- There are likely to be other issues which are missing from this document
+
+
+Build System
+============
+
+Unicode support in PHP is always enabled. The only configuration option
+during development should be the location of the ICU headers and libraries.
+
+    --with-icu-dir=<dir>       <dir> parameter specifies the location of ICU
+                               header and library files.
+
+After the initial development we have to repackage ICU library for our needs
+and bundle it with PHP.
+
+
+Document History
+================
+  0.5: Updated per latest discussions. Removed tentative language in several
+       places, since we have decided on everything described here already.
+       Clarified details according to Phase II progress.
+ 
+  0.4: Updated to include all the latest discussions. Updated development
+       phases.
+
+  0.3: Updated to include all the latest discussions.
+
+  0.2: Updated Phase I design proposal per discussion on unicode@php.net.
+       Modified Internal Encoding section to contain only UTF-16 info..
+       Expanded Script Encoding section.
+       Added Binary Data Type section. 
+       Amended Language Modifications section to describe string literals
+       behavior.
+       Amended Build System section.
+
+  0.1: Phase I design proposal
+
+
+References
+==========
+
+  Unicode
+  http://www.unicode.org
+
+  Unicode Glossary
+  http://www.unicode.org/glossary/
+
+  UTF-8
+  http://www.utf-8.com/
+
+  UTF-16
+  http://www.ietf.org/rfc/rfc2781.txt
+
+  ICU Homepage
+  http://www.ibm.com/software/globalization/icu/
+
+  ICU User Guide and API Reference
+  http://icu.sourceforge.net/
+
+  Unicode Annex #31
+  http://www.unicode.org/reports/tr31/
+
+  PHP Parameter Parsing API
+  http://www.php.net/manual/en/zend.arguments.retrieval.php
+
+
+Authors
+=======
+  Andrei Zmievski <andrei@gravitonic.com>
+
+vim: set et :
@@ -0,0 +1,403 @@
+This document attempts to describe portions of the API related to the new
+Unicode functionality and the best practices for upgrading existing
+functions to support Unicode.
+
+Your first stop should be README.UNICODE: it covers the general Unicode
+functionality and concepts without going into technical implementation
+details.
+
+Working in Unicode World
+========================
+
+Strings
+-------
+
+A lot of internal functionality is controlled by the unicode_semantics
+switch. Its value is found in the Unicode globals variable, UG(unicode). It
+is either on or off for the entire request.
+
+The big thing is that there are two new string types: IS_UNICODE and
+IS_BINARY. The former one has its own storage in the value union part of
+zval (value.ustr) and the latter re-uses value.str.
+
+Both types have new macros to set the zval value and to access it.
+
+Z_USTRVAL(), Z_USTRLEN()
+ - accesses the value and length (in code units) of the Unicode type string
+
+Z_BINVAL(), Z_BINLEN()
+ - accesses the value and length of the binary type string
+
+Z_UNIVAL(), Z_UNILEN()
+ - accesses either Unicode or native string value, depending on the current
+ setting of UG(unicode) switch. The Z_UNIVAL() type resolves to char*, so
+ you may need to cast it appropriately.
+
+Z_USTRCPLEN()
+ - gives the number of codepoints in the Unicode type string
+
+ZVAL_BINARY(), ZVAL_BINARYL()
+ - Sets zval to hold a binary string. Takes the same parameters as
+   Z_STRING(), Z_STRINGL().
+
+ZVAL_UNICODE, ZVAL_UNICODEL()
+ - Sets zval to hold a Unicode string. Takes the same parameters as
+   Z_STRING(), Z_STRINGL().
+
+ZVAL_ASCII_STRING(), ZVAL_ASCII_STRINGL()
+ - When UG(unicode) is off, it's equivalent to Z_STRING(), ZSTRINGL(). When
+   UG(unicode) is on, it sets zval to hold a Unicode representation of the
+   passed-in ASCII string. It will always create a new string in
+   UG(unicode)=1 case, so the value of the duplicate flag is not taken into
+   account.
+
+ZVAL_RT_STRING()
+ - When UG(unicode) is off, it's equivalent to Z_STRING(), Z_STRINGL(). WHen
+   UG(unicode) is on, it takes the input string, converts it to Unicode
+   using the runtime_encoding converter and sets zval to it. Since a new
+   string is always created in this case, the value of the duplicate flag
+   does not matter.
+
+ZVAL_TEXT()
+ - This macro sets the zval to hold either a Unicode or a normal string,
+   depending on the value of UG(unicode). No conversion happens, so the
+   argument has to be cast to (char*) when using this macro. One example of
+   its usage would be to initialize zval to hold the name of a user
+   function.
+
+There are, of course, related conversion macros.
+
+convert_to_string_with_converter(zval *op, UConverter *conv)
+ - converts a zval to native string using the specified converter, if necessary.
+
+convert_to_binary()
+ - converts a zval to binary string.
+
+convert_to_unicode()
+ - converts a zval to Unicode string.
+
+convert_to_unicode_with_converter(zval *op, UConverter *conv)
+ - converts a zval to Unicode string using the specified converter, if
+   necessary.
+
+convert_to_text(zval *op)
+ - converts a zval to either Unicode or native string, depending on the
+   value of UG(unicode) switch
+
+zend_ascii_to_unicode() function can be used to convert an ASCII char*
+string to Unicode. This is useful especially for inline string literals, in
+which case you can simply use USTR_MAKE() macro, e.g.:
+   
+   UChar* ustr;
+
+   ustr = USTR_MAKE("main");
+
+If you need to initialize a few such variables, it may be more efficient to
+use ICU macros, which avoid the conversion, depending on the platform. See
+[1] for more information.
+
+USTR_FREE() can be used to free a UChar* string safely, since it checks for
+NULL argument. USTR_LEN() takes either a UChar* or a char* argument,
+depending on the UG(unicode) value, and returns its length. Cast the
+argument to char* before passing it.
+
+The list of functions that add new array values and add object properties
+has also been expanded to include the new types. Please see zend_API.h for
+full listing (add_*_ascii_string_*, add_*_rt_string_*, add_*_unicode_*,
+add_*_binary_*).
+
+UBYTES() macro can be used to obtain the number of bytes necessary to store
+the given number of UChar's. The typical usage is:
+  
+    char *constant_name = colon + (UG(unicode)?UBYTES(2):2);
+
+
+Code Points and Code Units
+--------------------------
+
+Unicode type strings are in the UTF-16 encoding where 1 Unicode character
+may be represented by 1 or 2 UChar's. Each UChar is referred to as a "code
+unit", and a full Unicode character as a "code point". Consequently, number
+of code units and number of code points for the same Unicode string may be
+different. This has many implications, the most important of which is that
+you cannot simply index the UChar* string to  get the desired codepoint.
+
+The zval's value.ustr.len contains  actually the number of code units. To
+obtain the number of code points, one can use u_counChar32() ICU API
+function or Z_USTRCPLEN() macro.
+
+ICU provides a number of macros for working with UTF-16 strings on the
+codepoint level [2]. They allow you to do things like obtain a codepoint at
+random code unit offset, move forward and backward over the string, etc.
+There are two versions of iterator macros, *_SAFE and *_UNSAFE. It is strong
+recommended to use *_SAFE version, since they handle unpaired surrogates and
+check for string boundaries. Here is an example of how to move through
+UChar* string and work on codepoints.
+
+    UChar *str = ...;
+    int32_t str_len = ...;
+    UChar32 codepoint;
+    int32_t offset = 0;
+
+    while (offset < str_len) {
+        U16_NEXT(str, offset, str_len, codepoint);
+        /* now we have the Unicode character in codepoint */
+    }
+
+There is not macro to get a codepoint at a certain code point offset, but
+there is a Zend API function that does it.
+
+    inline UChar32 zend_get_codepoint_at(UChar *str, int32_t length, int32_t n);
+
+To retrieve 3rd codepoint, you would call:
+
+    zend_get_codepoint_at(str, str_len, 3);
+
+If you have a UChar32 codepoint and need to put it into a UChar* string,
+there is another helper function, zend_codepoint_to_uchar(). It takes
+a single UChar32 and converts it to a UChar sequence (1 or 2 UChar's).
+
+    UChar buf[8];
+    UChar32 codepoint = 0x101a2;
+    int8_t num_uchars;
+    num_uchars = zend_codepoint_to_uchar(codepoint, buf);
+
+The return value is the number of resulting UChar's or 0, which indicates
+invalid codepoint.
+
+
+Memory Allocation
+-----------------
+
+For ease of use and to reduce possible bugs, there are memory allocation
+functions specific to Unicode strings. Please use them at all times when
+allocating UChar's.
+
+    eumalloc(size)
+    eurealloc(ptr, size)
+    eustrndup(s, length)
+    eustrdup(s)
+
+    peumalloc(size, persistent) 
+    peurealloc(ptr, size, persistent) 
+
+The size parameter refers to the number of UChar's, not bytes.
+
+
+Hashes
+------
+
+Hashes API has been upgraded to work with Unicode and binary strings. All
+hash functions that worked with string keys now have their equivalent
+zend_u_hash_* API. The zend_u_hash_* functions take the type of the key
+string as the second argument.
+
+When UG(unicode) switch is on, the IS_STRING keys are upconverted to
+IS_UNICODE and then used in the hash lookup.
+
+There are two new constants that define key types:
+
+    #define HASH_KEY_IS_BINARY 4
+    #define HASH_KEY_IS_UNICODE 5
+
+Note that zend_hash_get_current_key_ex() does not have a zend_u_hash_*
+version. It returns the key as a char* pointer, you can can cast it
+appropriately based on the key type.
+
+
+Identifiers and Class Entries
+-----------------------------
+
+In Unicode mode all the identifiers are Unicode strings. This means that
+while various structures such as zend_class_entry, zend_function, etc store
+the identifier name as a char* pointer, it will actually point to UChar*
+string. Be careful when accessing the names of classes, functions, and such
+-- always check UG(unicode) before using them.
+
+In addition, zend_class_entry has a u_twin field that points to its Unicode
+counterpart in UG(unicode) mode. Use U_CLASS_ENTRY() macro to access the
+correct class entry, e.g.:
+
+    ce = U_CLASS_ENTRY(default_exception_ce);
+
+
+Formatted Output
+----------------
+
+Since UTF-16 strings frequently contain NULL bytes, you cannot simpley use
+%s format to print them out. Towards that end, output functions such as
+php_printf(), spprintf(), etc now have three different formats for use with
+Unicode strings:
+
+  %r
+    This format treats the corresponding argument as a Unicode string. The
+    string is automatically converted to the output encoding. If you wish to
+    apply a different converter to the string, use %*r and pass the
+    converter before the string argument.
+
+    UChar *class_name = USTR_NAME("ReflectionClass");
+    zend_printf("%r", class_name);
+
+  %R
+    This format requires at least two arguments: the first one specifies the
+    type of the string to follow (IS_STRING or IS_UNICODE), and the second
+    one - the string itself. If the string is of Unicode type, it is
+    automatically converted to the output encoding. If you wish to apply
+    a different converter to the string, use %*R and pass the converter
+    before the string argument.
+
+    zend_throw_exception_ex(U_CLASS_ENTRY(reflection_exception_ptr), 0 TSRMLS_CC,
+            "Interface %R does not exist",
+            Z_TYPE_P(class_name), Z_UNIVAL_P(class_name));
+
+  %v
+    This format takes only one parameter, the string, but the expected
+    string type depends on the UG(unicode) value. If the string is of
+    Unicode type, it is automatically converted to the output encoding. If
+    you wish to apply a different converter to the string, use %*R and pass
+    the converter before the string argument.
+
+    zend_error(E_WARNING, "%v::__toString() did not return anything",
+            Z_OBJCE_P(object)->name);
+
+
+
+Upgrading Functions
+===================
+
+Let's take a look at a couple of functions that have been upgraded to
+support new string types.
+
+substr()
+--------
+
+This functions returns part of a string based on offset and length
+parameters.
+
+    void *str;
+    int32_t str_len, cp_len;
+    zend_uchar str_type;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "tl|l", &str, &str_len, &str_type, &f, &l) == FAILURE) {
+        return;
+    }
+
+The first thing we notice is that the incoming string specifier is 't',
+which means that we can accept all 3 string types. The 'str' variable is
+declared as void*, because it can point to either UChar* or char*.
+The actual type of the incoming string is stored in 'str_type' variable.
+
+    if (str_type == IS_UNICODE) {
+        cp_len = u_countChar32(str, str_len);
+    } else {
+        cp_len = str_len;
+    }
+
+If the string is a Unicode one, we cannot rely on the str_len value to tell
+us the number of characters in it. Instead, we call u_countChar32() to
+obtain it.
+
+The next several lines normalize start and length parameters to fit within the
+string. Nothing new here. Then we locate the appropriate segment.
+
+    if (str_type == IS_UNICODE) {
+        int32_t start = 0, end = 0;
+        U16_FWD_N((UChar*)str, end, str_len, f);
+        start = end;
+        U16_FWD_N((UChar*)str, end, str_len, l);
+        RETURN_UNICODEL((UChar*)str + start, end-start, 1);
+
+Since codepoint (character) #n is not necessarily at offset #n in Unicode
+strings, we start at the beginning and iterate forward until we have gone
+through the required number of codepoints to reach the start of the segment.
+Then we save the location in 'start' and continue iterating through the number
+of codepoints specified by the offset. Once that's done, we can return the
+segment as a Unicode string.
+
+    } else {
+        RETURN_STRINGL((char*)str + f, l, 1);
+    }
+
+For native and binary types, we can return the segment directly.
+
+
+strrev()
+--------
+
+Let's look at strrev() which requires somewhat more complicated upgrade.
+While one of the guidelines for upgrades is that combining sequences are not
+really taken into account during processing -- substr() can break them up,
+for example -- in this case, we actually should be concerned, because
+reversing combining sequence may result in a completely different string. To
+illustrate:
+
+      a    (U+0061 LATIN SMALL LETTER A)
+      o    (U+006f LATIN SMALL LETTER O)
+    + '    (U+0301 COMBINING ACUTE ACCENT)
+    + _    (U+0320 COMBINING MINUS SIGN BELOW)
+      l    (U+006C LATIN SMALL LETTER L)
+
+Reversing this would result in:
+
+      l    (U+006C LATIN SMALL LETTER L)
+    + _    (U+0320 COMBINING MINUS SIGN BELOW)
+    + '    (U+0301 COMBINING ACUTE ACCENT)
+      o    (U+006f LATIN SMALL LETTER O)
+      a    (U+0061 LATIN SMALL LETTER A)
+
+All of a sudden the combining marks are being applied to 'l' instead of 'o'.
+To avoid this, we need to treat combininig sequences as a unit, by checking
+the combining character class of each character with u_getCombiningClass().
+
+strrev() obtains its single argument, a string, and unless the string is of
+Unicode type, processes it exactly as before, simply swapping bytes around.
+For Unicode case, the magic is like this:
+
+	int32_t i, x1, x2;
+	UChar32 ch;
+	UChar *u_s, *u_n, *u_p;
+
+    u_n = eumalloc(Z_USTRLEN_PP(str)+1);
+    u_p = u_n;
+    u_s = Z_USTRVAL_PP(str);
+
+    i = Z_USTRLEN_PP(str);
+    while (i > 0) {
+        U16_PREV(u_s, 0, i, ch);
+        if (u_getCombiningClass(ch) == 0) {
+            u_p += zend_codepoint_to_uchar(ch, u_p);
+        } else {
+            x2 = i;
+            do {
+                U16_PREV(u_s, 0, i, ch);
+            } while (u_getCombiningClass(ch) != 0);
+            x1 = i;
+            while (x1 <= x2) {
+                U16_NEXT(u_s, x1, Z_USTRLEN_PP(str), ch);
+                u_p += zend_codepoint_to_uchar(ch, u_p);
+            }
+        }
+    }
+    *u_p = 0;
+
+The basic idea is to walk the string backwards from the end, using
+U16_PREV() macro. If the combining class of the current character is 0,
+meaning it's a base character and not a combining mark, we simply append it
+to the new string. Otherwise, we save the location of the index and do a run
+over the characters until we get to the next one with combining class 0. At
+that point we append the sequence as is, without reversing, to the new
+string. Voila.
+
+Note that the code uses zend_codepoint_to_uchar() to convert full Unicode
+characters (UChar32 type) to 1 or 2 UTF-16 code units (UChar type).
+
+
+
+References
+==========
+
+[1] http://icu.sourceforge.net/apiref/icu4c/ustring_8h.html#a1
+
+[2] http://icu.sourceforge.net/apiref/icu4c/utf16_8h.html
+
+vim: set et ai tw=76 fo=tron21:
@@ -0,0 +1,172 @@
+Updating your script to PHP6
+============================
+
+This document attempts to describe portions of PHP that changed or
+disapeared in PHP6 and the best practices for upgrading existing
+applications to support PHP6.
+
+1. Language
+	1.1 Functions and function aliases
+	1.2 Register globals
+	1.3 Magic quotes
+	1.4 Register long arrays ($HTTP_*_VARS)
+	1.5 ZE1 compatibility mode
+	1.6 dl() function
+	1.7 E_ALL and E_STRICT constants
+	1.8 References
+2. Unicode (see README.UNICODE-UPGRADES)
+2. Extensions
+2.1 GD
+
+
+1.1 Functions and function aliases
+    ------------------------------
+
+<TODO: List all arguments order changes, aliases droped in php6...>
+1.2 Register globals
+    ---------------- 
+
+For security reasons, register_globals has been removed from php6.
+ini_get('register_globals') will always return false.
+
+You can emulate its behavior with some minimum changes in your code.
+
+*DISCLAIMER*
+people should get a short-term solution if they are willing to run
+an insecure app.
+
+Here is an example to emulate the session related functions and
+a snippet to register variables:
+
+$_register_globals_order = strrev(ini_get("variables_order"));
+$_register_globals_order_len = strlen($_register_globals_order);
+
+for($_register_globals_i=0;$_register_globals_i<$_register_globals_order_len;$_register_globals_i++) {
+	switch($_register_globals_order{$_register_globals_i}) {
+		case "E":
+			extract($_ENV, EXTR_REFS|EXTR_SKIP);
+		break;
+
+		case "G":
+			extract($_GET, EXTR_REFS|EXTR_SKIP);
+		break;
+
+		case "P":
+			extract($_POST, EXTR_REFS|EXTR_SKIP);
+		break;
+
+		case "C":
+			extract($_COOKIE, EXTR_REFS|EXTR_SKIP);
+		break;
+
+		case "S":
+			extract($_SERVER, EXTR_REFS|EXTR_SKIP);
+		break;
+	}
+}
+unset($_register_globals_order, $_register_globals_order_len, $_register_globals_i);
+
+function session_register($mixed) {
+	static $started;
+	if(!isset($started) || session_id() === "") {
+		session_start();
+		$started = true;
+	}
+
+	$array = func_get_args();
+	foreach($array as $mixed) {
+
+		if(is_scalar($mixed)) {
+			$_SESSION[$mixed] =& $GLOBALS[$mixed];
+		}
+		elseif(is_array($mixed)) {
+			foreach($mixed as $name) {
+				$ok = session_register($name);
+				if(!$ok) {
+					return false;
+				}
+			}
+		}
+		else {
+			return false;
+		}
+	}
+	return true;
+}
+
+function session_is_registered($name) {
+	if(is_scalar($name)) {
+		return isset($_SESSION[$name]);
+	}
+	return false;
+}
+
+function session_unregister($name) {
+	if(isset($_SESSION[$name]) && is_scalar($name)) {
+		unset($_SESSION[$name]);
+		return true;
+	}
+	return false;
+}
+
+1.3 Magic quotes
+    ------------
+
+1.4 Register long arrays ($HTTP_*_VARS)
+    -----------------------------------
+
+register_long_arrays and the long versions of super globals had been removed.
+PHP will emit E_CORE_ERROR during PHP startup if it would detect
+register_long_arrays setting.
+
+You can emulate long arrays by including the following file:
+
+<?php
+if (!ini_get('register_long_arrays')) {	
+	$HTTP_POST_VARS =& $_POST;
+	$HTTP_GET_VARS =& $_GET;
+	$HTTP_COOKIE_VARS =& $_COOKIE;
+	$HTTP_SERVER_VARS =& $_SERVER;
+	$HTTP_ENV_VARS =& $_ENV;
+	$HTTP_FILES_VARS =& $_FILES;
+}
+?>
+
+1.5 ZE1 compatibility mode
+    ----------------------
+
+ZE1 compatibility mode (PHP4 object model) was introduced to migrate from PHP4
+to PHP5 in an easier way, but it never keeped 100% compatibility.
+It is completly removed in PHP6, and there is no way to emulate it.
+Applications should assume PHP5/PHP6 object model.
+
+1.6 dl() function
+    -------------
+
+Now dl() function is supported only in CLI, CGI and EMBED SAPI.
+There is no way to emulte it. You can just check if dl() is supported by SAPI:
+
+<?php
+if (!function_exists("dl")) {
+	die("dl() function is required\n!");
+}
+?>
+    
+1.7 E_ALL and E_STRICT constants
+    ----------------------------
+
+Now E_ALL error reporting mask includes E_STRICT.
+You can filter E_STRICT error messages using the following code:
+
+<?php
+error_reporting(error_reporting() & ~E_STRICT);
+?>
+
+1.8 References
+    ----------
+
+<TODO: Derick plans to clean the reference mess in php6>
+
+2.1 GD
+
+<TODO: gd2/ft2 only, functions droped>
@@ -1,6 +1,174 @@
 The Win32 Build System.
+$Id$
+Wez Furlong <wez@thebrainroom.com>

-See http://wiki.php.net/internals/windows/stepbystepbuild 
+If you need help with the build system, send mail to
+internals@lists.php.net; please don't email me directly.
+
+===========================================================
+Contents:
+1. How to build PHP under windows
+ a. Requirements
+ b. Opening a command prompt
+ c. Generating configure.js
+ d. Configuring
+ e. Building
+ f. Cleaning up
+ g. Running the test suite
+ h. snapshot building
+ 
+2. How to write config.w32 files
+ x. to be written.
+
+===========================================================
+1. How to build PHP under windows
+a. Requirements
+
+ You need:
+  - Windows Scripting Host (cscript.exe)
+  - Microsoft Build Tools from:
+     Microsoft Visual Studio (VC6) or later
+ 
+ You also need:
+  - bindlib_w32 [http://www.php.net/extra/bindlib_w32.zip]
+  - win32build  [http://www.php.net/extra/win32build.zip]
+
+ b. Opening the Build Environment Command Prompt:
+  - Using Visual Studio (VC6)
+    1. Install it
+    2. If you have a VC++ Command Prompt icon on your start menu,
+       click on it to get a Command Prompt with the env vars
+       set up correctly.
+
+       If not, create a new shortcut and set the Target to:
+
+       %comspec% /k "C:\Program Files\Microsoft Visual Studio\VC98\Bin\vcvars32.bat"
+
+       You might also want to set the prompt to start in
+       a convenient location (such as the root of your
+       PHP source checkout).
+
+  - Using Visual Studio .Net
+    1. Install it.
+    2. Under the Visual Studio .Net Tools sub menu of your start
+       menu, you should have a Visual Studio .Net Command Prompt
+       icon.  If not, create a new shortcut and set the Target to:
+
+       %comspec% /k "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat"
+
+       You might also want to set the prompt to start in
+       a convenient location (such as the root of your
+       PHP source checkout).
+
+  - Using the Platform SDK tools
+    1. Download the Platform SDK:
+       http://www.microsoft.com/msdownload/platformsdk/sdkupdate/
+
+       - You need the Core SDK, which is approx 200MB to download
+         and requires approx 500MB of disk space.
+       - The other components of the SDK are not required by PHP
+       - You might be able to reduce the download size by downloading
+         the installer control component first and then selecting
+         only the Build Environment (around 30MB), but I haven't
+         tried this.
+
+         ** Note: it seems that MS don't include the 32 bit
+            build tools in the platform SDK any longer, so
+            you will probably have very limited luck if you
+            don't also have VC++ or VS.Net already installed.
+
+    2. Once installed, you will have an icon on your start menu
+       that will launch the build environment; the latest SDK's
+       install a number of different versions of this; you probably
+       want to choose the Windows 2000 Retail build environment.
+       Clicking on this will open a command prompt with its Path,
+       Include and Lib env vars set to point to the build tools
+       and win32 headers.
+
+c. Generating configure
+
+ Change directory to where you have your PHP 5 sources.
+ Run buildconf.bat.
+
+d. Configuring
+ 
+ cscript /nologo configure.js --help
+ 
+ Will give you a list of configuration options; these will
+ have the form:
+ 
+ --enable-foo or --disable-foo or --with-foo or --without-foo.
+ 
+ --enable-foo will turn something on, and is equivalent to
+ specifying --enable-foo=yes
+ 
+ --disable-foo will turn something off, and is equivalent to
+ specifying --enable-foo=no
+
+ --enable-foo=shared will attempt to build that feature as
+ a shared, dynamically loadable module.
+
+ Sometimes a configure option needs additional information
+ about where to find headers and libraries; quite often
+ you can specify --enable-foo=option where option could be
+ the path to where to find those files.  If you want to
+ specify a parameter and build it as shared, you can use
+ this syntax instead:  --enable-foo=shared,option
+
+ The same rules all apply to --with-foo and --without-foo;
+ the only difference is the way the options are named;
+ the convention is that --enable-foo means that you are
+ switching on something that comes with PHP, whereas
+ --with-foo means that you want to build in something
+ external to PHP.
+
+e. Building
+
+ Once you have successfully configured your build (make
+ sure you read the output from the command to make sure
+ it worked correctly), you can build the code; simply type
+
+ "nmake" at the command prompt, and it will build everthing
+ you asked for.
+
+ Once the build has completed, you will find your binaries
+ in the build dir determined by configure; this is typically
+ Release_TS for release builds or Debug_TS for debug builds.
+ If you build a non-thread-safe build, it will use Release
+ or Debug to store the files.  Also in this build dir you
+ will find sub directories for each module that went into
+ your PHP build.  The files you'll want to keep are the
+ .exe and .dll files directly in your build dir.
+
+f. Cleaning Up
+ 
+ You can automatically delete everything that was built
+ by running "nmake clean".  This will delete everything
+ that was put there when you ran nmake, including the
+ .exe and .dll files.
+
+g. Running the test suite
+
+ You can verify that your build is working well by running
+ the regression test suite.  You do this by typing
+ "nmake test".  You can specify the tests you want to run
+ by defing the TESTS variable - if you wanted to run the
+ sqlite test suite only, you would type
+ "nmake /D TESTS=ext/sqlite/tests test"
+
+h. Snapshot Building
+
+ If you want to set up an automated build that will tolerate
+ breakages in some of the modules, you can use the
+ --enable-snapshot-build configure option to generate a
+ makefile optimized for that purpose.  A snapshot build will
+ switch the argument parser so that the default option for
+ configure switches that your don't specify will be set
+ to "shared".  The effect of this is to turn on all options
+ unless you explicitly disable them.  When you have configured
+ your snapshot build, you can use "nmake build-snap" to build
+ everything, ignoring build errors in individual extensions
+ or SAPI.

 vim:tw=78:sw=1:ts=1:et

@@ -0,0 +1,112 @@
+Using PHP 5 with the Zeus Web Server
+-----------------------------------
+
+Zeus fully supports running PHP in combination with our
+webserver. There are three different interfaces that can be used to
+enable PHP:
+
+* CGI
+* ISAPI
+* FastCGI
+
+Of the three, we recommend using FastCGI, which has been tested and
+benchmarked as providing the best performance and reliability.
+
+Full details of how to install PHP are available from our
+website, at:
+
+http://support.zeus.com/products/php.html
+
+If you have any problems, please check the support site for more
+up-to-date information and advice.
+
+
+Quick guide to installing CGI/FastCGI with Zeus
+-----------------------------------------------
+
+Step 1 - Compile PHP as FastCGI.
+
+Compile as follows:
+        ./configure --enable-fastcgi
+        make
+
+Note that PHP has many options to the configure script -
+e.g. --with-mysql. You will probably want to select your usual options
+before compiling; the above is just a bare minimum, for illustration.
+
+After compilation finishes, you will be left with an executable
+program called 'php'. Copy this into your document root, under a
+dedicated FastCGI directory (e.g. $DOCROOT/fcgi-bin/php)
+
+
+Step 2 - configure Zeus
+
+Four stages:
+        -  enable FastCGI
+        -  configure FastCGI
+        -  setup alias for FastCGI
+        -  setup alias for PHP
+
+1) Using the admin server, go to the 'module configuration' page for
+your virtual server, and ensure that 'fastcgi' is enabled (select the
+tickbox to the left).
+
+2) While we can run FastCGI's locally, there are known problems with
+some OS's (specifically, the communication between web server and
+FastCGI happens over a unix domain socket, and some OS's have trouble
+sustaining high connection rates over these sockets). So instead, we
+are going to set up the PHP FastCGI to run 'remotely' over localhost
+(this uses TCP sockets, which do not suffer this problem). Go to the
+'fastcgi configuration' page, and under 'add remote fastcgi':
+        Add Remote FastCGI
+                Docroot path            /fcgi-bin/php
+                Remote machine          localhost:8002
+The first entry is where you saved PHP, above.
+The second entry is localhost:<any unused port>
+We will start the FastCGI listening on this port shortly.
+Click 'update' to commit these changes.
+
+3) Go to the path mapping module and add an alias for FastCGI:
+        Add Alias
+                Docroot path            /fcgi-bin
+                Filesystem directory    /path/to/docroot/fcgi-bin
+                Alias type              fastcgi
+Click 'update' to commit these changes
+
+4) Also on the path mapping module, add a handler for PHP:
+        Add handler
+                File extension          php
+                Handler                 /fcgi-bin/php
+Click 'update' to commit these changes
+
+Finally restart your virtual server for these changes to take effect.
+
+
+Step 3 - start PHP as a FastCGI runner
+
+When you start PHP, it will pre-fork a given number of child processes
+to handle incoming PHP requests. Each process will handle a given
+number of requests before exiting (and being replaced by a newly
+forked process). You can control these two parameters by setting the
+following environment variables BEFORE starting the FastCGI runner:
+
+PHP_FCGI_CHILDREN - the number of child processes to pre-fork. This
+variable MUST be set, if not then the PHP will not run as a FastCGI.
+We recommend a value of 8 for a fairly busy site. If you have many,
+long-running PHP scripts, then you may need to increase this further.
+
+PHP_FCGI_MAX_REQUESTS - the number of requests each PHP child process
+handles before exiting. If not set, defaults to 500.
+
+To start the FastCGI runner, execute '$ZEUSHOME/web/bin/fcgirunner
+8002 $DOCROOT/fcgi-bin/php'.  Substitute the appropriate values for
+$ZEUSHOME and $DOCROOT; also substitute for 8002 the port you chose,
+above.
+
+To stop the runner (e.g. to experiment with the above environment
+variables) you will need to manually stop and running PHP
+processes. (Use 'ps' and 'kill'). As it is PHP which is forking lots
+of children and not the runner, Zeus unfortunately cannot keep track
+of what processes are running, sorry. A typical command line may look
+like 'ps -efl | grep $DOCROOT/fcgi-bin/php | grep -v grep | awk
+'{print $4}' | xargs kill'
@@ -10,16 +10,15 @@ The Input Filter support in PHP 5 is aimed at providing the framework
 through which a company-wide or site-wide security policy can be
 enforced.  It is implemented as a SAPI hook and is called from the
 treat_data and post handler functions.  To implement your own security
-policy you will need to write a standard PHP extension.  There is also
-a powerful standard implementation in ext/filter that should suit most
-peoples' needs.  However, if you want to implement your own security 
-policy, read on.
+policy you will need to write a standard PHP extension.  

 A simple implementation might look like the following.  This stores the
 original raw user data and adds a my_get_raw() function while the normal
 $_POST, $_GET and $_COOKIE arrays are only populated with stripped
 data.  In this simple example all I am doing is calling strip_tags() on
-the data.
+the data.  If register_globals is turned on, the default globals that
+are created will be stripped ($foo) while a $RAW_foo is created with the
+original user input.

 ZEND_BEGIN_MODULE_GLOBALS(my_input_filter)
        zval *post_array;
@@ -86,7 +85,7 @@ PHP_MINFO_FUNCTION(my_input_filter)
 {
    php_info_print_table_start();
    php_info_print_table_row( 2, "My Input Filter Support", "enabled" );
-    php_info_print_table_row( 2, "Revision", "$Id$");
+    php_info_print_table_row( 2, "Revision", "$Revision$");
    php_info_print_table_end();
 }

@@ -153,6 +152,8 @@ PHP_FUNCTION(my_get_raw)
    int var_len;
    zval **tmp;
    zval *array_ptr = NULL;
+    HashTable *hash_ptr;
+    char *raw_var;

    if(zend_parse_parameters(2 TSRMLS_CC, "ls", &arg, &var, &var_len) == FAILURE) {
        return;
@@ -170,15 +171,23 @@ PHP_FUNCTION(my_get_raw)
            break;
    }

-    if(!array_ptr) {
-        RETURN_FALSE;
-    }
+    if(!array_ptr) RETURN_FALSE;

-    if(zend_hash_find(HASH_OF(array_ptr), var, var_len+5, (void **)&tmp) == SUCCESS) {
+    /*
+     * I'm changing the variable name here because when running with register_globals on,
+     * the variable will end up in the global symbol table
+     */
+    raw_var = emalloc(var_len+5);  /* RAW_ and a \0 */
+    strcpy(raw_var, "RAW_");
+    strlcat(raw_var,var,var_len+5);
+    hash_ptr = HASH_OF(array_ptr);
+
+    if(zend_hash_find(hash_ptr, raw_var, var_len+5, (void **)&tmp) == SUCCESS) {
        *return_value = **tmp;
        zval_copy_ctor(return_value);
    } else {
        RETVAL_FALSE;
    }
+    efree(raw_var);
 }

@@ -1,39 +0,0 @@
-The PHP Interpreter
-===================
-
-This is the github mirror of the official PHP repository located at
-http://git.php.net.
-
-[![Build Status](https://secure.travis-ci.org/php/php-src.png?branch=master)](http://travis-ci.org/php/php-src)
-
-Pull Requests
-=============
-PHP accepts pull requests via github. Discussions are done on github, but
-depending on the topic can also be relayed to the official PHP developer
-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
-information on the process.
-
-Bug fixes **do not** require an RFC, but require a bugtracker ticket. Always
-open a ticket at https://bugs.php.net and reference the bug id using #NNNNNN.
-
-    Fix #55371: get_magic_quotes_gpc() throws deprecation warning
-
-    After removing magic quotes, the get_magic_quotes_gpc function caused
-    a deprecate warning. get_magic_quotes_gpc can be used to detected
-    the magic_quotes behavior and therefore should not raise a warning at any
-    time. The patch removes this warning
-
-We do not merge pull requests directly on github. All PRs will be
-pulled and pushed through http://git.php.net.
-
-
-Guidelines for contributors
-===========================
- [CODING_STANDARDS](/CODING_STANDARDS)
- [README.GIT-RULES](/README.GIT-RULES)
- [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES)
- [README.RELEASE_PROCESS](/README.RELEASE_PROCESS)
-
@@ -1,174 +0,0 @@
-Design
-======
-
-Main assumption of the model is that the problem that we are to solve is the
-problem of the very long class names in PHP libraries. We would not attempt
-to take autoloader's job or create packaging model - only make names
-manageable.
-
-Namespaces are defined the following way:
-
-Zend/DB/Connection.php:
-<?php
-namespace Zend\DB;
-
-class Connection {
-}
-
-function connect() {
-}
-?>
-
-Namespace definition does the following:
-All class and function names inside are automatically prefixed with
-namespace name. Inside namespace, local name always takes precedence over
-global name. Several files may be using the same namespace.
-The namespace declaration statement must be the very first statement in
-the file. The only exception is "declare" statement that can be used before.
-
-Every class and function in a namespace can be referred to by the full name
- e.g. Zend\DB\Connection or Zend\DB\connect - at any time.
-
-<?php
-require 'Zend/Db/Connection.php';
-$x = new Zend\DB\Connection;
-Zend\DB\connect();
-?>
-
-Namespace or class name can be imported:
-
-<?php
-require 'Zend/Db/Connection.php';
-use Zend\DB;
-use Zend\DB\Connection as DbConnection;
-
-$x = new Zend\DB\Connection();
-$y = new DB\connection();
-$z = new DbConnection();
-DB\connect();
-?>
-
-The use statement only defines name aliasing. It may create name alias for
-namespace or class. The simple form of statement "use A\B\C\D;" is
-equivalent to "use A\B\C\D as D;". The use statement can be used at any
-time in the global scope (not inside function/class) and takes effect from 
-the point of definition down to the end of file. It is recommended however to
-place the use statements at the beginning of the file. The use statements have
-effect only on the file where they appear.
-
-The special "empty" namespace (\ prefix) is useful as explicit global
-namespace qualification. All class and function names started from \
-interpreted as global.
-
-<?php 
-namespace A\B\C;
-
-$con = \mysql_connect(...);
-?>
-
-A special constant __NAMESPACE__ contains the name of the current namespace. 
-It can be used to construct fully-qualified names to pass them as callbacks.
-
-<?php
-namespace A\B\C;
-
-function foo() {
-}
-
-set_error_handler(__NAMESPACE__ . "\foo");
-?>
-
-In global namespace __NAMESPACE__ constant has the value of empty string.
-
-Names inside namespace are resolved according to the following rules:
-
-1) all qualified names are translated during compilation according to
-current import rules. So if we have "use A\B\C" and then "C\D\e()"
-it is translated to "A\B\C\D\e()".
-2) unqualified class names translated during compilation according to
-current import rules. So if we have "use A\B\C" and then "new C()" it
-is translated to "new A\B\C()".
-3) inside namespace, calls to unqualified functions that are defined in 
-current namespace (and are known at the time the call is parsed) are 
-interpreted as calls to these namespace functions.
-4) inside namespace, calls to unqualified functions that are not defined 
-in current namespace are resolved at run-time. The call to function foo() 
-inside namespace (A\B) first tries to find and call function from current 
-namespace A\B\foo() and if it doesn't exist PHP tries to call internal
-function foo(). Note that using foo() inside namespace you can call only 
-internal PHP functions, however using \foo() you are able to call any
-function from the global namespace.
-5) unqualified class names are resolved at run-time. E.q. "new Exception()"
-first tries to use (and autoload) class from current namespace and in case 
-of failure uses internal PHP class. Note that using "new A" in namespace 
-you can only create class from this namespace or internal PHP class, however
-using "new \A" you are able to create any class from the global namespace.
-6) Calls to qualified functions are resolved at run-time. Call to
-A\B\foo() first tries to call function foo() from namespace A\B, then
-it tries to find class A\B (__autoload() it if necessary) and call its
-static method foo()
-7) qualified class names are interpreted as class from corresponding
-namespace. So "new A\B\C()" refers to class C from namespace A\B.
-
-Examples
--------
-<?php
-namespace A;
-foo();   // first tries to call "foo" defined in namespace "A"
-         // then calls internal function "foo"
-\foo(); // calls function "foo" defined in global scope
-?>
-
-<?php
-namespace A;
-new B();   // first tries to create object of class "B" defined in namespace "A"
-           // then creates object of internal class "B"
-new \B(); // creates object of class "B" defined in global scope
-?>
-
-<?php
-namespace A;
-new A(); // first tries to create object of class "A" from namespace "A" (A\A)
-         // then creates object of internal class "A"
-?>
-
-<?php
-namespace A;
-B\foo();   // first tries to call function "foo" from namespace "A\B"
-            // then calls method "foo" of internal class "B"
-\B\foo(); // first tries to call function "foo" from namespace "B"
-            // then calls method "foo" of class "B" from global scope
-?>
-
-The worst case if class name conflicts with namespace name
-<?php
-namespace A;
-A\foo();   // first tries to call function "foo" from namespace "A\A"
-            // then tries to call method "foo" of class "A" from namespace "A"
-            // then tries to call function "foo" from namespace "A"
-            // then calls method "foo" of internal class "A"
-\A\foo(); // first tries to call function "foo" from namespace "A"
-            // then calls method "foo" of class "A" from global scope
-?>
-
-TODO
-====
-
-* Support for namespace constants?
-
-* performance problems
-  - calls to internal functions in namespaces are slower, because PHP first
-    looks for such function in current namespace
-  - calls to static methods are slower, because PHP first tries to look
-    for corresponding function in namespace
-
-* Extend the Reflection API?
-  * Add ReflectionNamespace class
-    + getName()
-    + getClasses()
-    + getFunctions()
-    + getFiles()
-  * Add getNamespace() methods to ReflectionClass and ReflectionFunction
-
-* Rename namespaces to packages?
-
@@ -0,0 +1,152 @@
+Things to do or at least think about doing in the future. Name in
+parenthesis means that person has taken on this project.
+
+Zend
+----
+    * Allow foreach ($array as $k => list($a, $b)) syntax for multi
+      dimensional arrays.
+    * Look at replacing c-lib call tolower().
+    * Make hash API functions work with HASH_OF() to save time.
+    * Native large number support (probably with GNU GMP)
+    * Const'ify APIs. Right now, many functions leave parameters untouched,
+      but don't declare those as const. This makes interaction with other
+      interfaces difficult which pass const parameters to us.
+    * Clean up object->string conversion behavior wherever possible (switch(),
+      comparison, etc)
+
+
+global
+------
+    * Make sure that all ZTS globals get destructed. Most ts_allocate_id()
+      calls should have a dtor entry.
+    * on some platforms unimplemented function will just do nothing 
+      (e.g. symlink) they should print a warning or not even be defined!
+      (DONE ?)
+    * --enable-all in configure. (--enable-shared=max ...)
+    * make configure print out a summary when it's done (like XEmacs)
+    * replace standard functions which work on static data with 
+      reentrancy-safe functions (DONE?).
+    * make SAPI conform to CGI/1.1. Currently, all SAPI modules
+      define REMOTE_ADDR etc. themselves and reach only various level
+      of compliance.
+    * see what functions might need to be changed to use HashPosition, so
+      that the internal array pointer is not affected.
+
+    Other
+    * use thread-safe resolver functions (either require BIND 8 or adns).
+    * implement javadoc based function docs template system.
+    * provide optional IPv6 support (seems to be done?).
+    * find a better way to implement script timeouts. SIGVTALRM is used
+      by some POSIX threads implementations (i.e. OpenBSD) and is not
+      available in ZTS mode.
+    * Implement flush feature suitable for nested output buffers.
+
+Streams
+-------
+    * Route filestat.c through the wrapper layer; isolate the statcache code
+      so that it is independent of php functions and can be applied to any
+      stream/path.
+    * Implement generalized connection pool for stated protocols such as
+      ftp and http/1.1 (using keep-alive) to avoid having to negotiate
+      new command/request stream for each subsequent call; Possibly store 
+      resources in contexts (creating a default context if necessary) to 
+      allow segmentation of connection pools.
+    * Add a method to take ownership of the memory buffer in memory streams so
+      that generating string values for zvals doesn't require an estrdup.
+    * bundle and use curl lib for fopen wrapper.
+
+documentation
+-------------
+    * Add remarks in the documentation which functions are not implemented 
+      on win32. 
+    * Add remarks in the documentation which functions are not binary-safe.
+    * Update curl documentation (DONE?)
+    * Add developer documentation.
+    * Add detailed documentation for Java extension.
+
+ext/bz2
+-------
+    * Add an ini directive to specify the size of decompression buffer.
+      The default 4k is too small for large files and also requires much time
+      for decompression. 40k is suitable for such files, however it may be too
+      much under certain environments. There should be appropriate default
+      settings for the various SAPI modules (e.g. apache and cli).
+
+ext/curl
+--------
+    * Have a warning scheme for when people use unsupported features.
+
+ext/oci8
+--------
+    * All OCIFetch*() functions should return 0 for no more data and false on 
+      error.
+    * Have a flag that trims trailing spaces from CHAR fields on retrieval.
+    * Make allow_call_time_pass_reference=Off working.
+    * For additional todo information, see oci8.c, in ext/oci8
+
+ext/odbc
+--------
+    For PHP 4.3.0:
+    * update all php_error calls to php_error_docref where valid
+    * integrate EXPERIMENTAL ODBC update for use in PHP 5.0, use for
+      testing purposes only.
+
+    For PHP 5.0.0
+    * Activate EXPERIMENTAL ODBC codebase update
+
+ext/pcre
+--------
+    * Allow user to set PCRE_NOTEMPTY, PCRE_ANCHORED at execution time, maybe
+
+ext/pcntl
+---------
+    * Change internal callback handler to use TICKS
+    * Remove all zend_extension code
+    * Add object callback support to pcntl_signal()
+
+ext/pgsql
+---------
+    For PHP 4.3.0:
+    * Add pg_metadata() with metadata cache feature.
+    * Add pg_convert() to check and convert array value for query.
+    * Add pg_insert/pg_update/pg_delete/pg_select for simple query.
+
+ext/session
+-----------
+    For PHP 4.3.0:
+    * session_abort() to abort session. ie: Do not save session data.
+    * Allow unset($_SESSION) or unset($HTTP_SESSION_VARS) to unset
+      session vars regardless of register_globals setting.
+
+    Other:
+    * Maybe implement finer-grained session variables that could be 
+      locked individually.
+    * Write a network-transparent storage back-end with fallover
+      facilities
+    * Provide a callback facility which is executed upon encountering
+      an unknown class name during deserialization
+
+ext/standard
+------------
+    * Add a version number to data serialized via serialize().
+    * Possibly modify parsing of GPC data to automatically create arrays if
+      variable name is seen more than once.
+    * Implement regex-cache for url-functions.
+    * Move socket related functions to fsock.c.
+
+ext/wddx
+--------
+    * See if we can support the remaining data types:
+        dateTime
+        binary
+
+        http://www.wddx.org/WDDX_SDK_10a/7__References/WDDX_DTD.htm
+        (Andrei)
+
+    * implement wddx_packet_as_javascript(). (Andrei)
+
+other cool stuff
+----------------
+    * PVM extension
+
+vim:et:sw=4:ts=4
@@ -0,0 +1,5 @@
+Zend Engine
+-----------
+  - Look at making zend_constant value member be a zval* instead of zval. (Andi)
+  - Implement inheritance rules for type hints. (Marcus) 
+  - Find a keyword for the if-set-or operator (apply the patch). (Marcus, all)
@@ -0,0 +1,109 @@
+Component:      Zend Engine 2
+
+                Important stuff to finish: PPP members/PPP methods, 
+                support of overloaded extensions, possibly differentiate 
+                between class and namespace as discussed with Stig in 
+                Germany.
+Responsibility: Zeev, Andi, Stas
+Time frame:     Couple of months for first part and extensions will be
+                ongoing while PHP is being fixed.
+                Things to leave for later versions: Native aggregation
+                support, accessing static members via object and not class.
+
+
+Component:      Aggregation
+Responsibility: Andi, Stig?
+Time frame:     ?
+
+
+Component:      Redesign of API Versioning
+Responsibility: ?
+Time frame:     1 month
+
+
+Component:      Thread Safety
+                Identify the extensions that are not thread safe by design 
+                or due to dependant libraries and identify them as such. 
+                If possible try to resolve thread safety issue via code 
+                improvements (if php code or patches will be accepted by 
+                library maintainers).   For situations where thread safety 
+                cannot easily be acheived a flag in the extension API is 
+                set so PHP can identify non-thread safe extensions.  These 
+                extensions will not be loaded in a ZTS compiled binary 
+                (unless it is cli/cgi).
+
+Responsibility: ?
+Time frame:     ?
+
+
+Component:      SAPI
+                Environment variables defined in the CGI spec need to be 
+                verified in each SAPI module that they conform to the CGI 
+                spec correctly.  If they do not, the SAPI module needs to 
+                fix the variable prior to script execution.  Having this 
+                conformity will aid in having PHP scripts run correctly 
+                under different sapi modules.
+
+Responsibility: Shane Caraveo & each sapi module owner
+Timeframe:      ? (but shouldn't be much effort, most modules are probably ok)
+
+
+Component:      Input Filtering
+                - Implement a SAPI input filter hook that will get called
+                  just before registering a variable in the 
+                  treat_data/post_handler hooks.  (done)
+                - Make sure this is also done in mbstring  (done)
+                - Provide access functions, or perhaps a new 
+                  $_RAW_GET/POST/Cookie set of superglobals to get at the
+                  unfiltered data
+                - Provide a .ini directive which allows people to set their
+                  input filter to one of the built-in strip_tags,
+                  htmlspecialchars or whatever other internal function might
+                  be useful here.
+                - (The main benefit of this is to make it easier for people
+                   to solve the XSS problem once and for all without having
+                   to go through every line of their code and adding input
+                   validation/filtering everywhere)
+Responsibility: Rasmus
+Timeframe:      Yesterday
+
+
+Component:      RPC Abstraction Layer
+                Porting java, com, dotnet, xmlrpc, corba, soap and python, srm
+                (are there more ?) to work with the new oo api and preferably
+                by using ext/rpc.
+Responsibility: Harald
+Time frame:     2 months (but i have to wait for a few engine features first)
+
+
+Component:      OO Extensions
+                Each OO extension has to be revised and rewritten to fit into
+                the new OO model. We should decide which extensions are a must
+                to have for the release and which can be ported by the maintainer
+                later as a separate pecl release.
+                A list of extensions to be extended that have to be investigated:
+                  * browscap
+                  * aggregate
+                  * all *sql extensions (*_fetch_object)
+                  * domxml (seems like christian is rewriting it anyways)
+                  * ming
+Responsibility: Harald (, extension maintainers)
+
+
+Component:      Abstract Data Types (ADT)
+Responsibility: Sterling, Harald
+Time frame:     ?
+
+
+Component:      Test Suite
+                Extending the test suite with atleast a test for every
+                function in an extension that doesn't require external
+                resources. Also developing an automated test thing which
+                cvs ups's, compiles and tests the build on a daily base on
+                as much platforms/extensions as possible.
+
+                The test suite will also be extended to support threaded
+                testing and testing for differing sapi modules (via http
+                calls or other methods).
+Reponsibility:  Derick (, extension maintainers)
+Time frame:     3 months
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Thread Safe Resource Manager                                         |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2011, Andi Gutmans, Sascha Schumann, Zeev Suraski |
+   | Copyright (c) 1999-2006, Andi Gutmans, Sascha Schumann, Zeev Suraski |
   | This source file is subject to the TSRM license, that is bundled     |
   | with this package in the file LICENSE                                |
   +----------------------------------------------------------------------+
@@ -647,26 +647,19 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 }


-/*
-  Lock a mutex.
-  A return value of 0 indicates success
-*/
+/* Lock a mutex */
 TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 {
 	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Mutex locked thread: %ld", tsrm_thread_id()));
 #ifdef TSRM_WIN32
 	EnterCriticalSection(mutexp);
-	return 0;
+	return 1;
 #elif defined(GNUPTH)
-	if (pth_mutex_acquire(mutexp, 0, NULL)) {
-		return 0;
-	}
-	return -1;
+	return pth_mutex_acquire(mutexp, 0, NULL);
 #elif defined(PTHREADS)
 	return pthread_mutex_lock(mutexp);
 #elif defined(NSAPI)
-	crit_enter(mutexp);
-	return 0;
+	return crit_enter(mutexp);
 #elif defined(PI3WEB)
 	return PISync_lock(mutexp);
 #elif defined(TSRM_ST)
@@ -679,26 +672,19 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 }


-/*
-  Unlock a mutex.
-  A return value of 0 indicates success
-*/
+/* Unlock a mutex */
 TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 {
 	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Mutex unlocked thread: %ld", tsrm_thread_id()));
 #ifdef TSRM_WIN32
 	LeaveCriticalSection(mutexp);
-	return 0;
+	return 1;
 #elif defined(GNUPTH)
-	if (pth_mutex_release(mutexp)) {
-		return 0;
-	}
-	return -1;
+	return pth_mutex_release(mutexp);
 #elif defined(PTHREADS)
 	return pthread_mutex_unlock(mutexp);
 #elif defined(NSAPI)
-	crit_exit(mutexp);
-	return 0;
+	return crit_exit(mutexp);
 #elif defined(PI3WEB)
 	return PISync_unlock(mutexp);
 #elif defined(TSRM_ST)
@@ -710,22 +696,6 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 #endif
 }

-/*
-  Changes the signal mask of the calling thread
-*/
-#ifdef HAVE_SIGPROCMASK
-TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset)
-{
-	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Changed sigmask in thread: %ld", tsrm_thread_id()));
-	/* TODO: add support for other APIs */
-#ifdef PTHREADS
-	return pthread_sigmask(how, set, oldset);
-#else
-	return sigprocmask(how, set, oldset);
-#endif
-}
-#endif
-

 TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler)
 {
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Thread Safe Resource Manager                                         |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2011, Andi Gutmans, Sascha Schumann, Zeev Suraski |
+   | Copyright (c) 1999-2006, Andi Gutmans, Sascha Schumann, Zeev Suraski |
   | This source file is subject to the TSRM license, that is bundled     |
   | with this package in the file LICENSE                                |
   +----------------------------------------------------------------------+
@@ -13,33 +13,26 @@
 #ifndef TSRM_H
 #define TSRM_H

-#if !defined(__CYGWIN__) && defined(WIN32)
+/* #ifndef WIN32 */
+#ifndef WIN32
+# include <tsrm_config.h>
+#endif
+
+#ifdef WIN32
 # define TSRM_WIN32
 # include "tsrm_config.w32.h"
-#else
-# include <tsrm_config.h>
 #endif

 #ifdef TSRM_WIN32
 #	ifdef TSRM_EXPORTS
-#		define TSRM_API __declspec(dllexport)
+#	define TSRM_API __declspec(dllexport)
 #	else
-#		define TSRM_API __declspec(dllimport)
+#	define TSRM_API __declspec(dllimport)
 #	endif
-#elif defined(__GNUC__) && __GNUC__ >= 4
-#	define TSRM_API __attribute__ ((visibility("default")))
 #else
 #	define TSRM_API
 #endif

-#ifdef _WIN64
-typedef __int64 tsrm_intptr_t;
-typedef unsigned __int64 tsrm_uintptr_t;
-#else
-typedef long tsrm_intptr_t;
-typedef unsigned long tsrm_uintptr_t;
-#endif
-
 /* Only compile multi-threading functions if we're in ZTS mode */
 #ifdef ZTS

@@ -90,10 +83,6 @@ typedef struct {
 # define MUTEX_T beos_ben * 
 #endif

-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
 typedef void (*ts_allocate_ctor)(void *, void ***);
 typedef void (*ts_allocate_dtor)(void *, void ***);

@@ -142,9 +131,6 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void);
 TSRM_API void tsrm_mutex_free(MUTEX_T mutexp);
 TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp);
 TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp);
-#ifdef HAVE_SIGPROCMASK
-TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset);
-#endif

 TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler);
 TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
@@ -0,0 +1 @@
+#undef PTHREADS
@@ -33,7 +33,7 @@ $(makefile_in_files): $(makefile_am_files)
 aclocal.m4: configure.in acinclude.m4
 	aclocal

-$(config_h_in): configure.in
+$(config_h_in): configure.in acconfig.h
 # explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
@@ -1,5 +1,10 @@
 // vim:ft=javascript
 // $Id$

+if (CHECK_HEADER_ADD_INCLUDE("NewAPIs.h", "CFLAGS_PHP", php_usual_include_suspects)) {
+	// Need to add the flag directly, since TSRM doesn't include the config
+	// header
+	ADD_FLAG("CFLAGS_PHP", "/DHAVE_NEWAPIS_H=1");
+}
 ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c tsrm_win32.c");

@@ -7,10 +7,6 @@ AC_INIT(TSRM.c)
 AM_INIT_AUTOMAKE(TSRM, 1.0, nodefine)
 AM_CONFIG_HEADER(tsrm_config.h)

-AH_TOP([
-#undef PTHREADS
-])
-
 sinclude(tsrm.m4)
 	
 TSRM_BASIC_CHECKS
@@ -7,13 +7,11 @@
 * on Windows 95/NT.
 */

-#include <windows.h>
-
 #include <io.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <direct.h>
+

 /* struct dirent - same as Unix */

@@ -27,10 +25,10 @@ struct dirent {

 /* typedef DIR - not the same as Unix */
 typedef struct {
-	HANDLE handle;				/* _findfirst/_findnext handle */
+	long handle;				/* _findfirst/_findnext handle */
 	short offset;				/* offset into directory */
 	short finished;				/* 1 if there are not more files */
-	WIN32_FIND_DATA fileinfo;	/* from _findfirst/_findnext */
+	struct _finddata_t fileinfo;	/* from _findfirst/_findnext */
 	char *dir;					/* the dir we are reading */
 	struct dirent dent;			/* the dirent to return */
 } DIR;
@@ -40,6 +38,7 @@ DIR *opendir(const char *);
 struct dirent *readdir(DIR *);
 int readdir_r(DIR *, struct dirent *, struct dirent **);
 int closedir(DIR *);
-int rewinddir(DIR *);
+void rewinddir(DIR *);
+

 #endif /* READDIR_H */
@@ -30,8 +30,6 @@ AC_REQUIRE([AC_PROG_RANLIB])dnl

 AC_CHECK_HEADERS(stdarg.h)

-AC_CHECK_FUNCS(sigprocmask)
-
 ])


@@ -70,6 +68,7 @@ AC_DEFUN([TSRM_CHECK_ST],[
 ])

 sinclude(threads.m4)
+sinclude(TSRM/threads.m4)

 AC_DEFUN([TSRM_CHECK_PTHREADS],[
 		
@@ -1,8 +1,6 @@
 #ifndef TSRM_CONFIG_W32_H
 #define TSRM_CONFIG_W32_H

-#include <../main/config.w32.h>
-
 #define HAVE_UTIME 1
 #define HAVE_ALLOCA 1
 #define HAVE_REALPATH 1
@@ -1,10 +1,8 @@
 #ifndef TSRM_CONFIG_COMMON_H
 #define TSRM_CONFIG_COMMON_H

-#ifndef __CYGWIN__
-# if WINNT|WIN32
-#  define TSRM_WIN32
-# endif
+#if WINNT|WIN32
+# define TSRM_WIN32
 #endif

 #ifdef TSRM_WIN32
@@ -52,19 +50,11 @@ char *alloca ();
 #endif

 #if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2))
-# define TSRM_ALLOCA_MAX_SIZE 4096
-# define TSRM_ALLOCA_FLAG(name) \
-	int name;
-# define tsrm_do_alloca_ex(size, limit, use_heap) \
-	((use_heap = ((size) > (limit))) ? malloc(size) : alloca(size))
-# define tsrm_do_alloca(size, use_heap) \
-	tsrm_do_alloca_ex(size, TSRM_ALLOCA_MAX_SIZE, use_heap)
-# define tsrm_free_alloca(p, use_heap) \
-	do { if (use_heap) free(p); } while (0)
+# define tsrm_do_alloca(p) alloca(p)
+# define tsrm_free_alloca(p)
 #else
-# define TSRM_ALLOCA_FLAG(name)
-# define tsrm_do_alloca(p, use_heap)	malloc(p)
-# define tsrm_free_alloca(p, use_heap)	free(p)
+# define tsrm_do_alloca(p)   malloc(p)
+# define tsrm_free_alloca(p) free(p)
 #endif

 #endif /* TSRM_CONFIG_COMMON_H */
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2006 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 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2006 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 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2006 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        |
@@ -14,7 +14,6 @@
   +----------------------------------------------------------------------+
   | Authors: Andi Gutmans <andi@zend.com>                                |
   |          Sascha Schumann <sascha@schumann.cx>                        |
-   |          Pierre Joye <pierre@php.net>                                |
   +----------------------------------------------------------------------+
 */

@@ -38,14 +37,8 @@
 #include <stdarg.h>
 #endif

-#ifdef ZTS
-#define VIRTUAL_DIR
-#endif
-
 #ifndef TSRM_WIN32
 #include <unistd.h>
-#else
-#include <direct.h>
 #endif

 #if defined(__osf__) || defined(_AIX)
@@ -108,7 +101,7 @@ typedef unsigned short mode_t;
 #define COPY_WHEN_ABSOLUTE(path) 0
 #endif

-#ifndef IS_ABSOLUTE_PATH
+#ifndef IS_ABSOLUTE_PATH	
 #define IS_ABSOLUTE_PATH(path, len) \
 	(IS_SLASH(path[0]))
 #endif
@@ -118,28 +111,13 @@ typedef unsigned short mode_t;
 #endif

 #ifdef TSRM_WIN32
-#	ifdef CWD_EXPORTS
-#		define CWD_API __declspec(dllexport)
-#	else
-#		define CWD_API __declspec(dllimport)
-#	endif
-#elif defined(__GNUC__) && __GNUC__ >= 4
-#	define CWD_API __attribute__ ((visibility("default")))
+#       ifdef CWD_EXPORTS
+#       define CWD_API __declspec(dllexport)
+#       else
+#       define CWD_API __declspec(dllimport)
+#       endif
 #else
-#	define CWD_API
-#endif
-
-#ifdef TSRM_WIN32
-CWD_API int php_sys_stat_ex(const char *path, struct stat *buf, int lstat);
-# define php_sys_stat(path, buf) php_sys_stat_ex(path, buf, 0)
-# define php_sys_lstat(path, buf) php_sys_stat_ex(path, buf, 1)
-CWD_API int php_sys_readlink(const char *link, char *target, size_t target_len);
-#else
-# define php_sys_stat stat
-# define php_sys_lstat lstat
-# ifdef HAVE_SYMLINK
-# define php_sys_readlink(link, target, target_len) readlink(link, target, target_len)
-# endif
+#define CWD_API
 #endif

 typedef struct _cwd_state {
@@ -163,7 +141,9 @@ CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...);
 CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC);
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC);
+#if !defined(TSRM_WIN32)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC);
+#endif
 CWD_API int virtual_unlink(const char *path TSRMLS_DC);
 CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC);
@@ -186,6 +166,10 @@ CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC);
 #endif
 #endif

+#if defined(__osf__) || defined(_AIX)
+char *php_realpath_hack(char *src, char *dest);
+#endif
+
 #if HAVE_UTIME
 CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC);
 #endif
@@ -194,16 +178,7 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC);
 CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int link TSRMLS_DC);
 #endif

-/* One of the following constants must be used as the last argument
-   in virtual_file_ex() call. */
-
-#define CWD_EXPAND   0 /* expand "." and ".." but dont resolve symlinks      */
-#define CWD_FILEPATH 1 /* resolve symlinks if file is exist otherwise expand */
-#define CWD_REALPATH 2 /* call realpath(), resolve symlinks. File must exist */
-
-CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath TSRMLS_DC);
-
-CWD_API char *tsrm_realpath(const char *path, char *real_path TSRMLS_DC);
+CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath);

 #define REALPATH_CACHE_TTL  (2*60) /* 2 minutes */
 #define REALPATH_CACHE_SIZE 0      /* disabled while php.ini isn't loaded */
@@ -214,15 +189,8 @@ typedef struct _realpath_cache_bucket {
 	int                            path_len;
 	char                          *realpath;
 	int                            realpath_len;
-	int                            is_dir;
 	time_t                         expires;
-#ifdef PHP_WIN32
-	unsigned char                  is_rvalid;
-	unsigned char                  is_readable;
-	unsigned char                  is_wvalid;
-	unsigned char                  is_writable;
-#endif
-	struct _realpath_cache_bucket *next;
+	struct _realpath_cache_bucket *next;	
 } realpath_cache_bucket;

 typedef struct _virtual_cwd_globals {
@@ -241,16 +209,9 @@ extern virtual_cwd_globals cwd_globals;
 # define CWDG(v) (cwd_globals.v)
 #endif

-CWD_API void realpath_cache_clean(TSRMLS_D);
-CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
-CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_len, time_t t TSRMLS_DC);
-CWD_API int realpath_cache_size(TSRMLS_D);
-CWD_API int realpath_cache_max_buckets(TSRMLS_D);
-CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
-
 /* The actual macros to be used in programs using TSRM
 * If the program defines VIRTUAL_DIR it will use the
- * virtual_* functions
+ * virtual_* functions 
 */

 #ifdef VIRTUAL_DIR
@@ -267,7 +228,9 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
 #define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path TSRMLS_CC)
 #define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
 #define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
-# define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
+#if !defined(TSRM_WIN32)
+#define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
+#endif
 #define VCWD_UNLINK(path) virtual_unlink(path TSRMLS_CC)
 #define VCWD_MKDIR(pathname, mode) virtual_mkdir(pathname, mode TSRMLS_CC)
 #define VCWD_RMDIR(pathname) virtual_rmdir(pathname TSRMLS_CC)
@@ -292,17 +255,11 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
 #define VCWD_OPEN(path, flags) open(path, flags)
 #define VCWD_OPEN_MODE(path, flags, mode)	open(path, flags, mode)
 #define VCWD_CREAT(path, mode) creat(path, mode)
-/* rename on windows will fail if newname already exists.
-   MoveFileEx has to be used */
-#if defined(TSRM_WIN32)
-# define VCWD_RENAME(oldname, newname) (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED) == 0 ? -1 : 0)
-#else
-# define VCWD_RENAME(oldname, newname) rename(oldname, newname)
-#endif
+#define VCWD_RENAME(oldname, newname) rename(oldname, newname)
 #define VCWD_CHDIR(path) chdir(path)
 #define VCWD_CHDIR_FILE(path) virtual_chdir_file(path, chdir)
 #define VCWD_GETWD(buf) getwd(buf)
-#define VCWD_STAT(path, buff) php_sys_stat(path, buff)
+#define VCWD_STAT(path, buff) stat(path, buff)
 #define VCWD_LSTAT(path, buff) lstat(path, buff)
 #define VCWD_UNLINK(path) unlink(path)
 #define VCWD_MKDIR(pathname, mode) mkdir(pathname, mode)
@@ -310,21 +267,24 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
 #define VCWD_OPENDIR(pathname) opendir(pathname)
 #define VCWD_POPEN(command, type) popen(command, type)
 #if defined(TSRM_WIN32)
-#define VCWD_ACCESS(pathname, mode) tsrm_win32_access(pathname, mode TSRMLS_CC)
+#define VCWD_ACCESS(pathname, mode) tsrm_win32_access(pathname, mode)
 #else
 #define VCWD_ACCESS(pathname, mode) access(pathname, mode)
 #endif

-#define VCWD_REALPATH(path, real_path) tsrm_realpath(path, real_path TSRMLS_CC)
-
-#if HAVE_UTIME
-# ifdef TSRM_WIN32
-#  define VCWD_UTIME(path, time) win32_utime(path, time)
-# else
-#  define VCWD_UTIME(path, time) utime(path, time)
-# endif
+#ifdef HAVE_REALPATH
+#if defined(__osf__) || defined(_AIX)
+#define VCWD_REALPATH(path, real_path) php_realpath_hack(path, real_path)
+#else
+#define VCWD_REALPATH(path, real_path) realpath(path, real_path)
+#endif
+#else
+#define VCWD_REALPATH(path, real_path) strcpy(real_path, path)
 #endif

+#if HAVE_UTIME
+#define VCWD_UTIME(path, time) utime(path, time)
+#endif
 #define VCWD_CHMOD(path, mode) chmod(path, mode)
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
 #define VCWD_CHOWN(path, owner, group) chown(path, owner, group)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2006 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -23,16 +23,14 @@
 #include <io.h>
 #include <process.h>
 #include <time.h>
-#include <errno.h>

 #define TSRM_INCLUDE_FULL_WINDOWS_HEADERS
-#include "SAPI.h"
+
 #include "TSRM.h"

 #ifdef TSRM_WIN32
-#include <Sddl.h>
+
 #include "tsrm_win32.h"
-#include "tsrm_virtual_cwd.h"

 #ifdef ZTS
 static ts_rsrc_id win32_globals_id;
@@ -47,16 +45,6 @@ static void tsrm_win32_ctor(tsrm_win32_globals *globals TSRMLS_DC)
 	globals->process_size = 0;
 	globals->shm_size	  = 0;
 	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 
-	 * NULL if no impersonation has been done.
-	 * the impersonated token can't be set here as the impersonation
-	 * will happen later, in fcgi_accept_request (or whatever is the
-	 * SAPI being used).
-	 */
-	globals->impersonation_token = INVALID_HANDLE_VALUE;
-	globals->impersonation_token_sid = NULL;
 }

 static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC)
@@ -78,13 +66,6 @@ static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC)
 	}

 	free(globals->comspec);
-
-	if (globals->impersonation_token && globals->impersonation_token != INVALID_HANDLE_VALUE	) {
-		CloseHandle(globals->impersonation_token);
-	}
-	if (globals->impersonation_token_sid) {
-		free(globals->impersonation_token_sid);
-	}
 }

 TSRM_API void tsrm_win32_startup(void)
@@ -103,280 +84,15 @@ TSRM_API void tsrm_win32_shutdown(void)
 #endif
 }

-char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC)
+TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 {
-	PSID pSid = TWG(impersonation_token_sid);
-	DWORD sid_len = pSid ? GetLengthSid(pSid) : 0;
-	TCHAR *ptcSid = NULL;
-	char *bucket_key = NULL;
-
-	if (!pSid) {
-		bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + 1);
-		if (!bucket_key) {
-			return NULL;
-		}
-		memcpy(bucket_key, pathname, strlen(pathname));
-		return bucket_key;
-	}
-
-	if (!ConvertSidToStringSid(pSid, &ptcSid)) {
-		return NULL;
-	}
-
-	bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + strlen(ptcSid) + 1);
-	if (!bucket_key) {
-		LocalFree(ptcSid);
-		return NULL;
-	}
-
-	memcpy(bucket_key, ptcSid, strlen(ptcSid));
-	memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1);
-
-	LocalFree(ptcSid);
-	return bucket_key;
-}
-
-
-PSID tsrm_win32_get_token_sid(HANDLE hToken)
-{
-	BOOL bSuccess = FALSE;
-	DWORD dwLength = 0;
-	PTOKEN_USER pTokenUser = NULL;
-	PSID sid;
-	PSID *ppsid = &sid;
-	DWORD sid_len;
-	PSID pResultSid = NULL;
-
-	/* Get the actual size of the TokenUser structure */
-	if (!GetTokenInformation(
-			hToken, TokenUser, (LPVOID) pTokenUser, 0, &dwLength))  {
-		if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-			goto Finished;
-		}
-
-		pTokenUser = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength);
-		if (pTokenUser == NULL) {
-			goto Finished;
-		}
-	}
-
-	/* and fetch it now */
-	if (!GetTokenInformation(
-		hToken, TokenUser, (LPVOID) pTokenUser, dwLength, &dwLength)) {
-		goto Finished;
-	}
-
-	sid_len = GetLengthSid(pTokenUser->User.Sid);
-
-	/* ConvertSidToStringSid(pTokenUser->User.Sid, &ptcSidOwner); */
-	pResultSid = malloc(sid_len);
-	if (!pResultSid) {
-		goto Finished;
-	}
-	if (!CopySid(sid_len, pResultSid, pTokenUser->User.Sid)) {
-		goto Finished;
-	}
-	HeapFree(GetProcessHeap(), 0, (LPVOID)pTokenUser);
-	return pResultSid;
-
-Finished:
-	if (pResultSid) {
-		free(pResultSid);
-	}
-	/* Free the buffer for the token groups. */
-	if (pTokenUser != NULL) {
-		HeapFree(GetProcessHeap(), 0, (LPVOID)pTokenUser);
-	}
-	return NULL;
-}
-
-TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
-{
-	time_t t;
-	HANDLE thread_token = NULL;
-	PSID token_sid;
-	SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
-	GENERIC_MAPPING gen_map = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS };
-	DWORD priv_set_length = sizeof(PRIVILEGE_SET);
-
-	PRIVILEGE_SET privilege_set = {0};
-	DWORD sec_desc_length = 0, desired_access = 0, granted_access = 0;
-	BYTE * psec_desc = NULL;
-	BOOL fAccess = FALSE;
-
-	BOOL bucket_key_alloc = FALSE;
-	realpath_cache_bucket * bucket = NULL;
-	char * real_path = NULL;
+	SHFILEINFO sfi;

 	if (mode == 1 /*X_OK*/) {
-		DWORD type;
-		return GetBinaryType(pathname, &type) ? 0 : -1;
+		return access(pathname, 0) == 0 && 
+			SHGetFileInfo(pathname, 0, &sfi, sizeof(SHFILEINFO), SHGFI_EXETYPE) != 0 ? 0 : -1;
 	} else {
-		if(!IS_ABSOLUTE_PATH(pathname, strlen(pathname)+1)) {
-			real_path = (char *)malloc(MAX_PATH);
-			if(tsrm_realpath(pathname, real_path TSRMLS_CC) == NULL) {
-				goto Finished;
-			}
-			pathname = real_path;
- 		}
-
-		if(access(pathname, mode)) {
-			free(real_path);
-			return errno;
-		}
-
- 		/* If only existence check is made, return now */
- 		if (mode == 0) {
-			free(real_path);
-			return 0;
-		}
-
-/* Only in NTS when impersonate==1 (aka FastCGI) */
-
-		/*
-		 AccessCheck() requires an impersonation token.  We first get a primary
-		 token and then create a duplicate impersonation token.  The
-		 impersonation token is not actually assigned to the thread, but is
-		 used in the call to AccessCheck.  Thus, this function itself never
-		 impersonates, but does use the identity of the thread.  If the thread
-		 was impersonating already, this function uses that impersonation context.
-		*/
-		if(!OpenThreadToken(GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, &thread_token)) {
-			DWORD err = GetLastError();
-			if (GetLastError() == ERROR_NO_TOKEN) {
-				if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &thread_token)) {
-					 TWG(impersonation_token) = NULL;
-					 goto Finished;
-				 }
-			}
-		}
-
-		/* token_sid will be freed in tsrmwin32_dtor */
-		token_sid = tsrm_win32_get_token_sid(thread_token);
-		if (!token_sid) {
-			if (TWG(impersonation_token_sid)) {
-				free(TWG(impersonation_token_sid));
-			}
-			TWG(impersonation_token_sid) = NULL;
-			goto Finished;
-		}
-
-		/* Different identity, we need a new impersontated token as well */
-		if (!TWG(impersonation_token_sid) || !EqualSid(token_sid, TWG(impersonation_token_sid))) {
-			if (TWG(impersonation_token_sid)) {
-				free(TWG(impersonation_token_sid));
-			}
-			TWG(impersonation_token_sid) = token_sid;
-
-			/* Duplicate the token as impersonated token */
-			if (!DuplicateToken(thread_token, SecurityImpersonation, &TWG(impersonation_token))) {
-				goto Finished;
-			}
-		} else {
-			/* we already have it, free it then */
-			free(token_sid);
-		}
-
-		if (CWDG(realpath_cache_size_limit)) {
-			t = time(0);
-			bucket = realpath_cache_lookup(pathname, strlen(pathname), t TSRMLS_CC);
-			if(bucket == NULL && real_path == NULL) {
-				/* We used the pathname directly. Call tsrm_realpath */
-				/* so that entry is created in realpath cache */
-				real_path = (char *)malloc(MAX_PATH);
-				if(tsrm_realpath(pathname, real_path TSRMLS_CC) != NULL) {
-					pathname = real_path;
-					bucket = realpath_cache_lookup(pathname, strlen(pathname), t TSRMLS_CC);
-				}
-			}
- 		}
-
- 		/* Do a full access check because access() will only check read-only attribute */
- 		if(mode == 0 || mode > 6) {
-			if(bucket != NULL && bucket->is_rvalid) {
-				fAccess = bucket->is_readable;
-				goto Finished;
-			}
- 			desired_access = FILE_GENERIC_READ;
- 		} else if(mode <= 2) {
-			if(bucket != NULL && bucket->is_wvalid) {
-				fAccess = bucket->is_writable;
-				goto Finished;
-			}
-			desired_access = FILE_GENERIC_WRITE;
- 		} else if(mode <= 4) {
-			if(bucket != NULL && bucket->is_rvalid) {
-				fAccess = bucket->is_readable;
-				goto Finished;
-			}
-			desired_access = FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS;
- 		} else { // if(mode <= 6)
-			if(bucket != NULL && bucket->is_rvalid && bucket->is_wvalid) {
-				fAccess = bucket->is_readable & bucket->is_writable;
-				goto Finished;
-			}
-			desired_access = FILE_GENERIC_READ | FILE_GENERIC_WRITE;
- 		}
-
-		if(TWG(impersonation_token) == NULL) {
-			goto Finished;
-		}
-
-		/* Get size of security buffer. Call is expected to fail */
-		if(GetFileSecurity(pathname, sec_info, NULL, 0, &sec_desc_length)) {
-			goto Finished;
-		}
-
-		psec_desc = (BYTE *)malloc(sec_desc_length);
-		if(psec_desc == NULL ||
-			 !GetFileSecurity(pathname, sec_info, (PSECURITY_DESCRIPTOR)psec_desc, sec_desc_length, &sec_desc_length)) {
-			goto Finished;
-		}
-
-		MapGenericMask(&desired_access, &gen_map);
-
-		if(!AccessCheck((PSECURITY_DESCRIPTOR)psec_desc, TWG(impersonation_token), desired_access, &gen_map, &privilege_set, &priv_set_length, &granted_access, &fAccess)) {
-			goto Finished_Impersonate;
-		}
-
-		/* Keep the result in realpath_cache */
-		if(bucket != NULL) {
-			if(desired_access == (FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS)) {
-				bucket->is_rvalid = 1;
-				bucket->is_readable = fAccess;
-			}
-			else if(desired_access == FILE_GENERIC_WRITE) {
-				bucket->is_wvalid = 1;
-				bucket->is_writable = fAccess;
-			} else if (desired_access == (FILE_GENERIC_READ | FILE_GENERIC_WRITE)) {
-				bucket->is_rvalid = 1;
-				bucket->is_readable = fAccess;
-				bucket->is_wvalid = 1;
-				bucket->is_writable = fAccess;
-			}
-		}
-
-Finished_Impersonate:
-		if(psec_desc != NULL) {
-			free(psec_desc);
-			psec_desc = NULL;
-		}
-
-Finished:
-		if(thread_token != NULL) {
-			CloseHandle(thread_token);
-		}
-		if(real_path != NULL) {
-			free(real_path);
-			real_path = NULL;
-		}
-
-		if(fAccess == FALSE) {
-			errno = EACCES;
-			return errno;
-		} else {
-			return 0;
-		}
+		return access(pathname, mode);
 	}
 }

@@ -385,22 +101,22 @@ static process_pair *process_get(FILE *stream TSRMLS_DC)
 {
 	process_pair *ptr;
 	process_pair *newptr;
-
+	
 	for (ptr = TWG(process); ptr < (TWG(process) + TWG(process_size)); ptr++) {
 		if (ptr->stream == stream) {
 			break;
 		}
 	}
-
+	
 	if (ptr < (TWG(process) + TWG(process_size))) {
 		return ptr;
 	}
-
+	
 	newptr = (process_pair*)realloc((void*)TWG(process), (TWG(process_size)+1)*sizeof(process_pair));
 	if (newptr == NULL) {
 		return NULL;
 	}
-
+	
 	TWG(process) = newptr;
 	ptr = newptr + TWG(process_size);
 	TWG(process_size)++;
@@ -412,7 +128,7 @@ static shm_pair *shm_get(int key, void *addr)
 	shm_pair *ptr;
 	shm_pair *newptr;
 	TSRMLS_FETCH();
-
+	
 	for (ptr = TWG(shm); ptr < (TWG(shm) + TWG(shm_size)); ptr++) {
 		if (!ptr->descriptor) {
 			continue;
@@ -427,12 +143,12 @@ static shm_pair *shm_get(int key, void *addr)
 	if (ptr < (TWG(shm) + TWG(shm_size))) {
 		return ptr;
 	}
-
+	
 	newptr = (shm_pair*)realloc((void*)TWG(shm), (TWG(shm_size)+1)*sizeof(shm_pair));
 	if (newptr == NULL) {
 		return NULL;
 	}
-
+	
 	TWG(shm) = newptr;
 	ptr = newptr + TWG(shm_size);
 	TWG(shm_size)++;
@@ -449,54 +165,29 @@ static HANDLE dupHandle(HANDLE fh, BOOL inherit) {

 TSRM_API FILE *popen(const char *command, const char *type)
 {
-	TSRMLS_FETCH();
-
-	return popen_ex(command, type, NULL, NULL TSRMLS_CC);
+	return popen_ex(command, type, NULL, NULL);
 }

-TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC)
+TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env)
 {
 	FILE *stream = NULL;
-	int fno, type_len = strlen(type), read, mode;
+	int fno, str_len = strlen(type), read, mode;
 	STARTUPINFO startup;
 	PROCESS_INFORMATION process;
 	SECURITY_ATTRIBUTES security;
 	HANDLE in, out;
-	DWORD dwCreateFlags = 0;
-	BOOL res;
-	process_pair *proc;
 	char *cmd;
-	int i;
-	char *ptype = (char *)type;
-	HANDLE thread_token = NULL;
-	HANDLE token_user = NULL;
-	BOOL asuser = TRUE;
-
-	if (!type) {
-		return NULL;
-	}
-
-	/*The following two checks can be removed once we drop XP support */
-	type_len = strlen(type);
-	if (type_len <1 || type_len > 2) {
-		return NULL;
-	}
-
-	for (i=0; i < type_len; i++) {
-		if (!(*ptype == 'r' || *ptype == 'w' || *ptype == 'b' || *ptype == 't')) {
-			return NULL;
-		}
-		ptype++;
-	}
+	process_pair *proc;
+	TSRMLS_FETCH();

 	security.nLength				= sizeof(SECURITY_ATTRIBUTES);
 	security.bInheritHandle			= TRUE;
 	security.lpSecurityDescriptor	= NULL;

-	if (!type_len || !CreatePipe(&in, &out, &security, 2048L)) {
+	if (!str_len || !CreatePipe(&in, &out, &security, 2048L)) {
 		return NULL;
 	}
-
+	
 	memset(&startup, 0, sizeof(STARTUPINFO));
 	memset(&process, 0, sizeof(PROCESS_INFORMATION));

@@ -505,7 +196,8 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	startup.hStdError	= GetStdHandle(STD_ERROR_HANDLE);

 	read = (type[0] == 'r') ? TRUE : FALSE;
-	mode = ((type_len == 2) && (type[1] == 'b')) ? O_BINARY : O_TEXT;
+	mode = ((str_len == 2) && (type[1] == 'b')) ? O_BINARY : O_TEXT;
+

 	if (read) {
 		in = dupHandle(in, FALSE);
@@ -517,47 +209,21 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 		startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
 	}

-	dwCreateFlags = NORMAL_PRIORITY_CLASS;
-	if (strcmp(sapi_module.name, "cli") != 0) {
-		dwCreateFlags |= CREATE_NO_WINDOW;
-	}
-
-	/* Get a token with the impersonated user. */
-	if(OpenThreadToken(GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, &thread_token)) {
-		DuplicateTokenEx(thread_token, MAXIMUM_ALLOWED, &security, SecurityImpersonation, TokenPrimary, &token_user);
-	} else {
-		DWORD err = GetLastError();
-		if (err == ERROR_NO_TOKEN) {
-			asuser = FALSE;
-		}
-	}
-
-	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
-	if (!cmd) {
+	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c "));
+	sprintf(cmd, "%s /c %s", TWG(comspec), command);
+	if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS, env, cwd, &startup, &process)) {
 		return NULL;
 	}
-
-	sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
-	if (asuser) {
-		res = CreateProcessAsUser(token_user, NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
-		CloseHandle(token_user);
-	} else {
-		res = CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
-	}
 	free(cmd);

-	if (!res) {
-		return NULL;
-	}
-
 	CloseHandle(process.hThread);
 	proc = process_get(NULL TSRMLS_CC);

 	if (read) {
-		fno = _open_osfhandle((tsrm_intptr_t)in, _O_RDONLY | mode);
+		fno = _open_osfhandle((long)in, _O_RDONLY | mode);
 		CloseHandle(out);
 	} else {
-		fno = _open_osfhandle((tsrm_intptr_t)out, _O_WRONLY | mode);
+		fno = _open_osfhandle((long)out, _O_WRONLY | mode);
 		CloseHandle(in);
 	}

@@ -578,7 +244,7 @@ TSRM_API int pclose(FILE *stream)
 	}

 	fflush(process->stream);
-	fclose(process->stream);
+    fclose(process->stream);

 	WaitForSingleObject(process->prochnd, INFINITE);
 	GetExitCodeProcess(process->prochnd, &termstat);
@@ -606,6 +272,9 @@ TSRM_API int shmget(int key, int size, int flags)
 	info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);

 	if ((!shm_handle && !info_handle)) {
+		if (flags & IPC_EXCL) {
+			return -1;
+		}
 		if (flags & IPC_CREAT) {
 			shm_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, size, shm_segment);
 			info_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(shm->descriptor), shm_info);
@@ -614,10 +283,6 @@ TSRM_API int shmget(int key, int size, int flags)
 		if ((!shm_handle || !info_handle)) {
 			return -1;
 		}
-	} else {
-		if (flags & IPC_EXCL) {
-			return -1;
-		}
 	}

 	shm = shm_get(key, NULL);
@@ -625,7 +290,7 @@ TSRM_API int shmget(int key, int size, int flags)
 	shm->info	 = info_handle;
 	shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);

-	if (NULL != shm->descriptor && created) {
+	if (created) {
 		shm->descriptor->shm_perm.key	= key;
 		shm->descriptor->shm_segsz		= size;
 		shm->descriptor->shm_ctime		= time(NULL);
@@ -639,10 +304,8 @@ TSRM_API int shmget(int key, int size, int flags)
 		shm->descriptor->shm_perm.mode	= shm->descriptor->shm_perm.seq	= 0;
 	}

-	if (NULL != shm->descriptor && (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz)) {
-		if (NULL != shm->segment) {
-			CloseHandle(shm->segment);
-		}
+	if (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz ) {
+		CloseHandle(shm->segment);
 		UnmapViewOfFile(shm->descriptor);
 		CloseHandle(shm->info);
 		return -1;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2006 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        |
@@ -63,8 +63,6 @@ typedef struct {
 	int				process_size;
 	int				shm_size;
 	char			*comspec;
-	HANDLE impersonation_token;
-	PSID			impersonation_token_sid;
 } tsrm_win32_globals;

 #ifdef ZTS
@@ -90,16 +88,14 @@ typedef struct {
 #define	SHM_RND		FILE_MAP_WRITE
 #define	SHM_REMAP	FILE_MAP_COPY

-char * tsrm_win32_get_path_sid_key(const char *pathname  TSRMLS_DC);

 TSRM_API void tsrm_win32_startup(void);
 TSRM_API void tsrm_win32_shutdown(void);

-TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC);
+TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env);
 TSRM_API FILE *popen(const char *command, const char *type);
 TSRM_API int pclose(FILE *stream);
-TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC);
-TSRM_API int win32_utime(const char *filename, struct utimbuf *buf);
+TSRM_API int tsrm_win32_access(const char *pathname, int mode);

 TSRM_API int shmget(int key, int size, int flags);
 TSRM_API void *shmat(int key, const void *shmaddr, int flags);
@@ -1,486 +0,0 @@
-$Id$
-
-PHP 5.5 UPGRADE NOTES
-
-1.  Backward Incompatible Changes
-2.  New Features
-2.  Changes in SAPI modules
-3.  Deprecated Functionality
-4.  Changed Functions
-5.  New Functions
-6.  New Classes and Interfaces
-7.  Removed Extensions
-8.  Other Changes to Extensions
-9.  New Global Constants
-10. Changes to INI File Handling
-11. Windows Support
-12. Other Changes
-
-
-========================================
-1. Backward Incompatible Changes
-========================================
-
- Dropped Windows XP and 2003 support. (Pierre)
-
- All internal case insensitivity handling for class, function and constant
-  names is done according to ASCII rules.  Current locale settings are ignored.
-
- self, parent & static keywords now are always case-insensitive (see bug
-  #60833).
-
- Removed Logo GUIDs: php_logo_guid(), php_egg_logo_guid(),
-  php_real_logo_guid() and zend_logo_guid()
-
-========================================
-2. New Features
-========================================
-
- Support list in foreach. (Laruence)
-  (http://php.net/foreach#control-structures.foreach.list,
-  http://wiki.php.net/rfc/foreachlist)
-
- Support "finally" keyword. (Laruence)
-  (http://php.net/exceptions, http://wiki.php.net/rfc/finally)
-
- Support constant array/string dereferencing. (Laruence)
-  (http://php.net/manual/en/language.types.array.php,
-   https://wiki.php.net/rfc/constdereference)
-
- Add support for using empty() on the result of function calls and
-  other expressions. Thus it is now possible to write empty(getArray()),
-  for example. (http://php.net/manual/en/function.empty.php,
-  https://wiki.php.net/rfc/empty_isset_exprs)
-
- Added generators.
-  (http://php.net/generators, https://wiki.php.net/rfc/generators)
-
- ClassName::class syntax returning full class name for a class as a
-  string constant.  (http://php.net/oop5.basic,
-  https://wiki.php.net/rfc/class_name_scalars)
-
- Added support for non-scalar Iterator keys in foreach.
-  (http://php.net/manual/en/control-structures.foreach.php,
-  https://wiki.php.net/rfc/foreach-non-scalar-keys).
-
- Bundled Zend OPcache extension to improve performance
-  (http://php.net/manual/en/book.opcache.php,
-  https://wiki.php.net/rfc/optimizerplus)
-
- Added a simplified password hashing API
-  (http://php.net/password, https://wiki.php.net/rfc/password_hash)
-
-========================================
-2. Changes in SAPI modules
-========================================
-
- Support for changing the process's title in CLI/CLI-Server
-  SAPIs. (Keyur)
-  (http://php.net/manual/en/function.cli-set-process-title.php,
-  http://php.net/manual/en/function.cli-get-process-title.php,
-  https://wiki.php.net/rfc/cli_process_title)
-
- Support for systemd in php-fpm: Add --with-fpm-systemd option to
-  report health to systemd, and add systemd_interval option to
-  configure this. The service can now use Type=notify in the systemd
-  unit file. (Remi)
-
-========================================
-3. Deprecated Functionality
-========================================
-
- The original MySQL extension is now deprecated and will generate
-  deprecation warnings when connecting to a database through
-  mysql_connect(), mysql_pconnect() or by establishing an implicit
-  connection. Use MySQLi or PDO instead.
-
- The preg_replace /e modifier is now deprecated.  Use
-  preg_replace_callback instead.
-  (https://wiki.php.net/rfc/remove_preg_replace_eval_modifier)
-
- IntlDateFormatter::setTimeZoneID() and datefmt_set_timezone_id() are
-  deprecated. Use IntlDateFormatter::setTimeZone() or
-  datefmt_set_timezone() instead.
-
- mcrypt_ecb(), mcrypt_cbc(), mcrypt_cfb() and mcrypt_ofb() now throw
-  E_DEPRECATED. Their use was already previously discouraged in the
-  documentation, but that predated the existence of E_DEPRECATED.
-
-========================================
-4. Changed Functions
-========================================
-
- pack()/unpack() had the following changes, which bring it more in
-  line with Perl's behavior: - Implemented format character "Z": NULL
-  padded string, with trailing NULL bytes removed.  - Changed format
-  character "a": this no longer removes trailing NULL bytes.  -
-  Changed format character "A": all trailing ASCII whitespace is now
-  removed (defined as spaces, tabs, \r, \n and NULL).
-
- MessageFormatter::format() and related functions now accepted named
-  arguments and mixed numeric/named arguments in ICU 4.8+.
-
- MessageFormatter::format() and related functions now don't error out
-  when an insufficient argument count is provided. Instead, the
-  placeholders will remain unsubstituted.
-
- MessageFormatter::parse() and MessageFormat::format() (and their
-  static equivalents) now don't throw away better than second
-  precision in the arguments.
-
- IntlDateFormatter::__construct and datefmt_create() now accept for
-  the $timezone argument time zone identifiers, IntlTimeZone objects,
-  DateTimeZone objects and NULL. It used to accept only time zone
-  identifiers and NULL.  Invalid time zone identifiers are no longer
-  accepted. Empty strings are no longer accepted.
-
- The default time zone used in IntlDateFormatter::__construct and
-  datefmt_create() (when the corresponding argument is not passed or
-  NULL is passed) is now the one given by date_default_timezone_get(),
-  not the default ICU time zone.
-
- The time zone passed to the IntlDateFormatter is ignored if it is
-  NULL and if the calendar passed is an IntlCalendar object -- in this
-  case, the IntlCalendar's time zone will be used instead. Otherwise,
-  the time zone specified in the $timezone argument is used
-  instead. This does not affect old code, as IntlCalendar was
-  introduced in this version.
-
- IntlDateFormatter::__construct and datefmt_create() now accept for
-  the $calendar argument also IntlCalendar objects.
-
- IntlDateFormatter::getCalendar() and datefmt_get_calendar() return
-  false if the IntlDateFormatter was set up with an IntlCalendar
-  instead of the constants
-  IntlDateFormatter::GREGORIAN/TRADITIONAL. IntlCalendar did not exist
-  before this version.
-
- IntlDateFormatter::setCalendar() and datefmt_set_calendar() now also
-  accept an IntlCalendar object, in which case its time zone is
-  taken. Passing a constant is still allowed, and still keeps the time
-  zone.
-
- IntlDateFormatter::format() and datefmt_format() now also accept an
-  IntlCalendar object for formatting.
-
- set_error_handler(NULL) can now be used to reset the error handler.
-  Furthermore both set_error_handler(NULL) and
-  set_exception_handler(NULL) will now return the previously defined
-  error/exception handler. Previously bool(true) was returned.
-
- setcookie(), setrawcookie() and ext/session now send Max-Age headers
-  alongside Expires headers. (see
-  https://wiki.php.net/rfc/cookie_max-age)
-
- curl_setopt now accepts new option CURLOPT_SAFE_UPLOAD and CURLFile
-  object for safer file uploads (see
-  https://wiki.php.net/rfc/curl-file-upload)
-
- Functions in the socket extension now do not emit warnings when the
-  errno is EAGAIN, EWOULDBLOCK or EINPROGRESS.
-
- Since 5.5.2, spl_autoload_functions() returns different names for 
-  different lambda functions registered via spl_autoload_register().
-
- Since 5.5.3, DOMDocument::schemaValidateSource() and 
-  DOMDocument::schemaValidate() accept flag parameter. Only flag 
-  available now is LIBXML_SCHEMA_CREATE. Default is 0.
-
- Since 5.5.4, fputcsv() has fifth parameter escape_char, allowing to
-  specify escape char.
-
-========================================
-5. New Functions
-========================================
-
- Core:
-  - array_column()
-  - boolval()
-  - password_get_info()
-  - password_hash()
-  - password_needs_rehash()
-  - password_verify()
-
- cURL:
-  - curl_file_create
-
- GD
-  - imageflip
-  - imagecrop
-  - imagecropauto
-  - imagesetinterpolation
-  - imageaffine
-  - imageaffinematrixget
-  - imageaffinematrixconcat
-  - imagescale
-
- Hash:
-  - hash_pbkdf2()
-
- Intl:
-  - datefmt_format_object()
-  - datefmt_get_calendar_object()
-  - datefmt_get_timezone()
-  - datefmt_set_timezone()
-  - datefmt_get_calendar_object()
-  - intlcal_create_instance()
-  - intlcal_get_keyword_values_for_locale()
-  - intlcal_get_now()
-  - intlcal_get_available_locales()
-  - intlcal_get()
-  - intlcal_get_time()
-  - intlcal_set_time()
-  - intlcal_add()
-  - intlcal_set_time_zone()
-  - intlcal_after()
-  - intlcal_before()
-  - intlcal_set()
-  - intlcal_roll()
-  - intlcal_clear()
-  - intlcal_field_difference()
-  - intlcal_get_actual_maximum()
-  - intlcal_get_actual_minimum()
-  - intlcal_get_day_of_week_type()
-  - intlcal_get_first_day_of_week()
-  - intlcal_get_greatest_minimum()
-  - intlcal_get_least_maximum()
-  - intlcal_get_locale()
-  - intlcal_get_maximum()
-  - intlcal_get_minimal_days_in_first_week()
-  - intlcal_get_minimum()
-  - intlcal_get_time_zone()
-  - intlcal_get_type()
-  - intlcal_get_weekend_transition()
-  - intlcal_in_daylight_time()
-  - intlcal_is_equivalent_to()
-  - intlcal_is_lenient()
-  - intlcal_is_set()
-  - intlcal_is_weekend()
-  - intlcal_set_first_day_of_week()
-  - intlcal_set_lenient()
-  - intlcal_equals()
-  - intlcal_get_repeated_wall_time_option()
-  - intlcal_get_skipped_wall_time_option()
-  - intlcal_set_repeated_wall_time_option()
-  - intlcal_set_skipped_wall_time_option()
-  - intlcal_from_date_time()
-  - intlcal_to_date_time()
-  - intlcal_get_error_code()
-  - intlcal_get_error_message()
-  - intlgregcal_create_instance()
-  - intlgregcal_set_gregorian_change()
-  - intlgregcal_get_gregorian_change()
-  - intlgregcal_is_leap_year()
-  - intltz_create_time_zone()
-  - intltz_create_default()
-  - intltz_get_id()
-  - intltz_get_gmt()
-  - intltz_get_unknown()
-  - intltz_create_enumeration()
-  - intltz_count_equivalent_ids()
-  - intltz_create_time_zone_id_enumeration()
-  - intltz_get_canonical_id()
-  - intltz_get_region()
-  - intltz_get_tz_data_version()
-  - intltz_get_equivalent_id()
-  - intltz_use_daylight_time()
-  - intltz_get_offset()
-  - intltz_get_raw_offset()
-  - intltz_has_same_rules()
-  - intltz_get_display_name()
-  - intltz_get_dst_savings()
-  - intltz_from_date_time_zone()
-  - intltz_to_date_time_zone()
-  - intltz_get_error_code()
-  - intltz_get_error_message()
-
-  - IntlDateFormatter::formatObject()
-  - IntlDateFormatter::getCalendarObject()
-  - IntlDateFormatter::getTimeZone()
-  - IntlDateFormatter::setTimeZone()
-
- Sockets:
-  - socket_sendmsg()
-  - socket_recvmsg()
-  - socket_cmsg_space()
-
- SPL:
-  - SplFixedArray::__wakeup()
-  - SplDoublyLinkedList::add()
-  - RecursiveTreeIterator::getPostfix() (5.5.2)
-  - RecursiveTreeIterator::setPostfix() (5.5.2)
-
- Zend OPcache:
- - opcache_get_configuration()
- - opcache_get_status()
- - opcache_reset()
-
-========================================
-6. New Classes and Interfaces
-========================================
-
- Intl:
-  - IntlCalendar
-  - IntlGregorianCalendar
-  - IntlTimeZone
-  - IntlBreakIterator
-  - IntlRuleBasedBreakIterator
-  - IntlCodePointBreakIterator
-  - UConverter
-
- cURL:
-  - CURLFile
-
-========================================
-7. Removed Extensions
-========================================
-
-None
-
-========================================
-8. Other Changes to Extensions
-========================================
-
- Intl:
-  - This extension now requires ICU 4.0+.
- Phar:
-  - Added ability of resolving alias created by Phar::map
-
-========================================
-9. New Global Constants
-========================================
-
- mysqli:
-  - Added MYSQLI_SERVER_PUBLIC_KEY constant to be used with mysqli_options()
-
- cURL:
-  - Added CURLOPT_SAFE_UPLOAD to be used with curl_setopt().
-  - Added CURL_WRAPPERS_ENABLED to reflect --with-curlwrappers.
-
- GD
-  - Added constants for imageflip:
-    . IMG_FLIP_HORIZONTAL
-    . IMG_FLIP_VERTICAL
-    . IMG_FLIP_BOTH
-  - Added constants for imagecrop
-    . IMG_CROP_DEFAULT
-    . IMG_CROP_TRANSPARENT
-    . IMG_CROP_BLACK
-    . IMG_CROP_WHITE
-    . IMG_CROP_SIDES
-    . IMG_CROP_THRESHOLD
-  - Added constants for imagesetinterpolation, used by imagescale
-    imagerotate and imageaffine:
-    . IMG_BELL
-    . IMG_BESSEL
-    . IMG_BILINEAR_FIXED
-    . IMG_BICUBIC
-    . IMG_BICUBIC_FIXED
-    . IMG_BLACKMAN
-    . IMG_BOX
-    . IMG_BSPLINE
-    . IMG_CATMULLROM
-    . IMG_GAUSSIAN
-    . IMG_GENERALIZED_CUBIC
-    . IMG_HERMITE
-    . IMG_HAMMING
-    . IMG_HANNING
-    . IMG_MITCHELL
-    . IMG_POWER
-    . IMG_QUADRATIC
-    . IMG_SINC
-    . IMG_NEAREST_NEIGHBOUR
-    . IMG_WEIGHTED4
-    . IMG_TRIANGLE
-  - Added constants for imageaffinematrixget
-    . IMG_AFFINE_TRANSLATE
-    . IMG_AFFINE_SCALE
-    . IMG_AFFINE_ROTATE
-    . IMG_AFFINE_SHEAR_HORIZONTAL
-    . IMG_AFFINE_SHEAR_VERTICAL
-
-========================================
-10. Changes to INI File Handling
-========================================
-
- Core:
-  - Added sys_temp_dir INI directive, for specifying temporary
-    directory.
-
- Intl:
-  - Added intl.use_exceptions INI directive, which controls what
-    happens when global errors are set together with intl.error_level.
-
- MSSQL:
-  - mssql.compatability_mode renamed to mssql.compatibility_mode in 5.5.2,
-    old directive still supported for BC reasons.
-
- mysqlnd:
-  - Added mysqlnd.sha256_server_public_key INI PERDIR setting that
-    affects all APIs which use(are built) for mysqlnd. This allows
-    ext/mysqli to be used with the new auth protocol, although at
-    coarser level.
-
- Sessions:
-  - Added session.use_strict_mode in 5.5.3, which prevents session
-    fixation attacks and session collisions. 
-    See also https://wiki.php.net/rfc/strict_sessions
-
- Zend OPcache (See http://php.net/manual/en/book.opcache.php)
-  - Added the following directives:
-    - opcache.enable (default "1")
-    - opcache.memory_consumption (default "64")
-    - opcache.interned_strings_buffer (default "4")
-    - opcache.max_accelerated_files (default "2000")
-    - opcache.max_wasted_percentage (default "5")
-    - opcache.use_cwd (default "1")
-    - opcache.validate_timestamps (default "1")
-    - opcache.revalidate_freq (default "2")
-    - opcache.revalidate_path (default "0")
-    - opcache.save_comments (default "1")
-    - opcache.load_comments (default "1")
-    - opcache.fast_shutdown (default "0")
-    - opcache.enable_file_override (default "0")
-    - opcache.optimization_level (default "0xffffffff")
-    - opcache.inherited_hack (default "1")
-    - opcache.blacklist_filename (default "")
-    - opcache.max_file_size (default "0")
-    - opcache.consistency_checks (default "0")
-    - opcache.force_restart_timeout (default "180")
-    - opcache.error_log (default "" which means stderr)
-    - opcache.log_verbosity_level (default "1")
-    - opcache.preferred_memory_model (default "")
-    - opcache.protect_memory (default "0")
-    - opcache.mmap_base (Windows-only)
-
-========================================
-11. Windows Support
-========================================
-
- The Apache 2.4 handler is supported as of PHP 5.5.0
-
- OPcache: Errors like 'unable to reattach to base address' could
-  happen in many common setups.  It is due to some technical and
-  design restriction in the engine and could not be fixed easily
-  before 5.5.0 was released.
-
-  A possible fix is to tweak the opcache.mmap_base INI setting by
-  forcing the first address to be tried.
-
-  For x86 version, the following addreses can be tried:
-        .  0x20000000, 0x21000000, 0x30000000, 0x31000000, 0x50000000
-  and for x64 (still experimental):
-        . 0x0000100000000000, 0x0000200000000000, 0x0000300000000000, 0x0000700000000000
-
-========================================
-12. Other Changes
-========================================
-
- If the APC or WinCache user cache APIs were used before, consider
-   these alternatives for PHP 5.5:
-
-  - APCu
-      - all supported OSes: http://pecl.php.net/package/APCu
-      - Windows: http://windows.php.net/downloads/pecl/releases/apcu/
-
-  - WinCache, Windows only: http://pecl.php.net/package/WinCache
@@ -1,120 +0,0 @@
-$Id$
-
-UPGRADE NOTES - PHP X.Y
-
-1. Internal API changes
-  a. Executor changes
-  b. Streams pooling API
-  c. Lowercasing and locales
-  d. zend_qsort_r
-  e. get_current_key
-
-2. Build system changes
-  a. Unix build system changes
-  b. Windows build system changes
-
-
-========================
-1. Internal API changes
-========================
-
-	a. Executor changes
-
- * extensions can't override zend_execute() any more, they should override
-   zend_execute_ex() instead. The EG(current_execute_data) is already
-   initialized in zend_execute_ex(), so for compatibility extensions
-   may need to use EG(current_execute_data)->prev_execute_data instead.
- * removed EG(arg_types_stack), EX(fbc), EX(called_scope), EX(current_object)
- * added op_array->nested_calls. It's calculated at compile time.
- * added EX(call_slots). It is an array to store information about syntaticaly
-   nested calls (e.g. foo(bar())). It's preallocated together with execute_data.
- * added EX(call) - pointer to a current calling function. Actually an
-   element of EX(call_slots)
- * opcodes INIT_METHOD_CALL, ZEND_INIT_STATIC_METHOD_CALL,
-   ZEND_INIT_FCALL_BY_NAME, ZEND_INIT_NS_FCALL_BY_NAME use result.num as
-   an index in EX(call_slots)
- * opcode ZEND_NEW uses extended_vallue as an index in EX(call_slots)
- * opcoes ZEND_DO_FCALL and ZEND_DO_FCALL_BY_NAME use op2.num as
-   an index in EX(call_slots)
- * added op_array->used_stack. It's calculated at compile time and the
-   corresponding stack space is preallocated together with execute_data.
-   ZEND_SEND* and ZEND_DO_FCALL* don't need to check for stack overflow
-   anymore.
- * Removed execute_data->Ts field. The VM temporary variables always allocated
-   immediately before execute_data structure. Now they are accessed by offset
-   from the execute_data base pointer (instead of execute_data->Ts). Compiler
-   stores new offsets in op_array->opcodes[*].op?.num. You can use macros
-   EX_TMP_VAR() and EX_TMP_VAR_NUM() to access temp_variable by offset or
-   number. You can convert number to offset using EX_TMP_VAR_NUM(0, num) or
-   offset to number (EX_TMP_VAR_NUM(0,0)-EX_TMP_VAR(0,offset)).
- * Removed execute_data->CVs field. The VM compiled variables always allocated
-   immediately after execute_data structure. Now they are accessed by offset
-   from the execute_data base pointer (instead of execute_data->CVs). You can
-   use macros EX_CV_NUM() to access compiled variables by number.
-
-	b. Streams pooling API
-
-The streams pooling API has been removed. The following functions no longer
-exist:
-
-PHPAPI int php_stream_context_get_link(php_stream_context *context,
-		const char *hostent, php_stream **stream);
-PHPAPI int php_stream_context_set_link(php_stream_context *context,
-		const char *hostent, php_stream *stream);
-PHPAPI int php_stream_context_del_link(php_stream_context *context,
-		php_stream *stream);
-
-	c. Lowercasing and locales
-
-The lowercasing functions in zend_operators.c were split into those that do 
-lowercasing according to locale rules and those that do ASCII lowercasing.
-ASCII:
-
-                zend_str_tolower_copy
-                zend_str_tolower_dup
-                zend_str_tolower
-                zend_binary_strcasecmp
-                zend_binary_strncasecmp
-
-Locale-based:
-                zend_binary_strncasecmp_l
-                zend_binary_strcasecmp_l
-                zend_binary_zval_strcasecmp
-                zend_binary_zval_strncasecmp
-                string_compare_function_ex
-                string_case_compare_function
-
-Internal engine lowercasing will be using ASCII-only rules. User-facing functions,
-such as strcasecmp, will be using locale rules. 
-
-Two new functions - zend_binary_strncasecmp_l and zend_binary_strcasecmp_l - added as 
-locale-based counterparts to zend_binary_strcasecmp and zend_binary_strncasecmp.
-
-	d. zend_qsort_r
-
-Added the function zend_qsort_r():
-
-typedef int  (*compare_r_func_t)(const void *, const void * TSRMLS_DC, void *);
-void zend_qsort_r(void *base, size_t nmemb, size_t siz, compare_r_func_t compare, void *arg TSRMLS_DC);
-
-The extra argument it has (relatively to zend_qsort()) is passed to the
-comparison function.
-
-	e. get_current_key
-
-The signature of the get_current_key iteration handler has been changed to:
-
-void (*get_current_key)(zend_object_iterator *iter, zval *key TSRMLS_DC);
-
-The key should be written into the zval* using the ZVAL_* macros.
-
-========================
-2. Build system changes
-========================
-
-  a. Unix build system changes
-    - 
-
-  b. Windows build system changes
-    - Drop Windows XP and 2003 support.
-  
@@ -0,0 +1,186 @@
+// $Header$
+
+// FlexLexer.h -- define interfaces for lexical analyzer classes generated
+//		  by flex
+
+// Copyright (c) 1993 The Regents of the University of California.
+// All rights reserved.
+//
+// This code is derived from software contributed to Berkeley by
+// Kent Williams and Tom Epperly.
+//
+// Redistribution and use in source and binary forms with or without
+// modification are permitted provided that: (1) source distributions retain
+// this entire copyright notice and comment, and (2) distributions including
+// binaries display the following acknowledgement:  ``This product includes
+// software developed by the University of California, Berkeley and its
+// contributors'' in the documentation or other materials provided with the
+// distribution and in all advertising materials mentioning features or use
+// of this software.  Neither the name of the University nor the names of
+// its contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+// This file defines FlexLexer, an abstract class which specifies the
+// external interface provided to flex C++ lexer objects, and yyFlexLexer,
+// which defines a particular lexer class.
+//
+// If you want to create multiple lexer classes, you use the -P flag
+// to rename each yyFlexLexer to some other xxFlexLexer.  You then
+// include <FlexLexer.h> in your other sources once per lexer class:
+//
+//	#undef yyFlexLexer
+//	#define yyFlexLexer xxFlexLexer
+//	#include <FlexLexer.h>
+//
+//	#undef yyFlexLexer
+//	#define yyFlexLexer zzFlexLexer
+//	#include <FlexLexer.h>
+//	...
+
+#ifndef FLEXLEXER_H
+// Never included before - need to define base class.
+#define FLEXLEXER_H
+#include <iostream.h>
+
+extern "C++" {
+
+struct yy_buffer_state;
+typedef int yy_state_type;
+
+class FlexLexer {
+public:
+	virtual ~FlexLexer()	{ }
+
+	const char* YYText()	{ return yytext; }
+	int YYLeng()		{ return yyleng; }
+
+	virtual void
+		yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
+	virtual struct yy_buffer_state*
+		yy_create_buffer( istream* s, int size ) = 0;
+	virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
+	virtual void yyrestart( istream* s ) = 0;
+
+	virtual int yylex() = 0;
+
+	// Call yylex with new input/output sources.
+	int yylex( istream* new_in, ostream* new_out = 0 )
+		{
+		switch_streams( new_in, new_out );
+		return yylex();
+		}
+
+	// Switch to new input/output streams.  A nil stream pointer
+	// indicates "keep the current one".
+	virtual void switch_streams( istream* new_in = 0,
+					ostream* new_out = 0 ) = 0;
+
+	int lineno() const		{ return yylineno; }
+
+	int debug() const		{ return yy_flex_debug; }
+	void set_debug( int flag )	{ yy_flex_debug = flag; }
+
+protected:
+	char* yytext;
+	int yyleng;
+	int yylineno;		// only maintained if you use %option yylineno
+	int yy_flex_debug;	// only has effect with -d or "%option debug"
+};
+
+}
+#endif
+
+#if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
+// Either this is the first time through (yyFlexLexerOnce not defined),
+// or this is a repeated include to define a different flavor of
+// yyFlexLexer, as discussed in the flex man page.
+#define yyFlexLexerOnce
+
+class yyFlexLexer : public FlexLexer {
+public:
+	// arg_yyin and arg_yyout default to the cin and cout, but we
+	// only make that assignment when initializing in yylex().
+	yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 );
+
+	virtual ~yyFlexLexer();
+
+	void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
+	struct yy_buffer_state* yy_create_buffer( istream* s, int size );
+	void yy_delete_buffer( struct yy_buffer_state* b );
+	void yyrestart( istream* s );
+
+	virtual int yylex();
+	virtual void switch_streams( istream* new_in, ostream* new_out );
+
+protected:
+	virtual int LexerInput( char* buf, int max_size );
+	virtual void LexerOutput( const char* buf, int size );
+	virtual void LexerError( const char* msg );
+
+	void yyunput( int c, char* buf_ptr );
+	int yyinput();
+
+	void yy_load_buffer_state();
+	void yy_init_buffer( struct yy_buffer_state* b, istream* s );
+	void yy_flush_buffer( struct yy_buffer_state* b );
+
+	int yy_start_stack_ptr;
+	int yy_start_stack_depth;
+	int* yy_start_stack;
+
+	void yy_push_state( int new_state );
+	void yy_pop_state();
+	int yy_top_state();
+
+	yy_state_type yy_get_previous_state();
+	yy_state_type yy_try_NUL_trans( yy_state_type current_state );
+	int yy_get_next_buffer();
+
+	istream* yyin;	// input source for default LexerInput
+	ostream* yyout;	// output sink for default LexerOutput
+
+	struct yy_buffer_state* yy_current_buffer;
+
+	// yy_hold_char holds the character lost when yytext is formed.
+	char yy_hold_char;
+
+	// Number of characters read into yy_ch_buf.
+	int yy_n_chars;
+
+	// Points to current character in buffer.
+	char* yy_c_buf_p;
+
+	int yy_init;		// whether we need to initialize
+	int yy_start;		// start state number
+
+	// Flag which is used to allow yywrap()'s to do buffer switches
+	// instead of setting up a fresh yyin.  A bit of a hack ...
+	int yy_did_buffer_switch_on_eof;
+
+	// The following are not always needed, but may be depending
+	// on use of certain flex features (like REJECT or yymore()).
+
+	yy_state_type yy_last_accepting_state;
+	char* yy_last_accepting_cpos;
+
+	yy_state_type* yy_state_buf;
+	yy_state_type* yy_state_ptr;
+
+	char* yy_full_match;
+	int* yy_full_state;
+	int yy_full_lp;
+
+	int yy_lp;
+	int yy_looking_for_trail_begin;
+
+	int yy_more_flag;
+	int yy_more_len;
+	int yy_more_offset;
+	int yy_prev_more_offset;
+};
+
+#endif
@@ -10,15 +10,14 @@ libZend_la_SOURCES=\
 	zend_ini_parser.y zend_ini_scanner.l \
 	zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
 	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
-	zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+	zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
 	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
 	zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
 	zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
-	zend_objects_API.c zend_ts_hash.c zend_stream.c \
+	zend_objects_API.c zend_ts_hash.c zend_stream.c zend_mm.c \
 	zend_default_classes.c \
 	zend_iterators.c zend_interfaces.c zend_exceptions.c \
-	zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c \
-	zend_generators.c
+	zend_strtod.c zend_strtod.c zend_strtol.c

 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
@@ -32,7 +31,7 @@ zend_ini_scanner.lo: zend_ini_parser.h
 # Language parser/scanner rules

 zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt $(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
+	$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l

 zend_language_parser.h: zend_language_parser.c
 zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -44,7 +43,7 @@ zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
 	$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c

 zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt $(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
+	$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l

 zend_ini_parser.h: zend_ini_parser.c

@@ -1,43 +0,0 @@
-Zend Memory Manager
-===================
-
-General:
--------
-
-The goal of the new memory manager (available since PHP 5.2) is to reduce memory
-allocation overhead and speedup memory management.
-
-The new manager's "configure" has no "--disable-zend-memory-manager" option,
-but it has "--enable-malloc-mm" instead.  It is enabled by default in DEBUG
-build and disabled by default in RELEASE build. When enabled it allows selecting
-between malloc and emalloc at runtime so you can use internal and external memory
-debuggers without recompilation.
-
-Debugging:
----------
-
-Normal:
-
-    $ sapi/cli/php -r 'leak();'
-
-Zend MM disabled:
-
-    $ USE_ZEND_ALLOC=0 valgrind --leak-check=full sapi/cli/php -r 'leak();'
-
-Shared extensions:
------------------
-
-Since PHP 5.3.11 it is possible to prevent shared extensions from unloading so
-that valgrind can correctly track the memory leaks in shared extensions. For
-this there is the ZEND_DONT_UNLOAD_MODULES environment variable. If set, then
-DL_UNLOAD() is skipped during the shutdown of shared extensions.
-
-
-Tweaking:
---------
-
-The Zend MM can be tweaked using ZEND_MM_MEM_TYPE and ZEND_MM_SEG_SIZE environment
-variables.  Default values are "malloc" and "256K". Dependent on target system you
-can also use "mmap_anon", "mmap_zero" and "win32" storage managers.
-
-	$ ZEND_MM_MEM_TYPE=mmap_anon ZEND_MM_SEG_SIZE=1M sapi/cli/php ..etc.
@@ -6,7 +6,7 @@ fields and using different execution methods (call threading, switch threading
 and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
 code execution (with specialized executor and direct threading execution
 method). As in most PHP applications raw execution speed isn't the limiting
-factor but system calls and database calls are, your mileage with this patch
+factor but system calls and database callls are, your mileage with this patch
 will vary.

 Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can
@@ -1,5 +1,5 @@
 Title:           Zend 2.0 Namespaces
-Version:         $Id$
+Version:         $Revision$
 Status:          declined
 Maintainer:      Stig S. Bakken <ssb@php.net>
 Created:         2001-09-08
@@ -1,5 +1,5 @@
 Title:           Loose type requirements for functions
-Version:         $Id$
+Version:         $Revision$
 Status:          draft
 Maintainer:      Brian Moon <brianm@dealnews.com>
 Created:         2001-09-17
@@ -435,7 +435,7 @@ Changes in the Zend Engine 2.0
      that of other object-oriented languages, such as Java: When the
      last reference to an object is destroyed the object's
      destructor, which is a class method name __destruct() that
-      receives no parameters, is called before the object is freed
+      recieves no parameters, is called before the object is freed
      from memory.

      Example:
@@ -1136,7 +1136,7 @@ Changes in the Zend Engine 1.0
      (supports breakpoints, expression evaluation, step-in/over,
      function call backtrace, and more).

-  The Zend Engine claims 100% compatibility with the engine of PHP
+  The Zend Engine claims 100% compatability with the engine of PHP
  3.0, and is shamelessly lying about it. Here's why:

    * Static variable initializers only accept scalar values
@@ -1161,6 +1161,6 @@ Changes in the Zend Engine 1.0
      printed the letter { and the contents of the variable $somevar in
      PHP 3.0), it will result in a parse error with the Zend Engine.
      In this case, you would have to change the code to print
-      "\{$somevar"; This incompatibility is due to the full variable
+      "\{$somevar"; This incompatability is due to the full variable
      reference within quoted strings feature added in the Zend
      Engine.
@@ -123,10 +123,6 @@ SOURCE=.\zend_builtin_functions.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_closures.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_compile.c
 # End Source File
 # Begin Source File
@@ -155,14 +151,6 @@ SOURCE=.\zend_extensions.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_float.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_generators.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_hash.c
 # End Source File
 # Begin Source File
@@ -207,6 +195,10 @@ SOURCE=.\zend_llist.c
 # End Source File
 # Begin Source File

+SOURCE=.\zend_mm.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_object_handlers.c
 # End Source File
 # Begin Source File
@@ -235,6 +227,10 @@ SOURCE=.\zend_qsort.c
 # End Source File
 # Begin Source File

+SOURCE=.\zend_reflection_api.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_sprintf.c
 # End Source File
 # Begin Source File
@@ -247,10 +243,6 @@ SOURCE=.\zend_stream.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_string.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_strtod.c
 # End Source File
 # Begin Source File
@@ -261,10 +253,6 @@ SOURCE=.\zend_ts_hash.c

 SOURCE=.\zend_variables.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\zend_vm_opcodes.c
-# End Source File
 # End Group
 # Begin Group "Header Files"

@@ -327,6 +315,10 @@ SOURCE=.\zend_extensions.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_fast_cache.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_globals.h
 # End Source File
 # Begin Source File
@@ -383,6 +375,10 @@ SOURCE=.\zend_llist.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_mm.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_modules.h
 # End Source File
 # Begin Source File
@@ -411,6 +407,10 @@ SOURCE=.\zend_qsort.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_reflection_api.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_stack.h
 # End Source File
 # Begin Source File
@@ -419,10 +419,6 @@ SOURCE=.\zend_stream.h
 # End Source File
 # Begin Source File

-SOURCE=.\zend_string.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_strtod.h
 # End Source File
 # Begin Source File
@@ -31,6 +31,7 @@ AC_DEFUN([LIBZEND_BASIC_CHECKS],[
 AC_REQUIRE([AC_PROG_YACC])
 AC_REQUIRE([AC_PROG_CC])
 AC_REQUIRE([AC_PROG_CC_C_O])
+AC_REQUIRE([AC_PROG_LEX])
 AC_REQUIRE([AC_HEADER_STDC])

 LIBZEND_BISON_CHECK
@@ -60,6 +61,7 @@ sys/time.h \
 signal.h \
 unix.h \
 stdlib.h \
+mach-o/dyld.h \
 dlfcn.h)

 AC_TYPE_SIZE_T
@@ -97,46 +99,12 @@ dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
-AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp)
+AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass)
 AC_ZEND_BROKEN_SPRINTF

 AC_CHECK_FUNCS(finite isfinite isinf isnan)

 ZEND_FP_EXCEPT
-
-ZEND_CHECK_FLOAT_PRECISION
-
-dnl test whether double cast to long preserves least significant bits
-AC_MSG_CHECKING(whether double cast to long preserves least significant bits)
-
-AC_TRY_RUN([
-#include <limits.h>
-
-int main()
-{
-	if (sizeof(long) == 4) {
-		double d = (double) LONG_MIN * LONG_MIN + 2e9;
-
-		if ((long) d == 2e9 && (long) -d == -2e9) {
-			exit(0);
-		}
-	} else if (sizeof(long) == 8) {
-		double correct = 18e18 - ((double) LONG_MIN * -2); /* Subtract ULONG_MAX + 1 */
-
-		if ((long) 18e18 == correct) { /* On 64-bit, only check between LONG_MAX and ULONG_MAX */
-			exit(0);
-		}
-	}
-	exit(1);
-}
-], [
-  AC_DEFINE([ZEND_DVAL_TO_LVAL_CAST_OK], 1, [Define if double cast to long preserves least significant bits])
-  AC_MSG_RESULT(yes)
-], [
-  AC_MSG_RESULT(no)
-], [
-  AC_MSG_RESULT(no)
-])
 	
 ])

@@ -161,6 +129,15 @@ AC_ARG_WITH(zend-vm,
  PHP_ZEND_VM=CALL
 ])

+AC_ARG_ENABLE(zend-memory-manager,
+[  --disable-zend-memory-manager
+                          Disable the Zend memory manager - FOR DEVELOPERS ONLY!!],
+[
+  ZEND_USE_ZEND_ALLOC=$enableval
+], [
+  ZEND_USE_ZEND_ALLOC=yes
+])
+
 AC_ARG_ENABLE(maintainer-zts,
 [  --enable-maintainer-zts Enable thread safety - for code maintainers only!!],[
  ZEND_MAINTAINER_ZTS=$enableval
@@ -176,15 +153,28 @@ AC_ARG_ENABLE(inline-optimization,
  ZEND_INLINE_OPTIMIZATION=yes
 ])

+AC_ARG_ENABLE(memory-limit,
+[  --enable-memory-limit   Compile with memory limit support], [
+  ZEND_MEMORY_LIMIT=$enableval
+],[
+  ZEND_MEMORY_LIMIT=no
+])
+
 AC_MSG_CHECKING([virtual machine dispatch method])
 AC_MSG_RESULT($PHP_ZEND_VM)

+AC_MSG_CHECKING(whether to enable the Zend memory manager)
+AC_MSG_RESULT($ZEND_USE_ZEND_ALLOC)
+
 AC_MSG_CHECKING(whether to enable thread-safety)
 AC_MSG_RESULT($ZEND_MAINTAINER_ZTS)

 AC_MSG_CHECKING(whether to enable inline optimization for GCC)
 AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION)

+AC_MSG_CHECKING(whether to enable a memory limit)
+AC_MSG_RESULT($ZEND_MEMORY_LIMIT)
+
 AC_MSG_CHECKING(whether to enable Zend debugging)
 AC_MSG_RESULT($ZEND_DEBUG)

@@ -216,12 +206,24 @@ fi

 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"

+if test "$ZEND_USE_ZEND_ALLOC" = "yes"; then
+  AC_DEFINE(USE_ZEND_ALLOC,1,[Use Zend memory manager])
+else
+  AC_DEFINE(USE_ZEND_ALLOC,0,[Use Zend memory manager])
+fi
+
 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
  AC_DEFINE(ZTS,1,[ ])
  CFLAGS="$CFLAGS -DZTS"
  LIBZEND_CPLUSPLUS_CHECKS
 fi  

+if test "$ZEND_MEMORY_LIMIT" = "yes"; then
+  AC_DEFINE(MEMORY_LIMIT, 1, [Memory limit])
+else
+  AC_DEFINE(MEMORY_LIMIT, 0, [Memory limit])
+fi
+
 changequote({,})
 if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
  INLINE_CFLAGS=`echo $ac_n "$CFLAGS $ac_c" | sed s/-O[0-9s]*//`
@@ -290,146 +292,10 @@ int main()

 AC_MSG_RESULT(done)

-dnl test for memory allocation using mmap(MAP_ANON)
-AC_MSG_CHECKING(for memory allocation using mmap(MAP_ANON))
-
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <stdlib.h>
-#include <stdio.h>
-#ifndef MAP_ANON
-# ifdef MAP_ANONYMOUS
-#  define MAP_ANON MAP_ANONYMOUS
-# endif
-#endif
-#ifndef MREMAP_MAYMOVE
-# define MREMAP_MAYMOVE 0
-#endif
-#ifndef MAP_FAILED
-# define MAP_FAILED ((void*)-1)
-#endif
-
-#define SEG_SIZE (256*1024)
-
-int main()
-{
-	void *seg = mmap(NULL, SEG_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-	if (seg == MAP_FAILED) {
-		return 1;
-	}
-	if (munmap(seg, SEG_SIZE) != 0) {
-		return 2;
-	}
-	return 0;
-}
-], [
-  AC_DEFINE([HAVE_MEM_MMAP_ANON], 1, [Define if the target system has support for memory allocation using mmap(MAP_ANON)])
-  AC_MSG_RESULT(yes)
-], [
-  AC_MSG_RESULT(no)
-], [
-  dnl cross-compile needs something here
-  AC_MSG_RESULT(no)
 ])

-dnl test for memory allocation using mmap("/dev/zero")
-AC_MSG_CHECKING(for memory allocation using mmap("/dev/zero"))
-
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <stdlib.h>
-#include <stdio.h>
-#ifndef MAP_ANON
-# ifdef MAP_ANONYMOUS
-#  define MAP_ANON MAP_ANONYMOUS
-# endif
-#endif
-#ifndef MREMAP_MAYMOVE
-# define MREMAP_MAYMOVE 0
-#endif
-#ifndef MAP_FAILED
-# define MAP_FAILED ((void*)-1)
-#endif
-
-#define SEG_SIZE (256*1024)
-
-int main()
-{
-	int fd;
-	void *seg;
-
-	fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR);
-	if (fd < 0) {
-		return 1;
-	}
-	seg = mmap(NULL, SEG_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
-	if (seg == MAP_FAILED) {
-		return 2;
-	}
-	if (munmap(seg, SEG_SIZE) != 0) {
-		return 3;
-	}
-	if (close(fd) != 0) {
-		return 4;
-	}
-	return 0;
-}
-], [
-  AC_DEFINE([HAVE_MEM_MMAP_ZERO], 1, [Define if the target system has support for memory allocation using mmap("/dev/zero")])
-  AC_MSG_RESULT(yes)
-], [
-  AC_MSG_RESULT(no)
-], [
-  dnl cross-compile needs something here
-  AC_MSG_RESULT(no)
-])
-
-AC_CHECK_FUNCS(mremap)
-
-
-AC_ARG_ENABLE(zend-signals,
-[  --enable-zend-signals   Use zend signal handling],[
-  ZEND_SIGNALS=$enableval
-],[
-  ZEND_SIGNALS=no
-])  
-
-AC_CHECK_FUNC(sigaction, [
-	AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available])
-], [
-	ZEND_SIGNALS=no
-])
-if test "$ZEND_SIGNALS" = "yes"; then
-	AC_DEFINE(ZEND_SIGNALS, 1, [Use zend signal handling])
-	CFLAGS="$CFLAGS -DZEND_SIGNALS"
-fi
-
-AC_MSG_CHECKING(whether to enable zend signal handling)
-AC_MSG_RESULT($ZEND_SIGNALS)
-
-])

 AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[

 ])

-AC_MSG_CHECKING(whether /dev/urandom exists) 
-if test -r "/dev/urandom" && test -c "/dev/urandom"; then 
-  AC_DEFINE([HAVE_DEV_URANDOM], 1, [Define if the target system has /dev/urandom device])
-  AC_MSG_RESULT(yes) 
-else 
-  AC_MSG_RESULT(no) 
-  AC_MSG_CHECKING(whether /dev/arandom exists) 
-  if test -r "/dev/arandom" && test -c "/dev/arandom"; then 
-    AC_DEFINE([HAVE_DEV_ARANDOM], 1, [Define if the target system has /dev/arandom device])
-    AC_MSG_RESULT(yes) 
-  else 
-    AC_MSG_RESULT(no) 
-  fi 
-fi 
@@ -148,10 +148,6 @@ SOURCE=.\zend_builtin_functions.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_closures.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_compile.c
 # End Source File
 # Begin Source File
@@ -173,7 +169,6 @@ SOURCE=.\zend_exceptions.c
 # Begin Source File

 SOURCE=.\zend_execute.c
-# ADD CPP /I "..\TSRM"
 # End Source File
 # Begin Source File

@@ -185,10 +180,6 @@ SOURCE=.\zend_extensions.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_generators.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_hash.c
 # End Source File
 # Begin Source File
@@ -237,6 +228,10 @@ SOURCE=.\zend_llist.c
 # End Source File
 # Begin Source File

+SOURCE=.\zend_mm.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_object_handlers.c
 # End Source File
 # Begin Source File
@@ -265,6 +260,10 @@ SOURCE=.\zend_qsort.c
 # End Source File
 # Begin Source File

+SOURCE=.\zend_reflection_api.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_sprintf.c
 # End Source File
 # Begin Source File
@@ -277,10 +276,6 @@ SOURCE=.\zend_stream.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_string.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_strtod.c
 # End Source File
 # Begin Source File
@@ -291,10 +286,6 @@ SOURCE=.\zend_ts_hash.c

 SOURCE=.\zend_variables.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\zend_vm_opcodes.c
-# End Source File
 # End Group
 # Begin Group "Header Files"

@@ -357,6 +348,10 @@ SOURCE=.\zend_extensions.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_fast_cache.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_globals.h
 # End Source File
 # Begin Source File
@@ -417,6 +412,10 @@ SOURCE=.\zend_llist.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_mm.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_modules.h
 # End Source File
 # Begin Source File
@@ -445,6 +444,10 @@ SOURCE=.\zend_qsort.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_reflection_api.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_stack.h
 # End Source File
 # Begin Source File
@@ -453,10 +456,6 @@ SOURCE=.\zend_stream.h
 # End Source File
 # Begin Source File

-SOURCE=.\zend_string.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_strtod.h
 # End Source File
 # Begin Source File
@@ -0,0 +1,121 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2006 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#define ZEND_API
+#define ZEND_DLEXPORT
+#define ZEND_DLIMPORT
+
+@TOP@
+
+#undef uint
+#undef ulong
+
+/* Define if you want to enable memory limit support */
+#define MEMORY_LIMIT 0
+
+@BOTTOM@
+
+#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifdef HAVE_IEEEFP_H
+# include <ieeefp.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#if ZEND_BROKEN_SPRINTF
+int zend_sprintf(char *buffer, const char *format, ...);
+#else
+# define zend_sprintf sprintf
+#endif
+
+#include <math.h>
+
+/* To enable the is_nan, is_infinite and is_finite PHP functions */
+#ifdef NETWARE
+	#define HAVE_ISNAN 1
+	#define HAVE_ISINF 1
+	#define HAVE_ISFINITE 1
+#endif
+
+#ifndef zend_isnan
+#ifdef HAVE_ISNAN
+#define zend_isnan(a) isnan(a)
+#elif defined(HAVE_FPCLASS)
+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+#else
+#define zend_isnan(a) 0
+#endif
+#endif
+
+#ifdef HAVE_ISINF
+#define zend_isinf(a) isinf(a)
+#elif defined(INFINITY)
+/* Might not work, but is required by ISO C99 */
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
+#else
+#define zend_isinf(a) 0
+#endif
+
+#ifdef HAVE_FINITE
+#define zend_finite(a) finite(a)
+#elif defined(HAVE_ISFINITE) || defined(isfinite)
+#define zend_finite(a) isfinite(a)
+#elif defined(fpclassify)
+#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
+#else
+#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
+#endif
+
+#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
+
+#ifdef NETWARE
+#ifdef USE_WINSOCK
+#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
+#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
+#endif
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -4,7 +4,7 @@ dnl This file contains local autoconf functions.

 AC_DEFUN([LIBZEND_BISON_CHECK],[
  # we only support certain bison versions
-  bison_version_list="2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2"

  # for standalone build of Zend Engine
  test -z "$SED" && SED=sed
@@ -12,7 +12,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
  bison_version=none
  if test "$YACC"; then
    AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-      bison_version_vars=`$YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /g' | tr -d a-z`
+      bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
      php_cv_bison_version=invalid
      if test -n "$bison_version_vars"; then
        set $bison_version_vars
@@ -105,117 +105,3 @@ int main(void)
 AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
-
-dnl x87 floating point internal precision control checks
-dnl See: http://wiki.php.net/rfc/rounding
-AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
-  AC_MSG_CHECKING([for usable _FPU_SETCW])
-  AC_TRY_LINK([
-    #include <fpu_control.h>
-  ],[
-    fpu_control_t fpu_oldcw, fpu_cw;
-    volatile double result;
-    double a = 2877.0;
-    volatile double b = 1000000.0;
-
-    _FPU_GETCW(fpu_oldcw);
-    fpu_cw = (fpu_oldcw & ~_FPU_EXTENDED & ~_FPU_SINGLE) | _FPU_DOUBLE;
-    _FPU_SETCW(fpu_cw);
-    result = a / b;
-    _FPU_SETCW(fpu_oldcw);
-  ], [ac_cfp_have__fpu_setcw=yes], [ac_cfp_have__fpu_setcw=no])
-  if test "$ac_cfp_have__fpu_setcw" = "yes" ; then
-    AC_DEFINE(HAVE__FPU_SETCW, 1, [whether _FPU_SETCW is present and usable])
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
-  
-  AC_MSG_CHECKING([for usable fpsetprec])
-  AC_TRY_LINK([
-    #include <machine/ieeefp.h>
-  ],[
-    fp_prec_t fpu_oldprec;
-    volatile double result;
-    double a = 2877.0;
-    volatile double b = 1000000.0;
-
-    fpu_oldprec = fpgetprec();
-    fpsetprec(FP_PD);
-    result = a / b;
-    fpsetprec(fpu_oldprec);
-  ], [ac_cfp_have_fpsetprec=yes], [ac_cfp_have_fpsetprec=no])
-  if test "$ac_cfp_have_fpsetprec" = "yes" ; then
-    AC_DEFINE(HAVE_FPSETPREC, 1, [whether fpsetprec is present and usable])
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
-
-  AC_MSG_CHECKING([for usable _controlfp])
-  AC_TRY_LINK([
-    #include <float.h>
-  ],[
-    unsigned int fpu_oldcw;
-    volatile double result;
-    double a = 2877.0;
-    volatile double b = 1000000.0;
-
-    fpu_oldcw = _controlfp(0, 0);
-    _controlfp(_PC_53, _MCW_PC);
-    result = a / b;
-    _controlfp(fpu_oldcw, _MCW_PC);
-  ], [ac_cfp_have__controlfp=yes], [ac_cfp_have__controlfp=no])
-  if test "$ac_cfp_have__controlfp" = "yes" ; then
-    AC_DEFINE(HAVE__CONTROLFP, 1, [whether _controlfp is present usable])
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
-
-  AC_MSG_CHECKING([for usable _controlfp_s])
-  AC_TRY_LINK([
-   #include <float.h>
-  ],[
-    unsigned int fpu_oldcw, fpu_cw;
-    volatile double result;
-    double a = 2877.0;
-    volatile double b = 1000000.0;
-
-    _controlfp_s(&fpu_cw, 0, 0);
-    fpu_oldcw = fpu_cw;
-    _controlfp_s(&fpu_cw, _PC_53, _MCW_PC);
-    result = a / b;
-    _controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC);
-  ], [ac_cfp_have__controlfp_s=yes], [ac_cfp_have__controlfp_s=no])
-  if test "$ac_cfp_have__controlfp_s" = "yes" ; then
-    AC_DEFINE(HAVE__CONTROLFP_S, 1, [whether _controlfp_s is present and usable])
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
-
-  AC_MSG_CHECKING([whether FPU control word can be manipulated by inline assembler])
-  AC_TRY_LINK([
-    /* nothing */
-  ],[
-    unsigned int oldcw, cw;
-    volatile double result;
-    double a = 2877.0;
-    volatile double b = 1000000.0;
-
-    __asm__ __volatile__ ("fnstcw %0" : "=m" (*&oldcw));
-    cw = (oldcw & ~0x0 & ~0x300) | 0x200;
-    __asm__ __volatile__ ("fldcw %0" : : "m" (*&cw));
-
-    result = a / b;
-
-    __asm__ __volatile__ ("fldcw %0" : : "m" (*&oldcw));
-  ], [ac_cfp_have_fpu_inline_asm_x86=yes], [ac_cfp_have_fpu_inline_asm_x86=no])
-  if test "$ac_cfp_have_fpu_inline_asm_x86" = "yes" ; then
-    AC_DEFINE(HAVE_FPU_INLINE_ASM_X86, 1, [whether FPU control word can be manipulated by inline assembler])
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
-])
@@ -1,7 +1,4 @@
 <?php
-if (function_exists("date_default_timezone_set")) {
-	date_default_timezone_set("UTC");
-}

 function simple() {
  $a = 0;
@@ -33,7 +33,7 @@ $(makefile_in_files): $(makefile_am_files)
 aclocal.m4: configure.in acinclude.m4
 	aclocal

-$(config_h_in): configure.in
+$(config_h_in): configure.in acconfig.h
 # explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
@@ -7,109 +7,11 @@ AM_CONFIG_HEADER(zend_config.h)
 AM_SANITY_CHECK
 AM_MAINTAINER_MODE
 AC_PROG_CC
+AM_PROG_LEX
 AM_PROG_CC_STDC
 ZEND_VERSION=$VERSION
 AC_ZEND_C_BIGENDIAN

-AH_TOP([
-#if defined(__GNUC__) && __GNUC__ >= 4
-# define ZEND_API __attribute__ ((visibility("default")))
-# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
-#else
-# define ZEND_API
-# define ZEND_DLEXPORT
-#endif
-
-#define ZEND_DLIMPORT
-
-#undef uint
-#undef ulong
-
-/* Define if you want to enable memory limit support */
-#define MEMORY_LIMIT 0
-])
-
-AH_BOTTOM([
-#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifdef HAVE_IEEEFP_H
-# include <ieeefp.h>
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#if ZEND_BROKEN_SPRINTF
-int zend_sprintf(char *buffer, const char *format, ...);
-#else
-# define zend_sprintf sprintf
-#endif
-
-#include <math.h>
-
-/* To enable the is_nan, is_infinite and is_finite PHP functions */
-#ifdef NETWARE
-	#define HAVE_ISNAN 1
-	#define HAVE_ISINF 1
-	#define HAVE_ISFINITE 1
-#endif
-
-#ifndef zend_isnan
-#ifdef HAVE_ISNAN
-#define zend_isnan(a) isnan(a)
-#elif defined(HAVE_FPCLASS)
-#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
-#else
-#define zend_isnan(a) 0
-#endif
-#endif
-
-#ifdef HAVE_ISINF
-#define zend_isinf(a) isinf(a)
-#elif defined(INFINITY)
-/* Might not work, but is required by ISO C99 */
-#define zend_isinf(a) (((a)==INFINITY)?1:0)
-#elif defined(HAVE_FPCLASS)
-#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
-#else
-#define zend_isinf(a) 0
-#endif
-
-#ifdef HAVE_FINITE
-#define zend_finite(a) finite(a)
-#elif defined(HAVE_ISFINITE) || defined(isfinite)
-#define zend_finite(a) isfinite(a)
-#elif defined(fpclassify)
-#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
-#else
-#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
-#endif
-
-#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
-
-#ifdef NETWARE
-#ifdef USE_WINSOCK
-#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
-#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
-#endif
-#endif
-])
-
 dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2006 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -1,358 +0,0 @@
-<?php
-
-function hallo() {
-}
-
-function simpleucall($n) {
-  for ($i = 0; $i < $n; $i++) 
-    hallo();
-}
-
-function simpleudcall($n) {
-  for ($i = 0; $i < $n; $i++) 
-    hallo2();
-}
-
-function hallo2() {
-}
-
-function simpleicall($n) {
-  for ($i = 0; $i < $n; $i++) 
-    func_num_args();
-}
-
-class Foo {
-	static $a = 0;
-	public $b = 0;
-	const TEST = 0;
-
-	static function read_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = self::$a;
-		}
-	}
-
-	static function write_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			self::$a = 0;
-		}
-	}
-
-	static function isset_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = isset(self::$a);
-		}
-	}
-
-	static function empty_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = empty(self::$a);
-		}
-	}
-
-	static function f() {
-	}
-
-	static function call_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			self::f();
-		}
-	}
-
-	function read_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = $this->b;
-		}
-	}
-
-	function write_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->b = 0;
-		}
-	}
-
-	function assign_add_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->b += 2;
-		}
-	}
-
-	function pre_inc_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			++$this->b;
-		}
-	}
-
-	function pre_dec_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			--$this->b;
-		}
-	}
-
-	function post_inc_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->b++;
-		}
-	}
-
-	function post_dec_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->b--;
-		}
-	}
-
-	function isset_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = isset($this->b);
-		}
-	}
-
-	function empty_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = empty($this->b);
-		}
-	}
-
-	function g() {
-	}
-
-	function call($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->g();
-		}
-	}
-
-	function read_const($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = $this::TEST;
-		}
-	}
-
-}
-
-function read_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = Foo::$a;
-	}
-}
-
-function write_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		Foo::$a = 0;
-	}
-}
-
-function isset_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = isset(Foo::$a);
-	}
-}
-
-function empty_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = empty(Foo::$a);
-	}
-}
-
-function call_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		Foo::f();
-	}
-}
-
-function create_object($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = new Foo();
-	}
-}
-
-define('TEST', null);
-
-function read_const($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = TEST;
-	}
-}
-
-function read_auto_global($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $_GET;
-	}
-}
-
-$g_var = 0;
-
-function read_global_var($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $GLOBALS['g_var'];
-	}
-}
-
-function read_hash($n) {
-	$hash = array('test' => 0);
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $hash['test'];
-	}
-}
-
-function read_str_offset($n) {
-	$str = "test";
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $str[1];
-	}
-}
-
-function issetor($n) {
-	$val = array(0,1,2,3,4,5,6,7,8,9);
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $val ?: null;
-	}
-}
-
-function issetor2($n) {
-	$f = false; $j = 0;
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $f ?: $j + 1;
-	}
-}
-
-function ternary($n) {
-	$val = array(0,1,2,3,4,5,6,7,8,9);
-	$f = false;
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $f ? null : $val;
-	}
-}
-
-function ternary2($n) {
-	$f = false; $j = 0;
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $f ? $f : $j + 1;
-	}
-}
-
-/*****/
-
-function empty_loop($n) {
-	for ($i = 0; $i < $n; ++$i) {
-	}
-}
-
-function getmicrotime()
-{
-  $t = gettimeofday();
-  return ($t['sec'] + $t['usec'] / 1000000);
-}
-
-function start_test()
-{
-  ob_start();
-  return getmicrotime();
-}
-
-function end_test($start, $name, $overhead = null)
-{
-  global $total;
-  global $last_time;
-  $end = getmicrotime();
-  ob_end_clean();
-  $last_time = $end-$start;
-  $total += $last_time;
-  $num = number_format($last_time,3);
-  $pad = str_repeat(" ", 24-strlen($name)-strlen($num));
-  if (is_null($overhead)) {
-    echo $name.$pad.$num."\n";
-  } else {
-    $num2 = number_format($last_time - $overhead,3);
-    echo $name.$pad.$num."    ".$num2."\n";
-  }
-  ob_start();
-  return getmicrotime();
-}
-
-function total()
-{
-  global $total;
-  $pad = str_repeat("-", 24);
-  echo $pad."\n";
-  $num = number_format($total,3);
-  $pad = str_repeat(" ", 24-strlen("Total")-strlen($num));
-  echo "Total".$pad.$num."\n";
-}
-
-const N = 5000000;
-
-$t0 = $t = start_test();
-empty_loop(N);
-$t = end_test($t, 'empty_loop');
-$overhead = $last_time;
-simpleucall(N);
-$t = end_test($t, 'func()', $overhead);
-simpleudcall(N);
-$t = end_test($t, 'undef_func()', $overhead);
-simpleicall(N);
-$t = end_test($t, 'int_func()', $overhead);
-Foo::read_static(N);
-$t = end_test($t, '$x = self::$x', $overhead);
-Foo::write_static(N);
-$t = end_test($t, 'self::$x = 0', $overhead);
-Foo::isset_static(N);
-$t = end_test($t, 'isset(self::$x)', $overhead);
-Foo::empty_static(N);
-$t = end_test($t, 'empty(self::$x)', $overhead);
-read_static(N);
-$t = end_test($t, '$x = Foo::$x', $overhead);
-write_static(N);
-$t = end_test($t, 'Foo::$x = 0', $overhead);
-isset_static(N);
-$t = end_test($t, 'isset(Foo::$x)', $overhead);
-empty_static(N);
-$t = end_test($t, 'empty(Foo::$x)', $overhead);
-Foo::call_static(N);
-$t = end_test($t, 'self::f()', $overhead);
-call_static(N);
-$t = end_test($t, 'Foo::f()', $overhead);
-$x = new Foo();
-$x->read_prop(N);
-$t = end_test($t, '$x = $this->x', $overhead);
-$x->write_prop(N);
-$t = end_test($t, '$this->x = 0', $overhead);
-$x->assign_add_prop(N);
-$t = end_test($t, '$this->x += 2', $overhead);
-$x->pre_inc_prop(N);
-$t = end_test($t, '++$this->x', $overhead);
-$x->pre_dec_prop(N);
-$t = end_test($t, '--$this->x', $overhead);
-$x->post_inc_prop(N);
-$t = end_test($t, '$this->x++', $overhead);
-$x->post_dec_prop(N);
-$t = end_test($t, '$this->x--', $overhead);
-$x->isset_prop(N);
-$t = end_test($t, 'isset($this->x)', $overhead);
-$x->empty_prop(N);
-$t = end_test($t, 'empty($this->x)', $overhead);
-$x->call(N);
-$t = end_test($t, '$this->f()', $overhead);
-$x->read_const(N);
-$t = end_test($t, '$x = Foo::TEST', $overhead);
-create_object(N);
-$t = end_test($t, 'new Foo()', $overhead);
-read_const(N);
-$t = end_test($t, '$x = TEST', $overhead);
-read_auto_global(N);
-$t = end_test($t, '$x = $_GET', $overhead);
-read_global_var(N);
-$t = end_test($t, '$x = $GLOBALS[\'v\']', $overhead);
-read_hash(N);
-$t = end_test($t, '$x = $hash[\'v\']', $overhead);
-read_str_offset(N);
-$t = end_test($t, '$x = $str[0]', $overhead);
-issetor(N);
-$t = end_test($t, '$x = $a ?: null', $overhead);
-issetor2(N);
-$t = end_test($t, '$x = $f ?: tmp', $overhead);
-ternary(N);
-$t = end_test($t, '$x = $f ? $f : $a', $overhead);
-ternary2(N);
-$t = end_test($t, '$x = $f ? $f : tmp', $overhead);
-total($t0, "Total");
@@ -1,54 +0,0 @@
--TEST--
-func_num_args() tests
--FILE--
-<?php
-
-function test1() {
-	var_dump(func_num_args());
-}
-
-function test2($a) {
-	var_dump(func_num_args());
-}
-
-function test3($a, $b) {
-	var_dump(func_num_args());
-}
-
-test1();
-test2(1);
-test2();
-test3(1,2);
-
-call_user_func("test1");
-call_user_func("test3", 1);
-call_user_func("test3", 1, 2);
-
-class test {
-	static function test1($a) {
-		var_dump(func_num_args());
-	}
-}
-
-test::test1(1);
-var_dump(func_num_args());
-
-echo "Done\n";
-?>
--EXPECTF--	
-int(0)
-int(1)
-
-Warning: Missing argument 1 for test2(), called in %s on line %d
-int(0)
-int(2)
-int(0)
-
-Warning: Missing argument 2 for test3() in %s on line %d
-int(1)
-int(2)
-int(1)
-
-Warning: func_num_args():  Called from the global scope - no function context in %s on line %d
-int(-1)
-Done
@@ -1,108 +0,0 @@
--TEST--
-func_get_arg() tests
--FILE--
-<?php
-
-function test1() {
-	var_dump(func_get_arg(-10));
-	var_dump(func_get_arg(0));
-	var_dump(func_get_arg(1));
-}
-
-function test2($a) {
-	var_dump(func_get_arg(0));
-	var_dump(func_get_arg(1));
-}
-
-function test3($a, $b) {
-	var_dump(func_get_arg(0));
-	var_dump(func_get_arg(1));
-	var_dump(func_get_arg(2));
-}
-
-test1();
-test1(10);
-test2(1);
-test2();
-test3(1,2);
-
-call_user_func("test1");
-call_user_func("test3", 1);
-call_user_func("test3", 1, 2);
-
-class test {
-	static function test1($a) {
-		var_dump(func_get_arg(0));
-		var_dump(func_get_arg(1));
-	}
-}
-
-test::test1(1);
-var_dump(func_get_arg(1));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
-bool(false)
-
-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)
-
-Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
-bool(false)
-int(10)
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-int(1)
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-
-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)
-
-Warning: func_get_arg():  Argument 2 not passed to function in %s on line %d
-bool(false)
-
-Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
-bool(false)
-
-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)
-
-Warning: Missing argument 2 for test3() in %s on line %d
-int(1)
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-
-Warning: func_get_arg():  Argument 2 not passed to function in %s on line %d
-bool(false)
-int(1)
-int(2)
-
-Warning: func_get_arg():  Argument 2 not passed to function in %s on line %d
-bool(false)
-int(1)
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-
-Warning: func_get_arg():  Called from the global scope - no function context in %s on line %d
-bool(false)
-Done
@@ -1,81 +0,0 @@
--TEST--
-func_get_args() tests
--FILE--
-<?php
-
-function test1() {
-	var_dump(func_get_args());
-}
-
-function test2($a) {
-	var_dump(func_get_args());
-}
-
-function test3($a, $b) {
-	var_dump(func_get_args());
-}
-
-test1();
-test1(10);
-test2(1);
-test2();
-test3(1,2);
-
-call_user_func("test1");
-call_user_func("test3", 1);
-call_user_func("test3", 1, 2);
-
-class test {
-	static function test1($a) {
-		var_dump(func_get_args());
-	}
-}
-
-test::test1(1);
-var_dump(func_get_args());
-
-echo "Done\n";
-?>
--EXPECTF--	
-array(0) {
-}
-array(1) {
-  [0]=>
-  int(10)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
-
-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)
-  [1]=>
-  int(2)
-}
-array(0) {
-}
-
-Warning: Missing argument 2 for test3() in %s on line %d
-array(1) {
-  [0]=>
-  int(1)
-}
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
-
-Warning: func_get_args():  Called from the global scope - no function context in %s on line %d
-bool(false)
-Done
@@ -1,25 +0,0 @@
--TEST--
-strncmp() tests
--FILE--
-<?php
-
-var_dump(strncmp("", ""));
-var_dump(strncmp("", "", 100));
-var_dump(strncmp("aef", "dfsgbdf", -1));
-var_dump(strncmp("fghjkl", "qwer", 0));
-var_dump(strncmp("qwerty", "qwerty123", 6));
-var_dump(strncmp("qwerty", "qwerty123", 7));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: strncmp() expects exactly 3 parameters, 2 given in %s on line %d
-NULL
-int(0)
-
-Warning: Length must be greater than or equal to 0 in %s on line %d
-bool(false)
-int(0)
-int(0)
-int(-1)
-Done
@@ -1,27 +0,0 @@
--TEST--
-strcasecmp() tests
--FILE--
-<?php
-
-var_dump(strcasecmp(""));
-var_dump(strcasecmp("", ""));
-var_dump(strcasecmp("aef", "dfsgbdf"));
-var_dump(strcasecmp("qwe", "qwer"));
-var_dump(strcasecmp("qwerty", "QweRty"));
-var_dump(strcasecmp("qwErtY", "qwerty"));
-var_dump(strcasecmp("q123", "Q123"));
-var_dump(strcasecmp("01", "01"));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: strcasecmp() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-int(0)
-int(-3)
-int(-1)
-int(0)
-int(0)
-int(0)
-int(0)
-Done
@@ -1,31 +0,0 @@
--TEST--
-strncasecmp() tests
--FILE--
-<?php
-
-var_dump(strncasecmp(""));
-var_dump(strncasecmp("", "", -1));
-var_dump(strncasecmp("aef", "dfsgbdf", 0));
-var_dump(strncasecmp("aef", "dfsgbdf", 10));
-var_dump(strncasecmp("qwe", "qwer", 3));
-var_dump(strncasecmp("qwerty", "QweRty", 6));
-var_dump(strncasecmp("qwErtY", "qwer", 7));
-var_dump(strncasecmp("q123", "Q123", 3));
-var_dump(strncasecmp("01", "01", 1000));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: strncasecmp() expects exactly 3 parameters, 1 given in %s on line %d
-NULL
-
-Warning: Length must be greater than or equal to 0 in %s on line %d
-bool(false)
-int(0)
-int(-3)
-int(0)
-int(0)
-int(2)
-int(0)
-int(0)
-Done
@@ -1,63 +0,0 @@
--TEST--
-each() tests
--FILE--
-<?php
-
-var_dump(each());
-$var = 1;
-var_dump(each($var));
-$var = "string";
-var_dump(each($var));
-$var = array(1,2,3);
-var_dump(each($var));
-$var = array("a"=>1,"b"=>2,"c"=>3);
-var_dump(each($var));
-
-$a = array(1);
-$a [] =&$a[0];
-
-var_dump(each($a));
-
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: each() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-array(4) {
-  [1]=>
-  int(1)
-  ["value"]=>
-  int(1)
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-array(4) {
-  [1]=>
-  int(1)
-  ["value"]=>
-  int(1)
-  [0]=>
-  string(1) "a"
-  ["key"]=>
-  string(1) "a"
-}
-array(4) {
-  [1]=>
-  int(1)
-  ["value"]=>
-  int(1)
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-Done
@@ -1,53 +0,0 @@
--TEST--
-define() tests
--FILE--
-<?php
-
-var_dump(define());
-var_dump(define("TRUE"));
-var_dump(define("TRUE", 1));
-var_dump(define("TRUE", 1, array(1)));
-
-var_dump(define(array(1,2,3,4,5), 1));
-var_dump(define(" ", 1));
-var_dump(define("[[[", 2));
-var_dump(define("test const", 3));
-var_dump(define("test const", 3));
-var_dump(define("test", array(1)));
-var_dump(define("test1", new stdclass));
-
-var_dump(constant(" "));
-var_dump(constant("[[["));
-var_dump(constant("test const"));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: define() expects at least 2 parameters, 0 given in %s on line %d
-NULL
-
-Warning: define() expects at least 2 parameters, 1 given in %s on line %d
-NULL
-bool(true)
-
-Warning: define() expects parameter 3 to be boolean, array given in %s on line %d
-NULL
-
-Warning: define() expects parameter 1 to be string, array given in %s on line %d
-NULL
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Constant test const already defined in %s on line %d
-bool(false)
-
-Warning: Constants may only evaluate to scalar values in %s on line %d
-bool(false)
-
-Warning: Constants may only evaluate to scalar values in %s on line %d
-bool(false)
-int(1)
-int(2)
-int(3)
-Done
@@ -1,48 +0,0 @@
--TEST--
-get_class() tests
--FILE--
-<?php
-
-class foo {
-	function bar () {
-		var_dump(get_class());
-	}
-}
-
-class foo2 extends foo {
-}
-
-foo::bar();
-foo2::bar();
-
-$f1 = new foo;
-$f2 = new foo2;
-
-$f1->bar();
-$f2->bar();
-
-var_dump(get_class());
-var_dump(get_class("qwerty"));
-
-var_dump(get_class($f1));
-var_dump(get_class($f2));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
-string(3) "foo"
-
-Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
-string(3) "foo"
-string(3) "foo"
-string(3) "foo"
-
-Warning: get_class() called without object from outside a class in %s on line %d
-bool(false)
-
-Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
-bool(false)
-string(3) "foo"
-string(4) "foo2"
-Done
@@ -1,59 +0,0 @@
--TEST--
-get_parent_class() tests
--FILE--
-<?php
-
-interface i {
-	function test();
-}
-
-class foo implements i {
-	function test() {
-		var_dump(get_parent_class());
-	}
-}
-
-class bar extends foo {
-	function test_bar() {
-		var_dump(get_parent_class());
-	}
-}
-
-$bar = new bar;
-$foo = new foo;
-
-$foo->test();
-$bar->test();
-$bar->test_bar();
-
-var_dump(get_parent_class($bar));
-var_dump(get_parent_class($foo));
-var_dump(get_parent_class("bar"));
-var_dump(get_parent_class("foo"));
-var_dump(get_parent_class("i"));
-
-var_dump(get_parent_class(""));
-var_dump(get_parent_class("[[[["));
-var_dump(get_parent_class(" "));
-var_dump(get_parent_class(new stdclass));
-var_dump(get_parent_class(array()));
-var_dump(get_parent_class(1));
-
-echo "Done\n";
-?>
--EXPECTF--	
-bool(false)
-bool(false)
-string(3) "foo"
-string(3) "foo"
-bool(false)
-string(3) "foo"
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-Done
@@ -1,89 +0,0 @@
--TEST--
-property_exists() tests
--FILE--
-<?php
-
-class foo {
-	public $pp1 = 1;
-	private $pp2 = 2;
-	protected $pp3 = 3;
-
-	function bar() {
-		var_dump(property_exists("foo","pp1"));
-		var_dump(property_exists("foo","pp2"));
-		var_dump(property_exists("foo","pp3"));
-	}
-}
-
-class bar extends foo {
-	function test() {
-		var_dump(property_exists("foo","pp1"));
-		var_dump(property_exists("foo","pp2"));
-		var_dump(property_exists("foo","pp3"));
-	}
-}
-
-var_dump(property_exists());
-var_dump(property_exists(""));
-var_dump(property_exists("foo","pp1"));
-var_dump(property_exists("foo","pp2"));
-var_dump(property_exists("foo","pp3"));
-var_dump(property_exists("foo","nonexistent"));
-var_dump(property_exists("fo","nonexistent"));
-var_dump(property_exists("foo",""));
-var_dump(property_exists("","test"));
-var_dump(property_exists("",""));
-
-$foo = new foo;
-
-var_dump(property_exists($foo,"pp1"));
-var_dump(property_exists($foo,"pp2"));
-var_dump(property_exists($foo,"pp3"));
-var_dump(property_exists($foo,"nonexistent"));
-var_dump(property_exists($foo,""));
-var_dump(property_exists(array(),"test"));
-var_dump(property_exists(1,"test"));
-var_dump(property_exists(true,"test"));
-
-$foo->bar();
-
-$bar = new bar;
-$bar->test();
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: property_exists() expects exactly 2 parameters, 0 given in %s on line %d
-NULL
-
-Warning: property_exists() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-
-Warning: First parameter must either be an object or the name of an existing class in %s on line %d
-NULL
-
-Warning: First parameter must either be an object or the name of an existing class in %s on line %d
-NULL
-
-Warning: First parameter must either be an object or the name of an existing class in %s on line %d
-NULL
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-Done
@@ -1,34 +0,0 @@
--TEST--
-class_exists() tests
--FILE--
-<?php
-
-class foo {
-}
-
-var_dump(class_exists());
-var_dump(class_exists("qwerty"));
-var_dump(class_exists(""));
-var_dump(class_exists(array()));
-var_dump(class_exists("test", false));
-var_dump(class_exists("foo", false));
-var_dump(class_exists("foo"));
-var_dump(class_exists("stdClass", false));
-var_dump(class_exists("stdClass"));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: class_exists() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-bool(false)
-bool(false)
-
-Warning: class_exists() expects parameter 1 to be string, array given in %s on line %d
-NULL
-bool(false)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-Done
@@ -1,34 +0,0 @@
--TEST--
-interface_exists() tests
--FILE--
-<?php
-
-interface foo {
-}
-
-var_dump(interface_exists());
-var_dump(interface_exists("qwerty"));
-var_dump(interface_exists(""));
-var_dump(interface_exists(array()));
-var_dump(interface_exists("test", false));
-var_dump(interface_exists("foo", false));
-var_dump(interface_exists("foo"));
-var_dump(interface_exists("stdClass", false));
-var_dump(interface_exists("stdClass"));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: interface_exists() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-bool(false)
-bool(false)
-
-Warning: interface_exists() expects parameter 1 to be string, array given in %s on line %d
-NULL
-bool(false)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-Done
@@ -1,3 +0,0 @@
-<?php
-/* dummy file for 014.phpt */
-?>
@@ -1,52 +0,0 @@
--TEST--
-get_included_files() tests
--FILE--
-<?php
-
-var_dump(get_included_files());
-
-include(dirname(__FILE__)."/014.inc");
-var_dump(get_included_files());
-
-var_dump(get_included_files(1,1));
-
-include_once(dirname(__FILE__)."/014.inc");
-var_dump(get_included_files());
-
-var_dump(get_included_files(1));
-
-include(dirname(__FILE__)."/014.inc");
-var_dump(get_included_files());
-
-echo "Done\n";
-?>
--EXPECTF--	
-array(1) {
-  [0]=>
-  string(%d) "%s"
-}
-array(2) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-}
-
-Warning: get_included_files() expects exactly 0 parameters, 2 given in %s on line %d
-NULL
-array(2) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-}
-
-Warning: get_included_files() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
-array(2) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-}
-Done
@@ -1,37 +0,0 @@
--TEST--
-trigger_error() tests
--FILE--
-<?php
-
-var_dump(trigger_error());
-var_dump(trigger_error("error"));
-var_dump(trigger_error(array()));
-var_dump(trigger_error("error", -1));
-var_dump(trigger_error("error", 0));
-var_dump(trigger_error("error", E_USER_WARNING));
-var_dump(trigger_error("error", E_USER_DEPRECATED));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: trigger_error() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
-Notice: error in %s on line %d
-bool(true)
-
-Warning: trigger_error() expects parameter 1 to be string, array given in %s on line %d
-NULL
-
-Warning: Invalid error type specified in %s on line %d
-bool(false)
-
-Warning: Invalid error type specified in %s on line %d
-bool(false)
-
-Warning: error in %s on line %d
-bool(true)
-
-Deprecated: error in %s on line %d
-bool(true)
-Done
@@ -1,12 +0,0 @@
--TEST--
-isset() with object properties when operating on non-object
--FILE--
-<?php
-
-$foo = NULL; 
-isset($foo->bar->bar);
-
-echo "Done\n";
-?>
--EXPECT--	
-Done