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

Fix for '' returned as ' '.
This only works with FreeTDS as microsofts library returns a length of 1 for an empty string!

.gdbinit

@@ -119,7 +119,8 @@ define ____printzv_contents
 		set $type = 0
 	end
 	if $type == 6
-		printf "string(%d): \"%s\"", $zvalue->value.str.len, $zvalue->value.str.val
+		printf "string(%d): ", $zvalue->value.str.len
+		____print_str $zvalue->value.str.val $zvalue->value.str.len
 	end
 	if $type == 7
 		printf "resource: #%d", $zvalue->value.lval
@@ -167,8 +168,9 @@ define ____print_const_table
 			set $i = $i - 1
 		end
 
-		if $p->nKeyLength > 0 
-			printf "\"%s\" => ", $p->arKey
+		if $p->nKeyLength > 0
+			____print_str $p->arKey $p->nKeyLength
+			printf " => "
 		else
 			printf "%d => ", $p->h
 		end
@@ -198,8 +200,9 @@ define ____print_ht
 			set $i = $i - 1
 		end
 
-		if $p->nKeyLength > 0 
-			printf "\"%s\" => ", $p->arKey
+		if $p->nKeyLength > 0
+			____print_str $p->arKey $p->nKeyLength
+			printf " => "
 		else
 			printf "%d => ", $p->h
 		end
@@ -233,8 +236,9 @@ define ____print_ft
 			set $i = $i - 1
 		end
 
-		if $p->nKeyLength > 0 
-			printf "\"%s\" => ", (char*)$p->arKey
+		if $p->nKeyLength > 0
+			____print_str $p->arKey $p->nKeyLength
+			printf " => "
 		else
 			printf "%d => ", $p->h
 		end
@@ -255,6 +259,113 @@ document print_ft
 	dumps a function table (HashTable)
 end
 
+define ____print_inh_class
+	set $ce = $arg0
+	if $ce->ce_flags & 0x10 || $ce->ce_flags & 0x20
+		printf "abstract "
+	else
+		if $ce->ce_flags & 0x40
+			printf "final "
+		end
+	end
+	printf "class %s", $ce->name
+	if $ce->parent != 0
+		printf " extends %s", $ce->parent->name
+	end
+	if $ce->num_interfaces != 0
+		printf " implements"
+		set $tmp = 0
+		while $tmp < $ce->num_interfaces
+			printf " %s", $ce->interfaces[$tmp]->name
+			set $tmp = $tmp + 1
+			if $tmp < $ce->num_interfaces
+				printf ","
+			end
+		end
+	end
+	set $ce = $ce->parent
+end
+
+define ____print_inh_iface
+	set $ce = $arg0
+	printf "interface %s", $ce->name
+	if $ce->num_interfaces != 0
+		set $ce = $ce->interfaces[0]
+		printf " extends %s", $ce->name
+	else
+		set $ce = 0
+	end
+end
+
+define print_inh
+	set $ce = $arg0
+	set $depth = 0
+	while $ce != 0
+		set $tmp = $depth
+		while $tmp != 0
+			printf " "
+			set $tmp = $tmp - 1
+		end
+		set $depth = $depth + 1
+		if $ce->ce_flags & 0x80
+			____print_inh_iface $ce
+		else
+			____print_inh_class $ce
+		end
+		printf " {\n"
+	end
+	while $depth != 0
+		set $tmp = $depth
+		while $tmp != 1
+			printf " "
+			set $tmp = $tmp - 1
+		end
+		printf "}\n"
+		set $depth = $depth - 1
+	end
+end
+
+define print_pi
+	set $pi = $arg0
+	printf "[0x%08x] {\n", $pi
+	printf "    h     = %lu\n", $pi->h
+	printf "    flags = %d (", $pi->flags
+	if $pi->flags & 0x100
+		printf "ZEND_ACC_PUBLIC"
+	else
+		if $pi->flags & 0x200
+			printf "ZEND_ACC_PROTECTED"
+		else
+			if $pi->flags & 0x400
+				printf "ZEND_ACC_PRIVATE"
+			else
+				if $pi->flags & 0x800
+					printf "ZEND_ACC_CHANGED"
+				end
+			end
+		end
+	end
+	printf ")\n"
+	printf "    name  = "
+	____print_str $pi->name $pi->name_length
+	printf "\n}\n"
+end
+
+define ____print_str
+	set $tmp = 0
+	set $str = $arg0
+	printf "\""
+	while $tmp < $arg1
+		if $str[$tmp] > 32 && $str[$tmp] < 127
+			printf "%c", $str[$tmp]
+		else
+			printf "\\%o", $str[$tmp]
+		end
+		set $tmp = $tmp + 1
+	end
+	printf "\""
+end
+
 define printzn
 	____executor_globals
 	set $ind = 0

EXTENSIONS

@@ -229,7 +229,7 @@ STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           simplexml
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
@@ -464,6 +464,11 @@ PRIMARY MAINTAINER:  Kristian K
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           reflection
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>, Johannes Schlüter <johannes@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           session
 PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained

Makefile.gcov

@@ -29,7 +29,7 @@ php_lcov.info: lcov-test
 	@rm -rf lcov_data/
 	@$(mkinstalldirs) lcov_data/
 	@echo
-	-@find . -name \*.gcda -o -name \*.gcno -o -name \*.da | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq | while read x; do \
+	-@find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq | while read x; do \
 		echo -n . ;\
 		y=`echo $$x | sed -e 's!\.libs/!!'`; \
 		dir=lcov_data/`dirname $$x`; \
@@ -37,6 +37,9 @@ php_lcov.info: lcov-test
 		if test -f "$(top_srcdir)/$$y.c"; then \
 			ln -f -s $(top_srcdir)/$$y.c lcov_data/$$y.c; \
 		fi; \
+		if test -f "$(top_srcdir)/$$y.h"; then \
+			ln -f -s $(top_srcdir)/$$y.h lcov_data/$$y.h; \
+		fi; \
 		if test -f "$(top_srcdir)/$$y.re"; then \
 			ln -f -s $(top_srcdir)/$$y.re lcov_data/$$y.re; \
 		fi; \
@@ -46,6 +49,9 @@ php_lcov.info: lcov-test
 		if test -f "$(top_srcdir)/$$y.l"; then \
 		        ln -f -s $(top_srcdir)/$$y.l lcov_data/$$y.l; \
 		fi; \
+		if test -f "$(top_srcdir)/$$y"; then \
+		        ln -f -s $(top_srcdir)/$$y lcov_data/$$y; \
+		fi; \
 		if test -f "$(top_builddir)/$$y.c"; then \
 			ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
 		fi; \
@@ -61,7 +67,7 @@ php_lcov.info: lcov-test
 
 lcov-html: php_lcov.info
 	@echo "Generating lcov HTML"
-	@$(LTP_GENHTML) --legend --output-directory lcov_html/ --title "PHP Code Coverage" --show-details php_lcov.info
+	@$(LTP_GENHTML) --legend --output-directory lcov_html/ --title "PHP Code Coverage" php_lcov.info
 
 lcov-clean:
 	rm -f php_lcov.info

NEWS

