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

2026-11-09 10:10:50 +00:00 · 2004-03-17 16:40:57 +00:00
10911 changed files with 212391 additions and 1334547 deletions
@@ -1,34 +1,16 @@
+set $zts = 0
+
 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])
+	if $zts
+		set $eg = ((zend_executor_globals) (*((void ***) tsrm_ls))[executor_globals_id-1])
 	else
 		set $eg = executor_globals
 	end
 end

 document ____executor_globals
-	portable way of accessing executor_globals, set $eg
-	ZTS detection is automatically based on ext/standard module struct
-end
-
-define print_cvs
-	____executor_globals
-	set $p = $eg.current_execute_data.CVs
-	set $c = $eg.current_execute_data.op_array.last_var
-	set $v = $eg.current_execute_data.op_array.vars
-	set $i = 0
-
-	printf "Compiled variables count: %d\n", $c
-	while $i < $c
-		printf "%d = %s\n", $i, $v[$i].name
-		if $p[$i] != 0
-			printzv *$p[$i]
-		else
-			printf "*uninitialized*\n"
-		end
-		set $i = $i + 1
-	end
+	portable way of accessing executor_globals
+	type "set $zts = 1" if you use --enable-maintainer-zts on your configure line
 end

 define dump_bt
@@ -58,41 +40,59 @@ define printzv
 end

 document printzv
-	prints zval contents
+	prints content of zval 
 end

 define ____printzv_contents
+	____executor_globals
 	set $zvalue = $arg0
-	set $type = $zvalue->type

-	printf "(refcount=%d", $zvalue->refcount
-	if $zvalue->is_ref
-		printf ",is_ref"
+	if $zvalue.type == 0
+		set $typename = "NULL"
 	end
-	printf ") "
-	if $type == 0
-		printf "NULL"
+	if $zvalue.type == 1
+		set $typename = "long"
 	end
-	if $type == 1
-		printf "long: %ld", $zvalue->value.lval
+	if $zvalue.type == 2
+		set $typename = "double"
 	end
-	if $type == 2
-		printf "double: %lf", $zvalue->value.dval
+	if $zvalue.type == 3
+		set $typename = "string"
 	end
-	if $type == 3
-		printf "bool: "
-		if $zvalue->value.lval
-			printf "true"
-		else
-			printf "false"
-		end
+	if $zvalue.type == 4
+		set $typename = "array"
 	end
-	if $type == 4
-		printf "array(%d): ", $zvalue->value.ht->nNumOfElements
+	if $zvalue.type == 5
+		set $typename = "object"
+	end
+	if $zvalue.type == 6
+		set $typename = "bool"
+	end
+	if $zvalue.type == 7
+		set $typename = "resource"
+	end
+	if $zvalue.type == 8 
+		set $typename = "constant"
+	end
+	if $zvalue.type == 9
+		set $typename = "const_array"
+	end
+
+	printf "(refcount=%d) %s: ", $zvalue.refcount, $typename
+	if $zvalue.type == 1
+		printf "%ld", $zvalue.value.lval
+	end
+	if $zvalue->type == 2
+		printf "%lf", $zvalue.value.dval
+	end
+	if $zvalue.type == 3
+		printf "\"%s\"(%d)", $zvalue.value.str.val, $zvalue.value.str.len
+	end
+	if $zvalue.type == 4
 		if ! $arg1
 			printf "{\n"
 			set $ind = $ind + 1
-			____print_ht $zvalue->value.ht 1
+			____print_ht $zvalue.value.ht
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0
@@ -101,61 +101,34 @@ define ____printzv_contents
 			end
 			printf "}"
 		end
-		set $type = 0
 	end
-	if $type == 5
-		printf "object"
-		____executor_globals
-		set $handle = $zvalue->value.obj.handle
-		set $handlers = $zvalue->value.obj.handlers
-		if basic_functions_module.zts
-			set $zobj = zend_objects_get_address($zvalue, $tsrm_ls)
-		else
-			set $zobj = zend_objects_get_address($zvalue)
-		end
-		if $handlers->get_class_entry == &zend_std_object_get_class
-			set $cname = $zobj->ce.name
-		else
-			set $cname = "Unknown"
-		end
-		printf "(%s) #%d", $cname, $handle
+	if $zvalue.type == 5
 		if ! $arg1
-			if $handlers->get_properties == &zend_std_get_properties
-				set $ht = $zobj->properties
-				if $ht
-					printf "(%d): ", $ht->nNumOfElements
-					printf "{\n"
-					set $ind = $ind + 1
-					____print_ht $ht 1
-					set $ind = $ind - 1
-					set $i = $ind
-					while $i > 0
-						printf "  "
-						set $i = $i - 1
-					end
-					printf "}"
-				else
-					echo "no properties found"
-				end
+			printf "(prop examination disabled due to a gdb bug)"
+			if $zvalue.value.obj.handlers->get_properties
+#				set $ht = $zvalue->value.obj.handlers->get_properties($zvalue)
+#				printf "{\n"
+#				set $ind = $ind + 1
+#				____print_ht $ht
+#				set $ind = $ind - 1
+#				set $i = $ind
+#				while $i > 0
+#					printf "  "
+#					set $i = $i - 1
+#				end
+#				printf "}"
 			end
 		end
-		set $type = 0
 	end
-	if $type == 6
-		printf "string(%d): ", $zvalue->value.str.len
-		____print_str $zvalue->value.str.val $zvalue->value.str.len
+	if $zvalue.type == 6
+		if $zvalue.value.lval
+			printf "true"
+		else
+			printf "false"
+		end
 	end
-	if $type == 7
-		printf "resource: #%d", $zvalue->value.lval
-	end
-	if $type == 8 
-		printf "constant"
-	end
-	if $type == 9
-		printf "const_array"
-	end
-	if $type > 9
-		printf "unknown type %d", $type
+	if $zvalue.type == 7
+		printf "#%d", $zvalue.value.lval
 	end
 	printf "\n"
 end
@@ -170,7 +143,7 @@ define ____printzv
 		printf "*uninitialized* "
 	end

-	set $zcontents = (zval*) $zvalue
+	set $zcontents = *(struct _zval_struct *) $zvalue
 	if $arg1
 		____printzv_contents $zcontents $arg1
 	else
@@ -183,7 +156,7 @@ define ____print_const_table
 	set $p = $ht->pListHead

 	while $p != 0
-		set $const = (zend_constant *) $p->pData
+		set $const = *(zend_constant *) $p->pData

 		set $i = $ind
 		while $i > 0
@@ -191,14 +164,13 @@ define ____print_const_table
 			set $i = $i - 1
 		end

-		if $p->nKeyLength > 0
-			____print_str $p->arKey $p->nKeyLength
-			printf " => "
+		if $p->nKeyLength > 0 
+			printf "\"%s\" => ", $p->arKey
 		else
 			printf "%d => ", $p->h
 		end

-		____printzv_contents &$const->value 0
+		____printzv_contents $const.value 0
 		set $p = $p->pListNext
 	end
 end
@@ -211,34 +183,25 @@ define print_const_table
 end

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

 	while $p != 0
+		set $zval = *(struct _zval_struct **)$p->pData
+
 		set $i = $ind
 		while $i > 0
 			printf "  "
 			set $i = $i - 1
 		end

-		if $p->nKeyLength > 0
-			____print_str $p->arKey $p->nKeyLength
-			printf " => "
+		if $p->nKeyLength > 0 
+			printf "\"%s\" => ", $p->arKey
 		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
@@ -246,7 +209,7 @@ end
 define print_ht
 	set $ind = 1
 	printf "[0x%08x] {\n", $arg0
-	____print_ht $arg0 1
+	____print_ht $arg0
 	printf "}\n"
 end

@@ -254,171 +217,6 @@ document print_ht
 	dumps elements of HashTable made of zval
 end

-define print_htptr
-	set $ind = 1
-	printf "[0x%08x] {\n", $arg0
-	____print_ht $arg0 0
-	printf "}\n"
-end
-
-document print_htptr
-	dumps elements of HashTable made of pointers
-end
-
-define print_htstr
-	set $ind = 1
-	printf "[0x%08x] {\n", $arg0
-	____print_ht $arg0 2
-	printf "}\n"
-end
-
-document print_htstr
-	dumps elements of HashTable made of strings
-end
-
-define ____print_ft
-	set $ht = $arg0
-	set $p = $ht->pListHead
-
-	while $p != 0
-		set $func = (zend_function*)$p->pData
-
-		set $i = $ind
-		while $i > 0
-			printf "  "
-			set $i = $i - 1
-		end
-
-		if $p->nKeyLength > 0
-			____print_str $p->arKey $p->nKeyLength
-			printf " => "
-		else
-			printf "%d => ", $p->h
-		end
-
-		printf "\"%s\"\n", $func->common.function_name
-		set $p = $p->pListNext
-	end
-end
-
-define print_ft
-	set $ind = 1
-	printf "[0x%08x] {\n", $arg0
-	____print_ft $arg0
-	printf "}\n"
-end
-
-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
@@ -58,8 +58,8 @@ Exceptions:
    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, 
+    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
@@ -148,19 +148,20 @@ 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, with words underscore delimited. The class name should be prefixed
+    with the name of the 'parent set'.

    Good:
    'Curl'
-    'FooBar'
+    'Foo_Bar'

    Bad:
    'foobar'
    'foo_bar'
+    'FooBar'
+

 Syntax and indentation
 ----------------------
@@ -207,12 +208,6 @@ Syntax and indentation
    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
-    in README.TESTING.
-
 Documentation and Folding Hooks
 -------------------------------

@@ -256,7 +251,7 @@ that the first implementation include a file labeled 'EXPERIMENTAL'
 in the function directory, and that the functions follow the
 standard prefixing conventions during their initial implementation.

-The file labeled 'EXPERIMENTAL' should include the following
+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 CVS comments.
@@ -26,6 +26,11 @@ Status legend

 == Server APIs ==

+-------------------------------------------------------------------------------
+EXTENSION:           activescript
+PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>
+MAINTENANCE:         Odd Fixes
+STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           aolserver
 MAINTENANCE:         Unknown
@@ -36,19 +41,14 @@ PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           apache_hooks
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           apache2filter
+EXTENSION:           apache2handler / apache2filter
 PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Experimental
 -------------------------------------------------------------------------------
-EXTENSION:           apache2handler
-PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>, Ilia Alshanetsky <iliaa@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
+EXTENSION:           apache_hooks
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           caudium
 MAINTENANCE:         Unknown
@@ -63,11 +63,6 @@ MAINTENANCE:         Marcus Boerger <helly@php.net>, Edin Kadribasic <edink@php.
 STATUS:              Working
 SINCE:               4.3.0
 -------------------------------------------------------------------------------
-EXTENSION:           continuity
-PRIMARY MAINTAINER:  Alex Leigh <aleigh@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           embed
 PRIMARY MAINTAINER:  Edin Kadribasic <edink@php.net>
 MAINTENANCE:         Maintained
@@ -127,14 +122,36 @@ EXTENSION:           dbase
 MAINTENANCE:         Orphaned
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           fbsql
-PRIMARY MAINTAINER:  Frank M. Kromann <fmk@swwwing.com>
+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:           filepro
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
+EXTENSION:           hwapi
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+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
@@ -153,70 +170,11 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mysqli
-PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               5.0
 -------------------------------------------------------------------------------
-EXTENSION:           oci8
-PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net>, Antony Dovgal <tony2001@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           odbc
-PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-COMMENT:             Working 
-------------------------------------------------------------------------------
-EXTENSION:           pdo
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Odd fixes
-STATUS:              Working
-SINCE:               5.1
-------------------------------------------------------------------------------
-EXTENSION:           pdo_dblib
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Odd fixes
-STATUS:              Working
-SINCE:               5.1
-------------------------------------------------------------------------------
-EXTENSION:           pdo_firebird
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Odd fixes
-STATUS:              Working
-SINCE:               5.1
-------------------------------------------------------------------------------
-EXTENSION:           pdo_mysql
-PRIMARY MAINTAINER:  Unknown
-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:           pgsql
 PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Yasuo Ohgaki <yohgaki@php.net>
 MAINTENANCE:         Maintained
@@ -238,6 +196,22 @@ EXTENSION:           sybase_ct
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           oci8
+PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           odbc
+PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+COMMENT:             Working 
+-------------------------------------------------------------------------------
+EXTENSION:           oracle
+MAINTENANCE:         Orphaned
+STATUS:              Working
+COMMENT:             Using the new OCI8 driver is encouraged where possible.
+-------------------------------------------------------------------------------


 == XML extensions ==
@@ -246,23 +220,18 @@ STATUS:              Working
 EXTENSION:           dom
 PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>, Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           simplexml
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               5.0
 -------------------------------------------------------------------------------
-EXTENSION:           soap
-PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
 EXTENSION:           wddx
 PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
-MAINTENANCE:         Orphaned
+MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xml
@@ -270,25 +239,15 @@ PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           xmlreader
-PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.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
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               5.0
 -------------------------------------------------------------------------------

@@ -298,7 +257,7 @@ SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           bcmath
 MAINTENANCE:         Unknown
-STATUS:              Working
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           bz2
 PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
@@ -306,6 +265,11 @@ MAINTENANCE:         Odd Fixes
 STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
+EXTENSION:           dio
+MAINTENANCE:         Orphaned
+STATUS:              Working
+SINCE:               4.0.6
+-------------------------------------------------------------------------------
 EXTENSION:           calendar
 PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
 MAINTENANCE:         Odd Fixes
@@ -317,41 +281,40 @@ MAINTENANCE:         Maintained
 STATUS:              Windows
 SINCE:               5.0
 -------------------------------------------------------------------------------
+EXTENSION:           cpdf
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           ctype
 PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           curl
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>,Ilia Alshanetsky <iliaa@php.net>
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
-EXTENSION:           date
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
 EXTENSION:           exif
 PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.2
 -------------------------------------------------------------------------------
-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:           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
 -------------------------------------------------------------------------------
@@ -360,9 +323,8 @@ 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:           iconv
@@ -371,18 +333,12 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           imap
-PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>, Ilia Alshanetsky <iliaa@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>
+MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           json
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Odd fixes
-STATUS:              Working
-SINCE:               5.2
-------------------------------------------------------------------------------
 EXTENSION:           ldap
-PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>
+PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -398,40 +354,37 @@ STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mhash
 PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Unknown
+MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           mime_magic
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Deprecated
-STATUS:              Experimental
-COMMENT:             Use PECL's fileinfo extension instead
-------------------------------------------------------------------------------
-EXTENSION:           ming
-PRIMARY MAINTAINER:  Frank M. Kromann
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-------------------------------------------------------------------------------
-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:           msession
+PRIMARY MAINTAINER   Mark L. Woodward mlwmohawk@mohawksoft.com
+MAINTENANCE:         Maintained
+STATUS:              Working/Experimental
+COMMENT:             Tested on Linux, should work on other UNIX platforms. Backend server code can compile under Windows.
 -------------------------------------------------------------------------------
 EXTENSION:           openssl
-PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>, Pierre-Alain Joye <pajoye@php.net>
+PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
-EXTENSION:           pcntl
-MAINTENANCE:         Unknown
-STATUS:              Working
-------------------------------------------------------------------------------
 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:           pdf
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           pfpro
+PRIMARY MAINTAINER:  David Croft <david@infotrek.co.uk>
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               4.0.2
+-------------------------------------------------------------------------------
 EXTENSION:           posix
 PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
 MAINTENANCE:         Maintained
@@ -440,7 +393,7 @@ STATUS:              Working
 EXTENSION:           pspell
 PRIMARY MAINTAINER:  Vlad Krupin <phpdevel@echospace.com>
 MAINTENANCE:         Unknown
-STATUS:              Working
+STATUS:              Unknown
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           readline
@@ -452,20 +405,15 @@ PRIMARY MAINTAINER:  Kristian K
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           reflection
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>, Johannes Schlüter <johannes@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
 EXTENSION:           session
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Ilia Alshanetsky <iliaa@php.net>
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           shmop
 PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
 EXTENSION:           snmp
@@ -476,41 +424,30 @@ 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>
-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>
+EXTENSION:           yaz
+PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Unknown
+SINCE:               4.0.1
 -------------------------------------------------------------------------------
-EXTENSION:           tokenizer
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
+EXTENSION:           yp
 MAINTENANCE:         Unknown
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           zip
-PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           zlib
 PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de>
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
-                  The PHP License, version 3.01
-Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+                  The PHP License, Version 3.0
+Copyright (c) 1999 - 2003 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -38,8 +38,8 @@ are met:

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
-     "This product includes PHP software, freely available from
-     <http://www.php.net/software/>".
+     "This product includes PHP, freely available from
+     <http://www.php.net/>".

 THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
 ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -64,5 +64,5 @@ The PHP Group can be contacted via Email at group@php.net.
 For more information on the PHP Group and the PHP project, 
 please see <http://www.php.net>.

-PHP includes the Zend Engine, freely available at
+This product includes the Zend Engine, freely available at
 <http://www.zend.com>.
