This commit was manufactured by cvs2svn to create tag 'php_5_2_0RC4'.

PHP 5.2.0RC4
Make float filter handle things like 02.324 properly
2026-11-10 18:50:50 +00:00 · 2006-09-14 17:49:13 +00:00 · 2006-09-14 17:49:12 +00:00 · 2006-09-14 17:47:00 +00:00 · 2006-09-14 16:58:52 +00:00 · 2006-09-14 15:30:13 +00:00
12859 changed files with 350074 additions and 1751547 deletions
@@ -2,155 +2,22 @@ define ____executor_globals
 	if basic_functions_module.zts
 		set $tsrm_ls = ts_resource_ex(0, 0)
 		set $eg = ((zend_executor_globals) (*((void ***) $tsrm_ls))[executor_globals_id-1])
-		set $cg = ((zend_compiler_globals) (*((void ***) $tsrm_ls))[compiler_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 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 
-end
-
-document printzv
-	prints zval contents
-end
-
-define printu
-	set $str = (UChar*)$arg0
-	if $arg1 > 0
-		set $max = $arg1
-	else
-		set $max = 1024
-	end
-	set $pos = 0
-	while $pos < $max && *(char*)(($str+$pos))
-		if $str[$pos] < 256
-			printf "%c", $str[$pos]
-		else
-			printf "\\u%04X", $str[$pos]
-		end
-		set $pos = $pos + 1
-	end
-	if $pos < $max && *((char*)($str+$pos))
-		printf "[...]"
-	end
-end
-
-document printu
-	prints a unicode string, optionally with given length
-	usage: printu str [len]
-	The function stops at the first zero byte (not char) or when len is reached.
-	If len is less than or equal to one then a maximum of 1024 characters are 
-	printed.
-end
-
-define printt
-	if $arg0
-		printu $arg1 $arg2
-	else
-		set $len = strlen($arg1)
-		if $arg2 > 0 && $len > $arg2
-			set $copy = strdup($arg1)
-			printf "%p: %s\n", $copy, $copy
-			set ((char*)$copy)[$arg2] = 0
-			printf "%s[...]", $copy
-			call free($copy)
-		else
-			printf "%s", $arg1
-		end
-	end
-end
-
-document printt
-	prints a binary or unicode string, optionally with given length
-	usage: printt unicode str [len]
-	If unicode is 1 the function calls printu, else it uses printf.
-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 "[0x%08x] ", $t
 		if $t->function_state.function->common.function_name
-			printu $t->function_state.function->common.function_name.u 50
-			printf "() "
+			printf "%s() ", $t->function_state.function->common.function_name
 		else
 			printf "??? "
 		end
@@ -166,39 +33,43 @@ document dump_bt
 	dumps the current execution stack. usage: dump_bt executor_globals.current_execute_data
 end

+define printzv
+	set $ind = 1
+	____printzv $arg0 0 
+end
+
+document printzv
+	prints content of zval 
+end
+
 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"
-	else
-		____printz_type $type
 	end
 	if $type == 1
-		printf ": %ld", $zvalue->value.lval
+		printf "long: %ld", $zvalue->value.lval
 	end
 	if $type == 2
-		printf ": %lf", $zvalue->value.dval
+		printf "double: %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 "(%d): ", $zvalue->value.ht->nNumOfElements
+		printf "array(%d): ", $zvalue->value.ht->nNumOfElements
 		if ! $arg1
 			printf "{\n"
 			set $ind = $ind + 1
-			____print_ht $zvalue->value.ht 0 1
+			____print_ht $zvalue->value.ht
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0
@@ -210,6 +81,7 @@ 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
@@ -219,7 +91,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.s
+			set $cname = $zobj->ce.name
 		else
 			set $cname = "Unknown"
 		end
@@ -231,7 +103,7 @@ define ____printzv_contents
 					printf "(%d): ", $ht->nNumOfElements
 					printf "{\n"
 					set $ind = $ind + 1
-					____print_ht $ht 1 1
+					____print_ht $ht
 					set $ind = $ind - 1
 					set $i = $ind
 					while $i > 0
@@ -247,21 +119,20 @@ define ____printzv_contents
 		set $type = 0
 	end
 	if $type == 6
-		printf "(%d): \"%s\"", $zvalue->value.str.len, $zvalue->value.str.val
+		printf "string(%d): ", $zvalue->value.str.len
+		____print_str $zvalue->value.str.val $zvalue->value.str.len
 	end
 	if $type == 7
-		printf ": #%d", $zvalue->value.lval
+		printf "resource: #%d", $zvalue->value.lval
 	end
 	if $type == 8 
+		printf "constant"
 	end
 	if $type == 9
+		printf "const_array"
 	end
-	if $type == 10
-		printf "(%d): [%p]: \"", $zvalue->value.str.len, $zvalue->value.str.val
-		printu $zvalue->value.ustr.val $zvalue->value.str.len
-		printf "\""
-	end
-	if $type > 10
+	if $type > 9
+		printf "unknown type %d", $type
 	end
 	printf "\n"
 end
@@ -297,8 +168,9 @@ define ____print_const_table
 			set $i = $i - 1
 		end

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

 define ____print_ht
 	set $ht = $arg0
-	set $obj = $arg1
 	set $p = $ht->pListHead
-	set $unicode = $ht->unicode

 	while $p != 0
+		set $zval = *(zval **)$p->pData
+
 		set $i = $ind
 		while $i > 0
 			printf "  "
@@ -329,44 +201,21 @@ define ____print_ht
 		end

 		if $p->nKeyLength > 0
-			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 "\""
-				printt $p->key.type $p->key.arKey.s $p->nKeyLength
-				printf "\" => "
-			end
+			____print_str $p->arKey $p->nKeyLength
+			printf " => "
 		else
 			printf "%d => ", $p->h
 		end

-		if $arg1 == 0
-			printf "%p\n", (void*)$p->pData
-		end
-		if $arg1 == 1
-			set $zval = *(zval **)$p->pData
-			____printzv $zval 1
-		end
-		if $arg1 == 2
-			printf "%s\n", (char*)$p->pData
-		end
-
+		____printzv $zval 1
 		set $p = $p->pListNext
 	end
 end

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

@@ -374,32 +223,9 @@ document print_ht
 	dumps elements of HashTable made of zval
 end

-define print_htptr
-	set $ind = 1
-	printf "[0x%08x] (%d) {\n", $arg0, $arg0->nNumOfElements
-	____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 "[0x%08x] (%d) {\n", $arg0, $arg0->nNumOfElements
-	____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
-	set $unicode = $ht->unicode

 	while $p != 0
 		set $func = (zend_function*)$p->pData
@@ -411,44 +237,20 @@ define ____print_ft
 		end

 		if $p->nKeyLength > 0
-			printf "\""
-			if $p->key.arKey.u.s[1] == '\0'
-				printu $p->key.arKey.u $p->nKeyLength
-			else
-				printt $unicode $p->key.arKey.u $p->nKeyLength
-			end
-			printf "\" => "
+			____print_str $p->arKey $p->nKeyLength
+			printf " => "
 		else
 			printf "%d => ", $p->h
 		end
-		printf "[%p]: ", $func
-		if $func->common.fn_flags & 0x01
-			printf "static "
-		end
-		if $func->common.fn_flags & 0x02
-			printf "abstract "
-		end
-		if $func->common.fn_flags & 0x04
-			printf "final "
-		end
-		set $visibility = zend_visibility_string($func->common.fn_flags)
-		printf "%s", $visibility
-		if *$visibility
-			printf " "
-		end
-		if $func->common.return_reference
-			printf "& "
-		end
-		printt $unicode $func->common.function_name.s 0
-		
-		printf "()\n"
+
+		printf "\"%s\"\n", $func->common.function_name
 		set $p = $p->pListNext
 	end
 end

 define print_ft
 	set $ind = 1
-	printf "[0x%08x] (%d) {\n", $arg0, $arg0->nNumOfElements
+	printf "[0x%08x] {\n", $arg0
 	____print_ft $arg0
 	printf "}\n"
 end
@@ -457,6 +259,113 @@ 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 "[0x%08x] {\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
@@ -473,9 +382,6 @@ define printzn
 	if $znode->op_type == 8
 		set $optype = "IS_UNUSED"
 	end
-	if $znode->op_type == 16
-		set $optype = "IS_CV"
-	end

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

@@ -496,9 +402,6 @@ define printzn
 	if $znode->op_type == 8
 		printf "\n"
 	end
-	if $znode->op_type == 16
-		printf "\n"
-	end
 end

 document printzn
@@ -1,6 +1,6 @@
-========================
-  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
@@ -9,38 +9,37 @@ follow it, but it's going in that general direction.  Since we are now
 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 "<svn username here>_0". For example, #if FOO_0, where FOO is your
-    svn 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 (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)::
+[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
 -----------------------------------
@@ -77,12 +77,6 @@ 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
@@ -124,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
@@ -141,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>,  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>, Andrey Hristov <andrey@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
-EXTENSION:           mysqlnd
-PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.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
 -------------------------------------------------------------------------------
@@ -168,53 +187,14 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             Working 
 -------------------------------------------------------------------------------
-EXTENSION:           pdo
-PRIMARY MAINTAINER:  Unknown
-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:  Unknown
-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>
@@ -227,18 +207,14 @@ 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
 -------------------------------------------------------------------------------

@@ -261,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
@@ -305,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>
@@ -325,6 +286,11 @@ 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
@@ -347,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
 -------------------------------------------------------------------------------
@@ -374,29 +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:           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
 -------------------------------------------------------------------------------
@@ -410,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>
+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>
@@ -461,7 +457,7 @@ SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           readline
 MAINTENANCE:         Unknown
-STATUS:              Working
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           recode
 PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
@@ -481,57 +477,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:  Rasmus Lerdorf <rasmus@php.net>, Pierre-Alain Joye <pajoye@php.net>
+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:         Maintained
-STATUS:              Working
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           unicode
-MAINTENANCE:         Andrei Zmievski <andrei@php.net>
+EXTENSION:           yaz
+PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
 MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           zip
-PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
-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 - 2009 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) --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) --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
@@ -13,13 +13,13 @@ lcov-test: all
 		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/; \
+			$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -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); \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi
@@ -61,16 +61,13 @@ php_lcov.info: lcov-test
 		test -f "$$x.bb"   && cp $$x.bb   lcov_data/$$y.bb ; \
 		test -f "$$x.bbg"  && cp $$x.bbg  lcov_data/$$y.bbg ; \
 	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 \
-		test -d lcov_data/$$dir && rm -rf lcov_data/$$dir ; \
-	done
 	@echo 
 	@echo "Generating $@"
 	@$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@

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

 lcov-clean:
 	rm -f php_lcov.info
@@ -8,27 +8,27 @@ 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) $(PHP_ZEND_EX)
+build-modules: $(PHP_MODULES)

-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; \
@@ -66,53 +66,35 @@ install-headers:
 			fi \
 		done; \
 	fi
+	
+install-su: install-pear

-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 = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|safe_mode_(gid|include_dir|exec_dir|allowed_env_vars|protected_env_vars)?|highlight_bg|enable_dl|detect_unicode|allow_call_time_pass_reference|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
-
-test: all
+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_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); \
+			$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -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 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi

 clean:
-	find . -name \*.gcno -o -name \*.gcda | xargs rm -f
 	find . -name \*.lo -o -name \*.o | xargs rm -f
 	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
-	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_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 stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+	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
@@ -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$
-
-
-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_zval, 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_zval, 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_zval 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_zval, set_handler_name_zval 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_zval, 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_zval, 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
@@ -31,81 +31,28 @@ resources cannot be auto-converted.

 Type specifiers
 ---------------
- The following list shows the type specifier, its meaning and the parameter 
- 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)
- r  - resource (zval*)
- s  - string (with possible null bytes) and its length (char*, int)
- S  - binary string, does not allow conversion from Unicode strings
- t  - text (zstr (string union), int (length), zend_uchar (IS_STRING/..))
-      accepts either Unicode or binary string
- T  - text (zstr (string union), int (length), zend_uchar (IS_STRING/..))
-      coalesces all T parameters to common type (Unicode or binary)
- u  - unicode (UChar*, int)
- U  - Unicode string, does not allow conversion from binary strings
- x  - Unicode or binary string depending on UG(unicode). In unicode this 
-      behaves like 'u' and in nonunicode mode it behaves like 's'.
- z  - the actual zval (zval*)
- Z  - the actual zval (zval**)
- *  - variable arguments list (0 or more)
- +  - variable arguments list (1 or more)
+ a	- array
+ b	- boolean, stored in zend_bool
+ d	- 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*)
+ l	- long
+ o	- object (of any type)
+ O	- object (of specific type, specified by class entry)
+ r	- resource (stored in zval)
+ s	- string (with possible null bytes) and its length
+ z	- the actual 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 (applies
-		to all specifiers except for 'b', 'l', and 'd'). If NULL is passed, the
-		results pointer is set to NULL as well.
-    & - alternate format (currently used for 's' only to specify a converter to
-        use when converting from Unicode strings)
-	^ - returns original string type before conversion (only for 's' and 'u'
-	    specifiers)
-
-
-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
 --------
@@ -115,18 +62,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;
 }


@@ -135,65 +82,26 @@ 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;
 }