@@ -1,11 +1,864 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+08 Feb 2007, PHP 5.2.1
+- Added read-timeout context option "timeout" for HTTP streams. (Hannes, Ilia). 
+- Added CURLOPT_TCP_NODELAY constant to Curl extension. (Sara)
+- Added support for hex numbers of any size. (Matt)
+- Added function stream_socket_shutdown(). It is a wrapper for system 
+  shutdown() function, that shut downs part of a full-duplex connection. 
+  (Dmitry)
+- Added internal heap protection (Dmitry)
+  . memory-limit is always enabled (--enable-memory-limit removed)
+  . default value if memory-limit is set to 128M
+  . safe unlinking
+  . cookies
+  . canary protection (debug build only)
+  . random generation of cookies and canaries
+- Added forward support for 'b' prefix in front of string literals. (Andrei)
+- Added three new functions to ext/xmlwriter (Rob, Ilia)
+  . xmlwriter_start_dtd_entity()
+  . xmlwriter_end_dtd_entity()
+  . xmlwriter_write_dtd_entity()
+- Added a meta tag to phpinfo() output to prevent search engines from indexing 
+  the page. (Ilia)
+- Added new function, sys_get_temp_dir(). (Hartmut)
+- Added missing object support to file_put_contents(). (Ilia)
+- Added support for md2, ripemd256 and ripemd320 algos to hash(). (Sara)
+- Added forward support for (binary) cast. (Derick)
+- Added optimization for imageline with horizontal and vertical lines (Pierre)
+
+- Removed dependency from SHELL32.DLL. (Dmitry)
+- Removed double "wrong parameter count" warnings in various functions. 
+  (Hannes)
+- Moved extensions to PECL:
+  . ext/informix (Derick, Tony)
+
+- Changed double-to-string utilities to use BSD implementation. (Dmitry, Tony)
+- Updated bundled libcURL to version 7.16.0 in the Windows distro. (Edin)
+- Updated timezone database to version 2006.16. (Derick)
+- cgi.* and fastcgi.* directives are moved to INI subsystem. The new directive 
+  cgi.check_shebang_line can be used to omitting check for "#! /usr/bin/php" 
+  line. (Dmitry).
+- Improved proc_open(). Now on Windows it can run external commands not 
+  through CMD.EXE. (Dmitry)
+- VCWD_REALPATH() is improved to use realpath cache without VIRTUAL_DIR.
+  (Dmitry)
+- ext/bcmath initialization code is moved from request startup to module 
+  startup. (Dmitry)
+- Zend Memory Manager Improvements (Dmitry)
+  . use HeapAlloc() instead of VirtualAlloc()
+  . use "win32" storage manager (instead of "malloc") on Windows by default
+- Zip Extension Improvements (Pierre)
+  . Fixed leak in statName and stateIndex
+  . Fixed return setComment (Hannes)
+  . Added addEmptyDir method
+- Filter Extension Improvements (Ilia, Pierre)
+  . Fixed a bug when callback function returns a non-modified value.
+  . Added filter support for $_SERVER in cgi/apache2 sapis.
+  . Make sure PHP_SELF is filtered in Apache 1 sapi.
+  . Fixed bug #39358 (INSTALL_HEADERS contains incorrect reference to 
+    php_filter.h).
+  . Added "default" option that allows a default value to be set for an 
+    invalid or missing value.
+  . Invalid filters fails instead of returning unsafe value
+  . Fixed possible double encoding problem with sanitizing filters
+  . Make use of space-strict strip_tags() function
+  . Fixed whitespace trimming
+  . Added support for FastCGI environment variables. (Dmitry)
+- PDO_MySQL Extension Improvements (Ilia)
+  . Enabled buffered queries by default.
+  . Enabled prepared statement emulation by default.
+
+- Small optimization of the date() function. (Matt,Ilia)
+- Optimized the internal is_numeric_string() function. (Matt,Ilia)
+- Optimized array functions utilizing php_splice(). (Ilia)
+- Windows related optimizations (Dmitry, Stas)
+  . COM initialization/deinitialization are done only if necessary
+  . removed unnecessary checks for ISREG file and corresponding stat() calls
+  . opendir() is reimplementation using GetFistFile/GetNextFile those are 
+    faster then _findfirst/_findnext
+  . implemented registry cache that prevent registry lookup on each request. 
+    In case of modification of corresponding registry-tree PHP will reload it 
+    automatic
+  . start timeout thread only if necessary
+  . stat() is reimplementation using GetFileAttributesEx(). The new 
+    implementation is faster then implementation in MS VC CRT, but it doesn't
+    support Windows 95.
+- Streams optimization (Dmitry)
+  . removed unnecessary ftell() calls (one call for each included PHP file)
+  . disabled calls to read() after EOF
+
+- Fixed incorrect function names on FreeBSD where inet_pton() was named 
+  __inet_pton() and inet_ntop() was named __inet_ntop(). (Hannes)
+- Fixed FastCGI impersonation for persistent connections on Windows. (Dmitry)
+- Fixed wrong signature initialization in imagepng (Takeshi Abe)
+- Fixed ftruncate() with negative size on FreeBSD. (Hannes)
+- Fixed segfault in RegexIterator when given invalid regex. (Hannes)
+- Fixed segfault in SplFileObject->openFile()->getPathname(). (Hannes)
+- Fixed segfault in ZTS mode when OCI8 statements containing sub-statements 
+  are destroyed in wrong order. (Tony)
+- Fixed the validate email filter so that the letter "v" can also be used in
+  the user part of the email address. (Derick)
+- Fixed bug #40297 (compile failure in ZTS mode when collections support is 
+  missing). (Tony)
+- Fixed bug #40285 (The PDO prepare parser goes into an infinite loop in
+  some instances). (Ilia)
+- Fixed Bug #40274 (Sessions fail with numeric root keys). (Ilia)
+- Fixed bug #40259 (ob_start call many times - memory error). (Dmitry)
+- Fixed bug #40231 (file_exists incorrectly reports false). (Dmitry)
+- Fixed bug #40228 (ZipArchive::extractTo does create empty directories 
+  recursively). (Pierre)
+- Fixed bug #40200 (The FastCgi version has different realpath results than 
+  thread safe version). (Dmitry)
+- Fixed bug #40191 (use of array_unique() with objects triggers segfault). 
+  (Tony)
+- Fixed bug #40189 (possible endless loop in zlib.inflate stream filter).
+  (Greg, Tony)
+- Fixed bug #40169 (CURLOPT_TCP_NODELAY only available in curl >= 7.11.2). 
+  (Tony)
+- Fixed bug #40129 (iconv extension doesn't compile with CodeWarrior on 
+  Netware). (gk at gknw dot de, Tony)
+- Fixed bug #40127 (apache2handler doesn't compile on Netware). 
+  (gk at gknw dot de)
+- Fixed bug #40121 (PDO_DBLIB driver wont free statements). (Ilia)
+- Fixed bug #40098 (php_fopen_primary_script() not thread safe). (Ilia)
+- Fixed bug #40092 (chroot() doesn't clear realpath cache). (Dmitry)
+- Fixed bug #40091 (spl_autoload_register with 2 instances of the same class).
+  (Ilia)
+- Fixed bug #40083 (milter SAPI functions always return false/null). (Tony)
+- Fixed bug #40079 (php_get_current_user() not thread safe).
+  (Ilia, wharmby at uk dot ibm dot com)
+- Fixed bug #40078 (ORA-01405 when fetching NULL values using
+  oci_bind_array_by_name()). (Tony)
+- Fixed bug #40076 (zend_alloc.c: Value of enumeration constant must be in 
+  range of signed integer). (Dmitry)
+- Fixed bug #40073 (exif_read_data dies on certain images). (Tony, Marcus)
+- Fixed bug #40036 (empty() does not work correctly with ArrayObject when 
+  using ARRAY_AS_PROPS). (Ilia)
+- Fixed bug #40012 (php_date.c doesn't compile on Netware).
+  (gk at gknw dot de, Derick)
+- Fixed bug #40009 (http_build_query(array()) returns NULL). (Ilia)
+- Fixed bug #40002 (Try/Catch performs poorly). (Dmitry)
+- Fixed bug #39993 (tr_TR.UTF-8 locale has problems with PHP). (Ilia)
+- Fixed bug #39990 (Cannot "foreach" over overloaded properties). (Dmitry)
+- Fixed bug #39988 (type argument of oci_define_by_name() is ignored).
+  (Chris Jones, Tony)
+- Fixed bug #39984 (redirect response code in header() could be ignored 
+  in CGI sapi). (Ilia)
+- Fixed bug #39979 (PGSQL_CONNECT_FORCE_NEW will causes next connect to 
+  establish a new connection). (Ilia)
+- Fixed bug #39971 (pg_insert/pg_update do not allow now() to be used 
+  for timestamp fields). (Ilia)
+- Fixed bug #39969 (ini setting short_open_tag has no effect when using 
+  --enable-maintainer-zts). (Dmitry)
+- Fixed bug #39952 (zip ignoring --with-libdir on zlib checks)
+  (judas dot iscariote at gmail dot com)
+- Fixed bug #39944 (References broken). (Dmitry)
+- Fixed bug #39935 (Extensions tidy,mcrypt,mhash,pdo_sqlite ignores 
+  --with-libdir). (judas dot iscariote at gmail dot com, Derick)
+- Fixed bug #39903 (Notice message when executing __halt_compiler() more than
+  once). (Tony)
+- Fixed bug #39898 (FILTER_VALIDATE_URL validates \r\n\t etc). (Ilia)
+- Fixed bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR
+  install path). (Tony)
+- Fixed bug #39884 (ReflectionParameter::getClass() throws exception for 
+  type hint self). (thekid at php dot net)
+- Fixed bug #39878 (CURL doesn't compile on Sun Studio Pro). (Ilia)
+- Fixed bug #39873 (number_format() breaks with locale & decimal points).
+  (Ilia)
+- Fixed bug #39869 (safe_read does not initialize errno).
+  (michiel at boland dot org, Dmitry)
+- Fixed bug #39850 (SplFileObject throws contradictory/wrong error messages
+  when trying to open "php://wrong"). (Tony)
+- Fixed bug #39846 (Invalid IPv4 treated as valid). (Ilia)
+- Fixed bug #39845 (Persistent connections generate a warning in pdo_pgsql).
+  (Ilia)
+- Fixed bug #39832 (SOAP Server: parameter not matching the WSDL specified 
+  type are set to 0). (Dmitry)
+- Fixed bug #39825 (foreach produces memory error). (Dmitry)
+- Fixed bug #39816 (apxs2filter ignores httpd.conf & .htaccess php config 
+  settings). (Ilia)
+- Fixed bug #39815 (SOAP double encoding is not locale-independent). (Dmitry)
+- Fixed bug #39797 (virtual() does not reset changed INI settings). (Ilia) 
+- Fixed bug #39795 (build fails on AIX because crypt_r() uses different 
+  data struct). (Tony)
+- Fixed bug #39791 (Crash in strtotime() on overly long relative date 
+  multipliers). (Ilia)
+- Fixed bug #39787 (PHP doesn't work with Apache 2.3).
+  (mv at binarysec dot com).
+- Fixed bug #39782 (setTime() on a DateTime constructed with a Weekday 
+  yields incorrect results). (Ilia)
+- Fixed bug #39780 (PNG image with CRC/data error raises fatal error) (Pierre)
+- Fixed bug #39779 (Enable AUTH PLAIN mechanism in underlying libc-client).
+  (michael dot heimpold at s2000 dot tu-chemnitz dot de, Ilia)
+- Fixed bug #39775 ("Indirect modification ..." message is not shown).
+  (Dmitry)
+- Fixed bug #39763 (magic quotes are applied twice by ext/filter in 
+  parse_str()). (Ilia) 
+- Fixed bug #39760 (cloning fails on nested SimpleXML-Object). (Rob)
+- Fixed bug #39759 (Can't use stored procedures fetching multiple result 
+  sets in pdo_mysql). (Ilia)
+- Fixed bug #39754 (Some POSIX extension functions not thread safe).
+  (Ilia, wharmby at uk dot ibm dot com)
+- Fixed bug #39751 (putenv crash on Windows). (KevinJohnHoffman at gmail.com)
+- Fixed bug #39732 (oci_bind_array_by_name doesn't work on Solaris 64bit).
+  (Tony)
+- Fixed bug #39724 (Broken build due to spl/filter usage of pcre extension).
+  (Tony, Ilia)
+- Fixed bug #39718 (possible crash if assert.callback is set in ini). (Ilia)
+- Fixed bug #39702 (php crashes in the allocator on linux-m68k). (Dmitry)
+- Fixed bug #39685 (iconv() - undefined function). (Hannes)
+- Fixed bug #39673 (file_get_contents causes bus error on certain offsets).
+  (Tony)
+- Fixed bug #39663 (Memory leak in pg_get_notify() and a possible memory 
+  corruption on Windows in pgsql and pdo_pgsql extensions).
+  (Ilia, matteo at beccati dot com)
+- Fixed bug #39662 (Segfault when calling asXML() of a cloned 
+  SimpleXMLElement). (Rob, Tony)
+- Fixed bug #39656 (crash when calling fetch() on a PDO statment object after
+  closeCursor()). (Ilia, Tony)
+- Fixed bug #39653 (ext/dba doesn't check for db-4.5 and db-4.4 when db4
+  support is enabled). (Tony)
+- Fixed bug #39652 (Wrong negative results from memory_get_usage()). (Dmitry)
+- Fixed bug #39648 (Implementation of PHP functions chown() and chgrp() are 
+  not thread safe). (Ilia, wharmby at uk dot ibm dot com)
+- Fixed bug #39640 (Segfault with "Allowed memory size exhausted"). (Dmitry)
+- Fixed bug #39625 (Apache crashes on importStylesheet call). (Rob)
+- Fixed bug #39623 (thread safety fixes on *nix for putenv() & mime_magic).
+  (Ilia, wharmby at uk dot ibm dot com)
+- Fixed bug #39621 (str_replace() is not binary safe on strings with equal
+  length). (Tony)
+- Fixed bug #39613 (Possible segfault in imap initialization due to missing
+  module dependency). (wharmby at uk dot ibm dot com, Tony)
+- Fixed bug #39606 (Use of com.typelib_file in PHP.ini STILL causes A/V). (Rob)
+- Fixed bug #39602 (Invalid session.save_handler crashes PHP). (Dmitry)
+- Fixed bug #39596 (Creating Variant of type VT_ARRAY). (Rob)
+- Fixed bug #39583 (ftp_put() does not change transfer mode to ASCII). (Tony)
+- Fixed bug #39576 (array_walk() doesn't separate user data zval). (Tony)
+- Fixed bug #39575 (move_uploaded_file() no longer working (safe mode 
+  related)). (Tony)
+- Fixed bug #39571 (timeout ssl:// connections). (Ilia)
+- Fixed bug #39564 (PDO::errorInfo() returns inconsistent information when 
+  sqlite3_step() fails). (Tony)
+- Fixed bug #39548 (ZMSG_LOG_SCRIPT_NAME not routed to OutputDebugString()
+  on Windows). (Dmitry)
+- Fixed bug #39538 (fgetcsv can't handle starting newlines and trailing odd
+  number of backslashes). (David Soria Parra, Pierre)
+- Fixed bug #39534 (Error in maths to calculate of 
+  ZEND_MM_ALIGNED_MIN_HEADER_SIZE). (wharmby at uk dot ibm dot com, Dmitry)
+- Fixed bug #39527 (Failure to retrieve results when multiple unbuffered,
+  prepared statements are used in pdo_mysql). (Ilia)
+- Fixed bug #39508 (imagefill crashes with small images 3 pixels or less).
+  (Pierre)
+- Fixed bug #39506 (Archive corrupt with ZipArchive::addFile method). (Pierre)
+- Fixed bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag, not 
+  entity). (Hannes)
+- Fixed bug #39483 (Problem with handling of \ char in prepared statements).
+  (Ilia, suhachov at gmail dot com)
+- Fixed bug #39458 (ftp_nlist() returns false on empty dirs). (Nuno)
+- Fixed bug #39454 (Returning a SOAP array segfaults PHP). (Dmitry)
+- Fixed bug #39450 (getenv() fills other super-globals). (Ilia, Tony)
+- Fixed bug #39449 (Overloaded array properties do not work correctly).
+  (Dmitry)
+- Fixed bug #39445 (Calling debug_backtrace() in the __toString()
+  function produces a crash). (Dmitry)
+- Fixed bug #39438 (Fatal error: Out of memory). (Dmitry)
+- Fixed bug #39435 ('foo' instanceof bar gives invalid opcode error). (Sara)
+- Fixed bug #39414 (Syntax error while compiling with Sun Workshop Complier).
+  (Johannes)
+- Fixed bug #39398 (Booleans are not automatically translated to integers).
+  (Ilia)
+- Fixed bug #39394 (Missing check for older variants of openssl). (Ilia)
+- Fixed bug #39367 (clearstatcache() doesn't clear realpath cache).
+  (j at pureftpd dot org, Dmitry)
+- Fixed bug #39366 (imagerotate does not use alpha with angle > 45 degrees)
+  (Pierre)
+- Fixed bug #39364 (Removed warning on empty haystack inside mb_strstr()).
+  (Ilia)
+- Fixed bug #39362 (Added an option to imap_open/imap_reopen to control the
+  number of connection retries). (Ilia)
+- Fixed bugs #39361 & #39400 (mbstring function overloading problem). (Seiji)
+- Fixed bug #39354 (Allow building of curl extension against libcurl
+  7.16.0). (Ilia) 
+- Fixed bug #39350 (crash with implode("\n", array(false))). (Ilia)
+- Fixed bug #39344 (Unnecessary calls to OnModify callback routine for
+  an extension INI directive). (wharmby at uk dot ibm dot com, Dmitry)
+- Fixed bug #39320 (ZEND_HASH_APPLY_STOP causes deletion). (Marcus)
+- Fixed bug #39313 (spl_autoload triggers Fatal error). (Marcus)
+- Fixed bug #39300 (make install fails if wget is not available). (Tony)
+- Fixed bug #39297 (Memory corruption because of indirect modification of
+  overloaded array). (Dmitry)
+- Fixed bug #39286 (misleading error message when invalid dimensions are
+  given) (Pierre)
+- Fixed bug #39273 (imagecopyresized may ignore alpha channel) (Pierre)
+- Fixed bug #39265 (Fixed path handling inside mod_files.sh).
+  (michal dot taborsky at gmail dot com, Ilia)
+- Fixed bug #39217 (serialNumber might be -1 when the value is too large).
+  (Pierre, Tony)
+- Fixed bug #39215 (Inappropriate close of stdin/stdout/stderr). (Wez, Ilia)
+- Fixed bug #39201 (Possible crash in Apache 2 with 413 ErrorHandler). (Ilia)
+- Fixed bug #39151 (Parse error in recursiveiteratoriterator.php). (Marcus)
+- Fixed bug #39121 (Incorrect return array handling in non-wsdl soap client).
+  (Dmitry)
+- Fixed bug #39090 (DirectoryFilterDots doxygen docs and example is wrong).
+  (Marcus)
+- Fixed bug #38852 (XML-RPC Breaks iconv). (Hannes)
+- Fixed bug #38770 (unpack() broken with longs on 64 bit machines).
+  (Ilia, David Soria Parra).
+- Fixed bug #38698 (for some keys cdbmake creates corrupted db and cdb can't
+  read valid db). (Marcus)
+- Fixed bug #38680 (Added missing handling of basic types in json_decode).
+  (Ilia)
+- Fixed bug #38604 (Fixed request time leak inside foreach() when iterating
+  through virtual properties). (Dmitry)
+- Fixed bug #38602 (header( "HTTP/1.0 ..." ) does not change proto version).
+  (Ilia)
+- Fixed bug #38542 (proc_get_status() returns wrong PID on windows). (Nuno)
+- Fixed bug #38536 (SOAP returns an array of values instead of an object).
+  (Dmitry)
+- Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php 
+  ErrorDocument). (Ilia)
+- Fixed bug #38325 (spl_autoload_register() gives wrong line for "class not
+  found"). (Ilia)
+- Fixed bug #38319 (Remove bogus warnings from persistent PDO connections).
+  (Ilia)
+- Fixed bug #38274 (Memlimit fatal error sent to "wrong" stderr when using
+  fastcgi). (Dmitry)
+- Fixed bug #38252 (Incorrect PDO error message on invalid default fetch
+  mode). (Ilia)
+- Fixed bug #37927 (Prevent trap when COM extension processes argument of
+  type VT_DISPATCH|VT_REF) (Andy)
+- Fixed bug #37773 (iconv_substr() gives "Unknown error" when string
+  length = 1"). (Ilia)
+- Fixed bug #37627 (session save_path check checks the parent directory).
+  (Ilia)
+- Fixed bug #37619 (proc_open() closes stdin on fork() failure).
+  (jdolecek at NetBSD dot org, Nuno)
+- Fixed bug #37588 (COM Property propputref converts to PHP function
+  and can't be accesed). (Rob)
+- Fixed bug #36975 (natcasesort() causes array_pop() to misbehave).
+  (Hannes)
+- Fixed bug #36812 (pg_execute() modifies input array). (Ilia)
+- Fixed bug #36798 (Error parsing named parameters with queries containing
+  high-ascii chars). (Ilia)
+- Fixed bug #36644 (possible crash in variant_date_from_timestamp()). (Ilia)
+- Fixed bug #36427 (proc_open() / proc_close() leak handles on windows).
+  (jdolecek at NetBSD dot org, Nuno)
+- Fixed bug #36392 (wrong number of decimal digits with %e specifier in
+  sprintf). (Matt,Ilia)
+- Fixed bug #36214 (__get method works properly only when conditional
+  operator is used). (Dmitry)
+- Fixed bug #35634 (Erroneous "Class declarations may not be nested"
+  error raised). (Carl P. Corliss, Dmitry)
+- Fixed bug #35106 (nested foreach fails when array variable has a
+  reference). (Dmitry)
+- Fixed bug #34564 (COM extension not returning modified "out" argument) (Andy)
+- Fixed bug #33734 (Something strange with COM Object). (Rob)
+- Fixed bug #33386 (ScriptControl only sees last function of class). (Rob)
+- Fixed bug #33282 (Re-assignment by reference does not clear the is_ref
+  flag) (Ilia, Dmitry, Matt Wilmas)
+- Fixed bug #30074 (apparent symbol table error with 
+  extract($blah, EXTR_REFS)) (Brian)
+- Fixed bug #29840 (is_executable() does not honor safe_mode_exec_dir 
+  setting). (Ilia)
+- Fixed PECL bug #7295 (ORA-01405: fetched column value is NULL on LOB
+  fields). (Tony)
+
+02 Nov 2006, PHP 5.2.0
+- Updated bundled OpenSSL to version 0.9.8d in the Windows distro. (Edin)
+- Updated Postgresql client libraries to 8.1.4 in the Windows distro. (Edin)
+- Updated PCRE to version 6.7. (Ilia)
+- Updated libsqlite in ext/pdo_sqlite to 3.3.7. (Ilia)
+- Updated bundled MySQL client library to version 5.0.22 in the Windows 
+  distribution. (Edin)
+- Updated timezonedb to version 2006.7. (Derick)
+
+- Added ability to make SOAP call userspace PHP<->XML converters. (Dmitry)
+- Added support for character sets in pg_escape_string() for PostgreSQL 8.1.4 
+  and higher. (Ilia)
+- Added support for character sets in PDO quote() method for PostgreSQL 8.1.4 
+  and higher. (Ilia)
+- Added DSA key generation support to openssl_pkey_new(), FR #38731 (marci
+  at balabit dot hu, Tony)
+- Added SoapServer::setObject() method (it is a simplified version of
+  SoapServer::setClass() method). (Dmitry)
+- Added support for hexadecimal entity in imagettftext() for the bundled GD.
+  (Pierre)
+- Added support for httpOnly flag for session extension and cookie setting 
+  functions. (Scott MacVicar, Ilia)
+- Added version specific registry keys to allow different configurations for 
+  different php version. (Richard, Dmitry)
+- Added "PHPINIDir" Apache directive to apache and apache_hooks SAPIs.
+  (Dmitry)
+- Added an optional boolean parameter to memory_get_usage() and 
+  memory_get_peak_usage() to get memory size allocated by emalloc() or real 
+  size of memory allocated from system. (Dmitry)
+- Added Zip Archive extension. (Pierre)
+- Added RFC1867 fileupload processing hook. (Stefan E.)
+- Added JSON and Filter extensions. (Derick, Rasmus)
+- Added error messages to disk_free_space() and disk_total_space() functions.
+  FR #37971 (Tony)
+- Added PATHINFO_FILENAME option to pathinfo() to get the filename. 
+  (Toby S. and Christian S.)
+- Added array_fill_keys() function. (Marcus, Matt Wilmas)
+- Added posix_initgroups() function. (Ilia)
+- Added an optional parameter to parse_url() to allow retrieval of distinct 
+  URL components. (Ilia)
+- Added optional parameter to http_build_query() to allow specification of 
+  string separator. (Ilia)
+- Added image_type_to_extension() function. (Hannes, Ilia)
+- Added allow_url_include ini directive to complement allow_url_fopen. (Rasmus)
+- Added automatic module globals management. (Dmitry)
+- Added RFC2397 (data: stream) support. (Marcus)
+- Added new error mode E_RECOVERABLE_ERROR. (Derick, Marcus, Tony)
+- Added support for getenv() input filtering. (Rasmus)
+- Added support for constructors in interfaces to force constructor signature 
+  checks in implementations. (Marcus)
+- Added memory_get_peak_usage() function for retrieving peak memory usage of 
+  a PHP script. (Ilia)
+- Added pg_field_table() function. (Edin)
+- Added SimpleXMLElement::saveXML() as an alias for SimpleXMLElement::asXML(). 
+  (Hannes)
+- Added DOMNode::getNodePath() for getting an XPath for a node. (Christian)
+- Added gmp_nextprime() function. (ants dot aasma at gmail dot com, Tony)
+- Added error_get_last() function. (Mike)
+
+- Removed current working directory from the php.ini search path for CLI and 
+  re-added it for other SAPIs (restore to pre 5.1.x behavior). (Edin)
+- Moved extensions to PECL:
+  . ext/filepro (Derick, Tony)
+  . ext/hwapi (Derick, Tony)
+- Disabled CURLOPT_FOLLOWLOCATION in curl when open_basedir or 
+  safe_mode are enabled. (Stefan E., Ilia)
+
+- Increased default memory limit to 16 megabytes to accommodate for a more 
+  accurate memory utilization measurement.
+- In addition to path to php.ini, PHPRC now may specify full file name. 
+  (Dmitry)
+
+- Optimized array/HashTable copying. (Matt Wilmas, Dmitry)
+- Optimized zend_try/zend_catch macros by eliminating memcpy(3). (Dmitry)
+- Optimized require_once() and include_once() by eliminating fopen(3) on 
+  second usage. (Dmitry)
+- Optimized request shutdown sequence. Restoring ini directives now iterates 
+  only over modified directives instead of all. (Dmitry)
+
+- Changed priority of PHPRC environment variable on win32 to be higher then 
+  value from registry. (Dmitry)
+- Changed __toString() to be called wherever applicable. (Marcus)
+- Changed E_ALL error reporting mode to include E_RECOVERABLE_ERROR. (Marcus)
+- Changed realpath cache to be disabled when "open_basedir" or "safe_mode" 
+  are enabled on per-request basis. (Ilia)
+
+- Improved SNMP extension: (Jani)
+  . Renamed snmp_set_oid_numeric_print() to snmp_set_oid_output_format(). 
+  . Added 2 new constants: SNMP_OID_OUTPUT_FULL and SNMP_OID_OUTPUT_NUMERIC
+  . Fixed bug #37564 (AES privacy encryption not possible due to net-snmp 5.2 
+    compatibility issue). (Patch: scott dot moynes+php at gmail dot com)
+- Improved OpenSSL extension: (Pierre)
+  . Added support for all supported algorithms in openssl_verify
+  . Added openssl_pkey_get_details, returns the details of a key
+  . Added x509 v3 extensions support
+  . Added openssl_csr_get_subject() and openssl_csr_get_public_key()
+  . Added 3 new constants OPENSSL_VERSION_TEXT and OPENSSL_VERSION_NUMBER and
+    OPENSSL_KEYTYPE_EC
+- Improved the Zend memory manager: (Dmitry)
+  . Removed unnecessary "--disable-zend-memory-manager" configure option.
+  . Added "--enable-malloc-mm" configure option which is enabled by default in 
+    debug builds to allow using internal and external memory debuggers.
+  . Allow tweaking the memory manager with ZEND_MM_MEM_TYPE and ZEND_MM_SEG_SIZE
+    environment variables.
+  . For more information: Zend/README.ZEND_MM
+- Improved safe_mode check for the error_log() function. (Ilia)
+- Improved the error reporting in SOAP extension on request failure. (Ilia)
+- Improved crypt() on win32 to be about 10 times faster and to have friendlier 
+  license. (Frank, Dmitry)
+- Improved performance of the implode() function on associated arrays. (Ilia)
+- Improved performance of str_replace() when doing 1 char to 1 char or 1 char 
+  to many chars replacement. (Ilia)
+- Improved apache2filter SAPI:
+  . Allowed PHP to be an arbitrary filter in the chain and read the script from
+    the Apache stream. (John)
+  . Added support for apache2filter in the Windows build including binary 
+    support for both Apache 2.0.x (php5apache2_filter.dll) and Apache 2.2.x 
+    (php5apache2_2_filter.dll). (Edin)
+- Improved apache2handler SAPI:
+  . Changed ap_set_content_type() to be called only once. (Mike)
+  . Added support for Apache 2.2 handler in the Windows distribution. (Edin)
+- Improved FastCGI SAPI: (Dmitry)
+  . Removed source compatibility with libfcgi.
+  . Optimized access to FastCGI environment variables by using HashTable 
+    instead of linear search.
+  . Allowed PHP_FCGI_MAX_REQUESTS=0 that assumes no limit.
+  . Allowed PHP_FCGI_CHILDREN=0 that assumes no worker children. (FastCGI 
+    requests are handled by main process itself)
+- Improved CURL: 
+  . Added control character checks for "open_basedir" and "safe_mode" checks.
+    (Ilia)
+  . Added implementation of curl_multi_info_read(). (Brian)
+- Improved PCRE: (Andrei)
+  . Added run-time configurable backtracking/recursion limits.
+  . Added preg_last_error(). (Andrei)
+- Improved PDO:
+  . Added new attribute ATTR_DEFAULT_FETCH_MODE. (Pierre)
+  . Added FETCH_PROPS_LATE. (Marcus)
+- Improved SPL: (Marcus)
+  . Made most iterator code exception safe.
+  . Added RegExIterator and RecursiveRegExIterator.
+  . Added full caching support and ArrayAccess to CachingIterator.
+  . Added array functions to ArrayObject/ArrayIterator and made them faster.
+  . Added support for reading csv and skipping empty lines in SplFileObject.
+  . Added CachingIterator::TOSTRING_USE_INNER, calls inner iterator __toString.
+  . Added ability to set the CSV separator per SplFileObject.
+- Improved xmlReader: (Rob)
+  . Added readInnerXml(), xmlReader::setSchema().
+  . Added readInnerXML(), readOuterXML(), readString(), setSchema(). (2.6.20+)
+  . Changed to passing libxml options when loading reader.
+
+- Fixed invalid read in imagecreatefrompng when an empty file is given 
+  (Pierre, Tony)
+- Fixed infinite loop when a wrong color index is given to imagefill (Pierre)
+- Fixed mess with CGI/CLI -d option (now it works with cgi; constants are 
+  working exactly like in php.ini; with FastCGI -d affects all requests).
+  (Dmitry)
+- Fixed missing open_basedir check inside chdir() function. (Ilia)
+- Fixed overflow on 64bit systems in str_repeat() and wordwrap(). (Stefan E.)
+- Fixed XSLTProcessor::importStylesheet() to return TRUE on success
+  (Christian)
+- Fixed leaks in openssl_csr_sign and openssl_csr_new (Pierre)
+- Fixed phpinfo() cutoff of variables at \0. (Ilia)
+- Fixed a bug in the filter extension that prevented magic_quotes_gpc from 
+  being applied when RAW filter is used. (Ilia)
+- Fixed memory leaks in openssl streams context options. (Pierre)
+- Fixed handling of extremely long paths inside tempnam() function. (Ilia)
+- Fixed bug #39721 (Runtime inheritance causes data corruption). (Dmitry)
+- Fixed bug #39304 (Segmentation fault with list unpacking of string offset).
+  (Dmitry)
+- Fixed bug #39192 (Not including nsapi.h properly with SJSWS 7). This will
+  make PHP 5.2 compatible to new Sun Webserver. (Uwe)
+- Fixed bug #39140 (Uncaught exception may cause crash). (Dmitry)
+- Fixed bug #39125 (Memleak when reflecting non-existing class/method). (Tony)
+- Fixed bug #39067 (getDeclaringClass() and private properties). (Tony)
+- Fixed bug #39039 (SSL: fatal protocol error when fetching HTTPS from servers
+  running Google web server). (Ilia)
+- Fixed bug #39035 (Compatibility issue between DOM and
+  zend.ze1_compatibility_mode). (Rob)
+- Fixed bug #39034 (curl_exec() with return transfer returns TRUE on empty
+  files). (Ilia)
+- Fixed bug #39032 (strcspn() stops on null character). (Tony)
+- Fixed bug #39020 (PHP in FastCGI server mode crashes). (Dmitry)
+- Fixed bug #39017 (foreach(($obj = new myClass) as $v); echo $obj;
+  segfaults). (Dmitry)
+- Fixed bug #39004 (Fixed generation of config.nice with autoconf 2.60). (Ilia)
+- Fixed bug #39003 (__autoload() is called for type hinting). (Dmitry, Tony)
+- Fixed bug #39001 (ReflectionProperty returns incorrect declaring class for
+  protected properties). (Tony)
+- Fixed bug #38996 (PDO_MYSQL doesn't check connections for liveness). (Tony)
+- Fixed bug #38993 (Fixed safe_mode/open_basedir checks for session.save_path,
+  allowing them to account for extra parameters). (Ilia)
+- Fixed bug #38989 (Absolute path with slash at beginning doesn't work on win).
+  (Dmitry)
+- Fixed bug #38985 (Can't cast COM objects). (Wez)
+- Fixed bug #38981 (using FTP URLs in get_headers() causes crash). (Tony)
+- Fixed bug #38963 (Fixed a possible open_basedir bypass in tempnam()). (Ilia)
+- Fixed bug #38961 (metaphone() results in segmentation fault on NetBSD).
+  (Tony)
+- Fixed bug #38949 (Cannot get xmlns value attribute). (Rob)
+- Fixed bug #38942 (Double old-style-ctor inheritance). (Dmitry)
+- Fixed bug #38941 (imap extension does not compile against new version of the 
+  imap library). (Ilia)
+- Fixed bug #38934 (move_uploaded_file() cannot read uploaded file outside of 
+  open_basedir). (Ilia)
+- Fixed bug #38904 (apache2filter changes cwd to /). (Ilia, Hannes)
+- Fixed bug #38891 (get_headers() do not work with curl-wrappers). (Ilia)
+- Fixed bug #38882 (ldap_connect causes segfault with newer versions of
+  OpenLDAP). (Tony)
+- Fixed bug #38859 (parse_url() fails if passing '@' in passwd). (Tony)
+- Fixed bug #38850 (lookupNamespaceURI doesn't return default namespace). (Rob)
+- Fixed bug #38844 (curl_easy_strerror() is defined only since cURL 7.12.0).
+  (Tony)
+- Fixed bug #38813 (DOMEntityReference->__construct crashes when called
+  explicitly). (Rob)
+- Fixed bug #38808 ("maybe ref" issue for current() and others). (Dmitry)
+- Fixed bug #38779 (engine crashes when require()'ing file with syntax error
+  through userspace stream wrapper). (Tony, Dmitry)
+- Fixed bug #38772 (inconsistent overriding of methods in different visibility
+  contexts). (Dmitry)
+- Fixed bug #38759 (PDO sqlite2 empty query causes segfault). (Tony)
+- Fixed bug #38721 (Invalid memory read in date_parse()). (Tony, Derick)
+- Fixed bug #38700 (SoapClient::__getTypes never returns). (Dmitry)
+- Fixed bug #38693 (curl_multi_add_handle() set curl handle to null). (Ilia)
+- Fixed bug #38687 (sockaddr local storage insufficient for all sock families).
+  (Sara)
+- Fixed bug #38661 (mixed-case URL breaks url-wrappers). (Ilia)
+- Fixed bug #38653 (memory leak in ReflectionClass::getConstant()). (Tony)
+- Fixed bug #38649 (uninit'd optional arg in stream_socket_sendto()). (Sara)
+- Fixed bug #38637 (curl_copy_handle() fails to fully copy the cURL handle).
+  (Tony, Ilia)
+- Fixed bug #38624 (Strange warning when incrementing an object property and
+  exception is thrown from __get method). (Tony)
+- Fixed bug #38623 (leaks in a tricky code with switch() and exceptions).
+  (Dmitry)
+- Fixed bug #38579 (include_once() may include the same file twice). (Dmitry)
+- Fixed bug #38574 (missing curl constants and improper constant detection).
+  (Ilia)
+- Fixed bug #38543 (shutdown_executor() may segfault when memory_limit is too 
+  low). (Dmitry)
+- Fixed bug #38535 (memory corruption in pdo_pgsql driver on error retrieval 
+  inside a failed query executed via query() method). (Ilia)
+- Fixed bug #38534 (segfault when calling setlocale() in userspace session
+  handler). (Tony)
+- Fixed bug #38524 (strptime() does not initialize the internal date storage
+  structure). (Ilia)
+- Fixed bug #38511, #38473, #38263 (Fixed session extension request shutdown
+  order to ensure it is shutdown before the extensions it may depend on).
+  (Ilia)
+- Fixed bug #38488 (Access to "php://stdin" and family crashes PHP on win32).
+  (Dmitry)
+- Fixed bug #38474 (getAttribute select attribute by order, even when
+  prefixed). (Rob)
+- Fixed bug #38467 (--enable-versioning causes make fail on OS X). (Tony)
+- Fixed bug #38465 (ReflectionParameter fails if default value is an access 
+  to self::). (Johannes)
+- Fixed bug #38464 (array_count_values() mishandles numeric strings).
+  (Matt Wilmas, Ilia)
+- Fixed bug #38461 (setting private attribute with __set() produces
+  segfault). (Tony)
+- Fixed bug #38458, PECL bug #8944, PECL bug #7775 (error retrieving columns 
+  after long/text columns with PDO_ODBC). (Wez)
+- Fixed bug #38454 (warning upon disabling handler via
+  xml_set_element_handler). (dtorop933 at gmail dot com, Rob)
+- Fixed bug #38451 (PDO_MYSQL doesn't compile on Solaris). (Tony)
+- Fixed bug #38450 (constructor is not called for classes used in userspace
+  stream wrappers). (Tony)
+- Fixed bug #38438 (DOMNodeList->item(0) segfault on empty NodeList). (Ilia)
+- Fixed bug #38431 (xmlrpc_get_type() crashes PHP on objects). (Tony)
+- Fixed bug #38427 (unicode causes xml_parser to misbehave). (Rob)
+- Fixed bug #38424 (Different attribute assignment if new or existing). (Rob)
+- Fixed bug #38400 (Use of com.typelib_file may cause a crash). (Ilia)
+- Fixed bug #38394 (PDO fails to recover from failed prepared statement
+  execution). (Ilia)
+- Fixed bug #38377 (session_destroy() gives warning after 
+  session_regenerate_id()). (Ilia)
+- Implemented #38357 (dbase_open can't open DBase 3 dbf file).
+  (rodrigo at fabricadeideias dot com, Mike)
+- Fixed bug #38354 (Unwanted reformatting of XML when using AsXML). (Christian)
+- Fixed bug #38347 (Segmentation fault when using foreach with an unknown/empty
+  SimpleXMLElement). (Tony)
+- Fixed bug #38322 (reading past array in sscanf() leads to arbitrary code
+  execution). (Tony)
+- Fixed bug #38315 (Constructing in the destructor causes weird behavior).
+  (Dmitry)
+- Fixed bug #38303 (spl_autoload_register() suppress all errors silently).
+  (Ilia)
+- Fixed bug #38290 (configure script ignores --without-cdb,inifile,flatfile).
+  (Marcus)
+- Fixed bug #38289 (segfault in session_decode() when _SESSION is NULL).
+  (Tony)
+- Fixed bug #38287 (static variables mess up global vars). (Dmitry)
+- Fixed bug #38278 (session_cache_expire()'s value does not match phpinfo's
+  session.cache_expire). (Tony)
+- Fixed bug #38276 (file_exists() works incorrectly with long filenames
+  on Windows). (Ilia, Tony)
+- Fixed bug #38269 (fopen wrapper doesn't fail on invalid hostname with
+  curlwrappers enabled). (Tony)
+- Fixed bug #38265 (heap corruption). (Dmitry)
+- Fixed bug #38261 (openssl_x509_parse() leaks with invalid cert) (Pierre)
+- Fixed bug #38255 (openssl possible leaks while passing keys) (Pierre)
+- Fixed bug #38253 (PDO produces segfault with default fetch mode). (Tony)
+- Fixed bug #38251 (socket_select() and invalid arguments). (Tony)
+- Fixed bug #38236 (Binary data gets corrupted on multipart/formdata POST).
+  (Ilia)
+- Fixed bug #38234 (Exception in __clone makes memory leak). (Dmitry, Nuno)
+- Fixed bug #38229 (strtotime() does not parse YYYY-MM format). (Ilia)
+- Fixed bug #38224 (session extension can't handle broken cookies). (Ilia)
+- Fixed bug #38220 (Crash on some object operations). (Dmitry)
+- Fixed bug #38217 (ReflectionClass::newInstanceArgs() tries to allocate too
+  much memory). (Tony)
+- Fixed bug #38214 (gif interlace output cannot work). (Pierre)
+- Fixed bug #38213, #37611, #37571 (wddx encoding fails to handle certain
+  characters). (Ilia)
+- Fixed bug #38212 (Segfault on invalid imagecreatefromgd2part() parameters).
+  (Pierre)
+- Fixed bug #38211 (variable name and cookie name match breaks script 
+  execution). (Dmitry)
+- Fixed bug #38199 (fclose() unable to close STDOUT and STDERR). (Tony)
+- Fixed bug #38198 (possible crash when COM reports an exception). (Ilia)
+- Fixed bug #38194 (ReflectionClass::isSubclassOf() returns TRUE for the 
+  class itself). (Ilia)
+- Fixed bug #38183 (disable_classes=Foobar causes disabled class to be 
+  called Foo). (Jani)
+- Fixed bug #38179 (imagecopy from a palette to a truecolor image loose alpha 
+  channel) (Pierre)
+- Fixed bug #38173 (Freeing nested cursors causes OCI8 to segfault). (Tony)
+- Fixed bug #38168 (Crash in pdo_pgsql on missing bound parameters). (Ilia)
+- Fixed bug #38161 (oci_bind_by_name() returns garbage when Oracle didn't set
+  the variable). (Tony)
+- Fixed bug #38146 (Cannot use array returned from foo::__get('bar') in write 
+  context). (Dmitry)
+- Fixed bug #38132 (ReflectionClass::getStaticProperties() retains \0 in key 
+  names). (Ilia)
+- Fixed bug #38125 (undefined reference to spl_dual_it_free_storage). (Marcus)
+- Fixed bug #38112 (corrupted gif segfaults) (Pierre)
+- Fixed bug #38096 (large timeout values ignored on 32bit machines in 
+  stream_socket_accept() and stream_socket_client()). (Ilia)
+- Fixed bug #38086 (stream_copy_to_stream() returns 0 when maxlen is bigger
+  than the actual length). (Tony)
+- Fixed bug #38072 (boolean arg for mysqli_autocommit() is always true on
+  Solaris). (Tony)
+- Fixed bug #38067 (Parameters are not decoded from utf-8 when using encoding 
+  option). (Dmitry)
+- Fixed bug #38064 (ignored constructor visibility). (Marcus)
+- Fixed bug #38055 (Wrong interpretation of boolean parameters). (Dmitry)
+- Fixed bug #38047 ("file" and "line" sometimes not set in backtrace from 
+  inside error handler). (Dmitry)
+- Fixed bug #38019 (segfault extending mysqli class). (Dmitry)
+- Fixed bug #38005 (SoapFault faultstring doesn't follow encoding rules).
+  (Dmitry)
+- Fixed bug #38004 (Parameters in SoapServer are decoded twice). (Dmitry)
+- Fixed bug #38003 (in classes inherited from MySQLi it's possible to call
+  private constructors from invalid context). (Tony)
+- Fixed bug #37987 (invalid return of file_exists() in safe mode). (Ilia)
+- Fixed bug #37947 (zend_ptr_stack reallocation problem). (Dmitry)
+- Fixed bug #37945 (pathinfo() cannot handle argument with special characters 
+  like German "Umlaut"). (Mike)
+- Fixed bug #37931 (possible crash in OCI8 after database restart
+  when using persistent connections). (Tony)
+- Fixed bug #37923 (Display constant value in reflection::export). (Johannes)
+- Fixed bug #37920 (compilation problems on z/OS). (Tony)
+- Fixed bug #37870 (pgo_pgsql tries to de-allocate unused statements).
+  (Ilia, ce at netage dot bg)
+- Fixed bug #37864 (file_get_contents() leaks on empty file). (Hannes)
+- Fixed bug #37862 (Integer pointer comparison to numeric value).
+  (bugs-php at thewrittenword dot com)
+- Fixed bug #37846 (wordwrap() wraps incorrectly). (ddk at krasn dot ru, Tony)
+- Fixed bug #37816 (ReflectionProperty does not throw exception when accessing
+  protected attribute). (Marcus)
+- Fixed bug #37811 (define not using toString on objects). (Marcus)
+- Fixed bug #37807 (segmentation fault during SOAP schema import). (Tony)
+- Fixed bug #37806 (weird behavior of object type and comparison). (Marcus)
+- Fixed bug #37780 (memory leak trying to execute a non existing file (CLI)).
+  (Mike)
+- Fixed bug #37779 (empty include_path leads to search for files inside /).
+  (jr at terragate dot net, Ilia)
+- Fixed bug #37747 (strtotime segfaults when given "nextyear"). (Derick)
+- Fixed bug #37720 (merge_php_config scrambles values).
+  (Mike, pumuckel at metropolis dot de)
+- Fixed bug #37709 (Possible crash in PDO::errorCode()). (Ilia)
+- Fixed bug #37707 (clone without assigning leaks memory). (Ilia, Nuno, Dmitri)
+- Fixed bug #37705 (Semaphore constants not available). (Ilia)
+- Fixed bug #37671 (MySQLi extension fails to recognize BIT column). (Ilia)
+- Fixed bug #37667 (Object is not added into array returned by __get). (Marcus)
+- Fixed bug #37635 (parameter of pcntl signal handler is trashed). (Mike)
+- Fixed bug #37632 (Protected method access problem). (Marcus)
+- Fixed bug #37630 (MySQL extensions should link against thread safe client 
+  libs if built with ZTS). (Mike)
+- Fixed bug #37620 (mysqli_ssl_set validation is inappropriate). (Georg)
+- Fixed bug #37616 (DATE_RFC822 does not product RFC 822 dates).
+  (Hannes Magnusson, Derick)
+- Fixed bug #37614 (Class name lowercased in error message). (Johannes)
+- Fixed bug #37587 (var without attribute causes segfault). (Marcus)
+- Fixed bug #37586 (Bumped minimum PCRE version to 6.6, needed for recursion 
+  limit support). (Ilia)
+- Fixed bug #37581 (oci_bind_array_by_name clobbers input array when using
+  SQLT_AFC, AVC). (Tony)
+- Fixed bug #37569 (WDDX incorrectly encodes high-ascii characters). (Ilia)
+- Fixed bug #37565 (Using reflection::export with simplexml causing a crash).
+  (Marcus)
+- Fixed bug #37564 (AES privacy encryption not possible due to net-snmp 5.2 
+  compatibility issue). (Jani, patch by scott dot moynes+php at gmail dot com)
+- Fixed bug #37563 (array_key_exists performance is poor for &$array). (Ilia)
+- Fixed bug #37558 (timeout functionality doesn't work after a second PHP 
+  start-up on the same thread). (p dot desarnaud at wanadoo dot fr)
+- Fixed bug #37531 (oci8 persistent connection corruption). (Tony)
+- Fixed bug #37523 (namespaces added too late, leads to missing xsi:type 
+  attributes. Incompatibility with libxml2-2.6.24). (Dmitry)
+- Fixed bug #37514 (strtotime doesn't assume year correctly). (Derick)
+- Fixed bug #37510 (session_regenerate_id changes session_id() even on
+  failure). (Hannes)
+- Fixed bug #37505 (touch() truncates large files). (Ilia)
+- Fixed bug #37499 (CLI segmentation faults during cleanup with sybase-ct
+  extension enabled). (Tony)
+- Fixed bug #37496 (FastCGI output buffer overrun). (Piotr, Dmitry)
+- Fixed bug #37487 (oci_fetch_array() array-type should always default to 
+  OCI_BOTH). (Tony)
+- Fixed bug #37457 (Crash when an exception is thrown in accept() method of
+  FilterIterator). (Marcus)
+- Fixed bug #37456 (DOMElement->setAttribute() loops forever). (Rob)
+- Fixed bug #37445 (Fixed crash in pdo_mysql resulting from premature object
+  destruction). (Ilia)
+- Fixed bug #37428 (PHP crashes on windows if there are start-up errors and 
+  event log is used for logging them). (Edin)
+- Fixed bug #37418 (tidy module crashes on shutdown). (Tony)
+- Fixed bug #37416 (iterator_to_array() hides exceptions thrown in rewind()
+  method). (Tony)
+- Fixed bug #37413 (Rejected versions of flex that don't work). (Ilia)
+- Fixed bug #37395 (recursive mkdir() fails to create nonexistent directories
+  in root dir). (Tony)
+- Fixed bug #37394 (substr_compare() returns an error when offset equals
+  string length). (Ilia)
+- Fixed bug #37392 (Unnecessary call to OCITransRollback() at the end of
+  request). (Tony)
+- Fixed bug #37376 (fastcgi.c compile fail with gcc 2.95.4). (Ilia)
+- Fixed bug #37368 (Incorrect timestamp returned for strtotime()). (Derick)
+- Fixed bug #37363 (PDO_MYSQL does not build if no other mysql extension is 
+  enabled). (Mike)
+- Fixed bug #37348 (make PEAR install ignore open_basedir). (Ilia)
+- Fixed bug #37341 ($_SERVER in included file is shortened to two entries, 
+  if $_ENV gets used). (Dmitry)
+- Fixed bug #37313 (sigemptyset() used without including <signal.h>).
+  (jdolecek)
+- Fixed bug #37306 (max_execution_time = max_input_time). (Dmitry)
+- Fixed bug #37278 (SOAP not respecting uri in __soapCall). (Dmitry)
+- Fixed bug #37265 (Added missing safe_mode & open_basedir checks to 
+  imap_body()). (Ilia)
+- Fixed bug #37262 (var_export() does not escape \0 character). (Ilia)
+- Fixed bug #37256 (php-fastcgi doesn't handle connection abort). (Dmitry)
+- Fixed bug #37244 (Added strict flag to base64_decode() that enforces
+  RFC3548 compliance). (Ilia)
+- Fixed bug #37144 (PHP crashes trying to assign into property of dead object).
+  (Dmitry)
+- Fixed bug #36949 (invalid internal mysqli objects dtor). (Mike)
+- Implement #36732 (req/x509 extensions support for openssl_csr_new and 
+  openssl_csr_sign) (ben at psc dot edu, Pierre)
+- Fixed bug #36759 (Objects destructors are invoked in wrong order when script
+  is finished). (Dmitry)
+- Fixed bug #36681 (pdo_pgsql driver incorrectly ignored some errors).
+  (Wez, Ilia)
+- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
+- Fixed bug #36515 (Unlinking buckets from non-existent brigades). (Sara)
+- Fixed bug #35973 (Error ORA-24806 occurs when trying to fetch a NCLOB
+  field). (Tony)
+- Fixed bug #35886 (file_get_contents() fails with some combinations of 
+  offset & maxlen). (Nuno)
+- Fixed bug #35512 (Lack of read permission on main script results in
+  E_WARNING rather then E_ERROR). (Ilia)
+- Fixed bug #34180 (--with-curlwrappers causes PHP to disregard some HTTP
+  stream context options). (Mike)
+- Fixed bug #34066 (recursive array_walk causes segfault). (Tony)
+- Fixed bug #34065 (throw in foreach causes memory leaks). (Dmitry)
+- Fixed bug #34005 (oci_password_change() fails). 
+  (pholdaway at technocom-wireless dot com, Tony)
+- Fixed bug #33895 (Missing math constants). (Hannes)
+- Fixed bug #33770 (https:// or ftps:// do not work when --with-curlwrappers
+  is used and ssl certificate is not verifiable). (Ilia)
+- Fixed bug #29538 (number_format and problem with 0). (Matt Wilmas)
+- Implement #28382 (openssl_x509_parse() extensions support) (Pierre)
+- Fixed PECL bug #9061 (oci8 might reuse wrong persistent connection). (Tony)
+- Fixed PECL bug #8816 (issue in php_oci_statement_fetch with more than one
+  piecewise column) (jeff at badtz-maru dot com, Tony)
+- Fixed PECL bug #8112 (OCI8 persistent connections misbehave when Apache
+  process times out). (Tony)
+- Fixed PECL bug #7755 (error selecting DOUBLE fields with PDO_ODBC).
+  ("slaws", Wez)
+
+
 04 May 2006, PHP 5.1.4
 - Added "capture_peer_cert" and "capture_peer_cert_chain" context options
   for SSL streams. (Wez).
 - Added PDO::PARAM_EVT_* family of constants. (Sara)
 - Fixed possible crash in highlight_string(). (Dmitry)
-- Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll). (Dmitry)
+- Fixed bug #37291 (FastCGI no longer works with isapi_fcgi.dll). (Dmitry)
 - Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob)
 - Fixed bug #37276 (problems with $_POST array). (Dmitry)
 - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez).

README.CVS-RULES

@@ -29,14 +29,22 @@ Having said that, here are the organizational rules:
    5. If you don't know how to do something, ask first!
 
    6. Test your changes before committing them. We mean it. Really.
+      To do so use "make test".
+   
+   7. For development use the --enable-maintainer-zts switch to ensure your
+      code handles TSRM correctly and doesn't break for thos who need that.
 
 Currently we have the following branches in use:
 HEAD     Will become PHP 6.0. This CVS branch is for active development.
-PHP_5_1  Is used to release the PHP 5.1.x series. Only minor feature
-		 enhancements may go in here, but please keep that as infrequent as
-		 possible.
+PHP_5_2  Is used to release the PHP 5.2.x series. Only minor feature
+         enhancements may go in here, but please keep that as infrequent as
+         possible.
+PHP_5_1  Is used to release the PHP 5.1.x series. Only bugfixes are permitted
+         on this branch (Consult the releasemaster prior to commit).
+PHP_5_0  This branch is closed.
 PHP_4_4  Is used to release the PHP 4.4.x series. Only bugfixes are permitted
