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

compressed SWF movie has been passed to the function.

.gdbinit

@@ -1,7 +1,8 @@
+set $zts = 0
+
 define ____executor_globals
-	if basic_functions_module.zts
-		set $tsrm_ls = ts_resource_ex(0, 0)
-		set $eg = ((zend_executor_globals) (*((void ***) $tsrm_ls))[executor_globals_id-1])
+	if $zts
+		set $eg = ((zend_executor_globals) (*((void ***) tsrm_ls))[executor_globals_id-1])
 	else
 		set $eg = executor_globals
 	end
@@ -9,7 +10,7 @@ end
 
 document ____executor_globals
 	portable way of accessing executor_globals
-	ZTS detection is automatically based on ext/standard module struct
+	type "set $zts = 1" if you use --enable-maintainer-zts on your configure line
 end
 
 define dump_bt
@@ -43,33 +44,55 @@ document printzv
 end
 
 define ____printzv_contents
+	____executor_globals
 	set $zvalue = $arg0
-	set $type = $zvalue->type
 
-	printf "(refcount=%d) ", $zvalue->refcount
-	if $type == 0
-		printf "NULL"
+	if $zvalue.type == 0
+		set $typename = "NULL"
 	end
-	if $type == 1
-		printf "long: %ld", $zvalue->value.lval
+	if $zvalue.type == 1
+		set $typename = "long"
 	end
-	if $type == 2
-		printf "double: %lf", $zvalue->value.dval
+	if $zvalue.type == 2
+		set $typename = "double"
 	end
-	if $type == 3
-		printf "bool: "
-		if $zvalue->value.lval
-			printf "true"
-		else
-			printf "false"
-		end
+	if $zvalue.type == 3
+		set $typename = "string"
 	end
-	if $type == 4
-		printf "array(%d): ", $zvalue->value.ht->nNumOfElements
+	if $zvalue.type == 4
+		set $typename = "array"
+	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 ! $arg1
 			printf "{\n"
 			set $ind = $ind + 1
-			____print_ht $zvalue->value.ht
+			____print_ht $zvalue.value.ht
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0
@@ -78,60 +101,34 @@ define ____printzv_contents
 			end
 			printf "}"
 		end
-		set $type = 0
 	end
-	if $type == 5
-		printf "object"
-		____executor_globals
-		set $handle = $zvalue->value.obj.handle
-		set $handlers = $zvalue->value.obj.handlers
-		if basic_functions_module.zts
-			set $zobj = zend_objects_get_address($zvalue, $tsrm_ls)
-		else
-			set $zobj = zend_objects_get_address($zvalue)
-		end
-		if $handlers->get_class_entry == &zend_std_object_get_class
-			set $cname = $zobj->ce.name
-		else
-			set $cname = "Unknown"
-		end
-		printf "(%s) #%d", $cname, $handle
+	if $zvalue.type == 5
 		if ! $arg1
-			if $handlers->get_properties == &zend_std_get_properties
-				set $ht = $zobj->properties
-				if $ht
-					printf "(%d): ", $ht->nNumOfElements
-					printf "{\n"
-					set $ind = $ind + 1
-					____print_ht $ht
-					set $ind = $ind - 1
-					set $i = $ind
-					while $i > 0
-						printf "  "
-						set $i = $i - 1
-					end
-					printf "}"
-				else
-					echo "no properties found"
-				end
+			printf "(prop examination disabled due to a gdb bug)"
+			if $zvalue.value.obj.handlers->get_properties
+#				set $ht = $zvalue->value.obj.handlers->get_properties($zvalue)
+#				printf "{\n"
+#				set $ind = $ind + 1
+#				____print_ht $ht
+#				set $ind = $ind - 1
+#				set $i = $ind
+#				while $i > 0
+#					printf "  "
+#					set $i = $i - 1
+#				end
+#				printf "}"
 			end
 		end
-		set $type = 0
 	end
-	if $type == 6
-		printf "string(%d): \"%s\"", $zvalue->value.str.len, $zvalue->value.str.val
+	if $zvalue.type == 6
+		if $zvalue.value.lval
+			printf "true"
+		else
+			printf "false"
+		end
 	end
-	if $type == 7
-		printf "resource: #%d", $zvalue->value.lval
-	end
-	if $type == 8 
-		printf "constant"
-	end
-	if $type == 9
-		printf "const_array"
-	end
-	if $type > 9
-		printf "unknown type %d", $type
+	if $zvalue.type == 7
+		printf "#%d", $zvalue.value.lval
 	end
 	printf "\n"
 end
@@ -146,7 +143,7 @@ define ____printzv
 		printf "*uninitialized* "
 	end
 
-	set $zcontents = (zval*) $zvalue
+	set $zcontents = *(struct _zval_struct *) $zvalue
 	if $arg1
 		____printzv_contents $zcontents $arg1
 	else
@@ -159,7 +156,7 @@ define ____print_const_table
 	set $p = $ht->pListHead
 
 	while $p != 0
-		set $const = (zend_constant *) $p->pData
+		set $const = *(zend_constant *) $p->pData
 
 		set $i = $ind
 		while $i > 0
@@ -173,7 +170,7 @@ define ____print_const_table
 			printf "%d => ", $p->h
 		end
 
-		____printzv_contents &$const->value 0
+		____printzv_contents $const.value 0
 		set $p = $p->pListNext
 	end
 end
@@ -190,7 +187,7 @@ define ____print_ht
 	set $p = $ht->pListHead
 
 	while $p != 0
-		set $zval = *(zval **)$p->pData
+		set $zval = *(struct _zval_struct **)$p->pData
 
 		set $i = $ind
 		while $i > 0
@@ -220,41 +217,6 @@ document print_ht
 	dumps elements of HashTable made of zval
 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 
-			printf "\"%s\" => ", (char*)$p->arKey
-		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 printzn
 	____executor_globals
 	set $ind = 0

CODING_STANDARDS

@@ -148,19 +148,20 @@ Naming Conventions
     'buildsomewidget'
     'getI()'
 
-[7] Classes should be given descriptive names. Avoid using abbreviations where
-    possible. Each word in the class name should start with a capital letter, 
-    without underscore delimiters (CampelCaps starting with a capital letter). 
-    The class name should be prefixed with the name of the 'parent set' (e.g. 
-    the name of the extension).
+[7] Classes should be given descriptive names. Avoid using abbreviations
+    where possible. Each word in the class name should start with a capital
+    letter, with words underscore delimited. The class name should be prefixed
+    with the name of the 'parent set'.
 
     Good:
     'Curl'
-    'FooBar'
+    'Foo_Bar'
 
     Bad:
     'foobar'
     'foo_bar'
+    'FooBar'
+
 
 Syntax and indentation
 ----------------------
@@ -207,12 +208,6 @@ Syntax and indentation
     indent preprocessor directives you should put the # at the beginning
     of a line, followed by any number of whitespace.
 
-Testing
--------
-
-[1] Extensions should be well tested using *.phpt tests. Read about that
-    in README.TESTING.
-
 Documentation and Folding Hooks
 -------------------------------
 

EXTENSIONS

@@ -26,6 +26,11 @@ Status legend
 
 == Server APIs ==
 
+-------------------------------------------------------------------------------
+EXTENSION:           activescript
+PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>
+MAINTENANCE:         Odd Fixes
+STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           aolserver
 MAINTENANCE:         Unknown
@@ -36,19 +41,14 @@ PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           apache_hooks
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           apache2filter
+EXTENSION:           apache2handler / apache2filter
 PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Experimental
 -------------------------------------------------------------------------------
-EXTENSION:           apache2handler
-PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>, Ilia Alshanetsky <iliaa@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
+EXTENSION:           apache_hooks
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           caudium
 MAINTENANCE:         Unknown
@@ -63,11 +63,6 @@ MAINTENANCE:         Marcus Boerger <helly@php.net>, Edin Kadribasic <edink@php.
 STATUS:              Working
 SINCE:               4.3.0
 -------------------------------------------------------------------------------
-EXTENSION:           continuity
-PRIMARY MAINTAINER:  Alex Leigh <aleigh@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
 EXTENSION:           embed
 PRIMARY MAINTAINER:  Edin Kadribasic <edink@php.net>
 MAINTENANCE:         Maintained
@@ -134,8 +129,12 @@ 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>
+EXTENSION:           filepro
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           hwapi
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
@@ -171,31 +170,11 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mysqli
-PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               5.0
 -------------------------------------------------------------------------------
-EXTENSION:           oci8
-PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           odbc
-PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-COMMENT:             Working 
--------------------------------------------------------------------------------
-EXTENSION:           oracle
-MAINTENANCE:         Orphaned
-STATUS:              Working
-COMMENT:             Using the new OCI8 driver is encouraged where possible.
--------------------------------------------------------------------------------
-EXTENSION:           ovrimos
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
 EXTENSION:           pgsql
 PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Yasuo Ohgaki <yohgaki@php.net>
 MAINTENANCE:         Maintained
@@ -217,6 +196,22 @@ EXTENSION:           sybase_ct
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           oci8
+PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           odbc
+PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+COMMENT:             Working 
+-------------------------------------------------------------------------------
+EXTENSION:           oracle
+MAINTENANCE:         Orphaned
+STATUS:              Working
+COMMENT:             Using the new OCI8 driver is encouraged where possible.
+-------------------------------------------------------------------------------
 
 
 == XML extensions ==
@@ -225,19 +220,14 @@ STATUS:              Working
 EXTENSION:           dom
 PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>, Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           simplexml
 PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.0
--------------------------------------------------------------------------------
-EXTENSION:           soap
-PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>
-MAINTENANCE:         Maintained
 STATUS:              Experimental
+SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           wddx
 PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
@@ -257,7 +247,7 @@ STATUS:              Experimental
 EXTENSION:           xsl
 PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               5.0
 -------------------------------------------------------------------------------
 
@@ -275,6 +265,11 @@ MAINTENANCE:         Odd Fixes
 STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
+EXTENSION:           dio
+MAINTENANCE:         Orphaned
+STATUS:              Working
+SINCE:               4.0.6
+-------------------------------------------------------------------------------
 EXTENSION:           calendar
 PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
 MAINTENANCE:         Odd Fixes
@@ -297,36 +292,22 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           curl
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>,Ilia Alshanetsky <iliaa@php.net>
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
-EXTENSION:           date
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
 EXTENSION:           exif
 PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.2
 -------------------------------------------------------------------------------
-EXTENSION:           fam
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
 EXTENSION:           fdf
 PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           filepro
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
 EXTENSION:           ftp
 PRIMARY MAINTAINER:  Stefan Esser (sesser@php.net)
 MAINTENANCE:         Maintained
@@ -346,26 +327,16 @@ MAINTENANCE:         Unknown
 STATUS:              Unknown
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
-EXTENSION:           hwapi
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
 EXTENSION:           iconv
 PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           imap
-PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>, Ilia Alshanetsky <iliaa@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>
+MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           ircg
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
 EXTENSION:           ldap
 PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>
 MAINTENANCE:         Maintained
@@ -381,63 +352,33 @@ 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
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           mime_magic
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Deprecated
-STATUS:              Experimental
-COMMENT:             Use PECL's fileinfo extension instead
--------------------------------------------------------------------------------
-EXTENSION:           ming
-PRIMARY MAINTAINER:  Frank M. Kromann
-MAINTENANCE:         Unknown
-STATUS:              Experimental
--------------------------------------------------------------------------------
-EXTENSION:           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>
+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>
 MAINTENANCE:         Maintained
 STATUS:              Experimental
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
-EXTENSION:           pcntl
-MAINTENANCE:         Unknown
-STATUS:              Experimental
--------------------------------------------------------------------------------
 EXTENSION:           pcre
 PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           pdf
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           pfpro
 PRIMARY MAINTAINER:  David Croft <david@infotrek.co.uk>
 MAINTENANCE:         Maintained
@@ -452,7 +393,7 @@ STATUS:              Working
 EXTENSION:           pspell
 PRIMARY MAINTAINER:  Vlad Krupin <phpdevel@echospace.com>
 MAINTENANCE:         Unknown
-STATUS:              Working
+STATUS:              Unknown
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           readline
@@ -465,7 +406,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           session
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Ilia Alshanetsky <iliaa@php.net>
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -486,12 +427,6 @@ MAINTENANCE:         Maintained
 STATUS:              Experimental
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
-EXTENSION:           spl
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.0.0
--------------------------------------------------------------------------------
 EXTENSION:           sysvmsg
 MAINTENANCE:         Unknown
 STATUS:              Unknown
@@ -504,22 +439,16 @@ EXTENSION:           sysvshm
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           tidy
-PRIMARY MAINTAINER:  John Coggeshall <john@php.net>, Ilia Alshanetsky <iliaa@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           tokenizer
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
 EXTENSION:           yaz
 PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
 MAINTENANCE:         Maintained
 STATUS:              Unknown
 SINCE:               4.0.1
 -------------------------------------------------------------------------------
+EXTENSION:           yp
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
 EXTENSION:           zlib
 PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de>
 MAINTENANCE:         Maintained

LICENSE

@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
-                  The PHP License, version 3.01
-Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+                  The PHP License, Version 3.0
+Copyright (c) 1999 - 2003 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 
 
 Redistribution and use in source and binary forms, with or without
@@ -38,8 +38,8 @@ are met:
 
   6. Redistributions of any form whatsoever must retain the following
      acknowledgment:
-     "This product includes PHP software, freely available from
-     <http://www.php.net/software/>".
+     "This product includes PHP, freely available from
+     <http://www.php.net/>".
 
 THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
 ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -64,5 +64,5 @@ The PHP Group can be contacted via Email at group@php.net.
 For more information on the PHP Group and the PHP project, 
 please see <http://www.php.net>.
 
-PHP includes the Zend Engine, freely available at
+This product includes the Zend Engine, freely available at
 <http://www.zend.com>.

Makefile.frag

@@ -7,17 +7,17 @@ $(builddir)/zend_language_scanner.lo: $(builddir)/zend_language_parser.h
 $(builddir)/zend_ini_scanner.lo: $(builddir)/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