@@ -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
-	@$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/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
-	@$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o $@
+$(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
-	@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
+$(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
-	@$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/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
@@ -1,61 +0,0 @@
-
-#
-# LCOV
-#
-
-lcov: lcov-html
-
-lcov-test: lcov-clean-data test
-
-php_lcov.info: lcov-test
-	@echo "Generating data for $@"
-	@rm -rf lcov_data/
-	@$(mkinstalldirs) lcov_data/
-	@echo
-	-@find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq | while read x; do \
-		echo -n . ;\
-		y=`echo $$x | sed -e 's!\.libs/!!'`; \
-		dir=lcov_data/`dirname $$x`; \
-		test -d "$$dir" || $(mkinstalldirs) "$$dir"; \
-		if test -f "$(top_srcdir)/$$y.c"; then \
-			ln -f -s $(top_srcdir)/$$y.c lcov_data/$$y.c; \
-		fi; \
-		if test -f "$(top_srcdir)/$$y.h"; then \
-			ln -f -s $(top_srcdir)/$$y.h lcov_data/$$y.h; \
-		fi; \
-		if test -f "$(top_srcdir)/$$y.re"; then \
-			ln -f -s $(top_srcdir)/$$y.re lcov_data/$$y.re; \
-		fi; \
-		if test -f "$(top_srcdir)/$$y.y"; then \
-		        ln -f -s $(top_srcdir)/$$y.y lcov_data/$$y.y; \
-		fi; \
-		if test -f "$(top_srcdir)/$$y.l"; then \
-		        ln -f -s $(top_srcdir)/$$y.l lcov_data/$$y.l; \
-		fi; \
-		if test -f "$(top_srcdir)/$$y"; then \
-		        ln -f -s $(top_srcdir)/$$y lcov_data/$$y; \
-		fi; \
-		if test -f "$(top_builddir)/$$y.c"; then \
-			ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
-		fi; \
-		test -f "$$x.gcno" && cp $$x.gcno lcov_data/$$y.gcno ; \
-		test -f "$$x.gcda" && cp $$x.gcda lcov_data/$$y.gcda ; \
-		test -f "$$x.da"   && cp $$x.da   lcov_data/$$y.da ; \
-		test -f "$$x.bb"   && cp $$x.bb   lcov_data/$$y.bb ; \
-		test -f "$$x.bbg"  && cp $$x.bbg  lcov_data/$$y.bbg ; \
-	done
-	@echo 
-	@echo "Generating $@"
-	@$(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
-
-lcov-clean:
-	rm -f php_lcov.info
-	rm -rf lcov_data/
-	rm -rf lcov_html/
-
-lcov-clean-data:
-	@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
@@ -5,30 +5,31 @@ INSTALL_DATA = $(INSTALL) -m 644
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)

+
 all: $(all_targets) 
 	@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_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_SUFFIX_NAME).$$i; then \
+				$(LN_S) $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); \
 				break; \
 			fi; \
 		done; \
@@ -42,76 +43,34 @@ install-modules: build-modules
 	@rm -f modules/*.la >/dev/null 2>&1
 	@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)

-install-headers:
-	-@if test "$(INSTALL_HEADERS)"; then \
-		for i in `echo $(INSTALL_HEADERS)`; do \
-			i=`$(top_srcdir)/build/shtool path -d $$i`; \
-			paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
-		done; \
-		$(mkinstalldirs) $$paths && \
-		echo "Installing header files:          $(INSTALL_ROOT)$(phpincludedir)/" && \
-		for i in `echo $(INSTALL_HEADERS)`; do \
-			if test "$(PHP_PECL_EXTENSION)"; then \
-				src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \
-			else \
-				src=$$i; \
-			fi; \
-			if test -f "$(top_srcdir)/$$src"; then \
-				$(INSTALL_DATA) $(top_srcdir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \
-			elif test -f "$(top_builddir)/$$src"; then \
-				$(INSTALL_DATA) $(top_builddir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \
-			else \
-				(cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \
-				cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
-			fi \
-		done; \
-	fi
+install-tester:
+	@echo "Installing regression tester:     $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/"
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
+	@$(INSTALL) -m 755 $(top_srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR)

-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`
+install-su: install-pear install-tester

-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) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' "$$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 '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
-		fi; \
-		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
+test: 
+	-@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \
+		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
-			$(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); \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(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 php5.spec sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
-	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
+	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' configure|sed 's/.*>//'|xargs rm -f
+	find . -name Makefile | xargs rm -f

 .PHONY: all clean install distclean test
 .NOEXPORT:
@@ -0,0 +1,115 @@
+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.
+	
+
+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. Also see
+      the note below about automatically updating NEWS in your commit message.
+
+   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.
+
+If a line begins with #, it is taken to be a comment and will not appear
+in the ChangeLog.  If the line begins with @, it will be redirected to the
+NEWS file. 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 # or @ at the beginning of _every_ such line. Every 
+entry in NEWS has to have a name after it, so if you did it with someone's 
+help, put both your names there. Your name WILL NOT be automatically put
+at the end of the NEWS entry - so, please provide it yourself.
+
+Example. Say you modified two files, datetime.c and string.c. In datetime.c
+you added a new format option for 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:
+
+(PHP date) Added new 'K' format modifier for printing out number of
+           days until New Year's Eve.
+@- Added new 'K' format modifier that will output the number of days
+@  until New Year's Eve. (Bob)
+
+For string.c:
+(php_trim) Fixed a memory leak resulting from improper use of zval_dtor().
+# Man, that thing was leaking all over the place!
+@- Fixed memory leak in trim(). (Bob)
+
+The lines above marked with @ will go into NEWS file automagically, and the
+# lines will be omitted from the ChangeLog. Alternatively, you might want
+to modify NEWS file directly and not use the @ lines.
+
+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 pgsql notice handler double free crash bug. Bug #14016
+@ Fixed pgsql notice handler double free crash bug. Bug #14016
+
+If you don't see your messages in ChangeLog and NEWS right away, don't worry!
+These files are updated once a day, so your stuff will not show up until
+somewhat later. Don't go adding stuff to NEWS by hand if you already put @
+lines in the commit message.
+
+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
@@ -31,17 +31,14 @@ resources cannot be auto-converted.

 Type specifiers
 ---------------
- 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
+ d	- double
+ s	- string (with possible null bytes) and its length
+ b	- boolean, stored in zend_bool
+ r	- resource (stored in zval)
+ a	- array
 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:
@@ -51,8 +48,8 @@ Type specifiers
 	    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 's', 'a', 'o', 'O', 'r', 'h', 'C', 'z', and 'Z'). If NULL is passed,
-	 	the results pointer is set to NULL as well.
+	    to 'a', 'o', 'O', 'r', and 'z'). If NULL is passed, the results
+	    pointer is set to NULL as well.

 Examples
 --------
@@ -70,7 +67,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
 /* 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;
@@ -1,5 +1,5 @@
-1. strrpos() and strripos() now use the entire string as a needle.  Be aware
-   that the existing scripts may no longer work as you expect.
+1. strrpos() and strripos() now use the entire string as a needle.
+   Be aware that the existing scripts may no longer work as you expect.

   EX :
   <?php
@@ -53,103 +53,18 @@
   variables_order setting.  As in, the CLI version will now always populate
   the global $argc and $argv variables.

-8. In some cases classes must be declared before used. It only happens only
-   if some of the new features of PHP 5 are used. Otherwise the behaviour is
-   the old.
-   Example 1 (works with no errors):
+8. Classes must be declared before used:
   <?php
-   $a = new a();
-   class a {
+   $test = new fubar();
+   $test->barfu();
+
+   class fubar {
+       function barfu() {
+           echo 'fubar';
+       }
   }
   ?>
- 
-   Example 2 (throws an error):
-   <?php 
-   $a = new a();
-   interface b{
-   }
-   class a implements b {
-   } 
-   ?>
-
-   Output (example 2) :
-   Fatal error: Class 'a' not found in /tmp/cl.php on line 2
-
-9. get_class() starting PHP 5 returns the name of the class as it was
-   declared which may lead to problems in older scripts that rely on
-   the previous behaviour - the class name is lowercased. Expect the
-   same behaviour from get_parent_class() when applicable.
-   Example :
-   <?php
-   class FooBar {
-   }
-   class ExtFooBar extends FooBar{}
-   $a = new FooBar();
-   var_dump(get_class($a), get_parent_class($a));
-   ?>
-
-   Output (PHP 4):
-   string(6) "foobar"
-   string(9) "extfoobar"
-
-   Output (PHP 5):
-   string(6) "FooBar"
-   string(9) "ExtFooBar"
-   ----------------------------------------------------------------------
-   Example code that will break :
-   //....
-   function someMethod($p) {
-     if (get_class($p) != 'helpingclass') {
-       return FALSE;
-     }
-     //...
-   }
-   //...
-   Possible solution is to search for get_class() and get_parent_class() in
-   all your scripts and use strtolower().
-
-10. get_class_methods() returns the names of the methods of a class as they
-   declared. In PHP4 the names are all lowercased.
-   Example code :
-   <?php
-   class Foo{
-     function doFoo(){}
-     function hasFoo(){}
-   }
-   var_dump(get_class_methods("Foo")); 
-   ?>
-   Output (PHP4):
-   array(2) {
-     [0]=>
-     string(5) "dofoo"
-     [1]=>
-     string(6) "hasfoo"
-   }
-   Output (PHP5):
-   array(2) {
-     [0]=>
-     string(5) "doFoo"
-     [1]=>
-     string(6) "hasFoo"
-   }
-
-11. Assignment $this is impossible. Starting PHP 5.0.0 $this has special
-    meaning in class methods and is recognized by the PHP parser. The latter
-    will generate a parse error when assignment to $this is found
-    Example code :
-    <?php
-    class Foo {
-      function assignNew($obj) {
-        $this = $obj;
-      }
-    }
-    $a = new Foo();
-    $b = new Foo();
-    $a->assignNew($b);
-    echo "I was executed\n";
-    ?>
-    Output (PHP 4):
-    I was executed
-    Output (PHP 5):
-    PHP Fatal error:  Cannot re-assign $this in /tmp/this_ex.php on line 4
-
+   This script is perfectly valid and works in PHP 4 but with PHP 5 there
+   will be a fatal error like :
+   Fatal error: Class 'fubar' not found in ....
+   If there is defined function __autoload() it will be called.
@@ -8,11 +8,11 @@ part is making it acceptable for inclusion into our repository. :-)

 How to create patch?  
 -------------------- 
-We use Subversion (SVN) for revision control.  You need to get the
-source from SVN in order to create a patch.  Read
-http://www.php.net/svn.php for help on using SVN.  You can check out
-older branches, but make sure you get trunk as well and make your
-patch work there.
+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)

 Read CODING_STANDARDS file before you start working.

@@ -21,7 +21,7 @@ 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 
-"svn diff > your.patch" command.
+"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
@@ -41,8 +41,25 @@ maintainer and/or internals@lists.php.net, or pear-dev@lists.php.net if
 you are patching PEAR. Official module maintainers can be found in
 EXTENSIONS file in PHP source.

-If you are new to SVN (Subversion), visit
-http://svnbook.red-bean.com/ for details.
+If you are new to CVS (Concurrent Versions System), visit 
+http://cvshome.org/ for details.
+
+
+Recommended CVS client settings for creating patch file
+------------------------------------------------------
+Recommended ~/.cvsrc file setting is:
+------
+cvs -z3
+update -d -P
+checkout -P
+diff -u
+
+------
+diff -u means:
+ -u     Use the unified output format.
+
+With this CVS setting, you don't have to worry about adding/deleting
+newlines and spaces.


 Check list for submitting patch
@@ -53,7 +70,10 @@ Check list for submitting patch
   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 update SVN source before you take final patch?
+ - 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?


@@ -98,7 +118,7 @@ these questions:

 What happens when your patch is applied?
 ---------------------------------------- 
-Your name will be included together with your email address in the SVN 
+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.

@@ -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 CVS 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 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.
-
-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
@@ -1,20 +1,11 @@
 [IMPORTANT NOTICE]
 ------------------
- Failed tests usualy indicate a problem with your local system setup
-and not within PHP itself (at least for official PHP release versions).
-You may decide to automaticaly submit a test summary to our QA workflow
-at the end of a test run.
- Please do *not* submit a failed test as a bug or ask for help on why
-it failed on your system without providing substantial backup information
-on *why* the test failed on your special setup. Thank you :-)
+ Please do not ask developers why some or all tests are failing in
+your environment! Let us know if you find why it fails. Thank you.


 [Testing Basics] 
 ----------------
- The easiest way to test your PHP build is to run "make test" from the
-command line after successfully compiling. This will run the complete
-tests for all enabled functionalities and extensions using the PHP
-CLI binary.
 To execute test scripts, you must build PHP with some SAPI, then you
 type "make test" to execute all or some test scripts saved under
 "tests" directory under source root directory.
@@ -32,12 +23,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


@@ -10,10 +10,7 @@ The Input Filter support in PHP 5 is aimed at providing the framework
 through which a company-wide or site-wide security policy can be
 enforced.  It is implemented as a SAPI hook and is called from the
 treat_data and post handler functions.  To implement your own security
-policy you will need to write a standard PHP extension.  There is also
-a powerful standard implementation in ext/filter that should suit most
-peoples' needs.  However, if you want to implement your own security 
-policy, read on.
+policy you will need to write a standard PHP extension.  

 A simple implementation might look like the following.  This stores the
 original raw user data and adds a my_get_raw() function while the normal
@@ -37,7 +34,7 @@ ZEND_END_MODULE_GLOBALS(my_input_filter)

 ZEND_DECLARE_MODULE_GLOBALS(my_input_filter)

-zend_function_entry my_input_filter_functions[] = {
+function_entry my_input_filter_functions[] = {
    PHP_FE(my_get_raw,   NULL)
    {NULL, NULL, NULL}
 };
@@ -158,7 +155,7 @@ PHP_FUNCTION(my_get_raw)
    HashTable *hash_ptr;
    char *raw_var;

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

@@ -7,6 +7,13 @@ Zend
      dimensional arrays.
    * Look at replacing c-lib call tolower().
    * Make hash API functions work with HASH_OF() to save time.
+    * Allow to set a default value for call-by-reference-parameters. 
+      eg: function hello (&$pallo = NULL) {} 
+    * Add configure test to determine if dlsym() requires underscore and set
+      DLSYM_NEEDS_UNDERSCORE accordingly. Perl and zsh have it in configure, 
+      for example. (DONE?)
+    * Allow foreach ($array as $k => &$val) syntax. right now we cannot 
+      traverse an array without copying each element.
    * Native large number support (probably with GNU GMP)
    * Const'ify APIs. Right now, many functions leave parameters untouched,
      but don't declare those as const. This makes interaction with other
@@ -64,6 +71,14 @@ 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.
@@ -96,6 +111,13 @@ ext/pcntl
    * Remove all zend_extension code
    * Add object callback support to pcntl_signal()

+ext/pgsql
+---------
+    For PHP 4.3.0:
+    * Add pg_metadata() with metadata cache feature.
+    * Add pg_convert() to check and convert array value for query.
+    * Add pg_insert/pg_update/pg_delete/pg_select for simple query.
+
 ext/session
 -----------
    For PHP 4.3.0:
@@ -122,6 +144,7 @@ ext/standard
 ext/wddx
 --------
    * See if we can support the remaining data types:
+        dateTime
        binary

        http://www.wddx.org/WDDX_SDK_10a/7__References/WDDX_DTD.htm
@@ -1,4 +0,0 @@
-Zend Engine
-----------
-  - Look at making zend_constant value member be a zval* instead of zval. (Andi)
-  - Implement inheritance rules for type hints. (Marcus) 
@@ -16,6 +16,83 @@ Responsibility: Andi, Stig?
 Time frame:     ?


+Component:      Introspection
+
+                get_function_definition(<is_callable> [field]) =>
+                array(
+                	file => filename
+                	line_start =>
+                	line_end =>
+                	parameters => array( name, byref, default )
+                	static_variables => array( name, value/default )
+                	scope => 'namespace' | 'class' | null
+                	namespace => classname | namespacename | 'main'
+                	protection => protection_flags
+                	phpdoc => pre-scanned-phpdoc-string
+                	type => 'internal' | 'user'
+                )
+                
+                get_class_definition(<class> [field]) =>
+                array(
+                	type => 'internal' | 'user'
+                	file => filename
+                	line_start => 
+                	line_end =>
+                	name => pretty-name
+                	parent => classname | namespace | null
+                	flags => bitfield (ABSTRACT)
+                	methods => array( array( name, phpdoc ) )
+                	default_properties => array( array( name, value, phpdoc ) )
+                	private_properties => array( array( name, value, phpdoc ) )
+                	protected_properties => array( array( name, value, phpdoc ) )
+                	public_properties => array( array( name, value, phpdoc ) )
+                	static_members => array( array( name, value, phpdoc ) )
+                	constants => array( array( name, value, phpdoc ) )
+                	classes => array( array( name, phpdoc ) )
+                	phpdoc => pre-scanned-phpdoc-string
+                )
+                
+                get_constant_definition(<constant> [field]) =>
+                array(
+                	file => filename
+                	line_start =>
+                	line_end =>
+                	name => 
+                	value =>
+                	phpdoc =>
+                )
+                
+                get_global_variable_defintion(<name> [field]) =>
+                array(
+                	file =>
+                	line_start =>
+                	line_end =>
+                	name =>
+                	phpdoc =>
+                )
+                
+                We tried to take into account the implementation of each piece of
+                information, and there are some that are problematic, especially those
+                regarding constants and global variables (where do we store the extra
+                information?)
+                
+                With "pre-scanned-phpdoc-string" we mean converting:
+                
+                /**
+                 * Blah blah blah
+                 * @param foo ...
+                 */
+                
+                to:
+                
+                Blah blah blah
+                @param foo
+                
+                The rest of the phpdoc handling should be left to an extension.
+Responsibility: Stig, Andrei, Harald
+Time frame:     ?
+
+
 Component:      Redesign of API Versioning
 Responsibility: ?
 Time frame:     1 month