-         on this branch.
+         on this branch (Consult the releasemaster prior to commit).
+PHP_4_3  This branch is closed.
 
 The next few rules are more of a technical nature.
 

README.PARAMETER_PARSING_API

@@ -31,14 +31,17 @@ resources cannot be auto-converted.
 
 Type specifiers
 ---------------
- l	- long
- d	- double
- s	- string (with possible null bytes) and its length
- b	- boolean, stored in zend_bool
- r	- resource (stored in zval)
  a	- array
+ b	- boolean, stored in zend_bool
+ d	- double
+ f	- function or array containing php method call info (returned as 
+	  zend_fcall_info* and zend_fcall_info_cache*)
+ h	- array (returned as HashTable*)
+ l	- long
  o	- object (of any type)
  O	- object (of specific type, specified by class entry)
+ r	- resource (stored in zval)
+ s	- string (with possible null bytes) and its length
  z	- the actual zval
 
  The following characters also have a meaning in the specifier string:
@@ -48,8 +51,8 @@ Type specifiers
 	    passed to it.
 	/ - use SEPARATE_ZVAL_IF_NOT_REF() on the parameter it follows
 	! - the parameter it follows can be of specified type or NULL (only applies
-	    to 'a', 'o', 'O', 'r', and 'z'). If NULL is passed, the results
-	    pointer is set to NULL as well.
+		to 's', 'a', 'o', 'O', 'r', 'h', 'C', 'z', and 'Z'). If NULL is passed,
+	 	the results pointer is set to NULL as well.
 
 Examples
 --------

README.input_filter

@@ -10,7 +10,10 @@ The Input Filter support in PHP 5 is aimed at providing the framework
 through which a company-wide or site-wide security policy can be
 enforced.  It is implemented as a SAPI hook and is called from the
 treat_data and post handler functions.  To implement your own security
-policy you will need to write a standard PHP extension.  
+policy you will need to write a standard PHP extension.  There is also
+a powerful standard implementation in ext/filter that should suit most
+peoples' needs.  However, if you want to implement your own security 
+policy, read on.
 
 A simple implementation might look like the following.  This stores the
 original raw user data and adds a my_get_raw() function while the normal

TSRM/TSRM.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Thread Safe Resource Manager                                         |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2006, Andi Gutmans, Sascha Schumann, Zeev Suraski |
+   | Copyright (c) 1999-2007, Andi Gutmans, Sascha Schumann, Zeev Suraski |
    | This source file is subject to the TSRM license, that is bundled     |
    | with this package in the file LICENSE                                |
    +----------------------------------------------------------------------+

TSRM/TSRM.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Thread Safe Resource Manager                                         |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2006, Andi Gutmans, Sascha Schumann, Zeev Suraski |
+   | Copyright (c) 1999-2007, Andi Gutmans, Sascha Schumann, Zeev Suraski |
    | This source file is subject to the TSRM license, that is bundled     |
    | with this package in the file LICENSE                                |
    +----------------------------------------------------------------------+

TSRM/readdir.h

@@ -7,11 +7,15 @@
  * on Windows 95/NT.
  */
 
+#define _WIN32_WINNT 0x0400
+
+#include <windows.h>
+
 #include <io.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
-
+#include <direct.h>
 
 /* struct dirent - same as Unix */
 
@@ -25,10 +29,10 @@ struct dirent {
 
 /* typedef DIR - not the same as Unix */
 typedef struct {
-	long handle;				/* _findfirst/_findnext handle */
+	HANDLE handle;				/* _findfirst/_findnext handle */
 	short offset;				/* offset into directory */
 	short finished;				/* 1 if there are not more files */
-	struct _finddata_t fileinfo;	/* from _findfirst/_findnext */
+	WIN32_FIND_DATA fileinfo;	/* from _findfirst/_findnext */
 	char *dir;					/* the dir we are reading */
 	struct dirent dent;			/* the dirent to return */
 } DIR;
@@ -38,7 +42,6 @@ DIR *opendir(const char *);
 struct dirent *readdir(DIR *);
 int readdir_r(DIR *, struct dirent *, struct dirent **);
 int closedir(DIR *);
-void rewinddir(DIR *);
-
+int rewinddir(DIR *);
 
 #endif /* READDIR_H */

TSRM/tsrm.m4

@@ -68,7 +68,6 @@ AC_DEFUN([TSRM_CHECK_ST],[
 ])
 
 sinclude(threads.m4)
-sinclude(TSRM/threads.m4)
 
 AC_DEFUN([TSRM_CHECK_PTHREADS],[
 		

TSRM/tsrm_nw.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2007 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-2006 The PHP Group                                |
+   | Copyright (c) 1997-2007 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.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2007 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        |
@@ -35,11 +35,6 @@
 #ifdef TSRM_WIN32
 #include <io.h>
 #include "tsrm_win32.h"
-# if HAVE_NEWAPIS_H
-#  define WANT_GETLONGPATHNAME_WRAPPER
-#  define COMPILE_NEWAPIS_STUBS
-#  include <NewAPIs.h>
-# endif
 #endif
 
 #ifdef NETWARE
@@ -140,11 +135,93 @@ static int php_check_dots(const char *element, int n)
 #define CWD_STATE_FREE(s)			\
 	free((s)->cwd);
 	
+#ifdef TSRM_WIN32
+CWD_API int php_sys_stat(const char *path, struct stat *buf)
+{
+	WIN32_FILE_ATTRIBUTE_DATA data;
+	__int64 t;
+
+	if (!GetFileAttributesEx(path, GetFileExInfoStandard, &data)) {
+		return stat(path, buf);
+	}
+
+	if (path[1] == ':') {
+		if (path[0] >= 'A' && path[0] <= 'Z') {
+			buf->st_dev = buf->st_rdev = path[0] - 'A';
+		} else {
+			buf->st_dev = buf->st_rdev = path[0] - 'a';
+		}
+	} else {
+		char  cur_path[MAXPATHLEN+1];
+		DWORD len = sizeof(cur_path);
+		char *tmp = cur_path;
+
+		while(1) {
+			DWORD r = GetCurrentDirectory(len, tmp);
+			if (r < len) {
+				if (tmp[1] == ':') {
+					if (path[0] >= 'A' && path[0] <= 'Z') {
+						buf->st_dev = buf->st_rdev = path[0] - 'A';
+					} else {
+						buf->st_dev = buf->st_rdev = path[0] - 'a';
+					}
+				} else {
+					buf->st_dev = buf->st_rdev = -1;
+				}
+				break;
+			} else if (!r) {
+				buf->st_dev = buf->st_rdev = -1;
+				break;
+			} else {
+				len = r+1;
+				tmp = (char*)malloc(len);
+			}
+		}
+		if (tmp != cur_path) {
+			free(tmp);
+		}		    	
+	}
+	buf->st_uid = buf->st_gid = buf->st_ino = 0;
+	buf->st_mode = (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? (S_IFDIR|S_IEXEC|(S_IEXEC>>3)|(S_IEXEC>>6)) : S_IFREG;
+	buf->st_mode |= (data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)) : (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)|S_IWRITE|(S_IWRITE>>3)|(S_IWRITE>>6));
+	if ((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
+		int len = strlen(path);
+
+		if (path[len-4] == '.') {
+			if (_memicmp(path+len-3, "exe", 3) == 0 ||
+			    _memicmp(path+len-3, "com", 3) == 0 ||
+			    _memicmp(path+len-3, "bat", 3) == 0 ||
+			    _memicmp(path+len-3, "cmd", 3) == 0) {
+				buf->st_mode  |= (S_IEXEC|(S_IEXEC>>3)|(S_IEXEC>>6));
+			}
+		}
+	}			
+    buf->st_nlink = 1;
+	t = data.nFileSizeHigh;
+	t = t << 32;
+	t |= data.nFileSizeLow;
+	buf->st_size = t;
+	t = data.ftLastAccessTime.dwHighDateTime;
+	t = t << 32;
+	t |= data.ftLastAccessTime.dwLowDateTime;
+	buf->st_atime = (unsigned long)((t / 10000000) - 11644473600);
+	t = data.ftCreationTime.dwHighDateTime;
+	t = t << 32;
+	t |= data.ftCreationTime.dwLowDateTime;
+	buf->st_ctime = (unsigned long)((t / 10000000) - 11644473600);
+	t = data.ftLastWriteTime.dwHighDateTime;
+	t = t << 32;
+	t |= data.ftLastWriteTime.dwLowDateTime;
+	buf->st_mtime = (unsigned long)((t / 10000000) - 11644473600);
+	return 0;
+}
+#endif
+
 static int php_is_dir_ok(const cwd_state *state) 
 {
 	struct stat buf;
 
-	if (stat(state->cwd, &buf) == 0 && S_ISDIR(buf.st_mode))
+	if (php_sys_stat(state->cwd, &buf) == 0 && S_ISDIR(buf.st_mode))
 		return (0);
 
 	return (1);
@@ -154,7 +231,7 @@ static int php_is_file_ok(const cwd_state *state)
 {
 	struct stat buf;
 
-	if (stat(state->cwd, &buf) == 0 && S_ISREG(buf.st_mode))
+	if (php_sys_stat(state->cwd, &buf) == 0 && S_ISREG(buf.st_mode))
 		return (0);
 
 	return (1);
@@ -172,18 +249,7 @@ static void cwd_globals_ctor(virtual_cwd_globals *cwd_globals TSRMLS_DC)
 static void cwd_globals_dtor(virtual_cwd_globals *cwd_globals TSRMLS_DC)
 {
 	CWD_STATE_FREE(&cwd_globals->cwd);
-	{
-		int i;
-
-		for (i = 0; i < sizeof(cwd_globals->realpath_cache)/sizeof(cwd_globals->realpath_cache[0]); i++) {
-			realpath_cache_bucket *p = cwd_globals->realpath_cache[i];
-			while (p != NULL) {
-				realpath_cache_bucket *r = p;
-				p = p->next;
-				free(r);
-			}
-		}
-	}
+	realpath_cache_clean(TSRMLS_C);
 }
 
 static char *tsrm_strndup(const char *s, size_t length)
@@ -306,14 +372,51 @@ CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC)
 
 static inline unsigned long realpath_cache_key(const char *path, int path_len)
 {
-  register unsigned long h;
+	register unsigned long h;
+	const char *e = path + path_len;
 
-  const char *e = path + path_len;
-  for (h = 2166136261U; path < e; ) {
-    h *= 16777619;
-    h ^= *path++;
-  }
-  return h;
+	for (h = 2166136261U; path < e;) {
+		h *= 16777619;
+		h ^= *path++;
+	}
+
+	return h;
+}
+
+CWD_API void realpath_cache_clean(TSRMLS_D)
+{
+	int i;
+
+	for (i = 0; i < sizeof(CWDG(realpath_cache))/sizeof(CWDG(realpath_cache)[0]); i++) {
+		realpath_cache_bucket *p = CWDG(realpath_cache)[i];
+		while (p != NULL) {
+			realpath_cache_bucket *r = p;
+			p = p->next;
+			free(r);
+		}
+		CWDG(realpath_cache)[i] = NULL;
+	}
+	CWDG(realpath_cache_size) = 0;
+}
+
+CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC)
+{
+	unsigned long key = realpath_cache_key(path, path_len);
+	unsigned long n = key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
+	realpath_cache_bucket **bucket = &CWDG(realpath_cache)[n];
+
+	while (*bucket != NULL) {
+		if (key == (*bucket)->key && path_len == (*bucket)->path_len &&
+		           memcmp(path, (*bucket)->path, path_len) == 0) {
+			realpath_cache_bucket *r = *bucket;
+			*bucket = (*bucket)->next;
+			CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
+			free(r);
+			return;
+		} else {
+			bucket = &(*bucket)->next;
+		}
+	}
 }
 
 static inline void realpath_cache_add(const char *path, int path_len, const char *realpath, int realpath_len, time_t t TSRMLS_DC)
@@ -334,7 +437,7 @@ static inline void realpath_cache_add(const char *path, int path_len, const char
 		n = bucket->key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
 		bucket->next = CWDG(realpath_cache)[n];
 		CWDG(realpath_cache)[n] = bucket;
-	  CWDG(realpath_cache_size) += size;
+		CWDG(realpath_cache_size) += size;
 	}
 }
 
@@ -366,23 +469,11 @@ static inline realpath_cache_bucket* realpath_cache_find(const char *path, int p
 CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath)
 {
 	int path_length = strlen(path);
-	char *ptr, *path_copy;
-	char *tok = NULL;
-	int ptr_length;
 	cwd_state old_state;
-	int ret = 0;
-	int copy_amount = -1;
-	char *free_path;
-	unsigned char is_absolute = 0;
-#ifndef TSRM_WIN32
-	char resolved_path[MAXPATHLEN];
-#else
-	char *new_path;
-#endif
 	char orig_path[MAXPATHLEN];
-	int orig_path_len = 0;
 	realpath_cache_bucket *bucket;
 	time_t t = 0;
+	int ret;
 	TSRMLS_FETCH();
 
 	if (path_length == 0) 
@@ -390,21 +481,36 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	if (path_length >= MAXPATHLEN)
 		return (1);
 
-	if (use_realpath && CWDG(realpath_cache_size_limit)) {
-		if (IS_ABSOLUTE_PATH(path, path_length) || (state->cwd_length < 1)) {
-			memcpy(orig_path, path, path_length+1);
-			orig_path_len = path_length;
-		} else {
-			orig_path_len = path_length + state->cwd_length + 1;
-			if (orig_path_len >= MAXPATHLEN) {
-				return 1;
-			}
-			memcpy(orig_path, state->cwd, state->cwd_length);
-			orig_path[state->cwd_length] = DEFAULT_SLASH;
-			memcpy(orig_path + state->cwd_length + 1, path, path_length + 1);
+#if VIRTUAL_CWD_DEBUG
+		fprintf(stderr,"cwd = %s path = %s\n", state->cwd, path);
+#endif
+
+	/* cwd_length can be 0 when getcwd() fails.
+	 * This can happen under solaris when a dir does not have read permissions
+	 * but *does* have execute permissions */
+	if (!IS_ABSOLUTE_PATH(path, path_length) && (state->cwd_length > 0)) {
+		int orig_path_len;
+		int state_cwd_length = state->cwd_length;
+
+#ifdef TSRM_WIN32
+		if (IS_SLASH(path[0])) {
+			state_cwd_length = 2;
 		}
+#endif
+		orig_path_len = path_length + state_cwd_length + 1;
+		if (orig_path_len >= MAXPATHLEN) {
+			return 1;
+		}
+		memcpy(orig_path, state->cwd, state_cwd_length);
+		orig_path[state_cwd_length] = DEFAULT_SLASH;
+		memcpy(orig_path + state_cwd_length + 1, path, path_length + 1);
+		path = orig_path;
+		path_length = orig_path_len; 
+	}
+
+	if (use_realpath != CWD_EXPAND && CWDG(realpath_cache_size_limit)) {
 		t = CWDG(realpath_cache_ttl)?time(NULL):0;
-		if ((bucket = realpath_cache_find(orig_path, orig_path_len, t TSRMLS_CC)) != NULL) {		
+		if ((bucket = realpath_cache_find(path, path_length, t TSRMLS_CC)) != NULL) {		
 			int len = bucket->realpath_len;
 
 			CWD_STATE_COPY(&old_state, state);
@@ -421,107 +527,62 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 			}
 		}
 	}
+
+	if (use_realpath != CWD_EXPAND) {
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
-	/* cwd_length can be 0 when getcwd() fails.
-	 * This can happen under solaris when a dir does not have read permissions
-	 * but *does* have execute permissions */
-	if (IS_ABSOLUTE_PATH(path, path_length) || (state->cwd_length < 1)) {
-		if (use_realpath) {
-			if (realpath(path, resolved_path)) {  /* Note: Not threadsafe on older *BSD's */
-				path = resolved_path;
-				path_length = strlen(path);
-			} else {
-				/* disable for now
-				return 1; */
+		char resolved_path[MAXPATHLEN];
+
+		if (!realpath(path, resolved_path)) {  /* Note: Not threadsafe on older *BSD's */
+			if (use_realpath == CWD_REALPATH) {
+				return 1;
 			}
+			goto no_realpath;
 		}
-	} else { /* Concat current directory with relative path and then run realpath() on it */
-		char *tmp;
-		char *ptr;
+		CWD_STATE_COPY(&old_state, state);
 
-		ptr = tmp = (char *) malloc(state->cwd_length+path_length+sizeof("/"));
-		if (!tmp) {
-			return 1;
-		}
-		memcpy(ptr, state->cwd, state->cwd_length);
-		ptr += state->cwd_length;
-		*ptr++ = DEFAULT_SLASH;
-		memcpy(ptr, path, path_length);
-		ptr += path_length;
-		*ptr = '\0';
-		if (strlen(tmp) >= MAXPATHLEN) {
-			free(tmp);
-			return 1;
-		}
-		if (use_realpath) {
-			if (realpath(tmp, resolved_path)) {
-				path = resolved_path;
-				path_length = strlen(path);
-			} else {
-				/* disable for now 
-				free(tmp);
-				return 1; */
-			}
-		}
-		free(tmp);
-	}
+		state->cwd_length = strlen(resolved_path);
+		state->cwd = (char *) realloc(state->cwd, state->cwd_length+1);
+		memcpy(state->cwd, resolved_path, state->cwd_length+1);
+#else
+		goto no_realpath;
 #endif
-#if defined(TSRM_WIN32)
-	{
-		int new_path_length;
-  
-		new_path_length = GetLongPathName(path, NULL, 0);
-		if (new_path_length == 0) {
-			goto php_failed_getlongpath;
-		}
-
-		/* GetLongPathName already counts the \0 */
-		new_path = (char *) malloc(new_path_length);
-		if (!new_path) {
-			return 1;
-		}
-		
-		if (GetLongPathName(path, new_path, new_path_length) != 0) {
-			path = new_path;
-			path_length = new_path_length;
-		} else {
-			free(new_path);
-php_failed_getlongpath:
-			new_path = NULL;
-		}
-	}
-#endif
-	free_path = path_copy = tsrm_strndup(path, path_length);
-
-	CWD_STATE_COPY(&old_state, state);
-#if VIRTUAL_CWD_DEBUG
-	fprintf(stderr,"cwd = %s path = %s\n", state->cwd, path);
-#endif
-	if (IS_ABSOLUTE_PATH(path_copy, path_length)) {
-        copy_amount = COPY_WHEN_ABSOLUTE(path_copy);
-		is_absolute = 1;
+	} else {
+		char *ptr, *path_copy, *free_path;
+		char *tok = NULL;
+		int ptr_length;
 #ifdef TSRM_WIN32
-	} else if (IS_SLASH(path_copy[0])) {
-		copy_amount = 2;
+		int is_unc = 0;
 #endif
-	}
 
-	if (copy_amount != -1) {
-		state->cwd = (char *) realloc(state->cwd, copy_amount + 1);
-		if (copy_amount) {
-			if (is_absolute) {
-				memcpy(state->cwd, path_copy, copy_amount);
-				path_copy += copy_amount;
-			} else {
-				memcpy(state->cwd, old_state.cwd, copy_amount);
-			}
+no_realpath:
+
+		free_path = path_copy = tsrm_strndup(path, path_length);
+		CWD_STATE_COPY(&old_state, state);
+
+#ifdef TSRM_WIN32		
+		if (path_length >= 2 && path[1] == ':') {			
+			state->cwd = (char *) realloc(state->cwd, 2 + 1);
+			state->cwd[0] = toupper(path[0]);
+			state->cwd[1] = ':';
+			state->cwd[2] = '\0';
+			state->cwd_length = 2;
+			path_copy += 2;
+		} else if (IS_UNC_PATH(path, path_length)) {
+			state->cwd = (char *) realloc(state->cwd, 1 + 1);
+			state->cwd[0] = DEFAULT_SLASH;
+			state->cwd[1] = '\0';
+			state->cwd_length = 1;
+			path_copy += 2;
+			is_unc = 2;
+		} else {
+#endif
+			state->cwd = (char *) realloc(state->cwd, 1);
+			state->cwd[0] = '\0';
+			state->cwd_length = 0;
+#ifdef TSRM_WIN32
 		}
-		state->cwd[copy_amount] = '\0';
-		state->cwd_length = copy_amount;
-	}
-
-
-	if (state->cwd_length > 0 || IS_ABSOLUTE_PATH(path, path_length)) {
+#endif
+		
 		ptr = tsrm_strtok_r(path_copy, TOKENIZER_STRING, &tok);
 		while (ptr) {
 			ptr_length = strlen(ptr);
@@ -551,7 +612,8 @@ php_failed_getlongpath:
 				state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1+1);
 #ifdef TSRM_WIN32
 				/* Windows 9x will consider C:\\Foo as a network path. Avoid it. */
-				if ((state->cwd[state->cwd_length-1]!='\\' && state->cwd[state->cwd_length-1]!='/') || 
+				if (state->cwd_length < 2 ||
+				    (state->cwd[state->cwd_length-1]!='\\' && state->cwd[state->cwd_length-1]!='/') ||
 						IsDBCSLeadByte(state->cwd[state->cwd_length-2])) {
 					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
 				}
@@ -575,32 +637,51 @@ php_failed_getlongpath:
 				state->cwd[state->cwd_length++] = DEFAULT_SLASH;
 #endif
 				memcpy(&state->cwd[state->cwd_length], ptr, ptr_length+1);
+
+#ifdef TSRM_WIN32
+				if (use_realpath != CWD_EXPAND) {
+					WIN32_FIND_DATA data;
+					HANDLE hFind;
+
+					if ((hFind = FindFirstFile(state->cwd, &data)) != INVALID_HANDLE_VALUE) {
+						int length = strlen(data.cFileName);
+
+						if (length != ptr_length) {
+							state->cwd = (char *) realloc(state->cwd, state->cwd_length+length+1);
+						}
+						memcpy(&state->cwd[state->cwd_length], data.cFileName, length+1);
+						ptr_length = length;
+						FindClose(hFind);
+					} else if (use_realpath == CWD_REALPATH) {
+						if (is_unc) {
+							is_unc--;
+						} else {
+							free(free_path);
+							CWD_STATE_FREE(state);
+							*state = old_state;					
+							return 1;
+						}
+					}
+				}
+#endif
+
 				state->cwd_length += ptr_length;
 			}
 			ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok);
 		}
 
+		free(free_path);
+
 		if (state->cwd_length == COPY_WHEN_ABSOLUTE(state->cwd)) {
 			state->cwd = (char *) realloc(state->cwd, state->cwd_length+1+1);
 			state->cwd[state->cwd_length] = DEFAULT_SLASH;
 			state->cwd[state->cwd_length+1] = '\0';
 			state->cwd_length++;
 		}
-	} else {
-		state->cwd = (char *) realloc(state->cwd, path_length+1);
-		memcpy(state->cwd, path, path_length+1);
-		state->cwd_length = path_length;
 	}
 
-#ifdef TSRM_WIN32
-	if (new_path) {
-		free(new_path);
-	}
-#endif
-	free(free_path);
-
-	if (use_realpath && CWDG(realpath_cache_size_limit)) {
-		realpath_cache_add(orig_path, orig_path_len, state->cwd, state->cwd_length, t TSRMLS_CC);
+	if (use_realpath != CWD_EXPAND && CWDG(realpath_cache_size_limit)) {
+		realpath_cache_add(path, path_length, state->cwd, state->cwd_length, t TSRMLS_CC);
 	}
 
 	if (verify_path && verify_path(state)) {
@@ -620,7 +701,7 @@ php_failed_getlongpath:
 
 CWD_API int virtual_chdir(const char *path TSRMLS_DC)
 {
-	return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok, 1)?-1:0;
+	return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok, CWD_REALPATH)?-1:0;
 }
 
 CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path TSRMLS_DC) TSRMLS_DC)
@@ -662,7 +743,7 @@ CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC)
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
 	
-	if (virtual_file_ex(&new_state, path, NULL, 1)==0) {
+	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)==0) {
 		int len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;
 
 		memcpy(real_path, new_state.cwd, len);
@@ -683,7 +764,7 @@ CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_f
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	retval = virtual_file_ex(&new_state, path, verify_path, 1);
+	retval = virtual_file_ex(&new_state, path, verify_path, CWD_FILEPATH);
 
 	*filepath = new_state.cwd;
 
@@ -706,7 +787,10 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC)
 	}
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 1);
+	if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return NULL;
+	}
 
 	f = fopen(new_state.cwd, mode);
 
