This commit was manufactured by cvs2svn to create tag

'BEFORE_NEW_OUTPUT_API'.
idness not valid for attribute declarations
2026-11-08 09:47:30 +00:00 · 2006-06-02 16:15:59 +00:00 · 2006-06-02 16:15:58 +00:00 · 2006-06-02 13:31:38 +00:00 · 2006-06-02 05:31:58 +00:00 · 2006-06-01 22:42:53 +00:00
2736 changed files with 194870 additions and 175145 deletions
@@ -1,8 +1,7 @@
-set $zts = 0
-
 define ____executor_globals
-	if $zts
-		set $eg = ((zend_executor_globals) (*((void ***) tsrm_ls))[executor_globals_id-1])
+	if basic_functions_module.zts
+		set $tsrm_ls = ts_resource_ex(0, 0)
+		set $eg = ((zend_executor_globals) (*((void ***) $tsrm_ls))[executor_globals_id-1])
 	else
 		set $eg = executor_globals
 	end
@@ -10,7 +9,7 @@ end

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

 define dump_bt
@@ -34,65 +33,92 @@ document dump_bt
 	dumps the current execution stack. usage: dump_bt executor_globals.current_execute_data
 end

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

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

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

-	if $zvalue.type == 0
-		set $typename = "NULL"
+	printf "(refcount=%d) ", $zvalue->refcount
+	if $type == 0
+		printf "NULL"
 	end
-	if $zvalue.type == 1
-		set $typename = "long"
+	____printz_type $type
+	if $type == 1
+		printf ": %ld", $zvalue->value.lval
 	end
-	if $zvalue.type == 2
-		set $typename = "double"
+	if $type == 2
+		printf ": %lf", $zvalue->value.dval
 	end
-	if $zvalue.type == 3
-		set $typename = "string"
+	if $type == 3
+		if $zvalue->value.lval
+			printf ": true"
+		else
+			printf ": false"
+		end
 	end
-	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 $type == 4
+		printf "(%d): ", $zvalue->value.ht->nNumOfElements
 		if ! $arg1
 			printf "{\n"
 			set $ind = $ind + 1
-			____print_ht $zvalue.value.ht
+			____print_ht $zvalue->value.ht 0
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0
@@ -101,34 +127,59 @@ define ____printzv_contents
 			end
 			printf "}"
 		end
+		set $type = 0
 	end
-	if $zvalue.type == 5
+	if $type == 5
+		____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.s
+		else
+			set $cname = "Unknown"
+		end
+		printf "(%s) #%d", $cname, $handle
 		if ! $arg1
-			printf "(prop examination disabled due to a gdb bug)"
-			if $zvalue.value.obj.handlers->get_properties
-#				set $ht = $zvalue->value.obj.handlers->get_properties($zvalue)
-#				printf "{\n"
-#				set $ind = $ind + 1
-#				____print_ht $ht
-#				set $ind = $ind - 1
-#				set $i = $ind
-#				while $i > 0
-#					printf "  "
-#					set $i = $i - 1
-#				end
-#				printf "}"
+			if $handlers->get_properties == &zend_std_get_properties
+				set $ht = $zobj->properties
+				if $ht
+					printf "(%d): ", $ht->nNumOfElements
+					printf "{\n"
+					set $ind = $ind + 1
+					____print_ht $ht 1
+					set $ind = $ind - 1
+					set $i = $ind
+					while $i > 0
+						printf "  "
+						set $i = $i - 1
+					end
+					printf "}"
+				else
+					echo "no properties found"
+				end
 			end
 		end
+		set $type = 0
 	end
-	if $zvalue.type == 6
-		if $zvalue.value.lval
-			printf "true"
-		else
-			printf "false"
-		end
+	if $type == 6
+		printf "(%d): \"%s\"", $zvalue->value.str.len, $zvalue->value.str.val
 	end
-	if $zvalue.type == 7
-		printf "#%d", $zvalue.value.lval
+	if $type == 7
+		printf ": #%d", $zvalue->value.lval
+	end
+	if $type == 8 
+	end
+	if $type == 9
+	end
+	if $type == 10
+		printf "(%d): [%p]", $zvalue->value.str.len, $zvalue->value.str.val
+	end
+	if $type > 10
 	end
 	printf "\n"
 end
@@ -143,7 +194,7 @@ define ____printzv
 		printf "*uninitialized* "
 	end

-	set $zcontents = *(struct _zval_struct *) $zvalue
+	set $zcontents = (zval*) $zvalue
 	if $arg1
 		____printzv_contents $zcontents $arg1
 	else
@@ -156,7 +207,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
@@ -165,12 +216,12 @@ define ____print_const_table
 		end

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

-		____printzv_contents $const.value 0
+		____printzv_contents &$const->value 0
 		set $p = $p->pListNext
 	end
 end
@@ -184,10 +235,11 @@ end

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

 	while $p != 0
-		set $zval = *(struct _zval_struct **)$p->pData
+		set $zval = *(zval **)$p->pData

 		set $i = $ind
 		while $i > 0
@@ -195,8 +247,20 @@ define ____print_ht
 			set $i = $i - 1
 		end

-		if $p->nKeyLength > 0 
-			printf "\"%s\" => ", $p->arKey
+		if $p->nKeyLength > 0
+			if $obj && $p->key.arKey.s[0] == 0
+				if $p->key.arKey.s[1] == '*'
+					printf "\"protected %s\" => ", $p->key.arKey.s+3
+				else
+					set $n = 1
+					while $n < $p->nKeyLength && $p->key.arKey.s[$n] != 0
+						set $n = $n + 1
+					end
+					printf "\"private %s::%s\" => ", $p->key.arKey.s+1, $p->key.arKey.s+$n+1
+				end
+			else
+				printf "\"%s\" => ", $p->key.arKey.s
+			end
 		else
 			printf "%d => ", $p->h
 		end
@@ -209,7 +273,7 @@ end
 define print_ht
 	set $ind = 1
 	printf "[0x%08x] {\n", $arg0
-	____print_ht $arg0
+	____print_ht $arg0 0
 	printf "}\n"
 end

@@ -217,6 +281,41 @@ 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\" => ", $p->key.arKey.s
+		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
@@ -148,20 +148,19 @@ Naming Conventions
    'buildsomewidget'
    'getI()'

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

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

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

 Syntax and indentation
 ----------------------
@@ -208,6 +207,12 @@ Syntax and indentation
    indent preprocessor directives you should put the # at the beginning
    of a line, followed by any number of whitespace.

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

@@ -46,9 +46,9 @@ MAINTENANCE:         Maintained
 STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           apache2handler
-PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>
+PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Experimental
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           caudium
 MAINTENANCE:         Unknown
@@ -68,11 +68,6 @@ PRIMARY MAINTAINER:  Alex Leigh <aleigh@php.net>
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           date
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
 EXTENSION:           embed
 PRIMARY MAINTAINER:  Edin Kadribasic <edink@php.net>
 MAINTENANCE:         Maintained
@@ -302,11 +297,16 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           curl
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>,Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
+EXTENSION:           date
+PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           exif
 PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
@@ -357,8 +357,8 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           imap
-PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>
-MAINTENANCE:         Odd Fixes
+PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>, Ilia Alshanetsky <iliaa@php.net>
+MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           ircg
@@ -465,7 +465,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           session
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -714,12 +714,10 @@ CGI environment and recommended modifications in php.ini
     CGI-like environment variables.

   Simply change your scripts to get CGI variables in the correct way for
-   PHP 4.x by using the superglobal $_SERVER. If you have older scripts
-   which use $HTTP_HOST, etc., you should turn on register_globals in
-   php.ini and change the variable order too (important: remove "E" from
-   it, because you do not need the environment here):
+   PHP 4.x by using the superglobal $_SERVER. 
+   (important: remove "E" from variables_order because you do not need 
+   the environment here):
 variables_order = "GPCS"
-register_globals = On
     _________________________________________________________________

 Special use for error pages or self-made directory listings (PHP >= 4.3.3)
@@ -1430,7 +1428,6 @@ The configuration file
 ; Boolean values can be set to either:
 ;    true, on, yes
 ; or false, off, no, none
-register_globals = off
 track_errors = yes

 ; you can enclose strings in double-quotes
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
-                  The PHP License, Version 3.0
-Copyright (c) 1999 - 2005 The PHP Group. All rights reserved.
+                  The PHP License, version 3.01
+Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

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

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

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

-This product includes the Zend Engine, freely available at
+PHP includes the Zend Engine, freely available at
 <http://www.zend.com>.
@@ -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
@@ -0,0 +1,70 @@
+
+#
+# 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 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
+	elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
+		NO_INTERACTION=1 \
+		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
+	else \
+		echo "ERROR: Cannot run tests without CLI sapi."; \
+	fi
+
+php_lcov.info: lcov-test
+	@echo "Generating data for $@"
+	@rm -rf lcov_data/
+	@$(mkinstalldirs) lcov_data/
+	@echo
+	-@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 --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/
+
@@ -5,9 +5,6 @@ INSTALL_DATA = $(INSTALL) -m 644
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)

-CORE_HEADERS = Zend/ TSRM/ include/ main/ main/streams/ regex/ ext/standard/
-INSTALL_HEADERS = $(CORE_HEADERS) $(INSTALL_EXT_HEADERS)
-
 all: $(all_targets) 
 	@echo
 	@echo "Build complete."
@@ -28,10 +25,10 @@ install: $(all_targets) $(install_targets)
 install-sapi: $(OVERALL_TARGET)
 	@echo "Installing PHP SAPI module:       $(PHP_SAPI)"
 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-	-@if test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); then \
+	-@if test ! -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); then \
 		for i in 0.0.0 0.0 0; do \
-			if test -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i; then \
-				$(LN_S) $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); \
+			if test -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+				$(LN_S) $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); \
 				break; \
 			fi; \
 		done; \
