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

2026-11-12 11:40:50 +00:00 · 2003-12-21 18:30:32 +00:00
3328 changed files with 119071 additions and 441541 deletions
@@ -273,18 +273,6 @@ document printzops
 	dump operands of the current opline
 end

-define zbacktrace
-	____executor_globals
-	dump_bt $eg.current_execute_data
-end
-
-document zbacktrace
-	prints backtrace.
-	This command is almost a short cut for
-	> (gdb) ____executor_globals
-	> (gdb) dump_bt $eg.current_execute_data
-end
-
 define zmemcheck
 	set $p = alloc_globals.head
 	set $stat = "?"
@@ -357,3 +345,4 @@ document zmemcheck
 	usage: zmemcheck [ptr].
 	if ptr is 0, all blocks will be listed.
 end
+
@@ -133,22 +133,7 @@ Naming Conventions
 [5] Variable names should be in lowercase.  Use underscores to separate
    between words.

-[6] Method names follow the 'studlyCaps' (also referred to as 'bumpy case'
-    or 'camel caps') naming convention, with care taken to minimize the
-    letter count. The initial letter of the name is lowercase, and each
-    letter that starts a new 'word' is capitalized.
-
-    Good:
-    'connect()'
-    'getData()'
-    'buildSomeWidget()'
-
-    Bad:
-    'get_Data()'
-    'buildsomewidget'
-    'getI()'
-
-[7] Classes should be given descriptive names. Avoid using abbreviations
+[6] Classes should be given descriptive names. Avoid using abbreviations
    where possible. Each word in the class name should start with a capital
    letter, with words underscore delimited. The class name should be prefixed
    with the name of the 'parent set'.
@@ -183,7 +168,7 @@ Syntax and indentation
    indentation and comment styles and up to function declaration
    syntax.

-    (see also http://www.catb.org/~esr/jargon/html/I/indent-style.html)
+    (see also http://www.tuxedo.org/~esr/jargon/html/entry/indent-style.html)
    
 [3] Be generous with whitespace and braces.  Always prefer:

@@ -204,10 +189,6 @@ Syntax and indentation
    four spaces.  It is important to maintain consistency in indenture so
    that definitions, comments, and control structures line up correctly.

-[5] Preprocessor statements (#if and such) MUST start at column one. To
-    indent preprocessor directives you should put the # at the beginning
-    of a line, followed by any number of whitespace.
-
 Documentation and Folding Hooks
 -------------------------------

@@ -26,6 +26,11 @@ Status legend

 == Server APIs ==

+-------------------------------------------------------------------------------
+EXTENSION:           activescript
+PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>
+MAINTENANCE:         Odd Fixes
+STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           aolserver
 MAINTENANCE:         Unknown
@@ -36,20 +41,15 @@ PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           apache2handler / apache2filter
+PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
+-------------------------------------------------------------------------------
 EXTENSION:           apache_hooks
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           apache2filter
-PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
-------------------------------------------------------------------------------
-EXTENSION:           apache2handler
-PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
-------------------------------------------------------------------------------
 EXTENSION:           caudium
 MAINTENANCE:         Unknown
 STATUS:              Unknown
@@ -63,16 +63,6 @@ MAINTENANCE:         Marcus Boerger <helly@php.net>, Edin Kadribasic <edink@php.
 STATUS:              Working
 SINCE:               4.3.0
 -------------------------------------------------------------------------------
-EXTENSION:           continuity
-PRIMARY MAINTAINER:  Alex Leigh <aleigh@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           date
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
 EXTENSION:           embed
 PRIMARY MAINTAINER:  Edin Kadribasic <edink@php.net>
 MAINTENANCE:         Maintained
@@ -129,7 +119,8 @@ STATUS:              Working
 COMMENT:             DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini
 -------------------------------------------------------------------------------
 EXTENSION:           dbase
-MAINTENANCE:         Orphaned
+PRIMARY MAINTAINER:  Jim Winstead <jimw@php.net>
+MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           dbx
@@ -139,8 +130,12 @@ STATUS:              Working
 SINCE:               4.0.6
 COMMENT:             DB abstraction for odbc, mysql, pgsql, mssql, fbsql and more, see documentation
 -------------------------------------------------------------------------------
-EXTENSION:           fbsql
-PRIMARY MAINTAINER:  Frank M. Kromann <fmk@swwwing.com>
+EXTENSION:           filepro
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           hwapi
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
@@ -181,26 +176,6 @@ MAINTENANCE:         Maintained
 STATUS:              Experimental
 SINCE:               5.0
 -------------------------------------------------------------------------------
-EXTENSION:           oci8
-PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           odbc
-PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-COMMENT:             Working 
-------------------------------------------------------------------------------
-EXTENSION:           oracle
-MAINTENANCE:         Orphaned
-STATUS:              Working
-COMMENT:             Using the new OCI8 driver is encouraged where possible.
-------------------------------------------------------------------------------
-EXTENSION:           ovrimos
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           pgsql
 PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Yasuo Ohgaki <yohgaki@php.net>
 MAINTENANCE:         Maintained
@@ -222,6 +197,21 @@ EXTENSION:           sybase_ct
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           oci8
+MAINTENANCE:         Orphaned
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           odbc
+PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+COMMENT:             Working 
+-------------------------------------------------------------------------------
+EXTENSION:           oracle
+MAINTENANCE:         Orphaned
+STATUS:              Working
+COMMENT:             Using the new OCI8 driver is encouraged where possible.
+-------------------------------------------------------------------------------


 == XML extensions ==
@@ -230,19 +220,14 @@ STATUS:              Working
 EXTENSION:           dom
 PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>, Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           simplexml
 PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.0
-------------------------------------------------------------------------------
-EXTENSION:           soap
-PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>
-MAINTENANCE:         Maintained
 STATUS:              Experimental
+SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           wddx
 PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
@@ -262,7 +247,7 @@ STATUS:              Experimental
 EXTENSION:           xsl
 PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Experimental
 SINCE:               5.0
 -------------------------------------------------------------------------------

@@ -280,6 +265,11 @@ MAINTENANCE:         Odd Fixes
 STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
+EXTENSION:           dio
+MAINTENANCE:         Orphaned
+STATUS:              Working
+SINCE:               4.0.6
+-------------------------------------------------------------------------------
 EXTENSION:           calendar
 PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
 MAINTENANCE:         Odd Fixes
@@ -313,20 +303,11 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.2
 -------------------------------------------------------------------------------
-EXTENSION:           fam
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           fdf
 PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           filepro
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           ftp
 PRIMARY MAINTAINER:  Stefan Esser (sesser@php.net)
 MAINTENANCE:         Maintained
@@ -346,11 +327,6 @@ MAINTENANCE:         Unknown
 STATUS:              Unknown
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
-EXTENSION:           hwapi
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           iconv
 PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net>
 MAINTENANCE:         Maintained
@@ -361,11 +337,6 @@ PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>
 MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           ircg
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           ldap
 PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>
 MAINTENANCE:         Maintained
@@ -381,63 +352,33 @@ PRIMARY MAINTAINER:  Derick Rethans <derick@derickrethans.nl>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           mcve
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           mhash
 PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           mime_magic
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Deprecated
-STATUS:              Experimental
-COMMENT:             Use PECL's fileinfo extension instead
-------------------------------------------------------------------------------
-EXTENSION:           ming
-PRIMARY MAINTAINER:  Frank M. Kromann
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-------------------------------------------------------------------------------
-EXTENSION:           mnogosearch
-PRIMARY MAINTAINER:  Sergey Kartashoff <gluke@mail.ru>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           mono
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           msession
-PRIMARY MAINTAINER   Mark L. Woodward <mlwmohawk@mohawksoft.com>
+PRIMARY MAINTAINER   Mark L. Woodward mlwmohawk@mohawksoft.com
 MAINTENANCE:         Maintained
 STATUS:              Working/Experimental
 COMMENT:             Tested on Linux, should work on other UNIX platforms. Backend server code can compile under Windows.
 -------------------------------------------------------------------------------
-EXTENSION:           ncurses
-PRIMARY MAINTAINER   Ilia Alshanetsky <iliaa@php.net>, Wez Furlong <wez@php.net>, Hartmut Holzgraefe <hholzgra@php.net>, Georg Richter <georg@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-------------------------------------------------------------------------------
 EXTENSION:           openssl
 PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Experimental
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
-EXTENSION:           pcntl
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-------------------------------------------------------------------------------
 EXTENSION:           pcre
 PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           pdf
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           pfpro
 PRIMARY MAINTAINER:  David Croft <david@infotrek.co.uk>
 MAINTENANCE:         Maintained
@@ -486,12 +427,6 @@ MAINTENANCE:         Maintained
 STATUS:              Experimental
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
-EXTENSION:           spl
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.0.0
-------------------------------------------------------------------------------
 EXTENSION:           sysvmsg
 MAINTENANCE:         Unknown
 STATUS:              Unknown
@@ -504,22 +439,16 @@ EXTENSION:           sysvshm
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           tidy
-PRIMARY MAINTAINER:  John Coggeshall <john@php.net>, Ilia Alshanetsky <iliaa@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           tokenizer
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           yaz
 PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
 MAINTENANCE:         Maintained
 STATUS:              Unknown
 SINCE:               4.0.1
 -------------------------------------------------------------------------------
+EXTENSION:           yp
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
 EXTENSION:           zlib
 PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de>
 MAINTENANCE:         Maintained
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                  The PHP License, Version 3.0
-Copyright (c) 1999 - 2005 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2003 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -5,8 +5,6 @@ INSTALL_DATA = $(INSTALL) -m 644
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)

-CORE_HEADERS = Zend/ TSRM/ include/ main/ main/streams/ regex/ ext/standard/
-INSTALL_HEADERS = $(CORE_HEADERS) $(INSTALL_EXT_HEADERS)

 all: $(all_targets) 
 	@echo
@@ -57,7 +55,7 @@ test:
 		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
-			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi
@@ -71,7 +69,7 @@ clean:

 distclean: clean
 	rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp5.module buildmk.stamp
-	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
+	egrep define'.*include/php' configure|sed 's/.*>//'|xargs rm -f
 	find . -name Makefile | xargs rm -f

 .PHONY: all clean install distclean test
@@ -29,14 +29,7 @@ Having said that, here are the organizational rules:
   5. If you don't know how to do something, ask first!

   6. Test your changes before committing them. We mean it. Really.
-
-Currently we have the following branches in use:
-HEAD     Will become PHP 5.1. This CVS branch is for active development.
-PHP_5_0  Is used to release the PHP 5.0.x series. Only minor feature
-		 enhancements may go in here, but please keep that as infrequent as
-		 possible.
-PHP_4_3  Is used to release the PHP 4.3.x series. Only bugfixes are permitted
-         on this branch.
+	

 The next few rules are more of a technical nature.

@@ -44,11 +37,8 @@ The next few rules are more of a technical nature.
      messages every day. Woe be to those who attempt to mess with it.

   2. All news updates intended for public viewing, such as new features,
-      bug fixes, improvements, etc., should go into the NEWS file. 
-	  
-      NB! Lines, starting with @ will go automagically into NEWS file, but
-      this is NOT recommended, though. Please, add news entries directly to 
-      NEWS file and don't forget to keep them adjusted and sorted.
+      bug fixes, improvements, etc., should go into the NEWS file. Also see
+      the note below about automatically updating NEWS in your commit message.

   3. Do not commit multiple file and dump all messages in one commit. If you
      modified several unrelated files, commit each group separately and
@@ -68,29 +58,37 @@ The next few rules are more of a technical nature.

 The format of the commit messages is pretty simple.

-Use a - to start a new item in your commit message.
-
 If a line begins with #, it is taken to be a comment and will not appear
-in the ChangeLog. Everything else goes into the ChangeLog.
+in the ChangeLog.  If the line begins with @, it will be redirected to the
+NEWS file. Everything else goes into the ChangeLog.

 It is important to note that if your comment or news logline spans multiple
-lines, you have to put # at the beginning of _every_ such line. 
+lines, you have to put # or @ at the beginning of _every_ such line. Every 
+entry in NEWS has to have a name after it, so if you did it with someone's 
+help, put both your names there. Your name WILL NOT be automatically put
+at the end of the NEWS entry - so, please provide it yourself.

-Example. Say you modified two files, datetime.c and string.c. In datetime.c you
-added a new format option for the date() function, and in string.c you fixed a
-memory leak in php_trim(). Don't commit both of these at once. Commit them
+Example. Say you modified two files, datetime.c and string.c. In datetime.c
+you added a new format option for date() function, and in string.c you fixed
+a memory leak in php_trim(). Don't commit both of these at once. Commit them
 separately and try to make sure your commit messages look something like the
 following.

 For datetime.c:
- Added new 'K' format modifier to date() for printing out number of days until
-  New Year's Eve.
+
+(PHP date) Added new 'K' format modifier for printing out number of
+           days until New Year's Eve.
+@- Added new 'K' format modifier that will output the number of days
+@  until New Year's Eve. (Bob)

 For string.c:
- Fixed a memory leak in php_trim() resulting from improper use of zval_dtor().
-#- Man, that thing was leaking all over the place!
+(php_trim) Fixed a memory leak resulting from improper use of zval_dtor().
+# Man, that thing was leaking all over the place!
+@- Fixed memory leak in trim(). (Bob)

-The # lines will be omitted from the ChangeLog automagically.
+The lines above marked with @ will go into NEWS file automagically, and the
+# lines will be omitted from the ChangeLog. Alternatively, you might want
+to modify NEWS file directly and not use the @ lines.

 If you fix some bugs, you should note the bug ID numbers in your
 commit message. Bug ID should be prefixed by "#" for easier access to
@@ -98,11 +96,13 @@ bug report when developers are browsing CVS via. LXR or Bonsai.

 Example:

-Fixed bug #14016 (pgsql notice handler double free crash bug.)
+Fixed pgsql notice handler double free crash bug. Bug #14016
+@ Fixed pgsql notice handler double free crash bug. Bug #14016

-If you don't see your messages in ChangeLog right away, don't worry!
+If you don't see your messages in ChangeLog and NEWS right away, don't worry!
 These files are updated once a day, so your stuff will not show up until
-somewhat later. 
+somewhat later. Don't go adding stuff to NEWS by hand if you already put @
+lines in the commit message.

 You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
 to look at PHP CVS repository in various ways.
@@ -1,5 +1,5 @@
-1. strrpos() and strripos() now use the entire string as a needle.  Be aware
-   that the existing scripts may no longer work as you expect.
+1. strrpos() and strripos() now use the entire string as a needle.
+   Be aware that the existing scripts may no longer work as you expect.

   EX :
   <?php
@@ -34,122 +34,8 @@
    - mysqli_fetch_assoc()

 5. PATH_TRANSLATED server variable is no longer set implicitly under
-   Apache2 SAPI in contrast to the situation in PHP 4, where it is set to the
+   Apache2 SAPI in contrast to the situation in PHP4, where it is set to the
   same value as the SCRIPT_FILENAME server variable when it is not populated
   by Apache.  This change was made to comply with the CGI specification.
   Please refer to bug #23610 for further information.

-6. Starting PHP 5.0.0 the T_ML_CONSTANT constant is no longer defined by the
-   ext/tokenizer extension. If error_reporting is set to E_ALL notices will
-   be produced. Instead of T_ML_CONSTANT for /* */ the T_COMMENT constant 
-   is used, thus both // and /* */ are resolved as the T_COMMENT constant.
-   However the PHPDoc style comments /** */ ,which starting PHP 5 are parsed
-   by PHP, are recongnized as T_DOC_COMMENT.
-
-7. $_SERVER should be populated with argc and argv if variables_order
-   includes "S".  If you have specifically configured your system to not
-   create $_SERVER, then of course it shouldn't be there.  The change was to
-   always make argc and argv available in the CLI version regardless of the
-   variables_order setting.  As in, the CLI version will now always populate
-   the global $argc and $argv variables.
-
-8. In some cases classes must be declared before used. It only happens only
-   if some of the new features of PHP 5 are used. Otherwise the behaviour is
-   the old.
-   Example 1 (works with no errors):
-   <?php
-   $a = new a();
-   class a {
-   }
-   ?>
- 
-   Example 2 (throws an error):
-   <?php 
-   $a = new a();
-   interface b{
-   }
-   class a implements b {
-   } 
-   ?>
-
-   Output (example 2) :
-   Fatal error: Class 'a' not found in /tmp/cl.php on line 2
-
-9. get_class() starting PHP 5 returns the name of the class as it was
-   declared which may lead to problems in older scripts that rely on
-   the previous behaviour - the class name is lowercased. Expect the
-   same behaviour from get_parent_class() when applicable.
-   Example :
-   <?php
-   class FooBar {
-   }
-   class ExtFooBar extends FooBar{}
-   $a = new FooBar();
-   var_dump(get_class($a), get_parent_class($a));
-   ?>
-
-   Output (PHP 4):
-   string(6) "foobar"
-   string(9) "extfoobar"
-
-   Output (PHP 5):
-   string(6) "FooBar"
-   string(9) "ExtFooBar"
-   ----------------------------------------------------------------------
-   Example code that will break :
-   //....
-   function someMethod($p) {
-     if (get_class($p) != 'helpingclass') {
-       return FALSE;
-     }
-     //...
-   }
-   //...
-   Possible solution is to search for get_class() and get_parent_class() in
-   all your scripts and use strtolower().
-
-10. get_class_methods() returns the names of the methods of a class as they
-   declared. In PHP4 the names are all lowercased.
-   Example code :
-   <?php
-   class Foo{
-     function doFoo(){}
-     function hasFoo(){}
-   }
-   var_dump(get_class_methods("Foo")); 
-   ?>
-   Output (PHP4):
-   array(2) {
-     [0]=>
-     string(5) "dofoo"
-     [1]=>
-     string(6) "hasfoo"
-   }
-   Output (PHP5):
-   array(2) {
-     [0]=>
-     string(5) "doFoo"
-     [1]=>
-     string(6) "hasFoo"
-   }
-
-11. Assignment $this is impossible. Starting PHP 5.0.0 $this has special
-    meaning in class methods and is recognized by the PHP parser. The latter
-    will generate a parse error when assignment to $this is found
-    Example code :
-    <?php
-    class Foo {
-      function assignNew($obj) {
-        $this = $obj;
-      }
-    }
-    $a = new Foo();
-    $b = new Foo();
-    $a->assignNew($b);
-    echo "I was executed\n";
-    ?>
-    Output (PHP 4):
-    I was executed
-    Output (PHP 5):
-    PHP Fatal error:  Cannot re-assign $this in /tmp/this_ex.php on line 4
-
@@ -90,7 +90,7 @@ Please add the prefix "[PATCH]" to your email subject and make sure
 to include the patch as a MIME attachment even if it is short. 

 NOTE: only MIME attachments of type 'text/*' are accepted. The
-      easiest way to accomplish this, is to make the extension
+      easiest way to acclomplish this, is to make the extension
      '.txt'.

 Test scripts should be included in the same email.
@@ -100,7 +100,7 @@ Finally, add the bug Id(s) which can be closed by your patch, if any.


 What happens after you submit your patch
---------------------------------------- 
+-------------------------------------- 
 If your patch is easy to review and has obviously no side-effects,
 it might take up to a few hours until someone commits it.

@@ -1,20 +1,11 @@
 [IMPORTANT NOTICE]
 ------------------
- Failed tests usualy indicate a problem with your local system setup
-and not within PHP itself (at least for official PHP release versions).
-You may decide to automaticaly submit a test summary to our QA workflow
-at the end of a test run.
- Please do *not* submit a failed test as a bug or ask for help on why
-it failed on your system without providing substantial backup information
-on *why* the test failed on your special setup. Thank you :-)
+ Please do not ask developers why some or all tests are failing in
+your environment! Let us know if you find why it fails. Thank you.


 [Testing Basics] 
 ----------------
- The easiest way to test your PHP build is to run "make test" from the
-command line after successfully compiling. This will run the complete
-tests for all enabled functionalities and extensions using the PHP
-CLI binary.
 To execute test scripts, you must build PHP with some SAPI, then you
 type "make test" to execute all or some test scripts saved under
 "tests" directory under source root directory.
@@ -2,8 +2,11 @@ The Win32 Build System.
 $Id$
 Wez Furlong <wez@thebrainroom.com>

-If you need help with the build system, send mail to
-internals@lists.php.net; please don't email me directly.
+NB: Please don't mail me asking for help on this, unless
+you are a Core PHP developer, or you are prepared to donate
+some money via paypal or buy me something from my wishlist.
+http://pecl.php.net/user/wez
+Thanks :-)

 ===========================================================
 Contents:
