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

.gdbinit

@@ -15,25 +15,6 @@ document ____executor_globals
 	ZTS detection is automatically based on ext/standard module struct
 end
 
-define print_cvs
-	____executor_globals
-	set $p = $eg.current_execute_data.CVs
-	set $c = $eg.current_execute_data.op_array.last_var
-	set $v = $eg.current_execute_data.op_array.vars
-	set $i = 0
-
-	printf "Compiled variables count: %d\n", $c
-	while $i < $c
-		printf "%d = %s\n", $i, $v[$i].name
-		if $p[$i] != 0
-			printzv *$p[$i]
-		else
-			printf "*uninitialized*\n"
-		end
-		set $i = $i + 1
-	end
-end
-
 define dump_bt
 	set $t = $arg0
 	while $t

.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>php-5.3</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

CODING_STANDARDS

@@ -59,8 +59,8 @@ Exceptions:
     you're calling.
 
 7.  When commenting out code using a #if statement, do NOT use 0 only. Instead
-    use "<svn username here>_0". For example, #if FOO_0, where FOO is your
-    svn user foo.  This allows easier tracking of why code was commented out,
+    use "<cvs username here>_0". For example, #if FOO_0, where FOO is your
+    cvs user foo.  This allows easier tracking of why code was commented out,
     especially in bundled libraries.
 
 8.  Do not define functions that are not available.  For instance, if a
@@ -259,7 +259,7 @@ The file labelled 'EXPERIMENTAL' should include the following
 information::
 
   Any authoring information (known bugs, future directions of the module).
-  Ongoing status notes which may not be appropriate for SVN comments.
+  Ongoing status notes which may not be appropriate for CVS comments.
 
 Aliases & Legacy Documentation
 -----------------------------------

EXTENSIONS

@@ -73,12 +73,6 @@ PRIMARY MAINTAINER:  Edin Kadribasic <edink@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           fpm
-PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>, Jerome Loyet <fat@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.3.3
--------------------------------------------------------------------------------
 EXTENSION:           isapi
 MAINTENANCE:         Unknown
 STATUS:              Working
@@ -497,8 +491,8 @@ STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
 EXTENSION:           snmp
-PRIMARY MAINTAINER:  Boris Lytochkin <lytboris@php.net>, Rasmus Lerdorf <rasmus@php.net>, Pierre-Alain Joye <pajoye@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>, Pierre-Alain Joye <pajoye@php.net>
+MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sockets

LICENSE

@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                   The PHP License, version 3.01
-Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2009 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 
 
 Redistribution and use in source and binary forms, with or without

Makefile.gcov

@@ -5,7 +5,24 @@
 
 lcov: lcov-html
 
-lcov-test: lcov-clean-data test
+lcov-test: all
+	@echo "Running test suite"
+	@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
+	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
+		NO_INTERACTION=1 \
+		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
+	elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
+		NO_INTERACTION=1 \
+		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
+	else \
+		echo "ERROR: Cannot run tests without CLI sapi."; \
+	fi
 
 php_lcov.info: lcov-test
 	@echo "Generating data for $@"
@@ -44,7 +61,7 @@ php_lcov.info: lcov-test
 		test -f "$$x.bb"   && cp $$x.bb   lcov_data/$$y.bb ; \
 		test -f "$$x.bbg"  && cp $$x.bbg  lcov_data/$$y.bbg ; \
 	done
-	for dir in ext/bcmath/libbcmath ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
+	for dir in ext/bcmath/libbcmath ext/date/lib ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
 		test -d lcov_data/$$dir && rm -rf lcov_data/$$dir ; \
 	done
 	@echo 
@@ -60,5 +77,3 @@ lcov-clean:
 	rm -rf lcov_data/
 	rm -rf lcov_html/
 
-lcov-clean-data:
-	@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f

Makefile.global

@@ -13,8 +13,6 @@ all: $(all_targets)
 	
 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
 
-build-binaries: $(PHP_BINARIES)
-
 libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
@@ -37,8 +35,6 @@ install-sapi: $(OVERALL_TARGET)
 	fi
 	@$(INSTALL_IT)
 
-install-binaries: build-binaries $(install_binary_targets)
-
 install-modules: build-modules
 	@test -d modules && \
 	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
@@ -83,26 +79,29 @@ PHP_TEST_SHARED_EXTENSIONS =  ` \
 			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
 		done; \
 	fi`
-PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
 
 test: all
 	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
-		INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
-		if test "$$INI_FILE"; then \
-			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
-		else \
-			echo > $(top_builddir)/tmp-php.ini; \
-		fi; \
-		INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
-		if test "$$INI_SCANNED_PATH"; then \
-			INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
-			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
-		fi; \
 		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