@@ -720,7 +804,10 @@ CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC)
 	int ret;
 	
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL, 1);
+	if (virtual_file_ex(&new_state, pathname, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}
 
 #if defined(TSRM_WIN32)
 	ret = tsrm_win32_access(new_state.cwd, mode);
@@ -741,7 +828,10 @@ CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC)
 	int ret;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL, 0);
+	if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}
 
 	ret = utime(new_state.cwd, buf);
 
@@ -756,7 +846,10 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC)
 	int ret;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL, 1);
+	if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}
 
 	ret = chmod(new_state.cwd, mode);
 
@@ -771,7 +864,10 @@ CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int li
 	int ret;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL, 0);
+	if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}
 
 	if (link) {
 #if HAVE_LCHOWN
@@ -794,7 +890,10 @@ CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...)
 	int f;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 1);
+	if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}
 
 	if (flags & O_CREAT) {
 		mode_t mode;
@@ -818,7 +917,10 @@ CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC)
 	int f;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 1);
+	if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}
 
 	f = creat(new_state.cwd,  mode);
 
@@ -833,11 +935,18 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&old_state, &CWDG(cwd));
-	virtual_file_ex(&old_state, oldname, NULL, 0);
+	if (virtual_file_ex(&old_state, oldname, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&old_state);
+		return -1;
+	}
 	oldname = old_state.cwd;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, newname, NULL, 0);
+	if (virtual_file_ex(&new_state, newname, NULL, CWD_FILEPATH)) {
+		CWD_STATE_FREE(&old_state);
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}
 	newname = new_state.cwd;
  
 	retval = rename(oldname, newname);
@@ -854,11 +963,12 @@ CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, path, NULL, 1)) {
+	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
 		return -1;
 	}
 
-	retval = stat(new_state.cwd, buf);
+	retval = php_sys_stat(new_state.cwd, buf);
 
 	CWD_STATE_FREE(&new_state);
 	return retval;
@@ -871,7 +981,10 @@ CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 0);
+	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}
 
 	retval = lstat(new_state.cwd, buf);
 
@@ -886,7 +999,10 @@ CWD_API int virtual_unlink(const char *path TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 0);
+	if (virtual_file_ex(&new_state, path, NULL, CWD_EXPAND)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}
 
 	retval = unlink(new_state.cwd);
 
@@ -900,7 +1016,10 @@ CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL, 1);
+	if (virtual_file_ex(&new_state, pathname, NULL, CWD_FILEPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}
 
 #ifdef TSRM_WIN32
 	retval = mkdir(new_state.cwd);
@@ -917,7 +1036,10 @@ CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL, 0);
+	if (virtual_file_ex(&new_state, pathname, NULL, CWD_EXPAND)) {
+		CWD_STATE_FREE(&new_state);
+		return -1;
+	}
 
 	retval = rmdir(new_state.cwd);
 
@@ -935,7 +1057,10 @@ CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC)
 	DIR *retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL, 1);
+	if (virtual_file_ex(&new_state, pathname, NULL, CWD_REALPATH)) {
+		CWD_STATE_FREE(&new_state);
+		return NULL;
+	}
 
 	retval = opendir(new_state.cwd);
 
@@ -1043,25 +1168,36 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 
 #endif
 
-/* On AIX & Tru64 when a file does not exist realpath() returns
- * NULL, and sets errno to ENOENT. Unlike in other libc implementations
- * the destination is not filled and remains undefined. Therefor, we
- * must populate it manually using strcpy as done on systems with no
- * realpath() function.
- */
-#if defined(__osf__) || defined(_AIX)
-char *php_realpath_hack(char *src, char *dest)
+CWD_API char *tsrm_realpath(const char *path, char *real_path TSRMLS_DC)
 {
-	char *ret;
+	cwd_state new_state;
+	char cwd[MAXPATHLEN];
 
-	if ((ret = realpath(src, dest)) == NULL && errno == ENOENT) {
-		return strcpy(dest, src);
+	if (!IS_ABSOLUTE_PATH(path, strlen(path)) &&
+	    VCWD_GETCWD(cwd, MAXPATHLEN)) {
+		new_state.cwd = strdup(cwd);
+		new_state.cwd_length = strlen(cwd);
 	} else {
-		return ret;
+		new_state.cwd = (char*)malloc(1);
+		new_state.cwd[0] = '\0';
+		new_state.cwd_length = 0;		
+	}
+
+	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)) {
+		free(new_state.cwd);
+		return NULL;
+	}
+
+	if (real_path) {
+		int copy_len = new_state.cwd_length>MAXPATHLEN-1 ? MAXPATHLEN-1 : new_state.cwd_length;
+		memcpy(real_path, new_state.cwd, copy_len);
+		real_path[copy_len] = '\0';
+		free(new_state.cwd);
+		return real_path;
+	} else {
+		return new_state.cwd;
 	}
 }
-#endif
-
 
 
 /*

TSRM/tsrm_virtual_cwd.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2007 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        |
@@ -37,8 +37,14 @@
 #include <stdarg.h>
 #endif
 
+#ifdef ZTS
+#define VIRTUAL_DIR
+#endif
+
 #ifndef TSRM_WIN32
 #include <unistd.h>
+#else
+#include <direct.h>
 #endif
 
 #if defined(__osf__) || defined(_AIX)
@@ -120,6 +126,12 @@ typedef unsigned short mode_t;
 #define CWD_API
 #endif
 
+#ifdef TSRM_WIN32
+CWD_API int php_sys_stat(const char *path, struct stat *buf);
+#else
+# define php_sys_stat stat
+#endif
+
 typedef struct _cwd_state {
 	char *cwd;
 	int cwd_length;
@@ -166,10 +178,6 @@ CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC);
 #endif
 #endif
 
-#if defined(__osf__) || defined(_AIX)
-char *php_realpath_hack(char *src, char *dest);
-#endif
-
 #if HAVE_UTIME
 CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC);
 #endif
@@ -178,8 +186,17 @@ 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 
+   in virtual_file_ex() call. */
+
+#define CWD_EXPAND   0 /* expand "." and ".." but dont resolve symlinks      */
+#define CWD_FILEPATH 1 /* resolve symlinks if file is exist otherwise expand */
+#define CWD_REALPATH 2 /* call realpath(), resolve symlinks. File must exist */
+
 CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath);
 
+CWD_API char *tsrm_realpath(const char *path, char *real_path TSRMLS_DC);
+
 #define REALPATH_CACHE_TTL  (2*60) /* 2 minutes */
 #define REALPATH_CACHE_SIZE 0      /* disabled while php.ini isn't loaded */
 
@@ -209,6 +226,9 @@ extern virtual_cwd_globals cwd_globals;
 # define CWDG(v) (cwd_globals.v)
 #endif
 
+CWD_API void realpath_cache_clean(TSRMLS_D);
+CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
+
 /* The actual macros to be used in programs using TSRM
  * If the program defines VIRTUAL_DIR it will use the
  * virtual_* functions 
@@ -259,7 +279,7 @@ extern virtual_cwd_globals cwd_globals;
 #define VCWD_CHDIR(path) chdir(path)
 #define VCWD_CHDIR_FILE(path) virtual_chdir_file(path, chdir)
 #define VCWD_GETWD(buf) getwd(buf)
-#define VCWD_STAT(path, buff) stat(path, buff)
+#define VCWD_STAT(path, buff) php_sys_stat(path, buff)
 #define VCWD_LSTAT(path, buff) lstat(path, buff)
 #define VCWD_UNLINK(path) unlink(path)
 #define VCWD_MKDIR(pathname, mode) mkdir(pathname, mode)
@@ -272,15 +292,7 @@ extern virtual_cwd_globals cwd_globals;
 #define VCWD_ACCESS(pathname, mode) access(pathname, mode)
 #endif
 
-#ifdef HAVE_REALPATH
-#if defined(__osf__) || defined(_AIX)
-#define VCWD_REALPATH(path, real_path) php_realpath_hack(path, real_path)
-#else
-#define VCWD_REALPATH(path, real_path) realpath(path, real_path)
-#endif
-#else
-#define VCWD_REALPATH(path, real_path) strcpy(real_path, path)
-#endif
+#define VCWD_REALPATH(path, real_path) tsrm_realpath(path, real_path TSRMLS_CC)
 
 #if HAVE_UTIME
 #define VCWD_UTIME(path, time) utime(path, time)

TSRM/tsrm_win32.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2007 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        |
@@ -86,11 +86,19 @@ TSRM_API void tsrm_win32_shutdown(void)
 
 TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 {
-	SHFILEINFO sfi;
-
 	if (mode == 1 /*X_OK*/) {
+#if 1
+		/* This code is not supported by Windows 98, 
+		 * but we don't support it anymore */
+		DWORD type;
+
+		return GetBinaryType(pathname, &type)?0:-1;
+#else
+		SHFILEINFO sfi;
+
 		return access(pathname, 0) == 0 && 
 			SHGetFileInfo(pathname, 0, &sfi, sizeof(SHFILEINFO), SHGFI_EXETYPE) != 0 ? 0 : -1;
+#endif
 	} else {
 		return access(pathname, mode);
 	}

TSRM/tsrm_win32.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2007 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        |

UPGRADING

@@ -35,7 +35,7 @@ UPGRADE NOTES - PHP 5.1
 1a. Overview
 ============
 
->From the PHP script writer's point of view, the change most likely to impact
+From the PHP script writer's point of view, the change most likely to impact
 legacy code is in the way that references are handled in all PHP versions
 post-dating the PHP 4.4.0 release.
 

Zend/Makefile.am

@@ -14,7 +14,7 @@ libZend_la_SOURCES=\
 	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
 	zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
 	zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
-	zend_objects_API.c zend_ts_hash.c zend_stream.c zend_mm.c \
+	zend_objects_API.c zend_ts_hash.c zend_stream.c \
 	zend_default_classes.c \
 	zend_iterators.c zend_interfaces.c zend_exceptions.c \
 	zend_strtod.c zend_multibyte.c

Zend/README.ZEND_MM

@@ -0,0 +1,13 @@
+The goal of the new memory manager (PHP 5.2 and later) is reducing memory allocation overhead and speedup memory management.
+
+The new manager's "configure" has no "--disable-zend-memory-manager" option, but it has "--enable-malloc-mm" instead. It is enabled by default in DEBUG build and disabled by default in RELEASE built. It allows select malloc/emalloc at runtime.  So you can use internal and external memory debuggers without recompilation.
+
+$ sapi/cli/php -r 'leak();'
+
+$ USE_ZEND_ALLOC=0 valgrind --leak-check=full -r 'leak();'
+
+The patch allows tweaking memory manager with ZEND_MM_MEM_TYPE and ZEND_MM_SEG_SIZE environment variables. Default values are "malloc" and "256K". Dependent on target system you can also use "mmap_anon", "mmap_zero"
+and "win32" storage managers.
+
+$ ZEND_MM_MEM_TYPE=mmap_anon ZEND_MM_SEG_SIZE=1M sapi/cli/php
+

Zend/Zend.dsp

@@ -195,10 +195,6 @@ SOURCE=.\zend_llist.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_mm.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_object_handlers.c
 # End Source File
 # Begin Source File
@@ -371,10 +367,6 @@ SOURCE=.\zend_llist.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_mm.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_modules.h
 # End Source File
 # Begin Source File

Zend/Zend.m4

@@ -129,15 +129,6 @@ AC_ARG_WITH(zend-vm,
   PHP_ZEND_VM=CALL
 ])
 
-AC_ARG_ENABLE(zend-memory-manager,
-[  --disable-zend-memory-manager
-                          Disable the Zend memory manager - FOR DEVELOPERS ONLY!!],
-[
-  ZEND_USE_ZEND_ALLOC=$enableval
-], [
-  ZEND_USE_ZEND_ALLOC=yes
-])
-
 AC_ARG_ENABLE(maintainer-zts,
 [  --enable-maintainer-zts Enable thread safety - for code maintainers only!!],[
   ZEND_MAINTAINER_ZTS=$enableval
@@ -153,13 +144,6 @@ AC_ARG_ENABLE(inline-optimization,
   ZEND_INLINE_OPTIMIZATION=yes
 ])
 
-AC_ARG_ENABLE(memory-limit,
-[  --enable-memory-limit   Compile with memory limit support], [
-  ZEND_MEMORY_LIMIT=$enableval
-],[
-  ZEND_MEMORY_LIMIT=no
-])
-
 AC_ARG_ENABLE(zend-multibyte,
 [  --enable-zend-multibyte Compile with zend multibyte support], [
   ZEND_MULTIBYTE=$enableval
@@ -170,18 +154,12 @@ AC_ARG_ENABLE(zend-multibyte,
 AC_MSG_CHECKING([virtual machine dispatch method])
 AC_MSG_RESULT($PHP_ZEND_VM)
 
-AC_MSG_CHECKING(whether to enable the Zend memory manager)
-AC_MSG_RESULT($ZEND_USE_ZEND_ALLOC)
-
 AC_MSG_CHECKING(whether to enable thread-safety)
 AC_MSG_RESULT($ZEND_MAINTAINER_ZTS)
 
 AC_MSG_CHECKING(whether to enable inline optimization for GCC)
 AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION)
 
-AC_MSG_CHECKING(whether to enable a memory limit)
-AC_MSG_RESULT($ZEND_MEMORY_LIMIT)
-
 AC_MSG_CHECKING(whether to enable Zend debugging)
 AC_MSG_RESULT($ZEND_DEBUG)
 
@@ -216,24 +194,12 @@ fi
 
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
-if test "$ZEND_USE_ZEND_ALLOC" = "yes"; then
-  AC_DEFINE(USE_ZEND_ALLOC,1,[Use Zend memory manager])
-else
-  AC_DEFINE(USE_ZEND_ALLOC,0,[Use Zend memory manager])
-fi
-
 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
   AC_DEFINE(ZTS,1,[ ])
   CFLAGS="$CFLAGS -DZTS"
   LIBZEND_CPLUSPLUS_CHECKS
 fi  
 
-if test "$ZEND_MEMORY_LIMIT" = "yes"; then
-  AC_DEFINE(MEMORY_LIMIT, 1, [Memory limit])
-else
-  AC_DEFINE(MEMORY_LIMIT, 0, [Memory limit])
-fi
-
 if test "$ZEND_MULTIBYTE" = "yes"; then
   AC_DEFINE(ZEND_MULTIBYTE, 1, [ ])
 fi
@@ -306,6 +272,108 @@ int main()
 
 AC_MSG_RESULT(done)
 
+dnl test for memory allocation using mmap(MAP_ANON)
+AC_MSG_CHECKING(for memory allocation using mmap(MAP_ANON))
+
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <stdlib.h>
+#include <stdio.h>
+#ifndef MAP_ANON
+# ifdef MAP_ANONYMOUS
+#  define MAP_ANON MAP_ANONYMOUS
+# endif
+#endif
+#ifndef MREMAP_MAYMOVE
+# define MREMAP_MAYMOVE 0
+#endif
+#ifndef MAP_FAILED
+# define MAP_FAILED ((void*)-1)
+#endif
+
+#define SEG_SIZE (256*1024)
+
+int main()
+{
+	void *seg = mmap(NULL, SEG_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+	if (seg == MAP_FAILED) {
+		return 1;
+	}
+	if (munmap(seg, SEG_SIZE) != 0) {
+		return 2;
+	}
+	return 0;
+}
+], [
+  AC_DEFINE([HAVE_MEM_MMAP_ANON], 1, [Define if the target system has support for memory allocation using mmap(MAP_ANON)])
+  AC_MSG_RESULT(yes)
+], [
+  AC_MSG_RESULT(no)
+], [
+  dnl cross-compile needs something here
+  AC_MSG_RESULT(no)
+])
+
+dnl test for memory allocation using mmap("/dev/zero")
+AC_MSG_CHECKING(for memory allocation using mmap("/dev/zero"))
+
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <stdlib.h>
+#include <stdio.h>
+#ifndef MAP_ANON
+# ifdef MAP_ANONYMOUS
+#  define MAP_ANON MAP_ANONYMOUS
+# endif
+#endif
+#ifndef MREMAP_MAYMOVE
+# define MREMAP_MAYMOVE 0
+#endif
+#ifndef MAP_FAILED
+# define MAP_FAILED ((void*)-1)
+#endif
+
+#define SEG_SIZE (256*1024)
+
+int main()
+{
+	int fd;
+	void *seg;
+
+	fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR);
+	if (fd < 0) {
+		return 1;
+	}
+	seg = mmap(NULL, SEG_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
+	if (seg == MAP_FAILED) {
+		return 2;
+	}
+	if (munmap(seg, SEG_SIZE) != 0) {
+		return 3;
+	}
+	if (close(fd) != 0) {
+		return 4;
+	}
+	return 0;
+}
+], [
+  AC_DEFINE([HAVE_MEM_MMAP_ZERO], 1, [Define if the target system has support for memory allocation using mmap("/dev/zero")])
+  AC_MSG_RESULT(yes)
+], [
+  AC_MSG_RESULT(no)
+], [
+  dnl cross-compile needs something here
+  AC_MSG_RESULT(no)
+])
+
+AC_CHECK_FUNCS(mremap)
+
 ])
 
 