@@ -45,24 +42,68 @@ install-modules: build-modules
 	@rm -f modules/*.la >/dev/null 2>&1
 	@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)

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

 test: all 
-	-@if test ! -z $(PHP_EXECUTABLE) && test -x $(PHP_EXECUTABLE); then \
+	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
 		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
-			$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
-	elif test ! -z $(SAPI_CLI_PATH) && test -x $(SAPI_CLI_PATH); then \
+			$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
+	elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
 		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
-			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d '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 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -U $(TESTS); \
+	else \
+		echo "ERROR: Cannot run tests without CLI sapi."; \
+	fi
+
+utest: all
+	-@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \
+		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -u $(TESTS); \
+	else \
+		echo "ERROR: Cannot run tests without CLI sapi."; \
+	fi
+
+ntest: all
+	-@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \
+		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -N $(TESTS); \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi

 clean:
+	find . -name \*.gcno -o -name \*.gcda | xargs rm -f
 	find . -name \*.lo -o -name \*.o | xargs rm -f
 	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
@@ -1,893 +1,58 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2005, PHP 5.1
- Updated bundled libraries in Windows distribution. (Edin)
-  . zlib 1.2.3
-  . curl 7.14.0
-  . openssl 0.9.8
-  . ming 0.3b
-  . libpq (PostgreSQL) 8.0.1
- Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
-  (Andrey)
- Fixed bug #33999 (object remains object when cast to int). (Dmitry)
- Fixed bug #33996 (No information given for fatal error on passing invalid
-  value to typed argument). (Dmitry)
- Fixed bug #33989 (extract($GLOBALS,EXTR_REFS) crashes PHP). (Dmitry)
- Fixed bug #33967 (misuse of Exception constructor doesn't display errorfile).
-  (Jani)
- Fixed bug #33958 (duplicate cookies and magic_quotes=off may cause a crash).
-  (Ilia)
- Fixed bug #33917 (number_format() output with > 1 char separators). (Jani)
- Fixed bug #33904 (input array keys being escaped when magic quotes is off). 
-  (Ilia)
- Fixed bug #33899 (CLI: setting extension_dir=some/path extension=foobar.so
-  does not work). (Jani)
- Fixed bug #33882 (CLI was looking for php.ini in wrong path). (Hartmut)
- Fixed bug #33869 (strtotime() problem with "+1days" format). (Ilia) 
- Fixed bug #33841 (pdo sqlite driver forgets to update affected column count
-  on execution of prepared statments). (Ilia)
- Fixed bug #33837 (Informix ESQL version numbering schema changed). (Jani)
- Fixed bug #33802 (throw Exception in error handler causes crash). (Dmitry)
- Fixed bug #33723 (php_value overrides php_admin_value). (Dmitry)
- Fixed bug #33710 (ArrayAccess objects doen't initialize $this). (Dmitry)
- Fixed bug #33690 (Crash setting some ini directives in httpd.conf). (Rasmus)
- Fixed bug #33578 (strtotime() problem with "Oct17" format). (Derick)
- Fixed bug #33558 (warning with nested calls to functions returning by
-  reference). (Dmitry)
- Fixed bug #32139 (SOAP client does not auto-handle base64 encoding). (Ilia)
- Fixed bug #32010 (Memory leak in mssql_fetch_batch). (fmk)
- Fixed bug #29334 (win32 mail() provides incorrect Date: header). (Jani)
+?? ??? 20??, PHP 6.0
+- Unicode support. (Andrei, Dmitry, et al)

-14 Jul 2005, PHP 5.1 Beta 3
- Upgraded bundled SQLite library for PDO:SQLite to 3.2.2 (Ilia)
- Moved extensions to PECL:
-  . ext/dbx         (Jani, Derick)
-  . ext/ircg        (Jani, Derick)
- Added PDO_MYSQL_ATTR_USE_BUFFERED_QUERY parameter for pdo_mysql. (Ilia)
- Added date_timezone_set() function to set the timezone that the date
-  functions will use. (Derick)
- Added pg_fetch_all_columns() function to fetch all values of a column from
-  a result cursor. (Ilia)
- Added support for LOCK_EX flag for file_put_contents(). (Ilia)
- Implemented feature request #33452 (Year belonging to ISO week). (Derick)
- Fixed support for shared extensions on AIX. (Dmitry)
- Fixed memory corruption in pg_copy_from() in case the as_null parameter was
-  passed. (Derick)
- Fixed crash inside stream_get_line() when length parameter equals 0. (Ilia)
- Fixed bug #33673 (Added detection for partially uploaded files). (Ilia)
- Fixed bug #33605 (substr_compare() crashes with negative offset and length). 
-  (Tony)
- Fixed bug #33597 (setcookie() "expires" date format doesn't comply with RFC).
-  (Tony)
- Fixed bug #33588 (LDAP: RootDSE query not possible). (Jani)
- Fixed bug #33578 (strtotime() doesn't understand "11 Oct" format). (Derick)
- Fixed bug #33562 (date("") crashes). (Derick)
- Fixed bug #33536 (strtotime() defaults to now even on non time string).
-  (Derick)
- Fixed bug #33532 (Different output for strftime() and date()). (Derick)
- Fixed bug #33523 (Memory leak in xmlrpc_encode_request()). (Ilia)
- Fixed bug #33520 (crash if safe_mode is on and session.save_path is changed).
-  (Dmitry)
- Fixed bug #33512 (Add missing support for isset()/unset() overloading to
-  complement the property get/set methods). (Dmitry)
- Fixed bug #33491 (crash after extending MySQLi internal class). (Tony)
- Fixed bug #33475 (cURL handle is not closed on curl_close(). (Ilia)
- Fixed bug #33469 (Compile error undefined reference to ifx_checkAPI). (Jani)
- Fixed bug #33433 (strtoll not available on Tru64). (Jani, Derick)
- Fixed bug #33415 (strtotime() related bugs). (Derick)
- Fixed bug #32660 (Assignment by reference causes crash when field access is
-  overloaded (__get)). (Dmitry)
- Fixed bug #31358 (Older GCC versions do not provide portable va_copy()).
-  (Jani)
- Fixed bug #31158 (array_splice on $GLOBALS crashes). (Dmitry)
- Fixed bug #33156 (cygwin version of setitimer doesn't accept ITIMER_PROF).
-  (Nuno)
- Fixed bug #30828 (debug_backtrace() reports incorrect class in overridden
-  methods). (Dmitry)
- Fixed bug #30519 (Interface not existing says Class not found). (Dmitry)
- Fixed bug #30096 (gmmktime does not return the corrent time). (Derick)
- Fixed bug #30052 (Crash on shutdown after odbc_pconnect()). (Edin)
- Fixed bug #28377 (debug_backtrace is intermittently passing args). (Dmitry)
- Fixed bug #28072 (static array with some constant keys will be incorrectly
-  ordered). (Dmitry)
- Fixed bug #27268 (Bad references accentuated by clone). (Dmitry)
+- Changed dl() to be disabled by default. Enabled only when explicitly 
+  registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry)
+- Changed return "new" by reference to throw an E_STRICT error. (Dmitry)
+- Changed __toString() behavior to call it in all necessary places
+  (Marcus, Dmitry)
+- Changed "instanceof" and "catch" operators, is_a() and is_subclass_of()
+  functions to not call __autoload(). (Dmitry)

-22 Jun 2005, PHP 5.1 Beta 2
- Improved PHP extension loading mechanism with support for module dependencies
-  and conflicts. (Jani, Dmitry) 
- Allowed return by reference from internal functions. (Marcus, Andi, Dmitry)
- Rewrote strtotime() with support for timezones and many new formats.
-  Implements feature requests #21399, #26694, #28088, #29150, #29585 and
-  #29595. (Derick)
- Added bindto socket context option. (Ilia)
- Added offset parameter to the stream_copy_to_stream() function. (Ilia)
- Added offset & length parameters to substr_count() function. (Ilia)
- Fixed inheritance check to control return by reference and pass by reference
-  correctly (ArrayAccess can no longer support references correctly).
-  (Marcus, Andi, Dmitry)
- Fixed PDO shutdown problem (possible inifite loop running rollback on
-  shutdown). (Wez)
- Fixed PECL bug #3714 (PDO: beginTransaction doesn't work if you're in
-  auto-commit mode). (Wez)
- Fixed bug #33427 (ext/odbc: check if unixODBC header file exists). (Jani)
- Fixed bug #33389 (double free() when exporting a ReflectionClass). (Marcus)
- Fixed bug #33382 (array_reverse() fails after *sort()), 
-  introduced by zend_hash_sort() optimizations in HEAD. (Tony)
- Fixed bug #33340 (CLI Crash when calling php:function from XSLT). (Rob)
- Fixed bug #33318 (throw 1; results in Invalid opcode 108/1/8). (Dmitry)
- Fixed bug #33312 (ReflectionParameter methods do not work correctly).
-  (Dmitry)
- Fixed bug #33299 (php:function no longer handles returned dom objects). 
-  (Rob, Joe Orton)
- Fixed bug #33286 (nested array_walk() calls and user array compare functions
-  broken; FCI cache). (Andrei, patch from m.bretz@metropolis-ag.de)
- Fixed bug #33277 (private method accessed by child class). (Dmitry)
- Fixed bug #33257 (array_splice() inconsistent when passed function instead
-  of variable). (Dmitry)
- Fixed bug #33212 ([GCC 4]: 'zend_error_noreturn' aliased to external symbol
-  'zend_error'). (Dmitry)
- Fixed bug #33150 (shtool: insecure temporary file creation). (Jani)
- Fixed bug #33136 (method offsetSet in class extended from ArrayObject crash 
-  PHP). (Marcus)
- Fixed bug #32160 (copying a file into itself leads to data loss). (Ilia)
- Fixed bug #31256 (PHP_EVAL_LIBLINE configure macro does not handle -pthread).
-  (Jani)
- Fixed bug #31213 (Sideeffects caused by fix of bug #29493). (Dmitry)
- Fixed bug #31054 (safe_mode & open_basedir checks only check first 
-  include_path value). (Ilia)
- Fixed bug #29896 (Backtrace argument list out of sync). (Dmitry)
- Fixed bug #29683 (headers_list() returns empty array). (Tony)
- Fixed bug #28355 (glob wont error if dir is not readable). (Hartmut)
- Fixed bug #15854 (boolean ini options may be incorrectly displayed as Off 
-  when they are On). (Tony)
- Fixed bugs #14561, #20382, #26090, #26320, #28024, #30532, #32086, #32270,
-  #32555, #32588, #33056 (strtotime() related bugs). (Derick)
+- Removed old legacy:
+  . "register_globals" support. (Pierre)
+  . "register_long_arrays" ini option. (Dmitry)
+  . "safe_mode" support. (Ilia, Andi)
+  . "allow_call_time_pass_reference", added E_STRICT error message. (Dmitry)
+  . session_register(), session_unregister() and session_is_registered()
+    (needed only with "register_globals=On").
+  . "magic_quotes_gpc", "magic_quotes_runtime" and "magic_quotes_sybase" ini
+    options. (Pierre)
+  . Changed get_magic_quotes_gpc(), get_magic_quotes_runtime to always return
+    false and set_magic_quotes_runtime() to raise an E_CORE_ERROR.
+- Removed support for "continue" and "break" operators with non-constant
+  operands. (Dmitry)
+- Removed Freetype 1.x and GD 1.x from GD extension. (Pierre)
+- Removed global reflection constants. (Johannes)

-10 Jun 2005, PHP 5.1 Beta 1
- Upgraded PCRE library to version 5.0. (Andrei)
- Removed php_check_syntax() function which never worked properly. (Ilia)
- Removed garbage manager in Zend Engine which results in more aggressive
-  freeing of data. (Dmitry, Andi)
- Moved extensions to PECL:
-  . ext/cpdf        (Tony, Derick)
-  . ext/dio         (Jani, Derick)
-  . ext/fam         (Jani, Derick)
-  . ext/ingres_ii   (Jani, Derick)
-  . ext/mnogosearch (Jani, Derick)
-  . ext/w32api      (Jani, Derick)
-  . ext/yp          (Jani, Derick)
- Changed sha1_file() and md5_file() functions to use streams instead of
-  low level IO. (Uwe)
- Changed abstract private methods to be not allowed anymore. (Stas)
- Changed stream_filter_(ap|pre)pend() to return resource. (Sara)
- Changed mysqli_exception and sqlite_exception to use RuntimeException as base 
-  if SPL extension is present. (Georg, Marcus)
- Improved interactive mode of PHP CLI (php -a). (Johannes, Marcus)
- Improved performance of:
-  . general execution/compilation. (Andi, Thies, Sterling, Dmitry, Marcus)
-  . switch() statement. (Dmitry)
-  . several array functions. (Marcus)
-  . virtual path handling by adding a realpath() cache. (Andi)
-  . variable fetches. (Andi)
-  . magic method invocations. (Marcus)
- Improved support for embedded server in mysqli. (Georg)
- Improved mysqli extension. (Georg)
-  . added constructor for mysqli_stmt and mysqli_result classes
-  . added new function mysqli_get_charset()
-  . added new function mysqli_set_charset()
-  . added new class mysqli_driver
-  . added new class mysqli_warning
-  . added new class mysqli_execption 
-  . added new class mysqli_sql_exception
- Improved SPL extension. (Marcus)
-  . added standard hierarchy of Exception classes
-  . added interface Countable
-  . added interfaces Subject and Observer
-  . added spl_autoload*() functions
-  . converted several 5.0 examples into c code
-  . added class FileObject
-  . added possibility to use a string with class_parents() and
-    class_implements(). (Andrey)
- Added man pages for "phpize" and "php-config" scripts. (Jakub Vrana)
- Added support for .cc files in extensions. (Brian)
- Added PHP_INT_MAX and PHP_INT_SIZE as predefined constants. (Andrey)
- Added user opcode API that allow overloading of opcode handlers. (Dmitry)
- Added an optional remove old session parameter to session_regenerate_id(). (Ilia)
- Added array type hinting. (Dmitry)
- Added the tidy_get_opt_doc() function to return documentation for
-  configuration options in tidy. (Patch by: nlopess@php.net)
- Added support for .cc files in extensions. (Brian)
- Added imageconvolution() function which can be used to apply a custom 3x3
-  matrix convolution to an image. (Pierre)
- Added optional first parameter to XsltProcessor::registerPHPFunctions to only  
-  allow certain functions to be called from XSLT. (Christian)
- Added the ability to override the autotools executables used by the buildconf
-  script via the PHP_AUTOCONF and PHP_AUTOHEADER environmental variables. (Jon)
- Added several new functions to support the PostgreSQL v3 protocol introduced 
-  in PostgreSQL 7.4. (Christopher)
-  . pg_transaction_status() - in-transaction status of a database connection.
-  . pg_query_params() - execution of parameterized queries.
-  . pg_prepare() - prepare named queries.
-  . pg_execute() - execution of named prepared queries.
-  . pg_send_query_params() - async equivalent of pg_query_params().
-  . pg_send_prepare() - async equivalent of pg_prepare().
-  . pg_send_execute() - async equivalent of pg_execute().
-  . pg_result_error_field() - highly detailed error information, 
-    most importantly the SQLSTATE error code.
-  . pg_set_error_verbosity() - set verbosity of errors.
- Added optional fifth parameter "count" to preg_replace_callback() and
-  preg_replace() to count the number of replacements made. FR #32275. (Andrey)
- Added optional third parameter "charlist" to str_word_count() which
-  contains characters to be considered as word part. FR #31560. (Andrey, Ilia)
- Added interface Serializeable. (Stanislav, Marcus)
- Added pg_field_type_oid() PostgreSQL function. (mauroi at digbang dot com)
- Added zend_declare_property_...() and zend_update_property_...()
-  API functions for bool, double and binary safe strings. (Hartmut)
- Added possibility to access INI variables from within .ini file. (Andrei)
- Added variable $_SERVER['REQUEST_TIME'] containing request start time. (Ilia)
- Added optional float parameter to gettimeofday(). (Ilia)
- Added apache_reset_timeout() Apache1 function. (Rasmus)
- Added sqlite_fetch_column_types() 3rd argument for arrays. (Ilia)
- Added optional offset parameter to stream_get_contents() and
-  file_get_contents(). (Ilia)
- Added optional maxlen parameter to file_get_contents(). (Ilia)
- Added SAPI hook to get the current request time. (Rasmus)
- Added new functions:
-  . array_diff_key() (Andrey)
-  . array_diff_ukey() (Andrey)
-  . array_intersect_key() (Christiano Duarte)
-  . array_intersect_ukey() (Christiano Duarte)
-  . array_product() (Andrey)
-  . DomDocumentFragment::appendXML() (Christian)
-  . fputcsv() (David Sklar)
-  . htmlspecialchars_decode() (Ilia)
-  . inet_pton() (Sara)
-  . inet_ntop() (Sara)
-  . mysqli::client_info property (Georg)
-  . posix_access() (Magnus)
-  . posix_mknod() (Magnus)
-  . SimpleXMLElement::registerXPathNamespace() (Christian)
-  . stream_context_get_default() (Wez)
-  . stream_socket_enable_crypto() (Wez)
-  . stream_wrapper_unregister() (Sara)
-  . stream_wrapper_restore() (Sara)
-  . stream_filter_remove() (Sara)
-  . time_sleep_until() (Ilia)
- Added DomDocument::$recover property for parsing not well-formed
-  XML Documents. (Christian)   
- Added Cursor support for MySQL 5.0.x in mysqli (Georg)
- Added proxy support to ftp wrapper via http. (Sara)
- Added MDTM support to ftp_url_stat. (Sara)
- Added zlib stream filter support. (Sara)
- Added bz2 stream filter support. (Sara)
- Added HTTP/1.1 and chunked encoding support to http:// wrapper. (Sara)
- Added max_redirects context option that specifies how many HTTP 
-  redirects to follow. (Ilia)
- Added support of parameter=>value arrays to xsl_xsltprocessor_set_parameter().
-  (Tony)
- Fixed extension initialization to respect dependancies between extensions.
-  (Wez)
- Fixed ext/mysqli to allocate less memory when fetching bound params
-  of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
- Fixed a problem with SPL iterators aggregating the innner iterator. (Marcus)
- Fixed bug with $HTTP_RAW_POST_DATA not getting set. (Brian)
- Fixed bug in mysql::client_version(). (Georg)
- Fixed ZTS destruction. (Marcus)
- Fixed bug #33268 (iconv_strlen() works only with a parameter of < 3 in 
-  length). (Ilia)
- Fixed bug #33243 (ze1_compatibility_mode does not work as expected). (Dmitry)
- Fixed bug #33242 (Mangled error message when stream fails). (Derick)
- Fixed bug #33222 (segfault when CURL handle is closed in a callback). (Tony)
- Fixed bug #33214 (odbc_next_result does not signal SQL errors with 
-  2-statement SQL batches). (rich at kastle dot com, Tony)
- Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
-  misbehave). (Jani)
- Fixed bug #33185 (--enable-session=shared does not build). (Jani)
- Fixed bug #33171 (foreach enumerates private fields declared in base
-  classes). (Dmitry)
- Fixed bug #33164 (Soap extension incorrectly detects HTTP/1.1). (Ilia)
- Fixed bug #33116 (crash when assigning class name to global variable in
-  __autoload). (Dmitry)
- Fixed bug #33090 (mysqli_prepare() doesn't return an error). (Georg)
- Fixed bug #33076 (str_ireplace() incorrectly counts result string length 
-  and may cause segfault). (Tony)
- Fixed bug #33072 (Add a safemode/open_basedir check for runtime
-  "session.save_path" change using session_save_path() function). (Rasmus)
- Fixed bug #33070 (Improved performance of bzdecompress() by several orders
-  of magnitude). (Ilia)
- Fixed bug #33059 (crash when moving xml attribute set in dtd). (Ilia)
- Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per
-  RFC 2616 section 10.3.5) (Rasmus, Choitel)
- Fixed bug #33019 (socket errors cause memory leaks in php_strerror()). 
-  (jwozniak23 at poczta dot onet dot pl, Tony).
- Fixed bug #33017 ("make distclean" gives an error with VPATH build). (Jani)
- Fixed bug #33013 ("next month" was handled wrong while parsing dates).
-  (Derick)
- Fixed bug #32993 (implemented Iterator function current() don't throw
-  exception). (Dmitry)
- Fixed bug #32956 (mysql_bind_result() doesn't support MYSQL_TYPE_NULL). (Georg)
- Fixed bug #32947 (Incorrect option for mysqli default password). (Georg)
- Fixed bug #32944 (Disabling session.use_cookies doesn't prevent reading 
-  session cookies). (Jani, Tony)
- Fixed bug #32941 (Sending structured SOAP fault kills a php). (Dmitry)
- Fixed bug #32936 (http redirects URLs are not checked for control chars). (Ilia)
- Fixed bug #32933 (Cannot extend class "SQLiteDatabase"). (Marcus)
- Fixed bug #32932 (Oracle LDAP: ldap_get_entries(), invalid pointer). (Jani)
- Fixed bug #32930 (class extending DOMDocument doesn't clone properly). (Rob)
- Fixed bug #32924 (file included with "auto_prepend_file" can be included
-  with require_once() or include_once()). (Stas)
- Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Tony)
- Fixed bug #32852 (Crash with singleton and __destruct when
-  zend.ze1_compatibility_mode = On). (Dmitry)
- Fixed bug #32833 (Invalid opcode). (Dmitry)
- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly). (Ilia)
- Fixed bug #32810 (temporary files not using plain file wrapper). (Ilia)
- Fixed bug #32809 (Missing T1LIB support on Windows). (Edin)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
- Fixed bug #32799 (crash: calling the corresponding global var during the
-  destruct). (Dmitry)
- Fixed bug #32776 (SOAP doesn't support one-way operations). (Dmitry)
- Fixed bug #32773 (GMP functions break when second parameter is 0). (Stas)
- Fixed bug #32759 (incorrect determination of default value (COM)). (Wez)
- Fixed bug #32758 (Cannot access safearray properties in VB6 objects). (Wez)
- Fixed bug #32755 (Segfault in replaceChild() when DocumentFragment has
-  no children). (Rob)
- Fixed bug #32753 (Undefined constant SQLITE_NOTADB). (Ilia)
- Fixed bug #32742 (segmentation fault when the stream with a wrapper 
-  is not closed). (Tony, Dmitry)
- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
-  (Derick)
- Fixed bug #32686 (Require/include file in destructor causes segfault).
-  (Marcus)
- Fixed bug #32682 (ext/mssql: Error on module shutdown when called from
-  activescript). (Frank)
- Fixed bug #32674 (exception in iterator causes crash). (Dmitry)
- Fixed bug #32647 (Using register_shutdown_function() with invalid callback
-  can crash PHP). (Jani)
- Fixed bug #32615 (Segfault in replaceChild() using fragment when 
-  previousSibling is NULL). (Rob)
- Fixed bug #32613 (ext/snmp: use of snmp_shutdown() causes snmpapp.conf 
-  access errors). (Jani, ric at arizona dot edu)
- Fixed bug #32608 (html_entity_decode() converts single quotes even if
-  ENT_NOQUOTES is given). (Ilia)
- Fixed bug #32596 (Segfault/Memory Leak by getClass (etc) in __destruct).
-  (Dmitry)
- Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX). (Jani)
- Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets).
-  (Ilia)
- Fixed bug #32587 (Apache2: errors sent to error_log do not include
-  timestamps). (Jani)
- Fixed bug #32560 (configure looks for incorrect db2 library). (Tony)
- Fixed bug #32553 (mmap loads only the 1st 2000000 bytes on Win32). (Ilia)
- Fixed bug #32533 (proc_get_status() returns the incorrect process status). (Ilia)
- Fixed bug #32530 (chunk_split() does not append endstr if chunklen is  
-  longer then the original string). (Ilia)
- Fixed bug #32491 (File upload error - unable to create a temporary file).
-  (Uwe Schindler)
- Fixed bug #32429 (method_exists() always return TRUE if __call method
-  exists). (Dmitry)
- Fixed bug #32428 (The @ warning error supression operator is broken).
-  (Dmitry)
- Fixed bug #32427 (Interfaces are not allowed 'static' access modifier).
-  (Dmitry)
- Fixed bug #32405 (mysqli::fetch() returns bad data - 64bit problem). (Andrey)
- Fixed bug #32282 (Segfault in mysqli_fetch_array on 64-bit). (Georg)
- Fixed bug #32296 (get_class_methods() output has changed between 5.0.2 and
-  5.0.3). (Dmitry)
- Fixed bug #32245 (xml_parser_free() in a function assigned to the xml parser
-  gives a segfault). (Rob)
- Fixed bug #32171 (Userspace stream wrapper crashes PHP). (Tony, Dmitry)
- Fixed bug #32109 ($_POST is not populated in multithreaded environment).
-  (Moriyoshi)
- Fixed bug #32080 (segfault when assigning object to itself with
-  zend.ze1_compatibility_mode=On). (Dmitry)
- Fixed bug #32021 (Crash caused by range('', 'z')). (Derick)
- Fixed bug #32013 (ext/mysqli bind_result causes fatal error: memory
-  limit). (Andrey)
- Fixed bug #31887 (ISAPI: Custom 5xx error does not return correct HTTP 
-  response message). (Jani)
- Fixed bug #31828 (Crash with zend.ze1_compatibility_mode=On). (Dmitry)
- Fixed bug #31668 (multi_query works exactly every other time - multi query
-  d/e flag global and not per connection). (Andrey)
- Fixed bug #31636 (another crash when echoing a COM object). (Wez)
- Fixed bug #31583 (php_std_date() uses short day names in non-y2k_compliance 
-  mode). (mike at php dot net)
- Fixed bug #31525 (object reference being dropped. $this getting lost).
-  (Stas, Dmitry)
- Fixed bug #31502 (Wrong deserialization from session when using WDDX
-  serializer). (Dmitry) 
- Fixed bug #31478 (segfault with empty() / isset()). (Moriyoshi)
- Fixed bug #31465 (False warning in unpack() when working with *). (Ilia)
- Fixed bug #31363 (broken non-blocking flock()). (ian at snork dot net)
- Fixed bug #31033 (php:function(string, nodeset) with xsl:key crashes PHP).
-  (Rob)
- Fixed bug #30961 (Wrong linenumber in ReflectionClass getStartLine()).
-  (Dmitry)
- Fixed bug #30889 (Conflict between __get/__set and ++ operator). (Dmitry)
- Fixed bug #30833 (array_count_values() modifying input array). (Tony)
- Fixed bug #30820 (static member conflict with $this->member silently
-  ignored). (Dmitry)
- Fixed bug #30819 (Better support for LDAP SASL bind). (Jani)
- Fixed bug #30791 (magic methods (__sleep/__wakeup/__toString) call __call if
-  object is overloaded). (Dmitry)
- Fixed bug #30707 (Segmentation fault on exception in method). (Stas, Dmitry)
- Fixed bug #30702 (cannot initialize class variable from class constant).
-  (Dmitry)
- Fixed bug #30578 (Output buffers flushed before calling __desctruct()
-  functions). (Jani)
- Fixed bug #30407 (Strange behaviour of default arguments). (Dmitry)
- Fixed bug #30394 (Assignment operators yield wrong result with __get/__set).
-  (Dmitry)
- Fixed bug #30332 (zend.ze1_compatibility_mode isnt fully compatable with
-  array_push()). (Dmitry)
- Fixed bug #30162 (Catching exception in constructor causes lose of $this).
-  (Dmitry)
- Fixed bug #30140 (Problem with array in static properties). (Dmitry)
- Fixed bug #30126 (Enhancement for error message for abstract classes). 
-  (Marcus)
- Fixed bug #30080 (Passing array or non array of objects). (Dmitry)
- Fixed bug #29975 (memory leaks when set_error_handler() is used inside error 
-  handler). (Tony)
- Fixed bug #29971 (variables_order behaviour). (Dmitry)
- Fixed bug #29944 (Function defined in switch, crashes). (Dmitry)
- Fixed bug #29728 (Reflection API Feature: Default parameter value). (Marcus)
- Fixed bug #29689 (default value of protected member overrides default value of
-  private and other private variable problems in inherited classes). (Stas)
- Fixed bug #29583 (crash when echoing a COM object). (M.Sisolak, Wez)
- Fixed bug #29522 (accessing properties without connection). (Georg)
- Fixed bug #29338 (unencoded spaces get ignored after certain tags). (Ilia)
- Fixed bug #29335 (fetch functions now use MYSQLI_BOTH as default). (Georg)
- Fixed bug #29311 (calling parent constructor in mysqli). (Georg)
- Fixed bug #29256 (SOAP HTTP Error when envelop size is more than 24345 bytes).
-  (Dmitry, Wez)
- Fixed bug #29236 (memory error when wsdl-cache is enabled). (Dmitry)
- Fixed bug #29210 (Function: is_callable - no support for private and
-  protected classes). (Dmitry)
- Fixed bug #29109 (SoapFault exception: [WSDL] Out of memory). (Dmitry)
- Fixed bug #29104 (Function declaration in method doesn't work). (Dmitry)
- Fixed bug #29061 (soap extension segfaults). (Dmitry)
- Fixed bug #29015 (Incorrect behavior of member vars(non string ones)-numeric
-  mem vars und others). (Dmitry)
- Fixed bug #28985 (__getTypes() returning nothing on complex WSDL). (Dmitry)
- Fixed bug #28969 (Wrong data encoding of special characters). (Dmitry)
- Fixed bug #28839 (SIGSEGV in interactive mode (php -a)).
-  (kameshj at fastmail dot fm)
- Fixed bug #28605 (Need to use -[m]ieee option for Alpha CPUs). (Jani)
- Fixed bug #28568 (SAPI::known_post_content_types is not thread safe).
-  (Moriyoshi)
- Fixed bug #27598 (list() array key assignment causes HUGE memory leak).
-  (Dmitry)
- Fixed bug #26456 (Wrong results from Reflection-API getDocComment() when
-  called via STDIN). (Dmitry)
- Fixed bug #25922 (In error handler, modifying 5th arg (errcontext) may result
-  in seg fault). (Dmitry)
- Fixed bug #22836 (returning reference to uninitialized variable). (Dmitry)
+- Improved and cleaned CGI code. FastCGI is now always enabled and can not be
+  disabled. See sapi/cgi/CHANGES for more details. (Dmitry)
+- Improved cURL: (Ilia)
+  . Added curl_setopt_array() which allows setting of multiple cURL options.
+  . Added CURLINFO_HEADER_OUT constant to facilitate request retrieval.

-31 Mar 2005, PHP 5.0.4
- Added SNMPv2 support. (harrie)
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
- Added length and charsetnr for field array and object in mysqli. (Georg)
- Added checks for negative values to gmp_sqrt(), gmp_powm(), gmp_sqrtrem()
-  and gmp_fact() to prevent SIGFPE. (Tony)
- Changed foreach() to throw an exception if IteratorAggregate::getIterator()
-  does not return an Iterator. (Marcus)
- Changed phpize not to require libtool. (Jani)
- Updated bundled oniguruma library (used for multibyte regular expression)
-  to 3.7.0. (Moriyoshi)
- Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
-  Fixed bugs:
-  . Bug #32311 (mb_encode_mimeheader() does not properly escape characters)
-  . Bug #32063 (mb_convert_encoding ignores named entity 'alpha')
-  . Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes)
-  . bug #30573 (compiler warnings in libmbfl due to invalid type cast)
-  . Bug #30549 (incorrect character translations for some ISO8859 charsets).
- Fixed bug preventing from building oci8 as shared. 
-  (stanislav dot voroniy at portavita dot nl, Tony)
- Fixed a bug in mysql_affected_rows and mysql_stmt_affected_rows when the
-  api function returns -1 (Georg)
- Fixed several leaks in ext/browscap and sapi/embed. (Andrei)
- Fixed several leaks in ext/filepro. (Tony)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed a bug in mysqli_stmt_execute() (type conversion with NULL values).
-  (Georg)
- Fixed segfault in mysqli_fetch_field_direct() when invalid field offset 
-  is passed. (Tony)
- Fixed posix_getsid() & posix_getpgid() to return sid & pgid instead 
-  of true. (Tony)   
- Fixed bug #32394 (offsetUnset() segfaults in a foreach). (Marcus)
- Fixed bug #32373 (segfault in bzopen() if supplied path to non-existent 
-  file). (Tony)
- Fixed bug #32326 (Check values of Connection/Transfer-Encoding 
-  case-incentively in SOAP extension). (Ilia)
- Fixed bug #32290 (call_user_func_array() calls wrong class method within 
-  child class). (Marcus)
- Fixed bug #32238 (spl_array.c: void function cannot return value). (Johannes)
- Fixed bug #32210 (proc_get_status() sets "running" always to true). (Ilia)
- Fixed bug #32200 (Prevent using both --with-apxs2 and --with-apxs2filter).
-  (Jani)
- Fixed bug #32134 (Overloading offsetGet/offsetSet). (Marcus)
- Fixed bug #32130 (ArrayIterator::seek() does not throw an Exception on 
-  invalid index). (Marcus)
- Fixed bug #32115 (dateTime SOAP encoding of timezone incorrect). (Dmitry)
- Fixed bug #32081 (in mysqli default socket value is not being used). (Ilia)
- Fixed bug #32021 (Crash caused by range('', 'z')). (Derick)
- Fixed bug #32011 (Fragments which replaced Nodes are not globaly useable).
-  (Rob)
- Fixed bug #32001 (xml_parse_into_struct() function exceeds maximum 
-  execution time). (Rob, Moriyoshi)
- Fixed bug #31980 (Unicode exif data not available on Windows). (Edin)
- Fixed bug #31960 (msql_fetch_row() and msql_fetch_array() dropping columns
-  with NULL values). (Daniel Convissor)
- Fixed bug #31878 (Segmentation fault using clone keyword on nodes). (Rob)
- Fixed bug #31858 (--disable-cli does not force --without-pear). (Jani)
- Fixed bug #31842 (*date('r') does not return RFC2822 conforming date string).
-  (Jani)
- Fixed bug #31832 (SOAP encoding problem with complex types in WSDL mode with
-  multiple parts). (Dmitry)
- Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
- Fixed bug #31796 (readline completion handler does not handle empty return
-  values). (Ilia)
- Fixed bug #31792 (getrusage() does not provide ru_nswap value). (Ilia)
- Fixed bug #31755 (Cannot create SOAP header in no namespace). (Dmitry)
- Fixed bug #31754 (dbase_open() fails for mode = 1). (Mehdi, Derick)
- Fixed bug #31751 (pg_parameter_status() missing on Windows). (Edin)
- Fixed bug #31747 (SOAP Digest Authentication doesn't work with 
-  "HTTP/1.1 100 Continue" response). (Dmitry)
- Fixed bug #31732 (mb_get_info() causes segfault when no parameters 
-  specified). (Tony)
- Fixed bug #31710 (Wrong return values for mysqli_autocommit/commit/rollback).
-  (Georg)
- Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar). (Ilia)
- Fixed bug #31695 (Cannot redefine endpoint when using WSDL). (Dmitry)
- Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings).
-  (elod at itfais dot com)
- Fixed bug #31683 (changes to $name in __get($name) override future 
-  parameters). (Dmitry)
- Fixed bug #31699 (unserialize() float problem on non-English locales). (Ilia)
- Fixed bug #31562 (__autoload() problem with static variables). (Marcus)
- Fixed bug #31651 (ReflectionClass::getDefaultProperties segfaults with arrays).
-  (Marcus)
- Fixed bug #31623 (OCILogin does not support password grace period).
-  (daniel dot beet at accuratesoftware dot com, Tony)
- Fixed bug #31527 (crash in msg_send() when non-string is stored without
-  being serialized). (Ilia)
- Fixed bug #31515 (Improve performance of scandir() by factor of 10 or so). (Ilia)
- Fixed bug #31514 (open_basedir uses path_translated rather then cwd for .
-  translation). (Ilia)
- Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). (Ilia)
- Fixed bug #31479 (Fixed crash in chunk_split(), when chunklen > strlen). (Ilia)
- Fixed bug #31454 (session_set_save_handler crashes PHP when supplied 
-  non-existent object ref). (Tony)
- Fixed bug #31444 (Memory leak in zend_language_scanner.c).
-  (hexer at studentcenter dot org)
- Fixed bug #31442 (unserialize broken on 64-bit systems). (Marcus)
- Fixed bug #31440 ($GLOBALS can be overwritten via GPC when register_globals
-  is enabled). (Ilia)
- Fixed bug #31422 (No Error-Logging on SoapServer-Side). (Dmitry)
- Fixed bug #31413 (curl POSTFIELDS crashes on 64-bit platforms). (Joe)
- Fixed bug #31396 (compile fails with gd 2.0.33 without freetype). (Jani)
- Fixed bug #31371 (highlight_file() trims new line after heredoc). (Ilia)
- Fixed bug #31361 (simplexml/domxml segfault when adding node twice). (Rob)
- Fixed bug #31348 (CachingIterator::rewind() leaks). (Marcus)
- Fixed bug #31346 (ArrayIterator::next segfaults). (Marcus)
- Fixed bug #31190 (Unexpected warning then exception is thrown from 
-  call_user_func_array()). (phpbugs at domain51 dot net, Dmitry)
- Fixed bug #31142 (imap_mail_compose() fails to generate correct output). (Ilia)
- Fixed bug #31139 (XML Parser Functions seem to drop &amp; when parsing). (Rob)
- Fixed bug #31398 (When magic_guotes_gpc are enabled filenames with ' get cutoff).
-  (Ilia)
- Fixed bug #31288 (Possible crash in mysql_fetch_field(), if mysql_list_fields() 
-  was not called previously). (Ilia)
- Fixed bug #31107, #31110, #31111, #31249 (Compile failure of zend_strtod.c).
-  (Jani)
- Fixed bug #31110 (PHP 4.3.10 does not compile on Tru64 UNIX 5.1B). (Derick)
- Fixed bug #31107 (Compile failure on Solaris 9 (Intel) and gcc 3.4.3). (Derick)
- Fixed bug #31103 (Better error message when c-client cannot be found). (Ilia)
- Fixed bug #31101 (missing kerberos header file path with --with-openssl). (Jani)
- Fixed bug #31098 (isset() / empty() incorrectly return true in dereference of
-  a string type). (Moriyoshi)
- Fixed bug #31087 (broken php_url_encode_hash macro). (Ilia)
- Fixed bug #31072 (var_export() does not output an array element with an empty
-  string key). (Derick)
- Fixed bug #31060 (imageftbbox() does not use linespacing parameter). (Jani)
- Fixed bug #31056 (php_std_date() returns invalid formatted date if 
-  y2k_compliance is On). (Ilia)
- Fixed bug #31055 (apache2filter: per request leak proportional to the full
-  path of the request URI). (kameshj at fastmail dot fm)
- Fixed bug #30901 (can't send cookies with soap envelop). (Dmitry)
- Fixed bug #30871 (Misleading warning message for array_combine()). (Andrey)
- Fixed bug #30868 (evaluated pointer comparison in mbregex causes compile
-  failure). (Moriyoshi)
- Fixed bug #30862 (Static array with boolean indexes). (Marcus)
- Fixed bug #30726 (-.1 like numbers are not being handled correctly). (Ilia)
- Fixed bug #30725 (PHP segfaults when an exception is thrown in getIterator() 
-  within foreach). (Marcus)
- Fixed bug #30609 (cURL functions bypass open_basedir). (Jani)
- Fixed bug #30446 (apache2handler: virtual() includes files out of sequence)
- Fixed bug #30430 (odbc_next_result() doesn't bind values and that results 
-  in segfault). (pdan-php at esync dot org, Tony)
- Fixed bug #30266 (Invalid opcode 137/1/8). (Marcus)
- Fixed bug #30120 (imagettftext() and imagettfbbox() accept too many
-  parameters). (Jani)
- Fixed bug #30106 (SOAP cannot not parse 'ref' element. Causes Uncaught
-  SoapFault exception). (Dmitry)
- Fixed bug #29989 (type re_registers redefined in oniguruma.h). (Moriyoshi)
- Fixed bug #28803 (enabled debug causes bailout errors with CLI on AIX 
-  because of fflush() called on already closed filedescriptor). (Tony)
- Fixed bug #29767 (Weird behaviour of __set($name, $value)). (Dmitry)
- Fixed bug #29733 (printf() handles repeated placeholders wrong).
-  (bugs dot php dot net at bluetwanger dot de, Ilia)
- Fixed bug #29424 (width and height inverted for JPEG2000 files). (Ilia)
- Fixed bug #29329 (configure for mysqli with shared doesn't work). (Georg)
- Fixed bug #29136 (make test - libtool failure on MacOSX). (Jani)
- Fixed bug #28976 (mail(): use "From:" from headers if sendmail_from is empty).
-  (Jani)
- Fixed bug #28930 (PHP sources pick wrong header files generated by bison).
-  (eggert at gnu dot org, Jani)
- Fixed bug #28840 (__destruct of a class that extends mysqli not called).
-  (Marcus)
- Fixed bug #28804 (ini-file section parsing pattern is buggy).
-  (wendland at scan-plus dot de)
- Fixed bug #28451 (corrupt EXIF headers have unlimited recursive IFD directory
-  entries). (Andrei)
- Fixed bug #28444 (Cannot access undefined property for object with overloaded
-  property access). (Dmitry)
- Fixed bug #28442 (Changing a static variables in a class changes it across 
-  sub/super classes.) (Marcus)
- Fixed bug #28324 (HTTP_SESSION_VARS appear when register_long_arrays is 
-  Off). (Tony)
- Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream).
-  (chris at ex-parrot dot com)
- Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping). (Derick,
-  Benjamin Greiner)
- Fixed bug #28041 (SOAP HTTP Digest Access Authentication). (Dmitry)
- Fixed bug #27633 (Double \r problem on ftp_get in ASCII mode on Win32). (Ilia)
- Fixed bug #18613 (Multiple OUs in x509 certificate not handled properly).
-  (Jani)
-
-15 Dec 2004, PHP 5.0.3
- Added the %F modifier to *printf to render a non-locale-aware representation
-  of a float with the . as decimal seperator. (Derick)
- Fixed error handling in mysqli_multi_query. (Georg)
- Extended the functionality of is_subclass_of() to accept either a class name
-  or an object as first parameter. (Andrey) 
- Fixed potential problems with unserializing invalid serialize data. (Marcus)
- Fixed bug #32076 (ReflectionMethod::isDestructor() always return true). 
-  (Derick, Tony)
- Fixed bug #31034 (Problem with non-existing iconv header file). (Derick)
- Fixed bug #30995 (snmp extension does not build with net-snmp 5.2). (Ilia)
- Fixed bug #30994 (SOAP server unable to handle request with references).
-  (Dmitry)
- Fixed bug #30990 (allow popen() on *NIX to accept 'b' flag). (Ilia)
- Fixed bug #30967 (properties in extended mysqli classes don't work). (Georg)
- Fixed bug #30928 (When Using WSDL, SoapServer doesn't handle private or
-  protected properties). (Dmitry)
- Fixed bug #30922 (reflective functions crash PHP when interfaces extend
-  themselves). (Tony, Dmitry)
- Fixed bug #30904 (segfault when recording soapclient into session). (Tony,
-  Dmitry)
- Fixed bug #30890 (MySQLi testsuite)
- Fixed bug #30856 (ReflectionClass::getStaticProperties segfaults). (Marcus)
- Fixed bug #30832 ("!" stripped off comments in xml parser). (Rob)
- Fixed bug #30799 (SoapServer doesn't handle private or protected properties).
-  (Dmitry)
- Fixed bug #30783 (Apache crash when using ReflectionFunction::
-  getStaticVariables()). (Marcus)
- Fixed bug #30750 (Meaningful error message when upload directory is not 
-  accessible). (Ilia)
- Fixed bug #30685 (Malformed SOAPClient http header reequest). (Dmitry)
- Fixed bug #30672 (Problem handling exif data in jpeg images at unusual 
-  places). (Marcus)
- Fixed bug #30658 (Ensure that temporary files created by GD are removed).
-  (Ilia)
- Fixed bug #30645 (def. multi result set support for mysql_connect). (Georg)
- Fixed bug #30637 (compile with pear error). (Antony)
- Fixed bug #30587 (array_multisort doesn't separate zvals before 
-  changing them). (Tony)
- Fixed bug #30572 (crash when comparing SimpleXML attribute to a boolean).
-  (Andi)
- Fixed bug #30566 (attribute namespace URIs are inconsistent when parsing).
-  (Rob)
- Fixed bug #30490 (PEAR installation fails). (Antony)
- Fixed bug #30475 (curl_getinfo() may crash in some situations). (Ilia)
- Fixed bug #30442 (segfault when parsing ?getvariable[][ ). (Tony)
- Fixed bug #30388 (rename across filesystems loses ownership and 
-  permission info). (Tony)
- Fixed bug #30387 (stream_socket_client async connect was broken).
-  (vnegrier at esds dot com, Wez).
- Fixed bug #30381 (Strange results with get_class_vars()). (Marcus)
- Fixed bug #30375 (cal_info() does not work without a parameter). (Ilia)
- Fixed bug #30362 (stream_get_line() not handling end string correctly).
-  (Ilia)
- Fixed bug #30359 (SOAP client requests have no port in "Host" field).
-  (Dmitry)
- Fixed bug #30356 (str_ireplace() does not work on all strings). (Ilia)
- Fixed bug #30344 (Reflection::getModifierNames() returns too long strings).
-  (Marcus)
- Fixed bug #30329 (Error Fetching http body, No Content-Length, connection
-  closed or chunked data). (Dmitry)
- Fixed bug #30282 (segfault when using unknown/unsupported 
-  session.save_handler and/or session.serialize_handler). (Tony)
- Fixed bug #30281 (Prevent non-wbmp images from being detected as such).
-  (Ilia)
- Fixed bug #30276 (Possible crash in ctype_digit on large numbers). (Ilia)
- Fixed bug #30230 (exception handler not working with objects). (Marcus)
- Fixed bug #30224 (Sybase date strings are sometimes not null terminated).
-  (Ilia)
- Fixed bug #30175 (SOAP results aren't parsed correctly). (Dmitry)
- Fixed bug #30147 (OO sqlite_fetch_object did not reset error handler). (Wez)
- Fixed bug #30133 (get_current_user() crashes on Windows). (Edin)
- Fixed bug #30061 (xml_set_start_namespace_decl_handler not called). (Rob)
- Fixed bug #30057 (did not detect IPV6 on FreeBSD 4.1). (Wez)
- Fixed bug #30042 (strtotime does not use second param). (Derick)
- Fixed bug #30027 (Possible crash inside ftp_get()).
-  (cfield at affinitysolutions dot com)
- Fixed bug #29954 (array_reduce segfaults when initial value is array). (Tony)
- Fixed bug #29883 (isset gives invalid values on strings). (Tony, Dmitry)
- Fixed bug #29801 (Set limit on the size of mmapable data). (Ilia)
- Fixed bug #29557 (strtotime error). (Derick)
- Fixed bug #29418 (double free when openssl_csr_new fails).
-  (Kamesh Jayachandran).
- Fixed bug #29385 (Soapserver always uses std class). (David, Dmitry)
- Fixed bug #29211 (SoapClient doesn't request wsdl through proxy). (Rob)
- Fixed bug #28817 (Var problem when extending domDocument). (Georg)
- Fixed bug #28599 (strtotime fails with zero base time). (Derick)
- Fixed bug #28598 (Lost support for MS Symbol fonts). (Pierre)
- Fixed bug #28220 (mb_strwidth() returns wrong width values for some hangul
-  characters). (Moriyoshi)
- Fixed bug #28228 (NULL decimal separator is not being handled correctly).
-  (Ilia)
- Fixed bug #28209 (strtotime("now")). (Derick)
- Fixed bug #27798 (private / protected variables not exposed by 
-  get_object_vars() inside class). (Marcus)
- Fixed bug #27728 (Can't return within a zend_try {} block or the previous
-  bailout state isn't restored. (Andi)
- Fixed bug #27183 (Userland stream wrapper segfaults on stream_write). 
-  (Christian)
-
-23 Sep 2004, PHP 5.0.2
- Added new boolean (fourth) parameter to array_slice() that turns on the
-  preservation of keys in the returned array. (Derick)
- Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
-  them sort based on the current locale. (Derick)
- Added interface_exists() and make class_exists() only return true for real
-  classes. (Andrey)
- Added PHP_EOL constant that contains the OS way of representing newlines.
-  (Paul Hudson, Derick)
- Implemented periodic PCRE compiled regexp cache cleanup, to avoid memory
-  exhaustion. (Andrei)
- Renamed SoapClient->__call() to SoapClinet->__soapCall(). (Dmitry)
- Fixed bug with raw_post_data not getting set (Brian)
- Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
- Fixed bug #30209 (ReflectionClass::getMethod() lowercases attribute). 
-  (Marcus)
- Fixed bug #30182 (SOAP module processing WSDL file dumps core). (Dmitry)
- Fixed bug #30045 (Cannot pass big integers (> 2147483647) in SOAP requests).
-  (Dmitry)
- Fixed bug #29985 (unserialize()/ __PHP_Incomplete_class does not report 
-  correctly class name). (Marcus, Tony)
- Fixed bug #29945 (simplexml_load_file URL limitation 255 char). (Rob)
- Fixed bug #29873 (No defines around pcntl_*priority definitions). (Derick)
- Fixed bug #29844 (SOAP doesn't return the result of a valid SOAP request).
-  (Dmitry)
- Fixed bug #29842 (soapclient return null value). (Dmitry)
- Fixed bug #29839 (incorrect convert (xml:lang to lang)). (Dmitry)
- Fixed bug #29830 (SoapServer::setClass() should not export non-public
-  methods). (Dmitry)
- Fixed bug #29828 (Interfaces no longer work). (Marcus)
- Fixed bug #29821 (Fixed possible crashes in convert_uudecode() on invalid
-  data). (Ilia)
- Fixed bug #29808 (array_count_values() breaks with numeric strings). (Ilia)
- Fixed bug #29805 (HTTP Authentication Issues). (Uwe Schindler)
- Fixed bug #29795 (SegFault with Soap and Amazon's Web Services). (Dmitry)
- Fixed bug #29737 (ip2long should return -1 if IP is 255.255.255.255 and FALSE
-  on error). (Tony)
- Fixed bug #29711 (Changed ext/xml to default to UTF-8 output). (Rob)
- Fixed bug #29678 (opendir() with ftp:// wrapper segfaults if path does not
-  have trailing slash). (Ilia)
- Fixed bug #29657 (xml_* functions throw non descriptive error). 
-  (Christian, Rob)
- Fixed bug #29656 (segfault on result and statement properties). (Georg)
- Fixed bug #29566 (foreach/string handling strangeness (crash)). (Dmitry)
- Fixed bug #29447 (Reflection API issues). (Marcus)
- Fixed bug #29296 (Added sslv2 and sslv3 transports). (Wez)
- Fixed bug #29283 (Invalid statement handle in mysqli on execute). (Georg)
- Fixed bug #29913 (parse_url() is now binary safe). (Ilia)
- Fixed bug #27994 (segfault with Soapserver when WSDL-Cache is enabled).
-  (Dmitry)
- Fixed bug #27791 (Apache 2.0 SAPI build against Apache 2 HEAD). (Joe Orton,
-  Derick)
- Fixed bug #26737 (private/protected properties not serialized when user
-  declared method __sleep() exists). E_NOTICE thrown when __sleep() returns
-  name of non-existing member. (Andrey, Curt)
-
-12 Aug 2004, PHP 5.0.1
- Changed destructor mechanism so that destructors are called prior to request
-  shutdown. (Marcus)
- Rewritten UNIX and Windows install help files. (Documentation Team)
- Updated several libraries bundled with the windows release which now 
-  includes libxml2-2.6.11, libxslt-1.1.7 and iconv-1.9.1. (Rob, Edin)
- Improved and moved ActiveScript SAPI to PECL.  (Wez)
- Fixed bug #29606 (php_strip_whitespace() prints to stdout rather then
-  returning the value). (Ilia)
- Fixed bug #29577 (MYSQLI_CLIENT_FOUND_ROWS undefined) (Georg)
- Fixed bug #29573 (Segmentation fault, when exception thrown within
-  PHP function called from XSLT). (Christian)
- Fixed bug #29522 (accessing properties without connection) (Georg)
- Fixed bug #29505 (get_class_vars() severely broken when used with arrays).
-  (Marcus)
- Fixed bug #29490 (.Net object instantiation failed). (Michael Sisolak).
- Fixed bug #29474 (win32: usleep() doesn't work). (Wez)
- Fixed bug #29449 (win32: feof() hangs on empty tcp stream). (Wez)
- Fixed bug #29437 (Possible crash inside array_walk_recursive()). (Ilia)
- Fixed bug #29431 (crash when parsing invalid address; invalid address
-  returned by stream_socket_recvfrom(), stream_socket_getname()). (Wez)
- Fixed bug #29409 (Segfault in PHP functions called from XSLT). (Rob)
- Fixed unloading of dynamically loaded extensions. 
-  (Marcus, kameshj at fastmail dot fm)
- Fixed bug #29395 (sqlite_escape_string() returns bogus data on empty
-  strings). (Ilia, Tony)
- Fixed bug #29392 (com_dotnet crashes when echo'ing an object). (Wez)
- Fixed bug #29368 (The destructor is called when an exception is thrown from 
-  the constructor). (Marcus)
- Fixed bug #29354 (Exception constructor marked as both public and protected).
-  (Marcus)
- Fixed bug #29342 (strtotime() does not handle empty date string properly).
-  (Ilia)
- Fixed bug #29340 (win32 build produces invalid php_ifx.dll). (Edin)
- Fixed bug #29335 (fetch functions now use MYSQLI_BOTH as default) (Georg)
- Fixed bug #29291 (get_class_vars() return names with NULLs). (Marcus)
- Fixed bug #29264 (gettext extension not working). (Edin)
- Fixed bug #29258 (variant_date_from_timestamp() does not honour
-  timezone).  (Wez)
- Fixed bug #29256 (error when sending large packets on a socket). (Dmitry)
- Fixed bug #29236 (memory error when wsdl-cache is enabled). (Dmitry)
- Fixed bug #29147 (Compile Error in mnoGoSearch functions). (Sergey, Antony)
- Fixed bug #29132 ($_SERVER["PHP_AUTH_USER"] isn't defined). (Stefan)
- Fixed bug #29119 (html_entity_decode() misbehaves with UTF-8). (Moriyoshi)
- Fixed bug #29109 (SoapFault exception: [WSDL] Out of memory). (Dmitry)
- Fixed bug #29061 (soap extension segfaults). (Dmitry)
- Fixed bug #28985 (__getTypes() returning nothing on complex WSDL). (Dmitry)
- Fixed bug #28969 (Wrong data encoding of special characters). (Dmitry)
- Fixed bug #28895 (ReflectionClass::isAbstract always returns false). (Marcus)
- Fixed bug #28829 (Thread-unsafety in bcmath elementary values). (Sara)
- Fixed bug #28464 (catch() does not catch exceptions by interfaces). (Marcus)
- Fixed bug #27669 (PHP 5 didn't support all possibilities for calling static
-  methods dynamically). (Dmitry)
- Fixed ReflectionClass::getMethod() and ReflectionClass::getProperty() to
-  raise an ReflectionException instead of returning NULL on failure.
-  (Sebastian)
- Fixed convert.* filters to consume remaining buckets_in on flush. (Sara)
- Fixed bug in mysqli->client_version. (Georg)
-
-13 Jul 2004, PHP 5.0.0
- Updated PCRE to provide better error handling in certain cases. (Andrei)
- Changed doc comments to require a single white space after '/**'. (Marcus)
- Fixed bug #29019 (Database not closing). (Marcus)
- Fixed bug #29008 (array_combine() does not handle non-numeric/string keys).
-  (Ilia)
- Fixed bug #28999 (fixed behaviour of exec() to work as it did in 4.X). (Ilia)
- Fixed bug #28868 (Internal filter registry not thread safe). (Sara)
- Fixed bug #28851 (call_user_func_array has typo in error message). (Marcus)
- Fixed bug #28831 (ArrayObject::offsetGet() does the work of offsetUnset()). 
-  (Marcus)
- Fixed bug #28822 (ArrayObject::offsetExists() works inverted). (Marcus)
- Fixed bug #28789 (ReflectionProperty getValue() fails on public static 
-  members). (Marcus)
- Fixed bug #28771 (Segfault when using xslt and clone). (Rob)
- Fixed bug #28751 (SoapServer does not call _autoload()). (Dmitry)
- Fixed bug #28739 (array_*diff() and array_*intersect() not clearing the fci
-  cache before work). (Andrey)
- Fixed bug #28721 (appendChild() and insertBefore() unset DOMText).(Rob)
- Fixed bug #28702 (SOAP does not parse WSDL service address correctly). (Dmitry)
- Fixed bug #28699 (Reflection api bugs). (Marcus)
- Fixed bug #28694 (ReflectionExtension::getFunctions() crashes PHP). (Marcus)
- Fixed bug #28512 (Allocate enough space to store MSSQL data). (Frank)
- Fixed strip_tags() to correctly handle '\0' characters. (Stefan)
+- Add implementation of curl_multi_info_read (Brian)
+- Added "jump label" operator (limited "goto"). (Dmitry, Sara)
+- Added E_STRICT to E_ALL. (Dmitry)
+- Added gmp_nextprime() function. (Tony, patch by ants dot aasma at gmail dot com) 
+- Added "allow_url_include" ini option to be able to turn off remote url
+  code execution separately from the "allow_url_fopen" setting. (Rasmus)
+- Added --rclass and --rextension CLI parameters to reflect internal classes
+  and loaded extensions. (Johannes)
+- Added optional parameter to http_build_query() to allow specification of 
+  string separator. (Ilia)
+- Added an optional parameter to parse_url() to allow retrieval of distinct URL
+  components. (Ilia)
+- Added an optional parameter to strstr() and stristr() for retrieval of either
+  the part of haystack before or after first occurence of needle. (Johannes)
+- Added possibility to check in which extension an internal function was
+  defined using reflection API. (Johannes)
+- Added second optional parameter to stream_context_create() to set params
+  during context creation. (Sara)
+- Added sys_get_temp_dir() function that returns the default directory for
+  temporary files (as requested in bug #35380). (Hartmut)

+- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
+- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)
@@ -29,14 +29,22 @@ Having said that, here are the organizational rules:
   5. If you don't know how to do something, ask first!

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

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

 The next few rules are more of a technical nature.

@@ -31,15 +31,30 @@ resources cannot be auto-converted.

 Type specifiers
 ---------------
- l	- long
- d	- double
- s	- string (with possible null bytes) and its length
- b	- boolean, stored in zend_bool
- r	- resource (stored in zval)
- a	- array
- o	- object (of any type)
- O	- object (of specific type, specified by class entry)
- z	- the actual zval
+ The following list shows the type specifier, its meaning and the parameter 
+ types that need to be passed by address. All passed paramaters are set
+ if the PHP parameter is non optional and untouched if optional and the 
+ parameter is not present. The only exception is O where the zend_class_entry*
+ has to be provided on input and is used to verify the PHP parameter is an 
+ instance of that class.
+
+ l	- long (long)
+ d	- double (double)
+ s	- string (with possible null bytes) and its length (char*, int)
+ u	- unicode (UChar*, int)
+ t	- text (void * (char*/Uchar*), int (length), zend_uchar (IS_STRING/..))
+  	  actual type is controled by ini unicode setting
+ T	- text (void * (char*/Uchar*), int (length), zend_uchar (IS_STRING/..))
+  	  actual type controlled by first s or u
+ b	- boolean (zend_bool)
+ r	- resource (zval*)
+ a	- array (zval*)
+ h	- array (returned as HashTable*)
+ o	- object of any type (zval*)
+ O	- object of specific type given by class entry (zval*, zend_class_entry)
+ C	- class (zend_class_entry*)
+ z	- the actual zval (zval*)
+ Z	- the actual zval (zval**)

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

 ZEND_DECLARE_MODULE_GLOBALS(my_input_filter)