-/* Gets a binary string in UTF-8 */
-char *str;
-int str_len;
-
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&", &str, &str_len, UG(utf8_conv)) == FAILURE) {
-    return;
-}
-
-
-/* Gets a Unicode string */
-UChar *str;
-int len;
-
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "u", &str, &len) == FAILURE) {
-    return;
-}
-
-
-/* Gets a Unicode or binary string */
-zstr 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 str.u as Unicode string */
-} else {
-   /* process str.s binary string */
-}
-
-
-/* Gets two string parameters, both of which will be guaranteed to be of the same type */
-zstr 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 binary string, str2 is guaranteed to be the same */
+/* 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;
 }


@@ -210,72 +118,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);
-}
-
@@ -1,11 +0,0 @@
-To install the PEAR installer, please use go-pear.
-
-On linux:
-$ lynx -source http://pear.php.net/go-pear | 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
@@ -1,429 +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
-
-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-2002 and
-placed in the public domain.
-
-There's absolutely no warranty.
-
-It is my intent that you should be able to use this on your system,
-as a 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 compatible with OpenBSD bcrypt.c (version 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>.
-
-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,286 +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 the day before a release. So if the release is to be on Thursday,
-package on Wednesday.
-
-3. Ensure that Windows builds will work before packaging
-
-4. Follow all steps to the letter. When unclear ask previous RM's (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 root level access to the CVS server.
-Contact systems@php.net to get this taken care of.
-
-Moving extensions from php-src to PECL
- Filesystem: cp -r php-src/ext/foo pecl/foo
- cvs rm php-src/ext/foo
-
-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
-
-Moving extensions from PECL to php-src
- Filesystem: cp -r pecl/foo php-src/ext/foo
-OR depending on the wishes from the PECL extension maintainer.
- Filesystem: ln -s pecl/foo php-src/ext/foo
-
-Rolling a non stable release (alpha/beta/RC)
--------------------------------------------
-
-1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)
-
-2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
-Do not use abbreviations for alpha and beta.
-
-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. tag the repository with the version f.e. "``cvs tag php_4_4_1RC1``"
-(of course, you need to change that to the version you're rolling an RC for).
-
-6. Bump up the version numbers in ``main/php_version.h``, ``configure.in``
-and possibly ``NEWS`` again, to the **next** version. F.e. if the release
-candidate was "4.4.1RC1" then the new one should be "4.4.1RC2-dev" - regardless
-if we get a new RC or not. This is to make sure ``version_compare()`` can
-correctly work.
-
-7. Commit those changes
-
-8. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4
-branch if you're rolling 4.4.x releases).
-
-9. You do not have to update the tree, but of course you can with "``cvs up -dP``".
-
-10. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure
-and build two tarballs (one gz and one bz2).
-
-11. Copy those two tarballs to www.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.
-
-12. Now the RC can be found on http://downloads.php.net/yourname,
-f.e. http://downloads.php.net/derick/
-
-13. 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 the MD5 sums in ``web/qa/trunk/include/rc-md5sums.txt`` (no empty lines).
-
-4. Update in ``web/qa/trunk/include/release-qa.php`` constants with the new RC and
-commit this.
-
- a. ``$BUILD_TEST_RELEASES`` = array("4.4.7RC1", "5.2.2RC1")
-
- b. ``$CURRENT_QA_RELEASE_4`` = "4.4.7RC1" (``$CURRENT_QA_RELEASE_5`` for PHP5)
-
- c. ``$RELEASE_PROCESS`` = array(4 => true, 5 => true)
-
-1. Update in ``php-bugs/trunk/include/functions.inc`` the ``show_version_option``
-function to include the new RC and commit.
-
-2. Update ``phpweb/include/version.inc`` (x=major version number)
-
- a. ``$PHP_x_RC`` = "5.3.0RC1"
-
- b. ``$PHP_x_RC_DATE`` = "06 September 2007"
-
-3. Commit those changes:
-
- a. ``cvs commit include/version.inc include/releases.inc``
-
-4. 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. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)
-
-2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
-
-3. **Merge** all related sections in NEWS (f.e. merge the 4.4.1RC1 and 4.4.0 sections)
-
-4. Commit those changes
-
-5. run the "scripts/dev/credits" script in php-src and commit the changes in the
-credits files in ext/standard.
-
-6. tag the repository with the version f.e. "``cvs tag php_4_4_1``"
-(of course, you need to change that to the version you're rolling an RC for).
-When making 5.X release, you need to tag the Zend directory separately!!
-
-7. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and
-possibly ``NEWS`` again, to the **next** version. F.e. if the release candidate
-was "4.4.1RC1" then the new one should be "4.4.1RC2-dev" - regardless if we get
-a new RC or not. This is to make sure ``version_compare()`` can correctly work.
-
-8. Commit those changes
-
-9. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4
-branch if you're rolling 4.4.x releases).
-
-10. You do not have to update the tree, but of course you can with "``cvs up -dP``".
-
-11. run: ``./makedist php 4.4.1``, this will export the tree, create configure
-and build two tarballs (one gz and one bz2).
-
-12. Commit those two tarballs to CVS (phpweb/distributions)
-
-13. 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 committed to CVS too.
-
-14. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4)
-
-15. When making a final release, also remind the PHP Windows development team
-(internals-win@lists.php.net) to prepare the installer packages for Win32.
-
-Getting the stable release announced
------------------------------------
-
-1. Run the bumpRelease script for phpweb on your local checkout
-
- a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4)
-
-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 the ChangeLog file for the given major version
-f.e. ``ChangeLog-4.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); ?>/``
-
-4. ``cp releases/4_4_0.php releases/4_4_1.php``
-
-5. ``cvs add releases/4_4_1.php``
-
-6. Update the ``releases/*.php`` file with relevant data. The release
-announcement file should list in detail:
-
- a. security fixes,
-
- b. changes in behavior (whether due to a bug fix or not)
-
-7. 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
-
-8. Commit all the changes.
-
-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.
-
-10. Update ``php-bugs-web/include/functions.php`` to include the new version
-number, and remove the RC from there.
-
-11. Update ``qaweb/include/release-qa.php``
-
- a. Update the $BUILD_TEST_RELEASES array with the release name
-
- b. Update $RELEASE_PROCESS array (set to false)
-
-  I. For PHP4: Set $CURRENT_QA_RELEASE_4 to false
-
-  II. For PHP5: Set $CURRENT_QA_RELEASE_5 to false
-
-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.
@@ -1,152 +1,126 @@
-Submitting Patches to PHP
-=========================
+Submitting Patch for PHP
+========================

-This document describes how to submit a patch for PHP. Creating a
-patch for PHP is 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 code, tests or documentation for
-inclusion in PHP. Once you've followed this README and had several
-patches accepted, PHP 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.


-Prework
-------
-If you are fixing broken functionality then create a bug or identify
-an existing bug at http://bugs.php.net/. This can be used to track
-the patch progress and prevent your changes getting lost in the PHP
-mail archives.
+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 your code change is large, then first discuss it with the extension
-maintainer and/or a development mail list. Extension maintainers can
-be found in the EXTENSIONS file in the PHP source. Use the
-internals@lists.php.net mail list to discuss changes to the base PHP
-code. Use pecl-dev@lists.php.net for changes to code that is only
-available from PECL (http://pecl.php.net/). Use pear-dev@lists.php.net
-for PEAR modules (http://pear.php.net/). Use phpdoc@lists.php.net for
-PHP documentation questions. Mail list subscription is explained on
-http://www.php.net/mailing-lists.php.
+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 a PHP or PECL patch affects user functionality or makes significant
-internal changes then create a simple Request For Comment (RFC) page
-on http://wiki.php.net/rfc before starting discussion. This RFC can be
-used for initial discussion and later for documentation. Wiki accounts
-can be requested on http://wiki.php.net/start?do=register
-
-Online 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 reference is the book "Extending and Embedding PHP" by Sara
-Golemon.
-
-Information on contributing to PEAR is available at
-http://pear.php.net/manual/en/guide-developers.php
-
-Information on contributing to PHP documentation is at
-http://php.net/dochowto and http://wiki.php.net/doc/howto
-
-There are several IRC channels where PHP developers are often
-available to discuss questions. They include #php.pecl and #php.doc
-on the EFNet network and #php-dev-win on FreeNode.
+If you are new to CVS (Concurrent Versions System), visit 
+http://cvshome.org/ for details.


-How to create your patch
------------------------
-PHP uses 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.
+Recommended CVS client settings for creating patch file
+------------------------------------------------------
+Recommended ~/.cvsrc file setting is:
+------
+cvs -z3
+update -d -P
+checkout -P
+diff -u

-Generally we ask that patches work on the current stable PHP
-development branch and on "trunk".
+------
+diff -u means:
+ -u     Use the unified output format.

-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.
+With this CVS setting, you don't have to worry about adding/deleting
+newlines and spaces.


-Checklist for submitting your patch
-----------------------------------
- - Update SVN source just before running your final 'diff' and
-   before testing.
- - 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 the PHP tests.
- - Rebuild PHP with --enable-maintainer-zts to check your patch compiles
-   on multi-threaded web servers.
- - Create test scripts for use with "make test".
- - Add in-line comments and/or have external documentation ready.
- - Review the patch once more just before submitting it.
+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 patching PHP C source then email the patch to
-internals@lists.php.net
+Where to send your patch?
+-------------------------
+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 you patching a PECL extension then send the patch to
-pecl-dev@lists.php.net
+If you are patching PEAR, send the patch to pear-dev@lists.php.net.

-If you are patching PEAR then send the patch to
-pear-dev@lists.php.net
+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. 

-If you are patching PHP's documentation then send the patch to
-phpdoc@lists.php.net
+NOTE: only MIME attachments of type 'text/*' are accepted. The
+      easiest way to accomplish this, is to make the extension
+      '.txt'.

-The mail can be CC'd to the extension maintainer (see EXTENSIONS).
+Test scripts should be included in the same email.
+Explain what has been fixed/added/changed by your patch.

-Please make the subject prefix "[PATCH]", for example "[PATCH] Fix
-return value of all array functions"
-
-Include the patch as an attachment with a file extension of ".txt".
-This is because only MIME attachments of type 'text/*' are accepted.
-
-Explain what has been fixed/added/changed by your patch. Test scripts
-should be included in the email.
-
-Include the bug id(s) which can be closed by your patch.
-
-Finally, update any open bugs and add a link to the source of your
-patch.
+Finally, add the bug Id(s) which can be closed by your patch, if any.


 What happens after you submit your patch
----------------------------------------
-If your patch is easy to review and obviously has no side-effects,
-it might be committed relatively quickly.
+---------------------------------------- 
+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.

-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
+Because this is a volunteer-driven effort, more complex patches will
+require more patience on your side. 
+
+If you did not receive any feedback in a few days, please consider
+resubmitting the description of your patch, along-side with
 these questions:

- - 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 which factors?
- - Are there any unwanted white space changes?
+- 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?


-What happens when your patch is applied
---------------------------------------
-Your name will 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.
+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.

-Thank you for patching PHP!
+
+Thank you for submitting patch for PHP!
@@ -1,146 +0,0 @@
-====================
-  SVN Commit Rules
-====================
-
-This is the first file you should be reading after you get your SVN account.
-We'll assume you're basically familiar with SVN, but feel free to post
-your questions on the mailing list. Please have a look at
-http://svnbook.red-bean.com/ for more detailed information on SVN.
-
-PHP is developed through the efforts of a large number of people.
-Collaboration is a Good Thing(tm), and SVN lets us do this. Thus, following
-some basic rules with regards to SVN usage will::
-
-   a. Make everybody happier, especially those responsible for maintaining
-      the SVN 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 thos who need that.
-
-Currently we have the following branches in use::
-
-  trunk             Will become PHP 6.0. This branch is for active development.
-
-  branches/PHP_5_3  Is used to release the PHP 5.3.x series. It still allows for
-                    larger enhancements.
-
-  branches/PHP_5_2  Is used to release the PHP 5.2.x series. Only bugfixes are permitted
-                    on this branch (Consult the releasemaster prior to commit).
-
-  branches/PHP_5_1  This branch is closed.
-
-  branches/PHP_4_4  This branch is closed.
-
-The next few rules are more of a technical nature::
-
-   1. All changes should first go to trunk and then get merged from trunk
-      (aka MFH'ed) to all other relevant branches.
-
-   2. DO NOT TOUCH ChangeLog! It is automagically updated from the commit
-      messages every day. Woe be to those who attempt to mess with it.
-
-   3. All news updates intended for public viewing, such as new features,
-      bug fixes, improvements, etc., should go into the NEWS file of the
-      *first* to be released version with the given change. In other words
-      any NEWS file change only needs to done in one branch.
-
-      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.
-
-   4. 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.
-
-   5. 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.
-
-   6. 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.
-
-   7. 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.
-
-Use the [DOC] tag in your log message whenever you feel that your changes
-imply a documentation modification. The php-doc team will automatically
-get notified about your commit through the php-doc mailing list.
-
-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 SVN 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.
-
-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 LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
-to look at PHP SVN 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
@@ -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


@@ -1,644 +0,0 @@
-Audience
-========
-
-This README describes how PHP 6 provides native support for the Unicode 
-Standard. Readers of this document should be proficient with PHP and have a
-basic understanding of Unicode concepts. For more technical details about
-PHP 6 design principles and for guidelines about writing Unicode-ready PHP 
-extensions, refer to README.UNICODE-UPGRADES.
-
-Introduction
-============
-
-As successful as PHP has proven to be over the years, its support for
-multilingual and multinational environments has languished. PHP can no
-longer afford to remain outside the overall movement towards the Unicode
-standard.  Although recent updates involving the mbstring extension have
-enabled easier multibyte data processing, this does not constitute native
-Unicode support.
-
-Since the full implementation of the Unicode Standard is very involved, our
-approach is to speed up implementation by using the well-tested,
-full-featured, and freely available ICU (International Components for
-Unicode) library.
-
-
-General Remarks
-===============
-
-International Components for Unicode
------------------------------------
-
-ICU (International Components for Unicode is a mature, widely used set of
-C/C++ and Java libraries for Unicode support, software internationalization
-and globalization. It provides:
-
-  - Encoding conversions
-  - Collations
-  - Unicode text processing
-  - and much more
-
-When building PHP 6, Unicode support is always enabled. The only
-configuration option during development should be the location of the ICU
-headers and libraries.
-
-  --with-icu-dir=<dir>
-  
-where <dir> specifies the location of ICU header and library files. If you do
-not specify this option, PHP attempts to find ICU under /usr and /usr/local.
-
-NOTE: ICU is not bundled with PHP 6 yet. To download the distribution, visit
-http://icu.sourceforge.net. PHP requires ICU version 3.4 or higher. 
-
-Backwards Compatibility
-----------------------
-Our paramount concern for providing Unicode support is backwards compatibility.
-Because PHP is used on so many sites, existing data types and functions must
-work as they always have. However, although PHP's interfaces must remain
-backwards-compatible, the speed of certain operations might be affected due to
-internal implementation changes.
-
-Encoding Names
--------------
-All the encoding settings discussed in this document can accept any valid
-encoding name supported by ICU. For a full list of encodings, refer to the ICU
-online documentation.
-
-NOTE: References to "Unicode" in this document generally mean the UTF-16
-character encoding, unless explicitly stated otherwise.
-
-Unicode Semantics Switch
-========================
-
-Because many applications do not require Unicode, PHP 6 provides a server-wide
-INI setting to enable Unicode support:
-
-  unicode.semantics = On/Off
-
-This switch is off by default. If your applications do not require native
-Unicode support, you may leave this switch off, and continue to use Unicode
-strings only when you need to. 
-
-However, if your application is ready to fully support Unicode, you should 
-turn this switch on. This activates various Unicode support mechanisms, 
-including:
-
-  * All string literals become Unicode
-  * All variables received from HTTP requests become Unicode
-  * PHP identifiers may use Unicode characters
-
-More fundamentally, your PHP environment is now a Unicode environment.  Strings
-inside PHP are Unicode, and the system is responsible for converting non-Unicode
-strings on PHP's periphery (for example, in HTTP input and output, streams, and
-filesystem operations). With unicode.semantics on, you must specify binary
-strings explicitly. PHP makes no assumptions about the content of a binary
-string, so your application must handle all binary string appropriately.
-
-Conversely, if unicode.semantics is off, PHP behaves as it did in the past.
-String literals do not become Unicode, and files are binary strings for
-backwards compatibility. You can always create Unicode strings programmatically,
-and all functions and operators support Unicode strings transparently.
-
-
-Fallback Encoding
-=================
-
-The fallback encoding provides a default value for all other unicode.*_encoding
-INI settings. If you do not set a particular unicode.*_encoding setting, PHP
-uses the fallback encoding. If you do not specify a fallback encoding, PHP uses
-UTF-8.
-
-  unicode.fallback_encoding = "iso-8859-1"
-
-
-Runtime Encoding
-================
-
-The runtime encoding specifies the encoding PHP uses for converting binary 
-strings within the PHP engine itself. 
-
-  unicode.runtime_encoding = "iso-8859-1"
-
-This setting has no effect on I/O-related operations such as writing to 
-standard out, reading from the filesystem, or decoding HTTP input variables.
-
-PHP enables you to explicitly convert strings using casting:
-
-  * (binary) -- casts to binary string type
-  * (unicode) -- casts to Unicode string type
-  * (string) -- casts to Unicode string type if unicode.semantics is on,
-    to binary otherwise
-
-For example, if unicode.runtime_encoding is iso-8859-1, and $uni is a unicode
-string, then
-
-  $str = (binary)$uni
-
-creates a binary string $str in the ISO-8859-1 encoding.
-
-Implicit conversions include concatenation, comparison, and parameter passing.
-For better precision, PHP attempts to convert strings to Unicode before
-performing these sorts of operations. For example, if we concatenate our binary
-string $str with a unicode literal, PHP converts $str to Unicode first, using
-the encoding specified by unicode.runtime_encoding.
-
-Output Encoding
-===============
-
-PHP automatically converts output for commands that write to the standard 
-output stream, such as 'print' and 'echo'.
-
-  unicode.output_encoding = "utf-8"
-
-However, PHP does not convert binary strings. When writing to files or external
-resources, you must rely on stream encoding features or manually encode the data
-using functions provided by the unicode extension.
-
-The existing default_charset INI setting is DEPRECATED in favor of
-unicode.output_setting. Previously, default_charset only specified the charset
-portion of the Content-Type MIME header. Now default_charset only takes effect
-when unicode.semantics is off, and it does not affect the actual transcoding of
-the output stream. Setting unicode.output_encoding causes PHP to add the
-'charset' portion to the Content-Type header, overriding any value set for
-default_charset.
-
-
-HTTP Input Encoding
-===================
-
-The HTTP input encoding specifies the encoding of variables received via
-HTTP, such as the contents of the $_GET and _$POST arrays.
-
-This functionality is currently under development. For a discussion of the
-approach that the PHP 6 team is taking, refer to:
-
-http://marc.theaimsgroup.com/?t=116613047300005&r=1&w=2
-
-
-Filesystem Encoding
-===================
-
-The filesystem encoding specifies the encoding of file and directory names
-on the filesystem. 
-
-  unicode.filename_encoding = "utf-8"
-
-Filesystem-related functions such as opendir() perform this conversion when 
-accepting and returning file names. You should set the filename encoding to 
-the encoding used by your filesystem. 
-
-
-Script Encoding
-===============
-
-You may write PHP scripts in any encoding supported by ICU. To specify the
-script encoding site-wide, use the INI setting:
-
-   unicode.script_encoding = utf-8
-
-If you cannot change the encoding system wide, you can use a pragma to 
-override the INI setting in a local script:
-
-   <?php declare(encoding = 'Shift-JIS'); ?>
-
-The pragma setting must be the first statement in the script. It only affects 
-the script in which it occurs, and does not propagate to any included files. 
-
-
-INI Files
-=========
-
-If unicode.semantics is on, INI files are presumed to contain UTF-8 encoded 
-keys and values. If unicode.semantics is off, the data is taken as-is,
-similar to PHP 5. No validation occurs during parsing. Instead invalid UTF-8
-sequences are caught during access by ini_*() functions.
-
-
-Stream I/O
-==========
-
-PHP has a streams-based I/O system for generalized filesystem access, 
-networking, data compression, and other operations. Since the data on the 
-other end of the stream can be in any encoding, you need to think about 
-data conversion. 
-
-Okay, this needs to be clarified. By "default", streams are actually
-opened in binary mode. You have to specify 't' flag or use FILE_TEXT in
-order to open it in text mode, where conversions apply. And for the text
-mode streams, the default stream encoding is UTF-8 indeed.
-
-By default, PHP opens streams in binary mode. To open a file in text mode,
-you must use the 't' flag (or the FILE_TEXT parameter -- see below). The 
-default encoding for streams in text mode is UTF-8. This means that if 
-'file.txt' is a UTF-8 text file, this code snippet:
-
-  $fp = fopen('file.txt', 'rt');
-  $str = fread($fp, 100)
-
-returns 100 Unicode characters, while: 
-
-  $fp = fopen('file.txt', 'wt');
-  $fwrite($fp, $uni)
-
-writes to a UTF-8 text file.
-
-If you mainly work with files in an encoding other than UTF-8, you can
-change the default context encoding setting:
-
-  stream_default_encoding('Shift-JIS');
-  $data = file_get_contents('file.txt', FILE_TEXT);
-  // work on $data
-  file_put_contents('file.txt', $data, FILE_TEXT);
-
-The file_get_contents() and file_put_contents() functions now accept an
-additional parameter, FILE_TEXT. If you provide FILE_TEXT for
-file_get_contents(), PHP returns a Unicode string. Without FILE_TEXT, PHP
-returns a binary string (which would be appropriate for true binary data, such
-as an image file). When writing a Unicode string with file_put_contents(), you
-must supply the FILE_TEXT parameter, or PHP generates a warning. 
-
-If you need to work with multiple encodings, you can create custom contexts
-using stream_context_create() and then pass in the custom context as an
-additional parameter. For example: 
-
-  $ctx = stream_context_create(NULL, array('encoding' => 'big5'));
-  $data = file_get_contents('file.txt', FILE_TEXT, $ctx);
-  // work on $data
-  file_put_contents('file.txt', $data, FILE_TEXT, $ctx);
-
-
-Conversion Semantics and Error Handling
-=======================================
-
-PHP can convert strings explicitly (casting) and implicitly (concatenation,
-comparison, and parameter passing. For example, when concatenating a Unicode
-string and a binary string, PHP converts the binary string to Unicode for better
-precision.
-
-However, not all characters can be converted between Unicode and legacy 
-encodings. The first possibility is that a string contains corrupt data or
-an illegal byte sequence. In this case, the converter simply stops with 
-a message that resembles:
-
-  Warning: Could not convert binary string to Unicode string
-  (converter UTF-8 failed on bytes (0xE9) at offset 2)
-
-Conversely, if a similar error occurs when attempting to convert Unicode to
-a legacy string, the converter generates a message that resembles:
-
-  Warning: Could not convert Unicode string to binary string
-  (converter ISO-8859-1 failed on character {U+DC00} at offset 2)
-
-To customize this behavior, refer to "Creating a Custom Error Handler" below.
-
-The second possibility is that a Unicode character simply cannot be represented
-in the legacy encoding. By default, when downconverting from Unicode, the
-converter substitutes any missing sequences with the appropriate substitution
-sequence for that codepage, such as 0x1A (Control-Z) in ISO-8859-1. When
-upconverting to Unicode, the converter replaces any byte sequence that has no
-Unicode equivalent with the Unicode substitution character (U+FFFD). 
-
-You can customize the conversion error behavior to:
-
-  - stop the conversion and return an empty string
-  - skip any invalid characters
-  - substitute invalid characters with a custom substitution character
-  - escape the invalid character in various formats
-
-To control the global conversion error settings, use the functions:
-
-  unicode_set_error_mode(int direction, int mode)
-  unicode_set_subst_char(unicode char)
-
-where direction is either FROM_UNICODE or TO_UNICODE, and mode is one of these
-constants:
-
-  U_CONV_ERROR_STOP
-  U_CONV_ERROR_SKIP 
-  U_CONV_ERROR_SUBST
-  U_CONV_ERROR_ESCAPE_UNICODE
-  U_CONV_ERROR_ESCAPE_ICU
-  U_CONV_ERROR_ESCAPE_JAVA
-  U_CONV_ERROR_ESCAPE_XML_DEC
-  U_CONV_ERROR_ESCAPE_XML_HEX
-
-As an example, with a runtime encoding of ISO-8859-1, the conversion:
-
-  $str = (binary)"< \u30AB >";
-
-results in:
-
-  MODE                    RESULT
-  --------------------------------------
-  stop                    ""
-  skip                    "<   >"
-  substitute              "< ? >"
-  escape (Unicode)        "< {U+30AB} >"
-  escape (ICU)            "< %U30AB >"
-  escape (Java)           "< \u30AB >"
-  escape (XML decimal)    "< &#12459; >"
-  escape (XML hex)        "< &#x30AB; >"
-
-With a runtime encoding of UTF-8, the conversion of the (illegal) sequence:
-
-  $str = (unicode)b"< \xe9\xfe >";
-
-results in:
-
-  MODE                    RESULT
-  --------------------------------------
-  stop                    ""
-  skip                    ""
-  substitute              ""
-  escape (Unicode)        "< %XE9%XFE >"
-  escape (ICU)            "< %XE9%XFE >"
-  escape (Java)           "< \xE9\xFE >"
-  escape (XML decimal)    "< &#233;&#254; >"
-  escape (XML hex)        "< &#xE9;&#xFE; >"
-
-The substitution character can be set only for FROM_UNICODE direction and has to
-exist in the target character set. The default substitution character is (?). 
-
-NOTE: Casting is just a shortcut for using unicode.runtime_encoding. To convert
-using an alternative encoding, use the unicode_encode() and unicode_decode()
-functions. For example,
-
-  $str = unicode_encode($uni, 'koi8-r', U_CONV_ERROR_SUBST);
-
-results in a binary KOI8-R encoded string. 
-
-Creating a Custom Error Handler
-------------------------------
-If an error occurs during the conversion, PHP outputs a warning describing the
-problem. Instead of this default behavior, PHP can invoke a user-provided error
-handler, similar to how the current user-defined error handler works.  To set
-the custom conversion error handler, call:
-
-  mixed unicode_set_error_handler(callback error_handler)
-
-The function returns the previously defined custom error handler. If no error
-handler was defined, or if an error occurs when returning the handler, this 
-function returns NULL.
-
-When the custom handler is set, the standard error handler is bypassed. It is
-the responsibility of the custom handler to output or log any messages, raise
-exceptions, or die(), if necessary. However, if the custom error handler returns
-FALSE, the standard handler will be invoked afterwards.
-
-The user function specified as the error_handler must accept five parameters:
-
-  mixed error_handler($direction, $encoding, $char_or_byte, $offset, 
-  $message)
-
-where:
-
-  $direction    - the direction of conversion, FROM_UNICODE/TO_UNICODE
-
-  $encoding     - the name of the encoding to/from which the conversion
-                  was attempted
-
-  $char_or_byte - either Unicode character or byte sequence (depending
-                  on direction) which caused the error
-
-  $offset       - the offset of the failed character/byte sequence in
-                  the source string
-
-  $message      - the error message describing the problem
-
-NOTE: If the error mode set by unicode_set_error_mode() is substitute, 
-skip, or escape, the handler won't be called, since these are non-error
-causing operations. To always invoke your handler, set the error mode to
-U_CONV_ERROR_STOP.
-
-
-Unicode String Type
-===================
-
-The Unicode string type (IS_UNICODE) is supposed to contain text data encoded in
-UTF-16. This 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 types.
-
-
-Binary String Type
-==================
-
-Binary string type (IS_STRING) serves two purposes: backwards compatibility and
-representing non-Unicode strings and binary data. When Unicode semantics switch
-is off, it is used for all strings in PHP, same in previous versions. When the
-switch is on, this type will be used to store text in other encodings as well as
-true binary data such as images, PDFs, etc.
-
-Printing binary data to the standard output passes it through as-is, independent
-of the output encoding.
-
-For examples of specifying binary string literals, refer to the section 
-"Language Modfications".
-
-Language Modifications
-======================
-
-If a Unicode switch is turned on, PHP string literals -- single-quoted,
-double-quoted, and heredocs -- become Unicode strings (IS_UNICODE type).  String
-literals support all the same escape sequences and variable interpolations as
-before, plus several new escape sequences.
-
-PHP interprets the contents of strings as follows:
-
-  - all non-escaped characters are interpreted as a corresponding Unicode
-    codepoint based on the current script encoding, e.g. ASCII 'a' (0x61) =>
-    U+0061, Shift-JIS (0x92 0x86) => 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. (Having two sequences avoids the ambiguity of \u020608 --
-    is that supposed to be U+0206 followed by "08", or U+020608 ?)
-    
-  - a new escape sequence allows specifying a character by its full
-    Unicode name, e.g. \C{THAI CHARACTER PHO SAMPHAO} => U+0E20
-
-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 PHP
-can handle literal chunks in the normal way as far as Unicode support is
-concerned.
-
-Since all string literals become Unicode by default, PHP 6 introduces new syntax
-for creating byte-oriented or binary strings. Prefixing a string literal with
-the letter 'b' creates a binary string:
-
-    $var = b'abc\001';
-    $var = b"abc\001";
-    $var = b<<<EOD
-      abc\001
-    EOD;
-
-The content of a binary string is the literal byte sequence inside the
-delimiters, which depends on the script encoding (unicode.script_encoding).
-Binary string literals support the same escape sequences as PHP 5 strings. If
-the Unicode switch is turned off, then the binary string literals generate the
-normal string (IS_STRING) type internally without any effect on the application.
-
-The string operators now accomodate the new IS_UNICODE and IS_BINARY types:
-
-  - The concatenation operator (.) and concatenation assignment operator (.=)
-    automatically coerce the IS_STRING type to the more precise IS_UNICODE if
-    the operands are of different string types.
-
-  - The string indexing operator [] now accommodates IS_UNICODE type strings 
-    and extracts the specified character. To support supplementary characters,
-    the index specifies a code point, not a byte or a code unit.
-
-  - 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). The
-    (string) operator casts to Unicode type if the Unicode semantics switch is
-    on, and to binary type otherwise.
-
-  - The comparison operators compare Unicode strings in binary code point 
-    order. They also coerce strings to Unicode if the strings are of different 
-    types.
-
-  - The arithmetic operators use the same semantics as today for converting
-    strings to numbers. A Unicode string is considered numeric if it
-    represents a long or a double number in the en_US_POSIX locale.
-
-
-Unicode Support in Existing Functions
-=====================================
-
-All functions in the PHP default distribution are undergoing analysis to 
-determine which functions need to be upgraded for native Unicode support. 
-You can track progress here:
-
-  http://www.php.net/~scoates/unicode/render_func_data.php
-
-Key extensions that are fully converted include:
-
-  * curl
-  * dom
-  * json
-  * mysql
-  * mysqli
-  * oci8
-  * pcre
-  * reflection
-  * simplexml
-  * soap
-  * sqlite
-  * xml
-  * xmlreader/xmlwriter
-  * xsl
-  * zlib
-
-NOTE: Unsafe functions might still work, since PHP performs Unicode conversions
-at runtime. However, unsafe functions might not work correctly with multibyte
-binary strings, or Unicode characters that are not representable in the
-specified unicode.runtime_encoding. 
-
-
-Identifiers
-===========
-
-Since 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. 
-
-
-Numbers
-=======
-
-Unlike identifiers, numbers must consist only of ASCII digits,.and are
-restricted to the en_US_POSIX or C locale. In other words, numbers have no
-thousands separator, and the fractional separator is (.) "full stop".  Numeric
-strings adhere to the same rules, so "10,3" is not interpreted as a number even
-if the current locale's fractional separator is a comma.
-
-TextIterators
-=============
-
-Instead of using the offset operator [] to access characters in a linear
-fashion, use a TextIterator instead. TextIterator is very fast and enables you
-to iterate over code points, combining sequences, characters, words, lines, and
-sentences, both forward and backward. For example:
-
-  $text = "nai\u308ve";  
-  foreach (new TextIterator($text) as $u) {
-      var_inspect($u)
-  }
-
-lists six code points, including the umlaut (U+0308) as a separate code point.
-Instantiating the TextIterator to iterate over characters,
-
-  $text = "nai\u308ve";  
-  foreach (new TextIterator($text, TextIterator::CHARACTER) as $u) {
-      var_inspect($u)
-  }
-
-lists five characters, including an "i" with an umlaut as a single character.
-
-Locales
-=======
-
-Unicode support in PHP relies exclusively on ICU locales, NOT the POSIX locales
-installed on the system. You may access the default ICU locale using:
-
-  locale_set_default()
-  locale_get_default()
-
-ICU locale IDs have a somewhat different format from POSIX locale IDs. The ICU
-syntax is:
-
-  <language>[_<script>]_<country>[_<variant>][@<keywords>]
-
-For example, sr_Latn_YU_REVISED@currency=USD is Serbian (Latin, Yugoslavia,
-Revised Orthography, Currency=US Dollar).
-
-Do not use the deprecated setlocale() function. This function interacts with the
-POSIX locale. If Unicode semantics are on, using setlocale() generates
-a deprecation warning.
-
-Document TODO
-==========================================
- Final review.
- Fix the HTTP Input Encoding section, that's obsolete now.
-
-
-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>
-  Evan Goer <goer@yahoo-inc.com>
-
-vim: set et tw=80 :
@@ -1,806 +0,0 @@
-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.
-
-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.
-
-
-Zval Structure Changes
-======================
-
-For IS_UNICODE type, we add another structure to the union:
-
-    union {
-    ....
-        struct {
-            UChar *val;            /* Unicode string value */
-            int len;               /* number of UChar's */
-        } ustr;
-    ....
-    } value;
-
-This cleanly separates the two types of strings and helps preserve backwards
-compatibility.
-
-To optimize access to IS_STRING and IS_UNICODE storage at runtime, we need yet
-another structure:
-
-    union {
-    ....
-        struct {                    /* Universal string type */
-            zstr val;
-            int len;
-        } uni;
-    ....
-    } value;
-
-Where zstr is a union of char*, UChar*, and void*.
-
-
-Parameter Parsing API Modifications
-===================================
-
-There are now five new specifiers: 'u', 't', 'T', 'U', 'S', 'x' and a new '&'
-modifier.
-
-  't' specifier
-  -------------
-  This specifier indicates that the caller requires the incoming parameter to be
-  string data (IS_STRING, IS_UNICODE). 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 Unicode string */
-    } else {
-       /* process binary string */
-    }
-
-  For IS_STRING type, 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 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.
-
-    UChar *str;
-    int len;
-
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "u", &str, &len) == FAILURE) {
-        return;
-    }
-    /* process Unicode string */
-
-
-  '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.
-
-  If at least one of the 'T' parameters is of Unicode type, then the rest of
-  them are converted to IS_UNICODE. Otherwise all 'T' parameters are conveted 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 binary string, str2 is guaranteed to be the same */
-    }
-
-
-   'x' specifier
-   -------------
-   This specifier acts as either 'u' or 's', depending on the value of the
-   unicode semantics switch. If UG(unicode) is on, it behaves as 'u', and as
-   's' otherwise.
-
-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. The '&' modifier can be used after 's' specifier to force
-a different converter instead.
-
-    char *str;
-    int len;
-
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&", &str, &len, UG(utf8_conv)) == FAILURE) {
-        return;
-    }
-    /* here str is in UTF-8, if a Unicode string was passed in */
-
-The 'U' and 'S' specifiers are similar to 'u' and 's' but they are more strict
-about the type of the passed-in parameter. If 'U' is specified and the binary
-string is passed in, the engine will issue a warning instead of doing automatic
-conversion. The converse applies to the 'S' specifier.
-
-
-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 is a new string types: IS_UNICODE.
-This has its own storage in the value union part of
-zval (value.ustr) while non-unicode (binary) strings reuse the
-IS_STRING type and the value.str element of the zval.
-
-New macros exist (parallel to Z_STRVAL/Z_STRLEN) for accessing unicode strings.
-
-Z_USTRVAL(), Z_USTRLEN()
- - accesses the value (as a UChar*) and length (in code units) of the Unicode type string
-   value.ustr.val   value.ustr.len
-
-Z_UNIVAL(), Z_UNILEN()
- - accesses the value (as a zstr) and length (in type-appropriate units)
-   value.uni.val    value.uni.len
-
-Z_USTRCPLEN()
- - gives the number of codepoints (not units) in the Unicode type string
-   This macro examines the actual string taking into account Surrogate Pairs
-   and returns the number of UChar32(UTF32) codepoints which may be less than the
-   number of UChar(UTF16) codeunits found in the string buffer.
-   If this value will be used repeatedly, consider storing it in a local variable
-   to avoid having to reexamine the string every time.
-
-
-ZVAL_* macros
-------------
-
-The 'dup' parameter to the ZVAL_STRING()/RETVAL_STRING()/RETURN_STRING() type
-macros has been extended slightly.  The following defines are now encouraged instead:
-
-#define ZSTR_DUPLICATE (1<<0)
-#define ZSTR_AUTOFREE  (1<<1)
-
-ZSTR_DUPLICATE (which has a resulting value of 1) serves the same purpose as a
-truth value in old-style 'dup' flags.  The value of 1 was specifically chosen
-to match the common practice of passing a 1 for this parameter.
-Warning: If you find extension code which uses a truth value other than one for
-the dup flag, its logic should be modified to explicitly pass ZSTR_DUPLICATE instead.
-
-ZSTR_AUTOFREE is used with macros such as ZVAL_RT_STRING which may populate Unicode
-zvals from non-unicode source strings.  When UG(unicode) is on, the source string
-will be implicitly copied (to make a UChar* version).  If the original string
-needed copying anyway this is fine.  However if the original string was emalloc()'d
-and would have ordinarily been given to the engine (i.e. RETURN_STRING(estrdup("foo"), 0))
-then it will need to be freed in UG(unicode) mode to avoid leaking.
-The ZSTR_AUTOFREE flag ensures that the original string is freed in UG(unicode) mode.
-
-ZVAL_UNICODE(pzv, str, dup), ZVAL_UNICODEL(pzv, str, str_len, dup)
- - Sets zval to hold a Unicode string. Takes the same parameters as
-   Z_STRING(), Z_STRINGL().
-
-ZVAL_U_STRING(conv, pzv, str, dup), ZVAL_U_STRINGL(conv, pzv, str, str_len, dup)
- - When UG(unicode) is off, it's equivalent to Z_STRING(), ZSTRINGL()
-   and the conv parameter is ignored.
-   When UG(unicode) is on, it sets zval to hold a Unicode representation of the
-   passed-in string using the UConverter* specified by conv.
-   Since a new string is always created in this case, passing ZSTR_DUPLICATE
-   for 'dup' does not matter, but ZSTR_AUTOFREE will be used will be used to
-   efree the original value
-
-ZVAL_RT_STRING(pzv, str, dup), ZVAL_RT_STRINGL(pzv, str, str_len, dup)
- - 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, passing ZSTR_DUPLICATE
-   for 'dup' does not matter, but ZSTR_AUTOFREE will be used will be used to
-   efree the original value
-
-ZVAL_ASCII_STRING(pzv, str, dup), ZVAL_ASCII_STRINGL(pzv, str, str_len, dup)
- - 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 an ASCII converter and sets zval to it.
-   Since a new string is always created in this case, passing ZSTR_DUPLICATE
-   for 'dup' does not matter, but ZSTR_AUTOFREE will be used will be used to
-   efree the original value
-
-ZVAL_UTF8_STRING(pzv, str, dup), ZVAL_UTF8_STRINGL(pzv, str, str_len, dup)
- - 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 a UTF8 converter and sets zval to it.
-   Since a new string is always created in this case, passing ZSTR_DUPLICATE
-   for 'dup' does not matter, but ZSTR_AUTOFREE will be used will be used to
-   efree the original value
-
-ZVAL_ZSTR(pzv, type, zstr, dup), ZVAL_ZSTRL(pzv, type, zstr, zstr_len, dup)
- - This macro uses 'type' to switch between calling ZVAL_STRING(pzv, zstr.s, dup)
-   and ZVAL_UNICODE(pzv, zstr.u, dup).  No conversion happens so the
-   presense of absense of ZSTR_AUTOFREE is ignored.
-
-ZVAL_TEXT(pzv, zstr, dup), ZVAL_TEXTL(pzv, zstr, zstr_len, dup)
- - 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 be certain
-   that the string passed in matches the type expected by UG(unicode).
-   One example of its usage would be to initialize zval to hold the name
-   of a user function.
-
-ZVAL_EMPTY_UNICODE(pzv) / ZVAL_EMPTY_TEXT(pzv)
- - These macros work identically to ZVAL_EMPTY_STRING() with the UNICODE
-   version always generating an IS_UNICODE zval, and the TEXT version
-   generating a UG(unicode) dependent string type.
-
-ZVAL_UCHAR32(pzv, char)
- - Converts the character provided into a UChar string (which may potentially
-   be 1 or 2 characters long in the case of surrogate pairs) and dispatches
-   to ZVAL_UNICODEL().
-
-
-As usual, for each ZVAL_* macro, there is a matching RETVAL_* and RETURN_* macro.
-
-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_unicode_with_converter(zval *op, UConverter *conv)
- - converts a zval to Unicode string using the specified converter, if
-   necessary.
-
-convert_to_unicode(zval *op)
- - converts a zval to Unicode string.
-
-convert_to_string(zval *op)
- - Behaves just as it currently does, converting to IS_STRING type
-
-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(zstr) can be used to free a UChar* string safely, since it checks for
-NULL argument. USTR_LEN() takes a zstr as its argument, and
-depending on the UG(unicode) value, and returns its strlen() or u_strlen().
-
-Array Manipulation
------------------
-
-The add_next_index_*(), add_index_*() and add_assoc_*() functions have been
-significantly expanded both to allow for the unicode type as a value and to
-permit various types of keys.
-
-Values: In the following examples, {1} represents a placeholder for the keytype and
-its arguments (covered later).
-
-add_{1}_unicode(zval *arr, {1}, UChar *ustr, int dup);
-add_{1}_unicodel(zval *arr, {1}, UChar *ustr, int ustr_len, int dup);
- - Works like add_{1}_string() and add_{1}_stringl() but takes a UChar* value
-   and adds an IS_UNICODE type.
-
-add_{1}_rt_string(zval *arr, {1}, char *str, int dup);
-add_{1}_rt_stringl(zval *arr, {1}, char *str, int str_len, int dup);
- - Works like add_{1}_string() and add_{1}_stringl() but converts the char*
-   value to Unicode using runtime encoding when UG(unicode) is on.
-
-add_{1}_ascii_string(zval *arr, {1}, char *str, int dup);
-add_{1}_ascii_stringl(zval *arr, {1}, char *str, int str_len, int dup);
- - Works like add_{1}_rt_string() and add_{1}_rt_stringl() but uses
-   an ASCII converter rather than runtime encoding.
-
-add_{1}_utf8_string(zval *arr, {1}, char *str, int dup);
-add_{1}_utf8_stringl(zval *arr, {1}, char *str, int str_len, int dup);
- - Works like add_{1}_rt_string() and add_{1}_rt_stringl() but uses
-   a UTF8 converter rather than runtime encoding.
-
-add_{1}_text(zval *arr, {1}, zstr str, int dup);
-add_{1}_textl(zval *arr, {1}, zstr str, int str_len, int dup);
- - Wrapper which dispatches to add_{1}_string(l)() or add_{1}_unicode(l)()
-   depending on the setting of UG(unicode).
-
-add_{1}_zstr(zval *arr, {1}, zend_uchar type, zstr str, int dup);
-add_{1}_zstrl(zval *arr, {1}, zend_uchar type, zstr str, int str_len, int dup);
- - Works like add_{1}_text() and add_{1}_textl(), but dispatches based on 'type'.
-
-
-Keys: In the following example, the zval* type is used for values, however
-each of the value types (including those listed above) are supported.
-
-The existing key types work as they always have:
-  add_next_index_zval(zval *arr, zval *val);
-  add_index_zval(zval *arr, long idx, zval *val);
-  add_assoc_zval(zval *arr, char *key, zval *val);
-  add_assoc_zval_ex(zval *arr, char *key, int key_len, zval *val);
-   . Associative keys are considered binary (IS_STRING)
-   . Remember that key_len includes the terminating NULL
-
-The following additional methods provide unicode capable keytypes:
-
-add_u_assoc_zval(zval *arr, zend_uchar type, zstr key, zval *val);
-add_u_assoc_zval_ex(zval *arr, zend_uchar type, zstr key, int key_len, zval *val);
- . When type==IS_STRING, these behave identically to their
-   add_assoc_zval() and add_assoc_zval_ex() counterparts.
-   When type==IS_STRING, the key is considered to be Unicode (UChar*).
-
-add_rt_assoc_zval(zval *arr, char *key, zval *val);
-add_rt_assoc_zval_ex(zval *arr, char *key, int key_len, zval *val);
- . When UG(unicode) is off, these behave identically to their
-   add_assoc_zval() and add_assoc_zval_ex() counterparts.
-   When UG(unicode) is on, key is converted to Unicode using runtime encoding.
-
-add_ascii_assoc_zval(zval *arr, char *key, zval *val);
-add_ascii_assoc_zval_ex(zval *arr, char *key, int key_len, zval *val);
- . When UG(unicode) is off, these behave identically to their
-   add_assoc_zval() and add_assoc_zval_ex() counterparts.
-   When UG(unicode) is on, key is converted to Unicode using an ASCII converter.
-
-add_utf8_assoc_zval(zval *arr, char *key, zval *val);
-add_utf8_assoc_zval_ex(zval *arr, char *key, int key_len, zval *val);
- . When UG(unicode) is off, these behave identically to their
-   add_assoc_zval() and add_assoc_zval_ex() counterparts.
-   When UG(unicode) is on, key is converted to Unicode using a UTF8 converter.
-
-
-Keytype and Valuetype specification may be mixed in any combination, for example:
-add_utf8_assoc_ascii_stringl_ex(zval *arr, char *key, int key_len, char *val, int val_len, int dup);
-
-
-Miscellaneous
-------------
-
-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 the number of code units (UChar -- UTF16).
-To obtain the number of code points, one can use u_countChar32() 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.
-
-	zend_zstrndup(type, zstr, length)
-
-
-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.
-
-A new HASH_KEY constant has been added for differentiating key types:
- . HASH_KEY_IS_UNICODE
-
-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.
-
-
-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);
-    spprintf(&utf8_buffer, 0, "%*r", UG(utf8_conv), 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);
-
-  %Z
-    This format prints a zval's value. You can specify the minimum length
-    of the string representation using "%*Z" as well as the absolute length
-    using "%.*Z". The following example is taken from the engine and
-    therefor uses zend_spprintf rather than spprintf. Further more clen is
-    an integer that is smaller than Z_UNILEN_P(callable).
-
-    zend_spprintf(error, 0, "class '%.*Z' not found", clen, callable);
-
-    The function allows to output any kind of zval values, as long as a
-    string (or unicode) conversion is available. Note that printing non
-    string zvals outside of request time is not possible.
-
-Since [v]spprintf() can only output native strings there are also the new
-functions [v]uspprintf() and [v]zspprintf() that create unicode strings and
-return the number of characters printed. That is they return the length rather
-than the byte size. The second pair of functions also takes an additional type
-parameter that allows to create a string of arbitrary type. The following
-example illustrates the use. Assume it fetches a unicode/native string into
-path, path_len and path_type inorder to create sub_name, sub_len and sub_type.
-
-	zstr path, sub_name;
-	int path_len, sub_len;
-	zend_uchar path_type, sub_type;
-
-	/* fetch */
-
-	if (path.v) {
-		sub_type = path_type;
-		sub_len = zspprintf(path_type, &sub_name, 0, "%R%c%s",
-			path_type, path,
-			DEFAULT_SLASH,
-			entry.d_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.
-
-    zstr str;
-    int 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 zstr, 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.u, 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(str.u, end, str_len, f);
-        start = end;
-        U16_FWD_N(str.u, end, str_len, l);
-        RETURN_UNICODEL(str.u + start, end-start, ZSTR_DUPLICATE);
-
-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(str.s + f, l, ZSTR_DUPLICATE);
-    }
-
-For native strings, 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).
-
-
-realpath()
----------
-
-Filenames use their own converter as it's not uncommon, for example,
-to need to access files on a filesystem with latin1 entries while outputting
-UTF8 runtime content.
-
-The most common approach to parsing filenames can be found in realpath():
-
-zval **ppfilename;
-char *filename;
-int filename_len;
-
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &ppfilename) == FAILURE ||
-	php_stream_path_param_encode(ppfilename, &filename, &filename_len, REPORT_ERRORS, FG(default_context)) == FAILURE) {
-	return;
-}
-
-Here, the filename is taken first as a generic zval**, then converted (separating if necessary)
-and populated into local char* and int storage.  The filename will be converted according to
-unicode.filesystem_encoding unless the wrapper specified overrides this with its own conversion
-function (The http:// wrapper, for example, enforces utf8 conversion).
-
-
-rmdir()
-------
-
-If the function accepts a context parameter, then this context should be used in place of FG(default_context)
-
-zval **ppdir, *zcontext = NULL;
-char *dir;
-int dir_len;
-
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|r", &ppdir, &zcontext) == FAILURE) {
-	return;
-}
-
-context = php_stream_context_from_zval(zcontext, 0);
-if (php_stream_path_param_encode(ppdir, &dir, &dir_len, REPORT_ERRORS, context) == FAILURE) {
-	return;
-}
-
-
-sqlite_query()
--------------
-
-If the function's underlying library expects a particular encoding (i.e. UTF8), then the alternate form of
-the string parameter may be used with zend_parse_parameters().
-
-char *sql;
-int sql_len;
-
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&", &sql, &sql_len, UG(utf8_conv)) == FAILURE) {
-    return;
-}
-
-Converters
-==========
-
-Standard Converters
-------------------
-
-The following converters (UConverter*) are initialized by Zend and are always available (regardless of UG(unicode) mode):
-  UG(utf8_conv)
-  UG(ascii_conv)
-  UG(fallback_encoding_conv) - UTF8 unless overridden by INI setting unicode.fallback_encoding
-
-Additional converters will be optionally initialized depending on INI settings:
-  UG(runtime_encoding_conv) - unicode.runtime_encoding
-   . Unicode output generated by a script will be encoding using this converter
-
-  UG(script_encoding_conv) - unicode.script_encoding
-   . Scripts read from disk will be decoded using this converter
-
-  UG(filesystem_encoding_conv) - unicode.filesystem_encoding
-   . Filenames and paths will be encoding using this converter
-
-
-Since these additional converters may not be instatiated (because their INI value is not set), all uses of these converters must
-be wrapped in ZEND_U_CONVERTER() for safety.  If the converter hasn't been instantiated, then UG(fallback_encoding_conv) will be
-used instead.
-
-For example, RETURN_RT_STRING("foo", ZSTR_DUPLICATE); expands out to:
-  RETURN_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), "foo", ZSTR_DUPLICATE);
-
-Which uses UG(runtime_encoding_conv) if it's been set, otherwise using UG(fallback_encoding_conv).
-
-Note that the INI setting unicode.stream_encoding does not instantiate a UConverter* automatically for use by the process/thread,
-it stores the value as a string for use during fopen() style calls where a UConverter* is instantiated for that particular stream.
-
-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,170 @@
+PHP 5.2 UPDATE INFO
+
+===============================
+Changes in PHP datetime support
+===============================
+
+Since PHP 5.1, there has been an extension named 'date' in the PHP core. This
+is the new implementation of PHP's datetime support. Although it will attempt
+to guess your system's timezone setting, you should set the timezone manually.
+You can do this in any of three ways:
+
+1) in your php.ini using the date.timezone INI directive
+2) on your system using the TZ environmental variable
+3) from your script using the convenience function date_default_timezone_set()
+
+All supported timezones are listed in the PHP Manual at
+http://www.php.net/manual/timezones.php.
+
+With the advent of PHP 5.2, there are object representations of the date and
+timezone, named DateTime and DateTimeZone respectively. You can see the methods
+and constants available to the new classes by running
+
+php --rc DateTime
+php --rc DateTimeZone
+
+under PHP CLI. All methods map to existing procedural date functions.
+
+==================================
+Items from the NEWS file explained
+==================================
+
+- Added new error mode E_RECOVERABLE_ERROR. (Derick, Marcus, Tony)
+
+  Some of the existing E_ERROR conditions have been converted to something that
+  you can catch with a user-defined error handler. If an E_RECOVERABLE_ERROR is
+  not handled, it will behave in the same way as E_ERROR behaves in all versions
+  of PHP. Errors of this type are logged as 'Catchable fatal error'.
+
+
+- Changed E_ALL error reporting mode to include E_RECOVERABLE_ERROR. (Marcus)
+
+  This change means that the value of the E_ALL error_reporting constant is now
+  6143, where its previous value was 2047. If you are setting the error_reporting
+  mode from either the Apache config file or the .htaccess files, you will need
+  to adjust the value accordingly. The same applies if you use the numeric value
+  rather than the constant in your PHP scripts.
+
+
+- Added support for constructors in interfaces to force constructor signature
+  checks in implementations. (Marcus)
+
+  Starting with PHP 5.2, interfaces can have constructors. However, if you choose
+  to declare a constructor in an interface, each class implementing that interface
+  MUST include a constructor with a signature matching that of the base interface
+  constructor. By 'signature' we mean the parameter and return type definitions,
+  including any type hints and including whether the data is passed by reference
+  or by value.
+
+
+- Changed __toString to be called wherever applicable. (Marcus)
+
+  The magic method __toString() will now be called in a string context, that
+  is, anywhere an object is used as a string. When implementing your __toString()
+  method in a class, you should be aware that the script will terminate if
+  your function throws an exception.
+
+  The PHP 5.0/5.1 fallback - returning a string that contains the object
+  identifier - has been dropped in PHP 5.2. It became problematic because
+  an object identifier cannot be considered unique. This change will mean
+  that your application is flawed if you have relied on the object identifier
+  as a return value. An attempt to use that value as a string will now result
+  in a catchable fatal error (see above).
+
+  Even with __toString(), objects cannot be used as array indices or keys. We
+  may add built-in hash support for this at a later date, but for PHP 5.2 you
+  will need to either provide your own hashing or use the new SPL function
+  spl_object_hash().
+
+
+- Added RFC2397 (data: stream) support. (Marcus)
+
+  The introduction of the 'data' URL scheme has the potential to lead to a
+  change of behaviour under Windows. If you are working with an NTFS
+  filesystem and making use of meta streams in your application, and if you
+  just happen to be using a file with the name 'data:' that is accessed without
+  any path information - it won't work any more. The fix is to use the 'file:'
+  protocol when accessing it.
+
+  There is information about the RFC at http://www.faqs.org/rfcs/rfc2397.html.
+
+
+- Added allow_url_include ini directive to complement allow_url_fopen. (Rasmus)
+
+  This useful option makes it possible to differentiate between standard
+  file operations on remote files, and the inclusion of remote files. While the
+  former is usually desirable, the latter can be a security risk if used naively.
+  Starting with PHP 5.2, you can allow remote file operations while
+  disallowing the inclusion of remote files in local scripts. In fact, this
+  is the default configuration.
+
+
+- Dropped abstract static class functions. (Marcus)
+
+  Due to an oversight, PHP 5.0 and 5.1 allowed abstract static functions in
+  classes. In PHP 5.2, only interfaces can have them.
+
+
+- Removed extensions (Derick, Tony)
+
+  The filepro and hwapi extensions have been moved to PECL and are no longer
+  part of the PHP distribution. The PECL package version of these extensions
+  will be created on the basis of user demand.
+
+
+- Added extensions (Rasmus, Derick, Pierre)
+
+  The JSON extension implements the JavaScript Object Notation (JSON)
+  data interchange format. This extension is enabled by default.
+
+  The Filter extension validates and filters data, and is designed for
+  use with insecure data such as user input. This extension is enabled
+  by default; the default mode RAW does not impact input data in any way.
+
+  The Zip extension enables you to transparently read or write ZIP
+  compressed archives and the files inside them.
+
+  Please refer to the PHP Manual for details.
+
+
+- Improved memory manager and increased default memory limit (Dmitry)
+
+  The new memory manager allocates less memory and works faster than the
+  previous incarnation. It allocates memory from the system in large blocks,
+  and then manages the heap by itself. The memory_limit value in php.ini is
+  checked, not for each emalloc() call (as before), but for actual blocks
+  requested from the system. This means that memory_limit is far more
+  accurate than it used to be, since the old memory manager didn't calculate
+  all the memory overhead used by the malloc library.
+
+  Thanks to this new-found accuracy memory usage may appear to have increased,
+  although actually it has not. To accommodate this apparent increase, the
+  default memory_limit setting was also increased - from 8 to 16 megabytes.
+
+
+- Changed priority of PHPRC environment variable on win32 (Dmitry)
+
+  The PHPRC environment variable now takes priority over the path stored
+  in the Windows registry.
+
+
+- Added notice when accessing return value from __get() in write mode (Marcus)
+
+  The reason for this is that __get() only returns variables in read mode, and
+  it is therefore not possible to write to the returned variable. In previous
+  releases there was no effective way to detect incorrect usage. Starting from
+  PHP 5.2, an E_NOTICE will be emitted in this situation.
+
+  WARNING: foreach() and functions that modify the internal array pointer will
+  now also trigger the same E_NOTICE, since modification requires that the
+  variable be accessed in write mode. To work around this, you should either
+  cast the returned value from __get() to an array, or use SPL's ArrayObject
+  instead of an array.
+
+- CLI SAPI no longer checks cwd for php.ini or the php-cli.ini file (Edin)
+
+  In PHP 5.1.X an undocumented feature was added that made the CLI binary
+  check the current directory for PHP configuration file possibly leading to
+  unpredictable behavior due to an un-expected configuration file being
+  read. This functionality was removed in 5.2 and PHP will no longer search
+  CWD for the presence of the php.ini or the php-cli.ini files.
@@ -1,172 +0,0 @@
-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_POST_FILES =& $_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