@@ -313,3 +381,10 @@ AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
 
 ])
 
+AC_MSG_CHECKING(whether /dev/urandom exists) 
+if test -r "/dev/urandom" && test -c "/dev/urandom"; then 
+  AC_DEFINE([HAVE_DEV_URANDOM], 1, [Define if the target system has /dev/urandom device])
+  AC_MSG_RESULT(yes) 
+else 
+  AC_MSG_RESULT(no) 
+fi 

Zend/ZendTS.dsp

@@ -169,6 +169,7 @@ SOURCE=.\zend_exceptions.c
 # Begin Source File
 
 SOURCE=.\zend_execute.c
+# ADD CPP /I "..\TSRM"
 # End Source File
 # Begin Source File
 
@@ -228,10 +229,6 @@ SOURCE=.\zend_llist.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_mm.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_object_handlers.c
 # End Source File
 # Begin Source File
@@ -408,10 +405,6 @@ SOURCE=.\zend_llist.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_mm.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_modules.h
 # End Source File
 # Begin Source File

Zend/acconfig.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2006 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2007 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |

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"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed

Zend/bench.php

@@ -1,4 +1,5 @@
 <?php
+date_default_timezone_set("UTC");
 
 function simple() {
   $a = 0;

Zend/tests/001.phpt

@@ -0,0 +1,54 @@
+--TEST--
+func_num_args() tests
+--FILE--
+<?php
+
+function test1() {
+	var_dump(func_num_args());
+}
+
+function test2($a) {
+	var_dump(func_num_args());
+}
+
+function test3($a, $b) {
+	var_dump(func_num_args());
+}
+
+test1();
+test2(1);
+test2();
+test3(1,2);
+
+call_user_func("test1");
+call_user_func("test3", 1);
+call_user_func("test3", 1, 2);
+
+class test {
+	static function test1($a) {
+		var_dump(func_num_args());
+	}
+}
+
+test::test1(1);
+var_dump(func_num_args());
+
+echo "Done\n";
+?>
+--EXPECTF--	
+int(0)
+int(1)
+
+Warning: Missing argument 1 for test2(), called in %s on line %d
+int(0)
+int(2)
+int(0)
+
+Warning: Missing argument 2 for test3() in %s on line %d
+int(1)
+int(2)
+int(1)
+
+Warning: func_num_args():  Called from the global scope - no function context in %s on line %d
+int(-1)
+Done

Zend/tests/002.phpt

@@ -0,0 +1,108 @@
+--TEST--
+func_get_arg() tests
+--FILE--
+<?php
+
+function test1() {
+	var_dump(func_get_arg(-10));
+	var_dump(func_get_arg(0));
+	var_dump(func_get_arg(1));
+}
+
+function test2($a) {
+	var_dump(func_get_arg(0));
+	var_dump(func_get_arg(1));
+}
+
+function test3($a, $b) {
+	var_dump(func_get_arg(0));
+	var_dump(func_get_arg(1));
+	var_dump(func_get_arg(2));
+}
+
+test1();
+test1(10);
+test2(1);
+test2();
+test3(1,2);
+
+call_user_func("test1");
+call_user_func("test3", 1);
+call_user_func("test3", 1, 2);
+
+class test {
+	static function test1($a) {
+		var_dump(func_get_arg(0));
+		var_dump(func_get_arg(1));
+	}
+}
+
+test::test1(1);
+var_dump(func_get_arg(1));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  Argument 0 not passed to function in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
+bool(false)
+int(10)
+
+Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
+bool(false)
+int(1)
+
+Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
+bool(false)
+
+Warning: Missing argument 1 for test2(), called in %s on line %d and defined in %s on line %d
+
+Warning: func_get_arg():  Argument 0 not passed to function in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
+bool(false)
+int(1)
+int(2)
+
+Warning: func_get_arg():  Argument 2 not passed to function in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  Argument 0 not passed to function in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
+bool(false)
+
+Warning: Missing argument 2 for test3() in %s on line %d
+int(1)
+
+Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  Argument 2 not passed to function in %s on line %d
+bool(false)
+int(1)
+int(2)
+
+Warning: func_get_arg():  Argument 2 not passed to function in %s on line %d
+bool(false)
+int(1)
+
+Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
+bool(false)
+
+Warning: func_get_arg():  Called from the global scope - no function context in %s on line %d
+bool(false)
+Done

Zend/tests/003.phpt

@@ -0,0 +1,81 @@
+--TEST--
+func_get_args() tests
+--FILE--
+<?php
+
+function test1() {
+	var_dump(func_get_args());
+}
+
+function test2($a) {
+	var_dump(func_get_args());
+}
+
+function test3($a, $b) {
+	var_dump(func_get_args());
+}
+
+test1();
+test1(10);
+test2(1);
+test2();
+test3(1,2);
+
+call_user_func("test1");
+call_user_func("test3", 1);
+call_user_func("test3", 1, 2);
+
+class test {
+	static function test1($a) {
+		var_dump(func_get_args());
+	}
+}
+
+test::test1(1);
+var_dump(func_get_args());
+
+echo "Done\n";
+?>
+--EXPECTF--	
+array(0) {
+}
+array(1) {
+  [0]=>
+  int(10)
+}
+array(1) {
+  [0]=>
+  int(1)
+}
+
+Warning: Missing argument 1 for test2(), called in %s on line %d and defined in %s on line %d
+array(0) {
+}
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+}
+array(0) {
+}
+
+Warning: Missing argument 2 for test3() in %s on line %d
+array(1) {
+  [0]=>
+  int(1)
+}
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+}
+array(1) {
+  [0]=>
+  int(1)
+}
+
+Warning: func_get_args():  Called from the global scope - no function context in %s on line %d
+bool(false)
+Done

Zend/tests/004.phpt

@@ -0,0 +1,25 @@
+--TEST--
+strncmp() tests
+--FILE--
+<?php
+
+var_dump(strncmp("", ""));
+var_dump(strncmp("", "", 100));
+var_dump(strncmp("aef", "dfsgbdf", -1));
+var_dump(strncmp("fghjkl", "qwer", 0));
+var_dump(strncmp("qwerty", "qwerty123", 6));
+var_dump(strncmp("qwerty", "qwerty123", 7));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: Wrong parameter count for strncmp() in %s on line %d
+NULL
+int(0)
+
+Warning: Length must be greater than or equal to 0 in %s on line %d
+bool(false)
+int(0)
+int(0)
+int(-1)
+Done

Zend/tests/005.phpt

@@ -0,0 +1,27 @@
+--TEST--
+strcasecmp() tests
+--FILE--
+<?php
+
+var_dump(strcasecmp(""));
+var_dump(strcasecmp("", ""));
+var_dump(strcasecmp("aef", "dfsgbdf"));
+var_dump(strcasecmp("qwe", "qwer"));
+var_dump(strcasecmp("qwerty", "QweRty"));
+var_dump(strcasecmp("qwErtY", "qwerty"));
+var_dump(strcasecmp("q123", "Q123"));
+var_dump(strcasecmp("01", "01"));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: Wrong parameter count for strcasecmp() in %s on line %d
+NULL
+int(0)
+int(-3)
+int(-1)
+int(0)
+int(0)
+int(0)
+int(0)
+Done

Zend/tests/006.phpt

@@ -0,0 +1,31 @@
+--TEST--
+strncasecmp() tests
+--FILE--
+<?php
+
+var_dump(strncasecmp(""));
+var_dump(strncasecmp("", "", -1));
+var_dump(strncasecmp("aef", "dfsgbdf", 0));
+var_dump(strncasecmp("aef", "dfsgbdf", 10));
+var_dump(strncasecmp("qwe", "qwer", 3));
+var_dump(strncasecmp("qwerty", "QweRty", 6));
+var_dump(strncasecmp("qwErtY", "qwer", 7));
+var_dump(strncasecmp("q123", "Q123", 3));
+var_dump(strncasecmp("01", "01", 1000));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: Wrong parameter count for strncasecmp() in %s on line %d
+NULL
+
+Warning: Length must be greater than or equal to 0 in %s on line %d
+bool(false)
+int(0)
+int(-3)
+int(0)
+int(0)
+int(2)
+int(0)
+int(0)
+Done

Zend/tests/007.phpt

@@ -0,0 +1,63 @@
+--TEST--
+each() tests
+--FILE--
+<?php
+
+var_dump(each());
+$var = 1;
+var_dump(each($var));
+$var = "string";
+var_dump(each($var));
+$var = array(1,2,3);
+var_dump(each($var));
+$var = array("a"=>1,"b"=>2,"c"=>3);
+var_dump(each($var));
+
+$a = array(1);
+$a [] =&$a[0];
+
+var_dump(each($a));
+
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: Wrong parameter count for each() in %s on line %d
+NULL
+
+Warning: Variable passed to each() is not an array or object in %s on line %d
+NULL
+
+Warning: Variable passed to each() is not an array or object in %s on line %d
+NULL
+array(4) {
+  [1]=>
+  int(1)
+  ["value"]=>
+  int(1)
+  [0]=>
+  int(0)
+  ["key"]=>
+  int(0)
+}
+array(4) {
+  [1]=>
+  int(1)
+  ["value"]=>
+  int(1)
+  [0]=>
+  string(1) "a"
+  ["key"]=>
+  string(1) "a"
+}
+array(4) {
+  [1]=>
+  int(1)
+  ["value"]=>
+  int(1)
+  [0]=>
+  int(0)
+  ["key"]=>
+  int(0)
+}
+Done

Zend/tests/008.phpt

@@ -0,0 +1,53 @@
+--TEST--
+define() tests
+--FILE--
+<?php
+
+var_dump(define());
+var_dump(define("TRUE"));
+var_dump(define("TRUE", 1));
+var_dump(define("TRUE", 1, array(1)));
+
+var_dump(define(array(1,2,3,4,5), 1));
+var_dump(define(" ", 1));
+var_dump(define("[[[", 2));
+var_dump(define("test const", 3));
+var_dump(define("test const", 3));
+var_dump(define("test", array(1)));
+var_dump(define("test1", new stdclass));
+
+var_dump(constant(" "));
+var_dump(constant("[[["));
+var_dump(constant("test const"));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: Wrong parameter count for define() in %s on line %d
+NULL
+
+Warning: Wrong parameter count for define() in %s on line %d
+NULL
+bool(true)
+
+Notice: Constant true already defined in %s on line %d
+bool(false)
+
+Notice: Array to string conversion in %s on line %d
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+
+Notice: Constant test const already defined in %s on line %d
+bool(false)
+
+Warning: Constants may only evaluate to scalar values in %s on line %d
+bool(false)
+
+Warning: Constants may only evaluate to scalar values in %s on line %d
+bool(false)
+int(1)
+int(2)
+int(3)
+Done

Zend/tests/009.phpt

@@ -0,0 +1,46 @@
+--TEST--
+get_class() tests
+--FILE--
+<?php
+
+class foo {
+	function bar () {
+		var_dump(get_class());
+	}
+}
+
+class foo2 extends foo {
+}
+
+foo::bar();
+foo2::bar();
+
+$f1 = new foo;
+$f2 = new foo2;
+
+$f1->bar();
+$f2->bar();
+
+var_dump(get_class());
+var_dump(get_class("qwerty"));
+
+var_dump(get_class($f1));
+var_dump(get_class($f2));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
+string(3) "foo"
+
+Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
+string(3) "foo"
+string(3) "foo"
+string(3) "foo"
+
+Warning: get_class() called without object from outside a class in %s on line %d
+bool(false)
+bool(false)
+string(3) "foo"
+string(4) "foo2"
+Done

Zend/tests/010.phpt

@@ -0,0 +1,59 @@
+--TEST--
+get_parent_class() tests
+--FILE--
+<?php
+
+interface i {
+	function test();
+}
+
+class foo implements i {
+	function test() {
+		var_dump(get_parent_class());
+	}
+}
+
+class bar extends foo {
+	function test_bar() {
+		var_dump(get_parent_class());
+	}
+}
+
+$bar = new bar;
+$foo = new foo;
+
+$foo->test();
+$bar->test();
+$bar->test_bar();
+
+var_dump(get_parent_class($bar));
+var_dump(get_parent_class($foo));
+var_dump(get_parent_class("bar"));
+var_dump(get_parent_class("foo"));
+var_dump(get_parent_class("i"));
+
+var_dump(get_parent_class(""));
+var_dump(get_parent_class("[[[["));
+var_dump(get_parent_class(" "));
+var_dump(get_parent_class(new stdclass));
+var_dump(get_parent_class(array()));
+var_dump(get_parent_class(1));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+bool(false)
+bool(false)
+string(3) "foo"
+string(3) "foo"
+bool(false)
+string(3) "foo"
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+Done

Zend/tests/011.phpt

@@ -0,0 +1,89 @@
+--TEST--
+property_exists() tests
+--FILE--
+<?php
+
+class foo {
+	public $pp1 = 1;
+	private $pp2 = 2;
+	protected $pp3 = 3;
+
+	function bar() {
+		var_dump(property_exists("foo","pp1"));
+		var_dump(property_exists("foo","pp2"));
+		var_dump(property_exists("foo","pp3"));
+	}
+}
+
+class bar extends foo {
+	function test() {
+		var_dump(property_exists("foo","pp1"));
+		var_dump(property_exists("foo","pp2"));
+		var_dump(property_exists("foo","pp3"));
+	}
+}
+
+var_dump(property_exists());
+var_dump(property_exists(""));
+var_dump(property_exists("foo","pp1"));
+var_dump(property_exists("foo","pp2"));
+var_dump(property_exists("foo","pp3"));
+var_dump(property_exists("foo","nonexistent"));
+var_dump(property_exists("fo","nonexistent"));
+var_dump(property_exists("foo",""));
+var_dump(property_exists("","test"));
+var_dump(property_exists("",""));
+
+$foo = new foo;
+
+var_dump(property_exists($foo,"pp1"));
+var_dump(property_exists($foo,"pp2"));
+var_dump(property_exists($foo,"pp3"));
+var_dump(property_exists($foo,"nonexistent"));
+var_dump(property_exists($foo,""));
+var_dump(property_exists(array(),"test"));
+var_dump(property_exists(1,"test"));
+var_dump(property_exists(true,"test"));
+
+$foo->bar();
+
+$bar = new bar;
+$bar->test();
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: Wrong parameter count for property_exists() in %s on line %d
+NULL
+
+Warning: Wrong parameter count for property_exists() in %s on line %d
+NULL
+bool(true)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+
+Warning: First parameter must either be an object or the name of an existing class in %s on line %d
+NULL
+
+Warning: First parameter must either be an object or the name of an existing class in %s on line %d
+NULL
+
+Warning: First parameter must either be an object or the name of an existing class in %s on line %d
+NULL
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(false)
+bool(true)
+Done

Zend/tests/012.phpt

@@ -0,0 +1,34 @@
+--TEST--
+class_exists() tests
+--FILE--
+<?php
+
+class foo {
+}
+
+var_dump(class_exists());
+var_dump(class_exists("qwerty"));
+var_dump(class_exists(""));
+var_dump(class_exists(array()));
+var_dump(class_exists("test", false));
+var_dump(class_exists("foo", false));
+var_dump(class_exists("foo"));
+var_dump(class_exists("stdClass", false));
+var_dump(class_exists("stdClass"));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: class_exists() expects at least 1 parameter, 0 given in %s on line %d
+NULL
+bool(false)
+bool(false)
+
+Warning: class_exists() expects parameter 1 to be string, array given in %s on line %d
+NULL
+bool(false)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Done

Zend/tests/013.phpt

@@ -0,0 +1,34 @@
+--TEST--
+interface_exists() tests
+--FILE--
+<?php
+
+interface foo {
+}
+
+var_dump(interface_exists());
+var_dump(interface_exists("qwerty"));
+var_dump(interface_exists(""));
+var_dump(interface_exists(array()));
+var_dump(interface_exists("test", false));
+var_dump(interface_exists("foo", false));
+var_dump(interface_exists("foo"));
+var_dump(interface_exists("stdClass", false));
+var_dump(interface_exists("stdClass"));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: interface_exists() expects at least 1 parameter, 0 given in %s on line %d
+NULL
+bool(false)
+bool(false)
+
+Warning: interface_exists() expects parameter 1 to be string, array given in %s on line %d
+NULL
+bool(false)
+bool(true)
+bool(true)
+bool(false)
+bool(false)
+Done

Zend/tests/014.inc

@@ -0,0 +1,3 @@
+<?php
+/* dummy file for 014.phpt */
+?>

Zend/tests/014.phpt

@@ -0,0 +1,52 @@
+--TEST--
+get_included_files() tests
+--FILE--
+<?php
+
+var_dump(get_included_files());
+
+include(dirname(__FILE__)."/014.inc");
+var_dump(get_included_files());
+
+var_dump(get_included_files(1,1));
+
+include_once(dirname(__FILE__)."/014.inc");
+var_dump(get_included_files());
+
+var_dump(get_included_files(1));
+
+include(dirname(__FILE__)."/014.inc");
+var_dump(get_included_files());
+
+echo "Done\n";
+?>
+--EXPECTF--	
+array(1) {
+  [0]=>
+  string(%d) "%s"
+}
+array(2) {
+  [0]=>
+  string(%d) "%s"
+  [1]=>
+  string(%d) "%s"
+}
+
+Warning: Wrong parameter count for get_included_files() in %s on line %d
+NULL
+array(2) {
+  [0]=>
+  string(%d) "%s"
+  [1]=>
+  string(%d) "%s"
+}
+
+Warning: Wrong parameter count for get_included_files() in %s on line %d
+NULL
+array(2) {
+  [0]=>
+  string(%d) "%s"
+  [1]=>
+  string(%d) "%s"
+}
+Done

Zend/tests/015.phpt

@@ -0,0 +1,35 @@
+--TEST--
+trigger_error() tests
+--FILE--
+<?php
+
+var_dump(trigger_error());
+var_dump(trigger_error("error"));
+var_dump(trigger_error(array()));
+var_dump(trigger_error("error", -1));
+var_dump(trigger_error("error", 0));
+var_dump(trigger_error("error", E_USER_WARNING));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: Wrong parameter count for trigger_error() in %s on line %d
+NULL
+
+Notice: error in %s on line %d
+bool(true)
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array in %s on line %d
+bool(true)
+
+Warning: Invalid error type specified in %s on line %d
+bool(false)
+
+Warning: Invalid error type specified in %s on line %d
+bool(false)
+
+Warning: error in %s on line %d
+bool(true)
+Done

