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

5.2.3
MFH
2026-11-08 17:50:50 +00:00 · 2007-05-30 18:46:00 +00:00 · 2007-05-30 18:45:59 +00:00 · 2007-05-30 16:32:02 +00:00 · 2007-05-30 15:40:26 +00:00 · 2007-05-30 15:16:31 +00:00
3890 changed files with 314195 additions and 188961 deletions
@@ -1,16 +1,15 @@
-set $zts = 0
-
 define ____executor_globals
-	if $zts
-		set $eg = ((zend_executor_globals) (*((void ***) tsrm_ls))[executor_globals_id-1])
+	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])
 	else
 		set $eg = executor_globals
 	end
 end

 document ____executor_globals
-	portable way of accessing executor_globals
-	type "set $zts = 1" if you use --enable-maintainer-zts on your configure line
+	portable way of accessing executor_globals, set $eg
+	ZTS detection is automatically based on ext/standard module struct
 end

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

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

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

-	if $zvalue.type == 0
-		set $typename = "NULL"
+	printf "(refcount=%d", $zvalue->refcount
+	if $zvalue->is_ref
+		printf ",is_ref"
 	end
-	if $zvalue.type == 1
-		set $typename = "long"
+	printf ") "
+	if $type == 0
+		printf "NULL"
 	end
-	if $zvalue.type == 2
-		set $typename = "double"
+	if $type == 1
+		printf "long: %ld", $zvalue->value.lval
 	end
-	if $zvalue.type == 3
-		set $typename = "string"
+	if $type == 2
+		printf "double: %lf", $zvalue->value.dval
 	end
-	if $zvalue.type == 4
-		set $typename = "array"
+	if $type == 3
+		printf "bool: "
+		if $zvalue->value.lval
+			printf "true"
+		else
+			printf "false"
+		end
 	end
-	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 $type == 4
+		printf "array(%d): ", $zvalue->value.ht->nNumOfElements
 		if ! $arg1
 			printf "{\n"
 			set $ind = $ind + 1
-			____print_ht $zvalue.value.ht
+			____print_ht $zvalue->value.ht 1
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0
@@ -101,34 +82,61 @@ define ____printzv_contents
 			end
 			printf "}"
 		end
+		set $type = 0
 	end
-	if $zvalue.type == 5
+	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 ! $arg1
-			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 "}"
+			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
 			end
 		end
+		set $type = 0
 	end
-	if $zvalue.type == 6
-		if $zvalue.value.lval
-			printf "true"
-		else
-			printf "false"
-		end
+	if $type == 6
+		printf "string(%d): ", $zvalue->value.str.len
+		____print_str $zvalue->value.str.val $zvalue->value.str.len
 	end
-	if $zvalue.type == 7
-		printf "#%d", $zvalue.value.lval
+	if $type == 7
+		printf "resource: #%d", $zvalue->value.lval
+	end
+	if $type == 8 
+		printf "constant"
+	end
+	if $type == 9
+		printf "const_array"
+	end
+	if $type > 9
+		printf "unknown type %d", $type
 	end
 	printf "\n"
 end
@@ -143,7 +151,7 @@ define ____printzv
 		printf "*uninitialized* "
 	end

-	set $zcontents = *(struct _zval_struct *) $zvalue
+	set $zcontents = (zval*) $zvalue
 	if $arg1
 		____printzv_contents $zcontents $arg1
 	else
@@ -156,7 +164,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
@@ -164,13 +172,14 @@ define ____print_const_table
 			set $i = $i - 1
 		end

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

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

 define ____print_ht
-	set $ht = $arg0
+	set $ht = (HashTable*)$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 
-			printf "\"%s\" => ", $p->arKey
+		if $p->nKeyLength > 0
+			____print_str $p->arKey $p->nKeyLength
+			printf " => "
 		else
 			printf "%d => ", $p->h
 		end
+		
+		if $arg1 == 0
+			printf "%p\n", (void*)$p->pData
+		end
+		if $arg1 == 1
+			set $zval = *(zval **)$p->pData
+			____printzv $zval 1
+		end
+		if $arg1 == 2
+			printf "%s\n", (char*)$p->pData
+		end

-		____printzv $zval 1
 		set $p = $p->pListNext
 	end
 end
@@ -209,7 +227,7 @@ end
 define print_ht
 	set $ind = 1
 	printf "[0x%08x] {\n", $arg0
-	____print_ht $arg0
+	____print_ht $arg0 1
 	printf "}\n"
 end

@@ -217,6 +235,171 @@ 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
@@ -148,20 +148,19 @@ 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, with words underscore delimited. The class name should be prefixed
-    with the name of the 'parent set'.
+[7] Classes should be given descriptive names. Avoid using abbreviations where
+    possible. Each word in the class name should start with a capital letter, 
+    without underscore delimiters (CampelCaps starting with a capital letter). 
+    The class name should be prefixed with the name of the 'parent set' (e.g. 
+    the name of the extension).

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

    Bad:
    'foobar'
    'foo_bar'
-    'FooBar'
-

 Syntax and indentation
 ----------------------
@@ -208,6 +207,12 @@ 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
 -------------------------------

@@ -46,9 +46,9 @@ MAINTENANCE:         Maintained
 STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           apache2handler
-PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>
+PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Experimental
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           caudium
 MAINTENANCE:         Unknown
@@ -68,11 +68,6 @@ PRIMARY MAINTAINER:  Alex Leigh <aleigh@php.net>
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           date
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
 EXTENSION:           embed
 PRIMARY MAINTAINER:  Edin Kadribasic <edink@php.net>
 MAINTENANCE:         Maintained
@@ -132,32 +127,14 @@ EXTENSION:           dbase
 MAINTENANCE:         Orphaned
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           dbx
-PRIMARY MAINTAINER:  Marc Boeren <M.Boeren@guidance.nl>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               4.0.6
-COMMENT:             DB abstraction for odbc, mysql, pgsql, mssql, fbsql and more, see documentation
-------------------------------------------------------------------------------
 EXTENSION:           fbsql
 PRIMARY MAINTAINER:  Frank M. Kromann <fmk@swwwing.com>
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           informix
-PRIMARY MAINTAINER:  Danny Heijl <Danny.Heijl@cevi.be>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           ingres_ii
-PRIMARY MAINTAINER:  David Hénot <henot@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
-SINCE:               4.0.2
-------------------------------------------------------------------------------
 EXTENSION:           interbase
 PRIMARY MAINTAINER:  Ard Biesheuvel <ard@ard.nu>, Jouni Ahto <jouni.ahto@exdec.fi>
-MAINTENANCE:         Maintained
+MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           msql
@@ -176,9 +153,9 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mysqli
-PRIMARY MAINTAINER:  Georg Richter <georg@php.net>
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Experimental
+STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           oci8
@@ -192,14 +169,53 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             Working 
 -------------------------------------------------------------------------------
-EXTENSION:           oracle
-MAINTENANCE:         Orphaned
+EXTENSION:           pdo
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Odd fixes
 STATUS:              Working
-COMMENT:             Using the new OCI8 driver is encouraged where possible.
+SINCE:               5.1
 -------------------------------------------------------------------------------
-EXTENSION:           ovrimos
-MAINTENANCE:         Unknown
-STATUS:              Unknown
+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:  Unknown
+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>
@@ -234,7 +250,7 @@ STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           simplexml
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
@@ -242,11 +258,11 @@ SINCE:               5.0
 EXTENSION:           soap
 PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>
 MAINTENANCE:         Maintained
-STATUS:              Experimental
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           wddx
 PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
-MAINTENANCE:         Maintained
+MAINTENANCE:         Orphaned
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xml
@@ -254,11 +270,21 @@ 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:         UNKNOWN
+MAINTENANCE:         Orphaned
 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
@@ -272,7 +298,7 @@ SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           bcmath
 MAINTENANCE:         Unknown
-STATUS:              Unknown
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           bz2
 PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
@@ -291,49 +317,41 @@ 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>
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>,Ilia Alshanetsky <iliaa@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:           fam
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           fdf
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+EXTENSION:           filter
+PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>, Pierre-Alain Joye <pajoye@php.net>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           filepro
-MAINTENANCE:         Unknown
-STATUS:              Unknown
+STATUS:              Working
+SINCE:               5.2
 -------------------------------------------------------------------------------
 EXTENSION:           ftp
-PRIMARY MAINTAINER:  Stefan Esser (sesser@php.net)
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Stefan Esser <sesser@php.net>
+MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gd
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
+PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -342,32 +360,29 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gmp
-MAINTENANCE:         Unknown
-STATUS:              Unknown
+PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net>, Antony Dovgal <tony2001@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
-EXTENSION:           hwapi
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           iconv
 PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           imap
-PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>
-MAINTENANCE:         Odd Fixes
+PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>, Ilia Alshanetsky <iliaa@php.net>
+MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           ircg
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
+EXTENSION:           json
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Odd fixes
+STATUS:              Working
+SINCE:               5.2
 -------------------------------------------------------------------------------
 EXTENSION:           ldap
-PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>
+PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -381,14 +396,9 @@ PRIMARY MAINTAINER:  Derick Rethans <derick@derickrethans.nl>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           mcve
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           mhash
 PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Maintained
+MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mime_magic
@@ -402,48 +412,26 @@ PRIMARY MAINTAINER:  Frank M. Kromann
 MAINTENANCE:         Unknown
 STATUS:              Experimental
 -------------------------------------------------------------------------------