@@ -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?
-
@@ -11,9 +11,6 @@ Zend
    * 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)
-    * Port safe-allocation functions from 5.3 (zend_alloc.[ch])


 global
@@ -32,6 +29,8 @@ global
      of compliance.
    * see what functions might need to be changed to use HashPosition, so
      that the internal array pointer is not affected.
+    * Move most extensions and PEAR packages out of the PHP CVS tree,
+      include them again during release packaging.

    Other
    * use thread-safe resolver functions (either require BIND 8 or adns).
@@ -65,14 +64,6 @@ documentation
    * 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.
@@ -2,4 +2,3 @@ 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)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Thread Safe Resource Manager                                         |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2009, 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)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Thread Safe Resource Manager                                         |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2009, 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

@@ -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 */
@@ -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 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP Version 6                                                        |
+   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 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        |
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP Version 6                                                        |
+   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 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        |
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP Version 6                                                        |
+   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 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,11 +63,6 @@ typedef unsigned short mode_t;
 #define IS_SLASH_P(c)	(*(c) == '/' || \
        (*(c) == '\\' && !IsDBCSLeadByte(*(c-1))))

-#define DEFAULT_U_SLASH ((UChar)0x5c) /*'\\'*/
-#define DEFAULT_U_DIR_SEPARATOR	((UChar)0x3b) /*';'*/
-#define IS_U_SLASH(c)	((UChar32)(c) == (UChar32)0x2f /*'/'*/ || (UChar32)(c) == (UChar32)0x5c /*'\\'*/)
-#define IS_U_SLASH_P(c)	IS_SLASH(*(c))
-
 /* COPY_WHEN_ABSOLUTE is 2 under Win32 because by chance both regular absolute paths
   in the file system and UNC paths need copying of two characters */
 #define COPY_WHEN_ABSOLUTE(path) 2