-			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
-		rm $(top_builddir)/tmp-php.ini; \
+			$(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \
+	elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
+		INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
+		if test "$$INI_FILE"; then \
+			$(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
+		else \
+			echo > $(top_builddir)/tmp-php.ini; \
+		fi; \
+		INI_SCANNED_PATH=`$(top_builddir)/$(SAPI_CLI_PATH) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
+		if test "$$INI_SCANNED_PATH"; then \
+			INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
+			$(EGREP) -h -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
+		fi; \
+		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(top_builddir)/$(SAPI_CLI_PATH) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi
@@ -116,8 +115,9 @@ clean:
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+	rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
+	find . -name Makefile | xargs rm -f
 
 .PHONY: all clean install distclean test
 .NOEXPORT:

README.CVS-RULES

@@ -1,18 +1,18 @@
 ====================
-  SVN Commit Rules
+  CVS Commit Rules
 ====================
 
-This is the first file you should be reading after you get your SVN account.
-We'll assume you're basically familiar with SVN, but feel free to post
+This is the first file you should be reading after you get your CVS account.
+We'll assume you're basically familiar with CVS, but feel free to post
 your questions on the mailing list. Please have a look at
-http://svnbook.red-bean.com/ for more detailed information on SVN.
+http://cvsbook.red-bean.com/ for more detailed information on CVS.
 
 PHP is developed through the efforts of a large number of people.
-Collaboration is a Good Thing(tm), and SVN lets us do this. Thus, following
-some basic rules with regards to SVN usage will::
+Collaboration is a Good Thing(tm), and CVS lets us do this. Thus, following
+some basic rules with regards to CVS usage will::
 
    a. Make everybody happier, especially those responsible for maintaining
-      the SVN itself.
+      the CVS itself.
 
    b. Keep the changes consistently well documented and easily trackable.
 
@@ -43,25 +43,21 @@ Having said that, here are the organizational rules::
 
 Currently we have the following branches in use::
 
-  trunk             The active development branch. 
+  HEAD     Will become PHP 6.0. This CVS branch is for active development.
 
-  branches/PHP_5_4  Is used to release the PHP 5.4.x series. It still allows for
-                    larger enhancements.
+  PHP_5_3  Is used to release the PHP 5.3.x series. It still allows for
+           larger enhancements.
 
-  branches/PHP_5_3  Is used to release the PHP 5.3.x series. This is current 
-                    stable version and is open for bugfixes and small
-                    improvements (check with RMs if in doubt).
+  PHP_5_2  Is used to release the PHP 5.2.x series. Only bugfixes are permitted
+           on this branch (Consult the releasemaster prior to commit).
 
-  branches/PHP_5_2  Is used to release the PHP 5.2.x series. It is closed for 
-                    changes now.
+  PHP_5_1  This branch is closed.
 
-  branches/PHP_5_1  This branch is closed.
-
-  branches/PHP_4_4  This branch is closed.
+  PHP_4_4  This branch is closed.
 
 The next few rules are more of a technical nature::
 
-   1. All changes should first go to trunk and then get merged from trunk
+   1. All changes should first go to HEAD and then get merged from HEAD
       (aka MFH'ed) to all other relevant branches.
 
    2. DO NOT TOUCH ChangeLog! It is automagically updated from the commit
@@ -136,11 +132,11 @@ If you don't see your messages in ChangeLog right away, don't worry!
 These files are updated once a day, so your stuff will not show up until
 somewhat later.
 
-When you change the NEWS file for a bug fix, then please keep the bugs
+When you change the NEWS file for a bug fix, then please keep the bugs 
 sorted in decreasing order under the fixed version.
 
 You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
-to look at PHP SVN repository in various ways.
+to look at PHP CVS repository in various ways.
 
 To receive daily updates to ChangeLog and NEWS, send an empty message to
 php-cvs-daily-subscribe@lists.php.net.

README.NEW-OUTPUT-API

@@ -1,142 +0,0 @@
-$Id: README.NEW-OUTPUT-API 219039 2006-08-30 07:39:09Z mike $
-
-
-API adjustment to the old output control code:
-
-	Everything now resides beneath the php_output namespace, 
-	and there's an API call for every output handler op.
-
-	Checking output control layers status:
-		// Using OG()
-		php_output_get_status(TSRMLS_C);
-
-	Starting the default output handler:
-		// php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
-		php_output_start_default(TSRMLS_C);
-
-	Starting an user handler by zval:
-		// php_start_ob_buffer(zhandler, chunk_size, erase TSRMLS_CC);
-		php_output_start_user(zhandler, chunk_size, flags TSRMLS_CC);
-
-	Starting an internal handler whithout context:
-		// php_ob_set_internal_handler(my_php_output_handler_func_t, buffer_size, "output handler name", erase TSRMLS_CC);
-		php_output_start_internal(handler_name, handler_name_len, my_php_output_handler_func_t, chunk_size, flags TSRMLS_CC);
-
-	Starting an internal handler with context:
-		// not possible with old API
-		php_output_handler *h;
-		h = php_output_handler_create_internal(handler_name, handler_name_len, my_php_output_handler_context_func_t, chunk_size, flags TSRMLS_CC);
-		php_output_handler_set_context(h, my_context, my_context_dtor);
-		php_output_handler_start(h TSRMLS_CC);
-
-	Testing whether a certain output handler has already been started:
-		// php_ob_handler_used("output handler name" TSRMLS_CC);
-		php_output_handler_started(handler_name, handler_name_len TSRMLS_CC);
-
-	Flushing one output buffer:
-		// php_ob_end_buffer(1, 1 TSRMLS_CC);
-		php_output_flush(TSRMLS_C);
-
-	Flushing all output buffers:
-		// not possible with old API
-		php_output_flush_all(TSRMLS_C);
-
-	Cleaning one output buffer:
-		// php_ob_end_buffer(0, 1 TSRMLS_CC);
-		php_output_clean(TSRMLS_C);
-
-	Cleaning all output buffers:
-		// not possible with old API
-		php_output_clean_all(TSRMLS_C);
-
-	Discarding one output buffer:
-		// php_ob_end_buffer(0, 0 TSRMLS_CC);
-		php_output_discard(TSRMLS_C);
-
-	Discarding all output buffers:
-		// php_ob_end_buffers(0 TSRMLS_CC);
-		php_output_discard_all(TSRMLS_C);
-
-	Stopping (and dropping) one output buffer:
-		// php_ob_end_buffer(1, 0 TSRMLS_CC)
-		php_output_end(TSRMLS_C);
-
-	Stopping (and dropping) all output buffers:
-		// php_ob_end_buffers(1, 0 TSRMLS_CC);
-		php_output_end_all(TSRMLS_C);
-
-	Retrieving output buffers contents:
-		// php_ob_get_buffer(zstring TSRMLS_CC);
-		php_output_get_contents(zstring TSRMLS_CC);
-
-	Retrieving output buffers length:
-		// php_ob_get_length(zlength TSRMLS_CC);
-		php_output_get_length(zlength TSRMLS_CC);
-
-	Retrieving output buffering level:
-		// OG(nesting_level);
-		php_output_get_level(TSRMLS_C);
-
-	Issue a warning because of an output handler conflict:
-		// php_ob_init_conflict("to be started handler name", "to be tested if already started handler name" TSRMLS_CC);
-		php_output_handler_conflict(new_handler_name, new_handler_name_len, set_handler_name, set_handler_name_len TSRMLS_CC);
-
-	Registering a conflict checking function, which will be checked prior starting the handler:
-		// not possible with old API, unless hardcoding into output.c
-		php_output_handler_conflict_register(handler_name, handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);
-
-	Registering a reverse conflict checking function, which will be checked prior starting the specified foreign handler:
-		// not possible with old API
-		php_output_handler_reverse_conflict_register(foreign_handler_name, foreign_handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);
-
-	Facilitating a context from within an output handler callable with ob_start():
-		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr TSRMLS_CC);
-
-	Disabling of the output handler by itself:
-		//not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL TSRMLS_CC);
-
-	Marking an output handler immutable by itself because of irreversibility of its operation:
-		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC);
-
-	Restarting the output handler because of a CLEAN operation:
-		// not possible with old API
-		if (flags & PHP_OUTPUT_HANDLER_CLEAN) { ... }
-
-	Recognizing by the output handler itself if it gets discarded:
-		// not possible with old API
-		if ((flags & PHP_OUTPUT_HANDLER_CLEAN) && (flags & PHP_OUTPUT_HANDLER_FINAL)) { ... }
-
-
-Output handler hooks
-
-	The output handler can change its abilities at runtime. Eg. the gz handler can
-	remove the CLEANABLE and REMOVABLE bits when the first output has passed through it;
-	or handlers implemented in C to be used with ob_start() can contain a non-global
-	context:
-		PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ
-			pass a void*** pointer as second arg to receive the address of a pointer
-			pointer to the opaque field of the output handler context
-		PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS
-			pass a int* pointer as second arg to receive the flags set for the output handler
-		PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL
-			pass a int* pointer as second arg to receive the level of this output handler
-			(starts with 0)
-		PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE
-			the second arg is ignored; marks the output handler to be neither cleanable
-			nor removable
-		PHP_OUTPUT_HANDLER_HOOK_DISABLE
-			the second arg is ignored; marks the output handler as disabled
-
-
-Open questions
-
-	Should the userland API be adjusted and unified?
-	
-	Many bits of the manual (and very first implementation) do not comply
-	with the behaviour of the current (to be obsoleted) code, thus should
-	the manual or the behaviour be adjusted?
-
-END

README.PARAMETER_PARSING_API

@@ -51,7 +51,6 @@ Type specifiers
  L  - long, limits out-of-range numbers to LONG_MAX/LONG_MIN (long)
  o  - object of any type (zval*)
  O  - object of specific type given by class entry (zval*, zend_class_entry)
- p  - valid path (string without null bytes in the middle) and its length (char*, int)
  r  - resource (zval*)
  s  - string (with possible null bytes) and its length (char*, int)
  z  - the actual zval (zval*)

README.QNX

@@ -0,0 +1,57 @@
+QNX4 Installation Notes
+-----------------------
+
+NOTE: General installation instructions are in the INSTALL file 
+
+
+1. To compile and test PHP3 you have to grab, compile and install:
+	- GNU dbm library or another db library;
+	- GNU bison (1.25 or later; 1.25 tested);
+	- GNU flex (any version supporting -o and -P options; 2.5.4 tested);
+	- GNU diffutils (any version supporting -w option; 2.7 tested);
+
+2. To use CVS version you may need also:
+	- GNU CVS (1.9 tested);
+	- GNU autoconf (2.12 tested);
+	- GNU m4 (1.3 or later preferable; 1.4 tested);
+
+3. To run configure define -lunix in command line:
+	LDFLAGS=-lunix ./configure
+
+4. To use Sybase SQL Anywhere define ODBC_QNX and CUSTOM_ODBC_LIBS in
+	command line and run configure with --with-custom-odbc:
+	CFLAGS=-DODBC_QNX LDFLAGS=-lunix CUSTOM_ODBC_LIBS="-ldblib -lodbc" ./configure --with-custom-odbc=/usr/lib/sqlany50
+   If you have SQL Anywhere version 5.5.00, then you have to add 
+	CFLAGS=-DSQLANY_BUG
+   to workaround its SQLFreeEnv() bug. Other versions has not been tested,
+   so try without this flag first.
+
+5. To build the Apache module, you may have to hardcode an include path for 
+   alloc.h in your Apache base directory:
+	- APACHE_DIRECTORY/src/httpd.h: 
+		change	#include "alloc.h"
+		to 		#include "APACHE_DIRECTORY/src/alloc.h"
+   Unless you want to use system regex library, you have to hardcode also
+   a path to regex.h:
+	- APACHE_DIRECTORY/src/conf.h:  
+		change  #include <regex.h>
+		to		#include "APACHE_DIRECTORY/src/regex/regex.h"
+   I don't know so far why this required for QNX, may be it is Watcom 
+   compiler problem.
+
+  If you building Apache module with SQL Anywhere support, you'll get
+  symbol conflict with BOOL. It is defined in Apache (httpd.h) and in 
+  SQL Anywhere (odbc.h). This has nothing to do with PHP, so you have to 
+  fix it yourself someway.
+
+6. With above precautions, it should compile as is and pass regression
+	tests completely:
+		make
+		make check
+		make install
+
+	Don't bother me unless you really sure you made	that all but it 
+	still doesn't work.
+
+June 28, 1998
+Igor Kovalenko -- owl@infomarket.ru

README.REDIST.BINS

@@ -51,40 +51,27 @@ SUCH DAMAGE.
 
 6. ext/standard crypt's blowfish implementation
 
-The crypt_blowfish homepage is:
-
-http://www.openwall.com/crypt/
-
 This code comes from John the Ripper password cracker, with reentrant
 and crypt(3) interfaces added, but optimizations specific to password
 cracking removed.
 
-Written by Solar Designer <solar at openwall.com> in 1998-2011.
-No copyright is claimed, and the software is hereby placed in the public
-domain. In case this attempt to disclaim copyright and place the software
-in the public domain is deemed null and void, then the software is
-Copyright (c) 1998-2011 Solar Designer and it is hereby released to the
-general public under the following terms:
+Written by Solar Designer <solar at openwall.com> in 1998-2002 and
+placed in the public domain.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted.
-
-There's ABSOLUTELY NO WARRANTY, express or implied.
+There's absolutely no warranty.
 
 It is my intent that you should be able to use this on your system,
-as part of a software package, or anywhere else to improve security,
+as a part of a software package, or anywhere else to improve security,
 ensure compatibility, or for any other purpose. I would appreciate
 it if you give credit where it is due and keep your modifications in
 the public domain as well, but I don't require that in order to let
 you place this code and any modifications you make under a license
 of your choice.
 
-This implementation is mostly compatible with OpenBSD's bcrypt.c (prefix
-"$2a$") by Niels Provos <provos at citi.umich.edu>, and uses some of his
+This implementation is compatible with OpenBSD bcrypt.c (version 2a)
+by Niels Provos <provos at citi.umich.edu>, and uses some of his
 ideas. The password hashing algorithm was designed by David Mazieres
-<dm at lcs.mit.edu>. For more information on the level of compatibility,
-please refer to the comments in BF_set_key() and to the crypt(3) man page
-included in the crypt_blowfish tarball.
+<dm at lcs.mit.edu>.
 
 There's a paper on the algorithm that explains its design decisions:
 

README.RELEASE_PROCESS

@@ -20,18 +20,12 @@ php/QA/bug websites try to have someone from the webmaster team (Bjori) on hand.
 
 5. Verify the tags to be extra sure everything was tagged properly.
 
-6. Moving extensions from/to PECL requires write acces to the destination.
-Most developers should have this. 
+6. Moving extensions from/to PECL requires root level access to the CVS server.
+Contact systems@php.net to get this taken care of.
 
 Moving extensions from php-src to PECL
-- Checkout the pecl directory, most likely you want a sparse-root checkout
-  svn co --depth=empty https://svn.php.net/repository/pecl
-- Create an directory for the extension incl. branch and tag structure,
-  no trunk at this point and commit this to svn
-  cd pecl; mkdir foo foo/tags foo/branches; svn add foo; svn commit
-- Move the extension from php-src to the new location
-  svn mv https://svn.php.net/repository/php/php-src/trunk/ext/foo \
-         https://svn.php.net/repository/pecl/foo/trunk
+- Filesystem: cp -r php-src/ext/foo pecl/foo
+- cvs rm php-src/ext/foo
 
 If the extension is still usable or not dead, in cooperation with the extension
 maintainers if any:
@@ -39,23 +33,25 @@ maintainers if any:
 - create the package.xml, commit
 - release the package
 
-For Moving extensions from PECL to php-src the svn mv has to be tone the other
-way round.
+Moving extensions from PECL to php-src
+- Filesystem: cp -r pecl/foo php-src/ext/foo
+OR depending on the wishes from the PECL extension maintainer.
+- Filesystem: ln -s pecl/foo php-src/ext/foo
 
 Rolling a non stable release (alpha/beta/RC)
 --------------------------------------------
 
 1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)
 
-2. run the "scripts/dev/credits" script in php-src and commit the changes in the
-credits files in ext/standard.
-
-3. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
 Do not use abbreviations for alpha and beta.
 
-4. Commit those changes and note the revision id.
+3. Commit those changes
 
-5. tag the repository with the version. To do the tag in a fast way do a svn copy on the server using full URLs. You should use the revision id from the above commit to prevent mistakes in case there was a commit in between. f.e. "``svn cp https://svn.php.net/repository/php/php-src/branches/PHP_5_3@308399  https://svn.php.net/repository/php/php-src/tags/php_5_3_6RC1``"
+4. run the "scripts/dev/credits" script in php-src and commit the changes in the
+credits files in ext/standard.
+
+5. tag the repository with the version f.e. "``cvs tag php_4_4_1RC1``"
 (of course, you need to change that to the version you're rolling an RC for).
 
 6. Bump up the version numbers in ``main/php_version.h``, ``configure.in``
@@ -69,7 +65,7 @@ correctly work.
 8. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4
 branch if you're rolling 4.4.x releases).
 
-9. You do not have to update the tree, but of course you can with "``svn up``".
+9. You do not have to update the tree, but of course you can with "``cvs up -dP``".
 
 10. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure
 and build two tarballs (one gz and one bz2).
@@ -104,19 +100,21 @@ Derick) run the following commands for you:
 
 ``sudo -u ezmlm ezmlm-sub ~ezmlm/primary-qa-tester/mod moderator-email-address``
 
-3. Update ``web/qa/trunk/include/release-qa.php`` with the appropriate information.
-   See the documentation within release-qa.php for more information, but all releases
-   and RCs are configured here. Only $QA_RELEASES needs to be edited.
+3. Update the MD5 sums in ``qaweb/include/rc-md5sums.txt`` (no empty lines).
 
-   Example: When rolling an RC, set the 'rc' with appropriate information for the
-   given version.
+4. Update in ``qaweb/include/release-qa.php`` constants with the new RC and
+commit this.
 
-   Note: Remember to update the MD5 checksum information.
+ a. ``$BUILD_TEST_RELEASES`` = array("4.4.7RC1", "5.2.2RC1")
 
+ b. ``$CURRENT_QA_RELEASE_4`` = "4.4.7RC1" (``$CURRENT_QA_RELEASE_5`` for PHP5)
 
-1. Update in ``web/php-bugs/trunk/include/php_versions.php`` to include the new RC and commit.
+ c. ``$RELEASE_PROCESS`` = array(4 => true, 5 => true)
 
-2. Update ``web/php/trunk/include/version.inc`` (x=major version number)
+1. Update in ``php-bugs-web/include/functions.inc`` the ``show_version_option``
+function to include the new RC and commit.
+
+2. Update ``phpweb/include/version.inc`` (x=major version number)
 
  a. ``$PHP_x_RC`` = "5.3.0RC1"
 
@@ -124,7 +122,7 @@ Derick) run the following commands for you:
 
 3. Commit those changes:
 
- a. ``svn commit web/qa/trunk web/php-bugs/trunk web/php/trunk``
+ a. ``cvs commit include/version.inc include/releases.inc``
 
 4. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
 INSTALL and win32/install.txt files which are generated from the PHP manual sources.
@@ -212,10 +210,6 @@ f.e. ``ChangeLog-4.php`` from the NEWS file
 
   III. ``s/Fixed bug #\([0-9]\+\)/<?php bugfix(\1); ?>/``
 
-  IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``
-
-  V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
-
 4. ``cp releases/4_4_0.php releases/4_4_1.php``
 
 5. ``cvs add releases/4_4_1.php``
@@ -246,14 +240,17 @@ number, and remove the RC from there.
 
 11. Update ``qaweb/include/release-qa.php``
 
- - Update $QA_RELEASES with the appropriate information, which means bumping
-   the version number to an upcoming version. 
+ a. Update the $BUILD_TEST_RELEASES array with the release name
+
+ b. Update $RELEASE_PROCESS array (set to false)
+
+  I. For PHP4: Set $CURRENT_QA_RELEASE_4 to false
+
+  II. For PHP5: Set $CURRENT_QA_RELEASE_5 to false
 
-   Example: If PHP 5.3.7 is being released, then PHP 5.3.8 is the next QA version,
-   so replace 5.3.7 with 5.3.8 within $QA_RELEASES.
 
 Re-releasing the same version (or -pl)
---------------------------------------
+------------------------------------
 
 1. Commit the new binaries to ``phpweb/distributions/``
 
@@ -284,3 +281,4 @@ to upgrade.
 5. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 the news entry.
+

README.SUBMITTING_PATCH

@@ -1,182 +1,126 @@
-Submitting Enhancements and Patches to PHP
-==========================================
+Submitting Patch for PHP
+========================
 
-This document describes how to submit an enhancement or patch for PHP.
-It's easy!
+This document describes how to submit a patch for PHP. Since you are
+reading this document, you are willing to submit a patch for PHP.
+Please keep reading! Submitting a patch for PHP is easy. The hard
+part is making it acceptable for inclusion into our repository. :-)
 
-You don't need any login accounts or special access to download,
-build, debug and begin submitting PHP, PECL or PEAR code, tests or
-documentation.  Once you've followed this README and had several
-patches accepted, commit privileges are often quickly granted.
+How to create patch?  
+-------------------- 
+We are working with CVS. You need to get CVS source to create a patch
+that we accept.  Visit http://www.php.net/anoncvs.php to get CVS
+source. You can check out older versions, but make sure you get
+the default branch (i.e. Do not use -r option when you check out the 
+CVS source)
 
-An excellent article to read first is:
-http://phpadvent.org/2008/less-whining-more-coding-by-elizabeth-smith
+Read CODING_STANDARDS file before you start working.
+
+Now you are ready to create a patch. Modify source to fix a bug in PHP or
+add a new feature to PHP. After you finished editing, please test your
+patch. Read README.TESTING for testing.
+
+After you finish testing your patch, take diff file using 
+"cvs diff > your.patch" command.
+
+Read README.TESTING for submitting a test script for your patch. This is
+not strictly required, but it is preferred to submit a test script along
+with your patch. Making new test script is very easy. It also helps us
+to understand what you have been fixed or added to PHP.
 
 
-Online Forums
--------------
-There are several IRC channels where PHP developers are often
-available to discuss questions.  They include #php.pecl, #php.doc and
-#pear on the EFNet network and #php-dev-win on FreeNode.
+Tips for creating patch 
+----------------------- 
+If you would like to fix multiple bugs. It is easier for us if you
+could create 1 patch for 1 bug, but this is not strictly required.
+Note though that you might get little response, if your patch is
+too hard to review.
+
+If you would like change/add many lines, it is better to ask module
+maintainer and/or internals@lists.php.net, or pear-dev@lists.php.net if
+you are patching PEAR. Official module maintainers can be found in
+EXTENSIONS file in PHP source.
+
+If you are new to CVS (Concurrent Versions System), visit 
+http://cvshome.org/ for details.
 
 
-PHP Patches
------------
-If you are fixing broken functionality in PHP C source code first
-create a bug or identify an existing bug at http://bugs.php.net/.  A
-bug can be used to track the patch progress and prevent your changes
-getting lost in the PHP mail archives.
+Recommended CVS client settings for creating patch file
+------------------------------------------------------
+Recommended ~/.cvsrc file setting is:
+------
+cvs -z3
+update -d -P
+checkout -P
+diff -u
 
-If your change is large then create a Request For Comment (RFC) page
-on http://wiki.php.net/rfc, discuss it with the extension maintainer,
-and discuss it on the development mail list internals@lists.php.net.
-RFC Wiki accounts can be requested on
-http://wiki.php.net/start?do=register.  PHP extension maintainers can
-be found in the EXTENSIONS file in the PHP source.  Mail list
-subscription is explained on http://www.php.net/mailing-lists.php.
+------
+diff -u means:
+ -u     Use the unified output format.
 
-Information on PHP internal C functions is at
-http://www.php.net/internals, though this is considered incomplete.
-Various external resources can be found on the web.  A standard
-printed reference is the book "Extending and Embedding PHP" by Sara
-Golemon.
-
-Attach the patch to the PHP bug and consider sending a notification
-email about the change to internals@lists.php.net.  Also CC the
-extension maintainer.  Explain what has been changed by your patch.
-Test scripts should be included.
-
-Please make the mail subject prefix "[PATCH]".  If attaching a patch,
-ensure it has a file extension of ".txt".  This is because only MIME
-attachments of type 'text/*' are accepted.
+With this CVS setting, you don't have to worry about adding/deleting
+newlines and spaces.
 
 
-PHP Documentation Patches
+Check list for submitting patch
+-------------------------------
+ - Did you run "make test" to check if your patch didn't break
+   other features?
+ - Did you compile PHP with --enable-debug and check the PHP and
+   web server error logs when you test your patch?
+ - Did you build PHP for multi-threaded web servers. (Optional)
+ - Did you create test script for "make test"? (Recommended)
+ - Did you check your patch is unified format and it does not 
+   contain white space changes? (If you are not using recommended 
+   cvs setting)
+ - Did you update CVS source before you take final patch?
+ - Did you read the patch again?
+
+
+Where to send your patch?
 -------------------------
-If you are fixing incorrect PHP documentation first create a bug or
-identify an existing bug at http://bugs.php.net/.  A bug can be used
-to track the patch progress and prevent your changes getting lost in
-the PHP mail archives.
+If you are patching C source, send the patch to internals@lists.php.net. 
+If you are patching a module, you should also send the patch to the 
+maintainer. Official module maintainers are listed in EXTENSION file 
+in source.
 
-If your change is large, then first discuss it with the mail list
-phpdoc@lists.php.net.  Subscription is explained on
-http://www.php.net/mailing-lists.php.
+If you are patching PEAR, send the patch to pear-dev@lists.php.net.
 
-Information on contributing to PHP documentation is at
-http://php.net/dochowto and http://wiki.php.net/doc/howto
+Please add the prefix "[PATCH]" to your email subject and make sure
+to include the patch as a MIME attachment even if it is short. 
 
-Attach the patch to the PHP bug and consider sending a notification
-email about the change to phpdoc@lists.php.net.  Explain what has been
-fixed/added/changed by your patch.
+NOTE: only MIME attachments of type 'text/*' are accepted. The
+      easiest way to accomplish this, is to make the extension
+      '.txt'.
 
-Please make the mail subject prefix "[PATCH]".  Include the bug id(s)
-which can be closed by your patch.  If attaching a patch, ensure it
-has a file extension of ".txt".  This is because only MIME attachments
-of type 'text/*' are accepted.
+Test scripts should be included in the same email.
+Explain what has been fixed/added/changed by your patch.
+
+Finally, add the bug Id(s) which can be closed by your patch, if any.
 
 
-PECL Extension Patches: http://pecl.php.net/
---------------------------------------------
-If you are fixing broken functionality in a PECL extension then create
-a bug or identify an existing bug at http://pecl.php.net/bugs/.  A bug
-can be used to track the patch progress and prevent your changes
-getting lost in the PHP mail archives.
+What happens after you submit your patch
+---------------------------------------- 
+If your patch is easy to review and has obviously no side-effects,
+it might take up to a few hours until someone commits it.
 
-If your change is large then create a Request For Comment (RFC) page
-on http://wiki.php.net/rfc, discuss it with the extension maintainer,
-and discuss it on the development mail list pecl-dev@lists.php.net.
-PECL mail list subscription is explained on
-http://pecl.php.net/support.php.  RFC Wiki accounts can be requested
-on http://wiki.php.net/start?do=register
+Because this is a volunteer-driven effort, more complex patches will
+require more patience on your side. 
 
-Information on PHP internal C functions is at
-http://www.php.net/internals, though this is considered incomplete.
-Various external resources can be found on the web.  A standard
-printed reference is the book "Extending and Embedding PHP" by Sara
-Golemon.
+If you did not receive any feedback in a few days, please consider
+resubmitting the description of your patch, along-side with
+these questions:
 
-Update any open bugs and add a link to the source of your patch.  Send
-the patch or pointer to the bug to pecl-dev@lists.php.net.  Also CC
-the extension maintainer.  Explain what has been changed by your
-patch.  Test scripts should be included.
-
-Please make the mail subject prefix "[PATCH] ...".  Include the patch
-as an attachment with a file extension of ".txt".  This is because
-only MIME attachments of type 'text/*' are accepted.
+- Is my patch too hard to review? Because of which factors?
+- Should I split it up in multiple parts?
+- Are there any unwanted whitespace changes?
 
 
-PEAR Package Patches: http://pear.php.net/
-------------------------------------------
-Information on contributing to PEAR is available at
-http://pear.php.net/manual/en/developers-newmaint.php and
-http://pear.php.net/manual/en/guide-developers.php
+What happens when your patch is applied?
+---------------------------------------- 
+Your name will be included together with your email address in the CVS 
+commit log. If your patch affects end-users, a brief description
+and your name might be added to the NEWS file.
 
 
-How to create your PHP, PHP Documentation or PECL patch
--------------------------------------------------------
-PHP and PECL use Subversion (SVN) for revision control.  Read
-http://www.php.net/svn.php for help on using SVN to get and build PHP
-source code.  We recommend using a Sparse Directory checkout described
-in http://wiki.php.net/vcs/svnfaq.  If you are new to SVN, read
-http://svnbook.red-bean.com.
-
-Generally we ask that bug fix patches work on the current stable PHP
-development branches and on "trunk".  New PHP features only need to
-work on "trunk".
-
-Read CODING_STANDARDS before you start working.
-
-After modifying the source see README.TESTING and
-http://qa.php.net/write-test.php for how to test.  Submitting test
-scripts helps us to understand what functionality has changed.  It is
-important for the stability and maintainability of PHP that tests are
-comprehensive.
-
-After testing is finished, create a patch file using the command:
-
-  svn diff > your_patch.txt
-
-For ease of review and later troubleshooting, submit individual
-patches for each bug or feature.
-
-
-Checklist for submitting your PHP or PECL code patch
-----------------------------------------------------
- - Update SVN source just before running your final 'diff' and
-   before testing.
- - Add in-line comments and/or have external documentation ready.
-   Use only "/* */" style comments, not "//".
- - Create test scripts for use with "make test".
- - Run "make test" to check your patch doesn't break other features.
- - Rebuild PHP with --enable-debug (which will show some kinds of
-   memory errors) and check the PHP and web server error logs after
-   running your PHP tests.
- - Rebuild PHP with --enable-maintainer-zts to check your patch
-   compiles on multi-threaded web servers.
- - Review the patch once more just before submitting it.
-
-
-What happens after submitting your PHP, PHP Documentation or PECL patch
------------------------------------------------------------------------
-If your patch is easy to review and obviously has no side-effects,
-it might be committed relatively quickly.
-
-Because PHP is a volunteer-driven effort more complex patches will
-require patience on your side.  If you do not receive feedback in a
-few days, consider resubmitting the patch.  Before doing this think
-about these questions:
-
- - Did I send the patch to the right mail list?
- - Did I review the mail list archives to see if these kind of
-   changes had been discussed before?
- - Did I explain my patch clearly?
- - Is my patch too hard to review? Because of what factors?
-
-
-What happens when your PHP or PECL patch is applied
----------------------------------------------------
-Your name will likely be included in the SVN commit log.  If your
-patch affects end users, a brief description and your name might be
-added to the NEWS file.
-
-Thank you for patching PHP!
+Thank you for submitting patch for PHP!

README.WIN32-BUILD-SYSTEM

@@ -1,6 +1,174 @@
 The Win32 Build System.
+$Id$
+Wez Furlong <wez@thebrainroom.com>
 
-See http://wiki.php.net/internals/windows/stepbystepbuild 
+If you need help with the build system, send mail to
+internals@lists.php.net; please don't email me directly.
+
+===========================================================
+Contents:
+1. How to build PHP under windows
+ a. Requirements
+ b. Opening a command prompt
+ c. Generating configure.js
+ d. Configuring
+ e. Building
+ f. Cleaning up
+ g. Running the test suite
+ h. snapshot building
+ 
+2. How to write config.w32 files
+ x. to be written.
+
+===========================================================
+1. How to build PHP under windows
+a. Requirements
+
+ You need:
+  - Windows Scripting Host (cscript.exe)
+  - Microsoft Build Tools from:
+     Microsoft Visual Studio (VC6) or later
+ 
+ You also need:
+  - bindlib_w32 [http://www.php.net/extra/bindlib_w32.zip]
+  - win32build  [http://www.php.net/extra/win32build.zip]
+
+ b. Opening the Build Environment Command Prompt:
+  - Using Visual Studio (VC6)
+    1. Install it
+    2. If you have a VC++ Command Prompt icon on your start menu,
+       click on it to get a Command Prompt with the env vars
+       set up correctly.
+
+       If not, create a new shortcut and set the Target to:
+
+       %comspec% /k "C:\Program Files\Microsoft Visual Studio\VC98\Bin\vcvars32.bat"
+
+       You might also want to set the prompt to start in
+       a convenient location (such as the root of your
+       PHP source checkout).
+
+  - Using Visual Studio .Net
+    1. Install it.
+    2. Under the Visual Studio .Net Tools sub menu of your start
+       menu, you should have a Visual Studio .Net Command Prompt
+       icon.  If not, create a new shortcut and set the Target to:
+
+       %comspec% /k "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat"
+
+       You might also want to set the prompt to start in
+       a convenient location (such as the root of your
+       PHP source checkout).
+
+  - Using the Platform SDK tools
+    1. Download the Platform SDK:
+       http://www.microsoft.com/msdownload/platformsdk/sdkupdate/
+
+       - You need the Core SDK, which is approx 200MB to download
+         and requires approx 500MB of disk space.
+       - The other components of the SDK are not required by PHP
+       - You might be able to reduce the download size by downloading
+         the installer control component first and then selecting
+         only the Build Environment (around 30MB), but I haven't
+         tried this.
+
+         ** Note: it seems that MS don't include the 32 bit
+            build tools in the platform SDK any longer, so
+            you will probably have very limited luck if you
+            don't also have VC++ or VS.Net already installed.
+
+    2. Once installed, you will have an icon on your start menu
+       that will launch the build environment; the latest SDK's
+       install a number of different versions of this; you probably
+       want to choose the Windows 2000 Retail build environment.
+       Clicking on this will open a command prompt with its Path,
+       Include and Lib env vars set to point to the build tools
+       and win32 headers.
+
+c. Generating configure
+
+ Change directory to where you have your PHP 5 sources.
+ Run buildconf.bat.
+
+d. Configuring
+ 
+ cscript /nologo configure.js --help
+ 
+ Will give you a list of configuration options; these will
+ have the form:
+ 
+ --enable-foo or --disable-foo or --with-foo or --without-foo.
+ 
+ --enable-foo will turn something on, and is equivalent to
+ specifying --enable-foo=yes
+ 
+ --disable-foo will turn something off, and is equivalent to
+ specifying --enable-foo=no
+
+ --enable-foo=shared will attempt to build that feature as
+ a shared, dynamically loadable module.
+
+ Sometimes a configure option needs additional information
+ about where to find headers and libraries; quite often
+ you can specify --enable-foo=option where option could be
+ the path to where to find those files.  If you want to
+ specify a parameter and build it as shared, you can use
+ this syntax instead:  --enable-foo=shared,option
+
+ The same rules all apply to --with-foo and --without-foo;
+ the only difference is the way the options are named;
+ the convention is that --enable-foo means that you are
+ switching on something that comes with PHP, whereas
+ --with-foo means that you want to build in something
+ external to PHP.
+
+e. Building
+
+ Once you have successfully configured your build (make
+ sure you read the output from the command to make sure
+ it worked correctly), you can build the code; simply type
+
+ "nmake" at the command prompt, and it will build everthing
+ you asked for.
+
+ Once the build has completed, you will find your binaries
+ in the build dir determined by configure; this is typically
+ Release_TS for release builds or Debug_TS for debug builds.
+ If you build a non-thread-safe build, it will use Release
+ or Debug to store the files.  Also in this build dir you
+ will find sub directories for each module that went into
+ your PHP build.  The files you'll want to keep are the
+ .exe and .dll files directly in your build dir.
+
+f. Cleaning Up
+ 
+ You can automatically delete everything that was built
+ by running "nmake clean".  This will delete everything
+ that was put there when you ran nmake, including the
+ .exe and .dll files.
+
+g. Running the test suite
+
+ You can verify that your build is working well by running
+ the regression test suite.  You do this by typing
+ "nmake test".  You can specify the tests you want to run
+ by defing the TESTS variable - if you wanted to run the
+ sqlite test suite only, you would type
+ "nmake /D TESTS=ext/sqlite/tests test"
+
+h. Snapshot Building
+
+ If you want to set up an automated build that will tolerate
+ breakages in some of the modules, you can use the
+ --enable-snapshot-build configure option to generate a
+ makefile optimized for that purpose.  A snapshot build will
+ switch the argument parser so that the default option for
+ configure switches that your don't specify will be set
+ to "shared".  The effect of this is to turn on all options
+ unless you explicitly disable them.  When you have configured
+ your snapshot build, you can use "nmake build-snap" to build
+ everything, ignoring build errors in individual extensions
+ or SAPI.
 
 vim:tw=78:sw=1:ts=1:et
 

README.input_filter

@@ -19,7 +19,9 @@ A simple implementation might look like the following.  This stores the
 original raw user data and adds a my_get_raw() function while the normal
 $_POST, $_GET and $_COOKIE arrays are only populated with stripped
 data.  In this simple example all I am doing is calling strip_tags() on
-the data.
+the data.  If register_globals is turned on, the default globals that
+are created will be stripped ($foo) while a $RAW_foo is created with the
+original user input.
 
 ZEND_BEGIN_MODULE_GLOBALS(my_input_filter)
         zval *post_array;
@@ -153,6 +155,8 @@ PHP_FUNCTION(my_get_raw)
     int var_len;
     zval **tmp;
     zval *array_ptr = NULL;
+    HashTable *hash_ptr;
+    char *raw_var;
 
     if(zend_parse_parameters(2 TSRMLS_CC, "ls", &arg, &var, &var_len) == FAILURE) {
         return;
@@ -170,15 +174,23 @@ PHP_FUNCTION(my_get_raw)
             break;
     }
 
-    if(!array_ptr) {
-        RETURN_FALSE;
-    }
+    if(!array_ptr) RETURN_FALSE;
 
-    if(zend_hash_find(HASH_OF(array_ptr), var, var_len+5, (void **)&tmp) == SUCCESS) {
+    /*
+     * I'm changing the variable name here because when running with register_globals on,
+     * the variable will end up in the global symbol table
+     */
+    raw_var = emalloc(var_len+5);  /* RAW_ and a \0 */
+    strcpy(raw_var, "RAW_");
+    strlcat(raw_var,var,var_len+5);
+    hash_ptr = HASH_OF(array_ptr);
+
+    if(zend_hash_find(hash_ptr, raw_var, var_len+5, (void **)&tmp) == SUCCESS) {
         *return_value = **tmp;
         zval_copy_ctor(return_value);
     } else {
         RETVAL_FALSE;
     }
+    efree(raw_var);
 }
 

TODO

@@ -0,0 +1,136 @@
+Things to do or at least think about doing in the future. Name in
+parenthesis means that person has taken on this project.
+
+Zend
+----
+    * Allow foreach ($array as $k => list($a, $b)) syntax for multi
+      dimensional arrays.
+    * Look at replacing c-lib call tolower().
+    * Make hash API functions work with HASH_OF() to save time.
+    * Native large number support (probably with GNU GMP)
+    * Const'ify APIs. Right now, many functions leave parameters untouched,
+      but don't declare those as const. This makes interaction with other
+      interfaces difficult which pass const parameters to us.
+
+
+global
+------
+    * Make sure that all ZTS globals get destructed. Most ts_allocate_id()
+      calls should have a dtor entry.
+    * on some platforms unimplemented function will just do nothing 
+      (e.g. symlink) they should print a warning or not even be defined!
+      (DONE ?)
+    * --enable-all in configure. (--enable-shared=max ...)
+    * make configure print out a summary when it's done (like XEmacs)
+    * replace standard functions which work on static data with 
+      reentrancy-safe functions (DONE?).
+    * make SAPI conform to CGI/1.1. Currently, all SAPI modules
+      define REMOTE_ADDR etc. themselves and reach only various level
+      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).
+    * implement javadoc based function docs template system.
+    * provide optional IPv6 support (seems to be done?).
+    * find a better way to implement script timeouts. SIGVTALRM is used
+      by some POSIX threads implementations (i.e. OpenBSD) and is not
+      available in ZTS mode.
+    * Implement flush feature suitable for nested output buffers.
+
+Streams
+-------
+    * Route filestat.c through the wrapper layer; isolate the statcache code
+      so that it is independent of php functions and can be applied to any
+      stream/path.
+    * Implement generalized connection pool for stated protocols such as
+      ftp and http/1.1 (using keep-alive) to avoid having to negotiate
+      new command/request stream for each subsequent call; Possibly store 
+      resources in contexts (creating a default context if necessary) to 
+      allow segmentation of connection pools.
+    * Add a method to take ownership of the memory buffer in memory streams so
+      that generating string values for zvals doesn't require an estrdup.
+    * bundle and use curl lib for fopen wrapper.
+
+documentation
+-------------
+    * Add remarks in the documentation which functions are not implemented 
+      on win32. 
+    * Add remarks in the documentation which functions are not binary-safe.
+    * Update curl documentation (DONE?)
+    * Add developer documentation.
+    * Add detailed documentation for Java extension.
+
+ext/curl
+--------
+    * Have a warning scheme for when people use unsupported features.
+
+ext/oci8
+--------
+    * All OCIFetch*() functions should return 0 for no more data and false on 
+      error.
+    * Have a flag that trims trailing spaces from CHAR fields on retrieval.
+    * Make allow_call_time_pass_reference=Off working.
+    * For additional todo information, see oci8.c, in ext/oci8
+
+ext/odbc
+--------
+    For PHP 4.3.0:
+    * update all php_error calls to php_error_docref where valid
+    * integrate EXPERIMENTAL ODBC update for use in PHP 5.0, use for
+      testing purposes only.
+
+    For PHP 5.0.0
+    * Activate EXPERIMENTAL ODBC codebase update
+
+ext/pcre
+--------
+    * Allow user to set PCRE_NOTEMPTY, PCRE_ANCHORED at execution time, maybe
+
+ext/pcntl
+---------
+    * Change internal callback handler to use TICKS
+    * Remove all zend_extension code
+    * Add object callback support to pcntl_signal()
+
+ext/session
+-----------
+    For PHP 4.3.0:
+    * session_abort() to abort session. ie: Do not save session data.
+    * Allow unset($_SESSION) or unset($HTTP_SESSION_VARS) to unset
+      session vars regardless of register_globals setting.
+
+    Other:
+    * Maybe implement finer-grained session variables that could be 
+      locked individually.
+    * Write a network-transparent storage back-end with fallover
+      facilities
+    * Provide a callback facility which is executed upon encountering
+      an unknown class name during deserialization
+
+ext/standard
+------------
+    * Add a version number to data serialized via serialize().
+    * Possibly modify parsing of GPC data to automatically create arrays if
+      variable name is seen more than once.
+    * Implement regex-cache for url-functions.
+    * Move socket related functions to fsock.c.
+
+ext/wddx
+--------
+    * See if we can support the remaining data types:
+        binary
+
+        http://www.wddx.org/WDDX_SDK_10a/7__References/WDDX_DTD.htm
+        (Andrei)
+
+    * implement wddx_packet_as_javascript(). (Andrei)
+
+other cool stuff
+----------------
+    * PVM extension
+
+vim:et:sw=4:ts=4

TODO-5.1

@@ -0,0 +1,4 @@
+Zend Engine
+-----------
+  - Look at making zend_constant value member be a zval* instead of zval. (Andi)
+  - Implement inheritance rules for type hints. (Marcus) 

TODO-PHP5

@@ -0,0 +1,89 @@
+Component:      Zend Engine 2
+
+                Important stuff to finish: PPP members/PPP methods, 
+                support of overloaded extensions, possibly differentiate 
+                between class and namespace as discussed with Stig in 
+                Germany.
+Responsibility: Zeev, Andi, Stas
+Time frame:     Couple of months for first part and extensions will be
+                ongoing while PHP is being fixed.
+                Things to leave for later versions: Native aggregation
+                support, accessing static members via object and not class.
+
+
+Component:      Aggregation
+Responsibility: Andi, Stig?
+Time frame:     ?
+
+
+Component:      Redesign of API Versioning
+Responsibility: ?
+Time frame:     1 month
+
+
+Component:      Thread Safety
+                Identify the extensions that are not thread safe by design 
+                or due to dependant libraries and identify them as such. 
+                If possible try to resolve thread safety issue via code 
+                improvements (if php code or patches will be accepted by 
+                library maintainers).   For situations where thread safety 
+                cannot easily be acheived a flag in the extension API is 
+                set so PHP can identify non-thread safe extensions.  These 
+                extensions will not be loaded in a ZTS compiled binary 
+                (unless it is cli/cgi).
+
+Responsibility: ?
+Time frame:     ?
+
+
+Component:      SAPI
+                Environment variables defined in the CGI spec need to be 
+                verified in each SAPI module that they conform to the CGI 
+                spec correctly.  If they do not, the SAPI module needs to 
+                fix the variable prior to script execution.  Having this 
+                conformity will aid in having PHP scripts run correctly 
+                under different sapi modules.
+
+Responsibility: Shane Caraveo & each sapi module owner
+Timeframe:      ? (but shouldn't be much effort, most modules are probably ok)
+
+
+Component:      RPC Abstraction Layer
+                Porting java, com, dotnet, xmlrpc, corba, soap and python, srm
+                (are there more ?) to work with the new oo api and preferably
+                by using ext/rpc.
+Responsibility: Harald
+Time frame:     2 months (but i have to wait for a few engine features first)
+
+
+Component:      OO Extensions
+                Each OO extension has to be revised and rewritten to fit into
+                the new OO model. We should decide which extensions are a must
+                to have for the release and which can be ported by the maintainer
+                later as a separate pecl release.
+                A list of extensions to be extended that have to be investigated:
+                  * browscap
+                  * aggregate
+                  * all *sql extensions (*_fetch_object)
+                  * domxml (seems like christian is rewriting it anyways)
+                  * ming
+Responsibility: Harald (, extension maintainers)
+
+
+Component:      Abstract Data Types (ADT)
+Responsibility: Sterling, Harald
+Time frame:     ?
+
+
+Component:      Test Suite
+                Extending the test suite with atleast a test for every
+                function in an extension that doesn't require external
+                resources. Also developing an automated test thing which
+                cvs ups's, compiles and tests the build on a daily base on
+                as much platforms/extensions as possible.
+
+                The test suite will also be extended to support threaded
+                testing and testing for differing sapi modules (via http
+                calls or other methods).
+Reponsibility:  Derick (, extension maintainers)
+Time frame:     3 months

TSRM/TSRM.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Thread Safe Resource Manager                                         |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2011, Andi Gutmans, Sascha Schumann, Zeev Suraski |
+   | Copyright (c) 1999-2009, 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                                |
    +----------------------------------------------------------------------+
@@ -710,22 +710,6 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 #endif
 }
 
-/*
-  Changes the signal mask of the calling thread
-*/
-#ifdef HAVE_SIGPROCMASK
-TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset)
-{
-	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Changed sigmask in thread: %ld", tsrm_thread_id()));
-	/* TODO: add support for other APIs */
-#ifdef PTHREADS
-	return pthread_sigmask(how, set, oldset);
-#else
-	return sigprocmask(how, set, oldset);
-#endif
-}
-#endif
-
 
 TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler)
 {

TSRM/TSRM.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Thread Safe Resource Manager                                         |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2011, Andi Gutmans, Sascha Schumann, Zeev Suraski |
+   | Copyright (c) 1999-2009, 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                                |
    +----------------------------------------------------------------------+
@@ -90,10 +90,6 @@ typedef struct {
 # define MUTEX_T beos_ben * 
 #endif
 
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
 typedef void (*ts_allocate_ctor)(void *, void ***);
 typedef void (*ts_allocate_dtor)(void *, void ***);
 
@@ -142,9 +138,6 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void);
 TSRM_API void tsrm_mutex_free(MUTEX_T mutexp);
 TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp);
 TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp);
-#ifdef HAVE_SIGPROCMASK
-TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset);
-#endif
 
 TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler);
 TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);

TSRM/acconfig.h

@@ -0,0 +1 @@
+#undef PTHREADS

TSRM/build.mk

@@ -33,7 +33,7 @@ $(makefile_in_files): $(makefile_am_files)
 aclocal.m4: configure.in acinclude.m4
 	aclocal
 
-$(config_h_in): configure.in
+$(config_h_in): configure.in acconfig.h
 # explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@

TSRM/config.w32

@@ -1,5 +1,10 @@
 // vim:ft=javascript
 // $Id$
 
+if (CHECK_HEADER_ADD_INCLUDE("NewAPIs.h", "CFLAGS_PHP", php_usual_include_suspects)) {
+	// Need to add the flag directly, since TSRM doesn't include the config
+	// header
+	ADD_FLAG("CFLAGS_PHP", "/DHAVE_NEWAPIS_H=1");
+}
 ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c tsrm_win32.c");
 

TSRM/configure.in

@@ -7,10 +7,6 @@ AC_INIT(TSRM.c)
 AM_INIT_AUTOMAKE(TSRM, 1.0, nodefine)
 AM_CONFIG_HEADER(tsrm_config.h)
 
-AH_TOP([
-#undef PTHREADS
-])
-
 sinclude(tsrm.m4)
 	
 TSRM_BASIC_CHECKS

TSRM/tsrm.m4

@@ -30,8 +30,6 @@ AC_REQUIRE([AC_PROG_RANLIB])dnl
 
 AC_CHECK_HEADERS(stdarg.h)
 
-AC_CHECK_FUNCS(sigprocmask)
-
 ])
 
 

TSRM/tsrm_nw.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2009 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |

TSRM/tsrm_nw.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2009 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |

TSRM/tsrm_virtual_cwd.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2009 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -14,7 +14,6 @@
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Sascha Schumann <sascha@schumann.cx>                        |
-   |          Pierre Joye <pierre@php.net>                                |
    +----------------------------------------------------------------------+
 */
 
@@ -108,7 +107,7 @@ typedef unsigned short mode_t;
 #define COPY_WHEN_ABSOLUTE(path) 0
 #endif
 
-#ifndef IS_ABSOLUTE_PATH
+#ifndef IS_ABSOLUTE_PATH	
 #define IS_ABSOLUTE_PATH(path, len) \
 	(IS_SLASH(path[0]))
 #endif
@@ -130,16 +129,9 @@ typedef unsigned short mode_t;
 #endif
 
 #ifdef TSRM_WIN32
-CWD_API int php_sys_stat_ex(const char *path, struct stat *buf, int lstat);
-# define php_sys_stat(path, buf) php_sys_stat_ex(path, buf, 0)
-# define php_sys_lstat(path, buf) php_sys_stat_ex(path, buf, 1)
-CWD_API int php_sys_readlink(const char *link, char *target, size_t target_len);
+CWD_API int php_sys_stat(const char *path, struct stat *buf);
 #else
 # define php_sys_stat stat
-# define php_sys_lstat lstat
-# ifdef HAVE_SYMLINK
-# define php_sys_readlink(link, target, target_len) readlink(link, target, target_len)
-# endif
 #endif
 
 typedef struct _cwd_state {
@@ -163,7 +155,9 @@ CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...);
 CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC);
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC);
+#if !defined(TSRM_WIN32)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC);
+#endif
 CWD_API int virtual_unlink(const char *path TSRMLS_DC);
 CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC);
@@ -194,14 +188,14 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC);
 CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int link TSRMLS_DC);
 #endif
 
-/* One of the following constants must be used as the last argument
+/* One of the following constants must be used as the last argument 
    in virtual_file_ex() call. */
 
 #define CWD_EXPAND   0 /* expand "." and ".." but dont resolve symlinks      */
 #define CWD_FILEPATH 1 /* resolve symlinks if file is exist otherwise expand */
 #define CWD_REALPATH 2 /* call realpath(), resolve symlinks. File must exist */
 
-CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath TSRMLS_DC);
+CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath);
 
 CWD_API char *tsrm_realpath(const char *path, char *real_path TSRMLS_DC);
 
@@ -222,7 +216,7 @@ typedef struct _realpath_cache_bucket {
 	unsigned char                  is_wvalid;
 	unsigned char                  is_writable;
 #endif
-	struct _realpath_cache_bucket *next;
+	struct _realpath_cache_bucket *next;	
 } realpath_cache_bucket;
 
 typedef struct _virtual_cwd_globals {
@@ -244,13 +238,10 @@ extern virtual_cwd_globals cwd_globals;
 CWD_API void realpath_cache_clean(TSRMLS_D);
 CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
 CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_len, time_t t TSRMLS_DC);
-CWD_API int realpath_cache_size(TSRMLS_D);
-CWD_API int realpath_cache_max_buckets(TSRMLS_D);
-CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
 
 /* The actual macros to be used in programs using TSRM
  * If the program defines VIRTUAL_DIR it will use the
- * virtual_* functions
+ * virtual_* functions 
  */
 
 #ifdef VIRTUAL_DIR
@@ -267,7 +258,9 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
 #define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path TSRMLS_CC)
 #define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
 #define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
+#if !defined(TSRM_WIN32)
 # define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
+#endif
 #define VCWD_UNLINK(path) virtual_unlink(path TSRMLS_CC)
 #define VCWD_MKDIR(pathname, mode) virtual_mkdir(pathname, mode TSRMLS_CC)
 #define VCWD_RMDIR(pathname) virtual_rmdir(pathname TSRMLS_CC)
@@ -295,7 +288,7 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
 /* rename on windows will fail if newname already exists.
    MoveFileEx has to be used */
 #if defined(TSRM_WIN32)
-# define VCWD_RENAME(oldname, newname) (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED) == 0 ? -1 : 0)
+# define VCWD_RENAME(oldname, newname) (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING) == 0 ? -1 : 0)
 #else
 # define VCWD_RENAME(oldname, newname) rename(oldname, newname)
 #endif
@@ -310,7 +303,7 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
 #define VCWD_OPENDIR(pathname) opendir(pathname)
 #define VCWD_POPEN(command, type) popen(command, type)
 #if defined(TSRM_WIN32)
-#define VCWD_ACCESS(pathname, mode) tsrm_win32_access(pathname, mode TSRMLS_CC)
+#define VCWD_ACCESS(pathname, mode) tsrm_win32_access(pathname, mode)
 #else
 #define VCWD_ACCESS(pathname, mode) access(pathname, mode)
 #endif
@@ -318,13 +311,8 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
 #define VCWD_REALPATH(path, real_path) tsrm_realpath(path, real_path TSRMLS_CC)
 
 #if HAVE_UTIME
-# ifdef TSRM_WIN32
-#  define VCWD_UTIME(path, time) win32_utime(path, time)
-# else
-#  define VCWD_UTIME(path, time) utime(path, time)
-# endif
+#define VCWD_UTIME(path, time) utime(path, time)
 #endif
-
 #define VCWD_CHMOD(path, mode) chmod(path, mode)
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
 #define VCWD_CHOWN(path, owner, group) chown(path, owner, group)

TSRM/tsrm_win32.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2009 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -30,7 +30,7 @@
 #include "TSRM.h"
 
 #ifdef TSRM_WIN32
-#include <Sddl.h>
+
 #include "tsrm_win32.h"
 #include "tsrm_virtual_cwd.h"
 
@@ -42,21 +42,25 @@ static tsrm_win32_globals win32_globals;
 
 static void tsrm_win32_ctor(tsrm_win32_globals *globals TSRMLS_DC)
 {
+	HANDLE process_token = NULL;
+
 	globals->process = NULL;
 	globals->shm	 = NULL;
 	globals->process_size = 0;
 	globals->shm_size	  = 0;
 	globals->comspec = _strdup((GetVersion()<0x80000000)?"cmd.exe":"command.com");
+	globals->impersonation_token = NULL;
 
-	/* Set it to INVALID_HANDLE_VALUE
-	 * It will be initialized correctly in tsrm_win32_access or set to 
-	 * NULL if no impersonation has been done.
-	 * the impersonated token can't be set here as the impersonation
-	 * will happen later, in fcgi_accept_request (or whatever is the
-	 * SAPI being used).
-	 */
-	globals->impersonation_token = INVALID_HANDLE_VALUE;
-	globals->impersonation_token_sid = NULL;
+	/* Access check requires impersonation token. Create a duplicate token. */
+	if(OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_QUERY, &process_token)) {
+		DuplicateToken(process_token, SecurityImpersonation, &globals->impersonation_token);
+	}
+
+	/* impersonation_token will be closed when the process dies */
+	if(process_token != NULL) {
+		CloseHandle(process_token);
+		process_token = NULL;
+	}
 }
 
 static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC)
@@ -79,12 +83,9 @@ static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC)
 
 	free(globals->comspec);
 
-	if (globals->impersonation_token && globals->impersonation_token != INVALID_HANDLE_VALUE	) {
+	if(globals->impersonation_token) {
 		CloseHandle(globals->impersonation_token);
 	}
-	if (globals->impersonation_token_sid) {
-		free(globals->impersonation_token_sid);
-	}
 }
 
 TSRM_API void tsrm_win32_startup(void)
@@ -103,98 +104,8 @@ TSRM_API void tsrm_win32_shutdown(void)
 #endif
 }
 
-char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC)
+TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 {
-	PSID pSid = TWG(impersonation_token_sid);
-	DWORD sid_len = pSid ? GetLengthSid(pSid) : 0;
-	TCHAR *ptcSid = NULL;
-	char *bucket_key = NULL;
-
-	if (!pSid) {
-		bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + 1);
-		if (!bucket_key) {
-			return NULL;
-		}
-		memcpy(bucket_key, pathname, strlen(pathname));
-		return bucket_key;
-	}
-
-	if (!ConvertSidToStringSid(pSid, &ptcSid)) {
-		return NULL;
-	}
-
-	bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + strlen(ptcSid) + 1);
-	if (!bucket_key) {
-		LocalFree(ptcSid);
-		return NULL;
-	}
-
-	memcpy(bucket_key, ptcSid, strlen(ptcSid));
-	memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1);
-
-	LocalFree(ptcSid);
-	return bucket_key;
-}
-
-
-PSID tsrm_win32_get_token_sid(HANDLE hToken)
-{
-	BOOL bSuccess = FALSE;
-	DWORD dwLength = 0;
-	PTOKEN_USER pTokenUser = NULL;
-	PSID sid;
-	PSID *ppsid = &sid;
-	DWORD sid_len;
-	PSID pResultSid = NULL;
-
-	/* Get the actual size of the TokenUser structure */
-	if (!GetTokenInformation(
-			hToken, TokenUser, (LPVOID) pTokenUser, 0, &dwLength))  {
-		if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-			goto Finished;
-		}
-
-		pTokenUser = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength);
-		if (pTokenUser == NULL) {
-			goto Finished;
-		}
-	}
-
-	/* and fetch it now */
-	if (!GetTokenInformation(
-		hToken, TokenUser, (LPVOID) pTokenUser, dwLength, &dwLength)) {
-		goto Finished;
-	}
-
-	sid_len = GetLengthSid(pTokenUser->User.Sid);
-
-	/* ConvertSidToStringSid(pTokenUser->User.Sid, &ptcSidOwner); */
-	pResultSid = malloc(sid_len);
-	if (!pResultSid) {
-		goto Finished;
-	}
-	if (!CopySid(sid_len, pResultSid, pTokenUser->User.Sid)) {
-		goto Finished;
-	}
-	HeapFree(GetProcessHeap(), 0, (LPVOID)pTokenUser);
-	return pResultSid;
-
-Finished:
-	if (pResultSid) {
-		free(pResultSid);
-	}
-	/* Free the buffer for the token groups. */
-	if (pTokenUser != NULL) {
-		HeapFree(GetProcessHeap(), 0, (LPVOID)pTokenUser);
-	}
-	return NULL;
-}
-
-TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
-{
-	time_t t;
-	HANDLE thread_token;
-	PSID token_sid;
 	SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
 	GENERIC_MAPPING gen_map = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS };
 	DWORD priv_set_length = sizeof(PRIVILEGE_SET);
@@ -203,15 +114,22 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
 	DWORD sec_desc_length = 0, desired_access = 0, granted_access = 0;
 	BYTE * psec_desc = NULL;
 	BOOL fAccess = FALSE;
+	HANDLE process_token = NULL;
 
-	BOOL bucket_key_alloc = FALSE;
 	realpath_cache_bucket * bucket = NULL;
 	char * real_path = NULL;
+	time_t t;
+
+	TSRMLS_FETCH();
 
 	if (mode == 1 /*X_OK*/) {
 		DWORD type;
 		return GetBinaryType(pathname, &type) ? 0 : -1;
 	} else {
+		if(access(pathname, mode)) {
+			return errno;
+		}
+
 		if(!IS_ABSOLUTE_PATH(pathname, strlen(pathname)+1)) {
 			real_path = (char *)malloc(MAX_PATH);
 			if(tsrm_realpath(pathname, real_path TSRMLS_CC) == NULL) {
@@ -220,63 +138,6 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
 			pathname = real_path;
  		}
 
-		if(access(pathname, mode)) {
-			free(real_path);
-			return errno;
-		}
-
- 		/* If only existence check is made, return now */
- 		if (mode == 0) {
-			free(real_path);
-			return 0;
-		}
-
-/* Only in NTS when impersonate==1 (aka FastCGI) */
-
-		/*
-		 AccessCheck() requires an impersonation token.  We first get a primary
-		 token and then create a duplicate impersonation token.  The
-		 impersonation token is not actually assigned to the thread, but is
-		 used in the call to AccessCheck.  Thus, this function itself never
-		 impersonates, but does use the identity of the thread.  If the thread
-		 was impersonating already, this function uses that impersonation context.
-		*/
-		if(!OpenThreadToken(GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, &thread_token)) {
-			DWORD err = GetLastError();
-			if (GetLastError() == ERROR_NO_TOKEN) {
-				if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &thread_token)) {
-					 TWG(impersonation_token) = NULL;
-					 goto Finished;
-				 }
-			}
-		}
-
-		/* token_sid will be freed in tsrmwin32_dtor */
-		token_sid = tsrm_win32_get_token_sid(thread_token);
-		if (!token_sid) {
-			if (TWG(impersonation_token_sid)) {
-				free(TWG(impersonation_token_sid));
-			}
-			TWG(impersonation_token_sid) = NULL;
-			goto Finished;
-		}
-
-		/* Different identity, we need a new impersontated token as well */
-		if (!TWG(impersonation_token_sid) || !EqualSid(token_sid, TWG(impersonation_token_sid))) {
-			if (TWG(impersonation_token_sid)) {
-				free(TWG(impersonation_token_sid));
-			}
-			TWG(impersonation_token_sid) = token_sid;
-
-			/* Duplicate the token as impersonated token */
-			if (!DuplicateToken(thread_token, SecurityImpersonation, &TWG(impersonation_token))) {
-				goto Finished;
-			}
-		} else {
-			/* we already have it, free it then */
-			free(token_sid);
-		}
-
 		if (CWDG(realpath_cache_size_limit)) {
 			t = time(0);
 			bucket = realpath_cache_lookup(pathname, strlen(pathname), t TSRMLS_CC);
@@ -290,7 +151,7 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
 				}
 			}
  		}
-
+ 
  		/* Do a full access check because access() will only check read-only attribute */
  		if(mode == 0 || mode > 6) {
 			if(bucket != NULL && bucket->is_rvalid) {
@@ -309,7 +170,7 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
 				fAccess = bucket->is_readable;
 				goto Finished;
 			}
-			desired_access = FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS;
+			desired_access = FILE_GENERIC_READ;
  		} else { // if(mode <= 6)
 			if(bucket != NULL && bucket->is_rvalid && bucket->is_wvalid) {
 				fAccess = bucket->is_readable & bucket->is_writable;
@@ -333,36 +194,28 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
 			goto Finished;
 		}
 
-		MapGenericMask(&desired_access, &gen_map);
-
 		if(!AccessCheck((PSECURITY_DESCRIPTOR)psec_desc, TWG(impersonation_token), desired_access, &gen_map, &privilege_set, &priv_set_length, &granted_access, &fAccess)) {
-			goto Finished_Impersonate;
+				goto Finished;
 		}
 
 		/* Keep the result in realpath_cache */
 		if(bucket != NULL) {
-			if(desired_access == (FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS)) {
+			if(desired_access == FILE_GENERIC_READ) {
 				bucket->is_rvalid = 1;
 				bucket->is_readable = fAccess;
 			}
 			else if(desired_access == FILE_GENERIC_WRITE) {
 				bucket->is_wvalid = 1;
 				bucket->is_writable = fAccess;
-			} else if (desired_access == (FILE_GENERIC_READ | FILE_GENERIC_WRITE)) {
-				bucket->is_rvalid = 1;
-				bucket->is_readable = fAccess;
-				bucket->is_wvalid = 1;
-				bucket->is_writable = fAccess;
 			}
 		}
 
-Finished_Impersonate:
+Finished:
 		if(psec_desc != NULL) {
 			free(psec_desc);
 			psec_desc = NULL;
 		}
 
-Finished:
 		if(real_path != NULL) {
 			free(real_path);
 			real_path = NULL;
@@ -446,51 +299,27 @@ static HANDLE dupHandle(HANDLE fh, BOOL inherit) {
 
 TSRM_API FILE *popen(const char *command, const char *type)
 {
-	TSRMLS_FETCH();
-
-	return popen_ex(command, type, NULL, NULL TSRMLS_CC);
+	return popen_ex(command, type, NULL, NULL);
 }
 
-TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC)
+TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env)
 {
 	FILE *stream = NULL;
-	int fno, type_len = strlen(type), read, mode;
+	int fno, str_len = strlen(type), read, mode;
 	STARTUPINFO startup;
 	PROCESS_INFORMATION process;
 	SECURITY_ATTRIBUTES security;
 	HANDLE in, out;
 	DWORD dwCreateFlags = 0;
-	BOOL res;
-	process_pair *proc;
 	char *cmd;
-	int i;
-	char *ptype = (char *)type;
-	HANDLE thread_token = NULL;
-	HANDLE token_user = NULL;
-	BOOL asuser = TRUE;
-
-	if (!type) {
-		return NULL;
-	}
-
-	/*The following two checks can be removed once we drop XP support */
-	type_len = strlen(type);
-	if (type_len <1 || type_len > 2) {
-		return NULL;
-	}
-
-	for (i=0; i < type_len; i++) {
-		if (!(*ptype == 'r' || *ptype == 'w' || *ptype == 'b' || *ptype == 't')) {
-			return NULL;
-		}
-		ptype++;
-	}
+	process_pair *proc;
+	TSRMLS_FETCH();
 
 	security.nLength				= sizeof(SECURITY_ATTRIBUTES);
 	security.bInheritHandle			= TRUE;
 	security.lpSecurityDescriptor	= NULL;
 
-	if (!type_len || !CreatePipe(&in, &out, &security, 2048L)) {
+	if (!str_len || !CreatePipe(&in, &out, &security, 2048L)) {
 		return NULL;
 	}
 
@@ -502,7 +331,7 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	startup.hStdError	= GetStdHandle(STD_ERROR_HANDLE);
 
 	read = (type[0] == 'r') ? TRUE : FALSE;
-	mode = ((type_len == 2) && (type[1] == 'b')) ? O_BINARY : O_TEXT;
+	mode = ((str_len == 2) && (type[1] == 'b')) ? O_BINARY : O_TEXT;
 
 	if (read) {
 		in = dupHandle(in, FALSE);
@@ -519,34 +348,13 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 		dwCreateFlags |= CREATE_NO_WINDOW;
 	}
 
-	/* Get a token with the impersonated user. */
-	if(OpenThreadToken(GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, &thread_token)) {
-		DuplicateTokenEx(thread_token, MAXIMUM_ALLOWED, &security, SecurityImpersonation, TokenPrimary, &token_user);
-	} else {
-		DWORD err = GetLastError();
-		if (err == ERROR_NO_TOKEN) {
-			asuser = FALSE;
-		}
-	}
-
 	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
-	if (!cmd) {
-		return NULL;
-	}
-
 	sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
-	if (asuser) {
-		res = CreateProcessAsUser(token_user, NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
-		CloseHandle(token_user);
-	} else {
-		res = CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
+	if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process)) {
+		return NULL;
 	}
 	free(cmd);
 
-	if (!res) {
-		return NULL;
-	}
-
 	CloseHandle(process.hThread);
 	proc = process_get(NULL TSRMLS_CC);
 

TSRM/tsrm_win32.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2009 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -64,7 +64,6 @@ typedef struct {
 	int				shm_size;
 	char			*comspec;
 	HANDLE impersonation_token;
-	PSID			impersonation_token_sid;
 } tsrm_win32_globals;
 
 #ifdef ZTS
@@ -90,16 +89,14 @@ typedef struct {
 #define	SHM_RND		FILE_MAP_WRITE
 #define	SHM_REMAP	FILE_MAP_COPY
 
-char * tsrm_win32_get_path_sid_key(const char *pathname  TSRMLS_DC);
 
 TSRM_API void tsrm_win32_startup(void);
 TSRM_API void tsrm_win32_shutdown(void);
 
-TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC);
+TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env);
 TSRM_API FILE *popen(const char *command, const char *type);
 TSRM_API int pclose(FILE *stream);
-TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC);
-TSRM_API int win32_utime(const char *filename, struct utimbuf *buf);
+TSRM_API int tsrm_win32_access(const char *pathname, int mode);
 
 TSRM_API int shmget(int key, int size, int flags);
 TSRM_API void *shmat(int key, const void *shmaddr, int flags);

UPGRADING.INTERNALS

@@ -1,207 +0,0 @@
-$Id$
-
-UPGRADE NOTES - PHP X.Y
-
-1. Internal API changes
-  a. virtual_file_ex
-  b. stat/lstat support
-  c. readlink support
-  d. layout of some core ZE structures (zend_op_array, zend_class_entry, ...)
-  e. Zend\zend_fast_cache.h has been removed
-  f. streams that enclose private streams
-  g. leak_variable
-  h. API Signature changes
-  i. new TSRM function expand_filepath_with_mode
-
-2. Build system changes
-  a. Unix build system changes
-  b. Windows build system changes
-
-
-========================
-1. Internal API changes
-========================
-
-	a. virtual_file_ex
-
-virtual_file_ex takes now a TSRM context as last parameter:
-CWD_API int virtual_file_ex(cwd_state *state, const char *path, 
- verify_path_func verify_path, int use_realpath TSRLS_DC);
-
-
-	b. stat/lstat support
-
-lstat is now available on all platforms. On unix-like platform
-php_sys_lstat is an alias to lstat (when avaible). On Windows it is now 
-available using php_sys_lstat. php_sys_stat and php_sys_lstat usage is recommended 
-instead of calling lstat directly, to ensure portability.
-
-
-	c. readlink support
-
-readlink is now available on all platforms. On unix-like platform
-php_sys_readlink is an alias to readlink (when avaible). On Windows it is now 
-available using php_sys_readlink. php_sys_readlink usage is recommended 
-instead of calling readlink directly, to ensure portability.
-
-
-	d. layout of some core ZE structures (zend_op_array, zend_class_entry, ...)
-
-. zend_function.pass_rest_by_reference is replaced by
-  ZEND_ACC_PASS_REST_BY_REFERENCE in zend_function.fn_flags
-. zend_function.return_reference is replaced by ZEND_ACC_RETURN_REFERENCE
-  in zend_function.fn_flags
-. zend_arg_info.required_num_args removed. it was needed only for internal
-  functions. Now the first arg_info for internal function (which has special
-  meaning) is represented by zend_internal_function_info structure.
-. zend_op_array.size, size_var, size_literal, current_brk_cont,
-  backpatch_count moved into CG(context), because they are used only during
-  compilation.
-. zend_op_array.start_op is moved into EG(start_op), because it's used
-  only for 'interactive' execution of single top-level op-array.
-. zend_op_array.done_pass_two is replaced by ZEND_ACC_DONE_PASS_TWO in
-  zend_op_array.fn_flags.
-. op_array.vars array is trimmed (reallocated) during pass_two.
-. zend_class_entry.constants_updated is replaced by
-  ZEND_ACC_CONSTANTS_UPDATED in zend_class_entry.ce_flags
-. the size of zend_class_entry is reduced by sharing the same memory space
-  by different information for internal and user classes.
-  See zend_class_inttry.info union. 
-  
-
-	e. Zend\zend_fast_cache.h 
-
-It should not have been used anymore since php5, but now this header has
-been removed. The following macros are not available anymore:
-
-ZEND_FAST_ALLOC(p, type, fc_type)
-ZEND_FAST_FREE(p, fc_type)
-ZEND_FAST_ALLOC_REL(p, type, fc_type)
-ZEND_FAST_FREE_REL(p, fc_type)
-
-Use emalloc, emalloc_rel, efree or efree_rel instead.
-
-
-	f. Streams that enclose private streams
-
-Some streams, like the temp:// stream, may enclose private streams. If the
-outer stream leaks due to a programming error or is not exposed through a
-zval (and therefore is not deleted when all the zvals are gone), it will
-be destroyed on shutdown.
-The problem is that the outer usually wants itself to close the inner stream,
-so that it may do any other shutdown action that requires the inner stream to
-be live (e.g. commit data to it). If the outer stream is exposed through a
-zval and the inner one isn't, this is not a problem because the outer stream
-will be freed when the zval is destroyed, which happens before the resources
-are destroyed on shutdown.
-On resource list shutdown, the cleanup happens in reverse order of resource
-creation, so if the inner stream was created in the opener of the outer stream,
-it will be destroyed first.
-The following functions were added to the streams API to force a predictable
-destruction order:
-
-PHPAPI php_stream *php_stream_encloses(php_stream *enclosing, php_stream *enclosed);
-#define php_stream_free_enclosed(stream_enclosed, close_options)
-PHPAPI int _php_stream_free_enclosed(php_stream *stream_enclosed, int close_options TSRMLS_DC);
-
-Additionally, the following member was added to php_stream:
-
-	struct _php_stream *enclosing_stream;
-    
-and the following macro was added:
-
-#define PHP_STREAM_FREE_IGNORE_ENCLOSING	32
-
-The function php_stream_encloses declares the first stream encloses the second.
-This has the effect that, when the inner stream is closed from a resource
-destructor it will abort and try to free its enclosing stream instead.
-To prevent this from happening when the inner stream is freed from the outer
-stream, the macro php_stream_free_enclosed should be used instead of
-php_stream_free/php_stream_close/php_stream_pclose, or the flag
-PHP_STREAM_FREE_IGNORE_ENCLOSING should be directly passed to php_stream_free.
-The outer stream cannot abstain, in its close callback, from closing the inner
-stream or clear the enclosing_stream pointer in its enclosed stream by calling
-php_stream_encloses with the 2nd argument NULL. If this is not done, there will
-be problems, so observe this requirement when using php_stream_encloses.
-
-
-	g. leak_variable
-
-The function leak_variable(variable [, leak_data]) was added. It is only
-available on debug builds. It increments the refcount of a zval or, if the
-second argument is true and the variable is either an object or a resource
-it increments the refcounts of those objects instead.
-
-
-	h. API Signature changes
-
-. zend_list_insert
-  ZEND_API int zend_list_insert(void *ptr, int type TSRMLS_DC);
-  call: zend_list_insert(a, SOMETYPE TSRMLS_CC);
-  NB: If zend_list_insert is used to register a resource, 
-  ZEND_REGISTER_RESOURCE could be used instead.
-
-. php_le_stream_context(TSRMLS_C)
-  PHPAPI php_stream_context *php_stream_context_alloc(TSRMLS_D)
-  call: context  = php_stream_context_alloc(TSRMLS_C);
-
-. php_stream_context_alloc
-  PHPAPI php_stream_context *php_stream_context_alloc(TSRMLS_D);
-  call: context  = php_stream_context_alloc(TSRMLS_C);
-
-. sapi_get_request_time(TSRMLS_D);
-  SAPI_API double sapi_get_request_time(TSRMLS_D);
-
-. sapi_register_default_post_reader
-  SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D) TSRMLS_DC);
-
-. sapi_register_treat_data
-  SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC) TSRMLS_DC);
-
-. sapi_register_input_filter
-  SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC);
- 
-. tsrm_win32_access
-  TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC);
-
-. popen_ex (win32)
-  TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC);
-
-. php_get_current_user
-  PHPAPI php_get_current_user(TSRMLS_D)
-  Call: char *user = php_get_current_user(TSRMLS_C);
-
-. php_idate
-  PHPAPI php_idate(char format, time_t ts, int localtime TSRMLS_DC)
-  Call: int ret = php_idate(format, ts, localtime TSRMLS_CC)
-
-. php_escape_html_entities
-  (size_t parameters were ints, previous "quote_style" (now flags) has expanded meaning)
-  PHPAPI char *php_escape_html_entities(unsigned char *old, size_t oldlen, size_t *newlen, int all, int flags, char *hint_charset TSRMLS_DC);
-
-. php_escape_html_entities_ex
-  PHPAPI char *php_escape_html_entities_ex(unsigned char *old, size_t oldlen, size_t *newlen, int all, int flags, char *hint_charset, zend_bool double_encode TSRMLS_DC);
-
-. php_unescape_html_entities
-  PHPAPI char *php_unescape_html_entities(unsigned char *old, size_t oldlen, size_t *newlen, int all, int flags, char *hint_charset TSRMLS_DC);
-
-  i. 
-  PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, const char *relative_to, size_t relative_to_len, int realpath_mode TSRMLS_DC);
-  expand_filepath_with_mode lets define how realpath will behave, using one of the existing mode: CWD_EXPAND , CWD_FILEPATH or CWD_REALPATH.
-
-========================
-2. Build system changes
-========================
-
-  a. Unix build system changes
-
-    - Changes in SAPI module build:
-      . When adding new binary SAPI (executable, like CLI/CGI/FPM) use CLI config.m4 and Makefile.frag files as templates and replace CLI/cli with your SAPI name.
-
-    - New macros:
-      . PHP_INIT_DTRACE(providerdesc, header-file, sources [, module])
-
-
-  b. Windows build system changes
-    -
-  

Zend/Makefile.am

@@ -17,7 +17,7 @@ libZend_la_SOURCES=\
 	zend_objects_API.c zend_ts_hash.c zend_stream.c \
 	zend_default_classes.c \
 	zend_iterators.c zend_interfaces.c zend_exceptions.c \
-	zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c
+	zend_strtod.c zend_closures.c zend_float.c
 
 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@

Zend/Zend.dsp

@@ -243,10 +243,6 @@ SOURCE=.\zend_stream.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_string.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_strtod.c
 # End Source File
 # Begin Source File
@@ -319,6 +315,10 @@ SOURCE=.\zend_extensions.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_fast_cache.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_globals.h
 # End Source File
 # Begin Source File
@@ -411,10 +411,6 @@ SOURCE=.\zend_stream.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_string.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_strtod.h
 # End Source File
 # Begin Source File

Zend/Zend.m4

@@ -62,6 +62,18 @@ unix.h \
 stdlib.h \
 dlfcn.h)
 
+dnl Don't use mach-o/dyld.h on Darwin 8+, dl* is recommended by Apple from there on
+dnl See http://developer.apple.com/documentation/DeveloperTools/Conceptual/MachOTopics/Articles/loading_code.html
+case $host_alias in
+*darwin[[89]]*)
+    ;;
+*)
+    AC_CHECK_HEADERS([  \
+mach-o/dyld.h
+],[],[][])
+    ;;
+esac
+
 AC_TYPE_SIZE_T
 AC_TYPE_SIGNAL
 
@@ -176,6 +188,13 @@ AC_ARG_ENABLE(inline-optimization,
   ZEND_INLINE_OPTIMIZATION=yes
 ])
 
+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)
 
@@ -188,6 +207,9 @@ AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION)
 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])
@@ -222,6 +244,10 @@ if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
   LIBZEND_CPLUSPLUS_CHECKS
 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]*//`
@@ -392,22 +418,8 @@ int main()
 
 AC_CHECK_FUNCS(mremap)
 
-
-AC_CHECK_FUNC(sigaction, [
-	ZEND_SIGNALS=yes
-	AC_DEFINE(ZEND_SIGNALS, 1, [Use zend signal handling])
-	AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available])
-], [
-	ZEND_SIGNALS=no
 ])