-function_entry my_input_filter_functions[] = {
+zend_function_entry my_input_filter_functions[] = {
    PHP_FE(my_get_raw,   NULL)
    {NULL, NULL, NULL}
 };
@@ -11,6 +11,8 @@ Zend
    * Const'ify APIs. Right now, many functions leave parameters untouched,
      but don't declare those as const. This makes interaction with other
      interfaces difficult which pass const parameters to us.
+    * Clean up object->string conversion behavior wherever possible (switch(),
+      comparison, etc)


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

    Other
    * use thread-safe resolver functions (either require BIND 8 or adns).
@@ -1,4 +1,4 @@
-Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski.
+Copyright (c) 1999-2006, Andi Gutmans, Sascha Schumann, Zeev Suraski.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Thread Safe Resource Manager                                         |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski|
+   | Copyright (c) 1999-2006, Andi Gutmans, Sascha Schumann, Zeev Suraski |
   | This source file is subject to the TSRM license, that is bundled     |
   | with this package in the file LICENSE                                |
   +----------------------------------------------------------------------+
@@ -430,7 +430,6 @@ void *tsrm_new_interpreter_context(void)

 	current = tsrm_tls_get();

-	new_ctx = malloc(sizeof(*new_ctx));
 	allocate_new_resource(&new_ctx, thread_id);
 	
 	/* switch back to the context that was in use prior to our creation
@@ -481,6 +480,52 @@ void ts_free_thread(void)
 }


+/* frees all resources allocated for all threads except current */
+void ts_free_worker_threads(void)
+{
+	tsrm_tls_entry *thread_resources;
+	int i;
+	THREAD_T thread_id = tsrm_thread_id();
+	int hash_value;
+	tsrm_tls_entry *last=NULL;
+
+	tsrm_mutex_lock(tsmm_mutex);
+	hash_value = THREAD_HASH_OF(thread_id, tsrm_tls_table_size);
+	thread_resources = tsrm_tls_table[hash_value];
+
+	while (thread_resources) {
+		if (thread_resources->thread_id != thread_id) {
+			for (i=0; i<thread_resources->count; i++) {
+				if (resource_types_table[i].dtor) {
+					resource_types_table[i].dtor(thread_resources->storage[i], &thread_resources->storage);
+				}
+			}
+			for (i=0; i<thread_resources->count; i++) {
+				free(thread_resources->storage[i]);
+			}
+			free(thread_resources->storage);
+			if (last) {
+				last->next = thread_resources->next;
+			} else {
+				tsrm_tls_table[hash_value] = thread_resources->next;
+			}
+			free(thread_resources);
+			if (last) {
+				thread_resources = last->next;
+			} else {
+				thread_resources = tsrm_tls_table[hash_value];
+			}
+		} else {
+			if (thread_resources->next) {
+				last = thread_resources;
+			}
+			thread_resources = thread_resources->next;
+		}
+	}
+	tsrm_mutex_unlock(tsmm_mutex);
+}
+
+
 /* deallocates all occurrences of a given id */
 void ts_free_id(ts_rsrc_id id)
 {
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Thread Safe Resource Manager                                         |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski|
+   | Copyright (c) 1999-2006, Andi Gutmans, Sascha Schumann, Zeev Suraski |
   | This source file is subject to the TSRM license, that is bundled     |
   | with this package in the file LICENSE                                |
   +----------------------------------------------------------------------+
@@ -106,6 +106,9 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id);
 /* frees all resources allocated for the current thread */
 TSRM_API void ts_free_thread(void);

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

@@ -42,6 +42,8 @@ char *alloca ();
 #ifndef MAXPATHLEN
 # ifdef PATH_MAX
 #  define MAXPATHLEN PATH_MAX
+# elif defined(MAX_PATH)
+#  define MAXPATHLEN MAX_PATH
 # else
 #  define MAXPATHLEN 256
 # endif
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2005 The PHP Group                                |
+   | Copyright (c) 1997-2006 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
+   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
+   | http://www.php.net/license/3_01.txt                                  |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2005 The PHP Group                                |
+   | Copyright (c) 1997-2006 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
+   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
+   | http://www.php.net/license/3_01.txt                                  |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2005 The PHP Group                                |
+   | Copyright (c) 1997-2006 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
+   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
+   | http://www.php.net/license/3_01.txt                                  |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
@@ -163,18 +163,15 @@ static int php_is_file_ok(const cwd_state *state)
 static void cwd_globals_ctor(virtual_cwd_globals *cwd_globals TSRMLS_DC)
 {
 	CWD_STATE_COPY(&cwd_globals->cwd, &main_cwd_state);
-#ifdef REALPATH_CACHE
 	cwd_globals->realpath_cache_size = 0;
 	cwd_globals->realpath_cache_size_limit = REALPATH_CACHE_SIZE;
 	cwd_globals->realpath_cache_ttl = REALPATH_CACHE_TTL;
 	memset(cwd_globals->realpath_cache, 0, sizeof(cwd_globals->realpath_cache));
-#endif
 }

 static void cwd_globals_dtor(virtual_cwd_globals *cwd_globals TSRMLS_DC)
 {
 	CWD_STATE_FREE(&cwd_globals->cwd);
-#ifdef REALPATH_CACHE
 	{
 		int i;

@@ -187,7 +184,6 @@ static void cwd_globals_dtor(virtual_cwd_globals *cwd_globals TSRMLS_DC)
 			}
 		}
 	}