@@ -48,6 +125,26 @@ Responsibility: Shane Caraveo & each sapi module owner
 Timeframe:      ? (but shouldn't be much effort, most modules are probably ok)


+Component:      Input Filtering
+                - Implement a SAPI input filter hook that will get called
+                  just before registering a variable in the 
+                  treat_data/post_handler hooks.  (done)
+                - Make sure this is also done in mbstring  (done)
+                - Provide access functions, or perhaps a new 
+                  $_RAW_GET/POST/Cookie set of superglobals to get at the
+                  unfiltered data
+                - Provide a .ini directive which allows people to set their
+                  input filter to one of the built-in strip_tags,
+                  htmlspecialchars or whatever other internal function might
+                  be useful here.
+                - (The main benefit of this is to make it easier for people
+                   to solve the XSS problem once and for all without having
+                   to go through every line of their code and adding input
+                   validation/filtering everywhere)
+Responsibility: Rasmus
+Timeframe:      Yesterday
+
+
 Component:      RPC Abstraction Layer
                Porting java, com, dotnet, xmlrpc, corba, soap and python, srm
                (are there more ?) to work with the new oo api and preferably
@@ -75,6 +172,31 @@ Responsibility: Sterling, Harald
 Time frame:     ?


+Component:      MySQL Extension
+                Complete rewrite, leveraging the new MySQL 4 / MySQL 5
+                features.
+Responsibility: Georg Richter, Zak Greant
+Timeframe:      ?
+
+
+Component:      XML
+                - Rewrite DOMXML and incorporate all (or most of) W3C-DOM2.
+                - Use the new ZE2 features (Exceptions, setter/getter).
+                - Add SAX(2), XML Schema.
+                - XSLT, HTML, XPath, XPointer, DTD Validation will still be
+                  supported, have to find a meaningful API for it.
+                - Break BC, warn users now.
+                - Look at the libxml2 patch by lukas schröder and see if we can prevent
+                  memory leaks with it (anyway, getting rid of mem-leaks and intelligent
+                  memory management is on top prio...)
+                - In the longer term, domxml (or another name, as with todays features
+                  domxml is a little bit misleading) shall be the main xml-class, which
+                  covers most of what's needed for decent XML support in PHP ;)
+                  But there is certainly place for others like Sablotron etc.
+Responsibility: Christian Stocker
+Timeframe:      ?
+
+
 Component:      Test Suite
                Extending the test suite with atleast a test for every
                function in an extension that doesn't require external
@@ -0,0 +1,3 @@
+- clean up .cvsignores
+- purge Makefile.ins and replace PHP_EXTENSION in config.m4s
+  with appropiate calls to PHP_NEW_EXTENSION
@@ -1,4 +1,4 @@
-Copyright (c) 1999-2006, Andi Gutmans, Sascha Schumann, Zeev Suraski.
+Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Thread Safe Resource Manager                                         |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2009, Andi Gutmans, Sascha Schumann, Zeev Suraski |
+   | Copyright (c) 1999, 2000, 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                                |
   +----------------------------------------------------------------------+
@@ -34,7 +34,6 @@ typedef struct {
 	size_t size;
 	ts_allocate_ctor ctor;
 	ts_allocate_dtor dtor;
-	int done;
 } tsrm_resource_type;


@@ -92,28 +91,12 @@ static FILE *tsrm_error_file;
 #if defined(PTHREADS)
 /* Thread local storage */
 static pthread_key_t tls_key;
-# define tsrm_tls_set(what)		pthread_setspecific(tls_key, (void*)(what))
-# define tsrm_tls_get()			pthread_getspecific(tls_key)
-
 #elif defined(TSRM_ST)
 static int tls_key;
-# define tsrm_tls_set(what)		st_thread_setspecific(tls_key, (void*)(what))
-# define tsrm_tls_get()			st_thread_getspecific(tls_key)
-
 #elif defined(TSRM_WIN32)
 static DWORD tls_key;
-# define tsrm_tls_set(what)		TlsSetValue(tls_key, (void*)(what))
-# define tsrm_tls_get()			TlsGetValue(tls_key)
-
 #elif defined(BETHREADS)
 static int32 tls_key;
-# define tsrm_tls_set(what)		tls_set(tls_key, (void*)(what))
-# define tsrm_tls_get()			(tsrm_tls_entry*)tls_get(tls_key)
-
-#else
-# define tsrm_tls_set(what)
-# define tsrm_tls_get()			NULL
-# warning tsrm_set_interpreter_context is probably broken on this platform
 #endif

 /* Startup TSRM (call once for the entire process) */
@@ -175,12 +158,10 @@ TSRM_API void tsrm_shutdown(void)

 				next_p = p->next;
 				for (j=0; j<p->count; j++) {
-					if (p->storage[j]) {
-						if (resource_types_table && !resource_types_table[j].done && resource_types_table[j].dtor) {
-							resource_types_table[j].dtor(p->storage[j], &p->storage);
-						}
-						free(p->storage[j]);
+					if (resource_types_table && resource_types_table[j].dtor) {
+						resource_types_table[j].dtor(p->storage[j], &p->storage);
 					}
+					free(p->storage[j]);
 				}
 				free(p->storage);
 				free(p);
@@ -238,7 +219,6 @@ TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].size = size;
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].ctor = ctor;
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].dtor = dtor;
-	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].done = 0;

 	/* enlarge the arrays for the already active threads */
 	for (i=0; i<tsrm_tls_table_size; i++) {
@@ -278,29 +258,32 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 	(*thread_resources_ptr)->thread_id = thread_id;
 	(*thread_resources_ptr)->next = NULL;

+#if defined(PTHREADS)
 	/* Set thread local storage to this new thread resources structure */
-	tsrm_tls_set(*thread_resources_ptr);
+	pthread_setspecific(tls_key, (void *) *thread_resources_ptr);
+#elif defined(TSRM_ST)
+	st_thread_setspecific(tls_key, (void *) *thread_resources_ptr);
+#elif defined(TSRM_WIN32)
+	TlsSetValue(tls_key, (void *) *thread_resources_ptr);
+#elif defined(BETHREADS)
+	tls_set(tls_key, (void*) *thread_resources_ptr);
+#endif

 	if (tsrm_new_thread_begin_handler) {
 		tsrm_new_thread_begin_handler(thread_id, &((*thread_resources_ptr)->storage));
 	}
 	for (i=0; i<id_count; i++) {
-		if (resource_types_table[i].done) {
-			(*thread_resources_ptr)->storage[i] = NULL;
-		} else
-		{
-			(*thread_resources_ptr)->storage[i] = (void *) malloc(resource_types_table[i].size);
-			if (resource_types_table[i].ctor) {
-				resource_types_table[i].ctor((*thread_resources_ptr)->storage[i], &(*thread_resources_ptr)->storage);
-			}
+		(*thread_resources_ptr)->storage[i] = (void *) malloc(resource_types_table[i].size);
+		if (resource_types_table[i].ctor) {
+			resource_types_table[i].ctor((*thread_resources_ptr)->storage[i], &(*thread_resources_ptr)->storage);
 		}
 	}

+	tsrm_mutex_unlock(tsmm_mutex);
+
 	if (tsrm_new_thread_end_handler) {
 		tsrm_new_thread_end_handler(thread_id, &((*thread_resources_ptr)->storage));
 	}
-
-	tsrm_mutex_unlock(tsmm_mutex);
 }


@@ -321,13 +304,22 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 	if(tsrm_tls_table) {
 #endif
 	if (!th_id) {
+#if defined(PTHREADS)
 		/* Fast path for looking up the resources for the current
 		 * thread. Its used by just about every call to
 		 * ts_resource_ex(). This avoids the need for a mutex lock
 		 * and our hashtable lookup.
 		 */
-		thread_resources = tsrm_tls_get();
-
+		thread_resources = pthread_getspecific(tls_key);
+#elif defined(TSRM_ST)
+		thread_resources = st_thread_getspecific(tls_key);
+#elif defined(TSRM_WIN32)
+		thread_resources = TlsGetValue(tls_key);
+#elif defined(BETHREADS)
+		thread_resources = (tsrm_tls_entry*)tls_get(tls_key);
+#else
+		thread_resources = NULL;
+#endif
 		if (thread_resources) {
 			TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Fetching resource id %d for current thread %d", id, (long) thread_resources->thread_id));
 			/* Read a specific resource from the thread's resources.
@@ -378,65 +370,6 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 #endif
 }

-/* frees an interpreter context.  You are responsible for making sure that
- * it is not linked into the TSRM hash, and not marked as the current interpreter */
-void tsrm_free_interpreter_context(void *context)
-{
-	tsrm_tls_entry *next, *thread_resources = (tsrm_tls_entry*)context;
-	int i;
-
-	while (thread_resources) {
-		next = thread_resources->next;
-
-		for (i=0; i<thread_resources->count; i++) {
-			if (resource_types_table[i].dtor) {
-				resource_types_table[i].dtor(thread_resources->storage[i], &thread_resources->storage);
-			}
-		}
-		for (i=0; i<thread_resources->count; i++) {
-			free(thread_resources->storage[i]);
-		}
-		free(thread_resources->storage);
-		free(thread_resources);
-		thread_resources = next;
-	}
-}
-
-void *tsrm_set_interpreter_context(void *new_ctx)
-{
-	tsrm_tls_entry *current;
-
-	current = tsrm_tls_get();
-
-	/* TODO: unlink current from the global linked list, and replace it
-	 * it with the new context, protected by mutex where/if appropriate */
-
-	/* Set thread local storage to this new thread resources structure */
-	tsrm_tls_set(new_ctx);
-
-	/* return old context, so caller can restore it when they're done */
-	return current;
-}
-
-
-/* allocates a new interpreter context */
-void *tsrm_new_interpreter_context(void)
-{
-	tsrm_tls_entry *new_ctx, *current;
-	THREAD_T thread_id;
-
-	thread_id = tsrm_thread_id();
-	tsrm_mutex_lock(tsmm_mutex);
-
-	current = tsrm_tls_get();
-
-	allocate_new_resource(&new_ctx, thread_id);
-	
-	/* switch back to the context that was in use prior to our creation
-	 * of the new one */
-	return tsrm_set_interpreter_context(current);
-}
-

 /* frees all resources allocated for the current thread */
 void ts_free_thread(void)
@@ -467,7 +400,11 @@ void ts_free_thread(void)
 			} else {
 				tsrm_tls_table[hash_value] = thread_resources->next;
 			}
-			tsrm_tls_set(0);
+#if defined(PTHREADS)
+			pthread_setspecific(tls_key, 0);
+#elif defined(TSRM_WIN32)
+			TlsSetValue(tls_key, 0);
+#endif
 			free(thread_resources);
 			break;
 		}
@@ -480,83 +417,9 @@ void ts_free_thread(void)
 }


-/* frees all resources allocated for all threads except current */
-void ts_free_worker_threads(void)
-{
-	tsrm_tls_entry *thread_resources;
-	int i;
-	THREAD_T thread_id = tsrm_thread_id();
-	int hash_value;
-	tsrm_tls_entry *last=NULL;
-
-	tsrm_mutex_lock(tsmm_mutex);
-	hash_value = THREAD_HASH_OF(thread_id, tsrm_tls_table_size);
-	thread_resources = tsrm_tls_table[hash_value];
-
-	while (thread_resources) {
-		if (thread_resources->thread_id != thread_id) {
-			for (i=0; i<thread_resources->count; i++) {
-				if (resource_types_table[i].dtor) {
-					resource_types_table[i].dtor(thread_resources->storage[i], &thread_resources->storage);
-				}
-			}
-			for (i=0; i<thread_resources->count; i++) {
-				free(thread_resources->storage[i]);
-			}
-			free(thread_resources->storage);
-			if (last) {
-				last->next = thread_resources->next;
-			} else {
-				tsrm_tls_table[hash_value] = thread_resources->next;
-			}
-			free(thread_resources);
-			if (last) {
-				thread_resources = last->next;
-			} else {
-				thread_resources = tsrm_tls_table[hash_value];
-			}
-		} else {
-			if (thread_resources->next) {
-				last = thread_resources;
-			}
-			thread_resources = thread_resources->next;
-		}
-	}
-	tsrm_mutex_unlock(tsmm_mutex);
-}
-
-
 /* deallocates all occurrences of a given id */
 void ts_free_id(ts_rsrc_id id)
 {
-	int i;
-	int j = TSRM_UNSHUFFLE_RSRC_ID(id);
-
-	tsrm_mutex_lock(tsmm_mutex);
-
-	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Freeing resource id %d", id));
-
-	if (tsrm_tls_table) {
-		for (i=0; i<tsrm_tls_table_size; i++) {
-			tsrm_tls_entry *p = tsrm_tls_table[i];
-
-			while (p) {
-				if (p->count > j && p->storage[j]) {
-					if (resource_types_table && resource_types_table[j].dtor) {
-						resource_types_table[j].dtor(p->storage[j], &p->storage);
-					}
-					free(p->storage[j]);
-					p->storage[j] = NULL;
-				}
-				p = p->next;
-			}
-		}
-	}
-	resource_types_table[j].done = 1;
-
-	tsrm_mutex_unlock(tsmm_mutex);
-
-	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Successfully freed resource id %d", id));
 }


@@ -571,6 +434,13 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 {
 #ifdef TSRM_WIN32
 	return GetCurrentThreadId();
+#elif defined(NETWARE)
+	/* There seems to be some problem with the LibC call: NXThreadGetId().
+	 * Due to this, the PHPMyAdmin application is abending in PHP calls.
+	 * Used the call, kCurrentThread instead and it works fine.
+	 */
+/*	return NXThreadGetId(); */
+	return kCurrentThread();
 #elif defined(GNUPTH)
 	return pth_self();
 #elif defined(PTHREADS)
@@ -591,9 +461,24 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 {
 	MUTEX_T mutexp;
+#ifdef NETWARE
+#ifndef USE_MPK
+	/* To use the Recursive Mutex Locking of LibC */
+	long flags = NX_MUTEX_RECURSIVE;
+	NXHierarchy_t order = 0;
+	NX_LOCK_INFO_ALLOC (lockInfo, "PHP-TSRM", 0);
+#endif
+#endif
+
 #ifdef TSRM_WIN32
 	mutexp = malloc(sizeof(CRITICAL_SECTION));
 	InitializeCriticalSection(mutexp);
+#elif defined(NETWARE)
+#ifdef USE_MPK
+	mutexp = kMutexAlloc((BYTE*)"PHP-TSRM");
+#else
+	mutexp = NXMutexAlloc(flags, order, &lockInfo);
+#endif
 #elif defined(GNUPTH)
 	mutexp = (MUTEX_T) malloc(sizeof(*mutexp));
 	pth_mutex_init(mutexp);
@@ -625,6 +510,12 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
 		DeleteCriticalSection(mutexp);
 		free(mutexp);
+#elif defined(NETWARE)
+#ifdef USE_MPK
+		kMutexFree(mutexp);
+#else
+		NXMutexFree(mutexp);
+#endif
 #elif defined(GNUPTH)
 		free(mutexp);
 #elif defined(PTHREADS)
@@ -654,6 +545,12 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
 	EnterCriticalSection(mutexp);
 	return 1;
+#elif defined(NETWARE)
+#ifdef USE_MPK
+	return kMutexLock(mutexp);
+#else
+	return NXLock(mutexp);
+#endif
 #elif defined(GNUPTH)
 	return pth_mutex_acquire(mutexp, 0, NULL);
 #elif defined(PTHREADS)
@@ -679,6 +576,12 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
 	LeaveCriticalSection(mutexp);
 	return 1;
+#elif defined(NETWARE)
+#ifdef USE_MPK
+	return kMutexUnlock(mutexp);
+#else
+	return NXUnlock(mutexp);
+#endif
 #elif defined(GNUPTH)
 	return pth_mutex_release(mutexp);
 #elif defined(PTHREADS)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Thread Safe Resource Manager                                         |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2009, Andi Gutmans, Sascha Schumann, Zeev Suraski |
+   | Copyright (c) 1999, 2000, 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,11 +13,14 @@
 #ifndef TSRM_H
 #define TSRM_H

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

 #ifdef TSRM_WIN32
@@ -30,14 +33,6 @@
 #	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

@@ -47,6 +42,13 @@ typedef unsigned long tsrm_uintptr_t;
 # endif
 # include <windows.h>
 # include <shellapi.h>
+#elif defined(NETWARE)
+# include <nks/thread.h>
+#ifdef USE_MPK
+# include <mpklib4php.h>
+#else
+# include <nks/synch.h>
+#endif
 #elif defined(GNUPTH)
 # include <pth.h>
 #elif defined(PTHREADS)
@@ -64,6 +66,13 @@ typedef int ts_rsrc_id;
 #ifdef TSRM_WIN32
 # define THREAD_T DWORD
 # define MUTEX_T CRITICAL_SECTION *
+#elif defined(NETWARE)
+# define THREAD_T NXThreadId_t
+#ifdef USE_MPK
+# define MUTEX_T MUTEX
+#else
+# define MUTEX_T NXMutex_t *
+#endif
 #elif defined(GNUPTH)
 # define THREAD_T pth_t
 # define MUTEX_T pth_mutex_t *
@@ -111,9 +120,6 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id);
 /* frees all resources allocated for the current thread */
 TSRM_API void ts_free_thread(void);

-/* frees all resources allocated for all threads except current */
-void ts_free_worker_threads(void);
-
 /* deallocates all occurrences of a given id */
 TSRM_API void ts_free_id(ts_rsrc_id id);

@@ -140,18 +146,12 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp);
 TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler);
 TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);