-if test "$ZEND_SIGNALS" = "yes"; then
-	CFLAGS="$CFLAGS -DZEND_SIGNALS"
-fi
 
-AC_MSG_CHECKING(whether to enable zend signal handling)
-AC_MSG_RESULT($ZEND_SIGNALS)
-
-])
 
 AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
 
@@ -419,11 +431,4 @@ if test -r "/dev/urandom" && test -c "/dev/urandom"; then
   AC_MSG_RESULT(yes) 
 else 
   AC_MSG_RESULT(no) 
-  AC_MSG_CHECKING(whether /dev/arandom exists) 
-  if test -r "/dev/arandom" && test -c "/dev/arandom"; then 
-    AC_DEFINE([HAVE_DEV_ARANDOM], 1, [Define if the target system has /dev/arandom device])
-    AC_MSG_RESULT(yes) 
-  else 
-    AC_MSG_RESULT(no) 
-  fi 
 fi 

Zend/ZendTS.dsp

@@ -273,10 +273,6 @@ SOURCE=.\zend_stream.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_string.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_strtod.c
 # End Source File
 # Begin Source File
@@ -349,6 +345,10 @@ SOURCE=.\zend_extensions.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_fast_cache.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_globals.h
 # End Source File
 # Begin Source File
@@ -445,10 +445,6 @@ SOURCE=.\zend_stream.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_string.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_strtod.h
 # End Source File
 # Begin Source File