+	$(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 $@
+	$(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 $@
+	$(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
+	$(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

Makefile.gcov

@@ -1,70 +0,0 @@
-
-#
-# 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 | 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.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_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 --no-prefix --output-directory lcov_html/ --title "PHP Code Coverage" --show-details php_lcov.info
-
-lcov-clean:
-	rm -f php_lcov.info
-	rm -rf lcov_data/
-	rm -rf lcov_html/
-

Makefile.global

@@ -5,6 +5,7 @@ INSTALL_DATA = $(INSTALL) -m 644
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
 
+
 all: $(all_targets) 
 	@echo
 	@echo "Build complete."
@@ -42,44 +43,19 @@ 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 $(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 $(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
+install-tester:
+	@echo "Installing regression tester:     $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/"
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
+	@$(INSTALL) -m 755 $(top_srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
 
-test: all 
-	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
-		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
-		TEST_PHP_SRCDIR=$(top_srcdir) \
-		CC="$(CC)" \
-			$(PHP_EXECUTABLE) -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 \
+install-su: install-pear install-tester
+
+test: 
+	-@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \
 		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
-			$(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); \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi
@@ -93,7 +69,7 @@ clean:
 
 distclean: clean
 	rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp5.module buildmk.stamp
-	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
+	egrep define'.*include/php' configure|sed 's/.*>//'|xargs rm -f
 	find . -name Makefile | xargs rm -f
 
 .PHONY: all clean install distclean test

README.CVS-RULES

@@ -29,14 +29,7 @@ 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.
-
-Currently we have the following branches in use:
-HEAD     Will become PHP 6.0. This CVS branch is for active development.
-PHP_5_1  Is used to release the PHP 5.1.x series. Only minor feature
-		 enhancements may go in here, but please keep that as infrequent as
-		 possible.
-PHP_4_4  Is used to release the PHP 4.4.x series. Only bugfixes are permitted
-         on this branch.
+	
 
 The next few rules are more of a technical nature.
 
@@ -68,27 +61,26 @@ The next few rules are more of a technical nature.
 
 The format of the commit messages is pretty simple.
 
-Use a - to start a new item in your commit message.
-
 If a line begins with #, it is taken to be a comment and will not appear
 in the ChangeLog. Everything else goes into the ChangeLog.
 
 It is important to note that if your comment or news logline spans multiple
 lines, you have to put # at the beginning of _every_ such line. 
 
-Example. Say you modified two files, datetime.c and string.c. In datetime.c you
-added a new format option for the date() function, and in string.c you fixed a
-memory leak in php_trim(). Don't commit both of these at once. Commit them
+Example. Say you modified two files, datetime.c and string.c. In datetime.c
+you added a new format option for date() function, and in string.c you fixed
+a memory leak in php_trim(). Don't commit both of these at once. Commit them
 separately and try to make sure your commit messages look something like the
 following.
 
 For datetime.c:
-- Added new 'K' format modifier to date() for printing out number of days until
-  New Year's Eve.
+
+(PHP date) Added new 'K' format modifier for printing out number of
+           days until New Year's Eve.
 
 For string.c:
-- Fixed a memory leak in php_trim() resulting from improper use of zval_dtor().
-#- Man, that thing was leaking all over the place!
+(php_trim) Fixed a memory leak resulting from improper use of zval_dtor().
+# Man, that thing was leaking all over the place!
 
 The # lines will be omitted from the ChangeLog automagically.
 
@@ -98,7 +90,7 @@ bug report when developers are browsing CVS via. LXR or Bonsai.
 
 Example:
 
-Fixed bug #14016 (pgsql notice handler double free crash bug.)
+Fixed pgsql notice handler double free crash bug. Bug #14016
 
 If you don't see your messages in ChangeLog right away, don't worry!
 These files are updated once a day, so your stuff will not show up until

README.PHP4-TO-PHP5-THIN-CHANGES

@@ -77,24 +77,20 @@
 
 9. get_class() starting PHP 5 returns the name of the class as it was
    declared which may lead to problems in older scripts that rely on
-   the previous behaviour - the class name is lowercased. Expect the
-   same behaviour from get_parent_class() when applicable.
+   the previous behaviour - the class name is lowercased.
    Example :
    <?php
    class FooBar {
    }
-   class ExtFooBar extends FooBar{}
    $a = new FooBar();
-   var_dump(get_class($a), get_parent_class($a));
+   var_dump(get_class($a));
    ?>
 
    Output (PHP 4):
    string(6) "foobar"
-   string(9) "extfoobar"
 
    Output (PHP 5):
    string(6) "FooBar"
-   string(9) "ExtFooBar"
    ----------------------------------------------------------------------
    Example code that will break :
    //....
@@ -105,51 +101,7 @@
      //...
    }
    //...
-   Possible solution is to search for get_class() and get_parent_class() in
-   all your scripts and use strtolower().
-
-10. get_class_methods() returns the names of the methods of a class as they
-   declared. In PHP4 the names are all lowercased.
-   Example code :
-   <?php
-   class Foo{
-     function doFoo(){}
-     function hasFoo(){}
-   }
-   var_dump(get_class_methods("Foo")); 
-   ?>
-   Output (PHP4):
-   array(2) {
-     [0]=>
-     string(5) "dofoo"
-     [1]=>
-     string(6) "hasfoo"
-   }
-   Output (PHP5):
-   array(2) {
-     [0]=>
-     string(5) "doFoo"
-     [1]=>
-     string(6) "hasFoo"
-   }
-
-11. Assignment $this is impossible. Starting PHP 5.0.0 $this has special
-    meaning in class methods and is recognized by the PHP parser. The latter
-    will generate a parse error when assignment to $this is found
-    Example code :
-    <?php
-    class Foo {
-      function assignNew($obj) {
-        $this = $obj;
-      }
-    }
-    $a = new Foo();
-    $b = new Foo();
-    $a->assignNew($b);
-    echo "I was executed\n";
-    ?>
-    Output (PHP 4):
-    I was executed
-    Output (PHP 5):
-    PHP Fatal error:  Cannot re-assign $this in /tmp/this_ex.php on line 4
+   Possible solution is to search for get_class() in all your scripts and
+   use strtolower().
 
+   

README.input_filter

@@ -34,7 +34,7 @@ ZEND_END_MODULE_GLOBALS(my_input_filter)
 
 ZEND_DECLARE_MODULE_GLOBALS(my_input_filter)
 
-zend_function_entry my_input_filter_functions[] = {
+function_entry my_input_filter_functions[] = {
     PHP_FE(my_get_raw,   NULL)
     {NULL, NULL, NULL}
 };

TODO

@@ -7,6 +7,9 @@ Zend
       dimensional arrays.
     * Look at replacing c-lib call tolower().
     * Make hash API functions work with HASH_OF() to save time.
+    * Add configure test to determine if dlsym() requires underscore and set
+      DLSYM_NEEDS_UNDERSCORE accordingly. Perl and zsh have it in configure, 
+      for example. (DONE?)
     * Native large number support (probably with GNU GMP)
     * Const'ify APIs. Right now, many functions leave parameters untouched,
       but don't declare those as const. This makes interaction with other
@@ -64,6 +67,14 @@ documentation
     * Add developer documentation.
     * Add detailed documentation for Java extension.
 
+ext/bz2
+-------
+    * Add an ini directive to specify the size of decompression buffer.
+      The default 4k is too small for large files and also requires much time
+      for decompression. 40k is suitable for such files, however it may be too
+      much under certain environments. There should be appropriate default
+      settings for the various SAPI modules (e.g. apache and cli).
+
 ext/curl
 --------
     * Have a warning scheme for when people use unsupported features.

TODO-5.1

@@ -1,4 +1,17 @@
 Zend Engine
 -----------
   - Look at making zend_constant value member be a zval* instead of zval. (Andi)
+  - Add the patch for referring to existing .ini vars in .ini files. (Andrei)
   - Implement inheritance rules for type hints. (Marcus) 
+  - Implement true/false/NULL as keywords (apply the patch). (Andi, Marcus)
+  - Implement typehinting for arrays (apply the patch). (Andi, Marcus)
+  - Find a keyword for the if-set-or operator (apply the patch). (Marcus, all)
+  - Fix ZTS destruction (apply the patch). (Marcus)
+
+Build System
+------------
+  - Implement load order of built-in extensions (apply the patch). (Wez)
+
+Standard Library
+----------------
+  - Implement new time/date parsing and handling functions. (Derick)

TODO.BUILDv5

@@ -0,0 +1,3 @@
+- clean up .cvsignores
+- purge Makefile.ins and replace PHP_EXTENSION in config.m4s
+  with appropiate calls to PHP_NEW_EXTENSION

TSRM/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 1999-2006, Andi Gutmans, Sascha Schumann, Zeev Suraski.
+Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

TSRM/TSRM.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Thread Safe Resource Manager                                         |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2006, Andi Gutmans, Sascha Schumann, Zeev Suraski |
+   | Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski|
    | This source file is subject to the TSRM license, that is bundled     |
    | with this package in the file LICENSE                                |
    +----------------------------------------------------------------------+
@@ -34,7 +34,9 @@ typedef struct {
 	size_t size;
 	ts_allocate_ctor ctor;
 	ts_allocate_dtor dtor;
+#ifdef MBO_0
 	int done;
+#endif
 } tsrm_resource_type;
 
 
@@ -92,28 +94,12 @@ static FILE *tsrm_error_file;
 #if defined(PTHREADS)
 /* Thread local storage */
 static pthread_key_t tls_key;
-# define tsrm_tls_set(what)		pthread_setspecific(tls_key, (void*)(what))
-# define tsrm_tls_get()			pthread_getspecific(tls_key)
-
 #elif defined(TSRM_ST)
 static int tls_key;
-# define tsrm_tls_set(what)		st_thread_setspecific(tls_key, (void*)(what))
-# define tsrm_tls_get()			st_thread_getspecific(tls_key)
-
 #elif defined(TSRM_WIN32)
 static DWORD tls_key;
-# define tsrm_tls_set(what)		TlsSetValue(tls_key, (void*)(what))
-# define tsrm_tls_get()			TlsGetValue(tls_key)
-
 #elif defined(BETHREADS)
 static int32 tls_key;
-# define tsrm_tls_set(what)		tls_set(tls_key, (void*)(what))
-# define tsrm_tls_get()			(tsrm_tls_entry*)tls_get(tls_key)
-
-#else
-# define tsrm_tls_set(what)
-# define tsrm_tls_get()			NULL
-# warning tsrm_set_interpreter_context is probably broken on this platform
 #endif
 
 /* Startup TSRM (call once for the entire process) */
@@ -176,9 +162,11 @@ TSRM_API void tsrm_shutdown(void)
 				next_p = p->next;
 				for (j=0; j<p->count; j++) {
 					if (p->storage[j]) {
+#ifdef MBO_0
 						if (resource_types_table && !resource_types_table[j].done && resource_types_table[j].dtor) {
 							resource_types_table[j].dtor(p->storage[j], &p->storage);
 						}
+#endif
 						free(p->storage[j]);
 					}
 				}
@@ -238,7 +226,9 @@ TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].size = size;
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].ctor = ctor;
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].dtor = dtor;
+#ifdef MBO_0
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].done = 0;
+#endif
 
 	/* enlarge the arrays for the already active threads */
 	for (i=0; i<tsrm_tls_table_size; i++) {
@@ -278,16 +268,26 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 	(*thread_resources_ptr)->thread_id = thread_id;
 	(*thread_resources_ptr)->next = NULL;
 
+#if defined(PTHREADS)
 	/* Set thread local storage to this new thread resources structure */
-	tsrm_tls_set(*thread_resources_ptr);
+	pthread_setspecific(tls_key, (void *) *thread_resources_ptr);
+#elif defined(TSRM_ST)
+	st_thread_setspecific(tls_key, (void *) *thread_resources_ptr);
+#elif defined(TSRM_WIN32)
+	TlsSetValue(tls_key, (void *) *thread_resources_ptr);
+#elif defined(BETHREADS)
+	tls_set(tls_key, (void*) *thread_resources_ptr);
+#endif
 
 	if (tsrm_new_thread_begin_handler) {
 		tsrm_new_thread_begin_handler(thread_id, &((*thread_resources_ptr)->storage));
 	}
 	for (i=0; i<id_count; i++) {
+#if MBO_0
 		if (resource_types_table[i].done) {
 			(*thread_resources_ptr)->storage[i] = NULL;
 		} else
+#endif
 		{
 			(*thread_resources_ptr)->storage[i] = (void *) malloc(resource_types_table[i].size);
 			if (resource_types_table[i].ctor) {
@@ -296,11 +296,11 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 		}
 	}
 
+	tsrm_mutex_unlock(tsmm_mutex);
+
 	if (tsrm_new_thread_end_handler) {
 		tsrm_new_thread_end_handler(thread_id, &((*thread_resources_ptr)->storage));
 	}
-
-	tsrm_mutex_unlock(tsmm_mutex);
 }
 
 
@@ -321,13 +321,22 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 	if(tsrm_tls_table) {
 #endif
 	if (!th_id) {
+#if defined(PTHREADS)
 		/* Fast path for looking up the resources for the current
 		 * thread. Its used by just about every call to
 		 * ts_resource_ex(). This avoids the need for a mutex lock
 		 * and our hashtable lookup.
 		 */
-		thread_resources = tsrm_tls_get();
-
+		thread_resources = pthread_getspecific(tls_key);
+#elif defined(TSRM_ST)
+		thread_resources = st_thread_getspecific(tls_key);
+#elif defined(TSRM_WIN32)
+		thread_resources = TlsGetValue(tls_key);
+#elif defined(BETHREADS)
+		thread_resources = (tsrm_tls_entry*)tls_get(tls_key);
+#else
+		thread_resources = NULL;
+#endif
 		if (thread_resources) {
 			TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Fetching resource id %d for current thread %d", id, (long) thread_resources->thread_id));
 			/* Read a specific resource from the thread's resources.
@@ -378,65 +387,6 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 #endif
 }
 
-/* frees an interpreter context.  You are responsible for making sure that
- * it is not linked into the TSRM hash, and not marked as the current interpreter */
-void tsrm_free_interpreter_context(void *context)
-{
-	tsrm_tls_entry *next, *thread_resources = (tsrm_tls_entry*)context;
-	int i;
-
-	while (thread_resources) {
-		next = thread_resources->next;
-
-		for (i=0; i<thread_resources->count; i++) {
-			if (resource_types_table[i].dtor) {
-				resource_types_table[i].dtor(thread_resources->storage[i], &thread_resources->storage);
-			}
-		}
-		for (i=0; i<thread_resources->count; i++) {
-			free(thread_resources->storage[i]);
-		}
-		free(thread_resources->storage);
-		free(thread_resources);
-		thread_resources = next;
-	}
-}
-
-void *tsrm_set_interpreter_context(void *new_ctx)
-{
-	tsrm_tls_entry *current;
-
-	current = tsrm_tls_get();
-
-	/* TODO: unlink current from the global linked list, and replace it
-	 * it with the new context, protected by mutex where/if appropriate */
-
-	/* Set thread local storage to this new thread resources structure */
-	tsrm_tls_set(new_ctx);
-
-	/* return old context, so caller can restore it when they're done */
-	return current;
-}
-
-
-/* allocates a new interpreter context */
-void *tsrm_new_interpreter_context(void)
-{
-	tsrm_tls_entry *new_ctx, *current;
-	THREAD_T thread_id;
-
-	thread_id = tsrm_thread_id();
-	tsrm_mutex_lock(tsmm_mutex);
-
-	current = tsrm_tls_get();
-
-	allocate_new_resource(&new_ctx, thread_id);
-	
-	/* switch back to the context that was in use prior to our creation
-	 * of the new one */
-	return tsrm_set_interpreter_context(current);
-}
-
 
 /* frees all resources allocated for the current thread */
 void ts_free_thread(void)
@@ -467,7 +417,11 @@ void ts_free_thread(void)
 			} else {
 				tsrm_tls_table[hash_value] = thread_resources->next;
 			}
-			tsrm_tls_set(0);
+#if defined(PTHREADS)
+			pthread_setspecific(tls_key, 0);
+#elif defined(TSRM_WIN32)
+			TlsSetValue(tls_key, 0);
+#endif
 			free(thread_resources);
 			break;
 		}
@@ -483,6 +437,7 @@ void ts_free_thread(void)
 /* deallocates all occurrences of a given id */
 void ts_free_id(ts_rsrc_id id)
 {
+#ifdef MBO_0
 	int i;
 	int j = TSRM_UNSHUFFLE_RSRC_ID(id);
 
@@ -511,6 +466,7 @@ void ts_free_id(ts_rsrc_id id)
 	tsrm_mutex_unlock(tsmm_mutex);
 
 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Successfully freed resource id %d", id));
+#endif
 }
 
 
@@ -525,6 +481,13 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 {
 #ifdef TSRM_WIN32
 	return GetCurrentThreadId();
+#elif defined(NETWARE)
+	/* There seems to be some problem with the LibC call: NXThreadGetId().
+	 * Due to this, the PHPMyAdmin application is abending in PHP calls.
+	 * Used the call, kCurrentThread instead and it works fine.
+	 */
+/*	return NXThreadGetId(); */
+	return kCurrentThread();
 #elif defined(GNUPTH)
 	return pth_self();
 #elif defined(PTHREADS)
@@ -545,9 +508,24 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 {
 	MUTEX_T mutexp;
+#ifdef NETWARE
+#ifndef USE_MPK
+	/* To use the Recursive Mutex Locking of LibC */
+	long flags = NX_MUTEX_RECURSIVE;
+	NXHierarchy_t order = 0;
+	NX_LOCK_INFO_ALLOC (lockInfo, "PHP-TSRM", 0);
+#endif
+#endif
+
 #ifdef TSRM_WIN32
 	mutexp = malloc(sizeof(CRITICAL_SECTION));
 	InitializeCriticalSection(mutexp);
+#elif defined(NETWARE)
+#ifdef USE_MPK
+	mutexp = kMutexAlloc((BYTE*)"PHP-TSRM");
+#else
+	mutexp = NXMutexAlloc(flags, order, &lockInfo);
+#endif
 #elif defined(GNUPTH)
 	mutexp = (MUTEX_T) malloc(sizeof(*mutexp));
 	pth_mutex_init(mutexp);
@@ -579,6 +557,12 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
 		DeleteCriticalSection(mutexp);
 		free(mutexp);
+#elif defined(NETWARE)
+#ifdef USE_MPK
+		kMutexFree(mutexp);
+#else
+		NXMutexFree(mutexp);
+#endif
 #elif defined(GNUPTH)
 		free(mutexp);
 #elif defined(PTHREADS)
@@ -608,6 +592,12 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
 	EnterCriticalSection(mutexp);
 	return 1;
+#elif defined(NETWARE)
+#ifdef USE_MPK
+	return kMutexLock(mutexp);
+#else
+	return NXLock(mutexp);
+#endif
 #elif defined(GNUPTH)
 	return pth_mutex_acquire(mutexp, 0, NULL);
 #elif defined(PTHREADS)
@@ -633,6 +623,12 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
 	LeaveCriticalSection(mutexp);
 	return 1;
+#elif defined(NETWARE)
+#ifdef USE_MPK
+	return kMutexUnlock(mutexp);
+#else
+	return NXUnlock(mutexp);
+#endif
 #elif defined(GNUPTH)
 	return pth_mutex_release(mutexp);
 #elif defined(PTHREADS)

TSRM/TSRM.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Thread Safe Resource Manager                                         |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2006, Andi Gutmans, Sascha Schumann, Zeev Suraski |
+   | Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski|
    | This source file is subject to the TSRM license, that is bundled     |
    | with this package in the file LICENSE                                |
    +----------------------------------------------------------------------+
@@ -14,8 +14,8 @@
 #define TSRM_H
 
 /* #ifndef WIN32 */
-#ifndef WIN32
-# include <tsrm_config.h>
+#if !defined(WIN32) && !defined(NETWARE)
+# include "tsrm_config.h"
 #endif
 
 #ifdef WIN32
@@ -42,6 +42,13 @@
 # endif
 # include <windows.h>
 # include <shellapi.h>
+#elif defined(NETWARE)
+# include <nks/thread.h>
+#ifdef USE_MPK
+# include <mpklib4php.h>
+#else
+# include <nks/synch.h>
+#endif
 #elif defined(GNUPTH)
 # include <pth.h>
 #elif defined(PTHREADS)
@@ -59,6 +66,13 @@ typedef int ts_rsrc_id;
 #ifdef TSRM_WIN32
 # define THREAD_T DWORD
 # define MUTEX_T CRITICAL_SECTION *
+#elif defined(NETWARE)
+# define THREAD_T NXThreadId_t
+#ifdef USE_MPK
+# define MUTEX_T MUTEX
+#else
+# define MUTEX_T NXMutex_t *
+#endif
 #elif defined(GNUPTH)
 # define THREAD_T pth_t
 # define MUTEX_T pth_mutex_t *
@@ -132,18 +146,12 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp);
 TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler);
 TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
 
-/* these 3 APIs should only be used by people that fully understand the threading model
- * used by PHP/Zend and the selected SAPI. */
-TSRM_API void *tsrm_new_interpreter_context(void);
-TSRM_API void *tsrm_set_interpreter_context(void *new_ctx);
-TSRM_API void tsrm_free_interpreter_context(void *context);
-
 #define TSRM_SHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)+1)
 #define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)-1)
 
 #define TSRMLS_FETCH()			void ***tsrm_ls = (void ***) ts_resource_ex(0, NULL)
 #define TSRMLS_FETCH_FROM_CTX(ctx)	void ***tsrm_ls = (void ***) ctx
-#define TSRMLS_SET_CTX(ctx)		ctx = (void ***) tsrm_ls
+#define TSRMLS_SET_CTX(ctx)		(void ***) ctx = tsrm_ls
 #define TSRMG(id, type, element)	(((type) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
 #define TSRMLS_D	void ***tsrm_ls
 #define TSRMLS_DC	, TSRMLS_D

TSRM/acinclude.m4

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

TSRM/threads.m4

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

TSRM/tsrm.m4

@@ -1,6 +1,6 @@
 
 dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
-AC_DEFUN([TSRM_CHECK_GCC_ARG],[
+AC_DEFUN(TSRM_CHECK_GCC_ARG,[
   gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
   AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
   echo 'void somefunc() { };' > conftest.c
@@ -21,7 +21,7 @@ AC_DEFUN([TSRM_CHECK_GCC_ARG],[
   fi
 ])
 
-AC_DEFUN([TSRM_BASIC_CHECKS],[
+AC_DEFUN(TSRM_BASIC_CHECKS,[
 
 AC_REQUIRE([AC_PROG_CC])dnl
 dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
@@ -33,7 +33,7 @@ AC_CHECK_HEADERS(stdarg.h)
 ])
 
 
-AC_DEFUN([TSRM_CHECK_PTH],[
+AC_DEFUN(TSRM_CHECK_PTH,[
 
 AC_MSG_CHECKING(for GNU Pth)
 PTH_PREFIX="`$1 --prefix`"
@@ -50,7 +50,7 @@ AC_MSG_RESULT(yes - installed in $PTH_PREFIX)
 
 ])
 
-AC_DEFUN([TSRM_CHECK_ST],[
+AC_DEFUN(TSRM_CHECK_ST,[
   if test -r "$1/include/st.h"; then
     CPPFLAGS="$CPPFLAGS -I$1/include"
     LDFLAGS="$LDFLAGS -L$1/lib"
@@ -70,7 +70,7 @@ AC_DEFUN([TSRM_CHECK_ST],[
 sinclude(threads.m4)
 sinclude(TSRM/threads.m4)
 
-AC_DEFUN([TSRM_CHECK_PTHREADS],[
+AC_DEFUN(TSRM_CHECK_PTHREADS,[
 		
 PTHREADS_CHECK
 
@@ -89,14 +89,14 @@ fi
 ])
 
 
-AC_DEFUN([TSRM_THREADS_CHECKS],[
+AC_DEFUN(TSRM_THREADS_CHECKS,[
 
 dnl For the thread implementations, we always use --with-*
 dnl to maintain consistency
 
 AC_ARG_WITH(tsrm-pth,
 [  --with-tsrm-pth[=pth-config]
-                          Use GNU Pth],[
+                          Use GNU Pth.],[
   TSRM_PTH=$withval
 ],[
   TSRM_PTH=no

TSRM/tsrm_config.nw.h

@@ -0,0 +1,11 @@
+#ifndef TSRM_CONFIG_NW_H
+#define TSRM_CONFIG_NW_H
+
+#define HAVE_UTIME 1
+
+/* Though we have alloca(), this seems to be causing some problem
+ * with the stack pointer. Hence not using it
+ */
+/*#define HAVE_ALLOCA 1*/
+
+#endif

TSRM/tsrm_config_common.h

@@ -7,8 +7,10 @@
 
 #ifdef TSRM_WIN32
 # include "tsrm_config.w32.h"
+#elif defined(NETWARE)
+# include "tsrm_config.nw.h"
 #else
-# include <tsrm_config.h>
+# include "tsrm_config.h"
 # include <sys/param.h>
 #endif
 
@@ -42,8 +44,6 @@ char *alloca ();
 #ifndef MAXPATHLEN
 # ifdef PATH_MAX
 #  define MAXPATHLEN PATH_MAX
-# elif defined(MAX_PATH)
-#  define MAXPATHLEN MAX_PATH
 # else
 #  define MAXPATHLEN 256
 # endif

TSRM/tsrm_nw.c

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

TSRM/tsrm_nw.h

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

TSRM/tsrm_virtual_cwd.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2004 The PHP Group                                |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
    | that is bundled with this package in the file LICENSE, and is        |
    | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.txt.                                  |
    | If you did not receive a copy of the PHP license and are unable to   |
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <time.h>
 
 #include "tsrm_virtual_cwd.h"
 #include "tsrm_strtok_r.h"
@@ -43,7 +42,8 @@
 #endif
 
 #ifdef NETWARE
-#include <fsio.h>
+/*#include "pipe.h"*/
+#include "tsrm_nw.h"
 #endif
 
 #ifndef HAVE_REALPATH
@@ -60,9 +60,9 @@ MUTEX_T cwd_mutex;
 #endif
 
 #ifdef ZTS
-ts_rsrc_id cwd_globals_id;
+static ts_rsrc_id cwd_globals_id;
 #else
-virtual_cwd_globals cwd_globals;
+static virtual_cwd_globals cwd_globals;
 #endif
 
 cwd_state main_cwd_state; /* True global */
@@ -142,9 +142,15 @@ static int php_check_dots(const char *element, int n)
 	
 static int php_is_dir_ok(const cwd_state *state) 
 {
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 	struct stat buf;
 
 	if (stat(state->cwd, &buf) == 0 && S_ISDIR(buf.st_mode))
+#else
+    struct stat_libc buf;
+
+    if (stat(state->cwd, (struct stat*)(&buf)) == 0 && S_ISDIR(buf.st_mode))
+#endif
 		return (0);
 
 	return (1);
@@ -152,9 +158,15 @@ static int php_is_dir_ok(const cwd_state *state)
 
 static int php_is_file_ok(const cwd_state *state) 
 {
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 	struct stat buf;
 
 	if (stat(state->cwd, &buf) == 0 && S_ISREG(buf.st_mode))
+#else
+    struct stat_libc buf;
+
+    if (stat(state->cwd, (struct stat*)(&buf)) == 0 && S_ISREG(buf.st_mode))
+#endif
 		return (0);
 
 	return (1);
@@ -163,27 +175,11 @@ 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);
-	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));
 }
 
 static void cwd_globals_dtor(virtual_cwd_globals *cwd_globals TSRMLS_DC)
 {
 	CWD_STATE_FREE(&cwd_globals->cwd);
-	{
-		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);
-			}
-		}
-	}
 }
 
 static char *tsrm_strndup(const char *s, size_t length)
@@ -206,20 +202,7 @@ CWD_API void virtual_cwd_startup(void)
 	char cwd[MAXPATHLEN];
 	char *result;
 
-#ifdef NETWARE
-	result = getcwdpath(cwd, NULL, 1);
-	if(result)
-	{
-		char *c=cwd;
-		while(c = strchr(c, '\\'))
-		{
-			*c='/';
-			++c;
-		}
-	}
-#else
 	result = getcwd(cwd, sizeof(cwd));	
-#endif
 	if (!result) {
 		cwd[0] = '\0';
 	}
@@ -304,63 +287,6 @@ CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC)
 	return buf;
 }
 
-static inline unsigned long realpath_cache_key(const char *path, int path_len)
-{
-  register unsigned long h;
-
-  const char *e = path + path_len;
-  for (h = 2166136261U; path < e; ) {
-    h *= 16777619;
-    h ^= *path++;
-  }
-  return h;
-}
-
-static inline void realpath_cache_add(const char *path, int path_len, const char *realpath, int realpath_len, time_t t TSRMLS_DC)
-{
-	long size = sizeof(realpath_cache_bucket) + path_len + 1 + realpath_len + 1;
-	if (CWDG(realpath_cache_size) + size <= CWDG(realpath_cache_size_limit)) {
-		realpath_cache_bucket *bucket = malloc(size);
-		unsigned long n;
-	
-		bucket->key = realpath_cache_key(path, path_len);
-		bucket->path = (char*)bucket + sizeof(realpath_cache_bucket);
-		memcpy(bucket->path, path, path_len+1);
-		bucket->path_len = path_len;
-		bucket->realpath = bucket->path + (path_len + 1);
-		memcpy(bucket->realpath, realpath, realpath_len+1);
-		bucket->realpath_len = realpath_len;
-		bucket->expires = t + CWDG(realpath_cache_ttl);
-		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;
-	}
-}
-
-static inline realpath_cache_bucket* realpath_cache_find(const char *path, int path_len, time_t t 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 (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);
-		} else if (key == (*bucket)->key && path_len == (*bucket)->path_len &&
-		           memcmp(path, (*bucket)->path, path_len) == 0) {
-			return *bucket;
-		} else {
-			bucket = &(*bucket)->next;
-		}
-	}
-	return NULL;
-}
-
-
 /* Resolve path relatively to state and put the real path into state */
 /* returns 0 for ok, 1 for error */
 CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath)
@@ -369,7 +295,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	char *ptr, *path_copy;
 	char *tok = NULL;
 	int ptr_length;
-	cwd_state old_state;
+	cwd_state *old_state;
 	int ret = 0;
 	int copy_amount = -1;
 	char *free_path;
@@ -379,61 +305,18 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 #else
 	char *new_path;
 #endif
-	char orig_path[MAXPATHLEN];
-	int orig_path_len = 0;
-	realpath_cache_bucket *bucket;
-	time_t t = 0;
-	TSRMLS_FETCH();
 
 	if (path_length == 0) 
 		return (0);
-	if (path_length >= MAXPATHLEN)
-		return (1);
 
-	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;
-		} else {
-			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);
-		}
-		t = CWDG(realpath_cache_ttl)?time(NULL):0;
-		if ((bucket = realpath_cache_find(orig_path, orig_path_len, t TSRMLS_CC)) != NULL) {		
-			int len = bucket->realpath_len;
-
-			CWD_STATE_COPY(&old_state, state);
-			state->cwd = (char *) realloc(state->cwd, len+1);
-			memcpy(state->cwd, bucket->realpath, len+1);
-			state->cwd_length = len;
-			if (verify_path && verify_path(state)) {
-				CWD_STATE_FREE(state);
-				*state = old_state;
-				return 1;
-			} else {
-				CWD_STATE_FREE(&old_state);
-				return 0;
-			}
-		}
-	}
 #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; */
-			}
+		if (use_realpath && realpath(path, resolved_path)) {
+			path = resolved_path;
+			path_length = strlen(path);
 		}
 	} else { /* Concat current directory with relative path and then run realpath() on it */
 		char *tmp;
@@ -449,33 +332,22 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 		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 (use_realpath && realpath(tmp, resolved_path)) {
+			path = resolved_path;
+			path_length = strlen(path);
 		}
 		free(tmp);
 	}
 #endif
 #if defined(TSRM_WIN32)
 	{
+		char *dummy = NULL;
 		int new_path_length;
   
-		new_path_length = GetLongPathName(path, NULL, 0);
+		new_path_length = GetLongPathName(path, dummy, 0) + 1;
 		if (new_path_length == 0) {
-			goto php_failed_getlongpath;
+			return 1;
 		}
-
-		/* GetLongPathName already counts the \0 */
 		new_path = (char *) malloc(new_path_length);
 		if (!new_path) {
 			return 1;
@@ -486,14 +358,14 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 			path_length = new_path_length;
 		} else {
 			free(new_path);
-php_failed_getlongpath:
 			new_path = NULL;
 		}
 	}
 #endif
 	free_path = path_copy = tsrm_strndup(path, path_length);
 
-	CWD_STATE_COPY(&old_state, state);
+	old_state = (cwd_state *) malloc(sizeof(cwd_state));
+	CWD_STATE_COPY(old_state, state);
 #if VIRTUAL_CWD_DEBUG
 	fprintf(stderr,"cwd = %s path = %s\n", state->cwd, path);
 #endif
@@ -513,7 +385,7 @@ php_failed_getlongpath:
 				memcpy(state->cwd, path_copy, copy_amount);
 				path_copy += copy_amount;
 			} else {
-				memcpy(state->cwd, old_state.cwd, copy_amount);
+				memcpy(state->cwd, old_state->cwd, copy_amount);
 			}
 		}
 		state->cwd[copy_amount] = '\0';
@@ -556,19 +428,8 @@ php_failed_getlongpath:
 					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)) {
+				/* If the token is a volume name, it will have colon at the end -- so, no slash before it */
+				if (ptr[ptr_length-1] != ':') {
 					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
 				}
 #else
@@ -592,26 +453,24 @@ php_failed_getlongpath:
 		state->cwd_length = path_length;
 	}
 
+	if (verify_path && verify_path(state)) {
+		CWD_STATE_FREE(state);
+
+		*state = *old_state;
+
+		ret = 1;
+	} else {
+		CWD_STATE_FREE(old_state);
+		ret = 0;
+	}
+	
+	free(old_state);
 #ifdef TSRM_WIN32
 	if (new_path) {
 		free(new_path);
 	}
 #endif
 	free(free_path);
-
-	if (use_realpath && CWDG(realpath_cache_size_limit)) {
-		realpath_cache_add(orig_path, orig_path_len, state->cwd, state->cwd_length, t TSRMLS_CC);
-	}
-
-	if (verify_path && verify_path(state)) {
-		CWD_STATE_FREE(state);
-		*state = old_state;
-		ret = 1;
-	} else {
-		CWD_STATE_FREE(&old_state);
-		ret = 0;
-	}
-	
 #if VIRTUAL_CWD_DEBUG
 	fprintf (stderr, "virtual_file_ex() = %s\n",state->cwd);
 #endif
@@ -765,7 +624,7 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC)
 }
 
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
-CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int link TSRMLS_DC)
+CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group TSRMLS_DC)
 {
 	cwd_state new_state;
 	int ret;
@@ -773,15 +632,7 @@ CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int li
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
 	virtual_file_ex(&new_state, filename, NULL, 0);
 
-	if (link) {
-#if HAVE_LCHOWN
-		ret = lchown(new_state.cwd, owner, group);
-#else
-		ret = -1;
-#endif
-	} else {
-		ret = chown(new_state.cwd, owner, group);
-	}
+	ret = chown(new_state.cwd, owner, group);
 
 	CWD_STATE_FREE(&new_state);
 	return ret;
@@ -848,23 +699,37 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC)
 	return retval;
 }
 
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC)
 {
 	cwd_state new_state;
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, path, NULL, 1)) {
-		return -1;
-	}
+	virtual_file_ex(&new_state, path, NULL, 1);
 
 	retval = stat(new_state.cwd, buf);
 
 	CWD_STATE_FREE(&new_state);
 	return retval;
 }