-EXTENSION:           mnogosearch
-PRIMARY MAINTAINER:  Sergey Kartashoff <gluke@mail.ru>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           mono
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           msession
-PRIMARY MAINTAINER   Mark L. Woodward <mlwmohawk@mohawksoft.com>
-MAINTENANCE:         Maintained
-STATUS:              Working/Experimental
-COMMENT:             Tested on Linux, should work on other UNIX platforms. Backend server code can compile under Windows.
-------------------------------------------------------------------------------
 EXTENSION:           ncurses
 PRIMARY MAINTAINER   Ilia Alshanetsky <iliaa@php.net>, Wez Furlong <wez@php.net>, Hartmut Holzgraefe <hholzgra@php.net>, Georg Richter <georg@php.net>
 MAINTENANCE:         Unknown
 STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           openssl
-PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>
+PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Experimental
+STATUS:              Working
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
 EXTENSION:           pcntl
 MAINTENANCE:         Unknown
-STATUS:              Experimental
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           pcre
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>, Nuno Lopes <nlopess@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
@@ -452,7 +440,7 @@ STATUS:              Working
 EXTENSION:           pspell
 PRIMARY MAINTAINER:  Vlad Krupin <phpdevel@echospace.com>
 MAINTENANCE:         Unknown
-STATUS:              Unknown
+STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           readline
@@ -464,15 +452,20 @@ 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>
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           shmop
 PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Experimental
+STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
 EXTENSION:           snmp
@@ -483,7 +476,7 @@ STATUS:              Working
 EXTENSION:           sockets
 PRIMARY MAINTAINER:  Chris Vandomelen <chrisv@b0rked.dhs.org>
 MAINTENANCE:         Maintained
-STATUS:              Experimental
+STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           spl
@@ -494,31 +487,30 @@ SINCE:               5.0.0
 -------------------------------------------------------------------------------
 EXTENSION:           sysvmsg
 MAINTENANCE:         Unknown
-STATUS:              Unknown
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sysvsem
 MAINTENANCE:         Unknown
-STATUS:              Unknown
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sysvshm
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           tidy
-PRIMARY MAINTAINER:  John Coggeshall <john@php.net>, Ilia Alshanetsky <iliaa@php.net>
+PRIMARY MAINTAINER:  John Coggeshall <john@php.net>, Ilia Alshanetsky <iliaa@php.net>, Nuno Lopes <nlopess@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Unknown
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           tokenizer
 PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Unknown
-STATUS:              Unknown
+STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           yaz
-PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
+EXTENSION:           zip
+PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Unknown
-SINCE:               4.0.1
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           zlib
 PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de>
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
-                  The PHP License, Version 3.0
-Copyright (c) 1999 - 2005 The PHP Group. All rights reserved.
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2006 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, freely available from
-     <http://www.php.net/>".
+     "This product includes PHP software, freely available from
+     <http://www.php.net/software/>".

 THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
 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>.

-This product includes the Zend Engine, freely available at
+PHP includes the Zend Engine, freely available at
 <http://www.zend.com>.
@@ -3,21 +3,21 @@
 # Zend
 #

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

-$(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_scanner.c: $(srcdir)/zend_language_scanner.l
+	@$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l

-$(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_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_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_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_scanner.c: $(srcdir)/zend_ini_scanner.l
-	$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l
+$(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_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(builddir)/zend_language_parser.h
+$(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
@@ -0,0 +1,76 @@
+
+#
+# LCOV
+#
+
+lcov: lcov-html
+
+lcov-test: all
+	@echo "Running test suite"
+	@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
+	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
+		NO_INTERACTION=1 \
+		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
+	elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
+		NO_INTERACTION=1 \
+		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
+	else \
+		echo "ERROR: Cannot run tests without CLI sapi."; \
+	fi
+
+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/
+
@@ -5,13 +5,10 @@ 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)

-CORE_HEADERS = Zend/ TSRM/ include/ main/ main/streams/ regex/ ext/standard/
-INSTALL_HEADERS = $(CORE_HEADERS) $(INSTALL_EXT_HEADERS)
-
 all: $(all_targets) 
 	@echo
 	@echo "Build complete."
-	@echo "(It is safe to ignore warnings about tempnam and tmpnam)."
+	@echo "Don't forget to run 'make test'."
 	@echo
 	
 build-modules: $(PHP_MODULES)
@@ -28,10 +25,10 @@ install: $(all_targets) $(install_targets)
 install-sapi: $(OVERALL_TARGET)
 	@echo "Installing PHP SAPI module:       $(PHP_SAPI)"
 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-	-@if test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); then \
+	-@if test ! -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); then \
 		for i in 0.0.0 0.0 0; do \
-			if test -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i; then \
-				$(LN_S) $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); \
+			if test -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+				$(LN_S) $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); \
 				break; \
 			fi; \
 		done; \
@@ -45,15 +42,40 @@ 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-su: install-pear

 test: all 
-	-@if test ! -z $(PHP_EXECUTABLE) && test -x $(PHP_EXECUTABLE); then \
+	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
 		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
 			$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
-	elif test ! -z $(SAPI_CLI_PATH) && test -x $(SAPI_CLI_PATH); then \
+	elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
 		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
@@ -29,14 +29,22 @@ Having said that, here are the organizational rules:
   5. If you don't know how to do something, ask first!

   6. Test your changes before committing them. We mean it. Really.
+      To do so use "make test".
+   
+   7. For development use the --enable-maintainer-zts switch to ensure your
+      code handles TSRM correctly and doesn't break for thos who need that.

 Currently we have the following branches in use:
-HEAD     Will become PHP 5.1. This CVS branch is for active development.
-PHP_5_0  Is used to release the PHP 5.0.x series. Only minor feature
-		 enhancements may go in here, but please keep that as infrequent as
-		 possible.
-PHP_4_3  Is used to release the PHP 4.3.x series. Only bugfixes are permitted
-         on this branch.
+HEAD     Will become PHP 6.0. This CVS branch is for active development.
+PHP_5_2  Is used to release the PHP 5.2.x series. Only minor feature
+         enhancements may go in here, but please keep that as infrequent as
+         possible.
+PHP_5_1  Is used to release the PHP 5.1.x series. Only bugfixes are permitted
+         on this branch (Consult the releasemaster prior to commit).
+PHP_5_0  This branch is closed.
+PHP_4_4  Is used to release the PHP 4.4.x series. Only bugfixes are permitted
+         on this branch (Consult the releasemaster prior to commit).
+PHP_4_3  This branch is closed.

 The next few rules are more of a technical nature.

@@ -31,14 +31,17 @@ resources cannot be auto-converted.

 Type specifiers
 ---------------
- 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
+ b	- boolean, stored in zend_bool
+ d	- double
+ f	- function or array containing php method call info (returned as 
+	  zend_fcall_info* and zend_fcall_info_cache*)
+ h	- array (returned as HashTable*)
+ l	- long
 o	- object (of any type)
 O	- object (of specific type, specified by class entry)
+ r	- resource (stored in zval)
+ s	- string (with possible null bytes) and its length
 z	- the actual zval

 The following characters also have a meaning in the specifier string:
@@ -48,8 +51,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 'a', 'o', 'O', 'r', and 'z'). If NULL is passed, the results
-	    pointer is set to NULL as well.
+		to 's', 'a', 'o', 'O', 'r', 'h', 'C', 'z', and 'Z'). If NULL is passed,
+	 	the results pointer is set to NULL as well.

 Examples
 --------
@@ -10,7 +10,10 @@ 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.  
+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.

 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
@@ -34,7 +37,7 @@ ZEND_END_MODULE_GLOBALS(my_input_filter)

 ZEND_DECLARE_MODULE_GLOBALS(my_input_filter)