Zend/acconfig.h

@@ -0,0 +1,127 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define ZEND_API __attribute__ ((visibility("default")))
+# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
+#else
+# define ZEND_API
+# define ZEND_DLEXPORT
+#endif
+
+#define ZEND_DLIMPORT
+
+@TOP@
+
+#undef uint
+#undef ulong
+
+/* Define if you want to enable memory limit support */
+#define MEMORY_LIMIT 0
+
+@BOTTOM@
+
+#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifdef HAVE_IEEEFP_H
+# include <ieeefp.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#if ZEND_BROKEN_SPRINTF
+int zend_sprintf(char *buffer, const char *format, ...);
+#else
+# define zend_sprintf sprintf
+#endif
+
+#include <math.h>
+
+/* To enable the is_nan, is_infinite and is_finite PHP functions */
+#ifdef NETWARE
+	#define HAVE_ISNAN 1
+	#define HAVE_ISINF 1
+	#define HAVE_ISFINITE 1
+#endif
+
+#ifndef zend_isnan
+#ifdef HAVE_ISNAN
+#define zend_isnan(a) isnan(a)
+#elif defined(HAVE_FPCLASS)
+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+#else
+#define zend_isnan(a) 0
+#endif
+#endif
+
+#ifdef HAVE_ISINF
+#define zend_isinf(a) isinf(a)
+#elif defined(INFINITY)
+/* Might not work, but is required by ISO C99 */
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
+#else
+#define zend_isinf(a) 0
+#endif
+
+#ifdef HAVE_FINITE
+#define zend_finite(a) finite(a)
+#elif defined(HAVE_ISFINITE) || defined(isfinite)
+#define zend_finite(a) isfinite(a)
+#elif defined(fpclassify)
+#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
+#else
+#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
+#endif
+
+#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
+
+#ifdef NETWARE
+#ifdef USE_WINSOCK
+#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
+#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
+#endif
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */

Zend/acinclude.m4

@@ -4,7 +4,7 @@ dnl This file contains local autoconf functions.
 
 AC_DEFUN([LIBZEND_BISON_CHECK],[
   # we only support certain bison versions
-  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed

Zend/build.mk

@@ -33,7 +33,7 @@ $(makefile_in_files): $(makefile_am_files)
 aclocal.m4: configure.in acinclude.m4
 	aclocal
 
-$(config_h_in): configure.in
+$(config_h_in): configure.in acconfig.h
 # explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@

Zend/configure.in

@@ -11,105 +11,6 @@ AM_PROG_CC_STDC
 ZEND_VERSION=$VERSION
 AC_ZEND_C_BIGENDIAN
 
-AH_TOP([
-#if defined(__GNUC__) && __GNUC__ >= 4
-# define ZEND_API __attribute__ ((visibility("default")))
-# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
-#else
-# define ZEND_API
-# define ZEND_DLEXPORT
-#endif
-
-#define ZEND_DLIMPORT
-
-#undef uint
-#undef ulong
-
-/* Define if you want to enable memory limit support */
-#define MEMORY_LIMIT 0
-])
-
-AH_BOTTOM([
-#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifdef HAVE_IEEEFP_H
-# include <ieeefp.h>
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#if ZEND_BROKEN_SPRINTF
-int zend_sprintf(char *buffer, const char *format, ...);
-#else
-# define zend_sprintf sprintf
-#endif
-
-#include <math.h>
-
-/* To enable the is_nan, is_infinite and is_finite PHP functions */
-#ifdef NETWARE
-	#define HAVE_ISNAN 1
-	#define HAVE_ISINF 1
-	#define HAVE_ISFINITE 1
-#endif
-
-#ifndef zend_isnan
-#ifdef HAVE_ISNAN
-#define zend_isnan(a) isnan(a)
-#elif defined(HAVE_FPCLASS)
-#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
-#else
-#define zend_isnan(a) 0
-#endif
-#endif
-
-#ifdef HAVE_ISINF
-#define zend_isinf(a) isinf(a)
-#elif defined(INFINITY)
-/* Might not work, but is required by ISO C99 */
-#define zend_isinf(a) (((a)==INFINITY)?1:0)
-#elif defined(HAVE_FPCLASS)
-#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
-#else
-#define zend_isinf(a) 0
-#endif
-
-#ifdef HAVE_FINITE
-#define zend_finite(a) finite(a)
-#elif defined(HAVE_ISFINITE) || defined(isfinite)
-#define zend_finite(a) isfinite(a)
-#elif defined(fpclassify)
-#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
-#else
-#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
-#endif
-
-#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
-
-#ifdef NETWARE
-#ifdef USE_WINSOCK
-#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
-#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
-#endif
-#endif
-])
-
 dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1
 

Zend/header

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2009 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        |

Zend/micro_bench.php

@@ -1,321 +0,0 @@
-<?php
-
-function hallo() {
-}
-
-function simpleucall($n) {
-  for ($i = 0; $i < $n; $i++) 
-    hallo();
-}
-
-function simpleudcall($n) {
-  for ($i = 0; $i < $n; $i++) 
-    hallo2();
-}
-
-function hallo2() {
-}
-
-function simpleicall($n) {
-  for ($i = 0; $i < $n; $i++) 
-    func_num_args();
-}
-
-class Foo {
-	static $a = 0;
-	public $b = 0;
-	const TEST = 0;
-
-	static function read_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = self::$a;
-		}
-	}
-
-	static function write_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			self::$a = 0;
-		}
-	}
-
-	static function isset_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = isset(self::$a);
-		}
-	}
-
-	static function empty_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = empty(self::$a);
-		}
-	}
-
-	static function f() {
-	}
-
-	static function call_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			self::f();
-		}
-	}
-
-	function read_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = $this->b;
-		}
-	}
-
-	function write_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->b = 0;
-		}
-	}
-
-	function assign_add_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->b += 2;
-		}
-	}
-
-	function pre_inc_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			++$this->b;
-		}
-	}
-
-	function pre_dec_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			--$this->b;
-		}
-	}
-
-	function post_inc_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->b++;
-		}
-	}
-
-	function post_dec_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->b--;
-		}
-	}
-
-	function isset_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = isset($this->b);
-		}
-	}
-
-	function empty_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = empty($this->b);
-		}
-	}
-
-	function g() {
-	}
-
-	function call($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->g();
-		}
-	}
-
-	function read_const($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = $this::TEST;
-		}
-	}
-
-}
-
-function read_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = Foo::$a;
-	}
-}
-
-function write_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		Foo::$a = 0;
-	}
-}
-
-function isset_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = isset(Foo::$a);
-	}
-}
-
-function empty_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = empty(Foo::$a);
-	}
-}
-
-function call_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		Foo::f();
-	}
-}
-
-function create_object($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = new Foo();
-	}
-}
-
-define('TEST', null);
-
-function read_const($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = TEST;
-	}
-}
-
-function read_auto_global($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $_GET;
-	}
-}
-
-$g_var = 0;
-
-function read_global_var($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $GLOBALS['g_var'];
-	}
-}
-
-function read_hash($n) {
-	$hash = array('test' => 0);
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $hash['test'];
-	}
-}
-
-function read_str_offset($n) {
-	$str = "test";
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $str[1];
-	}
-}
-
-/*****/
-
-function empty_loop($n) {
-	for ($i = 0; $i < $n; ++$i) {
-	}
-}
-
-function getmicrotime()
-{
-  $t = gettimeofday();
-  return ($t['sec'] + $t['usec'] / 1000000);
-}
-
-function start_test()
-{
-  ob_start();
-  return getmicrotime();
-}
-
-function end_test($start, $name, $overhead = null)
-{
-  global $total;
-  global $last_time;
-  $end = getmicrotime();
-  ob_end_clean();
-  $last_time = $end-$start;
-  $total += $last_time;
-  $num = number_format($last_time,3);
-  $pad = str_repeat(" ", 24-strlen($name)-strlen($num));
-  if (is_null($overhead)) {
-    echo $name.$pad.$num."\n";
-  } else {
-    $num2 = number_format($last_time - $overhead,3);
-    echo $name.$pad.$num."    ".$num2."\n";
-  }
-  ob_start();
-  return getmicrotime();
-}
-
-function total()
-{
-  global $total;
-  $pad = str_repeat("-", 24);
-  echo $pad."\n";
-  $num = number_format($total,3);
-  $pad = str_repeat(" ", 24-strlen("Total")-strlen($num));
-  echo "Total".$pad.$num."\n";
-}
-
-const N = 5000000;
-
-$t0 = $t = start_test();
-empty_loop(N);
-$t = end_test($t, 'empty_loop');
-$overhead = $last_time;
-simpleucall(N);
-$t = end_test($t, 'func()', $overhead);
-simpleudcall(N);
-$t = end_test($t, 'undef_func()', $overhead);
-simpleicall(N);
-$t = end_test($t, 'int_func()', $overhead);
-Foo::read_static(N);
-$t = end_test($t, '$x = self::$x', $overhead);
-Foo::write_static(N);
-$t = end_test($t, 'self::$x = 0', $overhead);
-Foo::isset_static(N);
-$t = end_test($t, 'isset(self::$x)', $overhead);
-Foo::empty_static(N);
-$t = end_test($t, 'empty(self::$x)', $overhead);
-read_static(N);
-$t = end_test($t, '$x = Foo::$x', $overhead);
-write_static(N);
-$t = end_test($t, 'Foo::$x = 0', $overhead);
-isset_static(N);
-$t = end_test($t, 'isset(Foo::$x)', $overhead);
-empty_static(N);
-$t = end_test($t, 'empty(Foo::$x)', $overhead);
-Foo::call_static(N);
-$t = end_test($t, 'self::f()', $overhead);
-call_static(N);
-$t = end_test($t, 'Foo::f()', $overhead);
-$x = new Foo();
-$x->read_prop(N);
-$t = end_test($t, '$x = $this->x', $overhead);
-$x->write_prop(N);
-$t = end_test($t, '$this->x = 0', $overhead);
-$x->assign_add_prop(N);
-$t = end_test($t, '$this->x += 2', $overhead);
-$x->pre_inc_prop(N);
-$t = end_test($t, '++$this->x', $overhead);
-$x->pre_dec_prop(N);
-$t = end_test($t, '--$this->x', $overhead);
-$x->post_inc_prop(N);
-$t = end_test($t, '$this->x++', $overhead);
-$x->post_dec_prop(N);
-$t = end_test($t, '$this->x--', $overhead);
-$x->isset_prop(N);
-$t = end_test($t, 'isset($this->x)', $overhead);
-$x->empty_prop(N);
-$t = end_test($t, 'empty($this->x)', $overhead);
-$x->call(N);
-$t = end_test($t, '$this->f()', $overhead);
-$x->read_const(N);
-$t = end_test($t, '$x = Foo::TEST', $overhead);
-create_object(N);
-$t = end_test($t, 'new Foo()', $overhead);
-read_const(N);
-$t = end_test($t, '$x = TEST', $overhead);
-read_auto_global(N);
-$t = end_test($t, '$x = $_GET', $overhead);
-read_global_var(N);
-$t = end_test($t, '$x = $GLOBALS[\'v\']', $overhead);
-read_hash(N);
-$t = end_test($t, '$x = $hash[\'v\']', $overhead);
-read_str_offset(N);
-$t = end_test($t, '$x = $str[0]', $overhead);
-total($t0, "Total");