@@ -85,12 +80,6 @@ typedef unsigned short mode_t;
 #define DEFAULT_DIR_SEPARATOR	';'
 #define IS_SLASH(c)	((c) == '/' || (c) == '\\')
 #define IS_SLASH_P(c)	IS_SLASH(*(c))
-
-#define DEFAULT_U_SLASH ((UChar)0x2f) /*'/'*/
-#define DEFAULT_U_DIR_SEPARATOR	((UChar)0x3b) /*';'*/
-#define IS_U_SLASH(c)	((UChar32)(c) == (UChar32)0x2f /*'/'*/ || (UChar32)(c) == (UChar32)0x5c /*'\\'*/)
-#define IS_U_SLASH_P(c)	IS_U_SLASH(*(c))
-
 /* Colon indicates volume name, either first character should be forward slash or backward slash */
 #define IS_ABSOLUTE_PATH(path, len) \
    ((strchr(path, ':') != NULL) || ((len >= 1) && ((path[0] == '/') || (path[0] == '\\'))))
@@ -104,18 +93,12 @@ typedef unsigned short mode_t;

 #ifdef __riscos__
 #define DEFAULT_DIR_SEPARATOR  ';'
-#define DEFAULT_U_DIR_SEPARATOR	((UChar)0x3b) /*';'*/
 #else
 #define DEFAULT_DIR_SEPARATOR  ':'