Zend/tests/016.phpt

@@ -0,0 +1,12 @@
+--TEST--
+isset() with object properties when operating on non-object
+--FILE--
+<?php
+
+$foo = NULL; 
+isset($foo->bar->bar);
+
+echo "Done\n";
+?>
+--EXPECT--	
+Done

Zend/tests/017.phpt

@@ -0,0 +1,82 @@
+--TEST--
+builtin functions tests
+--FILE--
+<?php
+
+var_dump(get_resource_type());
+var_dump(get_resource_type(""));
+$fp = fopen(__FILE__, "r");
+var_dump(get_resource_type($fp));
+fclose($fp);
+var_dump(get_resource_type($fp));
+
+var_dump(get_loaded_extensions(true));
+var_dump(gettype(get_loaded_extensions()));
+var_dump(count(get_loaded_extensions()));
+
+define("USER_CONSTANT", "test");
+
+var_dump(get_defined_constants(true, true));
+var_dump(gettype(get_defined_constants(true)));
+var_dump(gettype(get_defined_constants()));
+var_dump(count(get_defined_constants()));
+
+function test () {
+}
+
+var_dump(get_defined_functions(true));
+var_dump(gettype(get_defined_functions()));
+var_dump(count(get_defined_functions()));
+
+var_dump(get_declared_interfaces(true));
+var_dump(gettype(get_declared_interfaces()));
+var_dump(count(get_declared_interfaces()));
+
+var_dump(get_extension_funcs());
+var_dump(get_extension_funcs(true));
+var_dump(gettype(get_extension_funcs("standard")));
+var_dump(count(get_extension_funcs("standard")));
+var_dump(gettype(get_extension_funcs("zend")));
+var_dump(count(get_extension_funcs("zend")));
+
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: Wrong parameter count for get_resource_type() in %s on line %d
+NULL
+
+Warning: Supplied argument is not a valid resource handle in %s on line %d
+bool(false)
+string(6) "stream"
+string(7) "Unknown"
+
+Warning: Wrong parameter count for get_loaded_extensions() in %s on line %d
+NULL
+string(5) "array"
+int(%d)
+
+Warning: Wrong parameter count for get_defined_constants() in %s on line %d
+NULL
+string(5) "array"
+string(5) "array"
+int(%d)
+
+Warning: Wrong parameter count for get_defined_functions() in %s on line %d
+NULL
+string(5) "array"
+int(%d)
+
+Warning: Wrong parameter count for get_declared_interfaces() in %s on line %d
+NULL
+string(5) "array"
+int(%d)
+
+Warning: Wrong parameter count for get_extension_funcs() in %s on line %d
+NULL
+bool(false)
+string(5) "array"
+int(%d)
+string(5) "array"
+int(%d)
+Done

Zend/tests/abstract-static.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Test for abstract static classes
+--FILE--
+<?php
+abstract class TestClass
+{
+    abstract static public function getName();
+}
+?>
+===DONE===
+--EXPECTF--
+
+Strict Standards: Static function TestClass::getName() should not be abstract in %sabstract-static.php on line %d
+===DONE===

Zend/tests/array_type_hint_001.phpt

@@ -12,4 +12,4 @@ foo(123);
 --EXPECTF--
 3
 
-Fatal error: Argument 1 passed to foo() must be an array, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
+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/bug24884.phpt

@@ -23,6 +23,6 @@ $test = new Test();
 $test2 = $test->__copy();
 var_dump($test2);
 ?>
---EXPECT--
-object(Test)#2 (0) {
+--EXPECTF--
+object(Test)#%d (0) {
 }

Zend/tests/bug26166.phpt

@@ -2,6 +2,7 @@
 Bug #26166 (__toString() crash when no values returned)
 --FILE--
 <?php
+
 class Foo
 {
     function __toString()
@@ -28,6 +29,23 @@ class Bar
 $o = new Bar;
 echo $o;
 
+echo "===NONE===\n";
+
+function my_error_handler($errno, $errstr, $errfile, $errline) {
+	var_dump($errstr);
+}
+
+set_error_handler('my_error_handler');
+
+class None
+{
+	function __toString() {
+	}
+}
+
+$o = new None;
+echo $o;
+
 echo "===THROW===\n";
 
 class Error 
@@ -45,23 +63,12 @@ catch (Exception $e) {
 	echo "Got the exception\n";
 }
 
-echo "===NONE===\n";
-
-class None
-{
-	function __toString() {
-	}
-}
-
-$o = new None;
-echo $o;
-
 ?>
 ===DONE===
 --EXPECTF--
 Hello World!
-===THROW===
-Got the exception
 ===NONE===
+string(52) "Method None::__toString() must return a string value"
+===THROW===
 
-Fatal error: Method None::__toString() must return a string value in %sbug26166.php on line %d
+Fatal error: Method Error::__toString() must not throw an exception in %sbug26166.php on line %d

Zend/tests/bug27641.phpt

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

Zend/tests/bug28444.phpt

@@ -3,6 +3,12 @@ Bug #28444 (Cannot access undefined property for object with overloaded property
 --FILE--
 <?php
 
+function my_error_handler($errno, $errstr, $errfile, $errline) {
+	var_dump($errstr);
+}
+
+set_error_handler('my_error_handler');
+
 class Object
 {
 	public $x;
@@ -60,7 +66,8 @@ Overloaded::__set(y,3)
 int(3)
 Overloaded::__get(y)
 int(3)
-Overloaded::__set(z,Object id #3)
+string(55) "Object of class Object could not be converted to string"
+Overloaded::__set(z,)
 object(Object)#%d (1) {
   ["x"]=>
   int(4)

Zend/tests/bug30791.phpt

@@ -2,21 +2,33 @@
 Bug #30791 magic methods (__sleep/__wakeup/__toString) call __call if object is overloaded 
 --FILE--
 <?php
-class a {
+
+function my_error_handler($errno, $errstr, $errfile, $errline) {
+	var_dump($errstr);
+}
+
+set_error_handler('my_error_handler');
+
+class a
+{
    public $a = 4;
    function __call($a,$b) {
        return "unknown method";
    }
 }
+
 $b = new a;
 echo $b,"\n";
 $c = unserialize(serialize($b));
 echo $c,"\n";
 var_dump($c);
+
 ?>
 --EXPECT--
-Object id #1
-Object id #2
+string(50) "Object of class a could not be converted to string"
+
+string(50) "Object of class a could not be converted to string"
+
 object(a)#2 (1) {
   ["a"]=>
   int(4)

Zend/tests/bug32660.phpt

@@ -28,9 +28,12 @@ $b = "much longer";
 print_r($a);
 ?>
 --EXPECTF--
+Notice: Indirect modification of overloaded property A::$whatever has no effect in %sbug32660.php on line 20
 A Object
 (
-    [q] => long
+    [q] => 3
 )
 
+Notice: Indirect modification of overloaded property A::$whatever has no effect in %sbug32660.php on line 23
+
 Fatal error: Cannot assign by reference to overloaded object in %sbug32660.php on line 23

Zend/tests/bug33282.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Bug #33282 (Re-assignment by reference does not clear the is_ref flag)
+--FILE--
+<?php
+	$a = array(1, 2, 3);
+	$r = &$a[0];
+	$r = &$a[1];
+	$r = &$a[2];
+	var_dump($a);
+?>
+--EXPECT--	
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  &int(3)
+}

Zend/tests/bug33732.phpt

@@ -27,7 +27,7 @@ interface iB2 extends iA2 {
 class A2 implements iA2 {
 }
 
-class B2 extends A2 implements iB2 {
+class B2 extends A2 implements iA2 {
 }
 
 echo iA2::cA;

Zend/tests/bug33771.phpt

@@ -1,5 +1,5 @@
 --TEST--
-bug #33771 (error_reporting falls to 0 when @ was used inside try/catch block)
+Bug #33771 (error_reporting falls to 0 when @ was used inside try/catch block)
 --FILE--
 <?php
 
@@ -14,7 +14,7 @@ function make_exception()
 
 function make_exception_and_change_err_reporting()
 {
-	error_reporting(E_ALL);
+    error_reporting(E_ALL & ~E_STRICT);
     throw new Exception();
 }
 
@@ -34,7 +34,7 @@ var_dump(error_reporting());
 echo "Done\n";
 ?>
 --EXPECTF--	
-int(4095)
-int(4095)
-int(2047)
+int(8191)
+int(8191)
+int(6143)
 Done

Zend/tests/bug33996.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Bug #33996 (No information given for fatal error on passing invalid value to typed argument)
 --INI--
-error_reporting=4095
+error_reporting=8191
 --FILE--
 <?php
 class Foo
@@ -24,6 +24,6 @@ FooTest();
 FooTest(new Foo());
 ?>
 --EXPECTF--
-Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line 17 and defined in %sbug33996.php on line 12
+Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d
 Hi!
-Fatal error: Argument 1 passed to FooTest() must be an object of class Foo, called in %sbug33996.php on line 18 and defined in %sbug33996.php on line 7
+Catchable fatal error: Argument 1 passed to FooTest() must be an instance of Foo, none given, called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d

Zend/tests/bug34065.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Bug #34065 (throw in foreach causes memory leaks)
+--FILE--
+<?php
+$data = file(__FILE__);
+try {
+  foreach ($data as $line) {
+    throw new Exception("error");
+  }
+} catch (Exception $e) {
+  echo "ok\n";
+}
+?>
+--EXPECT--
+ok

Zend/tests/bug34617.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Bug #34617 (zend_deactivate: objects_store used after zend_objects_store_destroy is called) 
 --SKIPIF--
-<?php if (!extension_loaded("xml")) print "skip"; ?>
+<?php if (!extension_loaded("xml")) print "skip the xml extension not available"; ?>
 --FILE--
 <?php
 class Thing {}
@@ -15,4 +15,4 @@ function boom()
 boom();
 ?>
 --EXPECT--
-ok
+ok

Zend/tests/bug35106.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Bug #35106 (nested foreach fails when array variable has a reference)
+--FILE--
+<?php
+$a=array("1","2");
+$b=&$a;
+foreach($a as $i){
+    echo $i;
+    foreach($a as $p);
+}
+echo "\n";
+?>
+--EXPECT--
+12

Zend/tests/bug35634.phpt

@@ -0,0 +1,36 @@
+--TEST--
+Bug #35634 (Erroneous "Class declarations may not be nested" error raised)
+--INI--
+error_reporting=0
+--FILE--
+<?php
+if (defined("pass3")) {
+
+  class ErrorClass {
+  }
+
+} else if (defined("pass2")) {
+
+  class TestClass {
+    function __construct() {
+    }
+    function TestClass() {
+      $this->__construct();
+    }
+  }
+
+} else {
+
+  function errorHandler($errorNumber, $errorMessage, $fileName, $lineNumber) {
+    define("pass3", 1);
+    include(__FILE__);
+    die("Error: $errorMessage ($fileName:$lineNumber)\n");
+  }
+
+  set_error_handler('errorHandler');
+  define("pass2", 1);
+  include(__FILE__);
+}
+?>
+--EXPECTF--
+Error: Redefining already defined constructor for class TestClass (%sbug35634.php:12)

Zend/tests/bug36214.phpt

@@ -0,0 +1,54 @@
+--TEST--
+Bug #36214 (__get method works properly only when conditional operator is used)
+--SKIPIF--
+<?php if (!extension_loaded("spl")) die("skip SPL is no available"); ?>
+--FILE--
+<?php
+class context {
+  public $stack = array();
+
+  public function __set($name,$var) {
+    $this->stack[$name] = $var;return;
+  }
+
+  public function &__get($name) {
+    return $this->stack[$name];
+  }
+}
+
+$ctx = new context;
+$ctx->comment_preview = array();
+$ctx->comment_preview[0] = 1;
+$ctx->comment_preview[1] = 2;
+var_dump($ctx->comment_preview);
+
+$comment_preview = array();
+$comment_preview[0] = 1;
+$comment_preview[1] = 2;
+$ctx->comment_preview = $comment_preview;
+var_dump($ctx->comment_preview);
+
+$ctx->comment_preview = new ArrayObject();
+$ctx->comment_preview[0] = 1;
+$ctx->comment_preview[1] = 2;
+var_dump($ctx->comment_preview);
+?>
+--EXPECT--
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+}
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+}
+object(ArrayObject)#2 (2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+}

Zend/tests/bug36759.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Bug #36759 (Objects destructors are invoked in wrong order when script is finished)
+--FILE--
+<?php
+class Foo {
+  private $bar;
+  function __construct($bar) {
+    $this->bar = $bar;
+  }
+  function __destruct() {
+    echo __METHOD__,"\n";
+    unset($this->bar);
+  }
+}
+
+class Bar {
+  function __destruct() {
+    echo __METHOD__,"\n";
+    unset($this->bar);
+  }
+}
+$y = new Bar();
+$x = new Foo($y);
+?>
+--EXPECT--
+Foo::__destruct
+Bar::__destruct

Zend/tests/bug37144.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Bug #37144 (PHP crashes trying to assign into property of dead object)
+--FILE--
+<?php
+function foo() {
+  $x = new stdClass();
+  $x->bar = array(1);
+  return $x;
+}
+foo()->bar[1] = "123";
+foo()->bar[0]++;
+unset(foo()->bar[0]);
+echo "ok\n";
+?>
+--EXPECT--
+ok

Zend/tests/bug37212.phpt

@@ -0,0 +1,55 @@
+--TEST--
+Bug #3721 (Access to protected property of common base class)
+--FILE--
+<?php
+
+class A
+{
+    protected $value;
+
+    public function __construct($val)
+    {
+        $this->value = $val;
+    }
+
+    protected function getValue()
+    {
+        return $this->value;
+    }
+}
+
+class B extends A
+{
+    public function copyValue($obj)
+    {
+        $this->value = $obj->getValue();
+        $this->value = $obj->value; // value defined in common base class
+    }
+}
+class C extends A {}
+
+$B = new B("B");
+var_dump($B);
+$C = new C("C");
+var_dump($C);
+
+$B->copyValue($C);
+
+var_dump($B);
+
+?>
+===DONE===
+--EXPECTF--
+object(B)#%d (1) {
+  ["value:protected"]=>
+  string(1) "B"
+}
+object(C)#%d (1) {
+  ["value:protected"]=>
+  string(1) "C"
+}
+object(B)#%d (1) {
+  ["value:protected"]=>
+  string(1) "C"
+}
+===DONE===

Zend/tests/bug37632.phpt

@@ -0,0 +1,135 @@
+--TEST--
+Bug #37632 (Protected method access problem)
+--FILE--
+<?php
+
+class A1
+{
+	protected function test()
+	{
+		echo __METHOD__ . "\n";
+	}
+}
+
+class B1 extends A1
+{
+	public function doTest(A1 $obj)
+	{
+		echo __METHOD__ . "\n";
+		$obj->test();
+	}
+}
+
+class C1 extends A1
+{
+	protected function test()
+	{
+		echo __METHOD__ . "\n";
+	}
+}
+
+$b = new B1;
+$b->doTest(new C1);
+
+class A2
+{
+	static protected function test()
+	{
+		echo __METHOD__ . "\n";
+	}
+}
+
+class B2 extends A2
+{
+	static public function doTest(A2 $obj)
+	{
+		echo __METHOD__ . "\n";
+		$obj->test();
+	}
+}
+
+class C2 extends A2
+{
+	static protected function test()
+	{
+		echo __METHOD__ . "\n";
+	}
+}
+
+B2::doTest(new C2);
+
+/* Right now Ctor's cannot be made protected when defined in a ctor. That is
+ * we cannot decrease visibility.
+ *
+
+interface Ctor
+{
+	function __construct($x);
+}
+
+class A3 implements Ctor
+{
+	protected function __construct()
+	{
+		echo __METHOD__ . "\n";
+	}
+}
+
+class B3 extends A3
+{
+	static public function doTest()
+	{
+		echo __METHOD__ . "\n";
+		new C3;
+	}
+}
+
+class C3 extends A3
+{
+	protected function __construct()
+	{
+		echo __METHOD__ . "\n";
+	}
+}
+
+B3::doTest();
+
+*/
+
+class A4
+{
+	protected function __construct()
+	{
+		echo __METHOD__ . "\n";
+	}
+}
+
+class B4 extends A4
+{
+	static public function doTest()
+	{
+		echo __METHOD__ . "\n";
+		new C4;
+	}
+}
+
+class C4 extends A4
+{
+	protected function __construct()
+	{
+		echo __METHOD__ . "\n";
+	}
+}
+
+B4::doTest();
+
+?>
+===DONE===
+--EXPECTF--
+B1::doTest
+C1::test
+B2::doTest
+C2::test
+B4::doTest
+
+Fatal error: Call to protected C4::__construct() from context 'B4' in %sbug37632.php on line %d

Zend/tests/bug37667.phpt

@@ -0,0 +1,53 @@
+--TEST--
+Bug #37667 (Object is not added into array returned by __get)
+--FILE--
+<?php
+
+class Test
+{
+	protected $property = array('foo' => 'bar');
+
+	function __get($name)
+	{
+		return $this->property;
+	}
+}
+
+$obj = new Test;
+
+var_dump($obj->property['foo']);
+var_dump($obj->property[2]);
+
+var_dump($obj);
+
+$obj->property[] = 1;
+$obj->property[] = 2;
+
+var_dump($obj);
+
+?>
+===DONE===
+--EXPECTF--
+string(3) "bar"
+
+Notice: Undefined offset:  2 in %sbug37667.php on line 16
+NULL
+object(Test)#%d (1) {
+  ["property:protected"]=>
+  array(1) {
+    ["foo"]=>
+    string(3) "bar"
+  }
+}
+
+Notice: Indirect modification of overloaded property Test::$property has no effect in %sbug37667.php on line 20
+
+Notice: Indirect modification of overloaded property Test::$property has no effect in %sbug37667.php on line 21
+object(Test)#%d (1) {
+  ["property:protected"]=>
+  array(1) {
+    ["foo"]=>
+    string(3) "bar"
+  }
+}
+===DONE===

Zend/tests/bug37707.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Bug #37707 (clone without assigning leaks memory)
+--FILE--
+<?php
+class testme {
+	function __clone() {
+		echo "clonned\n";
+	}
+}
+clone new testme();
+echo "NO LEAK\n";
+?>
+--EXPECT--
+clonned
+NO LEAK
+

Zend/tests/bug37811.phpt

@@ -0,0 +1,28 @@
+--TEST--
+Bug #37811 define not using toString on objects
+--FILE--
+<?php
+
+class TestClass
+{
+	function __toString()
+	{
+		return "Foo";
+	}
+}
+
+define("Bar",new TestClass);
+var_dump(Bar);
+define("Baz",new stdClass);
+var_dump(Baz);
+
+?>
+===DONE===
+--EXPECTF--
+string(3) "Foo"
+
+Warning: Constants may only evaluate to scalar values in %sbug37811.php on line %d
+
+Notice: Use of undefined constant Baz - assumed 'Baz' in %sbug37811.php on line %d
+string(3) "Baz"
+===DONE===

Zend/tests/bug38047.phpt

@@ -0,0 +1,50 @@
+--TEST--
+Bug #38047 ("file" and "line" sometimes not set in backtrace from inside error handler)
+--FILE--
+<?php
+error_reporting(E_ALL);
+set_error_handler('kalus_error_handler');
+ini_set("display_errors", "on");
+
+class A {
+  function A_ftk($a) {
+  }
+}
+
+function kalus_error_handler($error_code, $error_string, $filename, $line, $symbols) {
+  echo "$error_string\n";
+  get_error_context();
+}
+
+function get_error_context() {
+  $backtrace = debug_backtrace();
+  $n = 1;
+  foreach ($backtrace as $call) {
+  	echo $n++." ";
+  	if (isset($call["file"])) {
+  		echo $call["file"];
+  		if (isset($call["line"])) {
+  			echo ":".$call["line"];
+  		}
+  	}
+  	if (isset($call["function"])) {
+  		echo " ".$call["function"]."()";
+  	}
+  	echo "\n";
+  }
+  echo "\n";
+}
+
+//This will not create file and line items for the call into the error handler
+$page["name"] = A::A_ftk();
+?>
+--EXPECTF--
+Non-static method A::A_ftk() should not be called statically
+1 %sbug38047.php:13 get_error_context()
+2 %sbug38047.php:36 kalus_error_handler()
+3 %sbug38047.php:36 A_ftk()
+
+Missing argument 1 for A::A_ftk(), called in %sbug38047.php on line 36 and defined
+1 %sbug38047.php:13 get_error_context()
+2 %sbug38047.php:7 kalus_error_handler()
+3 %sbug38047.php:36 A_ftk()