-function_entry my_input_filter_functions[] = {
+zend_function_entry my_input_filter_functions[] = {
    PHP_FE(my_get_raw,   NULL)
    {NULL, NULL, NULL}
 };
@@ -64,14 +64,6 @@ documentation
    * Add developer documentation.
    * Add detailed documentation for Java extension.

-ext/bz2
-------
-    * Add an ini directive to specify the size of decompression buffer.
-      The default 4k is too small for large files and also requires much time
-      for decompression. 40k is suitable for such files, however it may be too
-      much under certain environments. There should be appropriate default
-      settings for the various SAPI modules (e.g. apache and cli).
-
 ext/curl
 --------
    * Have a warning scheme for when people use unsupported features.
@@ -104,13 +96,6 @@ 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:
@@ -137,7 +122,6 @@ 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
@@ -2,4 +2,3 @@ Zend Engine
 -----------
  - Look at making zend_constant value member be a zval* instead of zval. (Andi)
  - Implement inheritance rules for type hints. (Marcus) 
-  - Find a keyword for the if-set-or operator (apply the patch). (Marcus, all)
@@ -48,26 +48,6 @@ 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
@@ -1,4 +1,4 @@
-Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski.
+Copyright (c) 1999-2006, 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, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski|
+   | Copyright (c) 1999-2007, 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                                |
   +----------------------------------------------------------------------+
@@ -430,7 +430,6 @@ void *tsrm_new_interpreter_context(void)

 	current = tsrm_tls_get();

-	new_ctx = malloc(sizeof(*new_ctx));
 	allocate_new_resource(&new_ctx, thread_id);
 	
 	/* switch back to the context that was in use prior to our creation
@@ -481,6 +480,52 @@ 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)
 {
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Thread Safe Resource Manager                                         |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski|
+   | Copyright (c) 1999-2007, 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,14 +13,11 @@
 #ifndef TSRM_H
 #define TSRM_H

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

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

@@ -106,6 +111,9 @@ 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);

@@ -7,11 +7,15 @@
 * 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 */

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

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

 #endif /* READDIR_H */
@@ -68,7 +68,6 @@ AC_DEFUN([TSRM_CHECK_ST],[
 ])

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

 AC_DEFUN([TSRM_CHECK_PTHREADS],[
 		
@@ -1,8 +1,10 @@
 #ifndef TSRM_CONFIG_COMMON_H
 #define TSRM_CONFIG_COMMON_H

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

 #ifdef TSRM_WIN32
@@ -42,6 +44,8 @@ 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-2005 The PHP Group                                |
+   | Copyright (c) 1997-2007 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
+   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
+   | http://www.php.net/license/3_01.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-2005 The PHP Group                                |
+   | Copyright (c) 1997-2007 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
+   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
+   | http://www.php.net/license/3_01.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-2005 The PHP Group                                |
+   | Copyright (c) 1997-2007 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
+   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
+   | http://www.php.net/license/3_01.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.               |
@@ -35,11 +35,6 @@
 #ifdef TSRM_WIN32
 #include <io.h>
 #include "tsrm_win32.h"
-# if HAVE_NEWAPIS_H
-#  define WANT_GETLONGPATHNAME_WRAPPER
-#  define COMPILE_NEWAPIS_STUBS
-#  include <NewAPIs.h>
-# endif
 #endif

 #ifdef NETWARE
@@ -140,11 +135,93 @@ static int php_check_dots(const char *element, int n)
 #define CWD_STATE_FREE(s)			\
 	free((s)->cwd);
 	
+#ifdef TSRM_WIN32
+CWD_API int php_sys_stat(const char *path, struct stat *buf)
+{
+	WIN32_FILE_ATTRIBUTE_DATA data;
+	__int64 t;
+
+	if (!GetFileAttributesEx(path, GetFileExInfoStandard, &data)) {
+		return stat(path, buf);
+	}
+
+	if (path[1] == ':') {
+		if (path[0] >= 'A' && path[0] <= 'Z') {
+			buf->st_dev = buf->st_rdev = path[0] - 'A';
+		} else {
+			buf->st_dev = buf->st_rdev = path[0] - 'a';
+		}
+	} else {
+		char  cur_path[MAXPATHLEN+1];
+		DWORD len = sizeof(cur_path);
+		char *tmp = cur_path;
+
+		while(1) {
+			DWORD r = GetCurrentDirectory(len, tmp);
+			if (r < len) {
+				if (tmp[1] == ':') {
+					if (path[0] >= 'A' && path[0] <= 'Z') {
+						buf->st_dev = buf->st_rdev = path[0] - 'A';
+					} else {
+						buf->st_dev = buf->st_rdev = path[0] - 'a';
+					}
+				} else {
+					buf->st_dev = buf->st_rdev = -1;
+				}
+				break;
+			} else if (!r) {
+				buf->st_dev = buf->st_rdev = -1;
+				break;
+			} else {
+				len = r+1;
+				tmp = (char*)malloc(len);
+			}
+		}
+		if (tmp != cur_path) {
+			free(tmp);
+		}		    	
+	}
+	buf->st_uid = buf->st_gid = buf->st_ino = 0;
+	buf->st_mode = (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? (S_IFDIR|S_IEXEC|(S_IEXEC>>3)|(S_IEXEC>>6)) : S_IFREG;
+	buf->st_mode |= (data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)) : (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)|S_IWRITE|(S_IWRITE>>3)|(S_IWRITE>>6));
+	if ((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
+		int len = strlen(path);
+
+		if (path[len-4] == '.') {
+			if (_memicmp(path+len-3, "exe", 3) == 0 ||
+			    _memicmp(path+len-3, "com", 3) == 0 ||
+			    _memicmp(path+len-3, "bat", 3) == 0 ||
+			    _memicmp(path+len-3, "cmd", 3) == 0) {
+				buf->st_mode  |= (S_IEXEC|(S_IEXEC>>3)|(S_IEXEC>>6));
+			}
+		}
+	}			
+    buf->st_nlink = 1;
+	t = data.nFileSizeHigh;
+	t = t << 32;
+	t |= data.nFileSizeLow;
+	buf->st_size = t;
+	t = data.ftLastAccessTime.dwHighDateTime;
+	t = t << 32;
+	t |= data.ftLastAccessTime.dwLowDateTime;
+	buf->st_atime = (unsigned long)((t / 10000000) - 11644473600);
+	t = data.ftCreationTime.dwHighDateTime;
+	t = t << 32;
+	t |= data.ftCreationTime.dwLowDateTime;
+	buf->st_ctime = (unsigned long)((t / 10000000) - 11644473600);
+	t = data.ftLastWriteTime.dwHighDateTime;
+	t = t << 32;
+	t |= data.ftLastWriteTime.dwLowDateTime;
+	buf->st_mtime = (unsigned long)((t / 10000000) - 11644473600);
+	return 0;
+}
+#endif
+
 static int php_is_dir_ok(const cwd_state *state) 
 {
 	struct stat buf;

-	if (stat(state->cwd, &buf) == 0 && S_ISDIR(buf.st_mode))
+	if (php_sys_stat(state->cwd, &buf) == 0 && S_ISDIR(buf.st_mode))
 		return (0);

 	return (1);
@@ -154,7 +231,7 @@ static int php_is_file_ok(const cwd_state *state)
 {
 	struct stat buf;

-	if (stat(state->cwd, &buf) == 0 && S_ISREG(buf.st_mode))
+	if (php_sys_stat(state->cwd, &buf) == 0 && S_ISREG(buf.st_mode))
 		return (0);

 	return (1);
@@ -163,31 +240,16 @@ static int php_is_file_ok(const cwd_state *state)
 static void cwd_globals_ctor(virtual_cwd_globals *cwd_globals TSRMLS_DC)
 {
 	CWD_STATE_COPY(&cwd_globals->cwd, &main_cwd_state);
-#ifdef REALPATH_CACHE
 	cwd_globals->realpath_cache_size = 0;
 	cwd_globals->realpath_cache_size_limit = REALPATH_CACHE_SIZE;
 	cwd_globals->realpath_cache_ttl = REALPATH_CACHE_TTL;
 	memset(cwd_globals->realpath_cache, 0, sizeof(cwd_globals->realpath_cache));
-#endif
 }

 static void cwd_globals_dtor(virtual_cwd_globals *cwd_globals TSRMLS_DC)
 {
 	CWD_STATE_FREE(&cwd_globals->cwd);
-#ifdef REALPATH_CACHE
-	{
-		int i;
-
-		for (i = 0; i < sizeof(cwd_globals->realpath_cache)/sizeof(cwd_globals->realpath_cache[0]); i++) {
-			realpath_cache_bucket *p = cwd_globals->realpath_cache[i];
-			while (p != NULL) {
-				realpath_cache_bucket *r = p;
-				p = p->next;
-				free(r);
-			}
-		}
-	}
-#endif
+	realpath_cache_clean(TSRMLS_C);
 }

 static char *tsrm_strndup(const char *s, size_t length)
@@ -308,17 +370,53 @@ CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC)
 	return buf;
 }

-#ifdef REALPATH_CACHE
 static inline unsigned long realpath_cache_key(const char *path, int path_len)
 {
-  register unsigned long h;
+	register unsigned long h;
+	const char *e = path + path_len;

-  const char *e = path + path_len;
-  for (h = 2166136261U; path < e; ) {
-    h *= 16777619;
-    h ^= *path++;
-  }
-  return h;
+	for (h = 2166136261U; path < e;) {
+		h *= 16777619;
+		h ^= *path++;
+	}
+
+	return h;
+}
+
+CWD_API void realpath_cache_clean(TSRMLS_D)
+{
+	int i;
+
+	for (i = 0; i < sizeof(CWDG(realpath_cache))/sizeof(CWDG(realpath_cache)[0]); i++) {
+		realpath_cache_bucket *p = CWDG(realpath_cache)[i];
+		while (p != NULL) {
+			realpath_cache_bucket *r = p;
+			p = p->next;
+			free(r);
+		}
+		CWDG(realpath_cache)[i] = NULL;
+	}
+	CWDG(realpath_cache_size) = 0;
+}
+
+CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC)
+{
+	unsigned long key = realpath_cache_key(path, path_len);
+	unsigned long n = key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
+	realpath_cache_bucket **bucket = &CWDG(realpath_cache)[n];
+
+	while (*bucket != NULL) {
+		if (key == (*bucket)->key && path_len == (*bucket)->path_len &&
+		           memcmp(path, (*bucket)->path, path_len) == 0) {
+			realpath_cache_bucket *r = *bucket;
+			*bucket = (*bucket)->next;
+			CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+			free(r);
+			return;
+		} else {
+			bucket = &(*bucket)->next;
+		}
+	}
 }

 static inline void realpath_cache_add(const char *path, int path_len, const char *realpath, int realpath_len, time_t t TSRMLS_DC)
@@ -339,7 +437,7 @@ static inline void realpath_cache_add(const char *path, int path_len, const char
 		n = bucket->key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
 		bucket->next = CWDG(realpath_cache)[n];
 		CWDG(realpath_cache)[n] = bucket;
-	  CWDG(realpath_cache_size) += size;
+		CWDG(realpath_cache_size) += size;
 	}
 }

@@ -352,19 +450,18 @@ static inline realpath_cache_bucket* realpath_cache_find(const char *path, int p
 	while (*bucket != NULL) {
 		if (CWDG(realpath_cache_ttl) && (*bucket)->expires < t) {
 			realpath_cache_bucket *r = *bucket;
-		  *bucket = (*bucket)->next;
-		  CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
-		  free(r);
+			*bucket = (*bucket)->next;
+			CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+			free(r);
 		} else if (key == (*bucket)->key && path_len == (*bucket)->path_len &&
 		           memcmp(path, (*bucket)->path, path_len) == 0) {
 			return *bucket;
 		} else {
-			*bucket = (*bucket)->next;
+			bucket = &(*bucket)->next;
 		}
 	}
 	return NULL;
 }
-#endif


 /* Resolve path relatively to state and put the real path into state */
@@ -372,48 +469,57 @@ static inline realpath_cache_bucket* realpath_cache_find(const char *path, int p
 CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath)
 {
 	int path_length = strlen(path);
-	char *ptr, *path_copy;
-	char *tok = NULL;
-	int ptr_length;
 	cwd_state old_state;
-	int ret = 0;
-	int copy_amount = -1;
-	char *free_path;
-	unsigned char is_absolute = 0;
-#ifndef TSRM_WIN32
-	char resolved_path[MAXPATHLEN];
-#else
-	char *new_path;
-#endif
-#ifdef REALPATH_CACHE
 	char orig_path[MAXPATHLEN];
-	int orig_path_len;
 	realpath_cache_bucket *bucket;
-	time_t t;
+	time_t t = 0;
+	int ret;
+	int use_cache;
+	int use_relative_path = 0;
 	TSRMLS_FETCH();
-#endif
+	
+	use_cache = ((use_realpath != CWD_EXPAND) && CWDG(realpath_cache_size_limit));

 	if (path_length == 0) 
 		return (0);
 	if (path_length >= MAXPATHLEN)
 		return (1);

-#ifdef REALPATH_CACHE
-	if (use_realpath && CWDG(realpath_cache_size_limit)) {
-		if (IS_ABSOLUTE_PATH(path, path_length) || (state->cwd_length < 1)) {
-			memcpy(orig_path, path, path_length+1);
-			orig_path_len = path_length;
+#if VIRTUAL_CWD_DEBUG
+		fprintf(stderr,"cwd = %s path = %s\n", state->cwd, path);
+#endif
+
+	/* cwd_length can be 0 when getcwd() fails.
+	 * This can happen under solaris when a dir does not have read permissions
+	 * but *does* have execute permissions */
+	if (!IS_ABSOLUTE_PATH(path, path_length)) {
+		if (state->cwd_length == 0) {
+			use_cache = 0;
+			use_relative_path = 1;
 		} else {
-			orig_path_len = path_length + state->cwd_length + 1;
+			int orig_path_len;
+			int state_cwd_length = state->cwd_length;
+
+#ifdef TSRM_WIN32
+			if (IS_SLASH(path[0])) {
+				state_cwd_length = 2;
+			}
+#endif
+			orig_path_len = path_length + state_cwd_length + 1;
 			if (orig_path_len >= MAXPATHLEN) {
 				return 1;
 			}
-			memcpy(orig_path, state->cwd, state->cwd_length);
-			orig_path[state->cwd_length] = DEFAULT_SLASH;
-			memcpy(orig_path + state->cwd_length + 1, path, path_length + 1);
+			memcpy(orig_path, state->cwd, state_cwd_length);
+			orig_path[state_cwd_length] = DEFAULT_SLASH;
+			memcpy(orig_path + state_cwd_length + 1, path, path_length + 1);
+			path = orig_path;
+			path_length = orig_path_len; 
 		}
-		t = CWDG(realpath_cache_ttl)?time(NULL):0;
-		if ((bucket = realpath_cache_find(orig_path, orig_path_len, t TSRMLS_CC)) != NULL) {		
+	}
+
+	if (use_cache) {
+		t = CWDG(realpath_cache_ttl)?time(0):0;
+		if ((bucket = realpath_cache_find(path, path_length, t TSRMLS_CC)) != NULL) {		
 			int len = bucket->realpath_len;

 			CWD_STATE_COPY(&old_state, state);
@@ -430,106 +536,64 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 			}
 		}
 	}
-#endif
+
+	if (use_realpath != CWD_EXPAND) {
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
-	/* cwd_length can be 0 when getcwd() fails.
-	 * This can happen under solaris when a dir does not have read permissions
-	 * but *does* have execute permissions */
-	if (IS_ABSOLUTE_PATH(path, path_length) || (state->cwd_length < 1)) {
-		if (use_realpath) {
-			if (realpath(path, resolved_path)) {  /* Note: Not threadsafe on older *BSD's */
-				path = resolved_path;
-				path_length = strlen(path);
-			} else {
-				/* disable for now
-				return 1; */
-			}
-		}
-	} else { /* Concat current directory with relative path and then run realpath() on it */
-		char *tmp;
-		char *ptr;
+		char resolved_path[MAXPATHLEN];

-		ptr = tmp = (char *) malloc(state->cwd_length+path_length+sizeof("/"));
-		if (!tmp) {
-			return 1;
-		}
-		memcpy(ptr, state->cwd, state->cwd_length);
-		ptr += state->cwd_length;
-		*ptr++ = DEFAULT_SLASH;
-		memcpy(ptr, path, path_length);
-		ptr += path_length;
-		*ptr = '\0';
-		if (strlen(tmp) >= MAXPATHLEN) {
-			free(tmp);
-			return 1;
-		}
-		if (use_realpath) {
-			if (realpath(tmp, resolved_path)) {
-				path = resolved_path;
-				path_length = strlen(path);
-			} else {
-				/* disable for now 
-				free(tmp);
-				return 1; */
+		if (!realpath(path, resolved_path)) {  /* Note: Not threadsafe on older *BSD's */
+			if (use_realpath == CWD_REALPATH) {
+				return 1;
 			}
+			goto no_realpath;
 		}
-		free(tmp);
-	}
-#endif
-#if defined(TSRM_WIN32)
-	{
-		char *dummy = NULL;
-		int new_path_length;
-  
-		new_path_length = GetLongPathName(path, dummy, 0) + 1;
-		if (new_path_length == 0) {
-			return 1;
-		}
-		new_path = (char *) malloc(new_path_length);
-		if (!new_path) {
-			return 1;
-		}
-		
-		if (GetLongPathName(path, new_path, new_path_length) != 0) {
-			path = new_path;
-			path_length = new_path_length;
-		} else {
-			free(new_path);
-			new_path = NULL;
-		}
-	}
-#endif
-	free_path = path_copy = tsrm_strndup(path, path_length);
+		CWD_STATE_COPY(&old_state, state);

-	CWD_STATE_COPY(&old_state, state);
-#if VIRTUAL_CWD_DEBUG
-	fprintf(stderr,"cwd = %s path = %s\n", state->cwd, path);
+		state->cwd_length = strlen(resolved_path);
+		state->cwd = (char *) realloc(state->cwd, state->cwd_length+1);
+		memcpy(state->cwd, resolved_path, state->cwd_length+1);
+#else
+		goto no_realpath;
 #endif
-	if (IS_ABSOLUTE_PATH(path_copy, path_length)) {
-        copy_amount = COPY_WHEN_ABSOLUTE(path_copy);
-		is_absolute = 1;
+	} else {
+		char *ptr, *path_copy, *free_path;
+		char *tok;
+		int ptr_length;
 #ifdef TSRM_WIN32
-	} else if (IS_SLASH(path_copy[0])) {
-		copy_amount = 2;
+		int is_unc;
 #endif
-	}
+no_realpath:

-	if (copy_amount != -1) {
-		state->cwd = (char *) realloc(state->cwd, copy_amount + 1);
-		if (copy_amount) {
-			if (is_absolute) {
-				memcpy(state->cwd, path_copy, copy_amount);
-				path_copy += copy_amount;
-			} else {
-				memcpy(state->cwd, old_state.cwd, copy_amount);
-			}
+		free_path = path_copy = tsrm_strndup(path, path_length);
+		CWD_STATE_COPY(&old_state, state);
+
+#ifdef TSRM_WIN32
+		ret = 0;
+		is_unc = 0;
+		if (path_length >= 2 && path[1] == ':') {			
+			state->cwd = (char *) realloc(state->cwd, 2 + 1);
+			state->cwd[0] = toupper(path[0]);
+			state->cwd[1] = ':';
+			state->cwd[2] = '\0';
+			state->cwd_length = 2;
+			path_copy += 2;
+		} else if (IS_UNC_PATH(path, path_length)) {
+			state->cwd = (char *) realloc(state->cwd, 1 + 1);
+			state->cwd[0] = DEFAULT_SLASH;
+			state->cwd[1] = '\0';
+			state->cwd_length = 1;
+			path_copy += 2;
+			is_unc = 2;
+		} else {
+#endif
+			state->cwd = (char *) realloc(state->cwd, 1);
+			state->cwd[0] = '\0';
+			state->cwd_length = 0;
+#ifdef TSRM_WIN32
 		}
-		state->cwd[copy_amount] = '\0';
-		state->cwd_length = copy_amount;
-	}
-
-
-	if (state->cwd_length > 0 || IS_ABSOLUTE_PATH(path, path_length)) {
+#endif
+		
+		tok = NULL;
 		ptr = tsrm_strtok_r(path_copy, TOKENIZER_STRING, &tok);
 		while (ptr) {
 			ptr_length = strlen(ptr);
@@ -537,6 +601,12 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 			if (IS_DIRECTORY_UP(ptr, ptr_length)) {
 				char save;

+				if (use_relative_path) {
+					CWD_STATE_FREE(state);
+					*state = old_state;
+					return 1;
+				}
+
 				save = DEFAULT_SLASH;

 #define PREVIOUS state->cwd[state->cwd_length - 1]
@@ -556,62 +626,91 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 					state->cwd_length--;
 				}
 			} else if (!IS_DIRECTORY_CURRENT(ptr, ptr_length)) {
-				state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1+1);
+				if (use_relative_path) {
+					state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1);
+					use_relative_path = 0;
+				} else {
+					state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1+1);
 #ifdef TSRM_WIN32
-				/* Windows 9x will consider C:\\Foo as a network path. Avoid it. */
-				if ((state->cwd[state->cwd_length-1]!='\\' && state->cwd[state->cwd_length-1]!='/') || 
-						IsDBCSLeadByte(state->cwd[state->cwd_length-2])) {
-					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
-				}
+					/* Windows 9x will consider C:\\Foo as a network path. Avoid it. */
+					if (state->cwd_length < 2 ||
+					    (state->cwd[state->cwd_length-1]!='\\' && state->cwd[state->cwd_length-1]!='/') ||
+							IsDBCSLeadByte(state->cwd[state->cwd_length-2])) {
+						state->cwd[state->cwd_length++] = DEFAULT_SLASH;
+					}
 #elif defined(NETWARE)
-				/* 
-				Below code keeps appending to state->cwd a File system seperator
-				cases where this appending should not happen is given below,
-				a) sys: should just be left as it is
-				b) sys:system should just be left as it is,
-					Colon is allowed only in the first token as volume names alone can have the : in their names.
-					Files and Directories cannot have : in their names
-					So the check goes like this,
-					For second token and above simply append the DEFAULT_SLASH to the state->cwd.
-					For first token check for the existence of : 
-					if it exists don't append the DEFAULT_SLASH to the state->cwd.
-				*/
-				if(((state->cwd_length == 0) && (strchr(ptr, ':') == NULL)) || (state->cwd_length > 0)) {
-					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
-				}
+					/* 
+					Below code keeps appending to state->cwd a File system seperator
+					cases where this appending should not happen is given below,
+					a) sys: should just be left as it is
+					b) sys:system should just be left as it is,
+						Colon is allowed only in the first token as volume names alone can have the : in their names.
+						Files and Directories cannot have : in their names
+						So the check goes like this,
+						For second token and above simply append the DEFAULT_SLASH to the state->cwd.
+						For first token check for the existence of : 
+						if it exists don't append the DEFAULT_SLASH to the state->cwd.
+					*/
+					if(((state->cwd_length == 0) && (strchr(ptr, ':') == NULL)) || (state->cwd_length > 0)) {
+						state->cwd[state->cwd_length++] = DEFAULT_SLASH;
+					}
 #else
-				state->cwd[state->cwd_length++] = DEFAULT_SLASH;
+					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
 #endif
+				}
 				memcpy(&state->cwd[state->cwd_length], ptr, ptr_length+1);
+
+#ifdef TSRM_WIN32
+				if (use_realpath != CWD_EXPAND) {
+					WIN32_FIND_DATA data;
+					HANDLE hFind;
+
+					if ((hFind = FindFirstFile(state->cwd, &data)) != INVALID_HANDLE_VALUE) {
+						int length = strlen(data.cFileName);
+
+						if (length != ptr_length) {
+							state->cwd = (char *) realloc(state->cwd, state->cwd_length+length+1);
+						}
+						memcpy(&state->cwd[state->cwd_length], data.cFileName, length+1);
+						ptr_length = length;
+						FindClose(hFind);
+						ret = 0;
+					} else if (use_realpath == CWD_REALPATH) {
+						if (is_unc) {
+							/* skip share name */
+							is_unc--;
+							ret = 0;
+						} else {
+							ret = 1;
+						}
+					}
+				}
+#endif
+
 				state->cwd_length += ptr_length;
 			}
 			ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok);
 		}

+		free(free_path);
+
+		if ((use_realpath == CWD_REALPATH) && ret) {
+			CWD_STATE_FREE(state);
+			*state = old_state;					
+			return 1;
+		}
+
 		if (state->cwd_length == COPY_WHEN_ABSOLUTE(state->cwd)) {
 			state->cwd = (char *) realloc(state->cwd, state->cwd_length+1+1);
 			state->cwd[state->cwd_length] = DEFAULT_SLASH;
 			state->cwd[state->cwd_length+1] = '\0';
 			state->cwd_length++;
 		}
-	} else {
-		state->cwd = (char *) realloc(state->cwd, path_length+1);
-		memcpy(state->cwd, path, path_length+1);
-		state->cwd_length = path_length;
 	}

-#ifdef TSRM_WIN32
-	if (new_path) {
-		free(new_path);
+	if (use_cache) {
+		realpath_cache_add(path, path_length, state->cwd, state->cwd_length, t TSRMLS_CC);
 	}
-#endif
-	free(free_path);
-
-#ifdef REALPATH_CACHE
-	if (use_realpath && CWDG(realpath_cache_size_limit)) {
-		realpath_cache_add(orig_path, orig_path_len, state->cwd, state->cwd_length, t TSRMLS_CC);
-	}
-#endif

 	if (verify_path && verify_path(state)) {
 		CWD_STATE_FREE(state);
@@ -630,7 +729,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func

 CWD_API int virtual_chdir(const char *path TSRMLS_DC)
 {
-	return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok, 1)?-1:0;
+	return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok, CWD_REALPATH)?-1:0;
 }

 CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path TSRMLS_DC) TSRMLS_DC)
@@ -672,7 +771,7 @@ CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC)

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
 	