-#define DEFAULT_U_DIR_SEPARATOR	((UChar)0x3a) /*':'*/
 #endif

-#define IS_SLASH(c)		((c) == '/')
-#define IS_SLASH_P(c)	IS_SLASH(*(c))
-
-#define DEFAULT_U_SLASH ((UChar)0x2f) /*'/'*/
-#define IS_U_SLASH(c)	((UChar32)(c) == (UChar32)0x2f /*'/'*/)
-#define IS_U_SLASH_P(c)	IS_U_SLASH(*(c))
+#define IS_SLASH(c)	((c) == '/')
+#define IS_SLASH_P(c)	(*(c) == '/')

 #endif

@@ -134,21 +117,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(const char *path, struct stat *buf);
-#else
-# define php_sys_stat stat
+#define CWD_API
 #endif

 typedef struct _cwd_state {
@@ -197,6 +172,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
@@ -205,17 +184,8 @@ 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);

-CWD_API char *tsrm_realpath(const char *path, char *real_path TSRMLS_DC);
-
 #define REALPATH_CACHE_TTL  (2*60) /* 2 minutes */
 #define REALPATH_CACHE_SIZE 0      /* disabled while php.ini isn't loaded */

@@ -225,14 +195,7 @@ 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;	
 } realpath_cache_bucket;

@@ -252,13 +215,6 @@ 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 
@@ -279,7 +235,7 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
 #define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
 #define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
 #if !defined(TSRM_WIN32)
-# define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
+#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)
@@ -305,17 +261,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)
@@ -328,16 +278,19 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
 #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)
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP Version 6                                                        |
+   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 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,279 +84,15 @@ TSRM_API void tsrm_win32_shutdown(void)
 #endif
 }

-char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC)
-{
-	PSID pSid = TWG(impersonation_token_sid);
-	DWORD sid_len = pSid ? GetLengthSid(pSid) : 0;
-	TCHAR *ptcSid = NULL;
-	char *bucket_key = NULL;
-
-	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)
 {
-	time_t t;
-	HANDLE thread_token;
-	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;
-
-	TSRMLS_FETCH();
+	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(real_path != NULL) {
-			free(real_path);
-			real_path = NULL;
-		}
-
-		if(fAccess == FALSE) {
-			errno = EACCES;
-			return errno;
-		} else {
-			return 0;
-		}
+		return access(pathname, mode);
 	}
 }