Zend/tests/019.phpt

@@ -359,8 +359,7 @@ var_dump($global_var);
 
 //Note: No error conditions relating to passing arugments can be tested
 // because these are not functions but statements, it will result in syntax error.
-?>
-===DONE===
+echo "Done\n";
 --EXPECTF--
 *** Testing unset(), empty() & isset() with scalar variables ***
 -- Iteration 1 --
@@ -1186,11 +1185,11 @@ bool(true)
 
 *** Testing unset(), emtpy() & isset() with resource variables ***
 -- Iteration 1 --
-resource(%d) of type (stream)
+resource(5) of type (stream)
 bool(true)
 bool(false)
 bool(true)
-resource(%d) of type (stream)
+resource(5) of type (stream)
 bool(false)
 bool(true)
 bool(false)
@@ -1199,11 +1198,11 @@ bool(false)
 Notice: Undefined variable: resource in %s on line %d
 NULL
 -- Iteration 2 --
-resource(%d) of type (stream)
+resource(6) of type (stream)
 bool(true)
 bool(false)
 bool(true)
-resource(%d) of type (stream)
+resource(6) of type (stream)
 bool(false)
 bool(true)
 bool(false)
@@ -1218,7 +1217,7 @@ bool(false)
 bool(true)
 
 *** Testing unset(), empty() & isset() with objects ***