@@ -15,7 +18,6 @@ Contents:
 e. Building
 f. Cleaning up
 g. Running the test suite
- h. snapshot building
 
 2. How to write config.w32 files
 x. to be written.
@@ -26,8 +28,9 @@ a. Requirements

 You need:
  - Windows Scripting Host (cscript.exe)
-  - Microsoft Build Tools from:
+  - Microsoft Build Tools from either:
     Microsoft Visual Studio (VC6) or later
+  Microsoft Platform SDK
 
 You also need:
  - bindlib_w32 [http://www.php.net/extra/bindlib_w32.zip]
@@ -156,19 +159,5 @@ g. Running the test suite
 sqlite test suite only, you would type
 "nmake /D TESTS=ext/sqlite/tests test"

-h. Snapshot Building
-
- If you want to set up an automated build that will tolerate
- breakages in some of the modules, you can use the
- --enable-snapshot-build configure option to generate a
- makefile optimized for that purpose.  A snapshot build will
- switch the argument parser so that the default option for
- configure switches that your don't specify will be set
- to "shared".  The effect of this is to turn on all options
- unless you explicitly disable them.  When you have configured
- your snapshot build, you can use "nmake build-snap" to build
- everything, ignoring build errors in individual extensions
- or SAPI.
-
 vim:tw=78:sw=1:ts=1:et

@@ -1,4 +1,4 @@
-Using PHP 5 with the Zeus Web Server
+Using PHP4 with the Zeus Web Server
 -----------------------------------

 Zeus fully supports running PHP in combination with our
@@ -1,12 +1,12 @@
-Input Filter Support in PHP 5
-----------------------------
+Input Filter Support in PHP5
+----------------------------

 XSS (Cross Site Scripting) hacks are becoming more and more prevalent,
 and can be quite difficult to prevent.  Whenever you accept user data
 and somehow display this data back to users, you are likely vulnerable
 to XSS hacks.

-The Input Filter support in PHP 5 is aimed at providing the framework
+The Input Filter support in PHP5 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
@@ -155,7 +155,7 @@ PHP_FUNCTION(my_get_raw)
    HashTable *hash_ptr;
    char *raw_var;

-    if(zend_parse_parameters(2 TSRMLS_CC, "ls", &arg, &var, &var_len) == FAILURE) {
+    if(zend_parse_parameters(2 TSRMLS_CC, "ls|l", &arg, &var, &var_len) == FAILURE) {
        return;
    }

@@ -7,6 +7,13 @@ Zend
      dimensional arrays.
    * Look at replacing c-lib call tolower().
    * Make hash API functions work with HASH_OF() to save time.
+    * Allow to set a default value for call-by-reference-parameters. 
+      eg: function hello (&$pallo = NULL) {} 
+    * Add configure test to determine if dlsym() requires underscore and set
+      DLSYM_NEEDS_UNDERSCORE accordingly. Perl and zsh have it in configure, 
+      for example. (DONE?)
+    * Allow foreach ($array as $k => &$val) syntax. right now we cannot 
+      traverse an array without copying each element.
    * Native large number support (probably with GNU GMP)
    * Const'ify APIs. Right now, many functions leave parameters untouched,
      but don't declare those as const. This makes interaction with other
@@ -1,10 +0,0 @@
-Zend Engine
-----------
-  - Look at making zend_constant value member be a zval* instead of zval. (Andi)
-  - Implement inheritance rules for type hints. (Marcus) 
-  - Implement typehinting for arrays (apply the patch). (Andi, Marcus)
-  - Find a keyword for the if-set-or operator (apply the patch). (Marcus, all)
-
-Standard Library
----------------
-  - Implement new time/date parsing and handling functions. (Derick)
@@ -16,6 +16,83 @@ Responsibility: Andi, Stig?
 Time frame:     ?


+Component:      Introspection
+
+                get_function_definition(<is_callable> [field]) =>
+                array(
+                	file => filename
+                	line_start =>
+                	line_end =>
+                	parameters => array( name, byref, default )
+                	static_variables => array( name, value/default )
+                	scope => 'namespace' | 'class' | null
+                	namespace => classname | namespacename | 'main'
+                	protection => protection_flags
+                	phpdoc => pre-scanned-phpdoc-string
+                	type => 'internal' | 'user'
+                )
+                
+                get_class_definition(<class> [field]) =>
+                array(
+                	type => 'internal' | 'user'
+                	file => filename
+                	line_start => 
+                	line_end =>
+                	name => pretty-name
+                	parent => classname | namespace | null
+                	flags => bitfield (ABSTRACT)
+                	methods => array( array( name, phpdoc ) )
+                	default_properties => array( array( name, value, phpdoc ) )
+                	private_properties => array( array( name, value, phpdoc ) )
+                	protected_properties => array( array( name, value, phpdoc ) )
+                	public_properties => array( array( name, value, phpdoc ) )
+                	static_members => array( array( name, value, phpdoc ) )
+                	constants => array( array( name, value, phpdoc ) )
+                	classes => array( array( name, phpdoc ) )
+                	phpdoc => pre-scanned-phpdoc-string
+                )
+                
+                get_constant_definition(<constant> [field]) =>
+                array(
+                	file => filename
+                	line_start =>
+                	line_end =>
+                	name => 
+                	value =>
+                	phpdoc =>
+                )
+                
+                get_global_variable_defintion(<name> [field]) =>
+                array(
+                	file =>
+                	line_start =>
+                	line_end =>
+                	name =>
+                	phpdoc =>
+                )
+                
+                We tried to take into account the implementation of each piece of
+                information, and there are some that are problematic, especially those
+                regarding constants and global variables (where do we store the extra
+                information?)
+                
+                With "pre-scanned-phpdoc-string" we mean converting:
+                
+                /**
+                 * Blah blah blah
+                 * @param foo ...
+                 */
+                
+                to:
+                
+                Blah blah blah
+                @param foo
+                
+                The rest of the phpdoc handling should be left to an extension.
+Responsibility: Stig, Andrei, Harald
+Time frame:     ?
+
+
 Component:      Redesign of API Versioning
 Responsibility: ?
 Time frame:     1 month
@@ -95,6 +172,31 @@ Responsibility: Sterling, Harald
 Time frame:     ?


+Component:      MySQL Extension
+                Complete rewrite, leveraging the new MySQL 4 / MySQL 5
+                features.
+Responsibility: Georg Richter, Zak Greant
+Timeframe:      ?
+
+
+Component:      XML
+                - Rewrite DOMXML and incorporate all (or most of) W3C-DOM2.
+                - Use the new ZE2 features (Exceptions, setter/getter).
+                - Add SAX(2), XML Schema.
+                - XSLT, HTML, XPath, XPointer, DTD Validation will still be
+                  supported, have to find a meaningful API for it.
+                - Break BC, warn users now.
+                - Look at the libxml2 patch by lukas schröder and see if we can prevent
+                  memory leaks with it (anyway, getting rid of mem-leaks and intelligent
+                  memory management is on top prio...)
+                - In the longer term, domxml (or another name, as with todays features
+                  domxml is a little bit misleading) shall be the main xml-class, which
+                  covers most of what's needed for decent XML support in PHP ;)
+                  But there is certainly place for others like Sablotron etc.
+Responsibility: Christian Stocker
+Timeframe:      ?
+
+
 Component:      Test Suite
                Extending the test suite with atleast a test for every
                function in an extension that doesn't require external
@@ -34,7 +34,6 @@ typedef struct {
 	size_t size;
 	ts_allocate_ctor ctor;
 	ts_allocate_dtor dtor;
-	int done;
 } tsrm_resource_type;


@@ -92,28 +91,12 @@ static FILE *tsrm_error_file;
 #if defined(PTHREADS)
 /* Thread local storage */
 static pthread_key_t tls_key;
-# define tsrm_tls_set(what)		pthread_setspecific(tls_key, (void*)(what))
-# define tsrm_tls_get()			pthread_getspecific(tls_key)
-
 #elif defined(TSRM_ST)
 static int tls_key;
-# define tsrm_tls_set(what)		st_thread_setspecific(tls_key, (void*)(what))
-# define tsrm_tls_get()			st_thread_getspecific(tls_key)
-
 #elif defined(TSRM_WIN32)
 static DWORD tls_key;
-# define tsrm_tls_set(what)		TlsSetValue(tls_key, (void*)(what))
-# define tsrm_tls_get()			TlsGetValue(tls_key)
-
 #elif defined(BETHREADS)
 static int32 tls_key;
-# define tsrm_tls_set(what)		tls_set(tls_key, (void*)(what))
-# define tsrm_tls_get()			(tsrm_tls_entry*)tls_get(tls_key)
-
-#else
-# define tsrm_tls_set(what)
-# define tsrm_tls_get()			NULL
-# warning tsrm_set_interpreter_context is probably broken on this platform
 #endif

 /* Startup TSRM (call once for the entire process) */
@@ -175,12 +158,10 @@ TSRM_API void tsrm_shutdown(void)

 				next_p = p->next;
 				for (j=0; j<p->count; j++) {
-					if (p->storage[j]) {
-						if (resource_types_table && !resource_types_table[j].done && resource_types_table[j].dtor) {
-							resource_types_table[j].dtor(p->storage[j], &p->storage);
-						}
-						free(p->storage[j]);
+					if (resource_types_table && resource_types_table[j].dtor) {
+						resource_types_table[j].dtor(p->storage[j], &p->storage);
 					}
+					free(p->storage[j]);
 				}
 				free(p->storage);
 				free(p);
@@ -238,7 +219,6 @@ TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].size = size;
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].ctor = ctor;
 	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].dtor = dtor;