+#else
+CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC)
+{
+	cwd_state new_state;
+	int retval;
 
-#if !defined(TSRM_WIN32)
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, path, NULL, 1);
+
+	retval = stat(new_state.cwd, (struct stat*)buf);
+
+	CWD_STATE_FREE(&new_state);
+	return retval;
+}
+#endif
+
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC)
 {
 	cwd_state new_state;
@@ -986,24 +851,13 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 {
 	int command_length;
-	int dir_length, extra = 0;
 	char *command_line;
-	char *ptr, *dir;
+	char *ptr;
 	FILE *retval;
 
 	command_length = strlen(command);
 
-	dir_length = CWDG(cwd).cwd_length;
-	dir = CWDG(cwd).cwd;
-	while (dir_length > 0) {
-		if (*dir == '\'') extra+=3;
-		dir++;
-		dir_length--;
-	}
-	dir_length = CWDG(cwd).cwd_length;
-	dir = CWDG(cwd).cwd;
-
-	ptr = command_line = (char *) malloc(command_length + sizeof("cd '' ; ") + dir_length + extra+1+1);
+	ptr = command_line = (char *) malloc(command_length + sizeof("cd  ; ") + CWDG(cwd).cwd_length+1);
 	if (!command_line) {
 		return NULL;
 	}
@@ -1013,21 +867,8 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 	if (CWDG(cwd).cwd_length == 0) {
 		*ptr++ = DEFAULT_SLASH;
 	} else {
-		*ptr++ = '\'';
-		while (dir_length > 0) {
-			switch (*dir) {
-			case '\'':
-				*ptr++ = '\'';
-				*ptr++ = '\\';
-				*ptr++ = '\'';
-				/* fall-through */
-			default:
-				*ptr++ = *dir;
-			}
-			dir++;
-			dir_length--;
-		}
-		*ptr++ = '\'';
+		memcpy(ptr, CWDG(cwd).cwd, CWDG(cwd).cwd_length);
+		ptr += CWDG(cwd).cwd_length;
 	}
 	
 	*ptr++ = ' ';
@@ -1043,26 +884,6 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 
 #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)
-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
-
-
 
 /*
  * Local variables:

TSRM/tsrm_virtual_cwd.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2004 The PHP Group                                |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
    | that is bundled with this package in the file LICENSE, and is        |
    | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.txt.                                  |
    | If you did not receive a copy of the PHP license and are unable to   |
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
@@ -74,9 +74,10 @@ typedef unsigned short mode_t;
 #define DEFAULT_DIR_SEPARATOR	';'
 #define IS_SLASH(c)	((c) == '/' || (c) == '\\')
 #define IS_SLASH_P(c)	IS_SLASH(*(c))
-/* Colon indicates volume name, either first character should be forward slash or backward slash */
+#define COPY_WHEN_ABSOLUTE(path) \
+    (strchr(path, ':') - path + 1)  /* Take the volume name which ends with a colon */
 #define IS_ABSOLUTE_PATH(path, len) \
-    ((strchr(path, ':') != NULL) || ((len >= 1) && ((path[0] == '/') || (path[0] == '\\'))))
+    (strchr(path, ':') != NULL) /* Colon indicates volume name */
 
 #else
 #ifdef HAVE_DIRENT_H
@@ -140,8 +141,12 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC);
 CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...);
 CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC);
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC);
-#if !defined(TSRM_WIN32)
+#else
+CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC);
+#endif
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC);
 #endif
 CWD_API int virtual_unlink(const char *path TSRMLS_DC);