-object(Point)#%d (3) {
+object(Point)#1 (3) {
   ["x"]=>
   int(30)
   ["y"]=>
@@ -1240,7 +1239,7 @@ bool(false)
 
 Notice: Undefined variable: lable in %s on line %d
 bool(true)
-object(Point)#%d (3) {
+object(Point)#1 (3) {
   ["x"]=>
   int(30)
   ["y"]=>
@@ -1248,7 +1247,7 @@ object(Point)#%d (3) {
   ["lable"]=>
   string(6) "Point1"
 }
-object(Point)#%d (2) {
+object(Point)#1 (2) {
   ["y"]=>
   int(40)
   ["lable"]=>
@@ -1256,7 +1255,7 @@ object(Point)#%d (2) {
 }
 bool(false)
 bool(true)
-object(Point)#%d (0) {
+object(Point)#1 (0) {
 }
 bool(true)
 bool(false)
@@ -1277,7 +1276,7 @@ array(3) {
   [2]=>
   string(9) "testPoint"
 }
-object(Point)#%d (3) {
+object(Point)#1 (3) {
   ["x"]=>
   int(5)
   ["y"]=>
@@ -1330,4 +1329,4 @@ bool(false)
 bool(false)
 bool(true)
 int(10)
-===DONE===
+Done

Zend/tests/024.phpt

@@ -18,17 +18,17 @@ var_dump($a->$b->$c[1]);
 Notice: Undefined variable: a in %s on line %d
 NULL
 
-Notice: Undefined variable: %s in %s on line %d
+Notice: Undefined variable: c in %s on line %d
 
-Notice: Undefined variable: %s in %s on line %d
+Notice: Undefined variable: a in %s on line %d
 NULL
 
 Notice: Undefined variable: a in %s on line %d
 int(1)
 
-Notice: Undefined variable: %s in %s on line %d
+Notice: Undefined variable: b in %s on line %d
 
-Notice: Undefined variable: %s in %s on line %d
+Notice: Undefined variable: a in %s on line %d
 int(0)
 
 Notice: Undefined variable: a in %s on line %d

Zend/tests/026.phpt

@@ -21,5 +21,5 @@ print "ok\n";
 Notice: Trying to get property of non-object in %s on line %d
 ok
 
-Warning: Creating default object from empty value in %s on line %d
+Strict Standards: Creating default object from empty value in %s on line %d
 ok

Zend/tests/033.phpt

@@ -26,6 +26,6 @@ Notice: Undefined variable: arr in %s on line %d
 
 Notice: Trying to get property of non-object in %s on line %d
 
-Warning: Creating default object from empty value in %s on line %d
+Strict Standards: Creating default object from empty value in %s on line %d
 
-Warning: Creating default object from empty value in %s on line %d
+Strict Standards: Creating default object from empty value in %s on line %d

Zend/tests/array_type_hint_001.phpt

@@ -12,4 +12,4 @@ foo(123);
 --EXPECTF--
 3
 
-Catchable fatal error: Argument 1 passed to foo() must be of the type array, integer given, 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

Zend/tests/bug30162.phpt

@@ -41,14 +41,12 @@ $db = new hariCow;
 
 var_dump($db);
 ?>
-===DONE===
 --EXPECTF--
 Notice: Undefined variable: db in %sbug30162.php on line 35
 NULL
-object(hariCow)#%d (2) {
+object(hariCow)#1 (2) {
   ["x"]=>
   string(1) "x"
   ["y"]=>
   string(1) "y"
 }
-===DONE===

Zend/tests/bug31098.phpt

@@ -23,6 +23,7 @@ echo isset($simpleString[0])?"ok\n":"bug\n";
 echo isset($simpleString["0"])?"ok\n":"bug\n";
 echo isset($simpleString["16"])?"ok\n":"bug\n";
 echo isset($simpleString["17"])?"bug\n":"ok\n";
+echo isset($simpleString["wrong"][0])?"bug\n":"ok\n";
 echo $simpleString->wrong === null?"ok\n":"bug\n";
 echo $simpleString["wrong"] === "B"?"ok\n":"bug\n";
 echo $simpleString["0"] === "B"?"ok\n":"bug\n";
@@ -43,6 +44,7 @@ ok
 ok
 ok
 ok
+ok
 
 Notice: Trying to get property of non-object in %sbug31098.php on line %d
 ok

Zend/tests/bug35163.phpt

@@ -17,8 +17,22 @@ array(1) {
     [0]=>
     int(2)
     [1]=>
-    *RECURSION*
+    &array(3) {
+      [0]=>
+      int(2)
+      [1]=>
+      *RECURSION*
+      [2]=>
+      *RECURSION*
+    }
     [2]=>
-    *RECURSION*
+    &array(3) {
+      [0]=>
+      int(2)
+      [1]=>
+      *RECURSION*
+      [2]=>
+      *RECURSION*
+    }
   }
 }

Zend/tests/bug35163_2.phpt

@@ -20,17 +20,46 @@ array(3) {
     [0]=>
     int(2)
     [1]=>
-    *RECURSION*
+    &array(3) {
+      [0]=>
+      int(2)
+      [1]=>
+      *RECURSION*
+      [2]=>
+      *RECURSION*
+    }
     [2]=>
-    *RECURSION*
+    &array(3) {
+      [0]=>
+      int(2)
+      [1]=>
+      *RECURSION*
+      [2]=>
+      *RECURSION*
+    }
   }
   [2]=>
   &array(3) {
     [0]=>
     int(2)
     [1]=>
-    *RECURSION*
+    &array(3) {
+      [0]=>
+      int(2)
+      [1]=>
+      *RECURSION*
+      [2]=>
+      *RECURSION*
+    }
     [2]=>
-    *RECURSION*
+    &array(3) {
+      [0]=>
+      int(2)
+      [1]=>
+      *RECURSION*
+      [2]=>
+      *RECURSION*
+    }
   }
 }
+

Zend/tests/bug35163_3.phpt

@@ -11,15 +11,29 @@ var_dump($a);
 $a->b = null;
 $a = null;
 ?>
---EXPECTF--
-object(stdClass)#%d (1) {
+--EXPECT--
+object(stdClass)#1 (1) {
   ["b"]=>
   &array(3) {
     [0]=>
     int(2)
     [1]=>
-    *RECURSION*
+    &array(3) {
+      [0]=>
+      int(2)
+      [1]=>
+      *RECURSION*
+      [2]=>
+      *RECURSION*
+    }
     [2]=>
-    *RECURSION*
+    &array(3) {
+      [0]=>
+      int(2)
+      [1]=>
+      *RECURSION*
+      [2]=>
+      *RECURSION*
+    }
   }
 }

Zend/tests/bug35239.phpt

@@ -12,16 +12,30 @@ var_dump($a);
 $a->x0->y1 = "ok\n";
 echo $a->x0;
 ?>
---EXPECTF--
-object(stdClass)#%d (1) {
+--EXPECT--
+object(stdClass)#1 (1) {
   ["x0"]=>
-  &object(stdClass)#%d (3) {
+  &object(stdClass)#2 (3) {
     ["y0"]=>
     string(1) "b"
     ["y1"]=>
-    *RECURSION*
+    &object(stdClass)#2 (3) {
+      ["y0"]=>
+      string(1) "b"
+      ["y1"]=>
+      *RECURSION*
+      ["y2"]=>
+      *RECURSION*
+    }
     ["y2"]=>
-    *RECURSION*
+    &object(stdClass)#2 (3) {
+      ["y0"]=>
+      string(1) "b"
+      ["y1"]=>
+      *RECURSION*
+      ["y2"]=>
+      *RECURSION*
+    }
   }
 }
 ok

Zend/tests/bug35634.phpt

@@ -30,9 +30,7 @@ if (defined("pass3")) {
   set_error_handler('errorHandler');
   define("pass2", 1);
   include(__FILE__);
-  print "ok\n";
 }
-
 ?>
---EXPECT--
-ok
+--EXPECTF--
+Error: Redefining already defined constructor for class TestClass (%sbug35634.php:12)

Zend/tests/bug35655.phpt

@@ -4,6 +4,7 @@ Bug #35655 (whitespace following end of heredoc is lost)
 highlight.string  = #DD0000
 highlight.comment = #FF8000
 highlight.keyword = #007700
+highlight.bg      = #FFFFFF
 highlight.default = #0000BB
 highlight.html    = #000000
 --FILE--

Zend/tests/bug39018.phpt

@@ -63,18 +63,10 @@ print "\nDone\n";
 ?>
 --EXPECTF--
 
-Notice: Uninitialized string offset: %i in %s on line 6
-
-Notice: Uninitialized string offset: 0 in %s on line 10
-
 Notice: Uninitialized string offset: 0 in %s on line 12
 
-Notice: Uninitialized string offset: %i in %s on line 14
-
 Notice: Uninitialized string offset: %i in %s on line 16
 
-Notice: Uninitialized string offset: 0 in %s on line 18
-
 Notice: Uninitialized string offset: 4 in %s on line 28
 
 Notice: Uninitialized string offset: 4 in %s on line 34
@@ -85,8 +77,6 @@ Notice: Uninitialized string offset: 4 in %s on line 42
 
 Notice: Uninitialized string offset: 4 in %s on line 46
 
-Notice: Uninitialized string offset: 12 in %s on line 50
-
 Notice: Uninitialized string offset: 12 in %s on line 52
 b
 Done

Zend/tests/bug39304.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #39304 (Segmentation fault with list unpacking of string offset)
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.4.0', '>=')) die('skip ZendEngine 2.4 needed'); ?>
 --FILE--
 <?php 
   $s = "";

Zend/tests/bug39304_2_4.phpt

@@ -1,18 +0,0 @@
---TEST--
-Bug #39304 (Segmentation fault with list unpacking of string offset)
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.4.0', '<')) die('skip ZendEngine 2.4 needed'); ?>
---FILE--
-<?php 
-  $s = "";
-  list($a, $b) = $s[0];
-  var_dump($a,$b);
-?>
---EXPECTF--
-Notice: Uninitialized string offset: 0 in %sbug39304_2_4.php on line 3
-
-Notice: Uninitialized string offset: 1 in %sbug39304_2_4.php on line 3
-
-Notice: Uninitialized string offset: 0 in %sbug39304_2_4.php on line 3
-string(0) ""
-string(0) ""

Zend/tests/bug42767.phpt

@@ -4,6 +4,7 @@ Bug #42767 (highlight_string() truncates trailing comments)
 highlight.string  = #DD0000
 highlight.comment = #FF8000
 highlight.keyword = #007700
+highlight.bg      = #FFFFFF
 highlight.default = #0000BB
 highlight.html    = #000000
 --FILE--

Zend/tests/bug44827.phpt

@@ -1,11 +0,0 @@
---TEST--
-Bug #44827 (define() allows :: in constant names)
---FILE--
-<?php
-define('foo::bar', 1);
-define('::', 1);
-?>
---EXPECTF--
-Warning: Class constants cannot be defined or redefined in %sbug44827.php on line %d
-
-Warning: Class constants cannot be defined or redefined in %sbug44827.php on line %d

Zend/tests/bug45180.phpt

@@ -58,4 +58,4 @@ string(1) "C"
 __callstatic:
 string(3) "FOO"
 __callstatic:
-string(3) "FOO"
+string(3) "FOO"

Zend/tests/bug45742.phpt

@@ -20,5 +20,5 @@ var_dump( ArrayProperty::$array );
 --EXPECT--
 array(1) {
   [1]=>
-  int(42)
+  int(23)
 }

Zend/tests/bug45877.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Bug #45877 (Array key '2147483647' left as string)
 --INI--