-/* these 3 APIs should only be used by people that fully understand the threading model
- * used by PHP/Zend and the selected SAPI. */
-TSRM_API void *tsrm_new_interpreter_context(void);
-TSRM_API void *tsrm_set_interpreter_context(void *new_ctx);
-TSRM_API void tsrm_free_interpreter_context(void *context);
-
 #define TSRM_SHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)+1)
 #define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)-1)

 #define TSRMLS_FETCH()			void ***tsrm_ls = (void ***) ts_resource_ex(0, NULL)
 #define TSRMLS_FETCH_FROM_CTX(ctx)	void ***tsrm_ls = (void ***) ctx
-#define TSRMLS_SET_CTX(ctx)		ctx = (void ***) tsrm_ls
+#define TSRMLS_SET_CTX(ctx)		(void ***) ctx = tsrm_ls
 #define TSRMG(id, type, element)	(((type) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
 #define TSRMLS_D	void ***tsrm_ls
 #define TSRMLS_DC	, TSRMLS_D
@@ -1,5 +1,5 @@

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

@@ -7,15 +7,11 @@
 * on Windows 95/NT.
 */

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

 /* struct dirent - same as Unix */

@@ -29,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;
@@ -42,6 +38,7 @@ DIR *opendir(const char *);
 struct dirent *readdir(DIR *);
 int readdir_r(DIR *, struct dirent *, struct dirent **);
 int closedir(DIR *);
-int rewinddir(DIR *);
+void rewinddir(DIR *);
+

 #endif /* READDIR_H */
@@ -30,7 +30,7 @@ dnl PTHREADS_FLAGS
 dnl
 dnl Set some magic defines to achieve POSIX threads conformance
 dnl