@@ -384,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)++;
@@ -411,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;
@@ -426,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)++;
@@ -454,48 +171,23 @@ TSRM_API FILE *popen(const char *command, const char *type)
 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;
-
+	process_pair *proc;
 	TSRMLS_FETCH();

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

@@ -504,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);
@@ -516,43 +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);
-	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) {
+	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;
 	}
+	free(cmd);

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

@@ -573,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);
@@ -601,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);
@@ -609,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);
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP Version 6                                                        |
+   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 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,7 +88,6 @@ 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);
@@ -99,7 +96,6 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 TSRM_API FILE *popen(const char *command, const char *type);
 TSRM_API int pclose(FILE *stream);
 TSRM_API int tsrm_win32_access(const char *pathname, int mode);
-TSRM_API int win32_utime(const char *filename, struct utimbuf *buf);

 TSRM_API int shmget(int key, int size, int flags);
 TSRM_API void *shmat(int key, const void *shmaddr, int flags);
@@ -0,0 +1,548 @@
+$Id$
+
+UPGRADE NOTES - PHP 5.1
+
+1. Changes in reference handling
+     a. Overview
+     b. Code that worked under PHP 4.3, but now fails
+     c. Code that was valid under PHP 4.3, but now throws an error
+     d. Code that failed under PHP 4.3, but now works
+     e. Code that 'should have worked' under PHP 5.0
+     f. Warnings that came and went
+2. Reading []
+3. instanceof, is_a(), is_subclass_of(), catch
+4. Integer values in function parameters
+5. Abstract private methods
+6. Access modifiers in interfaces
+7. Changes in inheritance rules
+8. Class constants
+9. Extensions
+     a. Extensions that are gone from the PHP core
+     b. Class constants in new PHP 5.1 extensions
+10. Date/time support
+11. Changes in database support
+     a. PDO overview
+     b. Changes in MySQL support
+     c. Changes in SQLite support
+12. Further migration information
+13. Checking for E_STRICT errors
+
+===============================================================================
+
+1. Changes in reference handling
+================================
+
+1a. Overview
+============
+
+From the PHP script writer's point of view, the change most likely to impact
+legacy code is in the way that references are handled in all PHP versions
+post-dating the PHP 4.4.0 release.
+
+Until and including PHP 4.3, it was possible to send, assign or return variables
+by reference that should really be returned by value, such as a constant, a
+temporary value (e.g. the result of an expression), or the result of a function
+that had itself been returned by value, as here:
+
+<?php
+
+$foo = "123";
+
+function return_value() {
+    global $foo;
+    return $foo;
+}
+
+$bar = &return_value();
+
+?>
+
+Although this code would usually work as expected under PHP 4.3, in the general
+case the result is undefined. The Zend Engine could not act correctly on these
+values as references. This bug could and did lead to various hard-to-reproduce
+memory corruption problems, particularly where the code base was large.
+
+In PHP 4.4.0, PHP 5.0.4 and all subsequent PHP releases, the Engine was fixed
+to 'know' when the reference operation is being used on a value that should
+not be referenced. The actual value is now used in such cases, and a warning
+is emitted. The warning takes the form of an E_NOTICE in PHP 4.4.0 and up,
+and E_STRICT in PHP 5.0.4 and up.
+
+Code that could potentially produce memory corruption can no longer do so.
+However, some legacy code might work differently as a result.
+
+1b. Code that worked under PHP 4.3, but now fails
+=================================================
+
+<?php
+
+function func(&$arraykey) {
+    return $arraykey; // function returns by value!
+}
+
+$array = array('a', 'b', 'c');
+foreach (array_keys($array) as $key) {
+    $y = &func($array[$key]);
+    $z[] =& $y;
+}
+
+var_dump($z);
+
+?>
+Running the above script under any version of PHP that pre-dates the reference
+fix would produce this output:
+
+array(3) {
+  [0]=>
+  &string(1) "a"
+  [1]=>
+  &string(1) "b"
+  [2]=>
+  &string(1) "c"
+}
+
+Following the reference fix, the same code would result in:
+
+array(3) {
+  [0]=>
+  &string(1) "c"
+  [1]=>
+  &string(1) "c"
+  [2]=>
+  &string(1) "c"
+}
+
+This is because, following the changes, func() assigns by value. The value
+of $y is re-assigned, and reference-binding is preserved from $z. Prior
+to the fix, the value was assigned by reference, leading $y to be
+re-bound on each assignment. The attempt to bind to a temporary value
+by reference was the cause of the memory corruption.
+
+Such code can be made to work identically in both the pre-fix and the
+post-fix PHP versions. The signature of func() can be altered to return
+by reference, or the reference assignment can be removed from the result
+of func().
+
+<?php
+
+function func() {
+    return 'function return';
+}
+
+$x = 'original value';
+$y =& $x;
+$y = &func();
+echo $x;
+
+?>
+
+In PHP 4.3 $x would be 'original value', whereas after the changes it would
+be 'function return' - remember that where the function does not return by
+reference, the reference assignment is converted to a regular assignment.
+Again, this can be brought to a common base, either by forcing func() to
+return by reference or by eliminating the by-reference assignment.
+
+1c. Code that was valid under PHP 4.3, but now throws an error
+==============================================================
+
+<?php
+
+class Foo {
+
+    function getThis() {
+        return $this;
+    }
+
+    function destroyThis() {
+        $baz =& $this->getThis();
+    }
+}
+
+$bar = new Foo();
+$bar->destroyThis();
+var_dump($bar);
+
+?>
+
+In PHP 5.0.3, $bar evaluated to NULL instead of returning an object.
+That happened because getThis() returns by value, but the value here
+is assigned by reference. Although it now works in the expected way,
+this is actually invalid code which will throw an E_NOTICE under
+PHP 4.4 or an E_STRICT under PHP 5.0.4 and up.
+
+1d. Code that failed under PHP 4.3, but now works
+=================================================
+
+<?php
+
+function &f() {
+    $x = "foo";
+    var_dump($x);
+    print "$x\n";
+    return($a);
+}
+
+for ($i = 0; $i < 3; $i++) {
+    $h = &f();
+}
+
+?>
+
+In PHP 4.3 the third call to var_dump produces NULL, due to the memory
+corruption caused by returning an uninitialized value by reference.
+This is valid code in PHP 5.0.4 and up, but threw errors in earlier
+releases of PHP.
+
+<?php
+
+$arr = array('a1' => array('alfa' => 'ok'));
+$arr =& $arr['a1'];
+echo '-'.$arr['alfa']."-\n";
+
+?>
+
+Until PHP 5.0.5, it wasn't possible to assign an array element by
+reference in this way. It now is.
+
+1e. Code that 'should have worked' under PHP 5.0
+================================================
+
+There are a couple of instances of bugs reported under PHP 5.0 prior
+to the reference fixes which now 'work'. However, in both cases errors
+are thrown by PHP 5.1, because the code was invalid in the first place.
+Returning values by reference using self:: now works in the general
+case but throws an E_STRICT warning, and although your mileage may
+vary when assigning by reference to an overloaded object, you will
+still see an E_ERROR when you try it, even where the assignment
+itself appears to work.
+
+1f. Warnings that came and went
+===============================
+
+<?php
+
+function & foo() {
+    $var = 'ok';
+    return $var;
+}
+
+function & bar() {
+    return foo();
+}
+
+$a =& bar();
+echo "$a\n";
+
+?>
+
+Nested calls to functions returning by reference are valid code under both
+PHP 4.3 and PHP 5.1, but threw an unwarranted E_NOTICE or E_STRICT under
+the intervening PHP releases.
+
+2. Reading []
+=============
+
+<?php
+
+class XmlTest {
+
+    function test_ref(&$test) {
+        $test = "ok";
+    }
+
+    function test($test) { }
+
+    function run() {
+        $ar = array();
+        $this->test_ref($ar[]);
+        var_dump($ar);
+        $this->test($ar[]);
+    }
+}
+
+$o = new XmlTest();
+$o->run();
+
+?>
+
+This should always have thrown a fatal E_ERROR, because [] cannot be used
+for reading in PHP. It is invalid code in PHP 4.4.2 and PHP 5.0.5 upward.
+
+3. instanceof, is_a(), is_subclass_of(), catch
+==============================================
+
+In PHP 5.0, is_a() was deprecated and replaced by the "instanceof" operator.
+There were some issues with the initial implementation of "instanceof", which
+relied on __autoload() to search for missing classes. If the class was not
+present, "instanceof" would throw a fatal E_ERROR due to the failure of
+__autoload() to discover that class. The same behaviour occurred in the
+"catch" operator and the is_subclass_of() function, for the same reason.
+
+None of these functions or operators call __autoload() in PHP 5.1, and
+the class_exists() workarounds used in code written for PHP 5.0, while
+not problematic in any way, are no longer necessary.
+
+4. Integer values in function parameters
+========================================
+
+With the advent of PHP 5.0, a new parameter parsing API was introduced
+which is used by a large number of PHP functions. In all versions of
+PHP between 5.0 and 5.1, the handling of integer values was very strict
+and would reject non-well formed numeric values when a PHP function
+expected an integer. These checks have now been relaxed to support
+non-well formed numeric strings such as " 123" and "123 ", and will
+no longer fail as they did under PHP 5.0. However, to promote code
+safety and input validation, PHP functions will now emit an E_NOTICE
+when such strings are passed as integers.
+
+5. Abstract private methods
+===========================
+
+Abstract private methods were supported between PHP 5.0.0 and PHP 5.0.4,
+but were then disallowed on the grounds that the behaviours of 'private'
+and 'abstract' are mutually exclusive.
+
+6. Access modifiers in interfaces
+=================================
+
+Under PHP 5.0, function declarations in interfaces were treated in exactly
+the same way as function declarations in classes. This has not been the case
+since October 2004, at which point only the 'public' access modifier was
+allowed in interface function declarations. Since April 2005 - which pre-dates
+the PHP 5.0b1 release - the 'static' modifier has also been allowed. However,
+the 'protected' and 'private' modifiers will now throw an E_ERROR, as will
+'abstract'. Note that this change should not affect your existing code, as
+none of these modifiers makes sense in the context of interfaces anyway.
+
+7. Changes in inheritance rules
+===============================
+
+Under PHP 5.0, it was possible to have a function declaration in a derived class
+that did not match the declaration of the same function in the base class, e.g.
+
+class Base {
+    function &return_by_ref() {
+        $r = 1;
+        return $r;
+    }
+}
+
+class Derived extends Base {
+    function return_by_ref() {
+        return 1;
+    }
+}
+
+This code will cause an E_STRICT error to be emitted under PHP 5.1.
+
+8. Class constants
+==================
+
+Under PHP 5.0, the following code was valid:
+
+<?php
+
+class test {
+    const foobar = 'foo';
+    const foobar = 'bar';
+}
+
+?>
+
+Under PHP 5.1, redefinition of a class constant will throw a fatal E_ERROR.
+
+9. Extensions
+=============
+
+9a. Extensions that are gone from the PHP core
+==============================================
+
+One of the first things you're likely to notice when you download PHP 5.1 is that
+several of the older extensions have disappeared. Those extensions that are still
+actively maintained are available in the PHP Extension Community Library (PECL),
+at http://pecl.php.net. Windows binaries are built regularly, and you can obtain
+the binaries for PECL extensions built against PHP 5.1 from
+http://pecl4win.php.net/list.php/5_1.
+
+Extension           Alternative/status
+=========           ========================
+ext/cpdf            pecl/pdflib
+ext/dbx             pecl/dbx
+ext/dio             pecl/dio
+ext/fam             not actively maintained
+ext/ingres_ii       pecl/ingres
+ext/ircg            not actively maintained
+ext/mcve            pecl/mcve
+ext/mnogosearch     not actively maintained
+ext/oracle          ext/oci8 or ext/pdo_oci
+ext/ovrimos         not actively maintained
+ext/pfpro           not actively maintained
+                    - alternatives at http://pecl.php.net/packages.php?catpid=18&catname=Payment
+ext/w32api          pecl/ffi
+ext/yp              not actively maintained
+sapi/activescript   http://pecl4win.php.net/ext.php/php5activescript.dll (PECL package)
+                    or pecl/activescript (CVS)
+
+Modules in PECL that are not actively maintained (i.e. have not been supported
+for some time, have no active maintainer working on them currently, and do not
+have any PECL package releases), are still available in CVS at
+http://cvs.php.net/pecl/. However, unreleased PHP modules are by their nature
+unsupported, and your mileage may vary when attempting to install or use them.
+
+9b. Class constants in new PHP 5.1 extensions
+=============================================
+
+The Zend Engine 2.1 API allows extension developers to declare class constants
+in object oriented extensions. New extensions written for PHP 5.1, including SPL,
+PDO, ext/XMLReader and ext/date, have their constants in the format
+
+PDO::CLASS_CONSTANT
+
+rather than in the C format
+
+PDO_CLASS_CONSTANT
+
+in order to minimise pollution of the global namespace in PHP.
+
+10. Date/time support
+====================
+
+Date/time support has been fully rewritten in PHP 5.1, and no longer
+uses the system settings to 'know' the timezone in operation. It will
+instead utilize, in the following order:
+
+* The timezone set using the date_default_timezone_set() function (if any)
+* The TZ environment variable (if non empty)
+* The date.timezone ini option (if set)
+* "magical" guess (if the operating system supports it)
+* If none of the above options succeeds, UTC
+
+To ensure accuracy (and avoid an E_STRICT warning), you will need to define
+your timezone in your php.ini using the following format:
+
+date.timezone = Europe/London
+
+The supported timezones are listed, in this format, in the PHP manual at
+http://www.php.net/manual/en/timezones.php.
+
+11. Changes in database support
+==============================
+
+11a. PDO overview
+================
+
+PHP Data Objects (PDO) were introduced as a PECL extension under PHP 5.0,
+and became part of the core PHP distribution in PHP 5.1. The PDO extension
+provides a consistent interface for database access, and is used alongside
+database-specific PDO drivers. Each driver may also have database-specific
+functions of its own, but basic data access functionality such as issuing
+queries and fetching data is covered by PDO functions, using the driver
+named in PDO::__construct().
+
+Note that the PDO extension, and its drivers, are intended to be built as
+shared extensions. This will enable straightforward driver upgrades from
+PECL, without forcing you to rebuild all of PHP.
+
+At the point of the PHP 5.1 release, PDO is more than ready for widespread
+testing and could be adopted in most situations. However, it is important
+to understand that PDO and its drivers are comparatively young and may be
+missing certain database-specific features; evaluate PDO carefully before
+you use it in new projects.
+
+Legacy code will generally rely on the pre-existing database extensions,
+which are still maintained.
+
+There is more in-depth information about the PDO extension in the manual
+at http://www.php.net/manual/ref.pdo.php.
+
+11b. Changes in MySQL support
+============================
+
+In PHP 4, MySQL 3 support was built-in. With the release of PHP 5.0 there
+were two MySQL extensions, named 'mysql' and 'mysqli', which were designed
+to support MySQL < 4.1 and MySQL 4.1 and up, respectively. With the
+introduction of PDO, which provides a very fast interface to all the
+database APIs supported by PHP, the PDO_MYSQL driver can support any
+of the current versions (MySQL 3, 4 or 5) in PHP code written for PDO,
+depending on the MySQL library version used during compilation. The
+older MySQL extensions remain in place for reasons of back compatibility,
+but are not enabled by default.
+
+11c. Changes in SQLite support
+=============================
+
+In PHP 5.0, SQLite 2 support was provided by the built-in sqlite
+extension, which was also available as a PECL extension in PHP 4.3
+and PHP 4.4. With the introduction of PDO, the sqlite extension doubles
+up to act as a 'sqlite2' driver for PDO; it is due to this that the
+sqlite extension in PHP 5.1 has a dependency upon the PDO extension.
+
+PHP 5.1 ships with a number of alternative interfaces to sqlite:
+
+The sqlite extension provides the "classic" sqlite procedural/OO API
+that you may have used in prior versions of PHP. It also provides the
+PDO 'sqlite2' driver, which allows you to access legacy SQLite 2
+databases using the PDO API.
+
+PDO_SQLITE provides the 'sqlite' version 3 driver. SQLite version 3
+is vastly superior to SQLite version 2, but the file formats of the
+two versions are not compatible.
+
+If your SQLite-based project is already written and working against
+earlier PHP versions, then you can continue to use ext/sqlite without
+problems, but will need to explicitly enable both PDO and sqlite. New
+projects should use PDO and the 'sqlite' (version 3) driver, as this is
+faster than SQLite 2, has improved locking concurrency, and supports
+both prepared statements and binary columns natively.
+
+12. Further migration information
+================================
+
+For general information about migrating from PHP 4 to PHP 5, please refer to
+the relevant section in the PHP manual at http://www.php.net/manual/migration5.php.
+
+13. Checking for E_STRICT errors
+================================
+
+If you only have a single script to check, you can pick up E_STRICT
+errors using PHP's commandline lint facility:
+
+php -d error_reporting=4095 -l script_to_check.php
+
+For larger projects, the shell script below will achieve the same task:
+
+#!/bin/sh
+
+directory=$1
+
+shift
+
+# These extensions are checked
+extensions="php inc"
+
+check_file ()
+{
+  echo -ne "Doing PHP syntax check on $1 ..."
+
+  # Options:
+  ERRORS=`/www/php/bin/php -d display_errors=1 -d html_errors=0 -d error_prepend_string=" " -d error_append_string=" " -d error_reporting=4095 -l $1 | grep -v "No syntax errors detected"`
+
+  if test -z "$ERRORS"; then
+    echo -ne "OK."
+  else
+    echo -e "Errors found!\n$ERRORS"
+  fi
+
+  echo
+}
+
+# loop over remaining file args
+for FILE in "$@" ; do
+  for ext in $extensions; do
+     if echo $FILE | grep "\.$ext$" > /dev/null; then
+       if test -f $FILE; then
+         check_file "$FILE"
+       fi
+     fi
+  done
+done
@@ -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
@@ -8,16 +8,16 @@ noinst_LTLIBRARIES=libZend.la
 libZend_la_SOURCES=\
 	zend_language_parser.y zend_language_scanner.l \
 	zend_ini_parser.y zend_ini_scanner.l \