-precision=16
+precision=20
 --FILE--
 <?php
 $keys = array(PHP_INT_MAX,
@@ -18,6 +18,6 @@ array(3) {
   int(1)
   [-%d8]=>
   int(1)
-  ["%s"]=>
+  ["%d8"]=>
   int(1)
 }

Zend/tests/bug46665.phpt

@@ -12,4 +12,4 @@ function __autoload($class) {
 
 ?>
 --EXPECTF--
-%string|unicode%(11) "Foo\Bar\Baz"
+%string|unicode%(12) "\Foo\Bar\Baz"

Zend/tests/bug47516.phpt

@@ -30,7 +30,7 @@ ppp
 
 echo "$htm\n";
 ?>
---EXPECT--
+--EXPECT---
 abc
 abc
 abc

Zend/tests/bug48215.phpt

@@ -29,6 +29,8 @@ $b->A();
 ?>
 ===DONE===
 --EXPECTF--
+
+Strict Standards: Redefining already defined constructor for class A in %s on line %d
 B::__construct
 A::__construct
 B::A

Zend/tests/bug48215_2.phpt

@@ -16,4 +16,7 @@ $c = new c();
 ?>
 ===DONE===
 --EXPECTF--
+
+Strict Standards: Redefining already defined constructor for class a in %s on line %d
+
 Fatal error: Call to undefined method b::b() in %s on line %d

Zend/tests/bug48667_1.phpt

@@ -1,10 +0,0 @@
---TEST--
-Bug #48667 (Implementing both iterator and iteratoraggregate)
---FILE--
-<?php
-
-abstract class A implements Iterator, IteratorAggregate { }
-
-?>
---EXPECTF--
-Fatal error: Class A cannot implement both IteratorAggregate and Iterator at the same time in %s on line %d

Zend/tests/bug48667_2.phpt

@@ -1,10 +0,0 @@
---TEST--
-Bug #48667 (Implementing both iterator and iteratoraggregate)
---FILE--
-<?php
-
-abstract class A implements IteratorAggregate, Iterator { }
-
-?>
---EXPECTF--
-Fatal error: Class A cannot implement both Iterator and IteratorAggregate at the same time in %s on line %d

Zend/tests/bug48693.phpt

@@ -1,28 +0,0 @@
---TEST--
-Bug #48693 (Double declaration of __lambda_func when lambda wrongly formatted)
---FILE--
-<?php
-
-$x = create_function('', 'return 1; }');
-$y = create_function('', 'function a() { }; return 2;');
-$z = create_function('', '{');
-$w = create_function('', 'return 3;');
-
-var_dump(
-	$x,
-	$y(),
-	$z,
-	$w(),
-	$y != $z
-);
-
-?>
---EXPECTF--
-Parse error: syntax error, unexpected '}' in %s(%d) : runtime-created function on line 1
-
-Parse error: syntax error, unexpected end of file in %s(%d) : runtime-created function on line 1
-bool(false)
-int(2)
-bool(false)
-int(3)
-bool(true)

Zend/tests/bug48770.phpt

@@ -1,53 +0,0 @@
---TEST--
-Bug #48770 (call_user_func_array() fails to call parent from inheriting class)
---XFAIL--
-See Bug #48770
---FILE--
-<?php
- 
-class A {
-	public function func($str) {
-		var_dump(__METHOD__ .': '. $str);
-	}
-	private function func2($str) {
-		var_dump(__METHOD__ .': '. $str);
-	}
-	protected function func3($str) {
-		var_dump(__METHOD__ .': '. $str);		
-	}
-	private function func22($str) {
-		var_dump(__METHOD__ .': '. $str);		
-	}
-}
-
-class B extends A {
-	public function func($str) {
-		static $avoid_crash = 0;
-		
-		if ($avoid_crash++ == 1) {
-			print "This method shouldn't be called when using parent::func!\n";
-			return;
-		}
-				
-		call_user_func_array(array($this, 'parent::func'), array($str));
-	}
-	private function func2($str) {
-		var_dump(__METHOD__ .': '. $str);
-	}
-	protected function func3($str) {
-		var_dump(__METHOD__ .': '. $str);
-	}
-}
-
-class C extends B {
-	public function func($str) {
-		parent::func($str);
-	}
-}
-
-$c = new C;
-$c->func('This should work!');
-
-?>
---EXPECTF--
-%unicode|string%(26) "A::func: This should work!"

Zend/tests/bug48770_2.phpt

@@ -1,54 +0,0 @@
---TEST--
-Bug #48770 (call_user_func_array() fails to call parent from inheriting class)
---XFAIL--
-See Bug #48770
---FILE--
-<?php
- 
-class A {
-	public function func($str) {
-		var_dump(__METHOD__ .': '. $str);
-	}
-	private function func2($str) {
-		var_dump(__METHOD__ .': '. $str);
-	}
-	protected function func3($str) {
-		var_dump(__METHOD__ .': '. $str);		
-	}
-	private function func22($str) {
-		var_dump(__METHOD__ .': '. $str);		
-	}
-}
-
-class B extends A {
-	public function func($str) {
-  		call_user_func_array(array($this, 'parent::func2'), array($str));
-  		call_user_func_array(array($this, 'parent::func3'), array($str));
-  		call_user_func_array(array($this, 'parent::func22'), array($str));
-  		call_user_func_array(array($this, 'parent::inexistent'), array($str));
-	}
-	private function func2($str) {
-		var_dump(__METHOD__ .': '. $str);
-	}
-	protected function func3($str) {
-		var_dump(__METHOD__ .': '. $str);
-	}
-}
-
-class C extends B {
-	public function func($str) {
-		parent::func($str);
-	}
-}
-
-$c = new C;
-$c->func('This should work!');
-
-?>
---EXPECTF--
-%unicode|string%(27) "A::func2: This should work!"
-%unicode|string%(27) "A::func3: This should work!"
-
-Warning: call_user_func_array() expects parameter 1 to be a valid callback, cannot access private method A::func22() in %s on line %d
-
-Warning: call_user_func_array() expects parameter 1 to be a valid callback, class 'A' does not have a method 'inexistent' in %s on line %d

Zend/tests/bug48770_3.phpt

@@ -1,51 +0,0 @@
---TEST--
-Bug #48770 (call_user_func_array() fails to call parent from inheriting class)
---XFAIL--
-See Bug #48770
---FILE--
-<?php
- 
-class A {
-	public function func($str) {
-		var_dump(__METHOD__ .': '. $str);
-	}
-	private function func2($str) {
-		var_dump(__METHOD__ .': '. $str);
-	}
-	protected function func3($str) {
-		var_dump(__METHOD__ .': '. $str);		
-	}
-	private function func22($str) {
-		var_dump(__METHOD__ .': '. $str);		
-	}
-}
-
-class B extends A {
-	public function func($str) {
-  		call_user_func_array(array($this, 'self::func2'), array($str));
-  		call_user_func_array(array($this, 'self::func3'), array($str));
-  		call_user_func_array(array($this, 'self::inexistent'), array($str));
-	}
-	private function func2($str) {
-		var_dump(__METHOD__ .': '. $str);
-	}
-	protected function func3($str) {
-		var_dump(__METHOD__ .': '. $str);
-	}
-}
-
-class C extends B {
-	public function func($str) {
-		parent::func($str);
-	}
-}
-
-$c = new C;
-$c->func('This should work!');
-
-?>
---EXPECTF--
-%unicode|string%(27) "B::func2: This should work!"
-%unicode|string%(27) "B::func3: This should work!"
-
-Warning: call_user_func_array() expects parameter 1 to be a valid callback, class 'B' does not have a method 'inexistent' in %s on line %d

Zend/tests/bug48899.phpt

@@ -1,24 +0,0 @@
---TEST--
-Bug #48899 (is_callable returns true even if method does not exist in parent class)
---FILE--
-<?php
-
-class ParentClass { }
-
-class ChildClass extends ParentClass {
-	public function testIsCallable() {
-		var_dump(is_callable(array($this, 'parent::testIsCallable')));
-	}
-	public function testIsCallable2() {
-		var_dump(is_callable(array($this, 'static::testIsCallable2')));
-	}
-}
-
-$child = new ChildClass();
-$child->testIsCallable();
-$child->testIsCallable2();
-
-?>
---EXPECT--
-bool(false)
-bool(true)

Zend/tests/bug48912.phpt

@@ -1,16 +0,0 @@
---TEST--
-Bug #48912 (Namespace causes unexpected strict behaviour with extract())
---FILE--
-<?php
-namespace A;
-
-function test()
-{
-	extract(func_get_arg(0));
-}
-
-test(array('x' => 1));
-echo "ok\n";
-?>
---EXPECT--
-ok

Zend/tests/bug48930.phpt

@@ -1,16 +0,0 @@
---TEST--
-Bug #48930 (__COMPILER_HALT_OFFSET__ incorrect in PHP>=5.3)
---FILE--
-#!php
-<?php
-
-/*
- * Test
- */
-printf("__COMPILER_HALT_OFFSET__ is %d\n",__COMPILER_HALT_OFFSET__);
-
-__halt_compiler();
-
-?>
---EXPECT--
-__COMPILER_HALT_OFFSET__ is 116

Zend/tests/bug49269.phpt

@@ -1,26 +0,0 @@
---TEST--
-Bug #49269 (Ternary operator fails on Iterator object when used inside foreach declaration).
---FILE--
-<?php
-class TestObject implements Iterator
-{
-    public $n = 0;
-    function valid()
-    {
-        return ($this->n < 3);
-    }
-    function current() {return $this->n;}
-    function next() {$this->n++;}
-    function key() { }
-    function rewind() {$this->n = 0;}
-}
-
-
-$array_object = new TestObject();
-
-foreach ((true ? $array_object : $array_object) as $item) echo "$item\n";
-?>
---EXPECT--
-0
-1
-2

Zend/tests/bug49472.phpt

@@ -1,27 +0,0 @@
---TEST--
-Bug #49472 (Constants defined in Interfaces can be overridden)
---FILE--
-<?php
-
-interface ia {
-    const c = 'Sea';
-    const y = 2;
-}
-
-class Foo implements ia {
-}
-
-class FooBar extends Foo implements ia {
-	const x = 1;
-	const c = 'Ocean';
-	
-	public function show() {
-		return ia::c;
-	}
-}
-
-new FooBar;
-
-?>
---EXPECTF--
-Fatal error: Cannot inherit previously-inherited or override constant c from interface ia in %s on line %d

Zend/tests/bug49866.phpt

@@ -1,10 +0,0 @@
---TEST--
-Bug #49866 (Making reference on string offsets crashes PHP)
---FILE--
-<?php
-$a = "string";
-$b = &$a[1];
-$b = "f";
-echo $a;
---EXPECTF--
-Fatal error: Cannot create references to/from string offsets nor overloaded objects in %sbug49866.php on line 3

Zend/tests/bug49893.phpt

@@ -1,28 +0,0 @@
---TEST--
-Bug #49893 (Crash while creating an instance of Zend_Mail_Storage_Pop3)
---FILE--
-<?php
-class A {
-	function __destruct() {
-		try {
-			throw new Exception("2");
-		} catch (Exception $e) {
-			echo $e->getMessage() . "\n";
-		}
-	}
-}
-class B {
-	function __construct() {
-		$this->a = new A();
-		throw new Exception("1");
-	}
-}
-try {
-	$b = new B();
-} catch(Exception $e) {
-	echo $e->getMessage() . "\n";;
-}
-?>
---EXPECT--
-2
-1

Zend/tests/bug49908.phpt

@@ -1,28 +0,0 @@
---TEST--
-Bug #49908 (throwing exception in __autoload crashes when interface is not defined)
---FILE--
-<?php
-
-function __autoload($className) {
-	var_dump($className);
-	
-	if ($className == 'Foo') {
-		class Foo implements Bar {};
-	} else {
-		throw new Exception($className);
-	}
-}
-
-new Foo;
-
-?>
---EXPECTF--
-%unicode|string%(3) "Foo"
-%unicode|string%(3) "Bar"
-
-Fatal error: Uncaught exception 'Exception' with message 'Bar' in %s:%d
-Stack trace:
-#0 %s(7): __autoload('Bar')
-#1 %s(13): __autoload('Foo')
-#2 {main}
-  thrown in %s on line %d

Zend/tests/bug50005.phpt

@@ -1,19 +0,0 @@
---TEST--
-Bug #50005 (Throwing through Reflection modified Exception object makes segmentation fault)
---FILE--
-<?php
-
-class a extends exception {
-	public function __construct() {
-		$this->file = null;
-	}
-}
-
-throw new a;
-
-?>
---EXPECTF--
-Fatal error: Uncaught exception 'a' in :%d
-Stack trace:
-#0 {main}
-  thrown in Unknown on line %d

Zend/tests/bug50146.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #50146 (property_exists: Closure object cannot have properties)
---FILE--
-<?php
-
-$obj = function(){};
-
-var_dump(property_exists($obj,'foo'));
-
-$ref = new ReflectionObject($obj);
-var_dump($ref->hasProperty('b'));
-
-var_dump(isset($obj->a));
-
-?>
---EXPECTF--
-bool(false)
-bool(false)
-
-Catchable fatal error: Closure object cannot have properties in %s on line %d

Zend/tests/bug50174.phpt

@@ -1,33 +0,0 @@
---TEST--
-Bug #50174 (Incorrectly matched docComment)
---SKIPIF--
-<?php if (!extension_loaded('reflection') || !extension_loaded('spl')) print "skip"; ?>
---FILE--
-<?php
-
-class TestClass
-{
-	/** const comment */
-	const C = 0;
-
-	function x() {}
-}
-
-$rm = new ReflectionMethod('TestClass', 'x');
-var_dump($rm->getDocComment());
-
-class TestClass2
-{
-	/** const comment */
-	const C = 0;
-
-	public $x;
-}
-
-$rp = new ReflectionProperty('TestClass2', 'x');
-var_dump($rp->getDocComment());
-
-?>
---EXPECT--
-bool(false)
-bool(false)

Zend/tests/bug50255.phpt

@@ -1,30 +0,0 @@
---TEST--
-Bug #50255 (isset() and empty() silently casts array to object)
---FILE--
-<?php
-
-$arr = array('foo' => 'bar');
-
-print "isset\n";
-var_dump(isset($arr->foo));
-var_dump(isset($arr->bar));
-var_dump(isset($arr['foo']));
-var_dump(isset($arr['bar']));
-print "empty\n";
-var_dump(empty($arr->foo));
-var_dump(empty($arr->bar));
-var_dump(empty($arr['foo']));
-var_dump(empty($arr['bar']));
-
-?>
---EXPECT--
-isset
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-empty
-bool(true)
-bool(true)
-bool(false)
-bool(true)

Zend/tests/bug50261.phpt

@@ -1,38 +0,0 @@
---TEST--
-Bug #50261 (Crash When Calling Parent Constructor with call_user_func())
---FILE--
-<?php
-
-class testClass {
-	function testClass($x) {
-		echo __METHOD__, " (". $x . ")\n";
-	}
-}
-
-class testClass2 extends testClass {
-	function __construct() {
-		static $x = 0;
-		
-		if ($x) {
-			print "Infinite loop...\n";
-		} else {
-			$x++;
-			
-			parent::__construct(1);
-			testclass::__construct(2);
-			call_user_func(array('parent', '__construct'), 3);
-			call_user_func(array('testclass', '__construct'), 4);
-			call_user_func(array('testclass', 'testclass'), 5);
-		}
-	}
-}
-
-new testClass2;
-
-?>
---EXPECT--
-testClass::testClass (1)
-testClass::testClass (2)
-testClass::testClass (3)
-testClass::testClass (4)
-testClass::testClass (5)

Zend/tests/bug50383.phpt

@@ -1,130 +0,0 @@
---TEST--
-Bug #50383 (Exceptions thrown in __call / __callStatic do not include file and line in trace)
---FILE--
-<?php
-
-class myClass {
-	public static function __callStatic($method, $args) {
-		throw new Exception("Missing static method '$method'\n");
-	}
-	public function __call($method, $args) {
-		throw new Exception("Missing method '$method'\n");
-	}
-}
-
-function thrower() {
-	myClass::ThrowException();
-}
-function thrower2() {
-	$x = new myClass;
-	$x->foo();
-}
-
-try {
-	thrower();
-} catch(Exception $e) {
-	print $e->getMessage();
-	print_r($e->getTrace());
-}
-
-try {
-	thrower2();
-} catch (Exception $e) {
-	print $e->getMessage();
-	print_r($e->getTrace());
-}
-
-?>
---EXPECTF--
-Missing static method 'ThrowException'
-Array
-(
-    [0] => Array
-        (
-            [file] => %s
-            [line] => 13
-            [function] => __callStatic
-            [class] => myClass
-            [type] => ::
-            [args] => Array
-                (
-                    [0] => ThrowException
-                    [1] => Array
-                        (
-                        )
-
-                )
-
-        )
-
-    [1] => Array
-        (
-            [file] => %s
-            [line] => 13
-            [function] => ThrowException
-            [class] => myClass
-            [type] => ::
-            [args] => Array
-                (
-                )
-
-        )
-
-    [2] => Array
-        (
-            [file] => %s
-            [line] => 21
-            [function] => thrower
-            [args] => Array
-                (
-                )
-
-        )
-
-)
-Missing method 'foo'
-Array
-(
-    [0] => Array
-        (
-            [file] => %s
-            [line] => 17
-            [function] => __call
-            [class] => myClass
-            [type] => ->
-            [args] => Array
-                (
-                    [0] => foo
-                    [1] => Array
-                        (
-                        )
-
-                )
-
-        )
-
-    [1] => Array
-        (
-            [file] => %s
-            [line] => 17
-            [function] => foo
-            [class] => myClass
-            [type] => ->
-            [args] => Array
-                (
-                )
-
-        )
-
-    [2] => Array
-        (
-            [file] => %s
-            [line] => 28
-            [function] => thrower2
-            [args] => Array
-                (
-                )
-
-        )
-
-)

Zend/tests/bug50394.phpt

@@ -1,24 +0,0 @@
---TEST--
-Bug #50394: Reference argument converted to value in __call
---FILE--
-<?php
-function inc( &$x ) { $x++; }
-
-class Proxy {
-        function __call( $name, $args ) {
-		echo "$name called!\n";
-                call_user_func_array( 'inc', $args );
-        }
-}
-
-$arg = 1;
-$args = array( &$arg );
-$proxy = new Proxy;
-call_user_func_array( array( $proxy, 'bar' ), $args );
-call_user_func_array( array( $proxy, 'bar' ), array(&$arg) );
-var_dump($arg);
---EXPECT--	
-bar called!
-bar called!
-int(3)
-

Zend/tests/bug50810.phpt

@@ -1,46 +0,0 @@
---TEST--
-Bug #50810 (property_exists does not work for private)
---FILE--
-<?php
-
-class ExampleSuperClass
-{
-    private $foo;
-    static protected $bar;
- 
-    private function foo()
-    {
-    }
- 
-    public function propertyFooExists()
-    {
-        return property_exists($this, 'foo');
-    }
- 
-}
- 
-class ExampleSubClass extends ExampleSuperClass
-{
-    public function methodExists()
-    {
-        return method_exists($this, 'foo');
-    }
- 
-    public function propertyBarExists()
-    {
-        return property_exists($this, 'bar');
-    }
-}
- 
-$example = new ExampleSubClass();
-var_dump($example->methodExists());
-var_dump(method_exists($example, 'propertyFooExists'));
-var_dump($example->propertyFooExists());
-var_dump($example->propertyBarExists());
-
-?>
---EXPECT--
-bool(true)
-bool(true)
-bool(true)
-bool(true)