-	if (virtual_file_ex(&new_state, path, NULL, 1)==0) {
+	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)==0) {
 		int len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;

 		memcpy(real_path, new_state.cwd, len);
@@ -693,7 +792,7 @@ CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_f
 	int retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	retval = virtual_file_ex(&new_state, path, verify_path, 1);
+	retval = virtual_file_ex(&new_state, path, verify_path, CWD_FILEPATH);

 	*filepath = new_state.cwd;

@@ -716,7 +815,10 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC)
 	}

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 1);
+	if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return NULL;
+	}

 	f = fopen(new_state.cwd, mode);

@@ -730,7 +832,10 @@ CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC)
 	int ret;
 	
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL, 1);
+	if (virtual_file_ex(&new_state, pathname, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}

 #if defined(TSRM_WIN32)
 	ret = tsrm_win32_access(new_state.cwd, mode);
@@ -751,7 +856,10 @@ CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC)
 	int ret;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL, 0);
+	if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}

 	ret = utime(new_state.cwd, buf);

@@ -766,7 +874,10 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC)
 	int ret;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL, 1);
+	if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}

 	ret = chmod(new_state.cwd, mode);

@@ -775,15 +886,26 @@ 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 TSRMLS_DC)
+CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int link TSRMLS_DC)
 {
 	cwd_state new_state;
 	int ret;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL, 0);