-#endif
 }

 static char *tsrm_strndup(const char *s, size_t length)
@@ -308,7 +304,6 @@ CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC)
 	return buf;
 }

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


 /* Resolve path relatively to state and put the real path into state */
@@ -385,20 +379,17 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 #else
 	char *new_path;
 #endif
-#ifdef REALPATH_CACHE
 	char orig_path[MAXPATHLEN];
-	int orig_path_len;
+	int orig_path_len = 0;
 	realpath_cache_bucket *bucket;
-	time_t t;
+	time_t t = 0;
 	TSRMLS_FETCH();
-#endif

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

-#ifdef REALPATH_CACHE
 	if (use_realpath && CWDG(realpath_cache_size_limit)) {
 		if (IS_ABSOLUTE_PATH(path, path_length) || (state->cwd_length < 1)) {
 			memcpy(orig_path, path, path_length+1);
@@ -430,7 +421,6 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 			}
 		}
 	}
-#endif
 #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
@@ -478,13 +468,14 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 #endif
 #if defined(TSRM_WIN32)
 	{
-		char *dummy = NULL;
 		int new_path_length;
  
-		new_path_length = GetLongPathName(path, dummy, 0) + 1;
+		new_path_length = GetLongPathName(path, NULL, 0);
 		if (new_path_length == 0) {
-			return 1;
+			goto php_failed_getlongpath;
 		}
+
+		/* GetLongPathName already counts the \0 */
 		new_path = (char *) malloc(new_path_length);
 		if (!new_path) {
 			return 1;
@@ -495,6 +486,7 @@ 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;
 		}
 	}