@@ -166,8 +171,23 @@ 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)
-char *php_realpath_hack(char *src, char *dest);
+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
@@ -175,37 +195,18 @@ CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC);
 #endif
 CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC);
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
-CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int link TSRMLS_DC);
+CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group TSRMLS_DC);
 #endif
 
 CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath);
 
-#define REALPATH_CACHE_TTL  (2*60) /* 2 minutes */
-#define REALPATH_CACHE_SIZE 0      /* disabled while php.ini isn't loaded */
-
-typedef struct _realpath_cache_bucket {
-	unsigned long                  key;
-	char                          *path;
-	int                            path_len;
-	char                          *realpath;
-	int                            realpath_len;
-	time_t                         expires;
-	struct _realpath_cache_bucket *next;	
-} realpath_cache_bucket;
-
 typedef struct _virtual_cwd_globals {
 	cwd_state cwd;
-	long                   realpath_cache_size;
-	long                   realpath_cache_size_limit;
-	long                   realpath_cache_ttl;
-	realpath_cache_bucket *realpath_cache[1024];
 } virtual_cwd_globals;
 
 #ifdef ZTS
-extern ts_rsrc_id cwd_globals_id;
 # define CWDG(v) TSRMG(cwd_globals_id, virtual_cwd_globals *, v)
 #else
-extern virtual_cwd_globals cwd_globals;
 # define CWDG(v) (cwd_globals.v)
 #endif
 
@@ -228,7 +229,7 @@ extern virtual_cwd_globals cwd_globals;
 #define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path TSRMLS_CC)
 #define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
 #define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
-#if !defined(TSRM_WIN32)
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 #define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
 #endif
 #define VCWD_UNLINK(path) virtual_unlink(path TSRMLS_CC)
@@ -242,8 +243,7 @@ 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, 0 TSRMLS_CC)
-#define VCWD_LCHOWN(path, owner, group) virtual_chown(path, owner, group, 1 TSRMLS_CC)
+#define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group TSRMLS_CC)
 #endif
 
 #else
@@ -286,7 +286,6 @@ 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)
-#define VCWD_LCHOWN(path, owner, group) lchown(path, owner, group)
 #endif
 
 #endif

TSRM/tsrm_win32.c

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

TSRM/tsrm_win32.h

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

UPGRADING