+	if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}

-	ret = chown(new_state.cwd, owner, group);
+	if (link) {
+#if HAVE_LCHOWN
+		ret = lchown(new_state.cwd, owner, group);
+#else
+		ret = -1;
+#endif
+	} else {
+		ret = chown(new_state.cwd, owner, group);
+	}

 	CWD_STATE_FREE(&new_state);
 	return ret;
@@ -796,7 +918,10 @@ CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...)
 	int f;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 1);
+	if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}

 	if (flags & O_CREAT) {
 		mode_t mode;
@@ -820,7 +945,10 @@ CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC)
 	int f;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 1);
+	if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}

 	f = creat(new_state.cwd,  mode);

@@ -835,11 +963,18 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC)
 	int retval;

 	CWD_STATE_COPY(&old_state, &CWDG(cwd));
-	virtual_file_ex(&old_state, oldname, NULL, 0);
+	if (virtual_file_ex(&old_state, oldname, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&old_state);
+		return -1;
+	}
 	oldname = old_state.cwd;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, newname, NULL, 0);
+	if (virtual_file_ex(&new_state, newname, NULL, CWD_FILEPATH)) {
+		CWD_STATE_FREE(&old_state);
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}
 	newname = new_state.cwd;
 
 	retval = rename(oldname, newname);
@@ -856,9 +991,12 @@ CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC)
 	int retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 1);
+	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}

-	retval = stat(new_state.cwd, buf);
+	retval = php_sys_stat(new_state.cwd, buf);

 	CWD_STATE_FREE(&new_state);
 	return retval;
@@ -871,7 +1009,10 @@ CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC)
 	int retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 0);
+	if (virtual_file_ex(&new_state, path, NULL, CWD_EXPAND)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}

 	retval = lstat(new_state.cwd, buf);

@@ -886,7 +1027,10 @@ CWD_API int virtual_unlink(const char *path TSRMLS_DC)
 	int retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 0);
+	if (virtual_file_ex(&new_state, path, NULL, CWD_EXPAND)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}

 	retval = unlink(new_state.cwd);

@@ -900,7 +1044,10 @@ CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC)
 	int retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL, 1);
+	if (virtual_file_ex(&new_state, pathname, NULL, CWD_FILEPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}

 #ifdef TSRM_WIN32
 	retval = mkdir(new_state.cwd);
@@ -917,7 +1064,10 @@ CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC)
 	int retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL, 0);
+	if (virtual_file_ex(&new_state, pathname, NULL, CWD_EXPAND)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}

 	retval = rmdir(new_state.cwd);

@@ -935,7 +1085,10 @@ CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC)
 	DIR *retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL, 1);