@@ -607,11 +599,9 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 #endif
 	free(free_path);

-#ifdef REALPATH_CACHE
 	if (use_realpath && CWDG(realpath_cache_size_limit)) {
 		realpath_cache_add(orig_path, orig_path_len, state->cwd, state->cwd_length, t TSRMLS_CC);
 	}
-#endif

 	if (verify_path && verify_path(state)) {
 		CWD_STATE_FREE(state);
@@ -775,7 +765,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 TSRMLS_DC)
+CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int link TSRMLS_DC)
 {
 	cwd_state new_state;
 	int ret;
@@ -783,7 +773,15 @@ CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group TSRMLS_
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
 	virtual_file_ex(&new_state, filename, NULL, 0);

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

 	CWD_STATE_FREE(&new_state);
 	return ret;
@@ -856,7 +854,9 @@ CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC)
 	int retval;

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

 	retval = stat(new_state.cwd, buf);

@@ -1043,6 +1043,26 @@ 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:
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2005 The PHP Group                                |
+   | Copyright (c) 1997-2006 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
+   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
+   | http://www.php.net/license/3_01.txt                                  |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
@@ -166,23 +166,8 @@ CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC);
 #endif
 #endif

-/* On AIX & Tru64 when a file does not exist realpath() returns
- * NULL, and sets errno to ENOENT. Unlike in other libc implementations
- * the destination is not filled and remains undefined. Therefor, we
- * must populate it manually using strcpy as done on systems with no
- * realpath() function.
- */
 #if defined(__osf__) || defined(_AIX)