@@ -1,548 +0,0 @@
-$Id$
-
-UPGRADE NOTES - PHP 5.1
-
-1. Changes in reference handling
-     a. Overview
-     b. Code that worked under PHP 4.3, but now fails
-     c. Code that was valid under PHP 4.3, but now throws an error
-     d. Code that failed under PHP 4.3, but now works
-     e. Code that 'should have worked' under PHP 5.0
-     f. Warnings that came and went
-2. Reading []
-3. instanceof, is_a(), is_subclass_of(), catch
-4. Integer values in function parameters
-5. Abstract private methods
-6. Access modifiers in interfaces
-7. Changes in inheritance rules
-8. Class constants
-9. Extensions
-     a. Extensions that are gone from the PHP core
-     b. Class constants in new PHP 5.1 extensions
-10. Date/time support
-11. Changes in database support
-     a. PDO overview
-     b. Changes in MySQL support
-     c. Changes in SQLite support
-12. Further migration information
-13. Checking for E_STRICT errors
-
-===============================================================================
-
-1. Changes in reference handling
-================================
-
-1a. Overview
-============
-
->From the PHP script writer's point of view, the change most likely to impact
-legacy code is in the way that references are handled in all PHP versions
-post-dating the PHP 4.4.0 release.
-
-Until and including PHP 4.3, it was possible to send, assign or return variables
-by reference that should really be returned by value, such as a constant, a
-temporary value (e.g. the result of an expression), or the result of a function
-that had itself been returned by value, as here:
-
-<?php
-
-$foo = "123";
-
-function return_value() {
-    global $foo;
-    return $foo;
-}
-
-$bar = &return_value();
-
-?>
-
-Although this code would usually work as expected under PHP 4.3, in the general
-case the result is undefined. The Zend Engine could not act correctly on these
-values as references. This bug could and did lead to various hard-to-reproduce
-memory corruption problems, particularly where the code base was large.
-
-In PHP 4.4.0, PHP 5.0.4 and all subsequent PHP releases, the Engine was fixed
-to 'know' when the reference operation is being used on a value that should
-not be referenced. The actual value is now used in such cases, and a warning
-is emitted. The warning takes the form of an E_NOTICE in PHP 4.4.0 and up,
-and E_STRICT in PHP 5.0.4 and up.
-
-Code that could potentially produce memory corruption can no longer do so.
-However, some legacy code might work differently as a result.
-
-1b. Code that worked under PHP 4.3, but now fails
-=================================================
-
-<?php
-
-function func(&$arraykey) {
-    return $arraykey; // function returns by value!
-}
-
-$array = array('a', 'b', 'c');
-foreach (array_keys($array) as $key) {
-    $y = &func($array[$key]);
-    $z[] =& $y;
-}
-
-var_dump($z);
-
-?>
-Running the above script under any version of PHP that pre-dates the reference
-fix would produce this output:
-
-array(3) {
-  [0]=>
-  &string(1) "a"
-  [1]=>
-  &string(1) "b"
-  [2]=>
-  &string(1) "c"
-}
-
-Following the reference fix, the same code would result in:
-
-array(3) {
-  [0]=>
-  &string(1) "c"
-  [1]=>
-  &string(1) "c"
-  [2]=>
-  &string(1) "c"
-}
-
-This is because, following the changes, func() assigns by value. The value
-of $y is re-assigned, and reference-binding is preserved from $z. Prior
-to the fix, the value was assigned by reference, leading $y to be
-re-bound on each assignment. The attempt to bind to a temporary value
-by reference was the cause of the memory corruption.
-
-Such code can be made to work identically in both the pre-fix and the
-post-fix PHP versions. The signature of func() can be altered to return
-by reference, or the reference assignment can be removed from the result
-of func().
-
-<?php
-
-function func() {
-    return 'function return';
-}
-
-$x = 'original value';
-$y =& $x;
-$y = &func();
-echo $x;
-
-?>
-
-In PHP 4.3 $x would be 'original value', whereas after the changes it would
-be 'function return' - remember that where the function does not return by
-reference, the reference assignment is converted to a regular assignment.
-Again, this can be brought to a common base, either by forcing func() to
-return by reference or by eliminating the by-reference assignment.
-
-1c. Code that was valid under PHP 4.3, but now throws an error
-==============================================================
-
-<?php
-
-class Foo {
-
-    function getThis() {
-        return $this;
-    }
-
-    function destroyThis() {
-        $baz =& $this->getThis();
-    }
-}
-
-$bar = new Foo();
-$bar->destroyThis();
-var_dump($bar);
-
-?>
-
-In PHP 5.0.3, $bar evaluated to NULL instead of returning an object.
-That happened because getThis() returns by value, but the value here
-is assigned by reference. Although it now works in the expected way,
-this is actually invalid code which will throw an E_NOTICE under
-PHP 4.4 or an E_STRICT under PHP 5.0.4 and up.
-
-1d. Code that failed under PHP 4.3, but now works
-=================================================
-
-<?php
-
-function &f() {
-    $x = "foo";
-    var_dump($x);
-    print "$x\n";
-    return($a);
-}
-
-for ($i = 0; $i < 3; $i++) {
-    $h = &f();
-}
-
-?>
-
-In PHP 4.3 the third call to var_dump produces NULL, due to the memory
-corruption caused by returning an uninitialized value by reference.
-This is valid code in PHP 5.0.4 and up, but threw errors in earlier
-releases of PHP.
-
-<?php
-
-$arr = array('a1' => array('alfa' => 'ok'));
-$arr =& $arr['a1'];
-echo '-'.$arr['alfa']."-\n";
-
-?>
-
-Until PHP 5.0.5, it wasn't possible to assign an array element by
-reference in this way. It now is.
-
-1e. Code that 'should have worked' under PHP 5.0
-================================================
-
-There are a couple of instances of bugs reported under PHP 5.0 prior
-to the reference fixes which now 'work'. However, in both cases errors
-are thrown by PHP 5.1, because the code was invalid in the first place.
-Returning values by reference using self:: now works in the general
-case but throws an E_STRICT warning, and although your mileage may
-vary when assigning by reference to an overloaded object, you will
-still see an E_ERROR when you try it, even where the assignment
-itself appears to work.
-
-1f. Warnings that came and went
-===============================
-
-<?php
-
-function & foo() {
-    $var = 'ok';
-    return $var;
-}
-
-function & bar() {
-    return foo();
-}
-
-$a =& bar();
-echo "$a\n";
-
-?>
-
-Nested calls to functions returning by reference are valid code under both
-PHP 4.3 and PHP 5.1, but threw an unwarranted E_NOTICE or E_STRICT under
-the intervening PHP releases.
-
-2. Reading []
-=============
-
-<?php
-
-class XmlTest {
-
-    function test_ref(&$test) {
-        $test = "ok";
-    }
-
-    function test($test) { }
-
-    function run() {
-        $ar = array();
-        $this->test_ref($ar[]);
-        var_dump($ar);
-        $this->test($ar[]);
-    }
-}
-
-$o = new XmlTest();
-$o->run();
-
-?>
-
-This should always have thrown a fatal E_ERROR, because [] cannot be used
-for reading in PHP. It is invalid code in PHP 4.4.2 and PHP 5.0.5 upward.
-
-3. instanceof, is_a(), is_subclass_of(), catch
-==============================================
-
-In PHP 5.0, is_a() was deprecated and replaced by the "instanceof" operator.
-There were some issues with the initial implementation of "instanceof", which
-relied on __autoload() to search for missing classes. If the class was not
-present, "instanceof" would throw a fatal E_ERROR due to the failure of
-__autoload() to discover that class. The same behaviour occurred in the
-"catch" operator and the is_subclass_of() function, for the same reason.
-
-None of these functions or operators call __autoload() in PHP 5.1, and
-the class_exists() workarounds used in code written for PHP 5.0, while
-not problematic in any way, are no longer necessary.
-
-4. Integer values in function parameters
-========================================
-
-With the advent of PHP 5.0, a new parameter parsing API was introduced
-which is used by a large number of PHP functions. In all versions of
-PHP between 5.0 and 5.1, the handling of integer values was very strict
-and would reject non-well formed numeric values when a PHP function
-expected an integer. These checks have now been relaxed to support
-non-well formed numeric strings such as " 123" and "123 ", and will
-no longer fail as they did under PHP 5.0. However, to promote code
-safety and input validation, PHP functions will now emit an E_NOTICE
-when such strings are passed as integers.
-
-5. Abstract private methods
-===========================
-
-Abstract private methods were supported between PHP 5.0.0 and PHP 5.0.4,
-but were then disallowed on the grounds that the behaviours of 'private'
-and 'abstract' are mutually exclusive.
-
-6. Access modifiers in interfaces
-=================================
-
-Under PHP 5.0, function declarations in interfaces were treated in exactly
-the same way as function declarations in classes. This has not been the case
-since October 2004, at which point only the 'public' access modifier was
-allowed in interface function declarations. Since April 2005 - which pre-dates
-the PHP 5.0b1 release - the 'static' modifier has also been allowed. However,
-the 'protected' and 'private' modifiers will now throw an E_ERROR, as will
-'abstract'. Note that this change should not affect your existing code, as
-none of these modifiers makes sense in the context of interfaces anyway.
-
-7. Changes in inheritance rules
-===============================
-
-Under PHP 5.0, it was possible to have a function declaration in a derived class
-that did not match the declaration of the same function in the base class, e.g.
-
-class Base {
-    function &return_by_ref() {
-        $r = 1;
-        return $r;
-    }
-}
-
-class Derived extends Base {
-    function return_by_ref() {
-        return 1;
-    }
-}
-
-This code will cause an E_STRICT error to be emitted under PHP 5.1.
-
-8. Class constants
-==================
-
-Under PHP 5.0, the following code was valid:
-
-<?php
-
-class test {
-    const foobar = 'foo';
-    const foobar = 'bar';
-}
-
-?>
-
-Under PHP 5.1, redefinition of a class constant will throw a fatal E_ERROR.
-
-9. Extensions
-=============
-
-9a. Extensions that are gone from the PHP core
-==============================================
-
-One of the first things you're likely to notice when you download PHP 5.1 is that
-several of the older extensions have disappeared. Those extensions that are still
-actively maintained are available in the PHP Extension Community Library (PECL),
-at http://pecl.php.net. Windows binaries are built regularly, and you can obtain
-the binaries for PECL extensions built against PHP 5.1 from
-http://pecl4win.php.net/list.php/5_1.
-
-Extension           Alternative/status
-=========           ========================
-ext/cpdf            pecl/pdflib
-ext/dbx             pecl/dbx
-ext/dio             pecl/dio
-ext/fam             not actively maintained
-ext/ingres_ii       pecl/ingres
-ext/ircg            not actively maintained
-ext/mcve            pecl/mcve
-ext/mnogosearch     not actively maintained
-ext/oracle          ext/oci8 or ext/pdo_oci
-ext/ovrimos         not actively maintained
-ext/pfpro           not actively maintained
-                    - alternatives at http://pecl.php.net/packages.php?catpid=18&catname=Payment
-ext/w32api          pecl/ffi
-ext/yp              not actively maintained
-sapi/activescript   http://pecl4win.php.net/ext.php/php5activescript.dll (PECL package)
-                    or pecl/activescript (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

Zend/LICENSE

@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                 The Zend Engine License, Version 2.00
-Copyright (c) 1999-2006 Zend Technologies Ltd. All rights reserved.
+Copyright (c) 1999-2003 Zend Technologies Ltd. All rights reserved.
 -------------------------------------------------------------------- 
 
 Redistribution and use in source and binary forms, with or without

Zend/Makefile.am

@@ -15,9 +15,8 @@ libZend_la_SOURCES=\
 	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_iterators.c zend_interfaces.c zend_exceptions.c \
-	zend_strtod.c zend_multibyte.c
+	zend_default_classes.c zend_reflection_api.c \
+	zend_iterators.c zend_interfaces.c zend_exceptions.c
 
 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@

Zend/Makefile.frag

@@ -1 +0,0 @@
-Zend/zend_execute.lo: $(srcdir)/zend_vm_execute.h $(srcdir)/zend_vm_opcodes.h

Zend/README.ZEND_VM

@@ -1,108 +0,0 @@
-ZEND_VM
-=======
-
-ZEND_VM architecture allows specializing opcode handlers according to op_type
-fields and using different execution methods (call threading, switch threading
-and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
-code execution (with specialized executor and direct threading execution
-method). As in most PHP applications raw execution speed isn't the limiting
-factor but system calls and database callls are, your mileage with this patch
-will vary.
-
-Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can
-find opcode handlers and helpers. The typical opcode handler template looks
-like this:
-
-ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>)
-{
-	<HANDLER'S CODE>
-}
-
-<OPCODE-NUMBER> is a opcode number (0, 1, ...)
-<OPCODE> is an opcode name (ZEN_NOP, ZEND_ADD, :)
-<OP1_TYPES> & <OP2_TYPES> are masks for allowed operand op_types. Specializer
-will generate code only for defined combination of types. You can use any 
-combination of the following op_types UNUSED, CONST, VAR, TMP and  CV also
-you can use ANY mask to disable specialization according operand's op_type.
-<HANDLER'S CODE> is a handler's code itself. For most handlers it stills the
-same as in old zend_execute.c, but now it uses macros to access opcode operands
-and some internal executor data.
-
-You can see the conformity of new macros to old code in the following list:
-
-EXECUTE_DATA
-	execute_data
-ZEND_VM_DISPATCH_TO_HANDLER(<OP>)
-	return <OP>_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_DISPATCH_TO_HELPER(<NAME>) 
-	return <NAME>(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>) 
-	return <NAME>(<VAL>, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
-ZEND_VM_CONTINUE()
-	return 0
-ZEND_VM_NEXT_OPCODE()
-	NEXT_OPCODE()
-ZEND_VM_SET_OPCODE(<TARGET>
-	SET_OPCODE(<TARGET>
-ZEND_VM_INC_OPCODE()
-	INC_OPCOD()
-ZEND_VM_RETURN_FROM_EXECUTE_LOOP()
-	RETURN_FROM_EXECUTE_LOOP()
-ZEND_VM_C_LABEL(<LABEL>):
-	<LABEL>:
-ZEND_VM_C_GOTO(<LABEL>)
-	goto <LABEL>
-OP<X>_TYPE
-	opline->op<X>.op_type
-GET_OP<X>_ZVAL_PTR(<TYPE>)
-	get_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
-GET_OP<X>_ZVAL_PTR_PTR(<TYPE>)
-	get_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
-GET_OP<X>_OBJ_ZVAL_PTR(<TYPE>)
-	get_obj_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
-GET_OP<X>_OBJ_ZVAL_PTR_PTR(<TYPE>)
-	get_obj_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
-IS_OP<X>_TMP_FREE()
-	IS_TMP_FREE(free_op<X>)
-FREE_OP<X>()
-	FREE_OP(free_op<X>)
-FREE_OP<X>_IF_VAR()
-	FREE_VAR(free_op<X>)
-FREE_OP<X>_VAR_PTR()
-	FREE_VAR_PTR(free_op<X>)
-
-
-Executor's helpers can be defined without parameters or with one parameter. 
-This is done with the following constructs:
-
-ZEND_VM_HELPER(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>)
-{
-	<HELPER'S CODE>
-}
-
-ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>)
-{
-	<HELPER'S CODE>
-}
-
-Executor's code is generated by PHP script zend_vm_gen.php it uses zend_vm_def.h
-and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and 
-zend_vm_execute.h. The first file is a list of opcode definitions. It is 
-included from zend_compile.h. The second one is an executor code itself. It is
-included from zend_execute.c.
-
-zend_vm_gen.php can produce different kind of executors. You can select 
-different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can 
-disable opcode specialization using --without-specializer. You can include or
-exclude old executor together with specialized one using --without-old-executor.
-At last you can debug executor using original zend_vm_def.h or generated file
-zend_vm_execute.h. Debugging with original file requires --with-lines
-option. By default ZE2 uses the following command to generate executor:
-
-$ php zend_vm_gen.php --with-vm-kind=CALL
-
-Zend Engine II currently includes two executors during the build process, one
-is the specialized version and the other is the old one non-specialized with
-function handlers. By default Zend Engine II uses the specialized one but you
-can switch to the old executor at runtime by calling zend_vm_use_old_executor().
-

Zend/ZEND_CHANGES

@@ -890,47 +890,6 @@ Changes in the Zend Engine 2.0
       the use of all abstract methods declared in the interfaces Iterator
       and IteratorAggregate respectively.
 
-    * Array overloading
-    
-      Objects can be used with Array notation when they implement the 
-      interface ArrayAccess. You cannot use such objects in standard
-      array functions, however you have full control over the array
-      notation. This allows lazy initialization or read only array.
-      
-      Note that setting [] results in a call to offsetSet() with
-      index being NULL. That means that as with standard arrays you 
-      cannot store NULL keys.
-      
-      Example:
-      
-        <?php
-	        class ArrayClass implements ArrayAccess {
-				public $a = array();
-			
-				function offsetExists($index) {
-					return array_key_exists($index, $this->a);
-				}
-				function offsetGet($index) {
-					return $this->a[$index];
-				}
-				function offsetSet($index, $newval) {
-					return $this->a[$index] = $newval;
-				}
-				function offsetUnset($index) {
-					unset($this->a[$index]);
-				}
-			}
-			
-			$obj = new ArrayClass;
-			
-			$obj[0] = 'bla';     // calls offsetSet(0,'bla')
-			$obj[] = 42;         // calls offsetSet(NULL, 42)
-			$x = $obj[0];        // calls offsetGet(0)
-			$b = isset($obj[0]); // calls offsetExists(0)
-			unset($obj[0]);      // calls offsetUnset(0)
-		?>
- 
-
     * __METHOD__
 
       The pseudo constant __METHOD__ shows the current class and method

Zend/Zend.dsp

@@ -7,20 +7,20 @@
 CFG=Zend - Win32 Release_inline
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "Zend.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Release_inline"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -95,7 +95,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
@@ -135,6 +135,10 @@ SOURCE=.\zend_default_classes.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_interfaces.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_dynamic_array.c
 # End Source File
 # Begin Source File
@@ -175,10 +179,6 @@ SOURCE=.\zend_ini_scanner.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_interfaces.c
-# End Source File
-# Begin Source File
-
 SOURCE=".\zend_language_parser.c"
 # End Source File
 # Begin Source File
@@ -227,6 +227,10 @@ SOURCE=.\zend_qsort.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_reflection_api.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_sprintf.c
 # End Source File
 # Begin Source File
@@ -239,10 +243,6 @@ SOURCE=.\zend_stream.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_strtod.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_ts_hash.c
 # End Source File
 # Begin Source File
@@ -291,6 +291,10 @@ SOURCE=.\zend_default_classes.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_interfaces.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_dynamic_array.h
 # End Source File
 # Begin Source File
@@ -347,10 +351,6 @@ SOURCE=.\zend_ini_scanner.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_interfaces.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_istdiostream.h
 # End Source File
 # Begin Source File
@@ -403,6 +403,10 @@ SOURCE=.\zend_qsort.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_reflection_api.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_stack.h
 # End Source File
 # Begin Source File
@@ -411,10 +415,6 @@ SOURCE=.\zend_stream.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_strtod.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_ts_hash.h
 # End Source File
 # Begin Source File
@@ -449,7 +449,7 @@ BuildCmds= \
 
 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -504,7 +504,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # End Group
@@ -533,7 +533,7 @@ InputPath=.\zend_ini_scanner.l
 
 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -570,7 +570,7 @@ InputPath=".\zend_language_scanner.l"
 
 # End Custom Build
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # End Group

Zend/Zend.m4

@@ -4,29 +4,22 @@ dnl
 dnl This file contains Zend specific autoconf functions.
 dnl
 
-AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[
-AC_MSG_CHECKING(for $1)
-AC_TRY_COMPILE([
-#if HAVE_SYS_TYPES_H  
-#include <sys/types.h>
-#endif
-#if HAVE_INTTYPES_H  
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif],
-[if (($1 *) 0)
-  return 0;
-if (sizeof ($1))
-  return 0;
-],[
-  AC_DEFINE_UNQUOTED([HAVE_]translit($1,a-z_-,A-Z__), 1,[Define if $1 type is present. ])
-  AC_MSG_RESULT(yes)
-], AC_MSG_RESULT(no)
-)dnl
+AC_DEFUN(LIBZEND_BISON_CHECK,[
+
+if test "$YACC" != "bison -y"; then
+    AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.)
+else
+    AC_MSG_CHECKING(bison version)
+    set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /' | tr -d 'a-z'`
+    if test "${1}" = "1" -a "${2}" -lt "28"; then
+        AC_MSG_WARN(You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2}).)
+    fi
+    AC_MSG_RESULT(${1}.${2} (ok))
+fi
+
 ])
 
-AC_DEFUN([LIBZEND_BASIC_CHECKS],[
+AC_DEFUN(LIBZEND_BASIC_CHECKS,[
 
 AC_REQUIRE([AC_PROG_YACC])
 AC_REQUIRE([AC_PROG_CC])
@@ -49,8 +42,6 @@ if test "$ac_cv_prog_gcc" = "yes" -a "`uname -s`" = "Rhapsody"; then
 fi
 
 AC_CHECK_HEADERS(
-inttypes.h \
-stdint.h \
 limits.h \
 malloc.h \
 string.h \
@@ -67,12 +58,12 @@ dlfcn.h)
 AC_TYPE_SIZE_T
 AC_TYPE_SIGNAL
 
-AC_DEFUN([LIBZEND_LIBDL_CHECKS],[
+AC_DEFUN(LIBZEND_LIBDL_CHECKS,[
 AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
 AC_CHECK_FUNC(dlopen,[AC_DEFINE(HAVE_LIBDL, 1,[ ])])
 ])
 
-AC_DEFUN([LIBZEND_DLSYM_CHECK],[
+AC_DEFUN(LIBZEND_DLSYM_CHECK,[
 dnl
 dnl Ugly hack to check if dlsym() requires a leading underscore in symbol name.
 dnl
@@ -91,10 +82,6 @@ dnl This is required for QNX and may be some BSD derived systems
 AC_CHECK_TYPE( uint, unsigned int )
 AC_CHECK_TYPE( ulong, unsigned long )
 
-dnl Check if int32_t and uint32_t are defined
-LIBZEND_CHECK_INT_TYPE(int32_t)
-LIBZEND_CHECK_INT_TYPE(uint32_t)
-
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_FUNC_MEMCMP
@@ -108,7 +95,7 @@ ZEND_FP_EXCEPT
 	
 ])
 
-AC_DEFUN([LIBZEND_ENABLE_DEBUG],[
+AC_DEFUN(LIBZEND_ENABLE_DEBUG,[
 
 AC_ARG_ENABLE(debug,
 [  --enable-debug          Compile with debugging symbols],[
@@ -119,27 +106,10 @@ AC_ARG_ENABLE(debug,
 
 ])
 
-AC_DEFUN([LIBZEND_OTHER_CHECKS],[
-
-AC_ARG_WITH(zend-vm,
-[  --with-zend-vm=TYPE     Set virtual machine dispatch method. Type is
-                          one of "CALL", "SWITCH" or "GOTO" [TYPE=CALL]],[
-  PHP_ZEND_VM=$withval
-],[
-  PHP_ZEND_VM=CALL
-])
-
-AC_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_DEFUN(LIBZEND_OTHER_CHECKS,[
 
 AC_ARG_ENABLE(maintainer-zts,
-[  --enable-maintainer-zts Enable thread safety - for code maintainers only!!],[
+[  --enable-maintainer-zts Enable thread safety - for code maintainers only],[
   ZEND_MAINTAINER_ZTS=$enableval
 ],[
   ZEND_MAINTAINER_ZTS=no
@@ -147,32 +117,26 @@ AC_ARG_ENABLE(maintainer-zts,
 
 AC_ARG_ENABLE(inline-optimization,
 [  --disable-inline-optimization 
-                          If building zend_execute.lo fails, try this switch],[
+                          If building zend_execute.lo fails, try this switch.],[
   ZEND_INLINE_OPTIMIZATION=$enableval
 ],[
   ZEND_INLINE_OPTIMIZATION=yes
 ])
 
 AC_ARG_ENABLE(memory-limit,
-[  --enable-memory-limit   Compile with memory limit support], [
+[  --enable-memory-limit   Compile with memory limit support. ], [
   ZEND_MEMORY_LIMIT=$enableval
 ],[
   ZEND_MEMORY_LIMIT=no
 ])
 
 AC_ARG_ENABLE(zend-multibyte,
-[  --enable-zend-multibyte Compile with zend multibyte support], [
+[  --enable-zend-multibyte Compile with zend multibyte support. ], [
   ZEND_MULTIBYTE=$enableval
 ],[
   ZEND_MULTIBYTE=no
 ])
 
-AC_MSG_CHECKING([virtual machine dispatch method])
-AC_MSG_RESULT($PHP_ZEND_VM)
-
-AC_MSG_CHECKING(whether to enable 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)
 
@@ -188,19 +152,6 @@ AC_MSG_RESULT($ZEND_DEBUG)
 AC_MSG_CHECKING(whether to enable Zend multibyte)
 AC_MSG_RESULT($ZEND_MULTIBYTE)
 	
-case $PHP_ZEND_VM in
-  SWITCH)
-    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method])
-    ;;
-  GOTO)
-    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_GOTO,[virtual machine dispatch method])
-    ;;
-  *)
-    PHP_ZEND_VM=CALL
-    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_CALL,[virtual machine dispatch method])
-    ;;
-esac
-
 if test "$ZEND_DEBUG" = "yes"; then
   AC_DEFINE(ZEND_DEBUG,1,[ ])
   echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
@@ -216,12 +167,6 @@ 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"
@@ -250,13 +195,6 @@ AC_C_INLINE
 
 AC_SUBST(INLINE_CFLAGS)
 
-AC_MSG_CHECKING(target system is Darwin)
-if echo "$target" | grep "darwin" > /dev/null; then
-  AC_DEFINE([DARWIN], 1, [Define if the target system is darwin])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
 
 dnl test and set the alignment define for ZEND_MM
 dnl this also does the logarithmic test for ZEND_MM.
@@ -299,9 +237,6 @@ int main()
   LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
   AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ])
   AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ]) 
-], [], [
-  dnl cross-compile needs something here
-  LIBZEND_MM_ALIGN=8
 ])
 
 AC_MSG_RESULT(done)
@@ -309,7 +244,7 @@ AC_MSG_RESULT(done)
 ])
 
 
-AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
+AC_DEFUN(LIBZEND_CPLUSPLUS_CHECKS,[
 
 ])
 

Zend/ZendTS.dsp

@@ -260,6 +260,10 @@ SOURCE=.\zend_qsort.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_reflection_api.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_sprintf.c
 # End Source File
 # Begin Source File
@@ -272,10 +276,6 @@ SOURCE=.\zend_stream.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_strtod.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_ts_hash.c
 # End Source File
 # Begin Source File
@@ -440,6 +440,10 @@ SOURCE=.\zend_qsort.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_reflection_api.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_stack.h
 # End Source File
 # Begin Source File
@@ -448,10 +452,6 @@ SOURCE=.\zend_stream.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_strtod.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_ts_hash.h
 # End Source File
 # Begin Source File

Zend/acconfig.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2006 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2004 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -23,7 +23,9 @@
 #define ZEND_DLEXPORT
 #define ZEND_DLIMPORT
 
+#ifndef NETWARE
 @TOP@
+#endif
 
 #undef uint
 #undef ulong
@@ -31,7 +33,9 @@
 /* Define if you want to enable memory limit support */
 #define MEMORY_LIMIT 0
 
+#ifndef NETWARE
 @BOTTOM@
+#endif
 
 #ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
 
@@ -43,10 +47,6 @@
 # include <sys/types.h>
 #endif
 
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
 #ifdef HAVE_IEEEFP_H
 # include <ieeefp.h>
 #endif
@@ -65,13 +65,6 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 #include <math.h>
 
-/* To enable the is_nan, is_infinite and is_finite PHP functions */
-#ifdef NETWARE
-	#define HAVE_ISNAN 1
-	#define HAVE_ISINF 1
-	#define HAVE_ISFINITE 1
-#endif
-
 #ifndef zend_isnan
 #ifdef HAVE_ISNAN
 #define zend_isnan(a) isnan(a)
@@ -105,13 +98,6 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 #endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
 
-#ifdef NETWARE
-#ifdef USE_WINSOCK
-#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
-#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
-#endif
-#endif
-
 /*
  * Local variables:
  * tab-width: 4

Zend/acinclude.m4

@@ -2,40 +2,7 @@ dnl $Id$
 dnl
 dnl This file contains local autoconf functions.
 
-AC_DEFUN([LIBZEND_BISON_CHECK],[
-  # we only support certain bison versions
-  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1"
-
-  # for standalone build of Zend Engine
-  test -z "$SED" && SED=sed
-
-  bison_version=none
-  if test "$YACC"; then
-    AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-      bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
-      php_cv_bison_version=invalid
-      if test -n "$bison_version_vars"; then
-        set $bison_version_vars
-        bison_version="${1}.${2}"
-        for bison_check_version in $bison_version_list; do
-          if test "$bison_version" = "$bison_check_version"; then
-            php_cv_bison_version="$bison_check_version (ok)"
-            break
-          fi
-        done
-      fi
-    ])
-  fi
-  case $php_cv_bison_version in
-    ""|invalid[)]
-      bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)."
-      AC_MSG_WARN([$bison_msg])
-      YACC="exit 0;"
-      ;;
-  esac
-])
-
-AC_DEFUN([ZEND_FP_EXCEPT],[
+AC_DEFUN(ZEND_FP_EXCEPT,[
   AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
     AC_TRY_COMPILE([
 #include <floatingpoint.h>
@@ -56,7 +23,7 @@ fp_except x = (fp_except) 0;
 dnl
 dnl Check for broken sprintf()
 dnl
-AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
+AC_DEFUN(AC_ZEND_BROKEN_SPRINTF,[
   AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
     AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
       ac_cv_broken_sprintf=no
@@ -74,34 +41,7 @@ AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
   AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken])
 ])
 
-dnl
-dnl AC_ZEND_C_BIGENDIAN
-dnl Replacement macro for AC_C_BIGENDIAN
-dnl
-AC_DEFUN([AC_ZEND_C_BIGENDIAN],
-[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian_php,
- [
-  ac_cv_c_bigendian_php=unknown
-  AC_TRY_RUN(
-  [
-int main(void)
-{
-        short one = 1;
-        char *cp = (char *)&one;
-
-        if (*cp == 0) {
-                return(0);
-        } else {
-                return(1);
-        }
-}
-  ], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown])
- ])
- if test $ac_cv_c_bigendian_php = yes; then
-   AC_DEFINE(WORDS_BIGENDIAN, [], [Define if processor uses big-endian word])
- fi
-])
-
-AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
+AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
   LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
+

Zend/bench.php

@@ -1,419 +0,0 @@
-<?php
-
-function simple() {
-  $a = 0;
-  for ($i = 0; $i < 1000000; $i++) 
-    $a++;
-
-  $thisisanotherlongname = 0;
-  for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++) 
-    $thisisanotherlongname++;
-}
-
-/****/
-
-function simplecall() {
-  for ($i = 0; $i < 1000000; $i++) 
-    strlen("hallo");
-}
-
-/****/
-
-function hallo($a) {
-}
-
-function simpleucall() {
-  for ($i = 0; $i < 1000000; $i++) 
-    hallo("hallo");
-}
-
-/****/
-
-function simpleudcall() {
-  for ($i = 0; $i < 1000000; $i++) 
-    hallo2("hallo");
-}
-
-function hallo2($a) {
-}
-
-/****/
-
-function mandel() {
-  $w1=50;
-  $h1=150;
-  $recen=-.45;
-  $imcen=0.0;
-  $r=0.7;
-  $s=0;  $rec=0;  $imc=0;  $re=0;  $im=0;  $re2=0;  $im2=0;
-  $x=0;  $y=0;  $w2=0;  $h2=0;  $color=0;
-  $s=2*$r/$w1;
-  $w2=40;
-  $h2=12;
-  for ($y=0 ; $y<=$w1; $y=$y+1) {
-    $imc=$s*($y-$h2)+$imcen;
-    for ($x=0 ; $x<=$h1; $x=$x+1) {
-      $rec=$s*($x-$w2)+$recen;
-      $re=$rec;
-      $im=$imc;
-      $color=1000;
-      $re2=$re*$re;
-      $im2=$im*$im;
-      while( ((($re2+$im2)<1000000) && $color>0)) {
-        $im=$re*$im*2+$imc;
-        $re=$re2-$im2+$rec;
-        $re2=$re*$re;
-        $im2=$im*$im;
-        $color=$color-1;
-      }
-      if ( $color==0 ) {
-        print "_";
-      } else {
-        print "#";
-      }
-    }
-    print "<br>";
-    flush();
-  }
-}
-
-/****/
-
-function mandel2() {
-  $b = " .:,;!/>)|&IH%*#";
-  //float r, i, z, Z, t, c, C;
-  for ($y=30; printf("\n"), $C = $y*0.1 - 1.5, $y--;){
-    for ($x=0; $c = $x*0.04 - 2, $z=0, $Z=0, $x++ < 75;){
-      for ($r=$c, $i=$C, $k=0; $t = $z*$z - $Z*$Z + $r, $Z = 2*$z*$Z + $i, $z=$t, $k<5000; $k++)
-        if ($z*$z + $Z*$Z > 500000) break;
-      echo $b[$k%16];
-    }
-  }
-}
-
-/****/
-
-function Ack($m, $n){
-  if($m == 0) return $n+1;
-  if($n == 0) return Ack($m-1, 1);
-  return Ack($m - 1, Ack($m, ($n - 1)));
-}
-
-function ackermann($n) {
-  $r = Ack(3,$n);
-  print "Ack(3,$n): $r\n";
-}
-
-/****/
-
-function ary($n) {
-  for ($i=0; $i<$n; $i++) {
-    $X[$i] = $i;
-  }
-  for ($i=$n-1; $i>=0; $i--) {
-    $Y[$i] = $X[$i];
-  }
-  $last = $n-1;
-  print "$Y[$last]\n";
-}
-
-/****/
-
-function ary2($n) {
-  for ($i=0; $i<$n;) {
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-  }
-  for ($i=$n-1; $i>=0;) {
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-  }
-  $last = $n-1;
-  print "$Y[$last]\n";
-}
-
-/****/
-
-function ary3($n) {
-  for ($i=0; $i<$n; $i++) {
-    $X[$i] = $i + 1;
-    $Y[$i] = 0;
-  }
-  for ($k=0; $k<1000; $k++) {
-    for ($i=$n-1; $i>=0; $i--) {
-      $Y[$i] += $X[$i];
-    }
-  }
-  $last = $n-1;
-  print "$Y[0] $Y[$last]\n";
-}
-
-/****/
-
-function fibo_r($n){
-    return(($n < 2) ? 1 : fibo_r($n - 2) + fibo_r($n - 1));
-}
-
-function fibo($n) {
-  $r = fibo_r($n);
-  print "$r\n";
-}
-
-/****/
-
-function hash1($n) {
-  for ($i = 1; $i <= $n; $i++) {
-    $X[dechex($i)] = $i;
-  }
-  $c = 0;
-  for ($i = $n; $i > 0; $i--) {
-    if ($X[dechex($i)]) { $c++; }
-  }
-  print "$c\n";
-}
-
-/****/
-
-function hash2($n) {
-  for ($i = 0; $i < $n; $i++) {
-    $hash1["foo_$i"] = $i;
-    $hash2["foo_$i"] = 0;
-  }
-  for ($i = $n; $i > 0; $i--) {
-    foreach($hash1 as $key => $value) $hash2[$key] += $value;
-  }
-  $first = "foo_0";
-  $last  = "foo_".($n-1);
-  print "$hash1[$first] $hash1[$last] $hash2[$first] $hash2[$last]\n";
-}
-
-/****/
-
-function gen_random ($n) {
-    global $LAST;
-    return( ($n * ($LAST = ($LAST * IA + IC) % IM)) / IM );
-}
-
-function heapsort_r($n, &$ra) {
-    $l = ($n >> 1) + 1;
-    $ir = $n;
-
-    while (1) {
-	if ($l > 1) {
-	    $rra = $ra[--$l];
-	} else {
-	    $rra = $ra[$ir];
-	    $ra[$ir] = $ra[1];
-	    if (--$ir == 1) {
-		$ra[1] = $rra;
-		return;
-	    }
-	}
-	$i = $l;
-	$j = $l << 1;
-	while ($j <= $ir) {
-	    if (($j < $ir) && ($ra[$j] < $ra[$j+1])) {
-		$j++;
-	    }
-	    if ($rra < $ra[$j]) {
-		$ra[$i] = $ra[$j];
-		$j += ($i = $j);
-	    } else {
-		$j = $ir + 1;
-	    }
-	}
-	$ra[$i] = $rra;
-    }
-}
-
-function heapsort($N) {
-  global $LAST;
-
-  define("IM", 139968);
-  define("IA", 3877);
-  define("IC", 29573);
-
-  $LAST = 42;
-  for ($i=1; $i<=$N; $i++) {
-    $ary[$i] = gen_random(1);
-  }
-  heapsort_r($N, $ary);
-  printf("%.10f\n", $ary[$N]);
-}
-
-/****/
-
-function mkmatrix ($rows, $cols) {
-    $count = 1;
-    $mx = array();
-    for ($i=0; $i<$rows; $i++) {
-	for ($j=0; $j<$cols; $j++) {
-	    $mx[$i][$j] = $count++;
-	}
-    }
-    return($mx);
-}
-
-function mmult ($rows, $cols, $m1, $m2) {
-    $m3 = array();
-    for ($i=0; $i<$rows; $i++) {
-	for ($j=0; $j<$cols; $j++) {
-	    $x = 0;
-	    for ($k=0; $k<$cols; $k++) {
-		$x += $m1[$i][$k] * $m2[$k][$j];
-	    }
-	    $m3[$i][$j] = $x;
-	}
-    }
-    return($m3);
-}
-
-function matrix($n) {
-  $SIZE = 30;
-  $m1 = mkmatrix($SIZE, $SIZE);
-  $m2 = mkmatrix($SIZE, $SIZE);
-  while ($n--) {
-    $mm = mmult($SIZE, $SIZE, $m1, $m2);
-  }
-  print "{$mm[0][0]} {$mm[2][3]} {$mm[3][2]} {$mm[4][4]}\n";
-}
-
-/****/
-
-function nestedloop($n) {
-  $x = 0;
-  for ($a=0; $a<$n; $a++)
-    for ($b=0; $b<$n; $b++)
-      for ($c=0; $c<$n; $c++)
-        for ($d=0; $d<$n; $d++)
-          for ($e=0; $e<$n; $e++)
-            for ($f=0; $f<$n; $f++)
-             $x++;
-  print "$x\n";
-}
-
-/****/
-
-function sieve($n) {
-  $count = 0;
-  while ($n-- > 0) {
-    $count = 0;
-    $flags = range (0,8192);
-    for ($i=2; $i<8193; $i++) {
-      if ($flags[$i] > 0) {
-        for ($k=$i+$i; $k <= 8192; $k+=$i) {
-          $flags[$k] = 0;
-        }
-        $count++;
-      }
-    }
-  }
-  print "Count: $count\n";
-}
-
-/****/
-
-function strcat($n) {
-  $str = "";
-  while ($n-- > 0) {
-    $str .= "hello\n";
-  }
-  $len = strlen($str);
-  print "$len\n";
-}
-
-/*****/
-
-function getmicrotime()
-{
-  $t = gettimeofday();
-  return ($t['sec'] + $t['usec'] / 1000000);
-}
-
-function start_test()
-{
-	ob_start();
-  return getmicrotime();
-}
-
-function end_test($start, $name)
-{
-  global $total;
-  $end = getmicrotime();
-  ob_end_clean();
-  $total += $end-$start;
-  $num = number_format($end-$start,3);
-  $pad = str_repeat(" ", 24-strlen($name)-strlen($num));
-
-  echo $name.$pad.$num."\n";
-	ob_start();
-  return getmicrotime();
-}
-
-function total()
-{
-  global $total;
-  $pad = str_repeat("-", 24);
-  echo $pad."\n";
-  $num = number_format($total,3);
-  $pad = str_repeat(" ", 24-strlen("Total")-strlen($num));
-  echo "Total".$pad.$num."\n";
-}
-
-$t0 = $t = start_test();
-simple();
-$t = end_test($t, "simple");
-simplecall();
-$t = end_test($t, "simplecall");
-simpleucall();
-$t = end_test($t, "simpleucall");
-simpleudcall();
-$t = end_test($t, "simpleudcall");
-mandel();
-$t = end_test($t, "mandel");
-mandel2();
-$t = end_test($t, "mandel2");
-ackermann(7);
-$t = end_test($t, "ackermann(7)");
-ary(50000);
-$t = end_test($t, "ary(50000)");
-ary2(50000);
-$t = end_test($t, "ary2(50000)");
-ary3(2000);
-$t = end_test($t, "ary3(2000)");
-fibo(30);
-$t = end_test($t, "fibo(30)");
-hash1(50000);
-$t = end_test($t, "hash1(50000)");
-hash2(500);
-$t = end_test($t, "hash2(500)");
-heapsort(20000);
-$t = end_test($t, "heapsort(20000)");
-matrix(20);
-$t = end_test($t, "matrix(20)");
-nestedloop(12);
-$t = end_test($t, "nestedloop(12)");
-sieve(30);
-$t = end_test($t, "sieve(30)");
-strcat(200000);
-$t = end_test($t, "strcat(200000)");
-total($t0, "Total");
-?>

Zend/configure.in

@@ -10,14 +10,10 @@ AC_PROG_CC
 AM_PROG_LEX
 AM_PROG_CC_STDC
 ZEND_VERSION=$VERSION
-AC_ZEND_C_BIGENDIAN
 
 dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1
 
-AC_CHECK_SIZEOF(long, 8)
-AC_CHECK_SIZEOF(int, 4)
-
 sinclude(Zend.m4)
 
 LIBZEND_BASIC_CHECKS

Zend/header

@@ -1,19 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2006 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors:                                                             |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */

Zend/tests/array_type_hint_001.phpt

@@ -1,15 +0,0 @@
---TEST--
-Array type hint
---FILE--
-<?php
-function foo(array $a) {
-	echo count($a)."\n";
-}
-
-foo(array(1,2,3));
-foo(123);
-?>
---EXPECTF--
-3
-
-Fatal error: Argument 1 passed to foo() 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

Zend/tests/bug21888.phpt

@@ -34,3 +34,6 @@ $c->viewMom();
 --EXPECT--
 protected method
 protected property
+--EXPECT--
+protected method
+protected property

Zend/tests/bug22836.phpt

@@ -18,17 +18,57 @@ for ($i = 0; $i < 8; $i++) {
 --EXPECTF--
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
+string(3) "foo"
+'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Strict Standards: Only variable references should be returned by reference in %s on line %d
+
+

Zend/tests/bug24884.phpt

@@ -8,7 +8,7 @@ class Test {
     function __copy()
     {
         $string = PHP_VERSION;
-        $version = $string[0];
+        $version = $string{0};
         if($string < 5)
         {
             return $this;

Zend/tests/bug26077.phpt

@@ -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();

Zend/tests/bug26229.phpt

@@ -11,19 +11,11 @@ class array_iterator implements IteratorAggregate {
 
 $obj = new array_iterator;
 
-try
-{
-	foreach ($obj as $property => $value)
-	{
-		var_dump($value);
-	}
-}
-catch(Exception $e)
-{
-	echo $e->getMessage() . "\n";
+foreach ($obj as $property => $value) {
+        var_dump($value);
 }
 ?>
 ===DONE===
 --EXPECTF--
-Objects returned by array_iterator::getIterator() must be traversable or implement interface Iterator
-===DONE===
+Warning: Objects returned by array_iterator::getIterator() must be traversable or implement interface Iterator in %sbug26229.php on line %d
+===DONE===

Zend/tests/bug26281.phpt

@@ -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;

Zend/tests/bug26801.phpt

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

Zend/tests/bug27145.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug #27145 (Errors messages print unmangled PPP property names)
+--FILE--
+<?php
+class a {
+	protected static $v = "aa";
+}
+class b extends a {
+	protected static $v = "bb";
+}
+?>
+--EXPECTF--
+Fatal error: Cannot redeclare property static protected a::$v in class b in %s on line %d

Zend/tests/bug27268.phpt

@@ -1,28 +0,0 @@
---TEST--
-Bug #27268 (Bad references accentuated by clone)
---FILE--
-<?php
-class A
-{
-    public function &getA()
-    {
-        return $this->a;
-    }
-}
-
-$A = new A;
-$A->a = array(1);
-$x = $A->getA();
-$clone = clone $A;
-$clone->a = array();
-print_r($A);
-?>
---EXPECT--
-A Object
-(
-    [a] => Array
-        (
-            [0] => 1
-        )
-
-)

Zend/tests/bug27304.phpt

@@ -1,23 +0,0 @@
---TEST--
-Bug #27304
---FILE--
-<?php
-
-class Staticexample
-{
-	static function test()
-	{
-		var_dump(isset($this));
-	}
-}
-
-$b = new Staticexample();
-Staticexample::test();
-$b->test();
-        
-?>
-===DONE===
---EXPECT--
-bool(false)
-bool(false)
-===DONE===

Zend/tests/bug27598.phpt

@@ -1,12 +0,0 @@
---TEST--
-Bug #27598 (list() array key assignment causes HUGE memory leak)
---FILE--
-<?php
-list($out[0]) = array(1);
-var_dump($out);
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  int(1)
-}

Zend/tests/bug27641.phpt

@@ -2,8 +2,6 @@
 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 {

Zend/tests/bug27669.phpt

@@ -1,18 +0,0 @@
---TEST--
-Bug #27669 (PHP 5 didn't support all possibilities for calling static methods dynamically)
---FILE--
-<?php
-	error_reporting(E_ALL & !E_STRICT);
-
-	class A {
-		function hello() {
-			echo "Hello World\n";
-		}
-	}
-	$y[0] = 'hello';
-	A::$y[0]();
-?>
-===DONE===
---EXPECTF--
-Hello World
-===DONE===

Zend/tests/bug27798.phpt

@@ -1,72 +0,0 @@
---TEST--
-Bug #27798 (private / protected variables not exposed by get_object_vars() inside class)
---FILE--
-<?php
-
-class Base
-{
-	public    $Foo = 1;
-	protected $Bar = 2;
-	private   $Baz = 3;
-	
-	function __construct()
-	{
-		echo __METHOD__ . "\n";
-		var_dump(get_object_vars($this));
-	}
-}
-
-class Child extends Base
-{
-	private   $Baz = 4;
-
-	function __construct()
-	{
-		parent::__construct();
-		echo __METHOD__ . "\n";
-		var_dump(get_object_vars($this));
-	}
-}
-
-var_dump(get_object_vars(new Base));
-var_dump(get_object_vars(new Child));
-
-?>
-===DONE===
---EXPECT--
-Base::__construct
-array(3) {
-  ["Foo"]=>
-  int(1)
-  ["Bar"]=>
-  int(2)
-  ["Baz"]=>
-  int(3)
-}
-array(1) {
-  ["Foo"]=>
-  int(1)
-}
-Base::__construct
-array(3) {
-  ["Baz"]=>
-  int(4)
-  ["Foo"]=>
-  int(1)
-  ["Bar"]=>
-  int(2)
-}
-Child::__construct
-array(3) {
-  ["Baz"]=>
-  int(4)
-  ["Foo"]=>
-  int(1)
-  ["Bar"]=>
-  int(2)
-}
-array(1) {
-  ["Foo"]=>
-  int(1)
-}
-===DONE===

Zend/tests/bug28072.phpt

@@ -1,46 +0,0 @@
---TEST--
-Bug #28072 (static array with some constant keys will be incorrectly ordered)
---FILE--
-<?php
-define("FIRST_KEY", "a");
-define("THIRD_KEY", "c");
-                                                                        
-                 
-function test()
-{
-        static $arr = array(
-                FIRST_KEY => "111",
-                "b" => "222",
-                THIRD_KEY => "333",
-                "d" => "444"
-        );
-        print_r($arr);
-}
-                                                                        
-function test2()
-{
-        static $arr = array(
-                FIRST_KEY => "111",
-                "a" => "222",
-                "c" => "333",
-                THIRD_KEY => "444"
-        );
-        print_r($arr);
-}
-                 
-test();
-test2();
-?>
---EXPECT--
-Array
-(
-    [a] => 111
-    [b] => 222
-    [c] => 333
-    [d] => 444
-)
-Array
-(
-    [a] => 111
-    [c] => 444
-)

Zend/tests/bug28377.phpt

@@ -1,23 +0,0 @@
---TEST--
-Bug #28377 (debug_backtrace is intermittently passing args)
---FILE--
-<?php
-function doit($a, $b)
-{
-  $trace = debug_backtrace();
-  custom_callback('dereferenced', $trace);
-  custom_callback('direct', debug_backtrace());
-}
-  
-function custom_callback($traceName, $btInfo)
-{
-  echo $traceName ." -- args: ";
-  echo isset($btInfo[0]['args']) ? count($btInfo[0]['args']) : 'does not exist';
-  echo "\n";
-}
-  
-doit('a','b');
-?>
---EXPECT--
-dereferenced -- args: 2
-direct -- args: 2

Zend/tests/bug28442.phpt

@@ -1,65 +0,0 @@
---TEST--
-Bug #28442 (Changing a static variables in a class changes it across sub/super classes.)
---FILE--
-<?php
-
-class ClassA
-{
-   static $prop;
-}
-
-class ClassB extends ClassA
-{
-   static $prop;
-}
-
-class ClassC extends ClassB
-{
-}
-
-echo "===INIT===\n";
-ClassA::$prop = 'A';
-ClassB::$prop = 'B';
-ClassC::$prop = 'C';
-var_dump(ClassA::$prop);
-var_dump(ClassB::$prop);
-var_dump(ClassC::$prop);
-
-echo "===SetA===\n";
-ClassA::$prop = 'A2';
-var_dump(ClassA::$prop);
-var_dump(ClassB::$prop);
-var_dump(ClassC::$prop);
-
-echo "===SetB===\n";
-ClassB::$prop = 'B2';
-var_dump(ClassA::$prop);
-var_dump(ClassB::$prop);
-var_dump(ClassC::$prop);
-
-echo "===SetC===\n";
-ClassC::$prop = 'C2';
-var_dump(ClassA::$prop);
-var_dump(ClassB::$prop);
-var_dump(ClassC::$prop);
-
-?>
-===DONE===
---EXPECTF--
-===INIT===
-string(1) "A"
-string(1) "C"
-string(1) "C"
-===SetA===
-string(2) "A2"
-string(1) "C"
-string(1) "C"
-===SetB===
-string(2) "A2"
-string(2) "B2"
-string(2) "B2"
-===SetC===
-string(2) "A2"
-string(2) "C2"
-string(2) "C2"
-===DONE===

Zend/tests/bug28444.phpt

@@ -1,74 +0,0 @@
---TEST--
-Bug #28444 (Cannot access undefined property for object with overloaded property access)
---FILE--
-<?php
-
-class Object
-{
-	public $x;
-
-	function __construct($x)
-	{
-		$this->x = $x;
-	}
-}
-
-class Overloaded
-{
-	public $props = array();
-	public $x;
-
-	function __construct($x)
-	{
-		$this->x = new Object($x);
-	}
-
-	function __get($prop)
-	{
-		echo __METHOD__ . "($prop)\n";
-		return $this->props[$prop];
-	}
-
-	function __set($prop, $val)
-	{
-		echo __METHOD__ . "($prop,$val)\n";
-		$this->props[$prop] = $val;
-	}
-}
-$y = new Overloaded(2);
-var_dump($y->x);
-var_dump($y->x->x);
-var_dump($y->x->x = 3);
-var_dump($y->y = 3);
-var_dump($y->y);
-var_dump($y->z = new Object(4));
-var_dump($y->z->x);
-$t = $y->z;
-var_dump($t->x = 5);
-var_dump($y->z->x = 6);
-
-?>
-===DONE===
---EXPECTF--
-object(Object)#%d (1) {
-  ["x"]=>
-  int(2)
-}
-int(2)
-int(3)
-Overloaded::__set(y,3)
-int(3)
-Overloaded::__get(y)
-int(3)
-Overloaded::__set(z,Object id #3)
-object(Object)#%d (1) {
-  ["x"]=>
-  int(4)
-}
-Overloaded::__get(z)
-int(4)
-Overloaded::__get(z)
-int(5)
-Overloaded::__get(z)
-int(6)
-===DONE===

Zend/tests/bug29015.phpt

@@ -1,11 +0,0 @@
---TEST--
-Bug #29015 (Incorrect behavior of member vars(non string ones)-numeric mem vars und others)
---FILE--
-<?php
-$a = new stdClass();
-$x = "";
-$a->$x = "string('')";
-var_dump($a);
-?>
---EXPECTF--
-Fatal error: Cannot access empty property in %sbug29015.php on line 4

Zend/tests/bug29104.phpt

@@ -1,27 +0,0 @@
---TEST--
-Bug #29104 Function declaration in method doesn't work 
---FILE--
-<?php
-class A
-{ 
-  function g() 
-  { 
-    echo "function g - begin\n";
-    
-    function f() 
-    { 
-      echo "function f\n";
-    } 
-
-    echo "function g - end\n";
-  }
-}
-
-$a = new A;
-$a->g();
-f();
-?>
---EXPECT--
-function g - begin
-function g - end
-function f

Zend/tests/bug29210.phpt

@@ -1,104 +0,0 @@
---TEST--
-Bug #29210 Function: is_callable - no support for private and protected classes 
---FILE--
-<?php
-class test_class {
-   private function test_func1() {
-   	 echo "test_func1\n";
-   }
-   protected function test_func2() {
-   	 echo "test_func2\n";
-   }
-   static private function test_func3() {
-   	 echo "test_func3\n";
-   }
-   static protected function test_func4() {
-   	 echo "test_func4\n";
-   }
-   function test() {
-     if (is_callable(array($this,'test_func1'))) {
-	     $this->test_func1();
-     } else {
-       echo "test_func1 isn't callable from inside\n";
-     }
-     if (is_callable(array($this,'test_func2'))) {
-	     $this->test_func2();
-     } else {
-       echo "test_func2 isn't callable from inside\n";
-     }
-     if (is_callable(array('test_class','test_func3'))) {
-	     test_class::test_func3();
-     } else {
-       echo "test_func3 isn't callable from inside\n";
-     }
-     if (is_callable(array('test_class','test_func4'))) {
-	     test_class::test_func4();
-     } else {
-       echo "test_func4 isn't callable from inside\n";
-     }
-   }
-}
-
-class foo extends test_class {
-   function test() {
-     if (is_callable(array($this,'test_func1'))) {
-	     $this->test_func1();
-     } else {
-       echo "test_func1 isn't callable from child\n";
-     }
-     if (is_callable(array($this,'test_func2'))) {
-	     $this->test_func2();
-     } else {
-       echo "test_func2 isn't callable from child\n";
-     }
-     if (is_callable(array('test_class','test_func3'))) {
-	     test_class::test_func3();
-     } else {
-       echo "test_func3 isn't callable from child\n";
-     }
-     if (is_callable(array('test_class','test_func4'))) {
-	     test_class::test_func4();
-     } else {
-       echo "test_func4 isn't callable from child\n";
-     }
-   }
-}
-
-$object = new test_class;
-$object->test();
-if (is_callable(array($object,'test_func1'))) {
-	$object->test_func1();
-} else {
-  echo "test_func1 isn't callable from outside\n";
-}
-if (is_callable(array($object,'test_func2'))) {
-	$object->test_func2();
-} else {
-  echo "test_func2 isn't callable from outside\n";
-}
-if (is_callable(array('test_class','test_func3'))) {
-  test_class::test_func3();
-} else {
-  echo "test_func3 isn't callable from outside\n";
-}
-if (is_callable(array('test_class','test_func4'))) {
-  test_class::test_func4();
-} else {
-  echo "test_func4 isn't callable from outside\n";
-}
-$object = new foo();
-$object->test();
-?>
---EXPECTF--
-test_func1
-test_func2
-test_func3
-test_func4
-test_func1 isn't callable from outside
-test_func2 isn't callable from outside
-test_func3 isn't callable from outside
-test_func4 isn't callable from outside
-test_func1 isn't callable from child
-test_func2
-test_func3 isn't callable from child
-test_func4

Zend/tests/bug29368.phpt

@@ -1,34 +0,0 @@
---TEST--
-Bug #29368 (The destructor is called when an exception is thrown from the constructor)
---FILE--
-<?php
-
-class Foo
-{
-	function __construct()
-	{
-		echo __METHOD__ . "\n";
-		throw new Exception;
-	}
-	function __destruct()
-	{
-		echo __METHOD__ . "\n";
-	}
-}
-
-try
-{
-	$bar = new Foo;
-} catch(Exception $exc)
-{
-	echo "Caught exception!\n";
-}
-
-unset($bar);
-
-?>
-===DONE===
---EXPECTF--
-Foo::__construct
-Caught exception!
-===DONE===

Zend/tests/bug29674.phpt

@@ -1,41 +0,0 @@
---TEST--
-Bug #29674 (inherited method doesn't have access to private variables of the derived class)
---FILE--
-<?php
-
-class BaseClass
-{
-	private $private_base = "Base";
-	
-	function printVars ()
-	{
-		var_dump($this->private_base);
-		var_dump($this->private_child);
-	}
-}
-
-class ChildClass extends BaseClass
-{
-	private $private_child = "Child";
-}
-
-echo "===BASE===\n";
-$obj = new BaseClass;
-$obj->printVars();
-
-echo "===CHILD===\n";
-$obj = new ChildClass;
-$obj->printVars();
-
-?>
-===DONE===
---EXPECTF--
-===BASE===
-string(4) "Base"
-
-Notice: Undefined property:  BaseClass::$private_child in %sbug29674.php on line %d
-NULL
-===CHILD===
-string(4) "Base"
-
-Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d

Zend/tests/bug29689.phpt

@@ -1,62 +0,0 @@
---TEST--
-Bug #29689 (default value of protected member overrides default value of private)
---FILE--
-<?php
-class foo {
-    private $foo = 'foo';
-    private $foo2 = 'foo2';
-
-    function printFoo()
-    {
-        echo __CLASS__, ': ', $this->foo, " ", $this->foo2, "\n";
-    }
-}
-
-class bar extends foo {
-    protected $foo = 'bar';
-
-    function printFoo()
-    {
-        parent::printFoo();
-        echo __CLASS__, ': ', $this->foo, " ", $this->foo2, "\n";
-    }
-}
-
-class baz extends bar {
-    protected $foo = 'baz';
-    protected $foo2 = 'baz2';
-}
-
-class bar2 extends foo {
-    function printFoo()
-    {
-        parent::printFoo();
-        echo __CLASS__, ': ', $this->foo, " ", $this->foo2, "\n";
-    }
-}
-
-class baz2 extends bar2 {
-    protected $foo = 'baz2';
-    protected $foo2 = 'baz22';
-}
-
-$bar = new bar;
-$bar->printFoo();
-echo "---baz--\n";
-$baz = new baz();
-$baz->printFoo();
-echo "---baz2--\n";
-$baz = new baz2();
-$baz->printFoo();
-?>
---EXPECTF--
-foo: foo foo2
-bar: bar 
-Notice: Undefined property:  bar::$foo2 in %s on line %d
-
----baz--
-foo: foo foo2
-bar: baz baz2
----baz2--
-foo: foo foo2
-bar2: baz2 baz22

Zend/tests/bug29883.phpt

@@ -1,13 +0,0 @@
---TEST--
-Bug #29883 (isset gives invalid values on strings)
---FILE--
-<?php
-$x = "bug";
-var_dump(isset($x[-1]));
-var_dump(isset($x["1"]));
-echo $x["1"]."\n";
-?>
---EXPECT--
-bool(false)
-bool(true)
-u

Zend/tests/bug29890.phpt

@@ -1,23 +0,0 @@
---TEST--
-Bug #29890 (crash if error handler fails)
---FILE--
-<?php
-function customErrorHandler($fErrNo,$fErrStr,$fErrFile,$fErrLine,&$fClass) {
-echo "error :".$fErrStr."\n";
-}
-
-set_time_limit(5);
-
-error_reporting(E_ALL);
-
-set_error_handler("customErrorHandler");
-
-define("TEST",2);
-
-//should return a notice that the constant is already defined
-
-define("TEST",3);
-
-?>
---EXPECT--
-error :Constant TEST already defined

Zend/tests/bug29896.phpt

@@ -1,28 +0,0 @@
---TEST--
-Bug #29896 (Backtrace argument list out of sync)
---FILE--
-<?php
-function userErrorHandler($num, $msg, $file, $line, $vars)
-{
-    debug_print_backtrace();
-}
-
-$OldErrorHandler = set_error_handler("userErrorHandler");
-
-function GenerateError1($A1)
-{
-    $a = $b;
-}
-
-function GenerateError2($A1)
-{
-    GenerateError1("Test1");
-}
-
-GenerateError2("Test2");
-?>
---EXPECTF--
-#0  userErrorHandler(8, Undefined variable: b, %sbug29896.php, 11, Array ([A1] => Test1)) called at [%sbug29896.php:11]
-#1  GenerateError1(Test1) called at [%sbug29896.php:16]
-#2  GenerateError2(Test2) called at [%sbug29896.php:19]
-

Zend/tests/bug29944.phpt

@@ -1,16 +0,0 @@
---TEST--
-Bug #29944 (Function defined in switch, crashes)
---FILE--
-<?php
-$a = 1;
-switch ($a) {
-  case 1:
-    function foo($a) {
-      return "ok\n";
-    }
-    echo foo($a);
-}
-?>
---EXPECT--
-ok
-

Zend/tests/bug30080.phpt

@@ -1,18 +0,0 @@
---TEST--
-Bug #30080 (Passing array or non array of objects)
---FILE--
-<?php
-class foo { 	
-  function foo($arrayobj) { 
-    var_dump($arrayobj);
-  } 
-} 
-
-new foo(array(new stdClass)); 
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  object(stdClass)#2 (0) {
-  }
-}

Zend/tests/bug30140.phpt

@@ -1,30 +0,0 @@
---TEST--
-Bug #30140 (Problem with array in static properties)
---FILE--
-<?php
-class A {
-	public static $test1 = true;
-	public static $test2 = array();
-	public static $test3 = "str";
-}
-
-class B extends A {
-}
-
-A::$test1 = "x";
-A::$test2 = "y";
-A::$test3 = "z";
-var_dump(A::$test1);
-var_dump(A::$test2);
-var_dump(A::$test3);
-var_dump(B::$test1);
-var_dump(B::$test2);
-var_dump(B::$test3);
-?>
---EXPECT--
-string(1) "x"
-string(1) "y"
-string(1) "z"
-string(1) "x"
-string(1) "y"
-string(1) "z"

Zend/tests/bug30161.phpt

@@ -1,34 +0,0 @@
---TEST--
-Bug #30161 (Segmentation fault with exceptions)
---FILE--
-<?php
-class FIIFO {
-
-        public function __construct() {
-                throw new Exception;
-        }
-
-}
-
-class hariCow extends FIIFO {
-
-        public function __construct() {
-                try {
-                        parent::__construct();
-                } catch(Exception $e) {
-                }
-        }
-        
-        public function __toString() {
-                return "ok\n";
-        }
-
-}
-
-
-$db = new hariCow;
-
-echo $db;
-?>
---EXPECT--
-ok

Zend/tests/bug30162.phpt

@@ -1,52 +0,0 @@
---TEST--
-Bug #30162 (Catching exception in constructor couses lose of $this)
---FILE--
-<?php
-class FIIFO {
-
-	public function __construct() {
-		$this->x = "x";
-		throw new Exception;
-	}
-
-}
-
-class hariCow extends FIIFO {
-
-	public function __construct() {
-		try {
-			parent::__construct();
-		} catch(Exception $e) {
-		}
-		$this->y = "y";
-		try {
-			$this->z = new FIIFO;
-		} catch(Exception $e) {
-		}
-	}
-	
-	public function __toString() {
-		return "Rusticus in asino sedet.";
-	}
-
-}
-
-try {
-	$db = new FIIFO();
-} catch(Exception $e) {
-}
-var_dump($db);
-
-$db = new hariCow;
-
-var_dump($db);
-?>
---EXPECTF--
-Notice: Undefined variable: db in %sbug30162.php on line 35
-NULL
-object(hariCow)#1 (2) {
-  ["x"]=>
-  string(1) "x"
-  ["y"]=>
-  string(1) "y"
-}

Zend/tests/bug30332.phpt

@@ -1,40 +0,0 @@
---TEST--
-Bug #30332 (zend.ze1_compatibility_mode isnt fully compatable with array_push())
---INI--
-zend.ze1_compatibility_mode=on
-error_reporting=4095
---FILE--
-<?php
-class x { };
-
-$first = new x;
-$second = $first;
-$container = array();
-array_push($container, $first);
-
-$first->first = " im in the first";
-
-print_r($first);
-print_r($second);
-print_r($container);
-?>
---EXPECTF--
-Strict Standards: Implicit cloning object of class 'x' because of 'zend.ze1_compatibility_mode' in %sbug30332.php on line 4
-
-Strict Standards: Implicit cloning object of class 'x' because of 'zend.ze1_compatibility_mode' in %sbug30332.php on line 5
-
-Strict Standards: Implicit cloning object of class 'x' because of 'zend.ze1_compatibility_mode' in %sbug30332.php on line 7
-x Object
-(
-    [first] =>  im in the first
-)
-x Object
-(
-)
-Array
-(
-    [0] => x Object
-        (
-        )
-
-)

Zend/tests/bug30346.phpt

@@ -1,24 +0,0 @@
---TEST--
-Bug #30346 (arrayAccess and using $this)
---FILE--
-<?php
-
-class Test implements ArrayAccess
-{
-        public function __construct() { }       
-        public function offsetExists( $offset ) { return false; }
-        public function offsetGet( $offset ) { return $offset; }
-        public function offsetSet( $offset, $data ) { }
-        public function offsetUnset( $offset ) { }
-}
-
-$post = new Test;
-$id = 'page';
-echo $post[$id.'_show'];
-echo "\n";
-
-?>
-===DONE===
---EXPECT--
-page_show
-===DONE===

Zend/tests/bug30394.phpt

@@ -1,30 +0,0 @@
---TEST--
-Bug #30394 (Assignment operators yield wrong result with __get/__set)
---FILE--
-<?php
-class Container
-{
-	public function __get( $what )
-	{
-		return $this->_p[ $what ];
-	}
-	
-	public function __set( $what, $value )
-	{
-		$this->_p[ $what ] = $value;
-	}
-	
-	private $_p = array();
-}
-
-$c = new Container();
-$c->a = 1;
-$c->a += 1;
-print $c->a;	// --> 2
-
-print " - ";
-$c->a += max( 0, 1 );
-print $c->a;	// --> 4 (!)
-?>
---EXPECT--
-2 - 3

Zend/tests/bug30407.phpt

@@ -1,18 +0,0 @@
---TEST--
-Bug #30407 (Strange behaviour of default arguments)
---FILE--
-<?php
-
-function haricow($a = 'one') {
-	var_dump($a);
-	$a = 'two';
-}
-
-haricow();
-haricow();
-?>
-===DONE===
---EXPECT--
-string(3) "one"
-string(3) "one"
-===DONE===

Zend/tests/bug30451.phpt

@@ -1,36 +0,0 @@
---TEST--
-Bug #30451 (static properties permissions broken)
---FILE--
-<?php
-
-class A {
-
-	protected static $property = TRUE;
-	
-	protected static function method() {
-		return TRUE;
-	}
-
-}
-
-class B extends A {
-
-	public function __construct() {
-		
-		var_dump(self::method());
-		var_dump(parent::method());
-		
-		var_dump(self::$property);
-		var_dump(parent::$property);
-	
-	}
-	
-}
-
-new B;
-?>
---EXPECT--
-bool(true)
-bool(true)
-bool(true)
-bool(true)

Zend/tests/bug30519.phpt

@@ -1,10 +0,0 @@
---TEST--
-Bug #30519 Interface not existing says Class not found 
---FILE--
-<?php
-class test implements a {
-}
-?>
---EXPECTF--
-Fatal error: Interface 'a' not found in %sbug30519.php on line 2
-

Zend/tests/bug30702.phpt

@@ -1,39 +0,0 @@
---TEST--
-Bug #30702 cannot initialize class variable from class constant
---FILE--
-<?php
-class foo {
-	const C1=1;
-}
-
-class bar extends foo {
-  const C2=2;
-
-  public $c1=bar::C1;
-  public $c2=bar::C2;
-
-  public $c3=self::C1;
-  public $c4=self::C2;
-
-  public $c5=foo::C1;
-  public $c6=parent::C1;
-}
-
-$x= new bar();
-var_dump($x);
-?>
---EXPECT--
-object(bar)#1 (6) {
-  ["c1"]=>
-  int(1)
-  ["c2"]=>
-  int(2)
-  ["c3"]=>
-  int(1)
-  ["c4"]=>
-  int(2)
-  ["c5"]=>
-  int(1)
-  ["c6"]=>
-  int(1)
-}

Zend/tests/bug30707.phpt

@@ -1,29 +0,0 @@
---TEST--
-Bug #30707 (Segmentation fault on exception in method)
---FILE--
-<?php
-class C {
-	function byePHP($plop) {
-		echo "ok\n";
-	}
-
-	function plip() {
-		try {
-			$this->plap($this->plop());
-		}	catch(Exception $e) {
-		}
-	}
-
-	function plap($a) {	
-	}
-
-	function plop() {
-		throw new Exception;
-	}
-}
-
-$x = new C;
-$x->byePHP($x->plip());
-?>
---EXPECT--
-ok

Zend/tests/bug30725.phpt

@@ -1,32 +0,0 @@
---TEST--
-Bug #30725 (PHP segfaults when an exception is thrown in getIterator() within foreach)
---FILE--
-<?php 
-
-class Test implements IteratorAggregate
-{
-	function getIterator()
-	{
-		throw new Exception();
-	}
-}
-
-try
-{           
-	$it = new Test;
-	foreach($it as $v)
-	{
-		echo "Fail\n";
-	}
-	echo "Wrong\n";
-}
-catch(Exception $e)
-{
-	echo "Caught\n";
-}
-
-?>
-===DONE===
---EXPECT--
-Caught
-===DONE===

Zend/tests/bug30791.phpt

@@ -1,23 +0,0 @@
---TEST--
-Bug #30791 magic methods (__sleep/__wakeup/__toString) call __call if object is overloaded 
---FILE--
-<?php
-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
-object(a)#2 (1) {
-  ["a"]=>
-  int(4)
-}

Zend/tests/bug30820.phpt

@@ -1,27 +0,0 @@
---TEST--
-Bug #30820 (static member conflict with $this->member silently ignored)
---INI--
-error_reporting=4095
---FILE--
-<?php
-class Blah {
-    private static $x;
-
-    public function show() {
-        Blah::$x = 1;
-        $this->x = 5; // no warning, but refers to different variable
-
-        echo 'Blah::$x = '. Blah::$x ."\n";
-        echo '$this->x = '. $this->x ."\n";
-    }
-}
-
-$b = new Blah();
-$b->show();
-?>
---EXPECTF--
-Strict Standards: Accessing static property Blah::$x as non static in %sbug30820.php on line 7
-Blah::$x = 1
-
-Strict Standards: Accessing static property Blah::$x as non static in %sbug30820.php on line 10
-$this->x = 5

Zend/tests/bug30828.phpt

@@ -1,61 +0,0 @@
---TEST--
-Bug #30828 (debug_backtrace() reports incorrect class in overridden methods)
---FILE--
-<?php
-class A {
-	function __construct() {
-		debug_print_backtrace();
-		$bt = debug_backtrace();
-		foreach ($bt as $t) {
-			print $t['class'].$t['type'].$t['function']."\n";
-		}
-	}
-
-	function foo() {
-		debug_print_backtrace();
-		$bt = debug_backtrace();
-		foreach ($bt as $t) {
-                        print $t['class'].$t['type'].$t['function']."\n";
-		}
-	}
-
-	static function bar() {
-		debug_print_backtrace();
-		$bt = debug_backtrace();
-		foreach ($bt as $t) {
-			print $t['class'].$t['type'].$t['function']."\n";
-		}
-	}
-}
-
-class B extends A {
-	function __construct() {
-		parent::__construct();
-	}
-
-	function foo() {
-		parent::foo();
-	}
-
-	static function bar() {
-		parent::bar();
-	}
-}
-
-$b = new B();
-$b->foo();
-B::bar();
-?>
---EXPECTF--
-#0  A->__construct() called at [%sbug30828.php:30]
-#1  B->__construct() called at [%sbug30828.php:42]
-A->__construct
-B->__construct
-#0  A->foo() called at [%sbug30828.php:34]
-#1  B->foo() called at [%sbug30828.php:43]
-A->foo
-B->foo
-#0  A::bar() called at [%sbug30828.php:38]
-#1  B::bar() called at [%sbug30828.php:44]
-A::bar
-B::bar

Zend/tests/bug30889.phpt

@@ -1,31 +0,0 @@
---TEST--
-Bug #30889 Conflict between __get/__set and ++ operator
---FILE--
-<?php
-class overloaded
-{
-  private $values;
-  function __construct()
-  {
-    $this->values = array('a' => 0);
-  }
-  function __set($name, $value)
-  {
-    print "set $name = $value ($name was ".$this->values[$name].")\n";
-    $this->values[$name] = $value;
-  }
-  function __get($name)
-  {
-    print "get $name (returns ".$this->values[$name].")\n";
-    return $this->values[$name];
-  }
-}
-$test = new overloaded();
-$test->a++;     // __get(), then __set()
-++$test->a;
-?>
---EXPECT--
-get a (returns 0)
-set a = 1 (a was 0)
-get a (returns 1)
-set a = 2 (a was 1)

Zend/tests/bug30922.phpt

@@ -1,13 +0,0 @@
---TEST--
-Bug #30922 (reflective functions crash PHP when interfaces extend themselves)
---FILE--
-<?php
-interface RecurisiveFooFar extends RecurisiveFooFar {}
-class A implements RecurisiveFooFar {}
-
-$a = new A();
-var_dump($a instanceOf A);
-echo "ok\n";
-?>
---EXPECTF--
-Fatal error: Interface RecurisiveFooFar cannot not implement itself in %sbug30922.php on line %d

Zend/tests/bug30998.phpt

@@ -1,21 +0,0 @@
---TEST--
-Bug #30998 (Crash when user error handler returns false)
---FILE--
-<?php
-error_reporting(-1);
-                           
-function my_error($errno, $errstr, $errfile, $errline)
-{
-        print "$errstr ($errno) in $errfile:$errline\n";
-        return false;
-}
-set_error_handler('my_error');
-                           
-$f = fopen("/tmp/blah", "r");
-?>
-===DONE===
---EXPECTF--
-fopen(/tmp/blah): failed to open stream: No such file or directory (2) in %s:%d
-
-Warning: fopen(/tmp/blah): failed to open stream: No such file or directory in %s on line %d
-===DONE===

Zend/tests/bug31098.phpt

@@ -1,53 +0,0 @@
---TEST--
-Bug #31098 (isset() / empty() incorrectly returns true in dereference of a wrong type)
---FILE--
-<?php
-$a = '';
-var_dump(isset($a->b));
-$a = 'a';
-var_dump(isset($a->b));
-$a = '0';
-var_dump(isset($a->b));
-$a = '';
-var_dump(isset($a['b']));
-$a = 'a';
-var_dump(isset($a['b']));
-$a = '0';
-var_dump(isset($a['b']));
-
-$simpleString = "Bogus String Text";
-echo isset($simpleString->wrong)?"bug\n":"ok\n";
-echo isset($simpleString["wrong"])?"ok\n":"bug\n";
-echo isset($simpleString[-1])?"bug\n":"ok\n";
-echo isset($simpleString[0])?"ok\n":"bug\n";
-echo isset($simpleString["0"])?"ok\n":"bug\n";
-echo isset($simpleString["16"])?"ok\n":"bug\n";
-echo isset($simpleString["17"])?"bug\n":"ok\n";
-echo isset($simpleString["wrong"][0])?"bug\n":"ok\n";
-echo $simpleString->wrong === null?"ok\n":"bug\n";
-echo $simpleString["wrong"] === "B"?"ok\n":"bug\n";
-echo $simpleString["0"] === "B"?"ok\n":"bug\n";
-$simpleString["wrong"] = "f";
-echo $simpleString["0"] === "f"?"ok\n":"bug\n";
-?>
---EXPECTF--
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(true)
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-
-Notice: Trying to get property of non-object in %sbug31098.php on line %d
-ok
-ok
-ok
-ok

Zend/tests/bug31102.phpt

@@ -1,48 +0,0 @@
---TEST--
-Bug #31102 (Exception not handled when thrown inside __autoload())
---FILE--
-<?php
-
-$test = 0;
-
-function __autoload($class)
-{
-	global $test;
-
-	echo __METHOD__ . "($class,$test)\n";
-	switch($test)
-	{
-	case 1:
-		eval("class $class { function __construct(){throw new Exception('$class::__construct');}}");
-		return;
-	case 2:
-		eval("class $class { function __construct(){throw new Exception('$class::__construct');}}");
-		throw new Exception(__METHOD__);
-		return;
-	case 3:
-		return;
-	}
-}
-
-while($test++ < 5)
-{
-	try
-	{
-		eval("\$bug = new Test$test();");
-	}
-	catch (Exception $e)
-	{
-		echo "Caught: " . $e->getMessage() . "\n";
-	}
-}
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-__autoload(Test1,1)
-Caught: Test1::__construct
-__autoload(Test2,2)
-Caught: __autoload
-__autoload(Test3,3)
-
-Fatal error: Class 'Test3' not found in %sbug31102.php(%d) : eval()'d code on line 1

Zend/tests/bug31177-2.phpt

@@ -1,18 +0,0 @@
---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) {
-}

Zend/tests/bug31177.phpt

@@ -1,44 +0,0 @@
---TEST--
-Bug #31177 (Memory leak)
---FILE--
-<?php
-class DbGow {
-
-	public function query() {
-		throw new Exception;
-	}
-	
-	public function select() {
-		return new DbGowRecordSet($this->query());
-	}
-
-	public function select2() {
-		new DbGowRecordSet($this->query());
-	}
-
-}
-
-class DbGowRecordSet {
-
-	public function __construct($resource) {
-	}
-
-}
-
-$db = new DbGow;
-
-try {
-	$rs = $db->select();
-} catch(Exception $e) {
-	echo "ok\n";
-}
-	
-try {
-	$db->select2();
-} catch(Exception $e) {
-	echo "ok\n";
-}
-?>
---EXPECT--
-ok
-ok

Zend/tests/bug31341.phpt

@@ -1,29 +0,0 @@
---TEST--
-Bug #31341 (escape on curly inconsistent)
---FILE--
-<?php
-$a = array(
-	"$     \{    ",
-	"      \{   $",
-	"      \{$   ",
-	"      $\{   ",
-	"      \$\{  ",
-	"      \{\$  ",
-	"\$    \{    ",
-	"      \{  \$",
-	"%     \{    ");
-
-foreach ($a as $v) {
-	echo("'$v'\n");
-}
-?>
---EXPECT--
-'$     \{    '
-'      \{   $'
-'      \{$   '
-'      $\{   '
-'      $\{  '
-'      \{$  '
-'$    \{    '
-'      \{  $'
-'%     \{    '

Zend/tests/bug31525.phpt

@@ -1,22 +0,0 @@
---TEST--
-Bug #31525 (object reference being dropped. $this getting lost)
---INI--
-error_reporting=4095
---FILE--
-<?php
-class Foo {
-  function getThis() {
-    return $this;
-  }
-  function destroyThis() {
-    $baz =& $this->getThis();
-  }
-}
-$bar = new Foo();
-$bar->destroyThis();
-var_dump($bar);
-?>
---EXPECTF--
-Strict Standards: Only variables should be assigned by reference in %sbug31525.php on line 7
-object(Foo)#1 (0) {
-}