-	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].done = 0;

 	/* enlarge the arrays for the already active threads */
 	for (i=0; i<tsrm_tls_table_size; i++) {
@@ -278,29 +258,32 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 	(*thread_resources_ptr)->thread_id = thread_id;
 	(*thread_resources_ptr)->next = NULL;

+#if defined(PTHREADS)
 	/* Set thread local storage to this new thread resources structure */
-	tsrm_tls_set(*thread_resources_ptr);
+	pthread_setspecific(tls_key, (void *) *thread_resources_ptr);
+#elif defined(TSRM_ST)
+	st_thread_setspecific(tls_key, (void *) *thread_resources_ptr);
+#elif defined(TSRM_WIN32)
+	TlsSetValue(tls_key, (void *) *thread_resources_ptr);
+#elif defined(BETHREADS)
+	tls_set(tls_key, (void*) *thread_resources_ptr);
+#endif

 	if (tsrm_new_thread_begin_handler) {
 		tsrm_new_thread_begin_handler(thread_id, &((*thread_resources_ptr)->storage));
 	}
 	for (i=0; i<id_count; i++) {
-		if (resource_types_table[i].done) {
-			(*thread_resources_ptr)->storage[i] = NULL;
-		} else
-		{
-			(*thread_resources_ptr)->storage[i] = (void *) malloc(resource_types_table[i].size);
-			if (resource_types_table[i].ctor) {
-				resource_types_table[i].ctor((*thread_resources_ptr)->storage[i], &(*thread_resources_ptr)->storage);
-			}
+		(*thread_resources_ptr)->storage[i] = (void *) malloc(resource_types_table[i].size);
+		if (resource_types_table[i].ctor) {
+			resource_types_table[i].ctor((*thread_resources_ptr)->storage[i], &(*thread_resources_ptr)->storage);
 		}
 	}

+	tsrm_mutex_unlock(tsmm_mutex);
+
 	if (tsrm_new_thread_end_handler) {
 		tsrm_new_thread_end_handler(thread_id, &((*thread_resources_ptr)->storage));
 	}
-
-	tsrm_mutex_unlock(tsmm_mutex);
 }


@@ -321,13 +304,22 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 	if(tsrm_tls_table) {
 #endif
 	if (!th_id) {
+#if defined(PTHREADS)
 		/* Fast path for looking up the resources for the current
 		 * thread. Its used by just about every call to
 		 * ts_resource_ex(). This avoids the need for a mutex lock
 		 * and our hashtable lookup.
 		 */
-		thread_resources = tsrm_tls_get();
-
+		thread_resources = pthread_getspecific(tls_key);
+#elif defined(TSRM_ST)
+		thread_resources = st_thread_getspecific(tls_key);
+#elif defined(TSRM_WIN32)
+		thread_resources = TlsGetValue(tls_key);
+#elif defined(BETHREADS)
+		thread_resources = (tsrm_tls_entry*)tls_get(tls_key);
+#else
+		thread_resources = NULL;
+#endif
 		if (thread_resources) {
 			TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Fetching resource id %d for current thread %d", id, (long) thread_resources->thread_id));
 			/* Read a specific resource from the thread's resources.
@@ -378,66 +370,6 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 #endif
 }

-/* frees an interpreter context.  You are responsible for making sure that
- * it is not linked into the TSRM hash, and not marked as the current interpreter */
-void tsrm_free_interpreter_context(void *context)
-{
-	tsrm_tls_entry *next, *thread_resources = (tsrm_tls_entry*)context;
-	int i;
-
-	while (thread_resources) {
-		next = thread_resources->next;
-
-		for (i=0; i<thread_resources->count; i++) {
-			if (resource_types_table[i].dtor) {
-				resource_types_table[i].dtor(thread_resources->storage[i], &thread_resources->storage);
-			}
-		}
-		for (i=0; i<thread_resources->count; i++) {
-			free(thread_resources->storage[i]);
-		}
-		free(thread_resources->storage);
-		free(thread_resources);
-		thread_resources = next;
-	}
-}
-
-void *tsrm_set_interpreter_context(void *new_ctx)
-{
-	tsrm_tls_entry *current;
-
-	current = tsrm_tls_get();
-
-	/* TODO: unlink current from the global linked list, and replace it
-	 * it with the new context, protected by mutex where/if appropriate */
-
-	/* Set thread local storage to this new thread resources structure */
-	tsrm_tls_set(new_ctx);
-
-	/* return old context, so caller can restore it when they're done */
-	return current;
-}
-
-
-/* allocates a new interpreter context */
-void *tsrm_new_interpreter_context(void)
-{
-	tsrm_tls_entry *new_ctx, *current;
-	THREAD_T thread_id;
-
-	thread_id = tsrm_thread_id();
-	tsrm_mutex_lock(tsmm_mutex);
-
-	current = tsrm_tls_get();
-
-	new_ctx = malloc(sizeof(*new_ctx));
-	allocate_new_resource(&new_ctx, thread_id);
-	
-	/* switch back to the context that was in use prior to our creation
-	 * of the new one */
-	return tsrm_set_interpreter_context(current);
-}
-

 /* frees all resources allocated for the current thread */
 void ts_free_thread(void)
@@ -468,7 +400,11 @@ void ts_free_thread(void)
 			} else {
 				tsrm_tls_table[hash_value] = thread_resources->next;
 			}
-			tsrm_tls_set(0);
+#if defined(PTHREADS)
+			pthread_setspecific(tls_key, 0);
+#elif defined(TSRM_WIN32)
+			TlsSetValue(tls_key, 0);
+#endif
 			free(thread_resources);
 			break;
 		}
@@ -484,34 +420,6 @@ void ts_free_thread(void)
 /* deallocates all occurrences of a given id */
 void ts_free_id(ts_rsrc_id id)
 {
-	int i;
-	int j = TSRM_UNSHUFFLE_RSRC_ID(id);
-
-	tsrm_mutex_lock(tsmm_mutex);
-
-	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Freeing resource id %d", id));
-
-	if (tsrm_tls_table) {
-		for (i=0; i<tsrm_tls_table_size; i++) {
-			tsrm_tls_entry *p = tsrm_tls_table[i];
-
-			while (p) {
-				if (p->count > j && p->storage[j]) {
-					if (resource_types_table && resource_types_table[j].dtor) {
-						resource_types_table[j].dtor(p->storage[j], &p->storage);
-					}
-					free(p->storage[j]);
-					p->storage[j] = NULL;
-				}
-				p = p->next;
-			}
-		}
-	}
-	resource_types_table[j].done = 1;
-
-	tsrm_mutex_unlock(tsmm_mutex);
-
-	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Successfully freed resource id %d", id));
 }


@@ -526,6 +434,13 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 {
 #ifdef TSRM_WIN32
 	return GetCurrentThreadId();
+#elif defined(NETWARE)
+	/* There seems to be some problem with the LibC call: NXThreadGetId().
+	 * Due to this, the PHPMyAdmin application is abending in PHP calls.
+	 * Used the call, kCurrentThread instead and it works fine.
+	 */
+/*	return NXThreadGetId(); */
+	return kCurrentThread();
 #elif defined(GNUPTH)
 	return pth_self();
 #elif defined(PTHREADS)
@@ -546,9 +461,24 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 {
 	MUTEX_T mutexp;
+#ifdef NETWARE
+#ifndef USE_MPK
+	/* To use the Recursive Mutex Locking of LibC */
+	long flags = NX_MUTEX_RECURSIVE;
+	NXHierarchy_t order = 0;
+	NX_LOCK_INFO_ALLOC (lockInfo, "PHP-TSRM", 0);
+#endif
+#endif
+
 #ifdef TSRM_WIN32
 	mutexp = malloc(sizeof(CRITICAL_SECTION));
 	InitializeCriticalSection(mutexp);
+#elif defined(NETWARE)
+#ifdef USE_MPK
+	mutexp = kMutexAlloc((BYTE*)"PHP-TSRM");
+#else
+	mutexp = NXMutexAlloc(flags, order, &lockInfo);
+#endif
 #elif defined(GNUPTH)
 	mutexp = (MUTEX_T) malloc(sizeof(*mutexp));
 	pth_mutex_init(mutexp);
@@ -14,8 +14,8 @@
 #define TSRM_H

 /* #ifndef WIN32 */
-#ifndef WIN32
-# include <tsrm_config.h>
+#if !defined(WIN32) && !defined(NETWARE)
+# include "tsrm_config.h"
 #endif

 #ifdef WIN32
@@ -42,6 +42,13 @@
 # endif
 # include <windows.h>
 # include <shellapi.h>
+#elif defined(NETWARE)
+# include <nks/thread.h>
+#ifdef USE_MPK
+# include <mpklib4php.h>
+#else
+# include <nks/synch.h>
+#endif
 #elif defined(GNUPTH)
 # include <pth.h>
 #elif defined(PTHREADS)
@@ -59,6 +66,13 @@ typedef int ts_rsrc_id;
 #ifdef TSRM_WIN32
 # define THREAD_T DWORD
 # define MUTEX_T CRITICAL_SECTION *
+#elif defined(NETWARE)
+# define THREAD_T NXThreadId_t
+#ifdef USE_MPK
+# define MUTEX_T MUTEX
+#else
+# define MUTEX_T NXMutex_t *
+#endif
 #elif defined(GNUPTH)
 # define THREAD_T pth_t
 # define MUTEX_T pth_mutex_t *
@@ -132,12 +146,6 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp);
 TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler);
 TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);

-/* these 3 APIs should only be used by people that fully understand the threading model
- * used by PHP/Zend and the selected SAPI. */
-TSRM_API void *tsrm_new_interpreter_context(void);
-TSRM_API void *tsrm_set_interpreter_context(void *new_ctx);
-TSRM_API void tsrm_free_interpreter_context(void *context);
-
 #define TSRM_SHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)+1)
 #define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)-1)

@@ -1,5 +1,5 @@

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

@@ -1,10 +0,0 @@
-// vim:ft=javascript
-// $Id$
-
-if (CHECK_HEADER_ADD_INCLUDE("NewAPIs.h", "CFLAGS_PHP", php_usual_include_suspects)) {
-	// Need to add the flag directly, since TSRM doesn't include the config
-	// header
-	ADD_FLAG("CFLAGS_PHP", "/DHAVE_NEWAPIS_H=1");
-}
-ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c tsrm_win32.c");
-
@@ -30,7 +30,7 @@ dnl PTHREADS_FLAGS
 dnl
 dnl Set some magic defines to achieve POSIX threads conformance
 dnl
-AC_DEFUN([PTHREADS_FLAGS],[
+AC_DEFUN(PTHREADS_FLAGS,[
  if test -z "$host_alias" && test -n "$host"; then
    host_alias=$host
  fi
@@ -65,7 +65,7 @@ dnl PTHREADS_CHECK_COMPILE
 dnl
 dnl Check whether the current setup can use POSIX threads calls
 dnl
-AC_DEFUN([PTHREADS_CHECK_COMPILE], [
+AC_DEFUN(PTHREADS_CHECK_COMPILE, [
 AC_TRY_RUN( [
 #include <pthread.h>
 #include <stddef.h>
@@ -84,15 +84,7 @@ int main() {
  pthreads_working=yes
  ], [
  pthreads_working=no
-  ], [
-  dnl For cross compiling running this test is of no use. NetWare supports pthreads
-  pthreads_working=no
-  case $host_alias in
-  *netware*)
-    pthreads_working=yes
-  esac
-]
-) ] )dnl
+  ], pthreads_working=no ) ] )dnl
 dnl
 dnl PTHREADS_CHECK()
 dnl
@@ -108,7 +100,7 @@ dnl  -pthreads         gcc (Solaris)
 dnl  -qthreaded        AIX cc V5
 dnl  -threads          gcc (HP-UX)
 dnl
-AC_DEFUN([PTHREADS_CHECK],[
+AC_DEFUN(PTHREADS_CHECK,[

 if test "$beos_threads" = "1"; then
  pthreads_working="yes"
@@ -162,7 +154,7 @@ fi
 ])dnl
 dnl
 dnl
-AC_DEFUN([PTHREADS_ASSIGN_VARS],[
+AC_DEFUN(PTHREADS_ASSIGN_VARS,[
 if test -n "$ac_cv_pthreads_lib"; then
  LIBS="$LIBS -l$ac_cv_pthreads_lib"
 fi
@@ -1,6 +1,6 @@

 dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
-AC_DEFUN([TSRM_CHECK_GCC_ARG],[
+AC_DEFUN(TSRM_CHECK_GCC_ARG,[
  gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
  AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
  echo 'void somefunc() { };' > conftest.c
@@ -21,7 +21,7 @@ AC_DEFUN([TSRM_CHECK_GCC_ARG],[
  fi
 ])

-AC_DEFUN([TSRM_BASIC_CHECKS],[
+AC_DEFUN(TSRM_BASIC_CHECKS,[

 AC_REQUIRE([AC_PROG_CC])dnl
 dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
@@ -33,7 +33,7 @@ AC_CHECK_HEADERS(stdarg.h)
 ])


-AC_DEFUN([TSRM_CHECK_PTH],[
+AC_DEFUN(TSRM_CHECK_PTH,[

 AC_MSG_CHECKING(for GNU Pth)
 PTH_PREFIX="`$1 --prefix`"
@@ -50,7 +50,7 @@ AC_MSG_RESULT(yes - installed in $PTH_PREFIX)

 ])

-AC_DEFUN([TSRM_CHECK_ST],[
+AC_DEFUN(TSRM_CHECK_ST,[
  if test -r "$1/include/st.h"; then
    CPPFLAGS="$CPPFLAGS -I$1/include"
    LDFLAGS="$LDFLAGS -L$1/lib"
@@ -70,7 +70,7 @@ AC_DEFUN([TSRM_CHECK_ST],[
 sinclude(threads.m4)
 sinclude(TSRM/threads.m4)

-AC_DEFUN([TSRM_CHECK_PTHREADS],[
+AC_DEFUN(TSRM_CHECK_PTHREADS,[
 		
 PTHREADS_CHECK

@@ -89,14 +89,14 @@ fi
 ])


-AC_DEFUN([TSRM_THREADS_CHECKS],[
+AC_DEFUN(TSRM_THREADS_CHECKS,[

 dnl For the thread implementations, we always use --with-*
 dnl to maintain consistency

 AC_ARG_WITH(tsrm-pth,
 [  --with-tsrm-pth[=pth-config]
-                          Use GNU Pth],[
+                          Use GNU Pth.],[
  TSRM_PTH=$withval
 ],[
  TSRM_PTH=no
@@ -0,0 +1,11 @@
+#ifndef TSRM_CONFIG_NW_H
+#define TSRM_CONFIG_NW_H
+
+#define HAVE_UTIME 1
+
+/* Though we have alloca(), this seems to be causing some problem
+ * with the stack pointer. Hence not using it
+ */
+/*#define HAVE_ALLOCA 1*/
+
+#endif
@@ -7,8 +7,10 @@

 #ifdef TSRM_WIN32
 # include "tsrm_config.w32.h"
+#elif defined(NETWARE)
+# include "tsrm_config.nw.h"
 #else
-# include <tsrm_config.h>
+# include "tsrm_config.h"
 # include <sys/param.h>
 #endif

@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2004 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2004 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2004 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <time.h>

 #include "tsrm_virtual_cwd.h"
 #include "tsrm_strtok_r.h"
@@ -35,15 +34,11 @@
 #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
-#include <fsio.h>
+/*#include "pipe.h"*/
+#include "tsrm_nw.h"
 #endif

 #ifndef HAVE_REALPATH
@@ -60,9 +55,9 @@ MUTEX_T cwd_mutex;
 #endif

 #ifdef ZTS
-ts_rsrc_id cwd_globals_id;
+static ts_rsrc_id cwd_globals_id;
 #else
-virtual_cwd_globals cwd_globals;
+static virtual_cwd_globals cwd_globals;
 #endif

 cwd_state main_cwd_state; /* True global */
@@ -142,9 +137,15 @@ static int php_check_dots(const char *element, int n)
 	
 static int php_is_dir_ok(const cwd_state *state) 
 {
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 	struct stat buf;

 	if (stat(state->cwd, &buf) == 0 && S_ISDIR(buf.st_mode))
+#else
+    struct stat_libc buf;
+
+    if (stat(state->cwd, (struct stat*)(&buf)) == 0 && S_ISDIR(buf.st_mode))
+#endif
 		return (0);

 	return (1);
@@ -152,9 +153,15 @@ static int php_is_dir_ok(const cwd_state *state)

 static int php_is_file_ok(const cwd_state *state) 
 {
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 	struct stat buf;

 	if (stat(state->cwd, &buf) == 0 && S_ISREG(buf.st_mode))
+#else
+    struct stat_libc buf;
+
+    if (stat(state->cwd, (struct stat*)(&buf)) == 0 && S_ISREG(buf.st_mode))
+#endif
 		return (0);

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

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

 static char *tsrm_strndup(const char *s, size_t length)
@@ -210,20 +197,7 @@ CWD_API void virtual_cwd_startup(void)
 	char cwd[MAXPATHLEN];
 	char *result;

-#ifdef NETWARE
-	result = getcwdpath(cwd, NULL, 1);
-	if(result)
-	{
-		char *c=cwd;
-		while(c = strchr(c, '\\'))
-		{
-			*c='/';
-			++c;
-		}
-	}
-#else
 	result = getcwd(cwd, sizeof(cwd));	
-#endif
 	if (!result) {
 		cwd[0] = '\0';
 	}
@@ -308,65 +282,6 @@ CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC)
 	return buf;
 }

-#ifdef REALPATH_CACHE
-static inline unsigned long realpath_cache_key(const char *path, int path_len)
-{
-  register unsigned long h;
-
-  const char *e = path + path_len;
-  for (h = 2166136261U; path < e; ) {
-    h *= 16777619;
-    h ^= *path++;
-  }
-  return h;
-}
-
-static inline void realpath_cache_add(const char *path, int path_len, const char *realpath, int realpath_len, time_t t TSRMLS_DC)
-{
-	long size = sizeof(realpath_cache_bucket) + path_len + 1 + realpath_len + 1;
-	if (CWDG(realpath_cache_size) + size <= CWDG(realpath_cache_size_limit)) {
-		realpath_cache_bucket *bucket = malloc(size);
-		unsigned long n;
-	
-		bucket->key = realpath_cache_key(path, path_len);
-		bucket->path = (char*)bucket + sizeof(realpath_cache_bucket);
-		memcpy(bucket->path, path, path_len+1);
-		bucket->path_len = path_len;
-		bucket->realpath = bucket->path + (path_len + 1);
-		memcpy(bucket->realpath, realpath, realpath_len+1);
-		bucket->realpath_len = realpath_len;
-		bucket->expires = t + CWDG(realpath_cache_ttl);
-		n = bucket->key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
-		bucket->next = CWDG(realpath_cache)[n];
-		CWDG(realpath_cache)[n] = bucket;
-	  CWDG(realpath_cache_size) += size;
-	}
-}
-
-static inline realpath_cache_bucket* realpath_cache_find(const char *path, int path_len, time_t t TSRMLS_DC)
-{
-	unsigned long key = realpath_cache_key(path, path_len);
-	unsigned long n = key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
-	realpath_cache_bucket **bucket = &CWDG(realpath_cache)[n];
-
-	while (*bucket != NULL) {
-		if (CWDG(realpath_cache_ttl) && (*bucket)->expires < t) {
-			realpath_cache_bucket *r = *bucket;
-		  *bucket = (*bucket)->next;
-		  CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
-		  free(r);
-		} else if (key == (*bucket)->key && path_len == (*bucket)->path_len &&
-		           memcmp(path, (*bucket)->path, path_len) == 0) {
-			return *bucket;
-		} else {
-			*bucket = (*bucket)->next;
-		}
-	}
-	return NULL;
-}
-#endif
-
-
 /* Resolve path relatively to state and put the real path into state */
 /* returns 0 for ok, 1 for error */
 CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath)
@@ -375,75 +290,26 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	char *ptr, *path_copy;
 	char *tok = NULL;
 	int ptr_length;
-	cwd_state old_state;
+	cwd_state *old_state;
 	int ret = 0;
 	int copy_amount = -1;
 	char *free_path;
 	unsigned char is_absolute = 0;
 #ifndef TSRM_WIN32
 	char resolved_path[MAXPATHLEN];
-#else
-	char *new_path;
-#endif
-#ifdef REALPATH_CACHE
-	char orig_path[MAXPATHLEN];
-	int orig_path_len;
-	realpath_cache_bucket *bucket;
-	time_t t;
-	TSRMLS_FETCH();
 #endif

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

-#ifdef REALPATH_CACHE
-	if (use_realpath && CWDG(realpath_cache_size_limit)) {
-		if (IS_ABSOLUTE_PATH(path, path_length) || (state->cwd_length < 1)) {
-			memcpy(orig_path, path, path_length+1);
-			orig_path_len = path_length;
-		} else {
-			orig_path_len = path_length + state->cwd_length + 1;
-			if (orig_path_len >= MAXPATHLEN) {
-				return 1;
-			}
-			memcpy(orig_path, state->cwd, state->cwd_length);
-			orig_path[state->cwd_length] = DEFAULT_SLASH;
-			memcpy(orig_path + state->cwd_length + 1, path, path_length + 1);
-		}
-		t = CWDG(realpath_cache_ttl)?time(NULL):0;
-		if ((bucket = realpath_cache_find(orig_path, orig_path_len, t TSRMLS_CC)) != NULL) {		
-			int len = bucket->realpath_len;
-
-			CWD_STATE_COPY(&old_state, state);
-			state->cwd = (char *) realloc(state->cwd, len+1);
-			memcpy(state->cwd, bucket->realpath, len+1);
-			state->cwd_length = len;
-			if (verify_path && verify_path(state)) {
-				CWD_STATE_FREE(state);
-				*state = old_state;
-				return 1;
-			} else {
-				CWD_STATE_FREE(&old_state);
-				return 0;
-			}
-		}
-	}
-#endif
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
 	/* cwd_length can be 0 when getcwd() fails.
 	 * This can happen under solaris when a dir does not have read permissions
 	 * but *does* have execute permissions */
 	if (IS_ABSOLUTE_PATH(path, path_length) || (state->cwd_length < 1)) {
-		if (use_realpath) {
-			if (realpath(path, resolved_path)) {  /* Note: Not threadsafe on older *BSD's */
-				path = resolved_path;
-				path_length = strlen(path);
-			} else {
-				/* disable for now
-				return 1; */
-			}
+		if (use_realpath && realpath(path, resolved_path)) {
+			path = resolved_path;
+			path_length = strlen(path);
 		}
 	} else { /* Concat current directory with relative path and then run realpath() on it */
 		char *tmp;
@@ -459,19 +325,9 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 		memcpy(ptr, path, path_length);
 		ptr += path_length;
 		*ptr = '\0';
-		if (strlen(tmp) >= MAXPATHLEN) {
-			free(tmp);
-			return 1;
-		}
-		if (use_realpath) {
-			if (realpath(tmp, resolved_path)) {
-				path = resolved_path;
-				path_length = strlen(path);
-			} else {
-				/* disable for now 
-				free(tmp);
-				return 1; */
-			}
+		if (use_realpath && realpath(tmp, resolved_path)) {
+			path = resolved_path;
+			path_length = strlen(path);
 		}
 		free(tmp);
 	}
@@ -479,6 +335,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 #if defined(TSRM_WIN32)
 	{
 		char *dummy = NULL;
+		char *new_path;
 		int new_path_length;
  
 		new_path_length = GetLongPathName(path, dummy, 0) + 1;
@@ -495,13 +352,13 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 			path_length = new_path_length;
 		} else {
 			free(new_path);
-			new_path = NULL;
 		}
 	}
 #endif
 	free_path = path_copy = tsrm_strndup(path, path_length);

-	CWD_STATE_COPY(&old_state, state);
+	old_state = (cwd_state *) malloc(sizeof(cwd_state));
+	CWD_STATE_COPY(old_state, state);
 #if VIRTUAL_CWD_DEBUG
 	fprintf(stderr,"cwd = %s path = %s\n", state->cwd, path);
 #endif
@@ -521,7 +378,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 				memcpy(state->cwd, path_copy, copy_amount);
 				path_copy += copy_amount;
 			} else {
-				memcpy(state->cwd, old_state.cwd, copy_amount);
+				memcpy(state->cwd, old_state->cwd, copy_amount);
 			}
 		}
 		state->cwd[copy_amount] = '\0';
@@ -564,19 +421,8 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
 				}
 #elif defined(NETWARE)
-				/* 
-				Below code keeps appending to state->cwd a File system seperator
-				cases where this appending should not happen is given below,
-				a) sys: should just be left as it is
-				b) sys:system should just be left as it is,
-					Colon is allowed only in the first token as volume names alone can have the : in their names.
-					Files and Directories cannot have : in their names
-					So the check goes like this,
-					For second token and above simply append the DEFAULT_SLASH to the state->cwd.
-					For first token check for the existence of : 
-					if it exists don't append the DEFAULT_SLASH to the state->cwd.
-				*/
-				if(((state->cwd_length == 0) && (strchr(ptr, ':') == NULL)) || (state->cwd_length > 0)) {
+				/* If the token is a volume name, it will have colon at the end -- so, no slash before it */
+				if (ptr[ptr_length-1] != ':') {
 					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
 				}
 #else
@@ -600,28 +446,20 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 		state->cwd_length = path_length;
 	}

-#ifdef TSRM_WIN32
-	if (new_path) {
-		free(new_path);
-	}
-#endif
-	free(free_path);
-
-#ifdef REALPATH_CACHE
-	if (use_realpath && CWDG(realpath_cache_size_limit)) {
-		realpath_cache_add(orig_path, orig_path_len, state->cwd, state->cwd_length, t TSRMLS_CC);
-	}
-#endif
-
 	if (verify_path && verify_path(state)) {
 		CWD_STATE_FREE(state);
-		*state = old_state;
+
+		*state = *old_state;
+
 		ret = 1;
 	} else {
-		CWD_STATE_FREE(&old_state);
+		CWD_STATE_FREE(old_state);
 		ret = 0;
 	}
 	
+	free(old_state);
+	
+	free(free_path);
 #if VIRTUAL_CWD_DEBUG
 	fprintf (stderr, "virtual_file_ex() = %s\n",state->cwd);
 #endif
@@ -850,6 +688,7 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC)
 	return retval;
 }

+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC)
 {
 	cwd_state new_state;
@@ -863,8 +702,23 @@ CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC)
 	CWD_STATE_FREE(&new_state);
 	return retval;
 }
+#else
+CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC)
+{
+	cwd_state new_state;
+	int retval;

-#if !defined(TSRM_WIN32)
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, path, NULL, 1);
+
+	retval = stat(new_state.cwd, (struct stat*)buf);
+
+	CWD_STATE_FREE(&new_state);
+	return retval;
+}
+#endif
+
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC)
 {
 	cwd_state new_state;
@@ -986,24 +840,13 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 {
 	int command_length;
-	int dir_length, extra = 0;
 	char *command_line;
-	char *ptr, *dir;
+	char *ptr;
 	FILE *retval;

 	command_length = strlen(command);

-	dir_length = CWDG(cwd).cwd_length;
-	dir = CWDG(cwd).cwd;
-	while (dir_length > 0) {
-		if (*dir == '\'') extra+=3;
-		dir++;
-		dir_length--;
-	}
-	dir_length = CWDG(cwd).cwd_length;
-	dir = CWDG(cwd).cwd;
-
-	ptr = command_line = (char *) malloc(command_length + sizeof("cd '' ; ") + dir_length + extra+1+1);
+	ptr = command_line = (char *) malloc(command_length + sizeof("cd  ; ") + CWDG(cwd).cwd_length+1);
 	if (!command_line) {
 		return NULL;
 	}
@@ -1013,21 +856,8 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 	if (CWDG(cwd).cwd_length == 0) {
 		*ptr++ = DEFAULT_SLASH;
 	} else {
-		*ptr++ = '\'';
-		while (dir_length > 0) {
-			switch (*dir) {
-			case '\'':
-				*ptr++ = '\'';
-				*ptr++ = '\\';
-				*ptr++ = '\'';
-				/* fall-through */
-			default:
-				*ptr++ = *dir;
-			}
-			dir++;
-			dir_length--;
-		}
-		*ptr++ = '\'';
+		memcpy(ptr, CWDG(cwd).cwd, CWDG(cwd).cwd_length);
+		ptr += CWDG(cwd).cwd_length;
 	}
 	
 	*ptr++ = ' ';
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2004 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -74,9 +74,10 @@ typedef unsigned short mode_t;
 #define DEFAULT_DIR_SEPARATOR	';'
 #define IS_SLASH(c)	((c) == '/' || (c) == '\\')
 #define IS_SLASH_P(c)	IS_SLASH(*(c))
-/* Colon indicates volume name, either first character should be forward slash or backward slash */
+#define COPY_WHEN_ABSOLUTE(path) \
+    (strchr(path, ':') - path + 1)  /* Take the volume name which ends with a colon */
 #define IS_ABSOLUTE_PATH(path, len) \
-    ((strchr(path, ':') != NULL) || ((len >= 1) && ((path[0] == '/') || (path[0] == '\\'))))
+    (strchr(path, ':') != NULL) /* Colon indicates volume name */

 #else
 #ifdef HAVE_DIRENT_H
@@ -140,8 +141,12 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC);
 CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...);
 CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC);
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC);
-#if !defined(TSRM_WIN32)
+#else
+CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC);
+#endif
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC);
 #endif
 CWD_API int virtual_unlink(const char *path TSRMLS_DC);
@@ -195,37 +200,13 @@ CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group TSRMLS_

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

-#define REALPATH_CACHE
-#define REALPATH_CACHE_TTL  (2*60) /* 2 minutes */
-#define REALPATH_CACHE_SIZE 0      /* disabled while php.ini isn't loaded */
-
-#ifdef REALPATH_CACHE
-typedef struct _realpath_cache_bucket {
-	unsigned long                  key;
-	char                          *path;
-	int                            path_len;
-	char                          *realpath;
-	int                            realpath_len;
-	time_t                         expires;
-	struct _realpath_cache_bucket *next;	
-} realpath_cache_bucket;
-#endif
-
 typedef struct _virtual_cwd_globals {
 	cwd_state cwd;
-#ifdef REALPATH_CACHE
-	long                   realpath_cache_size;
-	long                   realpath_cache_size_limit;
-	long                   realpath_cache_ttl;
-	realpath_cache_bucket *realpath_cache[1024];
-#endif
 } virtual_cwd_globals;

 #ifdef ZTS
-extern ts_rsrc_id cwd_globals_id;
 # define CWDG(v) TSRMG(cwd_globals_id, virtual_cwd_globals *, v)
 #else
-extern virtual_cwd_globals cwd_globals;
 # define CWDG(v) (cwd_globals.v)
 #endif

@@ -248,7 +229,7 @@ extern virtual_cwd_globals cwd_globals;
 #define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path TSRMLS_CC)
 #define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
 #define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
-#if !defined(TSRM_WIN32)
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 #define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
 #endif
 #define VCWD_UNLINK(path) virtual_unlink(path TSRMLS_CC)
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2004 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -29,7 +29,6 @@
 #include "TSRM.h"

 #ifdef TSRM_WIN32
-
 #include "tsrm_win32.h"

 #ifdef ZTS
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2004 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -16,8 +16,7 @@ libZend_la_SOURCES=\
 	zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
 	zend_objects_API.c zend_ts_hash.c zend_stream.c zend_mm.c \
 	zend_default_classes.c zend_reflection_api.c \
-	zend_iterators.c zend_interfaces.c zend_exceptions.c \
-	zend_strtod.c zend_multibyte.c
+	zend_iterators.c zend_interfaces.c

 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
@@ -1 +0,0 @@
-Zend/zend_execute.lo: $(srcdir)/zend_vm_execute.h $(srcdir)/zend_vm_opcodes.h
@@ -51,7 +51,7 @@ write_property is used to directly write object's property by
 name.  This handler is used to assign property variables or to change them 
 in operations like += or ++ (unless get_property_zval_ptr is also set).

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

-    * $this
-
-      Unlike in Zend Engine 1 the pseudo variable $this cannot be
-      exchanged in Zend Engine 2. You can of course modify or work with
-      an object by using $this but you cannot replace $this with another
-      object to change the original object.
-
-      Example:
-
-        <?php
-        class Foo {
-            function replace($other)
-            {
-                $this = $other;
-            }
-        }
-
-        $object = new Foo;
-        $object->prop = 'Hello';
-
-        $other  = new Foo;
-        $other->prop = 'Bye';
-
-        $object->replace($other);
-
-        print $object->prop; // still shows 'Hello'
-
-        ?>
-
-        Zend Engine 2.0 will issue a compile error, if an assignment
-        to $this is found.
-
    * Private and Protected Members.

-      The Zend Engine 2.0 introduces private and protected member
-      variables. Note that for performance reasons no error message is
-      emitted in case of an illegal access to a private or protectecd
+      The Zend Engine 2.0 introduces private and protected member 
+      variables. Note that for performance reasons no error message is 
+      emitted in case of an illegal access to a private or protectecd 
      member variable.

      Example:
@@ -75,7 +43,7 @@ Changes in the Zend Engine 2.0

        class MyClass2 extends MyClass {
            protected $Foo;
-
+            
            function printHello() {
                MyClass::printHello();                          /* Should print */
                print "MyClass2::printHello() " . $this->Hello; /* Shouldn't print out anything */
@@ -96,9 +64,9 @@ Changes in the Zend Engine 2.0
        print $obj->Foo;    /* Shouldn't print out anything */
        $obj->printHello();
        ?>
-
-      Protected member variables can be accessed in classes extending the
-      class they are declared in, whereas private member variables can
+        
+      Protected member variables can be accessed in classes extending the 
+      class they are declared in, whereas private member variables can 
      only be accessed by the class they belong to.

    * Private and protected methods.
@@ -130,14 +98,14 @@ Changes in the Zend Engine 2.0
        $o->aPublicMethod();
        ?>

-      Old code that has no user-defined classes or functions named
+      Old code that has no user-defined classes or functions named 
      'public', 'protected' or 'private' should run without modifications.

    * Abstract Classes and Methods.

-      The Zend Engine 2.0 introduces abstract classes and methods. An
-      abstract method only declares the method's signature and does not
-      provide an implementation. A class that contains abstract methods
+      The Zend Engine 2.0 introduces abstract classes and methods. An 
+      abstract method only declares the method's signature and does not 
+      provide an implementation. A class that contains abstract methods 
      needs to be declared abstract.

      Example:
@@ -160,7 +128,7 @@ Changes in the Zend Engine 2.0
      Classes that do not have abstract methods can be declared abstract
      to prevent them from being instantiated.

-      Old code that has no user-defined classes or functions named
+      Old code that has no user-defined classes or functions named 
      'abstract' should run without modifications.

    * Interfaces.
@@ -182,47 +150,13 @@ Changes in the Zend Engine 2.0
        }
        ?>

-      Old code that has no user-defined classes or functions named
+      Old code that has no user-defined classes or functions named 
      'interface' or 'implements' should run without modifications.

-      An interface may extend one or more base interfaces (but not
-      implement them). Neither a class nor an interface can inherit
-      methods of the same name from different root interfaces.
-
-      Interfaces may contain abstract static methods.
-
-      Example:
-
-        <?php
-        interface Printable {
-          function dump();
-        }
-
-        interface Streamable extends Printable {
-          function writeToStream();
-          static function readFromStream();
-        }
-
-        class PrintableExample implements Streamable {
-          public function dump() {
-            // ...
-          }
-          function writeToStream() {
-            // ...
-          }
-          static function readFromStream() {
-            // ...
-          }
-        }
-        ?>
-
-      A class that does not implement all interface methods must be
-      declared as an abstract class.
-
    * Class Type Hints.

-      While remaining loosely typed the Zend Engine 2.0 introduces the
-      ability to use class type hints to declare the expected class of
+      While remaining loosely typed the Zend Engine 2.0 introduces the 
+      ability to use class type hints to declare the expected class of 
      objects that are passed as parameters to a method.

      Example:
@@ -275,7 +209,8 @@ Changes in the Zend Engine 2.0
    * Final methods and classes.

      The Zend Engine 2.0 introduces the "final" keyword to declare
-      final methods. Those cannot be overridden by sub-classes.
+      final members and methods. Those cannot be overridden by
+      sub-classes. 

      Example:

@@ -287,8 +222,8 @@ Changes in the Zend Engine 2.0
        }
        ?>

-      It is furthermore possible to make a class final. Doing this
-      prevents a class from being specialized (it cannot be inherited
+      It is furthermore possible to make a class final. Doing this 
+      prevents a class from being specialized (it cannot be inherited 
      by another class). There's no need to declare the methods of
      a final class themselves as final.

@@ -302,9 +237,9 @@ Changes in the Zend Engine 2.0
        // class Bork extends Foo {}
        ?>

-      Properties cannot be final. See per-class constants below.
+      Properties cannot be final.

-      Old code that has no user-defined classes or functions named
+      Old code that has no user-defined classes or functions named 
      'final' should run without modifications.

    * Object Cloning.
@@ -325,12 +260,13 @@ Changes in the Zend Engine 2.0
      replicate the parent object you want to create a new instance of
      this other object so that the replica has its own separate copy.

-      An object copy is created by using the clone operator.
+      An object copy is created by calling the object's __clone()
+      method.

      Example:

        <?php
-        $copy_of_object = clone $object;
+        $copy_of_object = $object->__clone();
        ?>

      When the developer asks to create a new copy of an object, the
@@ -339,40 +275,40 @@ Changes in the Zend Engine 2.0
      all of the object's properties. If a __clone() method is
      defined, then it will be responsible to set the necessary
      properties in the created object. For convenience, the engine
-      ensures, that the clone will be initialized with all of the
-      properties from the source object, so that developers can start
-      with a by-value replica of the source object, and only override
-      properties that need to be changed.
+      will supply a function that imports all of the properties from
+      the source object, so that they can start with a by-value
+      replica of the source object, and only override properties that
+      need to be changed. [The function hasn't been implemented yet]

      Example:
+
        <?php
        class MyCloneable {
-          static $id = 0;
+            static $id = 0;

-          function MyCloneable() {
-            $this->id = self::$id++;
-          }
+            function MyCloneable() {
+                $this->id = self::$id++;
+            }

-          function __clone() {
-            $this->address = 'New York';
-            $this->id = self::$id++;
-          }
+            function __clone() {
+                $this->name = $that->name;
+                $this->address = 'New York';
+                $this->id = self::$id++;
+            }
        }

        $obj = new MyCloneable();

-        $obj->name = 'Hello';
+        $obj->name    = 'Hello';
        $obj->address = 'Tel-Aviv';

-        $obj_clone = clone $obj;
+        print $obj->id . "\n";
+
+        $obj = $obj->__clone();

        print $obj->id . "\n";
        print $obj->name . "\n";
        print $obj->address . "\n";
-
-        print $obj_clone->id . "\n";
-        print $obj_clone->name . "\n";
-        print $obj_clone->address . "\n";
        ?>

    * Unified Constructors.
@@ -474,7 +410,7 @@ Changes in the Zend Engine 2.0
        echo 'Foo::constant = ' . Foo::constant . "\n";
        ?>

-      Old code that has no user-defined classes or functions
+      Old code that has no user-defined classes or functions 
      named 'const' will run without modifications.

    * Exceptions.
@@ -483,16 +419,16 @@ Changes in the Zend Engine 2.0
      introduces a exception model similar to that of other programming
      languages. But there is no catch all and no finally clause.

-      Old code that has no user-defined classes or functions 'catch',
+      Old code that has no user-defined classes or functions 'catch', 
      'throw' and 'try' will run without modifications.
-
+      
      Exceptions can be rethrown in catch blocks. Also it is possible to
-      have multiple catch blocks. In that case the caught exception is
-      compared with the classtype of each catch block from top to bottom
+      have multiple catch blocks. In that case the caught exception is 
+      compare with the classtype of each catch block from top to bottom
      and the first block that has a 'instanceof' match gets executed.
-      When the catch block finishes execution continues at the end of
+      When the catch block finishes execution continues at the end of 
      the last catch block. If no catch block has a 'instanceof' match
-      then the next try/catch block is searched until no more try/catch
+      then the next try/catch block is searched until no more try/catch 
      blocks are available. In that case the exception is an uncaught
      exception and the program terminates with showing the exception.

@@ -529,23 +465,24 @@ Changes in the Zend Engine 2.0
            echo $exception;
        }
        ?>
-
+      
      Even though the above example shows that it is possible to define
      exception classes  that don't inherit from Exception it is best to
      do so. This is because the internal Exception class can gather a
      lot of information otherwise not available. The PHP code emulation
      code would look something like shown below. The comments show the
-      meaning of each property. As the code shows it is possible to read
-      any available information by using the getter methods. But since
-      some of the methods are used internally they are marked final. All
-      in all the class is very restrictive because it must be ensured
-      that anything used internally always  works as expected.
-
+      meaning of each proerty and hence there getter methods. As the code
+      shows it is possible to read any available information by using the
+      getter methods. But since some og the methods are used internally
+      they are marked final. All in all the class is very restrictive 
+      because it must be ensured that anything used internally always
+      works as expected.
+      
      Emulating class Exception:

        <?php
        class Exception {
-          function __construct(/*string*/ $message=NULL, /*int*/ $code=0) {
+          function __construct(string $message=NULL, int code=0) {
            if (func_num_args()) {
              $this->message = $message;
            }
@@ -555,15 +492,15 @@ Changes in the Zend Engine 2.0
            $this->trace = debug_backtrace();
            $this->string = StringFormat($this);
          }
-
-          protected $message = 'Unknown exception';  // exception message
+          
+          protected $message = 'Unknown exception';  // exception message 
          protected $code = 0; // user defined exception code
          protected $file;     // source filename of exception
          protected $line;     // source line of exception
-
+  
          private $trace;      // backtrace of exception
          private $string;     // internal only!!
-
+          
          final function getMessage() {
            return $this->message;
          }
@@ -592,37 +529,11 @@ Changes in the Zend Engine 2.0
          }
        }
        ?>
-
+      
      If you derive your exception classes from this Exception base class
-      your exceptions will be nicely shown in the builtin handler for
+      your exceptions will be nicely shown in the builtin handler for 
      uncaught exceptions.

-      Note: The method getMessage() is a final read only access method to
-      the private proeprty message that is set in the constructor. If you
-      feel a need to overwrite the exception display then overload method
-      __toString() in your derived class or implement your own extneral
-      exception display function to accomplish your desired formatting.
-
-      Example:
-
-      <?php
-      function display_exception(Exception $ex)
-      {
-          echo 'Exception: ' . $ex->getMessage() . 'with backtrace: <pre>';
-          echo $ex->getTrace();
-          echo '</pre>';
-      }
-
-      try
-      {
-          // your code here
-      }
-      catch (Exception $ex)
-      {
-          display_exeption($ex);
-      }
-      ?>
-
    * Dereferencing objects returned from functions.

      Example:
@@ -662,9 +573,9 @@ Changes in the Zend Engine 2.0
        }

        print foo::$my_static;
-
+        
        $obj = foo;
-
+        
        print $obj->my_prop;
        ?>

@@ -691,20 +602,27 @@ Changes in the Zend Engine 2.0
    * instanceof.
      New support for an instanceof operator which checks if an object
      is of a certain class or interface type.
-
+      
      Example:
-
+      
      <?php
-
+      
      class Foo {
      }
-
+      
      $obj = new Foo();
      if ($obj instanceof Foo) {
        print "Yay!\n";
      }
      ?>

+    * Static function variables.
+
+      Statics are now treated at compile-time which allows developers
+      to assign variables to statics by reference. This change also
+      greatly improves their performance but means that indirect
+      references to statics will not work anymore.
+
    * Parameters that are passed by reference to a function
      may now have default values.

@@ -720,9 +638,9 @@ Changes in the Zend Engine 2.0

    * __autoload().

-      The __autoload() interceptor function will be automatically called
-      when an undeclared class is to be instantiated. The name of that
-      class will be passed to the __autoload() interceptor function as its
+      The __autoload() interceptor function will be automatically called 
+      when an undeclared class is to be instantiated. The name of that 
+      class will be passed to the __autoload() interceptor function as its 
      only argument. __autoload() must succeed in loading the class. If it
      doesn't then an E_ERROR is emitted.

@@ -799,8 +717,7 @@ Changes in the Zend Engine 2.0
    * Iteration

      Objects may be iterated in an overloaded way when used with
-      foreach. The default behavior is to iterate over all properties
-      with respect to property visibility.
+      foreach. The default behavior is to iterate over all properties.

      Example:

@@ -817,31 +734,34 @@ Changes in the Zend Engine 2.0
            }
        ?>

-      Each class whose instances can be iterated with foreach should
+      TBD: Respect visibility: Show protected only when inside class
+           method and only otherwise public properties only.
+
+      Each class whose instances can be iterated with foreach should 
      implement the empty interface 'Traversable'. Hence any object
      that says it implements 'Traversable' can be used with foreach.

      The interfaces 'IteratorAggregate' and 'Iterator' allow to specify
      how class objects are iterated in PHP code. The first of them simply
-      has a method 'getIterator' which must return an object that either
-      implements the interface 'Iterator' or is instantiated from an
+      has a method 'getIterator' which must return an object that either 
+      implements the interface 'Iterator' or is instantiated from an 
      internal class that can be iterated.

      Example:

        <?php
            class ObjectIterator implements Iterator {
-
+            
                private $obj;
                private $num;
-
+            
                function __construct($obj) {
                    $this->obj = $obj;
                }
                function rewind() {
                    $this->num = 0;
                }
-                function valid() {
+                function hasMore() {
                    return $this->num < $this->obj->max;
                }
                function key() {
@@ -859,82 +779,41 @@ Changes in the Zend Engine 2.0
                    $this->num++;
                }
            }
-
+                
            class Object implements IteratorAggregate {
-
+            
                public $max = 3;
-
+            
                function getIterator() {
                    return new ObjectIterator($this);
                }
-            }
-
+            } 
+            
            $obj = new Object;
-
+            
            // this foreach ...
            foreach($obj as $key => $val) {
                echo "$key = $val\n";
            }
-
+            
            // matches the following 7 lines with the for directive.
            $it = $obj->getIterator();
-            for($it->rewind(); $it->valid(); $it->next()) {
-                $key = $it->key();
-                $val = $it->current();
+            for($it->rewind(); $it->hasMore(); $it->next) {
+                $key = $it->current();
+                $val = $it->key();
                echo "$key = $val\n";
            }
            unset($it);
        ?>

-      The matching for directive is very intersting here since it shows
+      The matching for directive is very intersting here since it shows 
      the use of all abstract methods declared in the interfaces Iterator
      and IteratorAggregate respectively.

-    * Array overloading
-    
-      Objects can be used with Array notation when they implement the 
-      interface ArrayAccess. You cannot use such objects in standard
-      array functions, however you have full control over the array
-      notation. This allows lazy initialization or read only array.
-      
-      Note that setting [] results in a call to offsetSet() with
-      index being NULL. That means that as with standard arrays you 
-      cannot store NULL keys.
-      
-      Example:
-      
-        <?php
-	        class ArrayClass implements ArrayAccess {
-				public $a = array();
-			
-				function offsetExists($index) {
-					return array_key_exists($index, $this->a);
-				}
-				function offsetGet($index) {
-					return $this->a[$index];
-				}
-				function offsetSet($index, $newval) {
-					return $this->a[$index] = $newval;
-				}
-				function offsetUnset($index) {
-					unset($this->a[$index]);
-				}
-			}
-			
-			$obj = new ArrayClass;
-			
-			$obj[0] = 'bla';     // calls offsetSet(0,'bla')
-			$obj[] = 42;         // calls offsetSet(NULL, 42)
-			$x = $obj[0];        // calls offsetGet(0)
-			$b = isset($obj[0]); // calls offsetExists(0)
-			unset($obj[0]);      // calls offsetUnset(0)
-		?>
- 
-
    * __METHOD__

-      The pseudo constant __METHOD__ shows the current class and method
-      when used inside a method and the function when used outside of a
+      The pseudo constant __METHOD__ shows the current class and method 
+      when used inside a method and the function when used outside of a 
      class.

      Example:
@@ -952,13 +831,8 @@ Changes in the Zend Engine 2.0

    * __toString()

-      The magic method __toString() allows to overload the object to
-      string conversion. This conversion is only done automatically for
-      the printing functions (echo, print) but not for other functions
-      that expect strings. Also the function __toString is not used in
-      places where objects are not allowed but strings are like array
-      indices. Note that specialized objects may be converted to a string
-      in any place but without calling __toString().
+      The magic method __toString() allows to overload the object to 
+      string conversion.

      Example:

@@ -966,31 +840,26 @@ Changes in the Zend Engine 2.0
            class Foo {
                function __toString() {
                    return "What ever";
-                }
            }

-            $obj = new Foo;
+            $obj = Foo;
            
            $str = (string) $obj; // call __toString()
            
            echo $obj; // call __toString()
-            
-            $ar = array();
-            $ar[(string)$obj]; // this works
-            $ar[$obj];         // this is not allowed
        ?>

    * Reflection API
-
-      PHP 5 comes with a complete Reflection API that adds the ability to
+      
+      PHP5 comes with a complete reflection API that adds the ability to
      reverse-engineer classes, interfaces, functions and methods as well
      as extensions.
-
-      The Reflection API also offers ways of getting doc comments for
+      
+      The reflection API also offers ways of getting doc comments for
      functions, classes and methods.
-
+      
      Nearly all aspects of object oriented code can be reflected by
-      using the Reflection API which is documented separately:
+      using the reflection API which is documented separatley:
      http://sitten-polizei.de/php/reflection_api/docs/language.reflection.html

      Example:
@@ -1000,14 +869,13 @@ Changes in the Zend Engine 2.0
                public $prop;
                function Func($name) {
                    echo "Hello $name";
-                }
            }

-            ReflectionClass::export('Foo');
-            ReflectionObject::export(new Foo);
-            ReflectionMethod::export('Foo', 'func');
-            ReflectionProperty::export('Foo', 'prop');
-            ReflectionExtension::export('standard');
+            reflection_class::export('Foo');
+            reflection_object::export(new Foo);
+            reflection_method::export('Foo', 'func');
+            reflection_property::export('Foo', 'prop');
+            reflection_extension::export('standard');
        ?>

    * New memory manager
@@ -1018,7 +886,7 @@ Changes in the Zend Engine 2.0
    * Others
      Probably other changes which we forgot to list. This list will be kept up-to-date
      as much as possible.
-
+    

 Changes in the Zend Engine 1.0

@@ -7,20 +7,20 @@
 CFG=Zend - Win32 Release_inline
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "Zend.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Release_inline"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library")
-!MESSAGE 
+!MESSAGE

 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -95,7 +95,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo

-!ENDIF 
+!ENDIF

 # Begin Target

@@ -135,6 +135,10 @@ SOURCE=.\zend_default_classes.c
 # End Source File
 # Begin Source File

+SOURCE=.\zend_interfaces.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_dynamic_array.c
 # End Source File
 # Begin Source File
@@ -175,10 +179,6 @@ SOURCE=.\zend_ini_scanner.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_interfaces.c
-# End Source File
-# Begin Source File
-
 SOURCE=".\zend_language_parser.c"
 # End Source File
 # Begin Source File
@@ -243,10 +243,6 @@ SOURCE=.\zend_stream.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_strtod.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_ts_hash.c
 # End Source File
 # Begin Source File
@@ -295,6 +291,10 @@ SOURCE=.\zend_default_classes.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_interfaces.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_dynamic_array.h
 # End Source File
 # Begin Source File
@@ -351,10 +351,6 @@ SOURCE=.\zend_ini_scanner.h
 # End Source File
 # Begin Source File

-SOURCE=.\zend_interfaces.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_istdiostream.h
 # End Source File
 # Begin Source File
@@ -419,10 +415,6 @@ SOURCE=.\zend_stream.h
 # End Source File
 # Begin Source File

-SOURCE=.\zend_strtod.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_ts_hash.h
 # End Source File
 # Begin Source File
@@ -457,7 +449,7 @@ BuildCmds= \

 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"

-!ENDIF 
+!ENDIF

 # End Source File
 # Begin Source File
@@ -512,7 +504,7 @@ BuildCmds= \
   $(BuildCmds)
 # End Custom Build

-!ENDIF 
+!ENDIF

 # End Source File
 # End Group
@@ -541,7 +533,7 @@ InputPath=.\zend_ini_scanner.l

 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"

-!ENDIF 
+!ENDIF

 # End Source File
 # Begin Source File
@@ -578,7 +570,7 @@ InputPath=".\zend_language_scanner.l"

 # End Custom Build

-!ENDIF 
+!ENDIF

 # End Source File
 # End Group
@@ -4,29 +4,22 @@ dnl
 dnl This file contains Zend specific autoconf functions.
 dnl

-AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[
-AC_MSG_CHECKING(for $1)
-AC_TRY_COMPILE([
-#if HAVE_SYS_TYPES_H  
-#include <sys/types.h>
-#endif
-#if HAVE_INTTYPES_H  
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif],
-[if (($1 *) 0)
-  return 0;
-if (sizeof ($1))
-  return 0;
-],[
-  AC_DEFINE_UNQUOTED([HAVE_]translit($1,a-z_-,A-Z__), 1,[Define if $1 type is present. ])
-  AC_MSG_RESULT(yes)
-], AC_MSG_RESULT(no)
-)dnl
+AC_DEFUN(LIBZEND_BISON_CHECK,[
+
+if test "$YACC" != "bison -y"; then
+    AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.)
+else
+    AC_MSG_CHECKING(bison version)
+    set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /' | tr -d 'a-z'`
+    if test "${1}" = "1" -a "${2}" -lt "28"; then
+        AC_MSG_WARN(You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2}).)
+    fi
+    AC_MSG_RESULT(${1}.${2} (ok))
+fi
+
 ])

-AC_DEFUN([LIBZEND_BASIC_CHECKS],[
+AC_DEFUN(LIBZEND_BASIC_CHECKS,[

 AC_REQUIRE([AC_PROG_YACC])
 AC_REQUIRE([AC_PROG_CC])
@@ -49,8 +42,6 @@ if test "$ac_cv_prog_gcc" = "yes" -a "`uname -s`" = "Rhapsody"; then
 fi

 AC_CHECK_HEADERS(
-inttypes.h \
-stdint.h \
 limits.h \
 malloc.h \
 string.h \
@@ -67,12 +58,12 @@ dlfcn.h)
 AC_TYPE_SIZE_T
 AC_TYPE_SIGNAL

-AC_DEFUN([LIBZEND_LIBDL_CHECKS],[
+AC_DEFUN(LIBZEND_LIBDL_CHECKS,[
 AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
 AC_CHECK_FUNC(dlopen,[AC_DEFINE(HAVE_LIBDL, 1,[ ])])
 ])

-AC_DEFUN([LIBZEND_DLSYM_CHECK],[
+AC_DEFUN(LIBZEND_DLSYM_CHECK,[
 dnl
 dnl Ugly hack to check if dlsym() requires a leading underscore in symbol name.
 dnl
@@ -91,10 +82,6 @@ dnl This is required for QNX and may be some BSD derived systems
 AC_CHECK_TYPE( uint, unsigned int )
 AC_CHECK_TYPE( ulong, unsigned long )

-dnl Check if int32_t and uint32_t are defined
-LIBZEND_CHECK_INT_TYPE(int32_t)
-LIBZEND_CHECK_INT_TYPE(uint32_t)
-
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_FUNC_MEMCMP
@@ -108,7 +95,7 @@ ZEND_FP_EXCEPT
 	
 ])

-AC_DEFUN([LIBZEND_ENABLE_DEBUG],[
+AC_DEFUN(LIBZEND_ENABLE_DEBUG,[

 AC_ARG_ENABLE(debug,
 [  --enable-debug          Compile with debugging symbols],[
@@ -119,27 +106,10 @@ AC_ARG_ENABLE(debug,

 ])

-AC_DEFUN([LIBZEND_OTHER_CHECKS],[
-
-AC_ARG_WITH(zend-vm,
-[  --with-zend-vm=TYPE     Set virtual machine dispatch method. Type is
-                          one of "CALL", "SWITCH" or "GOTO" [TYPE=CALL]],[
-  PHP_ZEND_VM=$withval
-],[
-  PHP_ZEND_VM=CALL
-])
-
-AC_ARG_ENABLE(zend-memory-manager,
-[  --disable-zend-memory-manager
-                          Disable the Zend memory manager - FOR DEVELOPERS ONLY!!],
-[
-  ZEND_USE_ZEND_ALLOC=$enableval
-], [
-  ZEND_USE_ZEND_ALLOC=yes
-])
+AC_DEFUN(LIBZEND_OTHER_CHECKS,[

 AC_ARG_ENABLE(maintainer-zts,
-[  --enable-maintainer-zts Enable thread safety - for code maintainers only!!],[
+[  --enable-maintainer-zts Enable thread safety - for code maintainers only],[
  ZEND_MAINTAINER_ZTS=$enableval
 ],[
  ZEND_MAINTAINER_ZTS=no
@@ -147,32 +117,26 @@ AC_ARG_ENABLE(maintainer-zts,

 AC_ARG_ENABLE(inline-optimization,
 [  --disable-inline-optimization 
-                          If building zend_execute.lo fails, try this switch],[
+                          If building zend_execute.lo fails, try this switch.],[
  ZEND_INLINE_OPTIMIZATION=$enableval
 ],[
  ZEND_INLINE_OPTIMIZATION=yes
 ])

 AC_ARG_ENABLE(memory-limit,
-[  --enable-memory-limit   Compile with memory limit support], [
+[  --enable-memory-limit   Compile with memory limit support. ], [
  ZEND_MEMORY_LIMIT=$enableval
 ],[
  ZEND_MEMORY_LIMIT=no
 ])

 AC_ARG_ENABLE(zend-multibyte,
-[  --enable-zend-multibyte Compile with zend multibyte support], [
+[  --enable-zend-multibyte Compile with zend multibyte support. ], [
  ZEND_MULTIBYTE=$enableval
 ],[
  ZEND_MULTIBYTE=no
 ])

-AC_MSG_CHECKING([virtual machine dispatch method])
-AC_MSG_RESULT($PHP_ZEND_VM)
-
-AC_MSG_CHECKING(whether to enable the Zend memory manager)
-AC_MSG_RESULT($ZEND_USE_ZEND_ALLOC)
-
 AC_MSG_CHECKING(whether to enable thread-safety)
 AC_MSG_RESULT($ZEND_MAINTAINER_ZTS)

@@ -188,19 +152,6 @@ AC_MSG_RESULT($ZEND_DEBUG)
 AC_MSG_CHECKING(whether to enable Zend multibyte)
 AC_MSG_RESULT($ZEND_MULTIBYTE)
 	
-case $PHP_ZEND_VM in
-  SWITCH)
-    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method])
-    ;;
-  GOTO)
-    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_GOTO,[virtual machine dispatch method])
-    ;;
-  *)
-    PHP_ZEND_VM=CALL
-    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_CALL,[virtual machine dispatch method])
-    ;;
-esac
-
 if test "$ZEND_DEBUG" = "yes"; then
  AC_DEFINE(ZEND_DEBUG,1,[ ])
  echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
@@ -216,12 +167,6 @@ fi

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

-if test "$ZEND_USE_ZEND_ALLOC" = "yes"; then
-  AC_DEFINE(USE_ZEND_ALLOC,1,[Use Zend memory manager])
-else
-  AC_DEFINE(USE_ZEND_ALLOC,0,[Use Zend memory manager])
-fi
-
 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
  AC_DEFINE(ZTS,1,[ ])
  CFLAGS="$CFLAGS -DZTS"
@@ -250,13 +195,6 @@ AC_C_INLINE

 AC_SUBST(INLINE_CFLAGS)

-AC_MSG_CHECKING(target system is Darwin)
-if echo "$target" | grep "darwin" > /dev/null; then
-  AC_DEFINE([DARWIN], 1, [Define if the target system is darwin])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi

 dnl test and set the alignment define for ZEND_MM
 dnl this also does the logarithmic test for ZEND_MM.
@@ -299,9 +237,6 @@ int main()
  LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ])
  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ]) 
-], [], [
-  dnl cross-compile needs something here
-  LIBZEND_MM_ALIGN=8
 ])

 AC_MSG_RESULT(done)
@@ -309,7 +244,7 @@ AC_MSG_RESULT(done)
 ])


-AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
+AC_DEFUN(LIBZEND_CPLUSPLUS_CHECKS,[

 ])

@@ -160,11 +160,11 @@ SOURCE=.\zend_default_classes.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_dynamic_array.c
+SOURCE=.\zend_interfaces.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_exceptions.c
+SOURCE=.\zend_dynamic_array.c
 # End Source File
 # Begin Source File

@@ -204,10 +204,6 @@ SOURCE=.\zend_ini_scanner.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_interfaces.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_iterators.c
 # End Source File
 # Begin Source File
@@ -276,10 +272,6 @@ SOURCE=.\zend_stream.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_strtod.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_ts_hash.c
 # End Source File
 # Begin Source File
@@ -328,6 +320,10 @@ SOURCE=.\zend_default_classes.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_interfaces.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_dynamic_array.h
 # End Source File
 # Begin Source File
@@ -336,10 +332,6 @@ SOURCE=.\zend_errors.h
 # End Source File
 # Begin Source File

-SOURCE=.\zend_exceptions.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_execute.h
 # End Source File
 # Begin Source File
@@ -384,10 +376,6 @@ SOURCE=.\zend_ini_scanner.h
 # End Source File
 # Begin Source File

-SOURCE=.\zend_interfaces.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_istdiostream.h
 # End Source File
 # Begin Source File
@@ -456,10 +444,6 @@ SOURCE=.\zend_stream.h
 # End Source File
 # Begin Source File

-SOURCE=.\zend_strtod.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_ts_hash.h
 # End Source File
 # Begin Source File
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2004 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -23,7 +23,9 @@
 #define ZEND_DLEXPORT
 #define ZEND_DLIMPORT

+#ifndef NETWARE
@TOP@
+#endif

 #undef uint
 #undef ulong
@@ -31,9 +33,9 @@
 /* Define if you want to enable memory limit support */
 #define MEMORY_LIMIT 0

+#ifndef NETWARE
@BOTTOM@
-
-#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
+#endif

 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
@@ -43,10 +45,6 @@
 # include <sys/types.h>
 #endif

-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
 #ifdef HAVE_IEEEFP_H
 # include <ieeefp.h>
 #endif
@@ -65,16 +63,11 @@ int zend_sprintf(char *buffer, const char *format, ...);

 #include <math.h>

-/* To enable the is_nan, is_infinite and is_finite PHP functions */
-#ifdef NETWARE
-	#define HAVE_ISNAN 1
-	#define HAVE_ISINF 1
-	#define HAVE_ISFINITE 1
-#endif
-
 #ifndef zend_isnan
 #ifdef HAVE_ISNAN
 #define zend_isnan(a) isnan(a)
+#elif defined(NAN)
+#define zend_isnan(a) (((a)==NAN)?1:0)
 #elif defined(HAVE_FPCLASS)
 #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
 #else
@@ -103,8 +96,6 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
 #endif

-#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
-
 /*
 * Local variables:
 * tab-width: 4
@@ -2,37 +2,7 @@ dnl $Id$
 dnl
 dnl This file contains local autoconf functions.

-AC_DEFUN([LIBZEND_BISON_CHECK],[
-  # we only support certain bison versions
-  bison_version_list="1.28 1.35 1.75 1.875 2.0"
-
-  # for standalone build of Zend Engine
-  test -z "$SED" && SED=sed
-
-  if test "$YACC"; then
-    AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-      set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /'|tr -d a-z`
-      bison_version="${1}.${2}"
-      php_cv_bison_version=invalid
-      for bison_check_version in $bison_version_list; do
-        if test "$bison_version" = "$bison_check_version"; then
-          php_cv_bison_version="$bison_check_version (ok)"
-        fi
-      done
-    ])
-  else
-    bison_version=none
-  fi
-  case $php_cv_bison_version in
-    ""|invalid[)]
-      bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list  (found: $bison_version)."
-      AC_MSG_WARN([$bison_msg])
-      YACC="exit 0;"
-      ;;
-  esac
-])
-
-AC_DEFUN([ZEND_FP_EXCEPT],[
+AC_DEFUN(ZEND_FP_EXCEPT,[
  AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
    AC_TRY_COMPILE([
 #include <floatingpoint.h>
@@ -53,7 +23,7 @@ fp_except x = (fp_except) 0;
 dnl
 dnl Check for broken sprintf()
 dnl
-AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
+AC_DEFUN(AC_ZEND_BROKEN_SPRINTF,[
  AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
    AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
      ac_cv_broken_sprintf=no
@@ -71,34 +41,7 @@ AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
  AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken])
 ])

-dnl
-dnl AC_ZEND_C_BIGENDIAN
-dnl Replacement macro for AC_C_BIGENDIAN
-dnl
-AC_DEFUN([AC_ZEND_C_BIGENDIAN],
-[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian_php,
- [
-  ac_cv_c_bigendian_php=unknown
-  AC_TRY_RUN(
-  [
-int main(void)
-{
-        short one = 1;
-        char *cp = (char *)&one;
-
-        if (*cp == 0) {
-                return(0);
-        } else {
-                return(1);
-        }
-}
-  ], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown])
- ])
- if test $ac_cv_c_bigendian_php = yes; then
-   AC_DEFINE(WORDS_BIGENDIAN, [], [Define if processor uses big-endian word])
- fi
-])
-
-AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
+AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
+
@@ -1,412 +0,0 @@
-<?php
-
-function simple() {
-  for ($i = 0; $i < 1000000; $i++) 
-    $a++;
-
-  for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++) 
-    $thisisanotherlongname++;
-}
-
-/****/
-
-function simplecall() {
-  for ($i = 0; $i < 1000000; $i++) 
-    strlen("hallo");
-}
-
-/****/
-
-function hallo($a) {
-}
-
-function simpleucall() {
-  for ($i = 0; $i < 1000000; $i++) 
-    hallo("hallo");
-}
-
-/****/
-
-function simpleudcall() {
-  for ($i = 0; $i < 1000000; $i++) 
-    hallo2("hallo");
-}
-
-function hallo2($a) {
-}
-
-/****/
-
-function mandel() {
-  $w1=50;
-  $h1=150;
-  $recen=-.45;
-  $imcen=0.0;
-  $r=0.7;
-  $s=0;  $rec=0;  $imc=0;  $re=0;  $im=0;  $re2=0;  $im2=0;
-  $x=0;  $y=0;  $w2=0;  $h2=0;  $color=0;
-  $s=2*$r/$w1;
-  $w2=40;
-  $h2=12;
-  for ($y=0 ; $y<=$w1; $y=$y+1) {
-    $imc=$s*($y-$h2)+$imcen;
-    for ($x=0 ; $x<=$h1; $x=$x+1) {
-      $rec=$s*($x-$w2)+$recen;
-      $re=$rec;
-      $im=$imc;
-      $color=1000;
-      $re2=$re*$re;
-      $im2=$im*$im;
-      while( ((($re2+$im2)<1000000) && $color>0)) {
-        $im=$re*$im*2+$imc;
-        $re=$re2-$im2+$rec;
-        $re2=$re*$re;
-        $im2=$im*$im;
-        $color=$color-1;
-      }
-      if ( $color==0 ) {
-        print "_";
-      } else {
-        print "#";
-      }
-    }
-    print "<br>".$vbCr;
-    flush();
-  }
-}
-
-/****/
-
-function mandel2() {
-  $b = " .:,;!/>)|&IH%*#";
-  //float r, i, z, Z, t, c, C;
-  for ($y=30; printf("\n"), $C = $y*0.1 - 1.5, $y--;){
-    for ($x=0; $c = $x*0.04 - 2, $z=0, $Z=0, $x++ < 75;){
-      for ($r=$c, $i=$C, $k=0; $t = $z*$z - $Z*$Z + $r, $Z = 2*$z*$Z + $i, $z=$t, $k<5000; $k++)
-        if ($z*$z + $Z*$Z > 500000) break;
-      echo $b[$k%16];
-    }
-  }
-}
-
-/****/
-
-function Ack($m, $n){
-  if($m == 0) return $n+1;
-  if($n == 0) return Ack($m-1, 1);
-  return Ack($m - 1, Ack($m, ($n - 1)));
-}
-
-function ackermann($n) {
-  $r = Ack(3,$n);
-  print "Ack(3,$n): $r\n";
-}
-
-/****/
-
-function ary($n) {
-  for ($i=0; $i<$n; $i++) {
-    $X[$i] = $i;
-  }
-  for ($i=$n-1; $i>=0; $i--) {
-    $Y[$i] = $X[$i];
-  }
-  $last = $n-1;
-  print "$Y[$last]\n";
-}
-
-/****/
-
-function ary2($n) {
-  for ($i=0; $i<$n;) {
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-    $X[$i] = $i; ++$i;
-  }
-  for ($i=$n-1; $i>=0; $i--) {
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-    $Y[$i] = $X[$i]; --$i;
-  }
-  $last = $n-1;
-  print "$Y[$last]\n";
-}
-
-/****/
-
-function ary3($n) {
-  for ($i=0; $i<$n; $i++) {
-    $X[$i] = $i + 1;
-  }
-  for ($k=0; $k<1000; $k++) {
-    for ($i=$n-1; $i>=0; $i--) {
-      $Y[$i] += $X[$i];
-    }
-  }
-  $last = $n-1;
-  print "$Y[0] $Y[$last]\n";
-}
-
-/****/
-
-function fibo_r($n){
-    return(($n < 2) ? 1 : fibo_r($n - 2) + fibo_r($n - 1));
-}
-
-function fibo($n) {
-  $r = fibo_r($n);
-  print "$r\n";
-}
-
-/****/
-
-function hash($n) {
-  for ($i = 1; $i <= $n; $i++) {
-    $X[dechex($i)] = $i;
-  }
-  for ($i = $n; $i > 0; $i--) {
-    if ($X[$i]) { $c++; }
-  }
-  print "$c\n";
-}
-
-/****/
-
-function hash2($n) {
-  for ($i = 0; $i < 10000; $i++) {
-    $hash1["foo_$i"] = $i;
-  }
-  for ($i = $n; $i > 0; $i--) {
-    foreach($hash1 as $key => $value) $hash2[$key] += $value;
-  }
-  print "$hash1[foo_1] $hash1[foo_9999] $hash2[foo_1] $hash2[foo_9999]\n";
-}
-
-/****/
-
-function gen_random ($n) {
-    global $LAST;
-    return( ($n * ($LAST = ($LAST * IA + IC) % IM)) / IM );
-}
-
-function heapsort_r($n, &$ra) {
-    $l = ($n >> 1) + 1;
-    $ir = $n;
-
-    while (1) {
-	if ($l > 1) {
-	    $rra = $ra[--$l];
-	} else {
-	    $rra = $ra[$ir];
-	    $ra[$ir] = $ra[1];
-	    if (--$ir == 1) {
-		$ra[1] = $rra;
-		return;
-	    }
-	}
-	$i = $l;
-	$j = $l << 1;
-	while ($j <= $ir) {
-	    if (($j < $ir) && ($ra[$j] < $ra[$j+1])) {
-		$j++;
-	    }
-	    if ($rra < $ra[$j]) {
-		$ra[$i] = $ra[$j];
-		$j += ($i = $j);
-	    } else {
-		$j = $ir + 1;
-	    }
-	}
-	$ra[$i] = $rra;
-    }
-}
-
-function heapsort($N) {
-  global $LAST;
-
-  define("IM", 139968);
-  define("IA", 3877);
-  define("IC", 29573);
-
-  $LAST = 42;
-  for ($i=1; $i<=$N; $i++) {
-    $ary[$i] = gen_random(1);
-  }
-  heapsort_r($N, $ary);
-  printf("%.10f\n", $ary[$N]);
-}
-
-/****/
-
-function mkmatrix ($rows, $cols) {
-    $count = 1;
-    $mx = array();
-    for ($i=0; $i<$rows; $i++) {
-	for ($j=0; $j<$cols; $j++) {
-	    $mx[$i][$j] = $count++;
-	}
-    }
-    return($mx);
-}
-
-function mmult ($rows, $cols, $m1, $m2) {
-    $m3 = array();
-    for ($i=0; $i<$rows; $i++) {
-	for ($j=0; $j<$cols; $j++) {
-	    $x = 0;
-	    for ($k=0; $k<$cols; $k++) {
-		$x += $m1[$i][$k] * $m2[$k][$j];
-	    }
-	    $m3[$i][$j] = $x;
-	}
-    }
-    return($m3);
-}
-
-function matrix($n) {
-  $SIZE = 30;
-  $m1 = mkmatrix($SIZE, $SIZE);
-  $m2 = mkmatrix($SIZE, $SIZE);
-  while ($n--) {
-    $mm = mmult($SIZE, $SIZE, $m1, $m2);
-  }
-  print "{$mm[0][0]} {$mm[2][3]} {$mm[3][2]} {$mm[4][4]}\n";
-}
-
-/****/
-
-function nestedloop($n) {
-  $x = 0;
-  for ($a=0; $a<$n; $a++)
-    for ($b=0; $b<$n; $b++)
-      for ($c=0; $c<$n; $c++)
-        for ($d=0; $d<$n; $d++)
-          for ($e=0; $e<$n; $e++)
-            for ($f=0; $f<$n; $f++)
-             $x++;
-  print "$x\n";
-}
-
-/****/
-
-function sieve($n) {
-  $count = 0;
-  while ($n-- > 0) {
-    $count = 0;
-    $flags = range (0,8192);
-    for ($i=2; $i<8193; $i++) {
-      if ($flags[$i] > 0) {
-        for ($k=$i+$i; $k <= 8192; $k+=$i) {
-          $flags[$k] = 0;
-        }
-        $count++;
-      }
-    }
-  }
-  print "Count: $count\n";
-}
-
-/****/
-
-function strcat($n) {
-  $str = "";
-  while ($n-- > 0) {
-    $str .= "hello\n";
-  }
-  $len = strlen($str);
-  print "$len\n";
-}
-
-/*****/
-
-function getmicrotime()
-{
-  $t = gettimeofday();
-  return ($t['sec'] + $t['usec'] / 1000000);
-}
-
-function start_test()
-{
-	ob_start();
-  return getmicrotime();
-}
-
-function end_test($start, $name)
-{
-  global $total;
-  $end = getmicrotime();
-  ob_end_clean();
-  $total += $end-$start;
-  $num = number_format($end-$start,3);
-  $pad = str_repeat(" ", 24-strlen($name)-strlen($num));
-
-  echo $name.$pad.$num."\n";
-	ob_start();
-  return getmicrotime();
-}
-
-function total()
-{
-  global $total;
-  $pad = str_repeat("-", 24);
-  echo $pad."\n";
-  $num = number_format($total,3);
-  $pad = str_repeat(" ", 24-strlen("Total")-strlen($num));
-  echo "Total".$pad.$num."\n";
-}
-
-$t0 = $t = start_test();
-simple();
-$t = end_test($t, "simple");
-simplecall();
-$t = end_test($t, "simplecall");
-simpleucall();
-$t = end_test($t, "simpleucall");
-simpleudcall();
-$t = end_test($t, "simpleudcall");
-mandel();
-$t = end_test($t, "mandel");
-mandel2();
-$t = end_test($t, "mandel2");
-ackermann(7);
-$t = end_test($t, "ackermann(7)");
-ary(50000);
-$t = end_test($t, "ary(50000)");
-ary2(50000);
-$t = end_test($t, "ary2(50000)");
-ary3(2000);
-$t = end_test($t, "ary3(2000)");
-fibo(30);
-$t = end_test($t, "fibo(30)");
-hash(50000);
-$t = end_test($t, "hash(50000)");
-hash2(50);
-$t = end_test($t, "hash2(50)");
-heapsort(20000);
-$t = end_test($t, "heapsort(20000)");
-matrix(20);
-$t = end_test($t, "matrix(20)");
-nestedloop(12);
-$t = end_test($t, "nestedloop(12)");
-sieve(30);
-$t = end_test($t, "sieve(30)");
-strcat(200000);
-$t = end_test($t, "strcat(200000)");
-total($t0, "Total");
-?>
@@ -10,14 +10,10 @@ AC_PROG_CC
 AM_PROG_LEX
 AM_PROG_CC_STDC
 ZEND_VERSION=$VERSION
-AC_ZEND_C_BIGENDIAN

 dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1

-AC_CHECK_SIZEOF(long, 8)
-AC_CHECK_SIZEOF(int, 4)
-
 sinclude(Zend.m4)

 LIBZEND_BASIC_CHECKS
@@ -1,19 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2005 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors:                                                             |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
@@ -1,15 +0,0 @@
--TEST--
-Array type hint
--FILE--
-<?php
-function foo(array $a) {
-	echo count($a)."\n";
-}
-
-foo(array(1,2,3));
-foo(123);
-?>
--EXPECTF--
-3
-
-Fatal error: Argument 1 must be an array in %sarray_type_hint_001.php on line 2
@@ -39,5 +39,5 @@ echo "Done\n";
 2
 3
 Done
-test::__destruct
 test::destructor
+test::__destruct
@@ -7,9 +7,9 @@ Bug #22836 (returning references to NULL)
 function &f()
 {
 	$x = "foo";
-	var_dump($x);
-	print "'$x'\n";
-	return ($a);
+        var_dump($x);
+        print "'$x'\n";
+        return ($a);
 }
 for ($i = 0; $i < 8; $i++) {
 	$h =& f();
@@ -18,17 +18,7 @@ for ($i = 0; $i < 8; $i++) {
 --EXPECTF--
 string(3) "foo"
 'foo'
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Fatal error: Only variables or references can be returned by reference in %s on line %d
@@ -15,7 +15,7 @@ class Test {
        }
        else
        {
-            return clone $this;
+            return $this->__clone();
        }
    }
 }
@@ -24,5 +24,5 @@ $test2 = $test->__copy();
 var_dump($test2);
 ?>
 --EXPECT--
-object(Test)#2 (0) {
+object(test)#2 (0) {
 }
@@ -1,9 +0,0 @@
--TEST--
-Bug #26077  	Memory leaks when creating an instance of an object
--FILE--
-<?php
-class foo {} new foo();
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -1,5 +1,5 @@
 --TEST--
-Bug #26166 (__toString() crash when no values returned)
+Bug #26166: __toString() crash when no values returned
 --FILE--
 <?php
 class Foo
@@ -64,4 +64,4 @@ Hello World!
 Got the exception
 ===NONE===

-Fatal error: Method None::__toString() must return a string value in %sbug26166.php on line %d
+Fatal error: Method none::__toString() must return a string value in %sbug26166.php on line %d
@@ -1,29 +0,0 @@
--TEST--
-Bug #26229 (getIterator() segfaults when it returns arrays or scalars)
--FILE--
-<?php
-
-class array_iterator implements IteratorAggregate {
-        public function getIterator() {
-                return array('foo', 'bar');     
-        }
-}
-
-$obj = new array_iterator;
-
-try
-{
-	foreach ($obj as $property => $value)
-	{
-		var_dump($value);
-	}
-}
-catch(Exception $e)
-{
-	echo $e->getMessage() . "\n";
-}
-?>
-===DONE===
--EXPECTF--
-Objects returned by array_iterator::getIterator() must be traversable or implement interface Iterator
-===DONE===
@@ -1,22 +0,0 @@
--TEST--
-Bug #26696 (crash in switch() when string index is used)
--FILE--
-<?php
-$str = 'asdd/?';
-$len = strlen($str);
-for ($i = 0; $i < $len; $i++) {
-	switch ($str[$i]) {
-	case '?':
-		echo "?+\n";
-		break;
-	default:
-		echo $str[$i].'-';
-		break;
-	}
-}
-
-?>
-===DONE===
--EXPECT--
-a-s-d-d-/-?+
-===DONE===
@@ -1,24 +0,0 @@
--TEST--
-Bug #26697 (calling class_exists on a nonexistent class in __autoload results in segfault)
--SKIPIF--
-<?php if (function_exists('__autoload')) die('skip __autoload() declared in auto_prepend_file');?>
--FILE--
-<?php
-
-function __autoload($name)
-{
-	echo __METHOD__ . "($name)\n";
-	var_dump(class_exists('NotExistingClass'));
-	echo __METHOD__ . "($name), done\n";
-}
-
-var_dump(class_exists('NotExistingClass'));
-
-?>
-===DONE===
--EXPECTF--
-__autoload(NotExistingClass)
-bool(false)
-__autoload(NotExistingClass), done
-bool(false)
-===DONE===
@@ -1,73 +0,0 @@
--TEST--
-Bug #26698 (Thrown exceptions while evaluting argument to pass as parameter crash PHP)
--FILE--
-<?php
-
-ini_set("report_memleaks", 0);  // the exception thrown in this test results in a memory leak, which is fine
-
-class Object
-{
-	function getNone()
-	{
-		throw new Exception('NONE');
-	}
-}
-
-class Proxy
-{
-	function three($a, $b, $c)
-	{
-	}
-
-	function callOne()
-	{
-		try
-		{
-			$res = new Object();
-			$this->three($res->getNone());
-		}
-		catch(Exception $e)
-		{
-			echo 'Caught: '.$e->getMessage()."\n";
-		}
-	}
-
-	function callTwo()
-	{
-		try
-		{
-			$res = new Object();
-			$this->three(1, $res->getNone());
-		}
-		catch(Exception $e)
-		{
-			echo 'Caught: '.$e->getMessage()."\n";
-		}
-	}
-
-	function callThree()
-	{
-		try
-		{
-			$res = new Object();
-			$this->three(1, 2, $res->getNone());
-		}
-		catch(Exception $e)
-		{
-			echo 'Caught: '.$e->getMessage()."\n";
-		}
-	}
-}
-
-$p = new Proxy();
-
-$p->callOne();
-$p->callTwo();
-$p->callThree();
-?>
-===DONE===
--EXPECT--
-Caught: NONE
-Caught: NONE
-Caught: NONE
-===DONE===
@@ -1,22 +0,0 @@
--TEST--
-Bug #26801 (switch ($a{0}) crash)
--FILE--
-<?php
-
-$a = '11';
-$b = $a{0};
-switch ($b) {
-	case '-':
-		break;
-}
-
-$a = '22';
-switch ($a{0}) {
-	case '-':
-		break;
-}
-
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -1,37 +0,0 @@
--TEST--
-Bug #26802 (Can't call static method using a variable)
--FILE--
-<?php
-
-function global_func()
-{
-	echo __METHOD__ . "\n";
-}
-
-$function = 'global_func';
-$function();
-
-class foo
-{
-	static $method = 'global_func';
-	
-	static public function foo_func()
-	{
-		echo __METHOD__ . "\n";
-	}
-}
-
-/* The following is a BC break with PHP 4 where it would 
- * call foo::fail. In PHP 5 we first evaluate static class 
- * properties and then do the function call.
- */
-$method = 'foo_func';
-foo::$method();
-
-
-?>
-===DONE===
--EXPECT--
-global_func
-foo::foo_func
-===DONE===
@@ -1,28 +0,0 @@
--TEST--
-Bug #27268 (Bad references accentuated by clone)
--FILE--
-<?php
-class A
-{
-    public function &getA()
-    {
-        return $this->a;
-    }
-}
-
-$A = new A;
-$A->a = array(1);
-$x = $A->getA();
-$clone = clone $A;
-$clone->a = array();
-print_r($A);
-?>
--EXPECT--
-A Object
-(
-    [a] => Array
-        (
-            [0] => 1
-        )
-
-)
@@ -1,23 +0,0 @@
--TEST--
-Bug #27304
--FILE--
-<?php
-
-class Staticexample
-{
-	static function test()
-	{
-		var_dump(isset($this));
-	}
-}
-
-$b = new Staticexample();
-Staticexample::test();
-$b->test();
-        
-?>
-===DONE===
--EXPECT--
-bool(false)
-bool(false)
-===DONE===
@@ -1,12 +0,0 @@
--TEST--
-Bug #27598 (list() array key assignment causes HUGE memory leak)
--FILE--
-<?php
-list($out[0]) = array(1);
-var_dump($out);
-?>
--EXPECT--
-array(1) {
-  [0]=>
-  int(1)
-}
@@ -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
-)
@@ -1,18 +0,0 @@
--TEST--
-Bug #27669 (PHP 5 didn't support all possibilities for calling static methods dynamically)
--FILE--
-<?php
-	error_reporting(E_ALL & !E_STRICT);
-
-	class A {
-		function hello() {
-			echo "Hello World\n";
-		}
-	}
-	$y[0] = 'hello';
-	A::$y[0]();
-?>
-===DONE===
--EXPECTF--
-Hello World
-===DONE===
@@ -1,10 +0,0 @@
--TEST--
-Bug #27731 (error_reporing() call inside @ block does not work correctly)
--FILE--
-<?php
-	error_reporting(E_ALL ^ E_NOTICE);
-	@error_reporting(E_WARNING);
-	var_dump(error_reporting());
-?>
--EXPECT--
-int(2)
@@ -1,72 +0,0 @@
--TEST--
-Bug #27798 (private / protected variables not exposed by get_object_vars() inside class)
--FILE--
-<?php
-
-class Base
-{
-	public    $Foo = 1;
-	protected $Bar = 2;
-	private   $Baz = 3;
-	
-	function __construct()
-	{
-		echo __METHOD__ . "\n";
-		var_dump(get_object_vars($this));
-	}
-}
-
-class Child extends Base
-{
-	private   $Baz = 4;
-
-	function __construct()
-	{
-		parent::__construct();
-		echo __METHOD__ . "\n";
-		var_dump(get_object_vars($this));
-	}
-}
-
-var_dump(get_object_vars(new Base));
-var_dump(get_object_vars(new Child));
-
-?>
-===DONE===
--EXPECT--
-Base::__construct
-array(3) {
-  ["Foo"]=>
-  int(1)
-  ["Bar"]=>
-  int(2)
-  ["Baz"]=>
-  int(3)
-}
-array(1) {
-  ["Foo"]=>
-  int(1)
-}
-Base::__construct
-array(3) {
-  ["Baz"]=>
-  int(4)
-  ["Foo"]=>
-  int(1)
-  ["Bar"]=>
-  int(2)
-}
-Child::__construct
-array(3) {
-  ["Baz"]=>
-  int(4)
-  ["Foo"]=>
-  int(1)
-  ["Bar"]=>
-  int(2)
-}
-array(1) {
-  ["Foo"]=>
-  int(1)
-}
-===DONE===
@@ -1,46 +0,0 @@
--TEST--
-Bug #28072 (static array with some constant keys will be incorrectly ordered)
--FILE--
-<?php
-define("FIRST_KEY", "a");
-define("THIRD_KEY", "c");
-                                                                        
-                 
-function test()
-{
-        static $arr = array(
-                FIRST_KEY => "111",
-                "b" => "222",
-                THIRD_KEY => "333",
-                "d" => "444"
-        );
-        print_r($arr);
-}
-                                                                        
-function test2()
-{
-        static $arr = array(
-                FIRST_KEY => "111",
-                "a" => "222",
-                "c" => "333",
-                THIRD_KEY => "444"
-        );
-        print_r($arr);
-}
-                 
-test();
-test2();
-?>
--EXPECT--
-Array
-(
-    [a] => 111
-    [b] => 222
-    [c] => 333
-    [d] => 444
-)
-Array
-(
-    [a] => 111
-    [c] => 444
-)
@@ -1,23 +0,0 @@
--TEST--
-Bug #28377 (debug_backtrace is intermittently passing args)
--FILE--
-<?php
-function doit($a, $b)
-{
-  $trace = debug_backtrace();
-  custom_callback('dereferenced', $trace);
-  custom_callback('direct', debug_backtrace());
-}
-  
-function custom_callback($traceName, $btInfo)
-{
-  echo $traceName ." -- args: ";
-  echo isset($btInfo[0]['args']) ? count($btInfo[0]['args']) : 'does not exist';
-  echo "\n";
-}
-  
-doit('a','b');
-?>
--EXPECT--
-dereferenced -- args: 2
-direct -- args: 2
@@ -1,65 +0,0 @@
--TEST--
-Bug #28442 (Changing a static variables in a class changes it across sub/super classes.)
--FILE--
-<?php
-
-class ClassA
-{
-   static $prop;
-}
-
-class ClassB extends ClassA
-{
-   static $prop;
-}
-
-class ClassC extends ClassB
-{
-}
-
-echo "===INIT===\n";
-ClassA::$prop = 'A';
-ClassB::$prop = 'B';
-ClassC::$prop = 'C';
-var_dump(ClassA::$prop);
-var_dump(ClassB::$prop);
-var_dump(ClassC::$prop);
-
-echo "===SetA===\n";
-ClassA::$prop = 'A2';
-var_dump(ClassA::$prop);
-var_dump(ClassB::$prop);
-var_dump(ClassC::$prop);
-
-echo "===SetB===\n";
-ClassB::$prop = 'B2';
-var_dump(ClassA::$prop);
-var_dump(ClassB::$prop);
-var_dump(ClassC::$prop);
-
-echo "===SetC===\n";
-ClassC::$prop = 'C2';
-var_dump(ClassA::$prop);
-var_dump(ClassB::$prop);
-var_dump(ClassC::$prop);
-
-?>
-===DONE===
--EXPECTF--
-===INIT===
-string(1) "A"
-string(1) "C"
-string(1) "C"
-===SetA===
-string(2) "A2"
-string(1) "C"
-string(1) "C"
-===SetB===
-string(2) "A2"
-string(2) "B2"
-string(2) "B2"
-===SetC===
-string(2) "A2"
-string(2) "C2"
-string(2) "C2"
-===DONE===
@@ -1,74 +0,0 @@
--TEST--
-Bug #28444 (Cannot access undefined property for object with overloaded property access)
--FILE--
-<?php
-
-class Object
-{
-	public $x;
-
-	function __construct($x)
-	{
-		$this->x = $x;
-	}
-}
-
-class Overloaded
-{
-	public $props = array();
-	public $x;
-
-	function __construct($x)
-	{
-		$this->x = new Object($x);
-	}
-
-	function __get($prop)
-	{
-		echo __METHOD__ . "($prop)\n";
-		return $this->props[$prop];
-	}
-
-	function __set($prop, $val)
-	{
-		echo __METHOD__ . "($prop,$val)\n";
-		$this->props[$prop] = $val;
-	}
-}
-$y = new Overloaded(2);
-var_dump($y->x);
-var_dump($y->x->x);
-var_dump($y->x->x = 3);
-var_dump($y->y = 3);
-var_dump($y->y);
-var_dump($y->z = new Object(4));
-var_dump($y->z->x);
-$t = $y->z;
-var_dump($t->x = 5);
-var_dump($y->z->x = 6);
-
-?>
-===DONE===
--EXPECTF--
-object(Object)#%d (1) {
-  ["x"]=>
-  int(2)
-}
-int(2)
-int(3)
-Overloaded::__set(y,3)
-int(3)
-Overloaded::__get(y)
-int(3)
-Overloaded::__set(z,Object id #3)
-object(Object)#%d (1) {
-  ["x"]=>
-  int(4)
-}
-Overloaded::__get(z)
-int(4)
-Overloaded::__get(z)
-int(5)
-Overloaded::__get(z)
-int(6)
-===DONE===
@@ -1,11 +0,0 @@
--TEST--
-Bug #29015 (Incorrect behavior of member vars(non string ones)-numeric mem vars und others)
--FILE--
-<?php
-$a = new stdClass();
-$x = "";
-$a->$x = "string('')";
-var_dump($a);
-?>
--EXPECTF--
-Fatal error: Cannot access empty property in %sbug29015.php on line 4
@@ -1,27 +0,0 @@
--TEST--
-Bug #29104 Function declaration in method doesn't work 
--FILE--
-<?php
-class A
-{ 
-  function g() 
-  { 
-    echo "function g - begin\n";
-    
-    function f() 
-    { 
-      echo "function f\n";
-    } 
-
-    echo "function g - end\n";
-  }
-}
-
-$a = new A;
-$a->g();
-f();
-?>
--EXPECT--
-function g - begin
-function g - end
-function f
@@ -1,104 +0,0 @@
--TEST--
-Bug #29210 Function: is_callable - no support for private and protected classes 
--FILE--
-<?php
-class test_class {
-   private function test_func1() {
-   	 echo "test_func1\n";
-   }
-   protected function test_func2() {
-   	 echo "test_func2\n";
-   }
-   static private function test_func3() {
-   	 echo "test_func3\n";
-   }
-   static protected function test_func4() {
-   	 echo "test_func4\n";
-   }
-   function test() {
-     if (is_callable(array($this,'test_func1'))) {
-	     $this->test_func1();
-     } else {
-       echo "test_func1 isn't callable from inside\n";
-     }
-     if (is_callable(array($this,'test_func2'))) {
-	     $this->test_func2();
-     } else {
-       echo "test_func2 isn't callable from inside\n";
-     }
-     if (is_callable(array('test_class','test_func3'))) {
-	     test_class::test_func3();
-     } else {
-       echo "test_func3 isn't callable from inside\n";
-     }
-     if (is_callable(array('test_class','test_func4'))) {
-	     test_class::test_func4();
-     } else {
-       echo "test_func4 isn't callable from inside\n";
-     }
-   }
-}
-
-class foo extends test_class {
-   function test() {
-     if (is_callable(array($this,'test_func1'))) {
-	     $this->test_func1();
-     } else {
-       echo "test_func1 isn't callable from child\n";
-     }
-     if (is_callable(array($this,'test_func2'))) {
-	     $this->test_func2();
-     } else {
-       echo "test_func2 isn't callable from child\n";
-     }
-     if (is_callable(array('test_class','test_func3'))) {
-	     test_class::test_func3();
-     } else {
-       echo "test_func3 isn't callable from child\n";
-     }
-     if (is_callable(array('test_class','test_func4'))) {
-	     test_class::test_func4();
-     } else {
-       echo "test_func4 isn't callable from child\n";
-     }
-   }
-}
-
-$object = new test_class;
-$object->test();
-if (is_callable(array($object,'test_func1'))) {
-	$object->test_func1();
-} else {
-  echo "test_func1 isn't callable from outside\n";
-}
-if (is_callable(array($object,'test_func2'))) {
-	$object->test_func2();
-} else {
-  echo "test_func2 isn't callable from outside\n";
-}
-if (is_callable(array('test_class','test_func3'))) {
-  test_class::test_func3();
-} else {
-  echo "test_func3 isn't callable from outside\n";
-}
-if (is_callable(array('test_class','test_func4'))) {
-  test_class::test_func4();
-} else {
-  echo "test_func4 isn't callable from outside\n";
-}
-$object = new foo();
-$object->test();
-?>
--EXPECT--
-test_func1
-test_func2
-test_func3
-test_func4
-test_func1 isn't callable from outside
-test_func2 isn't callable from outside
-test_func3 isn't callable from outside
-test_func4 isn't callable from outside
-test_func1 isn't callable from child
-test_func2
-test_func3 isn't callable from child
-test_func4
@@ -1,34 +0,0 @@
--TEST--
-Bug #29368 (The destructor is called when an exception is thrown from the constructor)
--FILE--
-<?php
-
-class Foo
-{
-	function __construct()
-	{
-		echo __METHOD__ . "\n";
-		throw new Exception;
-	}
-	function __destruct()
-	{
-		echo __METHOD__ . "\n";
-	}
-}
-
-try
-{
-	$bar = new Foo;
-} catch(Exception $exc)
-{
-	echo "Caught exception!\n";
-}
-
-unset($bar);
-
-?>
-===DONE===
--EXPECTF--
-Foo::__construct
-Caught exception!
-===DONE===
@@ -1,31 +0,0 @@
--TEST--
-Bug #29505 (get_class_vars() severely broken when used with arrays)
--FILE--
-<?php
-
-class Test {
-    public $empty = array();
-    public $three = array(1, "b"=>"c", 3=>array());
-}
-
-var_dump(get_class_vars('Test'));
-
-?>
-===DONE===
--EXPECT--
-array(2) {
-  ["empty"]=>
-  array(0) {
-  }
-  ["three"]=>
-  array(3) {
-    [0]=>
-    int(1)
-    ["b"]=>
-    string(1) "c"
-    [3]=>
-    array(0) {
-    }
-  }
-}
-===DONE===
@@ -1,41 +0,0 @@
--TEST--
-Bug #29674 (inherited method doesn't have access to private variables of the derived class)
--FILE--
-<?php
-
-class BaseClass
-{
-	private $private_base = "Base";
-	
-	function printVars ()
-	{
-		var_dump($this->private_base);
-		var_dump($this->private_child);
-	}
-}
-
-class ChildClass extends BaseClass
-{
-	private $private_child = "Child";
-}
-
-echo "===BASE===\n";
-$obj = new BaseClass;
-$obj->printVars();
-
-echo "===CHILD===\n";
-$obj = new ChildClass;
-$obj->printVars();
-
-?>
-===DONE===
--EXPECTF--
-===BASE===
-string(4) "Base"
-
-Notice: Undefined property:  BaseClass::$private_child in %sbug29674.php on line %d
-NULL
-===CHILD===
-string(4) "Base"
-
-Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d
@@ -1,62 +0,0 @@
--TEST--
-Bug #29689 (default value of protected member overrides default value of private)
--FILE--
-<?php
-class foo {
-    private $foo = 'foo';
-    private $foo2 = 'foo2';
-
-    function printFoo()
-    {
-        echo __CLASS__, ': ', $this->foo, " ", $this->foo2, "\n";
-    }
-}
-
-class bar extends foo {
-    protected $foo = 'bar';
-
-    function printFoo()
-    {
-        parent::printFoo();
-        echo __CLASS__, ': ', $this->foo, " ", $this->foo2, "\n";
-    }
-}
-
-class baz extends bar {
-    protected $foo = 'baz';
-    protected $foo2 = 'baz2';
-}
-
-class bar2 extends foo {
-    function printFoo()
-    {
-        parent::printFoo();
-        echo __CLASS__, ': ', $this->foo, " ", $this->foo2, "\n";
-    }
-}
-
-class baz2 extends bar2 {
-    protected $foo = 'baz2';
-    protected $foo2 = 'baz22';
-}
-
-$bar = new bar;
-$bar->printFoo();
-echo "---baz--\n";
-$baz = new baz();
-$baz->printFoo();
-echo "---baz2--\n";
-$baz = new baz2();
-$baz->printFoo();
-?>
--EXPECTF--
-foo: foo foo2
-bar: bar 
-Notice: Undefined property:  bar::$foo2 in %s on line %d
-
---baz--
-foo: foo foo2
-bar: baz baz2
---baz2--
-foo: foo foo2
-bar2: baz2 baz22
@@ -1,13 +0,0 @@
--TEST--
-Bug #29883 (isset gives invalid values on strings)
--FILE--
-<?php
-$x = "bug";
-var_dump(isset($x[-1]));
-var_dump(isset($x["1"]));
-echo $x["1"]."\n";
-?>
--EXPECT--
-bool(false)
-bool(true)
-u
@@ -1,23 +0,0 @@
--TEST--
-Bug #29890 (crash if error handler fails)
--FILE--
-<?php
-function customErrorHandler($fErrNo,$fErrStr,$fErrFile,$fErrLine,&$fClass) {
-echo "error :".$fErrStr."\n";
-}
-
-set_time_limit(5);
-
-error_reporting(E_ALL);
-
-set_error_handler("customErrorHandler");
-
-define("TEST",2);
-
-//should return a notice that the constant is already defined
-
-define("TEST",3);
-
-?>
--EXPECT--
-error :Constant TEST already defined
@@ -1,28 +0,0 @@
--TEST--
-Bug #29896 (Backtrace argument list out of sync)
--FILE--
-<?php
-function userErrorHandler($num, $msg, $file, $line, $vars)
-{
-    debug_print_backtrace();
-}
-
-$OldErrorHandler = set_error_handler("userErrorHandler");
-
-function GenerateError1($A1)
-{
-    $a = $b;
-}
-
-function GenerateError2($A1)
-{
-    GenerateError1("Test1");
-}
-
-GenerateError2("Test2");
-?>
--EXPECTF--
-#0  userErrorHandler(8, Undefined variable: b, %sbug29896.php, 11, Array ([A1] => Test1)) called at [%sbug29896.php:11]
-#1  GenerateError1(Test1) called at [%sbug29896.php:16]
-#2  GenerateError2(Test2) called at [%sbug29896.php:19]
-
@@ -1,16 +0,0 @@
--TEST--
-Bug #29944 (Function defined in switch, crashes)
--FILE--
-<?php
-$a = 1;
-switch ($a) {
-  case 1:
-    function foo($a) {
-      return "ok\n";
-    }
-    echo foo($a);
-}
-?>
--EXPECT--
-ok
-
@@ -1,18 +0,0 @@
--TEST--
-Bug #30080 (Passing array or non array of objects)
--FILE--
-<?php
-class foo { 	
-  function foo($arrayobj) { 
-    var_dump($arrayobj);
-  } 
-} 
-
-new foo(array(new stdClass)); 
-?>
--EXPECT--
-array(1) {
-  [0]=>
-  object(stdClass)#2 (0) {
-  }
-}
@@ -1,30 +0,0 @@
--TEST--
-Bug #30140 (Problem with array in static properties)
--FILE--
-<?php
-class A {
-	public static $test1 = true;
-	public static $test2 = array();
-	public static $test3 = "str";
-}
-
-class B extends A {
-}
-
-A::$test1 = "x";
-A::$test2 = "y";
-A::$test3 = "z";
-var_dump(A::$test1);
-var_dump(A::$test2);
-var_dump(A::$test3);
-var_dump(B::$test1);
-var_dump(B::$test2);
-var_dump(B::$test3);
-?>
--EXPECT--
-string(1) "x"
-string(1) "y"
-string(1) "z"
-string(1) "x"
-string(1) "y"
-string(1) "z"
@@ -1,34 +0,0 @@
--TEST--
-Bug #30161 (Segmentation fault with exceptions)
--FILE--
-<?php
-class FIIFO {
-
-        public function __construct() {
-                throw new Exception;
-        }
-
-}
-
-class hariCow extends FIIFO {
-
-        public function __construct() {
-                try {
-                        parent::__construct();
-                } catch(Exception $e) {
-                }
-        }
-        
-        public function __toString() {
-                return "ok\n";
-        }
-
-}
-
-
-$db = new hariCow;
-
-echo $db;
-?>
--EXPECT--
-ok
@@ -1,52 +0,0 @@
--TEST--
-Bug #30162 (Catching exception in constructor couses lose of $this)
--FILE--
-<?php
-class FIIFO {
-
-	public function __construct() {
-		$this->x = "x";
-		throw new Exception;
-	}
-
-}
-
-class hariCow extends FIIFO {
-
-	public function __construct() {
-		try {
-			parent::__construct();
-		} catch(Exception $e) {
-		}
-		$this->y = "y";
-		try {
-			$this->z = new FIIFO;
-		} catch(Exception $e) {
-		}
-	}
-	
-	public function __toString() {
-		return "Rusticus in asino sedet.";
-	}
-
-}
-
-try {
-	$db = new FIIFO();
-} catch(Exception $e) {
-}
-var_dump($db);
-
-$db = new hariCow;
-
-var_dump($db);
-?>
--EXPECTF--
-Notice: Undefined variable: db in %sbug30162.php on line 35
-NULL
-object(hariCow)#1 (2) {
-  ["x"]=>
-  string(1) "x"
-  ["y"]=>
-  string(1) "y"
-}
@@ -1,40 +0,0 @@
--TEST--
-Bug #30332 (zend.ze1_compatibility_mode isnt fully compatable with array_push())
--INI--
-zend.ze1_compatibility_mode=on
-error_reporting=4095
--FILE--
-<?php
-class x { };
-
-$first = new x;
-$second = $first;
-$container = array();
-array_push($container, $first);
-
-$first->first = " im in the first";
-
-print_r($first);
-print_r($second);
-print_r($container);
-?>
--EXPECTF--
-Strict Standards: Implicit cloning object of class 'x' because of 'zend.ze1_compatibility_mode' in %sbug30332.php on line 4
-
-Strict Standards: Implicit cloning object of class 'x' because of 'zend.ze1_compatibility_mode' in %sbug30332.php on line 5
-
-Strict Standards: Implicit cloning object of class 'x' because of 'zend.ze1_compatibility_mode' in %sbug30332.php on line 7
-x Object
-(
-    [first] =>  im in the first
-)
-x Object
-(
-)
-Array
-(
-    [0] => x Object
-        (
-        )
-
-)
@@ -1,24 +0,0 @@
--TEST--
-Bug 30346 (arrayAcces & using $this)
--FILE--
-<?php
-
-class Test implements ArrayAccess
-{
-        public function __construct() { }       
-        public function offsetExists( $offset ) { return false; }
-        public function offsetGet( $offset ) { return $offset; }
-        public function offsetSet( $offset, $data ) { }
-        public function offsetUnset( $offset ) { }
-}
-
-$post = new Test;
-$id = 'page';
-echo $post[$id.'_show'];
-echo "\n";
-
-?>
-===DONE===
--EXPECT--
-page_show
-===DONE===
@@ -1,30 +0,0 @@
--TEST--
-Bug #30394 (Assignment operators yield wrong result with __get/__set)
--FILE--
-<?php
-class Container
-{
-	public function __get( $what )
-	{
-		return $this->_p[ $what ];
-	}
-	
-	public function __set( $what, $value )
-	{
-		$this->_p[ $what ] = $value;
-	}
-	
-	private $_p = array();
-}
-
-$c = new Container();
-$c->a = 1;
-$c->a += 1;
-print $c->a;	// --> 2
-
-print " - ";
-$c->a += max( 0, 1 );
-print $c->a;	// --> 4 (!)
-?>
--EXPECT--
-2 - 3
@@ -1,18 +0,0 @@
--TEST--
-Bug #30407 (Strange behaviour of default arguments)
--FILE--
-<?php
-
-function haricow($a = 'one') {
-	var_dump($a);
-	$a = 'two';
-}
-
-haricow();
-haricow();
-?>
-===DONE===
--EXPECT--
-string(3) "one"
-string(3) "one"
-===DONE===
@@ -1,36 +0,0 @@
--TEST--
-Bug #30451 (static properties permissions broken)
--FILE--
-<?php
-
-class A {
-
-	protected static $property = TRUE;
-	
-	protected static function method() {
-		return TRUE;
-	}
-
-}
-
-class B extends A {
-
-	public function __construct() {
-		
-		var_dump(self::method());
-		var_dump(parent::method());
-		
-		var_dump(self::$property);
-		var_dump(parent::$property);
-	
-	}
-	
-}
-
-new B;
-?>
--EXPECT--
-bool(true)
-bool(true)
-bool(true)
-bool(true)
@@ -1,10 +0,0 @@
--TEST--
-Bug #30519 Interface not existing says Class not found 
--FILE--
-<?php
-class test implements a {
-}
-?>
--EXPECTF--
-Fatal error: Interface 'a' not found in %sbug30519.php on line 2
-
@@ -1,39 +0,0 @@
--TEST--
-Bug #30702 cannot initialize class variable from class constant
--FILE--
-<?php
-class foo {
-	const C1=1;
-}
-
-class bar extends foo {
-  const C2=2;
-
-  public $c1=bar::C1;
-  public $c2=bar::C2;
-
-  public $c3=self::C1;
-  public $c4=self::C2;
-
-  public $c5=foo::C1;
-  public $c6=parent::C1;
-}
-
-$x= new bar();
-var_dump($x);
-?>
--EXPECT--
-object(bar)#1 (6) {
-  ["c1"]=>
-  int(1)
-  ["c2"]=>
-  int(2)
-  ["c3"]=>
-  int(1)
-  ["c4"]=>
-  int(2)
-  ["c5"]=>
-  int(1)
-  ["c6"]=>
-  int(1)
-}
@@ -1,29 +0,0 @@
--TEST--
-Bug #30707 (Segmentation fault on exception in method)
--FILE--
-<?php
-class C {
-	function byePHP($plop) {
-		echo "ok\n";
-	}
-
-	function plip() {
-		try {
-			$this->plap($this->plop());
-		}	catch(Exception $e) {
-		}
-	}
-
-	function plap($a) {	
-	}
-
-	function plop() {
-		throw new Exception;
-	}
-}
-
-$x = new C;
-$x->byePHP($x->plip());
-?>
--EXPECT--
-ok
@@ -1,32 +0,0 @@
--TEST--
-Bug #30725 (PHP segfaults when an exception is thrown in getIterator() within foreach)
--FILE--
-<?php 
-
-class Test implements IteratorAggregate
-{
-	function getIterator()
-	{
-		throw new Exception();
-	}
-}
-
-try
-{           
-	$it = new Test;
-	foreach($it as $v)
-	{
-		echo "Fail\n";
-	}
-	echo "Wrong\n";
-}
-catch(Exception $e)
-{
-	echo "Caught\n";
-}
-
-?>
-===DONE===
--EXPECT--
-Caught
-===DONE===
@@ -1,23 +0,0 @@
--TEST--
-Bug #30791 magic methods (__sleep/__wakeup/__toString) call __call if object is overloaded 
--FILE--
-<?php
-class a {
-   public $a = 4;
-   function __call($a,$b) {
-       return "unknown method";
-   }
-}
-$b = new a;
-echo $b,"\n";
-$c = unserialize(serialize($b));
-echo $c,"\n";
-var_dump($c);
-?>
--EXPECT--
-Object id #1
-Object id #2
-object(a)#2 (1) {
-  ["a"]=>
-  int(4)
-}
@@ -1,27 +0,0 @@
--TEST--
-Bug #30820 (static member conflict with $this->member silently ignored)
--INI--
-error_reporting=4095
--FILE--
-<?php
-class Blah {
-    private static $x;
-
-    public function show() {
-        Blah::$x = 1;
-        $this->x = 5; // no warning, but refers to different variable
-
-        echo 'Blah::$x = '. Blah::$x ."\n";
-        echo '$this->x = '. $this->x ."\n";
-    }
-}
-
-$b = new Blah();
-$b->show();
-?>
--EXPECTF--
-Strict Standards: Accessing static property Blah::$x as non static in %sbug30820.php on line 7
-Blah::$x = 1
-
-Strict Standards: Accessing static property Blah::$x as non static in %sbug30820.php on line 10
-$this->x = 5
@@ -1,61 +0,0 @@
--TEST--
-Bug #30828 (debug_backtrace() reports incorrect class in overridden methods)
--FILE--
-<?php
-class A {
-	function __construct() {
-		debug_print_backtrace();
-		$bt = debug_backtrace();
-		foreach ($bt as $t) {
-			print $t['class'].$t['type'].$t['function']."\n";
-		}
-	}
-
-	function foo() {
-		debug_print_backtrace();
-		$bt = debug_backtrace();
-		foreach ($bt as $t) {
-                        print $t['class'].$t['type'].$t['function']."\n";
-		}
-	}
-
-	static function bar() {
-		debug_print_backtrace();
-		$bt = debug_backtrace();
-		foreach ($bt as $t) {
-			print $t['class'].$t['type'].$t['function']."\n";
-		}
-	}
-}
-
-class B extends A {
-	function __construct() {
-		parent::__construct();
-	}
-
-	function foo() {
-		parent::foo();
-	}
-
-	static function bar() {
-		parent::bar();
-	}
-}
-
-$b = new B();
-$b->foo();
-B::bar();
-?>
--EXPECTF--
-#0  A->__construct() called at [%sbug30828.php:30]
-#1  B->__construct() called at [%sbug30828.php:42]
-A->__construct
-B->__construct
-#0  A->foo() called at [%sbug30828.php:34]
-#1  B->foo() called at [%sbug30828.php:43]
-A->foo
-B->foo
-#0  A::bar() called at [%sbug30828.php:38]
-#1  B::bar() called at [%sbug30828.php:44]
-A::bar
-B::bar
@@ -1,31 +0,0 @@
--TEST--
-Bug #30889 Conflict between __get/__set and ++ operator
--FILE--
-<?php
-class overloaded
-{
-  private $values;
-  function __construct()
-  {
-    $this->values = array('a' => 0);
-  }
-  function __set($name, $value)
-  {
-    print "set $name = $value ($name was ".$this->values[$name].")\n";
-    $this->values[$name] = $value;
-  }
-  function __get($name)
-  {
-    print "get $name (returns ".$this->values[$name].")\n";
-    return $this->values[$name];
-  }
-}
-$test = new overloaded();
-$test->a++;     // __get(), then __set()
-++$test->a;
-?>
--EXPECT--
-get a (returns 0)
-set a = 1 (a was 0)
-get a (returns 1)
-set a = 2 (a was 1)
				`@@ -1 +0,0 @@`
				`Zend/zend_execute.lo: $(srcdir)/zend_vm_execute.h $(srcdir)/zend_vm_opcodes.h`