+	if (virtual_file_ex(&new_state, pathname, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return NULL;
+	}

 	retval = opendir(new_state.cwd);

@@ -1043,6 +1196,37 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)

 #endif

+CWD_API char *tsrm_realpath(const char *path, char *real_path TSRMLS_DC)
+{
+	cwd_state new_state;
+	char cwd[MAXPATHLEN];
+
+	if (!IS_ABSOLUTE_PATH(path, strlen(path)) &&
+	    VCWD_GETCWD(cwd, MAXPATHLEN)) {
+		new_state.cwd = strdup(cwd);
+		new_state.cwd_length = strlen(cwd);
+	} else {
+		new_state.cwd = (char*)malloc(1);
+		new_state.cwd[0] = '\0';
+		new_state.cwd_length = 0;		
+	}
+
+	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)) {
+		free(new_state.cwd);
+		return NULL;
+	}
+
+	if (real_path) {
+		int copy_len = new_state.cwd_length>MAXPATHLEN-1 ? MAXPATHLEN-1 : new_state.cwd_length;
+		memcpy(real_path, new_state.cwd, copy_len);
+		real_path[copy_len] = '\0';
+		free(new_state.cwd);
+		return real_path;
+	} else {
+		return new_state.cwd;
+	}
+}
+

 /*
 * Local variables:
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2005 The PHP Group                                |
+   | Copyright (c) 1997-2007 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
+   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
+   | http://www.php.net/license/3_01.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,8 +37,14 @@
 #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)
@@ -120,6 +126,12 @@ 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;
@@ -166,40 +178,28 @@ 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 TSRMLS_DC);
+CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int link TSRMLS_DC);
 #endif

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

-#define REALPATH_CACHE
+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 */