Zend/tests/bug38146.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Bug #38146 (Cannot use array returned from foo::__get('bar') in write context)
+--FILE--
+<?php
+class foo {
+    public function __get($member) {
+        $f = array("foo"=>"bar","bar"=>"foo");
+        return $f;
+    }
+}
+
+$f = new foo();
+foreach($f->bar as $key => $value) {
+    print "$key => $value\n";
+}
+?>
+--EXPECT--
+foo => bar
+bar => foo

Zend/tests/bug38211.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Bug #38211 (variable name and cookie name match breaks script execution)
+--FILE--
+<?php
+$test = 'test';
+unset($$test);
+echo "ok\n";
+?>
+--EXPECT--
+ok

Zend/tests/bug38220.phpt

@@ -0,0 +1,92 @@
+--TEST--
+Bug #38220 Crash on some object operations 
+--FILE--
+<?php
+class drv {
+	public $obj;
+
+	function func1() {
+		echo "func1(): {$this->obj->i}\n";
+	}
+
+	function close() {
+		echo "close(): {$this->obj->i}\n";
+	}
+}
+
+class A {
+	public $i;
+
+	function __construct($i) {
+		$this->i = $i;
+
+	}
+
+	function __call($method, $args) {
+		$drv = myserv::drv();
+
+		$drv->obj = $this;
+
+		echo "before call $method\n";
+		print_r($this);
+		call_user_func_array(array($drv, $method), $args);
+		echo "after call $method\n";
+
+		// Uncomment this line to work without crash
+//		$drv->obj = null;
+	}
+
+	function __destruct() {
+		echo "A::__destruct()\n";
+		$this->close();
+	}
+}
+
+class myserv {
+	private static $drv = null;
+
+	static function drv() {
+		if (is_null(self::$drv))
+			self::$drv = new drv;
+		return self::$drv;
+	}
+}
+
+$obj1 = new A(1);
+$obj1->func1();
+
+$obj2 = new A(2);
+unset($obj1);
+$obj2->func1();
+?>
+--EXPECT--
+before call func1
+A Object
+(
+    [i] => 1
+)
+func1(): 1
+after call func1
+A::__destruct()
+before call close
+A Object
+(
+    [i] => 1
+)
+close(): 1
+after call close
+before call func1
+A Object
+(
+    [i] => 2
+)
+func1(): 1
+after call func1
+A::__destruct()
+before call close
+A Object
+(
+    [i] => 2
+)
+close(): 2
+after call close

Zend/tests/bug38234.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Bug #38234 (Exception in __clone makes memory leak)
+--FILE--
+<?php
+class Foo {
+	function __clone() {
+		throw new Exception();
+	}
+}
+try {
+	$x = new Foo();
+	$y = clone $x;
+} catch (Exception $e) {
+}
+echo "ok\n";
+?>
+--EXPECT--
+ok

Zend/tests/bug38287.phpt

@@ -0,0 +1,45 @@
+--TEST--
+Bug #38287 (static variables mess up global vars)
+--FILE--
+<?php
+error_reporting(0);
+
+something::do_something();
+
+// $not_there is really NULL
+var_dump($not_there);
+
+// error occurs here: execution should never get inside the if condition because $not_there is NULL
+if ($not_there["invalid_var"]) {
+  // will print NULL (which is ok, but execution should never get here if the value is NULL)
+  var_dump($not_there["use_authmodule"]);
+  // will print "PATH:Array"
+  print "PATH:".$not_there["use_authmodule"]."\n";
+}
+
+class something {
+  public static function get_object() {
+    static $object=NULL;
+    if ($object===NULL)
+    $object=new something;
+    return $object;
+  }
+
+  public static function do_something() {
+    self::get_object()->vars[]=1;
+    self::get_object()->vars[]=2;
+    self::get_object()->vars[]=3;
+    var_dump(self::get_object()->vars);
+  }
+}
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+NULL

Zend/tests/bug38461.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Bug #38461 (setting private attribute with __set() produces segfault)
+--FILE--
+<?php
+
+class Operation
+{
+    function __set( $var, $value )
+    {
+        $this->$var = $value;
+    }
+}
+
+class ExtOperation extends Operation
+{
+    private $x;
+}
+
+$op = new ExtOperation;
+$op->x = 'test';
+
+echo "Done\n";
+?>
+--EXPECT--	
+Done

Zend/tests/bug38623.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Bug #38623 (leaks in a tricky code with switch() and exceptions)
+--FILE--
+<?php
+try {
+	switch(strtolower("apache")) {
+    	case "apache":
+        	throw new Exception("test");
+	        break;
+	}
+} catch (Exception $e) {
+    echo "ok\n";
+}
+?>
+--EXPECT--
+ok

Zend/tests/bug38624.phpt

@@ -0,0 +1,34 @@
+--TEST--
+Bug #38624 (Strange warning when incrementing an object property and exception is thrown from __get method)
+--FILE--
+<?php
+
+class impl
+{
+    public function __construct()
+    {
+       $this->counter++;
+    }
+    public function __set( $name, $value )
+    {
+        throw new Exception( "doesn't work" );
+    }
+
+    public function __get( $name )
+    {
+        throw new Exception( "doesn't work" );
+    }
+
+}
+
+$impl = new impl();
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Fatal error: Uncaught exception 'Exception' with message 'doesn't work' in %s:%d
+Stack trace:
+#0 %s(%d): impl->__get('counter')
+#1 %s(%d): impl->__construct()
+#2 {main}
+  thrown in %s on line %d

Zend/tests/bug38772.phpt

@@ -0,0 +1,42 @@
+--TEST--
+Bug #38772 (inconsistent overriding of methods in different visibility contexts)
+--FILE--
+<?php
+class A {
+	
+	public function __construct() {
+		$this -> foo();
+	}
+	
+	private function foo() {
+		echo __METHOD__ . "\r\n";
+	}
+}
+
+class B extends A {
+	public function foo() {
+		echo __METHOD__ . "\r\n";
+	}
+}
+
+class C extends A {	
+	protected function foo() {
+		echo __METHOD__ . "\r\n";
+	}
+}
+
+class D extends A {
+        private function foo() {
+                echo __METHOD__ . "\r\n";
+        }
+}
+
+$a = new A();
+$b = new B();
+$c = new C();
+$d = new D();
+--EXPECT--
+A::foo
+A::foo
+A::foo
+A::foo

Zend/tests/bug38779.phpt

@@ -0,0 +1,29 @@
+--TEST--
+Bug #38779 (engine crashes when require()'ing file with syntax error through userspace stream wrapper)
+--FILE--
+<?php
+
+class Loader {
+	private $position;
+	private $data;
+	public function stream_open($path, $mode, $options, &$opened_path)  {
+		$this->data = '<' . "?php \n\"\";ll l\n ?" . '>';
+		$this->position = 0;
+		return true;
+	}
+	function stream_read($count) {
+		$ret = substr($this->data, $this->position, $count);
+		$this->position += strlen($ret);
+		return $ret;
+	}
+	function stream_eof() {
+		return $this->position >= strlen($this->data);
+	}
+}
+stream_wrapper_register('Loader', 'Loader');
+require 'Loader://qqq.php';
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Parse error: %s error%sin Loader://qqq.php on line %d

Zend/tests/bug38779_1.phpt

@@ -0,0 +1,45 @@
+--TEST--
+Bug #38779 (engine crashes when require()'ing file with syntax error through userspace stream wrapper)
+--FILE--
+<?php
+
+class Loader {
+	private $position;
+	private $data;
+	public function stream_open($path, $mode, $options, &$opened_path)  {
+		$this->data = '<' . "?php \n\"\";ll l\n ?" . '>';
+		$this->position = 0;
+		return true;
+	}
+	function stream_read($count) {
+		$ret = substr($this->data, $this->position, $count);
+		$this->position += strlen($ret);
+		return $ret;
+	}
+	function stream_eof() {
+		return $this->position >= strlen($this->data);
+	}
+	function stream_flush() {
+		@unlink(dirname(__FILE__)."/bug38779.txt");
+		var_dump("flush!");
+	}
+	function stream_close() {
+		var_dump("close!");
+	}
+}
+stream_wrapper_register('Loader', 'Loader');
+$fp = fopen ('Loader://qqq.php', 'r');
+
+$filename = dirname(__FILE__)."/bug38779.txt";
+$fp1 = fopen($filename, "w");
+fwrite($fp1, "<"."?php blah blah?".">");
+fclose($fp1);
+
+include $filename;
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Parse error: %s error%sin %s on line %d
+string(6) "flush!"
+string(6) "close!"

Zend/tests/bug38808.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Bug #38808 ("maybe ref" issue for current() and others)
+--FILE--
+<?php
+$current = "current";
+$next = "next";
+
+$b = array(1=>'one', 2=>'two');
+$a =& $b;
+
+echo $current($a)."\n";
+$next($a);
+echo $current($a)."\n";
+?>
+--EXPECT--
+one
+two

Zend/tests/bug38942.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Bug #38942 (Double old-style-ctor inheritance)
+--FILE--
+<?php
+class foo {
+    public function foo() {}
+}
+
+class bar extends foo {
+}
+print_r(get_class_methods("bar"));
+?>
+--EXPECT--
+Array
+(
+    [0] => foo
+)

Zend/tests/bug39003.phpt

@@ -0,0 +1,24 @@
+--TEST--
+Bug #39003 (__autoload() is called for type hinting)
+--FILE--
+<?php
+
+class ClassName
+{
+	public $var = 'bla';
+}
+
+function test (OtherClassName $object) { }
+
+function __autoload($class)
+{
+    var_dump("__autload($class)");
+}
+
+$obj = new ClassName;
+test($obj);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Catchable fatal error: Argument 1 passed to test() must be an instance of OtherClassName, instance of ClassName given, called in %s on line %d and defined in %s on line %d

Zend/tests/bug39017.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Bug #39017 (foreach(($obj = new myClass) as $v); echo $obj; segfaults)
+--FILE--
+<?php
+class A {}
+foreach(($a=(object)new A()) as $v);
+var_dump($a); // UNKNOWN:0
+?>
+--EXPECTF--
+object(A)#%d (0) {
+}

Zend/tests/bug39036.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Bug #39036 (Unsetting key of foreach() yields segmentation fault)
+--FILE--
+<?php
+
+$key = 'asdf';
+
+foreach (get_defined_vars() as $key => $value) {
+	unset($$key);
+}
+
+var_dump($key);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Notice: Undefined variable: key in %s on line %d
+NULL
+Done

Zend/tests/bug39297.phpt

@@ -0,0 +1,45 @@
+--TEST--
+Bug #39297 (Memory corryption because of indirect modification of overloaded array)
+--FILE--
+<?php
+function compareByRef(&$first, &$second) {
+    return $first === $second;
+}
+
+class MyTree implements ArrayAccess {
+    public $parent;
+    public $children = array();
+
+    public function offsetExists($offset) {
+    }
+
+    public function offsetUnset($offset) {
+    }
+
+    public function offsetSet($offset, $value) {
+    	echo "offsetSet()\n";
+        $cannonicalName = strtolower($offset);
+        $this->children[$cannonicalName] = $value;
+        $value->parent = $this;
+    }    
+    
+    public function offsetGet($offset) {
+    	echo "offsetGet()\n";
+        $cannonicalName = strtolower($offset);
+        return $this->children[$cannonicalName];
+    }
+
+}
+
+$id = 'Test';
+
+$root = new MyTree();
+$child = new MyTree();
+$root[$id] = $child;
+
+var_dump(compareByRef($root[$id], $child));
+?>
+--EXPECT--
+offsetSet()
+offsetGet()
+bool(true)

Zend/tests/bug39304.phpt

@@ -0,0 +1,9 @@
+--TEST--
+Bug #39304 (Segmentation fault with list unpacking of string offset)
+--FILE--
+<?php 
+  $s = "";
+  list($a, $b) = $s[0];
+?>
+--EXPECTF--
+Fatal error: Cannot use string offset as an array in %sbug39304.php on line 3

Zend/tests/bug39438.phpt

@@ -0,0 +1,45 @@
+--TEST--
+Bug #39438 (Fatal error: Out of memory)
+--INI--
+memory_limit=16M
+--FILE--
+<?php
+$i=0;
+$test2=array(
+   'a1_teasermenu' => array(
+   		'downloadcounter' => 2777,
+        'versions' => array(
+        	'0.1.0' => array (
+        		'title' => 'A1 Teasermenu',
+        	    'description' => 'Displays a teaser for advanced subpages or a selection of advanced pages',
+        	    'state' => 'stable',
+        	    'reviewstate' => 0,
+        	    'category' => 'plugin',
+        	    'downloadcounter' => 2787,
+        	    'lastuploaddate' => 1088427240,
+        	    'dependencies' => array (
+        	          'depends' => array(
+        	                  'typo3' =>'', 
+        	                  'php' =>'', 
+        	                  'cms' => ''
+        	           ),        	
+        	          'conflicts' => array('' =>'')        	
+        	    ),        	
+        	  	'authorname' => 'Mirko Balluff',
+        	  	'authoremail' => 'balluff@amt1.de',
+        	  	'ownerusername' => 'amt1',
+        	  	't3xfilemd5' => '3a4ec198b6ea8d0bc2d69d9b7400398f',
+      		)
+  		)
+  	)
+);
+$test=array();
+while($i<1200) {	
+	$test[]=$test2;
+	$i++;
+}
+$out=serialize($test);
+echo "ok\n";
+?>
+--EXPECT--
+ok

Zend/tests/bug39445.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Bug #39445 (Calling debug_backtrace() in the __toString() function produces a crash)
+--FILE--
+<?php
+class test {
+	public function __toString() {
+		debug_backtrace();
+		return 'lowercase';
+	}
+}
+
+	$test = new test();
+	echo strtoupper($test);
+?>
+--EXPECT--
+LOWERCASE

Zend/tests/bug39449.phpt

@@ -0,0 +1,40 @@
+--TEST--
+Bug #39449 (Overloaded array properties do not work correctly)
+--FILE--
+<?php
+class A {
+  private $keys = array();
+  public function & __get($val) {
+    return $this->keys[$val];
+  }
+  public function __set($k, $v) {
+    $this->keys[$k] = $v;
+  }
+}
+
+$a =new A();
+$a->arr = array('a','b','c');
+
+$b = &$a->arr;
+$b[]= 'd';
+
+foreach ($a->arr as $k => $v) {
+  echo "$k => $v\n";
+}
+
+$a->arr[]='d';
+
+foreach ($a->arr as $k => $v) {
+  echo "$k => $v\n";
+}
+?>
+--EXPECT--
+0 => a
+1 => b
+2 => c
+3 => d
+0 => a
+1 => b
+2 => c
+3 => d
+4 => d

Zend/tests/bug39602.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Bug #39602 (Invalid session.save_handler crashes PHP)
+--SKIPIF--
+<?php if (!extension_loaded("session")) die("skip"); ?>
+--INI--
+session.save_handler=qwerty
+--FILE--
+<?php
+ini_set("session.save_handler","files");
+$x = new stdClass();
+echo "ok";
+?>
+--EXPECT--
+ok
+Fatal error: Unknown: Cannot find save handler qwerty in Unknown on line 0

Zend/tests/bug39721.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Bug #39721 (Runtime inheritance causes data corruption)
+--FILE--
+<?php
+class test2 {
+	private static $instances = 0;
+	public $instance;
+	
+	public function __construct() {
+		$this->instance = ++self::$instances;
+	}
+	 
+}
+
+$foo = new test2();
+
+if (is_object($foo)) {
+	class test2_child extends test2 {
+	 
+	}
+}
+
+$child = new test2_child();
+
+echo $foo->instance . "\n";
+echo $child->instance . "\n";
+?>
+--EXPECT--
+1
+2

Zend/tests/bug39775.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Bug #39775 ("Indirect modification ..." message is not shown)
+--FILE--
+<?php
+class test {
+	var $array = array();
+	function __get($var) {
+		$v =& $this->array;
+		return $this->array;
+	}
+}
+$t = new test;
+$t->anything[] = 'bar';
+print_r($t->anything);
+?>
+--EXPECTF--
+Notice: Indirect modification of overloaded property test::$anything has no effect in %sbug39775.php on line 10
+Array
+(
+)

Zend/tests/bug39825.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug #39825 (foreach produces memory error)
+--FILE--
+<?php 
+$array = array(1 => 2, "foo" => "bar");
+$obj = (object)$array;
+foreach ($obj as $name => $value)  {
+	echo "$name -> $value\n";
+}
+?>
+--EXPECT--
+1 -> 2
+foo -> bar

Zend/tests/bug39944.phpt

@@ -0,0 +1,88 @@
+--TEST--
+Bug #39944 (References broken)
+--FILE--
+<?php
+$intTheValue = 0;
+
+function &getValue() {
+    global $intTheValue;
+    return $intTheValue;
+}
+
+function setValue(&$int, $iNewValue) {
+    $int = $iNewValue;
+}
+
+setValue(getValue(), 10);
+echo "intTheValue = {$intTheValue}\n";
+
+$b = &$intTheValue;
+
+setValue(getValue(), 10);
+echo "intTheValue = {$intTheValue}\n";
+
+/****/
+
+$arrTheArray = array();
+
+function &getArray() {
+	global $arrTheArray;
+	return $arrTheArray;
+}
+
+function addToArray(&$arr, $strToAdd) {
+	$arr[] = $strToAdd;
+}
+
+addToArray(getArray(), "xx1");
+$a = getArray();	
+addToArray($a, "xx2");
+$b = &$arrTheArray;
+addToArray($b, "xx3");
+addToArray(getArray(), "xx4");
+$a = getArray();	
+addToArray($a, "xx5");
+echo "arrTheArray = " . print_r($arrTheArray, 1);
+
+/****/
+
+class RefTest {
+	protected $arr;
+
+	function Add($strToAdd) {
+		$this->addToArray($this->getArray(), $strToAdd);
+	}	
+
+	function &getArray() {
+		if (!$this->arr)
+			$this->arr = array();
+		return $this->arr;
+	}
+
+	private function addToArray(&$arr, $strToAdd) {
+		$arr[] = $strToAdd;
+	}
+}
+
+$objRefTest = new RefTest();
+$objRefTest->Add("xx1");
+$objRefTest->Add("xx2");
+$objRefTest->Add("xx3");
+
+echo "objRefTest->getArray() = " . print_r($objRefTest->getArray(), 1);
+?>
+--EXPECT--
+intTheValue = 10
+intTheValue = 10
+arrTheArray = Array
+(
+    [0] => xx1
+    [1] => xx3
+    [2] => xx4
+)
+objRefTest->getArray() = Array
+(
+    [0] => xx1
+    [1] => xx2
+    [2] => xx3
+)

Zend/tests/bug39990.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Bug #39990 (Cannot "foreach" over overloaded properties)
+--FILE--
+<?php
+  class Foo {
+    public function __get($name) {
+      return array('Hello', 'World');    
+    }
+  }
+  
+  $obj=new Foo();
+  foreach($obj->arr as $value)
+    echo "$value\n";
+?>
+--EXPECT--
+Hello
+World

Zend/tests/catch_002.phpt

@@ -0,0 +1,33 @@
+--TEST--
+Catching an exception in a constructor
+--FILE--
+<?php
+
+class MyObject
+{
+	function __construct()
+	{
+		throw new Exception();
+		echo __METHOD__ . "() Must not be reached\n";
+	}
+
+	function __destruct()
+	{
+		echo __METHOD__ . "() Must not be called\n";
+	}
+}
+
+try
+{
+	new MyObject();
+}
+catch(Exception $e)
+{
+	echo "Caught\n";
+}
+
+?>
+===DONE===
+--EXPECT--
+Caught
+===DONE===

Zend/tests/catch_003.phpt

@@ -0,0 +1,38 @@
+--TEST--
+Catching an exception in a constructor fired form a static method
+--FILE--
+<?php
+
+class MyObject
+{
+	function fail()
+	{
+		throw new Exception();
+	}
+
+	function __construct()
+	{
+		self::fail();
+		echo __METHOD__ . "() Must not be reached\n";
+	}
+
+	function __destruct()
+	{
+		echo __METHOD__ . "() Must not be called\n";
+	}
+}
+
+try
+{
+	new MyObject();
+}
+catch(Exception $e)
+{
+	echo "Caught\n";
+}
+
+?>
+===DONE===
+--EXPECT--
+Caught
+===DONE===