-static char *php_realpath_hack(char *src, char *dest)
-{
-	char *ret;
-
-	if ((ret = realpath(src, dest)) == NULL && errno == ENOENT) {
-		return strcpy(dest, src);
-	} else {
-		return ret;
-	}
-}
+char *php_realpath_hack(char *src, char *dest);
 #endif

 #if HAVE_UTIME
@@ -190,16 +175,14 @@ CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC);
 #endif
 CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC);
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
-CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group TSRMLS_DC);
+CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int link TSRMLS_DC);
 #endif

 CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath);

-#define REALPATH_CACHE
 #define REALPATH_CACHE_TTL  (2*60) /* 2 minutes */
 #define REALPATH_CACHE_SIZE 0      /* disabled while php.ini isn't loaded */

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

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

 #ifdef ZTS
@@ -262,7 +242,10 @@ extern virtual_cwd_globals cwd_globals;
 #endif
 #define VCWD_CHMOD(path, mode) virtual_chmod(path, mode TSRMLS_CC)
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
-#define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group TSRMLS_CC)
+#define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group, 0 TSRMLS_CC)
+#if HAVE_LCHOWN
+#define VCWD_LCHOWN(path, owner, group) virtual_chown(path, owner, group, 1 TSRMLS_CC)
+#endif
 #endif

 #else
@@ -305,6 +288,9 @@ extern virtual_cwd_globals cwd_globals;
 #define VCWD_CHMOD(path, mode) chmod(path, mode)
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
 #define VCWD_CHOWN(path, owner, group) chown(path, owner, group)
+#if HAVE_LCHOWN
+#define VCWD_LCHOWN(path, owner, group) lchown(path, owner, group)
+#endif
 #endif

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

 Redistribution and use in source and binary forms, with or without
@@ -15,9 +15,9 @@ 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_reflection_api.c \
+	zend_default_classes.c \
 	zend_iterators.c zend_interfaces.c zend_exceptions.c \
-	zend_strtod.c zend_multibyte.c
+	zend_strtod.c zend_strtod.c zend_strtol.c

 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
@@ -160,13 +160,6 @@ AC_ARG_ENABLE(memory-limit,
  ZEND_MEMORY_LIMIT=no
 ])

-AC_ARG_ENABLE(zend-multibyte,
-[  --enable-zend-multibyte Compile with zend multibyte support], [
-  ZEND_MULTIBYTE=$enableval
-],[
-  ZEND_MULTIBYTE=no
-])
-
 AC_MSG_CHECKING([virtual machine dispatch method])
 AC_MSG_RESULT($PHP_ZEND_VM)

@@ -185,9 +178,6 @@ AC_MSG_RESULT($ZEND_MEMORY_LIMIT)
 AC_MSG_CHECKING(whether to enable Zend debugging)
 AC_MSG_RESULT($ZEND_DEBUG)

-AC_MSG_CHECKING(whether to enable Zend multibyte)
-AC_MSG_RESULT($ZEND_MULTIBYTE)
-	
 case $PHP_ZEND_VM in
  SWITCH)
    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method])
@@ -234,10 +224,6 @@ else
  AC_DEFINE(MEMORY_LIMIT, 0, [Memory limit])
 fi

-if test "$ZEND_MULTIBYTE" = "yes"; then
-  AC_DEFINE(ZEND_MULTIBYTE, 1, [ ])
-fi
-
 changequote({,})
 if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
  INLINE_CFLAGS=`echo $ac_n "$CFLAGS $ac_c" | sed s/-O[0-9s]*//`
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2005 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2006 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -4,28 +4,31 @@ dnl This file contains local autoconf functions.

 AC_DEFUN([LIBZEND_BISON_CHECK],[
  # we only support certain bison versions
-  bison_version_list="1.28 1.35 1.75 1.875 2.0"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2"

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

+  bison_version=none
  if test "$YACC"; then
    AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-      set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /'|tr -d a-z`
-      bison_version="${1}.${2}"
+      bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
      php_cv_bison_version=invalid
-      for bison_check_version in $bison_version_list; do
-        if test "$bison_version" = "$bison_check_version"; then
-          php_cv_bison_version="$bison_check_version (ok)"
-        fi
-      done
+      if test -n "$bison_version_vars"; then
+        set $bison_version_vars
+        bison_version="${1}.${2}"
+        for bison_check_version in $bison_version_list; do
+          if test "$bison_version" = "$bison_check_version"; then
+            php_cv_bison_version="$bison_check_version (ok)"
+            break
+          fi
+        done
+      fi
    ])
-  else
-    bison_version=none
  fi
  case $php_cv_bison_version in
    ""|invalid[)]
-      bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list  (found: $bison_version)."
+      bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)."
      AC_MSG_WARN([$bison_msg])
      YACC="exit 0;"
      ;;