-#ifdef REALPATH_CACHE
 typedef struct _realpath_cache_bucket {
 	unsigned long                  key;
 	char                          *path;
@@ -209,16 +209,13 @@ typedef struct _realpath_cache_bucket {
 	time_t                         expires;
 	struct _realpath_cache_bucket *next;	
 } realpath_cache_bucket;
-#endif

 typedef struct _virtual_cwd_globals {
 	cwd_state cwd;
-#ifdef REALPATH_CACHE
 	long                   realpath_cache_size;
 	long                   realpath_cache_size_limit;
 	long                   realpath_cache_ttl;
 	realpath_cache_bucket *realpath_cache[1024];
-#endif
 } virtual_cwd_globals;

 #ifdef ZTS
@@ -229,6 +226,9 @@ extern virtual_cwd_globals cwd_globals;
 # define CWDG(v) (cwd_globals.v)
 #endif

+CWD_API void realpath_cache_clean(TSRMLS_D);
+CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
+
 /* The actual macros to be used in programs using TSRM
 * If the program defines VIRTUAL_DIR it will use the
 * virtual_* functions 
@@ -262,7 +262,10 @@ extern virtual_cwd_globals cwd_globals;
 #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 TSRMLS_CC)
+#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
 #endif

 #else
@@ -276,7 +279,7 @@ extern virtual_cwd_globals cwd_globals;
 #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) stat(path, buff)
+#define VCWD_STAT(path, buff) php_sys_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)
@@ -289,15 +292,7 @@ extern virtual_cwd_globals cwd_globals;
 #define VCWD_ACCESS(pathname, mode) access(pathname, mode)
 #endif

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

 #if HAVE_UTIME
 #define VCWD_UTIME(path, time) utime(path, time)
@@ -305,6 +300,9 @@ extern virtual_cwd_globals cwd_globals;
 #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-2005 The PHP Group                                |
+   | Copyright (c) 1997-2007 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
+   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
+   | http://www.php.net/license/3_01.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,11 +86,19 @@ 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 && 
 			SHGetFileInfo(pathname, 0, &sfi, sizeof(SHFILEINFO), SHGFI_EXETYPE) != 0 ? 0 : -1;
+#endif
 	} else {
 		return access(pathname, mode);
 	}
@@ -211,7 +219,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, env, cwd, &startup, &process)) {
+	if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS|CREATE_NO_WINDOW, env, cwd, &startup, &process)) {
 		return NULL;
 	}
 	free(cmd);
@@ -220,10 +228,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((long)in, _O_RDONLY | mode);
+		fno = _open_osfhandle((tsrm_intptr_t)in, _O_RDONLY | mode);
 		CloseHandle(out);
 	} else {
-		fno = _open_osfhandle((long)out, _O_WRONLY | mode);
+		fno = _open_osfhandle((tsrm_intptr_t)out, _O_WRONLY | mode);
 		CloseHandle(in);
 	}

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

 Redistribution and use in source and binary forms, with or without
@@ -14,8 +14,8 @@ 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_mm.c \
-	zend_default_classes.c zend_reflection_api.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

@@ -0,0 +1,13 @@
+The goal of the new memory manager (PHP 5.2 and later) is reducing 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 built. It allows select malloc/emalloc at runtime.  So you can use internal and external memory debuggers without recompilation.
+
+$ sapi/cli/php -r 'leak();'
+
+$ USE_ZEND_ALLOC=0 valgrind --leak-check=full -r 'leak();'
+
+The patch allows tweaking memory manager with ZEND_MM_MEM_TYPE and ZEND_MM_SEG_SIZE environment variables. Default values are "malloc" and "256K". Dependent on target system you can also use "mmap_anon", "mmap_zero"
+and "win32" storage managers.
+
+$ ZEND_MM_MEM_TYPE=mmap_anon ZEND_MM_SEG_SIZE=1M sapi/cli/php
+
@@ -195,10 +195,6 @@ SOURCE=.\zend_llist.c
 # End Source File
 # Begin Source File

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

-SOURCE=.\zend_reflection_api.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_sprintf.c
 # End Source File
 # Begin Source File
@@ -375,10 +367,6 @@ 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
@@ -407,10 +395,6 @@ SOURCE=.\zend_qsort.h
 # End Source File
 # Begin Source File

-SOURCE=.\zend_reflection_api.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_stack.h
 # End Source File
 # Begin Source File
@@ -129,15 +129,6 @@ AC_ARG_WITH(zend-vm,
  PHP_ZEND_VM=CALL
 ])

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

-AC_ARG_ENABLE(memory-limit,
-[  --enable-memory-limit   Compile with memory limit support], [
-  ZEND_MEMORY_LIMIT=$enableval
-],[
-  ZEND_MEMORY_LIMIT=no
-])
-
 AC_ARG_ENABLE(zend-multibyte,
 [  --enable-zend-multibyte Compile with zend multibyte support], [
  ZEND_MULTIBYTE=$enableval
@@ -170,18 +154,12 @@ AC_ARG_ENABLE(zend-multibyte,
 AC_MSG_CHECKING([virtual machine dispatch method])
 AC_MSG_RESULT($PHP_ZEND_VM)

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

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

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

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

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

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

-if test "$ZEND_MEMORY_LIMIT" = "yes"; then
-  AC_DEFINE(MEMORY_LIMIT, 1, [Memory limit])
-else
-  AC_DEFINE(MEMORY_LIMIT, 0, [Memory limit])
-fi
-
 if test "$ZEND_MULTIBYTE" = "yes"; then
  AC_DEFINE(ZEND_MULTIBYTE, 1, [ ])
 fi
@@ -306,6 +272,108 @@ int main()

 AC_MSG_RESULT(done)

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


@@ -313,3 +381,10 @@ 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,6 +169,7 @@ SOURCE=.\zend_exceptions.c
 # Begin Source File

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

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

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

-SOURCE=.\zend_reflection_api.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_sprintf.c
 # End Source File
 # Begin Source File
@@ -412,10 +405,6 @@ 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
@@ -444,10 +433,6 @@ SOURCE=.\zend_qsort.h
 # End Source File
 # Begin Source File

-SOURCE=.\zend_reflection_api.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_stack.h
 # End Source File
 # Begin Source File
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2005 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2007 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        |
@@ -4,28 +4,31 @@ 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"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3"

  # for standalone build of Zend Engine
  test -z "$SED" && SED=sed

+  bison_version=none
  if test "$YACC"; then
    AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-      set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /'|tr -d a-z`
-      bison_version="${1}.${2}"
+      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
-      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)"
-        fi
-      done
+      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
    ])
-  else
-    bison_version=none
  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)."
+      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;"
      ;;
@@ -1,4 +1,5 @@
 <?php
+date_default_timezone_set("UTC");

 function simple() {
  $a = 0;
@@ -179,7 +180,7 @@ function fibo($n) {

 /****/

-function hash($n) {
+function hash1($n) {
  for ($i = 1; $i <= $n; $i++) {
    $X[dechex($i)] = $i;
  }
@@ -401,8 +402,8 @@ ary3(2000);
 $t = end_test($t, "ary3(2000)");
 fibo(30);
 $t = end_test($t, "fibo(30)");
-hash(50000);
-$t = end_test($t, "hash(50000)");
+hash1(50000);
+$t = end_test($t, "hash1(50000)");
 hash2(500);
 $t = end_test($t, "hash2(500)");
 heapsort(20000);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2005 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2006 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -0,0 +1,54 @@
+--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
@@ -0,0 +1,108 @@
+--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
@@ -0,0 +1,81 @@
+--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
@@ -0,0 +1,25 @@
+--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
@@ -0,0 +1,27 @@
+--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
@@ -0,0 +1,31 @@
+--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
@@ -0,0 +1,63 @@
+--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
@@ -0,0 +1,53 @@
+--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: Wrong parameter count for define() in %s on line %d
+NULL
+
+Warning: Wrong parameter count for define() in %s on line %d
+NULL
+bool(true)
+
+Notice: Constant true already defined in %s on line %d
+bool(false)
+
+Notice: Array to string conversion in %s on line %d
+bool(true)
+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
@@ -0,0 +1,46 @@
+--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
@@ -0,0 +1,59 @@
+--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
@@ -0,0 +1,89 @@
+--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
@@ -0,0 +1,34 @@
+--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
@@ -0,0 +1,34 @@
+--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
@@ -0,0 +1,3 @@
+<?php
+/* dummy file for 014.phpt */
+?>
@@ -0,0 +1,52 @@
+--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
@@ -0,0 +1,35 @@
+--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
@@ -0,0 +1,12 @@
+--TEST--
+isset() with object properties when operating on non-object
+--FILE--
+<?php
+
+$foo = NULL; 
+isset($foo->bar->bar);
+
+echo "Done\n";
+?>
+--EXPECT--	
+Done
@@ -0,0 +1,82 @@
+--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(get_loaded_extensions(true));
+var_dump(gettype(get_loaded_extensions()));
+var_dump(count(get_loaded_extensions()));
+
+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"
+
+Warning: Wrong parameter count for get_loaded_extensions() in %s on line %d
+NULL
+string(5) "array"
+int(%d)
+
+Warning: Wrong parameter count for get_defined_constants() 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
@@ -0,0 +1,36 @@
+--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
@@ -0,0 +1,14 @@
+--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===
@@ -0,0 +1,73 @@
+--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
@@ -0,0 +1,19 @@
+--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
@@ -0,0 +1,19 @@
+--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
@@ -0,0 +1,14 @@
+--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
@@ -0,0 +1,22 @@
+--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
@@ -0,0 +1,49 @@
+--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
@@ -0,0 +1,16 @@
+--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
@@ -0,0 +1,39 @@
+--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
@@ -12,4 +12,4 @@ foo(123);
 --EXPECTF--
 3

-Fatal error: Argument 1 must be an array, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
+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
@@ -39,5 +39,5 @@ echo "Done\n";
 2
 3
 Done
-test::__destruct
 test::destructor
+test::__destruct
@@ -34,6 +34,3 @@ $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--
@@ -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);
 ?>
--EXPECT--
-object(Test)#2 (0) {
+--EXPECTF--
+object(Test)#%d (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,6 +2,7 @@
 Bug #26166 (__toString() crash when no values returned)
 --FILE--
 <?php
+
 class Foo
 {
    function __toString()
@@ -28,6 +29,23 @@ 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 
@@ -45,23 +63,12 @@ catch (Exception $e) {
 	echo "Got the exception\n";
 }

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

-Fatal error: Method None::__toString() must return a string value in %sbug26166.php on line %d
+Fatal error: Method Error::__toString() must not throw an exception in %sbug26166.php on line %d
@@ -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,5 +1,5 @@
 --TEST--
-Bug #27304
+Bug #27304 (Static functions don't function properly)
 --FILE--
 <?php

@@ -1,44 +0,0 @@
--TEST--
-Bug #27641 (zend.ze1_compatibility_mode = On causes object properties to be misreported)
--SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
--INI--
-error_reporting=4095
--FILE--
-<?php
-  class A {
-    public $a = "Default for A";
-    public $b = "Default for B";
-
-    function __construct($a, $b) {
-      $this->a = $a;
-      $this->b = $b;
-    }
-    function A() {
-      $args = func_get_args();
-      call_user_func_array(Array(&$this, '__construct'), $args);
-    }
-  }
-
-  $t = new A("New A", "New B");
-  print_r($t);
-  print_r(get_class_vars(get_class($t)));
-  print_r(get_object_vars($t));
-?>
--EXPECTF--
-Strict Standards: Redefining already defined constructor for class A in %sbug27641.php on line %d
-A Object
-(
-    [a] => New A
-    [b] => New B
-)
-Array
-(
-    [a] => Default for A
-    [b] => Default for B
-)
-Array
-(
-    [a] => New A
-    [b] => New B
-)
@@ -3,6 +3,12 @@ Bug #28444 (Cannot access undefined property for object with overloaded property
 --FILE--
 <?php

+function my_error_handler($errno, $errstr, $errfile, $errline) {
+	var_dump($errstr);
+}
+
+set_error_handler('my_error_handler');
+
 class Object
 {
 	public $x;
@@ -60,7 +66,8 @@ Overloaded::__set(y,3)
 int(3)
 Overloaded::__get(y)
 int(3)
-Overloaded::__set(z,Object id #3)
+string(55) "Object of class Object could not be converted to string"
+Overloaded::__set(z,)
 object(Object)#%d (1) {
  ["x"]=>
  int(4)
@@ -1,5 +1,5 @@
 --TEST--
-Bug #29104 Function declaration in method doesn't work 
+Bug #29104 (Function declaration in method doesn't work)
 --FILE--
 <?php
 class A
@@ -1,5 +1,5 @@
 --TEST--
-Bug #29210 Function: is_callable - no support for private and protected classes 
+Bug #29210 (Function is_callable does not support private and protected methods)
 --FILE--
 <?php
 class test_class {
@@ -89,7 +89,7 @@ if (is_callable(array('test_class','test_func4'))) {
 $object = new foo();
 $object->test();
 ?>
--EXPECT--
+--EXPECTF--
 test_func1
 test_func2
 test_func3
@@ -1,5 +1,5 @@
 --TEST--
-Bug 30346 (arrayAcces & using $this)
+Bug #30346 (arrayAccess and using $this)
 --FILE--
 <?php

@@ -21,4 +21,4 @@ echo "\n";
 ===DONE===
 --EXPECT--
 page_show
-===DONE===
+===DONE===
@@ -1,5 +1,5 @@
 --TEST--
-Bug #30519 Interface not existing says Class not found 
+Bug #30519 (Interface not existing says Class not found)
 --FILE--
 <?php
 class test implements a {
@@ -1,5 +1,5 @@
 --TEST--
-Bug #30702 cannot initialize class variable from class constant
+Bug #30702 (cannot initialize class variable from class constant)
 --FILE--
 <?php
 class foo {
@@ -1,22 +1,34 @@
 --TEST--
-Bug #30791 magic methods (__sleep/__wakeup/__toString) call __call if object is overloaded 
+Bug #30791 (magic methods (__sleep/__wakeup/__toString) call __call if object is overloaded)
 --FILE--
 <?php
-class a {
+
+function my_error_handler($errno, $errstr, $errfile, $errline) {
+	var_dump($errstr);
+}
+
+set_error_handler('my_error_handler');
+
+class a
+{
   public $a = 4;
   function __call($a,$b) {
       return "unknown method";
   }
 }
+
 $b = new a;
 echo $b,"\n";
 $c = unserialize(serialize($b));
 echo $c,"\n";
 var_dump($c);
+
 ?>
 --EXPECT--
-Object id #1
-Object id #2
+string(50) "Object of class a could not be converted to string"
+
+string(50) "Object of class a could not be converted to string"
+
 object(a)#2 (1) {
  ["a"]=>
  int(4)
@@ -1,5 +1,5 @@
 --TEST--
-Bug #30889 Conflict between __get/__set and ++ operator
+Bug #30889 (Conflict between __get/__set and ++ operator)
 --FILE--
 <?php
 class overloaded
@@ -9,11 +9,11 @@ var_dump(isset($a->b));
 $a = '0';
 var_dump(isset($a->b));
 $a = '';
-var_dump(isset($a{'b'}));
+var_dump(isset($a['b']));
 $a = 'a';
-var_dump(isset($a{'b'}));
+var_dump(isset($a['b']));
 $a = '0';
-var_dump(isset($a{'b'}));
+var_dump(isset($a['b']));

 $simpleString = "Bogus String Text";
 echo isset($simpleString->wrong)?"bug\n":"ok\n";
@@ -0,0 +1,18 @@
+--TEST--
+Bug #31177 (memory corruption because of incorrect refcounting)
+--FILE--
+<?php
+class foo {
+  function foo($n=0) {
+    if($n) throw new Exception("new");
+  }
+}
+$x = new foo();
+try {
+  $y=$x->foo(1);
+} catch (Exception $e) {
+  var_dump($x);
+}
+--EXPECT--
+object(foo)#1 (0) {
+}
@@ -0,0 +1,29 @@
+--TEST--
+Bug #31341 (escape on curly inconsistent)
+--FILE--
+<?php
+$a = array(
+	"$     \{    ",
+	"      \{   $",
+	"      \{$   ",
+	"      $\{   ",
+	"      \$\{  ",
+	"      \{\$  ",
+	"\$    \{    ",
+	"      \{  \$",
+	"%     \{    ");
+
+foreach ($a as $v) {
+	echo("'$v'\n");
+}
+?>
+--EXPECT--
+'$     \{    '
+'      \{   $'
+'      \{$   '
+'      $\{   '
+'      $\{  '
+'      \{$  '
+'$    \{    '
+'      \{  $'
+'%     \{    '
@@ -7,7 +7,31 @@ class TestA
 {
 	public function doSomething($i)
 	{
-		echo __METHOD__ . "($this)\n";
+		echo __METHOD__ . "($i)\n";
+		return --$i;
+	}
+
+	public function doSomethingThis($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		return --$i;
+	}
+
+	public function doSomethingParent($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		return --$i;
+	}
+
+	public function doSomethingParentThis($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		return --$i;
+	}
+
+	public static function doSomethingStatic($i)
+	{
+		echo __METHOD__ . "($i)\n";
 		return --$i;
 	}
 }
@@ -16,20 +40,87 @@ class TestB extends TestA
 {
 	public function doSomething($i)
 	{
-		echo __METHOD__ . "($this)\n";
+		echo __METHOD__ . "($i)\n";
 		$i++;
 		if ($i >= 5) return 5;
-		return call_user_func_array(array("TestA","doSomething"), array($i));
+		return call_user_func_array(array("TestA", "doSomething"), array($i));
+	}
+
+	public function doSomethingThis($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		$i++;
+		if ($i >= 5) return 5;
+		return call_user_func_array(array($this, "TestA::doSomethingThis"), array($i));
+	}
+
+	public function doSomethingParent($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		$i++;
+		if ($i >= 5) return 5;
+		return call_user_func_array(array("parent", "doSomethingParent"), array($i));
+	}
+
+	public function doSomethingParentThis($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		$i++;
+		if ($i >= 5) return 5;
+		return call_user_func_array(array($this, "parent::doSomethingParentThis"), array($i));
+	}
+
+	public static function doSomethingStatic($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		$i++;
+		if ($i >= 5) return 5;
+		return call_user_func_array(array("TestA", "doSomethingStatic"), array($i));
 	}
 }

 $x = new TestB();
+echo "===A===\n";
 var_dump($x->doSomething(1));
+echo "\n===B===\n";
+var_dump($x->doSomethingThis(1));
+echo "\n===C===\n";
+var_dump($x->doSomethingParent(1));
+echo "\n===D===\n";
+var_dump($x->doSomethingParentThis(1));
+echo "\n===E===\n";
+var_dump($x->doSomethingStatic(1));

 ?>
 ===DONE===
+<?php exit(0); ?>
 --EXPECTF--
-TestB::doSomething(Object id #%d)
-TestA::doSomething(Object id #%d)
+===A===
+TestB::doSomething(1)
+
+Strict Standards: Non-static method TestA::doSomething() cannot be called statically, assuming $this from compatible context TestB in %sbug32290.php on line %d
+TestA::doSomething(2)
+int(1)
+
+===B===
+TestB::doSomethingThis(1)
+TestA::doSomethingThis(2)
+int(1)
+
+===C===
+TestB::doSomethingParent(1)
+
+Strict Standards: Non-static method TestA::doSomethingParent() cannot be called statically, assuming $this from compatible context TestB in %sbug32290.php on line %d
+TestA::doSomethingParent(2)
+int(1)
+
+===D===
+TestB::doSomethingParentThis(1)
+TestA::doSomethingParentThis(2)
+int(1)
+
+===E===
+TestB::doSomethingStatic(1)
+TestA::doSomethingStatic(2)
 int(1)
 ===DONE===
@@ -1,5 +1,5 @@
 --TEST--
-Bug #32296 get_class_methods output has changed between 5.0.2 and 5.0.3 
+Bug #32296 (get_class_methods output has changed between 5.0.2 and 5.0.3)
 --FILE--
 <?php
 abstract class space{
@@ -1,5 +1,5 @@
 --TEST--
-Bug #32427 Interfaces are not allowed 'static' access modifier
+Bug #32427 (Interfaces are not allowed 'static' access modifier)
 --FILE--
 <?php

@@ -1,5 +1,5 @@
 --TEST--
-Bug #32660 Assignment by reference causes crash when field access is overloaded (__get) 
+Bug #32660 (Assignment by reference causes crash when field access is overloaded (__get))
 --FILE--
 <?php
 class A
@@ -28,9 +28,12 @@ $b = "much longer";
 print_r($a);
 ?>
 --EXPECTF--
+Notice: Indirect modification of overloaded property A::$whatever has no effect in %sbug32660.php on line 20
 A Object
 (
-    [q] => long
+    [q] => 3
 )

+Notice: Indirect modification of overloaded property A::$whatever has no effect in %sbug32660.php on line 23
+
 Fatal error: Cannot assign by reference to overloaded object in %sbug32660.php on line 23
@@ -1,5 +1,5 @@
 --TEST--
-Bug #32674 exception in iterator causes crash
+Bug #32674 (exception in iterator causes crash)
 --FILE--
 <?php
 class collection implements Iterator {
@@ -1,5 +1,5 @@
 --TEST--
-Bug #32833 Invalid opcode 
+Bug #32833 (Invalid opcode with $a[] .= '')
 --FILE--
 <?php 
 $test = array();
@@ -1,5 +1,7 @@
 --TEST--
-Bug #33257 array_splice() inconsistent when passed function instead of variable 
+Bug #33257 (array_splice() inconsistent when passed function instead of variable)
+--INI--
+error_reporting=4095
 --FILE--
 <?php
 class X {
@@ -14,4 +16,10 @@ array_splice(X::getArr(), 1, 1);
 print_r(X::getArr());
 ?>
 --EXPECTF--
-Fatal error: Only variables can be passed by reference in %sbug33257.php on line 10
+Strict Standards: Only variables should be passed by reference in %sbug33257.php on line 10
+Array
+(
+    [0] => a
+    [1] => b
+    [2] => c
+)
@@ -0,0 +1,19 @@
+--TEST--
+Bug #33282 (Re-assignment by reference does not clear the is_ref flag)
+--FILE--
+<?php
+	$a = array(1, 2, 3);
+	$r = &$a[0];
+	$r = &$a[1];
+	$r = &$a[2];
+	var_dump($a);
+?>
+--EXPECT--	
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  &int(3)
+}
@@ -0,0 +1,66 @@
+--TEST--
+Bug #33512 (unset() overloaded properties doesn't work)
+--FILE--
+<?php
+class TheObj {
+		public $RealVar1, $RealVar2, $RealVar3, $RealVar4;
+		public $Var = array();
+
+		function __set($var, $val) {
+			$this->Var[$var] = $val;
+		}
+		function __get($var) {
+			if(isset($this->Var[$var])) return $this->Var[$var];
+			else return -1;
+		}
+		function __unset($var) {
+			unset($this->Var[$var]);
+		}
+	}
+
+	$SomeObj = new TheObj;
+
+	// this will fine
+	$SomeObj->RealVar1 = 'somevalue';
+	$SomeObj->{'RealVar2'} = 'othervalue';
+	$SomeObj->{'RealVar'.(3)} = 'othervaluetoo';
+	$SomeObj->{'RealVar'.'4'} = 'anothervalue';
+
+	// this will fine too
+	$SomeObj->Virtual1 = 'somevalue';
+	$SomeObj->{'Virtual2'} = 'othervalue';
+
+	// it's can't be used since this will encounter error
+	$SomeObj->{'Virtual'.(3)} = 'othervaluetoo';
+	$SomeObj->{'Virtual'.'4'} = 'anothervalue';
+
+	// but this will fine, ofcourse
+	$SomeObj->Var['Virtual'.(3)] = 'othervaluetoo';
+	$SomeObj->Var['Virtual'.'4'] = 'anothervalue';
+
+
+	var_dump($SomeObj->RealVar1);
+	print $SomeObj->{'RealVar'.(3)}."\n";
+	
+	unset($SomeObj->RealVar1);
+	unset($SomeObj->{'RealVar'.(3)});
+
+	//the lines below will catch by '__get' magic method since these variables are unavailable anymore
+	var_dump($SomeObj->RealVar1);
+	print $SomeObj->{'RealVar'.(3)}."\n";
+
+	// now we will try to unset these variables
+	unset($SomeObj->Virtual1);
+	unset($SomeObj->{'Virtual'.(3)});
+
+	//but, these variables are still available??? eventhough they're "unset"-ed
+	print $SomeObj->Virtual1."\n";
+	print $SomeObj->{'Virtual'.(3)}."\n";
+?>
+--EXPECT--
+string(9) "somevalue"
+othervaluetoo
+int(-1)
+-1
+-1
+-1
@@ -0,0 +1,45 @@
+--TEST--
+Bug #33732 (Wrong behavior of constants in class and interface extending)
+--FILE--
+<?php
+interface iA {
+  const cA = "const of iA\n";
+}
+
+class A implements iA {
+}
+
+class B extends A implements iA {
+}
+
+echo iA::cA;
+echo A::cA;
+echo B::cA;
+
+
+interface iA2 {
+    const cA = "const of iA2\n";
+}
+
+interface iB2 extends iA2 {
+}
+
+class A2 implements iA2 {
+}
+
+class B2 extends A2 implements iA2 {
+}
+
+echo iA2::cA;
+echo A2::cA;
+echo iB2::cA;
+echo B2::cA;
+?>
+--EXPECT--
+const of iA
+const of iA
+const of iA
+const of iA2
+const of iA2
+const of iA2
+const of iA2
@@ -0,0 +1,40 @@
+--TEST--
+Bug #33771 (error_reporting falls to 0 when @ was used inside try/catch block)
+--FILE--
+<?php
+
+error_reporting(E_ALL | E_STRICT);
+
+var_dump(error_reporting());
+
+function make_exception()
+{
+    throw new Exception();
+}
+
+function make_exception_and_change_err_reporting()
+{
+    error_reporting(E_ALL & ~E_STRICT);
+    throw new Exception();
+}
+
+
+try {
+	@make_exception();
+} catch (Exception $e) {}
+
+var_dump(error_reporting());
+
+try {
+	@make_exception_and_change_err_reporting();
+} catch (Exception $e) {}
+
+var_dump(error_reporting());
+
+echo "Done\n";
+?>
+--EXPECTF--	
+int(8191)
+int(8191)
+int(6143)
+Done