-AC_DEFUN([PTHREADS_FLAGS],[
+AC_DEFUN(PTHREADS_FLAGS,[
  if test -z "$host_alias" && test -n "$host"; then
    host_alias=$host
  fi
@@ -65,7 +65,7 @@ dnl PTHREADS_CHECK_COMPILE
 dnl
 dnl Check whether the current setup can use POSIX threads calls
 dnl
-AC_DEFUN([PTHREADS_CHECK_COMPILE], [
+AC_DEFUN(PTHREADS_CHECK_COMPILE, [
 AC_TRY_RUN( [
 #include <pthread.h>
 #include <stddef.h>
@@ -84,15 +84,7 @@ int main() {
  pthreads_working=yes
  ], [
  pthreads_working=no
-  ], [
-  dnl For cross compiling running this test is of no use. NetWare supports pthreads
-  pthreads_working=no
-  case $host_alias in
-  *netware*)
-    pthreads_working=yes
-  esac
-]
-) ] )dnl
+  ], pthreads_working=no ) ] )dnl
 dnl
 dnl PTHREADS_CHECK()
 dnl
@@ -108,7 +100,7 @@ dnl  -pthreads         gcc (Solaris)
 dnl  -qthreaded        AIX cc V5
 dnl  -threads          gcc (HP-UX)
 dnl
-AC_DEFUN([PTHREADS_CHECK],[
+AC_DEFUN(PTHREADS_CHECK,[

 if test "$beos_threads" = "1"; then
  pthreads_working="yes"
@@ -162,7 +154,7 @@ fi
 ])dnl
 dnl
 dnl
-AC_DEFUN([PTHREADS_ASSIGN_VARS],[
+AC_DEFUN(PTHREADS_ASSIGN_VARS,[
 if test -n "$ac_cv_pthreads_lib"; then
  LIBS="$LIBS -l$ac_cv_pthreads_lib"
 fi
@@ -1,6 +1,6 @@

 dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
-AC_DEFUN([TSRM_CHECK_GCC_ARG],[
+AC_DEFUN(TSRM_CHECK_GCC_ARG,[
  gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
  AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
  echo 'void somefunc() { };' > conftest.c
@@ -21,7 +21,7 @@ AC_DEFUN([TSRM_CHECK_GCC_ARG],[
  fi
 ])

-AC_DEFUN([TSRM_BASIC_CHECKS],[
+AC_DEFUN(TSRM_BASIC_CHECKS,[

 AC_REQUIRE([AC_PROG_CC])dnl
 dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
@@ -33,7 +33,7 @@ AC_CHECK_HEADERS(stdarg.h)
 ])


-AC_DEFUN([TSRM_CHECK_PTH],[
+AC_DEFUN(TSRM_CHECK_PTH,[

 AC_MSG_CHECKING(for GNU Pth)
 PTH_PREFIX="`$1 --prefix`"
@@ -50,7 +50,7 @@ AC_MSG_RESULT(yes - installed in $PTH_PREFIX)

 ])

-AC_DEFUN([TSRM_CHECK_ST],[
+AC_DEFUN(TSRM_CHECK_ST,[
  if test -r "$1/include/st.h"; then
    CPPFLAGS="$CPPFLAGS -I$1/include"
    LDFLAGS="$LDFLAGS -L$1/lib"
@@ -68,8 +68,9 @@ AC_DEFUN([TSRM_CHECK_ST],[
 ])

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

-AC_DEFUN([TSRM_CHECK_PTHREADS],[
+AC_DEFUN(TSRM_CHECK_PTHREADS,[
 		
 PTHREADS_CHECK

@@ -88,14 +89,14 @@ fi
 ])


-AC_DEFUN([TSRM_THREADS_CHECKS],[
+AC_DEFUN(TSRM_THREADS_CHECKS,[

 dnl For the thread implementations, we always use --with-*
 dnl to maintain consistency

 AC_ARG_WITH(tsrm-pth,
 [  --with-tsrm-pth[=pth-config]
-                          Use GNU Pth],[
+                          Use GNU Pth.],[
  TSRM_PTH=$withval
 ],[
  TSRM_PTH=no
@@ -0,0 +1,11 @@
+#ifndef TSRM_CONFIG_NW_H
+#define TSRM_CONFIG_NW_H
+
+#define HAVE_UTIME 1
+
+/* Though we have alloca(), this seems to be causing some problem
+ * with the stack pointer. Hence not using it
+ */
+/*#define HAVE_ALLOCA 1*/
+
+#endif
@@ -1,16 +1,16 @@
 #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
 # include "tsrm_config.w32.h"
+#elif defined(NETWARE)
+# include "tsrm_config.nw.h"
 #else
-# include <tsrm_config.h>
+# include "tsrm_config.h"
 # include <sys/param.h>
 #endif

@@ -44,8 +44,6 @@ char *alloca ();
 #ifndef MAXPATHLEN
 # ifdef PATH_MAX
 #  define MAXPATHLEN PATH_MAX
-# elif defined(MAX_PATH)
-#  define MAXPATHLEN MAX_PATH
 # else
 #  define MAXPATHLEN 256
 # endif
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2004 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.txt.                                  |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2004 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.txt.                                  |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2004 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.txt.                                  |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
@@ -37,14 +37,8 @@
 #include <stdarg.h>
 #endif

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

 #if defined(__osf__) || defined(_AIX)
@@ -80,9 +74,10 @@ typedef unsigned short mode_t;
 #define DEFAULT_DIR_SEPARATOR	';'
 #define IS_SLASH(c)	((c) == '/' || (c) == '\\')
 #define IS_SLASH_P(c)	IS_SLASH(*(c))
-/* Colon indicates volume name, either first character should be forward slash or backward slash */
+#define COPY_WHEN_ABSOLUTE(path) \
+    (strchr(path, ':') - path + 1)  /* Take the volume name which ends with a colon */
 #define IS_ABSOLUTE_PATH(path, len) \
-    ((strchr(path, ':') != NULL) || ((len >= 1) && ((path[0] == '/') || (path[0] == '\\'))))
+    (strchr(path, ':') != NULL) /* Colon indicates volume name */

 #else
 #ifdef HAVE_DIRENT_H
@@ -126,12 +121,6 @@ typedef unsigned short mode_t;
 #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
-#endif
-
 typedef struct _cwd_state {
 	char *cwd;
 	int cwd_length;
@@ -152,8 +141,12 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC);
 CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...);
 CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC);
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC);
-#if !defined(TSRM_WIN32)
+#else
+CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC);
+#endif
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC);
 #endif
 CWD_API int virtual_unlink(const char *path TSRMLS_DC);
@@ -178,57 +171,45 @@ CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC);
 #endif
 #endif

+/* On AIX & Tru64 when a file does not exist realpath() returns
+ * NULL, and sets errno to ENOENT. Unlike in other libc implementations
+ * the destination is not filled and remains undefined. Therefor, we
+ * must populate it manually using strcpy as done on systems with no
+ * realpath() function.
+ */
+#if defined(__osf__) || defined(_AIX)
+static char *php_realpath_hack(char *src, char *dest)
+{
+	char *ret;
+
+	if ((ret = realpath(src, dest)) == NULL && errno == ENOENT) {
+		return strcpy(dest, src);
+	} else {
+		return ret;
+	}
+}
+#endif
+
 #if HAVE_UTIME
 CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC);
 #endif
 CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC);
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
-CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int link TSRMLS_DC);
+CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group 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 */
-
-typedef struct _realpath_cache_bucket {
-	unsigned long                  key;
-	char                          *path;
-	int                            path_len;
-	char                          *realpath;
-	int                            realpath_len;
-	time_t                         expires;
-	struct _realpath_cache_bucket *next;	
-} realpath_cache_bucket;
-
 typedef struct _virtual_cwd_globals {
 	cwd_state cwd;
-	long                   realpath_cache_size;
-	long                   realpath_cache_size_limit;
-	long                   realpath_cache_ttl;
-	realpath_cache_bucket *realpath_cache[1024];
 } virtual_cwd_globals;

 #ifdef ZTS
-extern ts_rsrc_id cwd_globals_id;
 # define CWDG(v) TSRMG(cwd_globals_id, virtual_cwd_globals *, v)
 #else
-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);
-
 /* The actual macros to be used in programs using TSRM
 * If the program defines VIRTUAL_DIR it will use the
 * virtual_* functions 
@@ -248,7 +229,7 @@ CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
 #define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path TSRMLS_CC)
 #define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
 #define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
-#if !defined(TSRM_WIN32)
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 #define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
 #endif
 #define VCWD_UNLINK(path) virtual_unlink(path TSRMLS_CC)
@@ -262,10 +243,7 @@ CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
 #endif
 #define VCWD_CHMOD(path, mode) virtual_chmod(path, mode TSRMLS_CC)
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
-#define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group, 0 TSRMLS_CC)
-#if HAVE_LCHOWN
-#define VCWD_LCHOWN(path, owner, group) virtual_chown(path, owner, group, 1 TSRMLS_CC)
-#endif
+#define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group TSRMLS_CC)
 #endif

 #else
@@ -279,7 +257,7 @@ CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
 #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)
@@ -292,7 +270,15 @@ CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
 #define VCWD_ACCESS(pathname, mode) access(pathname, mode)
 #endif

-#define VCWD_REALPATH(path, real_path) tsrm_realpath(path, real_path TSRMLS_CC)
+#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)
@@ -300,9 +286,6 @@ CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
 #define VCWD_CHMOD(path, mode) chmod(path, mode)
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
 #define VCWD_CHOWN(path, owner, group) chown(path, owner, group)
-#if HAVE_LCHOWN
-#define VCWD_LCHOWN(path, owner, group) lchown(path, owner, group)
-#endif
 #endif

 #endif
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2004 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.txt.                                  |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
@@ -86,19 +86,11 @@ TSRM_API void tsrm_win32_shutdown(void)

 TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 {
+	SHFILEINFO sfi;
+
 	if (mode == 1 /*X_OK*/) {
-#if 1
-		/* This code is not supported by Windows 98,
-		 * but we don't support it anymore */
-		DWORD type;
-
-		return GetBinaryType(pathname, &type)?0:-1;
-#else
-		SHFILEINFO sfi;
-
-		return access(pathname, 0) == 0 &&
+		return access(pathname, 0) == 0 && 
 			SHGetFileInfo(pathname, 0, &sfi, sizeof(SHFILEINFO), SHGFI_EXETYPE) != 0 ? 0 : -1;
-#endif
 	} else {
 		return access(pathname, mode);
 	}
@@ -109,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)++;
@@ -136,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;
@@ -151,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)++;
@@ -179,42 +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;
-	process_pair *proc;
 	char *cmd;
-	int i;
-	char *ptype = (char *)type;
+	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));

@@ -223,7 +196,7 @@ 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) {
@@ -238,8 +211,7 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,

 	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|CREATE_NO_WINDOW, env, cwd, &startup, &process)) {
-		free(cmd);
+	if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS, env, cwd, &startup, &process)) {
 		return NULL;
 	}
 	free(cmd);
@@ -248,10 +220,10 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	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);
 	}

@@ -300,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);
@@ -308,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);
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2004 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.txt.                                  |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
@@ -1,548 +0,0 @@
-$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 (SVN)
-
-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 SVN at
-http://svn.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
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                The Zend Engine License, Version 2.00
-Copyright (c) 1999-2006 Zend Technologies Ltd. All rights reserved.
+Copyright (c) 1999-2003 Zend Technologies Ltd. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -14,10 +14,9 @@ libZend_la_SOURCES=\
 	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_default_classes.c \
-	zend_iterators.c zend_interfaces.c zend_exceptions.c \
-	zend_strtod.c zend_multibyte.c
+	zend_objects_API.c zend_ts_hash.c zend_stream.c zend_mm.c \
+	zend_default_classes.c zend_reflection_api.c \
+	zend_iterators.c zend_interfaces.c zend_exceptions.c

 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
@@ -1 +0,0 @@
-Zend/zend_execute.lo: $(srcdir)/zend_vm_execute.h $(srcdir)/zend_vm_opcodes.h
@@ -51,7 +51,7 @@ write_property is used to directly write object's property by
 name.  This handler is used to assign property variables or to change them 
 in operations like += or ++ (unless get_property_zval_ptr is also set).

-get_property_zval_ptr is used to obtain pointer to modifiable zval for 
+get_property_zval_ptr is used to obtain pointer to modifyable zval for 
 operations like += or ++. This should be used only if your object model 
 stores properties as real zval's that can be modified from outside. 
 Otherwise this handler should be NULL and the engine will use 
@@ -1,34 +0,0 @@
-Zend Memory Manager
-===================
-
-General:
--------
-
-The goal of the new memory manager (available since PHP 5.2) is to reduce memory
-allocation overhead and speedup memory management.
-
-The new manager's "configure" has no "--disable-zend-memory-manager" option,
-but it has "--enable-malloc-mm" instead.  It is enabled by default in DEBUG
-build and disabled by default in RELEASE build.  when enabled it allows selecting
-between malloc and emalloc at runtime so you can use internal and external memory
-debuggers without recompilation.
-
-Debugging:
----------
-
-Normal:
-
-    $ sapi/cli/php -r 'leak();'
-
-Zend MM disabled:
-
-    $ USE_ZEND_ALLOC=0 valgrind --leak-check=full sapi/cli/php -r 'leak();'
-
-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.
@@ -1,108 +0,0 @@
-ZEND_VM
-=======
-
-ZEND_VM architecture allows specializing opcode handlers according to op_type
-fields and using different execution methods (call threading, switch threading
-and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
-code execution (with specialized executor and direct threading execution
-method). As in most PHP applications raw execution speed isn't the limiting
-factor but system calls and database callls are, your mileage with this patch
-will vary.
-
-Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can
-find opcode handlers and helpers. The typical opcode handler template looks
-like this:
-
-ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>)
-{
-	<HANDLER'S CODE>
-}
-
-<OPCODE-NUMBER> is a opcode number (0, 1, ...)
-<OPCODE> is an opcode name (ZEN_NOP, ZEND_ADD, :)
-<OP1_TYPES> & <OP2_TYPES> are masks for allowed operand op_types. Specializer
-will generate code only for defined combination of types. You can use any 
-combination of the following op_types UNUSED, CONST, VAR, TMP and  CV also
-you can use ANY mask to disable specialization according operand's op_type.
-<HANDLER'S CODE> is a handler's code itself. For most handlers it stills the
-same as in old zend_execute.c, but now it uses macros to access opcode operands
-and some internal executor data.
-
-You can see the conformity of new macros to old code in the following list:
-
-EXECUTE_DATA
-	execute_data
-ZEND_VM_DISPATCH_TO_HANDLER(<OP>)
-	return <OP>_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_DISPATCH_TO_HELPER(<NAME>) 
-	return <NAME>(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>) 
-	return <NAME>(<VAL>, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_CONTINUE()
-	return 0
-ZEND_VM_NEXT_OPCODE()
-	NEXT_OPCODE()
-ZEND_VM_SET_OPCODE(<TARGET>
-	SET_OPCODE(<TARGET>
-ZEND_VM_INC_OPCODE()
-	INC_OPCOD()
-ZEND_VM_RETURN_FROM_EXECUTE_LOOP()
-	RETURN_FROM_EXECUTE_LOOP()
-ZEND_VM_C_LABEL(<LABEL>):
-	<LABEL>:
-ZEND_VM_C_GOTO(<LABEL>)
-	goto <LABEL>
-OP<X>_TYPE
-	opline->op<X>.op_type
-GET_OP<X>_ZVAL_PTR(<TYPE>)
-	get_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
-GET_OP<X>_ZVAL_PTR_PTR(<TYPE>)
-	get_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
-GET_OP<X>_OBJ_ZVAL_PTR(<TYPE>)
-	get_obj_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
-GET_OP<X>_OBJ_ZVAL_PTR_PTR(<TYPE>)
-	get_obj_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
-IS_OP<X>_TMP_FREE()
-	IS_TMP_FREE(free_op<X>)
-FREE_OP<X>()
-	FREE_OP(free_op<X>)
-FREE_OP<X>_IF_VAR()
-	FREE_VAR(free_op<X>)
-FREE_OP<X>_VAR_PTR()
-	FREE_VAR_PTR(free_op<X>)
-
-
-Executor's helpers can be defined without parameters or with one parameter. 
-This is done with the following constructs:
-
-ZEND_VM_HELPER(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>)
-{
-	<HELPER'S CODE>
-}
-
-ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>)
-{
-	<HELPER'S CODE>
-}
-
-Executor's code is generated by PHP script zend_vm_gen.php it uses zend_vm_def.h
-and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and 
-zend_vm_execute.h. The first file is a list of opcode definitions. It is 
-included from zend_compile.h. The second one is an executor code itself. It is
-included from zend_execute.c.
-
-zend_vm_gen.php can produce different kind of executors. You can select 
-different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can 
-disable opcode specialization using --without-specializer. You can include or
-exclude old executor together with specialized one using --without-old-executor.
-At last you can debug executor using original zend_vm_def.h or generated file
-zend_vm_execute.h. Debugging with original file requires --with-lines
-option. By default ZE2 uses the following command to generate executor:
-
-$ php zend_vm_gen.php --with-vm-kind=CALL
-
-Zend Engine II currently includes two executors during the build process, one
-is the specialized version and the other is the old one non-specialized with
-function handlers. By default Zend Engine II uses the specialized one but you
-can switch to the old executor at runtime by calling zend_vm_use_old_executor().
-
@@ -21,9 +21,9 @@ Changes in the Zend Engine 2.0

    * $this

-      Unlike in Zend Engine 1 the pseudo variable $this cannot be
-      exchanged in Zend Engine 2. You can of course modify or work with
-      an object by using $this but you cannot replace $this with another
+      Unlike in Zend Engine 1 the pseudo variable $this cannot be 
+      exchanged in Zend Engine 2. You can of course modify or work with 
+      an object by using $this but you cannot replace $this with another 
      object to change the original object.

      Example:
@@ -35,17 +35,17 @@ Changes in the Zend Engine 2.0
                $this = $other;
            }
        }
-
+        
        $object = new Foo;
        $object->prop = 'Hello';

        $other  = new Foo;
        $other->prop = 'Bye';
-
+        
        $object->replace($other);
-
+        
        print $object->prop; // still shows 'Hello'
-
+        
        ?>

        Zend Engine 2.0 will issue a compile error, if an assignment
@@ -53,9 +53,9 @@ Changes in the Zend Engine 2.0

    * Private and Protected Members.

-      The Zend Engine 2.0 introduces private and protected member
-      variables. Note that for performance reasons no error message is
-      emitted in case of an illegal access to a private or protectecd
+      The Zend Engine 2.0 introduces private and protected member 
+      variables. Note that for performance reasons no error message is 
+      emitted in case of an illegal access to a private or protectecd 
      member variable.

      Example:
@@ -75,7 +75,7 @@ Changes in the Zend Engine 2.0

        class MyClass2 extends MyClass {
            protected $Foo;
-
+            
            function printHello() {
                MyClass::printHello();                          /* Should print */
                print "MyClass2::printHello() " . $this->Hello; /* Shouldn't print out anything */
@@ -96,9 +96,9 @@ Changes in the Zend Engine 2.0
        print $obj->Foo;    /* Shouldn't print out anything */
        $obj->printHello();
        ?>
-
-      Protected member variables can be accessed in classes extending the
-      class they are declared in, whereas private member variables can
+        
+      Protected member variables can be accessed in classes extending the 
+      class they are declared in, whereas private member variables can 
      only be accessed by the class they belong to.

    * Private and protected methods.
@@ -130,14 +130,14 @@ Changes in the Zend Engine 2.0
        $o->aPublicMethod();
        ?>

-      Old code that has no user-defined classes or functions named
+      Old code that has no user-defined classes or functions named 
      'public', 'protected' or 'private' should run without modifications.

    * Abstract Classes and Methods.

-      The Zend Engine 2.0 introduces abstract classes and methods. An
-      abstract method only declares the method's signature and does not
-      provide an implementation. A class that contains abstract methods
+      The Zend Engine 2.0 introduces abstract classes and methods. An 
+      abstract method only declares the method's signature and does not 
+      provide an implementation. A class that contains abstract methods 
      needs to be declared abstract.

      Example:
@@ -160,7 +160,7 @@ Changes in the Zend Engine 2.0
      Classes that do not have abstract methods can be declared abstract
      to prevent them from being instantiated.

-      Old code that has no user-defined classes or functions named
+      Old code that has no user-defined classes or functions named 
      'abstract' should run without modifications.

    * Interfaces.
@@ -182,13 +182,13 @@ Changes in the Zend Engine 2.0
        }
        ?>

-      Old code that has no user-defined classes or functions named
+      Old code that has no user-defined classes or functions named 
      'interface' or 'implements' should run without modifications.
-
-      An interface may extend one or more base interfaces (but not
+      
+      An interface may extend one or more base interfaces (but not 
      implement them). Neither a class nor an interface can inherit
-      methods of the same name from different root interfaces.
-
+      methods of the same name from different root interfaces. 
+      
      Interfaces may contain abstract static methods.

      Example:
@@ -197,7 +197,7 @@ Changes in the Zend Engine 2.0
        interface Printable {
          function dump();
        }
-
+        
        interface Streamable extends Printable {
          function writeToStream();
          static function readFromStream();
@@ -215,14 +215,14 @@ Changes in the Zend Engine 2.0
          }
        }
        ?>
-
-      A class that does not implement all interface methods must be
+      
+      A class that does not implement all interface methods must be 
      declared as an abstract class.

    * Class Type Hints.

-      While remaining loosely typed the Zend Engine 2.0 introduces the
-      ability to use class type hints to declare the expected class of
+      While remaining loosely typed the Zend Engine 2.0 introduces the 
+      ability to use class type hints to declare the expected class of 
      objects that are passed as parameters to a method.

      Example:
@@ -275,7 +275,7 @@ Changes in the Zend Engine 2.0
    * Final methods and classes.

      The Zend Engine 2.0 introduces the "final" keyword to declare
-      final methods. Those cannot be overridden by sub-classes.
+      final methods. Those cannot be overridden by sub-classes. 

      Example:

@@ -287,8 +287,8 @@ Changes in the Zend Engine 2.0
        }
        ?>

-      It is furthermore possible to make a class final. Doing this
-      prevents a class from being specialized (it cannot be inherited
+      It is furthermore possible to make a class final. Doing this 
+      prevents a class from being specialized (it cannot be inherited 
      by another class). There's no need to declare the methods of
      a final class themselves as final.

@@ -304,7 +304,7 @@ Changes in the Zend Engine 2.0

      Properties cannot be final. See per-class constants below.

-      Old code that has no user-defined classes or functions named
+      Old code that has no user-defined classes or functions named 
      'final' should run without modifications.

    * Object Cloning.
@@ -339,9 +339,9 @@ Changes in the Zend Engine 2.0
      all of the object's properties. If a __clone() method is
      defined, then it will be responsible to set the necessary
      properties in the created object. For convenience, the engine
-      ensures, that the clone will be initialized with all of the
-      properties from the source object, so that developers can start
-      with a by-value replica of the source object, and only override
+      ensures, that the clone will be initialized with all of the 
+      properties from the source object, so that developers can start 
+      with a by-value replica of the source object, and only override 
      properties that need to be changed.

      Example:
@@ -374,7 +374,7 @@ Changes in the Zend Engine 2.0
        print $obj_clone->name . "\n";
        print $obj_clone->address . "\n";
        ?>
-
+   
    * Unified Constructors.

      The Zend Engine allows developers to declare constructor methods
@@ -474,7 +474,7 @@ Changes in the Zend Engine 2.0
        echo 'Foo::constant = ' . Foo::constant . "\n";
        ?>

-      Old code that has no user-defined classes or functions
+      Old code that has no user-defined classes or functions 
      named 'const' will run without modifications.

    * Exceptions.
@@ -483,16 +483,16 @@ Changes in the Zend Engine 2.0
      introduces a exception model similar to that of other programming
      languages. But there is no catch all and no finally clause.

-      Old code that has no user-defined classes or functions 'catch',
+      Old code that has no user-defined classes or functions 'catch', 
      'throw' and 'try' will run without modifications.
-
+      
      Exceptions can be rethrown in catch blocks. Also it is possible to
-      have multiple catch blocks. In that case the caught exception is
+      have multiple catch blocks. In that case the caught exception is 
      compared with the classtype of each catch block from top to bottom
      and the first block that has a 'instanceof' match gets executed.
-      When the catch block finishes execution continues at the end of
+      When the catch block finishes execution continues at the end of 
      the last catch block. If no catch block has a 'instanceof' match
-      then the next try/catch block is searched until no more try/catch
+      then the next try/catch block is searched until no more try/catch 
      blocks are available. In that case the exception is an uncaught
      exception and the program terminates with showing the exception.

@@ -529,23 +529,23 @@ Changes in the Zend Engine 2.0
            echo $exception;
        }
        ?>
-
+      
      Even though the above example shows that it is possible to define
      exception classes  that don't inherit from Exception it is best to
      do so. This is because the internal Exception class can gather a
      lot of information otherwise not available. The PHP code emulation
      code would look something like shown below. The comments show the
-      meaning of each property. As the code shows it is possible to read
+      meaning of each property. As the code shows it is possible to read 
      any available information by using the getter methods. But since
-      some of the methods are used internally they are marked final. All
-      in all the class is very restrictive because it must be ensured
+      some of the methods are used internally they are marked final. All 
+      in all the class is very restrictive because it must be ensured 
      that anything used internally always  works as expected.
-
+      
      Emulating class Exception:

        <?php
        class Exception {
-          function __construct(/*string*/ $message=NULL, /*int*/ $code=0) {
+          function __construct(string $message=NULL, int $code=0) {
            if (func_num_args()) {
              $this->message = $message;
            }
@@ -555,15 +555,15 @@ Changes in the Zend Engine 2.0
            $this->trace = debug_backtrace();
            $this->string = StringFormat($this);
          }
-
-          protected $message = 'Unknown exception';  // exception message
+          
+          protected $message = 'Unknown exception';  // exception message 
          protected $code = 0; // user defined exception code
          protected $file;     // source filename of exception
          protected $line;     // source line of exception
-
+  
          private $trace;      // backtrace of exception
          private $string;     // internal only!!
-
+          
          final function getMessage() {
            return $this->message;
          }
@@ -592,19 +592,19 @@ Changes in the Zend Engine 2.0
          }
        }
        ?>
-
+      
      If you derive your exception classes from this Exception base class
-      your exceptions will be nicely shown in the builtin handler for
+      your exceptions will be nicely shown in the builtin handler for 
      uncaught exceptions.
-
-      Note: The method getMessage() is a final read only access method to
+      
+      Note: The method getMessage() is a final read only access method to 
      the private proeprty message that is set in the constructor. If you
      feel a need to overwrite the exception display then overload method
-      __toString() in your derived class or implement your own extneral
+      __toString() in your derived class or implement your own extneral 
      exception display function to accomplish your desired formatting.
-
+      
      Example:
-
+      
      <?php
      function display_exception(Exception $ex)
      {
@@ -612,7 +612,7 @@ Changes in the Zend Engine 2.0
          echo $ex->getTrace();
          echo '</pre>';
      }
-
+      
      try
      {
          // your code here
@@ -662,9 +662,9 @@ Changes in the Zend Engine 2.0
        }

        print foo::$my_static;
-
+        
        $obj = foo;
-
+        
        print $obj->my_prop;
        ?>

@@ -691,14 +691,14 @@ Changes in the Zend Engine 2.0
    * instanceof.
      New support for an instanceof operator which checks if an object
      is of a certain class or interface type.
-
+      
      Example:
-
+      
      <?php
-
+      
      class Foo {
      }
-
+      
      $obj = new Foo();
      if ($obj instanceof Foo) {
        print "Yay!\n";
@@ -720,9 +720,9 @@ Changes in the Zend Engine 2.0

    * __autoload().

-      The __autoload() interceptor function will be automatically called
-      when an undeclared class is to be instantiated. The name of that
-      class will be passed to the __autoload() interceptor function as its
+      The __autoload() interceptor function will be automatically called 
+      when an undeclared class is to be instantiated. The name of that 
+      class will be passed to the __autoload() interceptor function as its 
      only argument. __autoload() must succeed in loading the class. If it
      doesn't then an E_ERROR is emitted.

@@ -817,24 +817,24 @@ Changes in the Zend Engine 2.0
            }
        ?>

-      Each class whose instances can be iterated with foreach should
+      Each class whose instances can be iterated with foreach should 
      implement the empty interface 'Traversable'. Hence any object
      that says it implements 'Traversable' can be used with foreach.

      The interfaces 'IteratorAggregate' and 'Iterator' allow to specify
      how class objects are iterated in PHP code. The first of them simply
-      has a method 'getIterator' which must return an object that either
-      implements the interface 'Iterator' or is instantiated from an
+      has a method 'getIterator' which must return an object that either 
+      implements the interface 'Iterator' or is instantiated from an 
      internal class that can be iterated.

      Example:

        <?php
            class ObjectIterator implements Iterator {
-
+            
                private $obj;
                private $num;
-
+            
                function __construct($obj) {
                    $this->obj = $obj;
                }
@@ -859,23 +859,23 @@ Changes in the Zend Engine 2.0
                    $this->num++;
                }
            }
-
+                
            class Object implements IteratorAggregate {
-
+            
                public $max = 3;
-
+            
                function getIterator() {
                    return new ObjectIterator($this);
                }
-            }
-
+            } 
+            
            $obj = new Object;
-
+            
            // this foreach ...
            foreach($obj as $key => $val) {
                echo "$key = $val\n";
            }
-
+            
            // matches the following 7 lines with the for directive.
            $it = $obj->getIterator();
            for($it->rewind(); $it->valid(); $it->next()) {
@@ -886,55 +886,14 @@ Changes in the Zend Engine 2.0
            unset($it);
        ?>

-      The matching for directive is very intersting here since it shows
+      The matching for directive is very intersting here since it shows 
      the use of all abstract methods declared in the interfaces Iterator
      and IteratorAggregate respectively.

-    * Array overloading
-    
-      Objects can be used with Array notation when they implement the 
-      interface ArrayAccess. You cannot use such objects in standard
-      array functions, however you have full control over the array
-      notation. This allows lazy initialization or read only array.
-      
-      Note that setting [] results in a call to offsetSet() with
-      index being NULL. That means that as with standard arrays you 
-      cannot store NULL keys.
-      
-      Example:
-      
-        <?php
-	        class ArrayClass implements ArrayAccess {
-				public $a = array();
-			
-				function offsetExists($index) {
-					return array_key_exists($index, $this->a);
-				}
-				function offsetGet($index) {
-					return $this->a[$index];
-				}
-				function offsetSet($index, $newval) {
-					return $this->a[$index] = $newval;
-				}
-				function offsetUnset($index) {
-					unset($this->a[$index]);
-				}
-			}
-			
-			$obj = new ArrayClass;
-			
-			$obj[0] = 'bla';     // calls offsetSet(0,'bla')
-			$obj[] = 42;         // calls offsetSet(NULL, 42)
-			$x = $obj[0];        // calls offsetGet(0)
-			$b = isset($obj[0]); // calls offsetExists(0)
-			unset($obj[0]);      // calls offsetUnset(0)
-		?>
- 
-
    * __METHOD__

-      The pseudo constant __METHOD__ shows the current class and method
-      when used inside a method and the function when used outside of a
+      The pseudo constant __METHOD__ shows the current class and method 
+      when used inside a method and the function when used outside of a 
      class.

      Example:
@@ -952,12 +911,12 @@ Changes in the Zend Engine 2.0

    * __toString()

-      The magic method __toString() allows to overload the object to
-      string conversion. This conversion is only done automatically for
-      the printing functions (echo, print) but not for other functions
+      The magic method __toString() allows to overload the object to 
+      string conversion. This conversion is only done automatically for 
+      printing functions (echo, *printf) but not for other functions 
      that expect strings. Also the function __toString is not used in
      places where objects are not allowed but strings are like array
-      indices. Note that specialized objects may be converted to a string
+      indices. Note that specialized objects maybe converted to a string
      in any place but without calling __toString().

      Example:
@@ -981,16 +940,16 @@ Changes in the Zend Engine 2.0
        ?>

    * Reflection API
-
-      PHP 5 comes with a complete Reflection API that adds the ability to
+      
+      PHP5 comes with a complete reflection API that adds the ability to
      reverse-engineer classes, interfaces, functions and methods as well
      as extensions.
-
-      The Reflection API also offers ways of getting doc comments for
+      
+      The reflection API also offers ways of getting doc comments for
      functions, classes and methods.
-
+      
      Nearly all aspects of object oriented code can be reflected by
-      using the Reflection API which is documented separately:
+      using the reflection API which is documented separatley:
      http://sitten-polizei.de/php/reflection_api/docs/language.reflection.html

      Example:
@@ -1003,11 +962,11 @@ Changes in the Zend Engine 2.0
                }
            }

-            ReflectionClass::export('Foo');
-            ReflectionObject::export(new Foo);
-            ReflectionMethod::export('Foo', 'func');
-            ReflectionProperty::export('Foo', 'prop');
-            ReflectionExtension::export('standard');
+            reflection_class::export('Foo');
+            reflection_object::export(new Foo);
+            reflection_method::export('Foo', 'func');
+            reflection_property::export('Foo', 'prop');
+            reflection_extension::export('standard');
        ?>

    * New memory manager
@@ -1018,7 +977,7 @@ Changes in the Zend Engine 2.0
    * Others
      Probably other changes which we forgot to list. This list will be kept up-to-date
      as much as possible.
-
+    

 Changes in the Zend Engine 1.0

@@ -7,20 +7,20 @@
 CFG=Zend - Win32 Release_inline
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "Zend.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Release_inline"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE

 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -95,7 +95,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo

-!ENDIF 
+!ENDIF

 # Begin Target

@@ -135,6 +135,10 @@ SOURCE=.\zend_default_classes.c
 # End Source File
 # Begin Source File

+SOURCE=.\zend_interfaces.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_dynamic_array.c
 # End Source File
 # Begin Source File
@@ -175,10 +179,6 @@ SOURCE=.\zend_ini_scanner.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_interfaces.c
-# End Source File
-# Begin Source File
-
 SOURCE=".\zend_language_parser.c"
 # End Source File
 # Begin Source File
@@ -195,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
@@ -223,6 +227,10 @@ SOURCE=.\zend_qsort.c
 # End Source File
 # Begin Source File

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

-SOURCE=.\zend_strtod.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_ts_hash.c
 # End Source File
 # Begin Source File
@@ -287,6 +291,10 @@ SOURCE=.\zend_default_classes.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_interfaces.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_dynamic_array.h
 # End Source File
 # Begin Source File
@@ -343,10 +351,6 @@ SOURCE=.\zend_ini_scanner.h
 # End Source File
 # Begin Source File

-SOURCE=.\zend_interfaces.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_istdiostream.h
 # End Source File
 # Begin Source File
@@ -367,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
@@ -395,6 +403,10 @@ SOURCE=.\zend_qsort.h
 # End Source File
 # Begin Source File

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

-SOURCE=.\zend_strtod.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_ts_hash.h
 # End Source File
 # Begin Source File
@@ -441,7 +449,7 @@ BuildCmds= \

 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"

-!ENDIF 
+!ENDIF

 # End Source File
 # Begin Source File
@@ -496,7 +504,7 @@ BuildCmds= \
   $(BuildCmds)
 # End Custom Build

-!ENDIF 
+!ENDIF

 # End Source File
 # End Group
@@ -525,7 +533,7 @@ InputPath=.\zend_ini_scanner.l

 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"

-!ENDIF 
+!ENDIF

 # End Source File
 # Begin Source File
@@ -562,7 +570,7 @@ InputPath=".\zend_language_scanner.l"

 # End Custom Build

-!ENDIF 
+!ENDIF

 # End Source File
 # End Group
@@ -4,29 +4,22 @@ dnl
 dnl This file contains Zend specific autoconf functions.
 dnl

-AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[
-AC_MSG_CHECKING(for $1)
-AC_TRY_COMPILE([
-#if HAVE_SYS_TYPES_H  
-#include <sys/types.h>
-#endif
-#if HAVE_INTTYPES_H  
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif],
-[if (($1 *) 0)
-  return 0;
-if (sizeof ($1))
-  return 0;
-],[
-  AC_DEFINE_UNQUOTED([HAVE_]translit($1,a-z_-,A-Z__), 1,[Define if $1 type is present. ])
-  AC_MSG_RESULT(yes)
-], AC_MSG_RESULT(no)
-)dnl
+AC_DEFUN(LIBZEND_BISON_CHECK,[
+
+if test "$YACC" != "bison -y"; then
+    AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.)
+else
+    AC_MSG_CHECKING(bison version)
+    set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /' | tr -d 'a-z'`
+    if test "${1}" = "1" -a "${2}" -lt "28"; then
+        AC_MSG_WARN(You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2}).)
+    fi
+    AC_MSG_RESULT(${1}.${2} (ok))
+fi
+
 ])

-AC_DEFUN([LIBZEND_BASIC_CHECKS],[
+AC_DEFUN(LIBZEND_BASIC_CHECKS,[

 AC_REQUIRE([AC_PROG_YACC])
 AC_REQUIRE([AC_PROG_CC])
@@ -49,8 +42,6 @@ if test "$ac_cv_prog_gcc" = "yes" -a "`uname -s`" = "Rhapsody"; then
 fi

 AC_CHECK_HEADERS(
-inttypes.h \
-stdint.h \
 limits.h \
 malloc.h \
 string.h \
@@ -67,12 +58,12 @@ dlfcn.h)
 AC_TYPE_SIZE_T
 AC_TYPE_SIGNAL

-AC_DEFUN([LIBZEND_LIBDL_CHECKS],[
+AC_DEFUN(LIBZEND_LIBDL_CHECKS,[
 AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
 AC_CHECK_FUNC(dlopen,[AC_DEFINE(HAVE_LIBDL, 1,[ ])])
 ])

-AC_DEFUN([LIBZEND_DLSYM_CHECK],[
+AC_DEFUN(LIBZEND_DLSYM_CHECK,[
 dnl
 dnl Ugly hack to check if dlsym() requires a leading underscore in symbol name.
 dnl
@@ -91,10 +82,6 @@ dnl This is required for QNX and may be some BSD derived systems
 AC_CHECK_TYPE( uint, unsigned int )
 AC_CHECK_TYPE( ulong, unsigned long )

-dnl Check if int32_t and uint32_t are defined
-LIBZEND_CHECK_INT_TYPE(int32_t)
-LIBZEND_CHECK_INT_TYPE(uint32_t)
-
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_FUNC_MEMCMP
@@ -108,7 +95,7 @@ ZEND_FP_EXCEPT
 	
 ])

-AC_DEFUN([LIBZEND_ENABLE_DEBUG],[
+AC_DEFUN(LIBZEND_ENABLE_DEBUG,[

 AC_ARG_ENABLE(debug,
 [  --enable-debug          Compile with debugging symbols],[
@@ -119,18 +106,10 @@ AC_ARG_ENABLE(debug,

 ])

-AC_DEFUN([LIBZEND_OTHER_CHECKS],[
-
-AC_ARG_WITH(zend-vm,
-[  --with-zend-vm=TYPE     Set virtual machine dispatch method. Type is
-                          one of "CALL", "SWITCH" or "GOTO" [TYPE=CALL]],[
-  PHP_ZEND_VM=$withval
-],[
-  PHP_ZEND_VM=CALL
-])
+AC_DEFUN(LIBZEND_OTHER_CHECKS,[

 AC_ARG_ENABLE(maintainer-zts,
-[  --enable-maintainer-zts Enable thread safety - for code maintainers only!!],[
+[  --enable-maintainer-zts Enable thread safety - for code maintainers only],[
  ZEND_MAINTAINER_ZTS=$enableval
 ],[
  ZEND_MAINTAINER_ZTS=no
@@ -138,47 +117,41 @@ AC_ARG_ENABLE(maintainer-zts,

 AC_ARG_ENABLE(inline-optimization,
 [  --disable-inline-optimization 
-                          If building zend_execute.lo fails, try this switch],[
+                          If building zend_execute.lo fails, try this switch.],[
  ZEND_INLINE_OPTIMIZATION=$enableval
 ],[
  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], [
+[  --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)
-
 AC_MSG_CHECKING(whether to enable thread-safety)
 AC_MSG_RESULT($ZEND_MAINTAINER_ZTS)

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

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

 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])
-    ;;
-  GOTO)
-    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_GOTO,[virtual machine dispatch method])
-    ;;
-  *)
-    PHP_ZEND_VM=CALL
-    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_CALL,[virtual machine dispatch method])
-    ;;
-esac
-
 if test "$ZEND_DEBUG" = "yes"; then
  AC_DEFINE(ZEND_DEBUG,1,[ ])
  echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
@@ -200,6 +173,12 @@ 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
@@ -216,13 +195,6 @@ AC_C_INLINE

 AC_SUBST(INLINE_CFLAGS)

-AC_MSG_CHECKING(target system is Darwin)
-if echo "$target" | grep "darwin" > /dev/null; then
-  AC_DEFINE([DARWIN], 1, [Define if the target system is darwin])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi

 dnl test and set the alignment define for ZEND_MM
 dnl this also does the logarithmic test for ZEND_MM.
@@ -265,126 +237,14 @@ int main()
  LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ])
  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ]) 
-], [], [
-  dnl cross-compile needs something here
-  LIBZEND_MM_ALIGN=8
 ])

 AC_MSG_RESULT(done)

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


-AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
+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 
@@ -169,7 +169,6 @@ SOURCE=.\zend_exceptions.c
 # Begin Source File

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

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

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

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

-SOURCE=.\zend_strtod.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_ts_hash.c
 # End Source File
 # Begin Source File
@@ -405,6 +408,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
@@ -433,6 +440,10 @@ SOURCE=.\zend_qsort.h
 # End Source File
 # Begin Source File

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

-SOURCE=.\zend_strtod.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_ts_hash.h
 # End Source File
 # Begin Source File
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2004 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        |
@@ -23,7 +23,9 @@
 #define ZEND_DLEXPORT
 #define ZEND_DLIMPORT

+#ifndef NETWARE
@TOP@
+#endif

 #undef uint
 #undef ulong
@@ -31,7 +33,9 @@
 /* Define if you want to enable memory limit support */
 #define MEMORY_LIMIT 0

+#ifndef NETWARE
@BOTTOM@
+#endif

 #ifndef ZEND_ACCONFIG_H_NO_C_PROTOS

@@ -43,10 +47,6 @@
 # include <sys/types.h>
 #endif

-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
 #ifdef HAVE_IEEEFP_H
 # include <ieeefp.h>
 #endif
@@ -65,16 +65,11 @@ int zend_sprintf(char *buffer, const char *format, ...);

 #include <math.h>

-/* To enable the is_nan, is_infinite and is_finite PHP functions */
-#ifdef NETWARE
-	#define HAVE_ISNAN 1
-	#define HAVE_ISINF 1
-	#define HAVE_ISFINITE 1
-#endif
-
 #ifndef zend_isnan
 #ifdef HAVE_ISNAN
 #define zend_isnan(a) isnan(a)
+#elif defined(NAN)
+#define zend_isnan(a) (((a)==NAN)?1:0)
 #elif defined(HAVE_FPCLASS)
 #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
 #else
@@ -105,13 +100,6 @@ int zend_sprintf(char *buffer, const char *format, ...);

 #endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */

-#ifdef NETWARE
-#ifdef USE_WINSOCK
-#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
-#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
-#endif
-#endif
-
 /*
 * Local variables:
 * tab-width: 4
@@ -2,40 +2,7 @@ dnl $Id$
 dnl
 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"
-
-  # for standalone build of Zend Engine
-  test -z "$SED" && SED=sed
-
-  bison_version=none
-  if test "$YACC"; then
-    AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-      bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
-      php_cv_bison_version=invalid
-      if test -n "$bison_version_vars"; then
-        set $bison_version_vars
-        bison_version="${1}.${2}"
-        for bison_check_version in $bison_version_list; do
-          if test "$bison_version" = "$bison_check_version"; then
-            php_cv_bison_version="$bison_check_version (ok)"
-            break
-          fi
-        done
-      fi
-    ])
-  fi
-  case $php_cv_bison_version in
-    ""|invalid[)]
-      bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)."
-      AC_MSG_WARN([$bison_msg])
-      YACC="exit 0;"
-      ;;
-  esac
-])
-
-AC_DEFUN([ZEND_FP_EXCEPT],[
+AC_DEFUN(ZEND_FP_EXCEPT,[
  AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
    AC_TRY_COMPILE([
 #include <floatingpoint.h>
@@ -56,7 +23,7 @@ fp_except x = (fp_except) 0;
 dnl
 dnl Check for broken sprintf()
 dnl
-AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
+AC_DEFUN(AC_ZEND_BROKEN_SPRINTF,[
  AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
    AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
      ac_cv_broken_sprintf=no
@@ -74,34 +41,7 @@ AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
  AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken])
 ])

-dnl
-dnl AC_ZEND_C_BIGENDIAN
-dnl Replacement macro for AC_C_BIGENDIAN
-dnl
-AC_DEFUN([AC_ZEND_C_BIGENDIAN],
-[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian_php,
- [
-  ac_cv_c_bigendian_php=unknown
-  AC_TRY_RUN(
-  [
-int main(void)
-{
-        short one = 1;
-        char *cp = (char *)&one;
-
-        if (*cp == 0) {
-                return(0);
-        } else {
-                return(1);
-        }
-}
-  ], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown])
- ])
- if test $ac_cv_c_bigendian_php = yes; then
-   AC_DEFINE(WORDS_BIGENDIAN, [], [Define if processor uses big-endian word])
- fi
-])
-
-AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
+AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
+
@@ -1,420 +0,0 @@
-<?php
-date_default_timezone_set("UTC");
-
-function simple() {
-  $a = 0;
-  for ($i = 0; $i < 1000000; $i++) 
-    $a++;
-
-  $thisisanotherlongname = 0;
-  for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++) 
-    $thisisanotherlongname++;
-}
-
-/****/
-
-function simplecall() {
-  for ($i = 0; $i < 1000000; $i++) 
-    strlen("hallo");
-}
-
-/****/
-
-function hallo($a) {
-}
-
-function simpleucall() {
-  for ($i = 0; $i < 1000000; $i++) 
-    hallo("hallo");
-}
-
-/****/
-
-function simpleudcall() {
-  for ($i = 0; $i < 1000000; $i++) 
-    hallo2("hallo");
-}
-
-function hallo2($a) {
-}
-
-/****/
-
-function mandel() {
-  $w1=50;
-  $h1=150;
-  $recen=-.45;
-  $imcen=0.0;
-  $r=0.7;
-  $s=0;  $rec=0;  $imc=0;  $re=0;  $im=0;  $re2=0;  $im2=0;
-  $x=0;  $y=0;  $w2=0;  $h2=0;  $color=0;
-  $s=2*$r/$w1;
-  $w2=40;
-  $h2=12;
-  for ($y=0 ; $y<=$w1; $y=$y+1) {
-    $imc=$s*($y-$h2)+$imcen;
-    for ($x=0 ; $x<=$h1; $x=$x+1) {
-      $rec=$s*($x-$w2)+$recen;
-      $re=$rec;
-      $im=$imc;
-      $color=1000;
-      $re2=$re*$re;
-      $im2=$im*$im;
-      while( ((($re2+$im2)<1000000) && $color>0)) {
-        $im=$re*$im*2+$imc;
-        $re=$re2-$im2+$rec;
-        $re2=$re*$re;
-        $im2=$im*$im;
-        $color=$color-1;
-      }
-      if ( $color==0 ) {
-        print "_";
-      } else {
-        print "#";
-      }
-    }
-    print "<br>";
-    flush();
-  }
-}
-
-/****/
-
-function mandel2() {
-  $b = " .:,;!/>)|&IH%*#";
-  //float r, i, z, Z, t, c, C;
-  for ($y=30; printf("\n"), $C = $y*0.1 - 1.5, $y--;){
-    for ($x=0; $c = $x*0.04 - 2, $z=0, $Z=0, $x++ < 75;){
-      for ($r=$c, $i=$C, $k=0; $t = $z*$z - $Z*$Z + $r, $Z = 2*$z*$Z + $i, $z=$t, $k<5000; $k++)
-        if ($z*$z + $Z*$Z > 500000) break;
-      echo $b[$k%16];
-    }
-  }
-}
-
-/****/
-
-function Ack($m, $n){
-  if($m == 0) return $n+1;
-  if($n == 0) return Ack($m-1, 1);
-  return Ack($m - 1, Ack($m, ($n - 1)));
-}
-
-function ackermann($n) {
-  $r = Ack(3,$n);
-  print "Ack(3,$n): $r\n";
-}
-
-/****/
-
-function ary($n) {
-  for ($i=0; $i<$n; $i++) {
-    $X[$i] = $i;
-  }
-  for ($i=$n-1; $i>=0; $i--) {
-    $Y[$i] = $X[$i];
-  }
-  $last = $n-1;
-  print "$Y[$last]\n";
-}
-
-/****/
-
-function ary2($n) {
-  for ($i=0; $i<$n;) {
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-  }
-  for ($i=$n-1; $i>=0;) {
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-  }
-  $last = $n-1;
-  print "$Y[$last]\n";
-}
-
-/****/
-
-function ary3($n) {
-  for ($i=0; $i<$n; $i++) {
-    $X[$i] = $i + 1;
-    $Y[$i] = 0;
-  }
-  for ($k=0; $k<1000; $k++) {
-    for ($i=$n-1; $i>=0; $i--) {
-      $Y[$i] += $X[$i];
-    }
-  }
-  $last = $n-1;
-  print "$Y[0] $Y[$last]\n";
-}
-
-/****/
-
-function fibo_r($n){
-    return(($n < 2) ? 1 : fibo_r($n - 2) + fibo_r($n - 1));
-}
-
-function fibo($n) {
-  $r = fibo_r($n);
-  print "$r\n";
-}
-
-/****/
-
-function hash1($n) {
-  for ($i = 1; $i <= $n; $i++) {
-    $X[dechex($i)] = $i;
-  }
-  $c = 0;
-  for ($i = $n; $i > 0; $i--) {
-    if ($X[dechex($i)]) { $c++; }
-  }
-  print "$c\n";
-}
-
-/****/
-
-function hash2($n) {
-  for ($i = 0; $i < $n; $i++) {
-    $hash1["foo_$i"] = $i;
-    $hash2["foo_$i"] = 0;
-  }
-  for ($i = $n; $i > 0; $i--) {
-    foreach($hash1 as $key => $value) $hash2[$key] += $value;
-  }
-  $first = "foo_0";
-  $last  = "foo_".($n-1);
-  print "$hash1[$first] $hash1[$last] $hash2[$first] $hash2[$last]\n";
-}
-
-/****/
-
-function gen_random ($n) {
-    global $LAST;
-    return( ($n * ($LAST = ($LAST * IA + IC) % IM)) / IM );
-}
-
-function heapsort_r($n, &$ra) {
-    $l = ($n >> 1) + 1;
-    $ir = $n;
-
-    while (1) {
-	if ($l > 1) {
-	    $rra = $ra[--$l];
-	} else {
-	    $rra = $ra[$ir];
-	    $ra[$ir] = $ra[1];
-	    if (--$ir == 1) {
-		$ra[1] = $rra;
-		return;
-	    }
-	}
-	$i = $l;
-	$j = $l << 1;
-	while ($j <= $ir) {
-	    if (($j < $ir) && ($ra[$j] < $ra[$j+1])) {
-		$j++;
-	    }
-	    if ($rra < $ra[$j]) {
-		$ra[$i] = $ra[$j];
-		$j += ($i = $j);
-	    } else {
-		$j = $ir + 1;
-	    }
-	}
-	$ra[$i] = $rra;
-    }
-}
-
-function heapsort($N) {
-  global $LAST;
-
-  define("IM", 139968);
-  define("IA", 3877);
-  define("IC", 29573);
-
-  $LAST = 42;
-  for ($i=1; $i<=$N; $i++) {
-    $ary[$i] = gen_random(1);
-  }
-  heapsort_r($N, $ary);
-  printf("%.10f\n", $ary[$N]);
-}
-
-/****/
-
-function mkmatrix ($rows, $cols) {
-    $count = 1;
-    $mx = array();
-    for ($i=0; $i<$rows; $i++) {
-	for ($j=0; $j<$cols; $j++) {
-	    $mx[$i][$j] = $count++;
-	}
-    }
-    return($mx);
-}
-
-function mmult ($rows, $cols, $m1, $m2) {
-    $m3 = array();
-    for ($i=0; $i<$rows; $i++) {
-	for ($j=0; $j<$cols; $j++) {
-	    $x = 0;
-	    for ($k=0; $k<$cols; $k++) {
-		$x += $m1[$i][$k] * $m2[$k][$j];
-	    }
-	    $m3[$i][$j] = $x;
-	}
-    }
-    return($m3);
-}
-
-function matrix($n) {
-  $SIZE = 30;
-  $m1 = mkmatrix($SIZE, $SIZE);
-  $m2 = mkmatrix($SIZE, $SIZE);
-  while ($n--) {
-    $mm = mmult($SIZE, $SIZE, $m1, $m2);
-  }
-  print "{$mm[0][0]} {$mm[2][3]} {$mm[3][2]} {$mm[4][4]}\n";
-}
-
-/****/
-
-function nestedloop($n) {
-  $x = 0;
-  for ($a=0; $a<$n; $a++)
-    for ($b=0; $b<$n; $b++)
-      for ($c=0; $c<$n; $c++)
-        for ($d=0; $d<$n; $d++)
-          for ($e=0; $e<$n; $e++)
-            for ($f=0; $f<$n; $f++)
-             $x++;
-  print "$x\n";
-}
-
-/****/
-
-function sieve($n) {
-  $count = 0;
-  while ($n-- > 0) {
-    $count = 0;
-    $flags = range (0,8192);
-    for ($i=2; $i<8193; $i++) {
-      if ($flags[$i] > 0) {
-        for ($k=$i+$i; $k <= 8192; $k+=$i) {
-          $flags[$k] = 0;
-        }
-        $count++;
-      }
-    }
-  }
-  print "Count: $count\n";
-}
-
-/****/
-
-function strcat($n) {
-  $str = "";
-  while ($n-- > 0) {
-    $str .= "hello\n";
-  }
-  $len = strlen($str);
-  print "$len\n";
-}
-
-/*****/
-
-function getmicrotime()
-{
-  $t = gettimeofday();
-  return ($t['sec'] + $t['usec'] / 1000000);
-}
-
-function start_test()
-{
-	ob_start();
-  return getmicrotime();
-}
-
-function end_test($start, $name)
-{
-  global $total;
-  $end = getmicrotime();
-  ob_end_clean();
-  $total += $end-$start;
-  $num = number_format($end-$start,3);
-  $pad = str_repeat(" ", 24-strlen($name)-strlen($num));
-
-  echo $name.$pad.$num."\n";
-	ob_start();
-  return getmicrotime();
-}
-
-function total()
-{
-  global $total;
-  $pad = str_repeat("-", 24);
-  echo $pad."\n";
-  $num = number_format($total,3);
-  $pad = str_repeat(" ", 24-strlen("Total")-strlen($num));
-  echo "Total".$pad.$num."\n";
-}
-
-$t0 = $t = start_test();
-simple();
-$t = end_test($t, "simple");
-simplecall();
-$t = end_test($t, "simplecall");
-simpleucall();
-$t = end_test($t, "simpleucall");
-simpleudcall();
-$t = end_test($t, "simpleudcall");
-mandel();
-$t = end_test($t, "mandel");
-mandel2();
-$t = end_test($t, "mandel2");
-ackermann(7);
-$t = end_test($t, "ackermann(7)");
-ary(50000);
-$t = end_test($t, "ary(50000)");
-ary2(50000);
-$t = end_test($t, "ary2(50000)");
-ary3(2000);
-$t = end_test($t, "ary3(2000)");
-fibo(30);
-$t = end_test($t, "fibo(30)");
-hash1(50000);
-$t = end_test($t, "hash1(50000)");
-hash2(500);
-$t = end_test($t, "hash2(500)");
-heapsort(20000);
-$t = end_test($t, "heapsort(20000)");
-matrix(20);
-$t = end_test($t, "matrix(20)");
-nestedloop(12);
-$t = end_test($t, "nestedloop(12)");
-sieve(30);
-$t = end_test($t, "sieve(30)");
-strcat(200000);
-$t = end_test($t, "strcat(200000)");
-total($t0, "Total");
-?>
@@ -10,14 +10,10 @@ AC_PROG_CC
 AM_PROG_LEX
 AM_PROG_CC_STDC
 ZEND_VERSION=$VERSION
-AC_ZEND_C_BIGENDIAN

 dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1

-AC_CHECK_SIZEOF(long, 8)
-AC_CHECK_SIZEOF(int, 4)
-
 sinclude(Zend.m4)

 LIBZEND_BASIC_CHECKS
@@ -1,19 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors:                                                             |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
@@ -1,54 +0,0 @@
--TEST--
-func_num_args() tests
--FILE--
-<?php
-
-function test1() {
-	var_dump(func_num_args());
-}
-
-function test2($a) {
-	var_dump(func_num_args());
-}
-
-function test3($a, $b) {
-	var_dump(func_num_args());
-}
-
-test1();
-test2(1);
-test2();
-test3(1,2);
-
-call_user_func("test1");
-call_user_func("test3", 1);
-call_user_func("test3", 1, 2);
-
-class test {
-	static function test1($a) {
-		var_dump(func_num_args());
-	}
-}
-
-test::test1(1);
-var_dump(func_num_args());
-
-echo "Done\n";
-?>
--EXPECTF--	
-int(0)
-int(1)
-
-Warning: Missing argument 1 for test2(), called in %s on line %d
-int(0)
-int(2)
-int(0)
-
-Warning: Missing argument 2 for test3() in %s on line %d
-int(1)
-int(2)
-int(1)
-
-Warning: func_num_args():  Called from the global scope - no function context in %s on line %d
-int(-1)
-Done
@@ -1,108 +0,0 @@
--TEST--
-func_get_arg() tests
--FILE--
-<?php
-
-function test1() {
-	var_dump(func_get_arg(-10));
-	var_dump(func_get_arg(0));
-	var_dump(func_get_arg(1));
-}
-
-function test2($a) {
-	var_dump(func_get_arg(0));
-	var_dump(func_get_arg(1));
-}
-
-function test3($a, $b) {
-	var_dump(func_get_arg(0));
-	var_dump(func_get_arg(1));
-	var_dump(func_get_arg(2));
-}
-
-test1();
-test1(10);
-test2(1);
-test2();
-test3(1,2);
-
-call_user_func("test1");
-call_user_func("test3", 1);
-call_user_func("test3", 1, 2);
-
-class test {
-	static function test1($a) {
-		var_dump(func_get_arg(0));
-		var_dump(func_get_arg(1));
-	}
-}
-
-test::test1(1);
-var_dump(func_get_arg(1));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
-bool(false)
-
-Warning: func_get_arg():  Argument 0 not passed to function in %s on line %d
-bool(false)
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-
-Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
-bool(false)
-int(10)
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-int(1)
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-
-Warning: Missing argument 1 for test2(), called in %s on line %d and defined in %s on line %d
-
-Warning: func_get_arg():  Argument 0 not passed to function in %s on line %d
-bool(false)
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-int(1)
-int(2)
-
-Warning: func_get_arg():  Argument 2 not passed to function in %s on line %d
-bool(false)
-
-Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
-bool(false)
-
-Warning: func_get_arg():  Argument 0 not passed to function in %s on line %d
-bool(false)
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-
-Warning: Missing argument 2 for test3() in %s on line %d
-int(1)
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-
-Warning: func_get_arg():  Argument 2 not passed to function in %s on line %d
-bool(false)
-int(1)
-int(2)
-
-Warning: func_get_arg():  Argument 2 not passed to function in %s on line %d
-bool(false)
-int(1)
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-
-Warning: func_get_arg():  Called from the global scope - no function context in %s on line %d
-bool(false)
-Done
@@ -1,81 +0,0 @@
--TEST--
-func_get_args() tests
--FILE--
-<?php
-
-function test1() {
-	var_dump(func_get_args());
-}
-
-function test2($a) {
-	var_dump(func_get_args());
-}
-
-function test3($a, $b) {
-	var_dump(func_get_args());
-}
-
-test1();
-test1(10);
-test2(1);
-test2();
-test3(1,2);
-
-call_user_func("test1");
-call_user_func("test3", 1);
-call_user_func("test3", 1, 2);
-
-class test {
-	static function test1($a) {
-		var_dump(func_get_args());
-	}
-}
-
-test::test1(1);
-var_dump(func_get_args());
-
-echo "Done\n";
-?>
--EXPECTF--	
-array(0) {
-}
-array(1) {
-  [0]=>
-  int(10)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
-
-Warning: Missing argument 1 for test2(), called in %s on line %d and defined in %s on line %d
-array(0) {
-}
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(0) {
-}
-
-Warning: Missing argument 2 for test3() in %s on line %d
-array(1) {
-  [0]=>
-  int(1)
-}
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
-
-Warning: func_get_args():  Called from the global scope - no function context in %s on line %d
-bool(false)
-Done
@@ -1,25 +0,0 @@
--TEST--
-strncmp() tests
--FILE--
-<?php
-
-var_dump(strncmp("", ""));
-var_dump(strncmp("", "", 100));
-var_dump(strncmp("aef", "dfsgbdf", -1));
-var_dump(strncmp("fghjkl", "qwer", 0));
-var_dump(strncmp("qwerty", "qwerty123", 6));
-var_dump(strncmp("qwerty", "qwerty123", 7));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: Wrong parameter count for strncmp() in %s on line %d
-NULL
-int(0)
-
-Warning: Length must be greater than or equal to 0 in %s on line %d
-bool(false)
-int(0)
-int(0)
-int(-1)
-Done
@@ -1,27 +0,0 @@
--TEST--
-strcasecmp() tests
--FILE--
-<?php
-
-var_dump(strcasecmp(""));
-var_dump(strcasecmp("", ""));
-var_dump(strcasecmp("aef", "dfsgbdf"));
-var_dump(strcasecmp("qwe", "qwer"));
-var_dump(strcasecmp("qwerty", "QweRty"));
-var_dump(strcasecmp("qwErtY", "qwerty"));
-var_dump(strcasecmp("q123", "Q123"));
-var_dump(strcasecmp("01", "01"));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: Wrong parameter count for strcasecmp() in %s on line %d
-NULL
-int(0)
-int(-3)
-int(-1)
-int(0)
-int(0)
-int(0)
-int(0)
-Done
@@ -1,31 +0,0 @@
--TEST--
-strncasecmp() tests
--FILE--
-<?php
-
-var_dump(strncasecmp(""));
-var_dump(strncasecmp("", "", -1));
-var_dump(strncasecmp("aef", "dfsgbdf", 0));
-var_dump(strncasecmp("aef", "dfsgbdf", 10));
-var_dump(strncasecmp("qwe", "qwer", 3));
-var_dump(strncasecmp("qwerty", "QweRty", 6));
-var_dump(strncasecmp("qwErtY", "qwer", 7));
-var_dump(strncasecmp("q123", "Q123", 3));
-var_dump(strncasecmp("01", "01", 1000));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: 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(-3)
-int(0)
-int(0)
-int(2)
-int(0)
-int(0)
-Done
@@ -1,63 +0,0 @@
--TEST--
-each() tests
--FILE--
-<?php
-
-var_dump(each());
-$var = 1;
-var_dump(each($var));
-$var = "string";
-var_dump(each($var));
-$var = array(1,2,3);
-var_dump(each($var));
-$var = array("a"=>1,"b"=>2,"c"=>3);
-var_dump(each($var));
-
-$a = array(1);
-$a [] =&$a[0];
-
-var_dump(each($a));
-
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: 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
-NULL
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-array(4) {
-  [1]=>
-  int(1)
-  ["value"]=>
-  int(1)
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-array(4) {
-  [1]=>
-  int(1)
-  ["value"]=>
-  int(1)
-  [0]=>
-  string(1) "a"
-  ["key"]=>
-  string(1) "a"
-}
-array(4) {
-  [1]=>
-  int(1)
-  ["value"]=>
-  int(1)
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-Done
@@ -1,53 +0,0 @@
--TEST--
-define() tests
--FILE--
-<?php
-
-var_dump(define());
-var_dump(define("TRUE"));
-var_dump(define("TRUE", 1));
-var_dump(define("TRUE", 1, array(1)));
-
-var_dump(define(array(1,2,3,4,5), 1));
-var_dump(define(" ", 1));
-var_dump(define("[[[", 2));
-var_dump(define("test const", 3));
-var_dump(define("test const", 3));
-var_dump(define("test", array(1)));
-var_dump(define("test1", new stdclass));
-
-var_dump(constant(" "));
-var_dump(constant("[[["));
-var_dump(constant("test const"));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: define() expects at least 2 parameters, 0 given in %s on line %d
-NULL
-
-Warning: define() expects at least 2 parameters, 1 given in %s on line %d
-NULL
-bool(true)
-
-Warning: define() expects parameter 3 to be boolean, array given in %s on line %d
-NULL
-
-Warning: define() expects parameter 1 to be string, array given in %s on line %d
-NULL
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Constant test const already defined in %s on line %d
-bool(false)
-
-Warning: Constants may only evaluate to scalar values in %s on line %d
-bool(false)
-
-Warning: Constants may only evaluate to scalar values in %s on line %d
-bool(false)
-int(1)
-int(2)
-int(3)
-Done
@@ -1,46 +0,0 @@
--TEST--
-get_class() tests
--FILE--
-<?php
-
-class foo {
-	function bar () {
-		var_dump(get_class());
-	}
-}
-
-class foo2 extends foo {
-}
-
-foo::bar();
-foo2::bar();
-
-$f1 = new foo;
-$f2 = new foo2;
-
-$f1->bar();
-$f2->bar();
-
-var_dump(get_class());
-var_dump(get_class("qwerty"));
-
-var_dump(get_class($f1));
-var_dump(get_class($f2));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
-string(3) "foo"
-
-Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
-string(3) "foo"
-string(3) "foo"
-string(3) "foo"
-
-Warning: get_class() called without object from outside a class in %s on line %d
-bool(false)
-bool(false)
-string(3) "foo"
-string(4) "foo2"
-Done
@@ -1,59 +0,0 @@
--TEST--
-get_parent_class() tests
--FILE--
-<?php
-
-interface i {
-	function test();
-}
-
-class foo implements i {
-	function test() {
-		var_dump(get_parent_class());
-	}
-}
-
-class bar extends foo {
-	function test_bar() {
-		var_dump(get_parent_class());
-	}
-}
-
-$bar = new bar;
-$foo = new foo;
-
-$foo->test();
-$bar->test();
-$bar->test_bar();
-
-var_dump(get_parent_class($bar));
-var_dump(get_parent_class($foo));
-var_dump(get_parent_class("bar"));
-var_dump(get_parent_class("foo"));
-var_dump(get_parent_class("i"));
-
-var_dump(get_parent_class(""));
-var_dump(get_parent_class("[[[["));
-var_dump(get_parent_class(" "));
-var_dump(get_parent_class(new stdclass));
-var_dump(get_parent_class(array()));
-var_dump(get_parent_class(1));
-
-echo "Done\n";
-?>
--EXPECTF--	
-bool(false)
-bool(false)
-string(3) "foo"
-string(3) "foo"
-bool(false)
-string(3) "foo"
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-Done
@@ -1,89 +0,0 @@
--TEST--
-property_exists() tests
--FILE--
-<?php
-
-class foo {
-	public $pp1 = 1;
-	private $pp2 = 2;
-	protected $pp3 = 3;
-
-	function bar() {
-		var_dump(property_exists("foo","pp1"));
-		var_dump(property_exists("foo","pp2"));
-		var_dump(property_exists("foo","pp3"));
-	}
-}
-
-class bar extends foo {
-	function test() {
-		var_dump(property_exists("foo","pp1"));
-		var_dump(property_exists("foo","pp2"));
-		var_dump(property_exists("foo","pp3"));
-	}
-}
-
-var_dump(property_exists());
-var_dump(property_exists(""));
-var_dump(property_exists("foo","pp1"));
-var_dump(property_exists("foo","pp2"));
-var_dump(property_exists("foo","pp3"));
-var_dump(property_exists("foo","nonexistent"));
-var_dump(property_exists("fo","nonexistent"));
-var_dump(property_exists("foo",""));
-var_dump(property_exists("","test"));
-var_dump(property_exists("",""));
-
-$foo = new foo;
-
-var_dump(property_exists($foo,"pp1"));
-var_dump(property_exists($foo,"pp2"));
-var_dump(property_exists($foo,"pp3"));
-var_dump(property_exists($foo,"nonexistent"));
-var_dump(property_exists($foo,""));
-var_dump(property_exists(array(),"test"));
-var_dump(property_exists(1,"test"));
-var_dump(property_exists(true,"test"));
-
-$foo->bar();
-
-$bar = new bar;
-$bar->test();
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: Wrong parameter count for property_exists() in %s on line %d
-NULL
-
-Warning: Wrong parameter count for property_exists() in %s on line %d
-NULL
-bool(true)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-
-Warning: First parameter must either be an object or the name of an existing class in %s on line %d
-NULL
-
-Warning: First parameter must either be an object or the name of an existing class in %s on line %d
-NULL
-
-Warning: First parameter must either be an object or the name of an existing class in %s on line %d
-NULL
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(true)
-Done
@@ -1,34 +0,0 @@
--TEST--
-class_exists() tests
--FILE--
-<?php
-
-class foo {
-}
-
-var_dump(class_exists());
-var_dump(class_exists("qwerty"));
-var_dump(class_exists(""));
-var_dump(class_exists(array()));
-var_dump(class_exists("test", false));
-var_dump(class_exists("foo", false));
-var_dump(class_exists("foo"));
-var_dump(class_exists("stdClass", false));
-var_dump(class_exists("stdClass"));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: class_exists() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-bool(false)
-bool(false)
-
-Warning: class_exists() expects parameter 1 to be string, array given in %s on line %d
-NULL
-bool(false)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-Done
@@ -1,34 +0,0 @@
--TEST--
-interface_exists() tests
--FILE--
-<?php
-
-interface foo {
-}
-
-var_dump(interface_exists());
-var_dump(interface_exists("qwerty"));
-var_dump(interface_exists(""));
-var_dump(interface_exists(array()));
-var_dump(interface_exists("test", false));
-var_dump(interface_exists("foo", false));
-var_dump(interface_exists("foo"));
-var_dump(interface_exists("stdClass", false));
-var_dump(interface_exists("stdClass"));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: interface_exists() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-bool(false)
-bool(false)
-
-Warning: interface_exists() expects parameter 1 to be string, array given in %s on line %d
-NULL
-bool(false)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-Done
@@ -1,3 +0,0 @@
-<?php
-/* dummy file for 014.phpt */
-?>
@@ -1,52 +0,0 @@
--TEST--
-get_included_files() tests
--FILE--
-<?php
-
-var_dump(get_included_files());
-
-include(dirname(__FILE__)."/014.inc");
-var_dump(get_included_files());
-
-var_dump(get_included_files(1,1));
-
-include_once(dirname(__FILE__)."/014.inc");
-var_dump(get_included_files());
-
-var_dump(get_included_files(1));
-
-include(dirname(__FILE__)."/014.inc");
-var_dump(get_included_files());
-
-echo "Done\n";
-?>
--EXPECTF--	
-array(1) {
-  [0]=>
-  string(%d) "%s"
-}
-array(2) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-}
-
-Warning: Wrong parameter count for get_included_files() in %s on line %d
-NULL
-array(2) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-}
-
-Warning: Wrong parameter count for get_included_files() in %s on line %d
-NULL
-array(2) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-}
-Done
@@ -1,35 +0,0 @@
--TEST--
-trigger_error() tests
--FILE--
-<?php
-
-var_dump(trigger_error());
-var_dump(trigger_error("error"));
-var_dump(trigger_error(array()));
-var_dump(trigger_error("error", -1));
-var_dump(trigger_error("error", 0));
-var_dump(trigger_error("error", E_USER_WARNING));
-
-echo "Done\n";
-?>
--EXPECTF--	
-Warning: Wrong parameter count for trigger_error() in %s on line %d
-NULL
-
-Notice: error in %s on line %d
-bool(true)
-
-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)
-
-Warning: Invalid error type specified in %s on line %d
-bool(false)
-
-Warning: error in %s on line %d
-bool(true)
-Done
@@ -1,12 +0,0 @@
--TEST--
-isset() with object properties when operating on non-object
--FILE--
-<?php
-
-$foo = NULL; 
-isset($foo->bar->bar);
-
-echo "Done\n";
-?>
--EXPECT--	
-Done
@@ -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: Wrong parameter count for get_resource_type() in %s on line %d
-NULL
-
-Warning: Supplied argument is not a valid resource handle in %s on line %d
-bool(false)
-string(6) "stream"
-string(7) "Unknown"
-string(5) "array"
-int(%d)
-string(5) "array"
-int(%d)
-
-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
-string(5) "array"
-string(5) "array"
-int(%d)
-
-Warning: Wrong parameter count for get_defined_functions() in %s on line %d
-NULL
-string(5) "array"
-int(%d)
-
-Warning: Wrong parameter count for get_declared_interfaces() in %s on line %d
-NULL
-string(5) "array"
-int(%d)
-
-Warning: Wrong parameter count for get_extension_funcs() in %s on line %d
-NULL
-bool(false)
-string(5) "array"
-int(%d)
-string(5) "array"
-int(%d)
-Done
@@ -1,36 +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: Wrong parameter count for constant() in %s on line %d
-NULL
-
-Warning: Wrong parameter count for constant() in %s on line %d
-NULL
-
-Warning: constant(): Couldn't find constant  in %s on line %d
-NULL
-
-Notice: Array to string conversion in %s on line %d
-
-Warning: constant(): Couldn't find constant Array in %s on line %d
-NULL
-int(1)
-string(4) "test"
-Done
@@ -1,31 +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--	
-bool(false)
-
-Warning: func_get_arg():  Called from the global scope - no function context in %s on line %d
-bool(false)
-bool(false)
-
-Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
-bool(false)
-Done
@@ -1,14 +0,0 @@
--TEST--
-Test for abstract static classes
--FILE--
-<?php
-abstract class TestClass
-{
-    abstract static public function getName();
-}
-?>
-===DONE===
--EXPECTF--
-
-Strict Standards: Static function TestClass::getName() should not be abstract in %sabstract-static.php on line %d
-===DONE===
@@ -1,39 +0,0 @@
--TEST--
-__call() for private/protected methods
--FILE--
-<?php
-
-class A {
-	private   $var1 = 'var1 value';
-	protected $var2 = 'var2 value';
-
-	private function func1()
-	{
-		return "in func1";
-	}
-	protected function func2()
-	{
-		return "in func2";
-	}
-	public function __get($var)
-	{
-		return $this->$var;
-	}
-	public function __call($func, array $args = array())
-	{
-		return call_user_func_array(array($this, $func), $args);
-	}
-}
-
-$a = new A();
-echo $a->var1,"\n";
-echo $a->var2,"\n";
-echo $a->func1(),"\n";
-echo $a->func2(),"\n";
-
-?>
--EXPECTF--	
-var1 value
-var2 value
-in func1
-in func2
@@ -1,21 +0,0 @@
--TEST--
-Trigger __call() in lieu of non visible methods when called via a callback.
--FILE--
-<?php
-class C {
-	protected function prot() { }
-	private function priv() { }
-	public function __call($name, $args)    {
-        echo "In __call() for method $name()\n";
-    }
-}
-
-$c = new C;
-call_user_func(array($c, 'none'));
-call_user_func(array($c, 'prot'));
-call_user_func(array($c, 'priv'));
-?>
--EXPECTF--
-In __call() for method none()
-In __call() for method prot()
-In __call() for method priv()
@@ -1,73 +0,0 @@
--TEST--
-adding arrays
--FILE--
-<?php
-
-$a = array(1,2,3);
-$b = array("str", "here");
-
-$c = $a + $b;
-var_dump($c);
-
-$a = array(1,2,3);
-$b = array(1,2,4);
-
-$c = $a + $b;
-var_dump($c);
-
-$a = array("a"=>"aaa",2,3);
-$b = array(1,2,"a"=>"bbbbbb");
-
-$c = $a + $b;
-var_dump($c);
-
-$a += $b;
-var_dump($c);
-
-$a += $a;
-var_dump($c);
-
-echo "Done\n";
-?>
--EXPECTF--	
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(3) {
-  ["a"]=>
-  string(3) "aaa"
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(3) {
-  ["a"]=>
-  string(3) "aaa"
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(3) {
-  ["a"]=>
-  string(3) "aaa"
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-Done
@@ -1,19 +0,0 @@
--TEST--
-adding objects to arrays
--FILE--
-<?php
-
-$a = array(1,2,3);
-
-$o = new stdclass;
-$o->prop = "value";
-
-$c = $a + $o;
-var_dump($c);
-
-echo "Done\n";
-?>
--EXPECTF--	
-Notice: Object of class stdClass could not be converted to int in %s on line %d
-
-Fatal error: Unsupported operand types in %s on line %d
@@ -1,19 +0,0 @@
--TEST--
-adding arrays to objects 
--FILE--
-<?php
-
-$a = array(1,2,3);
-
-$o = new stdclass;
-$o->prop = "value";
-
-$c = $o + $a;
-var_dump($c);
-
-echo "Done\n";
-?>
--EXPECTF--	
-Notice: Object of class stdClass could not be converted to int in %s on line %d
-
-Fatal error: Unsupported operand types in %s on line %d
@@ -1,14 +0,0 @@
--TEST--
-adding numbers to arrays
--FILE--
-<?php
-
-$a = array(1,2,3);
-
-$c = $a + 5;
-var_dump($c);
-
-echo "Done\n";
-?>
--EXPECTF--	
-Fatal error: Unsupported operand types in %s on line %d
@@ -1,22 +0,0 @@
--TEST--
-adding integers to doubles
--INI--
-precision=14
--FILE--
-<?php
-
-$i = 75636;
-$d = 2834681123.123123;
-
-$c = $i + $d;
-var_dump($c);
-
-$c = $d + $i;
-var_dump($c);
-
-echo "Done\n";
-?>
--EXPECTF--	
-float(2834756759.1231)
-float(2834756759.1231)
-Done
@@ -1,49 +0,0 @@
--TEST--
-adding numbers to strings
--INI--
-precision=14
--FILE--
-<?php
-
-$i = 75636;
-$s1 = "this is a string";
-$s2 = "876222numeric";
-$s3 = "48474874";
-$s4 = "25.68";
-
-$c = $i + $s1;
-var_dump($c);
-
-$c = $i + $s2;
-var_dump($c);
-
-$c = $i + $s3;
-var_dump($c);
-
-$c = $i + $s4;
-var_dump($c);
-
-$c = $s1 + $i;
-var_dump($c);
-
-$c = $s2 + $i;
-var_dump($c);
-
-$c = $s3 + $i;
-var_dump($c);
-
-$c = $s4 + $i;
-var_dump($c);
-
-echo "Done\n";
-?>
--EXPECTF--	
-int(75636)
-int(951858)
-int(48550510)
-float(75661.68)
-int(75636)
-int(951858)
-int(48550510)
-float(75661.68)
-Done
@@ -1,16 +0,0 @@
--TEST--
-adding strings to arrays 
--FILE--
-<?php
-
-$a = array(1,2,3);
-
-$s1 = "some string";
-
-$c = $a + $s1;
-var_dump($c);
-
-echo "Done\n";
-?>
--EXPECTF--	
-Fatal error: Unsupported operand types in %s on line %d
@@ -1,39 +0,0 @@
--TEST--
-bitwise AND and strings
--FILE--
-<?php
-
-$s = "123";
-$s1 = "234";
-
-var_dump($s & $s1);
-
-$s = "test";
-$s1 = "some";
-
-var_dump($s & $s1);
-
-$s = "test long";
-$s1 = "some";
-
-var_dump($s & $s1);
-
-$s = "test";
-$s1 = "some long";
-
-var_dump($s & $s1);
-
-$s = "test";
-$s &= "some long";
-
-var_dump($s);
-
-echo "Done\n";
-?>
--EXPECTF--	
-string(3) "020"
-string(4) "pead"
-string(4) "pead"
-string(4) "pead"
-string(4) "pead"
-Done
@@ -1,16 +0,0 @@
--TEST--
-Tests that array manipulation code is correctly dealing with copy on write and splitting on reference
--FILE--
-<?php
-	$a=array();
-	$b=1;
-	$c=&$b;
-	$a[]=$b;
-	$b=2;
-	var_dump ($a);
-?>
--EXPECT--
-array(1) {
-  [0]=>
-  int(1)
-}
@@ -1,15 +0,0 @@
--TEST--
-Array type hint
--FILE--
-<?php
-function foo(array $a) {
-	echo count($a)."\n";
-}
-
-foo(array(1,2,3));
-foo(123);
-?>
--EXPECTF--
-3
-
-Catchable fatal error: Argument 1 passed to foo() must be an array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
@@ -1,16 +0,0 @@
--TEST--
-Tests that array unshift code is correctly dealing with copy on write and splitting on reference
--FILE--
-<?php
-	$a=array();
-	$b=1;
-	$c=&$b;
-	array_unshift ($a,$b);
-	$b=2;
-	var_dump ($a);
-?>
--EXPECT--
-array(1) {
-  [0]=>
-  int(1)
-}
@@ -34,3 +34,6 @@ $c->viewMom();
 --EXPECT--
 protected method
 protected property
+--EXPECT--
+protected method
+protected property
@@ -1,5 +1,5 @@
 --TEST--
-Bug #22725 (A derived class can call a parent's protected method that calls a private method)
+bug #22725 (A derived class can call a parent's protected method that calls a private method)
 --SKIPIF--
 <?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
@@ -18,17 +18,57 @@ for ($i = 0; $i < 8; $i++) {
 --EXPECTF--
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
+string(3) "foo"
+'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
+
+
@@ -8,7 +8,7 @@ class Test {
    function __copy()
    {
        $string = PHP_VERSION;
-        $version = $string[0];
+        $version = $string{0};
        if($string < 5)
        {
            return $this;
@@ -23,6 +23,6 @@ $test = new Test();
 $test2 = $test->__copy();
 var_dump($test2);
 ?>
--EXPECTF--
-object(Test)#%d (0) {
+--EXPECT--
+object(Test)#2 (0) {
 }
@@ -1,5 +1,5 @@
 --TEST--
-Bug #26077 (Memory leaks when creating an instance of an object)
+Bug #26077  	Memory leaks when creating an instance of an object
 --FILE--
 <?php
 class foo {} new foo();
@@ -2,7 +2,6 @@
 Bug #26166 (__toString() crash when no values returned)
 --FILE--
 <?php
-
 class Foo
 {
    function __toString()
@@ -29,23 +28,6 @@ class Bar
 $o = new Bar;
 echo $o;

-echo "===NONE===\n";
-
-function my_error_handler($errno, $errstr, $errfile, $errline) {
-	var_dump($errstr);
-}
-
-set_error_handler('my_error_handler');
-
-class None
-{
-	function __toString() {
-	}
-}
-
-$o = new None;
-echo $o;
-
 echo "===THROW===\n";

 class Error 
@@ -63,12 +45,23 @@ catch (Exception $e) {
 	echo "Got the exception\n";
 }

+echo "===NONE===\n";
+
+class None
+{
+	function __toString() {
+	}
+}
+
+$o = new None;
+echo $o;
+
 ?>
 ===DONE===
 --EXPECTF--
 Hello World!
-===NONE===
-string(52) "Method None::__toString() must return a string value"
 ===THROW===
+Got the exception
+===NONE===

-Fatal error: Method Error::__toString() must not throw an exception in %sbug26166.php on line %d
+Fatal error: Method None::__toString() must return a string value in %sbug26166.php on line %d
@@ -11,19 +11,11 @@ class array_iterator implements IteratorAggregate {

 $obj = new array_iterator;

-try
-{
-	foreach ($obj as $property => $value)
-	{
-		var_dump($value);
-	}
-}
-catch(Exception $e)
-{
-	echo $e->getMessage() . "\n";
+foreach ($obj as $property => $value) {
+        var_dump($value);
 }
 ?>
 ===DONE===
 --EXPECTF--
-Objects returned by array_iterator::getIterator() must be traversable or implement interface Iterator
-===DONE===
+Warning: Objects returned by array_iterator::getIterator() must be traversable or implement interface Iterator in %sbug26229.php on line %d
+===DONE===
@@ -3,7 +3,7 @@ Bug #26281 (switch() crash when condition is a string offset)
 --FILE--
 <?php
 	$x = 'abc';
-	switch ($x[0]) {
+	switch ($x{0}) {
 		case 'a':
 			echo "no crash\n";
 			break;
@@ -4,14 +4,14 @@ Bug #26801 (switch ($a{0}) crash)
 <?php

 $a = '11';
-$b = $a[0];
+$b = $a{0};
 switch ($b) {
 	case '-':
 		break;
 }

 $a = '22';
-switch ($a[0]) {
+switch ($a{0}) {
 	case '-':
 		break;
 }
				`@@ -1 +0,0 @@`
				`Zend/zend_execute.lo: $(srcdir)/zend_vm_execute.h $(srcdir)/zend_vm_opcodes.h`