-	zend_alloc.c zend_compile.c zend_constants.c \
+	zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
 	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
 	zend_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_strtod.c zend_strtol.c zend_closures.c zend_float.c
+	zend_strtod.c zend_multibyte.c

 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
@@ -31,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) --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
@@ -43,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) --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,34 +1,13 @@
-Zend Memory Manager
-===================
+The goal of the new memory manager (PHP 5.2 and later) is reducing memory allocation overhead and speedup memory management.

-General:
--------
+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 built. It allows select malloc/emalloc at runtime.  So you can use internal and external memory debuggers without recompilation.

-The goal of the new memory manager (available since PHP 5.2) is to reduce memory
-allocation overhead and speedup memory management.
+$ sapi/cli/php -r 'leak();'

-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.
+$ USE_ZEND_ALLOC=0 valgrind --leak-check=full -r 'leak();'

-Debugging:
----------
+The patch allows tweaking memory manager with 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.

-Normal:
+$ ZEND_MM_MEM_TYPE=mmap_anon ZEND_MM_SEG_SIZE=1M sapi/cli/php

-    $ sapi/cli/php -r 'leak();'
-
-Zend MM disabled:
-
-    $ USE_ZEND_ALLOC=0 valgrind --leak-check=full sapi/cli/php -r 'leak();'
-
-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.
@@ -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
@@ -139,6 +135,10 @@ SOURCE=.\zend_default_classes.c
 # End Source File
 # Begin Source File

+SOURCE=.\zend_dynamic_array.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_execute.c
 # End Source File
 # Begin Source File
@@ -151,10 +151,6 @@ SOURCE=.\zend_extensions.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_float.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_hash.c
 # End Source File
 # Begin Source File
@@ -199,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
@@ -227,10 +227,6 @@ 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
@@ -295,6 +291,10 @@ SOURCE=.\zend_default_classes.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_dynamic_array.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_errors.h
 # End Source File
 # Begin Source File
@@ -371,6 +371,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
@@ -399,10 +403,6 @@ 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
@@ -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,13 @@ AC_ARG_WITH(zend-vm,
  PHP_ZEND_VM=CALL
 ])

+AC_ARG_ENABLE(malloc-mm,
+[  --enable-malloc-mm      Use environment variable for run-time malloc/emalloc
+                          selection - FOR DEVELOPERS ONLY!!],
+[
+  ZEND_USE_MALLOC_MM=$enableval
+])
+
 AC_ARG_ENABLE(maintainer-zts,
 [  --enable-maintainer-zts Enable thread safety - for code maintainers only!!],[
  ZEND_MAINTAINER_ZTS=$enableval
@@ -176,6 +151,20 @@ 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_ARG_ENABLE(zend-multibyte,
+[  --enable-zend-multibyte Compile with zend multibyte support], [
+  ZEND_MULTIBYTE=$enableval
+],[
+  ZEND_MULTIBYTE=no
+])
+
 AC_MSG_CHECKING([virtual machine dispatch method])
 AC_MSG_RESULT($PHP_ZEND_VM)

@@ -185,9 +174,15 @@ 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)

+AC_MSG_CHECKING(whether to enable Zend multibyte)
+AC_MSG_RESULT($ZEND_MULTIBYTE)
+	
 case $PHP_ZEND_VM in
  SWITCH)
    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method])
@@ -207,20 +202,9 @@ if test "$ZEND_DEBUG" = "yes"; then
  if test "$CFLAGS" = "-g -O2"; then
  	CFLAGS=-g
  fi
-  changequote({,})
-  if test -n "$GCC"; then
-
-    DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall"
-
-    "$CC" --help=warnings|grep -q -- '-Wpointer-arith[ \t]' && \
-      DEBUG_CFLAGS="$DEBUG_CFLAGS -Wpointer-arith"
-    "$CC" --help=warnings|grep -q -- '-Wdeclaration-after-statement[ \t]' && \
-      DEBUG_CFLAGS="$DEBUG_CFLAGS -Wdeclaration-after-statement"
-
-    test "$USE_MAINTAINER_MODE" = "yes" && \
-      DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations"
-  fi
-  changequote([,])
+  test -n "$GCC" && DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall"
+  test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes" && \
+    DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations"
 else
  AC_DEFINE(ZEND_DEBUG,0,[ ])
 fi
@@ -233,6 +217,16 @@ if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
  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
+
+if test "$ZEND_MULTIBYTE" = "yes"; then
+  AC_DEFINE(ZEND_MULTIBYTE, 1, [ ])
+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]*//`
@@ -410,10 +404,3 @@ 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) 
-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
@@ -164,11 +160,16 @@ SOURCE=.\zend_default_classes.c
 # End Source File
 # Begin Source File

+SOURCE=.\zend_dynamic_array.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_exceptions.c
 # End Source File
 # Begin Source File

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

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

-SOURCE=.\zend_float.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_hash.c
 # End Source File
 # Begin Source File
@@ -232,6 +229,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
@@ -260,10 +261,6 @@ 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
@@ -328,6 +325,10 @@ SOURCE=.\zend_default_classes.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_dynamic_array.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_errors.h
 # End Source File
 # Begin Source File
@@ -408,6 +409,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
@@ -436,10 +441,6 @@ 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
@@ -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        |
@@ -19,14 +19,8 @@

 /* $Id$ */

-#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_API
+#define ZEND_DLEXPORT
 #define ZEND_DLIMPORT

@TOP@
@@ -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="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3"

  # for standalone build of Zend Engine
  test -z "$SED" && SED=sed
@@ -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,6 +1,5 @@
 <?php