@@ -179,7 +179,7 @@ function fibo($n) {

 /****/

-function hash($n) {
+function hash1($n) {
  for ($i = 1; $i <= $n; $i++) {
    $X[dechex($i)] = $i;
  }
@@ -401,8 +401,8 @@ ary3(2000);
 $t = end_test($t, "ary3(2000)");
 fibo(30);
 $t = end_test($t, "fibo(30)");
-hash(50000);
-$t = end_test($t, "hash(50000)");
+hash1(50000);
+$t = end_test($t, "hash1(50000)");
 hash2(500);
 $t = end_test($t, "hash2(500)");
 heapsort(20000);
@@ -440,18 +440,6 @@ YY_MALLOC_DECL
 #define ECHO /* There is no output */
 #endif

-#ifdef ZEND_MULTIBYTE
-# define YY_INPUT(buf, result, max_size) \
-	if ( ((result = zend_multibyte_yyinput(yyin, buf, max_size TSRMLS_CC)) == 0) \
-		&& zend_stream_ferror( yyin TSRMLS_CC) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
-#else
-# define YY_INPUT(buf, result, max_size) \
-	if ( ((result = zend_stream_read(yyin, buf, max_size TSRMLS_CC)) == 0) \
-		  && zend_stream_ferror( yyin TSRMLS_CC) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
-#endif
-
 #ifndef ECHO
 %- Standard (non-C++) definition
 /* This used to be an fputs(), but since the string might contain NUL's,
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2005 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2006 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -0,0 +1,13 @@
+--TEST--
+Test for abstract static classes
+--FILE--
+<?php
+abstract class Test
+{
+    abstract static public function getName();
+}
+?>
+DONE
+--EXPECTF--
+
+Fatal error: Static function Test::getName() cannot be abstract in %sabstract-static.php on line %d
@@ -12,4 +12,4 @@ foo(123);
 --EXPECTF--
 3

-Fatal error: Argument 1 must be an array, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
+Catchable fatal error: Argument 1 passed to foo() must be an array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
@@ -34,6 +34,3 @@ $c->viewMom();
 --EXPECT--
 protected method
 protected property
--EXPECT--
-protected method
-protected property
@@ -32,3 +32,20 @@ string(3) "foo"
 'foo'
 string(3) "foo"
 'foo'
+--UEXPECTF--
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
@@ -10,3 +10,5 @@ foo();
 ?>
 --EXPECT--
 string(1) "a"
+--UEXPECT--
+unicode(1) "a"
@@ -16,4 +16,8 @@ array(1) {
  ["public"]=>
  string(6) "public"
 }
-
+--UEXPECT--
+array(1) {
+  [u"public"]=>
+  unicode(6) "public"
+}
@@ -1,5 +1,5 @@
 --TEST--
-Bug #26077  	Memory leaks when creating an instance of an object
+Bug #26077 (Memory leaks when creating an instance of an object)
 --FILE--
 <?php
 class foo {} new foo();
@@ -2,6 +2,7 @@
 Bug #26166 (__toString() crash when no values returned)
 --FILE--
 <?php
+
 class Foo
 {
    function __toString()
@@ -28,6 +29,23 @@ class Bar
 $o = new Bar;
 echo $o;

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

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

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

-Fatal error: Method None::__toString() must return a string value in %sbug26166.php on line %d
+Fatal error: Method Error::__toString() must not throw an exception in %sbug26166.php on line %d
+--UEXPECTF--
+Hello World!
+===NONE===
+unicode(52) "Method None::__toString() must return a string value"
+===THROW===
+
+Fatal error: Method Error::__toString() must not throw an exception in %sbug26166.php on line %d
@@ -70,3 +70,40 @@ array(1) {
  int(1)
 }
 ===DONE===
+--UEXPECT--
+Base::__construct
+array(3) {
+  [u"Foo"]=>
+  int(1)
+  [u"Bar"]=>
+  int(2)
+  [u"Baz"]=>
+  int(3)
+}
+array(1) {
+  [u"Foo"]=>
+  int(1)
+}
+Base::__construct
+array(3) {
+  [u"Baz"]=>
+  int(4)
+  [u"Foo"]=>
+  int(1)
+  [u"Bar"]=>
+  int(2)
+}
+Child::__construct
+array(3) {
+  [u"Baz"]=>
+  int(4)
+  [u"Foo"]=>
+  int(1)
+  [u"Bar"]=>
+  int(2)
+}
+array(1) {
+  [u"Foo"]=>
+  int(1)
+}
+===DONE===
@@ -63,3 +63,21 @@ string(2) "A2"
 string(2) "C2"
 string(2) "C2"
 ===DONE===
+--UEXPECTF--
+===INIT===
+unicode(1) "A"
+unicode(1) "C"
+unicode(1) "C"
+===SetA===
+unicode(2) "A2"
+unicode(1) "C"
+unicode(1) "C"
+===SetB===
+unicode(2) "A2"
+unicode(2) "B2"
+unicode(2) "B2"
+===SetC===
+unicode(2) "A2"
+unicode(2) "C2"
+unicode(2) "C2"
+===DONE===
@@ -3,6 +3,12 @@ Bug #28444 (Cannot access undefined property for object with overloaded property
 --FILE--
 <?php

+function my_error_handler($errno, $errstr, $errfile, $errline) {
+	var_dump($errstr);
+}
+
+set_error_handler('my_error_handler');
+
 class Object
 {
 	public $x;
@@ -60,7 +66,8 @@ Overloaded::__set(y,3)
 int(3)
 Overloaded::__get(y)
 int(3)
-Overloaded::__set(z,Object id #3)
+string(55) "Object of class Object could not be converted to string"
+Overloaded::__set(z,)
 object(Object)#%d (1) {
  ["x"]=>
  int(4)
@@ -72,3 +79,27 @@ int(5)
 Overloaded::__get(z)
 int(6)
 ===DONE===
+--UEXPECTF--
+object(Object)#%d (1) {
+  [u"x"]=>
+  int(2)
+}
+int(2)
+int(3)
+Overloaded::__set(y,3)
+int(3)
+Overloaded::__get(y)
+int(3)
+unicode(55) "Object of class Object could not be converted to string"
+Overloaded::__set(z,)
+object(Object)#%d (1) {
+  [u"x"]=>
+  int(4)
+}
+Overloaded::__get(z)
+int(4)
+Overloaded::__get(z)
+int(5)
+Overloaded::__get(z)
+int(6)
+===DONE===
@@ -89,7 +89,7 @@ if (is_callable(array('test_class','test_func4'))) {
 $object = new foo();
 $object->test();
 ?>
--EXPECT--
+--EXPECTF--
 test_func1
 test_func2
 test_func3
@@ -29,3 +29,20 @@ array(2) {
  }
 }
 ===DONE===
+--UEXPECT--
+array(2) {
+  [u"empty"]=>
+  array(0) {
+  }
+  [u"three"]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [u"b"]=>
+    unicode(1) "c"
+    [3]=>
+    array(0) {
+    }
+  }
+}
+===DONE===
@@ -39,3 +39,13 @@ NULL
 string(4) "Base"

 Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d
+--UEXPECTF--
+===BASE===
+unicode(4) "Base"
+
+Notice: Undefined property:  BaseClass::$private_child in %sbug29674.php on line %d
+NULL
+===CHILD===
+unicode(4) "Base"
+
+Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d
@@ -28,3 +28,10 @@ string(1) "z"
 string(1) "x"
 string(1) "y"
 string(1) "z"
+--UEXPECT--
+unicode(1) "x"
+unicode(1) "y"
+unicode(1) "z"
+unicode(1) "x"
+unicode(1) "y"
+unicode(1) "z"
@@ -50,3 +50,12 @@ object(hariCow)#1 (2) {
  ["y"]=>
  string(1) "y"
 }
+--UEXPECTF--
+Notice: Undefined variable: db in %sbug30162.php on line 35
+NULL
+object(hariCow)#1 (2) {
+  [u"x"]=>
+  unicode(1) "x"
+  [u"y"]=>
+  unicode(1) "y"
+}
@@ -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
-        (
-        )
-
-)
@@ -1,5 +1,5 @@
 --TEST--
-Bug 30346 (arrayAcces & using $this)
+Bug #30346 (arrayAccess and using $this)
 --FILE--
 <?php

@@ -21,4 +21,4 @@ echo "\n";
 ===DONE===
 --EXPECT--
 page_show
-===DONE===
+===DONE===
@@ -16,3 +16,7 @@ haricow();
 string(3) "one"
 string(3) "one"
 ===DONE===
+--UEXPECT--
+unicode(3) "one"
+unicode(3) "one"
+===DONE===
@@ -37,3 +37,18 @@ object(bar)#1 (6) {
  ["c6"]=>
  int(1)
 }
+--UEXPECT--
+object(bar)#1 (6) {
+  [u"c1"]=>
+  int(1)
+  [u"c2"]=>
+  int(2)
+  [u"c3"]=>
+  int(1)
+  [u"c4"]=>
+  int(2)
+  [u"c5"]=>
+  int(1)
+  [u"c6"]=>
+  int(1)
+}
@@ -2,22 +2,43 @@
 Bug #30791 magic methods (__sleep/__wakeup/__toString) call __call if object is overloaded 
 --FILE--
 <?php
-class a {
+
+function my_error_handler($errno, $errstr, $errfile, $errline) {
+	var_dump($errstr);
+}
+
+set_error_handler('my_error_handler');
+
+class a
+{
   public $a = 4;
   function __call($a,$b) {
       return "unknown method";
   }
 }
+
 $b = new a;
 echo $b,"\n";
 $c = unserialize(serialize($b));
 echo $c,"\n";
 var_dump($c);
+
 ?>
 --EXPECT--
-Object id #1
-Object id #2
+string(50) "Object of class a could not be converted to string"
+
+string(50) "Object of class a could not be converted to string"
+
 object(a)#2 (1) {
  ["a"]=>
  int(4)
 }
+--UEXPECT--
+unicode(50) "Object of class a could not be converted to string"
+
+unicode(50) "Object of class a could not be converted to string"
+
+object(a)#2 (1) {
+  [u"a"]=>
+  int(4)
+}
@@ -0,0 +1,18 @@
+--TEST--
+Bug #31177 (memory corruption because of incorrect refcounting)
+--FILE--
+<?php
+class foo {
+  function foo($n=0) {
+    if($n) throw new Exception("new");
+  }
+}
+$x = new foo();
+try {
+  $y=$x->foo(1);
+} catch (Exception $e) {
+  var_dump($x);
+}
+--EXPECT--
+object(foo)#1 (0) {
+}
@@ -0,0 +1,29 @@
+--TEST--
+Bug #31341 (escape on curly inconsistent)
+--FILE--
+<?php
+$a = array(
+	"$     \{    ",
+	"      \{   $",
+	"      \{$   ",
+	"      $\{   ",
+	"      \$\{  ",
+	"      \{\$  ",
+	"\$    \{    ",
+	"      \{  \$",
+	"%     \{    ");
+
+foreach ($a as $v) {
+	echo("'$v'\n");
+}
+?>
+--EXPECT--
+'$     \{    '
+'      \{   $'
+'      \{$   '
+'      $\{   '
+'      $\{  '
+'      \{$  '
+'$    \{    '
+'      \{  $'
+'%     \{    '
@@ -95,3 +95,30 @@ NULL
 string(2) "ok"
 string(2) "ok"
 ---
+--UEXPECT--
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+NULL
+unicode(2) "ok"
+unicode(2) "ok"
+---
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+NULL
+unicode(2) "ok"
+unicode(2) "ok"
+---
@@ -1,25 +0,0 @@
--TEST--
-Bug #31828 (Crash with zend.ze1_compatibility_mode=On)
--INI--
-zend.ze1_compatibility_mode=on
-error_reporting=4095
--FILE--
-<?php
-$o = new stdClass();
-$o->id = 77;
-$o->name = "Aerospace";
-$a[] = $o;
-$a = $a[0];
-print_r($a);
-?>
--EXPECTF--
-Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug31828.php on line 2
-
-Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug31828.php on line 5
-
-Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug31828.php on line 6
-stdClass Object
-(
-    [id] => 77
-    [name] => Aerospace
-)
@@ -1,18 +0,0 @@
--TEST--
-Bug #32080 (segfault when assigning object to itself with zend.ze1_compatibility_mode=On)
--INI--
-zend.ze1_compatibility_mode=on
-error_reporting=4095
--FILE--
-<?php
-class test { }
-$t = new test;
-$t = $t; // gives segfault
-var_dump($t);
-?>
--EXPECTF--
-Strict Standards: Implicit cloning object of class 'test' because of 'zend.ze1_compatibility_mode' in %sbug32080.php on line 3
-
-Strict Standards: Implicit cloning object of class 'test' because of 'zend.ze1_compatibility_mode' in %sbug32080.php on line 5
-object(test)#%d (0) {
-}
@@ -7,7 +7,31 @@ class TestA
 {
 	public function doSomething($i)
 	{
-		echo __METHOD__ . "($this)\n";
+		echo __METHOD__ . "($i)\n";
+		return --$i;
+	}
+
+	public function doSomethingThis($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		return --$i;
+	}
+
+	public function doSomethingParent($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		return --$i;
+	}
+
+	public function doSomethingParentThis($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		return --$i;
+	}
+
+	public static function doSomethingStatic($i)
+	{
+		echo __METHOD__ . "($i)\n";
 		return --$i;
 	}
 }
@@ -16,20 +40,87 @@ class TestB extends TestA
 {
 	public function doSomething($i)
 	{
-		echo __METHOD__ . "($this)\n";
+		echo __METHOD__ . "($i)\n";
 		$i++;
 		if ($i >= 5) return 5;
-		return call_user_func_array(array("TestA","doSomething"), array($i));
+		return call_user_func_array(array("TestA", "doSomething"), array($i));
+	}
+
+	public function doSomethingThis($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		$i++;
+		if ($i >= 5) return 5;
+		return call_user_func_array(array($this, "TestA::doSomethingThis"), array($i));
+	}
+
+	public function doSomethingParent($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		$i++;
+		if ($i >= 5) return 5;
+		return call_user_func_array(array("parent", "doSomethingParent"), array($i));
+	}
+
+	public function doSomethingParentThis($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		$i++;
+		if ($i >= 5) return 5;
+		return call_user_func_array(array($this, "parent::doSomethingParentThis"), array($i));
+	}
+
+	public static function doSomethingStatic($i)
+	{
+		echo __METHOD__ . "($i)\n";
+		$i++;
+		if ($i >= 5) return 5;
+		return call_user_func_array(array("TestA", "doSomethingStatic"), array($i));
 	}
 }

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

 ?>
 ===DONE===
+<?php exit(0); ?>
 --EXPECTF--
-TestB::doSomething(Object id #%d)
-TestA::doSomething(Object id #%d)
+===A===
+TestB::doSomething(1)
+
+Strict Standards: Non-static method TestA::doSomething() cannot be called statically in %s on line %d
+TestA::doSomething(2)
+int(1)
+
+===B===
+TestB::doSomethingThis(1)
+TestA::doSomethingThis(2)
+int(1)
+
+===C===
+TestB::doSomethingParent(1)
+
+Strict Standards: Non-static method TestA::doSomethingParent() cannot be called statically in %s on line %d
+TestA::doSomethingParent(2)
+int(1)
+
+===D===
+TestB::doSomethingParentThis(1)
+TestA::doSomethingParentThis(2)
+int(1)
+
+===E===
+TestB::doSomethingStatic(1)
+TestA::doSomethingStatic(2)
 int(1)
 ===DONE===
@@ -63,6 +63,7 @@ $getCopyofSingleton2   = test::getInstance2();

 define('SCRIPT_END',1);
 ?>
+===DONE===
 --EXPECTF--
 Try static instance inside class :
 New class Singleton1 created 
@@ -76,5 +77,6 @@ Using old class Singleton2

 Strict Standards: Only variables should be assigned by reference in %sbug32322.php on line 55
 Using old class Singleton2
+===DONE===
 Class Singleton1 destroyed at script end
 Class Singleton2 destroyed at script end
@@ -19,3 +19,9 @@ object(test)#1 (1) {
  ["c"]=>
  int(2)
 }
+--UEXPECT--
+2
+object(test)#1 (1) {
+  [u"c"]=>
+  int(2)
+}
@@ -1,38 +0,0 @@
--TEST--
-Bug #32852 (Crash with singleton and __destruct when zend.ze1_compatibility_mode = On)
--INI--
-zend.ze1_compatibility_mode=on
-error_reporting=4095
--FILE--
-<?php
-class crashme {
-    private static $instance = null;
-
-    public function __construct() {
-        self::$instance = $this;
-    }
-
-    public function __destruct() {
-        echo "i'm called\n";
-    }
-
-    public static function singleton() {
-        if (!isset(self::$instance)) {
-            self::$instance = new crashme();
-        }
-        return self::$instance;
-    }
-}
-
-crashme::singleton();
-?>
--EXPECTF--
-Strict Standards: Implicit cloning object of class 'crashme' because of 'zend.ze1_compatibility_mode' in %sbug32852.php on line 6
-i'm called
-
-Strict Standards: Implicit cloning object of class 'crashme' because of 'zend.ze1_compatibility_mode' in %sbug32852.php on line 15
-i'm called
-
-Strict Standards: Implicit cloning object of class 'crashme' because of 'zend.ze1_compatibility_mode' in %sbug32852.php on line 17
-i'm called
-i'm called
@@ -1,25 +0,0 @@
--TEST--
-Bug #33243 (ze1_compatibility_mode does not work as expected)
--INI--
-zend.ze1_compatibility_mode=1
-error_reporting=4095
--FILE--
-<?php
-$a->y->z = 0;
-$b = $a;      // should perform deep copy of $a
-$b->y->z = 1; // hence this should have no effect on $a
-var_dump($a);
-?>
--EXPECTF--
-Strict Standards: Creating default object from empty value in %sbug33243.php on line 2
-
-Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug33243.php on line 3
-
-Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug33243.php on line 5
-object(stdClass)#%d (1) {
-  ["y"]=>
-  object(stdClass)#%d (1) {
-    ["z"]=>
-    int(0)
-  }
-}
@@ -1,5 +1,7 @@
 --TEST--
 Bug #33257 array_splice() inconsistent when passed function instead of variable 
+--INI--
+error_reporting=4095
 --FILE--
 <?php
 class X {
@@ -14,4 +16,10 @@ array_splice(X::getArr(), 1, 1);
 print_r(X::getArr());
 ?>
 --EXPECTF--
-Fatal error: Only variables can be passed by reference in %sbug33257.php on line 10
+Strict Standards: Only variables should be passed by reference in %sbug33257.php on line 10
+Array
+(
+    [0] => a
+    [1] => b
+    [2] => c
+)
@@ -0,0 +1,73 @@
+--TEST--
+Bug #33512 (unset() overloaded properties doesn't work)
+--FILE--
+<?php
+class TheObj {
+		public $RealVar1, $RealVar2, $RealVar3, $RealVar4;
+		public $Var = array();
+
+		function __set($var, $val) {
+			$this->Var[$var] = $val;
+		}
+		function __get($var) {
+			if(isset($this->Var[$var])) return $this->Var[$var];
+			else return -1;
+		}
+		function __unset($var) {
+			unset($this->Var[$var]);
+		}
+	}
+
+	$SomeObj = new TheObj;
+
+	// this will fine
+	$SomeObj->RealVar1 = 'somevalue';
+	$SomeObj->{'RealVar2'} = 'othervalue';
+	$SomeObj->{'RealVar'.(3)} = 'othervaluetoo';
+	$SomeObj->{'RealVar'.'4'} = 'anothervalue';
+
+	// this will fine too
+	$SomeObj->Virtual1 = 'somevalue';
+	$SomeObj->{'Virtual2'} = 'othervalue';
+
+	// it's can't be used since this will encounter error
+	$SomeObj->{'Virtual'.(3)} = 'othervaluetoo';
+	$SomeObj->{'Virtual'.'4'} = 'anothervalue';
+
+	// but this will fine, ofcourse
+	$SomeObj->Var['Virtual'.(3)] = 'othervaluetoo';
+	$SomeObj->Var['Virtual'.'4'] = 'anothervalue';
+
+
+	var_dump($SomeObj->RealVar1);
+	print $SomeObj->{'RealVar'.(3)}."\n";
+	
+	unset($SomeObj->RealVar1);
+	unset($SomeObj->{'RealVar'.(3)});
+
+	//the lines below will catch by '__get' magic method since these variables are unavailable anymore
+	var_dump($SomeObj->RealVar1);
+	print $SomeObj->{'RealVar'.(3)}."\n";
+
+	// now we will try to unset these variables
+	unset($SomeObj->Virtual1);
+	unset($SomeObj->{'Virtual'.(3)});
+
+	//but, these variables are still available??? eventhough they're "unset"-ed
+	print $SomeObj->Virtual1."\n";
+	print $SomeObj->{'Virtual'.(3)}."\n";
+?>
+--EXPECT--
+string(9) "somevalue"
+othervaluetoo
+int(-1)
+-1
+-1
+-1
+--UEXPECT--
+unicode(9) "somevalue"
+othervaluetoo
+int(-1)
+-1
+-1
+-1
@@ -0,0 +1,45 @@
+--TEST--
+Bug #33732 (Wrong behavior of constants in class and interface extending)
+--FILE--
+<?php
+interface iA {
+  const cA = "const of iA\n";
+}
+
+class A implements iA {
+}
+
+class B extends A implements iA {
+}
+
+echo iA::cA;
+echo A::cA;
+echo B::cA;
+
+
+interface iA2 {
+    const cA = "const of iA2\n";
+}
+
+interface iB2 extends iA2 {
+}
+
+class A2 implements iA2 {
+}
+
+class B2 extends A2 implements iB2 {
+}
+
+echo iA2::cA;
+echo A2::cA;
+echo iB2::cA;
+echo B2::cA;
+?>
+--EXPECT--
+const of iA
+const of iA
+const of iA
+const of iA2
+const of iA2
+const of iA2
+const of iA2
@@ -0,0 +1,40 @@
+--TEST--
+bug #33771 (error_reporting falls to 0 when @ was used inside try/catch block)
+--FILE--
+<?php
+
+error_reporting(E_ALL | E_STRICT);
+
+var_dump(error_reporting());
+
+function make_exception()
+{
+    throw new Exception();
+}
+
+function make_exception_and_change_err_reporting()
+{
+    error_reporting(E_ALL & ~E_STRICT);
+    throw new Exception();
+}
+
+
+try {
+	@make_exception();
+} catch (Exception $e) {}
+
+var_dump(error_reporting());
+
+try {
+	@make_exception_and_change_err_reporting();
+} catch (Exception $e) {}
+
+var_dump(error_reporting());
+
+echo "Done\n";
+?>
+--EXPECTF--	
+int(8191)
+int(8191)
+int(6143)
+Done
@@ -1,7 +1,7 @@
 --TEST--
 Bug #33996 (No information given for fatal error on passing invalid value to typed argument)
 --INI--
-error_reporting=4095
+error_reporting=8191
 --FILE--
 <?php
 class Foo
@@ -24,6 +24,6 @@ FooTest();
 FooTest(new Foo());
 ?>
 --EXPECTF--
-Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line 17 and defined in %sbug33996.php on line 12
+Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d
 Hi!
-Fatal error: Argument 1 must be an object of class Foo, called in %sbug33996.php on line 18 and defined in %sbug33996.php on line 7
+Catchable fatal error: Argument 1 passed to FooTest() must be an instance of Foo, none given, called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d
@@ -28,3 +28,14 @@ int(1)

 Notice: Object of class Foo could not be converted to double in %sbug33999.php on line 12
 float(1)
+--UEXPECTF--
+object(Foo)#1 (1) {
+  [u"bar"]=>
+  unicode(3) "bat"
+}
+
+Notice: Object of class Foo could not be converted to int in %sbug33999.php on line 9
+int(1)
+
+Notice: Object of class Foo could not be converted to double in %sbug33999.php on line 12
+float(1)
@@ -0,0 +1,28 @@
+--TEST--
+Bug #34045 (Buffer overflow with serialized object)
+--FILE--
+<?php
+class BasicSingleton
+{
+    private static $instance;
+
+    public function __wakeup() {
+        self::$instance = $this;
+    }
+
+    public static function singleton() {
+        if (!(self::$instance instanceof BasicSingleton)) {
+            $c = __CLASS__;
+            self::$instance = new $c;
+        }
+        return self::$instance;
+    }
+}
+
+$db = BasicSingleton::singleton();
+$db_str = serialize($db);
+$db2 = unserialize($db_str);
+echo "ok\n";
+?>
+--EXPECT--
+ok
@@ -0,0 +1,24 @@
+--TEST--
+Bug #34062 (Crash in catch block when many arguments are used)
+--FILE--
+<?php
+function f1() { throw new Exception; }
+function f2() { echo "here\n"; }
+
+try {
+      // Currently it's the minimum required number of zeros
+      // If you remove one, it won't crash
+	max(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, f1());
+} catch (Exception $e) {
+	echo "(((\n";
+	f2(0, 0, 0); // Won't crash if less than 3 zeros here
+	echo ")))\n";
+}
+?>
+--EXPECT--
+(((
+here
+)))
+
@@ -0,0 +1,41 @@
+--TEST--
+Bug #34064 (arr[] as param to function in class gives invalid opcode)
+--FILE--
+<?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();
+?>
+--EXPECTF--
+array(1) {
+  [0]=>
+  string(2) "ok"
+}
+
+Fatal error: Cannot use [] for reading in %sbug34064.php on line 18
+--UEXPECTF--
+array(1) {
+  [0]=>
+  unicode(2) "ok"
+}
+
+Fatal error: Cannot use [] for reading in %sbug34064.php on line 18
@@ -0,0 +1,10 @@
+--TEST--
+Bug #34137 (assigning array element by reference causes binary mess)
+--FILE--
+<?php
+$arr1 = array('a1' => array('alfa' => 'ok'));
+$arr1 =& $arr1['a1'];
+echo '-'.$arr1['alfa']."-\n";
+?>
+--EXPECT--
+-ok-
@@ -0,0 +1,17 @@
+--TEST--
+Bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler)
+--SKIPIF--
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--FILE--
+<?php
+$xml = "<root></root>";
+$xml = simplexml_load_string($xml);
+$kids = $xml->children();
+var_dump((bool)$kids);
+if($kids) echo "bug\n"; else echo "ok\n";
+if(!$kids) echo "ok\n"; else echo "bug\n";
+?>
+--EXPECT--
+bool(false)
+ok
+ok
@@ -0,0 +1,36 @@
+--TEST--
+Bug #34260 (Segfault with callbacks (array_map) + overloading)
+--FILE--
+<?php
+class Faulty
+{
+    function __call($Method,$Args)
+    {
+        switch($Method)
+        {
+            case 'seg':
+              echo "I hate me\n";
+            break;
+        }
+    }
+
+    function NormalMethod($Args)
+    {
+       echo "I heart me\n"; 
+    }
+}
+
+$Faulty = new Faulty();
+$Array = array('Some junk','Some other junk');
+
+// This causes a seg fault.
+$Failure = array_map(array($Faulty,'seg'),$Array);
+
+// This does not.
+$Failure = array_map(array($Faulty,'NormalMethod'),$Array);
+?>
+--EXPECT--
+I hate me
+I hate me
+I heart me
+I heart me
@@ -0,0 +1,34 @@
+--TEST--
+Bug #34310 (foreach($arr as $c->d => $x) crashes)
+--FILE--
+<?php
+
+class C
+{
+	public $d;
+}
+
+$c = new C();
+
+$arr = array (1 => 'a', 2 => 'b', 3 => 'c');
+
+// Works fine:
+foreach($arr as $x => $c->d)
+{
+	echo "{$x} => {$c->d}\n";
+}
+
+// Crashes:
+foreach($arr as $c->d => $x)
+{
+	echo "{$c->d} => {$x}\n";
+}
+
+?>
+--EXPECT--
+1 => a
+2 => b
+3 => c
+1 => a
+2 => b
+3 => c
@@ -0,0 +1,15 @@
+--TEST--
+Bug #34358 (Fatal error: Cannot re-assign $this(again))
+--FILE--
+<?php
+class foo {
+  function bar() {
+    $ref = &$this;
+  }
+}
+$x = new foo();
+$x->bar();
+echo "ok\n";
+?>
+--EXPECT--
+ok
@@ -0,0 +1,27 @@
+--TEST--
+Bug #34467 (foreach + __get + __set incosistency)
+--FILE--
+<?php
+class abc {
+	private $arr;
+
+	function __set ($key, $value) {
+    $this->arr[$key] = $value;
+  }
+	
+	function __get ($key) {
+	  return $this->arr[$key];
+	} 
+}
+$abc = new abc();
+foreach (array (1,2,3) as $abc->k => $abc->v) {
+	var_dump($abc->k,$abc->v);
+}
+?>
+--EXPECT--
+int(0)
+int(1)
+int(1)
+int(2)
+int(2)
+int(3)
@@ -0,0 +1,38 @@
+--TEST--
+Bug #34518 (Unset doesn't separate container in CV)
+--FILE--
+<?php
+$arr = array(1,2,3);
+$arr["foo"] = array(4,5,6);
+$copy = $arr;
+
+unset($copy["foo"][0]);
+print_r($arr);
+print_r($copy);
+?>
+--EXPECT--
+Array
+(
+    [0] => 1
+    [1] => 2
+    [2] => 3
+    [foo] => Array
+        (
+            [0] => 4
+            [1] => 5
+            [2] => 6
+        )
+
+)
+Array
+(
+    [0] => 1
+    [1] => 2
+    [2] => 3
+    [foo] => Array
+        (
+            [1] => 5
+            [2] => 6
+        )
+
+)
@@ -0,0 +1,18 @@
+--TEST--
+Bug #34617 (zend_deactivate: objects_store used after zend_objects_store_destroy is called) 
+--SKIPIF--
+<?php if (!extension_loaded("xml")) print "skip"; ?>
+--FILE--
+<?php
+class Thing {}
+function boom()
+{
+    $reader = xml_parser_create();
+    xml_set_object($reader, new Thing());
+    die("ok\n");
+    xml_parser_free($reader);
+}
+boom();
+?>
+--EXPECT--
+ok
@@ -0,0 +1,25 @@
+--TEST--
+Bug #34678 (__call(), is_callable() and static methods)
+--FILE--
+<?php
+class A {
+	public function __call($m, $a) {
+		echo "__call\n";
+	}
+}
+
+class B extends A {
+	public static function foo() {
+		echo "foo\n";
+	}
+}
+
+if (is_callable(array('B', 'foo'))) {
+	call_user_func(array('B', 'foo'));
+}
+if (is_callable(array('A', 'foo'))) {
+	call_user_func(array('A', 'foo'));
+}
+?>
+--EXPECT--
+foo
@@ -0,0 +1,22 @@
+--TEST--
+Bug #34786 (2 @ results in change to error_reporting() to random value)
+--FILE--
+<?php
+function foo($a,$b,$c) {
+echo "foo: ".error_reporting()."\n";
+}
+
+function bar() {
+echo "bar: ".error_reporting()."\n";
+}
+
+error_reporting(1);
+echo "before: ".error_reporting()."\n";
+@foo(1,@bar(),3);
+echo "after: ".error_reporting()."\n";
+?>
+--EXPECT--
+before: 1
+bar: 0
+foo: 0
+after: 1
@@ -0,0 +1,30 @@
+--TEST--
+Bug #34873 (Segmentation Fault on foreach in object)
+--FILE--
+<?php
+class pwa {
+	public $var;
+
+	function __construct(){
+		$this->var = array();
+	}
+
+	function test (){
+		$cont = array();
+		$cont["mykey"] = "myvalue";
+
+		foreach ($cont as $this->var['key'] => $this->var['value'])
+		var_dump($this->var['value']);
+	}
+}
+$myPwa = new Pwa();
+$myPwa->test();
+
+echo "Done\n";
+?>
+--EXPECT--	
+string(7) "myvalue"
+Done
+--UEXPECT--
+unicode(7) "myvalue"
+Done
@@ -0,0 +1,11 @@
+--TEST--
+Bug #34879 (str_replace, array_map corrupt negative array indexes on 64-bit platforms)
+--FILE--
+<?php
+print_r(str_replace('a', 'b', array(-1 =>-1)));
+?>
+--EXPECT--
+Array
+(
+    [-1] => -1
+)
@@ -0,0 +1,33 @@
+--TEST--
+Bug #34893 (PHP5.1 overloading, Cannot access private property)
+--FILE--
+<?php
+class A {
+	private $p;
+	function __get($name){
+		return $this->$name;
+	}
+	function __set($name, $value) {
+		$this->$name = $value;
+	}
+}
+class B {
+	private $t;
+	function __get($name){
+		return $this->$name;
+	}
+	function __set($name, $value) {
+		$this->$name = $value;
+	}
+}
+$a = new A;
+$b = new B;
+$a->p = $b;
+$b->t = "foo";
+
+echo $a->p->t;
+$a->p->t = "bar";
+echo $a->p->t;
+?>
+--EXPECT--
+foobar
@@ -0,0 +1,21 @@
+--TEST--
+Bug #35017 (Exception thrown in error handler may cause unexpected behavior)
+--FILE--
+<?php
+set_error_handler('errorHandler');
+try {
+	if ($a) {
+		echo "1\n";
+	} else {
+		echo "0\n";
+	}
+	echo "?\n";
+} catch(Exception $e) { 
+  echo "This Exception should be catched\n";
+}
+function errorHandler($errno, $errstr, $errfile, $errline, $vars) {
+	throw new Exception('Some Exception');
+}
+?>
+--EXPECT--
+This Exception should be catched
@@ -0,0 +1,68 @@
+--TEST--
+Bug #35239 (Objects can lose references)
+--FILE--
+<?php
+$a = new stdClass; 
+$a->x0 = new stdClass;
+$a->x0->y0 = 'a';
+$a->x0->y1 =& $a->x0;
+$a->x0->y2 =& $a->x0;
+$a->x0->y0 = 'b';
+var_dump($a);
+$a->x0->y1 = "ok\n";
+echo $a->x0;
+?>
+--EXPECT--
+object(stdClass)#1 (1) {
+  ["x0"]=>
+  &object(stdClass)#2 (3) {
+    ["y0"]=>
+    string(1) "b"
+    ["y1"]=>
+    &object(stdClass)#2 (3) {
+      ["y0"]=>
+      string(1) "b"
+      ["y1"]=>
+      *RECURSION*
+      ["y2"]=>
+      *RECURSION*
+    }
+    ["y2"]=>
+    &object(stdClass)#2 (3) {
+      ["y0"]=>
+      string(1) "b"
+      ["y1"]=>
+      *RECURSION*
+      ["y2"]=>
+      *RECURSION*
+    }
+  }
+}
+ok
+--UEXPECT--
+object(stdClass)#1 (1) {
+  [u"x0"]=>
+  &object(stdClass)#2 (3) {
+    [u"y0"]=>
+    unicode(1) "b"
+    [u"y1"]=>
+    &object(stdClass)#2 (3) {
+      [u"y0"]=>
+      unicode(1) "b"
+      [u"y1"]=>
+      *RECURSION*
+      [u"y2"]=>
+      *RECURSION*
+    }
+    [u"y2"]=>
+    &object(stdClass)#2 (3) {
+      [u"y0"]=>
+      unicode(1) "b"
+      [u"y1"]=>
+      *RECURSION*
+      [u"y2"]=>
+      *RECURSION*
+    }
+  }
+}
+ok
@@ -0,0 +1,30 @@
+--TEST--
+Bug #35393 (changing static protected members from outside the class)
+--INI--
+error_reporting=4095
+--FILE--
+<?php
+class ObjectPath
+{
+    static protected $type = array(0=>'main');
+
+    static function getType()
+    {
+        return self::$type;
+    }
+}
+print_r(ObjectPath::getType());
+$object_type = array_pop((ObjectPath::getType()));
+print_r(ObjectPath::getType());
+?>
+--EXPECTF--
+Array
+(
+    [0] => main
+)
+
+Strict Standards: Only variables should be passed by reference in %sbug35393.php on line 12
+Array
+(
+    [0] => main
+)
@@ -0,0 +1,19 @@
+--TEST--
+Bug #35411 (Regression with \{$ handling)
+--FILE--
+<?php
+$abc = "bar";
+echo "foo\{$abc}baz\n";
+echo "foo\{ $abc}baz\n";
+echo <<<TEST
+foo{$abc}baz
+foo\{$abc}baz
+foo\{ $abc}baz
+TEST;
+?>
+--EXPECT--
+foo\{bar}baz
+foo\{ bar}baz
+foobarbaz
+foo\{bar}baz
+foo\{ bar}baz
@@ -0,0 +1,27 @@
+--TEST--
+Bug #35437 Segfault or Invalid Opcode 137/1/4 
+--FILE--
+<?php
+function err2exception($errno, $errstr)
+{
+	throw new Exception("Error occuried: " . $errstr);
+}
+
+set_error_handler('err2exception');
+
+class TestClass
+{
+	function testMethod()
+	{
+		$GLOBALS['t'] = new stdClass;
+	}
+}
+
+try {
+	TestClass::testMethod();
+} catch (Exception $e) {
+	echo "Catched: ".$e->getMessage()."\n";
+}
+?>
+--EXPECT--
+Catched: Error occuried: Non-static method TestClass::testMethod() should not be called statically
@@ -0,0 +1,11 @@
+--TEST--
+Bug #35470 (Assigning global using variable name from array doesn't function)
+--FILE--
+<?php
+$x = array("test", "55");
+global ${$x[0]};
+${$x[0]} = $x[1];
+echo "Test: $test\n";;
+?>
+--EXPECT--
+Test: 55
@@ -0,0 +1,31 @@
+--TEST--
+Bug #35509 (string constant as array key has different behavior inside object)
+--FILE--
+<?php
+class mytest
+{
+  const classConstant = '01';
+
+  private $classArray = array( mytest::classConstant => 'value' );
+
+  public function __construct()
+  {
+    print_r($this->classArray);
+  }
+}
+
+$classtest = new mytest();
+
+define( "normalConstant", '01' );
+$normalArray = array( normalConstant => 'value' );
+print_r($normalArray);
+?>
+--EXPECT--
+Array
+(
+    [01] => value
+)
+Array
+(
+    [01] => value
+)
@@ -0,0 +1,25 @@
+--TEST--
+Bug #35655 (whitespace following end of heredoc is lost)
+--INI--
+highlight.string  = #DD0000
+highlight.comment = #FF8000
+highlight.keyword = #007700
+highlight.bg      = #FFFFFF
+highlight.default = #0000BB
+highlight.html    = #000000
+--FILE--
+<?php
+$code = '
+<?php
+  $x = <<<EOT
+some string    
+EOT
+  $y = 2;
+?>';
+highlight_string($code);
+?>
+--EXPECT--
+<code><span style="color: #000000">
+<br /><span style="color: #0000BB">&lt;?php<br />&nbsp;&nbsp;$x&nbsp;</span><span style="color: #007700">=&nbsp;&lt;&lt;&lt;EOT<br /></span><span style="color: #0000BB">some&nbsp;string&nbsp;&nbsp;&nbsp;&nbsp;<br /></span><span style="color: #007700">EOT<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$y&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">2</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;</span>
+</span>
+</code>
@@ -0,0 +1,30 @@
+--TEST--
+Bug #36006 (Problem with $this in __destruct())
+--FILE--
+<?php
+
+class Person {
+	public $dad;
+	public function __destruct() {
+		$this->dad = null; /* no segfault if this is commented out */
+	}
+}
+
+class Dad extends Person {
+	public $son;
+	public function __construct() {
+		$this->son = new Person;
+		$this->son->dad = $this; /* no segfault if this is commented out */
+	}
+	public function __destruct() {
+		$this->son = null;
+		parent::__destruct(); /* segfault here */
+	}
+}
+
+$o = new Dad;
+unset($o);
+echo "ok\n";
+?>
+--EXPECT--
+ok