-date_default_timezone_set('UTC');
 function simple() {
  $a = 0;
  for ($i = 0; $i < 1000000; $i++) 
@@ -7,6 +7,7 @@ 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
@@ -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        |
@@ -35,7 +35,7 @@ var_dump(func_num_args());

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 int(0)
 int(1)

@@ -42,7 +42,7 @@ var_dump(func_get_arg(1));

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

@@ -36,7 +36,7 @@ var_dump(func_get_args());

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 array(0) {
 }
 array(1) {
@@ -12,8 +12,8 @@ var_dump(strncmp("qwerty", "qwerty123", 7));

 echo "Done\n";
 ?>
--EXPECTF--
-Warning: strncmp() expects exactly 3 parameters, 2 given in %s on line %d
+--EXPECTF--	
+Warning: Wrong parameter count for strncmp() in %s on line %d
 NULL
 int(0)

@@ -14,11 +14,11 @@ var_dump(strcasecmp("01", "01"));

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

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

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

 Warning: Variable passed to each() is not an array or object in %s on line %d
@@ -33,31 +33,31 @@ NULL
 array(4) {
  [1]=>
  int(1)
-  [u"value"]=>
+  ["value"]=>
  int(1)
  [0]=>
  int(0)
-  [u"key"]=>
+  ["key"]=>
  int(0)
 }
 array(4) {
  [1]=>
  int(1)
-  [u"value"]=>
+  ["value"]=>
  int(1)
  [0]=>
-  unicode(1) "a"
-  [u"key"]=>
-  unicode(1) "a"
+  string(1) "a"
+  ["key"]=>
+  string(1) "a"
 }
 array(4) {
  [1]=>
  int(1)
-  [u"value"]=>
+  ["value"]=>
  int(1)
  [0]=>
  int(0)
-  [u"key"]=>
+  ["key"]=>
  int(0)
 }
 Done
@@ -22,19 +22,19 @@ var_dump(constant("test const"));

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

-Warning: define() expects at least 2 parameters, 1 given in %s on line %d
+Warning: Wrong parameter count for define() in %s on line %d
 NULL
 bool(true)

-Warning: define() expects parameter 3 to be boolean, array given in %s on line %d
-NULL
+Notice: Constant true already defined in %s on line %d
+bool(false)

-Warning: define() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
-NULL
+Notice: Array to string conversion in %s on line %d
+bool(true)
 bool(true)
 bool(true)
 bool(true)
@@ -29,20 +29,18 @@ var_dump(get_class($f2));

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

 Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
-unicode(3) "foo"
-unicode(3) "foo"
-unicode(3) "foo"
+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, Unicode string given in %s on line %d
 bool(false)
-unicode(3) "foo"
-unicode(4) "foo2"
+string(3) "foo"
+string(4) "foo2"
 Done
@@ -41,13 +41,13 @@ var_dump(get_parent_class(1));

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

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

-Warning: property_exists() expects exactly 2 parameters, 1 given in %s on line %d
+Warning: Wrong parameter count for property_exists() in %s on line %d
 NULL
 bool(true)
-bool(true)
-bool(true)
+bool(false)
+bool(false)
 bool(false)
 bool(false)
 bool(false)
 bool(false)
 bool(false)
 bool(true)
-bool(true)
-bool(true)
+bool(false)
+bool(false)
 bool(false)
 bool(false)

@@ -84,6 +84,6 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-bool(true)
+bool(false)
 bool(true)
 Done
@@ -18,13 +18,13 @@ var_dump(class_exists("stdClass"));

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

-Warning: class_exists() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
+Warning: class_exists() expects parameter 1 to be string, array given in %s on line %d
 NULL
 bool(false)
 bool(true)
@@ -18,13 +18,13 @@ var_dump(interface_exists("stdClass"));

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

-Warning: interface_exists() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
+Warning: interface_exists() expects parameter 1 to be string, array given in %s on line %d
 NULL
 bool(false)
 bool(true)
@@ -20,33 +20,33 @@ var_dump(get_included_files());

 echo "Done\n";
 ?>
--EXPECTF--
+--EXPECTF--	
 array(1) {
  [0]=>
-  unicode(%d) "%s"
+  string(%d) "%s"
 }
 array(2) {
  [0]=>
-  unicode(%d) "%s"
+  string(%d) "%s"
  [1]=>
-  unicode(%d) "%s"
+  string(%d) "%s"
 }

-Warning: get_included_files() expects exactly 0 parameters, 2 given in %s on line %d
+Warning: Wrong parameter count for get_included_files() in %s on line %d
 NULL
 array(2) {
  [0]=>
-  unicode(%d) "%s"
+  string(%d) "%s"
  [1]=>
-  unicode(%d) "%s"
+  string(%d) "%s"
 }

-Warning: get_included_files() expects exactly 0 parameters, 1 given in %s on line %d
+Warning: Wrong parameter count for get_included_files() in %s on line %d
 NULL
 array(2) {
  [0]=>
-  unicode(%d) "%s"
+  string(%d) "%s"
  [1]=>
-  unicode(%d) "%s"
+  string(%d) "%s"
 }
 Done
@@ -9,19 +9,20 @@ 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
+Warning: Wrong parameter count for trigger_error() in %s on line %d
 NULL

 Notice: error in %s on line %d
 bool(true)

-Warning: trigger_error() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
-NULL
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array in %s on line %d
+bool(true)

 Warning: Invalid error type specified in %s on line %d
 bool(false)
@@ -31,7 +32,4 @@ bool(false)

 Warning: error in %s on line %d
 bool(true)
-
-Deprecated: error in %s on line %d
-bool(true)
 Done
@@ -8,5 +8,5 @@ isset($foo->bar->bar);

 echo "Done\n";
 ?>
--EXPECT--
+--EXPECT--	
 Done
@@ -1,86 +0,0 @@
--TEST--
-builtin functions tests
--FILE--
-<?php
-
-var_dump(get_resource_type());
-var_dump(get_resource_type(""));
-$fp = fopen(__FILE__, "r");
-var_dump(get_resource_type($fp));
-fclose($fp);
-var_dump(get_resource_type($fp));
-
-var_dump(gettype(get_loaded_extensions()));
-var_dump(count(get_loaded_extensions()));
-var_dump(gettype(get_loaded_extensions(true)));
-var_dump(count(get_loaded_extensions(true)));
-var_dump(get_loaded_extensions(true, true));
-
-define("USER_CONSTANT", "test");
-
-var_dump(get_defined_constants(true, true));
-var_dump(gettype(get_defined_constants(true)));
-var_dump(gettype(get_defined_constants()));
-var_dump(count(get_defined_constants()));
-
-function test () {
-}
-
-var_dump(get_defined_functions(true));
-var_dump(gettype(get_defined_functions()));
-var_dump(count(get_defined_functions()));
-
-var_dump(get_declared_interfaces(true));
-var_dump(gettype(get_declared_interfaces()));
-var_dump(count(get_declared_interfaces()));
-
-var_dump(get_extension_funcs());
-var_dump(get_extension_funcs(true));
-var_dump(gettype(get_extension_funcs("standard")));
-var_dump(count(get_extension_funcs("standard")));
-var_dump(gettype(get_extension_funcs("zend")));
-var_dump(count(get_extension_funcs("zend")));
-
-
-echo "Done\n";
-?>
--EXPECTF--
-Warning: get_resource_type() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: get_resource_type() expects parameter 1 to be resource, Unicode string given in %s on line %d
-NULL
-unicode(6) "stream"
-unicode(7) "Unknown"
-unicode(5) "array"
-int(%d)
-unicode(5) "array"
-int(0)
-
-Warning: get_loaded_extensions() expects at most 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: get_defined_constants() expects at most 1 parameter, 2 given in %s on line %d
-NULL
-unicode(5) "array"
-unicode(5) "array"
-int(%d)
-
-Warning: get_defined_functions() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
-unicode(5) "array"
-int(%d)
-
-Warning: get_declared_interfaces() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
-unicode(5) "array"
-int(%d)
-
-Warning: get_extension_funcs() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-bool(false)
-unicode(5) "array"
-int(%d)
-unicode(5) "array"
-int(%d)
-Done
@@ -1,34 +0,0 @@
--TEST--
-constant() tests
--FILE--
-<?php
-
-var_dump(constant());
-var_dump(constant("", ""));
-var_dump(constant(""));
-
-var_dump(constant(array()));
-
-define("TEST_CONST", 1);
-var_dump(constant("TEST_CONST"));
-
-define("TEST_CONST2", "test");
-var_dump(constant("TEST_CONST2"));
-
-echo "Done\n";
-?>
--EXPECTF--
-Warning: constant() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: constant() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: constant(): Couldn't find constant  in %s on line %d
-NULL
-
-Warning: constant() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
-NULL
-int(1)
-unicode(4) "test"
-Done
@@ -1,34 +0,0 @@
--TEST--
-func_get_arg() invalid usage
--FILE--
-<?php
-
-var_dump(func_get_arg(1,2,3));
-var_dump(func_get_arg(1));
-var_dump(func_get_arg());
-
-function bar() {
-	var_dump(func_get_arg(1));
-}
-
-function foo() {
-	bar(func_get_arg(1));
-}
-
-foo(1,2);
-
-echo "Done\n";
-?>
--EXPECTF--
-Warning: func_get_arg() expects exactly 1 parameter, 3 given in %s on line %d
-NULL
-
-Warning: func_get_arg():  Called from the global scope - no function context in %s on line %d
-bool(false)
-
-Warning: func_get_arg() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-Done
@@ -1,37 +0,0 @@
--TEST--
-?: operator
--FILE--
-<?php
-var_dump(true ?: false);
-var_dump(false ?: true);
-var_dump(23 ?: 42);
-var_dump(0 ?: "bar");
-
-$a = 23;
-$b = 0;
-$c = "";
-$d = 23.5;
-
-var_dump($a ?: $b);
-var_dump($c ?: $d);
-
-var_dump(1 ?: print(2));
-
-$e = array();
-
-$e['e'] = 'e';
-$e['e'] = $e['e'] ?: 'e';
-print_r($e);
-?>
--EXPECT--
-bool(true)
-bool(true)
-int(23)
-unicode(3) "bar"
-int(23)
-float(23.5)
-int(1)
-Array
-(
-    [e] => e
-)
@@ -1,24 +0,0 @@
--TEST--
-Implementating abstracting methods and optional parameters
--FILE--
-<?php
-
-abstract class Base
-{
-	abstract function someMethod($param);
-}
-
-class Ext extends Base
-{
-	function someMethod($param = "default")
-	{
-		echo $param, "\n";
-	}
-}
-
-$a = new Ext();
-$a->someMethod("foo");
-$a->someMethod();
--EXPECT--
-foo
-default
@@ -1,45 +0,0 @@
--TEST--
-Testing variable variables as function name
--FILE--
-<?php
-
-$a = 'ucfirst';
-$b = 'a';
-print $$b('test');
-print "\n";
-
-
-class bar {
-	public function a() {
-		return "bar!";
-	}
-}
-
-class foo {
-	public function test() {
-		print "foo!\n";
-		return new bar;
-	}
-}
-
-function test() {
-	return new foo;
-}
-
-$a = 'test';
-$b = 'a';
-var_dump($$b()->$$b()->$b());
-
-
-$a = 'strtoupper';
-$b = 'a';
-$c = 'b';
-$d = 'c';
-var_dump($$$$d('foo'));
-
-?>
--EXPECT--
-Test
-foo!
-unicode(4) "bar!"
-unicode(3) "FOO"
@@ -1,51 +0,0 @@
--TEST--
-Testing operations with undefined variable
--FILE--
-<?php
-
-var_dump($a[1]);
-var_dump($a[$c]);
-var_dump($a + 1);
-var_dump($a + $b);
-var_dump($a++);
-var_dump(++$b);
-var_dump($a->$b);
-var_dump($a->$b);
-var_dump($a->$b->$c[1]);
-
-?>
--EXPECTF--
-Notice: Undefined variable: a in %s on line %d
-NULL
-
-Notice: Undefined variable: %s in %s on line %d
-
-Notice: Undefined variable: %s in %s on line %d
-NULL
-
-Notice: Undefined variable: a in %s on line %d
-int(1)
-
-Notice: Undefined variable: %s in %s on line %d
-
-Notice: Undefined variable: %s in %s on line %d
-int(0)
-
-Notice: Undefined variable: a in %s on line %d
-NULL
-
-Notice: Undefined variable: b in %s on line %d
-int(1)
-
-Notice: Trying to get property of non-object in %s on line %d
-NULL
-
-Notice: Trying to get property of non-object in %s on line %d
-NULL
-
-Notice: Undefined variable: c in %s on line %d
-
-Notice: Trying to get property of non-object in %s on line %d
-
-Notice: Trying to get property of non-object in %s on line %d
-NULL
@@ -1,32 +0,0 @@
--TEST--
-Testing dynamic calls
--FILE--
-<?php
-
-class foo {
-	static public function a() {
-		print "ok\n";
-	}
-}
-
-$a = 'a';
-$b = 'a';
-
-$class = 'foo';
-
-foo::a();
-foo::$a();
-foo::$$b();
-
-$class::a();
-$class::$a();
-$class::$$b();
-
-?>
--EXPECT--
-ok
-ok
-ok
-ok
-ok
-ok
@@ -1,25 +0,0 @@
--TEST--
-Trying assign value to property when an object is not returned in a function
--FILE--
-<?php
-
-class foo {
-	public function a() {
-	}
-}
-
-$test = new foo;
-
-$test->a()->a;
-print "ok\n";
-
-$test->a()->a = 1;
-print "ok\n";
-
-?>
--EXPECTF--
-Notice: Trying to get property of non-object in %s on line %d
-ok
-
-Strict Standards: Creating default object from empty value in %s on line %d
-ok
@@ -1,22 +0,0 @@
--TEST--
-Testing dynamic calls using variable variables with curly syntax
--FILE--
-<?php
-
-$a = 'b';
-$b = 'c';
-$c = 'strtoupper';
-
-var_dump(${${$a}}('foo') == 'FOO');
-
-$a = 'b';
-$b = 'c';
-$c = 'strtoupper';
-$strtoupper = 'strtolower';
-
-var_dump(${${++$a}}('FOO') == 'foo');
-
-?>
--EXPECT--
-bool(true)
-bool(true)
@@ -1,23 +0,0 @@
--TEST--
-Testing function call through of array item
--FILE--
-<?php
-
-$arr = array('strtoupper', 'strtolower');
-
-$k = 0;
-
-var_dump($arr[0]('foo') == 'FOO');
-var_dump($arr[$k]('foo') == 'FOO');
-var_dump($arr[++$k]('FOO') == 'foo');
-var_dump($arr[++$k]('FOO') == 'foo');
-
-?>
--EXPECTF--
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Undefined offset: 2 in %s on line %d
-
-Fatal error: Function name must be a string in %s on line %d
@@ -1,51 +0,0 @@
--TEST--
-Testing assign to property of an object in an array
--FILE--
-<?php
-
-$arr = array(new stdClass);
-
-$arr[0]->a = clone $arr[0];
-var_dump($arr);
-
-$arr[0]->b = new $arr[0];
-var_dump($arr);
-
-$arr[0]->c = $arr[0]->a;
-var_dump($arr);
-
-?>
--EXPECT--
-array(1) {
-  [0]=>
-  object(stdClass)#1 (1) {
-    [u"a"]=>
-    object(stdClass)#2 (0) {
-    }
-  }
-}
-array(1) {
-  [0]=>
-  object(stdClass)#1 (2) {
-    [u"a"]=>
-    object(stdClass)#2 (0) {
-    }
-    [u"b"]=>
-    object(stdClass)#3 (0) {
-    }
-  }
-}
-array(1) {
-  [0]=>
-  object(stdClass)#1 (3) {
-    [u"a"]=>
-    object(stdClass)#2 (0) {
-    }
-    [u"b"]=>
-    object(stdClass)#3 (0) {
-    }
-    [u"c"]=>
-    object(stdClass)#2 (0) {
-    }
-  }
-}
@@ -1,70 +0,0 @@
--TEST--
-Overriding $this in catch and checking the object properties later.
--FILE--
-<?php
-
-class foo {
-	public $test = 0;
-	private $test_2 = 1;
-	protected $test_3 = 2;
-	
-	public function bar() {
-		try {
-			throw new Exception('foo');
-		} catch (Exception $this) {
-			var_dump($this);
-		}
-
-		$this->baz();		
-	}
-	
-	public function baz() {
-		foreach ($this as $k => $v) {
-			printf("'%s' => '%s'\n", $k, $v);
-		}		
-		print "ok\n";
-	}
-}
-
-$test = new foo;
-$test->bar();
-
-?>
--EXPECTF--
-object(Exception)#2 (%d) {
-  [u"message":protected]=>
-  unicode(3) "foo"
-  [u"string":u"Exception":private]=>
-  unicode(0) ""
-  [u"code":protected]=>
-  int(0)
-  [u"file":protected]=>
-  unicode(%d) "%s"
-  [u"line":protected]=>
-  int(%d)
-  [u"trace":u"Exception":private]=>
-  array(1) {
-    [0]=>
-    array(6) {
-      [u"file"]=>
-      unicode(%d) "%s"
-      [u"line"]=>
-      int(%d)
-      [u"function"]=>
-      unicode(3) "bar"
-      [u"class"]=>
-      unicode(3) "foo"
-      [u"type"]=>
-      unicode(2) "->"
-      [u"args"]=>
-      array(0) {
-      }
-    }
-  }
-  [u"previous":u"Exception":private]=>
-  NULL
-}
-'test' => '0'
-'test_2' => '1'
-'test_3' => '2'
-ok
@@ -1,11 +0,0 @@
--TEST--
-Testing array with '[]' passed as argument by value
--FILE--
-<?php 
-
-function test($var) { }
-test($arr[]);
-
-?>
--EXPECTF--
-Fatal error: Cannot use [] for reading in %s on line %d
@@ -1,13 +0,0 @@
--TEST--
-Testing array with '[]' passed as argument by reference
--FILE--
-<?php 
-
-function test(&$var) { }
-test($arr[]);
-
-print "ok!\n";
-
-?>
--EXPECT--
-ok!
@@ -1,31 +0,0 @@
--TEST--
-Using undefined multidimensional array
--FILE--
-<?php 
-
-$arr[1][2][3][4][5];
-
-echo $arr[1][2][3][4][5];
-
-$arr[1][2][3][4][5]->foo;
-
-$arr[1][2][3][4][5]->foo = 1;
-
-$arr[][] = 2;
-
-$arr[][]->bar = 2;
-
-?>
--EXPECTF--
-
-Notice: Undefined variable: arr in %s on line %d
-
-Notice: Undefined variable: arr in %s on line %d
-
-Notice: Undefined variable: arr in %s on line %d
-
-Notice: Trying to get property of non-object in %s on line %d
-
-Strict Standards: Creating default object from empty value in %s on line %d
-
-Strict Standards: Creating default object from empty value in %s on line %d
@@ -1,26 +0,0 @@
--TEST--
-Testing multiples 'default:' in switch
--FILE--
-<?php 
-
-switch (1) {
-	case 2:
-		print 'foo';
-		break;
-	case 3:
-		print 'bar';
-		break;
-	default:
-		print 1;
-		break;
-	default:
-		print 2;
-		break;
-	default:
-		print 3;
-		break;
-}
-
-?>
--EXPECT--
-3
@@ -1,18 +0,0 @@
--TEST--
-Using 'static' and 'global' in global scope
--FILE--
-<?php
-
-static $var, $var, $var = -1;
-var_dump($var);
-
-global $var, $var, $var;
-var_dump($var);
-
-var_dump($GLOBALS['var']);
-
-?>
--EXPECT--
-int(-1)
-int(-1)
-int(-1)
@@ -1,13 +0,0 @@
--TEST--
-Trying to use lambda in array offset
--FILE--
-<?php
-
-$test[function(){}] = 1;
-$a{function() { }} = 1;
-
-?>
--EXPECTF--
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
@@ -1,19 +0,0 @@
--TEST--
-Trying to access inexistent static property of Closure
--FILE--
-<?php
-
-namespace closure;
-
-class closure { static $x = 1;}
-
-$x = __NAMESPACE__;
-var_dump(closure::$x);
-
-var_dump($x::$x);
-
-?>
--EXPECTF--
-int(1)
-
-Fatal error: Access to undeclared static property: Closure::$x in %s on line %d
@@ -1,12 +0,0 @@
--TEST--
-Trying to use lambda as array key
--FILE--
-<?php
-
-var_dump(array(function() { } => 1));
-
-?>
--EXPECTF--
-Warning: Illegal offset type in %s on line %d
-array(0) {
-}
@@ -1,14 +0,0 @@
--TEST--
-using multiple access modifiers (methods)
--FILE--
-<?php
-
-class test {
-	static public public static final public final function foo() {
-	}
-}
-
-echo "Done\n";
-?>
--EXPECTF--
-Fatal error: Multiple access type modifiers are not allowed in %s on line %d
@@ -1,13 +0,0 @@
--TEST--
-using multiple access modifiers (attributes)
--FILE--
-<?php
-
-class test {
-	static public public static final public final $var;
-}
-
-echo "Done\n";
-?>
--EXPECTF--
-Fatal error: Multiple access type modifiers are not allowed in %s on line %d
@@ -1,13 +0,0 @@
--TEST--
-using multiple access modifiers (classes)
--FILE--
-<?php
-
-final final class test {
-	function foo() {}
-}
-
-echo "Done\n";
-?>
--EXPECTF--
-Parse error: %s error,%sexpecting %s in %s on line %d
@@ -1,14 +0,0 @@
--TEST--
-using multiple access modifiers (abstract methods)
--FILE--
-<?php
-
-class test {
-	abstract abstract function foo() {
-	}
-}
-
-echo "Done\n";
-?>
--EXPECTF--
-Fatal error: Multiple abstract modifiers are not allowed in %s on line %d
@@ -1,14 +0,0 @@
--TEST--
-using multiple access modifiers (final methods)
--FILE--
-<?php
-
-class test {
-	final final function foo() {
-	}
-}
-
-echo "Done\n";
-?>
--EXPECTF--
-Fatal error: Multiple final modifiers are not allowed in %s on line %d
@@ -1,14 +0,0 @@
--TEST--
-using multiple access modifiers (static methods)
--FILE--
-<?php
-
-class test {
-	static static function foo() {
-	}
-}
-
-echo "Done\n";
-?>
--EXPECTF--
-Fatal error: Multiple static modifiers are not allowed in %s on line %d
@@ -1,13 +0,0 @@
--TEST--
-abstract final methods errmsg
--FILE--
-<?php
-
-class test {
-	final abstract function foo();
-}
-
-echo "Done\n";
-?>
--EXPECTF--
-Fatal error: Cannot use the final modifier on an abstract class member in %s on line %d