This commit was manufactured by cvs2svn to create tag

'PRE_FILE_COMPILE_API_CHANGE'.

EXTENSIONS

@@ -0,0 +1,344 @@
+                     List of PHP maintainers
+                     =======================
+
+Maintenance legend
+------------------
+    Supported:       Someone is actually paid to look after this.
+    Maintained:      Someone actually looks after it.
+    Odd Fixes:       It has a maintainer but they don't have time to do
+                     much other than throw the odd patch in. See below.
+    Orphan:          No current maintainer [but maybe you could take the
+                     role as you write your new code].
+    Obsolete:        Old code. Something tagged obsolete generally means
+                     it has been replaced by a better system and you
+                     should be using that.
+    Unknown:         Not known at this time.
+
+Status legend
+-------------
+    Working:         Working under both Windows and Unix.
+    Windows:         Working only under Windows.
+    Unix:            Working only under Unix.
+    Experimental:    Under development or initial release.
+    Not Working:     Not working.
+    Unknown:         Status unknown.
+
+
+== Server APIs ==
+
+-------------------------------------------------------------------------------
+EXTENSION:           aolserver
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           apache
+PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           cgi
+MAINTENANCE:         Unknown
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           fhttpd
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           isapi
+MAINTENANCE:         Unknown
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           nsapi
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           phttpd
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           pi3web
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           roxen
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           servlet
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           thttpd
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+
+
+== Database extensions ==
+
+-------------------------------------------------------------------------------
+EXTENSION:           dba
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           dbase
+PRIMARY MAINTAINER:  Jim Winstead <jimw@php.net>
+MAINTENANCE:         Odd Fixes
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           filepro
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           hyperwave
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           informix
+PRIMARY MAINTAINER:  Danny Heijl <Danny.Heijl@cevi.be>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           ingres_ii
+PRIMARY MAINTAINER:  David Hénot <henot@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
+SINCE:               4.0.2
+-------------------------------------------------------------------------------
+EXTENSION:           interbase
+PRIMARY MAINTAINER:  Jouni Ahto <jah@mork.net>
+MAINTENANCE:         Odd Fixes
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           msql
+MAINTENANCE:         Unknown
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           mssql
+PRIMARY MAINTAINER:  Frank M. Kromann <fmk@swwwing.com>
+MAINTENANCE:         Maintained
+STATUS:              Working
+COMMENT:             Tested on phpts and isapi versions
+-------------------------------------------------------------------------------
+EXTENSION:           mysql
+MAINTENANCE:         Unknown
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           pgsql
+PRIMARY MAINTAINER:  Jouni Ahto <jah@mork.net>
+MAINTENANCE:         Odd fixes
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           sybase
+MAINTENANCE:         Unknown
+STATUS:              Not Working
+-------------------------------------------------------------------------------
+EXTENSION:           sybase_ct
+MAINTENANCE:         Unknown
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           oci8
+PRIMARY MAINTAINER:  Thies C. Arntzen <thies@digicol.de>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           odbc
+PRIMARY MAINTAINER:  Andreas Karajannis <Karajannis@gmd.de>
+MAINTENANCE:         Maintained
+STATUS:              Working
+COMMENT:             Working except for persistent connections
+-------------------------------------------------------------------------------
+EXTENSION:           oracle
+PRIMARY MAINTAINER:  Thies C. Arntzen <thies@digicol.de>
+MAINTENANCE:         Maintained
+STATUS:              Working
+COMMENT:             Using the new OCI8 driver is encouraged where possible.
+-------------------------------------------------------------------------------
+
+
+== Other extensions ==
+
+-------------------------------------------------------------------------------
+EXTENSION:           aspell
+MAINTENANCE:         Unknown
+STATUS:              Working
+COMMENT:             For aspell .27 and greater, check out the pspell extension
+-------------------------------------------------------------------------------
+EXTENSION:           bcmath
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           calendar
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           com
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           cpdf
+PRIMARY MAINTAINER:  Uwe Steinmann <Uwe.Steinmann@fernuni-hagen.de>
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           CURL
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
+SINCE:               4.0.2
+-------------------------------------------------------------------------------
+EXTENSION:           cybercash
+PRIMARY MAINTAINER:  Evan Klinger <evan715@sirius.com>
+MAINTENANCE:         Maintained
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           domxml
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           exif
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+SINCE:               4.0.1
+-------------------------------------------------------------------------------
+EXTENSION:           fdf
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           ftp
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           gd
+PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           gettext
+MAINTENANCE:         Unknown
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           icap
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           imap
+MAINTENANCE:         Unknown
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           java
+PRIMARY MAINTAINER:  Sam Ruby <rubys@us.ibm.com>
+MAINTENANCE:         Maintained
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           ldap
+PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
+MAINTENANCE:         Odd Fixes
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           mcal
+MAINTENANCE:         Unknown
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           mcrypt
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
+MAINTENANCE:         Maintained
+STATUS:              Working
+COMMENT:             Currently working only with libmcrypt 2.7.7 and earlier
+-------------------------------------------------------------------------------
+EXTENSION:           mhash
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           pcre
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@ispi.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           pdf
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           pfpro
+PRIMARY MAINTAINER:  David Croft <david@infotrek.co.uk>
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               4.0.2
+-------------------------------------------------------------------------------
+EXTENSION:           posix
+PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           pspell
+PRIMARY MAINTAINER:  Vlad Krupin <phpdevel@echospace.com>
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+SINCE:               4.0.2
+-------------------------------------------------------------------------------
+EXTENSION:           readline
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           recode
+PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           session
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           snmp
+PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
+MAINTENANCE:         Odd Fixes
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           sockets
+PRIMARY MAINTAINER:  Chris Vandomelen <chrisv@b0rked.dhs.org>
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+SINCE:               4.0.2
+-------------------------------------------------------------------------------
+EXTENSION:           swf
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Unix (won't change)
+-------------------------------------------------------------------------------
+EXTENSION:           sysvsem
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           sysvshm
+MAINTENANCE:         Unknown
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           wddx
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@ispi.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           xml
+PRIMARY MAINTAINER:  Thies C. Arntzen <thies@digicol.de>
+MAINTENANCE:         Maintained
+STATUS:              Unknown
+-------------------------------------------------------------------------------
+EXTENSION:           yaz
+PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
+MAINTENANCE:         Maintained
+STATUS:              Unknown
+SINCE:               4.0.1
+-------------------------------------------------------------------------------
+EXTENSION:           zlib
+PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+
+# iptc?

INSTALL

@@ -1,14 +1,73 @@
 Installation Instructions for PHP 4.0
 -------------------------------------
 
-Note!  As of 4.0b3, PHP will require GNU make.
-
 For the impatient here is a quick set of steps that will build PHP as
-an Apache module for Apache 1.3.x with MySQL support.  A more verbose
-explanation follows.
+first a dynamic Apache module (DSO) for Apache 1.3.x with MySQL support 
+and then a static module.  A more verbose explanation follows.  
+
+Note!  Only install either the static module or the dynamic one.  Do not
+install both.  
+
+Note 2!  If you are recompiling PHP to add new extensions or upgrading
+something like GD, remove the config.cache file before you re-run 
+configure.
+
+Note 3!  If you are on Linux and have installed shared libraries, make
+sure the location of these shared libraries are listed in your 
+/etc/ld.so.conf file.  For example, if you have:
+
+  /usr/local/lib/mysql/libmysqlclient.so
+
+Make sure /etc/ld.so.conf contains:
+
+  /usr/local/lib/mysql
+
+Then run ldconfig.
+
+If you want both PHP 3 and 4 modules in the same Apache server, check the
+bottom of this file for instructions.
+
+INSTALLATION WITH THE ZEUS WEB SERVER:
+--Please see the 'README.Zeus' file included in this distribution
 
 
-QUICK INSTALL
+QUICK INSTALL (DSO)
+
+For this to work your Apache httpd must have mod_so enabled.
+Check using httpd -l.  You should see something like:
+
+Compiled-in modules:
+  http_core.c
+  mod_so.c
+
+Chances are you will see a lot more modules than these two. That's ok, 
+as long as mod_so.c shows up you can proceed with the following steps:
+
+$ gunzip -c php-4.0.x.tar.gz | tar xf -
+$ cd php-4.0.x
+$ ./configure --with-mysql --with-apxs
+$ make
+$ make install
+
+If you get an error telling you that the apxs script could not be found,
+look for it on your system and if you find it, provide the full path to it
+as: --with-apxs=/path/to/apxs
+
+Next you must copy php.ini-dist to the appropriate place (normally
+/usr/local/lib/php.ini) and edit it as necessary to set PHP options.
+
+The only thing left to do is to edit your httpd.conf file and make sure the
+PHP 4 mime type is there and uncommented.  You need a line that looks like
+this:
+
+   AddType application/x-httpd-php .php
+
+Then restart your server (apachectl restart) and you should be able to
+serve up PHP files now.  Make a test file called test.php and put some 
+PHP tags in it.  Like <?phpinfo()?>, for example.
+
+
+QUICK INSTALL (Static)
 
 $ gunzip -c apache_1.3.x.tar.gz | tar xf -
 $ cd apache_1.3.x
@@ -25,10 +84,10 @@ $ cd ../apache_1.3.x
 $ ./configure --prefix=/www --activate-module=src/modules/php4/libphp4.a
  (The above line is correct!  Yes, we know libphp4.a does not exist at this
   stage.  It isn't supposed to.  It will be created.)
-make
+$ make
  (you should now have an httpd binary which you can copy to your Apache bin dir)
-cd ../php-4.0.x
-cp php.ini-dist /usr/local/lib/php.ini
+$ cd ../php-4.0.x
+$ cp php.ini-dist /usr/local/lib/php.ini
 You can edit /usr/local/lib/php.ini file to set PHP options.
 Edit your httpd.conf or srm.conf file and add:
   AddType application/x-httpd-php .php
@@ -36,18 +95,66 @@ Edit your httpd.conf or srm.conf file and add:
 
 VERBOSE INSTALL
 
+Chances are you are reading this because the quick install steps above
+did not work for you.  If this is the case, congratulations, you are
+among the elite few that actually reads documentation.  It really is
+not a difficult install and once you have done it once you will fly 
+through it.
+
 Installing PHP can be done in four simple steps:
 
 1. Unpack your distribution file.  
 
-   You will have downloaded a file named something like php4xn.tar.gz.
-   Unzip this file with a command like: gunzip php4xn.tar.gz
+   You will have downloaded a file named something like php-4.0.x.tar.gz.
+   Unzip this file with a command like: gunzip php-4.0.x.tar.gz
 
-   Next you have to untar it with: tar -xvf php4xn.tar
+   Next you have to untar it with: tar -xvf php-4.0.x.tar
 
    This will create a php-4.0.x directory.  cd into this new directory.
 
-2. Configure PHP.
+2a. Configure PHP (Dynamic Module) - Skip to 2b if you wish to build
+    a static module
+
+   You now have to choose the options you would like.  There are quite
+   a few of them.  To see a list, type: ./configure --help
+
+   The only options that you are likely to want to use are the ones in
+   the last section entitled, "--enable and --with options recognized:"
+
+   A popular choice is to build the Apache module version.  In order to
+   build PHP as a dynamic module for Apache-1.3.x you have to first have
+   Apache installed.  Assuming Apache is already installed, make sure
+   the shared object module is enabled.  To check this, type: httpd -l
+   You should see something like:
+
+     Compiled-in modules:
+       http_core.c
+       mod_so.c
+
+   You will most likely have a lot more modules than what is shown here.
+   As long as mod_so.c shows up in the list, PHP should be happy.
+
+   Now, type: ./configure --with-mysql --with-apxs
+
+   If you get an error telling you that the apxs script could not be found,
+   look for it on your system and if you find it, provide the full path to it
+   as: --with-apxs=/path/to/apxs
+
+   You might also want other flags on this configure line.  --with-mysql
+   is just an example.  
+
+   There are a few things that can go wrong during this configure step.
+   The most common is that you have asked for an option and that the
+   configure script can not find the files required to enable this 
+   option in PHP.  Chances are you can provide the full path to the
+   base directory under which the related files were installed.  For
+   example, if you have installed the GD library in /opt/gd which means
+   that /opt/gd/include has your GD header files and /opt/gd/lib contains
+   your GD library files, you would use --with-gd=/opt/gd
+
+   Skip to step 3 for compilation and installation instructions.
+
+2b. Configure PHP (Static Module) - Skip if you performed 2a
 
    You now have to choose the options you would like.  There are quite
    a few of them.  To see a list, type: ./configure --help
@@ -77,8 +184,16 @@ Installing PHP can be done in four simple steps:
    Apache Configure script at least once before compiling PHP.  It 
    doesn't matter how you have Apache configured at this point.
 
+   Skip to step 3b at this point.
+
 3. Compile and install the files.  Simply type: make install
 
+3a.   Dynamic Module Installation
+
+   Nothing else is needed here.  Proceed to step 4a.
+
+3b.   Static Module Installation
+
    For the Apache module version this will copy the appropriate files
    to the src/modules/php4 directory in your Apache distribution if
    you are using Apache 1.3.x.  If you are still running Apache 1.2.x
@@ -136,11 +251,49 @@ Installing PHP can be done in four simple steps:
    somewhere.  Re-edit Configuration and try again.  If it goes well,
    type: make
 
-4. Setting up the server.
+   Assuming it compiles without errors, proceed to step 4b.
+
+4a. Setting up the server. (Dynamic Module)
+
+   The make install command in step 3 should have done most of your
+   work for you.  It actually edits your httpd.conf file and tries to
+   enable the dynamic PHP module.  To verify this, look for a line that
+   looks like this:
+
+      LoadModule php4_module libexec/libphp4.so
+
+   The actual path before the libphp4.so part might differ slightly.  This
+   is likely fine.  If you are paranoid you can examine the output from the
+   make install step to see where the libphp4.so file was actually put and
+   place the full path to this file on this LoadModule line.
+
+   If somewhere in your httpd.conf file you have a ClearModuleList line
+   then you also need this line:
+
+      AddModule mod_php4.c
+
+   And finally you need to tell Apache which file extension should trigger
+   PHP.  You do this by creating a special mime type and associating it
+   with an extension.  We suggest using:
+
+      AddType application/x-httpd-php .php
+  
+   You are however free to use any extension you wish, including .html.
+
+   Note!  If a line has a # at the beginning, then it is commented out
+   and you need to remove the # for that line to take effect.
+
+   Finally you need to copy php.ini-dist to the appropriate place
+   (normally /usr/local/lib/php.ini) and edit if necessary.
+
+   Once you have made these changes you should be ready to restart your
+   server and try it out.  Type: apachectl restart
+   
+4b. Setting up the server. (Static Module)
    
    You should now have a new httpd binary.  Shut down your existing server,
    if you have one, and copy this new binary overtop of it.  Perhaps make
-   a backup of your previous one first.  Then edit your conf/srm.conf file
+   a backup of your previous one first.  Then edit your conf/httpd.conf file
    and add the line:
 
       AddType application/x-httpd-php .php
@@ -154,13 +307,71 @@ Installing PHP can be done in four simple steps:
    Any file ending in .phps will now be displayed with full colour syntax
    highlighting instead of being executed.
 
-   When you are finished making changes to your srm.conf file, you can
+   Note that on some older server setups, the AddType lines are in the
+   conf/srm.conf file instead of conf/httpd.conf.
+
+   Note!  If a line has a # at the beginning, then it is commented out
+   and you need to remove the # for that line to take effect.
+
+   When you are finished making changes to your httpd.conf file, you need
+   to copy php.ini-dist to the appropriate place (normally
+   /usr/local/lib/php.ini) and edit if necessary. You can then
    start up your server.
 
-USING PHP3 AND PHP4 AS CONCURRENT APACHE MODULES
+5. Testing it all worked
+
+   Create a test file named test.php in your web tree somewhere and
+   put some test PHP tags in it.  <?phpinfo()?> is a good first test.
+   This tag tells PHP to do a braindump and tells you all sorts of things
+   about itself.  
+
+
+WHY DISABLING -fPIC WORKS ON LINUX
+
+    From: Martin v. Loewis <martin@loewis.home.cs.tu-berlin.de>
+    To: glibc-linux@ricardo.ecn.wfu.edu
+    Subject: Re: Shared library -shared vs. -fpic
+
+    [In reply to Kaz Kylheku <kaz@ashi.footprints.net>]
+
+    > PIC stands for Position-Independent Code. 
+
+    Correct.
+
+    > Code isn't position-independent (or ``relocatable'') cannot be
+    > loaded at an arbitrary address;
+
+    Wrong.
+
+    > it requires some references to be patched at load time.
+
+    Correct.
+
+    > Shared libraries need to be relocatable because it's not known
+    > beforehand what address they will be loaded at
+
+    Correct, depending on the meaning of "relocatable". PIC code typically
+    does not contain relocations; that's why its position-independent.
+
+    > Just because you don't specify -fPIC doesn't mean that the compiler
+    > won't emit position-independent code; the option prevents it from
+    > emitting position-dependent code in situations where it otherwise
+    > would.
+
+    Correct. However, a non-trivial shared library typically won't be
+    position-independent unless explicitly compiled with
+    -fPIC. Linux/glibc indeed does not require a shared library to be
+    position-independent; instead, it will perform the relocations in the
+    binary, even if they refer to code pages. As a result, those relocated
+    pages won't be shared across processes, anymore.
+
+    Regards,
+    Martin
+
+USING PHP 3 AND PHP 4 AS CONCURRENT APACHE MODULES
 
    Recent operating systems provide the ability to perform versioning and
-   scoping. This features make it possible to let PHP3 and PHP4 run as
+   scoping. This features make it possible to let PHP 3 and PHP 4 run as
    concurrent modules in one Apache server. 
    
    This feature is known to work on the following platforms:
@@ -169,7 +380,7 @@ USING PHP3 AND PHP4 AS CONCURRENT APACHE MODULES
    - Solaris 2.5 or better
    - FreeBSD (3.2, 4.0 tested)
    
-   To enable it, configure PHP3 and PHP4 to use APXS (--with-apxs) and the
+   To enable it, configure PHP 3 and PHP 4 to use APXS (--with-apxs) and the
    necessary link extensions (--enable-versioning). Otherwise, all standard
    installations instructions apply. For example:
 

LICENSE

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------- 
-                  The PHP License, version 2.01
+                  The PHP License, version 2.02
 Copyright (c) 1999, 2000 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 
 
@@ -37,12 +37,17 @@ are met:
      "This product includes PHP, freely available from
      http://www.php.net/".
 
-  6. Permission to freely distribute and use Zend as an integrated
-     part of PHP is granted, under the conditions of version 0.91
-     of the Zend License.
-     The license is bundled with the Zend engine, and is available
-     at http://www.zend.com/license/0_91.txt, or by contacting
-     license@zend.com.
+  6. The software incorporates the Zend Engine, a product of Zend
+     Technologies, Ltd. ("Zend"). The Zend Engine is licensed to the
+     PHP Association (pursuant to a grant from Zend that can be
+     found at http://www.php.net/license/ZendGrant/) for
+     distribution to you under this license agreement, only as a
+     part of PHP.  In the event that you separate the Zend Engine
+     (or any portion thereof) from the rest of the software, or
+     modify the Zend Engine, or any portion thereof, your use of the
+     separated or modified Zend Engine software shall not be governed
+     by this license, and instead shall be governed by the license
+     set forth at http://www.zend.com/license/ZendLicense/. 
 
 
 

MAINTAINERS

@@ -1,101 +0,0 @@
-                     List of PHP maintainers
-                     =======================
-
-Status legend
--------------
-    Supported:       Someone is actually paid to look after this.
-    Maintained:      Someone actually looks after it.
-    Odd Fixes:       It has a maintainer but they don't have time to do
-                     much other than throw the odd patch in. See below..
-    Orphan:          No current maintainer [but maybe you could take the
-                     role as you write your new code].
-    Obsolete:        Old code. Something tagged obsolete generally means
-                     it has been replaced by a better system and you
-                     should be using that.
-
---------------------------------------------------------------------------------
-EXTENSION:           apache
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           cybercash
-PRIMARY MAINTAINER:  Evan Klinger <evan715@sirius.com>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           dba
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           fdf
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           gd
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           hyperwave
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           informix
-PRIMARY MAINTAINER:  Danny Heijl <Danny.Heijl@cevi.be>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           java
-PRIMARY MAINTAINER:  Sam Ruby <rubys@us.ibm.com>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           ldap
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
-STATUS:              Odd Fixes
---------------------------------------------------------------------------------
-EXTENSION:           mcrypt
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           mhash
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           mssql
-PRIMARY MAINTAINER:  Frank M. Kromann <fmk@swwwing.com>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           oci8
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@digicol.de>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           oracle
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@digicol.de>
-STATUS:              Maintained
-COMMENT:             Using the new OCI8 driver is encouraged where possible.
---------------------------------------------------------------------------------
-EXTENSION:           pcre
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@ispi.net>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           pdf
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           session
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           snmp
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
-STATUS:              Odd Fixes
---------------------------------------------------------------------------------
-EXTENSION:           wddx
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@ispi.net>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           xml
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@digicol.de>
-STATUS:              Maintained
---------------------------------------------------------------------------------
-EXTENSION:           zlib
-PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de>
-STATUS:              Maintained
---------------------------------------------------------------------------------

MODULES_STATUS

@@ -1,21 +0,0 @@
-Module              Status
-------              ------
-MySQL               Working
-COM                 Working
-WDDX                Working
-PCRE                Working
-DBA                 Working
-mcrypt              Working
-mhash               Working
-dbase               Working
-aspell              Working
-imap                Working
-ldap                Working
-oci8                Working (but no blob-support yet)
-oracle              Working
-iptc                Working
-informix            Working
-zlib                Working
-sysvshm             Working
-odbc                Working (except for persistent connections)
-MS SQL              Working (tested on phpts and isapi versions)

Makefile.in

@@ -1,24 +1,14 @@
 
-DEPTH     = .
-topsrcdir = @topsrcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 ZEND_DIR = $(srcdir)/Zend
-SUBDIRS = Zend ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
+SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
 
 LTLIBRARY_NAME = libphp4.la
-	
-LTLIBRARY_SOURCES = \
-       main.c internal_functions.c snprintf.c php_sprintf.c \
-       configuration-parser.c configuration-scanner.c \
-       safe_mode.c fopen-wrappers.c php_realpath.c alloca.c \
-       php_ini.c SAPI.c rfc1867.c dlist.c php_content_types.c strlcpy.c \
-       strlcat.c mergesort.c reentrancy.c php_variables.c
+LTLIBRARY_SOURCES = stub.c
 
 LTLIBRARY_DEPENDENCIES = \
 		Zend/libZend.la \
 		sapi/$(PHP_SAPI)/libsapi.la \
+		main/libmain.la \
 		$(REGEX_LIB) \
 		$(EXT_LTLIBS) \
 		$(TSRM_LIB)
@@ -26,29 +16,41 @@ LTLIBRARY_DEPENDENCIES = \
 LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
 LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
 
-PROGRAM_NAME         = $(PHP_PROGRAM)
+PROGRAM_NAME         = php
 PROGRAM_SOURCES      = stub.c
 PROGRAM_LDADD        = libphp4.la
 PROGRAM_LDFLAGS      = -export-dynamic	
 PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
 
-targets = $(LTLIBRARY_NAME) $(PROGRAM_NAME)
+targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
 
-install_targets = install-local install-modules
-	
-include $(topsrcdir)/build/rules.mk
-include $(topsrcdir)/build/library.mk
-include $(topsrcdir)/build/program.mk
+install_targets = install-sapi install-modules
 
-install-local:
+include $(top_srcdir)/build/rules.mk
+include $(top_srcdir)/build/library.mk
+include $(top_srcdir)/build/program.mk
+
+install-sapi:
 	@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
 	-@$(mkinstalldirs) $(bindir)
+	-@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
+		for i in 0.0.0 0.0 0; do \
+			if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
+				$(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
+				break; \
+			fi; \
+		done; \
+	fi
 	$(INSTALL_IT)
 
-configuration-parser.h configuration-parser.c: configuration-parser.y
-	$(YACC) -p cfg -v -d $< -o configuration-parser.c
+install-modules:
+	@test -d modules && \
+	$(mkinstalldirs) $(moduledir) && \
+	echo "installing shared modules into $(moduledir)" && \
+	rm -f modules/*.la && \
+	cp modules/* $(moduledir) >/dev/null 2>&1 || true
 
-configuration-scanner.c: configuration-scanner.l
-	$(LEX) -Pcfg -o$@ -i $<
+install-su: install-modules
+	(cd pear && $(MAKE) install)
 
 .NOEXPORT:

NEWS

@@ -1,6 +1,468 @@
 PHP 4.0                                                                    NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
+?? ??? 2000, Version 4.0.2
+- Fixed warning when shutting down OCINLogon() connections. (Thies)
+- Fixed \n in session variables bug on Win32 (Stas)
+- OCIError() would sometimes not report failed connections. (Thies)
+- Fix HEAD request bug on an Apache ErrorDocument redirect and preserve
+  the status code across the redirect as well.  (Rasmus)
+- Add Olympus-specific tags to read_exif_data() (Rasmus)
+- Fixed bug in imap_fetchheader() where using FT_PREFETCHTEXT didn't return
+  the body. Bug #4447. (Jani)
+- Fixed exec() returning "\0" when output is empty
+- Added XML_Parser class in PEAR (Stig)
+- Added "make test" target in pear/ and added some regression tests (Stig)
+- Fix bug in strip_tags function as per bug #5857 (Rasmus)
+- Fix reading of IPTC via GetImageInfo() for certain JPEG files. (Thies)
+- Improved the output-buffering functions to be re-entrant (Zeev)
+- Made ldap_add(), ldap_modify(), ldap_mod_add(), ldap_mod_replace()
+  binary-safe. Original patch: Terrence Miao <terrence_miao@email.com> (Jani)
+- CGI aka. command line version has now an option '-l' for syntax check
+  without execution (Hartmut)
+- Fixed bug in ldap_get_values_len() which makes it NULL-safe. (Jani)
+- Bug-report and fix submitted by Michel Alexeline <alexel@dr15.cnrs.fr>
+- Make ext_skel create a Makefile.in set up to handle shared extension
+  support automatically (Rasmus)
+- Fix php_realpath not to die on non-existing files (needed for touch()) (Stas and china@thewrittenword.com)
+- Fix get_browser() function (Stas)
+- Fix symbol clash which caused a DSO problem on OpenBSD (Rob Black and
+  anil@recoil.org)
+- Added new function: ldap_compare(). (Jani)
+- Fixed a bug in ldap_get_entries() and ldap_get_attributes(). (Jani)
+- Ported DB to new error reporting scheme in PEAR. (Stig)
+- Added sybase and ibase DB backends in PEAR. (Sterling)
+- New PEAR package Payment_Verisign for use with the Payflow Pro
+  (pfpro) extension. (David Croft)
+- Added CURL support. (Sterling)
+- Catch users trying to set "compatibility" parameter in PDF, which is not
+  supported from user-land. (Joey)
+- Fixed dbase_add_record. (Sterling)
+- Added new function wordwrap() to wordwrap long strings from Chris
+  Russel <russel@yorku.ca> (David Croft)
+- Added four additional arguments: attrsonly, sizelimit, timelimit, deref which
+  were missing in ldap_search(), ldap_list() and ldap_read() functions (Jani)
+- Fixed a bug in ldap_search/list/read() which prevented returning the partial
+  results when 'Sizelimit exceeded' error occurred. (Jani Taskinen)
+- Fixed preg_replace() to automatically escape quotes in matched
+  strings when using /e modifier. (Andrei)
+- Itanium patch (Steve Robb)
+- Set default include_path so PEAR files can be reached (Stig)
+- Added "pear" executable, requires CGI version installed (Stig)
+- Added extension ii for Ingres II native support. See README in ext/ingres_ii
+  directory. (David H)
+- Added Win32 project for the Interbase module (Zeev)
+- Added ability to perform calls to the parent class without explicitly
+  specifying its name, using parent::func_name(...) (Zeev, Zend Engine)
+- You can now call Ora_Error() without prameters to get the reason
+  for a failed connection attempt. (Kirill Maximov)
+- New extension "pfpro" for interface with Verisign Payflow Pro (David Croft)
+- Add IMG_GIF, IMG_JPG, IMG_JPEG, IMG_PNG and IMG_WBMP constants for
+  imagetypes() function (Rasmus)
+- Add ImageTypes() function which returns a bitfield with the supported
+  image formats.  1=gif, 2=jpeg, 4=png and 8=wbmp (Rasmus)
+- Make it possible to specify an empty string as a thousands-seperator
+  in number_format() (Rasmus)
+- Shared module support for LDAP extension (Troels Arvin)
+- Fixed a bug with imap_mail where apache would segfault if the rpath
+  parameter was specified.
+- Use dashes and short day name in cookies since some browsers seem picky
+  about this (Rasmus)
+- Added pspell module. (Vlad)
+- Added 3 additional arguments to the user-defined error handler - the file
+  name and line number in which the error occured, and the context (local
+  variables) of the code in which the error occured (Zeev, Zend Engine)
+- Improved the error handling code to handle an error in a user-defined error
+  handling function (Zeev, Zend Engine)
+- Fixed leak when using string offsets in the array() construct.
+  (Andi, Zend Engine)
+- Fixed corruption problem when changing deeply nested values in objects.
+  (Andi & Zeev, Zend Engine)
+- Improved array_multisort() to be able to specify sort type as well sort
+  order. Incidentally, it can be used to sort multi-dimensional arrays
+  as well. (Andrei)
+- Fixed a possible data corruption in case of a huge amount of aborted requests
+  (Zeev)
+- Apache module would sometimes close a wrong file-descriptor. (Sascha)
+- Fixed use of alternative storage handlers in the session module. (Sascha)
+- Updated str_pad() to be able to pad on left/right/both sides. (Andrei)
+- Fixed crash in gzopen(). (Thies)
+- Multiple character set support in gdttf.c (Rob Goodwin)
+- When using HTTP auth from PHP, fill in the %u custom log field so the
+  authenticated used id will get logged in the Apache access_log (Rasmus)
+- Support for pdflib 3.01. (Uwe)
+- FDF Data is handled properly and can be accessed by reading
+  HTTP_RAW_POST_DATA. (Uwe)
+- Added new 'O' format modifier that will output the GMT offset as "[+-]HHMM"
+  (eg: Pacific time is -0700).  This is useful for things such as Date: mail
+  headers. (Mike W)
+- Fixed crash on OCI?Logon() failure. (Thies)
+- Make the special Header("http/...") response be case insensitive like 3.0
+  (Rasmus)
+- Allow cybercash to compile as a DL module. (Sterling)
+- Fixed the dbase_create function. (Sterling)
+- Fixed a problem under some versions of Windows that could cause PHP to hang
+  on startup if errors occured, e.g. in the php.ini file (Zeev)
+- Fixed opendir() again.  It should actually work well continuously now (Zeev)
+- Added three additional arguments to be sent to a user-defined error handler -
+  the filename and line number in which the error occured, and the context
+  (the local variables) of the error (Zeev, Zend Engine)
+- Improved the error handling code to handle an error in a user-defined error
+  handling function (Zeev, Zend Engine)
+- Added an optional parameter to preg_replace() that can be used to
+  specify how many replacements to make. (Andrei)
+
+28 Jun 2000, Version 4.0.1
+- Fixed a possible crash in the LDAP modify code. (Eric Kilfoil)
+- Fixed a bug in opendir(), which prevented readdir() from working properly if
+  the $dir argument wasn't explicitly specified (Zeev)
+- Made --enable-discard-path work again. (Andi) 
+- Removed 8KB limit on line length of the file() function (Zeev)
+- Disabled dl() when PHP is being used as a module inside a multithreaded web
+  server - it didn't work before, and caused weird results (Zeev)
+- Added the ImageColorClosestHWB(), ImageCopyMerge() and ImagePaletteCopy() 
+  functions. (Sterling)
+- Added ImageCreateFromWBMP() function. (Jouni)
+- Fixed problems with POST requests under the NSAPI module. (Roberto Biancardi)
+- Added spliti() function. (Thies)
+- Fixed serializer behaviour with regards to serializing objects whose class
+  definition was not available in the deserializing context. (Sascha)
+- Improve memory cache performance and increase cache size. (Stas, Zend Engine)
+- Added a crc32 checksum function - used by the UdmSearch search engine
+  and currently run through a system call.  This will speed up the UdmSearch
+  php frontend significantly. (Rasmus)
+- Modified in_array() to not touch array pointer. (Andrei)
+- Added restore_error_handler(). (Zeev, Zend engine)
+- Fixed erroneous file names and line numbers in error situations under the
+  multithreaded version of PHP - most noticeably Win32 (Zeev, Zend Engine)
+- Fixed problem with CGI crashing on certain servers especially Windows Apache
+  & O'Reilly website (Andi)
+- Added Pi3Web SAPI module; run ./configure --with-pi3web to enable this.
+  (Holger; zimpel@t-online.de)
+- Enhanced WDDX functions to call __sleep() and __wakeup() when working on
+  objects. (Andrei)
+- Changed WDDX to serialize arrays as structs only if needed. (Thies)
+- Implemented max_execution_time under Win32 (Zeev)
+- Updated strtotime() to handle many more formats. It now has complete
+  feature parity with GNU date command. (Andrei)
+- Added support for multiple arguments in unset(). (Faisal, Zend Engine)
+- Functions that expect a resource but are passed something else now return 
+  NULL instead of FALSE. (Thies, Zend Engine)
+- Fixed gmmktime(), on certain systems it incorrectly adjusted for the timezone
+  offset and daylight savings time. (Andrei)
+- Moved VC++ Win32 project and workspace files to the win32 directory
+  (Zeev)
+- Fixed checkdate() to not return true on non-numeric arguments (Rasmus)
+- Added --enable-c9x-inline option for compilers which support the new C9x
+  standard. If you encounter undefined references to i_zend_is_true and
+  other symbols, you should enable this.  (Sascha, Zend Library)
+- Fixed a problem in ldap_add() and ldap_modify(), sometimes added trailing
+  garbage to the values (Stig Venaas) 
+- Fixed a problem with dbmopen() not handing 'c' correctly with dbm/db/ndbm
+  databases. (JimJag)
+- Fixed a crash in number_format() when used with locales. (Andrei)
+- Fixed an initialization problem in the MS-SQL problem that could cause
+  a crash in mssql_query() (Zeev)
+- Upgraded PCRE to version 3.2 and fixed a bug when anchored pattern
+  matched an empty string. (Andrei)
+- Fixed a bug that prevented PHP from paying attention to the extension_dir
+  directive with extensions that were loaded from the php.ini file (Zeev)
+- Changed set_error_handler() to return the name of the previously defined
+  error handler, if any (Zeev, Zend Engine)
+- Declared <?php_track_vars?> officially dead.  It didn't work in PHP 4.0.0
+  either, but now it's gone for good (Zeev)
+- Make convert_cyr_string() binary safe and stop it from corrupting other
+  PHP variables. (Andi)
+- Added functions array_unique, array_intersect and array_diff (Stig Venaas)
+- Fixed problem when using uninitialized values in comparisons with strings.
+  They behave as empty strings again just like in PHP 3.
+  (Andi & Zeev, Zend Engine)
+- Fixed 'Z' flag in date() to adjust for daylight savings time. (Andrei)
+- Fixed var_dump() not to modify the internal order of array elements (Zeev)
+- Fixed stripcslashes() to remove to strip \ in unknown escapes instead of
+  leaving it. (Andrei)
+- Changed WDDX to always serialize arrays as structs. (Andrei)
+- Fixed include_once() to issue a warning in case the supplied file name is
+  not found (Zeev, Zend Engine)
+- Fixed a bug in get_declared_classes() which could return the same class
+  multiple times under certain circumstances (Zeev, Zend Engine)
+- Fixed a bug in rawurldecode() that would cause in rawurldecode() corrupting
+  its argument (Zeev)
+- Parse errors (or other errors) in the php.ini files under Windows will no
+  longer mess up the HTTP headers in CGI mode and are now displayed in a
+  message box (Zeev)
+- Fixed a crash in OCIFetchStatement() when trying to read after all data
+  has already been read. (Thies)
+- fopen_wrappers() are now extensible via modules (Hartmut Holzgraefe)
+- Make trim strip \0 to match php 3 (Rasmus)
+- Added function imagecreatefromxbm(). (Jouni)
+- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe
+  Skillingstad)
+- Added str_pad() for padding a string with an arbitrary string on left or
+  right. (Andrei)
+- Made the short_tags, asp_tags and allow_call_time_pass_reference INI
+  directives work on a per-directory basis as well, e.g. from .htaccess
+  files. (Zeev)
+- Added fflush() function. (Eric Huss)
+- Fixed a problem with static variables, default function arguments and class
+  member variables, that contained array values. (Andi & Zeev, Zend Engine)
+- Fix virtual() when used with output buffering (Marc Pohl)
+- Clean up constants in flock() function and add optional 3rd arg which
+  is set to true on EWOULDBLOCK (Rasmus)
+- Added functions pg_loimport(), pg_loexport(). (Jouni)
+- Added SWF support to getimagesize() function (Derick Rethans)
+- Added support for both indexed and non-indexed arrays of file uploads
+  eg. name="file[]" type="file" (Rasmus)
+- Added create_function(), which gives the ability to create functions
+  on-the-fly (Zeev, Zend Engine)
+- Added support for comparisons of arrays (with arrays) and objects (with
+  objects);  The equality operator (==) performs an unordered comparison,
+  whereas the identity operator (===) performs an ordered comparison (Zeev,
+  Zend Engine)
+- Allow all functions that receive user-defined function callbacks to accept
+  an array that contains an object and a method name, in place of a function
+  name, e.g. usort($array, array($obj, "ObjSort")) (Zeev, Zend Engine)
+- Added set_error_handler() to allow custom error handling functions,
+  instead of the built-in error handling code (Zeev, Zend Engine)
+- Renamed user_error() to trigger_error();  user_error() remains
+  defined for compatibility (Zeev, Zend Engine)
+- Fix the global/static statements to require a trailing terminating
+  semi-colon ';'. (Andi, Zend Engine)
+- Cleaned up PCRE extension and made it binary-safe. (Andrei)
+- Added third argument to in_array(). If it's true, then in_array()
+  will use strict comparison instead of the default one. (Andrei)
+- Added pg_trace() and pg_untrace (Dominic J. Eidson & Zeev)
+- ignore_user_abort=Off is now default. (Thies)
+- Added array_merge_recursive() that will recursively merge values
+  under the same keys. (Andrei)
+- fixed crash in OCIParse when parsing invalid SQL. (Thies)
+- Fixed a bug in mysql_connect() that made it ignore the socket argument, in
+  case of non-persistent connects (Zeev)
+- Added disable_functions php.ini directive, to allow administrators to disable
+  certain functions for security reasons (Zeev)
+- Fixed sessions on Win32. When setting the directory depth parameter in
+  save_path you need to now delimit it with a ';' instead of ':', e.g
+  "5;/tmp" instead of "5:/tmp" (Andi)
+- Changed the Apache handler's return status to 'Declined' when a requested
+  PHP file could not be found.  Returning 'Not Found' caused problems
+  in the ErrorDocument handler stage in that $REDIRECT_REDIRECT_ERROR_NOTES
+  was not getting set at all.  Moving to 'Declined' should fix this and I
+  can't see any other side effects.  (Rasmus)
+- Fixed scanning decimal numbers in internationalized environments. They should
+  always be in standard US format e.g. 23.3. (Andi, Zend Engine)
+- Added second argument to preg_quote() which allows quoting of
+  one additional character, usually the regex delimiter. (Andrei)
+- Uncommitted outstanding OCI8 transactions are now rolled back
+  before the connection is closed. (Thies)
+- ignore_user_abort() & friends should now work in CGI mode as well.
+  (Patch by daniel.braun@ercom.fr)
+- Added extension YAZ (dickmeiss).
+- Fixed a crash bug triggered by certain cases of class redeclarations
+  (Stanislav & Zeev, Zend Engine)
+- Fixed min()/max() segfault. (Andrei)
+- New module for reading EXIF header data from JPEG files.  Most digital
+  cameras will embed all sorts of information about a picture inside the
+  jpeg images it generates.  (Rasmus)
+- Fixed basename() bug where "file.ext///" would not return the same
+  as "/path/file.ext///" (Rasmus)
+- Added the swf_ortho function. (Sterling)
+- Moved to virtual current working directory support. This highly improves the
+  functionality and stability of multi-threaded versions of PHP (Andi, Sascha)
+
+22 May 2000, Version 4.0.0 Release
+- Allow the writing of flash files to stdout.
+- Fixed a crash bug in .phps syntax-highlighted files (Andi)
+- Improved round() to allow specification of rounding precision.
+  (Andrei, Todd Kirby <kirbyt@yahoo.com>)
+- Added SORT_REGULAR, SORT_NUMERIC, SORT_STRING flags that can be used with
+  non-user sort functions for precise sorting behavior. (Andrei)
+- Fixed two 64-bit issues (startup crash, gethostbyaddr). (Sascha)
+- NULL values are now preserved in the return value of mysql_fetch_array()
+  and mysql_fetch_object(). (Andrei)
+- Ported InterBase module finally from PHP 3 to PHP 4. Full support for
+  InterBase 6. (Jouni)
+- Added swf_definepoly for drawing polygons to the SWF functions. (Sterling)
+- Ported imagegammacorrect from PHP3 to PHP4. (Sterling)
+- Added array_rand() function. (Andrei)
+
+8 May 2000, Version 4.0 Release Candidate 2
+- NSAPI WIN32 Module compilable, untested (Shane)
+- Apache WIN32 Module compilable and lightly tested. (Shane)
+- Enabled assert() by default in php.ini-dist. (Andrei)
+- Put in safeguards in case dynamic code evaluation in assert() and
+  preg_replace() with /e modifier fails. (Andrei)
+- Fixed infinite recursion when serializing $GLOBALS[] in WDDX. (Andrei)
+- Made WDDX serialization properly escape <, >, and &. Also speeded up
+  the serialization in general. (Andrei)
+- Moved install-local to install-sapi for clarity. (Joey)
+- Improved extension build framework. Refer to README.SELF-CONTAINED-EXTENSIONS
+  for an introduction. (Sascha)
+- ImagePolygon() is no longer limited by a maximum number of polygons.
+  (Marc Pohl)
+- Added configure time checking for bcmath package. (Joey, Sascha)
+- Added get_declared_classes(). (Andrei, Zend Engine)
+- Add initial NSAPI module from Jayakumar Muthukumarasamy. (Rasmus)
+- Added the SWF module which allows you to create Macromedia Flash files via 
+  libswf. (Sterling)
+- Improved UNIX build system to support more vendor make tools (Sascha)
+- Updated natural comparison/sorting algorithm by Martin Pool
+  <mbp@humbug.org.au>. (Andrei)
+- Fixed a crash in array_multisort() that happened when empty arrays
+  were passed to it. (Andrei)
+- Added substr_count() from Peter Kovacs. (Andrei)
+- Add an optional third argument to fseek to indicate where to seek from.
+  (Andrei)
+- OCIBindByName() will no longer complain about bindlength beeing zero. (Thies)
+- Converted the IMAP module to the high performance API (Zeev)
+- The fgetcsv() function now handles embedded end-of-line in a quoted field
+  (Nick Talbott)
+- Added user_error(), to allow explicitly generate error messages from scripts
+  (Zeev, Zend Engine)
+- Fixed a problem in long2ip() that occasionally returned incorrect IP address.
+  (Evan, Andrei)
+- Fixed many memory leaks in the IMAP module (Stas, Andi, Zeev)
+- Fixed bug in number_format (Jon Forsberg)
+- Make error_prepend_string and error_append_string work (Rasmus)
+- array_walk() now automatically resets the array. (Andrei)
+- Added natural comparison/sorting routines strnatcmp(), strnatcasecmp(),
+  natsort(), and natcasesort(). These are useful for comparing and sorting
+  strings that contain numbers. Based on the code from Martin Pool
+  <mbp@humbug.org.au>. See http://www.linuxcare.com.au/projects/natsort/
+  for more info on natural sorting. (Andrei)
+- Zeus Webserver support (version 3.3.6+) for ISAPI (Ben Mansell)
+- Fixed several problems with the PATH_TRANSLATED and PHP_SELF under Apache
+  (Paul Gregg & Zeev)
+- Ported ldap_get_values_len() function from PHP3 to PHP4. (Sterling)
+- Fixed a problem in include_once() with non constant arguments (Andi & Zeev,
+  Zend Engine)
+- Added php.ini-optimized (Zeev)
+- Ported ldap_errno(), ldap_err2str() and ldap_error() from PHP3 to PHP4.
+  (Sterling)
+- WDDX now defaults to ISO-8859-1. (Thies)
+- Fixed crash resulting from IMAP's error handling (Stas)
+- Added $HTTP_POST_FILES[filename][tmp_name] - it was previously impossible to
+  retrieve the temporary name of an uploaded file using $HTTP_POST_FILES[]
+  (Zeev)
+- Made the IMAP and LDAP modules compilable under Windows and thread-safe
+  (Zeev)
+- Fixed a problem when dealing with large POST blocks in CGI mode (Zeev)
+- Added session_get_cookie_params() function. (Sterling)
+- Fixed return of stristr() to no longer always be lowercased. (Andrei)
+- Changed the Windows version of PHP so that a php.ini file is no
+  longer mandatory (Zeev)
+- session_start() is now more verbose if headers cannot be send. (Thies)
+- Fixed a memory leak when using assign-op bitwise operators on strings (Zeev,
+  Zend Engine)
+- Added support for reading properties that require arguments in the COM
+  module - writing to them will only be supported in PHP 4.1 (Zeev)
+- Fixed a very old legacy memory leak in the COM module (Zeev)
+- Fixed problems with object-overloading support - noteably, COM and Java
+  (Zeev, Zend Engine)
+- Fixed an overrun in WDDX. (Thies)
+- Fixed a crash bug with modules loaded through dl() not properly freeing their
+  resources (Zeev, Zend Engine)
+- Added localtime() function. (Sterling)
+- Added the 'I' format option for the date function, this option will return
+  true or false depending on whether or not daylight savings time is in effect.
+(Sterling)
+- Added gmstrftime() function. (Sterling)
+- snmp_walkoid is now an alias for snmp_realwalk. (Sterling)
+- Fixed a bug that could cause a crash when using 'global' inside large include
+  files (Stas, Zend Engine)
+- Added --enable-libgcc switch to force linking against libgcc (Sascha)
+- Fixed dynamic loading where extension_dir had no trailing slash (Sascha)
+- Fixed dynamic loading on OpenBSD (Sascha)
+- Improved POSIX threads check. ZTS works now on at least Linux, Solaris, 
+  FreeBSD and OpenBSD (Sascha, TSRM)
+- Added !== operator support. (Torben, Zend Engine)
+
+27 March 2000, Version 4.0 Release Candidate 1
+- Added support for UCD-SNMP 4.1.x (Sascha)
+- Fixed a data corruption bug in mysql_result(), if used in table.fieldname
+  mode (Zeev)
+- Fixed a crash problem in func_num_args(), func_get_arg() and func_get_args()
+  when used as function arguments (Andi, Zend Engine)
+- Added get_class_methods(string classname) function. (Andrei)
+- Added 'I' switch to test whether or not DST is active. (Sterling)
+- Fixed a data corruption bug in mysql_result(), if used in table.fieldname
+  mode (Zeev)
+- Modified the registry INI entry reader (Win32) to work with drive letters.
+  For example, if you wish to wish to specify INI entries for C:\foo\bar, you
+  should create HKLM\PHP\Per Directory Values\C\foo\bar in the registry, and add
+  string values for each directive you want to override in this directory (Zeev)
+- Fixed extract() for EXTR_PREFIX_SAME and EXTR_SKIP cases. (Andrei)
+- stristr() no longer modifies it's arguments. (Thies)
+- Don't default to iso-8859-1 since this confuses some browsers. (Rasmus)
+- Make it possible to specify both a port and a socket
+  in mysql_[p]connect.  (Rasmus)
+- Added --disable-pic for disabling generating PIC for shared objects
+  on platforms which support it (i.e. Linux) (Sascha)
+- serialize()/unserialize() now call __sleep() and __wakeup() when
+  working on objects. (Thies)
+- renamed to_string() method to __string_value() for consistency.
+  (Thies, Zend Engine)
+- Fixed a bug in the third argument to define()
+- Added is_numeric() that returns true if the argument is a number
+  or a numeric string. (Andrei)
+- domxml now supports libxml 2.0 Beta and drops support for older versions,
+  due to massive changes in libxml
+- fixed possible crash in unserialize() if serialized data was
+  corrupted. (Thies)
+- Changed $HTTP_STATE_VARS to $HTTP_SESSION_VARS. Use only the latter
+  version now! (Andrei)
+- Added GD-JPEG Support (Rasmus)
+- Prevent from loading dynamic PHP modules which were compiled with different
+  debug and thread safety modes than PHP, which resulted in a crash (Andi)
+- connection_aborted() and friends work again (Thies)
+- Upgraded to libtool 1.3.4 (Sascha)
+- UNIX configure creates config.nice in the build directory now which allows
+  easy reuse of configuration options (Sascha)
+- Added support for embedded MySQL client library. Unless you specify a path
+  to --with-mysql, the bundled MySQL client library will be used (Sascha)
+- Added include_once() and require_once() functionality (Andi, Zend Engine)
+- Removed support for pdflib < 3.0 (Uwe)
+- Added auto-registration of everything in $HTTP_SESSION_VARS[] if
+  register_globals is turned off. (Andrei)
+- Cleaned up extension namespace (Stig)
+- OCINLogon() sessions are now closed again. (Thies)
+- Added ip2long() and long2ip(),
+  courtesy of Faisal Nasim <faisal@nasim.org> (Andrei)
+- Added ftruncate() and fstat(),
+  courtesy of Faisal Nasim <faisal@nasim.org> (Andrei)
+- Added parse_ini_file().  Currently implemented in non thread safe version
+  of PHP, and currently lacks section support (Zeev)
+- "none" is now equivalent with "" in Apache config directives (Stig)
+- OCINLogon no longer crashes. (Thies)
+- Fixed comparisons of (string) "nan" with (string) "nan". (Thies, Zend Engine)
+- Switched back to the old $HTTP_*_VARS[] behavior - $HTTP_GET_VARS["foo"]
+  and $foo are no longer references to each other, but separate variables
+  like they were prior to PHP 4.0 Beta 4 (Zeev)
+- Fixed Sybase-DB compilation (Zeev)
+- Fixed a (fairly common) situation where error_reporting values would not be
+  properly restored after a call to error_reporting(), in between requests
+  (Zeev)
+- The various $HTTP_*_VARS[] are now protected, and cannot be manipulated by
+  user input (Zeev)
+- Added ini_set() as an alias to ini_alter() (Zeev)
+- The string None is now recognized as a keyword by the php.ini processor, and
+  can be used to denote an empty string (Zeev)
+- Added get_class_vars(string class_name) and get_object_vars(object obj)
+  functions. (Andrei, Zend Engine)
+- Added pdf_set_parameter(), pdf_skew(), pdf_show_boxed() (Uwe)
+- Fixed comparison of (string) "inf" with (string) "inf", which was erroneously
+  returning false (Zeev)
+- Implemented default_charset and default_mimetype config directives (Stig)
+- Ported T1lib support from PHP3. (Jouni)
+- Fixed -DEAPI inheritance from APXS. (Sascha)
+- Fixed possible crash in module-shutdown. (Thies)
+- Fixed safe_mode_protected_env_vars INI directive (Zeev)
+- Fixed getrusage() (Sascha)
+- Fixed OCI8 crash when returning cursors from stored-procedures. (Thies)
+
+21 February 2000 Version 4.0 Beta 4 patch level 1 
+- Fixed crash when magic_quotes were switched off. (Thies)
+- Support for pdflib 2.30 (Uwe)
+
 20 February 2000, Version 4.0 Beta 4
 - Introduced $HTTP_POST_FILES[], that contains information about files uploaded
   through HTTP upload (Zeev)
@@ -9,8 +471,8 @@ PHP 4.0                                                                    NEWS
 - Made multipart/form-data content obey to the variables_order directive (Zeev)
 - Updated the browscap module to work with PHP 4.0 (Zeev)
 - Recover gracefully in ISAPI after the client prematurely presses STOP (Andi)
-- Fix bug in unset() on array offsets which are referenced more than once
-  (Andi, Zend library)
+- Fixed bug in unset() on array offsets which are referenced more than once
+  (Andi, Zend Engine)
 - Improved ISAPI module - it should no longer be necessary to set PHP as
   an ISAPI filter, only as an ISAPI extension, unless you wish to perform
   authentication using PHP.  This didn't yet get enough testing, but it
@@ -21,7 +483,7 @@ PHP 4.0                                                                    NEWS
 - Re-introduced "none" for disabling auto_prepend/append_file (Stig)
 - Added DB/storage (Stig, PEAR)
 - Introduced DB warnings (Stig, PEAR)
-- Fix overrun in strip_tags (Stas)
+- Fixed overrun in strip_tags (Stas)
 - Fixed crash in strip_tags() and related functions. (Thies)
 - Workaround for bogus POST-Data from IE/Mac. (Thies)
   Patch by Alain Malek <alain@virtua.ch>
@@ -32,7 +494,7 @@ PHP 4.0                                                                    NEWS
 - base64_decode() will decode POST data correct. (Thies)
   Patch submitted by: Turadg Aleahmad <turadg@wise.berkeley.edu>
 - Much more work on domxml. Build xml tree, create xml doc works (Uwe)
-- Made foreach() work on objects. (Thies, Zend library)
+- Made foreach() work on objects. (Thies, Zend Engine)
 - Added domxml extension based on libxml, still little functionality (Uwe)
 - Fixed memory corruption in fgetss(), strip_tags() and gzgetss() (Zeev)
 - Updated calendar dynamic library to work with PHP 4. (Evan)
@@ -88,10 +550,10 @@ PHP 4.0                                                                    NEWS
 - Implemented support for <boolean> and <null> types according
   to WDDX version 1.0 (Andrei)
 - Made var_dump()/serialize()/unserialize() NULL aware. (Thies)
-- Added new NULL constant (Zeev, Zend library)
+- Added new NULL constant (Zeev, Zend Engine)
 - Fixed -c support in the standalone CGI binary (Zeev)
 - Increased PHP's performance by 5-15% using a new memory cache (Andi & Zeev,
-  Zend library)
+  Zend Engine)
 - Improved the php.ini reader to support constants and bitwise operators (Zeev)
 - Fixed strrev() to no longer modify arg1. (Thies)
 - Fixed buffer overruns in iptcembed(). (Thies)
@@ -112,16 +574,16 @@ PHP 4.0                                                                    NEWS
 - Added get_loaded_extensions(), extension_loaded(), and
   get_extension_funcs() functions. (Andrei)
 - Added date/time stamping to PHP error log file. (Andrei, Joey)
-- Added is_subclass_of() function (Andrei, Zend library)
+- Added is_subclass_of() function (Andrei, Zend Engine)
 - Implemented count_chars(). (Thies)
-- Added class_exists() function (Andrei, Zend library)
+- Added class_exists() function (Andrei, Zend Engine)
 - Made strspn() and strcspn() binary-safe. (Andrei)
 - Added array_multisort() function. (Andrei)
 - Made pageinfo.c thread-safe (Sascha)
 - Made implode() binary-safe (Andrei)
 - Made strstr(), stristr(), and ucwords() binary-safe() (Andrei)
 - Made strtoupper(), strtolower(), substr_replace() binary-safe. (Andrei)
-- Fix a crash in the Apache syntax highlighting mode (Zeev)
+- Fixed a crash in the Apache syntax highlighting mode (Zeev)
 - Report all ODBC error's not just the one on the top of the stack (lurcher)
 - OCI8 now returns NULL values in LONG columns correct. (Thies)
 - Added support for a C-like assert() function. (Thies)
@@ -142,7 +604,7 @@ PHP 4.0                                                                    NEWS
 - Make the global GET/POST/Cookie variables and their $HTTP_*_VARS[] counterparts
   be references to each other (Zeev)
 - Added support for the 'use' keyword - behaves like 'require', but will not
-  use the same file more than once (Andi & Zeev, Zend library)
+  use the same file more than once (Andi & Zeev, Zend Engine)
 - Added check to see if a persistent connection is still valid with the
   ODBC interface before reusing (nick@easysoft.com)
 - Added DBMaker support (patch by Pax Tsai <paxtsai@lion.syscom.com.tw>)
@@ -151,7 +613,7 @@ PHP 4.0                                                                    NEWS
 - Disable symlinks to urls (Rasmus)
 - Informix driver now reflects version of ESQL/C used  (Danny)
 - Modified session_register() to take variable number of arguments (Andrei)
-- Fixed file descriptor leak in thread safe mode (Zeev, Zend library)
+- Fixed file descriptor leak in thread safe mode (Zeev, Zend Engine)
 - Added select(), fd_set() and fd_isset() (Evan)
 - cpdf support has been ported from php3, needs ClibPDF 2.x (Uwe)
 - Fixed a leak when using automatic output buffering (Zeev)
@@ -160,7 +622,7 @@ PHP 4.0                                                                    NEWS
 - Fixed inconsistencies in the implementation of here-docs (Andi & Zeev, Zend 
   library)
 - Fixed a problem with constant class-member initializations (Andi & Zeev,
-  Zend library)
+  Zend Engine)
 - Fixed float-compare in min(),max(),a[r]sort(),[r]sort() (Thies)
 - Implemented get_html_translation_table() function (Thies)
 - Implemented array_flip() function. Returns input-array with key, value
@@ -180,7 +642,7 @@ November 16 1999, Version 4.0 Beta 3
 - Upgraded regex library to alpha3.8 (Sascha)
 - Fixed selecting nested-tables in OCI8. (Thies)
 - RFC-854 fix for internal FTP-Code. Commands have to end in "\r\n" (Thies)
-- Fix OpenLink ODBC support (Stig)
+- Fixed OpenLink ODBC support (Stig)
 - min(),max(),a[r]sort(),[r]sort(),k[r]sort() now work consistent with the 
   language-core. (Thies)
 - tempnam() now uses mkstemp() if available (Stig)
@@ -191,7 +653,7 @@ November 16 1999, Version 4.0 Beta 3
   Patch submitted by: neal@wanlink.com
 - Added Microsoft SQL Server module for Win32 (Frank)
 - Added support for forcing a variable number of internal function arguments
-  by reference. (Andi & Zeev, Zend library)
+  by reference. (Andi & Zeev, Zend Engine)
 - Implemented getprotoby{name,number} (Evan)
 - Added array_pad() function. (Andrei)
 - Added new getservby{name,port} functions. (Evan)
@@ -207,7 +669,7 @@ November 16 1999, Version 4.0 Beta 3
 - Added getcwd() function. (Thies)
 - XML_Parse_Into_Struct no longer eats data. (Thies)
 - Fixed parse_url('-') crash. (Thies)
-- added === operator support. (Andi & Thies, Zend library)
+- added === operator support. (Andi & Thies, Zend Engine)
 - unserialize() now gives a notice when passed invalid data. (Thies)
 - Fixed shuffle() so that it no longer breaks on Solaris. (Andrei)
 - Added is_resource(), is_bool() functions. (Thies)
@@ -229,7 +691,7 @@ November 16 1999, Version 4.0 Beta 3
   messages. NEWS file is now the place for public announcements. (Andrei)
 - Fixed refcount problem in XML module. (Thies)
 - Fixed crash in HTTP_RAW_POST_DATA handling (Thies)
-- You can use resources as array-indices again (Thies, Zend library)
+- You can use resources as array-indices again (Thies, Zend Engine)
 - Fixed pg_fetch_array() with three arguments (Sascha)
   Patch submitted by: brian@soda.berkeley.edu
 - Upgraded a lot internal functions to use new Zend function API (Thies)
@@ -242,12 +704,12 @@ November 16 1999, Version 4.0 Beta 3
 - Fixed header("HTTP/..."); behaviour (Sascha)
 - Improved UNIX build system. Now utilizes libtool (Sascha)
 - Upgrade some more internal functions to use new Zend function API. (Thies, 
-  Zend library)
+  Zend Engine)
 - Fixed backwards incompatibility with ereg() (Thies)
 - Updated Zend garbage collection with a much more thorough method.
-  (Andi, Zend library)
+  (Andi, Zend Engine)
 - Added the ability to use variable references in the array() construct.
-  For example, array("foo" => &$foo). (Andi, Zend library)
+  For example, array("foo" => &$foo). (Andi, Zend Engine)
 - Added array_reverse() function (Andrei)
 - Some more XML fixes/cleanups (Thies)
 - Updated preg_replace() so that if any argument passed in is an array
@@ -273,8 +735,8 @@ November 16 1999, Version 4.0 Beta 3
 - Updated Oracle to use the new high-performance Zend function API. (Thies)
 - Improved the performance of the MySQL module significantly by using the new
   high-performance Zend function API. (Zeev)
-- Add support for the Easysoft ODBC-ODCB Bridge (martin@easysoft.com)
-- Fix bug in odbc_setoption, getParameter call incorrect (martin@easysoft.com)
+- Added support for the Easysoft ODBC-ODCB Bridge (martin@easysoft.com)
+- Fixed bug in odbc_setoption, getParameter call incorrect (martin@easysoft.com)
 - Ora_Fetch_Into now resets the returned array in all cases (Thies) 
 - Fixed NULL-Column problem in Oracle-Driver (Thies)
 - Added extra metadata functions to ODBC, SQLTables etc (nick@easysoft.com)
@@ -360,15 +822,15 @@ November 16 1999, Version 4.0 Beta 3
   from the command line (Zeev)
 - Fixed a crash that would occur if wddx_deserialize did not receive
   a valid packet (Andrei)
-- Fixed a bugglet when redefining a class at run-time (Andi, Zend library)
+- Fixed a bugglet when redefining a class at run-time (Andi, Zend Engine)
 - Fixed sem_get() on AIX (Sascha)
 - Fixed fopen() to work with URL's in Win32 (Andi & Zeev)
-- Fixed include_path for Win32 (Andi, Zend library)
+- Fixed include_path for Win32 (Andi, Zend Engine)
 - Fixed bug in ISAPI header sending function (Charles)
-- Fixed memory leak when using undefined values (Andi & Zeev, Zend library)
+- Fixed memory leak when using undefined values (Andi & Zeev, Zend Engine)
 - Added output_buffering directive to php.ini, to enable output buffering
   for all PHP scripts - default is off (Zeev).
-- Fixed some more class inheritance issues (Zeev, Zend library)
+- Fixed some more class inheritance issues (Zeev, Zend Engine)
 - Fixed Apache build wrt to shared modules on FreeBSD/Linux (Sascha)
 - Added session.extern_referer_chk which checks whether session ids were
   referred to by an external site and eliminates them (Sascha)
@@ -421,25 +883,25 @@ August 9 1999, Version 4.0 Beta 2
 - Fixed a bug in implode() that caused it to corrupt its arguments (Zeev)
 - Added get_class($obj), get_parent_class($obj) and method_exists($obj,"name")
   (Andi & Zeev)
-- Fixed various inheritance problems (Andi & Zeev, Zend library)
+- Fixed various inheritance problems (Andi & Zeev, Zend Engine)
 - Children now inherit their parent's constructor, if they do not supply a
   constructor of their own.
 - Fixed runtime inheritance of classes (parent methods/properties were
-  overriding their children) (Zeev, Zend library)
-- Fixed backwards incompatibility with the "new" operator (Andi, Zend library)
+  overriding their children) (Zeev, Zend Engine)
+- Fixed backwards incompatibility with the "new" operator (Andi, Zend Engine)
 - Fixed bugs in uksort() and ksort() sort ordering (Andrei)
 - Fixed a memory leak when using assignment-op operators with lvalue of type
-  string (Zeev, Zend library)
+  string (Zeev, Zend Engine)
 - Fixed a problem in inheritance from classes that are defined in include()d
-  files (Zeev, Zend library)
+  files (Zeev, Zend Engine)
 - Fixed a problem with the PHP error handler that could result in a crash
   on certain operating systems (Zeev)
 - Apache php_flag values only recognized 'On' (case sensitive) - changed
   to case insensitive (Zeev)
 - Fixed a memory leak with switch statement containing return statements
-  (Andi & Zeev, Zend library)
+  (Andi & Zeev, Zend Engine)
 - Fixed a crash problem in switch statements that had a string offset
-  as a conditional (Andi & Zeev, Zend library)
+  as a conditional (Andi & Zeev, Zend Engine)
 - Imported PHP 3.0 fixes for rand() and mt_rand() (Rasmus)
 - Added function entries for strip_tags() and similar_text() (Andrei)
 - Fixed a bug in WDDX that would cause a crash if a number was passed in
@@ -462,7 +924,7 @@ August 9 1999, Version 4.0 Beta 2
 - Added session id detection within REQUEST_URI (Sascha)
 - Merged in HP-UX/ANSI compatibility switch from PHP 3.0 (Sascha)
 - Fixed rpath handling for utilitites built during Apache build (Sascha)
-- Added missing E_ error level constants (Zeev, Zend library)
+- Added missing E_ error level constants (Zeev, Zend Engine)
 - Fixed a bug in sending multiple HTTP Cookies under Apache (Zeev)
 - Fixed implicit connect on the MySQL, mSQL, PostgreSQL and Sybase
   modules (Zeev)

README.CVS-RULES

@@ -19,7 +19,7 @@ Having said that, here are the organizational rules:
 
    2. Discuss any significant changes on the list before committing. 
 
-   3. Look at MAINTANERS file to see who is the primary maintainer of
+   3. Look at EXTENSIONS file to see who is the primary maintainer of
       the code you want to contribute to.
 
    4. If you "strongly disagree" about something another person did, don't
@@ -62,7 +62,9 @@ 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 # or @ 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.
 
 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

README.EXT_SKEL

@@ -0,0 +1,181 @@
+
+WHAT IT IS
+
+  It's a tool for automatically creating the basic framework for a PHP module
+  and writing C code handling arguments passed to your functions from a simple
+  configuration file. See an example at the end of this file.
+
+HOW TO USE IT
+
+  Very simple. First, cd do directory ext/ in PHP 4 sources. If you just need
+  the basic framework and will be writing all the code in your functions
+  yourself, you can now do
+
+   ./ext_skel --extname=module_name
+
+  and everything you need is placed in directory module_name. In fact, if you
+  don't need to test the existence of any external header files, libraries or
+  functions in them, the module is already almost ready to be compiled in PHP.
+  Just remove 3 comments in your_module_name/config.m4, cd back up to PHP
+  sources top directory, and do
+
+    ./buildconf; ./configure --enable-module_name; make
+
+  But if you already have planned the overall scheme of your module, what
+  functions it will contain, their return types and the arguments they take
+  (a very good idea) and don't want to bother yourself with creating function
+  definitions and handling arguments passed yourself, it's time to create a
+  function definitions file, which you will give as an argument to ext_skel
+  with option
+
+    --proto=filename.
+
+FORMAT OF FUNCTION DEFINITIONS FILE
+
+  All the definitions must be on one line. In it's simplest form, it's just
+  the function name, ie.
+
+    my_function
+
+  but then you'll be left with an almost empty function body without any
+  argument handling.
+
+  Arguments are given in parenthesis after the function name, and are of
+  the form 'argument_type argument_name'. Arguments are separated from each
+  other with a comma and optional space. Argument_type can be one of int,
+  bool, double, float, string, array, object or mixed.
+
+  An optional argument is separated from the previous by an optional space,
+  then '[' and of course comma and optional space, like all the other
+  arguments. You should close a row of optional arguments with same amount of
+  ']'s as there where '['s. Currently, it does not harm if you forget to do it
+  or there is a wrong amount of ']'s, but this may change in the future.
+
+  An example:
+
+    my_function(int arg1, int arg2 [, int arg3 [, int arg4]])
+
+  Arguments arg3 and arg4 are optional.
+
+  If possible, the function definition should also contain it's return type
+  in front of the definition. It's not actually used for any C code generating
+  purposes but PHP in-source documentation instead, and as such, very useful.
+  It can be any of int, double, string, bool, array, object, resource, mixed
+  or void.
+
+  The file must contain nothing else but function definitions, no comments or
+  empty lines.
+
+OTHER OPTIONS
+
+    --no-help
+
+  By default, ext_skel creates both comments in the source code and a test
+  function to help first time module writers to get started and testing
+  configuring and compiling their module. This option turns off all such things
+  which may just annoy experienced PHP module coders. Especially useful with
+
+    --stubs=file
+
+  which will leave out also all module specific stuff and write just function
+  stubs with function value declarations and passed argument handling, and
+  function entries and definitions at the end of the file, for copying and
+  pasting into an already existing module.
+
+    --assign-params
+    --string-lens
+
+  By default, function proto 'void foo(string bar)' creates the following:
+     ...
+     zval **bar;
+     ... (zend_get_parameters_ex() called in the middle...)
+     convert_to_string_ex(bar);
+
+  Specifying both of these options changes the generated code to:
+     ...
+     zval **bar_arg;
+     int bar_len;
+     char *bar = NULL;
+     ... (zend_get_parameters_ex() called in the middle...)
+     convert_to_string_ex(bar_arg);
+     bar = Z_STRVAL_PP(bar_arg);
+     bar_len = Z_STRLEN_PP(bar_arg);
+
+  You shouldn't have to ask what happens if you leave --string-lens out. If you
+  have to, it's questionable whether you should be reading this document.
+
+    --with-xml[=file]
+
+  Creates the basics for phpdoc .xml file.
+
+    --full-xml
+
+  Not implemented yet. When or if there will ever be created a framework for
+  self-contained extensions to use phpdoc system for their documentation, this
+  option enables it on the created xml file.
+
+CURRENT LIMITATIONS, BUGS AND OTHER ODDITIES
+
+  Only arguments of types int, bool, double, float, string and array are
+  handled. For other types you must write the code yourself. And for type
+  mixed, it wouldn't even be possible to write anything, because only you
+  know what to expect.
+  
+  It can't handle correctly, and probably never will, variable list of
+  of arguments. (void foo(int bar [, ...])
+
+  Don't trust too much the generated code. It tries to be useful in most of
+  the situations you might encounter, but automatic code generating will never
+  beat a programmer who knows the real situation at hand. ext_skel is generally
+  best suited for quickly generating a wrapper for c-library functions you
+  might want to have available in PHP too.
+
+  This program doesn't have a --help option. It has --no-help instead.
+
+EXAMPLE
+
+  The following _one_ line
+
+  bool my_drawtext(resource image, string text, resource font, int x, int y [, int color])
+
+  will create this function definition for you (note that there are a few
+  question marks to be replaced by you, and you must of course add your own
+  value definitions too):
+
+/* {{{ proto bool my_drawtext(resource image, string text, resource font, int x, int y[, int color])
+    */
+PHP_FUNCTION(my_drawtext)
+{
+	zval **image, **text, **font, **x, **y, **color;
+	int argc;
+	int image_id = -1;
+	int font_id = -1;
+	???LS_FETCH();
+
+	argc = ZEND_NUM_ARGS();
+	if (argc < 5 || argc > 6 || zend_get_parameters_ex(argc, &image, &text, &font, &x, &y, &color) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	ZEND_FETCH_RESOURCE(???, ???, image, image_id, "???", ???G());
+	ZEND_FETCH_RESOURCE(???, ???, font, font_id, "???", ???G());
+
+	switch (argc) {
+		case 6:
+			convert_to_long_ex(color);
+			/* Fall-through. */
+		case 5:
+			convert_to_long_ex(y);
+			convert_to_long_ex(x);
+			/* font: fetching resources already handled. */
+			convert_to_string_ex(text);
+			/* image: fetching resources already handled. */
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+	}
+
+	php_error(E_WARNING, "my_drawtext: not yet implemented");
+}
+/* }}} */
+

README.SELF-CONTAINED-EXTENSIONS

@@ -0,0 +1,174 @@
+$Id$
+=============================================================================
+
+HOW TO CREATE A SELF-CONTAINED PHP EXTENSION
+
+  A self-contained extension can be distributed independently of
+  the PHP source. To create such an extension, three things are
+  required:
+
+  - Makefile template (Makefile.in)
+  - Configuration file (config.m4)
+  - Source code for your module
+
+  We will describe now how to create these and how to put things
+  together.
+
+PREPARING YOUR SYSTEM
+
+  While the result will run on any system, a developer's setup needs these
+  tools:
+
+    GNU autoconf
+    GNU automake
+    GNU libtool
+    GNU m4
+
+  All of these are available from 
+
+    ftp://ftp.gnu.org/pub/gnu/
+
+CONVERTING AN EXISTING EXTENSION
+
+  Just to show you how easy it is to create a self-contained
+  extension, we will convert an embedded extension into a
+  self-contained one. Install PHP and execute the following
+  commands.
+  
+     $ mkdir /tmp/newext
+     $ cd /tmp/newext
+
+  You now have an empty directory. We will copy the files from
+  the mysql extension:
+
+     $ cp -rp php-4.0.X/ext/mysql/* .
+
+  It is time to finish the module. Run:
+
+     $ phpize
+
+  You can now ship the contents of the directory - the extension
+  can live completely on its own.
+
+  The user instructions boil down to
+
+     $ ./configure \
+            [--with-php-config=/path/to/php-config] \
+            [--with-mysql=MYSQL-DIR]
+     $ make install
+
+  The MySQL module will either use the embedded MySQL client 
+  library or the MySQL installation in MYSQL-DIR.
+
+
+DEFINING THE NEW EXTENSION
+
+  Our demo extension is called "foobar".
+
+  It consists of two source files "foo.c" and "bar.c"
+  (and any arbitrary amount of header files, but that is not
+  important here).
+  
+  The demo extension does not reference any external 
+  libraries (that is important, because the user does not
+  need to specify anything).
+
+
+CREATING THE MAKEFILE TEMPLATE 
+  
+  The Makefile Template (Makefile.in) contains three lines:
+
+------------------------------------------------------------------------------
+LTLIBRARY_SHARED_NAME = foobar.la
+LTLIBRARY_SOURCES     = foo.c bar.c
+
+include $(top_srcdir)/build/dynlib.mk
+------------------------------------------------------------------------------
+
+  LTLIBRARY_SHARED_NAME specifies the name of the extension.
+  It must be of the form `ext-name.la'.
+
+  LTLIBRARY_SOURCES specifies the names of the sources files. You can
+  name an arbitrary number of source files here.
+
+  The final include directive includes the build rules (you usually
+  don't need to care about what happens there). rules.mk and other
+  files are installed by phpize which we will cover later.
+
+
+CREATING THE M4 CONFIGURATION FILE
+
+  The m4 configuration can perform additional checks. For a 
+  self-contained extension, you do not need more than a few
+  macro calls.
+
+------------------------------------------------------------------------------
+PHP_ARG_ENABLE(foobar,whether to enable foobar,
+[  --enable-foobar            Enable foobar])
+
+if test "$PHP_FOOBAR" != "no"; then
+  PHP_EXTENSION(foobar, $ext_shared)
+fi
+------------------------------------------------------------------------------
+
+  PHP_ARG_ENABLE will automatically set the correct variables, so
+  that the extension will be enabled by PHP_EXTENSION in shared mode.
+
+  Please use always PHP_ARG_ENABLE or PHP_ARG_WITH. Even if you do not
+  plan to distribute your module with PHP, these facilities allow you
+  to integrate your module easily into the main PHP module framework.
+
+CREATING SOURCE FILES
+
+  ext_skel can be of great help when creating the common code for all modules
+  in PHP for you and also writing basic function definitions and C code for
+  handling arguments passed to your functions. See README.EXT_SKEL for further
+  information.
+
+  As for the rest, you are currently alone here. There are a lot of existing
+  modules, use a simple module as a starting point and add your own code.
+
+
+CREATING THE SELF-CONTAINED EXTENSION
+
+  Put Makefile.in, config.m4 and the source files into one directory.
+  Then run phpize (this is installed during make install by PHP 4.0).
+  For example, if you configured PHP with --prefix=/php, you would run
+
+     $ /php/bin/phpize
+
+  This will automatically copy the necessary build files and create
+  configure from your config.m4.
+
+  And that's it. You now have a self-contained extension.
+
+INSTALLING A SELF-CONTAINED EXTENSION
+
+  An extension can be installed by running:
+
+     $ ./configure \
+            [--with-php-config=/path/to/php-config]
+     $ make install
+
+ADDING SHARED MODULE SUPPORT TO A MODULE
+
+  In order to be useful, a self-contained extension must be loadable
+  as a shared module. I will explain now how you can add shared module 
+  support to an existing module called foo.
+
+  1. In config.m4, use PHP_ARG_WITH/PHP_ARG_ENABLE. Then you will
+     automatically be able to use --with-foo=shared or
+     --enable-foo=shared.
+
+  2. In config.m4, use PHP_EXTENSION(foo, $ext_shared) to enable
+     building the extension.
+
+  3. Add the following line to Makefile.in:
+
+        LTLIBRARY_SHARED_NAME = foo.la
+
+  4. Add the following lines to your C source file:
+
+        #ifdef COMPILE_DL_FOO
+        ZEND_GET_MODULE(foo)
+        #endif

README.Zeus

@@ -0,0 +1,102 @@
+Using PHP4 with the Zeus Web Server
+-----------------------------------
+
+Zeus fully supports running PHP in combination with our webserver. A
+significant improvement in PHP 4 is that you can now run PHP as an
+ISAPI module, giving great performance benefits over traditional CGI
+code.
+
+Note that you will need to be running at least version 3.3.6 of the
+webserver. If you are running an earlier version, please see our
+website (http://www.zeus.com) for upgrade instructions.
+
+
+To build the ISAPI version of PHP, start the configuration with:
+
+./configure --with-zeus=/usr/local/zeus
+
+Obviously, replace /usr/local/zeus with the location of where you have
+installed Zeus on your machine. For PHP to build successfully, you
+need to have 3.3.6 already installed, because the code relies on the
+presence of header files provided with the latest version.
+
+You may have to adjust the environment variable LDFLAGS and EXTRA_LIBS
+in order to link in extra libraries. This depends on the platform on
+which you are building and also on the compiler used (see below). A
+standard GNU/Linux install with GCC should build fine with no changes.
+
+
+Configuring the webserver
+-------------------------
+
+After running 'make' and 'make install', you will have a 'libphp4.so'
+file. Copy this file into a directory reserved for ISAPI
+binaries. Now, perform the following steps for each virtual server
+that you wish to run PHP on:
+
+1) On the Admin server, go to 'edit server->path mapping'
+2) Add an alias to the directory with libphp4.so in it, mapped to
+   /isapi/ (or a location of your choice). Make sure you set the alias
+   type to ISAPI.
+3) Click 'update'
+4) Add a handler for file extension 'php' to be run by /isapi/libphp4.so
+5) Click 'update', then go back to the previous page.
+6) Click on the 'module configuration' button, ensure that ISAPI
+   support is ticked.
+7) Click on the ISAPI link. At the bottom of the page, click the
+   checkbox for running ISAPI extensions 'out of process'.
+8) Click 'update'. Then restart the virtual server. Done!
+
+
+Troubleshooting
+---------------
+
+*) Why does the compile fail at Zend/zend-scanner-cc.cc
+                             or Zend/zend-parser.c ?
+
+These source files are auto-generated from the corresponding .y files.
+The default distribution of PHP contains pre-generated versions of these
+files that have caused problems for some people. The simplest solution is
+to delete the files. They will then be rebuilt correctly. You must have the
+following GNU tools to do this:
+
+       bison  1.28 or later
+       flex  2.5.4 or later
+
+*) Why does my PHP library fail to load?
+
+After configuring Zeus, if you get a '502 Bad Gateway' error when
+accessing a PHP page, there are problems loading the PHP
+library. Check the error log ($ZEUSHOME/web/log/errors) for errors.
+
+Failing to load the PHP ISAPI module is likely to be due to unresolved
+symbols in the module. A way to check for this is to visit our support
+page at http://support.zeus.com/faq/entries/isapi_error.html and run
+the program there on your libphp4.so. It will list any unresolved
+symbols.
+
+*) My libphp4.so has unresolved symbols. How do I fix this?
+
+You must ensure that the PHP build process links in the appropriate
+libraries that contain these symbols! The libraries required will
+depend on the platform you are running PHP on.
+
+You may need to set one or two environment variables before running
+the 'configure' program to set up PHP; LDFLAGS and EXTRA_LIBS. Make
+sure that you also export these variables to the build process.
+(Type 'export LDFLAGS EXTRA_LIBS' in the shell to do this.)
+
+Specific examples:
+
+Solaris + gcc:
+Ensure you run ./configure with the `--enable-libgcc' parameter. You
+may need to set LDFLAGS to '-L/usr/local/egcs/lib' (path depends on
+your gcc installation)
+
+FreeBSD 4.0:
+Some people may find they need to run ./configure with the
+'--enable-libgcc' compile option too.
+
+
+For more information and help with Zeus, please visit our website:
+http://www.zeus.com

TODO

@@ -3,16 +3,18 @@ parenthesis means that person has taken on this project.
 
 Zend
 ----
-    * allow foreach ($array as $k => &$val) syntax. right now we can not 
-	  traverse an array without copying each element.
-    * create typedefs for all kinds of callback functions - this would make
-      casting easier. eg: zend_hash_apply(someht,(zend_apply_f) bla);
+    * allow foreach ($array as $k => &$val) syntax. right now we cannot 
+      traverse an array without copying each element.
+    * look at replacing c-lib call tolower().
 
 global
 ------
-    * let every module (source-file) have it's own module & function_entry 
-      block. Right now the math functions are in math.c but the corresponding
-      function-entries are in basic_functions.
+    * make everything on the language-level independent of your locale setings.
+    * always build the standalone executable as well as the chosen SAPI 
+      target.
+    * make sure all source files have the "right" copyright.
+    * the following modules still use PHP3_TLS_*() macros (and thereby don't 
+      work in ZTS mode): ext/dav/dav.c, ext/db/db.c, ext/gd/gd.c, ext/ldap/ldap.c
     * make sure that all ZTS globals get destructed. Most ts_allocate_id()
       calls should have a dtor entry.
     * activate all extensions by default that don't rely on external
@@ -20,43 +22,79 @@ global
     * --enable-all in configure. (--enable-shared=max ...)
     * make configure print out a summary when it's done (like XEmacs)
     * replace standard functions which work on static data with 
-      reentrant-save functions
-    * there is only one current directory per process; to make
-      chdir() etc. thread-safe, we must introduce a per-thread
-      current directory
-    * on some platforms unimplemented function will just do nothing (eg symlink)
-      they should print a warning or be not even defined!
-    * banish the legacy of php3_ prefixes
-    * implement javadoc based function docs template system
-    * use thread-safe resolver functions (either require BIND 8 or adns)
-    * provide optional IPv6 support
+      reentrancy-safe functions.
+    * on some platforms unimplemented function will just do nothing (e.g. symlink)
+      they should print a warning or not even be defined!
+    * implement javadoc based function docs template system.
+    * use thread-safe resolver functions (either require BIND 8 or adns).
+    * provide optional IPv6 support.
     * make SAPI conform to CGI/1.1. Currently, all SAPI modules
       define REMOTE_ADDR etc. themselves and reach only various level
       of compliance.
+    * find a better way to implement script timeouts. SIGVTALRM is used
+      by some POSIX threads implementations (i.e. OpenBSD) and is not
+      available in ZTS mode.
+    * add aliases to functions to conform to new naming conventions, e.g.
+      str_to_upper().
+    * see what functions might need to be changed to use HashPosition, so
+      that the internal array pointer is not affected.
 
 documentation
 -------------
     * add remarks in the documentation which functions are not implemented on win32.
     * add remarks in the documentation which functions are not binary-safe.
 
-ext/wddx
+ext/dav
 --------
-	* implement wddx_packet_as_javascript(). (Andrei)
+    * rewrite.
+
+ext/mcrypt
+----------
+    * port to mcrypt-2.6 or later
 
 ext/oci8
 --------
     * all OCIFetch*() functions should return 0 for no more data and false on error.
+    * have a flag that trims trailing spaces from CHAR fields on retrieval.
+	* make allow_call_time_pass_reference=Off working.
+
+ext/pcre
+--------
+    * have an option for preg_grep() to return keys as well.
+    * update the online docs from version 3.1 man page
+
+ext/session
+-----------
+    * implement a call to set a session read-only to overcome 
+      the need to serialize frame-loads.
+    * maybe implement finer-grained session variables that could be 
+      locked individually.
+    * write a network-transparent storage back-end with fallover
+      facilities
 
 ext/standard
 ------------
+    * add a version number to data serialized via serialize().
+    * array_add(). (Andrei)
     * implement pathinfo()
+        $a = pathinfo("/some/file.bla");
+
+        => array("dirname" => "/some/",
+                "basename" => "file.bla",
+                "extension" => "bla");
+
+
+        We could also make it return just one part as a sting if used
+        like this:
+
+        $a = pathinfo("/some/file.bla", PATHINFO_BASENAME);
+
     * possibly modify parsing of GPC data to automatically create arrays if
       variable name is seen more than once.
     * implement regex-cache for url-functions.
-    * strpad() (Andrei)
-    * stri_replace() (Andrei)
-    * comparing arrays semantically (like Python) (Andrei)
-    * move socket related functions to fsock.c
+    * strcase_replace(). (Andrei)
+    * move socket related functions to fsock.c.
+    * get_defined_funcs(), get_defined_vars().
     * NOT binary safe:
         strtok()
         basename()
@@ -64,3 +102,19 @@ ext/standard
         strrpos()
         strrchr()
         strip_tags()
+
+ext/wddx
+--------
+    * See if we can support the remaining datatypes:
+        dateTime
+        binary
+        recordset
+
+        http://www.wddx.org/WDDX_SDK_10a/7__References/WDDX_DTD.htm
+        (Andrei)
+
+    * implement wddx_packet_as_javascript(). (Andrei)
+
+other cool stuff
+----------------
+    * PVM extension

TODO-LeftOver

@@ -1,75 +0,0 @@
-
-
-This is the ChangeLog from PHP3 as of Apr 12 1999. 
-
-Entries should be removed from this file, if you transfer changes
-over to PHP4.
-
-============================================================================
-
-?? 1999, Version 3.0.8
-- added Oracle-OCI8 persistent connections
-- fixed OCIDefineByName crash.
-- fixed some NULL-column related problems in OCI8-module.
-- Some Informix driver improvements.
-- PUT method support (mlemos@acm.org)
-- Fix parameter count problem in odbc_setoption()
-- Really fix implode() this time.  The fix in 3.0.7 was bogus
-- Make fgetss() slightly smarter
-- Add strip_tags() which uses the fgetss state-machine but acts on a string
-
-March 1 1999, Version 3.0.7
-- Added pdf_put_image and pdf_execute_image
-- Initial work on an ImageMagick module - doesn't do anything yet
-- Make configure script detect Netscape's LDAP SDK automagically
-- Fixed Oracle-OCI8 module for windows.
-- Add OCIRowCount function. (Number of affected rows for update-statements)
-- Add OCIDefineByName function.
-- Change the behaviour of open_basedir. It's now possible to supply more
-  than one directory. open_basedir paths from parent directories are now
-  automatically inherited.
-- fix rand() and mt_rand() to make the ranges work correctly
-- htmlspecialchars() and htmlentities() are now binary safe.
-- Add extract() function.
-- Oracle-OCI8 driver now supports BLOBS/CLOBS and IN/OUT binding of local php
-  variables.
-- Clean up apxs build
-- Add INSTALL.REDHAT file to walk RedHat users through the install
-- Add function_exists() function.
-- Add another version of WDDX module
-  (we need to pick a single implementation here)
-- Fixed includes for iODBC to support both the old and the new LGPL version
-- Fix implode() bug - When imploding an array that contained unset() elements
-  it wasn't correctly skipping past these
-- Add connection_status() function.  This returns the raw bitfield which
-  indicates whether the script terminated due to a user abort, a timeout
-  or normally.  Note that if ignore_user_abort is enabled, then both the
-  timeout state and the user abort state can be active
-- Add connection_timeout() function.  This one can be called in a shutdown
-  function to tell you if you got there because of a timeout
-- Add ignore_user_abort() function and .ini/.conf directive of same name
-- Fix connection abort detection code - It should now work reliably with
-  Apache.  Also added a user-level connection_aborted() function designed to
-  let people check whether the user aborted the connection in a user-level
-  shutdown function.
-- Add pfsockopen() function
-- Improvements in FreeType support: Macintosh fonts work, and non-antialiased
-  output is considerably cleaner  <mka@satama.com>
-- Fixed checkdate() function, range of valid years is now 0 to 32767
-- hw_insertdocument() returns object id now
-- Add pdf_open() warning in configure and documentation
-- Add diskfreespace() function
-- Added aspell support
-- Iptcparse would sometimes find a wrong tag.
-- Force var_dump() to output headers
-- Add optional 3th parameter to ora_fetchinto.
-- Serialize and var_dump no longer show array elements that
-  have been unset.
-- Add IptcEmbed() function (can replace an APP13-Marker in a JPEG file)
-- Add OCI8 module for Windows
-- Fix bug in pdf_close() function
-- Add WDDX support (see http://www.wddx.org for more info)
-- Add similar_text() function
-- Introduce simple regex compilation cache
-
-

TSRM/LICENSE

@@ -0,0 +1,26 @@
+Copyright (c) 1999,2000, Andi Gutmans, Sascha Schumann, Zeev Suraski.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+- Neither name of the copyright holders nor the names of their contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
+IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

TSRM/TSRM.c

@@ -13,7 +13,6 @@
    +----------------------------------------------------------------------+
 */
 
-
 #include "TSRM.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -207,13 +206,18 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 
 
 /* fetches the requested resource for the current thread */
-void *ts_resource(ts_rsrc_id id)
+TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 {
-	THREAD_T thread_id = tsrm_thread_id();
+	THREAD_T thread_id;
 	int hash_value;
 	tsrm_tls_entry *thread_resources;
 	void *resource;
 
+	if (th_id) {
+		thread_id = *th_id;
+	} else {
+		thread_id = tsrm_thread_id();
+	}
 	tsrm_debug("Fetching resource id %d for thread %ld\n", id, (long) thread_id);
 	tsrm_mutex_lock(tsmm_mutex);
 

TSRM/TSRM.dsp

@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Debug_TS"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "C:\Projects\TSRM" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "TSRM_EXPORTS" /D "_LIB" /D "WIN32" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x40d /d "_DEBUG"
 # ADD RSC /l 0x40d /d "_DEBUG"
 BSC32=bscmake.exe
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Release_TS"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "TSRM_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x40d /d "NDEBUG"
 # ADD RSC /l 0x40d /d "NDEBUG"
 BSC32=bscmake.exe
@@ -88,7 +88,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Release_TS_inline"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "TSRM_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "TSRM_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x40d /d "NDEBUG"
 # ADD RSC /l 0x40d /d "NDEBUG"
 BSC32=bscmake.exe

TSRM/TSRM.h

@@ -14,8 +14,8 @@
 */
 
 
-#ifndef _TSRM_H
-#define _TSRM_H
+#ifndef TSRM_H
+#define TSRM_H
 
 #ifdef HAVE_CONFIG_H
 # undef PACKAGE
@@ -81,7 +81,8 @@ TSRM_API void tsrm_shutdown(void);
 TSRM_API ts_rsrc_id ts_allocate_id(size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor);
 
 /* fetches the requested resource for the current thread */
-TSRM_API void *ts_resource(ts_rsrc_id id);
+TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id);
+#define ts_resource(id)			ts_resource_ex(id, NULL)
 
 /* frees all resources allocated for the current thread */
 TSRM_API void ts_free_thread(void);
@@ -107,4 +108,4 @@ TSRM_API void *tsrm_set_new_thread_end_handler(void (*new_thread_end_handler)(TH
 }
 #endif
 
-#endif /* _TSRM_H */
+#endif /* TSRM_H */

TSRM/threads.m4

@@ -0,0 +1,157 @@
+dnl  Copyright (c) 1999, 2000 Sascha Schumann. All rights reserved.
+dnl 
+dnl  Redistribution and use in source and binary forms, with or without
+dnl  modification, are permitted provided that the following conditions
+dnl  are met:
+dnl 
+dnl  1. Redistributions of source code must retain the above copyright
+dnl     notice, this list of conditions and the following disclaimer.
+dnl 
+dnl  2. Redistributions in binary form must reproduce the above copyright
+dnl     notice, this list of conditions and the following disclaimer in
+dnl     the documentation and/or other materials provided with the
+dnl     distribution.
+dnl 
+dnl  THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY
+dnl  EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+dnl  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+dnl  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL SASCHA SCHUMANN OR
+dnl  HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+dnl  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+dnl  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+dnl  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+dnl  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+dnl  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+dnl  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+dnl  OF THE POSSIBILITY OF SUCH DAMAGE.
+
+dnl
+dnl PTHREADS_FLAGS
+dnl
+dnl Set some magic defines to achieve POSIX threads conformance
+dnl
+AC_DEFUN(PTHREADS_FLAGS,[
+  if test -z "$host_alias"; then
+    AC_MSG_ERROR(host_alias is not set. Make sure to run config.guess)
+  fi
+  case "$host_alias" in
+  *solaris*)
+    PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";;
+  *freebsd*)
+    PTHREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE";;
+  *linux*)
+    PTHREAD_FLAGS="-D_REENTRANT";;
+  *aix*)
+    PTHREAD_FLAGS="-D_THREAD_SAFE";;
+  *irix*)
+    PTHREAD_FLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS";;
+  *hpux*)
+    PTHREAD_FLAGS="-D_REENTRANT";;
+  *sco*)
+    PTHREAD_FLAGS="-D_REENTRANT";;
+dnl Solves sigwait() problem, creates problems with u_long etc.
+dnl    PTHREAD_FLAGS="-D_REENTRANT -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE_EXTENDED=1";;
+  esac
+
+  if test -n "$PTHREAD_FLAGS"; then
+    CPPFLAGS="$CPPFLAGS $PTHREAD_FLAGS"
+  fi
+])dnl
+dnl
+dnl PTHREADS_CHECK_COMPILE
+dnl
+dnl Check whether the current setup can use POSIX threads calls
+dnl
+AC_DEFUN(PTHREADS_CHECK_COMPILE, [
+AC_TRY_RUN( [
+#include <pthread.h>
+#include <stddef.h>
+
+void *thread_routine(void *data) {
+    return data;
+}
+
+int main() {
+    pthread_t thd;
+    pthread_mutexattr_t mattr;
+    int data = 1;
+    pthread_mutexattr_init(&mattr);
+    return pthread_create(&thd, NULL, thread_routine, &data);
+} ], [ 
+  pthreads_working="yes"
+  ], [
+  pthreads_working="no"
+  ], pthreads_working="no" ) ] )dnl
+dnl
+dnl PTHREADS_CHECK()
+dnl
+dnl Try to find a way to enable POSIX threads
+dnl
+dnl  Magic flags
+dnl  -kthread          gcc (FreeBSD)
+dnl  -Kthread          UDK cc (UnixWare)
+dnl  -mt               WorkShop cc (Solaris)
+dnl  -mthreads         gcc (AIX)
+dnl  -pthread          gcc (Linux, FreeBSD, NetBSD, OpenBSD)
+dnl  -pthreads         gcc (Solaris) 
+dnl  -qthreaded        AIX cc V5
+dnl  -threads          gcc (HP-UX)
+dnl
+AC_DEFUN(PTHREADS_CHECK,[
+
+save_CFLAGS="$CFLAGS"
+save_LIBS="$LIBS"
+PTHREADS_ASSIGN_VARS
+PTHREADS_CHECK_COMPILE
+LIBS="$save_LIBS"
+CFLAGS="$save_CFLAGS"
+
+AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[
+ac_cv_pthreads_cflags=""
+if test "$pthreads_working" != "yes"; then
+  for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 
+    ac_save="$CFLAGS"
+    CFLAGS="$CFLAGS $flag"
+    PTHREADS_CHECK_COMPILE
+    CFLAGS="$ac_save"
+    if test "$pthreads_working" = "yes"; then
+      ac_cv_pthreads_cflags="$flag"
+      break
+    fi
+  done
+fi
+])
+
+AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
+ac_cv_pthreads_lib=""
+if test "$pthreads_working" != "yes"; then
+  for lib in pthread pthreads c_r; do
+    ac_save="$LIBS"
+    LIBS="$LIBS -l$lib"
+    PTHREADS_CHECK_COMPILE
+    LIBS="$ac_save"
+    if test "$pthreads_working" = "yes"; then
+      ac_cv_pthreads_lib="$lib"
+      break
+    fi
+  done
+fi
+])
+
+if test "$pthreads_working" = "yes"; then
+  threads_result="POSIX Threads found"
+else
+  threads_result="POSIX Threads not found"
+fi
+])dnl
+dnl
+dnl
+AC_DEFUN(PTHREADS_ASSIGN_VARS,[
+if test -n "$ac_cv_pthreads_lib"; then
+  LIBS="$LIBS -l$ac_cv_pthreads_lib"
+fi
+
+if test -n "$ac_cv_pthreads_cflags"; then
+  CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
+fi
+])dnl

TSRM/tsrm.m4

@@ -50,30 +50,15 @@ AC_MSG_RESULT(yes - installed in $PTH_PREFIX)
 
 ])
 
+sinclude(threads.m4)
+sinclude(TSRM/threads.m4)
 
 AC_DEFUN(TSRM_CHECK_PTHREADS,[
-
-old_CFLAGS="$CFLAGS"
-
-if test -n "$GCC"; then
-  TSRM_CHECK_GCC_ARG(-pthread, [
-    CFLAGS="$CFLAGS -pthread"
-    ],[
-    TSRM_CHECK_GCC_ARG(-pthreads, [
-        CFLAGS="$CFLAGS -pthreads"
-        ])])
-fi
-
-AC_CHECK_FUNCS(pthread_kill)
-
-if test "$ac_cv_func_pthread_kill" != "yes"; then
-  CFLAGS="$old_CFLAGS"
-  AC_CHECK_LIB(pthread, pthread_kill)
-  unset ac_cv_func_pthread_kill
-  AC_CHECK_FUNCS(pthread_kill)
-  if test "$ac_cv_func_pthread_kill" != "yes"; then
-    AC_MSG_ERROR(Your system seems to lack POSIX threads.)
-  fi
+		
+PTHREADS_CHECK
+		
+if test "$pthreads_working" != "yes"; then
+  AC_MSG_ERROR(Your system seems to lack POSIX threads.)
 fi
 		
 AC_DEFINE(PTHREADS, 1, Whether to use Pthreads)

Zend/FlexLexer.h

@@ -41,9 +41,9 @@
 //	#include <FlexLexer.h>
 //	...
 
-#ifndef __FLEX_LEXER_H
+#ifndef FLEXLEXER_H
 // Never included before - need to define base class.
-#define __FLEX_LEXER_H
+#define FLEXLEXER_H
 #include <iostream.h>
 
 extern "C++" {

Zend/LICENSE

@@ -1,11 +1,11 @@
 ---------------------------------------------------------------------------
-                    The Zend License, version 0.91
-           Copyright (C) 1999    Andi Gutmans & Zeev Suraski
+                    The Zend License, version 0.92
+           Copyright (C) 1999-2000    Zend Technologies Ltd.
 ---------------------------------------------------------------------------
 
-The Zend scripting engine library is a product of Andi Gutmans and
-Zeev Suraski.  It may be used and/or distributed under the terms of the
-Q Public License (QPL) version 1.0, enclosed below.
+The Zend scripting engine library is a product of Zend Technologies Ltd.
+It may be used and/or distributed under the terms of the Q Public
+License (QPL) version 1.0, enclosed below.
 
 For more information about Zend please visit http://www.zend.com/
 For license related questions please mail license@zend.com
@@ -113,4 +113,4 @@ OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS
 FOR A PARTICULAR PURPOSE.
 
 
-===========================================================================
+===========================================================================

Zend/Makefile.am

@@ -3,12 +3,14 @@
 #CLEANFILES = zend-parser.c zend-parser.h zend-scanner.c zend-parser.output 
 
 AUTOMAKE_OPTIONS=foreign
-EXTRA_LTLIBRARIES=libZend_cc.la libZend_c.la
-noinst_LTLIBRARIES=$(ZEND_SCANNER) libZend.la
+EXTRA_LTLIBRARIES=libZend_cc.la libZend_c.la libZend_gcc.la
+noinst_LTLIBRARIES=$(ZEND_SCANNER) $(ZEND_GCC) libZend.la
 
 libZend_cc_la_SOURCES=zend-scanner-cc.cc
 libZend_c_la_SOURCES=zend-scanner.c
 
+libZend_gcc_la_SOURCES=zend_gcc_inline.c
+
 libZend_la_SOURCES=\
 	zend-parser.y \
 	zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
@@ -17,22 +19,22 @@ libZend_la_SOURCES=\
 	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
 	zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c
 
-libZend_la_LIBADD = $(ZEND_SCANNER)
+libZend_la_LIBADD = $(ZEND_SCANNER) $(ZEND_GCC)
 libZend_la_LDFLAGS = @EXTRA_LIBS@
 libZend_la_DEPENDENCIES = $(ZEND_SCANNER)
 	
 # automake isn't too clever about "non-standard" use of lex and yacc
 
-zend-scanner.l: zend-parser.h
+$(libZend_la_OBJECTS) zend-scanner.lo zend-scanner-cc.lo: zend-parser.h
 
-zend-scanner.c: zend-scanner.l
+zend-scanner.c: $(srcdir)/zend-scanner.l
 	$(LEX) -Pzend -o$@ -i $(srcdir)/zend-scanner.l
 
-zend-scanner-cc.cc: zend-scanner.l
+zend-scanner-cc.cc: $(srcdir)/zend-scanner.l
 	$(LEX) -+ -B -i -S$(srcdir)/flex.skl -Pzend -o$@ $(srcdir)/zend-scanner.l
 
 zend-parser.h: zend-parser.c
-zend-parser.c: zend-parser.y
+zend-parser.c: $(srcdir)/zend-parser.y
 	$(YACC) -p zend -v -d $(srcdir)/zend-parser.y -o zend-parser.c
 
 depend:

Zend/ZEND_CHANGES

@@ -84,7 +84,7 @@ shamelessly lying about it.  Here's why:
 
 * static variable initializers only accept scalar values
   (in PHP 3.0 they accepted any valid expression).  The impact
-  should be somewhere in between void and non existant, since
+  should be somewhere in between void and non existent, since
   initializing a static variable with anything but a simple
   static value makes no sense at all.
 

Zend/Zend.dsp

@@ -151,6 +151,10 @@ SOURCE=.\zend_extensions.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_gcc_inline.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_hash.c
 # End Source File
 # Begin Source File

Zend/Zend.m4

@@ -50,13 +50,8 @@ dlfcn.h)
 AC_TYPE_SIZE_T
 AC_TYPE_SIGNAL
 
-AC_CHECK_LIB(c, dlopen, [
- # fake it
- AC_DEFINE(HAVE_LIBDL) ], [
- AC_CHECK_LIB(dl, dlopen, [
-  LIBS="-ldl $LIBS"
-  AC_DEFINE(HAVE_LIBDL) ], []) ])
-
+AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
+AC_CHECK_FUNC(dlopen,[AC_DEFINE(HAVE_LIBDL, 1,[ ])])
 
 dnl This is required for QNX and may be some BSD derived systems
 AC_CHECK_TYPE( uint, unsigned int )
@@ -67,8 +62,12 @@ dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
-AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol)
+AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite)
 AC_ZEND_BROKEN_SPRINTF
+
+AC_CHECK_FUNCS(finite isfinite isinf isnan)
+
+ZEND_FP_EXCEPT
 	
 AC_SUBST(ZEND_SCANNER)
 
@@ -81,10 +80,10 @@ AC_SUBST(ZEND_SCANNER)
 AC_DEFUN(LIBZEND_ENABLE_DEBUG,[
 
 AC_ARG_ENABLE(debug,
-[  --disable-debug         Compile without debugging symbols],[
+[  --enable-debug         Compile with debugging symbols],[
   ZEND_DEBUG=$enableval
 ],[
-  ZEND_DEBUG=yes
+  ZEND_DEBUG=no
 ])  
 
 ])
@@ -100,11 +99,15 @@ AC_ARG_ENABLE(debug,
 
 
 
-
-
-
 AC_DEFUN(LIBZEND_OTHER_CHECKS,[
 
+AC_ARG_ENABLE(c9x-inline,
+[  --enable-c9x-inline     Enable C9x-inline semantics],[
+  ZEND_C9X_INLINE=$enableval
+],[
+  ZEND_C9X_INLINE=no
+])
+
 AC_ARG_ENABLE(experimental-zts,
 [  --enable-experimental-zts   This will most likely break your build],[
   ZEND_EXPERIMENTAL_ZTS=$enableval
@@ -127,6 +130,9 @@ AC_ARG_ENABLE(memory-limit,
   ZEND_MEMORY_LIMIT=no
 ])
 
+AC_MSG_CHECKING(whether to enable C9x-inline semantics)
+AC_MSG_RESULT($ZEND_C9X_INLINE)
+
 AC_MSG_CHECKING(whether to enable experimental ZTS)
 AC_MSG_RESULT($ZEND_EXPERIMENTAL_ZTS)
 
@@ -140,19 +146,19 @@ AC_MSG_CHECKING(whether to enable Zend debugging)
 AC_MSG_RESULT($ZEND_DEBUG)
 	
 if test "$ZEND_DEBUG" = "yes"; then
-  AC_DEFINE(ZEND_DEBUG,1)
+  AC_DEFINE(ZEND_DEBUG,1,[ ])
   echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
   test -n "$GCC" && DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall"
   test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes" && \
     DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations"
 else
-  AC_DEFINE(ZEND_DEBUG,0)
+  AC_DEFINE(ZEND_DEBUG,0,[ ])
 fi
 
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
 if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
-  AC_DEFINE(ZTS)
+  AC_DEFINE(ZTS,1,[ ])
   ZEND_SCANNER_TYPE=cc
   CPPFLAGS="$CPPFLAGS -I../TSRM"
   LIBZEND_CPLUSPLUS_CHECKS
@@ -160,6 +166,13 @@ else
   ZEND_SCANNER_TYPE=c
 fi  
 
+if test "$ZEND_C9X_INLINE" = "yes"; then
+  AC_DEFINE(C9X_INLINE_SEMANTICS, 1, [whether to enable C9x-inline semantics])
+else
+  ZEND_GCC=libZend_gcc.la
+  AC_SUBST(ZEND_GCC)
+fi
+
 ZEND_SCANNER="libZend_${ZEND_SCANNER_TYPE}.la"
 
 if test "$ZEND_MEMORY_LIMIT" = "yes"; then

Zend/ZendTS.dsp

@@ -40,7 +40,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release_TS"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDebug_TS" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D ZEND_DEBUG=0 /D "ZTS" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /FR /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x40d /d "NDebug_TS"
 # ADD RSC /l 0x40d /d "NDebug_TS"
@@ -62,7 +62,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug_TS"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug_TS" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_Debug_TS" /D "_LIB" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "ZTS" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_Debug_TS" /D ZEND_DEBUG=1 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x40d /d "_Debug_TS"
 # ADD RSC /l 0x40d /d "_Debug_TS"
 BSC32=bscmake.exe
@@ -84,7 +84,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D ZEND_DEBUG=0 /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32_FORCE_INLINE" /FR /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x40d /d "NDebug_TS"
 # ADD RSC /l 0x40d /d "NDebug_TS"
@@ -155,6 +155,10 @@ SOURCE=.\zend_extensions.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_gcc_inline.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_hash.c
 # End Source File
 # Begin Source File

Zend/acconfig.h

@@ -1,38 +1,18 @@
 #define ZEND_API
+#define ZEND_DLEXPORT
 
 @TOP@
 
-/* This is the default configuration file to read */
-#define USE_CONFIG_FILE 1
-
 /* these are defined by automake */
 #undef PACKAGE
 #undef VERSION
 
-/* define uint by configure if it is missed (QNX and BSD derived) */
 #undef uint
-
-/* define ulong by configure if it is missed (most probably is) */
 #undef ulong
 
-/* Undefine if you want stricter XML/SGML compliance by default */
-/* (this disables "<?expression?>" by default) */
-#define T_DEFAULT_SHORT_OPEN_TAG 1
-
-/* Define both of these if you want the bundled REGEX library */
-#define REGEX 0
-#define HSREGEX 0
-
-#undef ZEND_DEBUG
-
 /* Define if you want to enable memory limit support */
 #define MEMORY_LIMIT 0
 
-/* Define to compile Zend thread safe */
-#undef ZTS
-
-#undef HAVE_LIBDL
-
 @BOTTOM@
 
 #ifdef HAVE_STDLIB_H
@@ -49,15 +29,26 @@
 # include <strings.h>
 #endif
 
-/* Define if you have stdiostream.h */
-#undef HAVE_STDIOSTREAM_H
-
 #if ZEND_BROKEN_SPRINTF
 int zend_sprintf(char *buffer, const char *format, ...);
 #else
 # define zend_sprintf sprintf
 #endif
 
+#ifdef HAVE_FINITE
+#define zend_finite(a) finite(a)
+#elif defined(HAVE_ISFINITE)
+#define zend_finite(a) isfinite(a)
+#elif defined(HAVE_ISNAN) && defined(HAVE_ISINF)
+#define zend_finite(a) (isnan(a) ? 0 : isinf(a) ? 0 : 1)
+#elif defined(HAVE_ISNAN)
+#define zend_finite(a) (isnan(a) ? 0 : 1)
+#elif defined(HAVE_ISINF)
+#define zend_finite(a) (isinf(a) ? 0 : 1)
+#else
+#define zend_finite(a) (1)
+#endif
+
 /*
  * Local variables:
  * tab-width: 4

Zend/acinclude.m4

@@ -2,6 +2,24 @@ dnl $Id$
 dnl
 dnl This file contains local autoconf functions.
 
+AC_DEFUN(ZEND_FP_EXCEPT,[
+  AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
+    AC_TRY_COMPILE([
+#include <floatingpoint.h>
+],[
+fp_except x = (fp_except) 0;
+],[
+     ac_cv_type_fp_except=yes
+],[
+     ac_cv_type_fp_except=no
+],[
+     ac_cv_type_fp_except=no
+])])
+  if test "$ac_cv_type_fp_except" = "yes"; then
+    AC_DEFINE(HAVE_FP_EXCEPT, 1, [whether floatingpoint.h defines fp_except])
+  fi
+])
+
 dnl
 dnl Check for broken sprintf()
 dnl

Zend/zend-parser.y

@@ -3,12 +3,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -33,8 +33,6 @@
 #include "zend_list.h"
 #include "zend_globals.h"
 #include "zend_API.h"
-#include "zend_variables.h"
-#include "zend_operators.h"
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode
@@ -47,22 +45,22 @@
 %}
 
 %pure_parser
-%expect 7
+%expect 4
 
-%left T_INCLUDE T_EVAL T_IMPORT
+%left T_INCLUDE T_INCLUDE_ONCE T_EVAL
 %left ','
 %left T_LOGICAL_OR
 %left T_LOGICAL_XOR
 %left T_LOGICAL_AND
 %right T_PRINT
-%left '=' T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL XT_OR_EQUAL T_SL_EQUAL T_SR_EQUAL
+%left '=' T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_SL_EQUAL T_SR_EQUAL
 %left '?' ':'
 %left T_BOOLEAN_OR
 %left T_BOOLEAN_AND
 %left '|'
 %left '^'
 %left '&'
-%nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL
+%nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL T_IS_NOT_IDENTICAL
 %nonassoc '<' T_IS_SMALLER_OR_EQUAL '>' T_IS_GREATER_OR_EQUAL
 %left T_SL T_SR
 %left '+' '-' '.'
@@ -108,6 +106,7 @@
 %token T_CONST
 %token T_RETURN
 %token T_REQUIRE
+%token T_REQUIRE_ONCE
 %token T_USE
 %token T_GLOBAL
 %token T_STATIC
@@ -134,7 +133,6 @@
 %token T_DOLLAR_OPEN_CURLY_BRACES
 %token T_CURLY_OPEN
 %token T_PAAMAYIM_NEKUDOTAYIM
-%token T_PHP_TRACK_VARS
 
 %% /* Rules */
 
@@ -182,31 +180,40 @@ unticked_statement:
 				for_expr
 			';' { do_free(&$3 CLS_CC); $4.u.opline_num = get_next_op_number(CG(active_op_array)); }
 				for_expr
-			';' { do_for_cond(&$6, &$7 CLS_CC); }
+			';' { do_extended_info(CLS_C); do_for_cond(&$6, &$7 CLS_CC); }
 				for_expr
 			')' { do_free(&$9 CLS_CC); do_for_before_statement(&$4, &$7 CLS_CC); }
 			for_statement { do_for_end(&$7 CLS_CC); }
-	|	T_SWITCH '(' expr ')' { do_switch_cond(&$3 CLS_CC); } switch_case_list { do_switch_end(&$6 CLS_CC); }
-	|	T_BREAK ';'		 	{ do_brk_cont(ZEND_BRK, NULL CLS_CC); }
+	|	T_SWITCH '(' expr ')'	{ do_switch_cond(&$3 CLS_CC); } switch_case_list { do_switch_end(&$6 CLS_CC); }
+	|	T_BREAK ';'				{ do_brk_cont(ZEND_BRK, NULL CLS_CC); }
 	|	T_BREAK expr ';'		{ do_brk_cont(ZEND_BRK, &$2 CLS_CC); }
-	|	T_CONTINUE ';'		{ do_brk_cont(ZEND_CONT, NULL CLS_CC); }
-	|	T_CONTINUE expr ';'	{ do_brk_cont(ZEND_CONT, &$2 CLS_CC); }
-	|	T_RETURN ';'			{ do_return(NULL, 0 CLS_CC); }
-	|	T_RETURN expr_without_variable ';'		{ do_return(&$2, 0 CLS_CC); }
-	|	T_RETURN cvar ';'		{ do_return(&$2, 1 CLS_CC); }
-	|	T_GLOBAL global_var_list
-	|	T_STATIC static_var_list
+	|	T_CONTINUE ';'			{ do_brk_cont(ZEND_CONT, NULL CLS_CC); }
+	|	T_CONTINUE expr ';'		{ do_brk_cont(ZEND_CONT, &$2 CLS_CC); }
+	|	T_RETURN ';'						{ do_return(NULL, 0 CLS_CC); }
+	|	T_RETURN expr_without_variable ';'	{ do_return(&$2, 0 CLS_CC); }
+	|	T_RETURN cvar ';'					{ do_return(&$2, 1 CLS_CC); }
+	|	T_GLOBAL global_var_list ';'
+	|	T_STATIC static_var_list ';'
 	|	T_ECHO echo_expr_list ';'
 	|	T_INLINE_HTML			{ do_echo(&$1 CLS_CC); }
-	|	expr ';'			{ do_free(&$1 CLS_CC); }
-	|	T_REQUIRE expr ';'			{ do_require(&$2 CLS_CC); }
+	|	expr ';'				{ do_free(&$1 CLS_CC); }
+	|	T_REQUIRE expr ';'				{ do_require(&$2, 0 CLS_CC); }
+	|	T_REQUIRE_ONCE use_filename ';'	{ do_require(&$2, 1 CLS_CC); }
 	|	T_USE use_filename ';'		{ use_filename($2.u.constant.value.str.val, $2.u.constant.value.str.len CLS_CC); zval_dtor(&$2.u.constant); }
-	|	T_UNSET '(' cvar ')' ';' { do_end_variable_parse(BP_VAR_UNSET, 0 CLS_CC); do_unset(&$3 CLS_CC); }
+	|	T_UNSET '(' unset_variables ')' ';'
 	|	T_FOREACH '(' expr T_AS { do_foreach_begin(&$1, &$3, &$2, &$4 CLS_CC); } w_cvar foreach_optional_arg ')' { do_foreach_cont(&$6, &$7, &$4 CLS_CC); } foreach_statement { do_foreach_end(&$1, &$2 CLS_CC); }
 	|	T_DECLARE { do_declare_begin(CLS_C); } '(' declare_list ')' declare_statement { do_declare_end(CLS_C); }
 	|	';'		/* empty statement */
 ;
 
+unset_variables:
+		unset_variable
+	|	unset_variables ',' unset_variable
+;
+
+unset_variable:
+		cvar	{ do_end_variable_parse(BP_VAR_UNSET, 0 CLS_CC); do_unset(&$1 CLS_CC); }
+;
 
 use_filename:
 		T_CONSTANT_ENCAPSED_STRING			{ $$ = $1; }
@@ -230,8 +237,8 @@ unticked_declaration_statement:
 
 
 foreach_optional_arg:
-		/* empty */		{ $$.op_type = IS_UNUSED; }
-	|	T_DOUBLE_ARROW w_cvar		{ $$ = $2; }
+		/* empty */				{ $$.op_type = IS_UNUSED; }
+	|	T_DOUBLE_ARROW w_cvar	{ $$ = $2; }
 ;
 
 
@@ -254,23 +261,23 @@ declare_statement:
 
 
 declare_list:
-		T_STRING '=' static_scalar						{ do_declare_stmt(&$1, &$3 CLS_CC); }
-	|	declare_list ',' T_STRING '=' static_scalar		{ do_declare_stmt(&$3, &$5 CLS_CC); }
+		T_STRING '=' static_scalar					{ do_declare_stmt(&$1, &$3 CLS_CC); }
+	|	declare_list ',' T_STRING '=' static_scalar	{ do_declare_stmt(&$3, &$5 CLS_CC); }
 ;
 
 
 switch_case_list:
 		'{' case_list '}'					{ $$ = $2; }
 	|	'{' ';' case_list '}'				{ $$ = $3; }
-	|	':' case_list T_ENDSWITCH ';'			{ $$ = $2; }
-	|	':' ';' case_list T_ENDSWITCH ';'		{ $$ = $3; }
+	|	':' case_list T_ENDSWITCH ';'		{ $$ = $2; }
+	|	':' ';' case_list T_ENDSWITCH ';'	{ $$ = $3; }
 ;
 
 
 case_list:
-		/* empty */	{ $$.u.opline_num = -1; }
-	|	case_list T_CASE expr case_separator { do_case_before_statement(&$1, &$2, &$3 CLS_CC); } inner_statement_list { do_case_after_statement(&$$, &$2 CLS_CC); }
-	|	case_list T_DEFAULT case_separator { do_default_before_statement(&$1, &$2 CLS_CC); } inner_statement_list { do_case_after_statement(&$$, &$2 CLS_CC); }
+		/* empty */	{ $$.op_type = IS_UNUSED; }
+	|	case_list T_CASE expr case_separator { do_extended_info(CLS_C);  do_case_before_statement(&$1, &$2, &$3 CLS_CC); } inner_statement_list { do_case_after_statement(&$$, &$2 CLS_CC); $$.op_type = IS_CONST }
+	|	case_list T_DEFAULT case_separator { do_extended_info(CLS_C);  do_default_before_statement(&$1, &$2 CLS_CC); } inner_statement_list { do_case_after_statement(&$$, &$2 CLS_CC); $$.op_type = IS_CONST; }
 ;
 
 
@@ -311,8 +318,6 @@ new_else_single:
 ;
 
 
-
-
 parameter_list: 
 		non_empty_parameter_list
 	|	/* empty */
@@ -320,35 +325,35 @@ parameter_list:
 
 
 non_empty_parameter_list:
-		T_VARIABLE						{ znode tmp;  fetch_simple_variable(&tmp, &$1, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
-	|	'&' T_VARIABLE					{ znode tmp;  fetch_simple_variable(&tmp, &$2, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_FORCE CLS_CC); }
-	|	T_CONST T_VARIABLE 			{ znode tmp;  fetch_simple_variable(&tmp, &$2, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
-	|	T_VARIABLE '=' static_scalar		{ znode tmp;  fetch_simple_variable(&tmp, &$1, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV_INIT, &tmp, &$$, &$3, BYREF_NONE CLS_CC); }
-	|	non_empty_parameter_list ',' T_VARIABLE 						{ znode tmp;  fetch_simple_variable(&tmp, &$3, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
-	|	non_empty_parameter_list ',' '&' T_VARIABLE					{ znode tmp;  fetch_simple_variable(&tmp, &$4, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_FORCE CLS_CC); }
-	|	non_empty_parameter_list ',' T_CONST T_VARIABLE			{ znode tmp;  fetch_simple_variable(&tmp, &$4, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
+		T_VARIABLE				{ znode tmp;  fetch_simple_variable(&tmp, &$1, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
+	|	'&' T_VARIABLE			{ znode tmp;  fetch_simple_variable(&tmp, &$2, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_FORCE CLS_CC); }
+	|	T_CONST T_VARIABLE 		{ znode tmp;  fetch_simple_variable(&tmp, &$2, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
+	|	T_VARIABLE '=' static_scalar				{ znode tmp;  fetch_simple_variable(&tmp, &$1, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV_INIT, &tmp, &$$, &$3, BYREF_NONE CLS_CC); }
+	|	non_empty_parameter_list ',' T_VARIABLE 	{ znode tmp;  fetch_simple_variable(&tmp, &$3, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
+	|	non_empty_parameter_list ',' '&' T_VARIABLE	{ znode tmp;  fetch_simple_variable(&tmp, &$4, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_FORCE CLS_CC); }
+	|	non_empty_parameter_list ',' T_CONST T_VARIABLE				{ znode tmp;  fetch_simple_variable(&tmp, &$4, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
 	|	non_empty_parameter_list ',' T_VARIABLE '=' static_scalar 	{ znode tmp;  fetch_simple_variable(&tmp, &$3, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV_INIT, &tmp, &$$, &$5, BYREF_NONE CLS_CC); }
 ;
 
 
 function_call_parameter_list:
-		non_empty_function_call_parameter_list		{ $$ = $1; }
-	|	/* empty */									{ $$.u.constant.value.lval = 0; }
+		non_empty_function_call_parameter_list	{ $$ = $1; }
+	|	/* empty */				{ $$.u.constant.value.lval = 0; }
 ;
 
 
 non_empty_function_call_parameter_list:
-		expr_without_variable	{	$$.u.constant.value.lval = 1;  do_pass_param(&$1, ZEND_SEND_VAL, $$.u.constant.value.lval CLS_CC); }
-	|	cvar					{	$$.u.constant.value.lval = 1;  do_pass_param(&$1, ZEND_SEND_VAR, $$.u.constant.value.lval CLS_CC); }
-	|	'&' w_cvar 				{	$$.u.constant.value.lval = 1;  do_pass_param(&$2, ZEND_SEND_REF, $$.u.constant.value.lval CLS_CC); }
-	|	non_empty_function_call_parameter_list ',' expr_without_variable	{	$$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$3, ZEND_SEND_VAL, $$.u.constant.value.lval CLS_CC); }
-	|	non_empty_function_call_parameter_list ',' cvar 					{	$$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$3, ZEND_SEND_VAR, $$.u.constant.value.lval CLS_CC); }
-	|	non_empty_function_call_parameter_list ',' '&' w_cvar				{	$$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$4, ZEND_SEND_REF, $$.u.constant.value.lval CLS_CC); }
+		expr_without_variable	{ $$.u.constant.value.lval = 1;  do_pass_param(&$1, ZEND_SEND_VAL, $$.u.constant.value.lval CLS_CC); }
+	|	cvar					{ $$.u.constant.value.lval = 1;  do_pass_param(&$1, ZEND_SEND_VAR, $$.u.constant.value.lval CLS_CC); }
+	|	'&' w_cvar 				{ $$.u.constant.value.lval = 1;  do_pass_param(&$2, ZEND_SEND_REF, $$.u.constant.value.lval CLS_CC); }
+	|	non_empty_function_call_parameter_list ',' expr_without_variable	{ $$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$3, ZEND_SEND_VAL, $$.u.constant.value.lval CLS_CC); }
+	|	non_empty_function_call_parameter_list ',' cvar						{ $$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$3, ZEND_SEND_VAR, $$.u.constant.value.lval CLS_CC); }
+	|	non_empty_function_call_parameter_list ',' '&' w_cvar				{ $$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$4, ZEND_SEND_REF, $$.u.constant.value.lval CLS_CC); }
 ;
 
 global_var_list:
-		global_var_list ',' global_var { do_fetch_global_or_static_variable(&$3, NULL, ZEND_FETCH_GLOBAL CLS_CC); }
-	|	global_var { do_fetch_global_or_static_variable(&$1, NULL, ZEND_FETCH_GLOBAL CLS_CC); }
+		global_var_list ',' global_var	{ do_fetch_global_or_static_variable(&$3, NULL, ZEND_FETCH_GLOBAL CLS_CC); }
+	|	global_var						{ do_fetch_global_or_static_variable(&$1, NULL, ZEND_FETCH_GLOBAL CLS_CC); }
 ;
 
 
@@ -384,14 +389,14 @@ class_statement:
 ;
 
 is_reference:
-		/* empty */ { $$.op_type = ZEND_RETURN_VAL; }
+		/* empty */	{ $$.op_type = ZEND_RETURN_VAL; }
 	|	'&'			{ $$.op_type = ZEND_RETURN_REF; }
 
 class_variable_decleration:
-		class_variable_decleration ',' T_VARIABLE { do_declare_property(&$3, NULL CLS_CC); }
-	|	class_variable_decleration ',' T_VARIABLE '=' static_scalar  { do_declare_property(&$3, &$5 CLS_CC); }
-	|	T_VARIABLE	{ do_declare_property(&$1, NULL CLS_CC); }
-	|	T_VARIABLE '=' static_scalar { do_declare_property(&$1, &$3 CLS_CC); }
+		class_variable_decleration ',' T_VARIABLE					{ do_declare_property(&$3, NULL CLS_CC); }
+	|	class_variable_decleration ',' T_VARIABLE '=' static_scalar	{ do_declare_property(&$3, &$5 CLS_CC); }
+	|	T_VARIABLE						{ do_declare_property(&$1, NULL CLS_CC); }
+	|	T_VARIABLE '=' static_scalar	{ do_declare_property(&$1, &$3 CLS_CC); }
 ;
 
 
@@ -403,12 +408,12 @@ echo_expr_list:
 
 for_expr:
 		/* empty */			{ $$.op_type = IS_CONST;  $$.u.constant.type = IS_BOOL;  $$.u.constant.value.lval = 1; }
-	|	non_empty_for_expr { $$ = $1; }
+	|	non_empty_for_expr	{ $$ = $1; }
 ;
 
 non_empty_for_expr:
-		non_empty_for_expr ',' { do_free(&$1 CLS_CC); } expr	{ $$ = $4; }
-	|	expr				{ $$ = $1; }
+		non_empty_for_expr ','	{ do_free(&$1 CLS_CC); } expr { $$ = $4; }
+	|	expr					{ $$ = $1; }
 ;
 
 
@@ -426,7 +431,7 @@ expr_without_variable:
 	|	cvar T_MOD_EQUAL expr		{ do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_MOD, &$$, &$1, &$3 CLS_CC); }
 	|	cvar T_AND_EQUAL expr		{ do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_BW_AND, &$$, &$1, &$3 CLS_CC); }
 	|	cvar T_OR_EQUAL expr 		{ do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_BW_OR, &$$, &$1, &$3 CLS_CC); }
-	|	cvar XT_OR_EQUAL expr 		{ do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_BW_XOR, &$$, &$1, &$3 CLS_CC); }
+	|	cvar T_XOR_EQUAL expr 		{ do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_BW_XOR, &$$, &$1, &$3 CLS_CC); }
 	|	cvar T_SL_EQUAL expr	{ do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_SL, &$$, &$1, &$3 CLS_CC); } 
 	|	cvar T_SR_EQUAL expr	{ do_end_variable_parse(BP_VAR_RW, 0 CLS_CC); do_binary_assign_op(ZEND_ASSIGN_SR, &$$, &$1, &$3 CLS_CC); } 
 	|	rw_cvar T_INC { do_post_incdec(&$$, &$1, ZEND_POST_INC CLS_CC); }
@@ -447,26 +452,27 @@ expr_without_variable:
 	|	expr '*' expr	{ do_binary_op(ZEND_MUL,&$$,&$1,&$3 CLS_CC); }
 	|	expr '/' expr	{ do_binary_op(ZEND_DIV,&$$,&$1,&$3 CLS_CC); }
 	|	expr '%' expr 	{ do_binary_op(ZEND_MOD,&$$,&$1,&$3 CLS_CC); }
-	| 	expr T_SL expr { do_binary_op(ZEND_SL, &$$, &$1, &$3 CLS_CC); }
-	|	expr T_SR expr { do_binary_op(ZEND_SR, &$$, &$1, &$3 CLS_CC); }
+	| 	expr T_SL expr	{ do_binary_op(ZEND_SL, &$$, &$1, &$3 CLS_CC); }
+	|	expr T_SR expr	{ do_binary_op(ZEND_SR, &$$, &$1, &$3 CLS_CC); }
 	|	'+' expr { $1.u.constant.value.lval=0; $1.u.constant.type=IS_LONG; $1.op_type = IS_CONST; INIT_PZVAL(&$1.u.constant); do_binary_op(ZEND_ADD, &$$, &$1, &$2 CLS_CC); }
 	|	'-' expr { $1.u.constant.value.lval=0; $1.u.constant.type=IS_LONG; $1.op_type = IS_CONST; INIT_PZVAL(&$1.u.constant); do_binary_op(ZEND_SUB, &$$, &$1, &$2 CLS_CC); }
 	|	'!' expr { do_unary_op(ZEND_BOOL_NOT, &$$, &$2 CLS_CC); }
 	|	'~' expr { do_unary_op(ZEND_BW_NOT, &$$, &$2 CLS_CC); }
-	|	expr T_IS_IDENTICAL expr				{ do_binary_op(ZEND_IS_IDENTICAL, &$$, &$1, &$3 CLS_CC); }
-	|	expr T_IS_EQUAL expr				{ do_binary_op(ZEND_IS_EQUAL, &$$, &$1, &$3 CLS_CC); }
-	|	expr T_IS_NOT_EQUAL expr 			{ do_binary_op(ZEND_IS_NOT_EQUAL, &$$, &$1, &$3 CLS_CC); }
+	|	expr T_IS_IDENTICAL expr		{ do_binary_op(ZEND_IS_IDENTICAL, &$$, &$1, &$3 CLS_CC); }
+	|	expr T_IS_NOT_IDENTICAL expr	{ do_binary_op(ZEND_IS_NOT_IDENTICAL, &$$, &$1, &$3 CLS_CC); }
+	|	expr T_IS_EQUAL expr			{ do_binary_op(ZEND_IS_EQUAL, &$$, &$1, &$3 CLS_CC); }
+	|	expr T_IS_NOT_EQUAL expr 		{ do_binary_op(ZEND_IS_NOT_EQUAL, &$$, &$1, &$3 CLS_CC); }
 	|	expr '<' expr 					{ do_binary_op(ZEND_IS_SMALLER, &$$, &$1, &$3 CLS_CC); }
-	|	expr T_IS_SMALLER_OR_EQUAL expr 	{ do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$1, &$3 CLS_CC); }
+	|	expr T_IS_SMALLER_OR_EQUAL expr { do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$1, &$3 CLS_CC); }
 	|	expr '>' expr 					{ do_binary_op(ZEND_IS_SMALLER, &$$, &$3, &$1 CLS_CC); }
-	|	expr T_IS_GREATER_OR_EQUAL expr 	{ do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$3, &$1 CLS_CC); }
+	|	expr T_IS_GREATER_OR_EQUAL expr { do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$3, &$1 CLS_CC); }
 	|	'(' expr ')' 	{ $$ = $2; }
 	|	expr '?' { do_begin_qm_op(&$1, &$2 CLS_CC); }
 		expr ':' { do_qm_true(&$4, &$2, &$5 CLS_CC); }
 		expr	 { do_qm_false(&$$, &$7, &$2, &$5 CLS_CC); }
 	|	function_call { $$ = $1; }
 	|	internal_functions_in_yacc { $$ = $1; }
-	|	T_INT_CAST expr 		{ do_cast(&$$, &$2, IS_LONG CLS_CC); }
+	|	T_INT_CAST expr 	{ do_cast(&$$, &$2, IS_LONG CLS_CC); }
 	|	T_DOUBLE_CAST expr 	{ do_cast(&$$, &$2, IS_DOUBLE CLS_CC); }
 	|	T_STRING_CAST expr	{ do_cast(&$$, &$2, IS_STRING CLS_CC); } 
 	|	T_ARRAY_CAST expr 	{ do_cast(&$$, &$2, IS_ARRAY CLS_CC); }
@@ -483,10 +489,10 @@ expr_without_variable:
 
 
 function_call:
-		T_STRING	'(' { do_extended_fcall_begin(CLS_C); $2.u.opline_num = do_begin_function_call(&$1 CLS_CC); }
+		T_STRING	'(' { $2.u.opline_num = do_begin_function_call(&$1 CLS_CC); }
 				function_call_parameter_list
 				')' { do_end_function_call(&$1, &$$, &$4, 0, $2.u.opline_num CLS_CC); do_extended_fcall_end(CLS_C); }
-	|	r_cvar '(' { do_extended_fcall_begin(CLS_C); do_begin_dynamic_function_call(&$1 CLS_CC); } 
+	|	cvar '(' { do_begin_dynamic_function_call(&$1 CLS_CC); } 
 				function_call_parameter_list 
 				')' { do_end_function_call(&$1, &$$, &$4, 0, 1 CLS_CC); do_extended_fcall_end(CLS_C);}
 	|	T_STRING T_PAAMAYIM_NEKUDOTAYIM T_STRING '(' { do_extended_fcall_begin(CLS_C); do_begin_class_member_function_call(&$1, &$3 CLS_CC); } 
@@ -496,46 +502,46 @@ function_call:
 
 
 exit_expr:
-		/* empty */		{ $$.op_type = IS_UNUSED; }	
-	|	'(' ')'			{ $$.op_type = IS_UNUSED; }	
+		/* empty */	{ memset(&$$, 0, sizeof(znode)); $$.op_type = IS_UNUSED; }	
+	|	'(' ')'		{ memset(&$$, 0, sizeof(znode)); $$.op_type = IS_UNUSED; }	
 	|	'(' expr ')'	{ $$ = $2; }
 ;
 
 
 ctor_arguments:
-		/* empty */									{ $$.u.constant.value.lval=0; }
-	|	'(' function_call_parameter_list ')'		{ $$ = $2; }
+		/* empty */	{ $$.u.constant.value.lval=0; }
+	|	'(' function_call_parameter_list ')'	{ $$ = $2; }
 ;
 
 
 class_name:
 		T_STRING	{ $$ = $1; }
-	|	r_cvar	{ $$ = $1; }
+	|	r_cvar		{ $$ = $1; }
 ;
 
 
 
 common_scalar:
-		T_LNUMBER 					{ $$=$1; }
-	|	T_DNUMBER 					{ $$=$1; }
+		T_LNUMBER 					{ $$ = $1; }
+	|	T_DNUMBER 					{ $$ = $1; }
 	|	T_CONSTANT_ENCAPSED_STRING	{ $$ = $1; }
-	|	T_LINE 					{ $$ = $1; }
-	|	T_FILE 					{ $$ = $1; }
+	|	T_LINE 						{ $$ = $1; }
+	|	T_FILE 						{ $$ = $1; }
 ;
 
 
 static_scalar: /* compile-time evaluated scalars */
 		common_scalar		{ $$ = $1; }
-	|	T_STRING 				{ do_fetch_constant(&$$, &$1, ZEND_CT CLS_CC); }
+	|	T_STRING 		{ do_fetch_constant(&$$, &$1, ZEND_CT CLS_CC); }
 	|	'+' static_scalar	{ $$ = $1; }
 	|	'-' static_scalar	{ zval minus_one;  minus_one.type = IS_LONG; minus_one.value.lval = -1;  mul_function(&$2.u.constant, &$2.u.constant, &minus_one);  $$ = $2; }
-	|	T_ARRAY '(' static_array_pair_list ')' { $$ = $3; }
+	|	T_ARRAY '(' static_array_pair_list ')' { $$ = $3; $$.u.constant.type = IS_CONSTANT_ARRAY; }
 ;
 
 
 scalar:
-		T_STRING 					{ do_fetch_constant(&$$, &$1, ZEND_RT CLS_CC); }
-	|	T_STRING_VARNAME			{ $$ = $1; }
+		T_STRING 				{ do_fetch_constant(&$$, &$1, ZEND_RT CLS_CC); }
+	|	T_STRING_VARNAME		{ $$ = $1; }
 	|	common_scalar			{ $$ = $1; }
 	|	'"' encaps_list '"' 	{ $$ = $2; }
 	|	'\'' encaps_list '\''	{ $$ = $2; }
@@ -544,16 +550,20 @@ scalar:
 
 
 static_array_pair_list:
-		/* empty */ 						{ $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); }
-	|	non_empty_static_array_pair_list	{ $$ = $1; }
+		/* empty */ { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); }
+	|	non_empty_static_array_pair_list possible_comma	{ $$ = $1; }
 ;
 
+possible_comma:
+		/* empty */
+	|	','
+;
 
 non_empty_static_array_pair_list:
 		non_empty_static_array_pair_list ',' static_scalar T_DOUBLE_ARROW static_scalar	{ do_add_static_array_element(&$$, &$3, &$5); }
-	|	non_empty_static_array_pair_list ',' static_scalar		{ do_add_static_array_element(&$$, NULL, &$3); }
-	|	static_scalar T_DOUBLE_ARROW static_scalar	{ $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); do_add_static_array_element(&$$, &$1, &$3); }
-	|	static_scalar 									{ $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); do_add_static_array_element(&$$, NULL, &$1); }
+	|	non_empty_static_array_pair_list ',' static_scalar { do_add_static_array_element(&$$, NULL, &$3); }
+	|	static_scalar T_DOUBLE_ARROW static_scalar { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); do_add_static_array_element(&$$, &$1, &$3); }
+	|	static_scalar { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); do_add_static_array_element(&$$, NULL, &$1); }
 ;
 
 expr:
@@ -598,8 +608,8 @@ cvar_without_objects:
 
 reference_variable:
 		reference_variable '[' dim_offset ']'	{ fetch_array_dim(&$$, &$1, &$3 CLS_CC); }
-	|	reference_variable '{' expr '}'			{ fetch_string_offset(&$$, &$1, &$3 CLS_CC); }
-	|	compound_variable						{ do_fetch_globals(&$1 CLS_CC); do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
+	|	reference_variable '{' expr '}'		{ fetch_string_offset(&$$, &$1, &$3 CLS_CC); }
+	|	compound_variable			{ do_fetch_globals(&$1 CLS_CC); do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
 ;
 	
 
@@ -654,33 +664,33 @@ assignment_list_element:
 
 
 array_pair_list:
-		/* empty */ 				{ do_init_array(&$$, NULL, NULL, 0 CLS_CC); }
-	|	non_empty_array_pair_list	{ $$ = $1; }
+		/* empty */ { do_init_array(&$$, NULL, NULL, 0 CLS_CC); }
+	|	non_empty_array_pair_list possible_comma	{ $$ = $1; }
 ;
 
 non_empty_array_pair_list:
 		non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr	{ do_add_array_element(&$$, &$5, &$3, 0 CLS_CC); }
-	|	non_empty_array_pair_list ',' expr		{ do_add_array_element(&$$, &$3, NULL, 0 CLS_CC); }
+	|	non_empty_array_pair_list ',' expr			{ do_add_array_element(&$$, &$3, NULL, 0 CLS_CC); }
 	|	expr T_DOUBLE_ARROW expr	{ do_init_array(&$$, &$3, &$1, 0 CLS_CC); }
-	|	expr 						{ do_init_array(&$$, &$1, NULL, 0 CLS_CC); }
+	|	expr 				{ do_init_array(&$$, &$1, NULL, 0 CLS_CC); }
 	|	non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' w_cvar { do_add_array_element(&$$, &$6, &$3, 1 CLS_CC); }
 	|	non_empty_array_pair_list ',' '&' w_cvar { do_add_array_element(&$$, &$4, NULL, 1 CLS_CC); }
 	|	expr T_DOUBLE_ARROW '&' w_cvar	{ do_init_array(&$$, &$4, &$1, 1 CLS_CC); }
-	|	'&' w_cvar 						{ do_init_array(&$$, &$2, NULL, 1 CLS_CC); }
+	|	'&' w_cvar 			{ do_init_array(&$$, &$2, NULL, 1 CLS_CC); }
 ;
 
 encaps_list:
 		encaps_list encaps_var { do_end_variable_parse(BP_VAR_R, 0 CLS_CC);  do_add_variable(&$$, &$1, &$2 CLS_CC); }
-	|	encaps_list T_STRING						{ do_add_string(&$$, &$1, &$2 CLS_CC); }
-	|	encaps_list T_NUM_STRING					{ do_add_string(&$$, &$1, &$2 CLS_CC); }
-	|	encaps_list T_ENCAPSED_AND_WHITESPACE		{ do_add_string(&$$, &$1, &$2 CLS_CC); }
-	|	encaps_list T_CHARACTER 					{ do_add_char(&$$, &$1, &$2 CLS_CC); }
-	|	encaps_list T_BAD_CHARACTER				{ do_add_string(&$$, &$1, &$2 CLS_CC); }
-	|	encaps_list '['		{ $2.u.constant.value.chval = '['; do_add_char(&$$, &$1, &$2 CLS_CC); }
-	|	encaps_list ']'		{ $2.u.constant.value.chval = ']'; do_add_char(&$$, &$1, &$2 CLS_CC); }
-	|	encaps_list '{'		{ $2.u.constant.value.chval = '{'; do_add_char(&$$, &$1, &$2 CLS_CC); }
-	|	encaps_list '}'		{ $2.u.constant.value.chval = '}'; do_add_char(&$$, &$1, &$2 CLS_CC); }
-	|	encaps_list T_OBJECT_OPERATOR  { znode tmp;  $2.u.constant.value.chval = '-';  do_add_char(&tmp, &$1, &$2 CLS_CC);  $2.u.constant.value.chval = '>'; do_add_char(&$$, &tmp, &$2 CLS_CC); }
+	|	encaps_list T_STRING			{ do_add_string(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list T_NUM_STRING		{ do_add_string(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list T_ENCAPSED_AND_WHITESPACE	{ do_add_string(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list T_CHARACTER 		{ do_add_char(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list T_BAD_CHARACTER		{ do_add_string(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list '['		{ $2.u.constant.value.lval = (long) '['; do_add_char(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list ']'		{ $2.u.constant.value.lval = (long) ']'; do_add_char(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list '{'		{ $2.u.constant.value.lval = (long) '{'; do_add_char(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list '}'		{ $2.u.constant.value.lval = (long) '}'; do_add_char(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list T_OBJECT_OPERATOR  { znode tmp;  $2.u.constant.value.lval = (long) '-';  do_add_char(&tmp, &$1, &$2 CLS_CC);  $2.u.constant.value.lval = (long) '>'; do_add_char(&$$, &tmp, &$2 CLS_CC); }
 	|	/* empty */			{ do_init_string(&$$ CLS_CC); }
 
 ;
@@ -698,9 +708,9 @@ encaps_var:
 
 
 encaps_var_offset:
-		T_STRING	{ $$ = $1; }
+		T_STRING		{ $$ = $1; }
 	|	T_NUM_STRING	{ $$ = $1; }
-	|	T_VARIABLE { fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
+	|	T_VARIABLE		{ fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
 ;
 
 
@@ -708,8 +718,8 @@ internal_functions_in_yacc:
 		T_ISSET '(' cvar ')'	{ do_isset_or_isempty(ZEND_ISSET, &$$, &$3 CLS_CC); }
 	|	T_EMPTY '(' cvar ')'	{ do_isset_or_isempty(ZEND_ISEMPTY, &$$, &$3 CLS_CC); }
 	|	T_INCLUDE expr 			{ do_include_or_eval(ZEND_INCLUDE, &$$, &$2 CLS_CC); }
+	|	T_INCLUDE_ONCE expr 	{ do_include_or_eval(ZEND_INCLUDE_ONCE, &$$, &$2 CLS_CC); }
 	|	T_EVAL '(' expr ')' 	{ do_include_or_eval(ZEND_EVAL, &$$, &$3 CLS_CC); }
-	|	T_IMPORT '(' expr ')'	{ do_include_or_eval(ZEND_IMPORT, &$$, &$3 CLS_CC); }
 ;
 
 

Zend/zend-scanner.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _LANGUAGE_SCANNER_H
-#define _LANGUAGE_SCANNER_H
+#ifndef ZEND_SCANNER_H
+#define ZEND_SCANNER_H
 
 #ifdef ZTS
 class ZendFlexLexer : public yyFlexLexer
@@ -33,21 +33,19 @@ public:
 #endif	/* ZTS */
 
 
-#ifndef ZTS
 typedef struct _zend_lex_state {
+#ifndef ZTS
 	YY_BUFFER_STATE buffer_state;
 	int state;
-	uint return_offset;
-	uint lineno;
 	FILE *in;
-	char *filename;
-} zend_lex_state;
 #else
-typedef struct _zend_lex_state {
 	ZendFlexLexer *ZFL;
 	istream *input_file;
-} zend_lex_state;
 #endif
+	uint lineno;
+	char *filename;
+} zend_lex_state;
+
 
 void zend_fatal_scanner_error(char *);
 inline void restore_lexical_state(zend_lex_state * CLS_DC);

Zend/zend-scanner.l

@@ -4,12 +4,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -34,7 +34,6 @@
 %{
 
 #ifdef ZEND_WIN32
-#include <winsock.h>
 #include <io.h>
 #endif
 
@@ -92,6 +91,7 @@ private:
   stdiobuf _file;
 public:
   istdiostream (FILE* __f) : istream(), _file(__f) { init(&_file); }
+  stdiobuf* rdbuf()/* const */ { return &_file; }
 };
 #endif
 
@@ -148,12 +148,12 @@ static inline void save_lexical_state(zend_lex_state *lex_state CLS_DC)
 #ifndef ZTS
 	memcpy(&lex_state->buffer_state,&YY_CURRENT_BUFFER,sizeof(YY_BUFFER_STATE));
 	lex_state->in = yyin;
-	lex_state->lineno = CG(zend_lineno);
 	lex_state->state = YYSTATE;
-	lex_state->filename = zend_get_compiled_filename(CLS_C);
 #else
 	lex_state->ZFL = CG(ZFL);
 #endif
+	lex_state->filename = zend_get_compiled_filename(CLS_C);
+	lex_state->lineno = CG(zend_lineno);
 }
 
 
@@ -170,13 +170,13 @@ inline void restore_lexical_state(zend_lex_state *lex_state CLS_DC)
 		
 	yy_delete_buffer(original_buffer_state);
 	yyin = lex_state->in;
-	CG(zend_lineno) = lex_state->lineno;
 	BEGIN(lex_state->state);
-	zend_restore_compiled_filename(lex_state->filename);
 #else
 	delete((ZendFlexLexer *) CG(ZFL));
 	CG(ZFL) = lex_state->ZFL;
 #endif
+	CG(zend_lineno) = lex_state->lineno;
+	zend_restore_compiled_filename(lex_state->filename);
 }
 
 
@@ -243,16 +243,21 @@ ZEND_API void zend_close_file_handle(zend_file_handle *file_handle CLS_DC)
 
 ZEND_API int open_file_for_scanning(zend_file_handle *file_handle CLS_DC)
 {
+	char *file_path;
+
 #ifndef ZTS
 	switch (file_handle->type) {
 		case ZEND_HANDLE_FILENAME:
 			file_handle->handle.fp = zend_fopen(file_handle->filename, &file_handle->opened_path);
+		    file_path = file_handle->opened_path; 
 			break;
 		case ZEND_HANDLE_FD:
+			file_path = file_handle->filename;
 			file_handle->opened_path = NULL;
 			file_handle->handle.fp = fdopen(file_handle->handle.fd, "r");
 			break;
 		case ZEND_HANDLE_FP:
+			file_path = file_handle->filename;
 			file_handle->opened_path = NULL;
 			file_handle->handle.fp = file_handle->handle.fp;
 			break;
@@ -298,6 +303,9 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle CLS_DC)
 			}	
 			break;
 	}
+
+	file_path = file_handle->filename;
+
 	if (file_handle->handle.is->fail()) {
 		delete file_handle->handle.is;
 		return FAILURE;
@@ -309,53 +317,71 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle CLS_DC)
 	CG(ZFL) = new ZendFlexLexer;
 	CG(ZFL)->switch_streams(file_handle->handle.is, &cout);
 #endif
-	zend_set_compiled_filename(file_handle->filename);
+	zend_set_compiled_filename(file_path);
 	CG(zend_lineno) = 1;
 	return SUCCESS;
 }
 END_EXTERN_C()
 
 
-ZEND_API zend_op_array *compile_files(int mark_as_ref CLS_DC, int file_count, ...)
+ZEND_API zend_op_array *zend_compile_files(int type CLS_DC, int file_count, ...)
 {
 	va_list files;
 	zend_op_array *op_array;
 
 	va_start(files, file_count);
-	op_array = v_compile_files(mark_as_ref CLS_CC, file_count, files);
+	op_array = zend_v_compile_files(type CLS_CC, file_count, files);
 	va_end(files);
 	return op_array;
 }
 
 
-ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count, va_list files)
+ZEND_API zend_op_array *v_compile_files(int type CLS_DC, int file_count, va_list files)
 {
 	zend_lex_state original_lex_state;
 	zend_op_array *op_array = (zend_op_array *) emalloc(sizeof(zend_op_array));
 	zend_op_array *original_active_op_array = CG(active_op_array);
 	zend_op_array *retval=NULL;
-	zend_file_handle *file_handle;
 	int i;
 	int compiler_result;
 	int compiled_files=0;
+	int last_file=0;
+	znode retval_znode;
 	zend_bool original_in_compilation = CG(in_compilation);
+	zend_file_handle **file_handles = (zend_file_handle **) do_alloca(file_count * sizeof(zend_file_handle *));
 
-	init_op_array(op_array, INITIAL_OP_ARRAY_SIZE);
+	retval_znode.op_type = IS_CONST;
+	retval_znode.u.constant.type = IS_LONG;
+	retval_znode.u.constant.value.lval = 1;
+	retval_znode.u.constant.is_ref = 0;
+	retval_znode.u.constant.refcount = 1;
+
+	init_op_array(op_array, ZEND_USER_FUNCTION, INITIAL_OP_ARRAY_SIZE);
 	save_lexical_state(&original_lex_state CLS_CC);
 
 	retval = op_array; /* success oriented */
+
 	for (i=0; i<file_count; i++) {
-		file_handle = va_arg(files, zend_file_handle *);
-		if (!file_handle) {
+		file_handles[i] = va_arg(files, zend_file_handle *);
+		if (file_handles[i]) {
+			last_file = i;
+		}
+	}
+
+	for (i=0; i<file_count; i++) {
+		if (!file_handles[i]) {
 			continue;
 		}
-		if (open_file_for_scanning(file_handle CLS_CC)==FAILURE) {
-			zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename);
+		if (open_file_for_scanning(file_handles[i] CLS_CC)==FAILURE) {
+			zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handles[i]->filename);
 		} else {
 			CG(in_compilation) = 1;
 			CG(active_op_array) = op_array;
 			compiler_result = zendparse(CLS_C);
-			zend_close_file_handle(file_handle CLS_CC);
+			zend_close_file_handle(file_handles[i] CLS_CC);
+			if (i == last_file) {
+				do_return(&retval_znode, 0 CLS_CC);
+			}
 			restore_lexical_state(&original_lex_state CLS_CC);
 			CG(in_compilation) = original_in_compilation;
 			if (compiler_result==1) { /* parser error */
@@ -369,12 +395,8 @@ ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count,
 
 	if (retval) {
 		if (compiled_files>0) {
-			do_return(NULL, 0 CLS_CC);
 			CG(active_op_array) = original_active_op_array;
 			pass_two(op_array);
-			if (mark_as_ref) {
-				pass_include_eval(op_array);
-			}
 		} else {
 			CG(active_op_array) = original_active_op_array;
 			destroy_op_array(op_array);
@@ -382,11 +404,12 @@ ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count,
 			retval = NULL;
 		}
 	}
+	free_alloca(file_handles);
 	return retval;
 }
 
 
-zend_op_array *compile_filename(int mode, zval *filename CLS_DC ELS_DC)
+zend_op_array *compile_filename(int type, zval *filename CLS_DC ELS_DC)
 {
 	zend_file_handle file_handle;
 	zval tmp;
@@ -405,16 +428,16 @@ zend_op_array *compile_filename(int mode, zval *filename CLS_DC ELS_DC)
 	file_handle.opened_path = NULL;
 
 
-	if (mode==ZEND_REQUIRE) {
+	if (type==ZEND_REQUIRE) {
 		/* We don't want to hear about inclusion failures;  If we fail,
 		 * we'll generate a require failure
 		 */
 		error_reporting = EG(error_reporting);
 		EG(error_reporting) = 0;
 	}
-	retval = zend_compile_files(1 CLS_CC, 1, &file_handle);
+	retval = zend_compile_files(type CLS_CC, 1, &file_handle);
 
-	if (mode==ZEND_REQUIRE) {
+	if (type==ZEND_REQUIRE) {
 		EG(error_reporting) = error_reporting;
 		if (!retval) {
 			zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, filename->value.str.val);
@@ -445,6 +468,8 @@ static inline int prepare_string_for_scanning(zval *str CLS_DC)
 
 	CG(ZFL)->switch_streams(input_stream, &cout);
 #endif
+	zend_set_compiled_filename("Eval code");
+	CG(zend_lineno) = 1;
 	return SUCCESS;
 }
 
@@ -471,8 +496,7 @@ zend_op_array *compile_string(zval *source_string CLS_DC)
 	convert_to_string(&tmp);
 	source_string = &tmp;
 
-	init_op_array(op_array, INITIAL_OP_ARRAY_SIZE);
-	op_array->type = ZEND_EVAL_CODE;
+	init_op_array(op_array, ZEND_EVAL_CODE, INITIAL_OP_ARRAY_SIZE);
 	save_lexical_state(&original_lex_state CLS_CC);
 	if (prepare_string_for_scanning(source_string CLS_CC)==FAILURE) {
 		destroy_op_array(op_array);
@@ -507,14 +531,14 @@ zend_op_array *compile_string(zval *source_string CLS_DC)
 
 
 BEGIN_EXTERN_C()
-int require_filename(char *filename CLS_DC)
+int require_filename(char *filename, zend_bool unique CLS_DC)
 {
 	zend_file_handle file_handle;
 
 	file_handle.type = ZEND_HANDLE_FILENAME;
 	file_handle.filename = filename;
 	file_handle.free_filename = 0;
-	if (require_file(&file_handle, 0 CLS_CC)==FAILURE) {
+	if (require_file(&file_handle, unique CLS_CC)==FAILURE) {
 		zend_bailout();
 		return FAILURE; /* will never get here */
 	}
@@ -524,6 +548,10 @@ int require_filename(char *filename CLS_DC)
 
 int use_filename(char *filename, uint filename_length CLS_DC)
 {
+	zend_error(E_COMPILE_ERROR,"use: Not yet supported. Please use include_once() or require_once()");
+	return FAILURE;
+
+#if 0
 	zend_file_handle file_handle;
 
 	file_handle.filename = (char *) emalloc(filename_length + zend_uv.import_use_extension_length);
@@ -539,6 +567,7 @@ int use_filename(char *filename, uint filename_length CLS_DC)
 		return FAILURE; /* will never get here */
 	}
 	return SUCCESS;
+#endif
 }
 
 
@@ -565,6 +594,7 @@ int require_file(zend_file_handle *file_handle, zend_bool unique CLS_DC)
 				pfh->type = ZEND_HANDLE_FILENAME;
 				if (pfh->filename) {
 					pfh->filename = estrdup(pfh->filename);
+					pfh->free_filename = 1;
 				}
 				if (pfh->opened_path) {
 					pfh->opened_path = strdup(pfh->opened_path);
@@ -666,47 +696,6 @@ int yyFlexLexer::yylex()
 
 #endif
 
-
-/* redefine YY_INPUT to handle urls for win32*/
-#if 0 /*defined(ZEND_WIN32)*/
-#define YY_INPUT(buf,result,max_size) \
-	if ( yyin->_tmpfname != "url" ){ \
-	if ( yy_current_buffer->yy_is_interactive ) \
-		{ \
-		int c = '*', n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" ); \
-	}else{ /* this is a url */ \
-	int recv_char=0,socketd=0; \
-	/*memset(buf,0,max_size);*/ \
-	socketd=yyin->_file; \
-	if ( yy_current_buffer->yy_is_interactive ) \
-		{ \
-		int c = '*', n; \
-		for ( n = 0; n < max_size && \
-			     ( (recv_char=recv( socketd,(char *)&c,1,0 ))) >0 && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( recv_char == SOCKET_ERROR ) \
-			YY_FATAL_ERROR( "input from url in flex scanner failed" ); \
-		result = n; \
-		} \
-	else if ((result = recv( socketd, (char *)buf, max_size, 0)) == SOCKET_ERROR) \
-		  	YY_FATAL_ERROR( "input from url read in flex scanner failed" ); \
-	}
-#endif
-
 %}
 
 LNUM	[0-9]+
@@ -719,6 +708,7 @@ TABS_AND_SPACES [ \t]*
 TOKENS [;:,.\[\]()|^&+-/*=%!~$<>?@]
 ENCAPSED_TOKENS [\[\]{}$]
 ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
+ANY_CHAR (.|[\n])
 
 %option noyylineno
 %option noyywrap
@@ -857,7 +847,7 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 	return T_STRING;
 }
 
-<ST_LOOKING_FOR_PROPERTY>. {
+<ST_LOOKING_FOR_PROPERTY>{ANY_CHAR} {
 	/*unput(yytext[0]);*/
 	yyless(0);
 	yy_pop_state();
@@ -911,14 +901,18 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 	return T_INCLUDE;
 }
 
-<ST_IN_SCRIPTING>"import" {
-	return T_IMPORT;
+<ST_IN_SCRIPTING>"include_once" {
+	return T_INCLUDE_ONCE;
 }
 
 <ST_IN_SCRIPTING>"require" {
 	return T_REQUIRE;
 }
 
+<ST_IN_SCRIPTING>"require_once" {
+	return T_REQUIRE_ONCE;
+}
+
 <ST_IN_SCRIPTING>"use" {
 	return T_USE;
 }
@@ -967,6 +961,10 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 	return T_IS_IDENTICAL;
 }
 
+<ST_IN_SCRIPTING>"!==" {
+	return T_IS_NOT_IDENTICAL;
+}
+
 <ST_IN_SCRIPTING>"==" {
 	return T_IS_EQUAL;
 }
@@ -1025,7 +1023,7 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 }
 
 <ST_IN_SCRIPTING>"^=" {
-	return XT_OR_EQUAL;
+	return T_XOR_EQUAL;
 }
 
 <ST_IN_SCRIPTING>"||" {
@@ -1092,7 +1090,7 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 }
 
 
-<ST_LOOKING_FOR_VARNAME>. {
+<ST_LOOKING_FOR_VARNAME>{ANY_CHAR} {
 	/*unput(yytext[0]);*/
 	yyless(0);
 	yy_pop_state();
@@ -1193,6 +1191,7 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 		zendlval->value.str.len = yyleng;
 		zendlval->type = IS_STRING;
 		BEGIN(ST_IN_SCRIPTING);
+		return T_OPEN_TAG;
 	} else {
 		zendlval->value.str.val = (char *) estrndup(yytext, yyleng);
 		zendlval->value.str.len = yyleng;
@@ -1213,9 +1212,12 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 
 
 <INITIAL>"<?php_track_vars?>"([\n]|"\r\n")? {
-	zend_message_dispatcher(ZMSG_ENABLE_TRACK_VARS, NULL);
+	zend_error(E_WARNING, "&lt;?php_track_vars?&gt; is no longer supported - please use the track_vars INI directive instead");
 	HANDLE_NEWLINE(yytext[yyleng-1]);
-	return T_PHP_TRACK_VARS;
+	zendlval->value.str.val = (char *) estrndup(yytext, yyleng);
+	zendlval->value.str.len = yyleng;
+	zendlval->type = IS_STRING;
+	return T_INLINE_HTML;
 }
 
 <ST_IN_SCRIPTING,ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE>"$"{LABEL} {
@@ -1288,14 +1290,15 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 
 
 <ST_IN_SCRIPTING>"%>"([\n]|"\r\n")? {
-	zendlval->value.str.val = yytext; /* no copying - intentional */
 	zendlval->value.str.len = yyleng;
 	zendlval->type = IS_STRING;
 	HANDLE_NEWLINES(yytext,yyleng);
 	if (CG(asp_tags)) {
 		BEGIN(INITIAL);
+		zendlval->value.str.val = yytext; /* no copying - intentional */
 		return T_CLOSE_TAG;  /* implicit ';' at php-end tag */
 	} else {
+	        zendlval->value.str.val = (char *) estrndup(yytext, yyleng);
 		return T_INLINE_HTML;
 	}
 }
@@ -1528,7 +1531,7 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 
 
 <ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"$"[^a-zA-Z_\x7f-\xff{] {
-	zendlval->value.chval = yytext[0];
+	zendlval->value.lval = (long) yytext[0];
 	if (yyleng == 2) {
 		yyless(1);
 		/*unput(yytext[1]);
@@ -1540,12 +1543,12 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 
 
 <ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>{ENCAPSED_TOKENS} {
-	zendlval->value.chval = yytext[0];
+	zendlval->value.lval = (long) yytext[0];
 	return yytext[0];
 }
 
 <ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"{$" {
-	zendlval->value.chval = yytext[0];
+	zendlval->value.lval = (long) yytext[0];
 	yy_push_state(ST_IN_SCRIPTING);
 	/*unput('$');*/
 	yyless(1);
@@ -1554,54 +1557,54 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 
 
 <ST_SINGLE_QUOTE>"\\'" {
-	zendlval->value.chval='\'';
+	zendlval->value.lval = (long) '\'';
 	return T_CHARACTER;
 }
 
 <ST_SINGLE_QUOTE>"\\\\" {
-	zendlval->value.chval='\\';
+	zendlval->value.lval = (long)'\\';
 	return T_CHARACTER;
 }
 
 <ST_DOUBLE_QUOTES>"\\\"" {
-	zendlval->value.chval='"';
+	zendlval->value.lval = (long) '"';
 	return T_CHARACTER;
 }
 
 <ST_BACKQUOTE>"\\`" {
-	zendlval->value.chval='`';
+	zendlval->value.lval = (long) '`';
 	return T_CHARACTER;
 }
 
 <ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"\\"[0-7]{1,3} {
-	zendlval->value.chval = (char) strtol (yytext+1, NULL, 8);
+	zendlval->value.lval = strtol(yytext+1, NULL, 8);
 	return T_CHARACTER;
 }
 
 <ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"\\x"[0-9A-Fa-f]{1,2} {
-	zendlval->value.chval = (char) strtol (yytext+2, NULL, 16);
+	zendlval->value.lval = strtol (yytext+2, NULL, 16);
 	return T_CHARACTER;
 }
 
-<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"\\". {
+<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"\\"{ANY_CHAR} {
 	switch (yytext[1]) {
 		case 'n':
-			zendlval->value.chval='\n';
+			zendlval->value.lval = (long) '\n';
 			break;
 		case 't':
-			zendlval->value.chval='\t';
+			zendlval->value.lval = (long) '\t';
 			break;
 		case 'r':
-			zendlval->value.chval='\r';
+			zendlval->value.lval = (long) '\r';
 			break;
 		case '\\':
-			zendlval->value.chval='\\';
+			zendlval->value.lval = (long) '\\';
 			break;
 		case '$':
-			zendlval->value.chval=yytext[1];
+			zendlval->value.lval = (long) yytext[1];
 			break;
 		case '{':
-			zendlval->value.chval=yytext[1];
+			zendlval->value.lval = (long) yytext[1];
 			break;
 		default:
 			zendlval->value.str.val = estrndup(yytext,yyleng);
@@ -1651,6 +1654,6 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 	
 
 
-<ST_IN_SCRIPTING,INITIAL,ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_SINGLE_QUOTE,ST_HEREDOC>. {
+<ST_IN_SCRIPTING,INITIAL,ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_SINGLE_QUOTE,ST_HEREDOC>{ANY_CHAR} {
 	zend_error(E_COMPILE_WARNING,"Unexpected character in input:  '%c' (ASCII=%d) state=%d",yytext[0],yytext[0],YYSTATE);
 }

Zend/zend.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -19,8 +19,6 @@
 
 
 #include "zend.h"
-#include "zend_operators.h"
-#include "zend_variables.h"
 #include "zend_extensions.h"
 #include "modules.h"
 #include "zend_constants.h"
@@ -38,17 +36,23 @@
 #	define GLOBAL_CONSTANTS_TABLE	CG(zend_constants)
 #endif
 
+#if defined(ZEND_WIN32) && ZEND_DEBUG
+BOOL WINAPI IsDebuggerPresent(VOID);
+#endif
+
 /* true multithread-shared globals */
 ZEND_API zend_class_entry zend_standard_class_def;
 ZEND_API int (*zend_printf)(const char *format, ...);
-ZEND_API int (*zend_write)(const char *str, uint str_length);
-ZEND_API void (*zend_error)(int type, const char *format, ...);
-ZEND_API void (*zend_message_dispatcher)(long message, void *data);
+ZEND_API zend_write_func_t zend_write;
 ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path);
 ZEND_API void (*zend_block_interruptions)(void);
 ZEND_API void (*zend_unblock_interruptions)(void);
-ZEND_API int (*zend_get_ini_entry)(char *name, uint name_length, zval *contents);
 ZEND_API void (*zend_ticks_function)(int ticks);
+ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
+
+static void (*zend_message_dispatcher_p)(long message, void *data);
+static int (*zend_get_ini_entry_p)(char *name, uint name_length, zval *contents);
+
 
 #ifdef ZTS
 ZEND_API int compiler_globals_id;
@@ -66,7 +70,7 @@ ZEND_API zval zval_used_for_init; /* True global variable */
 /* version information */
 static char *zend_version_info;
 static uint zend_version_info_length;
-#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski\n"
+#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2000 Zend Technologies\n"
 
 
 #define PRINT_ZVAL_INDENT 4
@@ -123,7 +127,6 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
 			expr_copy->value.str.val = empty_string;
 			break;
 		case IS_BOOL:
-#if 1
 			if (expr->value.lval) {
 				expr_copy->value.str.len = 1;
 				expr_copy->value.str.val = estrndup("1", 1);
@@ -131,15 +134,6 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
 				expr_copy->value.str.len = 0;
 				expr_copy->value.str.val = empty_string;
 			}
-#else
-			if (expr->value.lval) {
-				expr_copy->value.str.len = sizeof("true")-1;
-				expr_copy->value.str.val = estrndup("true", expr_copy->value.str.len);
-			} else {
-				expr_copy->value.str.len = sizeof("false")-1;
-				expr_copy->value.str.val = estrndup("false", expr_copy->value.str.len);
-			}
-#endif
 			break;
 		case IS_RESOURCE:
 			expr_copy->value.str.val = (char *) emalloc(sizeof("Resource id #")-1 + MAX_LENGTH_OF_LONG);
@@ -151,10 +145,7 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
 			break;
 		case IS_OBJECT: {
 				zval function_name;
-
-				function_name.value.str.len = sizeof("to_string")-1;
-				function_name.value.str.val = estrndup("to_string", function_name.value.str.len);
-				function_name.type = IS_STRING;
+				ZVAL_STRING(&function_name,"__string_value",1);
 
 				if (call_user_function(NULL, expr, &function_name, expr_copy, 0, NULL)==FAILURE) {
 					expr_copy->value.str.len = sizeof("Object")-1;
@@ -175,6 +166,12 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
 
 
 ZEND_API int zend_print_zval(zval *expr, int indent)
+{
+	return zend_print_zval_ex(zend_write, expr, indent);
+}
+
+
+ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int indent)
 {
 	zval expr_copy;
 	int use_copy;
@@ -189,7 +186,7 @@ ZEND_API int zend_print_zval(zval *expr, int indent)
 		}
 		return 0;
 	}
-	ZEND_WRITE(expr->value.str.val,expr->value.str.len);
+	write_func(expr->value.str.val,expr->value.str.len);
 	if (use_copy) {
 		zval_dtor(expr);
 	}
@@ -197,7 +194,13 @@ ZEND_API int zend_print_zval(zval *expr, int indent)
 }
 
 
-ZEND_API void zend_print_zval_r(zval *expr, int indent) 
+ZEND_API void zend_print_zval_r(zval *expr, int indent)
+{
+	zend_print_zval_r_ex(zend_write, expr, indent);
+}
+
+
+ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent) 
 {
 	switch(expr->type) {
 		case IS_ARRAY:
@@ -220,7 +223,7 @@ static FILE *zend_fopen_wrapper(const char *filename, char **opened_path)
 	if (opened_path) {
 		*opened_path = strdup(filename);
 	}
-	return fopen(filename, "r");
+	return fopen(filename, "rb");
 }
 
 
@@ -230,8 +233,8 @@ static void register_standard_class(void)
 	zend_standard_class_def.name_length = sizeof("stdClass") - 1;
 	zend_standard_class_def.name = zend_strndup("stdClass", zend_standard_class_def.name_length);
 	zend_standard_class_def.parent = NULL;
-	zend_hash_init(&zend_standard_class_def.default_properties, 0, NULL, ZVAL_PTR_DTOR, 1);
-	zend_hash_init(&zend_standard_class_def.function_table, 0, NULL, ZEND_FUNCTION_DTOR, 1);
+	zend_hash_init_ex(&zend_standard_class_def.default_properties, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
+	zend_hash_init_ex(&zend_standard_class_def.function_table, 0, NULL, ZEND_FUNCTION_DTOR, 1, 0);
 	zend_standard_class_def.handle_function_call = NULL;
 	zend_standard_class_def.handle_property_get = NULL;
 	zend_standard_class_def.handle_property_set = NULL;
@@ -241,21 +244,33 @@ static void register_standard_class(void)
 }
 
 
+static void zend_set_default_compile_time_values(CLS_D)
+{
+	/* default compile-time values */
+	CG(asp_tags) = 0;
+	CG(short_tags) = 1;
+	CG(allow_call_time_pass_reference) = 1;
+	CG(extended_info) = 0;
+}
+
+
 #ifdef ZTS
 static void compiler_globals_ctor(zend_compiler_globals *compiler_globals)
 {
 	zend_function tmp_func;
 	zend_class_entry tmp_class;
 
+	compiler_globals->compiled_filename = NULL;
+
 	compiler_globals->function_table = (HashTable *) malloc(sizeof(HashTable));
-	zend_hash_init(compiler_globals->function_table, 100, NULL, ZEND_FUNCTION_DTOR, 1);
+	zend_hash_init_ex(compiler_globals->function_table, 100, NULL, ZEND_FUNCTION_DTOR, 1, 0);
 	zend_hash_copy(compiler_globals->function_table, global_function_table, NULL, &tmp_func, sizeof(zend_function));
 
 	compiler_globals->class_table = (HashTable *) malloc(sizeof(HashTable));
-	zend_hash_init(compiler_globals->class_table, 10, NULL, ZEND_CLASS_DTOR, 1);
+	zend_hash_init_ex(compiler_globals->class_table, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
 	zend_hash_copy(compiler_globals->class_table, global_class_table, (copy_ctor_func_t) zend_class_add_ref, &tmp_class, sizeof(zend_class_entry));
 
-	compiler_globals->extended_info = 0;
+	zend_set_default_compile_time_values(CLS_C);
 }
 
 
@@ -278,14 +293,15 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals)
 		zend_startup_constants(ELS_C);
 		zend_copy_constants(executor_globals->zend_constants, global_constants_table);
 	}
-	init_resource_plist(ELS_C);
+	zend_init_rsrc_plist(ELS_C);
+	EG(lambda_count)=0;
 }
 
 
 static void executor_globals_dtor(zend_executor_globals *executor_globals)
 {
 	zend_shutdown_constants(ELS_C);
-	destroy_resource_plist(ELS_C);
+	zend_destroy_rsrc_plist(ELS_C);
 }
 
 
@@ -296,8 +312,12 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
 
 #endif
 
+#ifdef __FreeBSD__
+/* FreeBSD floating point precision fix */
+#include <floatingpoint.h>
+#endif
 
-int zend_startup(zend_utility_functions *utility_functions, char **extensions)
+int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions)
 {
 #ifdef ZTS
 	zend_compiler_globals *compiler_globals;
@@ -308,24 +328,39 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions)
 	start_memory_manager(ALS_C);
 #endif
 
+#ifdef __FreeBSD__
+	{
+		/* FreeBSD floating point precision fix */
+#ifdef HAVE_FP_EXCEPT
+		fp_except
+#else
+		fp_except_t
+#endif
+		mask;
+
+		mask = fpgetmask();
+		fpsetmask(mask & ~FP_X_IMP);
+	} 
+#endif
+		
 	/* Set up utility functions and values */
-	zend_error = utility_functions->error_function;
+	zend_error_cb = utility_functions->error_function;
 	zend_printf = utility_functions->printf_function;
-	zend_write = utility_functions->write_function;
+	zend_write = (zend_write_func_t) utility_functions->write_function;
 	zend_fopen = utility_functions->fopen_function;
 	if (!zend_fopen) {
 		zend_fopen = zend_fopen_wrapper;
 	}
-	zend_message_dispatcher = utility_functions->message_handler;
+	zend_message_dispatcher_p = utility_functions->message_handler;
 	zend_block_interruptions = utility_functions->block_interruptions;
 	zend_unblock_interruptions = utility_functions->unblock_interruptions;
-	zend_get_ini_entry = utility_functions->get_ini_entry;
+	zend_get_ini_entry_p = utility_functions->get_ini_entry;
 	zend_ticks_function = utility_functions->ticks_function;
 
-	zend_compile_files = compile_files;
+	zend_v_compile_files = v_compile_files;
 	zend_execute = execute;
 
-	zend_llist_init(&zend_extensions, sizeof(zend_extension), (void (*)(void *)) zend_extension_dtor, 1);
+	zend_startup_extensions();
 
 	/* set up version */
 	zend_version_info = strdup(ZEND_CORE_VERSION_INFO);
@@ -333,11 +368,11 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions)
 
 	GLOBAL_FUNCTION_TABLE = (HashTable *) malloc(sizeof(HashTable));
 	GLOBAL_CLASS_TABLE = (HashTable *) malloc(sizeof(HashTable));
-	zend_hash_init(GLOBAL_FUNCTION_TABLE, 100, NULL, ZEND_FUNCTION_DTOR, 1);
-	zend_hash_init(GLOBAL_CLASS_TABLE, 10, NULL, ZEND_CLASS_DTOR, 1);
+	zend_hash_init_ex(GLOBAL_FUNCTION_TABLE, 100, NULL, ZEND_FUNCTION_DTOR, 1, 0);
+	zend_hash_init_ex(GLOBAL_CLASS_TABLE, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
 	register_standard_class();
-	zend_hash_init(&module_registry, 50, NULL, ZEND_MODULE_DTOR, 1);
-	zend_hash_init(&list_destructors, 50, NULL, NULL, 1);
+	zend_hash_init_ex(&module_registry, 50, NULL, ZEND_MODULE_DTOR, 1, 0);
+	zend_init_rsrc_list_dtors();
 
 	/* This zval can be used to initialize allocate zval's to an uninit'ed value */
 	zval_used_for_init.is_ref = 0;
@@ -357,14 +392,17 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions)
 	GLOBAL_CONSTANTS_TABLE = EG(zend_constants);
 #else
 	zend_startup_constants();
+	zend_set_default_compile_time_values(CLS_C);
 #endif
 	zend_register_standard_constants(ELS_C);
 
 #ifndef ZTS
-	init_resource_plist(ELS_C);
+	zend_init_rsrc_plist(ELS_C);
 #endif
 
-	zend_startup_builtin_functions();
+	if (start_builtin_functions) {
+		zend_startup_builtin_functions();
+	}
 
 	return SUCCESS;
 }
@@ -372,10 +410,13 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions)
 
 void zend_shutdown()
 {
-#ifndef ZTS
-	destroy_resource_plist();
+#ifdef ZEND_WIN32
+	zend_shutdown_timeout_thread();
 #endif
-	zend_hash_destroy(&list_destructors);
+#ifndef ZTS
+	zend_destroy_rsrc_plist();
+#endif
+	zend_destroy_rsrc_list_dtors();
 	zend_hash_destroy(&module_registry);
 	zend_hash_destroy(GLOBAL_FUNCTION_TABLE);
 	free(GLOBAL_FUNCTION_TABLE);
@@ -456,11 +497,198 @@ void zend_activate_modules()
 	zend_hash_apply(&module_registry, (int (*)(void *)) module_registry_request_startup);
 }
 
+void zend_deactivate_modules()
+{
+	ELS_FETCH();
+	EG(opline_ptr) = NULL; /* we're no longer executing anything */
+
+	zend_hash_apply(&module_registry, (int (*)(void *)) module_registry_cleanup);
+}
 
 void zend_deactivate(CLS_D ELS_DC)
 {
-	zend_hash_apply(&module_registry, (int (*)(void *)) module_registry_cleanup);
+	/* we're no longer executing anything */
+	EG(opline_ptr) = NULL; 
+	EG(active_symbol_table) = NULL;
+
 	shutdown_scanner(CLS_C);
 	shutdown_executor(ELS_C);
 	shutdown_compiler(CLS_C);
 }
+
+
+BEGIN_EXTERN_C()
+ZEND_API void zend_message_dispatcher(long message, void *data)
+{
+	if (zend_message_dispatcher_p) {
+		zend_message_dispatcher_p(message, data);
+	}
+}
+END_EXTERN_C()
+
+
+ZEND_API int zend_get_ini_entry(char *name, uint name_length, zval *contents)
+{
+	if (zend_get_ini_entry_p) {
+		return zend_get_ini_entry_p(name, name_length, contents);
+	} else {
+		return FAILURE;
+	}
+}
+
+
+#define ZEND_ERROR_BUFFER_SIZE 1024
+
+ZEND_API void zend_error(int type, const char *format, ...)
+{
+	va_list args;
+	zval ***params;
+	zval *retval;
+	zval *z_error_type, *z_error_message, *z_error_filename, *z_error_lineno, *z_context;
+	char *error_filename;
+	uint error_lineno;
+	zval *orig_user_error_handler;
+	ELS_FETCH();
+	CLS_FETCH();
+
+	/* Obtain relevant filename and lineno */
+	switch (type) {
+		case E_CORE_ERROR:
+		case E_CORE_WARNING:
+			error_filename = NULL;
+			error_lineno = 0;
+			break;
+		case E_PARSE:
+		case E_COMPILE_ERROR:
+		case E_COMPILE_WARNING:
+		case E_ERROR:
+		case E_NOTICE:
+		case E_WARNING:
+		case E_USER_ERROR:
+		case E_USER_WARNING:
+		case E_USER_NOTICE:
+			if (zend_is_compiling()) {
+				error_filename = zend_get_compiled_filename(CLS_C);
+				error_lineno = zend_get_compiled_lineno(CLS_C);
+			} else if (zend_is_executing()) {
+				error_filename = zend_get_executed_filename(ELS_C);
+				error_lineno = zend_get_executed_lineno(ELS_C);
+			} else {
+				error_filename = NULL;
+				error_lineno = 0;
+			}
+			break;
+		default:
+			error_filename = NULL;
+			error_lineno = 0;
+			break;
+	}
+	if (!error_filename) {
+		error_filename = "Unknown";
+	}
+
+
+	va_start(args, format);
+
+	/* if we don't have a user defined error handler */
+	if (!EG(user_error_handler)) {
+		zend_error_cb(type, error_filename, error_lineno, format, args);
+	} else switch (type) {
+		case E_ERROR:
+		case E_PARSE:
+		case E_CORE_ERROR:
+		case E_CORE_WARNING:
+		case E_COMPILE_ERROR:
+		case E_COMPILE_WARNING:
+			/* The error may not be safe to handle in user-space */
+			zend_error_cb(type, error_filename, error_lineno, format, args);
+			break;
+		default:
+			/* Handle the error in user space */
+			ALLOC_INIT_ZVAL(z_error_message);
+			ALLOC_INIT_ZVAL(z_error_type);
+			ALLOC_INIT_ZVAL(z_error_filename);
+			ALLOC_INIT_ZVAL(z_error_lineno);
+			ALLOC_INIT_ZVAL(z_context);
+			z_error_message->value.str.val = (char *) emalloc(ZEND_ERROR_BUFFER_SIZE);
+
+#ifdef HAVE_VSNPRINTF
+			z_error_message->value.str.len = vsnprintf(z_error_message->value.str.val, ZEND_ERROR_BUFFER_SIZE, format, args);
+#else
+			/* This is risky... */
+			z_error_message->value.str.len = vsprintf(z_error_message->value.str.val, format, args);
+#endif
+			z_error_message->type = IS_STRING;
+
+			z_error_type->value.lval = type;
+			z_error_type->type = IS_LONG;
+
+			if (error_filename) {
+				z_error_filename->value.str.len = strlen(error_filename);
+				z_error_filename->value.str.val = estrndup(error_filename, z_error_filename->value.str.len);
+				z_error_filename->type = IS_STRING;
+			}
+				
+			z_error_lineno->value.lval = error_lineno;
+			z_error_lineno->type = IS_LONG;
+
+			z_context->value.ht = EG(active_symbol_table);
+			z_context->type = IS_ARRAY;
+			ZVAL_ADDREF(z_context);  /* we don't want this one to be freed */
+
+			params = (zval ***) emalloc(sizeof(zval **)*5);
+			params[0] = &z_error_type;
+			params[1] = &z_error_message;
+			params[2] = &z_error_filename;
+			params[3] = &z_error_lineno;
+			params[4] = &z_context;
+
+			orig_user_error_handler = EG(user_error_handler);
+			EG(user_error_handler) = NULL;
+			if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5, params, 1, NULL)==SUCCESS) {
+				zval_ptr_dtor(&retval);
+			} else {
+				/* The user error handler failed, use built-in error handler */
+				zend_error_cb(type, error_filename, error_lineno, format, args);
+			}
+			EG(user_error_handler) = orig_user_error_handler;
+
+			efree(params);
+			zval_ptr_dtor(&z_error_message);
+			zval_ptr_dtor(&z_error_type);
+			zval_ptr_dtor(&z_error_filename);
+			zval_ptr_dtor(&z_error_lineno);
+			if (ZVAL_REFCOUNT(z_context)==2) {
+				FREE_ZVAL(z_context);
+			}
+			break;
+	}
+
+	va_end(args);
+}
+
+
+ZEND_API void zend_output_debug_string(zend_bool trigger_break, char *format, ...)
+{
+#if ZEND_DEBUG
+	va_list args;
+
+	va_start(args, format);
+#	ifdef ZEND_WIN32
+	{
+		char output_buf[1024];
+
+		vsnprintf(output_buf, 1024, format, args);
+		OutputDebugString(output_buf);
+		OutputDebugString("\n");
+		if (trigger_break && IsDebuggerPresent()) {
+			DebugBreak();
+		}
+	}
+#	else
+	vfprintf(stderr, format, args);
+	fprintf(stderr, "\n");
+#	endif
+	va_end(args);
+#endif
+}

Zend/zend.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,10 +18,10 @@
 */
 
 
-#ifndef _ZEND_H
-#define _ZEND_H
+#ifndef ZEND_H
+#define ZEND_H
 
-#define ZEND_VERSION "0.90"
+#define ZEND_VERSION "1.0.1"
 
 #ifdef __cplusplus
 #define BEGIN_EXTERN_C() extern "C" {
@@ -57,8 +57,17 @@
 # include <dlfcn.h>
 #endif
 
-#if defined(HAVE_LIBDL) && defined(RTLD_NOW)
-# define DL_LOAD(libname)			dlopen(libname, RTLD_NOW)
+#if defined(HAVE_LIBDL)
+
+# ifndef RTLD_LAZY
+#  define RTLD_LAZY 1    /* Solaris 1, FreeBSD's (2.1.7.1 and older) */
+# endif
+
+# ifndef RTLD_GLOBAL
+#  define RTLD_GLOBAL 0
+# endif
+
+# define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL)
 # define DL_UNLOAD					dlclose
 # define DL_FETCH_SYMBOL			dlsym
 # define DL_HANDLE					void *
@@ -74,6 +83,18 @@
 # define ZEND_EXTENSIONS_SUPPORT	0
 #endif
 
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32))
+# define do_alloca(p) alloca(p)
+# define free_alloca(p)
+#else
+# define do_alloca(p)		emalloc(p)
+# define free_alloca(p)	efree(p)
+#endif
+
 #if ZEND_DEBUG
 #define ZEND_FILE_LINE_D				char *__zend_filename, uint __zend_lineno
 #define ZEND_FILE_LINE_DC				, ZEND_FILE_LINE_D
@@ -102,11 +123,20 @@
 #define ZEND_FILE_LINE_ORIG_RELAY_CC
 #endif	/* ZEND_DEBUG */
 
+#ifdef ZTS
+#define ZTS_V 1
+#else
+#define ZTS_V 0
+#endif
 
 #include "zend_errors.h"
 #include "zend_alloc.h"
 
 typedef unsigned char zend_bool;
+typedef unsigned char zend_uchar;
+typedef unsigned int zend_uint;
+typedef unsigned long zend_ulong;
+typedef unsigned short zend_ushort;
 
 #undef SUCCESS
 #undef FAILURE
@@ -133,7 +163,6 @@ typedef union _zvalue_value {
 		char *val;
 		int len;
 	} str;
-	char chval;					/* char value */
 	HashTable *ht;				/* hash table value */
 	struct {
 		zend_class_entry *ce;
@@ -145,9 +174,9 @@ typedef union _zvalue_value {
 struct _zval_struct {
 	/* Variable information */
 	zvalue_value value;		/* value */
-	unsigned char type;	/* active type */
-	unsigned char is_ref;
-	short refcount;
+	zend_uchar type;	/* active type */
+	zend_uchar is_ref;
+	zend_ushort refcount;
 };
 
 
@@ -162,7 +191,7 @@ typedef struct _zend_function_entry {
 typedef struct _zend_property_reference {
 	int type;  /* read, write or r/w */
 	zval *object;
-	zend_llist elements_list;
+	zend_llist *elements_list;
 } zend_property_reference;
 
 
@@ -196,7 +225,7 @@ struct _zend_class_entry {
 
 
 typedef struct _zend_utility_functions {
-	void (*error_function)(int type, const char *format, ...);
+	void (*error_function)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
 	int (*printf_function)(const char *format, ...);
 	int (*write_function)(const char *str, uint str_length);
 	FILE *(*fopen_function)(const char *filename, char **opened_path);
@@ -209,20 +238,22 @@ typedef struct _zend_utility_functions {
 
 		
 typedef struct _zend_utility_values {
-	zend_bool short_tags;
-	zend_bool asp_tags;
-	zend_bool allow_call_time_pass_reference;
 	char *import_use_extension;
 	uint import_use_extension_length;
 } zend_utility_values;
 
 
+typedef int (*zend_write_func_t)(const char *str, uint str_length);
+
+
 #undef MIN
 #undef MAX
 #define MAX(a,b)  (((a)>(b))?(a):(b))
 #define MIN(a,b)  (((a)<(b))?(a):(b))
 #define ZEND_STRL(str)		(str), (sizeof(str)-1)
 #define ZEND_STRS(str)		(str), (sizeof(str)
+#define ZEND_NORMALIZE_BOOL(n)			\
+	((n) ? (((n)>0) ? 1 : -1) : 0)
 
 
 /* data types */
@@ -235,16 +266,24 @@ typedef struct _zend_utility_values {
 #define IS_BOOL		6
 #define IS_RESOURCE	7
 #define IS_CONSTANT	8
+#define IS_CONSTANT_ARRAY	9
 
 /* Special data type to temporarily mark large numbers */
-#define FLAG_IS_BC	9 /* for parser internal use only */
+#define FLAG_IS_BC	10 /* for parser internal use only */
 
 /* overloaded elements data types */
 #define OE_IS_ARRAY	(1<<0)
 #define OE_IS_OBJECT	(1<<1)
 #define OE_IS_METHOD	(1<<2)
 
-int zend_startup(zend_utility_functions *utility_functions, char **extensions);
+
+/* Argument passing types */
+#define BYREF_NONE 0
+#define BYREF_FORCE 1
+#define BYREF_ALLOW 2
+#define BYREF_FORCE_REST 3
+
+int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions);
 void zend_shutdown(void);
 
 void zend_set_utility_values(zend_utility_values *utility_values);
@@ -255,7 +294,16 @@ ZEND_API char *get_zend_version(void);
 
 ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_copy);
 ZEND_API int zend_print_zval(zval *expr, int indent);
+ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int indent);
 ZEND_API void zend_print_zval_r(zval *expr, int indent);
+ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent);
+
+ZEND_API void zend_output_debug_string(zend_bool trigger_break, char *format, ...);
+#if ZEND_DEBUG
+#define Z_DBG(expr)		(expr)
+#else
+#define	Z_DBG(expr)
+#endif
 
 ZEND_API extern char *empty_string;
 
@@ -275,17 +323,19 @@ ZEND_API extern char *empty_string;
 #define ZEND_PUTS(str)					zend_write((str), strlen((str)))
 #define ZEND_PUTC(c)					zend_write(&(c), 1), (c)
 
+
 BEGIN_EXTERN_C()
 extern ZEND_API int (*zend_printf)(const char *format, ...);
-extern ZEND_API int (*zend_write)(const char *str, uint str_length);
-extern ZEND_API void (*zend_error)(int type, const char *format, ...);
+extern ZEND_API zend_write_func_t zend_write;
 extern ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path);
 extern ZEND_API void (*zend_block_interruptions)(void);
 extern ZEND_API void (*zend_unblock_interruptions)(void);
-extern ZEND_API void (*zend_message_dispatcher)(long message, void *data);
-extern ZEND_API int (*zend_get_ini_entry)(char *name, uint name_length, zval *contents);
 extern ZEND_API void (*zend_ticks_function)(int ticks);
- 
+extern ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
+
+
+ZEND_API void zend_error(int type, const char *format, ...);
+
 void zenderror(char *error);
 
 extern ZEND_API zend_class_entry zend_standard_class_def;
@@ -300,15 +350,25 @@ END_EXTERN_C()
 #define HANDLE_BLOCK_INTERRUPTIONS()		if (zend_block_interruptions) { zend_block_interruptions(); }
 #define HANDLE_UNBLOCK_INTERRUPTIONS()		if (zend_unblock_interruptions) { zend_unblock_interruptions(); }
 
+BEGIN_EXTERN_C()
+ZEND_API void zend_message_dispatcher(long message, void *data);
+END_EXTERN_C()
+
+ZEND_API int zend_get_ini_entry(char *name, uint name_length, zval *contents);
+
 
 /* Messages for applications of Zend */
-#define ZMSG_ENABLE_TRACK_VARS			1L
-#define ZMSG_FAILED_INCLUDE_FOPEN		2L
-#define ZMSG_FAILED_REQUIRE_FOPEN		3L
-#define ZMSG_FAILED_HIGHLIGHT_FOPEN		4L
-#define ZMSG_MEMORY_LEAK_DETECTED		5L
-#define ZMSG_MEMORY_LEAK_REPEATED		6L
-#define ZMSG_LOG_SCRIPT_NAME		7L
+#define ZMSG_FAILED_INCLUDE_FOPEN		1L
+#define ZMSG_FAILED_REQUIRE_FOPEN		2L
+#define ZMSG_FAILED_HIGHLIGHT_FOPEN		3L
+#define ZMSG_MEMORY_LEAK_DETECTED		4L
+#define ZMSG_MEMORY_LEAK_REPEATED		5L
+#define ZMSG_LOG_SCRIPT_NAME			6L
+
+
+#define ZVAL_ADDREF(pz)		(++(pz)->refcount)
+#define ZVAL_DELREF(pz)		(--(pz)->refcount)
+#define ZVAL_REFCOUNT(pz)	((pz)->refcount)
 
 #define INIT_PZVAL(z)		\
 	(z)->refcount = 1;		\
@@ -345,6 +405,11 @@ END_EXTERN_C()
 		SEPARATE_ZVAL(ppzv);				\
 	}
 
+#define SEPARATE_ZVAL_TO_MAKE_IS_REF(ppzv)	\
+	if (!PZVAL_IS_REF(*ppzv)) {				\
+		SEPARATE_ZVAL(ppzv);				\
+		(*(ppzv))->is_ref = 1;				\
+	}
 
 #define COPY_PZVAL_TO_ZVAL(zv, pzv)			\
 	(zv) = *(pzv);							\
@@ -352,11 +417,11 @@ END_EXTERN_C()
 		zval_copy_ctor(&(zv));				\
 		(pzv)->refcount--;					\
 	} else {								\
-		FREE_ZVAL(pzv);							\
+		FREE_ZVAL(pzv);						\
 	}										\
 	INIT_PZVAL(&(zv));
 
-#define ZEND_MAX_RESERVED_RESOURCES	1
+#define ZEND_MAX_RESERVED_RESOURCES	2
 
 #ifdef ZEND_WIN32
 /* Only use this macro if you know for sure that all of the switches values
@@ -369,7 +434,7 @@ END_EXTERN_C()
 #define EMPTY_SWITCH_DEFAULT_CASE()
 #endif
 
-#endif /* _ZEND_H */
+#endif /* ZEND_H */
 
 /*
  * Local variables:

Zend/zend_API.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -19,20 +19,18 @@
 
 
 #include "zend.h"
-#include "zend_variables.h"
 #include "zend_execute.h"
 #include "zend_API.h"
 #include "modules.h"
 #include "zend_constants.h"
-#include "zend_operators.h"
 
 #ifdef HAVE_STDARG_H
-# include <stdarg.h>
+#include <stdarg.h>
 #endif
 
 /* these variables are true statics/globals, and have to be mutex'ed on every access */
 static int module_count=0;
-HashTable list_destructors, module_registry;
+HashTable module_registry;
 
 /* this function doesn't check for too many parameters */
 ZEND_API int zend_get_parameters(int ht, int param_count, ...)
@@ -43,7 +41,7 @@ ZEND_API int zend_get_parameters(int ht, int param_count, ...)
 	zval **param, *param_ptr;
 	ELS_FETCH();
 
-	p = EG(argument_stack).top_element-1;
+	p = EG(argument_stack).top_element-2;
 	arg_count = (ulong) *p;
 
 	if (param_count>arg_count) {
@@ -52,9 +50,9 @@ ZEND_API int zend_get_parameters(int ht, int param_count, ...)
 
 	va_start(ptr, param_count);
 
-	while (param_count>0) {
+	while (param_count-->0) {
 		param = va_arg(ptr, zval **);
-		param_ptr = *(p-param_count);
+		param_ptr = *(p-arg_count);
 		if (!PZVAL_IS_REF(param_ptr) && param_ptr->refcount>1) {
 			zval *new_tmp;
 
@@ -63,11 +61,11 @@ ZEND_API int zend_get_parameters(int ht, int param_count, ...)
 			zval_copy_ctor(new_tmp);
 			INIT_PZVAL(new_tmp);
 			param_ptr = new_tmp;
-			((zval *) *(p-param_count))->refcount--;
-			*(p-param_count) = param_ptr;
+			((zval *) *(p-arg_count))->refcount--;
+			*(p-arg_count) = param_ptr;
 		}
 		*param = param_ptr;
-		param_count--;
+		arg_count--;
 	}
 	va_end(ptr);
 
@@ -82,16 +80,15 @@ ZEND_API int zend_get_parameters_array(int ht, int param_count, zval **argument_
 	zval *param_ptr;
 	ELS_FETCH();
 
-	p = EG(argument_stack).top_element-1;
+	p = EG(argument_stack).top_element-2;
 	arg_count = (ulong) *p;
 
 	if (param_count>arg_count) {
 		return FAILURE;
 	}
 
-
-	while (param_count>0) {
-		param_ptr = *(p-param_count);
+	while (param_count-->0) {
+		param_ptr = *(p-arg_count);
 		if (!PZVAL_IS_REF(param_ptr) && param_ptr->refcount>1) {
 			zval *new_tmp;
 
@@ -100,11 +97,11 @@ ZEND_API int zend_get_parameters_array(int ht, int param_count, zval **argument_
 			zval_copy_ctor(new_tmp);
 			INIT_PZVAL(new_tmp);
 			param_ptr = new_tmp;
-			((zval *) *(p-param_count))->refcount--;
-			*(p-param_count) = param_ptr;
+			((zval *) *(p-arg_count))->refcount--;
+			*(p-arg_count) = param_ptr;
 		}
 		*(argument_array++) = param_ptr;
-		param_count--;
+		arg_count--;
 	}
 
 	return SUCCESS;
@@ -123,7 +120,7 @@ ZEND_API int zend_get_parameters_ex(int param_count, ...)
 	zval ***param;
 	ELS_FETCH();
 
-	p = EG(argument_stack).top_element-1;
+	p = EG(argument_stack).top_element-2;
 	arg_count = (ulong) *p;
 
 	if (param_count>arg_count) {
@@ -131,9 +128,9 @@ ZEND_API int zend_get_parameters_ex(int param_count, ...)
 	}
 
 	va_start(ptr, param_count);
-	while (param_count>0) {
+	while (param_count-->0) {
 		param = va_arg(ptr, zval ***);
-		*param = (zval **) p-(param_count--);
+		*param = (zval **) p-(arg_count--);
 	}
 	va_end(ptr);
 
@@ -147,15 +144,15 @@ ZEND_API int zend_get_parameters_array_ex(int param_count, zval ***argument_arra
 	int arg_count;
 	ELS_FETCH();
 
-	p = EG(argument_stack).top_element-1;
+	p = EG(argument_stack).top_element-2;
 	arg_count = (ulong) *p;
 
 	if (param_count>arg_count) {
 		return FAILURE;
 	}
 
-	while (param_count>0) {
-		*(argument_array++) = (zval **) p-(param_count--);
+	while (param_count-->0) {
+		*(argument_array++) = (zval **) p-(arg_count--);
 	}
 
 	return SUCCESS;
@@ -169,7 +166,7 @@ ZEND_API int ParameterPassedByReference(int ht, uint n)
 	zval *arg;
 	ELS_FETCH();
 
-	p = EG(argument_stack).elements+EG(argument_stack).top-1;
+	p = EG(argument_stack).elements+EG(argument_stack).top-2;
 	arg_count = (ulong) *p;
 
 	if (n>arg_count) {
@@ -191,7 +188,7 @@ ZEND_API inline int _array_init(zval *arg ZEND_FILE_LINE_DC)
 	ALLOC_HASHTABLE_REL(arg->value.ht);
 
 	if (!arg->value.ht || zend_hash_init(arg->value.ht, 0, NULL, ZVAL_PTR_DTOR, 0)) {
-		zend_error(E_CORE_ERROR, "Cannot allocate memory for array");
+		zend_error(E_ERROR, "Cannot allocate memory for array");
 		return FAILURE;
 	}
 	arg->type = IS_ARRAY;
@@ -204,7 +201,7 @@ ZEND_API inline int _object_init_ex(zval *arg, zend_class_entry *class_type ZEND
 	zval *tmp;
 
 	if (!class_type->constants_updated) {
-		zend_hash_apply(&class_type->default_properties, (int (*)(void *)) zval_update_constant);
+		zend_hash_apply_with_argument(&class_type->default_properties, (int (*)(void *,void *)) zval_update_constant, (void *) 1);
 		class_type->constants_updated = 1;
 	}
 	
@@ -709,36 +706,23 @@ ZEND_API int zend_startup_module(zend_module_entry *module)
 }
 
 
-ZEND_API int _register_list_destructors(void (*list_destructor)(void *), void (*plist_destructor)(void *), int module_number)
-{
-	list_destructors_entry ld;
-	
-#if 0
-	printf("Registering destructors %d for module %d\n", list_destructors.nNextFreeElement, module_number);
-#endif
-	
-	ld.list_destructor=(void (*)(void *)) list_destructor;
-	ld.plist_destructor=(void (*)(void *)) plist_destructor;
-	ld.module_number = module_number;
-	ld.resource_id = list_destructors.nNextFreeElement;
-	
-	if (zend_hash_next_index_insert(&list_destructors,(void *) &ld,sizeof(list_destructors_entry),NULL)==FAILURE) {
-		return FAILURE;
-	}
-	return list_destructors.nNextFreeElement-1;
-}
-
-
 /* registers all functions in *library_functions in the function hash */
-int zend_register_functions(zend_function_entry *functions, HashTable *function_table)
+int zend_register_functions(zend_function_entry *functions, HashTable *function_table, int type)
 {
 	zend_function_entry *ptr = functions;
 	zend_function function;
 	zend_internal_function *internal_function = (zend_internal_function *)&function;
 	int count=0,unload=0;
 	HashTable *target_function_table = function_table;
+	int error_type;
 	CLS_FETCH();
 
+	if (type==MODULE_PERSISTENT) {
+		error_type = E_CORE_WARNING;
+	} else {
+		error_type = E_WARNING;
+	}
+
 	if (!target_function_table) {
 		target_function_table = CG(function_table);
 	}
@@ -749,7 +733,7 @@ int zend_register_functions(zend_function_entry *functions, HashTable *function_
 		internal_function->arg_types = ptr->func_arg_types;
 		internal_function->function_name = ptr->fname;
 		if (!internal_function->handler) {
-			zend_error(E_CORE_WARNING,"Null function defined as active function");
+			zend_error(error_type, "Null function defined as active function");
 			zend_unregister_functions(functions, count, target_function_table);
 			return FAILURE;
 		}
@@ -763,7 +747,7 @@ int zend_register_functions(zend_function_entry *functions, HashTable *function_
 	if (unload) { /* before unloading, display all remaining bad function in the module */
 		while (ptr->fname) {
 			if (zend_hash_exists(target_function_table, ptr->fname, strlen(ptr->fname)+1)) {
-				zend_error(E_CORE_WARNING, "Function registration failed - duplicate name - %s",ptr->fname);
+				zend_error(error_type, "Function registration failed - duplicate name - %s",ptr->fname);
 			}
 			ptr++;
 		}
@@ -805,7 +789,7 @@ ZEND_API int zend_register_module(zend_module_entry *module)
 #if 0
 	zend_printf("%s:  Registering module %d\n",module->name, module->module_number);
 #endif
-	if (module->functions && zend_register_functions(module->functions, NULL)==FAILURE) {
+	if (module->functions && zend_register_functions(module->functions, NULL, module->type)==FAILURE) {
 		zend_error(E_CORE_WARNING,"%s:  Unable to register functions, unable to load",module->name);
 		return FAILURE;
 	}
@@ -817,8 +801,10 @@ ZEND_API int zend_register_module(zend_module_entry *module)
 void module_destructor(zend_module_entry *module)
 {
 	if (module->type == MODULE_TEMPORARY) {
-		zend_hash_apply_with_argument(&list_destructors, (int (*)(void *,void *)) clean_module_resource_destructors, (void *) &(module->module_number));
+		zend_clean_module_rsrc_dtors(module->module_number);
 		clean_module_constants(module->module_number);
+		if (module->request_shutdown_func)
+			module->request_shutdown_func(module->type, module->module_number);
 	}
 
 	if (module->module_started && module->module_shutdown_func) {
@@ -887,8 +873,31 @@ int zend_next_free_module(void)
 	return ++module_count;
 }
 
+/* If parent_ce is not NULL then it inherits from parent_ce
+ * If parent_ce is NULL and parent_name isn't then it looks for the parent and inherits from it
+ * If both parent_ce and parent_name are NULL it does a regular class registration
+ * If parent_name is specified but not found NULL is returned
+ */
+ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce, char *parent_name)
+{
+	zend_class_entry *register_class;
+	CLS_FETCH();
 
-ZEND_API zend_class_entry *register_internal_class(zend_class_entry *class_entry)
+	if (!parent_ce && parent_name) {
+			if (zend_hash_find(CG(class_table), parent_name, strlen(parent_name)+1, (void **) &parent_ce)==FAILURE) {
+				return NULL;
+			}
+	}
+
+	register_class = zend_register_internal_class(class_entry);
+
+	if (parent_ce) {
+		do_inheritance(register_class, parent_ce);
+	}
+	return register_class;
+}
+
+ZEND_API zend_class_entry *zend_register_internal_class(zend_class_entry *class_entry)
 {
 	zend_class_entry *register_class;
 	char *lowercase_name = zend_strndup(class_entry->name, class_entry->name_length);
@@ -906,7 +915,7 @@ ZEND_API zend_class_entry *register_internal_class(zend_class_entry *class_entry
 
 
 	if (class_entry->builtin_functions) {
-		zend_register_functions(class_entry->builtin_functions, &class_entry->function_table);
+		zend_register_functions(class_entry->builtin_functions, &class_entry->function_table, MODULE_PERSISTENT);
 	}
 
 	zend_hash_update(CG(class_table), lowercase_name, class_entry->name_length+1, class_entry, sizeof(zend_class_entry), (void **) &register_class);
@@ -939,9 +948,37 @@ ZEND_API int zend_set_hash_symbol(zval *symbol, char *name, int name_length,
     va_start(symbol_table_list, num_symbol_tables);
     while(num_symbol_tables-- > 0) {
         symbol_table = va_arg(symbol_table_list, HashTable *);
-        zend_hash_update_ptr(symbol_table, name, name_length + 1, symbol, sizeof(zval *), NULL);
+        zend_hash_update(symbol_table, name, name_length + 1, &symbol, sizeof(zval *), NULL);
         zval_add_ref(&symbol);
     }
     va_end(symbol_table_list);
     return SUCCESS;
 }
+
+
+
+
+/* Disabled functions support */
+
+static ZEND_FUNCTION(display_disabled_function)
+{
+	zend_error(E_WARNING, "%s() has been disabled for security reasons.", get_active_function_name());
+}
+
+
+static zend_function_entry disabled_function[] =  {
+	ZEND_FE(display_disabled_function,			NULL)
+	{ NULL, NULL, NULL }
+};
+
+
+ZEND_API int zend_disable_function(char *function_name, uint function_name_length)
+{
+	CLS_FETCH();
+
+	if (zend_hash_del(CG(function_table), function_name, function_name_length+1)==FAILURE) {
+		return FAILURE;
+	}
+	disabled_function[0].fname = function_name;
+	return zend_register_functions(disabled_function, CG(function_table), MODULE_PERSISTENT);
+}

Zend/zend_API.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,19 +18,64 @@
 */
 
 
-#ifndef _ZEND_API_H
-#define _ZEND_API_H
+#ifndef ZEND_API_H
+#define ZEND_API_H
 
 #include "modules.h"
 #include "zend_list.h"
 #include "zend_fast_cache.h"
+#include "zend_operators.h"
+#include "zend_variables.h"
+#include "zend_execute.h"
 
-
+#define ZEND_FN(name) zend_if_##name
 #define ZEND_NAMED_FUNCTION(name) void name(INTERNAL_FUNCTION_PARAMETERS)
-#define ZEND_FUNCTION(name) ZEND_NAMED_FUNCTION(zend_if_##name)
+#define ZEND_FUNCTION(name) ZEND_NAMED_FUNCTION(ZEND_FN(name))
+
+#define ZEND_NAMED_FE(zend_name, name, arg_types) { #zend_name, name, arg_types },
+#define ZEND_FE(name, arg_types) ZEND_NAMED_FE(name, ZEND_FN(name), arg_types)
+#define ZEND_FALIAS(name, alias, arg_types) ZEND_NAMED_FE(name, ZEND_FN(alias), arg_types)
+
+#define ZEND_MINIT(module)       zend_minit_##module
+#define ZEND_MSHUTDOWN(module)   zend_mshutdown_##module
+#define ZEND_RINIT(module)       zend_rinit_##module
+#define ZEND_RSHUTDOWN(module)   zend_rshutdown_##module
+#define ZEND_MINFO(module)       zend_info_##module
+#define ZEND_GINIT(module)       zend_ginit_##module
+#define ZEND_GSHUTDOWN(module)   zend_gshutdown_##module
+
+#define ZEND_MINIT_FUNCTION(module)      int ZEND_MINIT(module)(INIT_FUNC_ARGS)
+#define ZEND_MSHUTDOWN_FUNCTION(module)  int ZEND_MSHUTDOWN(module)(SHUTDOWN_FUNC_ARGS)
+#define ZEND_RINIT_FUNCTION(module)      int ZEND_RINIT(module)(INIT_FUNC_ARGS)
+#define ZEND_RSHUTDOWN_FUNCTION(module)  int ZEND_RSHUTDOWN(module)(SHUTDOWN_FUNC_ARGS)
+#define ZEND_MINFO_FUNCTION(module)      void ZEND_MINFO(module)(ZEND_MODULE_INFO_FUNC_ARGS)
+#define ZEND_GINIT_FUNCTION(module)      int ZEND_GINIT(module)(GINIT_FUNC_ARGS)
+#define ZEND_GSHUTDOWN_FUNCTION(module)  int ZEND_GSHUTDOWN(module)(void)
+
+#define ZEND_GET_MODULE(name) \
+	ZEND_DLEXPORT zend_module_entry *get_module(void) { return &name##_module_entry; }
+
+#define ZEND_BEGIN_MODULE_GLOBALS(module_name)		\
+	typedef struct _zend_##module_name##_globals {
+#define ZEND_END_MODULE_GLOBALS(module_name)		\
+	} zend_##module_name##_globals;
+
+#ifdef ZTS
+
+#define ZEND_DECLARE_MODULE_GLOBALS(module_name)							\
+	static ts_rsrc_id module_name##_globals_id;
+#define ZEND_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor)	\
+	module_name##_globals_id = ts_allocate_id(sizeof(zend_##module_name##_globals), (ts_allocate_ctor) globals_ctor, (ts_allocate_dtor) globals_dtor);
+
+#else
+
+#define ZEND_DECLARE_MODULE_GLOBALS(module_name)							\
+	static zend_##module_name##_globals module_name##_globals;
+#define ZEND_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor)	\
+	globals_ctor(&module_name##_globals);
+
+#endif
 
-#define ZEND_NAMED_FE(runtime_name, name, arg_types) { #runtime_name, name, arg_types },
-#define ZEND_FE(name, arg_types) ZEND_NAMED_FE(name, zend_if_##name, arg_types)
 
 
 #define INIT_CLASS_ENTRY(class_container, class_name, functions)	\
@@ -64,25 +109,26 @@ ZEND_API int zend_get_parameters_array_ex(int param_count, zval ***argument_arra
 
 ZEND_API int ParameterPassedByReference(int ht, uint n);
 
-int zend_register_functions(zend_function_entry *functions, HashTable *function_table);
+int zend_register_functions(zend_function_entry *functions, HashTable *function_table, int type);
 void zend_unregister_functions(zend_function_entry *functions, int count, HashTable *function_table);
 ZEND_API int zend_register_module(zend_module_entry *module_entry);
-ZEND_API zend_class_entry *register_internal_class(zend_class_entry *class_entry);
+
+ZEND_API zend_class_entry *zend_register_internal_class(zend_class_entry *class_entry);
+ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce, char *parent_name);
+
 ZEND_API zend_module_entry *zend_get_module(int module_number);
+ZEND_API int zend_disable_function(char *function_name, uint function_name_length);
 
 ZEND_API void wrong_param_count(void);
 
 #define getThis() (this_ptr)
 
-#define WRONG_PARAM_COUNT { wrong_param_count(); return; }
-#define WRONG_PARAM_COUNT_WITH_RETVAL(ret) { wrong_param_count(); return ret; }
+#define WRONG_PARAM_COUNT					ZEND_WRONG_PARAM_COUNT()
+#define WRONG_PARAM_COUNT_WITH_RETVAL(ret)	ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret)
 #define ARG_COUNT(dummy)	(ht)
 #define ZEND_NUM_ARGS()		(ht)
-
-#define BYREF_NONE 0
-#define BYREF_FORCE 1
-#define BYREF_ALLOW 2
-#define BYREF_FORCE_REST 3
+#define ZEND_WRONG_PARAM_COUNT()					{ wrong_param_count(); return; }
+#define ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret)		{ wrong_param_count(); return ret; }
 
 #ifndef ZEND_WIN32
 #define DLEXPORT
@@ -132,7 +178,7 @@ ZEND_API int add_get_index_string(zval *arg, uint idx, char *str, void **dest, i
 ZEND_API int add_get_index_stringl(zval *arg, uint idx, char *str, uint length, void **dest, int duplicate);
 
 ZEND_API int call_user_function(HashTable *function_table, zval *object, zval *function_name, zval *retval_ptr, int param_count, zval *params[]);
-ZEND_API int call_user_function_ex(HashTable *function_table, zval *object, zval *function_name, zval **retval_ptr_ptr, int param_count, zval **params[], int no_separation);
+ZEND_API int call_user_function_ex(HashTable *function_table, zval *object, zval *function_name, zval **retval_ptr_ptr, int param_count, zval **params[], int no_separation, HashTable *symbol_table);
 
 ZEND_API int add_property_long(zval *arg, char *key, long l);
 ZEND_API int add_property_unset(zval *arg, char *key);
@@ -370,7 +416,7 @@ ZEND_API int zend_set_hash_symbol(zval *symbol, char *name, int name_length,
 #define HASH_OF(p) ((p)->type==IS_ARRAY ? (p)->value.ht : (((p)->type==IS_OBJECT ? (p)->value.obj.properties : NULL)))
 #define ZVAL_IS_NULL(z) ((z)->type==IS_NULL)
 
-#endif /* _ZEND_API_H */
+#endif /* ZEND_API_H */
 
 /*
  * Local variables:

Zend/zend_alloc.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -50,12 +50,12 @@ ZEND_API zend_alloc_globals alloc_globals;
 
 # if MEMORY_LIMIT
 #  if ZEND_DEBUG
-#define CHECK_MEMORY_LIMIT(s) _CHECK_MEMORY_LIMIT(s, __zend_filename, __zend_lineno)
+#define CHECK_MEMORY_LIMIT(s, rs) _CHECK_MEMORY_LIMIT(s, rs, __zend_filename, __zend_lineno)
 #  else
-#define CHECK_MEMORY_LIMIT(s)	_CHECK_MEMORY_LIMIT(s,NULL,0)
+#define CHECK_MEMORY_LIMIT(s, rs)	_CHECK_MEMORY_LIMIT(s, rs, NULL,0)
 #  endif
 
-#define _CHECK_MEMORY_LIMIT(s,file,lineno) { AG(allocated_memory) += (s);\
+#define _CHECK_MEMORY_LIMIT(s, rs, file, lineno) { AG(allocated_memory) += rs;\
 								if (AG(memory_limit)<AG(allocated_memory)) {\
 									if (!file) { \
 										zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)", AG(memory_limit),s); \
@@ -67,7 +67,7 @@ ZEND_API zend_alloc_globals alloc_globals;
 # endif
 
 #ifndef CHECK_MEMORY_LIMIT
-#define CHECK_MEMORY_LIMIT(s)
+#define CHECK_MEMORY_LIMIT(s, rs)
 #endif
 
 
@@ -99,15 +99,30 @@ ZEND_API zend_alloc_globals alloc_globals;
 	}								\
 	p->pLast = (zend_mem_header *) NULL;
 
+#define DECLARE_CACHE_VARS		\
+	unsigned int real_size;		\
+	unsigned int cache_index;
 
+#define REAL_SIZE(size) ((size+7) & ~0x7)
+
+#define CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size)	\
+	real_size = REAL_SIZE(size);				\
+	cache_index = real_size >> 3;
+
+#define SIZE real_size
+
+#define CACHE_INDEX cache_index
 
 ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
 	zend_mem_header *p;
+	DECLARE_CACHE_VARS
 	ALS_FETCH();
 
-	if (!ZEND_DISABLE_MEMORY_CACHE && (size < MAX_CACHED_MEMORY) && (AG(cache_count)[size] > 0)) {
-		p = AG(cache)[size][--AG(cache_count)[size]];
+	CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size);
+
+	if (!ZEND_DISABLE_MEMORY_CACHE && (CACHE_INDEX < MAX_CACHED_MEMORY) && (AG(cache_count)[CACHE_INDEX] > 0)) {
+		p = AG(cache)[CACHE_INDEX][--AG(cache_count)[CACHE_INDEX]];
 #if ZEND_DEBUG
 		p->filename = __zend_filename;
 		p->lineno = __zend_lineno;
@@ -115,18 +130,22 @@ ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 		p->orig_lineno = __zend_orig_lineno;
 		p->magic = MEM_BLOCK_START_MAGIC;
 		p->reported = 0;
-		AG(cache_stats)[size][1]++;
+		AG(cache_stats)[CACHE_INDEX][1]++;
 #endif
 		p->persistent = 0;
 		p->cached = 0;
+		p->size = size;
+		HANDLE_BLOCK_INTERRUPTIONS();
+		ADD_POINTER_TO_LIST(p);
+		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return (void *)((char *)p + sizeof(zend_mem_header) + PLATFORM_PADDING);
 	} else {
 #if ZEND_DEBUG
-		if (size<MAX_CACHED_MEMORY) {
-			AG(cache_stats)[size][0]++;
+		if (CACHE_INDEX<MAX_CACHED_MEMORY) {
+			AG(cache_stats)[CACHE_INDEX][0]++;
 		}
 #endif
-		p  = (zend_mem_header *) malloc(sizeof(zend_mem_header) + size + PLATFORM_PADDING + END_ALIGNMENT(size) + END_MAGIC_SIZE);
+		p  = (zend_mem_header *) malloc(sizeof(zend_mem_header) + SIZE + PLATFORM_PADDING + END_ALIGNMENT(SIZE) + END_MAGIC_SIZE);
 	}
 
 	HANDLE_BLOCK_INTERRUPTIONS();
@@ -143,7 +162,7 @@ ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 	}
 	p->persistent = p->cached = 0;
 	ADD_POINTER_TO_LIST(p);
-	p->size = size;
+	p->size = size; /* Save real size for correct cache output */
 #if ZEND_DEBUG
 	p->filename = __zend_filename;
 	p->lineno = __zend_lineno;
@@ -151,10 +170,10 @@ ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 	p->orig_lineno = __zend_orig_lineno;
 	p->magic = MEM_BLOCK_START_MAGIC;
 	p->reported = 0;
-	*((long *)(((char *) p) + sizeof(zend_mem_header)+size+PLATFORM_PADDING+END_ALIGNMENT(size))) = MEM_BLOCK_END_MAGIC;
+	*((long *)(((char *) p) + sizeof(zend_mem_header)+SIZE+PLATFORM_PADDING+END_ALIGNMENT(SIZE))) = MEM_BLOCK_END_MAGIC;
 #endif
 #if MEMORY_LIMIT
-	CHECK_MEMORY_LIMIT(size);
+	CHECK_MEMORY_LIMIT(size, SIZE);
 #endif
 	HANDLE_UNBLOCK_INTERRUPTIONS();
 	return (void *)((char *)p + sizeof(zend_mem_header) + PLATFORM_PADDING);
@@ -164,29 +183,34 @@ ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
 	zend_mem_header *p = (zend_mem_header *) ((char *)ptr - sizeof(zend_mem_header) - PLATFORM_PADDING);
+	DECLARE_CACHE_VARS
 	ALS_FETCH();
 
+	CALCULATE_REAL_SIZE_AND_CACHE_INDEX(p->size);
 #if ZEND_DEBUG
 	if (!_mem_block_check(ptr, 1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC)) {
 		return;
 	}
-	memset(ptr, 0x5a, p->size);
+	memset(ptr, 0x5a, SIZE);
 #endif
 
 	if (!ZEND_DISABLE_MEMORY_CACHE 
-		&& !p->persistent && (p->size < MAX_CACHED_MEMORY) && (AG(cache_count)[p->size] < MAX_CACHED_ENTRIES)) {
-		AG(cache)[p->size][AG(cache_count)[p->size]++] = p;
+		&& !p->persistent && (CACHE_INDEX < MAX_CACHED_MEMORY) && (AG(cache_count)[CACHE_INDEX] < MAX_CACHED_ENTRIES)) {
+		AG(cache)[CACHE_INDEX][AG(cache_count)[CACHE_INDEX]++] = p;
 		p->cached = 1;
 #if ZEND_DEBUG
 		p->magic = MEM_BLOCK_CACHED_MAGIC;
 #endif
+		HANDLE_BLOCK_INTERRUPTIONS();
+		REMOVE_POINTER_FROM_LIST(p);
+		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return;
 	}
 	HANDLE_BLOCK_INTERRUPTIONS();
 	REMOVE_POINTER_FROM_LIST(p);
 
 #if MEMORY_LIMIT
-	AG(allocated_memory) -= p->size;
+	AG(allocated_memory) -= SIZE;
 #endif
 	
 	free(p);
@@ -198,14 +222,14 @@ ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LI
 {
 	void *p;
 	int final_size=size*nmemb;
-
+	
 	HANDLE_BLOCK_INTERRUPTIONS();
 	p = _emalloc(final_size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	if (!p) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return (void *) p;
 	}
-	memset(p,(int)NULL,final_size);
+	memset(p,(int)NULL, final_size);
 	HANDLE_UNBLOCK_INTERRUPTIONS();
 	return p;
 }
@@ -215,14 +239,18 @@ ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LIN
 {
 	zend_mem_header *p = (zend_mem_header *) ((char *)ptr-sizeof(zend_mem_header)-PLATFORM_PADDING);
 	zend_mem_header *orig = p;
+	DECLARE_CACHE_VARS
 	ALS_FETCH();
 
 	if (!ptr) {
 		return _emalloc(size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	}
+
+	CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size);
+
 	HANDLE_BLOCK_INTERRUPTIONS();
 	REMOVE_POINTER_FROM_LIST(p);
-	p = (zend_mem_header *) realloc(p,sizeof(zend_mem_header)+size+PLATFORM_PADDING+END_ALIGNMENT(size)+END_MAGIC_SIZE);
+	p = (zend_mem_header *) realloc(p,sizeof(zend_mem_header)+SIZE+PLATFORM_PADDING+END_ALIGNMENT(SIZE)+END_MAGIC_SIZE);
 	if (!p) {
 		if (!allow_failure) {
 			fprintf(stderr,"FATAL:  erealloc():  Unable to allocate %ld bytes\n", (long) size);
@@ -241,10 +269,10 @@ ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LIN
 	p->filename = __zend_filename;
 	p->lineno = __zend_lineno;
 	p->magic = MEM_BLOCK_START_MAGIC;
-	*((long *)(((char *) p) + sizeof(zend_mem_header)+size+PLATFORM_PADDING+END_ALIGNMENT(size))) = MEM_BLOCK_END_MAGIC;
+	*((long *)(((char *) p) + sizeof(zend_mem_header)+SIZE+PLATFORM_PADDING+END_ALIGNMENT(SIZE))) = MEM_BLOCK_END_MAGIC;
 #endif	
 #if MEMORY_LIMIT
-	CHECK_MEMORY_LIMIT(size - p->size);
+	CHECK_MEMORY_LIMIT(size - p->size, SIZE - REAL_SIZE(p->size));
 #endif
 	p->size = size;
 
@@ -319,6 +347,11 @@ ZEND_API int zend_set_memory_limit(unsigned int memory_limit)
 
 ZEND_API void start_memory_manager(ALS_D)
 {
+#ifndef ZTS
+	int i, j;
+	void *cached_entries[MAX_CACHED_MEMORY][MAX_CACHED_ENTRIES];
+#endif
+
 	AG(phead) = AG(head) = NULL;
 	
 #if MEMORY_LIMIT
@@ -327,27 +360,43 @@ ZEND_API void start_memory_manager(ALS_D)
 	AG(memory_exhausted)=0;
 #endif
 
+	memset(AG(fast_cache_list_head), 0, sizeof(AG(fast_cache_list_head)));
+	memset(AG(cache_count),0,sizeof(AG(cache_count)));
+
+#ifndef ZTS
+	/* Initialize cache, to prevent fragmentation */
+	/* We can't do this in ZTS mode, because calling emalloc() from within start_memory_manager()
+	 * will yield an endless recursion calling to alloc_globals_ctor()
+	 */
+	for (i=1; i<MAX_CACHED_MEMORY; i++) {
+		for (j=0; j<PRE_INIT_CACHE_ENTRIES; j++) {
+			cached_entries[i][j] = emalloc(8*i);
+		}
+	}
+	for (i=1; i<MAX_CACHED_MEMORY; i++) {
+		for (j=0; j<PRE_INIT_CACHE_ENTRIES; j++) {
+			efree(cached_entries[i][j]);
+		}
+	}
+#endif
+
 #if ZEND_DEBUG
 	memset(AG(cache_stats), 0, sizeof(AG(cache_stats)));
 	memset(AG(fast_cache_stats), 0, sizeof(AG(fast_cache_stats)));
 #endif
-
-	memset(AG(fast_cache_list_head), 0, sizeof(AG(fast_cache_list_head)));
-	memset(AG(cache_count),0,MAX_CACHED_MEMORY*sizeof(unsigned char));
 }
 
 
 ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
 {
 	zend_mem_header *p, *t;
-	int fci;
+	unsigned int fci, i, j;
 #if ZEND_DEBUG
 	int had_leaks=0;
 #endif
 	zend_fast_cache_list_entry *fast_cache_list_entry, *next_fast_cache_list_entry;
 	ALS_FETCH();
 
-	
 	for (fci=0; fci<MAX_FAST_CACHE_TYPES; fci++) {
 		fast_cache_list_entry = AG(fast_cache_list_head)[fci];
 		while (fast_cache_list_entry) {
@@ -395,6 +444,14 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
 		}
 	}
 
+	if(clean_cache) {
+		for (i=1; i<MAX_CACHED_MEMORY; i++) {
+			for (j=0; j<AG(cache_count)[i]; j++) {
+				free(AG(cache)[i][j]);
+			}
+		}
+	}
+
 #if (ZEND_DEBUG)
 	do {
 		zval display_memory_cache_stats;
@@ -519,7 +576,7 @@ ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_
 
 
 	if (valid_beginning
-		&& *((long *)(((char *) p)+sizeof(zend_mem_header)+p->size+PLATFORM_PADDING+END_ALIGNMENT(p->size))) != MEM_BLOCK_END_MAGIC) {
+		&& *((long *)(((char *) p)+sizeof(zend_mem_header)+REAL_SIZE(p->size)+PLATFORM_PADDING+END_ALIGNMENT(REAL_SIZE(p->size)))) != MEM_BLOCK_END_MAGIC) {
 		long magic_num = MEM_BLOCK_END_MAGIC;
 		char *overflow_ptr, *magic_ptr=(char *) &magic_num;
 		int overflows=0;
@@ -529,7 +586,7 @@ ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_
 			return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 		}
 		had_problems=1;
-		overflow_ptr = ((char *) p)+sizeof(zend_mem_header)+p->size+PLATFORM_PADDING;
+		overflow_ptr = ((char *) p)+sizeof(zend_mem_header)+REAL_SIZE(p->size)+PLATFORM_PADDING;
 
 		for (i=0; i<sizeof(long); i++) {
 			if (overflow_ptr[i]!=magic_ptr[i]) {
@@ -539,7 +596,7 @@ ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_
 
 		zend_debug_alloc_output("%10s\t", "End:");
 		zend_debug_alloc_output("Overflown (magic=0x%0.8lX instead of 0x%0.8lX)\n", 
-				*((long *)(((char *) p) + sizeof(zend_mem_header)+p->size+PLATFORM_PADDING+END_ALIGNMENT(p->size))), MEM_BLOCK_END_MAGIC);
+				*((long *)(((char *) p) + sizeof(zend_mem_header)+REAL_SIZE(p->size)+PLATFORM_PADDING+END_ALIGNMENT(REAL_SIZE(p->size)))), MEM_BLOCK_END_MAGIC);
 		zend_debug_alloc_output("%10s\t","");
 		if (overflows>=sizeof(long)) {
 			zend_debug_alloc_output("At least %d bytes overflown\n", sizeof(long));
@@ -592,7 +649,7 @@ ZEND_API void _full_mem_check(int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_D
 #endif
 
 
-ZEND_API void _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+ZEND_API int _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
 	zend_mem_header *p = (zend_mem_header *) ((char *)ptr-sizeof(zend_mem_header)-PLATFORM_PADDING);
 	ALS_FETCH();
@@ -611,6 +668,7 @@ ZEND_API void _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 	/* add the block to the persistent list */
 	ADD_POINTER_TO_LIST(p);
 	HANDLE_UNBLOCK_INTERRUPTIONS();
+	return REAL_SIZE(p->size)+sizeof(zend_mem_header)+PLATFORM_PADDING;
 }
 
 

Zend/zend_alloc.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,15 +18,15 @@
 */
 
 
-#ifndef _ALLOC_H
-#define _ALLOC_H
+#ifndef ZEND_ALLOC_H
+#define ZEND_ALLOC_H
 
 #include <stdio.h>
 
 #include "zend_globals_macros.h"
 
 #define MEM_BLOCK_START_MAGIC	0x7312F8DCL
-#define MEM_BLOCK_END_MAGIC		0x2A8FCC84L
+#define MEM_BLOCK_END_MAGIC	0x2A8FCC84L
 #define MEM_BLOCK_FREED_MAGIC	0x99954317L
 #define MEM_BLOCK_CACHED_MAGIC	0xFB8277DCL
 
@@ -52,8 +52,10 @@ typedef union _align_test {
 	long lng;
 } align_test;
 
-#define MAX_CACHED_MEMORY   64
-#define MAX_CACHED_ENTRIES	16
+#define MAX_CACHED_MEMORY	11
+#define MAX_CACHED_ENTRIES	256
+#define PRE_INIT_CACHE_ENTRIES	32
+
 #if (defined (__GNUC__) && __GNUC__ >= 2)
 #define PLATFORM_ALIGNMENT (__alignof__ (align_test))
 #else
@@ -72,7 +74,7 @@ ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LI
 ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
 ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
 ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-ZEND_API void _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+ZEND_API int _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
 
 /* Standard wrapper macros */
 #define emalloc(size)					_emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)

Zend/zend_builtin_functions.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -21,8 +21,6 @@
 #include "zend.h"
 #include "zend_API.h"
 #include "zend_builtin_functions.h"
-#include "zend_operators.h"
-#include "zend_variables.h"
 #include "zend_constants.h"
 
 #undef ZEND_TEST_EXCEPTIONS
@@ -35,6 +33,7 @@ static ZEND_FUNCTION(strlen);
 static ZEND_FUNCTION(strcmp);
 static ZEND_FUNCTION(strncmp);
 static ZEND_FUNCTION(strcasecmp);
+static ZEND_FUNCTION(strncasecmp);
 static ZEND_FUNCTION(each);
 static ZEND_FUNCTION(error_reporting);
 static ZEND_FUNCTION(define);
@@ -48,11 +47,26 @@ static ZEND_FUNCTION(leak);
 #ifdef ZEND_TEST_EXCEPTIONS
 static ZEND_FUNCTION(crash);
 #endif
-static ZEND_FUNCTION(get_used_files);
-static ZEND_FUNCTION(get_imported_files);
+static ZEND_FUNCTION(get_required_files);
+static ZEND_FUNCTION(get_included_files);
 static ZEND_FUNCTION(is_subclass_of);
+static ZEND_FUNCTION(get_class_vars);
+static ZEND_FUNCTION(get_object_vars);
+static ZEND_FUNCTION(get_class_methods);
+static ZEND_FUNCTION(trigger_error);
+static ZEND_FUNCTION(set_error_handler);
+static ZEND_FUNCTION(restore_error_handler);
+static ZEND_FUNCTION(get_declared_classes);
+static ZEND_FUNCTION(create_function);
+static ZEND_FUNCTION(get_resource_type);
+#if ZEND_DEBUG
+static ZEND_FUNCTION(zend_test_func);
+#endif
 
-extern unsigned char first_arg_force_ref[];
+unsigned char first_arg_force_ref[] = { 1, BYREF_FORCE };
+unsigned char first_arg_allow_ref[] = { 1, BYREF_ALLOW };
+unsigned char second_arg_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE };
+unsigned char second_arg_allow_ref[] = { 2, BYREF_NONE, BYREF_ALLOW };
 
 static zend_function_entry builtin_functions[] = {
 	ZEND_FE(zend_version,		NULL)
@@ -63,6 +77,7 @@ static zend_function_entry builtin_functions[] = {
 	ZEND_FE(strcmp,				NULL)
 	ZEND_FE(strncmp,			NULL)
 	ZEND_FE(strcasecmp,			NULL)
+	ZEND_FE(strncasecmp,		NULL)
 	ZEND_FE(each,				first_arg_force_ref)
 	ZEND_FE(error_reporting,	NULL)
 	ZEND_FE(define,				NULL)
@@ -76,16 +91,29 @@ static zend_function_entry builtin_functions[] = {
 #ifdef ZEND_TEST_EXCEPTIONS
 	ZEND_FE(crash,				NULL)
 #endif
-	ZEND_FE(get_used_files,		NULL)
-	ZEND_FE(get_imported_files,	NULL)
+	ZEND_FE(get_required_files,	NULL)
+	ZEND_FE(get_included_files,	NULL)
 	ZEND_FE(is_subclass_of,		NULL)
+	ZEND_FE(get_class_vars,		NULL)
+	ZEND_FE(get_object_vars,	NULL)
+	ZEND_FE(get_class_methods,	NULL)
+	ZEND_FE(trigger_error,		NULL)
+	ZEND_FALIAS(user_error,		trigger_error,		NULL)
+	ZEND_FE(set_error_handler,		NULL)
+	ZEND_FE(restore_error_handler,	NULL)
+	ZEND_FE(get_declared_classes, NULL)
+	ZEND_FE(create_function,	NULL)
+	ZEND_FE(get_resource_type,	NULL)
+#if ZEND_DEBUG
+	ZEND_FE(zend_test_func,		NULL)
+#endif
 	{ NULL, NULL, NULL }
 };
 
 
 int zend_startup_builtin_functions()
 {
-	return zend_register_functions(builtin_functions, NULL);
+	return zend_register_functions(builtin_functions, NULL, MODULE_PERSISTENT);
 }
 
 
@@ -100,10 +128,13 @@ ZEND_FUNCTION(func_num_args)
 	void **p;
 	int arg_count;
 
-	p = EG(argument_stack).top_element-1;
+	p = EG(argument_stack).top_element-1-1;
 	arg_count = (ulong) *p;		/* this is the amount of arguments passed to func_num_args(); */
-
-	p = EG(argument_stack).top_element-1-arg_count-1;
+	p -= 1+arg_count;
+	if (*p) {
+		zend_error(E_ERROR, "func_num_args(): Can't be used as a function parameter");
+	}
+	--p;
 	if (p>=EG(argument_stack).elements) {
 		RETURN_LONG((ulong) *p);
 	} else {
@@ -127,10 +158,13 @@ ZEND_FUNCTION(func_get_arg)
 	convert_to_long_ex(z_requested_offset);
 	requested_offset = (*z_requested_offset)->value.lval;
 
-	p = EG(argument_stack).top_element-1;
-	arg_count = (ulong) *p;		/* this is the amount of arguments passed to func_num_args(); */
-
-	p = EG(argument_stack).top_element-1-arg_count-1;
+	p = EG(argument_stack).top_element-1-1;
+	arg_count = (ulong) *p;		/* this is the amount of arguments passed to func_get_arg(); */
+	p -= 1+arg_count;
+	if (*p) {
+		zend_error(E_ERROR, "func_get_arg(): Can't be used as a function parameter");
+	}
+	--p;
 	if (p<EG(argument_stack).elements) {
 		zend_error(E_WARNING, "func_get_arg():  Called from the global scope - no function context");
 		RETURN_FALSE;
@@ -154,10 +188,14 @@ ZEND_FUNCTION(func_get_args)
 	int arg_count;
 	int i;
 
-	p = EG(argument_stack).top_element-1;
-	arg_count = (ulong) *p;		/* this is the amount of arguments passed to func_num_args(); */
+	p = EG(argument_stack).top_element-1-1;
+	arg_count = (ulong) *p;		/* this is the amount of arguments passed to func_get_args(); */
+	p -= 1+arg_count;
+	if (*p) {
+		zend_error(E_ERROR, "func_get_args(): Can't be used as a function parameter");
+	}
+	--p;
 
-	p = EG(argument_stack).top_element-1-arg_count-1;
 	if (p<EG(argument_stack).elements) {
 		zend_error(E_WARNING, "func_get_args():  Called from the global scope - no function context");
 		RETURN_FALSE;
@@ -185,7 +223,7 @@ ZEND_FUNCTION(strlen)
 	zval **str;
 	
 	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
-		WRONG_PARAM_COUNT;
+		ZEND_WRONG_PARAM_COUNT();
 	}
 	convert_to_string_ex(str);
 	RETVAL_LONG((*str)->value.str.len);
@@ -199,7 +237,7 @@ ZEND_FUNCTION(strcmp)
 	zval **s1, **s2;
 	
 	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &s1, &s2) == FAILURE) {
-		WRONG_PARAM_COUNT;
+		ZEND_WRONG_PARAM_COUNT();
 	}
 	convert_to_string_ex(s1);
 	convert_to_string_ex(s2);
@@ -214,7 +252,7 @@ ZEND_FUNCTION(strncmp)
 	zval **s1, **s2, **s3;
 	
 	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &s1, &s2, &s3) == FAILURE) {
-		WRONG_PARAM_COUNT;
+		ZEND_WRONG_PARAM_COUNT();
 	}
 	convert_to_string_ex(s1);
 	convert_to_string_ex(s2);
@@ -230,7 +268,7 @@ ZEND_FUNCTION(strcasecmp)
 	zval **s1, **s2;
 	
 	if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &s1, &s2) == FAILURE) {
-		WRONG_PARAM_COUNT;
+		ZEND_WRONG_PARAM_COUNT();
 	}
 	convert_to_string_ex(s1);
 	convert_to_string_ex(s2);
@@ -238,6 +276,22 @@ ZEND_FUNCTION(strcasecmp)
 }
 /* }}} */
 
+/* {{{ proto int strncasecmp(string str1, string str2, int len)
+   Binary safe string comparison */
+ZEND_FUNCTION(strncasecmp)
+{
+	zval **s1, **s2, **s3;
+	
+	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &s1, &s2, &s3) == FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+	convert_to_string_ex(s1);
+	convert_to_string_ex(s2);
+	convert_to_long_ex(s3);
+	RETURN_LONG(zend_binary_zval_strncasecmp(*s1,*s2,*s3));
+}
+/* }}} */
+
 ZEND_FUNCTION(each)
 {
 	zval **array,*entry,**entry_ptr, *tmp;
@@ -247,7 +301,7 @@ ZEND_FUNCTION(each)
 	HashTable *target_hash;
 	
 	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
-		WRONG_PARAM_COUNT;
+		ZEND_WRONG_PARAM_COUNT();
 	}
 	target_hash = HASH_OF(*array);
 	if (!target_hash) {
@@ -271,7 +325,7 @@ ZEND_FUNCTION(each)
 	}
 	zend_hash_index_update(return_value->value.ht, 1, &entry, sizeof(zval *), NULL);
 	entry->refcount++;
-	zend_hash_update_ptr(return_value->value.ht, "value", sizeof("value"), entry, sizeof(zval *), NULL);
+	zend_hash_update(return_value->value.ht, "value", sizeof("value"), &entry, sizeof(zval *), NULL);
 	entry->refcount++;
 
 	/* add the key elements */
@@ -305,10 +359,10 @@ ZEND_FUNCTION(error_reporting)
 			EG(error_reporting)=(*arg)->value.lval;
 			break;
 		default:
-			WRONG_PARAM_COUNT;
+			ZEND_WRONG_PARAM_COUNT();
 			break;
 	}
-	
+
 	RETVAL_LONG(old_error_reporting);
 }
 
@@ -337,9 +391,10 @@ ZEND_FUNCTION(define)
 			}
 			break;
 		default:
-			WRONG_PARAM_COUNT;
+			ZEND_WRONG_PARAM_COUNT();
 			break;
 	}
+
 	switch((*val)->type) {
 		case IS_LONG:
 		case IS_DOUBLE:
@@ -357,11 +412,14 @@ ZEND_FUNCTION(define)
 	
 	c.value = **val;
 	zval_copy_ctor(&c.value);
-	c.flags = case_sensitive | ~CONST_PERSISTENT; /* non persistent */
+	c.flags = case_sensitive; /* non persistent */
 	c.name = zend_strndup((*var)->value.str.val, (*var)->value.str.len);
 	c.name_len = (*var)->value.str.len+1;
-	zend_register_constant(&c ELS_CC);
-	RETURN_TRUE;
+	if(zend_register_constant(&c ELS_CC) == SUCCESS) {
+	  RETURN_TRUE;
+	} else {
+	  RETURN_FALSE;
+	}
 }
 
 
@@ -371,7 +429,7 @@ ZEND_FUNCTION(defined)
 	zval c;
 		
 	if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &var)==FAILURE) {
-		WRONG_PARAM_COUNT;
+		ZEND_WRONG_PARAM_COUNT();
 	}
 	
 	convert_to_string_ex(var);
@@ -384,14 +442,13 @@ ZEND_FUNCTION(defined)
 }
 
 /* {{{ proto string get_class(object object)
-     Retrieves the class name ...
-*/
+   Retrieves the class name */
 ZEND_FUNCTION(get_class)
 {
 	zval **arg;
 	
 	if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &arg)==FAILURE) {
-		RETURN_FALSE;
+		ZEND_WRONG_PARAM_COUNT();
 	}
 	if ((*arg)->type != IS_OBJECT) {
 		RETURN_FALSE;
@@ -401,14 +458,13 @@ ZEND_FUNCTION(get_class)
 /* }}} */
 
 /* {{{ proto string get_parent_class(object object)
-     Retrieves the parent class name ...
-*/
+   Retrieves the parent class name */
 ZEND_FUNCTION(get_parent_class)
 {
 	zval **arg;
 	
 	if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &arg)==FAILURE) {
-		RETURN_FALSE;
+		ZEND_WRONG_PARAM_COUNT();
 	}
 	if (((*arg)->type != IS_OBJECT) || !(*arg)->value.obj.ce->parent) {
 		RETURN_FALSE;
@@ -426,7 +482,7 @@ ZEND_FUNCTION(is_subclass_of)
 	zend_class_entry *parent_ce = NULL;
 
 	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &obj, &class_name)==FAILURE) {
-		RETURN_FALSE;
+		ZEND_WRONG_PARAM_COUNT();
 	}
 
 	if ((*obj)->type != IS_OBJECT) {
@@ -448,16 +504,105 @@ ZEND_FUNCTION(is_subclass_of)
 }
 /* }}} */
 
+/* {{{ proto array get_class_vars(string class_name)
+   Returns an array of default properties of the class */
+ZEND_FUNCTION(get_class_vars)
+{
+	zval **class_name;
+	char *lcname;
+	zend_class_entry *ce;
+	zval *tmp;
+	CLS_FETCH();
+
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &class_name)==FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	convert_to_string_ex(class_name);
+	lcname = estrndup((*class_name)->value.str.val, (*class_name)->value.str.len);
+	zend_str_tolower(lcname, (*class_name)->value.str.len);
+
+	if (zend_hash_find(CG(class_table), lcname, (*class_name)->value.str.len+1, (void **)&ce)==FAILURE) {
+		efree(lcname);
+		RETURN_FALSE;
+	} else {
+		efree(lcname);
+		array_init(return_value);
+		zend_hash_copy(return_value->value.ht, &ce->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+	}
+}
+/* }}} */
+
+/* {{{ proto array get_object_vars(object obj)
+   Returns an array of object properties */
+ZEND_FUNCTION(get_object_vars)
+{
+	zval **obj;
+	zval *tmp;
+
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &obj) == FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	if ((*obj)->type != IS_OBJECT) {
+		RETURN_FALSE;
+	}
+
+	array_init(return_value);
+	zend_hash_copy(return_value->value.ht, (*obj)->value.obj.properties,
+				   (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+}
+/* }}} */
+
+/* {{{ proto array get_class_methods(string class_name)
+   Returns an array of class methods' names */
+ZEND_FUNCTION(get_class_methods)
+{
+	zval **class_name;
+	zval *method_name;
+	char *lcname;
+	zend_class_entry *ce;
+	char *string_key;
+	ulong num_key;
+	int key_type;
+	CLS_FETCH();
+
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &class_name)==FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	convert_to_string_ex(class_name);
+	lcname = estrndup((*class_name)->value.str.val, (*class_name)->value.str.len);
+	zend_str_tolower(lcname, (*class_name)->value.str.len);
+
+	if (zend_hash_find(CG(class_table), lcname, (*class_name)->value.str.len+1, (void **)&ce)==FAILURE) {
+		efree(lcname);
+		RETURN_NULL();
+	} else {
+		efree(lcname);
+		array_init(return_value);
+		zend_hash_internal_pointer_reset(&ce->function_table);
+		while ((key_type = zend_hash_get_current_key(&ce->function_table, &string_key, &num_key)) != HASH_KEY_NON_EXISTANT) {
+			if (key_type == HASH_KEY_IS_STRING) {
+				MAKE_STD_ZVAL(method_name);
+				ZVAL_STRING(method_name, string_key, 0);
+				zend_hash_next_index_insert(return_value->value.ht, &method_name, sizeof(zval *), NULL);
+			}
+			zend_hash_move_forward(&ce->function_table);
+		}
+	}
+}
+/* }}} */
+
 /* {{{ proto bool method_exists(object object, string method)
-     Checks if the class method exists ...
-*/
+   Checks if the class method exists */
 ZEND_FUNCTION(method_exists)
 {
 	zval **klass, **method_name;
 	char *lcname;
 	
 	if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &klass, &method_name)==FAILURE) {
-		RETURN_FALSE;
+		ZEND_WRONG_PARAM_COUNT();
 	}
 	if ((*klass)->type != IS_OBJECT) {
 		RETURN_FALSE;
@@ -476,8 +621,7 @@ ZEND_FUNCTION(method_exists)
 /* }}} */
 
 /* {{{ proto bool class_exists(string classname)
-     Checks if the class exists ...
-*/
+   Checks if the class exists */
 ZEND_FUNCTION(class_exists)
 {
 	zval **class_name;
@@ -485,7 +629,7 @@ ZEND_FUNCTION(class_exists)
 	CLS_FETCH();
 
 	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &class_name)==FAILURE) {
-		RETURN_FALSE;
+		ZEND_WRONG_PARAM_COUNT();
 	}
 	convert_to_string_ex(class_name);
 	lcname = estrndup((*class_name)->value.str.val, (*class_name)->value.str.len);
@@ -509,7 +653,7 @@ ZEND_FUNCTION(function_exists)
 	int retval;
 	
 	if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &function_name)==FAILURE) {
-		WRONG_PARAM_COUNT;
+		ZEND_WRONG_PARAM_COUNT();
 	}
 	convert_to_string_ex(function_name);
 	lcname = estrndup((*function_name)->value.str.val, (*function_name)->value.str.len);
@@ -569,17 +713,234 @@ static int copy_import_use_file(zend_file_handle *fh, zval *array)
 }
 
 
-ZEND_FUNCTION(get_used_files)
+/* {{{ proto array get_required_files(void)
+   Returns an array with the file names that were require_once()'d */
+ZEND_FUNCTION(get_required_files)
 {
 	CLS_FETCH();
 
+	if (ZEND_NUM_ARGS() != 0) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
 	array_init(return_value);
-	zend_hash_apply_with_argument(&CG(used_files), (int (*)(void *, void *)) copy_import_use_file, return_value);
+	zend_hash_apply_with_argument(&CG(used_files), (apply_func_arg_t) copy_import_use_file, return_value);
 }
+/* }}} */
 
 
-ZEND_FUNCTION(get_imported_files)
+/* {{{ proto array get_included_files(void)
+   Returns an array with the file names that were include_once()'d */
+ZEND_FUNCTION(get_included_files)
 {
+	if (ZEND_NUM_ARGS() != 0) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
 	array_init(return_value);
-	zend_hash_apply_with_argument(&EG(imported_files), (int (*)(void *, void *)) copy_import_use_file, return_value);
+	zend_hash_apply_with_argument(&EG(included_files), (apply_func_arg_t) copy_import_use_file, return_value);
+}
+/* }}} */
+
+
+/* {{{ proto void trigger_error(string messsage [, int error_type])
+   Generates a user-level error/warning/notice message */
+ZEND_FUNCTION(trigger_error)
+{
+	int error_type = E_USER_NOTICE;
+	zval **z_error_type, **z_error_message;
+
+	switch(ZEND_NUM_ARGS()) {
+		case 1:
+			if (zend_get_parameters_ex(1, &z_error_message)==FAILURE) {
+				ZEND_WRONG_PARAM_COUNT();
+			}
+			break;
+		case 2:
+			if (zend_get_parameters_ex(2, &z_error_message, &z_error_type)==FAILURE) {
+				ZEND_WRONG_PARAM_COUNT();
+			}
+			convert_to_long_ex(z_error_type);
+			error_type = (*z_error_type)->value.lval;
+			switch (error_type) {
+				case E_USER_ERROR:
+				case E_USER_WARNING:
+				case E_USER_NOTICE:
+					break;
+				default:
+					zend_error(E_WARNING, "Invalid error type specified");
+					RETURN_FALSE;
+					break;
+			}
+			break;
+	}
+	convert_to_string_ex(z_error_message);
+	zend_error(error_type, (*z_error_message)->value.str.val);
+	RETURN_TRUE;
+}
+/* }}} */
+
+
+/* {{{ proto string set_error_handler(string error_handler)
+   Sets a user-defined error handler function.  Returns the previously defined error handler, or false on error */
+ZEND_FUNCTION(set_error_handler)
+{
+	zval **error_handler;
+	zend_bool had_orig_error_handler=0;
+
+	if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &error_handler)==FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	convert_to_string_ex(error_handler);
+	if (EG(user_error_handler)) {
+		had_orig_error_handler = 1;
+		*return_value = *EG(user_error_handler);
+		zval_copy_ctor(return_value);
+		zend_ptr_stack_push(&EG(user_error_handlers), EG(user_error_handler));
+	}
+	ALLOC_ZVAL(EG(user_error_handler));
+
+	if (Z_STRLEN_PP(error_handler)==0) { /* unset user-defined handler */
+		FREE_ZVAL(EG(user_error_handler));
+		EG(user_error_handler) = NULL;
+		RETURN_TRUE;
+	}
+
+	*EG(user_error_handler) = **error_handler;
+	zval_copy_ctor(EG(user_error_handler));
+
+	if (!had_orig_error_handler) {
+		RETURN_NULL();
+	}
+}
+/* }}} */
+
+
+
+/* {{{ proto void restore_error_handler(void)
+   Restores the previously defined error handler function */
+ZEND_FUNCTION(restore_error_handler)
+{
+	if (EG(user_error_handler)) {
+		zval_ptr_dtor(&EG(user_error_handler));
+	}
+	if (zend_ptr_stack_num_elements(&EG(user_error_handlers))==0) {
+		EG(user_error_handler) = NULL;
+	} else {
+		EG(user_error_handler) = zend_ptr_stack_pop(&EG(user_error_handlers));
+	}
+	RETURN_TRUE;
+}
+
+
+static int copy_class_name(zend_class_entry *ce, int num_args, va_list args, zend_hash_key *hash_key)
+{
+	zval *array = va_arg(args, zval *);
+
+	if (hash_key->nKeyLength==0 || hash_key->arKey[0]!=0) {
+		add_next_index_stringl(array, ce->name, ce->name_length, 1);
+	}
+	return 0;
+}
+
+/* {{{ proto array get_declared_classes(void)
+   Returns an array of all declared classes. */
+ZEND_FUNCTION(get_declared_classes)
+{
+	CLS_FETCH();
+
+	if (ZEND_NUM_ARGS() != 0) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	array_init(return_value);
+	zend_hash_apply_with_arguments(CG(class_table), (apply_func_args_t)copy_class_name, 1, return_value);
+}
+/* }}} */
+
+
+#define LAMBDA_TEMP_FUNCNAME	"__lambda_func"
+
+/* {{{ proto string create_function(string args, string code)
+   Creates an anonymous function, and returns its name (funny, eh?) */
+ZEND_FUNCTION(create_function)
+{
+	char *eval_code, *function_name;
+	int eval_code_length, function_name_length;
+	zval **z_function_args, **z_function_code;
+	int retval;
+	CLS_FETCH();
+
+	if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &z_function_args, &z_function_code)==FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	convert_to_string_ex(z_function_args);
+	convert_to_string_ex(z_function_code);
+
+	eval_code_length = sizeof("function " LAMBDA_TEMP_FUNCNAME)
+			+Z_STRLEN_PP(z_function_args)
+			+2	/* for the args parentheses */
+			+2	/* for the curly braces */
+			+Z_STRLEN_PP(z_function_code);
+
+	eval_code = (char *) emalloc(eval_code_length);
+	sprintf(eval_code, "function " LAMBDA_TEMP_FUNCNAME "(%s){%s}", Z_STRVAL_PP(z_function_args), Z_STRVAL_PP(z_function_code));
+
+	retval = zend_eval_string(eval_code, NULL CLS_CC ELS_CC);
+	efree(eval_code);
+	if (retval==SUCCESS) {
+		zend_function *func;
+
+		if (zend_hash_find(EG(function_table), LAMBDA_TEMP_FUNCNAME, sizeof(LAMBDA_TEMP_FUNCNAME), (void **) &func)==FAILURE) {
+			zend_error(E_ERROR, "Unexpected inconsistency in create_function()");
+			RETURN_FALSE;
+		}
+		function_add_ref(func);
+
+		function_name = (char *) emalloc(sizeof("0lambda_")+MAX_LENGTH_OF_LONG);
+
+		do {
+			sprintf(function_name, "%clambda_%d", 0, ++EG(lambda_count));
+			function_name_length = strlen(function_name+1)+1;
+		} while (zend_hash_add(EG(function_table), function_name, function_name_length+1, func, sizeof(zend_function), NULL)==FAILURE);
+		zend_hash_del(EG(function_table), LAMBDA_TEMP_FUNCNAME, sizeof(LAMBDA_TEMP_FUNCNAME));
+		RETURN_STRINGL(function_name, function_name_length, 0);
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+
+
+ZEND_FUNCTION(zend_test_func)
+{
+	zval *arg1, *arg2;
+
+	zend_get_parameters(ht, 2, &arg1, &arg2);
+}
+
+
+ZEND_FUNCTION(get_resource_type)
+{
+	char *resource_type;
+	zval **z_resource_type;
+
+	if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &z_resource_type)==FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	if (Z_TYPE_PP(z_resource_type) != IS_RESOURCE) {
+		zend_error(E_WARNING, "Supplied argument is not a valid resource handle");
+		RETURN_FALSE;
+	}
+
+	resource_type = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(z_resource_type));
+	if (resource_type) {
+		RETURN_STRING(resource_type, 1);
+	} else {
+		RETURN_STRING("Unknown", 1);
+	}
 }

Zend/zend_builtin_functions.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,9 +18,9 @@
 */
 
 
-#ifndef _ZEND_BUILTIN_FUNCTIONS_H
-#define _ZEND_BUILTIN_FUNCTIONS_H
+#ifndef ZEND_BUILTIN_FUNCTIONS_H
+#define ZEND_BUILTIN_FUNCTIONS_H
 
 int zend_startup_builtin_functions(void);
 
-#endif /* _ZEND_BUILTIN_FUNCTIONS_H */
+#endif /* ZEND_BUILTIN_FUNCTIONS_H */

Zend/zend_compile.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -23,12 +23,10 @@
 #include "zend_compile.h"
 #include "zend_llist.h"
 #include "zend_API.h"
-#include "zend_variables.h"
-#include "zend_operators.h"
 #include "zend_fast_cache.h"
 
 
-ZEND_API zend_op_array *(*zend_compile_files)(int mark_as_ref CLS_DC, int file_count, ...);
+ZEND_API zend_op_array *(*zend_v_compile_files)(int type CLS_DC, int file_count, va_list files);
 
 
 #ifndef ZTS
@@ -39,18 +37,6 @@ ZEND_API zend_executor_globals executor_globals;
 
 #define SET_UNUSED(op)  (op).op_type = IS_UNUSED
 
-static int is_not_internal_function(zend_function *function)
-{
-	return(function->type != ZEND_INTERNAL_FUNCTION);
-}
-
-
-static int is_not_internal_class(zend_class_entry *ce)
-{
-	return(ce->type != ZEND_INTERNAL_CLASS);
-}
-
-
 static void free_filename(void *p)
 {
 	efree(*((char **) p));
@@ -72,7 +58,7 @@ static void build_runtime_defined_function_key(zval *result, zval *name, zend_op
 
 	/* NULL, name length, filename length, line number length */
 	result->value.str.len = 1+name->value.str.len+strlen(filename)+lineno_len+1;
-	result->value.str.val = (char *) emalloc(result->value.str.len+1);
+	result->value.str.val = (char *) emalloc(result->value.str.len); /* Extra null byte is calculated a line before */
 	sprintf(result->value.str.val, "%c%s%s%s", '\0', name->value.str.val, filename, lineno_buf);
 	result->type = IS_STRING;
 	result->refcount = 1;
@@ -104,12 +90,9 @@ void init_compiler(CLS_D ELS_DC)
 	zend_llist_init(&CG(list_llist), sizeof(list_llist_element), NULL, 0);
 	zend_llist_init(&CG(dimension_llist), sizeof(int), NULL, 0);
 	zend_llist_init(&CG(filenames_list), sizeof(char *), free_filename, 0);
-	CG(short_tags) = ZEND_UV(short_tags);
-	CG(asp_tags) = ZEND_UV(asp_tags);
-	CG(allow_call_time_pass_reference) = ZEND_UV(allow_call_time_pass_reference);
 	CG(handle_op_arrays) = 1;
 	CG(in_compilation) = 0;
-	init_resource_list(ELS_C);
+	zend_init_rsrc_list(ELS_C);
 	CG(unclean_shutdown) = 0;
 	zend_llist_init(&CG(open_files), sizeof(zend_file_handle), (void (*)(void *)) zend_open_file_dtor, 0);
 	zend_hash_init(&CG(used_files), 5, NULL, (void (*)(void *)) zend_open_file_dtor_wrapper, 0);
@@ -126,8 +109,6 @@ void shutdown_compiler(CLS_D)
 	zend_stack_destroy(&CG(object_stack));
 	zend_stack_destroy(&CG(declare_stack));
 	zend_llist_destroy(&CG(filenames_list));
-	zend_hash_apply(CG(function_table), (int (*)(void *)) is_not_internal_function);
-	zend_hash_apply(CG(class_table), (int (*)(void *)) is_not_internal_class);
 	zend_llist_destroy(&CG(open_files));
 	zend_hash_destroy(&CG(used_files));
 }
@@ -172,7 +153,7 @@ ZEND_API zend_bool zend_is_compiling()
 }
 
 
-static int get_temporary_variable(zend_op_array *op_array)
+static zend_uint get_temporary_variable(zend_op_array *op_array)
 {
 	return (op_array->T)++;
 }
@@ -414,9 +395,8 @@ void do_for_cond(znode *expr, znode *second_semicolon_token CLS_DC)
 	zend_op *opline = get_next_op(CG(active_op_array) CLS_CC);
 
 	opline->opcode = ZEND_JMPZNZ;
-	opline->result = *expr;  /* the conditional expression */
+	opline->op1 = *expr;  /* the conditional expression */
 	second_semicolon_token->u.opline_num = for_cond_op_number;
-	SET_UNUSED(opline->op1);
 	SET_UNUSED(opline->op2);
 }
 
@@ -427,7 +407,7 @@ void do_for_before_statement(znode *cond_start, znode *second_semicolon_token CL
 
 	opline->opcode = ZEND_JMP;
 	opline->op1.u.opline_num = cond_start->u.opline_num;
-	CG(active_op_array)->opcodes[second_semicolon_token->u.opline_num].op1.u.opline_num = get_next_op_number(CG(active_op_array));
+	CG(active_op_array)->opcodes[second_semicolon_token->u.opline_num].extended_value = get_next_op_number(CG(active_op_array));
 	SET_UNUSED(opline->op1);
 	SET_UNUSED(opline->op2);
 
@@ -536,8 +516,6 @@ void do_begin_variable_parse(CLS_D)
 {
 	zend_llist fetch_list;
 
-	/* zend_llist_init(&fetch_list, sizeof(int), NULL, 0);
-	zend_stack_push(&CG(bp_stack), (void *) &fetch_list, sizeof(zend_llist));*/
 	zend_llist_init(&fetch_list, sizeof(zend_op), NULL, 0);
 	zend_stack_push(&CG(bp_stack), (void *) &fetch_list, sizeof(zend_llist));
 }
@@ -587,6 +565,27 @@ void do_end_variable_parse(int type, int arg_offset CLS_DC)
 }
 
 
+static zend_bool is_method_call(CLS_D)
+{
+	zend_llist *fetch_list_ptr;
+	zend_llist_element *cur;
+	zend_op *cur_opline;
+
+	zend_stack_top(&CG(bp_stack), (void **) &fetch_list_ptr);
+
+	cur = fetch_list_ptr->head;
+	/* There is always at least one node in the list */
+	while (cur->next) {
+		cur = cur->next;
+	}
+	cur_opline = (zend_op *)cur->data;
+	if (cur_opline->opcode == ZEND_FETCH_OBJ_W) {
+			return 1;
+	}
+	return 0;
+}
+
+
 void do_init_string(znode *result CLS_DC)
 {
 	zend_op *opline = get_next_op(CG(active_op_array) CLS_CC);
@@ -681,7 +680,7 @@ void do_free(znode *op1 CLS_DC)
 			opline->result.u.EA.type |= EXT_TYPE_UNUSED;
 		} else {
 			while (opline>CG(active_op_array)->opcodes) {
-				/* This should be an object instanciation
+				/* This should be an object instantiation
 				 * Find JMP_NO_CTOR, mark the preceding ASSIGN and the
 				 * proceeding INIT_FCALL_BY_NAME as unused
 				 */
@@ -718,7 +717,7 @@ void do_begin_function_declaration(znode *function_token, znode *function_name,
 	function_token->u.op_array = CG(active_op_array);
 	zend_str_tolower(name, name_len);
 
-	init_op_array(&op_array, INITIAL_OP_ARRAY_SIZE);
+	init_op_array(&op_array, ZEND_USER_FUNCTION, INITIAL_OP_ARRAY_SIZE);
 
 	op_array.function_name = name;
 	op_array.arg_types = NULL;
@@ -767,6 +766,7 @@ void do_begin_function_declaration(znode *function_token, znode *function_name,
 
 void do_end_function_declaration(znode *function_token CLS_DC)
 {
+	do_extended_info(CLS_C);
 	do_return(NULL, 0 CLS_CC);
 	pass_two(CG(active_op_array));
 	CG(active_op_array) = function_token->u.op_array;
@@ -789,19 +789,21 @@ void do_receive_arg(int op, znode *var, znode *offset, znode *initialization, un
 	} else {
 		SET_UNUSED(opline->op2);
 	}
-	if (pass_type==BYREF_FORCE && !CG(active_op_array)->arg_types) {
-		int i;
+	if (!CG(active_op_array)->arg_types) {
+		if (pass_type==BYREF_FORCE) {
+			int i;
 
-		CG(active_op_array)->arg_types = (unsigned char *) emalloc(sizeof(unsigned char)*(offset->u.constant.value.lval+1));
-		for (i=1; i<offset->u.constant.value.lval; i++) {
-			CG(active_op_array)->arg_types[i] = BYREF_NONE;
+			CG(active_op_array)->arg_types = (unsigned char *) emalloc(sizeof(unsigned char)*(offset->u.constant.value.lval+1));
+			for (i=1; i<offset->u.constant.value.lval; i++) {
+				CG(active_op_array)->arg_types[i] = BYREF_NONE;
+			}
+			CG(active_op_array)->arg_types[0]=(unsigned char) offset->u.constant.value.lval;
+			CG(active_op_array)->arg_types[offset->u.constant.value.lval] = pass_type;
 		}
-		CG(active_op_array)->arg_types[0]=(unsigned char) offset->u.constant.value.lval;
-	}
-	if (CG(active_op_array)->arg_types) {
+	} else {
 		CG(active_op_array)->arg_types = (unsigned char *) erealloc(CG(active_op_array)->arg_types, sizeof(unsigned char)*(offset->u.constant.value.lval+1));
+		CG(active_op_array)->arg_types[0]=(unsigned char) offset->u.constant.value.lval;
 		CG(active_op_array)->arg_types[offset->u.constant.value.lval] = pass_type;
-		CG(active_op_array)->arg_types[0]++;
 	}
 }
 
@@ -833,6 +835,7 @@ int do_begin_function_call(znode *function_name CLS_DC)
 			}
 			break;
 	}
+	do_extended_fcall_begin(CLS_C); 
 	return 0;
 }
 
@@ -840,20 +843,30 @@ int do_begin_function_call(znode *function_name CLS_DC)
 void do_begin_dynamic_function_call(znode *function_name CLS_DC)
 {
 	unsigned char *ptr = NULL;
-	int last_op_number = get_next_op_number(CG(active_op_array))-1;
+	int last_op_number;
+	zend_op *last_op;
 
-	if (last_op_number>=0 && CG(active_op_array)->opcodes[last_op_number].opcode == ZEND_FETCH_OBJ_R) {
-		CG(active_op_array)->opcodes[last_op_number].opcode = ZEND_INIT_FCALL_BY_NAME;
-		CG(active_op_array)->opcodes[last_op_number].extended_value = ZEND_MEMBER_FUNC_CALL;
+	if (function_name->op_type != IS_CONST && is_method_call(CLS_C)) {
+		do_end_variable_parse(BP_VAR_W, 0 CLS_CC);
+		last_op_number = get_next_op_number(CG(active_op_array))-1;
+		last_op = &CG(active_op_array)->opcodes[last_op_number];
+		last_op->opcode = ZEND_INIT_FCALL_BY_NAME;
+		last_op->extended_value = ZEND_MEMBER_FUNC_CALL;
 	} else {
-		zend_op *opline = get_next_op(CG(active_op_array) CLS_CC);
-	
+		zend_op *opline;
+
+		if (function_name->op_type != IS_CONST) {
+			do_end_variable_parse(BP_VAR_R, 0 CLS_CC);
+		}
+
+		opline = get_next_op(CG(active_op_array) CLS_CC);
 		opline->opcode = ZEND_INIT_FCALL_BY_NAME;
 		opline->op2 = *function_name;
 		opline->extended_value = 0;
 		SET_UNUSED(opline->op1);
 	}
 	zend_stack_push(&CG(function_call_stack), (void *) &ptr, sizeof(zend_function *));
+	do_extended_fcall_begin(CLS_C); 
 }
 
 
@@ -864,6 +877,15 @@ void do_begin_class_member_function_call(znode *class_name, znode *function_name
 
 	opline->opcode = ZEND_INIT_FCALL_BY_NAME;
 	zend_str_tolower(class_name->u.constant.value.str.val, class_name->u.constant.value.str.len);
+	if ((class_name->u.constant.value.str.len == sizeof("parent")-1)
+		&& !memcmp(class_name->u.constant.value.str.val, "parent", sizeof("parent")-1)) {
+		if (!CG(active_class_entry) || !CG(active_class_entry)->parent) {
+			zend_error(E_COMPILE_ERROR, "No parent class available in this context");
+		}
+		efree(class_name->u.constant.value.str.val);
+		class_name->u.constant.value.str.len = CG(active_class_entry)->parent->name_length;
+		class_name->u.constant.value.str.val = estrndup(CG(active_class_entry)->parent->name, class_name->u.constant.value.str.len);
+	}
 	opline->op1 = *class_name;
 	opline->op2 = *function_name;
 	opline->extended_value = ZEND_MEMBER_FUNC_CALL;
@@ -908,9 +930,9 @@ void do_pass_param(znode *param, int op, int offset CLS_DC)
 		zend_error(E_COMPILE_WARNING,
 					"Call-time pass-by-reference has been deprecated - argument passed by value;  "
 					"If you would like to pass it by reference, modify the declaration of %s().  "
-					"If you would like to enable call-time pass-by-reference, you can set"
+					"If you would like to enable call-time pass-by-reference, you can set "
 					"allow_call_time_pass_reference to true in your INI file.  "
-					"However, future versions may not support this any longer.",
+					"However, future versions may not support this any longer. ",
 					(function_ptr?function_ptr->common.function_name:"[runtime function name]"),
 					offset+1);
 	}
@@ -978,7 +1000,7 @@ static int generate_free_switch_expr(zend_switch_entry *switch_entry CLS_DC)
 {
 	zend_op *opline;
 	
-	if (switch_entry->cond.op_type == IS_UNUSED) {
+	if (switch_entry->cond.op_type!=IS_VAR && switch_entry->cond.op_type!=IS_TMP_VAR) {
 		return 1;
 	}
 	
@@ -995,7 +1017,7 @@ static int generate_free_foreach_copy(znode *foreach_copy CLS_DC)
 {
 	zend_op *opline;
 	
-	if (foreach_copy->op_type == IS_UNUSED) {
+	if (foreach_copy->op_type!=IS_VAR && foreach_copy->op_type!=IS_TMP_VAR) {
 		return 1;
 	}
 
@@ -1020,11 +1042,11 @@ void do_return(znode *expr, int do_end_vparse CLS_DC)
 		}
 	}
 #ifdef ZTS
-	zend_stack_apply_with_argument(&CG(switch_cond_stack), (int (*)(void *element, void *)) generate_free_switch_expr, ZEND_STACK_APPLY_TOPDOWN CLS_CC);
-	zend_stack_apply_with_argument(&CG(foreach_copy_stack), (int (*)(void *element, void *)) generate_free_foreach_copy, ZEND_STACK_APPLY_TOPDOWN CLS_CC);
+	zend_stack_apply_with_argument(&CG(switch_cond_stack), ZEND_STACK_APPLY_TOPDOWN, (int (*)(void *element, void *)) generate_free_switch_expr CLS_CC);
+	zend_stack_apply_with_argument(&CG(foreach_copy_stack), ZEND_STACK_APPLY_TOPDOWN, (int (*)(void *element, void *)) generate_free_foreach_copy CLS_CC);
 #else
-	zend_stack_apply(&CG(switch_cond_stack), (int (*)(void *element)) generate_free_switch_expr, ZEND_STACK_APPLY_TOPDOWN);
-	zend_stack_apply(&CG(foreach_copy_stack), (int (*)(void *element)) generate_free_foreach_copy, ZEND_STACK_APPLY_TOPDOWN);
+	zend_stack_apply(&CG(switch_cond_stack), ZEND_STACK_APPLY_TOPDOWN, (int (*)(void *element)) generate_free_switch_expr);
+	zend_stack_apply(&CG(foreach_copy_stack), ZEND_STACK_APPLY_TOPDOWN, (int (*)(void *element)) generate_free_foreach_copy);
 #endif
 
 	opline = get_next_op(CG(active_op_array) CLS_CC);
@@ -1041,7 +1063,7 @@ void do_return(znode *expr, int do_end_vparse CLS_DC)
 }
 
 
-static void function_add_ref(zend_function *function)
+ZEND_API void function_add_ref(zend_function *function)
 {
 	if (function->type == ZEND_USER_FUNCTION) {
 		zend_op_array *op_array = &function->op_array;
@@ -1073,6 +1095,18 @@ static void do_inherit_parent_constructor(zend_class_entry *ce)
 	}
 }
 
+void do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce)
+{
+	zend_function tmp_zend_function;
+	zval *tmp;
+
+	/* Perform inheritance */
+	zend_hash_merge(&ce->default_properties, &parent_ce->default_properties, (void (*)(void *)) zval_add_ref, (void *) &tmp, sizeof(zval *), 0);
+	zend_hash_merge(&ce->function_table, &parent_ce->function_table, (void (*)(void *)) function_add_ref, &tmp_zend_function, sizeof(zend_function), 0);
+	ce->parent = parent_ce;
+	do_inherit_parent_constructor(ce);
+}
+
 
 ZEND_API int do_bind_function_or_class(zend_op *opline, HashTable *function_table, HashTable *class_table, int compile_time)
 {
@@ -1096,7 +1130,10 @@ ZEND_API int do_bind_function_or_class(zend_op *opline, HashTable *function_tabl
 		case ZEND_DECLARE_CLASS: {
 				zend_class_entry *ce;
 
-				zend_hash_find(class_table, opline->op1.u.constant.value.str.val, opline->op1.u.constant.value.str.len, (void **) &ce);
+				if (zend_hash_find(class_table, opline->op1.u.constant.value.str.val, opline->op1.u.constant.value.str.len, (void **) &ce)==FAILURE) {
+					zend_error(E_ERROR, "Internal Zend error - Missing class information for %s", opline->op1.u.constant.value.str.val);
+					return FAILURE;
+				}
 				(*ce->refcount)++;
 				if (zend_hash_add(class_table, opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len+1, ce, sizeof(zend_class_entry), NULL)==FAILURE) {
 					(*ce->refcount)--;
@@ -1111,36 +1148,41 @@ ZEND_API int do_bind_function_or_class(zend_op *opline, HashTable *function_tabl
 			break;
 		case ZEND_DECLARE_INHERITED_CLASS: {
 				zend_class_entry *ce, *parent_ce;
+				int parent_name_length;
 				char *class_name, *parent_name;
-				zend_function tmp_zend_function;
-				zval *tmp;
+				int found_ce;
 
-				zend_hash_find(class_table, opline->op1.u.constant.value.str.val, opline->op1.u.constant.value.str.len, (void **) &ce);
-				(*ce->refcount)++;
+				
+				found_ce = zend_hash_find(class_table, opline->op1.u.constant.value.str.val, opline->op1.u.constant.value.str.len, (void **) &ce);
 
 				/* Restore base class / derived class names */
-				parent_name = opline->op2.u.constant.value.str.val;
 				class_name = strchr(opline->op2.u.constant.value.str.val, ':');
 				if (!class_name) {
 					zend_error(E_CORE_ERROR, "Invalid runtime class entry");
 				}
-				*class_name++ = 0;
+				class_name++;
+
+				if (found_ce==FAILURE) {
+					zend_error(E_ERROR, "Cannot redeclare class %s", class_name);
+					return FAILURE;
+				}
+
+				(*ce->refcount)++;
 
 				/* Obtain parent class */
-				if (zend_hash_find(class_table, parent_name, strlen(parent_name)+1, (void **) &parent_ce)==FAILURE) {
+				parent_name_length = class_name - opline->op2.u.constant.value.str.val - 1;
+				parent_name = estrndup(opline->op2.u.constant.value.str.val, parent_name_length);
+				if (zend_hash_find(class_table, parent_name, parent_name_length+1, (void **) &parent_ce)==FAILURE) {
 					if (!compile_time) {
 						zend_error(E_ERROR, "Class %s:  Cannot inherit from undefined class %s", class_name, parent_name);
 					}
 					(*ce->refcount)--;
-					*(class_name-1) = ':';
+					efree(parent_name);
 					return FAILURE;
 				}
+				efree(parent_name);
 
-				/* Perform inheritance */
-				zend_hash_merge(&ce->default_properties, &parent_ce->default_properties, (void (*)(void *)) zval_add_ref, (void *) &tmp, sizeof(zval *), 0);
-				zend_hash_merge(&ce->function_table, &parent_ce->function_table, (void (*)(void *)) function_add_ref, &tmp_zend_function, sizeof(zend_function), 0);
-				ce->parent = parent_ce;
-				do_inherit_parent_constructor(ce);
+				do_inheritance(ce, parent_ce);
 
 				/* Register the derived class */
 				if (zend_hash_add(class_table, class_name, strlen(class_name)+1, ce, sizeof(zend_class_entry), NULL)==FAILURE) {
@@ -1183,6 +1225,8 @@ void do_early_binding(CLS_D)
 	zval_dtor(&opline->op1.u.constant);
 	zval_dtor(&opline->op2.u.constant);
 	opline->opcode = ZEND_NOP;
+	memset(&opline->op1, 0, sizeof(znode));
+	memset(&opline->op2, 0, sizeof(znode));
 	SET_UNUSED(opline->op1);
 	SET_UNUSED(opline->op2);
 }
@@ -1321,7 +1365,7 @@ void do_switch_end(znode *case_list CLS_DC)
 	
 	zend_stack_top(&CG(switch_cond_stack), (void **) &switch_entry_ptr);
 
-	if (case_list->u.opline_num != -1) { /* empty switch */
+	if (case_list->op_type != IS_UNUSED) { /* non-empty switch */
 		int next_op_number = get_next_op_number(CG(active_op_array));
 
 		CG(active_op_array)->opcodes[case_list->u.opline_num].op1.u.opline_num = next_op_number;
@@ -1342,11 +1386,13 @@ void do_switch_end(znode *case_list CLS_DC)
 	CG(active_op_array)->brk_cont_array[CG(active_op_array)->current_brk_cont].cont = CG(active_op_array)->brk_cont_array[CG(active_op_array)->current_brk_cont].brk = get_next_op_number(CG(active_op_array));
 	CG(active_op_array)->current_brk_cont = CG(active_op_array)->brk_cont_array[CG(active_op_array)->current_brk_cont].parent;
 
-	/* emit free for the switch condition*/
-	opline = get_next_op(CG(active_op_array) CLS_CC);
-	opline->opcode = ZEND_SWITCH_FREE;
-	opline->op1 = switch_entry_ptr->cond;
-	SET_UNUSED(opline->op2);
+	if (switch_entry_ptr->cond.op_type==IS_VAR || switch_entry_ptr->cond.op_type==IS_TMP_VAR) {
+		/* emit free for the switch condition*/
+		opline = get_next_op(CG(active_op_array) CLS_CC);
+		opline->opcode = ZEND_SWITCH_FREE;
+		opline->op1 = switch_entry_ptr->cond;
+		SET_UNUSED(opline->op2);
+	}
 	if (switch_entry_ptr->cond.op_type == IS_CONST) {
 		zval_dtor(&switch_entry_ptr->cond.u.constant);
 	}
@@ -1386,7 +1432,7 @@ void do_case_before_statement(znode *case_list, znode *case_token, znode *case_e
 	SET_UNUSED(opline->op2);
 	case_token->u.opline_num = next_op_number;
 
-	if (case_list->u.opline_num==-1) {
+	if (case_list->op_type==IS_UNUSED) {
 		return;
 	}
 	next_op_number = get_next_op_number(CG(active_op_array));
@@ -1445,7 +1491,7 @@ void do_default_before_statement(znode *case_list, znode *default_token CLS_DC)
 	switch_entry_ptr->default_case = next_op_number;
 
 	next_op_number = get_next_op_number(CG(active_op_array));
-	if (case_list->u.opline_num==-1) {
+	if (case_list->op_type==IS_UNUSED) {
 		return;
 	}
 	CG(active_op_array)->opcodes[case_list->u.opline_num].op1.u.opline_num = next_op_number;
@@ -1846,6 +1892,7 @@ void do_fetch_global_or_static_variable(znode *varname, znode *static_assignment
 {
 	zend_op *opline = get_next_op(CG(active_op_array) CLS_CC);
 	znode lval;
+	znode result;
 
 	if (fetch_type==ZEND_FETCH_STATIC && static_assignment) {
 		zval *tmp;
@@ -1857,7 +1904,7 @@ void do_fetch_global_or_static_variable(znode *varname, znode *static_assignment
 			ALLOC_HASHTABLE(CG(active_op_array)->static_variables);
 			zend_hash_init(CG(active_op_array)->static_variables, 2, NULL, ZVAL_PTR_DTOR, 0);
 		}
-		zend_hash_update_ptr(CG(active_op_array)->static_variables, varname->u.constant.value.str.val, varname->u.constant.value.str.len+1, tmp, sizeof(zval *), NULL);
+		zend_hash_update(CG(active_op_array)->static_variables, varname->u.constant.value.str.val, varname->u.constant.value.str.len+1, &tmp, sizeof(zval *), NULL);
 	}
 
 
@@ -1868,14 +1915,14 @@ void do_fetch_global_or_static_variable(znode *varname, znode *static_assignment
 	opline->op1 = *varname;
 	SET_UNUSED(opline->op2);
 	opline->op2.u.fetch_type = fetch_type;
+	result = opline->result;
 
 	if (varname->op_type == IS_CONST) {
 		zval_copy_ctor(&varname->u.constant);
 	}
 	fetch_simple_variable(&lval, varname, 0 CLS_CC); /* Relies on the fact that the default fetch is BP_VAR_W */
 
-
-	do_assign_ref(NULL, &lval, &opline->result CLS_CC);
+	do_assign_ref(NULL, &lval, &result CLS_CC);
 	CG(active_op_array)->opcodes[CG(active_op_array)->last-1].result.u.EA.type |= EXT_TYPE_UNUSED;
 }
 
@@ -1889,7 +1936,7 @@ void do_cast(znode *result, znode *expr, int type CLS_DC)
 	opline->result.u.var = get_temporary_variable(CG(active_op_array));
 	opline->op1 = *expr;
 	SET_UNUSED(opline->op2);
-	opline->op2.u.constant.type = type;
+	opline->extended_value = type;
 	*result = opline->result;
 }
 
@@ -1911,11 +1958,11 @@ void do_include_or_eval(int type, znode *result, znode *op1 CLS_DC)
 }
 
 
-void do_require(znode *filename CLS_DC)
+void do_require(znode *filename, zend_bool unique CLS_DC)
 {
 	if (filename->op_type==IS_CONST
 		&& filename->u.constant.type==IS_STRING) {
-		require_filename(filename->u.constant.value.str.val CLS_CC);
+		require_filename(filename->u.constant.value.str.val, unique CLS_CC);
 		zval_dtor(&filename->u.constant);
 	} else {
 		znode result;
@@ -2283,7 +2330,6 @@ int zendlex(znode *zendlval CLS_DC)
 		case T_COMMENT:
 		case T_OPEN_TAG:
 		case T_WHITESPACE:
-		case T_PHP_TRACK_VARS:
 			retval = zendlex(zendlval CLS_CC);
 			break;
 		case T_CLOSE_TAG:

Zend/zend_compile.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _COMPILE_H
-#define _COMPILE_H
+#ifndef ZEND_COMPILE_H
+#define ZEND_COMPILE_H
 
 #include "zend.h"
 
@@ -27,6 +27,10 @@
 # include <stdarg.h>
 #endif
 
+#ifdef __cplusplus
+#include <istream.h>
+#endif
+
 #include "zend_llist.h"
 
 #define DEBUG_ZEND 0
@@ -58,20 +62,20 @@ typedef struct _znode {
 	union {
 		zval constant;
 
-		int var;
-		int opline_num;
-		int fetch_type;
+		zend_uint var;
+		zend_uint opline_num; /*  Needs to be signed */
+		zend_uint fetch_type;
 		zend_op_array *op_array;
 		struct {
-			int var;	/* dummy */
-			int type;
+			zend_uint var;	/* dummy */
+			zend_uint type;
 		} EA;
 	} u;
 } znode;
 
 
 typedef struct _zend_op {
-	int opcode;
+	zend_uchar opcode;
 	znode result;
 	znode op1;
 	znode op2;
@@ -89,23 +93,22 @@ typedef struct _zend_brk_cont_element {
 
 
 struct _zend_op_array {
-	int type;	/* MUST be the first element of this struct! */
+	zend_uchar type;	/* MUST be the first element of this struct! */
 
-	unsigned char *arg_types;		/* MUST be the second element of this struct! */
+	zend_uchar *arg_types;		/* MUST be the second element of this struct! */
 	char *function_name;			/* MUST be the third element of this struct! */
 
-	int *refcount;
+	zend_uint *refcount;
 
 	zend_op *opcodes;
-	int last, size;
-
-	int T;
+	zend_uint last, size;
 
+	zend_uint T;
 
 	zend_brk_cont_element *brk_cont_array;
-	int last_brk_cont;
-	int current_brk_cont;
-	unsigned char uses_globals;
+	zend_uint last_brk_cont;
+	zend_uint current_brk_cont;
+	zend_bool uses_globals;
 
 	/* static variables support */
 	HashTable *static_variables;
@@ -116,31 +119,43 @@ struct _zend_op_array {
 	int backpatch_count;
 #endif
 	zend_bool return_reference;
+	zend_bool done_pass_two;
 
 	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
 };
 
 
 typedef struct _zend_internal_function {
-	int type;	/* MUST be the first element of this struct! */
+	zend_uchar type;	/* MUST be the first element of this struct! */
 
-	unsigned char *arg_types;		/* MUST be the second element of this struct */
+	zend_uchar *arg_types;		/* MUST be the second element of this struct */
 	char *function_name;			/* MUST be the third element of this struct */
 
 	void (*handler)(INTERNAL_FUNCTION_PARAMETERS);
 } zend_internal_function;
 
 
+typedef struct _zend_overloaded_function {
+	zend_uchar type;	/* MUST be the first element of this struct! */
+
+	zend_uchar *arg_types;		/* MUST be the second element of this struct */
+	char *function_name;		/* MUST be the third element of this struct */
+
+	zend_uint var;
+} zend_overloaded_function;
+
+
 typedef union _zend_function {
-	int type;	/* MUST be the first element of this struct! */
+	zend_uchar type;	/* MUST be the first element of this struct! */
 	struct {
-		int type;  /* never used */
-		unsigned char *arg_types;
+		zend_uchar type;  /* never used */
+		zend_uchar *arg_types;
 		char *function_name;
 	} common;
 	
 	zend_op_array op_array;
 	zend_internal_function internal_function;
+	zend_overloaded_function overloaded_function;
 } zend_function;
 
 
@@ -166,7 +181,7 @@ typedef struct _list_llist_element {
 
 
 typedef struct _zend_file_handle {
-	int type;
+	zend_uchar type;
 	char *filename;
 	char *opened_path;
 	union {
@@ -180,7 +195,6 @@ typedef struct _zend_file_handle {
 } zend_file_handle;
 
 
-#include "zend_globals.h"
 
 #define IS_CONST	(1<<0)
 #define IS_TMP_VAR	(1<<1)
@@ -190,16 +204,19 @@ typedef struct _zend_file_handle {
 
 #define EXT_TYPE_UNUSED		(1<<0)
 
+#include "zend_globals.h"
+
 BEGIN_EXTERN_C()
 
 void init_compiler(CLS_D ELS_DC);
 void shutdown_compiler(CLS_D);
 
-extern ZEND_API zend_op_array *(*zend_compile_files)(int mark_as_ref CLS_DC, int file_count, ...);
+extern ZEND_API zend_op_array *(*zend_v_compile_files)(int type CLS_DC, int file_count, va_list files);
 
 void zend_activate(CLS_D ELS_DC);
 void zend_deactivate(CLS_D ELS_DC);
-void zend_activate_modules();
+void zend_activate_modules(void);
+void zend_deactivate_modules(void);
 
 
 int lex_scan(zval *zendlval CLS_DC);
@@ -274,6 +291,7 @@ void do_begin_class_member_function_call(znode *class_name, znode *function_name
 void do_end_function_call(znode *function_name, znode *result, znode *argument_list, int is_method, int is_dynamic_fcall CLS_DC);
 void do_return(znode *expr, int do_end_vparse CLS_DC);
 ZEND_API int do_bind_function_or_class(zend_op *opline, HashTable *function_table, HashTable *class_table, int compile_time);
+void do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce);
 void do_early_binding(CLS_D);
 
 void do_pass_param(znode *param, int op, int offset CLS_DC);
@@ -321,7 +339,7 @@ void do_new_list_end(CLS_D);
 
 void do_cast(znode *result, znode *expr, int type CLS_DC);
 void do_include_or_eval(int type, znode *result, znode *op1 CLS_DC);
-void do_require(znode *filename CLS_DC);
+void do_require(znode *filename, zend_bool unique CLS_DC);
 
 void do_unset(znode *variable CLS_DC);
 void do_isset_or_isempty(int type, znode *result, znode *variable CLS_DC);
@@ -351,19 +369,21 @@ void do_extended_fcall_end(CLS_D);
 
 void do_ticks(CLS_D);
 
+ZEND_API void function_add_ref(zend_function *function);
+
 #define INITIAL_OP_ARRAY_SIZE 64
 
 
 /* helper functions in zend-scanner.l */
 ZEND_API int require_file(zend_file_handle *file_handle, zend_bool unique CLS_DC);	
-ZEND_API int require_filename(char *filename CLS_DC);
+ZEND_API int require_filename(char *filename, zend_bool unique CLS_DC);
 ZEND_API int use_filename(char *filename, uint filename_length CLS_DC);
-ZEND_API zend_op_array *compile_files(int mark_as_ref CLS_DC, int file_count, ...);
-ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count, va_list files);
+ZEND_API zend_op_array *zend_compile_files(int type CLS_DC, int file_count, ...);
+ZEND_API zend_op_array *v_compile_files(int type CLS_DC, int file_count, va_list files);
 ZEND_API zend_op_array *compile_string(zval *source_string CLS_DC);	
-ZEND_API zend_op_array *compile_filename(int mode, zval *filename CLS_DC ELS_DC);
+ZEND_API zend_op_array *compile_filename(int type, zval *filename CLS_DC ELS_DC);
 ZEND_API int open_file_for_scanning(zend_file_handle *file_handle CLS_DC);
-ZEND_API void init_op_array(zend_op_array *op_array, int initial_ops_size);
+ZEND_API void init_op_array(zend_op_array *op_array, int type, int initial_ops_size);
 ZEND_API void destroy_op_array(zend_op_array *op_array);
 ZEND_API void zend_close_file_handle(zend_file_handle *file_handle CLS_DC);
 ZEND_API void zend_open_file_dtor(zend_file_handle *fh);
@@ -381,7 +401,7 @@ int get_next_op_number(zend_op_array *op_array);
 int print_class(zend_class_entry *class_entry);
 void print_op_array(zend_op_array *op_array, int optimizations);
 int pass_two(zend_op_array *op_array);
-void pass_include_eval(zend_op_array *op_array);
+ZEND_API void pass_include_eval(zend_op_array *op_array);
 zend_brk_cont_element *get_next_brk_cont_element(zend_op_array *op_array);
 ZEND_API zend_bool zend_is_compiling(void);
 
@@ -404,120 +424,121 @@ int zendlex(znode *zendlval CLS_DC);
 #define ZEND_BOOL_NOT				13
 #define ZEND_BOOL_XOR				14
 #define ZEND_IS_IDENTICAL			15
-#define ZEND_IS_EQUAL				16
-#define ZEND_IS_NOT_EQUAL			17
-#define ZEND_IS_SMALLER				18
-#define ZEND_IS_SMALLER_OR_EQUAL	19
-#define ZEND_CAST					20
-#define ZEND_QM_ASSIGN				21
+#define ZEND_IS_NOT_IDENTICAL       16
+#define ZEND_IS_EQUAL				17
+#define ZEND_IS_NOT_EQUAL			18
+#define ZEND_IS_SMALLER				19
+#define ZEND_IS_SMALLER_OR_EQUAL	20
+#define ZEND_CAST					21
+#define ZEND_QM_ASSIGN				22
 
-#define ZEND_ASSIGN_ADD				22
-#define ZEND_ASSIGN_SUB				23
-#define ZEND_ASSIGN_MUL				24
-#define ZEND_ASSIGN_DIV				25
-#define ZEND_ASSIGN_MOD				26
-#define ZEND_ASSIGN_SL				27
-#define ZEND_ASSIGN_SR				28
-#define ZEND_ASSIGN_CONCAT			29
-#define ZEND_ASSIGN_BW_OR			30
-#define ZEND_ASSIGN_BW_AND			31
-#define ZEND_ASSIGN_BW_XOR			32
+#define ZEND_ASSIGN_ADD				23
+#define ZEND_ASSIGN_SUB				24
+#define ZEND_ASSIGN_MUL				25
+#define ZEND_ASSIGN_DIV				26
+#define ZEND_ASSIGN_MOD				27
+#define ZEND_ASSIGN_SL				28
+#define ZEND_ASSIGN_SR				29
+#define ZEND_ASSIGN_CONCAT			30
+#define ZEND_ASSIGN_BW_OR			31
+#define ZEND_ASSIGN_BW_AND			32
+#define ZEND_ASSIGN_BW_XOR			33
 									
-#define ZEND_PRE_INC				33
-#define ZEND_PRE_DEC				34
-#define ZEND_POST_INC				35
-#define ZEND_POST_DEC				36
-									
-#define ZEND_ASSIGN					37
-#define ZEND_ASSIGN_REF				38
+#define ZEND_PRE_INC				34
+#define ZEND_PRE_DEC				35
+#define ZEND_POST_INC				36
+#define ZEND_POST_DEC				37
+								 	
+#define ZEND_ASSIGN					38
+#define ZEND_ASSIGN_REF				39
 
-#define ZEND_ECHO					39
-#define ZEND_PRINT					40
+#define ZEND_ECHO					40
+#define ZEND_PRINT					41
 
-#define ZEND_JMP					41
-#define ZEND_JMPZ					42
-#define ZEND_JMPNZ					43
-#define ZEND_JMPZNZ					44
-#define ZEND_JMPZ_EX				45
-#define ZEND_JMPNZ_EX				46
-#define ZEND_CASE					47
-#define ZEND_SWITCH_FREE			48
-#define ZEND_BRK					49
-#define ZEND_CONT					50
-#define ZEND_BOOL					51
+#define ZEND_JMP					42
+#define ZEND_JMPZ					43
+#define ZEND_JMPNZ					44
+#define ZEND_JMPZNZ					45
+#define ZEND_JMPZ_EX				46
+#define ZEND_JMPNZ_EX				47
+#define ZEND_CASE					48
+#define ZEND_SWITCH_FREE			49
+#define ZEND_BRK					50
+#define ZEND_CONT					51
+#define ZEND_BOOL					52
 
-#define ZEND_INIT_STRING			52
-#define ZEND_ADD_CHAR				53
-#define ZEND_ADD_STRING				54
-#define ZEND_ADD_VAR				55
+#define ZEND_INIT_STRING			53
+#define ZEND_ADD_CHAR				54
+#define ZEND_ADD_STRING				55
+#define ZEND_ADD_VAR				56
 
-#define ZEND_BEGIN_SILENCE			56
-#define ZEND_END_SILENCE			57
+#define ZEND_BEGIN_SILENCE			57
+#define ZEND_END_SILENCE			58
 
-#define ZEND_INIT_FCALL_BY_NAME		58
-#define ZEND_DO_FCALL				59
-#define ZEND_DO_FCALL_BY_NAME		60
-#define ZEND_RETURN					61
+#define ZEND_INIT_FCALL_BY_NAME		59
+#define ZEND_DO_FCALL				60
+#define ZEND_DO_FCALL_BY_NAME		61
+#define ZEND_RETURN					62
 
-#define ZEND_RECV					62
-#define ZEND_RECV_INIT				63
+#define ZEND_RECV					63
+#define ZEND_RECV_INIT				64
 									
-#define ZEND_SEND_VAL				64
-#define ZEND_SEND_VAR				65
-#define ZEND_SEND_REF				66
+#define ZEND_SEND_VAL				65
+#define ZEND_SEND_VAR				66
+#define ZEND_SEND_REF				67
 
-#define ZEND_NEW 					67
-#define ZEND_JMP_NO_CTOR			68
-#define ZEND_FREE					69
+#define ZEND_NEW 					68
+#define ZEND_JMP_NO_CTOR			69
+#define ZEND_FREE					70
 									
-#define ZEND_INIT_ARRAY				70
-#define ZEND_ADD_ARRAY_ELEMENT		71
+#define ZEND_INIT_ARRAY				71
+#define ZEND_ADD_ARRAY_ELEMENT		72
 									
-#define ZEND_INCLUDE_OR_EVAL		72
+#define ZEND_INCLUDE_OR_EVAL		73
 									
-#define ZEND_UNSET_VAR				73
-#define ZEND_UNSET_DIM_OBJ			74
-#define ZEND_ISSET_ISEMPTY			75
+#define ZEND_UNSET_VAR				74
+#define ZEND_UNSET_DIM_OBJ			75
+#define ZEND_ISSET_ISEMPTY			76
 									
-#define ZEND_FE_RESET				76
-#define ZEND_FE_FETCH				77
+#define ZEND_FE_RESET				77
+#define ZEND_FE_FETCH				78
 									
-#define ZEND_EXIT					78
+#define ZEND_EXIT					79
 
 
 /* the following 18 opcodes are 6 groups of 3 opcodes each, and must
  * remain in that order!
  */
-#define ZEND_FETCH_R				79
-#define ZEND_FETCH_DIM_R			80
-#define ZEND_FETCH_OBJ_R			81
-#define ZEND_FETCH_W				82
-#define ZEND_FETCH_DIM_W			83
-#define ZEND_FETCH_OBJ_W			84
-#define ZEND_FETCH_RW				85
-#define ZEND_FETCH_DIM_RW			86
-#define ZEND_FETCH_OBJ_RW			87
-#define ZEND_FETCH_IS				88
-#define ZEND_FETCH_DIM_IS			89
-#define ZEND_FETCH_OBJ_IS			90
-#define ZEND_FETCH_FUNC_ARG			91
-#define ZEND_FETCH_DIM_FUNC_ARG		92
-#define ZEND_FETCH_OBJ_FUNC_ARG		93
-#define ZEND_FETCH_UNSET			94
-#define ZEND_FETCH_DIM_UNSET		95
-#define ZEND_FETCH_OBJ_UNSET		96
+#define ZEND_FETCH_R				80
+#define ZEND_FETCH_DIM_R			81
+#define ZEND_FETCH_OBJ_R			82
+#define ZEND_FETCH_W				83
+#define ZEND_FETCH_DIM_W			84
+#define ZEND_FETCH_OBJ_W			85
+#define ZEND_FETCH_RW				86
+#define ZEND_FETCH_DIM_RW			87
+#define ZEND_FETCH_OBJ_RW			88
+#define ZEND_FETCH_IS				89
+#define ZEND_FETCH_DIM_IS			90
+#define ZEND_FETCH_OBJ_IS			91
+#define ZEND_FETCH_FUNC_ARG			92
+#define ZEND_FETCH_DIM_FUNC_ARG		93
+#define ZEND_FETCH_OBJ_FUNC_ARG		94
+#define ZEND_FETCH_UNSET			95
+#define ZEND_FETCH_DIM_UNSET		96
+#define ZEND_FETCH_OBJ_UNSET		97
 
-#define ZEND_FETCH_DIM_TMP_VAR		97
-#define ZEND_FETCH_CONSTANT			98
+#define ZEND_FETCH_DIM_TMP_VAR		98
+#define ZEND_FETCH_CONSTANT			99
 
-#define ZEND_DECLARE_FUNCTION_OR_CLASS	99
+#define ZEND_DECLARE_FUNCTION_OR_CLASS	100
 
-#define ZEND_EXT_STMT				100
-#define ZEND_EXT_FCALL_BEGIN		101
-#define ZEND_EXT_FCALL_END			102
-#define ZEND_EXT_NOP				103
+#define ZEND_EXT_STMT				101
+#define ZEND_EXT_FCALL_BEGIN		102
+#define ZEND_EXT_FCALL_END			103
+#define ZEND_EXT_NOP				104
 
-#define ZEND_TICKS					104
+#define ZEND_TICKS					105
 
 /* end of block */
 
@@ -549,7 +570,7 @@ int zendlex(znode *zendlval CLS_DC);
 
 #define ZEND_EVAL				(1<<0)
 #define ZEND_INCLUDE			(1<<1)
-#define ZEND_IMPORT				(1<<2)
+#define ZEND_INCLUDE_ONCE		(1<<2)
 #define ZEND_REQUIRE			(1<<3)
 
 #define ZEND_ISSET				(1<<0)
@@ -607,4 +628,4 @@ int zendlex(znode *zendlval CLS_DC);
 
 END_EXTERN_C()
 
-#endif /* _COMPILE_H */
+#endif /* ZEND_COMPILE_H */

Zend/zend_config.w32.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,12 +18,13 @@
 */
 
 
-#ifndef _ZEND_CONFIG_W32_H
-#define _ZEND_CONFIG_W32_H
+#ifndef ZEND_CONFIG_W32_H
+#define ZEND_CONFIG_W32_H
 
 
 #include <string.h>
 #include <windows.h>
+#include <float.h>
 
 typedef unsigned long ulong;
 typedef unsigned int uint;
@@ -41,6 +42,11 @@ typedef unsigned int uint;
 #define HAVE_STDIOSTR_H 1
 #define HAVE_CLASS_ISTDIOSTREAM
 #define istdiostream stdiostream
+#define HAVE_STDARG_H	1
+#define HAVE_SNPRINTF	1
+#define HAVE_VSNPRINTF	1
+
+#define vsnprintf _vsnprintf
 
 #ifdef inline
 #undef inline
@@ -57,6 +63,7 @@ typedef unsigned int uint;
 # define inline
 #endif
 
+#define zend_finite(A) _finite(A)
 
 #ifdef LIBZEND_EXPORTS
 #	define ZEND_API __declspec(dllexport)
@@ -64,4 +71,17 @@ typedef unsigned int uint;
 #	define ZEND_API __declspec(dllimport)
 #endif
 
-#endif /* _ZEND_CONFIG_W32_H */
+#define ZEND_DLEXPORT		__declspec(dllexport)
+
+/* 0x00200000L is MB_SERVICE_NOTIFICATION, which is only supported under Windows NT 
+ * (and requires _WIN32_WINNT to be defined, which prevents the resulting executable
+ * from running under Windows 9x
+ * Windows 9x should silently ignore it, so it's being used here directly
+ */
+#ifndef MB_SERVICE_NOTIFICATION
+#define	MB_SERVICE_NOTIFICATION		0x00200000L
+#endif
+
+#define ZEND_SERVICE_MB_STYLE		(MB_TOPMOST|MB_SERVICE_NOTIFICATION)
+
+#endif /* ZEND_CONFIG_W32_H */

Zend/zend_constants.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -108,6 +108,9 @@ void zend_register_standard_constants(ELS_D)
 	REGISTER_MAIN_LONG_CONSTANT("E_CORE_WARNING", E_CORE_WARNING, CONST_PERSISTENT | CONST_CS);
 	REGISTER_MAIN_LONG_CONSTANT("E_COMPILE_ERROR", E_COMPILE_ERROR, CONST_PERSISTENT | CONST_CS);
 	REGISTER_MAIN_LONG_CONSTANT("E_COMPILE_WARNING", E_COMPILE_WARNING, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_USER_ERROR", E_USER_ERROR, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_USER_WARNING", E_USER_WARNING, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT | CONST_CS);
 
 	REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
 
@@ -131,6 +134,12 @@ void zend_register_standard_constants(ELS_D)
 		c.value.type = IS_BOOL;
 		zend_register_constant(&c ELS_CC);
 
+		c.name = zend_strndup(ZEND_STRL("ZEND_THREAD_SAFE"));
+		c.name_len = sizeof("ZEND_THREAD_SAFE");
+		c.value.value.lval = ZTS_V;
+		c.value.type = IS_BOOL;
+		zend_register_constant(&c ELS_CC);
+
 		c.name = zend_strndup(ZEND_STRL("NULL"));
 		c.name_len = sizeof("NULL");
 		c.value.type = IS_NULL;
@@ -230,9 +239,10 @@ ZEND_API int zend_get_constant(char *name, uint name_len, zval *result)
 }
 
 
-ZEND_API void zend_register_constant(zend_constant *c ELS_DC)
+ZEND_API int zend_register_constant(zend_constant *c ELS_DC)
 {
 	char *lowercase_name = zend_strndup(c->name, c->name_len);
+	int ret = SUCCESS;
 
 #if 0
 	printf("Registering constant for module %d\n",c->module_number);
@@ -241,8 +251,11 @@ ZEND_API void zend_register_constant(zend_constant *c ELS_DC)
 	zend_str_tolower(lowercase_name, c->name_len);
 	if (zend_hash_add(EG(zend_constants), lowercase_name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {
 		zval_dtor(&c->value);
+		zend_error(E_NOTICE,"Constant %s already defined",lowercase_name);
+		ret = FAILURE;
 	}
 	free(lowercase_name);
+	return ret;
 }
 
 

Zend/zend_constants.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _CONSTANTS_H
-#define _CONSTANTS_H
+#ifndef ZEND_CONSTANTS_H
+#define ZEND_CONSTANTS_H
 
 #include "zend_globals.h"
 
@@ -55,7 +55,7 @@ ZEND_API void zend_register_long_constant(char *name, uint name_len, long lval,
 ZEND_API void zend_register_double_constant(char *name, uint name_len, double dval, int flags, int module_number ELS_DC);
 ZEND_API void zend_register_string_constant(char *name, uint name_len, char *strval, int flags, int module_number ELS_DC);
 ZEND_API void zend_register_stringl_constant(char *name, uint name_len, char *strval, uint strlen, int flags, int module_number ELS_DC);
-ZEND_API void zend_register_constant(zend_constant *c ELS_DC);
+ZEND_API int zend_register_constant(zend_constant *c ELS_DC);
 void zend_copy_constants(HashTable *target, HashTable *sourc);
 void copy_zend_constant(zend_constant *c);
 

Zend/zend_dynamic_array.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |

Zend/zend_dynamic_array.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _DYNAMIC_ARRAY_H
-#define _DYNAMIC_ARRAY_H
+#ifndef ZEND_DYNAMIC_ARRAY_H
+#define ZEND_DYNAMIC_ARRAY_H
 
 typedef struct _dynamic_array {
 	char *array;
@@ -35,4 +35,4 @@ ZEND_API void *zend_dynamic_array_pop(dynamic_array *da);
 ZEND_API void *zend_dynamic_array_get_element(dynamic_array *da, unsigned int index);
 END_EXTERN_C()
 
-#endif /* _ZEND_DYNAMIC_ARRAY_H */
+#endif /* ZEND_DYNAMIC_ARRAY_H */

Zend/zend_errors.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_ERRORS_H
-#define _ZEND_ERRORS_H
+#ifndef ZEND_ERRORS_H
+#define ZEND_ERRORS_H
 
 #define E_ERROR				(1<<0L)
 #define E_WARNING			(1<<1L)
@@ -29,9 +29,12 @@
 #define E_CORE_WARNING		(1<<5L)
 #define E_COMPILE_ERROR		(1<<6L)
 #define E_COMPILE_WARNING	(1<<7L)
+#define E_USER_ERROR		(1<<8L)
+#define E_USER_WARNING		(1<<9L)
+#define E_USER_NOTICE		(1<<10L)
 
-#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING)
+#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE)
 #define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
 
-#endif /* _ZEND_ERRORS_H */
+#endif /* ZEND_ERRORS_H */
 

Zend/zend_execute.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -27,17 +27,11 @@
 #include "zend_execute.h"
 #include "zend_API.h"
 #include "zend_ptr_stack.h"
-#include "zend_variables.h"
-#include "zend_operators.h"
 #include "zend_constants.h"
 #include "zend_extensions.h"
 #include "zend_fast_cache.h"
 #include "zend_execute_locks.h"
 
-#if defined(HAVE_ALLOCA) && defined(HAVE_ALLOCA_H)
-# include <alloca.h>
-#endif
-
 #define get_zval_ptr(node, Ts, should_free, type) _get_zval_ptr(node, Ts, should_free ELS_CC)
 #define get_zval_ptr_ptr(node, Ts, type) _get_zval_ptr_ptr(node, Ts ELS_CC)
 
@@ -60,25 +54,17 @@
 
 
 /* Prototypes */
-static zval get_overloaded_property(ELS_D);
-static void set_overloaded_property(zval *value ELS_DC);
-static void call_overloaded_function(int arg_count, zval *return_value ELS_DC);
-static inline void zend_fetch_var_address(znode *result, znode *op1, znode *op2, temp_variable *Ts, int type ELS_DC);
-static inline void zend_fetch_dimension_address(znode *result, znode *op1, znode *op2, temp_variable *Ts, int type ELS_DC);
-static inline void zend_fetch_property_address(znode *result, znode *op1, znode *op2, temp_variable *Ts, int type ELS_DC);
-static inline void zend_fetch_dimension_address_from_tmp_var(znode *result, znode *op1, znode *op2, temp_variable *Ts ELS_DC);
+static zval get_overloaded_property(temp_variable *T ELS_DC);
+static void set_overloaded_property(temp_variable *T, zval *value ELS_DC);
+static void call_overloaded_function(temp_variable *T, int arg_count, zval *return_value ELS_DC);
+static void zend_fetch_var_address(znode *result, znode *op1, znode *op2, temp_variable *Ts, int type ELS_DC);
+static void zend_fetch_dimension_address(znode *result, znode *op1, znode *op2, temp_variable *Ts, int type ELS_DC);
+static void zend_fetch_property_address(znode *result, znode *op1, znode *op2, temp_variable *Ts, int type ELS_DC);
+static void zend_fetch_dimension_address_from_tmp_var(znode *result, znode *op1, znode *op2, temp_variable *Ts ELS_DC);
 static void zend_extension_statement_handler(zend_extension *extension, zend_op_array *op_array);
 static void zend_extension_fcall_begin_handler(zend_extension *extension, zend_op_array *op_array);
 static void zend_extension_fcall_end_handler(zend_extension *extension, zend_op_array *op_array);
 
-
-
-#define SEPARATE_ON_READ_OBJECT(obj, _type)	\
-if ((obj) && ((_type) == BP_VAR_R) && ((*(obj))->type == IS_OBJECT)) { \
-		SEPARATE_ZVAL_IF_NOT_REF((obj));			\
-		(*(obj))->is_ref = 1;			\
-	}
-
 #define RETURN_VALUE_USED(opline) (!((opline)->result.u.EA.type & EXT_TYPE_UNUSED))
 
 static inline zval *_get_zval_ptr(znode *node, temp_variable *Ts, int *should_free ELS_DC)
@@ -102,21 +88,21 @@ static inline zval *_get_zval_ptr(znode *node, temp_variable *Ts, int *should_fr
 
 				switch (Ts[node->u.var].EA.type) {
 					case IS_OVERLOADED_OBJECT:
-						Ts[node->u.var].tmp_var = get_overloaded_property(ELS_C);
+						Ts[node->u.var].tmp_var = get_overloaded_property(&Ts[node->u.var] ELS_CC);
 						Ts[node->u.var].tmp_var.refcount=1;
 						Ts[node->u.var].tmp_var.is_ref=1;
 						return &Ts[node->u.var].tmp_var;
 						break;
 					case IS_STRING_OFFSET: {
 							temp_variable *T = &Ts[node->u.var];
-							zval *str = T->EA.str;
+							zval *str = T->EA.data.str_offset.str;
 
-							if (T->EA.str->type != IS_STRING
-								|| (T->EA.str->value.str.len <= T->EA.offset)) {
+							if (T->EA.data.str_offset.str->type != IS_STRING
+								|| (T->EA.data.str_offset.str->value.str.len <= T->EA.data.str_offset.offset)) {
 								T->tmp_var.value.str.val = empty_string;
 								T->tmp_var.value.str.len = 0;
 							} else {
-								char c = str->value.str.val[T->EA.offset];
+								char c = str->value.str.val[T->EA.data.str_offset.offset];
 
 								T->tmp_var.value.str.val = estrndup(&c, 1);
 								T->tmp_var.value.str.len = 1;
@@ -148,13 +134,14 @@ static inline zval *_get_object_zval_ptr(znode *node, temp_variable *Ts, int *sh
 			return &Ts[node->u.var].tmp_var;
 			break;
 		case IS_VAR:
-			if (Ts[node->u.var].var.ptr) {
-				PZVAL_UNLOCK(Ts[node->u.var].var.ptr);
+			if (Ts[node->u.var].var.ptr_ptr) {
+				PZVAL_UNLOCK(*Ts[node->u.var].var.ptr_ptr);
 				*should_free = 0;
-				return Ts[node->u.var].var.ptr;
+				SEPARATE_ZVAL_IF_NOT_REF(Ts[node->u.var].var.ptr_ptr);
+				return *Ts[node->u.var].var.ptr_ptr;
 			} else {
 				if (Ts[node->u.var].EA.type==IS_STRING_OFFSET) {
-					PZVAL_UNLOCK(Ts[node->u.var].EA.str);
+					PZVAL_UNLOCK(Ts[node->u.var].EA.data.str_offset.str);
 				}
 				*should_free = 1;
 				return NULL;
@@ -175,7 +162,7 @@ static inline zval **_get_zval_ptr_ptr(znode *node, temp_variable *Ts ELS_DC)
 		if (Ts[node->u.var].var.ptr_ptr) {
 			PZVAL_UNLOCK(*Ts[node->u.var].var.ptr_ptr);
 		} else if (Ts[node->u.var].EA.type==IS_STRING_OFFSET) {
-			PZVAL_UNLOCK(Ts[node->u.var].EA.str);
+			PZVAL_UNLOCK(Ts[node->u.var].EA.data.str_offset.str);
 		}
 		return Ts[node->u.var].var.ptr_ptr;
 	} else {
@@ -222,7 +209,7 @@ static inline zval **zend_fetch_property_address_inner(HashTable *ht, znode *op2
 					zval *new_zval = &EG(uninitialized_zval);
 
 					new_zval->refcount++;
-					zend_hash_update_ptr(ht, prop_ptr->value.str.val, prop_ptr->value.str.len+1, new_zval, sizeof(zval *), (void **) &retval);
+					zend_hash_update(ht, prop_ptr->value.str.val, prop_ptr->value.str.len+1, &new_zval, sizeof(zval *), (void **) &retval);
 				}
 				break;
 			EMPTY_SWITCH_DEFAULT_CASE()
@@ -268,7 +255,7 @@ static inline void zend_assign_to_variable(znode *result, znode *op1, znode *op2
 	if (!variable_ptr_ptr) {
 		switch (Ts[op1->u.var].EA.type) {
 			case IS_OVERLOADED_OBJECT:
-				set_overloaded_property(value ELS_CC);
+				set_overloaded_property(&Ts[op1->u.var], value ELS_CC);
 				if (type == IS_TMP_VAR) {
 					zval_dtor(value);
 				}
@@ -276,8 +263,8 @@ static inline void zend_assign_to_variable(znode *result, znode *op1, znode *op2
 			case IS_STRING_OFFSET: {
 					temp_variable *T = &Ts[op1->u.var];
 
-					if (T->EA.str->type == IS_STRING
-						&& (T->EA.offset < T->EA.str->value.str.len)) {
+					if (T->EA.data.str_offset.str->type == IS_STRING
+						&& (T->EA.data.str_offset.offset < T->EA.data.str_offset.str->value.str.len)) {
 						zval tmp;
 						zval *final_value = value;
 
@@ -290,7 +277,7 @@ static inline void zend_assign_to_variable(znode *result, znode *op1, znode *op2
 							final_value = &tmp;
 						}
 
-						T->EA.str->value.str.val[T->EA.offset] = final_value->value.str.val[0];
+						T->EA.data.str_offset.str->value.str.val[T->EA.data.str_offset.offset] = final_value->value.str.val[0];
 						if (op2
 							&& op2->op_type == IS_VAR
 							&& value==&Ts[op2->u.var].tmp_var) {
@@ -301,10 +288,10 @@ static inline void zend_assign_to_variable(znode *result, znode *op1, znode *op2
 						}
 						/*
 						 * the value of an assignment to a string offset is undefined
-						Ts[result->u.var].var = &T->EA.str;
+						Ts[result->u.var].var = &T->EA.data.str_offset.str;
 						*/
 					}
-					/* zval_ptr_dtor(&T->EA.str); Nuke this line if it doesn't cause a leak */
+					/* zval_ptr_dtor(&T->EA.data.str_offset.str); Nuke this line if it doesn't cause a leak */
 					T->tmp_var.type = IS_STRING;
 				}
 				break;
@@ -353,16 +340,6 @@ static inline void zend_assign_to_variable(znode *result, znode *op1, znode *op2
 		if (variable_ptr->refcount==0) {
 			switch (type) {
 				case IS_VAR:
-					/*
-					if (PZVAL_IS_LOCKED(value)) {
-						zval *orig_value = value;
-
-						ALLOC_ZVAL(value);
-						*value = *orig_value;
-						value->refcount=0;
-						zval_copy_ctor(value);
-					}
-					*/
 					/* break missing intentionally */
 				case IS_CONST:
 					if (variable_ptr==value) {
@@ -392,16 +369,6 @@ static inline void zend_assign_to_variable(znode *result, znode *op1, znode *op2
 		} else { /* we need to split */
 			switch (type) {
 				case IS_VAR:
-					/*
-					if (PZVAL_IS_LOCKED(value)) {
-						zval *orig_value = value;
-
-						ALLOC_ZVAL(value);
-						*value = *orig_value;
-						value->refcount=0;
-						zval_copy_ctor(value);
-					}
-					*/
 					/* break missing intentionally */
 				case IS_CONST:
 					if (PZVAL_IS_REF(value) && value->refcount > 0) {
@@ -464,7 +431,7 @@ static void print_refcount(zval *p, char *str)
 }
 
 
-static inline void zend_fetch_var_address(znode *result, znode *op1, znode *op2, temp_variable *Ts, int type ELS_DC)
+static void zend_fetch_var_address(znode *result, znode *op1, znode *op2, temp_variable *Ts, int type ELS_DC)
 {
 	int free_op1;
 	zval *varname = get_zval_ptr(op1, Ts, &free_op1, BP_VAR_R);
@@ -513,7 +480,7 @@ static inline void zend_fetch_var_address(znode *result, znode *op1, znode *op2,
 					zval *new_zval = &EG(uninitialized_zval);
 
 					new_zval->refcount++;
-					zend_hash_update_ptr(target_symbol_table, varname->value.str.val, varname->value.str.len+1, new_zval, sizeof(zval *), (void **) &retval);
+					zend_hash_update(target_symbol_table, varname->value.str.val, varname->value.str.len+1, &new_zval, sizeof(zval *), (void **) &retval);
 				}
 				break;
 			EMPTY_SWITCH_DEFAULT_CASE()
@@ -522,14 +489,13 @@ static inline void zend_fetch_var_address(znode *result, znode *op1, znode *op2,
 	if (op2->u.fetch_type == ZEND_FETCH_LOCAL) {
 		FREE_OP(op1, free_op1);
 	} else if (op2->u.fetch_type == ZEND_FETCH_STATIC) {
-		zval_update_constant(retval);
+		zval_update_constant(retval, (void *) 1);
 	}
 
 	if (varname == &tmp_varname) {
 		zval_dtor(varname);
 	}
 	Ts[result->u.var].var.ptr_ptr = retval;
-	SEPARATE_ON_READ_OBJECT(retval, type);
 	SELECTIVE_PZVAL_LOCK(*retval, result);
 }
 
@@ -567,7 +533,7 @@ fetch_string_dim:
 							zval *new_zval = &EG(uninitialized_zval);
 
 							new_zval->refcount++;
-							zend_hash_update_ptr(ht, offset_key, offset_key_length+1, new_zval, sizeof(zval *), (void **) &retval);
+							zend_hash_update(ht, offset_key, offset_key_length+1, &new_zval, sizeof(zval *), (void **) &retval);
 						}
 						break;
 				}
@@ -620,7 +586,7 @@ fetch_string_dim:
 }
 
 
-static inline void zend_fetch_dimension_address(znode *result, znode *op1, znode *op2, temp_variable *Ts, int type ELS_DC)
+static void zend_fetch_dimension_address(znode *result, znode *op1, znode *op2, temp_variable *Ts, int type ELS_DC)
 {
 	int free_op2;
 	zval **container_ptr = get_zval_ptr_ptr(op1, Ts, type);
@@ -629,7 +595,6 @@ static inline void zend_fetch_dimension_address(znode *result, znode *op1, znode
 
 
 	if (container_ptr == NULL) {
-		zend_property_reference *property_reference;
 		zend_overloaded_element overloaded_element;
 
 		if (Ts[op1->u.var].EA.type == IS_STRING_OFFSET) {
@@ -655,9 +620,8 @@ static inline void zend_fetch_dimension_address(znode *result, znode *op1, znode
 			zval_copy_ctor(&overloaded_element.element);
 		}
 
-		zend_stack_top(&EG(overloaded_objects_stack), (void **) &property_reference);
-
-		zend_llist_add_element(&property_reference->elements_list, &overloaded_element);
+		Ts[result->u.var].EA = Ts[op1->u.var].EA;
+		zend_llist_add_element(Ts[result->u.var].EA.data.overloaded_element.elements_list, &overloaded_element);
 
 		Ts[result->u.var].EA.type = IS_OVERLOADED_OBJECT;
 		*retval = NULL;
@@ -672,18 +636,14 @@ static inline void zend_fetch_dimension_address(znode *result, znode *op1, znode
 	}
 
 	if (container->type==IS_NULL
+		|| (container->type==IS_BOOL && container->value.lval==0)
 		|| (container->type==IS_STRING && container->value.str.len==0)) {
 		switch (type) {
 			case BP_VAR_RW:
 			case BP_VAR_W:
 				if (!PZVAL_IS_REF(container)) {
-					container->refcount--;
-					if (container->refcount>0) {
-						ALLOC_ZVAL(container);
-						*container_ptr = container;
-						container->is_ref=0;
-					}
-					container->refcount=1;
+					SEPARATE_ZVAL(container_ptr);
+					container = *container_ptr;
 				}
 				array_init(container);
 				break;
@@ -693,22 +653,17 @@ static inline void zend_fetch_dimension_address(znode *result, znode *op1, znode
 	switch (container->type) {
 		case IS_ARRAY:
 			if ((type==BP_VAR_W || type==BP_VAR_RW) && container->refcount>1 && !PZVAL_IS_REF(container)) {
-				container->refcount--;
-				ALLOC_ZVAL(*container_ptr);
-				**container_ptr = *container;
+				SEPARATE_ZVAL(container_ptr);
 				container = *container_ptr;
-				INIT_PZVAL(container);
-				zendi_zval_copy_ctor(*container);
 			}
 			if (op2->op_type == IS_UNUSED) {
 				zval *new_zval = &EG(uninitialized_zval);
 
 				new_zval->refcount++;
-				zend_hash_next_index_insert_ptr(container->value.ht, new_zval, sizeof(zval *), (void **) retval);
+				zend_hash_next_index_insert(container->value.ht, &new_zval, sizeof(zval *), (void **) retval);
 			} else {
 				*retval = zend_fetch_dimension_address_inner(container->value.ht, op2, Ts, type ELS_CC);
 			}
-			SEPARATE_ON_READ_OBJECT(*retval, type);
 			SELECTIVE_PZVAL_LOCK(**retval, result);
 			break;
 		case IS_NULL:
@@ -717,6 +672,9 @@ static inline void zend_fetch_dimension_address(znode *result, znode *op1, znode
 			*retval = &EG(uninitialized_zval_ptr);
 			SELECTIVE_PZVAL_LOCK(**retval, result);
 			FREE_OP(op2, free_op2);
+			if (type==BP_VAR_W || type==BP_VAR_RW) {
+				zend_error(E_WARNING, "Cannot use a NULL value as an array");
+			}
 			break;
 		case IS_STRING: {
 				zval *offset;
@@ -738,9 +696,9 @@ static inline void zend_fetch_dimension_address(znode *result, znode *op1, znode
 					SEPARATE_ZVAL_IF_NOT_REF(container_ptr);
 				}
 				container = *container_ptr;
-				Ts[result->u.var].EA.str = container;
+				Ts[result->u.var].EA.data.str_offset.str = container;
 				PZVAL_LOCK(container);
-				Ts[result->u.var].EA.offset = offset->value.lval;
+				Ts[result->u.var].EA.data.str_offset.offset = offset->value.lval;
 				Ts[result->u.var].EA.type = IS_STRING_OFFSET;
 				FREE_OP(op2, free_op2);
 				*retval = NULL;
@@ -758,13 +716,16 @@ static inline void zend_fetch_dimension_address(znode *result, znode *op1, znode
 				}
 				FREE_OP(op2, free_op2);
 				SELECTIVE_PZVAL_LOCK(**retval, result);
+				if (type==BP_VAR_W || type==BP_VAR_RW) {
+					zend_error(E_WARNING, "Cannot use a scalar value as an array");
+				}
 			}
 			break;
 	}
 }
 
 
-static inline void zend_fetch_dimension_address_from_tmp_var(znode *result, znode *op1, znode *op2, temp_variable *Ts ELS_DC)
+static void zend_fetch_dimension_address_from_tmp_var(znode *result, znode *op1, znode *op2, temp_variable *Ts ELS_DC)
 {
 	int free_op1;
 	zval *container = get_zval_ptr(op1, Ts, &free_op1, BP_VAR_R);
@@ -780,7 +741,7 @@ static inline void zend_fetch_dimension_address_from_tmp_var(znode *result, znod
 }
 
 
-static inline void zend_fetch_property_address(znode *result, znode *op1, znode *op2, temp_variable *Ts, int type ELS_DC)
+static void zend_fetch_property_address(znode *result, znode *op1, znode *op2, temp_variable *Ts, int type ELS_DC)
 {
 	int free_op2;
 	zval **container_ptr = get_zval_ptr_ptr(op1, Ts, type);
@@ -789,11 +750,10 @@ static inline void zend_fetch_property_address(znode *result, znode *op1, znode
 
 
 	if (container_ptr == NULL) {
-		zend_property_reference *property_reference;
 		zend_overloaded_element overloaded_element;
 
 		if (Ts[op1->u.var].EA.type == IS_STRING_OFFSET) {
-			zval_ptr_dtor(&Ts[op1->u.var].EA.str);
+			zval_ptr_dtor(&Ts[op1->u.var].EA.data.str_offset.str);
 			switch (type) {
 				case BP_VAR_R:
 				case BP_VAR_IS:
@@ -815,9 +775,8 @@ static inline void zend_fetch_property_address(znode *result, znode *op1, znode
 			zval_copy_ctor(&overloaded_element.element);
 		}
 
-		zend_stack_top(&EG(overloaded_objects_stack), (void **) &property_reference);
-
-		zend_llist_add_element(&property_reference->elements_list, &overloaded_element);
+		Ts[result->u.var].EA = Ts[op1->u.var].EA;
+		zend_llist_add_element(Ts[result->u.var].EA.data.overloaded_element.elements_list, &overloaded_element);
 
 		Ts[result->u.var].EA.type = IS_OVERLOADED_OBJECT;
 		*retval = NULL;
@@ -833,38 +792,33 @@ static inline void zend_fetch_property_address(znode *result, znode *op1, znode
 
 	if (container->type == IS_OBJECT
 		&& container->value.obj.ce->handle_property_get) {
-		zend_property_reference property_reference;
 		zend_overloaded_element overloaded_element;
 
-		property_reference.object = container;
-		property_reference.type = type;
-		zend_llist_init(&property_reference.elements_list, sizeof(zend_overloaded_element), NULL, 0);
+		Ts[result->u.var].EA.data.overloaded_element.object = container;
+		Ts[result->u.var].EA.data.overloaded_element.type = type;
+		Ts[result->u.var].EA.data.overloaded_element.elements_list = (zend_llist *) emalloc(sizeof(zend_llist));
+		zend_llist_init(Ts[result->u.var].EA.data.overloaded_element.elements_list, sizeof(zend_overloaded_element), NULL, 0);
 		overloaded_element.element = *get_zval_ptr(op2, Ts, &free_op2, type);
 		overloaded_element.type = OE_IS_OBJECT;
 		if (!free_op2) {
 			zval_copy_ctor(&overloaded_element.element);
 		}
-		zend_llist_add_element(&property_reference.elements_list, &overloaded_element);
-		zend_stack_push(&EG(overloaded_objects_stack), &property_reference, sizeof(zend_property_reference));
+		zend_llist_add_element(Ts[result->u.var].EA.data.overloaded_element.elements_list, &overloaded_element);
 		Ts[result->u.var].EA.type = IS_OVERLOADED_OBJECT;
 		*retval = NULL;
 		return;
 	}
 
 
-
-	if (container->type == IS_STRING && container->value.str.len==0) {
+	if (container->type==IS_NULL
+		|| (container->type==IS_BOOL && container->value.lval==0)
+		|| (container->type==IS_STRING && container->value.str.len==0)) {
 		switch (type) {
 			case BP_VAR_RW:
 			case BP_VAR_W:
 				if (!PZVAL_IS_REF(container)) {
-					container->refcount--;
-					if (container->refcount>0) {
-						ALLOC_ZVAL(container);
-						*container_ptr = container;
-						container->is_ref=0;
-					}
-					container->refcount=1;
+					SEPARATE_ZVAL(container_ptr);
+					container = *container_ptr;
 				}
 				object_init(container);
 				break;
@@ -887,56 +841,39 @@ static inline void zend_fetch_property_address(znode *result, znode *op1, znode
 
 
 	if ((type==BP_VAR_W || type==BP_VAR_RW) && container->refcount>1 && !PZVAL_IS_REF(container)) {
-		container->refcount--;
-		ALLOC_ZVAL(*container_ptr);
-		**container_ptr = *container;
+		SEPARATE_ZVAL(container_ptr);
 		container = *container_ptr;
-		INIT_PZVAL(container);
-		zendi_zval_copy_ctor(*container);
 	}
 	*retval = zend_fetch_property_address_inner(container->value.obj.properties, op2, Ts, type ELS_CC);
-	SEPARATE_ON_READ_OBJECT(*retval, type);
 	SELECTIVE_PZVAL_LOCK(**retval, result);
 }
 
 
-static zval get_overloaded_property(ELS_D)
+static zval get_overloaded_property(temp_variable *T ELS_DC)
 {
-	zend_property_reference *property_reference;
 	zval result;
 
-	zend_stack_top(&EG(overloaded_objects_stack), (void **) &property_reference);
-	result = (property_reference->object)->value.obj.ce->handle_property_get(property_reference);
+	result = (T->EA.data.overloaded_element.object)->value.obj.ce->handle_property_get(&T->EA.data.overloaded_element);
 
-	zend_llist_destroy(&property_reference->elements_list);
-
-	zend_stack_del_top(&EG(overloaded_objects_stack));
+	zend_llist_destroy(T->EA.data.overloaded_element.elements_list);
+	efree(T->EA.data.overloaded_element.elements_list);
 	return result;
 }
 
 
-static void set_overloaded_property(zval *value ELS_DC)
+static void set_overloaded_property(temp_variable *T, zval *value ELS_DC)
 {
-	zend_property_reference *property_reference;
-
-	zend_stack_top(&EG(overloaded_objects_stack), (void **) &property_reference);
-	(property_reference->object)->value.obj.ce->handle_property_set(property_reference, value);
-
-	zend_llist_destroy(&property_reference->elements_list);
-
-	zend_stack_del_top(&EG(overloaded_objects_stack));
+	(T->EA.data.overloaded_element.object)->value.obj.ce->handle_property_set(&T->EA.data.overloaded_element, value);
+	zend_llist_destroy(T->EA.data.overloaded_element.elements_list);
+	efree(T->EA.data.overloaded_element.elements_list);
 }
 
 
-static void call_overloaded_function(int arg_count, zval *return_value ELS_DC)
+static void call_overloaded_function(temp_variable *T, int arg_count, zval *return_value ELS_DC)
 {
-	zend_property_reference *property_reference;
-
-	zend_stack_top(&EG(overloaded_objects_stack), (void **) &property_reference);
-	(property_reference->object)->value.obj.ce->handle_function_call(arg_count, return_value, property_reference->object, 1 ELS_CC, property_reference);
-	zend_llist_destroy(&property_reference->elements_list);
-
-	zend_stack_del_top(&EG(overloaded_objects_stack));
+	(T->EA.data.overloaded_element.object)->value.obj.ce->handle_function_call(arg_count, return_value, T->EA.data.overloaded_element.object, 1 ELS_CC, &T->EA.data.overloaded_element);
+	zend_llist_destroy(T->EA.data.overloaded_element.elements_list);
+	efree(T->EA.data.overloaded_element.elements_list);
 }
 
 
@@ -966,15 +903,6 @@ static int zend_check_symbol(zval **pz)
 #define CHECK_SYMBOL_TABLES()
 #endif
 
-
-#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32))
-#	define do_alloca(p) alloca(p)
-#	define free_alloca(p)
-#else
-#	define do_alloca(p)		emalloc(p)
-#	define free_alloca(p)	efree(p)
-#endif
-
 #define NEXT_OPCODE()		\
 	CHECK_SYMBOL_TABLES()	\
 	opline++;				\
@@ -1036,6 +964,11 @@ void execute(zend_op_array *op_array ELS_DC)
 	while (opline<end) {
 #else
 	while (1) {
+#endif
+#ifdef ZEND_WIN32
+		if (EG(timed_out)) {
+			zend_timeout(0);
+		}
 #endif
 		switch(opline->opcode) {
 			case ZEND_ADD:
@@ -1065,6 +998,9 @@ void execute(zend_op_array *op_array ELS_DC)
 			case ZEND_IS_IDENTICAL:
 				EG(binary_op) = is_identical_function;
 				goto binary_op_addr;
+			case ZEND_IS_NOT_IDENTICAL:
+				EG(binary_op) = is_not_identical_function;
+				goto binary_op_addr;
 			case ZEND_IS_EQUAL:
 				EG(binary_op) = is_equal_function;
 				goto binary_op_addr;
@@ -1149,17 +1085,9 @@ binary_assign_op_addr: {
 						opline++;
 						continue;
 					}
-					if (!PZVAL_IS_REF(*var_ptr)) {
-						if ((*var_ptr)->refcount>1) {
-							zval *orig_var=*var_ptr;
-							
-							(*var_ptr)->refcount--;
-							ALLOC_ZVAL(*var_ptr);
-							**var_ptr = *orig_var;
-							zendi_zval_copy_ctor(**var_ptr);
-							(*var_ptr)->refcount=1;
-						}
-					}
+					
+					SEPARATE_ZVAL_IF_NOT_REF(var_ptr);
+
 					EG(binary_op)(*var_ptr, *var_ptr, get_zval_ptr(&opline->op2, Ts, &EG(free_op2), BP_VAR_R));
 					Ts[opline->result.u.var].var.ptr_ptr = var_ptr;
 					SELECTIVE_PZVAL_LOCK(*var_ptr, &opline->result);
@@ -1194,17 +1122,9 @@ binary_assign_op_addr: {
 							zendi_zval_copy_ctor(Ts[opline->result.u.var].tmp_var);
 							break;
 					}
-					if (!PZVAL_IS_REF(*var_ptr)) {
-						if ((*var_ptr)->refcount>1) {
-							zval *orig_var = *var_ptr;
-							
-							(*var_ptr)->refcount--;
-							ALLOC_ZVAL(*var_ptr);
-							**var_ptr = *orig_var;
-							zendi_zval_copy_ctor(**var_ptr);
-							(*var_ptr)->refcount=1;
-						}
-					}
+					
+					SEPARATE_ZVAL_IF_NOT_REF(var_ptr);
+
 					incdec_op(*var_ptr);
 					switch (opline->opcode) {
 						case ZEND_PRE_INC:
@@ -1338,7 +1258,7 @@ binary_assign_op_addr: {
 					zval *value;
 					value = get_zval_ptr(&opline->op2, Ts, &EG(free_op2), BP_VAR_R);
 
-					zend_assign_to_variable(&opline->result, &opline->op1, &opline->op2, value, (EG(free_op2)?IS_TMP_VAR:opline->op2.op_type), Ts ELS_CC);
+ 					zend_assign_to_variable(&opline->result, &opline->op1, &opline->op2, value, (EG(free_op2)?IS_TMP_VAR:opline->op2.op_type), Ts ELS_CC);
 					/* zend_assign_to_variable() always takes care of op2, never free it! */
 				}
 				NEXT_OPCODE();
@@ -1381,18 +1301,18 @@ binary_assign_op_addr: {
 				}
 				NEXT_OPCODE();
 			case ZEND_JMPZNZ: {
-					znode *res = &opline->result;
+					znode *res = &opline->op1;
 					
-					if (!zend_is_true(get_zval_ptr(res, Ts, &EG(free_op1), BP_VAR_R))) {
+					if (zend_is_true(get_zval_ptr(res, Ts, &EG(free_op1), BP_VAR_R))) {
+#if DEBUG_ZEND>=2
+						printf("Conditional jmp on true to %d\n", opline->extended_value);
+#endif
+						opline = &op_array->opcodes[opline->extended_value];
+					} else {
 #if DEBUG_ZEND>=2
 						printf("Conditional jmp on false to %d\n", opline->op2.u.opline_num);
 #endif
 						opline = &op_array->opcodes[opline->op2.u.opline_num];
-					} else {
-#if DEBUG_ZEND>=2
-						printf("Conditional jmp on true to %d\n", opline->op1.u.opline_num);
-#endif
-						opline = &op_array->opcodes[opline->op1.u.opline_num];
 					}
 					FREE_OP(res, EG(free_op1));
 				}
@@ -1529,31 +1449,32 @@ binary_assign_op_addr: {
 							if ((!object.ptr && Ts[opline->op1.u.var].EA.type==IS_OVERLOADED_OBJECT)								
 								|| ((object.ptr && object.ptr->type==IS_OBJECT) && (object.ptr->value.obj.ce->handle_function_call))) { /* overloaded function call */
 								zend_overloaded_element overloaded_element;
-								zend_property_reference *property_reference;
 
 								overloaded_element.element = *function_name;
 								overloaded_element.type = OE_IS_METHOD;
 
 								if (object.ptr) {
-									zend_property_reference property_reference;
-
-									property_reference.object = object.ptr;
-									property_reference.type = BP_VAR_NA;
-									zend_llist_init(&property_reference.elements_list, sizeof(zend_overloaded_element), NULL, 0);
-									zend_stack_push(&EG(overloaded_objects_stack), &property_reference, sizeof(zend_property_reference));
+									Ts[opline->op1.u.var].EA.data.overloaded_element.object = object.ptr;
+									Ts[opline->op1.u.var].EA.data.overloaded_element.type = BP_VAR_NA;
+									Ts[opline->op1.u.var].EA.data.overloaded_element.elements_list = (zend_llist *) emalloc(sizeof(zend_llist));
+									zend_llist_init(Ts[opline->op1.u.var].EA.data.overloaded_element.elements_list, sizeof(zend_overloaded_element), NULL, 0);
 								}
-								zend_stack_top(&EG(overloaded_objects_stack), (void **) &property_reference);
-								zend_llist_add_element(&property_reference->elements_list, &overloaded_element);
+								zend_llist_add_element(Ts[opline->op1.u.var].EA.data.overloaded_element.elements_list, &overloaded_element);
 								fbc = (zend_function *) emalloc(sizeof(zend_function));
 								fbc->type = ZEND_OVERLOADED_FUNCTION;
 								fbc->common.arg_types = NULL;
+								fbc->overloaded_function.var = opline->op1.u.var;
 								goto overloaded_function_call_cont;
 							}
 
 							if (!object.ptr || object.ptr->type != IS_OBJECT) {
 								zend_error(E_ERROR, "Call to a member function on a non-object");
 							}
-							object.ptr->refcount++; /* For this pointer */
+							if (!object.ptr->is_ref && object.ptr->refcount > 1) {
+								zend_error(E_ERROR, "Bug: Problem in method call\n");
+							}
+							object.ptr->is_ref=1;
+							object.ptr->refcount++; /* For $this pointer */
 							active_function_table = &(object.ptr->value.obj.ce->function_table);
 						}
 					} else { /* function pointer */
@@ -1588,7 +1509,7 @@ do_fcall_common:
 					zval **original_return_value;
 					int return_value_used = RETURN_VALUE_USED(opline);
 
-					zend_ptr_stack_push(&EG(argument_stack), (void *) opline->extended_value);
+					zend_ptr_stack_n_push(&EG(argument_stack), 2, (void *) opline->extended_value, NULL);
 
 					Ts[opline->result.u.var].var.ptr_ptr = &Ts[opline->result.u.var].var.ptr;
 
@@ -1622,8 +1543,9 @@ do_fcall_common:
 							&& object.ptr
 							&& fbc->type!=ZEND_OVERLOADED_FUNCTION) {
 							zval **this_ptr;
+							zval *null_ptr = NULL;
 
-							zend_hash_update_ptr(function_state.function_symbol_table, "this", sizeof("this"), NULL, sizeof(zval *), (void **) &this_ptr);
+							zend_hash_update(function_state.function_symbol_table, "this", sizeof("this"), &null_ptr, sizeof(zval *), (void **) &this_ptr);
 							if (!PZVAL_IS_REF(object.ptr)) {
 								zend_error(E_WARNING,"Problem with method call. Report this bug\n");
                 			}
@@ -1656,7 +1578,7 @@ do_fcall_common:
 					} else { /* ZEND_OVERLOADED_FUNCTION */
 						ALLOC_ZVAL(Ts[opline->result.u.var].var.ptr);
 						INIT_ZVAL(*(Ts[opline->result.u.var].var.ptr));
-						call_overloaded_function(opline->extended_value, Ts[opline->result.u.var].var.ptr ELS_CC);
+						call_overloaded_function(&Ts[fbc->overloaded_function.var], opline->extended_value, Ts[opline->result.u.var].var.ptr ELS_CC);
 						efree(fbc);
 						if (!return_value_used) {
 							zval_ptr_dtor(&Ts[opline->result.u.var].var.ptr);
@@ -1681,10 +1603,8 @@ do_fcall_common:
 						
 						retval_ptr_ptr = get_zval_ptr_ptr(&opline->op1, Ts, BP_VAR_W);
 
-						if (!PZVAL_IS_REF(*retval_ptr_ptr)) {
-							SEPARATE_ZVAL(retval_ptr_ptr);
-							(*retval_ptr_ptr)->is_ref = 1;
-						}
+						SEPARATE_ZVAL_TO_MAKE_IS_REF(retval_ptr_ptr);
+						
 						(*retval_ptr_ptr)->refcount++;
 						(*EG(return_value_ptr_ptr)) = (*retval_ptr_ptr);
 					} else {
@@ -1763,21 +1683,12 @@ send_by_ref:
 					zval *varptr;
 					varptr_ptr = get_zval_ptr_ptr(&opline->op1, Ts, BP_VAR_W);
 
-					varptr = *varptr_ptr;
-
-					if (!PZVAL_IS_REF(varptr)) {
-						/* code to break away this variable */
-						if (varptr->refcount>1) {
-							varptr->refcount--;
-							ALLOC_ZVAL(*varptr_ptr);
-							**varptr_ptr = *varptr;
-							varptr = *varptr_ptr;
-							varptr->refcount = 1;
-							zval_copy_ctor(varptr);
-						}
-						varptr->is_ref = 1;
-						/* at the end of this code refcount is always 1 */
+					if (!varptr_ptr) {
+						zend_error(E_ERROR, "Only variables can be passed by reference");
 					}
+
+					SEPARATE_ZVAL_TO_MAKE_IS_REF(varptr_ptr);
+					varptr = *varptr_ptr;
 					varptr->refcount++;
 					zend_ptr_stack_push(&EG(argument_stack), varptr);
 				}
@@ -1786,7 +1697,7 @@ send_by_ref:
 					zval **param;
 
 					if (zend_ptr_stack_get_arg(opline->op1.u.constant.value.lval, (void **) &param ELS_CC)==FAILURE) {
-						zend_error(E_NOTICE, "Missing argument %d for %s()\n", opline->op1.u.constant.value.lval, get_active_function_name());
+						zend_error(E_WARNING, "Missing argument %d for %s()\n", opline->op1.u.constant.value.lval, get_active_function_name());
 						if (opline->result.op_type == IS_VAR) {
 							PZVAL_UNLOCK(*Ts[opline->result.u.var].var.ptr_ptr);
 						}
@@ -1801,18 +1712,15 @@ send_by_ref:
 					zval **param, *assignment_value;
 
 					if (zend_ptr_stack_get_arg(opline->op1.u.constant.value.lval, (void **) &param ELS_CC)==FAILURE) {
-						if (opline->op2.u.constant.type == IS_CONSTANT) {
+						if (opline->op2.u.constant.type == IS_CONSTANT || opline->op2.u.constant.type==IS_CONSTANT_ARRAY) {
 							zval *default_value;
-							zval tmp;
 
 							ALLOC_ZVAL(default_value);
 							*default_value = opline->op2.u.constant;
-							if (!zend_get_constant(default_value->value.str.val, default_value->value.str.len, &tmp)) {
-								default_value->type = IS_STRING;
+							if (opline->op2.u.constant.type==IS_CONSTANT_ARRAY) {
 								zval_copy_ctor(default_value);
-							} else {
-								*default_value = tmp;
 							}
+							zval_update_constant(&default_value, 0);
 							default_value->refcount=0;
 							default_value->is_ref=0;
 							param = &default_value;
@@ -1825,7 +1733,7 @@ send_by_ref:
 						assignment_value = *param;
 					}
 
-					if (PZVAL_IS_REF(assignment_value)) {
+					if (PZVAL_IS_REF(assignment_value) && param) {
 						zend_assign_to_variable_reference(NULL, get_zval_ptr_ptr(&opline->result, Ts, BP_VAR_W), param, NULL ELS_CC);
 					} else {
 						zend_assign_to_variable(NULL, &opline->result, NULL, assignment_value, IS_VAR, Ts ELS_CC);
@@ -1893,7 +1801,7 @@ send_by_ref:
 						} else {
 							switch_expr_is_overloaded = 1;
 							if (Ts[opline->op1.u.var].EA.type==IS_STRING_OFFSET) {
-								Ts[opline->op1.u.var].EA.str->refcount++;
+								Ts[opline->op1.u.var].EA.data.str_offset.str->refcount++;
 							}
 						}
 					}
@@ -1928,7 +1836,7 @@ send_by_ref:
 					zend_str_tolower(class_name.value.str.val, class_name.value.str.len);
 
 					if (zend_hash_find(EG(class_table), class_name.value.str.val, class_name.value.str.len+1, (void **) &ce)==FAILURE) {
-						zend_error(E_ERROR, "Cannot instanciate non-existant class:  %s", class_name.value.str.val);
+						zend_error(E_ERROR, "Cannot instantiate non-existent class:  %s", class_name.value.str.val);
 					}
 					object_init_ex(&Ts[opline->result.u.var].tmp_var, ce);
 					Ts[opline->result.u.var].tmp_var.refcount=1;
@@ -1965,7 +1873,7 @@ send_by_ref:
 							NEXT_OPCODE();
 						}
 					}
-					if (opline->op1.op_type == IS_TMP_VAR) { /* temporary variable */
+					if (!opline->extended_value && EG(free_op1)) { /* temporary variable */
 						zval *new_expr;
 
 						ALLOC_ZVAL(new_expr);
@@ -1974,11 +1882,8 @@ send_by_ref:
 						INIT_PZVAL(expr_ptr);
 					} else {
 						if (opline->extended_value) {
-							if (!PZVAL_IS_REF(expr_ptr)) {
-								SEPARATE_ZVAL(expr_ptr_ptr);
-								expr_ptr = *expr_ptr_ptr;
-								expr_ptr->is_ref = 1;
-							}
+							SEPARATE_ZVAL_TO_MAKE_IS_REF(expr_ptr_ptr);
+							expr_ptr = *expr_ptr_ptr;
 							expr_ptr->refcount++;
 						} else if (PZVAL_IS_REF(expr_ptr)) {
 							zval *new_expr;
@@ -2021,7 +1926,7 @@ send_by_ref:
 					if (!EG(free_op1)) {
 						zendi_zval_copy_ctor(*result);
 					}					
-					switch (opline->op2.u.constant.type) {
+					switch (opline->extended_value) {
 						case IS_NULL:
 							convert_to_null(result);
 							break;
@@ -2050,21 +1955,72 @@ send_by_ref:
 					zend_op_array *new_op_array=NULL;
 					zval **original_return_value = EG(return_value_ptr_ptr);
 					int return_value_used;
+					zval *inc_filename = get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_R);
+					zval tmp_inc_filename;
 					CLS_FETCH();
+
+					if (inc_filename->type!=IS_STRING) {
+						tmp_inc_filename = *inc_filename;
+						zval_copy_ctor(&tmp_inc_filename);
+						convert_to_string(&tmp_inc_filename);
+						inc_filename = &tmp_inc_filename;
+					}
 					
 					return_value_used = RETURN_VALUE_USED(opline);
 
 					switch (opline->op2.u.constant.value.lval) {
-						case ZEND_INCLUDE:
-						case ZEND_IMPORT:
-						case ZEND_REQUIRE:
-							new_op_array = compile_filename(opline->op2.u.constant.value.lval, get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_R) CLS_CC ELS_CC);
+						case ZEND_INCLUDE_ONCE: {
+								char *opened_path;
+								int dummy = 1;
+								zend_file_handle file_handle;
+
+								file_handle.handle.fp = zend_fopen(inc_filename->value.str.val, &opened_path);
+								file_handle.type = ZEND_HANDLE_FP;
+								if (opened_path) {
+									file_handle.filename = opened_path;
+									file_handle.free_filename = 0;
+								} else {
+									file_handle.filename = inc_filename->value.str.val;
+									file_handle.free_filename = 0;
+								}
+								
+								if (file_handle.handle.fp) {
+									if (!opened_path || zend_hash_add(&EG(included_files), opened_path, strlen(opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) {
+										new_op_array = zend_compile_files(ZEND_INCLUDE CLS_CC, 1, &file_handle);
+										if (new_op_array) {
+											pass_include_eval(new_op_array);
+										} else {
+											fclose(file_handle.handle.fp);
+										}
+									} else {
+										fclose(file_handle.handle.fp);
+									}
+								} else {
+									zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle.filename);
+								}
+								if (opened_path) {
+									free (opened_path);
+								}
+								break;
+							}
 							break;
+						case ZEND_INCLUDE:
+						case ZEND_REQUIRE:
+						{
+							new_op_array = compile_filename(opline->op2.u.constant.value.lval, inc_filename CLS_CC ELS_CC);
+							if (new_op_array) {
+								pass_include_eval(new_op_array);
+							}
+							break;
+						}
 						case ZEND_EVAL:
-							new_op_array = compile_string(get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_R) CLS_CC);
+							new_op_array = compile_string(inc_filename CLS_CC);
 							break;
 						EMPTY_SWITCH_DEFAULT_CASE()
 					}
+					if (inc_filename==&tmp_inc_filename) {
+						zval_dtor(&tmp_inc_filename);
+					}
 					FREE_OP(&opline->op1, EG(free_op1));
 					Ts[opline->result.u.var].var.ptr = NULL;
 					Ts[opline->result.u.var].var.ptr_ptr = &Ts[opline->result.u.var].var.ptr;
@@ -2126,6 +2082,8 @@ send_by_ref:
 					if (container) {
 						HashTable *ht;
 
+						SEPARATE_ZVAL_IF_NOT_REF(container);
+
 						switch ((*container)->type) {
 							case IS_ARRAY:
 								ht = (*container)->value.ht;
@@ -2137,14 +2095,32 @@ send_by_ref:
 								ht = NULL;
 								break;
 						}
-						if (ht) {
+						if (ht)	{
 							switch (offset->type) {
+								case IS_DOUBLE:
+								case IS_RESOURCE:
+								case IS_BOOL: 
 								case IS_LONG:
-									zend_hash_index_del(ht, offset->value.lval);
-									break;
+									{
+										long index;
+
+										if (offset->type == IS_DOUBLE) {
+											index = (long) offset->value.lval;
+										} else {
+											index = offset->value.lval;
+										}
+										zend_hash_index_del(ht, index);
+										break;
+									}
 								case IS_STRING:
 									zend_hash_del(ht, offset->value.str.val, offset->value.str.len+1);
 									break;
+								case IS_NULL:
+									zend_hash_del(ht, "", sizeof(""));
+									break;
+								default: 
+									zend_error(E_WARNING, "Illegal offset type in unset");
+									break;
 							}
 						}
 					} else {
@@ -2247,8 +2223,8 @@ send_by_ref:
 
 					if (!var) {
 						if (Ts[opline->op1.u.var].EA.type==IS_STRING_OFFSET) {
-							if (Ts[opline->op1.u.var].EA.offset>=0
-								&& Ts[opline->op1.u.var].EA.offset<Ts[opline->op1.u.var].EA.str->value.str.len) {
+							if (Ts[opline->op1.u.var].EA.data.str_offset.offset>=0
+								&& Ts[opline->op1.u.var].EA.data.str_offset.offset<Ts[opline->op1.u.var].EA.data.str_offset.str->value.str.len) {
 								isset = 1;
 							} else {
 								isset = 0;
@@ -2270,7 +2246,7 @@ send_by_ref:
 						case ZEND_ISEMPTY:
 							if (!var) {
 								if (!isset
-									|| Ts[opline->op1.u.var].EA.str->value.str.val[Ts[opline->op1.u.var].EA.offset]=='0') {
+									|| Ts[opline->op1.u.var].EA.data.str_offset.str->value.str.val[Ts[opline->op1.u.var].EA.data.str_offset.offset]=='0') {
 									Ts[opline->result.u.var].tmp_var.value.lval = 1;
 								} else {
 									Ts[opline->result.u.var].tmp_var.value.lval = 0;
@@ -2339,6 +2315,7 @@ send_by_ref:
 			case ZEND_NOP:
 				NEXT_OPCODE();
 			EMPTY_SWITCH_DEFAULT_CASE()
+
 		}
 	}
 #if SUPPORT_INTERACTIVE

Zend/zend_execute.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,11 +18,13 @@
 */
 
 
-#ifndef _EXECUTE_H
-#define _EXECUTE_H
+#ifndef ZEND_EXECUTE_H
+#define ZEND_EXECUTE_H
 
 #include "zend_compile.h"
 #include "zend_hash.h"
+#include "zend_variables.h"
+#include "zend_execute_locks.h"
 
 typedef union _temp_variable {
 	zval tmp_var;
@@ -33,8 +35,14 @@ typedef union _temp_variable {
 	struct {
 		zval tmp_var; /* a dummy */
 
-		zval *str;
-		int offset;
+		union {
+			struct {
+				zval *str;
+				int offset;
+			} str_offset;
+			zend_property_reference overloaded_element;
+		} data;
+			
 		unsigned char type;
 	} EA;
 } temp_variable;
@@ -46,15 +54,95 @@ void init_executor(CLS_D ELS_DC);
 void shutdown_executor(ELS_D);
 void execute(zend_op_array *op_array ELS_DC);
 ZEND_API int zend_is_true(zval *op);
-ZEND_API inline void safe_free_zval_ptr(zval *p);
-ZEND_API void zend_eval_string(char *str, zval *retval_ptr CLS_DC ELS_DC);
-ZEND_API inline int i_zend_is_true(zval *op);
-ZEND_API int zval_update_constant(zval **pp);
-ZEND_API inline void zend_assign_to_variable_reference(znode *result, zval **variable_ptr_ptr, zval **value_ptr_ptr, temp_variable *Ts ELS_DC);
+ZEND_API inline void safe_free_zval_ptr(zval *p)
+#if defined(C9X_INLINE_SEMANTICS)
+{
+	ELS_FETCH();
+
+	if (p!=EG(uninitialized_zval_ptr)) {
+		FREE_ZVAL(p);
+	}
+}
+#else
+;
+#endif
+
+ZEND_API int zend_eval_string(char *str, zval *retval_ptr CLS_DC ELS_DC);
+ZEND_API inline int i_zend_is_true(zval *op)
+#if defined(C9X_INLINE_SEMANTICS)
+{
+	int result;
+
+	switch (op->type) {
+		case IS_NULL:
+			result = 0;
+			break;
+		case IS_LONG:
+		case IS_BOOL:
+		case IS_RESOURCE:
+			result = (op->value.lval?1:0);
+			break;
+		case IS_DOUBLE:
+			result = (op->value.dval ? 1 : 0);
+			break;
+		case IS_STRING:
+			if (op->value.str.len == 0
+				|| (op->value.str.len==1 && op->value.str.val[0]=='0')) {
+				result = 0;
+			} else {
+				result = 1;
+			}
+			break;
+		case IS_ARRAY:
+			result = (zend_hash_num_elements(op->value.ht)?1:0);
+			break;
+		case IS_OBJECT:
+			result = (zend_hash_num_elements(op->value.obj.properties)?1:0);
+			break;
+		default:
+			result = 0;
+			break;
+	}
+	return result;
+}
+#else
+;
+#endif
+
+ZEND_API int zval_update_constant(zval **pp, void *arg);
 
 /* dedicated Zend executor functions - do not use! */
-ZEND_API inline void zend_ptr_stack_clear_multiple(ELS_D);
-ZEND_API inline int zend_ptr_stack_get_arg(int requested_arg, void **data ELS_DC);
+ZEND_API inline void zend_ptr_stack_clear_multiple(ELS_D)
+#if defined(C9X_INLINE_SEMANTICS)
+{
+	void **p = EG(argument_stack).top_element-2;
+	int delete_count = (ulong) *p;
+
+	EG(argument_stack).top -= (delete_count+2);
+	while (--delete_count>=0) {
+		zval_ptr_dtor((zval **) --p);
+	}
+	EG(argument_stack).top_element = p;
+}
+#else
+;
+#endif
+
+ZEND_API inline int zend_ptr_stack_get_arg(int requested_arg, void **data ELS_DC)
+#if defined(C9X_INLINE_SEMANTICS)
+{
+	void **p = EG(argument_stack).top_element-2;
+	int arg_count = (ulong) *p;
+
+	if (requested_arg>arg_count) {
+		return FAILURE;
+	}
+	*data = (p-arg_count+requested_arg-1);
+	return SUCCESS;
+}
+#else
+;
+#endif
 
 #if SUPPORT_INTERACTIVE
 void execute_new_code(CLS_D);
@@ -67,13 +155,78 @@ ZEND_API char *zend_get_executed_filename(ELS_D);
 ZEND_API uint zend_get_executed_lineno(ELS_D);
 ZEND_API zend_bool zend_is_executing(void);
 
+void zend_set_timeout(long seconds);
+void zend_unset_timeout(void);
+ZEND_API void zend_timeout(int dummy);
+
+#ifdef ZEND_WIN32
+void zend_init_timeout_thread();
+void zend_shutdown_timeout_thread();
+#define WM_REGISTER_ZEND_TIMEOUT		(WM_USER+1)
+#define WM_UNREGISTER_ZEND_TIMEOUT		(WM_USER+2)
+#endif
+
 #define zendi_zval_copy_ctor(p) zval_copy_ctor(&(p))
 #define zendi_zval_dtor(p) zval_dtor(&(p))
 
 #define active_opline (*EG(opline_ptr))
 
+ZEND_API inline void zend_assign_to_variable_reference(znode *result, zval **variable_ptr_ptr, zval **value_ptr_ptr, temp_variable *Ts ELS_DC)
+#if defined(C9X_INLINE_SEMANTICS)
+{
+	zval *variable_ptr = *variable_ptr_ptr;
+	zval *value_ptr;
+	
+
+	if (!value_ptr_ptr) {
+		zend_error(E_ERROR, "Cannot create references to string offsets nor overloaded objects");
+		return;
+	}
+
+	value_ptr = *value_ptr_ptr;
+	if (variable_ptr == EG(error_zval_ptr) || value_ptr==EG(error_zval_ptr)) {
+		variable_ptr_ptr = &EG(uninitialized_zval_ptr);
+/*	} else if (variable_ptr==&EG(uninitialized_zval) || variable_ptr!=value_ptr) { */
+	} else if (variable_ptr_ptr != value_ptr_ptr) {
+		variable_ptr->refcount--;
+		if (variable_ptr->refcount==0) {
+			zendi_zval_dtor(*variable_ptr);
+			FREE_ZVAL(variable_ptr);
+		}
+
+		if (!PZVAL_IS_REF(value_ptr)) {
+			/* break it away */
+			value_ptr->refcount--;
+			if (value_ptr->refcount>0) {
+				ALLOC_ZVAL(*value_ptr_ptr);
+				**value_ptr_ptr = *value_ptr;
+				value_ptr = *value_ptr_ptr;
+				zendi_zval_copy_ctor(*value_ptr);
+			}
+			value_ptr->refcount = 1;
+			value_ptr->is_ref = 1;
+		}
+
+		*variable_ptr_ptr = value_ptr;
+		value_ptr->refcount++;
+	} else {
+		if (variable_ptr->refcount>1) { /* we need to break away */
+			SEPARATE_ZVAL(variable_ptr_ptr);
+		}
+		(*variable_ptr_ptr)->is_ref = 1;
+	}
+
+	if (result && (result->op_type != IS_UNUSED)) {
+		Ts[result->u.var].var.ptr_ptr = variable_ptr_ptr;
+		SELECTIVE_PZVAL_LOCK(*variable_ptr_ptr, result);
+		AI_USE_PTR(Ts[result->u.var].var);
+	}
+}
+#else
+;
+#endif
 
 #define IS_OVERLOADED_OBJECT 1
 #define IS_STRING_OFFSET 2
 
-#endif /* _EXECUTE_H */
+#endif /* ZEND_EXECUTE_H */

Zend/zend_execute_API.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -26,15 +26,26 @@
 #include "zend_execute.h"
 #include "zend_API.h"
 #include "zend_ptr_stack.h"
-#include "zend_variables.h"
-#include "zend_operators.h"
 #include "zend_constants.h"
 #include "zend_extensions.h"
 #include "zend_execute_locks.h"
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 
 
 ZEND_API void (*zend_execute)(zend_op_array *op_array ELS_DC);
 
+#ifdef ZEND_WIN32
+#include <process.h>
+/* true global */
+static WNDCLASS wc;
+static HWND timeout_window;
+static HANDLE timeout_thread_event;
+static DWORD timeout_thread_id;
+static int timeout_thread_initialized=0;
+#endif
+
 
 #if ZEND_DEBUG
 static void (*original_sigsegv_handler)(int);
@@ -80,6 +91,18 @@ static void zend_extension_deactivator(zend_extension *extension)
 }
 
 
+static int is_not_internal_function(zend_function *function)
+{
+	return(function->type != ZEND_INTERNAL_FUNCTION);
+}
+
+
+static int is_not_internal_class(zend_class_entry *ce)
+{
+	return(ce->type != ZEND_INTERNAL_CLASS);
+}
+
+
 void init_executor(CLS_D ELS_DC)
 {
 	INIT_ZVAL(EG(uninitialized_zval));
@@ -87,7 +110,6 @@ void init_executor(CLS_D ELS_DC)
 	EG(uninitialized_zval_ptr)=&EG(uninitialized_zval);
 	EG(error_zval_ptr)=&EG(error_zval);
 	zend_ptr_stack_init(&EG(arg_types_stack));
-	zend_stack_init(&EG(overloaded_objects_stack));
 /* destroys stack frame, therefore makes core dumps worthless */
 #if 0&&ZEND_DEBUG
 	original_sigsegv_handler = signal(SIGSEGV, zend_handle_sigsegv);
@@ -115,17 +137,30 @@ void init_executor(CLS_D ELS_DC)
 	EG(opline_ptr) = NULL;
 	EG(garbage_ptr) = 0;
 
-	zend_hash_init(&EG(imported_files), 5, NULL, NULL, 0);
+	zend_hash_init(&EG(included_files), 5, NULL, NULL, 0);
 
 	EG(ticks_count) = 0;
+
+	EG(user_error_handler) = NULL;
+
+	zend_ptr_stack_init(&EG(user_error_handlers));
+
+	EG(orig_error_reporting) = EG(error_reporting);
+
+#ifdef ZEND_WIN32
+	EG(timed_out) = 0;
+#endif
 }
 
 
 void shutdown_executor(ELS_D)
 {
-	zval_dtor(&EG(global_return_value));
+	if (EG(global_return_value_ptr) == &EG(global_return_value)) {
+		zval_dtor(&EG(global_return_value));
+	} else {
+		zval_ptr_dtor(EG(return_value_ptr_ptr));
+	}
 	zend_ptr_stack_destroy(&EG(arg_types_stack));
-	zend_stack_destroy(&EG(overloaded_objects_stack));
 			
 	while (EG(symtable_cache_ptr)>=EG(symtable_cache)) {
 		zend_hash_destroy(*EG(symtable_cache_ptr));
@@ -142,20 +177,36 @@ void shutdown_executor(ELS_D)
 		}
 	}
 
-	destroy_resource_list(ELS_C); /* must be destroyed after the main symbol table is destroyed */
-
 	zend_ptr_stack_destroy(&EG(argument_stack));
+
+	/* Destroy all op arrays */
 	if (EG(main_op_array)) {
 		destroy_op_array(EG(main_op_array));
 		efree(EG(main_op_array));
 	}
+	zend_hash_apply(EG(function_table), (int (*)(void *)) is_not_internal_function);
+	zend_hash_apply(EG(class_table), (int (*)(void *)) is_not_internal_class);
+
+	zend_destroy_rsrc_list(ELS_C); /* must be destroyed after the main symbol table and
+									* op arrays are destroyed.
+									*/
+
 	clean_non_persistent_constants();
 #if ZEND_DEBUG
 	signal(SIGSEGV, original_sigsegv_handler);
 #endif
 
+	zend_hash_destroy(&EG(included_files));
 
-	zend_hash_destroy(&EG(imported_files));
+	if (EG(user_error_handler)) {
+		zval_dtor(EG(user_error_handler));
+		FREE_ZVAL(EG(user_error_handler));
+	}
+
+	zend_ptr_stack_clean(&EG(user_error_handlers), ZVAL_DESTRUCTOR, 1);
+	zend_ptr_stack_destroy(&EG(user_error_handlers));
+
+	EG(error_reporting) = EG(orig_error_reporting);
 }
 
 
@@ -211,16 +262,6 @@ ZEND_API zend_bool zend_is_executing()
 }
 
 
-ZEND_API inline void safe_free_zval_ptr(zval *p)
-{
-	ELS_FETCH();
-
-	if (p!=EG(uninitialized_zval_ptr)) {
-		FREE_ZVAL(p);
-	}
-}
-
-
 ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC)
 {
 #if DEBUG_ZEND>=2
@@ -236,71 +277,47 @@ ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC)
 }
 	
 
-ZEND_API inline int i_zend_is_true(zval *op)
-{
-	int result;
-
-	switch (op->type) {
-		case IS_NULL:
-			result = 0;
-			break;
-		case IS_LONG:
-		case IS_BOOL:
-		case IS_RESOURCE:
-			result = (op->value.lval?1:0);
-			break;
-		case IS_DOUBLE:
-			result = (op->value.dval ? 1 : 0);
-			break;
-		case IS_STRING:
-			if (op->value.str.len == 0
-				|| (op->value.str.len==1 && op->value.str.val[0]=='0')) {
-				result = 0;
-			} else {
-				result = 1;
-			}
-			break;
-		case IS_ARRAY:
-			result = (zend_hash_num_elements(op->value.ht)?1:0);
-			break;
-		case IS_OBJECT:
-			result = (zend_hash_num_elements(op->value.obj.properties)?1:0);
-			break;
-		default:
-			result = 0;
-			break;
-	}
-	return result;
-}
-
-
 ZEND_API int zend_is_true(zval *op)
 {
 	return i_zend_is_true(op);
 }
 
 
-ZEND_API int zval_update_constant(zval **pp)
+ZEND_API int zval_update_constant(zval **pp, void *arg)
 {
 	zval *p = *pp;
+	zend_bool inline_change = (zend_bool) (unsigned long) arg;
 
 	if (p->type == IS_CONSTANT) {
 		zval c;
-		int refcount = p->refcount;
+		int refcount;
+
+		SEPARATE_ZVAL(pp);
+		p = *pp;
+
+		refcount = p->refcount;
 
 		if (!zend_get_constant(p->value.str.val, p->value.str.len, &c)) {
 			zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'",
 						p->value.str.val,
 						p->value.str.val);
 			p->type = IS_STRING;
+			if (!inline_change) {
+				zval_copy_ctor(p);
+			}
 		} else {
-			STR_FREE(p->value.str.val);
+			if (inline_change) {
+				STR_FREE(p->value.str.val);
+			}
 			*p = c;
 		}
 		INIT_PZVAL(p);
 		p->refcount = refcount;
-	} else if (p->type == IS_ARRAY) {
-		zend_hash_apply(p->value.ht, (int (*)(void *)) zval_update_constant);
+	} else if (p->type == IS_CONSTANT_ARRAY) {
+		SEPARATE_ZVAL(pp);
+		p = *pp;
+		p->type = IS_ARRAY;
+		zend_hash_apply_with_argument(p->value.ht, (int (*)(void *,void *)) zval_update_constant, (void *) 1);
 	}
 	return 0;
 }
@@ -316,7 +333,7 @@ int call_user_function(HashTable *function_table, zval *object, zval *function_n
 	for (i=0; i<param_count; i++) {
 		params_array[i] = &params[i];
 	}
-	ex_retval = call_user_function_ex(function_table, object, function_name, &local_retval_ptr, param_count, params_array, 1);
+	ex_retval = call_user_function_ex(function_table, object, function_name, &local_retval_ptr, param_count, params_array, 1, NULL);
 	if (local_retval_ptr) {
 		COPY_PZVAL_TO_ZVAL(*retval_ptr, local_retval_ptr);
 	} else {
@@ -327,7 +344,7 @@ int call_user_function(HashTable *function_table, zval *object, zval *function_n
 }
 
 
-int call_user_function_ex(HashTable *function_table, zval *object, zval *function_name, zval **retval_ptr_ptr, int param_count, zval **params[], int no_separation)
+int call_user_function_ex(HashTable *function_table, zval *object, zval *function_name, zval **retval_ptr_ptr, int param_count, zval **params[], int no_separation, HashTable *symbol_table)
 {
 	int i;
 	zval **original_return_value;
@@ -340,12 +357,30 @@ int call_user_function_ex(HashTable *function_table, zval *object, zval *functio
 
 	*retval_ptr_ptr = NULL;
 
+	if (function_name->type==IS_ARRAY) { /* assume array($obj, $name) couple */
+		zval **tmp_object_ptr, **tmp_real_function_name;
+
+		if (zend_hash_index_find(function_name->value.ht, 0, (void **) &tmp_object_ptr)==FAILURE) {
+			return FAILURE;
+		}
+		if (zend_hash_index_find(function_name->value.ht, 1, (void **) &tmp_real_function_name)==FAILURE) {
+			return FAILURE;
+		}
+		function_name = *tmp_real_function_name;
+		object = *tmp_object_ptr;
+	}
+
 	if (object) {
 		if (object->type != IS_OBJECT) {
 			return FAILURE;
 		}
 		function_table = &object->value.obj.ce->function_table;
 	}
+
+	if (function_name->type!=IS_STRING) {
+		return FAILURE;
+	}
+
 	original_function_state_ptr = EG(function_state_ptr);
 	zend_str_tolower(function_name->value.str.val, function_name->value.str.len);
 	if (zend_hash_find(function_table, function_name->value.str.val, function_name->value.str.len+1, (void **) &function_state.function)==FAILURE) {
@@ -386,19 +421,23 @@ int call_user_function_ex(HashTable *function_table, zval *object, zval *functio
 		zend_ptr_stack_push(&EG(argument_stack), param);
 	}
 
-	zend_ptr_stack_push(&EG(argument_stack), (void *) (long) param_count);
+	zend_ptr_stack_n_push(&EG(argument_stack), 2, (void *) (long) param_count, NULL);
 
 	if (function_state.function->type == ZEND_USER_FUNCTION) {
 		calling_symbol_table = EG(active_symbol_table);
-		ALLOC_HASHTABLE(EG(active_symbol_table));
-		zend_hash_init(EG(active_symbol_table), 0, NULL, ZVAL_PTR_DTOR, 0);
+		if (symbol_table) {
+			EG(active_symbol_table) = symbol_table;
+		} else {
+			ALLOC_HASHTABLE(EG(active_symbol_table));
+			zend_hash_init(EG(active_symbol_table), 0, NULL, ZVAL_PTR_DTOR, 0);
+		}
 		if (object) {
 			zval *dummy, **this_ptr;
 
 			ALLOC_ZVAL(dummy);
 			INIT_ZVAL(*dummy);
 			
-			zend_hash_update_ptr(EG(active_symbol_table), "this", sizeof("this"), dummy, sizeof(zval *), (void **) &this_ptr);
+			zend_hash_update(EG(active_symbol_table), "this", sizeof("this"), &dummy, sizeof(zval *), (void **) &this_ptr);
 			zend_assign_to_variable_reference(NULL, this_ptr, &object, NULL ELS_CC);
 		}
 		original_return_value = EG(return_value_ptr_ptr);
@@ -407,8 +446,10 @@ int call_user_function_ex(HashTable *function_table, zval *object, zval *functio
 		EG(active_op_array) = (zend_op_array *) function_state.function;
 		original_opline_ptr = EG(opline_ptr);
 		zend_execute(EG(active_op_array) ELS_CC);
-		zend_hash_destroy(EG(active_symbol_table));		
-		FREE_HASHTABLE(EG(active_symbol_table));
+		if (!symbol_table) {
+			zend_hash_destroy(EG(active_symbol_table));
+			FREE_HASHTABLE(EG(active_symbol_table));
+		}
 		EG(active_symbol_table) = calling_symbol_table;
 		EG(active_op_array) = original_op_array;
 		EG(return_value_ptr_ptr)=original_return_value;
@@ -425,13 +466,14 @@ int call_user_function_ex(HashTable *function_table, zval *object, zval *functio
 }
 
 
-ZEND_API void zend_eval_string(char *str, zval *retval_ptr CLS_DC ELS_DC)
+ZEND_API int zend_eval_string(char *str, zval *retval_ptr CLS_DC ELS_DC)
 {
 	zval pv;
 	zend_op_array *new_op_array;
 	zend_op_array *original_active_op_array = EG(active_op_array);
 	zend_function_state *original_function_state_ptr = EG(function_state_ptr);
 	int original_handle_op_arrays;
+	int retval;
 
 	if (retval_ptr) {
 		pv.value.str.len = strlen(str)+sizeof("return  ;")-1;
@@ -482,64 +524,15 @@ ZEND_API void zend_eval_string(char *str, zval *retval_ptr CLS_DC ELS_DC)
 		destroy_op_array(new_op_array);
 		efree(new_op_array);
 		EG(return_value_ptr_ptr) = original_return_value_ptr_ptr;
+		retval = SUCCESS;
 	} else {
-		printf("Failed executing:\n%s\n", str);
+		retval = FAILURE;
 	}
 	zval_dtor(&pv);
+	return retval;
 }
 
 
-ZEND_API inline void zend_assign_to_variable_reference(znode *result, zval **variable_ptr_ptr, zval **value_ptr_ptr, temp_variable *Ts ELS_DC)
-{
-	zval *variable_ptr = *variable_ptr_ptr;
-	zval *value_ptr;
-	
-
-	if (!value_ptr_ptr) {
-		zend_error(E_ERROR, "Cannot create references to string offsets nor overloaded objects");
-		return;
-	}
-
-	value_ptr = *value_ptr_ptr;
-	if (variable_ptr == EG(error_zval_ptr) || value_ptr==EG(error_zval_ptr)) {
-		variable_ptr_ptr = &EG(uninitialized_zval_ptr);
-/*	} else if (variable_ptr==&EG(uninitialized_zval) || variable_ptr!=value_ptr) { */
-	} else if (variable_ptr_ptr != value_ptr_ptr) {
-		variable_ptr->refcount--;
-		if (variable_ptr->refcount==0) {
-			zendi_zval_dtor(*variable_ptr);
-			FREE_ZVAL(variable_ptr);
-		}
-
-		if (!PZVAL_IS_REF(value_ptr)) {
-			/* break it away */
-			value_ptr->refcount--;
-			if (value_ptr->refcount>0) {
-				ALLOC_ZVAL(*value_ptr_ptr);
-				**value_ptr_ptr = *value_ptr;
-				value_ptr = *value_ptr_ptr;
-				zendi_zval_copy_ctor(*value_ptr);
-			}
-			value_ptr->refcount = 1;
-			value_ptr->is_ref = 1;
-		}
-
-		*variable_ptr_ptr = value_ptr;
-		value_ptr->refcount++;
-	} else {
-		if (variable_ptr->refcount>1) { /* we need to break away */
-			SEPARATE_ZVAL(variable_ptr_ptr);
-		}
-		(*variable_ptr_ptr)->is_ref = 1;
-	}
-
-	if (result && (result->op_type != IS_UNUSED)) {
-		Ts[result->u.var].var.ptr_ptr = variable_ptr_ptr;
-		SELECTIVE_PZVAL_LOCK(*variable_ptr_ptr, result);
-		AI_USE_PTR(Ts[result->u.var].var);
-	}
-}
-
 
 #if SUPPORT_INTERACTIVE
 void execute_new_code(CLS_D)
@@ -561,32 +554,163 @@ void execute_new_code(CLS_D)
 #endif
 
 
-/* these are a dedicated, optimized, function, and shouldn't be used for any purpose
- * other than by Zend's executor
- */
-ZEND_API inline void zend_ptr_stack_clear_multiple(ELS_D)
+ZEND_API void zend_timeout(int dummy)
 {
-	void **p = EG(argument_stack).top_element-1;
-	int delete_count = (ulong) *p;
+	ELS_FETCH();
 
-	EG(argument_stack).top -= (delete_count+1);
-	while (--delete_count>=0) {
-		zval_ptr_dtor((zval **) --p);
+	/* is there any point in this?  we're terminating the request anyway...
+	PLS_FETCH();
+
+	PG(connection_status) |= PHP_CONNECTION_TIMEOUT;
+	*/
+	zend_error(E_ERROR, "Maximum execution time of %d second%s exceeded",
+			  EG(timeout_seconds), EG(timeout_seconds) == 1 ? "" : "s");
+}
+
+
+#ifdef ZEND_WIN32
+static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) 
+{
+	switch (message) {
+		case WM_DESTROY:
+			PostQuitMessage(0);
+			break;
+		case WM_REGISTER_ZEND_TIMEOUT:
+			/* wParam is the thread id pointer, lParam is the timeout amount in seconds */
+			if (lParam==0) {
+				KillTimer(timeout_window, wParam);
+			} else {
+				SetTimer(timeout_window, wParam, lParam*1000, NULL);
+			}
+			break;
+		case WM_UNREGISTER_ZEND_TIMEOUT:
+			/* wParam is the thread id pointer */
+			KillTimer(timeout_window, wParam);
+			break;
+		case WM_TIMER: {
+#ifdef ZTS
+				zend_executor_globals *executor_globals;
+
+				executor_globals = ts_resource_ex(executor_globals_id, &wParam);
+				if (!executor_globals) {
+					/* Thread died before receiving its timeout? */
+					break;
+				}
+#endif
+				KillTimer(timeout_window, wParam);
+				EG(timed_out) = 1;
+			}
+			break;
+		default:
+			return DefWindowProc(hWnd,message,wParam,lParam);
 	}
-	EG(argument_stack).top_element = p;
+	return 0;
 }
 
 
 
-ZEND_API int zend_ptr_stack_get_arg(int requested_arg, void **data ELS_DC)
+static unsigned __stdcall timeout_thread_proc(void *pArgs)
 {
-	void **p = EG(argument_stack).top_element-1;
-	int arg_count = (ulong) *p;
+	MSG message;
 
-	if (requested_arg>arg_count) {
-		return FAILURE;
+	wc.style=0;
+	wc.lpfnWndProc = zend_timeout_WndProc;
+	wc.cbClsExtra=0;
+	wc.cbWndExtra=0;
+	wc.hInstance=NULL;
+	wc.hIcon=NULL;
+	wc.hCursor=NULL;
+	wc.hbrBackground=(HBRUSH)(COLOR_BACKGROUND + 5);
+	wc.lpszMenuName=NULL;
+	wc.lpszClassName = "Zend Timeout Window";
+	if(!RegisterClass(&wc)) {
+		return -1;
 	}
-	*data = (p-arg_count+requested_arg-1);
-	return SUCCESS;
+	timeout_window = CreateWindow(wc.lpszClassName, wc.lpszClassName, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL);
+	SetEvent(timeout_thread_event);
+	while (GetMessage(&message, NULL, 0, 0)) {
+		SendMessage(timeout_window, message.message, message.wParam, message.lParam);
+		if (message.message == WM_QUIT) {
+			break;
+		}
+	}
+	DestroyWindow(timeout_window);
+	UnregisterClass(wc.lpszClassName, NULL);
+	return 0;
 }
 
+
+void zend_init_timeout_thread()
+{
+	timeout_thread_event = CreateEvent(NULL, FALSE, FALSE, NULL);
+	_beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);
+	WaitForSingleObject(timeout_thread_event, INFINITE);
+}
+
+
+void zend_shutdown_timeout_thread()
+{
+	if (!timeout_thread_initialized) {
+		return;
+	}
+	PostThreadMessage(timeout_thread_id, WM_QUIT, 0, 0);
+}
+
+#endif
+
+/* This one doesn't exists on QNX */
+#ifndef SIGPROF
+#define SIGPROF 27
+#endif
+
+void zend_set_timeout(long seconds)
+{
+	ELS_FETCH();
+
+	EG(timeout_seconds) = seconds;
+#ifdef ZEND_WIN32
+	if (timeout_thread_initialized==0 && InterlockedIncrement(&timeout_thread_initialized)==1) {
+		/* We start up this process-wide thread here and not in zend_startup(), because if Zend
+		 * is initialized inside a DllMain(), you're not supposed to start threads from it.
+		 */
+		zend_init_timeout_thread();
+	}
+	PostThreadMessage(timeout_thread_id, WM_REGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) seconds);
+#else
+#	ifdef HAVE_SETITIMER
+	{
+		struct itimerval t_r;		/* timeout requested */
+		sigset_t sigset;
+
+		t_r.it_value.tv_sec = seconds;
+		t_r.it_value.tv_usec = t_r.it_interval.tv_sec = t_r.it_interval.tv_usec = 0;
+
+		setitimer(ITIMER_PROF, &t_r, NULL);
+		signal(SIGPROF, zend_timeout);
+		sigemptyset(&sigset);
+		sigaddset(&sigset, SIGPROF);
+		sigprocmask(SIG_UNBLOCK,&sigset,NULL);
+	}
+#	endif
+#endif
+}
+
+
+void zend_unset_timeout(void)
+{
+	ELS_FETCH();
+
+#ifdef ZEND_WIN32
+	PostThreadMessage(timeout_thread_id, WM_UNREGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) 0);
+#else
+#	ifdef HAVE_SETITIMER
+	{
+		struct itimerval no_timeout;
+
+		no_timeout.it_value.tv_sec = no_timeout.it_value.tv_usec = no_timeout.it_interval.tv_sec = no_timeout.it_interval.tv_usec = 0;
+
+		setitimer(ITIMER_PROF, &no_timeout, NULL);
+	}
+#	endif
+#endif
+}

Zend/zend_execute_locks.h

@@ -1,5 +1,5 @@
-#ifndef _ZEND_EXECUTE_LOCKS_H
-#define _ZEND_EXECUTE_LOCKS_H
+#ifndef ZEND_EXECUTE_LOCKS_H
+#define ZEND_EXECUTE_LOCKS_H
 
 #define PZVAL_LOCK(z)	((z)->refcount++)
 #define PZVAL_UNLOCK(z)	{ ((z)->refcount--);								\
@@ -19,4 +19,4 @@
 
 #define SELECTIVE_PZVAL_LOCK(pzv, pzn)		if (!((pzn)->u.EA.type & EXT_TYPE_UNUSED)) { PZVAL_LOCK(pzv); }
 
-#endif /* _ZEND_EXECUTE_LOCKS_H */
+#endif /* ZEND_EXECUTE_LOCKS_H */

Zend/zend_extensions.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -44,7 +44,7 @@ int zend_load_extension(char *path)
 {
 #if ZEND_EXTENSIONS_SUPPORT
 	DL_HANDLE handle;
-	zend_extension extension, *new_extension;
+	zend_extension *new_extension;
 	zend_extension_version_info *extension_version_info;
 
 	handle = DL_LOAD(path);
@@ -65,18 +65,19 @@ int zend_load_extension(char *path)
 	}
 
 	if (extension_version_info->zend_extension_api_no > ZEND_EXTENSION_API_NO) {
-		fprintf(stderr, "%s requires Zend version %s or later\n"
-					"Current version %s, API version %d\n",
+		fprintf(stderr, "%s requires Zend Engine API version %d\n"
+					"The installed Zend Engine API version is %d\n\n",
 					new_extension->name,
-					extension_version_info->required_zend_version,
-					ZEND_VERSION,
+					extension_version_info->zend_extension_api_no,
 					ZEND_EXTENSION_API_NO);
 		DL_UNLOAD(handle);
 		return FAILURE;
 	} else if (extension_version_info->zend_extension_api_no < ZEND_EXTENSION_API_NO) {
 		/* we may be able to allow for downwards compatability in some harmless cases. */
-		fprintf(stderr, "%s is outdated (API version %d, current version %d)\n"
-					"Contact %s at %s for a later version of this module.\n",
+		fprintf(stderr, "%s designed to be used with the Zend Engine API %d is outdated\n"
+					"It requires a more recent version of the Zend Engine\n"
+					"The installed Zend Engine API version is %d\n"
+					"Contact %s at %s for a later version of this module.\n\n",
 					new_extension->name,
 					extension_version_info->zend_extension_api_no,
 					ZEND_EXTENSION_API_NO,
@@ -100,27 +101,41 @@ int zend_load_extension(char *path)
 		return FAILURE;
 	}
 
+	return zend_register_extension(new_extension, handle);
+#else
+	fprintf(stderr, "Extensions are not supported on this platform.\n");
+	return FAILURE;
+#endif
+}
+
+
+int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle)
+{
+#if ZEND_EXTENSIONS_SUPPORT
+	zend_extension extension;
+
 	if (new_extension->startup) {
 		if (new_extension->startup(new_extension)!=SUCCESS) {
 			DL_UNLOAD(handle);
 			return FAILURE;
 		}
 	}
+
 	extension = *new_extension;
 	extension.handle = handle;
 
+	zend_extension_dispatch_message(ZEND_EXTMSG_NEW_EXTENSION, &extension);
+
 	zend_llist_add_element(&zend_extensions, &extension);
 
-	/*fprintf(stderr, "Loaded %s, version %s\n", extension.name, extension.version);*/
-
 	zend_append_version_info(&extension);
-	return SUCCESS;
-#else
-	fprintf(stderr, "Extensions are not supported on this platform.\n");
-	return FAILURE;
+	/*fprintf(stderr, "Loaded %s, version %s\n", extension.name, extension.version);*/
 #endif
+
+	return SUCCESS;
 }
 
+
 static void zend_extension_shutdown(zend_extension *extension)
 {
 #if ZEND_EXTENSIONS_SUPPORT
@@ -131,6 +146,14 @@ static void zend_extension_shutdown(zend_extension *extension)
 }
 
 
+int zend_startup_extensions()
+{
+	zend_llist_init(&zend_extensions, sizeof(zend_extension), (void (*)(void *)) zend_extension_dtor, 1);
+	last_resource_number = 0;
+	return SUCCESS;
+}
+
+
 void zend_shutdown_extensions()
 {
 	zend_llist_apply(&zend_extensions, (void (*)(void *)) zend_extension_shutdown);
@@ -141,16 +164,38 @@ void zend_shutdown_extensions()
 void zend_extension_dtor(zend_extension *extension)
 {
 #if ZEND_EXTENSIONS_SUPPORT
-	DL_UNLOAD(extension->handle);
+	if (extension->handle) {
+		DL_UNLOAD(extension->handle);
+	}
 #endif
 }
 
 
+static void zend_extension_message_dispatcher(zend_extension *extension, int num_args, va_list args)
+{
+	int message;
+	void *arg;
+
+	if (!extension->message_handler || num_args!=2) {
+		return;
+	}
+	message = va_arg(args, int);
+	arg = va_arg(args, void *);
+	extension->message_handler(message, arg);
+}
+
+
+ZEND_API void zend_extension_dispatch_message(int message, void *arg)
+{
+	zend_llist_apply_with_arguments(&zend_extensions, (llist_apply_with_args_func_t) zend_extension_message_dispatcher, 2, message, arg);
+}
+
+
 ZEND_API int zend_get_resource_handle(zend_extension *extension)
 {
-	if (last_resource_number<4) {
+	if (last_resource_number<ZEND_MAX_RESERVED_RESOURCES) {
 		extension->resource_number = last_resource_number;
-		return last_resource_number;
+		return last_resource_number++;
 	} else {
 		return -1;
 	}

Zend/zend_extensions.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,12 +18,12 @@
 */
 
 
-#ifndef _ZEND_EXTENSIONS_H
-#define _ZEND_EXTENSIONS_H
+#ifndef ZEND_EXTENSIONS_H
+#define ZEND_EXTENSIONS_H
 
 #include "zend_compile.h"
 
-#define ZEND_EXTENSION_API_NO		19990619
+#define ZEND_EXTENSION_API_NO		20000707
 
 typedef struct _zend_extension_version_info {
 	int zend_extension_api_no;
@@ -47,14 +47,16 @@ struct _zend_extension {
 	void (*activate)();
 	void (*deactivate)();
 
+	void (*message_handler)(int message, void *arg);
+
 	void (*op_array_handler)(zend_op_array *op_array);
 	
 	void (*statement_handler)(zend_op_array *op_array);
 	void (*fcall_begin_handler)(zend_op_array *op_array);
 	void (*fcall_end_handler)(zend_op_array *op_array);
 
-	void (*op_array_ctor)(void **resource);
-	void (*op_array_dtor)(void **resource);
+	void (*op_array_ctor)(zend_op_array *op_array);
+	void (*op_array_dtor)(zend_op_array *op_array);
 
 	void *reserved1;
 	void *reserved2;
@@ -71,16 +73,13 @@ struct _zend_extension {
 
 
 ZEND_API int zend_get_resource_handle(zend_extension *extension);
+ZEND_API void zend_extension_dispatch_message(int message, void *arg);
 
-#ifdef ZTS
-#define ZTS_V 1
-#else
-#define ZTS_V 0
-#endif
+#define ZEND_EXTMSG_NEW_EXTENSION		1
 
 
 #define ZEND_EXTENSION()	\
-	ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, "0.90", ZTS_V, ZEND_DEBUG }
+	ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, ZEND_VERSION, ZTS_V, ZEND_DEBUG }
 
 #define STANDARD_ZEND_EXTENSION_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1
 
@@ -88,9 +87,11 @@ ZEND_API int zend_get_resource_handle(zend_extension *extension);
 ZEND_API extern zend_llist zend_extensions;
 
 void zend_extension_dtor(zend_extension *extension);
-int zend_load_extension(char *path);
-int zend_load_extensions(char **extension_paths);
+ZEND_API int zend_load_extension(char *path);
+ZEND_API int zend_load_extensions(char **extension_paths);
+ZEND_API int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle);
 void zend_append_version_info(zend_extension *extension);
+int zend_startup_extensions(void);
 void zend_shutdown_extensions(void);
 
-#endif /* _ZEND_EXTENSIONS_H */
+#endif /* ZEND_EXTENSIONS_H */

Zend/zend_fast_cache.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_FAST_CACHE_H
-#define _ZEND_FAST_CACHE_H
+#ifndef ZEND_FAST_CACHE_H
+#define ZEND_FAST_CACHE_H
 
 #ifndef ZEND_ENABLE_FAST_CACHE
 # if ZEND_DEBUG
@@ -117,7 +117,7 @@ typedef struct _zend_fast_cache_list_entry {
 #define FREE_ZVAL_REL(z)	\
 	ZEND_FAST_FREE_REL(z, ZVAL_CACHE_LIST)
 
-/* fast cache for HashTable's */
+/* fast cache for HashTables */
 #define ALLOC_HASHTABLE(ht)	\
 	ZEND_FAST_ALLOC(ht, HashTable, HASHTABLE_CACHE_LIST)
 
@@ -130,7 +130,7 @@ typedef struct _zend_fast_cache_list_entry {
 #define FREE_HASHTABLE_REL(ht)	\
 	ZEND_FAST_FREE_REL(ht, HASHTABLE_CACHE_LIST)
 
-#endif /* _ZEND_FAST_CACHE_H */
+#endif /* ZEND_FAST_CACHE_H */
 
 /*
  * Local variables:

Zend/zend_gcc_inline.c

@@ -0,0 +1,17 @@
+
+/*
+ * If C9X_INLINE_SEMANTICS is already defined here,
+ * we assume the user does not want GCC inline semantics,
+ * but compiles this file always.
+ */
+
+#ifndef C9X_INLINE_SEMANTICS
+
+#define C9X_INLINE_SEMANTICS
+
+#include "zend.h"
+
+#include "zend_execute.h"
+#include "zend_operators.h"
+
+#endif

Zend/zend_globals.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _T_GLOBALS_H
-#define _T_GLOBALS_H
+#ifndef ZEND_GLOBALS_H
+#define ZEND_GLOBALS_H
 
 
 #include <setjmp.h>
@@ -54,7 +54,6 @@ END_EXTERN_C()
 
 
 #include "zend_compile.h"
-#include "zend_execute.h"
 
 /* excpt.h on Digital Unix 4.0 defines function_table */
 #undef function_table
@@ -131,7 +130,6 @@ struct _zend_executor_globals {
 
 	zend_function_state *function_state_ptr;
 	zend_ptr_stack arg_types_stack;
-	zend_stack overloaded_objects_stack;
 
 	/* for global return() support */
 	zval *global_return_value_ptr;
@@ -147,11 +145,12 @@ struct _zend_executor_globals {
 	HashTable *active_symbol_table;
 	HashTable symbol_table;		/* main symbol table */
 
-	HashTable imported_files;	/* files already included using 'import' */
+	HashTable included_files;	/* files already included */
 
 	jmp_buf bailout;
 
 	int error_reporting;
+	int orig_error_reporting;
 
 	zend_op_array *active_op_array;
 	zend_op_array *main_op_array;
@@ -169,6 +168,10 @@ struct _zend_executor_globals {
 	/* for extended information support */
 	zend_bool no_extensions;
 
+#ifdef ZEND_WIN32
+	zend_bool timed_out;
+#endif
+
 	HashTable regular_list;
 	HashTable persistent_list;
 
@@ -180,6 +183,14 @@ struct _zend_executor_globals {
 	zval *garbage[4];
 	int garbage_ptr;
 
+	zval *user_error_handler;
+	zend_ptr_stack user_error_handlers;
+
+	/* timeout support */
+	int timeout_seconds;
+
+	int lambda_count;
+
 	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
 #if SUPPORT_INTERACTIVE
 	int interactive;
@@ -191,7 +202,7 @@ struct _zend_alloc_globals {
 	zend_mem_header *head;		/* standard list */
 	zend_mem_header *phead;		/* persistent list */
 	void *cache[MAX_CACHED_MEMORY][MAX_CACHED_ENTRIES];
-	unsigned char cache_count[MAX_CACHED_MEMORY];
+	unsigned int cache_count[MAX_CACHED_MEMORY];
 	void *fast_cache_list_head[MAX_FAST_CACHE_TYPES];
 
 #if ZEND_DEBUG
@@ -206,5 +217,4 @@ struct _zend_alloc_globals {
 #endif
 };
 
-
-#endif /* _T_GLOBALS_H */
+#endif /* ZEND_GLOBALS_H */

Zend/zend_globals_macros.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_GLOBALS_MACROS_H
-#define _ZEND_GLOBALS_MACROS_H
+#ifndef ZEND_GLOBALS_MACROS_H
+#define ZEND_GLOBALS_MACROS_H
 
 typedef struct _zend_compiler_globals zend_compiler_globals;
 typedef struct _zend_executor_globals zend_executor_globals;
@@ -85,5 +85,5 @@ extern ZEND_API zend_executor_globals executor_globals;
 extern ZEND_API zend_alloc_globals alloc_globals;
 #endif
 
-#endif /* _ZEND_GLOBALS_MACROS_H */
+#endif /* ZEND_GLOBALS_MACROS_H */
 

Zend/zend_hash.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -78,24 +78,28 @@
 	}
 
 #if ZEND_DEBUG
+#define HT_OK				0
 #define HT_IS_DESTROYING	1
 #define HT_DESTROYED		2
-#define HT_CLEANING		3
-#define HT_OK				0
+#define HT_CLEANING			3
 
 static void _zend_is_inconsistent(HashTable *ht, char *file, int line)
 {
+	if (ht->inconsistent==HT_OK) {
+		return;
+	}
     switch (ht->inconsistent) {
-	case HT_IS_DESTROYING:
-        zend_error(E_CORE_ERROR, "ht=%08x is destroying in %s:%d", ht, file, line);
-		break;
-	case HT_DESTROYED:
-        zend_error(E_CORE_ERROR, "ht=%08x is already destroyed in %s:%d", ht, file, line);
-		break;
-	case HT_CLEANING:
-        zend_error(E_CORE_ERROR, "ht=%08x is cleaning %s:%d", ht, file, line);
-		break;
+		case HT_IS_DESTROYING:
+			zend_output_debug_string(1, "%s(%d) : ht=0x%08x is being destroyed", file, line, ht);
+			break;
+		case HT_DESTROYED:
+			zend_output_debug_string(1, "%s(%d) : ht=0x%08x is already destroyed", file, line, ht);
+			break;
+		case HT_CLEANING:
+			zend_output_debug_string(1, "%s(%d) : ht=0x%08x is being cleaned", file, line, ht);
+			break;
     }
+	zend_bailout();
 }
 #define IS_CONSISTENT(a) _zend_is_inconsistent(a,__FILE__,__LINE__);
 #define SET_INCONSISTENT(n) ht->inconsistent = n;
@@ -104,9 +108,23 @@ static void _zend_is_inconsistent(HashTable *ht, char *file, int line)
 #define SET_INCONSISTENT(n)
 #endif
 
+#define HASH_APPLY_BEGIN(ht)															\
+	if ((ht)->bApplyProtection) {														\
+		if ((ht)->nApplyCount>=3) {														\
+			zend_error(E_WARNING, "Nesting level too deep - recursive dependency?");	\
+			return;																		\
+		}																				\
+		(ht)->nApplyCount++;															\
+	}
+
+#define HASH_APPLY_END(ht)																\
+	(ht)->nApplyCount--;
+
+
 /* Generated on an Octa-ALPHA 300MHz CPU & 2.5GB RAM monster */
 static uint PrimeNumbers[] =
-{5, 11, 19, 53, 107, 223, 463, 983, 1979, 3907, 7963, 16229, 32531, 65407, 130987, 262237, 524521, 1048793, 2097397, 4194103, 8388857, 16777447, 33554201, 67108961, 134217487, 268435697, 536870683, 1073741621, 2147483399};
+	{5, 11, 19, 53, 107, 223, 463, 983, 1979, 3907, 7963, 16229, 32531, 65407, 130987, 262237, 524521, 1048793, 2097397, 4194103, 8388857, 16777447, 33554201, 67108961, 134217487, 268435697, 536870683, 1073741621, 2147483399};
+static uint nNumPrimeNumbers = sizeof(PrimeNumbers) / sizeof(uint);
 
 #define ZEND_HASH_IF_FULL_DO_RESIZE(ht)				\
 	if ((ht)->nNumOfElements > (ht)->nTableSize) {	\
@@ -115,7 +133,6 @@ static uint PrimeNumbers[] =
 
 static int zend_hash_do_resize(HashTable *ht);
 
-static uint nNumPrimeNumbers = sizeof(PrimeNumbers) / sizeof(ulong);
 
 ZEND_API ulong hashpjw(char *arKey, uint nKeyLength)
 {
@@ -134,11 +151,11 @@ ZEND_API ulong hashpjw(char *arKey, uint nKeyLength)
 
 
 #define UPDATE_DATA(ht, p, pData, nDataSize)								\
-	if (flag & HASH_ADD_PTR) {												\
+	if (nDataSize == sizeof(void*)) {										\
 		if (!(p)->pDataPtr) {												\
 			pefree((p)->pData, (ht)->persistent);							\
 		}																	\
-		(p)->pDataPtr = pData;												\
+		(p)->pDataPtr = *(void **)pData;									\
 		(p)->pData = &(p)->pDataPtr;										\
 	} else {																\
 		if ((p)->pDataPtr) {												\
@@ -149,8 +166,8 @@ ZEND_API ulong hashpjw(char *arKey, uint nKeyLength)
 	}
 
 #define INIT_DATA(ht, p, pData, nDataSize);								\
-	if (flag & HASH_ADD_PTR) {											\
-		(p)->pDataPtr = pData;											\
+	if (nDataSize == sizeof(void*)) {									\
+		(p)->pDataPtr = *(void **)pData;								\
 		(p)->pData = &(p)->pDataPtr;									\
 	} else {															\
 		(p)->pData = (void *) pemalloc(nDataSize, (ht)->persistent);	\
@@ -200,9 +217,28 @@ ZEND_API int zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunction
 	ht->nNextFreeElement = 0;
 	ht->pInternalPointer = NULL;
 	ht->persistent = persistent;
+	ht->nApplyCount = 0;
+	ht->bApplyProtection = 1;
 	return SUCCESS;
 }
 
+
+ZEND_API int zend_hash_init_ex(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, int persistent, zend_bool bApplyProtection)
+{
+	int retval = zend_hash_init(ht, nSize, pHashFunction, pDestructor, persistent);
+
+	ht->bApplyProtection = bApplyProtection;
+	return retval;
+}
+
+
+ZEND_API void zend_hash_set_apply_protection(HashTable *ht, zend_bool bApplyProtection)
+{
+	ht->bApplyProtection = bApplyProtection;
+}
+
+
+
 ZEND_API int zend_hash_add_or_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag)
 {
 	ulong h;
@@ -650,6 +686,7 @@ ZEND_API void zend_hash_apply(HashTable *ht, apply_func_t apply_func)
 
 	IS_CONSISTENT(ht);
 
+	HASH_APPLY_BEGIN(ht);
 	p = ht->pListHead;
 	while (p != NULL) {
 		if (apply_func(p->pData)) {
@@ -658,6 +695,7 @@ ZEND_API void zend_hash_apply(HashTable *ht, apply_func_t apply_func)
 			p = p->pListNext;
 		}
 	}
+	HASH_APPLY_END(ht);
 }
 
 
@@ -667,6 +705,7 @@ ZEND_API void zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t appl
 
 	IS_CONSISTENT(ht);
 
+	HASH_APPLY_BEGIN(ht);
 	p = ht->pListHead;
 	while (p != NULL) {
 		if (apply_func(p->pData, argument)) {
@@ -675,6 +714,7 @@ ZEND_API void zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t appl
 			p = p->pListNext;
 		}
 	}
+	HASH_APPLY_END(ht);
 }
 
 
@@ -686,8 +726,9 @@ ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, int (*destruct)(void
 
 	IS_CONSISTENT(ht);
 
-	va_start(args, num_args);
+	HASH_APPLY_BEGIN(ht);
 
+	va_start(args, num_args);
 	p = ht->pListHead;
 	while (p != NULL) {
 		hash_key.arKey = p->arKey;
@@ -699,8 +740,9 @@ ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, int (*destruct)(void
 			p = p->pListNext;
 		}
 	}
-
 	va_end(args);
+
+	HASH_APPLY_END(ht);
 }
 
 
@@ -893,48 +935,64 @@ ZEND_API int zend_hash_num_elements(HashTable *ht)
 }
 
 
-ZEND_API void zend_hash_internal_pointer_reset(HashTable *ht)
+ZEND_API void zend_hash_internal_pointer_reset_ex(HashTable *ht, HashPosition *pos)
 {
 	IS_CONSISTENT(ht);
 
-	ht->pInternalPointer = ht->pListHead;
+	if (pos)
+		*pos = ht->pListHead;
+	else
+		ht->pInternalPointer = ht->pListHead;
 }
 
 
 /* This function will be extremely optimized by remembering 
  * the end of the list
  */
-ZEND_API void zend_hash_internal_pointer_end(HashTable *ht)
+ZEND_API void zend_hash_internal_pointer_end_ex(HashTable *ht, HashPosition *pos)
 {
 	IS_CONSISTENT(ht);
 
-	ht->pInternalPointer = ht->pListTail;
+	if (pos)
+		*pos = ht->pListTail;
+	else
+		ht->pInternalPointer = ht->pListTail;
 }
 
 
-ZEND_API void zend_hash_move_forward(HashTable *ht)
+ZEND_API int zend_hash_move_forward_ex(HashTable *ht, HashPosition *pos)
 {
+	HashPosition *current = pos ? pos : &ht->pInternalPointer;
+
 	IS_CONSISTENT(ht);
 
-	if (ht->pInternalPointer) {
-		ht->pInternalPointer = ht->pInternalPointer->pListNext;
-	}
+	if (*current) {
+		*current = (*current)->pListNext;
+		return SUCCESS;
+	} else
+		return FAILURE;
 }
 
-ZEND_API void zend_hash_move_backwards(HashTable *ht)
+ZEND_API int zend_hash_move_backwards_ex(HashTable *ht, HashPosition *pos)
 {
+	HashPosition *current = pos ? pos : &ht->pInternalPointer;
+
 	IS_CONSISTENT(ht);
 
-	if (ht->pInternalPointer) {
-		ht->pInternalPointer = ht->pInternalPointer->pListLast;
-	}
+	if (*current) {
+		*current = (*current)->pListLast;
+		return SUCCESS;
+	} else
+		return FAILURE;
 }
 
 
 /* This function should be made binary safe  */
-ZEND_API int zend_hash_get_current_key(HashTable *ht, char **str_index, ulong *num_index)
+ZEND_API int zend_hash_get_current_key_ex(HashTable *ht, char **str_index, ulong *str_length, ulong *num_index, HashPosition *pos)
 {
-	Bucket *p = ht->pInternalPointer;
+	Bucket *p;
+   
+	p = pos ? (*pos) : ht->pInternalPointer;
 
 	IS_CONSISTENT(ht);
 
@@ -942,6 +1000,9 @@ ZEND_API int zend_hash_get_current_key(HashTable *ht, char **str_index, ulong *n
 		if (p->nKeyLength) {
 			*str_index = (char *) pemalloc(p->nKeyLength, ht->persistent);
 			memcpy(*str_index, p->arKey, p->nKeyLength);
+			if (str_length) {
+				*str_length = p->nKeyLength;
+			}
 			return HASH_KEY_IS_STRING;
 		} else {
 			*num_index = p->h;
@@ -952,9 +1013,11 @@ ZEND_API int zend_hash_get_current_key(HashTable *ht, char **str_index, ulong *n
 }
 
 
-ZEND_API int zend_hash_get_current_key_type(HashTable *ht)
+ZEND_API int zend_hash_get_current_key_type_ex(HashTable *ht, HashPosition *pos)
 {
-	Bucket *p = ht->pInternalPointer;
+	Bucket *p;
+   
+	p = pos ? (*pos) : ht->pInternalPointer;
 
 	IS_CONSISTENT(ht);
 
@@ -969,9 +1032,11 @@ ZEND_API int zend_hash_get_current_key_type(HashTable *ht)
 }
 
 
-ZEND_API int zend_hash_get_current_data(HashTable *ht, void **pData)
+ZEND_API int zend_hash_get_current_data_ex(HashTable *ht, void **pData, HashPosition *pos)
 {
-	Bucket *p = ht->pInternalPointer;
+	Bucket *p;
+   
+	p = pos ? (*pos) : ht->pInternalPointer;
 
 	IS_CONSISTENT(ht);
 
@@ -1041,6 +1106,71 @@ ZEND_API int zend_hash_sort(HashTable *ht, sort_func_t sort_func,
 }
 
 
+ZEND_API int zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t compar, zend_bool ordered)
+{
+	Bucket *p1, *p2;
+	int result;
+	void *pData2;
+
+	IS_CONSISTENT(ht1);
+	IS_CONSISTENT(ht2);
+
+	result = ht1->nNumOfElements - ht2->nNumOfElements;
+	if (result!=0) {
+		return result;
+	}
+
+	p1 = ht1->pListHead;
+	if (ordered) {
+		p2 = ht2->pListHead;
+	}
+
+	while (p1) {
+		if (ordered && !p2) {
+			return 1; /* That's not supposed to happen */
+		}
+		if (ordered) {
+			if (p1->nKeyLength==0 && p2->nKeyLength==0) { /* numeric indices */
+				result = p1->h - p2->h;
+				if (result!=0) {
+					return result;
+				}
+			} else { /* string indices */
+				result = p1->nKeyLength - p2->nKeyLength;
+				if (result!=0) {
+					return result;
+				}
+				result = memcmp(p1->arKey, p2->arKey, p1->nKeyLength);
+				if (result!=0) {
+					return result;
+				}
+			}
+			pData2 = p2->pData;
+		} else {
+			if (p1->nKeyLength==0) { /* numeric index */
+				if (zend_hash_index_find(ht2, p1->h, &pData2)==FAILURE) {
+					return 1;
+				}
+			} else { /* string index */
+				if (zend_hash_find(ht2, p1->arKey, p1->nKeyLength, &pData2)==FAILURE) {
+					return 1;
+				}
+			}
+		}
+		result = compar(p1->pData, pData2);
+		if (result!=0) {
+			return result;
+		}
+		p1 = p1->pListNext;
+		if (ordered) {
+			p2 = p2->pListNext;
+		}
+	}
+
+	return 0;
+}
+
+
 ZEND_API int zend_hash_minmax(HashTable *ht, int (*compar) (const void *, const void *), int flag, void **pData)
 {
 	Bucket *p,*res;
@@ -1083,7 +1213,7 @@ void zend_hash_display_pListTail(HashTable *ht)
 
 	p = ht->pListTail;
 	while (p != NULL) {
-		zend_printf("pListTail has key %s\n", p->arKey);
+		zend_output_debug_string(0, "pListTail has key %s\n", p->arKey);
 		p = p->pListLast;
 	}
 }
@@ -1096,14 +1226,14 @@ void zend_hash_display(HashTable *ht)
 	for (i = 0; i < ht->nTableSize; i++) {
 		p = ht->arBuckets[i];
 		while (p != NULL) {
-			zend_printf("%s <==> 0x%X\n", p->arKey, p->h);
+			zend_output_debug_string(0, "%s <==> 0x%X\n", p->arKey, p->h);
 			p = p->pNext;
 		}
 	}
 
 	p = ht->pListTail;
 	while (p != NULL) {
-		zend_printf("%s <==> 0x%X\n", p->arKey, p->h);
+		zend_output_debug_string(0, "%s <==> 0x%X\n", p->arKey, p->h);
 		p = p->pListLast;
 	}
 }

Zend/zend_hash.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -17,8 +17,8 @@
    +----------------------------------------------------------------------+
 */
 
-#ifndef _HASH_
-#define _HASH_
+#ifndef ZEND_HASH_H
+#define ZEND_HASH_H
 
 #include <sys/types.h>
 
@@ -29,7 +29,6 @@
 #define HASH_UPDATE 		(1<<0)
 #define HASH_ADD			(1<<1)
 #define HASH_NEXT_INSERT	(1<<2)
-#define HASH_ADD_PTR		(1<<3)
 
 #define HASH_DEL_KEY 0
 #define HASH_DEL_INDEX 1
@@ -42,7 +41,7 @@ typedef int (*apply_func_arg_t)(void *pDest, void *argument);
 typedef ulong (*hash_func_t)(char *arKey, uint nKeyLength);
 typedef void (*copy_ctor_func_t)(void *pElement);
 
-struct hashtable;
+struct _hashtable;
 
 typedef struct bucket {
 	ulong h;						/* Used for numeric indexing */
@@ -56,7 +55,7 @@ typedef struct bucket {
 	char arKey[1]; /* Must be last element */
 } Bucket;
 
-typedef struct hashtable {
+typedef struct _hashtable {
 	uint nTableSize;
 	uint nHashSizeIndex;
 	uint nNumOfElements;
@@ -67,16 +66,21 @@ typedef struct hashtable {
 	Bucket *pListTail;
 	Bucket **arBuckets;
 	dtor_func_t pDestructor;
-	unsigned char persistent;
+	zend_bool persistent;
+	unsigned char nApplyCount;
+	zend_bool bApplyProtection;
 #if ZEND_DEBUG
 	int inconsistent;
 #endif
 } HashTable;
 
+typedef Bucket* HashPosition;
+
 BEGIN_EXTERN_C()
 
 /* startup/shutdown */
 ZEND_API int zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, int persistent);
+ZEND_API int zend_hash_init_ex(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, int persistent, zend_bool bApplyProtection);
 ZEND_API void zend_hash_destroy(HashTable *ht);
 
 ZEND_API void zend_hash_clean(HashTable *ht);
@@ -87,26 +91,18 @@ ZEND_API int zend_hash_add_or_update(HashTable *ht, char *arKey, uint nKeyLength
 		zend_hash_add_or_update(ht,arKey,nKeyLength,pData,nDataSize,pDest,HASH_UPDATE)
 #define zend_hash_add(ht,arKey,nKeyLength,pData,nDataSize,pDest) \
 		zend_hash_add_or_update(ht,arKey,nKeyLength,pData,nDataSize,pDest,HASH_ADD)
-#define zend_hash_update_ptr(ht,arKey,nKeyLength,pData,nDataSize,pDest) \
-		zend_hash_add_or_update(ht,arKey,nKeyLength,pData,0,pDest,(HASH_UPDATE|HASH_ADD_PTR))
-#define zend_hash_add_ptr(ht,arKey,nKeyLength,pData,nDataSize,pDest) \
-		zend_hash_add_or_update(ht,arKey,nKeyLength,pData,nDataSize,pDest,(HASH_ADD|HASH_ADD_PTR))
 
 ZEND_API int zend_hash_quick_add_or_update(HashTable *ht, char *arKey, uint nKeyLength, ulong h, void *pData, uint nDataSize, void **pDest,int flag);
 #define zend_hash_quick_update(ht,arKey,nKeyLength,h,pData,nDataSize,pDest) \
 		zend_hash_quick_add_or_update(ht,arKey,nKeyLength,h,pData,nDataSize,pDest,HASH_UPDATE)
 #define zend_hash_quick_add(ht,arKey,nKeyLength,h,pData,nDataSize,pDest) \
 		zend_hash_quick_add_or_update(ht,arKey,nKeyLength,h,pData,nDataSize,pDest,HASH_ADD)
-#define zend_hash_quick_update_ptr(ht,arKey,nKeyLength,h,pData,nDataSize,pDest) \
-		zend_hash_quick_add_or_update(ht,arKey,nKeyLength,h,pData,0,pDest,HASH_UPDATE|HASH_ADD_PTR)
 
 ZEND_API int zend_hash_index_update_or_next_insert(HashTable *ht, ulong h, void *pData, uint nDataSize, void **pDest, int flag);
 #define zend_hash_index_update(ht,h,pData,nDataSize,pDest) \
 		zend_hash_index_update_or_next_insert(ht,h,pData,nDataSize,pDest,HASH_UPDATE)
 #define zend_hash_next_index_insert(ht,pData,nDataSize,pDest) \
 		zend_hash_index_update_or_next_insert(ht,0,pData,nDataSize,pDest,HASH_NEXT_INSERT)
-#define zend_hash_next_index_insert_ptr(ht,pData,nDataSize,pDest) \
-		zend_hash_index_update_or_next_insert(ht,0,pData,nDataSize,pDest,HASH_NEXT_INSERT|HASH_ADD_PTR)
 
 typedef struct _zend_hash_key {
 	char *arKey;
@@ -115,6 +111,8 @@ typedef struct _zend_hash_key {
 } zend_hash_key;
 
 
+typedef int (*apply_func_args_t)(void *pDest, int num_args, va_list args, zend_hash_key *hash_key);
+
 #define ZEND_STD_HASH_APPLIER		\
 	int (*)(void *element, int num_args, va_list args, zend_hash_key *hash_key)
 
@@ -146,18 +144,34 @@ ZEND_API int zend_hash_index_exists(HashTable *ht, ulong h);
 ZEND_API ulong zend_hash_next_free_element(HashTable *ht);
 
 /* traversing */
-ZEND_API void zend_hash_move_forward(HashTable *ht);
-ZEND_API void zend_hash_move_backwards(HashTable *ht);
-ZEND_API int zend_hash_get_current_key(HashTable *ht, char **str_index, ulong *num_index);
-ZEND_API int zend_hash_get_current_key_type(HashTable *ht);
-ZEND_API int zend_hash_get_current_data(HashTable *ht, void **pData);
-ZEND_API void zend_hash_internal_pointer_reset(HashTable *ht);
-ZEND_API void zend_hash_internal_pointer_end(HashTable *ht);
+ZEND_API int zend_hash_move_forward_ex(HashTable *ht, HashPosition *pos);
+ZEND_API int zend_hash_move_backwards_ex(HashTable *ht, HashPosition *pos);
+ZEND_API int zend_hash_get_current_key_ex(HashTable *ht, char **str_index, ulong *str_length, ulong *num_index, HashPosition *pos);
+ZEND_API int zend_hash_get_current_key_type_ex(HashTable *ht, HashPosition *pos);
+ZEND_API int zend_hash_get_current_data_ex(HashTable *ht, void **pData, HashPosition *pos);
+ZEND_API void zend_hash_internal_pointer_reset_ex(HashTable *ht, HashPosition *pos);
+ZEND_API void zend_hash_internal_pointer_end_ex(HashTable *ht, HashPosition *pos);
+
+#define zend_hash_move_forward(ht) \
+	zend_hash_move_forward_ex(ht, NULL)
+#define zend_hash_move_backwards(ht) \
+	zend_hash_move_backwards_ex(ht, NULL)
+#define zend_hash_get_current_key(ht, str_index, num_index) \
+	zend_hash_get_current_key_ex(ht, str_index, NULL, num_index, NULL)
+#define zend_hash_get_current_key_type(ht) \
+	zend_hash_get_current_key_type_ex(ht, NULL)
+#define zend_hash_get_current_data(ht, pData) \
+	zend_hash_get_current_data_ex(ht, pData, NULL)
+#define zend_hash_internal_pointer_reset(ht) \
+	zend_hash_internal_pointer_reset_ex(ht, NULL)
+#define zend_hash_internal_pointer_end(ht) \
+	zend_hash_internal_pointer_end_ex(ht, NULL)
 
 /* Copying, merging and sorting */
 ZEND_API void zend_hash_copy(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size);
 ZEND_API void zend_hash_merge(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size, int overwrite);
 ZEND_API int zend_hash_sort(HashTable *ht, sort_func_t sort_func, compare_func_t compare_func, int renumber);
+ZEND_API int zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t compar, zend_bool ordered);
 ZEND_API int zend_hash_minmax(HashTable *ht, int (*compar)(const void *, const void *), int flag, void **pData);
 
 ZEND_API int zend_hash_num_elements(HashTable *ht);
@@ -174,4 +188,11 @@ void zend_hash_display(HashTable *ht);
 
 END_EXTERN_C()
 
-#endif							/* _HASH_ */
+#define ZEND_INIT_SYMTABLE(ht)								\
+	ZEND_INIT_SYMTABLE_EX(ht, 2, 0)
+
+#define ZEND_INIT_SYMTABLE_EX(ht, n, persistent)			\
+	zend_hash_init(ht, n, NULL, ZVAL_PTR_DTOR, persistent)
+
+
+#endif							/* ZEND_HASH_H */

Zend/zend_highlight.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -33,7 +33,7 @@ extern int zendleng;
 #define zendleng zend_get_zendleng(CLS_C)
 #endif
 
-static void html_putc(char c)
+ZEND_API void zend_html_putc(char c)
 {
 	switch (c) {
 		case '\n':
@@ -61,12 +61,12 @@ static void html_putc(char c)
 }
 
 
-static void html_puts(char *s, uint len)
+ZEND_API void zend_html_puts(char *s, uint len)
 {
 	register char *ptr=s, *end=s+len;
 	
 	while (ptr<end) {
-		html_putc(*ptr++);
+		zend_html_putc(*ptr++);
 	}
 }
 
@@ -94,6 +94,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 				next_color = syntax_highlighter_ini->highlight_comment;
 				break;
 			case T_OPEN_TAG:
+			case T_OPEN_TAG_WITH_ECHO:
 				next_color = syntax_highlighter_ini->highlight_default;
 				break;
 			case T_CLOSE_TAG:
@@ -107,7 +108,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 				in_string = !in_string;
 				break;				
 			case T_WHITESPACE:
-				html_puts(zendtext, zendleng);  /* no color needed */
+				zend_html_puts(zendtext, zendleng);  /* no color needed */
 				token.type = 0;
 				continue;
 				break;
@@ -135,16 +136,17 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 		}
 		switch (token_type) {
 			case T_END_HEREDOC:
-				html_puts(token.value.str.val, token.value.str.len);
+				zend_html_puts(token.value.str.val, token.value.str.len);
 				break;
 			default:
-				html_puts(zendtext, zendleng);
+				zend_html_puts(zendtext, zendleng);
 				break;
 		}
 
 		if (token.type == IS_STRING) {
 			switch (token_type) {
 				case T_OPEN_TAG:
+				case T_OPEN_TAG_WITH_ECHO:
 				case T_CLOSE_TAG:
 				case T_WHITESPACE:
 					break;

Zend/zend_highlight.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _HIGHLIGHT_H
-#define _HIGHLIGHT_H
+#ifndef ZEND_HIGHLIGHT_H
+#define ZEND_HIGHLIGHT_H
 
 #define HL_COMMENT_COLOR     "#FF8000"    /* orange */
 #define HL_DEFAULT_COLOR     "#0000BB"    /* blue */
@@ -42,6 +42,8 @@ BEGIN_EXTERN_C()
 ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini);
 int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini);
 int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ini);
+ZEND_API void zend_html_putc(char c);
+ZEND_API void zend_html_puts(char *s, uint len);
 END_EXTERN_C()
 
 extern zend_syntax_highlighter_ini syntax_highlighter_ini;

Zend/zend_indent.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |

Zend/zend_indent.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,9 +18,9 @@
 */
 
 
-#ifndef _ZEND_INDENT_H
-#define _ZEND_INDENT_H
+#ifndef ZEND_INDENT_H
+#define ZEND_INDENT_H
 
 ZEND_API void zend_indent(void);
 
-#endif /* _ZEND_INDENT_H */
+#endif /* ZEND_INDENT_H */

Zend/zend_list.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -27,10 +27,14 @@
 
 ZEND_API int le_index_ptr;
 
-static inline int zend_list_do_insert(HashTable *list,void *ptr, int type)
+/* true global */
+static HashTable list_destructors;
+
+
+static inline int zend_list_do_insert(HashTable *list, void *ptr, int type, zend_bool valid)
 {
 	int index;
-	list_entry le;
+	zend_rsrc_list_entry le;
 
 	index = zend_hash_next_free_element(list);
 
@@ -39,13 +43,14 @@ static inline int zend_list_do_insert(HashTable *list,void *ptr, int type)
 	le.ptr=ptr;
 	le.type=type;
 	le.refcount=1;
-	zend_hash_index_update(list, index, (void *) &le, sizeof(list_entry), NULL);
+	le.valid = valid;
+	zend_hash_index_update(list, index, (void *) &le, sizeof(zend_rsrc_list_entry), NULL);
 	return index;
 }
 
 static inline int zend_list_do_delete(HashTable *list,int id)
 {
-	list_entry *le;
+	zend_rsrc_list_entry *le;
 	ELS_FETCH();
 	
 	if (zend_hash_index_find(&EG(regular_list), id, (void **) &le)==SUCCESS) {
@@ -63,7 +68,7 @@ static inline int zend_list_do_delete(HashTable *list,int id)
 
 static inline void *zend_list_do_find(HashTable *list,int id, int *type)
 {
-	list_entry *le;
+	zend_rsrc_list_entry *le;
 
 	if (zend_hash_index_find(list, id, (void **) &le)==SUCCESS) {
 		*type = le->type;
@@ -79,7 +84,7 @@ ZEND_API int zend_list_insert(void *ptr, int type)
 {
 	ELS_FETCH();
 
-	return zend_list_do_insert(&EG(regular_list), ptr, type);
+	return zend_list_do_insert(&EG(regular_list), ptr, type, 1);
 }
 
 
@@ -87,13 +92,13 @@ ZEND_API int zend_plist_insert(void *ptr, int type)
 {
 	ELS_FETCH();
 
-	return zend_list_do_insert(&EG(persistent_list), ptr, type);
+	return zend_list_do_insert(&EG(persistent_list), ptr, type, 1);
 }
 
 
 ZEND_API int zend_list_addref(int id)
 {
-	list_entry *le;
+	zend_rsrc_list_entry *le;
 	ELS_FETCH();
 	
 	if (zend_hash_index_find(&EG(regular_list), id, (void **) &le)==SUCCESS) {
@@ -122,6 +127,20 @@ ZEND_API int zend_plist_delete(int id)
 }
 
 
+ZEND_API int zend_list_convert_to_number(int id)
+{
+	zend_rsrc_list_entry *le;
+	ELS_FETCH();
+	
+	if (zend_hash_index_find(&EG(regular_list), id, (void **) &le)==SUCCESS
+		&& le->valid) {
+		return id;
+	}
+	return 0;
+}
+
+
+
 ZEND_API void *zend_list_find(int id, int *type)
 {
 	ELS_FETCH();
@@ -153,6 +172,22 @@ ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int r
 }
 
 
+ZEND_API int zend_register_false_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type)
+{
+	int rsrc_id;
+	ELS_FETCH();
+
+	rsrc_id = zend_list_do_insert(&EG(regular_list), rsrc_pointer, rsrc_type, 0);
+	
+	if (rsrc_result) {
+		rsrc_result->value.lval = rsrc_id;
+		rsrc_result->type = IS_RESOURCE;
+	}
+
+	return rsrc_id;
+}
+
+
 ZEND_API void *zend_fetch_resource(zval **passed_id, int default_id, char *resource_type_name, int *found_resource_type, int num_resource_types, ...)
 {
 	int id;
@@ -180,8 +215,9 @@ ZEND_API void *zend_fetch_resource(zval **passed_id, int default_id, char *resou
 
 	resource = zend_list_find(id, &actual_resource_type);
 	if (!resource) {
-		if (resource_type_name)
+		if (resource_type_name) {
 			zend_error(E_WARNING, "%d is not a valid %s resource", id, resource_type_name);
+		}
 		return NULL;
 	}
 
@@ -197,8 +233,9 @@ ZEND_API void *zend_fetch_resource(zval **passed_id, int default_id, char *resou
 	}
 	va_end(resource_types);
 
-	if (resource_type_name)
+	if (resource_type_name) {
 		zend_error(E_WARNING, "Supplied resource is not a valid %s resource", resource_type_name);
+	}
 
 	return NULL;
 }
@@ -206,12 +243,22 @@ ZEND_API void *zend_fetch_resource(zval **passed_id, int default_id, char *resou
 
 void list_entry_destructor(void *ptr)
 {
-	list_entry *le = (list_entry *) ptr;
-	list_destructors_entry *ld;
+	zend_rsrc_list_entry *le = (zend_rsrc_list_entry *) ptr;
+	zend_rsrc_list_dtors_entry *ld;
 	
-	if (zend_hash_index_find(&list_destructors,le->type,(void **) &ld)==SUCCESS) {
-		if (ld->list_destructor) {
-			(ld->list_destructor)(le->ptr);
+	if (zend_hash_index_find(&list_destructors, le->type,(void **) &ld)==SUCCESS) {
+		switch (ld->type) {
+			case ZEND_RESOURCE_LIST_TYPE_STD:
+				if (ld->list_dtor) {
+					(ld->list_dtor)(le->ptr);
+				}
+				break;
+			case ZEND_RESOURCE_LIST_TYPE_EX:
+				if (ld->list_dtor_ex) {
+					ld->list_dtor_ex(le);
+				}
+				break;
+			EMPTY_SWITCH_DEFAULT_CASE()
 		}
 	} else {
 		zend_error(E_WARNING,"Unknown list entry type in request shutdown (%d)",le->type);
@@ -221,12 +268,12 @@ void list_entry_destructor(void *ptr)
 
 void plist_entry_destructor(void *ptr)
 {
-	list_entry *le = (list_entry *) ptr;
-	list_destructors_entry *ld;
+	zend_rsrc_list_entry *le = (zend_rsrc_list_entry *) ptr;
+	zend_rsrc_list_dtors_entry *ld;
 
-	if (zend_hash_index_find(&list_destructors,le->type,(void **) &ld)==SUCCESS) {
-		if (ld->plist_destructor) {
-			(ld->plist_destructor)(le->ptr);
+	if (zend_hash_index_find(&list_destructors, le->type,(void **) &ld)==SUCCESS) {
+		if (ld->plist_dtor) {
+			(ld->plist_dtor)(le->ptr);
 		}
 	} else {
 		zend_error(E_WARNING,"Unknown persistent list entry type in module shutdown (%d)",le->type);
@@ -234,31 +281,31 @@ void plist_entry_destructor(void *ptr)
 }
 
 
-int init_resource_list(ELS_D)
+int zend_init_rsrc_list(ELS_D)
 {
 	return zend_hash_init(&EG(regular_list), 0, NULL, list_entry_destructor, 0);
 }
 
 
-int init_resource_plist(ELS_D)
+int zend_init_rsrc_plist(ELS_D)
 {
-	return zend_hash_init(&EG(persistent_list), 0, NULL, plist_entry_destructor, 1);
+	return zend_hash_init_ex(&EG(persistent_list), 0, NULL, plist_entry_destructor, 1, 0);
 }
 
 
-void destroy_resource_list(ELS_D)
+void zend_destroy_rsrc_list(ELS_D)
 {
 	zend_hash_graceful_destroy(&EG(regular_list));
 }
 
 
-void destroy_resource_plist(ELS_D)
+void zend_destroy_rsrc_plist(ELS_D)
 {
 	zend_hash_graceful_destroy(&EG(persistent_list));
 }
 
 
-static int clean_module_resource(list_entry *le, int *resource_id)
+static int clean_module_resource(zend_rsrc_list_entry *le, int *resource_id)
 {
 	if (le->type == *resource_id) {
 		return 1;
@@ -268,11 +315,12 @@ static int clean_module_resource(list_entry *le, int *resource_id)
 }
 
 
-int clean_module_resource_destructors(list_destructors_entry *ld, int *module_number)
+static int zend_clean_module_rsrc_dtors_cb(zend_rsrc_list_dtors_entry *ld, int *module_number)
 {
 	if (ld->module_number == *module_number) {
 		ELS_FETCH();
 
+		zend_hash_apply_with_argument(&EG(regular_list), (int (*)(void *,void *)) clean_module_resource, (void *) &(ld->resource_id));
 		zend_hash_apply_with_argument(&EG(persistent_list), (int (*)(void *,void *)) clean_module_resource, (void *) &(ld->resource_id));
 		return 1;
 	} else {
@@ -281,6 +329,83 @@ int clean_module_resource_destructors(list_destructors_entry *ld, int *module_nu
 }
 
 
+void zend_clean_module_rsrc_dtors(int module_number)
+{
+	zend_hash_apply_with_argument(&list_destructors, (int (*)(void *,void *)) zend_clean_module_rsrc_dtors_cb, (void *) &module_number);
+}
+
+
+ZEND_API int zend_register_list_destructors(void (*ld)(void *), void (*pld)(void *), int module_number)
+{
+	zend_rsrc_list_dtors_entry lde;
+	
+#if 0
+	printf("Registering destructors %d for module %d\n", list_destructors.nNextFreeElement, module_number);
+#endif
+	
+	lde.list_dtor=(void (*)(void *)) ld;
+	lde.plist_dtor=(void (*)(void *)) pld;
+	lde.list_dtor_ex = lde.plist_dtor_ex = NULL;
+	lde.module_number = module_number;
+	lde.resource_id = list_destructors.nNextFreeElement;
+	lde.type = ZEND_RESOURCE_LIST_TYPE_STD;
+	lde.type_name = NULL;
+	
+	if (zend_hash_next_index_insert(&list_destructors, (void *) &lde, sizeof(zend_rsrc_list_dtors_entry), NULL)==FAILURE) {
+		return FAILURE;
+	}
+	return list_destructors.nNextFreeElement-1;
+}
+
+
+ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_func_t pld, char *type_name, int module_number)
+{
+	zend_rsrc_list_dtors_entry lde;
+	
+#if 0
+	printf("Registering destructors %d for module %d\n", list_destructors.nNextFreeElement, module_number);
+#endif
+
+	lde.list_dtor = NULL;
+	lde.plist_dtor = NULL;
+	lde.list_dtor_ex = ld;
+	lde.plist_dtor_ex = pld;
+	lde.module_number = module_number;
+	lde.resource_id = list_destructors.nNextFreeElement;
+	lde.type = ZEND_RESOURCE_LIST_TYPE_EX;
+	lde.type_name = type_name;
+	
+	if (zend_hash_next_index_insert(&list_destructors,(void *) &lde, sizeof(zend_rsrc_list_dtors_entry),NULL)==FAILURE) {
+		return FAILURE;
+	}
+	return list_destructors.nNextFreeElement-1;
+}
+
+
+int zend_init_rsrc_list_dtors()
+{
+	return zend_hash_init(&list_destructors, 50, NULL, NULL, 1);
+}
+
+
+void zend_destroy_rsrc_list_dtors()
+{
+	zend_hash_destroy(&list_destructors);
+}
+
+
+char *zend_rsrc_list_get_rsrc_type(int resource)
+{
+	zend_rsrc_list_dtors_entry *lde;
+
+	if (zend_hash_index_find(&list_destructors, resource, (void **) &lde)==SUCCESS) {
+		return lde->type_name;
+	} else {
+		return NULL;
+	}
+}
+
+
 /*
  * Local variables:
  * tab-width: 4

Zend/zend_list.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,29 +18,46 @@
 */
 
 
-#ifndef _LIST_H
-#define _LIST_H
+#ifndef ZEND_LIST_H
+#define ZEND_LIST_H
 
 #include "zend_hash.h"
 #include "zend_globals.h"
 
-extern HashTable list_destructors;
 
-typedef struct _list_entry {
+#define ZEND_RESOURCE_LIST_TYPE_STD	1
+#define ZEND_RESOURCE_LIST_TYPE_EX	2
+
+typedef struct _zend_rsrc_list_entry {
 	void *ptr;
 	int type;
 	int refcount;
-} list_entry;
+	zend_bool valid;
+} zend_rsrc_list_entry;
+
+typedef void (*rsrc_dtor_func_t)(zend_rsrc_list_entry *rsrc);
+#define ZEND_RSRC_DTOR_FUNC(name)		void name(zend_rsrc_list_entry *rsrc)
+
+typedef struct _zend_rsrc_list_dtors_entry {
+	/* old style destructors */
+	void (*list_dtor)(void *);
+	void (*plist_dtor)(void *);
+
+	/* new style destructors */
+	rsrc_dtor_func_t list_dtor_ex;
+	rsrc_dtor_func_t plist_dtor_ex;
+
+	char *type_name;
 
-typedef struct _list_destructors_entry {
-	void (*list_destructor)(void *);
-	void (*plist_destructor)(void *);
 	int module_number;
 	int resource_id;
-} list_destructors_entry;
+	unsigned char type;
+} zend_rsrc_list_dtors_entry;
 
-#define register_list_destructors(ld,pld) _register_list_destructors((void (*)(void *))ld, (void (*)(void *))pld, module_number);
-ZEND_API int _register_list_destructors(void (*ld)(void *), void (*pld)(void *), int module_number);
+
+#define register_list_destructors(ld, pld) zend_register_list_destructors((void (*)(void *))ld, (void (*)(void *))pld, module_number);
+ZEND_API int zend_register_list_destructors(void (*ld)(void *), void (*pld)(void *), int module_number);
+ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_func_t pld, char *type_name, int module_number);
 
 enum list_entry_type {
 	LE_DB=1000
@@ -49,28 +66,33 @@ enum list_entry_type {
 void list_entry_destructor(void *ptr);
 void plist_entry_destructor(void *ptr);
 
-int clean_module_resource_destructors(list_destructors_entry *ld, int *module_number);
-int init_resource_list(ELS_D);
-int init_resource_plist(ELS_D);
-void destroy_resource_list(ELS_D);
-void destroy_resource_plist(ELS_D);
+void zend_clean_module_rsrc_dtors(int module_number);
+int zend_init_rsrc_list(ELS_D);
+int zend_init_rsrc_plist(ELS_D);
+void zend_destroy_rsrc_list(ELS_D);
+void zend_destroy_rsrc_plist(ELS_D);
+int zend_init_rsrc_list_dtors();
+void zend_destroy_rsrc_list_dtors();
 
 ZEND_API int zend_list_insert(void *ptr, int type);
 ZEND_API int zend_plist_insert(void *ptr, int type);
 ZEND_API int zend_list_addref(int id);
 ZEND_API int zend_list_delete(int id);
 ZEND_API int zend_plist_delete(int id);
+ZEND_API int zend_list_convert_to_number(int id);
 ZEND_API void *zend_list_find(int id, int *type);
 ZEND_API void *zend_plist_find(int id, int *type);
 
 ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type);
 ZEND_API void *zend_fetch_resource(zval **passed_id, int default_id, char *resource_type_name, int *found_resource_type, int num_resource_types, ...);
 
+ZEND_API char *zend_rsrc_list_get_rsrc_type(int resource);
+
 extern ZEND_API int le_index_ptr;  /* list entry type for index pointers */
 
 #define ZEND_VERIFY_RESOURCE(rsrc)		\
 	if (!rsrc) {						\
-		RETURN_FALSE;					\
+		RETURN_NULL();					\
 	}
 
 #define ZEND_FETCH_RESOURCE(rsrc, rsrc_type, passed_id, default_id, resource_type_name, resource_type)	\

Zend/zend_llist.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -81,7 +81,7 @@ ZEND_API void zend_llist_del_element(zend_llist *l, void *element, int (*compare
 			}
 			if (l->dtor) {
 				l->dtor(current->data);
-				efree(current);
+				pefree(current, l->persistent);
 			}
 			break;
 		}
@@ -121,7 +121,7 @@ ZEND_API void zend_llist_remove_tail(zend_llist *l)
 			l->tail->prev->next = NULL;
 		}
 		l->tail = l->tail->prev;
-		efree(old_tail);
+		pefree(old_tail, l->persistent);
 	}
 }
 
@@ -196,6 +196,19 @@ ZEND_API void zend_llist_apply_with_argument(zend_llist *l, void (*func)(void *d
 }
 
 
+ZEND_API void zend_llist_apply_with_arguments(zend_llist *l, llist_apply_with_args_func_t func, int num_args, ...)
+{
+	zend_llist_element *element;
+	va_list args;
+
+	va_start(args, num_args);
+	for (element=l->head; element; element=element->next) {
+		func(element->data, num_args, args);
+	}
+	va_end(args);
+}
+
+
 ZEND_API int zend_llist_count(zend_llist *l)
 {
 	zend_llist_element *element;
@@ -208,46 +221,54 @@ ZEND_API int zend_llist_count(zend_llist *l)
 }
 
 
-ZEND_API void *zend_llist_get_first(zend_llist *l)
+ZEND_API void *zend_llist_get_first_ex(zend_llist *l, zend_llist_position *pos)
 {
-	l->traverse_ptr = l->head;
-	if (l->traverse_ptr) {
-		return l->traverse_ptr->data;
+	zend_llist_position *current = pos ? pos : &l->traverse_ptr;
+
+	*current = l->head;
+	if (*current) {
+		return (*current)->data;
 	} else {
 		return NULL;
 	}
 }
 
 
-ZEND_API void *zend_llist_get_last(zend_llist *l)
+ZEND_API void *zend_llist_get_last_ex(zend_llist *l, zend_llist_position *pos)
 {
-	l->traverse_ptr = l->tail;
-	if (l->traverse_ptr) {
-		return l->traverse_ptr->data;
+	zend_llist_position *current = pos ? pos : &l->traverse_ptr;
+
+	*current = l->tail;
+	if (*current) {
+		return (*current)->data;
 	} else {
 		return NULL;
 	}
 }
 
 
-ZEND_API void *zend_llist_get_next(zend_llist *l)
+ZEND_API void *zend_llist_get_next_ex(zend_llist *l, zend_llist_position *pos)
 {
-	if (l->traverse_ptr) {
-		l->traverse_ptr = l->traverse_ptr->next;
-		if (l->traverse_ptr) {
-			return l->traverse_ptr->data;
+	zend_llist_position *current = pos ? pos : &l->traverse_ptr;
+
+	if (*current) {
+		*current = (*current)->next;
+		if (*current) {
+			return (*current)->data;
 		}
 	}
 	return NULL;
 }
 
 
-ZEND_API void *zend_llist_get_prev(zend_llist *l)
+ZEND_API void *zend_llist_get_prev_ex(zend_llist *l, zend_llist_position *pos)
 {
-	if (l->traverse_ptr) {
-		l->traverse_ptr = l->traverse_ptr->prev;
-		if (l->traverse_ptr) {
-			return l->traverse_ptr->data;
+	zend_llist_position *current = pos ? pos : &l->traverse_ptr;
+
+	if (*current) {
+		*current = (*current)->prev;
+		if (*current) {
+			return (*current)->data;
 		}
 	}
 	return NULL;

Zend/zend_llist.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_LLIST_H
-#define _ZEND_LLIST_H
+#ifndef ZEND_LLIST_H
+#define ZEND_LLIST_H
 
 #include <stdlib.h>
 
@@ -38,7 +38,12 @@ typedef struct _zend_llist {
 	zend_llist_element *traverse_ptr;
 } zend_llist;
 
-typedef int (*llist_compare_func_t) (const zend_llist_element *, const zend_llist_element *);
+typedef int (*llist_compare_func_t)(const zend_llist_element *, const zend_llist_element *);
+typedef void(*llist_apply_with_arg_func_t)(void *data, void *arg);
+typedef void(*llist_apply_with_args_func_t)(void *data, int num_args, va_list args);
+typedef void (*llist_apply_func_t)(void *);
+
+typedef zend_llist_element* zend_llist_position;
 
 BEGIN_EXTERN_C()
 ZEND_API void zend_llist_init(zend_llist *l, size_t size, void (*dtor)(void *data), unsigned char persistent);
@@ -49,16 +54,23 @@ ZEND_API void zend_llist_destroy(zend_llist *l);
 ZEND_API void zend_llist_clean(zend_llist *l);
 ZEND_API void zend_llist_remove_tail(zend_llist *l);
 ZEND_API void zend_llist_copy(zend_llist *dst, zend_llist *src);
-ZEND_API void zend_llist_apply(zend_llist *l, void (*func)(void *data));
-ZEND_API void zend_llist_apply_with_argument(zend_llist *l, void (*func)(void *data, void *arg), void *arg);
+ZEND_API void zend_llist_apply(zend_llist *l, llist_apply_func_t);
+ZEND_API void zend_llist_apply_with_argument(zend_llist *l, llist_apply_with_arg_func_t, void *arg);
+ZEND_API void zend_llist_apply_with_arguments(zend_llist *l, llist_apply_with_args_func_t func, int num_args, ...);
 ZEND_API int zend_llist_count(zend_llist *l);
 ZEND_API void zend_llist_sort(zend_llist *l, llist_compare_func_t comp_func);
 
 /* traversal */
-ZEND_API void *zend_llist_get_first(zend_llist *l);
-ZEND_API void *zend_llist_get_last(zend_llist *l);
-ZEND_API void *zend_llist_get_next(zend_llist *l);
-ZEND_API void *zend_llist_get_prev(zend_llist *l);
+ZEND_API void *zend_llist_get_first_ex(zend_llist *l, zend_llist_position *pos);
+ZEND_API void *zend_llist_get_last_ex(zend_llist *l, zend_llist_position *pos);
+ZEND_API void *zend_llist_get_next_ex(zend_llist *l, zend_llist_position *pos);
+ZEND_API void *zend_llist_get_prev_ex(zend_llist *l, zend_llist_position *pos);
+
+#define zend_llist_get_first(l) zend_llist_get_first_ex(l, NULL)
+#define zend_llist_get_last(l) zend_llist_get_last_ex(l, NULL)
+#define zend_llist_get_next(l) zend_llist_get_next_ex(l, NULL)
+#define zend_llist_get_prev(l) zend_llist_get_prev_ex(l, NULL)
+
 END_EXTERN_C()
 
-#endif /* _ZEND_LLIST_H */
+#endif /* ZEND_LLIST_H */

Zend/zend_modules.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,16 +18,33 @@
 */
 
 
-#ifndef _MODULES_H
-#define _MODULES_H
+#ifndef MODULES_H
+#define MODULES_H
 
 #define INIT_FUNC_ARGS		int type, int module_number ELS_DC
 #define INIT_FUNC_ARGS_PASSTHRU	type, module_number ELS_CC
 #define SHUTDOWN_FUNC_ARGS	int type, int module_number
 #define SHUTDOWN_FUNC_ARGS_PASSTHRU type, module_number
 #define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module
+#define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module
+#define GINIT_FUNC_ARGS		void
+#define GINIT_FUNC_ARGS_PASSTHRU
 
-#define STANDARD_MODULE_PROPERTIES_EX 0, 0, NULL, 0
+extern unsigned char first_arg_force_ref[];
+extern unsigned char first_arg_allow_ref[];
+extern unsigned char second_arg_force_ref[];
+extern unsigned char second_arg_allow_ref[];
+
+#include "zend.h"
+
+#define ZEND_MODULE_API_NO 20000609
+#ifdef ZTS
+#define USING_ZTS 1
+#else
+#define USING_ZTS 0
+#endif
+
+#define STANDARD_MODULE_PROPERTIES_EX 0, 0, 0, NULL, 0, ZEND_DEBUG, USING_ZTS, ZEND_MODULE_API_NO
 
 #define STANDARD_MODULE_PROPERTIES \
 	NULL, NULL, STANDARD_MODULE_PROPERTIES_EX
@@ -47,10 +64,14 @@ struct _zend_module_entry {
 	void (*info_func)(ZEND_MODULE_INFO_FUNC_ARGS);
 	int (*global_startup_func)(void);
 	int (*global_shutdown_func)(void);
+	int globals_id;
 	int module_started;
 	unsigned char type;
 	void *handle;
 	int module_number;
+	unsigned char zend_debug;
+	unsigned char zts;
+	unsigned int zend_api;
 };
 
 

Zend/zend_opcode.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -23,8 +23,6 @@
 #include "zend.h"
 #include "zend_alloc.h"
 #include "zend_compile.h"
-#include "zend_variables.h"
-#include "zend_operators.h"
 #include "zend_extensions.h"
 #include "zend_API.h"
 
@@ -32,11 +30,7 @@
 static void zend_extension_op_array_ctor_handler(zend_extension *extension, zend_op_array *op_array)
 {
 	if (extension->op_array_ctor) {
-		if (extension->resource_number>=0) {
-			extension->op_array_ctor(&op_array->reserved[extension->resource_number]);
-		} else {
-			extension->op_array_ctor(NULL);
-		}
+		extension->op_array_ctor(op_array);
 	}
 }
 
@@ -44,11 +38,7 @@ static void zend_extension_op_array_ctor_handler(zend_extension *extension, zend
 static void zend_extension_op_array_dtor_handler(zend_extension *extension, zend_op_array *op_array)
 {
 	if (extension->op_array_dtor) {
-		if (extension->resource_number>=0) {
-			extension->op_array_dtor(&op_array->reserved[extension->resource_number]);
-		} else {
-			extension->op_array_dtor(NULL);
-		}
+		extension->op_array_dtor(op_array);
 	}
 }
 
@@ -60,9 +50,9 @@ static void op_array_alloc_ops(zend_op_array *op_array)
 
 
 
-void init_op_array(zend_op_array *op_array, int initial_ops_size)
+void init_op_array(zend_op_array *op_array, int type, int initial_ops_size)
 {
-	op_array->type = ZEND_USER_FUNCTION;
+	op_array->type = type;
 #if SUPPORT_INTERACTIVE
 	{
 		ELS_FETCH();
@@ -78,7 +68,7 @@ void init_op_array(zend_op_array *op_array, int initial_ops_size)
 	}
 #endif
 
-	op_array->refcount = (int *) emalloc(sizeof(int));
+	op_array->refcount = (zend_uint *) emalloc(sizeof(zend_uint));
 	*op_array->refcount = 1;
 	op_array->size = initial_ops_size;
 	op_array->last = 0;
@@ -100,6 +90,7 @@ void init_op_array(zend_op_array *op_array, int initial_ops_size)
 	op_array->uses_globals = 0;
 
 	op_array->return_reference = 0;
+	op_array->done_pass_two = 0;
 
 	zend_llist_apply_with_argument(&zend_extensions, (void (*)(void *, void *)) zend_extension_op_array_ctor_handler, op_array);
 }
@@ -187,27 +178,26 @@ ZEND_API void destroy_op_array(zend_op_array *op_array)
 	if (op_array->brk_cont_array) {
 		efree(op_array->brk_cont_array);
 	}
-	zend_llist_apply_with_argument(&zend_extensions, (void (*)(void *, void *)) zend_extension_op_array_dtor_handler, op_array);
+	if (op_array->done_pass_two) {
+		zend_llist_apply_with_argument(&zend_extensions, (void (*)(void *, void *)) zend_extension_op_array_dtor_handler, op_array);
+	}
 }
 
 
 void init_op(zend_op *op CLS_DC)
 {
+	memset(&op->result, 0, sizeof(znode));
 	op->lineno = CG(zend_lineno);
 	op->filename = zend_get_compiled_filename(CLS_C);
 	op->result.op_type = IS_UNUSED;
 	op->extended_value = 0;
-	op->op1.u.EA.var = 0;
-	op->op1.u.EA.type = 0;
-	op->op2.u.EA.var = 0;
-	op->op2.u.EA.type = 0;
-	op->result.u.EA.var = 0;
-	op->result.u.EA.type = 0;
+	memset(&op->op1, 0, sizeof(znode));
+	memset(&op->op2, 0, sizeof(znode));
 }
 
 zend_op *get_next_op(zend_op_array *op_array CLS_DC)
 {
-	int next_op_num = op_array->last++;
+	zend_uint next_op_num = op_array->last++;
 	zend_op *next_op;
 
 	if (next_op_num >= op_array->size) {
@@ -302,11 +292,12 @@ int pass_two(zend_op_array *op_array)
 	if (CG(handle_op_arrays)) {
 		zend_llist_apply_with_argument(&zend_extensions, (void (*)(void *, void *)) zend_extension_op_array_handler, op_array);
 	}
+	op_array->done_pass_two = 1;
 	return 0;
 }
 
 
-void pass_include_eval(zend_op_array *op_array)
+ZEND_API void pass_include_eval(zend_op_array *op_array)
 {
 	zend_op *opline=op_array->opcodes, *end=opline+op_array->last;
 
@@ -386,6 +377,9 @@ ZEND_API void *get_binary_op(int opcode)
 		case ZEND_IS_IDENTICAL:
 			return (void *) is_identical_function;
 			break;
+		case ZEND_IS_NOT_IDENTICAL:
+			return (void *) is_not_identical_function;
+			break;
 		case ZEND_IS_EQUAL:
 			return (void *) is_equal_function;
 			break;

Zend/zend_operators.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <ctype.h>
+#include <math.h>
 
 #include "zend.h"
 #include "zend_operators.h"
@@ -31,11 +32,55 @@
 #include "zend_list.h"
 #include "zend_fast_cache.h"
 
-
 #if WITH_BCMATH
 #include "ext/bcmath/number.h"
 #endif
 
+ZEND_API double zend_string_to_double(const char *number, zend_uint length)
+{
+	double divisor = 10.0;
+	double result = 0.0;
+	double exponent;
+	const char *end = number+length;
+	const char *digit = number;
+
+	if (!length) {
+		return result;
+	}
+
+	while (digit < end) {
+		if ((*digit <= '9' && *digit >= '0')) {
+			result *= 10;
+			result += *digit - '0';
+		} else if (*digit == '.') {
+			digit++;
+			break;
+		} else if (toupper(*digit) == 'E') {
+			exponent = (double) atoi(digit+1);
+			result *= pow(10.0, exponent);
+			return result;
+		} else {
+			return result;
+		}
+		digit++;
+	}
+
+	while (digit < end) {
+		if ((*digit <= '9' && *digit >= '0')) {
+			result += (*digit - '0') / divisor;
+			divisor *= 10;
+		} else if (toupper(*digit) == 'E') {
+			exponent = (double) atoi(digit+1);
+			result *= pow(10.0, exponent);
+			return result;
+		} else {
+			return result;
+		}
+		digit++;
+	}
+	return result;
+}
+
 
 ZEND_API void convert_scalar_to_number(zval *op)
 {
@@ -312,7 +357,7 @@ ZEND_API void convert_to_boolean(zval *op)
 }
 
 
-ZEND_API void convert_to_string(zval *op)
+ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC)
 {
 	long lval;
 	double dval;
@@ -327,34 +372,40 @@ ZEND_API void convert_to_string(zval *op)
 			break;
 		case IS_BOOL:
 			if (op->value.lval) {
-				op->value.str.val = estrndup("1", 1);
+				op->value.str.val = estrndup_rel("1", 1);
 				op->value.str.len = 1;
 			} else {
 				op->value.str.val = empty_string;
 				op->value.str.len = 0;
 			}
 			break;
+		case IS_RESOURCE: {
+			long tmp = op->value.lval;
+			op->value.str.val = (char *) emalloc(sizeof("Resource id #")-1 + MAX_LENGTH_OF_LONG);
+			op->value.str.len = sprintf(op->value.str.val, "Resource id #%ld", tmp);
+			break;
+		}
 		case IS_LONG:
 			lval = op->value.lval;
 
-			op->value.str.val = (char *) emalloc(MAX_LENGTH_OF_LONG + 1);
+			op->value.str.val = (char *) emalloc_rel(MAX_LENGTH_OF_LONG + 1);
 			op->value.str.len = zend_sprintf(op->value.str.val, "%ld", lval);  /* SAFE */
 			break;
 		case IS_DOUBLE: {
 			dval = op->value.dval;
-			op->value.str.val = (char *) emalloc(MAX_LENGTH_OF_DOUBLE + EG(precision) + 1);
+			op->value.str.val = (char *) emalloc_rel(MAX_LENGTH_OF_DOUBLE + EG(precision) + 1);
 			op->value.str.len = zend_sprintf(op->value.str.val, "%.*G", (int) EG(precision), dval);  /* SAFE */
 			/* %G already handles removing trailing zeros from the fractional part, yay */
 			break;
 		}
 		case IS_ARRAY:
 			zval_dtor(op);
-			op->value.str.val = estrndup("Array",sizeof("Array")-1);
+			op->value.str.val = estrndup_rel("Array",sizeof("Array")-1);
 			op->value.str.len = sizeof("Array")-1;
 			break;
 		case IS_OBJECT:
 			zval_dtor(op);
-			op->value.str.val = estrndup("Object",sizeof("Object")-1);
+			op->value.str.val = estrndup_rel("Object",sizeof("Object")-1);
 			op->value.str.len = sizeof("Object")-1;
 			break;
 		default:
@@ -726,7 +777,8 @@ ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2)
 	
 	if (op1->type == IS_STRING && op2->type == IS_STRING) {
 		zval *longer, *shorter;
-		int i;
+		char *result_str;
+		int i, result_len;
 
 		if (op1->value.str.len >= op2->value.str.len) {
 			longer = op1;
@@ -736,11 +788,17 @@ ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2)
 			shorter = op1;
 		}
 
-		result->value.str.len = longer->value.str.len;
-		result->value.str.val = estrndup(longer->value.str.val, longer->value.str.len);
+		result->type = IS_STRING;
+		result_len = longer->value.str.len;
+		result_str = estrndup(longer->value.str.val, longer->value.str.len);
 		for (i = 0; i < shorter->value.str.len; i++) {
-			result->value.str.val[i] |= shorter->value.str.val[i];
+			result_str[i] |= shorter->value.str.val[i];
 		}
+		if (result==op1) {
+			efree(result->value.str.val);
+		}
+		result->value.str.val = result_str;
+		result->value.str.len = result_len;
 		return SUCCESS;
 	}
 	zendi_convert_to_long(op1, op1_copy, result);
@@ -758,7 +816,8 @@ ZEND_API int bitwise_and_function(zval *result, zval *op1, zval *op2)
 	
 	if (op1->type == IS_STRING && op2->type == IS_STRING) {
 		zval *longer, *shorter;
-		int i;
+		char *result_str;
+		int i, result_len;
 
 		if (op1->value.str.len >= op2->value.str.len) {
 			longer = op1;
@@ -768,11 +827,17 @@ ZEND_API int bitwise_and_function(zval *result, zval *op1, zval *op2)
 			shorter = op1;
 		}
 
-		result->value.str.len = shorter->value.str.len;
-		result->value.str.val = estrndup(shorter->value.str.val, shorter->value.str.len);
+		result->type = IS_STRING;
+		result_len = shorter->value.str.len;
+		result_str = estrndup(shorter->value.str.val, shorter->value.str.len);
 		for (i = 0; i < shorter->value.str.len; i++) {
-			result->value.str.val[i] &= longer->value.str.val[i];
+			result_str[i] &= longer->value.str.val[i];
 		}
+		if (result==op1) {
+			efree(result->value.str.val);
+		}
+		result->value.str.val = result_str;
+		result->value.str.len = result_len;
 		return SUCCESS;
 	}
 	
@@ -792,7 +857,8 @@ ZEND_API int bitwise_xor_function(zval *result, zval *op1, zval *op2)
 	
 	if (op1->type == IS_STRING && op2->type == IS_STRING) {
 		zval *longer, *shorter;
-		int i;
+		char *result_str;
+		int i, result_len;
 
 		if (op1->value.str.len >= op2->value.str.len) {
 			longer = op1;
@@ -802,11 +868,17 @@ ZEND_API int bitwise_xor_function(zval *result, zval *op1, zval *op2)
 			shorter = op1;
 		}
 
-		result->value.str.len = shorter->value.str.len;
-		result->value.str.val = estrndup(shorter->value.str.val, shorter->value.str.len);
+		result->type = IS_STRING;
+		result_len = shorter->value.str.len;
+		result_str = estrndup(shorter->value.str.val, shorter->value.str.len);
 		for (i = 0; i < shorter->value.str.len; i++) {
-			result->value.str.val[i] ^= longer->value.str.val[i];
+			result_str[i] ^= longer->value.str.val[i];
 		}
+		if (result==op1) {
+			efree(result->value.str.val);
+		}
+		result->value.str.val = result_str;
+		result->value.str.len = result_len;
 		return SUCCESS;
 	}
 
@@ -849,7 +921,7 @@ ZEND_API int add_char_to_string(zval *result, zval *op1, zval *op2)
 {
 	result->value.str.len = op1->value.str.len + 1;
 	result->value.str.val = (char *) erealloc(op1->value.str.val, result->value.str.len+1);
-    result->value.str.val[result->value.str.len - 1] = op2->value.chval;
+    result->value.str.val[result->value.str.len - 1] = (char) op2->value.lval;
 	result->value.str.val[result->value.str.len] = 0;
 	result->type = IS_STRING;
 	return SUCCESS;
@@ -914,10 +986,70 @@ ZEND_API int concat_function(zval *result, zval *op1, zval *op2)
 }
 
 
+ZEND_API int string_compare_function(zval *result, zval *op1, zval *op2)
+{
+	zval op1_copy, op2_copy;
+	int use_copy1, use_copy2;
+
+	zend_make_printable_zval(op1, &op1_copy, &use_copy1);
+	zend_make_printable_zval(op2, &op2_copy, &use_copy2);
+
+	if (use_copy1) {
+		op1 = &op1_copy;
+	}
+	if (use_copy2) {
+		op2 = &op2_copy;
+	}
+
+	result->value.lval = zend_binary_zval_strcmp(op1, op2);
+	result->type = IS_LONG;
+
+	if (use_copy1) {
+		zval_dtor(op1);
+	}
+	if (use_copy2) {
+		zval_dtor(op2);
+	}
+	return SUCCESS;
+}
+
+ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2)
+{
+	zval op1_copy, op2_copy;
+
+	op1_copy = *op1;
+	zval_copy_ctor(&op1_copy);
+
+	op2_copy = *op2;
+	zval_copy_ctor(&op2_copy);
+
+	convert_to_double(&op1_copy);
+	convert_to_double(&op2_copy);
+
+	result->value.lval = ZEND_NORMALIZE_BOOL(op1_copy.value.dval-op2_copy.value.dval);
+	result->type = IS_LONG;
+
+	return SUCCESS;
+}
+
+
 ZEND_API int compare_function(zval *result, zval *op1, zval *op2)
 {
 	zval op1_copy, op2_copy;
 
+	if ((op1->type == IS_NULL && op2->type == IS_STRING)
+		|| (op2->type == IS_NULL && op1->type == IS_STRING)) {
+		if (op1->type == IS_NULL) {
+			result->type = IS_LONG;
+			result->value.lval = zend_binary_strcmp("", 0, op2->value.str.val, op2->value.str.len);
+			return SUCCESS;
+		} else {
+			result->type = IS_LONG;
+			result->value.lval = zend_binary_strcmp(op1->value.str.val, op1->value.str.len, "", 0);
+			return SUCCESS;
+		}
+	}
+		
 	if (op1->type == IS_STRING && op2->type == IS_STRING) {
 		zendi_smart_strcmp(result, op1, op2);
 		return SUCCESS;
@@ -928,7 +1060,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2)
 		zendi_convert_to_boolean(op1, op1_copy, result);
 		zendi_convert_to_boolean(op2, op2_copy, result);
 		result->type = IS_LONG;
-		result->value.lval = op1->value.lval - op2->value.lval;
+		result->value.lval = ZEND_NORMALIZE_BOOL(op1->value.lval-op2->value.lval);
 		return SUCCESS;
 	}
 
@@ -937,24 +1069,68 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2)
 
 	if (op1->type == IS_LONG && op2->type == IS_LONG) {
 		result->type = IS_LONG;
-		result->value.lval = op1->value.lval - op2->value.lval;
+		result->value.lval = ZEND_NORMALIZE_BOOL(op1->value.lval-op2->value.lval);
 		return SUCCESS;
 	}
 	if ((op1->type == IS_DOUBLE || op1->type == IS_LONG)
 		&& (op2->type == IS_DOUBLE || op2->type == IS_LONG)) {
 		result->value.dval = (op1->type == IS_LONG ? (double) op1->value.lval : op1->value.dval) - (op2->type == IS_LONG ? (double) op2->value.lval : op2->value.dval);
-		result->type = IS_DOUBLE;
+		result->value.lval = ZEND_NORMALIZE_BOOL(result->value.dval);
+		result->type = IS_LONG;
 		return SUCCESS;
 	}
-	if ((op1->type==IS_ARRAY || op1->type==IS_OBJECT)
-		&& (op2->type==IS_ARRAY || op2->type==IS_OBJECT)) {
-		zend_error(E_WARNING,"Cannot compare arrays or objects");
+	if (op1->type==IS_ARRAY && op2->type==IS_ARRAY) {
+		zend_compare_arrays(result, op1, op2);
+		return SUCCESS;
 	}
+
+	if (op1->type==IS_OBJECT && op2->type==IS_OBJECT) {
+		zend_compare_objects(result, op1, op2);
+		return SUCCESS;
+	}
+
+	if (op1->type==IS_ARRAY) {
+		result->value.lval = 1;
+		result->type = IS_LONG;
+		return SUCCESS;
+	}
+	if (op2->type==IS_ARRAY) {
+		result->value.lval = -1;
+		result->type = IS_LONG;
+		return SUCCESS;
+	}
+	if (op1->type==IS_OBJECT) {
+		result->value.lval = 1;
+		result->type = IS_LONG;
+		return SUCCESS;
+	}
+	if (op2->type==IS_OBJECT) {
+		result->value.lval = -1;
+		result->type = IS_LONG;
+		return SUCCESS;
+	}
+
 	var_reset(result);
 	return FAILURE;
 }
 
 
+static int hash_zval_identical_function(const zval **z1, const zval **z2)
+{
+	zval result;
+
+	/* is_identical_function() returns 1 in case of identity and 0 in case
+	 * of a difference;
+	 * whereas this comparison function is expected to return 0 on identity,
+	 * and non zero otherwise.
+	 */
+	if (is_identical_function(&result, (zval *) *z1, (zval *) *z2)==FAILURE) {
+		return 1;
+	}
+	return !result.value.lval;
+}
+
+
 ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2)
 {
 	result->type = IS_BOOL;
@@ -965,17 +1141,14 @@ ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2)
 	switch (op1->type) {
 		case IS_NULL:
 			result->value.lval = (op2->type==IS_NULL);
-			return SUCCESS;
 			break;
 		case IS_BOOL:
 		case IS_LONG:
 		case IS_RESOURCE:
 			result->value.lval = (op1->value.lval == op2->value.lval);
-			return SUCCESS;
 			break;
 		case IS_DOUBLE:
 			result->value.lval = (op1->value.dval == op2->value.dval);
-			return SUCCESS;
 			break;
 		case IS_STRING:
 			if ((op1->value.str.len == op2->value.str.len)
@@ -984,17 +1157,44 @@ ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2)
 			} else {
 				result->value.lval = 0;
 			}
-			return SUCCESS;
 			break;
 		case IS_ARRAY:
-		case IS_OBJECT:
-			zend_error(E_WARNING,"Cannot compare arrays or objects");
+			if (zend_hash_compare(op1->value.ht, op2->value.ht, (compare_func_t) hash_zval_identical_function, 1)==0) {
+				result->value.lval = 1;
+			} else {
+				result->value.lval = 0;
+			}
 			break;
+		case IS_OBJECT:
+			if (op1->value.obj.ce != op2->value.obj.ce) {
+				result->value.lval = 0;
+			} else {
+				if (zend_hash_compare(op1->value.obj.properties, op2->value.obj.properties, (compare_func_t) hash_zval_identical_function, 1)==0) {
+					result->value.lval = 1;
+				} else {
+					result->value.lval = 0;
+				}
+			}
+			break;
+		default:
+			var_reset(result);
+			return FAILURE;
 	}
-	var_reset(result);
-	return FAILURE;
+	return SUCCESS;
 }
 
+
+ZEND_API int is_not_identical_function(zval *result, zval *op1, zval *op2)
+{
+   result->type = IS_BOOL;
+   if (is_identical_function( result, op1, op2 ) == FAILURE) {
+	  return FAILURE;
+   }
+   result->value.lval = !result->value.lval;
+   return SUCCESS;
+}
+
+
 ZEND_API int is_equal_function(zval *result, zval *op1, zval *op2)
 {
 	if (compare_function(result, op1, op2) == FAILURE) {
@@ -1031,6 +1231,7 @@ ZEND_API int is_smaller_function(zval *result, zval *op1, zval *op2)
 		return FAILURE;
 	}
 	if (result->type == IS_LONG) {
+		result->type = IS_BOOL;
 		if (result->value.lval < 0) {
 			result->value.lval = 1;
 		} else {
@@ -1039,7 +1240,7 @@ ZEND_API int is_smaller_function(zval *result, zval *op1, zval *op2)
 		return SUCCESS;
 	}
 	if (result->type == IS_DOUBLE) {
-		result->type = IS_LONG;
+		result->type = IS_BOOL;
 		if (result->value.dval < 0) {
 			result->value.lval = 1;
 		} else {
@@ -1058,6 +1259,7 @@ ZEND_API int is_smaller_or_equal_function(zval *result, zval *op1, zval *op2)
 		return FAILURE;
 	}
 	if (result->type == IS_LONG) {
+		result->type = IS_BOOL;
 		if (result->value.lval <= 0) {
 			result->value.lval = 1;
 		} else {
@@ -1066,7 +1268,7 @@ ZEND_API int is_smaller_or_equal_function(zval *result, zval *op1, zval *op2)
 		return SUCCESS;
 	}
 	if (result->type == IS_DOUBLE) {
-		result->type = IS_LONG;
+		result->type = IS_BOOL;
 		if (result->value.dval <= 0) {
 			result->value.lval = 1;
 		} else {
@@ -1254,21 +1456,39 @@ ZEND_API int zend_binary_strncmp(char *s1, uint len1, char *s2, uint len2, uint
 
 ZEND_API int zend_binary_strcasecmp(char *s1, uint len1, char *s2, uint len2)
 {
-	unsigned char c1 = 0, c2 = 0;
+	int len;
+	int c1,c2;
 
-	if (len1 != len2 || !len1) {
-		return len1 - len2;
-	}
+	len = MIN(len1, len2);
 
-	while (len1--) {
+	while (len--) {
 		c1 = tolower(*s1++);
 		c2 = tolower(*s2++);
 		if (c1 != c2) {
-			break;
+			return c1 - c2;
 		}
 	}
 
-	return c1 - c2;
+	return len1 - len2;
+}
+
+
+ZEND_API int zend_binary_strncasecmp(char *s1, uint len1, char *s2, uint len2, uint length)
+{
+	int len;
+	int c1,c2;
+
+	len = MIN(length, MIN(len1, len2));
+
+	while (len--) {
+		c1 = tolower(*s1++);
+		c2 = tolower(*s2++);
+		if (c1 != c2) {
+			return c1 - c2;
+		}
+	}
+
+	return len1 - len2;
 }
 
 
@@ -1289,6 +1509,12 @@ ZEND_API int zend_binary_zval_strcasecmp(zval *s1, zval *s2)
 }
 
 
+ZEND_API int zend_binary_zval_strncasecmp(zval *s1, zval *s2, zval *s3)
+{
+	return zend_binary_strncasecmp(s1->value.str.val, s1->value.str.len, s2->value.str.val, s2->value.str.len, s3->value.lval);
+}
+
+
 ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2)
 {
 	int ret1,ret2;
@@ -1307,6 +1533,7 @@ ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2)
 			str2num(&first,s1->value.str.val,100); /* this scale should do */
 			str2num(&second,s2->value.str.val,100); /* ditto */
 			result->value.lval = bc_compare(first,second);
+			result->value.lval = ZEND_NORMALIZE_BOOL(result->value.lval);
 			result->type = IS_LONG;
 			free_num(&first);
 			free_num(&second);
@@ -1319,79 +1546,65 @@ ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2)
 				dval2 = strtod(s2->value.str.val, NULL);
 			}
 			result->value.dval = dval1 - dval2;
-			result->type = IS_DOUBLE;
+			result->value.lval = ZEND_NORMALIZE_BOOL(result->value.dval);
+			result->type = IS_LONG;
 		} else { /* they both have to be long's */
 			result->value.lval = lval1 - lval2;
+			result->value.lval = ZEND_NORMALIZE_BOOL(result->value.lval);
 			result->type = IS_LONG;
 		}
 	} else {
 		result->value.lval = zend_binary_zval_strcmp(s1, s2);
+		result->value.lval = ZEND_NORMALIZE_BOOL(result->value.lval);
 		result->type = IS_LONG;
 	}
 	return;	
 }
 
 
+static int hash_zval_compare_function(const zval **z1, const zval **z2)
+{
+	zval result;
+
+	if (compare_function(&result, (zval *) *z1, (zval *) *z2)==FAILURE) {
+		return 1;
+	}
+	return result.value.lval;
+}
+
+
+
+ZEND_API void zend_compare_symbol_tables(zval *result, HashTable *ht1, HashTable *ht2)
+{
+	result->type = IS_LONG;
+	result->value.lval = zend_hash_compare(ht1, ht2, (compare_func_t) hash_zval_compare_function, 0);
+}
+
+
+ZEND_API void zend_compare_arrays(zval *result, zval *a1, zval *a2)
+{
+	zend_compare_symbol_tables(result, a1->value.ht, a2->value.ht);
+}
+
+
+ZEND_API void zend_compare_objects(zval *result, zval *o1, zval *o2)
+{
+	if (o1->value.obj.ce != o2->value.obj.ce) {
+		result->value.lval = 1;	/* Comparing objects of different types is pretty much meaningless */
+		result->type = IS_LONG;
+		return;
+	}
+	zend_compare_symbol_tables(result, o1->value.obj.properties, o2->value.obj.properties);
+}
+
+
 /* returns 0 for non-numeric string
  * returns IS_DOUBLE for floating point string, and assigns the value to *dval (if it's not NULL)
  * returns IS_LONG for integer strings, and assigns the value to *lval (if it's not NULL)
  * returns FLAG_IS_BC if the number might lose accuracy when converted to a double
  */
  
-#if 1
-ZEND_API inline int is_numeric_string(char *str, int length, long *lval, double *dval)
-{
-	long local_lval;
-	double local_dval;
-	char *end_ptr;
-
-	if (!length) {
-		return 0;
-	}
-	
-	errno=0;
-	local_lval = strtol(str, &end_ptr, 10);
-	if (errno!=ERANGE && end_ptr == str+length) { /* integer string */
-		if (lval) {
-			*lval = local_lval;
-		}
-		return IS_LONG;
-	}
-
-	errno=0;
-	local_dval = strtod(str, &end_ptr);
-	if (errno!=ERANGE && end_ptr == str+length) { /* floating point string */
-		if (dval) {
-			*dval = local_dval;
-		}
-#if WITH_BCMATH
-		if (length>16) {
-			register char *ptr=str, *end=str+length;
-			
-			while(ptr<end) {
-				switch(*ptr++) {
-					case 'e':
-					case 'E':
-						/* scientific notation, not handled by the BC library */
-						return IS_DOUBLE;
-						break;
-					default:
-						break;
-				}
-			}
-			return FLAG_IS_BC;
-		} else {
-			return IS_DOUBLE;
-		}
-#else
-		return IS_DOUBLE;
-#endif
-	}
-	
-	return 0;
-}
-
-#else
+#if 0
 
 static inline int is_numeric_string(char *str, int length, long *lval, double *dval)
 {

Zend/zend_operators.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,19 @@
 */
 
 
-#ifndef _OPERATORS_H
-#define _OPERATORS_H
+#ifndef ZEND_OPERATORS_H
+#define ZEND_OPERATORS_H
+
+#include <errno.h>
+#include <math.h>
+
+#ifdef HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
+
+#if WITH_BCMATH
+#include "ext/bcmath/number.h"
+#endif
 
 #define MAX_LENGTH_OF_LONG 18
 #define MAX_LENGTH_OF_DOUBLE 32
@@ -43,17 +54,77 @@ ZEND_API int concat_function(zval *result, zval *op1, zval *op2);
 
 ZEND_API int is_equal_function(zval *result, zval *op1, zval *op2);
 ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2);
+ZEND_API int is_not_identical_function(zval *result, zval *op1, zval *op2);
 ZEND_API int is_not_equal_function(zval *result, zval *op1, zval *op2);
 ZEND_API int is_smaller_function(zval *result, zval *op1, zval *op2);
 ZEND_API int is_smaller_or_equal_function(zval *result, zval *op1, zval *op2);
-ZEND_API inline int is_numeric_string(char *str, int length, long *lval, double *dval);
+ZEND_API inline int is_numeric_string(char *str, int length, long *lval, double *dval)
+#if defined(C9X_INLINE_SEMANTICS)
+{
+	long local_lval;
+	double local_dval;
+	char *end_ptr;
+
+	if (!length) {
+		return 0;
+	}
+	
+	errno=0;
+	local_lval = strtol(str, &end_ptr, 10);
+	if (errno!=ERANGE && end_ptr == str+length) { /* integer string */
+		if (lval) {
+			*lval = local_lval;
+		}
+		return IS_LONG;
+	}
+
+	errno=0;
+	local_dval = strtod(str, &end_ptr);
+	if (errno!=ERANGE && end_ptr == str+length) { /* floating point string */
+		if (! zend_finite(local_dval)) {
+			/* "inf","nan" and maybe other weird ones */
+			return 0;
+		}
+
+		if (dval) {
+			*dval = local_dval;
+		}
+#if WITH_BCMATH
+		if (length>16) {
+			register char *ptr=str, *end=str+length;
+			
+			while(ptr<end) {
+				switch(*ptr++) {
+					case 'e':
+					case 'E':
+						/* scientific notation, not handled by the BC library */
+						return IS_DOUBLE;
+						break;
+					default:
+						break;
+				}
+			}
+			return FLAG_IS_BC;
+		} else {
+			return IS_DOUBLE;
+		}
+#else
+		return IS_DOUBLE;
+#endif
+	}
+	
+	return 0;
+}
+#else
+;
+#endif
 
 ZEND_API int increment_function(zval *op1);
 ZEND_API int decrement_function(zval *op2);
 
 BEGIN_EXTERN_C()
 ZEND_API void convert_scalar_to_number(zval *op);
-ZEND_API void convert_to_string(zval *op);
+ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC);
 ZEND_API void convert_to_long(zval *op);
 ZEND_API void convert_to_double(zval *op);
 ZEND_API void convert_to_long_base(zval *op, int base);
@@ -63,19 +134,31 @@ ZEND_API void convert_to_array(zval *op);
 ZEND_API void convert_to_object(zval *op);
 ZEND_API int add_char_to_string(zval *result, zval *op1, zval *op2);
 ZEND_API int add_string_to_string(zval *result, zval *op1, zval *op2);
+#define convert_to_string(op)			_convert_to_string((op) ZEND_FILE_LINE_CC)
+
+ZEND_API double zend_string_to_double(const char *number, zend_uint length);
 END_EXTERN_C()
 
 ZEND_API int zval_is_true(zval *op);
 ZEND_API int compare_function(zval *result, zval *op1, zval *op2);
+ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2);
+ZEND_API int string_compare_function(zval *result, zval *op1, zval *op2);
 
 ZEND_API void zend_str_tolower(char *str, unsigned int length);
 ZEND_API int zend_binary_zval_strcmp(zval *s1, zval *s2);
 ZEND_API int zend_binary_zval_strncmp(zval *s1, zval *s2, zval *s3);
 ZEND_API int zend_binary_zval_strcasecmp(zval *s1, zval *s2);
+ZEND_API int zend_binary_zval_strncasecmp(zval *s1, zval *s2, zval *s3);
 ZEND_API int zend_binary_strcmp(char *s1, uint len1, char *s2, uint len2);
+ZEND_API int zend_binary_strncmp(char *s1, uint len1, char *s2, uint len2, uint length);
 ZEND_API int zend_binary_strcasecmp(char *s1, uint len1, char *s2, uint len2);
+ZEND_API int zend_binary_strncasecmp(char *s1, uint len1, char *s2, uint len2, uint length);
 
 ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2);
+ZEND_API void zend_compare_symbol_tables(zval *result, HashTable *ht1, HashTable *ht2);
+ZEND_API void zend_compare_arrays(zval *result, zval *a1, zval *a2);
+ZEND_API void zend_compare_objects(zval *result, zval *o1, zval *o2);
+
 
 #define convert_to_ex_master(ppzv, lower_type, upper_type)	\
 	if ((*ppzv)->type!=IS_##upper_type) {					\
@@ -85,6 +168,13 @@ ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2);
 		convert_to_##lower_type(*ppzv);						\
 	}
 
+#define convert_to_writable_ex_master(ppzv, lower_type, upper_type)	\
+	if ((*ppzv)->type!=IS_##upper_type) {							\
+		SEPARATE_ZVAL(ppzv);										\
+		convert_to_##lower_type(*ppzv);								\
+	}
+
+
 #define convert_to_boolean_ex(ppzv)	convert_to_ex_master(ppzv, boolean, BOOL)
 #define convert_to_long_ex(ppzv)	convert_to_ex_master(ppzv, long, LONG)
 #define convert_to_double_ex(ppzv)	convert_to_ex_master(ppzv, double, DOUBLE)
@@ -93,6 +183,15 @@ ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2);
 #define convert_to_object_ex(ppzv)	convert_to_ex_master(ppzv, object, OBJECT)
 #define convert_to_null_ex(ppzv)	convert_to_ex_master(ppzv, null, NULL)
 
+#define convert_to_writable_boolean_ex(ppzv)	convert_to_writable_ex_master(ppzv, boolean, BOOL)
+#define convert_to_writable_long_ex(ppzv)		convert_to_writable_ex_master(ppzv, long, LONG)
+#define convert_to_writable_double_ex(ppzv)		convert_to_writable_ex_master(ppzv, double, DOUBLE)
+#define convert_to_writable_string_ex(ppzv)		convert_to_writable_ex_master(ppzv, string, STRING)
+#define convert_to_writable_array_ex(ppzv)		convert_to_writable_ex_master(ppzv, array, ARRAY)
+#define convert_to_writable_object_ex(ppzv)		convert_to_writable_ex_master(ppzv, object, OBJECT)
+#define convert_to_writable_null_ex(ppzv)		convert_to_writable_ex_master(ppzv, null, NULL)
+
+
 #define convert_scalar_to_number_ex(ppzv)							\
 	if ((*ppzv)->type!=IS_LONG && (*ppzv)->type!=IS_DOUBLE) {		\
 		if (!(*ppzv)->is_ref) {										\
@@ -101,4 +200,28 @@ ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2);
 		convert_scalar_to_number(*ppzv);							\
 	}
 
+
+
+#define Z_LVAL(zval)		(zval).value.lval
+#define Z_DVAL(zval)		(zval).value.dval
+#define Z_STRVAL(zval)		(zval).value.str.val
+#define Z_STRLEN(zval)		(zval).value.str.len
+#define Z_ARRVAL(zval)		(zval).value.ht
+
+#define Z_LVAL_P(zval_p)		Z_LVAL(*zval_p)
+#define Z_DVAL_P(zval_p)		Z_DVAL(*zval_p)
+#define Z_STRVAL_P(zval_p)		Z_STRVAL(*zval_p)
+#define Z_STRLEN_P(zval_p)		Z_STRLEN(*zval_p)
+#define Z_ARRVAL_P(zval_p)		Z_ARRVAL(*zval_p)
+
+#define Z_LVAL_PP(zval_pp)		Z_LVAL(**zval_pp)
+#define Z_DVAL_PP(zval_pp)		Z_DVAL(**zval_pp)
+#define Z_STRVAL_PP(zval_pp)	Z_STRVAL(**zval_pp)
+#define Z_STRLEN_PP(zval_pp)	Z_STRLEN(**zval_pp)
+#define Z_ARRVAL_PP(zval_pp)	Z_ARRVAL(**zval_pp)
+
+#define Z_TYPE(zval)		(zval).type
+#define Z_TYPE_P(zval_p)	Z_TYPE(*zval_p)
+#define Z_TYPE_PP(zval_pp)	Z_TYPE(**zval_pp)
+
 #endif

Zend/zend_ptr_stack.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -104,11 +104,22 @@ ZEND_API void zend_ptr_stack_apply(zend_ptr_stack *stack, void (*func)(void *))
 }
 
 
-ZEND_API void zend_ptr_stack_clean(zend_ptr_stack *stack, void (*func)(void *))
+ZEND_API void zend_ptr_stack_clean(zend_ptr_stack *stack, void (*func)(void *), zend_bool free_elements)
 {
 	zend_ptr_stack_apply(stack, func);
+	if (free_elements) {
+		int i = stack->top;
+
+		while (--i >= 0) {
+			efree(stack->elements[i]);
+		}
+	}
 	stack->top = 0;
 	stack->top_element = stack->elements;
 }
 
 
+ZEND_API int zend_ptr_stack_num_elements(zend_ptr_stack *stack)
+{
+	return stack->top;
+}

Zend/zend_ptr_stack.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,11 +18,11 @@
 */
 
 
-#ifndef _ZEND_PTR_STACK_H
-#define _ZEND_PTR_STACK_H
+#ifndef ZEND_PTR_STACK_H
+#define ZEND_PTR_STACK_H
 
 typedef struct _zend_ptr_stack {
-	short top, max;
+	int top, max;
 	void **elements;
 	void **top_element;
 } zend_ptr_stack;
@@ -37,6 +37,7 @@ ZEND_API void *zend_ptr_stack_pop(zend_ptr_stack *stack);
 ZEND_API void zend_ptr_stack_n_pop(zend_ptr_stack *stack, int count, ...);
 ZEND_API void zend_ptr_stack_destroy(zend_ptr_stack *stack);
 ZEND_API void zend_ptr_stack_apply(zend_ptr_stack *stack, void (*func)(void *));
-ZEND_API void zend_ptr_stack_clean(zend_ptr_stack *stack, void (*func)(void *));
+ZEND_API void zend_ptr_stack_clean(zend_ptr_stack *stack, void (*func)(void *), zend_bool free_elements);
+ZEND_API int zend_ptr_stack_num_elements(zend_ptr_stack *stack);
 
-#endif /* _ZEND_PTR_STACK_H */
+#endif /* ZEND_PTR_STACK_H */

Zend/zend_sprintf.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |

Zend/zend_stack.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -118,7 +118,7 @@ ZEND_API int zend_stack_count(zend_stack *stack)
 }
 
 
-ZEND_API void zend_stack_apply(zend_stack *stack, int (*apply_function)(void *element), int type)
+ZEND_API void zend_stack_apply(zend_stack *stack, int type, int (*apply_function)(void *element))
 {
 	int i;
 
@@ -141,7 +141,7 @@ ZEND_API void zend_stack_apply(zend_stack *stack, int (*apply_function)(void *el
 }
 
 
-ZEND_API void zend_stack_apply_with_argument(zend_stack *stack, int (*apply_function)(void *element, void *arg), int type, void *arg)
+ZEND_API void zend_stack_apply_with_argument(zend_stack *stack, int type, int (*apply_function)(void *element, void *arg), void *arg)
 {
 	int i;
 

Zend/zend_stack.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_STACK_H
-#define _ZEND_STACK_H
+#ifndef ZEND_STACK_H
+#define ZEND_STACK_H
 
 typedef struct _zend_stack {
 	int top, max;
@@ -38,10 +38,10 @@ ZEND_API int zend_stack_is_empty(zend_stack *stack);
 ZEND_API int zend_stack_destroy(zend_stack *stack);
 ZEND_API void **zend_stack_base(zend_stack *stack);
 ZEND_API int zend_stack_count(zend_stack *stack);
-ZEND_API void zend_stack_apply(zend_stack *stack, int (*apply_function)(void *element), int type);
-ZEND_API void zend_stack_apply_with_argument(zend_stack *stack, int (*apply_function)(void *element, void *arg), int type, void *arg);
+ZEND_API void zend_stack_apply(zend_stack *stack, int type, int (*apply_function)(void *element));
+ZEND_API void zend_stack_apply_with_argument(zend_stack *stack, int type, int (*apply_function)(void *element, void *arg), void *arg);
 
 #define ZEND_STACK_APPLY_TOPDOWN	1
 #define ZEND_STACK_APPLY_BOTTOMUP	2
 
-#endif /* _ZEND_STACK_H */
+#endif /* ZEND_STACK_H */

Zend/zend_static_allocator.c

@@ -0,0 +1,76 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+#include <stdlib.h>
+
+#include "zend_static_allocator.h"
+
+/* Not checking emalloc() and erealloc() return values as they are supposed to bailout */
+
+inline static void block_init(Block *block, zend_uint block_size)
+{
+	block->pos = block->bp = (char *) emalloc(block_size);
+	block->end = block->bp + block_size;
+}
+
+inline static char *block_allocate(Block *block, zend_uint size)
+{
+	char *retval = block->pos;
+	if ((block->pos += size) >= block->end) {
+		return (char *)NULL;
+	}
+	return retval;
+}
+
+inline static void block_destroy(Block *block)
+{
+	efree(block->bp);
+}
+
+void static_allocator_init(StaticAllocator *sa)
+{
+	sa->Blocks = (Block *) emalloc(sizeof(Block));
+	block_init(sa->Blocks, ALLOCATOR_BLOCK_SIZE);
+	sa->num_blocks = 1;
+	sa->current_block = 0;
+}
+
+char *static_allocator_allocate(StaticAllocator *sa, zend_uint size)
+{
+	char *retval;
+
+	retval = block_allocate(&sa->Blocks[sa->current_block], size);
+	if (retval) {
+		return retval;
+	}
+	sa->Blocks = (Block *) erealloc(sa->Blocks, ++sa->num_blocks);
+	sa->current_block++;
+	block_init(&sa->Blocks[sa->current_block], (size > ALLOCATOR_BLOCK_SIZE) ? size : ALLOCATOR_BLOCK_SIZE);
+	retval = block_allocate(&sa->Blocks[sa->current_block], size);
+	return retval;
+}
+
+void static_allocator_destroy(StaticAllocator *sa)
+{
+	zend_uint i;
+
+	for (i=0; i<sa->num_blocks; i++) {
+		block_free(&sa->Blocks[i]);
+	}
+	efree(sa->Blocks);
+}

Zend/zend_static_allocator.h

@@ -0,0 +1,45 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef ZEND_STATIC_ALLOCATOR_H
+#define ZEND_STATIC_ALLOCATOR_H
+
+#define ALLOCATOR_BLOCK_SIZE 400000
+
+/* Temporary */
+typedef unsigned int zend_uint;
+#define emalloc(s) malloc(s)
+#define efree(p) free(p)
+
+typedef struct _Block {
+	char *bp;
+	char *pos;
+	char *end;
+} Block;
+
+typedef struct _StaticAllocator {
+	Block *Blocks;
+	zend_uint num_blocks;
+	zend_uint current_block;
+} StaticAllocator;
+
+void static_allocator_init(StaticAllocator *sa);
+char *static_allocator_allocate(StaticAllocator *sa, zend_uint size);
+void static_allocator_destroy(StaticAllocator *sa);
+
+#endif /* ZEND_STATIC_ALLOCATOR_H */

Zend/zend_variables.c

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -23,7 +23,6 @@
 #include "zend_API.h"
 #include "zend_globals.h"
 #include "zend_constants.h"
-#include "zend_variables.h"
 #include "zend_list.h"
 
 ZEND_API char *empty_string = "";	/* in order to save emalloc() and efree() time for
@@ -62,7 +61,8 @@ ZEND_API void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC)
 		case IS_CONSTANT:
 			STR_FREE_REL(zvalue->value.str.val);
 			break;
-		case IS_ARRAY: {
+		case IS_ARRAY:
+		case IS_CONSTANT_ARRAY: {
 				ELS_FETCH();
 
 				if (zvalue->value.ht && (zvalue->value.ht != &EG(symbol_table))) {
@@ -90,7 +90,7 @@ ZEND_API void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC)
 }
 
 
-void zval_del_ref(zval **p)
+ZEND_API void zval_del_ref(zval **p)
 {
 	(*p)->refcount--;
 	if ((*p)->refcount==0) {
@@ -100,7 +100,7 @@ void zval_del_ref(zval **p)
 }                                                                                                                               
 
 
-void zval_add_ref(zval **p)
+ZEND_API void zval_add_ref(zval **p)
 {
 	(*p)->refcount++;
 }
@@ -116,6 +116,7 @@ ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC)
 		case IS_LONG:
 		case IS_NULL:
 			break;
+		case IS_CONSTANT:
 		case IS_STRING:
 			if (zvalue->value.str.val) {
 				if (zvalue->value.str.len==0) {
@@ -125,7 +126,8 @@ ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC)
 			}
 			zvalue->value.str.val = (char *) estrndup_rel(zvalue->value.str.val, zvalue->value.str.len);
 			break;
-		case IS_ARRAY: {
+		case IS_ARRAY:
+		case IS_CONSTANT_ARRAY: {
 				zval *tmp;
 				HashTable *original_ht = zvalue->value.ht;
 				ELS_FETCH();
@@ -136,7 +138,7 @@ ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC)
 				} else if (zvalue->value.ht==&EG(symbol_table)) {
 					return SUCCESS; /* do nothing */
 				}
-				zvalue->value.ht = (HashTable *) emalloc_rel(sizeof(HashTable));
+				ALLOC_HASHTABLE_REL(zvalue->value.ht);
 				zend_hash_init(zvalue->value.ht, 0, NULL, ZVAL_PTR_DTOR, 0);
 				zend_hash_copy(zvalue->value.ht, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
 			}
@@ -145,7 +147,7 @@ ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC)
 				zval *tmp;
 				HashTable *original_ht = zvalue->value.obj.properties;
 
-				zvalue->value.obj.properties = (HashTable *) emalloc_rel(sizeof(HashTable));
+				ALLOC_HASHTABLE_REL(zvalue->value.obj.properties);
 				zend_hash_init(zvalue->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
 				zend_hash_copy(zvalue->value.obj.properties, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
 			}

Zend/zend_variables.h

@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2000 Andi Gutmans, Zeev Suraski                   |
+   | Copyright (c) 1998-2000 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.91 of the Zend license,     |
+   | This source file is subject to version 0.92 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
    | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_91.txt.                                |
+   | http://www.zend.com/license/0_92.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.              |
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _VARIABLES_H
-#define _VARIABLES_H
+#ifndef ZEND_VARIABLES_H
+#define ZEND_VARIABLES_H
 
 
 ZEND_API int zend_print_variable(zval *var);
@@ -48,8 +48,8 @@ ZEND_API void _zval_ptr_dtor_wrapper(zval **zval_ptr);
 END_EXTERN_C()
 
 
-void zval_add_ref(zval **p);
-void zval_del_ref(zval **p);
+ZEND_API void zval_add_ref(zval **p);
+ZEND_API void zval_del_ref(zval **p);
 
 #define ZVAL_DESTRUCTOR (void (*)(void *)) zval_dtor_wrapper
 #define ZVAL_PTR_DTOR (void (*)(void *)) zval_ptr_dtor_wrapper

acconfig.h.in

@@ -1,126 +1 @@
-/* This is the default configuration file to read -*- C -*- */
-
-/* these are defined by automake */
-#undef PACKAGE
-#undef VERSION
-
-#undef HAVE_LIBDL
-
-#undef HAVE_STRUCT_FLOCK
-#undef HAVE_TM_GMTOFF
-
-#define CONFIGURATION_FILE_PATH "php.ini"
-#define USE_CONFIG_FILE 1
-
-#undef HAVE_DMALLOC
-
-/* Some global constants defined by conigure */
-#undef PHP_BUILD_DATE
-#undef PHP_OS
-#undef PHP_UNAME 
-
-/* define uint by configure if it is missed (QNX and BSD derived) */
-#undef uint
-
-/* define ulong by configure if it is missed (most probably is) */
-#undef ulong
-
-/* type check for in_addr_t */
-#undef in_addr_t
-
-/* Define if you have dirent.h but opendir() resides in libc rather than in libdir */
-/* This will cause HAVE_DIRENT_H defined twice sometimes, but it should be problem */
-#undef HAVE_DIRENT_H
-
-/* Define if you have the resolv library (-lresolv). */
-#undef HAVE_LIBRESOLV
-
-/* Define if you have the pam library (-lpam). */
-#define HAVE_LIBPAM 0
-
-/* Define if you have the bind library (-lbind). */
-#define HAVE_LIBBIND 0
-
-/* Define if you have Netscape LDAP instead of umich ldap or openldap*/
-#define HAVE_NSLDAP 0
-
-/* Define if you want safe mode enabled by default. */
-#define PHP_SAFE_MODE 0
-
-/* Set to the path to the dir containing safe mode executables */
-#define PHP_SAFE_MODE_EXEC_DIR /usr/local/php/bin
-
-/* Define if you want POST/GET/Cookie track variables by default */
-#define PHP_TRACK_VARS 0
-
-/* Undefine if you want stricter XML/SGML compliance by default */
-/* (this disables "<?expression?>" by default) */
-#define DEFAULT_SHORT_OPEN_TAG 1
-
-/* Undefine if you do not want PHP by default to escape "'" */
-/* in GET/POST/Cookie data */
-#define MAGIC_QUOTES 1
-
-/* Define both of these if you want the bundled REGEX library */
-#define REGEX 0
-#define HSREGEX 0
-
-/* Define if you have and want to use libnsl */
-#undef HAVE_LIBNSL
-
-/* Define if you have and want to use libsocket */
-#undef HAVE_LIBSOCKET
-
-/* Define if you have the sendmail program available */
-#define HAVE_SENDMAIL 0
-
-/* Define if you are compiling PHP as an Apache module with mod_charset patch applied (aka Russian Apache)*/
-#define USE_TRANSFER_TABLES 0
-
-/* Define if you are compiling PHP as an fhttpd module */
-#define FHTTPD 0
-
-/* Define if your Apache creates an ap_config.h header file (only 1.3b6 and later) */
-#define HAVE_AP_CONFIG_H 0
-
-/* Define if your Apache has src/include/compat.h */
-#define HAVE_OLD_COMPAT_H 0
-
-/* Define if your Apache has src/include/ap_compat.h */
-#define HAVE_AP_COMPAT_H 0
-
-#ifndef DEBUG /* should be set to ZEND_DEBUG */
-#define DEBUG 0
-#endif
-
-/* Define if you want to enable PHP RPC (experimental) */
-#define PHP_RPC 0
-
-/* Define if you want to prevent the CGI from working unless REDIRECT_STATUS is defined in the environment */
-#define FORCE_CGI_REDIRECT 0
-
-/* Define if you want to prevent the CGI from using path_info and path_translated */
-#define DISCARD_PATH 0
-
-/* Define if you want include() and other functions to be able to open
- * http and ftp URLs as files.
- */
-#define PHP3_URL_FOPEN 0
-
-/* Define if you have broken header files like SunOS 4 */
-#define MISSING_FCLOSE_DECL 0
-
-/* Define to compile PHP/Zend thread safe */
-#undef ZTS
-
-/* Define when compiling with Zeus support */
-#undef WITH_ZEUS
-
-/* Define if struct sockaddr contains the field sa_len */
-#undef HAVE_SOCKADDR_SA_LEN
-
-#undef BROKEN_SPRINTF
-
-#if BROKEN_SPRINTF
-#define sprintf php_sprintf
-#endif
+/* Leave this file alone */

acinclude.m4

@@ -2,6 +2,281 @@ dnl $Id$
 dnl
 dnl This file contains local autoconf functions.
 
+sinclude(dynlib.m4)
+
+dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD)
+dnl
+dnl Use this macro, if you need to add libraries and or library search
+dnl paths to the PHP build system which are only given in compiler
+dnl notation.
+dnl
+AC_DEFUN(PHP_EVAL_LIBLINE,[
+  for ac_i in $1; do
+    case "$ac_i" in
+    -l*)
+      ac_ii=`echo $ac_i|cut -c 3-`
+      AC_ADD_LIBRARY($ac_ii,,$2)
+    ;;
+    -L*)
+      ac_ii=`echo $ac_i|cut -c 3-`
+      AC_ADD_LIBPATH($ac_ii,$2)
+    ;;
+    esac
+  done
+])
+
+dnl PHP_EVAL_INCLINE(LINE)
+dnl
+dnl Use this macro, if you need to add header search paths to the PHP
+dnl build system which are only given in compiler notation.
+dnl
+AC_DEFUN(PHP_EVAL_INCLINE,[
+  for ac_i in $1; do
+    case "$ac_i" in
+    -I*)
+      ac_ii=`echo $ac_i|cut -c 3-`
+      AC_ADD_INCLUDE($ac_ii)
+    ;;
+    esac
+  done
+])
+	
+AC_DEFUN(PHP_READDIR_R_TYPE,[
+  dnl HAVE_READDIR_R is also defined by libmysql
+  AC_CHECK_FUNC(readdir_r,ac_cv_func_readdir_r=yes,ac_cv_func_readdir=no)
+  if test "$ac_cv_func_readdir_r" = "yes"; then
+  AC_CACHE_CHECK(for type of readdir_r, ac_cv_what_readdir_r,[
+    AC_TRY_RUN([
+#define _REENTRANT
+#include <sys/types.h>
+#include <dirent.h>
+
+main() {
+	DIR *dir;
+	struct dirent entry, *pentry;
+
+	dir = opendir("/");
+	if (!dir) 
+		exit(1);
+	if (readdir_r(dir, &entry, &pentry) == 0)
+		exit(0);
+	exit(1);
+}
+    ],[
+      ac_cv_what_readdir_r=POSIX
+    ],[
+      AC_TRY_CPP([
+#define _REENTRANT
+#include <sys/types.h>
+#include <dirent.h>
+int readdir_r(DIR *, struct dirent *);
+        ],[
+          ac_cv_what_readdir_r=old-style
+        ],[
+          ac_cv_what_readdir_r=none
+      ])
+    ],[
+      ac_cv_what_readdir_r=none
+   ])
+  ])
+    case "$ac_cv_what_readdir_r" in
+    POSIX)
+      AC_DEFINE(HAVE_POSIX_READDIR_R,1,[whether you have POSIX readdir_r]);;
+    old-style)
+      AC_DEFINE(HAVE_OLD_READDIR_R,1,[whether you have old-style readdir_r]);;
+    esac
+  fi
+])
+
+AC_DEFUN(PHP_SHLIB_SUFFIX_NAME,[
+  PHP_SUBST(SHLIB_SUFFIX_NAME)
+  SHLIB_SUFFIX_NAME=so
+  case "$host_alias" in
+  *hpux*)
+	SHLIB_SUFFIX_NAME=sl
+	;;
+  esac
+])
+
+AC_DEFUN(PHP_DEBUG_MACRO,[
+  DEBUG_LOG="$1"
+  cat >$1 <<X
+CONFIGURE:  $CONFIGURE_COMMAND
+CC:         $CC
+CFLAGS:     $CFLAGS
+CPPFLAGS:   $CPPFLAGS
+CXX:        $CXX
+CXXFLAGS:   $CXXFLAGS
+INCLUDES:   $INCLUDES
+LDFLAGS:    $LDFLAGS
+LIBS:       $LIBS
+DLIBS:      $DLIBS
+SAPI:       $PHP_SAPI
+PHP_RPATHS: $PHP_RPATHS
+uname -a:   `uname -a`
+
+X
+    cat >conftest.$ac_ext <<X
+main()
+{
+  exit(0);
+}
+X
+    (eval echo \"$ac_link\"; eval $ac_link && ./conftest) >>$1 2>&1
+    rm -fr conftest*
+])
+	
+AC_DEFUN(PHP_MISSING_TIME_R_DECL,[
+  AC_MSG_CHECKING(for missing declarations of reentrant functions)
+  AC_TRY_COMPILE([#include <time.h>],[struct tm *(*func)() = localtime_r],[
+    :
+  ],[
+    AC_DEFINE(MISSING_LOCALTIME_R_DECL,1,[Whether localtime_r is declared])
+  ])
+  AC_TRY_COMPILE([#include <time.h>],[struct tm *(*func)() = gmtime_r],[
+    :
+  ],[
+    AC_DEFINE(MISSING_GMTIME_R_DECL,1,[Whether gmtime_r is declared])
+  ])
+  AC_TRY_COMPILE([#include <time.h>],[char *(*func)() = asctime_r],[
+    :
+  ],[
+    AC_DEFINE(MISSING_ASCTIME_R_DECL,1,[Whether asctime_r is declared])
+  ])
+  AC_TRY_COMPILE([#include <time.h>],[char *(*func)() = ctime_r],[
+    :
+  ],[
+    AC_DEFINE(MISSING_CTIME_R_DECL,1,[Whether ctime_r is declared])
+  ])
+  AC_TRY_COMPILE([#include <string.h>],[char *(*func)() = strtok_r],[
+    :
+  ],[
+    AC_DEFINE(MISSING_STRTOK_R_DECL,1,[Whether strtok_r is declared])
+  ])
+  AC_MSG_RESULT(done)
+])
+
+dnl
+dnl PHP_LIBGCC_LIBPATH(gcc)
+dnl Stores the location of libgcc in libgcc_libpath
+dnl
+AC_DEFUN(PHP_LIBGCC_LIBPATH,[
+  changequote({,})
+  libgcc_libpath="`$1 --print-libgcc-file-name|sed 's%/*[^/][^/]*$%%'`"
+  changequote([,])
+])
+
+AC_DEFUN(PHP_ARG_ANALYZE,[
+case "[$]$1" in
+shared,*)
+  ext_output="yes, shared"
+  ext_shared=yes
+  $1=`echo $ac_n "[$]$1$ac_c"|sed s/^shared,//`
+  ;;
+shared)
+  ext_output="yes, shared"
+  ext_shared=yes
+  $1=yes
+  ;;
+no)
+  ext_output="no"
+  ext_shared=no
+  ;;
+*)
+  ext_output="yes"
+  ext_shared=no
+  ;;
+esac
+
+if test "$php_always_shared" = "yes"; then
+  ext_output="yes, shared"
+  ext_shared=yes
+  test "[$]$1" = "no" && $1=yes
+fi
+
+AC_MSG_RESULT($ext_output)
+])
+
+dnl
+dnl PHP_ARG_WITH(arg-name, check message, help text[, default-val])
+dnl Sets PHP_ARG_NAME either to the user value or to the default value.
+dnl default-val defaults to no. 
+dnl
+AC_DEFUN(PHP_ARG_WITH,[
+PHP_REAL_ARG_WITH([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_))
+])
+
+AC_DEFUN(PHP_REAL_ARG_WITH,[
+AC_MSG_CHECKING($2)
+AC_ARG_WITH($1,[$3],$5=[$]withval,$5=ifelse($4,,no,$4))
+PHP_ARG_ANALYZE($5)
+])
+
+dnl
+dnl PHP_ARG_ENABLE(arg-name, check message, help text[, default-val])
+dnl Sets PHP_ARG_NAME either to the user value or to the default value.
+dnl default-val defaults to no. 
+dnl
+AC_DEFUN(PHP_ARG_ENABLE,[
+PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_))
+])
+
+AC_DEFUN(PHP_REAL_ARG_ENABLE,[
+AC_MSG_CHECKING($2)
+AC_ARG_ENABLE($1,[$3],$5=[$]enableval,$5=ifelse($4,,no,$4))
+PHP_ARG_ANALYZE($5)
+])
+
+AC_DEFUN(PHP_MODULE_PTR,[
+  EXTRA_MODULE_PTRS="$EXTRA_MODULE_PTRS $1,"
+])
+ 
+AC_DEFUN(PHP_CONFIG_NICE,[
+  rm -f $1
+  cat >$1<<EOF
+#! /bin/sh
+#
+# Created by configure
+
+EOF
+
+  for arg in [$]0 "[$]@"; do
+    echo "\"[$]arg\" \\" >> $1
+  done
+  echo '"[$]@"' >> $1
+  chmod +x $1
+])
+
+AC_DEFUN(PHP_TIME_R_TYPE,[
+AC_CACHE_CHECK(for type of reentrant time-related functions, ac_cv_time_r_type,[
+AC_TRY_RUN([
+#include <time.h>
+#include <stdlib.h>
+
+main() {
+char buf[27];
+struct tm t;
+time_t old = 0;
+int r, s;
+
+s = gmtime_r(&old, &t);
+r = (int) asctime_r(&t, buf, 26);
+if (r == s && s == 0) exit(0);
+exit(1);
+}
+],[
+  ac_cv_time_r_type=hpux
+],[
+  ac_cv_time_r_type=POSIX
+],[
+  ac_cv_time_r_type=POSIX
+])
+])
+if test "$ac_cv_time_r_type" = "hpux"; then
+  AC_DEFINE(PHP_HPUX_TIME_R,1,[Whether you have HP-UX 10.x])
+fi
+])
+
 AC_DEFUN(PHP_SUBST,[
   PHP_VAR_SUBST="$PHP_VAR_SUBST $1"
   AC_SUBST($1)
@@ -24,14 +299,17 @@ AC_DEFUN(PHP_MKDIR_P_CHECK,[
   ])
 ])
 
-AC_DEFUN(PHP_FAST_GENERATE,[
+AC_DEFUN(PHP_GEN_CONFIG_VARS,[
   PHP_MKDIR_P_CHECK
   echo creating config_vars.mk
   > config_vars.mk
   for i in $PHP_VAR_SUBST; do
     eval echo "$i = \$$i" >> config_vars.mk
   done
-  $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $PHP_FAST_OUTPUT_FILES
+])
+
+AC_DEFUN(PHP_GEN_MAKEFILES,[
+  $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $1
 ])
 
 AC_DEFUN(PHP_TM_GMTOFF,[
@@ -41,7 +319,7 @@ AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
   ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
 
 if test "$ac_cv_struct_tm_gmtoff" = yes; then
-  AC_DEFINE(HAVE_TM_GMTOFF)
+  AC_DEFINE(HAVE_TM_GMTOFF,1,[whether you have tm_gmtoff in struct tm])
 fi
 ])
 
@@ -53,9 +331,9 @@ AC_DEFUN(PHP_CONFIGURE_PART,[
 ])
 
 AC_DEFUN(PHP_PROG_SENDMAIL,[
-AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/lib/sendmail, $PATH /usr/bin /usr/sbin /usr/etc /etc /usr/ucblib)
+AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/lib/sendmail, $PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib)
 if test -n "$PROG_SENDMAIL"; then
-  AC_DEFINE(HAVE_SENDMAIL)
+  AC_DEFINE(HAVE_SENDMAIL,1,[whether you have sendmail])
 fi
 ])
 
@@ -101,7 +379,7 @@ AC_CACHE_CHECK(for struct flock,ac_cv_struct_flock,
         ])
 )
 if test "$ac_cv_struct_flock" = "yes" ; then
-    AC_DEFINE(HAVE_STRUCT_FLOCK, 1)
+    AC_DEFINE(HAVE_STRUCT_FLOCK, 1,[whether you have struct flock])
 fi
 ])
 
@@ -137,6 +415,17 @@ dnl PHP_BUILD_THREAD_SAFE
 dnl
 AC_DEFUN(PHP_BUILD_THREAD_SAFE,[
   enable_experimental_zts=yes
+  if test "$pthreads_working" != "yes"; then
+    AC_MSG_ERROR(ZTS currently requires working POSIX threads. Your system does not support this.)
+  fi
+])
+
+AC_DEFUN(PHP_REQUIRE_CXX,[
+  if test -z "$php_cxx_done"; then
+    AC_PROG_CXX
+    AC_PROG_CXXCPP
+    php_cxx_done=yes
+  fi
 ])
 
 dnl
@@ -166,7 +455,9 @@ dnl
 dnl execute code, if variable is not set in namespace
 dnl
 AC_DEFUN(AC_PHP_ONCE,[
-  unique=`echo $ac_n "$2$ac_c" | tr -cd a-zA-Z0-9`
+  changequote({,})
+  unique=`echo $2|sed 's/[^a-zA-Z0-9]/_/g'`
+  changequote([,])
   cmd="echo $ac_n \"\$$1$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
     eval "$1$unique=set"
@@ -183,25 +474,31 @@ AC_DEFUN(AC_EXPAND_PATH,[
   if test -z "$1" || echo "$1" | grep '^/' >/dev/null ; then
     $2="$1"
   else
-    ep_dir="`dirname \"$1\"`"
+    changequote({,})
+    ep_dir="`echo $1|sed 's%/*[^/][^/]*$%%'`"
+    changequote([,])
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
     $2="$ep_realdir/`basename \"$1\"`"
   fi
 ])
 
 dnl
-dnl AC_ADD_LIBPATH(path)
+dnl AC_ADD_LIBPATH(path[, shared-libadd])
 dnl
 dnl add a library to linkpath/runpath
 dnl
 AC_DEFUN(AC_ADD_LIBPATH,[
   if test "$1" != "/usr/lib"; then
     AC_EXPAND_PATH($1, ai_p)
-    AC_PHP_ONCE(LIBPATH, $ai_p, [
-      test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-      LDFLAGS="$LDFLAGS -L$ai_p"
-      PHP_RPATHS="$PHP_RPATHS $ai_p"
-    ])
+    if test "$ext_shared" = "yes" && test -n "$2"; then
+      $2="-R$1 -L$1 [$]$2"
+    else
+      AC_PHP_ONCE(LIBPATH, $ai_p, [
+        test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+        LDFLAGS="$LDFLAGS -L$ai_p"
+        PHP_RPATHS="$PHP_RPATHS $ai_p"
+      ])
+    fi
   fi
 ])
 
@@ -211,14 +508,14 @@ dnl
 dnl builds RPATH from PHP_RPATHS
 dnl
 AC_DEFUN(AC_BUILD_RPATH,[
-  if test "$enable_rpath" = "yes" && test -n "$PHP_RPATHS"; then
+  if test "$PHP_RPATH" = "yes" && test -n "$PHP_RPATHS"; then
     OLD_RPATHS="$PHP_RPATHS"
-	PHP_RPATHS=""
-	for i in $OLD_RPATHS; do
-        PHP_LDFLAGS="$PHP_LDFLAGS -L$i"
-        PHP_RPATHS="$PHP_RPATHS -R $i"
-        NATIVE_RPATHS="$NATIVE_RPATHS ${ld_runpath_switch}$i"
-	  done
+    PHP_RPATHS=""
+    for i in $OLD_RPATHS; do
+      PHP_LDFLAGS="$PHP_LDFLAGS -L$i"
+      PHP_RPATHS="$PHP_RPATHS -R $i"
+      NATIVE_RPATHS="$NATIVE_RPATHS ${ld_runpath_switch}$i"
+    done
   fi
 ])
 
@@ -236,27 +533,75 @@ AC_DEFUN(AC_ADD_INCLUDE,[
   fi
 ])
 
+AC_DEFUN(PHP_X_ADD_LIBRARY,[
+  ifelse($2,,$3="-l$1 [$]$3", $3="[$]$3 -l$1")
+])
+
 dnl
-dnl AC_ADD_LIBRARY(library[, append])
+dnl AC_ADD_LIBRARY(library[, append[, shared-libadd]])
 dnl
 dnl add a library to the link line
 dnl
 AC_DEFUN(AC_ADD_LIBRARY,[
-  AC_PHP_ONCE(LIBRARY, $1, [
-    ifelse($#, 1, LIBS="-l$1 $LIBS", LIBS="$LIBS -l$1")
-  ])
+ case "$1" in
+ c|c_r|pthread*) ;;
+ *)
+ifelse($3,,[
+   PHP_X_ADD_LIBRARY($1,$2,LIBS)
+],[
+   if test "$ext_shared" = "yes"; then
+     PHP_X_ADD_LIBRARY($1,$2,$3)
+   else
+     AC_ADD_LIBRARY($1,$2)
+   fi
+])
+  ;;
+  esac
 ])
 
 dnl
-dnl AC_ADD_LIBRARY_WITH_PATH(library, path)
+dnl AC_ADD_LIBRARY_DEFER(library[, append])
 dnl
-dnl add a library to the link line and path to linkpath/runpath
+dnl add a library to the link line (deferred)
+AC_DEFUN(AC_ADD_LIBRARY_DEFER,[
+  ifelse($#, 1, DLIBS="-l$1 $DLIBS", DLIBS="$DLIBS -l$1")
+])
+
+dnl
+dnl AC_ADD_LIBRARY_WITH_PATH(library, path[, shared-libadd])
+dnl
+dnl add a library to the link line and path to linkpath/runpath.
+dnl if shared-libadd is not empty and $ext_shared is yes,
+dnl shared-libadd will be assigned the library information
 dnl
 AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH,[
-  AC_ADD_LIBPATH($2)
+ifelse($3,,[
+  if test -n "$2"; then
+    AC_ADD_LIBPATH($2)
+  fi
   AC_ADD_LIBRARY($1)
+],[
+  if test "$ext_shared" = "yes"; then
+    $3="-l$1 [$]$3"
+    if test -n "$2"; then
+      AC_ADD_LIBPATH($2,$3)
+    fi
+  else
+    AC_ADD_LIBRARY_WITH_PATH($1,$2)
+  fi
+])
 ])
 
+dnl
+dnl AC_ADD_LIBRARY_DEFER_WITH_PATH(library, path)
+dnl
+dnl add a library to the link line (deferred)
+dnl and path to linkpath/runpath (not deferred)
+dnl
+AC_DEFUN(AC_ADD_LIBRARY_DEFER_WITH_PATH,[
+  AC_ADD_LIBPATH($2)
+  AC_ADD_LIBRARY_DEFER($1)
+])
 
 AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
   LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
@@ -268,7 +613,9 @@ dnl
 AC_DEFUN(AC_CHECK_CC_OPTION,[
   echo "main(){return 0;}" > conftest.$ac_ext
   opt="$1"
-  var=`echo $ac_n "$opt$ac_c"|tr -c a-zA-Z0-9 _`
+  changequote({,})
+  var=`echo $opt|sed 's/[^a-zA-Z0-9]/_/g'`
+  changequote([,])
   AC_MSG_CHECKING([if compiler supports -$1 really])
   ac_php_compile="${CC-cc} -$opt -o conftest $CFLAGS $CPPFLAGS conftest.$ac_ext 2>&1"
   if eval $ac_php_compile 2>&1 | egrep "$opt" > /dev/null 2>&1 ; then
@@ -290,11 +637,11 @@ AC_DEFUN(PHP_REGEX,[
 if test "$REGEX_TYPE" = "php"; then
   REGEX_LIB=regex/libregex.la
   REGEX_DIR=regex
-  AC_DEFINE(HSREGEX)
-  AC_DEFINE(REGEX,1)
+  AC_DEFINE(HSREGEX,1,[ ])
+  AC_DEFINE(REGEX,1,[ ])
   PHP_FAST_OUTPUT(regex/Makefile)
 elif test "$REGEX_TYPE" = "system"; then
-  AC_DEFINE(REGEX,0)
+  AC_DEFINE(REGEX,0,[ ])
 fi
 
 AC_MSG_CHECKING(which regex library to use)
@@ -311,10 +658,10 @@ dnl
 AC_DEFUN(AC_MISSING_FCLOSE_DECL,[
   AC_MSG_CHECKING([for fclose declaration])
   AC_TRY_COMPILE([#include <stdio.h>],[int (*func)() = fclose],[
-    AC_DEFINE(MISSING_FCLOSE_DECL,0)
+    AC_DEFINE(MISSING_FCLOSE_DECL,0,[ ])
     AC_MSG_RESULT(ok)
   ],[
-    AC_DEFINE(MISSING_FCLOSE_DECL,1)
+    AC_DEFINE(MISSING_FCLOSE_DECL,1,[ ])
     AC_MSG_RESULT(missing)
   ])
 ])
@@ -333,9 +680,9 @@ AC_DEFUN(AC_BROKEN_SPRINTF,[
     ])
   ])
   if test "$ac_cv_broken_sprintf" = "yes"; then
-    AC_DEFINE(BROKEN_SPRINTF, 1)
+    AC_DEFINE(PHP_BROKEN_SPRINTF, 1, [ ])
   else
-    AC_DEFINE(BROKEN_SPRINTF, 0)
+    AC_DEFINE(PHP_BROKEN_SPRINTF, 0, [ ])
   fi
 ])
 
@@ -349,21 +696,30 @@ dnl "shared" can be set to "shared" or "yes" to build the extension as
 dnl a dynamically loadable library.
 dnl
 AC_DEFUN(PHP_EXTENSION,[
-  if test -d "$cwd/$srcdir/ext/$1" ; then
-    ext_src_base="${abs_srcdir}/ext/$1/"
-    ext_base="ext/$1/"
-    EXT_SUBDIRS="$EXT_SUBDIRS $1"
-    if test "$2" != "shared" && test "$2" != "yes" && test -z "$php_always_shared"; then
-      _extlib="lib$1.a"
-      EXT_LTLIBS="$EXT_LTLIBS ext/$1/lib$1.la"
-      EXT_LIBS="$EXT_LIBS $1/$_extlib"
-      EXT_STATIC="$EXT_STATIC $1"
-    else
-      AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z,A-Z), 1, Whether to build $1 as dynamic module)
-      EXT_SHARED="$EXT_SHARED $1"
-    fi
-    PHP_FAST_OUTPUT(ext/$1/Makefile)
+  EXT_SUBDIRS="$EXT_SUBDIRS $1"
+  
+  if test -d "$abs_srcdir/ext/$1"; then
+dnl ---------------------------------------------- Internal Module
+    ext_builddir="ext/$1"
+    ext_srcdir="$abs_srcdir/ext/$1"
+  else
+dnl ---------------------------------------------- External Module
+    ext_builddir="."
+    ext_srcdir="$abs_srcdir"
   fi
+
+  if test "$2" != "shared" && test "$2" != "yes"; then
+dnl ---------------------------------------------- Static module
+    LIB_BUILD($ext_builddir)
+    EXT_LTLIBS="$EXT_LTLIBS $ext_builddir/lib$1.la"
+    EXT_STATIC="$EXT_STATIC $1"
+  else 
+dnl ---------------------------------------------- Shared module
+    LIB_BUILD($ext_builddir,yes)
+    AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z-,A-Z_), 1, Whether to build $1 as dynamic module)
+  fi
+
+  PHP_FAST_OUTPUT($ext_builddir/Makefile)
 ])
 
 PHP_SUBST(EXT_SUBDIRS)
@@ -471,13 +827,13 @@ AC_DEFUN(AC_SOCKADDR_SA_LEN,[
 #include <sys/socket.h>],
     [struct sockaddr s; s.sa_len;],
     [ac_cv_sockaddr_sa_len=yes
-     AC_DEFINE(HAVE_SOCKADDR_SA_LEN)],
+     AC_DEFINE(HAVE_SOCKADDR_SA_LEN,1,[ ])],
     [ac_cv_sockaddr_sa_len=no])
   ])
 ])
 
 
-dnl ## PHP_AC_OUTPUT(file)
+dnl ## PHP_OUTPUT(file)
 dnl ## adds "file" to the list of files generated by AC_OUTPUT
 dnl ## This macro can be used several times.
 AC_DEFUN(PHP_OUTPUT,[
@@ -503,3 +859,22 @@ AC_DEFUN(PHP_DECLARED_TIMEZONE,[
     AC_DEFINE(HAVE_DECLARED_TIMEZONE, 1, [Whether system headers declare timezone])
   fi
 ])
+
+AC_DEFUN(PHP_EBCDIC,[
+  AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[
+  AC_TRY_RUN( [
+int main(void) { 
+  return (unsigned char)'A' != (unsigned char)0xC1; 
+} 
+],[
+  ac_cv_ebcdic="yes"
+],[
+  ac_cv_ebcdic="no"
+],[
+  ac_cv_ebcdic="no"
+])])
+  if test "$ac_cv_ebcdic" = "yes"; then
+    AC_DEFINE(CHARSET_EBCDIC,1, [Define if system uses EBCDIC])
+  fi
+])
+

build-defs.h.in

@@ -1,31 +1,22 @@
 /*                                                                -*- C -*-
    +----------------------------------------------------------------------+
-   | PHP HTML Embedded Scripting Language Version 3.0                     |
+   | PHP version 4.0                                                      |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997,1998 PHP Development Team (See Credits file)      |
+   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
-   | This program is free software; you can redistribute it and/or modify |
-   | it under the terms of one of the following licenses:                 |
-   |                                                                      |
-   |  A) the GNU General Public License as published by the Free Software |
-   |     Foundation; either version 2 of the License, or (at your option) |
-   |     any later version.                                               |
-   |                                                                      |
-   |  B) the PHP License as published by the PHP Development Team and     |
-   |     included in the distribution in the file: LICENSE                |
-   |                                                                      |
-   | This program is distributed in the hope that it will be useful,      |
-   | but WITHOUT ANY WARRANTY; without even the implied warranty of       |
-   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
-   | GNU General Public License for more details.                         |
-   |                                                                      |
-   | You should have received a copy of both licenses referred to here.   |
-   | If you did not, or have any questions about PHP licensing, please    |
-   | contact core@php.net.                                                |
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
    | Authors: Stig Sæther Bakken <ssb@fast.no>                            |
    +----------------------------------------------------------------------+
- */
+*/
+
+/* $Id$ */
 
 #define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
 #define PHP_ADA_INCLUDE		""
@@ -39,7 +30,7 @@
 #define PHP_BINNAME		"@BINNAME@"
 #define PHP_CFLAGS		"@CFLAGS@"
 #define PHP_DBASE_LIB		""
-#define PHP_DEBUG		"@DEBUG_CFLAGS@"
+#define PHP_BUILD_DEBUG		"@DEBUG_CFLAGS@"
 #define PHP_GDBM_INCLUDE	""
 #define PHP_HSREGEX		""
 #define PHP_IBASE_INCLUDE	""
@@ -62,13 +53,12 @@
 #define PHP_ODBC_INCLUDE    "@ODBC_INCLUDE@"
 #define PHP_ODBC_LFLAGS     "@ODBC_LFLAGS@"
 #define PHP_ODBC_LIBS       "@ODBC_LIBS@"
-#define PHP_ORACLE_HOME		""
-#define PHP_ORACLE_INCLUDE	""
-#define PHP_ORACLE_LFLAGS	""
-#define PHP_ORACLE_LIBS		""
-#define PHP_ORACLE_SHLIBS	""
-#define PHP_ORACLE_STLIBS	""
-#define PHP_ORACLE_VERSION	""
+#define PHP_OCI8_SHARED_LIBADD 	"@OCI8_SHARED_LIBADD@"
+#define PHP_OCI8_DIR			"@OCI8_DIR@"
+#define PHP_OCI8_VERSION		"@OCI8_VERSION@"
+#define PHP_ORACLE_SHARED_LIBADD 	"@ORACLE_SHARED_LIBADD@"
+#define PHP_ORACLE_DIR				"@ORACLE_DIR@"
+#define PHP_ORACLE_VERSION			"@ORACLE_VERSION@"
 #define PHP_PGSQL_INCLUDE	""
 #define PHP_PGSQL_LFLAGS	""
 #define PHP_PGSQL_LIBS		""
@@ -88,3 +78,5 @@
 #define PHP_LDAP_LIBS		""
 #define PHP_VELOCIS_INCLUDE     ""
 #define PHP_VELOCIS_LIBS        ""
+#define PHP_EXTENSION_DIR       "@EXTENSION_DIR@"
+#define PHP_INCLUDE_PATH	"@INCLUDE_PATH@"

build/build2.mk

@@ -39,15 +39,8 @@ acconfig_h_SOURCES = acconfig.h.in $(config_h_files)
 targets = $(TOUCH_FILES) $(makefile_in_files) configure $(config_h_in)
 
 
-all: .deps Zend/Makefile.am TSRM/Makefile.am $(targets)
+all: Zend/Makefile.am TSRM/Makefile.am $(targets)
 
-.deps:
-	@echo creating empty dependencies
-	for i in `find ext sapi regex -type d \! -name \*CVS`; do \
-		list="$$list $$i/.deps"; \
-	done; \
-	touch $$list pear/.deps $@
-	
 Zend/Makefile.am:
 	test -d Zend || (test -d ../Zend && ln -s ../Zend Zend)
 
@@ -59,7 +52,7 @@ acconfig.h: $(acconfig_h_SOURCES)
 	cat $(acconfig_h_SOURCES) > $@
 
 $(makefile_in_files): $(makefile_am_files) aclocal.m4 configure.in $(config_m4_files)
-	@echo rebuilding Makefile.in\'s
+	@echo rebuilding Makefile templates
 	@for i in $(LT_TARGETS); do \
 		if test -f "$$i"; then \
 			mv $$i $$i.bak; \
@@ -71,7 +64,7 @@ $(makefile_in_files): $(makefile_am_files) aclocal.m4 configure.in $(config_m4_f
 		|| true >&2
 	@for i in $(LT_TARGETS); do mv $$i.bak $$i; done
 
-aclocal.m4: configure.in acinclude.m4
+aclocal.m4: configure.in acinclude.m4 dynlib.m4
 	aclocal
 
 $(config_h_in): configure acconfig.h
@@ -79,11 +72,11 @@ $(config_h_in): configure acconfig.h
 # correctly otherwise (timestamps are not updated)
 	@echo rebuilding $@
 	@rm -f $@
-	autoheader
+	@autoheader 2>&1 | (grep -v 'warning: AC_TRY_RUN called without default to allow cross compiling'||true)
 
 $(TOUCH_FILES):
 	touch $(TOUCH_FILES)
-	
+
 configure: aclocal.m4 configure.in $(config_m4_files)
 	@echo rebuilding $@
-	autoconf
+	@autoconf 2>&1 | (grep -v 'warning: AC_TRY_RUN called without default to allow cross compiling'||true)

build/buildcheck.sh

@@ -48,7 +48,7 @@ exit 1
 fi
 lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
 IFS=.; set $lt_version; IFS=' '
-if test "$1" -gt "1" || test "$2" -gt "3" || test "$2" = "3" -a "$3" -ge "3"
+if test "$1" -gt "1" || test "$2" -gt "3" || test "$2" = "3" && (test "$3" = "c" || test "$3" -ge "3")
 then
 echo "buildconf: libtool version $lt_pversion (ok)"
 else

build/dynlib.mk

@@ -0,0 +1,5 @@
+all: all-recursive
+
+include $(builddir)/libs.mk
+
+include $(top_srcdir)/build/rules.mk

build/fastgen.sh

@@ -23,29 +23,36 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 ##############################################################################
-# $Id: fastgen.sh,v 1.2 2000-01-01 20:48:42 sas Exp $ 
+# $Id: fastgen.sh,v 1.7 2000-06-11 10:33:39 sas Exp $ 
 #
 
 srcdir=$1
 shift
 
-topsrcdir=`(cd $srcdir; pwd)`
-
 mkdir_p=$1
 shift
 
+top_srcdir=`(cd $srcdir; pwd)`
+top_builddir=`pwd`
+
 if test "$mkdir_p" = "yes"; then
   mkdir_p="mkdir -p"
 else
-  mkdir_p="$topsrcdir/build/shtool mkdir -f -p"
+  mkdir_p="$top_srcdir/helpers/mkdir.sh"
 fi
 
-for i in $@ ; do
-	echo "creating $i"
-	dir=`dirname $i`
-	$mkdir_p $dir
-	sed \
-		-e s#@topsrcdir@#$topsrcdir# \
-		-e s#@srcdir@#$topsrcdir/$dir# \
-	< $topsrcdir/$i.in > $i
+for makefile in $@; do
+  echo "creating $makefile"
+  dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
+  $mkdir_p "$dir/"
+
+  cat - $top_srcdir/$makefile.in <<EOF >$makefile
+top_srcdir   = $top_srcdir
+top_builddir = $top_builddir
+srcdir       = $top_srcdir/$dir
+builddir     = $top_builddir/$dir
+VPATH        = $top_srcdir/$dir
+EOF
+  
+  test -z "$dir" || touch $dir/.deps
 done

build/library.mk

@@ -24,22 +24,7 @@
 # $Id$ 
 #
 
-LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo)
+LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
 
 $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
 	$(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
-
-$(LTLIBRARY_SHARED_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
-	@test -d $(phplibdir) || $(mkinstalldirs) $(phplibdir)
-	$(LINK) -avoid-version -module -rpath $(phplibdir) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_SHARED_LIBADD)
-	$(SHLIBTOOL) --mode=install install $@ $(phplibdir)
-
-shared:
-	@if test -z '$(LTLIBRARY_SHARED_NAME)'; then \
-		echo "LTLIBRARY_SHARED_NAME is empty. Double check your Makefile.in"; \
-	fi
-	@if test '$(SHLIBTOOL)' != '$(LIBTOOL)'; then \
-		$(MAKE) 'LIBTOOL=$(SHLIBTOOL)' $(LTLIBRARY_SHARED_NAME); \
-	else \
-		$(MAKE) $(LTLIBRARY_SHARED_NAME); \
-	fi; \

build/ltlib.mk

@@ -26,8 +26,6 @@
 
 targets = $(LTLIBRARY_NAME)
 
-include $(topsrcdir)/build/rules.mk
-include $(topsrcdir)/build/library.mk
+include $(top_srcdir)/build/rules.mk
+include $(top_srcdir)/build/library.mk
 
-# CC = insure
-CC = gcc

build/rules.mk

@@ -24,42 +24,53 @@
 # $Id$ 
 #
 
-include $(DEPTH)/config_vars.mk
+include $(top_builddir)/config_vars.mk
 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@
-mkinstalldirs = $(top_srcdir)/build/shtool mkdir -f -p
+COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)
+COMPILE      = $(CC)  $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
+CXX_COMPILE  = $(CXX) $(COMMON_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
+
+SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(COMPILE) -c $< && touch $@
+CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@
+
+LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LDFLAGS) -o $@
+
+mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
 INSTALL = $(top_srcdir)/build/shtool install -c
 INSTALL_DATA = $(INSTALL) -m 644
 
-DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(DEPTH)
+DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/main
 
-moduledir    = $(libdir)/php/modules
-top_srcdir   = $(topsrcdir)
-top_builddir = $(DEPTH)
+moduledir    = $(EXTENSION_DIR)
 
+CXX_SUFFIX = .cxx
+	
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s .y .l
+.SUFFIXES: .slo .c $(CXX_SUFFIX) .lo .o .s .y .l
 
 .c.o:
 	$(COMPILE) -c $<
 
-.s.o:
-	$(COMPILE) -c $<
+$(CXX_SUFFIX).o:
+	$(CXX_COMPILE) -c $<
 
-.S.o:
+.s.o:
 	$(COMPILE) -c $<
 
 .c.lo:
 	$(PHP_COMPILE)
 
+$(CXX_SUFFIX).lo:
+	$(CXX_PHP_COMPILE)
+
 .s.lo:
 	$(PHP_COMPILE)
 
-.S.lo:
-	$(PHP_COMPILE)
+.c.slo:
+	$(SHARED_COMPILE)
+
+$(CXX_SUFFIX).slo:
+	$(CXX_SHARED_COMPILE)
 
 .y.c:
 	$(YACC) $(YFLAGS) $< && mv y.tab.c $*.c
@@ -76,48 +87,36 @@ install: install-recursive
 
 distclean-recursive depend-recursive clean-recursive all-recursive install-recursive:
 	@otarget=`echo $@|sed s/-recursive//`; \
-	if test '$(NO_RECURSION)' != "$$otarget"; then \
-		list='$(SUBDIRS)'; for i in $$list; do \
-			target="$$otarget"; \
-			echo "Making $$target in $$i"; \
-			if test "$$i" = "."; then \
-				ok=yes; \
-				target="$$target-p"; \
-			fi; \
-			(cd $$i && $(MAKE) $$target) || exit 1; \
-		done; \
-		if test "$$otarget" = "all" && test -z '$(targets)'; then ok=yes; fi; \
-		if test "$$ok" != "yes"; then $(MAKE) "$$otarget-p" || exit 1; fi; \
-	fi; \
-	if test -n '$(make_shared)'; then \
-		$(MAKE) shared || exit 1; \
-	fi;
+	list='$(SUBDIRS)'; for i in $$list; do \
+		target="$$otarget"; \
+		echo "Making $$target in $$i"; \
+		if test "$$i" = "."; then \
+			ok=yes; \
+			target="$$target-p"; \
+		fi; \
+		(cd $$i && $(MAKE) $$target) || exit 1; \
+	done; \
+	if test "$$otarget" = "all" && test -z '$(targets)'; then ok=yes; fi; \
+	if test "$$ok" != "yes"; then $(MAKE) "$$otarget-p" || exit 1; fi
 
 all-p: $(targets)
 install-p: $(targets) $(install_targets)
 distclean-p depend-p clean-p:
 
 depend: depend-recursive
-	test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) *.c > .deps
+	test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP)  $(INCLUDES) $(EXTRA_INCLUDES) *.c > $(builddir)/.deps
 
 clean: clean-recursive clean-x
 
 clean-x:
-	rm -f $(targets) *.lo *.la *.o $(CLEANFILES)
+	rm -f $(targets) *.lo *.slo *.la *.o $(CLEANFILES)
 	rm -rf .libs
 
 distclean: distclean-recursive clean-x
 	rm -f config.cache config.log config.status config_vars.mk libtool \
 	php_config.h stamp-h Makefile build-defs.h php4.spec libphp4.module
 
-install-modules:
-	@test -d modules && \
-	$(mkinstalldirs) $(moduledir) && \
-	echo "installing shared modules into $(moduledir)" && \
-	rm -f modules/*.la && \
-	cp modules/* $(moduledir) || true
-	
-include $(srcdir)/.deps
+include $(builddir)/.deps
 
 .PHONY: all-recursive clean-recursive install-recursive \
 $(install_targets) install all clean depend depend-recursive shared \

build/rules_pear.mk

@@ -24,7 +24,7 @@
 # $Id$ 
 #
 
-include $(DEPTH)/config_vars.mk
+include $(top_builddir)/config_vars.mk
 
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
@@ -33,15 +33,13 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@
 mkinstalldirs = $(top_srcdir)/build/shtool mkdir -f -p
 INSTALL = $(top_srcdir)/build/shtool install -c
 INSTALL_DATA = $(INSTALL) -m 644
+SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< && touch $@
+DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/main
 
-DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(DEPTH)
-
-moduledir    = $(libdir)/php/modules
-top_srcdir   = $(topsrcdir)
-top_builddir = $(DEPTH)
+moduledir    = $(EXTENSION_DIR)
 
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s .y .l
+.SUFFIXES: .slo .c .lo .o .s .y .l
 
 .c.o:
 	$(COMPILE) -c $<
@@ -49,17 +47,14 @@ top_builddir = $(DEPTH)
 .s.o:
 	$(COMPILE) -c $<
 
-.S.o:
-	$(COMPILE) -c $<
-
 .c.lo:
 	$(PHP_COMPILE)
 
 .s.lo:
 	$(PHP_COMPILE)
 
-.S.lo:
-	$(PHP_COMPILE)
+.c.slo:
+	$(SHARED_COMPILE)
 
 .y.c:
 	$(YACC) $(YFLAGS) $< && mv y.tab.c $*.c
@@ -70,44 +65,36 @@ top_builddir = $(DEPTH)
 .l.c:
 	$(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@
 
-#################################
-# Simplified Makefile
+install_targets = install-modules
 
-all: shared
-install: shared install-modules
-
-#################################
-
-#all: all-recursive
+all: all-recursive
 install: install-recursive
 
 distclean-recursive depend-recursive clean-recursive all-recursive install-recursive:
 	@otarget=`echo $@|sed s/-recursive//`; \
-	if test '$(NO_RECURSION)' != "$$otarget"; then \
-		list='$(SUBDIRS)'; for i in $$list; do \
-			target="$$otarget"; \
-			echo "Making $$target in $$i"; \
-			if test "$$i" = "."; then \
-				ok=yes; \
-				target="$$target-p"; \
-			fi; \
-			(cd $$i && $(MAKE) $$target) || exit 1; \
-		done; \
-		test "$otarget" = "all" && test -z '$(targets)' && ok=yes; \
-		test "$ok" = "yes" || $(MAKE) "$$otarget-p" || exit 1; \
-	fi; 
+	list='$(SUBDIRS)'; for i in $$list; do \
+		target="$$otarget"; \
+		echo "Making $$target in $$i"; \
+		if test "$$i" = "."; then \
+			ok=yes; \
+			target="$$target-p"; \
+		fi; \
+		(cd $$i && $(MAKE) $$target) || exit 1; \
+	done; \
+	if test "$$otarget" = "all" && test -z '$(targets)'; then ok=yes; fi; \
+	if test "$$ok" != "yes"; then $(MAKE) "$$otarget-p" || exit 1; fi
 
 all-p: $(targets)
 install-p: $(targets) $(install_targets)
 distclean-p depend-p clean-p:
 
 depend: depend-recursive
-	test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) *.c > .deps
+	test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) *.c > $(builddir)/.deps
 
 clean: clean-recursive clean-x
 
 clean-x:
-	rm -f $(targets) *.lo *.la *.o $(CLEANFILES)
+	rm -f $(targets) *.lo *.slo *.la *.o $(CLEANFILES)
 	rm -rf .libs
 
 distclean: distclean-recursive clean-x
@@ -120,8 +107,8 @@ install-modules:
 	echo "installing shared modules into $(moduledir)" && \
 	rm -f modules/*.la && \
 	cp modules/* $(moduledir) || true
-	
-include $(srcdir)/.deps
+
+include $(builddir)/.deps
 
 .PHONY: all-recursive clean-recursive install-recursive \
 $(install_targets) install all clean depend depend-recursive shared \

build/shtool

@@ -1,12 +1,12 @@
 #!/bin/sh
 ##
 ##  GNU shtool -- The GNU Portable Shell Tool
-##  Copyright (c) 1994-1999 Ralf S. Engelschall <rse@engelschall.com>
+##  Copyright (c) 1994-2000 Ralf S. Engelschall <rse@engelschall.com>
 ##
 ##  See http://www.gnu.org/software/shtool/ for more information.
 ##  See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
 ##
-##  Version 1.4.7 (24-Dec-1999)
+##  Version 1.4.9 (16-Apr-2000)
 ##  Ingredients: 3/17 available modules
 ##
 
@@ -44,14 +44,14 @@
 ##
 ##  Not available commands (because module was not built-in):
 ##    mdate      Pretty-print modification time of a file or dir
-##    table      Pretty print a field-separated list as a table
+##    table      Pretty-print a field-separated list as a table
 ##    prop       Display progress with a running propeller
-##    move       Move files with simultan substitution
+##    move       Move files with simultaneous substitution
 ##    mkln       Make link with calculation of relative paths
-##    mkshadow   Make a shadow tree
+##    mkshadow   Make a shadow tree through symbolic links
 ##    fixperm    Fix file permissions inside a source tree
 ##    tarball    Roll distribution tarballs
-##    guessos    Simple OS/platform guesser
+##    guessos    Simple operating system guesser
 ##    arx        Extended archive command
 ##    slo        Separate linker options by library class
 ##    scpp       Sharing C Pre-Processor
@@ -65,8 +65,8 @@ if [ $# -eq 0 ]; then
     exit 1
 fi
 if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
-    echo "This is GNU shtool, version 1.4.7 (24-Dec-1999)"
-    echo "Copyright (c) 1994-1999 Ralf S. Engelschall <rse@engelschall.com>"
+    echo "This is GNU shtool, version 1.4.9 (16-Apr-2000)"
+    echo "Copyright (c) 1994-2000 Ralf S. Engelschall <rse@engelschall.com>"
     echo "Report bugs to <bug-shtool@gnu.org>"
     echo ''
     echo "Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]" 
@@ -94,9 +94,9 @@ if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
     echo '           <user>] [-g <group>] [-e <pattern>] <path> [<path> ...]'
     echo '  guessos  '
     echo '  arx      [-t] [-C<cmd>] <op> <archive> [<file> ...]'
-    echo '  slo      -- -L<dir> -l<lib> [ -L<dir> -l<lib> ... ]'
-    echo '  scpp     [-v] [-p] [-o<ofile>] [-t<tfile>] [-M<mark>] [-D<dname>]'
-    echo '           [-C<cname>] <file> [<file> ...]'
+    echo '  slo      [-p<str>] -- -L<dir> -l<lib> [-L<dir> -l<lib> ...]'
+    echo '  scpp     [-v] [-p] [-f<filter>] [-o<ofile>] [-t<tfile>] [-M<mark>]'
+    echo '           [-D<dname>] [-C<cname>] <file> [<file> ...]'
     echo '  version  [-l<lang>] [-n<name>] [-p<prefix>] [-s<version>] [-i<knob>]'
     echo '           [-d<type>] <file>'
     echo '  path     [-s] [-r] [-d] [-b] [-m] [-p<path>] <str> [<str> ...]'
@@ -104,7 +104,7 @@ if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
     exit 0
 fi
 if [ ".$1" = ".-v" -o ".$1" = ."--version" ]; then
-    echo "GNU shtool 1.4.7 (24-Dec-1999)"
+    echo "GNU shtool 1.4.9 (16-Apr-2000)"
     exit 0
 fi
 if [ ".$1" = ".-d" -o ".$1" = ."--debug" ]; then
@@ -136,13 +136,20 @@ case $tool in
         str_tool="echo"
         str_usage="[-n] [-e] [<str> ...]"
         arg_spec="0+"
-        opt_spec="ne"
+        opt_spec="n.e."
+        opt_n=no
+        opt_e=no
         ;;
     install )
         str_tool="install"
         str_usage="[-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<ext>] <file> <path>"
-        arg_spec="2"
-        opt_spec="vtcCsm:o:g:e:"
+        arg_spec="2="
+        opt_spec="v.t.c.C.s.m:o:g:e:"
+        opt_v=no
+        opt_t=no
+        opt_c=no
+        opt_C=no
+        opt_s=no
         opt_m=""
         opt_o=""
         opt_g=""
@@ -152,9 +159,17 @@ case $tool in
         str_tool="mkdir"
         str_usage="[-t] [-f] [-p] [-m<mode>] <dir> [<dir> ...]"
         arg_spec="1+"
-        opt_spec="tfpm:"
+        opt_spec="t.f.p.m:"
+        opt_t=no
+        opt_f=no
+        opt_p=no
         opt_m=""
         ;;
+    -* )
+        echo "$0:Error: unknown option \`$tool'" 2>&1
+        echo "$0:Hint:  run \`$0 -h' for usage" 2>&1
+        exit 1
+        ;;
     * )
         echo "$0:Error: unknown command \`$tool'" 2>&1
         echo "$0:Hint:  run \`$0 -h' for usage" 2>&1
@@ -168,30 +183,24 @@ esac
 
 #   determine name of tool
 if [ ".$tool" != . ]; then
-    #   inside shtool
+    #   used inside shtool script
     toolcmd="$0 $tool"
     toolcmdhelp="shtool $tool"
     msgprefix="shtool:$tool"
 else
-    #   standalone
+    #   used as standalone script
     toolcmd="$0"
-    toolcmdhelp="sh.$tool"
+    toolcmdhelp="sh $0"
     msgprefix="$str_tool"
 fi
 
 #   parse argument specification string
-eval `echo $arg_spec | sed -e 's/^\([0-9]*\)\(.*\)/arg_NUMS="\1"; arg_MODE="\2"/'`
-test ".$arg_MODE" = . && arg_MODE="="
+eval `echo $arg_spec |\
+      sed -e 's/^\([0-9]*\)\([+=]\)/arg_NUMS=\1; arg_MODE=\2/'`
 
 #   parse option specification string
-for opt in `echo "h$opt_spec" | sed -e 's/\([a-zA-Z0-9][:+]*\)/\1 /g'`; do
-    opt_MODE="."
-    eval `echo $opt |\
-          sed -e 's/^\([a-zA-Z0-9]\)/opt_THIS="\1";/' \
-              -e 's/";\([:+]\)/"; opt_MODE="\1";/'`
-    eval "opt_MODE_${opt_THIS}=${opt_MODE}"
-    test "$opt_MODE" = . && eval "opt_${opt_THIS}=no"
-done
+eval `echo h.$opt_spec |\
+      sed -e 's/\([a-zA-Z0-9]\)\([.:+]\)/opt_MODE_\1=\2;/g'`
 
 #   interate over argument line
 opt_PREV=''
@@ -209,7 +218,7 @@ while [ $# -gt 0 ]; do
         opt_OPT="$opt_PREV"
         opt_ARG="$1"
         opt_ARG_OK=yes
-        opt_PREV=""
+        opt_PREV=''
     else
         #   split argument into option and argument
         case "$1" in
@@ -219,8 +228,7 @@ while [ $# -gt 0 ]; do
                           -e 's/";\(.*\)$/"; opt_ARG="\1"/'`
                 ;;
             -[a-zA-Z0-9])
-                opt_OPT=`awk 'BEGIN { printf("%s", substr(OPT, 2)); }' \
-                         "OPT=$1" </dev/null"`
+                opt_OPT=`echo "x$1" | cut -c3-`
                 opt_ARG=''
                 ;;
             *)
@@ -243,15 +251,15 @@ while [ $# -gt 0 ]; do
 
     #   process option
     case $opt_MODE in
-        "." )
+        '.' )
             #   boolean option
             eval "opt_${opt_OPT}=yes"
             ;;
-        ":" )
+        ':' )
             #   option with argument (multiple occurances override)
             eval "opt_${opt_OPT}=\"\$opt_ARG\""
             ;;
-        "+" )
+        '+' )
             #   option with argument (multiple occurances append)
             eval "opt_${opt_OPT}=\"\$opt_${opt_OPT} \$opt_ARG\""
             ;;
@@ -276,14 +284,14 @@ fi
 
 #   complain about incorrect number of arguments
 case $arg_MODE in
-    "=" )
+    '=' )
         if [ $# -ne $arg_NUMS ]; then
             echo "$msgprefix:Error: invalid number of arguments (exactly $arg_NUMS expected)" 1>&2
             echo "$msgprefix:Hint:  run \`$toolcmd -h' or \`man shtool' for details" 1>&2
             exit 1
         fi
         ;;
-    "+" )
+    '+' )
         if [ $# -lt $arg_NUMS ]; then
             echo "$msgprefix:Error: invalid number of arguments (at least $arg_NUMS expected)" 1>&2
             echo "$msgprefix:Hint:  run \`$toolcmd -h' or \`man shtool' for details" 1>&2
@@ -294,13 +302,12 @@ esac
 
 #   establish a temporary file on request
 if [ ".$gen_tmpfile" = .yes ]; then
-    tmpdir="/tmp"
     if [ ".$TMPDIR" != . ]; then
         tmpdir="$TMPDIR"
+    elif [ ".$TEMPDIR" != . ]; then
+        tmpdir="$TEMPDIR"
     else
-        if [ ".$TEMPDIR" != . ]; then
-            tmpdir="$TEMPDIR"
-        fi
+        tmpdir="/tmp"
     fi
     tmpfile="$tmpdir/.shtool.$$"
     rm -f $tmpfile >/dev/null 2>&1
@@ -316,7 +323,7 @@ case $tool in
 echo )
     ##
     ##  echo -- Print string with optional construct expansion
-    ##  Copyright (c) 1998-1999 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2000 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for WML as buildinfo
     ##
     
@@ -343,8 +350,8 @@ echo )
     term_bold='' 
     term_norm=''
     if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[Bb]'`" != . ]; then
-        #   the most important terminals we directly know
         case $TERM in
+            #   for the most important terminal types we directly know the sequences
             xterm|xterm*|vt220|vt220*)
                 term_bold=`awk 'BEGIN { printf("%c%c%c%c", 27, 91, 49, 109); }' </dev/null 2>/dev/null`
                 term_norm=`awk 'BEGIN { printf("%c%c%c", 27, 91, 109); }' </dev/null 2>/dev/null`
@@ -353,35 +360,37 @@ echo )
                 term_bold=`awk 'BEGIN { printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }' </dev/null 2>/dev/null`
                 term_norm=`awk 'BEGIN { printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }' </dev/null 2>/dev/null`
                 ;;
-        esac
-        #   then try a possibly existing "tput" or "tcout" utility
-        paths=`echo $PATH | sed -e 's/:/ /g'`
-        for tool in tput tcout; do
-            for dir in $paths; do
-                if [ -r "$dir/$tool" ]; then
-                    for seq in bold md smso; do # smso is last
-                        bold="`$dir/$tool $seq 2>/dev/null`"
-                        if [ ".$bold" != . ]; then
-                            term_bold="$bold"
+            #   for all others, we try to use a possibly existing `tput' or `tcout' utility
+            * )
+                paths=`echo $PATH | sed -e 's/:/ /g'`
+                for tool in tput tcout; do
+                    for dir in $paths; do
+                        if [ -r "$dir/$tool" ]; then
+                            for seq in bold md smso; do # 'smso' is last
+                                bold="`$dir/$tool $seq 2>/dev/null`"
+                                if [ ".$bold" != . ]; then
+                                    term_bold="$bold"
+                                    break
+                                fi
+                            done
+                            if [ ".$term_bold" != . ]; then
+                                for seq in sgr0 me rmso reset; do # 'reset' is last
+                                    norm="`$dir/$tool $seq 2>/dev/null`"
+                                    if [ ".$norm" != . ]; then
+                                        term_norm="$norm"
+                                        break
+                                    fi
+                                done
+                            fi
                             break
                         fi
                     done
-                    if [ ".$term_bold" != . ]; then
-                        for seq in sgr0 me rmso reset; do # 'reset' is last
-                            norm="`$dir/$tool $seq 2>/dev/null`"
-                            if [ ".$norm" != . ]; then
-                                term_norm="$norm"
-                                break
-                            fi
-                        done
+                    if [ ".$term_bold" != . -a ".$term_norm" != . ]; then
+                        break;
                     fi
-                    break
-                fi
-            done
-            if [ ".$term_bold" != . -a ".$term_norm" != . ]; then
-                break;
-            fi
-        done
+                done
+                ;;
+        esac
         if [ ".$term_bold" = . -o ".$term_norm" = . ]; then
             echo "$msgprefix:Warning: unable to determine terminal sequence for bold mode" 1>&2
         fi
@@ -525,7 +534,7 @@ echo )
         echo $seo "$text"
     else
         #   the harder part: echo -n is best, because
-        #   awk complains about some \xx sequences.
+        #   awk may complain about some \xx sequences.
         if [ ".$minusn" != . ]; then
             echo $seo $minusn "$text"
         else
@@ -537,7 +546,7 @@ echo )
 install )
     ##
     ##  install -- Install a program, script or datafile
-    ##  Copyright (c) 1997-1999 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1997-2000 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
@@ -644,24 +653,24 @@ install )
 mkdir )
     ##
     ##  mkdir -- Make one or more directories
-    ##  Copyright (c) 1996-1999 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1996-2000 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for public domain by Noah Friedman <friedman@prep.ai.mit.edu>
     ##  Cleaned up and enhanced for shtool
     ##
     
     errstatus=0
     for p in ${1+"$@"}; do
-        #   when the directory already exists...
+        #   if the directory already exists...
         if [ -d "$p" ]; then
-            if [ ".$opt_f" = .no ]; then
-                echo "$msgprefix:Error: file exists: $p" 1>&2
+            if [ ".$opt_f" = .no ] && [ ".$opt_p" = .no ]; then
+                echo "$msgprefix:Error: directory already exists: $p" 1>&2
                 errstatus=1
                 break
             else
                 continue
             fi
         fi
-        #   when the directory has to be created
+        #   if the directory has to be created...
         if [ ".$opt_p" = .no ]; then
             if [ ".$opt_t" = .yes ]; then
                 echo "mkdir $p" 1>&2
@@ -675,7 +684,7 @@ mkdir )
                            -e 's/\// /g' \
                            -e 's/^%/\//'`
             shift
-            pathcomp=
+            pathcomp=''
             for d in ${1+"$@"}; do
                 pathcomp="$pathcomp$d"
                 case "$pathcomp" in

calendar.mak

@@ -1,244 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on calendar.dsp
-!IF "$(CFG)" == ""
-CFG=calendar - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to calendar - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "calendar - Win32 Release" && "$(CFG)" != "calendar - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "calendar.mak" CFG="calendar - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "calendar - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "calendar - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "calendar - Win32 Release"
-
-OUTDIR=.\module_release
-INTDIR=.\module_release
-# Begin Custom Macros
-OutDir=.\module_release
-# End Custom Macros
-
-ALL : "$(OUTDIR)\php3_calendar.dll"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\calendar.obj"
-	-@erase "$(INTDIR)\dow.obj"
-	-@erase "$(INTDIR)\french.obj"
-	-@erase "$(INTDIR)\gregor.obj"
-	-@erase "$(INTDIR)\jewish.obj"
-	-@erase "$(INTDIR)\julian.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\php3_calendar.dll"
-	-@erase "$(OUTDIR)\php3_calendar.exp"
-	-@erase "$(OUTDIR)\php3_calendar.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "./" /I "../" /D "NDEBUG" /D "COMPILE_DL" /D "MSVC5" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\calendar.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\calendar.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=php.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:1 /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\php3_calendar.pdb" /machine:I386 /out:"$(OUTDIR)\php3_calendar.dll" /implib:"$(OUTDIR)\php3_calendar.lib" /libpath:"cgi_release" 
-LINK32_OBJS= \
-	"$(INTDIR)\calendar.obj" \
-	"$(INTDIR)\dow.obj" \
-	"$(INTDIR)\french.obj" \
-	"$(INTDIR)\gregor.obj" \
-	"$(INTDIR)\jewish.obj" \
-	"$(INTDIR)\julian.obj"
-
-"$(OUTDIR)\php3_calendar.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "calendar - Win32 Debug"
-
-OUTDIR=.\module_debug
-INTDIR=.\module_debug
-# Begin Custom Macros
-OutDir=.\module_debug
-# End Custom Macros
-
-ALL : "$(OUTDIR)\php3_calendar.dll"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\calendar.obj"
-	-@erase "$(INTDIR)\dow.obj"
-	-@erase "$(INTDIR)\french.obj"
-	-@erase "$(INTDIR)\gregor.obj"
-	-@erase "$(INTDIR)\jewish.obj"
-	-@erase "$(INTDIR)\julian.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\php3_calendar.dll"
-	-@erase "$(OUTDIR)\php3_calendar.exp"
-	-@erase "$(OUTDIR)\php3_calendar.ilk"
-	-@erase "$(OUTDIR)\php3_calendar.lib"
-	-@erase "$(OUTDIR)\php3_calendar.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../" /D "DEBUG" /D "_DEBUG" /D "COMPILE_DL" /D "MSVC5" /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\calendar.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\calendar.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=php.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:1 /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\php3_calendar.pdb" /debug /machine:I386 /out:"$(OUTDIR)\php3_calendar.dll" /implib:"$(OUTDIR)\php3_calendar.lib" /pdbtype:sept /libpath:"cgi_debug" 
-LINK32_OBJS= \
-	"$(INTDIR)\calendar.obj" \
-	"$(INTDIR)\dow.obj" \
-	"$(INTDIR)\french.obj" \
-	"$(INTDIR)\gregor.obj" \
-	"$(INTDIR)\jewish.obj" \
-	"$(INTDIR)\julian.obj"
-
-"$(OUTDIR)\php3_calendar.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("calendar.dep")
-!INCLUDE "calendar.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "calendar.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "calendar - Win32 Release" || "$(CFG)" == "calendar - Win32 Debug"
-SOURCE=.\dl\calendar\calendar.c
-
-"$(INTDIR)\calendar.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dl\calendar\dow.c
-
-"$(INTDIR)\dow.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dl\calendar\french.c
-
-"$(INTDIR)\french.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dl\calendar\gregor.c
-
-"$(INTDIR)\gregor.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dl\calendar\jewish.c
-
-"$(INTDIR)\jewish.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dl\calendar\julian.c
-
-"$(INTDIR)\julian.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-

config.guess

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
@@ -23,8 +23,7 @@
 # the same distribution terms that you use for the rest of that program.
 
 # Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-# Please send patches to <autoconf-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -68,6 +67,43 @@ trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# Netbsd (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	# Determine the machine/vendor (is the vendor relevant).
+	case "${UNAME_MACHINE}" in
+	    amiga) machine=m68k-cbm ;;
+	    arm32) machine=arm-unknown ;;
+	    atari*) machine=m68k-atari ;;
+	    sun3*) machine=m68k-sun ;;
+	    mac68k) machine=m68k-apple ;;
+	    macppc) machine=powerpc-apple ;;
+	    hp3[0-9][05]) machine=m68k-hp ;;
+	    ibmrt|romp-ibm) machine=romp-ibm ;;
+	    *) machine=${UNAME_MACHINE}-unknown ;;
+	esac
+	# The Operating System including object format.
+	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep __ELF__ >/dev/null
+	then
+	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+	    # Return netbsd for either.  FIX?
+	    os=netbsd
+	else
+	    os=netbsdelf
+	fi
+	# The OS release
+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -77,41 +113,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
 	.globl main
+	.align 4
 	.ent main
 main:
-	.frame \$30,0,\$26,0
-	.prologue 0
-	.long 0x47e03d80 # implver $0
-	lda \$2,259
-	.long 0x47e20c21 # amask $2,$1
-	srl \$1,8,\$2
-	sll \$2,2,\$2
-	sll \$0,3,\$0
-	addl \$1,\$0,\$0
-	addl \$2,\$0,\$0
-	ret \$31,(\$26),1
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
 	.end main
 EOF
 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		./$dummy
-		case "$?" in
-			7)
+		case `./$dummy` in
+			0-0)
 				UNAME_MACHINE="alpha"
 				;;
-			15)
+			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
-			14)
+			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
-			10)
+			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
-			16)
+			2-303)
 				UNAME_MACHINE="alphaev6"
 				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
 		esac
 	fi
 	rm -f $dummy.s $dummy
@@ -129,9 +175,6 @@ EOF
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-cbm-sysv4
 	exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -162,9 +205,6 @@ EOF
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    arm32:NetBSD:*:*)
-	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
@@ -221,15 +261,12 @@ EOF
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    atari*:NetBSD:*:*)
-	echo m68k-atari-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     atari*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor 
+    # "atarist" or "atariste" at least should have a processor
     # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
     # to the lowercase version "mint" (or "freemint").  Finally
     # the system name "TOS" denotes a system which is actually not
@@ -253,15 +290,9 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:NetBSD:*:*)
-	echo m68k-sun-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     sun3*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    mac68k:NetBSD:*:*)
-	echo m68k-apple-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -274,9 +305,6 @@ EOF
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
-    macppc:NetBSD:*:*)
-        echo powerpc-apple-netbsd${UNAME_RELEASE}
-        exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
 	exit 0 ;;
@@ -292,6 +320,7 @@ EOF
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -331,7 +360,7 @@ EOF
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
 	       [ ${TARGET_BINARY_INTERFACE}x = x ]
@@ -408,7 +437,7 @@ EOF
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
 	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
 	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
@@ -429,6 +458,8 @@ EOF
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
               sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
               #include <stdlib.h>
               #include <unistd.h>
 
@@ -553,10 +584,13 @@ EOF
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
 	exit 0 ;;
     CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE}
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*T3E:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE}
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY-2:*:*:*)
 	echo cray2-cray-unicos
@@ -569,13 +603,10 @@ EOF
     F301:UNIX_System_V:*:*)
        echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
        exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-	echo m68k-hp-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     sparc*:BSD/OS:*:*)
@@ -585,17 +616,8 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	if test -x /usr/bin/objformat; then
-	    if test "elf" = "`/usr/bin/objformat`"; then
-		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
-		exit 0
-	    fi
-	fi
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
-    *:NetBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
-	exit 0 ;;
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
@@ -644,6 +666,10 @@ EOF
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit 0
 		;;
+	  elf_i?86)
+		echo "${UNAME_MACHINE}-pc-linux"
+		exit 0
+		;;
 	  i?86coff)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit 0
@@ -657,7 +683,7 @@ EOF
 		exit 0
 		;;
 	  elf32arm*)
-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
 		exit 0
 		;;
 	  armelf_linux*)
@@ -668,7 +694,7 @@ EOF
 		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
 		exit 0
 		;;
-	  elf32ppc)
+	  elf32ppc | elf32ppclinux)
 		# Determine Lib Version
 		cat >$dummy.c <<EOF
 #include <features.h>
@@ -695,7 +721,7 @@ EOF
 			if test "$?" = 0 ; then
 				LIBC="libc1"
 			fi
-		fi	
+		fi
 		rm -f $dummy.c $dummy
 		echo powerpc-unknown-linux-gnu${LIBC}
 		exit 0
@@ -703,43 +729,53 @@ EOF
 	esac
 
 	if test "${UNAME_MACHINE}" = "alpha" ; then
-		sed 's/^	//'  <<EOF >$dummy.s
-		.globl main
-		.ent main
-	main:
-		.frame \$30,0,\$26,0
-		.prologue 0
-		.long 0x47e03d80 # implver $0
-		lda \$2,259
-		.long 0x47e20c21 # amask $2,$1
-		srl \$1,8,\$2
-		sll \$2,2,\$2
-		sll \$0,3,\$0
-		addl \$1,\$0,\$0
-		addl \$2,\$0,\$0
-		ret \$31,(\$26),1
-		.end main
+		cat <<EOF >$dummy.s
+			.data
+		\$Lformat:
+			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+			.text
+			.globl main
+			.align 4
+			.ent main
+		main:
+			.frame \$30,16,\$26,0
+			ldgp \$29,0(\$27)
+			.prologue 1
+			.long 0x47e03d80 # implver \$0
+			lda \$2,-1
+			.long 0x47e20c21 # amask \$2,\$1
+			lda \$16,\$Lformat
+			mov \$0,\$17
+			not \$1,\$18
+			jsr \$26,printf
+			ldgp \$29,0(\$26)
+			mov 0,\$16
+			jsr \$26,exit
+			.end main
 EOF
 		LIBC=""
 		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
-			./$dummy
-			case "$?" in
-			7)
+			case `./$dummy` in
+			0-0)
 				UNAME_MACHINE="alpha"
 				;;
-			15)
+			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
-			14)
+			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
-			10)
+			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
-			16)
+			2-303)
 				UNAME_MACHINE="alphaev6"
 				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
 			esac
 
 			objdump --private-headers $dummy | \
@@ -753,6 +789,7 @@ EOF
 	elif test "${UNAME_MACHINE}" = "mips" ; then
 	  cat >$dummy.c <<EOF
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -768,6 +805,8 @@ EOF
 EOF
 	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
+	elif test "${UNAME_MACHINE}" = "s390"; then
+	  echo s390-ibm-linux && exit 0
 	else
 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
 	  # or one that does not give us useful --help.
@@ -789,6 +828,7 @@ EOF
 	  cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -860,7 +900,11 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    i?86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     pc:*:*:*)
+	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
@@ -974,8 +1018,26 @@ EOF
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
+    *:Darwin:*:*)
+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	if test "${UNAME_MACHINE}" = "x86pc"; then
+		UNAME_MACHINE=pc
+	fi
+	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+	exit 0 ;;
     *:QNX:*:4*)
-	echo i386-qnx-qnx${UNAME_VERSION}
+	echo i386-pc-qnx
+	exit 0 ;;
+    NSR-W:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit 0 ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit 0 ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
 	exit 0 ;;
 esac
 

config.sub

@@ -1,6 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Free Software Foundation, Inc.
+#
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -25,6 +27,9 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+# Written by Per Bothner <bothner@cygnus.com>.
+# Please send patches to <config-patches@gnu.org>.
+#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -68,7 +73,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  linux-gnu*)
+  nto-qnx* | linux-gnu*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -169,15 +174,18 @@ case $basic_machine in
 	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
 		| 580 | i960 | h8300 \
+		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+		| hppa64 \
+		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+		| alphaev6[78] \
 		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
 		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
 		| mips64vr5000 | miprs64vr5000el | mcore \
 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v | fr30)
+		| thumb | d10v | fr30 | avr)
 		basic_machine=$basic_machine-unknown
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
@@ -201,8 +209,11 @@ case $basic_machine in
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
 	      | xmp-* | ymp-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
-	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+	      | hppa2.0n-* | hppa64-* \
+	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+	      | alphaev6[78]-* \
 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
 	      | clipper-* | orion-* \
 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
@@ -210,9 +221,10 @@ case $basic_machine in
 	      | mips64el-* | mips64orion-* | mips64orionel-* \
 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
 	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f301-* | armv*-* | t3e-* \
+	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+	      | bs2000-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -464,9 +476,6 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-mingw32
 		;;
-	i386-qnx | qnx)
-		basic_machine=i386-qnx
-		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -513,6 +522,10 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -585,6 +598,9 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -729,6 +745,10 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
@@ -918,12 +938,25 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i[34567]86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto*)
+		os=-nto-qnx
+		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
@@ -940,6 +973,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+	-wince*)
+		os=-wince
+		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -964,6 +1000,9 @@ case $os in
 	-ns2 )
 	        os=-nextstep2
 		;;
+	-nsk)
+		os=-nsk
+		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -977,9 +1016,6 @@ case $os in
 	-oss*)
 		os=-sysv3
 		;;
-        -qnx)
-		os=-qnx4
-		;;
 	-svr4)
 		os=-sysv4
 		;;

configure.in

@@ -3,15 +3,9 @@ dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
 
-AC_INIT(main.c)
+AC_INIT(README.CVS-RULES)
 
-PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile) 
-
-dnl Because ``make install'' is often performed by the superuser,
-dnl we create the libs subdirectory as the user who configures PHP.
-dnl Otherwise, the current user will not be able to delete libs
-dnl or the contents of libs.
-test -d libs || mkdir libs
+PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile)
 
 if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then
   AC_MSG_ERROR(--with-shared-apache is not supported. Please refer to the documentation for using APXS)
@@ -23,8 +17,9 @@ fi
 
 cwd=`pwd`
 
-CONFIGURE_COMMAND=$0
-for arg in "$@"; do
+PHP_CONFIG_NICE(config.nice)
+
+for arg in $0 "$@"; do
     CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
 done
 
@@ -32,6 +27,14 @@ php_shtool="$srcdir/build/shtool"
 T_MD=`$php_shtool echo -n -e %B`
 T_ME=`$php_shtool echo -n -e %b`
 
+dnl Because ``make install'' is often performed by the superuser,
+dnl we create the libs subdirectory as the user who configures PHP.
+dnl Otherwise, the current user will not be able to delete libs
+dnl or the contents of libs.
+
+$php_shtool mkdir -p libs
+rm -f libs/*
+
 dnl ## Diversion 2 is the initial checking of OS features, programs,
 dnl ## libraries and so on.
 
@@ -47,12 +50,8 @@ dnl ## All of these are normally in the extension directories.
 
 dnl ## Diversion 5 is the last one.  Here we generate files and clean up.
 
-divert(2)
-
-PHP_CONFIGURE_PART(Running system checks)
-	
 dnl ## This is where the version number is changed from now on!
-AM_INIT_AUTOMAKE(php, 4.0b4)
+AM_INIT_AUTOMAKE(php, 4.0.2-dev)
 
 PHP_VERSION=$VERSION
 echo "/* automatically generated by configure */" > php_version.h.new
@@ -68,15 +67,11 @@ fi
 
 AM_CONFIG_HEADER(php_config.h)
 AM_MAINTAINER_MODE
+AC_CANONICAL_HOST
 
 dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1
 
-dnl If we're using cc on HP-UX, add -Ae -D_HPUX_SOURCE [obsolete]
-dnl if test -n "$auto_cflags" && test "`uname -s 2>/dev/null`" = "HP-UX"; then
-dnl   test -n "$GCC" || CFLAGS="-Ae $CFLAGS -D_HPUX_SOURCE"
-dnl fi
-
 dnl Checks for programs.
 AC_PROG_YACC
 if test "$YACC" != "bison -y"; then
@@ -92,11 +87,17 @@ else
     AC_MSG_RESULT($1.$2 (ok))
 fi
 
-dnl ## there has to be a better way...
-dnl## OLDLIBS=$LIBS; LIBS=""
 AC_PROG_CC
 AC_AIX
-dnl## LIBS=$OLDLIBS
+
+case "$host_alias" in
+*solaris*)
+    CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS";;
+*dgux*)
+    CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR";;
+*rhapsody*)
+    CPPFLAGS="$CPPFLAGS -traditional-cpp";;
+esac
 
 AM_PROG_CC_STDC
 
@@ -106,9 +107,9 @@ AC_PROG_LN_S
 
 AM_PROG_LEX
 
-dnl Make flex scanners use const if they can, even if __STDC__ is not
-dnl true, for compilers like Sun's that only set __STDC__ true in
-dnl "limit-to-ANSI-standard" mode, not in "ANSI-compatible" mode
+dnl ## Make flex scanners use const if they can, even if __STDC__ is not
+dnl ## true, for compilers like Sun's that only set __STDC__ true in
+dnl ## "limit-to-ANSI-standard" mode, not in "ANSI-compatible" mode
 AC_C_CONST
 if test "$ac_cv_c_const" = "yes" ; then
   LEX_CFLAGS="-DYY_USE_CONST"
@@ -118,6 +119,37 @@ sinclude(Zend/acinclude.m4)
 sinclude(Zend/Zend.m4)
 sinclude(TSRM/tsrm.m4)
 
+divert(2)
+
+PTHREADS_CHECK
+
+PHP_SHLIB_SUFFIX_NAME
+
+PHP_SAPI=cgi
+PHP_BUILD_PROGRAM
+dnl paths to the targets are relative to the build directory
+SAPI_PROGRAM=php
+SAPI_SHARED=libs/libphp4.$SHLIB_SUFFIX_NAME
+SAPI_STATIC=libs/libphp4.a
+
+PHP_CONFIGURE_PART(Configuring SAPI modules)
+
+esyscmd(./scripts/config-stubs sapi)
+
+AC_MSG_CHECKING(for chosen SAPI module)
+AC_MSG_RESULT($PHP_SAPI)
+
+if test "$enable_experimental_zts" = "yes"; then
+  PTHREADS_ASSIGN_VARS
+  PTHREADS_FLAGS
+fi
+
+divert(3)
+
+PHP_CONFIGURE_PART(Running system checks)
+
+PHP_MISSING_TIME_R_DECL
+
 dnl check for -R, etc. switch
 AC_MSG_CHECKING(whether compiler supports -R)
 AC_CACHE_VAL(php_cv_cc_dashr,[
@@ -144,49 +176,64 @@ else
 	fi
 fi
 
-dnl AC_PROG_INSTALL
-AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/lib/sendmail, $PATH /usr/bin /usr/sbin /usr/etc /etc /usr/ucblib)
-if test -n "$PROG_SENDMAIL"; then
-  AC_DEFINE(HAVE_SENDMAIL)
-fi
+PHP_PROG_SENDMAIL
+
+dnl Check whether the system uses EBCDIC (not ASCII) as its native codeset
+PHP_EBCDIC
 
 dnl
 dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary
 dnl and source packages.  This should be harmless on other OSs.
 dnl
 if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
-       CFLAGS="$CFLAGS -I/usr/pkg/include"
+       CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
        LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
 fi
 
-INCLUDES="-I\$(top_builddir)/Zend -I\$(top_srcdir)"
+INCLUDES="$INCLUDES -I\$(top_builddir)/Zend -I\$(top_srcdir)"
 
-AC_CHECK_LIB(nsl, gethostname, [
- AC_ADD_LIBRARY(nsl)
- AC_DEFINE(HAVE_LIBNSL) ], [])
 
 AC_CHECK_LIB(socket, socket, [
  AC_ADD_LIBRARY(socket)
- AC_DEFINE(HAVE_LIBSOCKET) ], [
+ AC_DEFINE(HAVE_LIBSOCKET,1,[ ]) ], [
   AC_CHECK_LIB(socket, htonl, [
    AC_ADD_LIBRARY(socket)
    ])])
 
-AC_CHECK_LIB(nsl, gethostbyaddr, [
+dnl Some systems (OpenServer 5) dislike -lsocket -lnsl, so we try
+dnl to avoid -lnsl checks, if we already have the functions which
+dnl are usually in libnsl
+
+unset ac_cv_func_yp_get_default_domain
+AC_CHECK_FUNC(yp_get_default_domain,
+ [php_no_nsl_checks=yes],[ ])
+unset ac_cv_func_yp_get_default_domain
+
+if test "$php_no_nsl_checks" != "yes"; then
+
+AC_CHECK_LIB(nsl, gethostname, [
  AC_ADD_LIBRARY(nsl)
- AC_DEFINE(HAVE_LIBNSL) ], [])
+ AC_DEFINE(HAVE_LIBNSL,1,[ ]) ],[
+ AC_CHECK_LIB(nsl, gethostbyaddr, [
+  AC_ADD_LIBRARY(nsl)
+  AC_DEFINE(HAVE_LIBNSL,1,[ ]) ], [])
+])
+
+fi
 
 AC_CHECK_LIB(crypt, crypt, [
  AC_ADD_LIBRARY(crypt)
  AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) ], [])
 
+AC_CHECK_LIB(dl, dlopen,[AC_ADD_LIBRARY(dl)])
+
 dnl The sin may be in a library which need not be specifed
 dnl as well as res_search resides in libsocket
 AC_CHECK_LIB(m, sin)
 
 AC_CHECK_LIB(bind, inet_aton, [
   AC_ADD_LIBRARY(bind)
-  AC_DEFINE(HAVE_LIBBIND) ], []) 
+  AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], []) 
 
 AC_CHECK_LIB(resolv, inet_aton)
 
@@ -197,10 +244,10 @@ AC_CHECK_LIB(socket, res_search, [
  AC_CHECK_LIB(resolv, dn_skipname)
  AC_CHECK_LIB(resolv, __dn_skipname)
  LIBS="$LIBS -lsocket"
- AC_DEFINE(HAVE_LIBSOCKET) ], [
+ AC_DEFINE(HAVE_LIBSOCKET,1,[ ]) ], [
  AC_CHECK_LIB(resolv, res_search, [
   LIBS="$LIBS -lresolv"
-  AC_DEFINE(HAVE_LIBRESOLV) 
+  AC_DEFINE(HAVE_LIBRESOLV,1,[ ]) 
  ], [
   AC_CHECK_LIB(resolv, dn_skipname)
   AC_CHECK_LIB(resolv, __dn_skipname)
@@ -219,22 +266,23 @@ fi
 AC_MISSING_FCLOSE_DECL
 dnl QNX requires unix.h to allow functions in libunix to work properly
 AC_CHECK_HEADERS(
+alloca.h \
 arpa/inet.h \
 crypt.h \
-dlfcn.h \
 fcntl.h \
 grp.h \
 limits.h \
 locale.h \
-memory.h \
 netinet/in.h \
 pwd.h \
 signal.h \
 stdarg.h \
 stdlib.h \
 string.h \
+syslog.h \
 sys/file.h \
 sys/mman.h \
+sys/resource.h \
 sys/select.h \
 sys/socket.h \
 sys/statfs.h \
@@ -243,9 +291,9 @@ sys/time.h \
 sys/types.h \
 sys/varargs.h \
 sys/wait.h \
-syslog.h \
 unistd.h \
 unix.h \
+utime.h \
 )
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -276,9 +324,6 @@ AC_STRUCT_ST_RDEV
 dnl Checks for types
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
-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 Checks for library functions.
 AC_FUNC_VPRINTF
@@ -291,9 +336,11 @@ flock \
 gcvt \
 getlogin \
 gethostbyaddr \
+getrusage \
 gettimeofday \
 gmtime_r \
 inet_aton \
+isascii \
 link \
 localtime_r \
 lockf \
@@ -305,7 +352,6 @@ putenv \
 random \
 rand_r \
 regcomp \
-rint \
 setitimer \
 setlocale \
 setsockopt \
@@ -317,6 +363,7 @@ srand48 \
 srandom \
 statfs \
 statvfs \
+std_syslog \
 strcasecmp \
 strdup \
 strerror \
@@ -337,6 +384,8 @@ AC_FUNC_UTIME_NULL
 AC_FUNC_ALLOCA
 AC_BROKEN_SPRINTF
 PHP_DECLARED_TIMEZONE
+PHP_TIME_R_TYPE
+PHP_READDIR_R_TYPE
 
 dnl AIX keeps in_addr_t in /usr/include/netinet/in.h
 dnl AC_MSG_CHECKING(for in_addr_t)
@@ -355,60 +404,40 @@ changequote([,]), [#include <sys/types.h>
 
 dnl AC_MSG_RESULT($ac_cv_type_in_addr_t)
 if test $ac_cv_type_in_addr_t = no; then
-  AC_DEFINE(in_addr_t, u_int)
+  AC_DEFINE(in_addr_t, u_int, [ ])
 fi
 
-divert(3)
+divert(4)
 
 
 	
 abs_srcdir=`(cd $srcdir; pwd)`
 abs_builddir=`pwd`
 
-AC_MSG_CHECKING(whether to use a configuration file)
-AC_ARG_WITH(config-file-path,
+PHP_ARG_WITH(config-file-path,whether to use a configuration file,
 [  --with-config-file-path=PATH  
                           Sets the path in which to look for php.ini.
-                          defaults to /usr/local/lib],
-[
-  if test "$withval" = "yes"; then
-    AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "/usr/local/lib")
-    AC_DEFINE(USE_CONFIG_FILE, 1)
-    AC_MSG_RESULT(yes)
-  else
-    if test "$withval" != "no"; then
-      AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "$withval")
-      AC_DEFINE(USE_CONFIG_FILE, 1)
-      AC_MSG_RESULT(yes)
-    else
-      AC_DEFINE(CONFIGURATION_FILE_PATH, 0)
-      AC_DEFINE(USE_CONFIG_FILE, 0)
-      AC_MSG_RESULT(no)
-    fi
-  fi
-],[
-  AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "/usr/local/lib")
-  AC_DEFINE(USE_CONFIG_FILE, 1)
-  AC_MSG_RESULT(yes)
-]) 
+                          defaults to /usr/local/lib], yes)
 
+if test "$PHP_CONFIG_FILE_PATH" = "yes"; then
+  PHP_CONFIG_FILE_PATH="/usr/local/lib"
+fi
 
-AC_ARG_ENABLE(debug,
-[  --disable-debug         Compile without debugging symbols], [
-  PHP_DEBUG=$enableval
-],[
-  PHP_DEBUG=yes
-])
+if test "$PHP_CONFIG_FILE_PATH" != "no"; then
+  AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "$PHP_CONFIG_FILE_PATH",[ ])
+  AC_DEFINE(USE_CONFIG_FILE, 1, [ ])
+else
+  AC_DEFINE(CONFIGURATION_FILE_PATH, 0, [ ])
+  AC_DEFINE(USE_CONFIG_FILE, 0, [ ])
+fi
 
-AC_MSG_CHECKING(whether to include debugging symbols)
-AC_MSG_RESULT($PHP_DEBUG)
+PHP_ARG_ENABLE(debug, whether to include debugging symbols,
+[  --enable-debug         Compile with debugging symbols.], no)
 
 if test "$PHP_DEBUG" = "yes"; then
-  AC_DEFINE(DEBUG,1)
   PHP_DEBUG=1
   ZEND_DEBUG=yes
 else
-  AC_DEFINE(DEBUG,0)
   PHP_DEBUG=0
   ZEND_DEBUG=no
 fi
@@ -416,23 +445,14 @@ fi
 
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
+PHP_ARG_ENABLE(safe-mode, whether to enable safe mode by default,
+[  --enable-safe-mode      Enable safe mode by default.])
 
-AC_MSG_CHECKING(whether to enable safe mode by default)
-AC_ARG_ENABLE(safe-mode,
-[  --enable-safe-mode      Enable safe mode by default.],
-[
-  if test "$enableval" = "yes"; then
-    AC_DEFINE(PHP_SAFE_MODE, 1)
-    AC_MSG_RESULT(yes)
-  else
-    AC_DEFINE(PHP_SAFE_MODE, 0)
-    AC_MSG_RESULT(no)
-  fi
-],[
-    AC_DEFINE(PHP_SAFE_MODE, 0)
-    AC_MSG_RESULT(no)
-]) 
-
+if test "$PHP_SAFE_MODE" = "yes"; then
+  AC_DEFINE(PHP_SAFE_MODE,1,[ ])
+else
+  AC_DEFINE(PHP_SAFE_MODE,0,[ ])
+fi
 
 AC_MSG_CHECKING(for safe mode exec dir)
 AC_ARG_WITH(exec-dir,
@@ -441,150 +461,103 @@ AC_ARG_WITH(exec-dir,
 [
   if test "$withval" != "no"; then
   	if test "$withval" = "yes"; then
-		AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin")
+		AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
     	AC_MSG_RESULT(/usr/local/php/bin)
    	else
-		AC_DEFINE_UNQUOTED(PHP_SAFE_MODE_EXEC_DIR,"$withval")
+		AC_DEFINE_UNQUOTED(PHP_SAFE_MODE_EXEC_DIR,"$withval", [ ])
     	AC_MSG_RESULT($withval)
    	fi
   else
-	AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin")
+	AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
    	AC_MSG_RESULT(/usr/local/php/bin)
   fi
 ],[
-	AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin")
+	AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
    	AC_MSG_RESULT(/usr/local/php/bin)
 ])
 
+PHP_ARG_ENABLE(sigchild,whether to enable PHP's own SIGCHLD handler,
+[  --enable-sigchild       Enable PHP's own SIGCHLD handler.],no)
 
-AC_MSG_CHECKING(whether to enable track_vars variables by default)
-AC_ARG_ENABLE(track-vars,
-[  --enable-track-vars     Enable GET/POST/Cookie track variables by default.],
-[
-  if test "$enableval" = "yes"; then
-    AC_DEFINE(PHP_TRACK_VARS, 1)
-    AC_MSG_RESULT(yes)
-  else
-    AC_DEFINE(PHP_TRACK_VARS, 0)
-    AC_MSG_RESULT(no)
-  fi
-],[
-    AC_DEFINE(PHP_TRACK_VARS, 0)
-    AC_MSG_RESULT(no)
-]) 
+if test "$PHP_SIGCHILD" = "yes"; then
+  AC_DEFINE(PHP_SIGCHILD, 1, [ ])
+else
+  AC_DEFINE(PHP_SIGCHILD, 0, [ ])
+fi
 
+PHP_ARG_ENABLE(magic-quotes,whether to enable magic quotes by default,
+[  --enable-magic-quotes   Enable magic quotes by default.])
 
-AC_MSG_CHECKING(whether to enable magic quotes by default)
-AC_ARG_ENABLE(magic-quotes,
-[  --enable-magic-quotes   Enable magic quotes by default.],
-[
-  if test "$enableval" = "yes"; then
-    AC_DEFINE(MAGIC_QUOTES, 1)
-    AC_MSG_RESULT(yes)
-  else
-    AC_DEFINE(MAGIC_QUOTES, 0)
-    AC_MSG_RESULT(no)
-  fi
-],[
-    AC_DEFINE(MAGIC_QUOTES, 0)
-    AC_MSG_RESULT(no)
-]) 
+if test "$PHP_MAGIC_QUOTES" = "yes"; then
+  AC_DEFINE(MAGIC_QUOTES, 1, [ ])
+else
+  AC_DEFINE(MAGIC_QUOTES, 0, [ ])
+fi
 
-
-AC_MSG_CHECKING(whether to enable runpaths)
-AC_ARG_ENABLE(rpath,
+PHP_ARG_ENABLE(rpath, whether to enable runpaths,
 [  --disable-rpath         Disable passing additional runtime library
-                          search paths],
-[
-  if test "$enableval" = "no"; then
-    enable_rpath=no
-  else
-    enable_rpath=yes
-  fi
-],[
-  enable_rpath=yes
-])
-AC_MSG_RESULT($enable_rpath)
+                          search paths], yes)
 
-AC_MSG_CHECKING(whether to enable short tags by default)
-AC_ARG_ENABLE(short-tags,
-[  --disable-short-tags    Disable the short-form <? start tag by default.],
-[
-  if test "$enableval" = "no"; then
-    AC_DEFINE(DEFAULT_SHORT_OPEN_TAG, 0)
-    AC_MSG_RESULT(no)
-  else
-    AC_DEFINE(DEFAULT_SHORT_OPEN_TAG, 1)
-    AC_MSG_RESULT(yes)
-  fi
-],[
-  AC_DEFINE(DEFAULT_SHORT_OPEN_TAG, 1)
-  AC_MSG_RESULT(yes)
-]) 
+PHP_ARG_ENABLE(libgcc, whether to explicitly link against libgcc,
+[  --enable-libgcc         Enable explicitly linking against libgcc])
 
-AC_MSG_CHECKING(whether to enable the URL-aware fopen wrapper)
-AC_ARG_ENABLE(url-fopen-wrapper,
+if test "$PHP_LIBGCC" = "yes"; then
+  PHP_LIBGCC_LIBPATH(gcc)
+  if test -z "$libgcc_libpath"; then
+    AC_MSG_ERROR(Cannot locate libgcc. Make sure that gcc is in your path)
+  fi
+  AC_ADD_LIBPATH($libgcc_libpath)
+  AC_ADD_LIBRARY(gcc, yes)
+fi
+
+PHP_ARG_ENABLE(short-tags,whether to enable short tags by default,
+[  --disable-short-tags    Disable the short-form <? start tag by default.],yes)
+
+if test "$PHP_SHORT_TAGS" = "yes"; then
+  AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,1,[ ])
+else
+  AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,0,[ ])
+fi
+
+PHP_ARG_ENABLE(url-fopen-wrapper,whether to enable the URL-aware fopen wrapper,
 [  --disable-url-fopen-wrapper 
                           Disable the URL-aware fopen wrapper that allows
-                          accessing files via http or ftp.],
-[
-  if test "$enableval" = "yes"; then
-    AC_DEFINE(PHP3_URL_FOPEN, 1)
-    AC_MSG_RESULT(yes)
-  else
-    AC_DEFINE(PHP3_URL_FOPEN, 0)
-    AC_MSG_RESULT(no)
-  fi
-],[
-  AC_DEFINE(PHP3_URL_FOPEN, 1)
-  AC_MSG_RESULT(yes)
-])
+                          accessing files via http or ftp.], yes)
 
-DMALLOC_RESULT=no
-AC_MSG_CHECKING(whether to enable dmalloc)
-AC_ARG_ENABLE(dmalloc,
-[  --enable-dmalloc        Enable dmalloc],
-[
-  if test "$enableval" = "yes" ; then
-    AC_DEFINE(HAVE_DMALLOC, 1)
-    AC_ADD_LIBRARY(dmalloc)
-    CFLAGS="$CFLAGS -DDMALLOC_FUNC_CHECK"
-    DMALLOC_RESULT=yes
-  fi
-])
-AC_MSG_RESULT($DMALLOC_RESULT)
+if test "$PHP_URL_FOPEN_WRAPPER" = "yes"; then
+  AC_DEFINE(PHP_URL_FOPEN, 1, [ ])
+else
+  AC_DEFINE(PHP_URL_FOPEN, 0, [ ])
+fi
 
-AC_ARG_ENABLE(pear,
-[  --disable-pear          Do not install PEAR],[
-  PHP_PEAR=$enableval
-],[
-  PHP_PEAR=yes
-])
+PHP_ARG_ENABLE(pic,whether to enable PIC for shared objects,
+[  --disable-pic           Disable PIC for shared objects], yes)
 
-AC_MSG_CHECKING(whether to install PEAR)
-AC_MSG_RESULT($PHP_PEAR)
+
+PHP_ARG_ENABLE(dmalloc,whether to enable dmalloc,
+[  --enable-dmalloc        Enable dmalloc])
+
+if test "$PHP_DMALLOC" = "yes"; then
+  AC_DEFINE(HAVE_DMALLOC,1,[Whether you have dmalloc])
+  AC_ADD_LIBRARY(dmalloc)
+  CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK"
+fi
+
+PHP_ARG_ENABLE(pear,whether to install PEAR,
+[  --disable-pear          Do not install PEAR],yes)
 
 if test "$PHP_PEAR" = "yes"; then
   PEAR_DIR=pear
 fi
 
+PHP_OUTPUT(pear/pear)
+PHP_OUTPUT(pear/run-tests)
+PHP_OUTPUT(pear/phpize)
+PHP_OUTPUT(pear/php-config)
+PHP_OUTPUT(pear/PEAR.php)
 
-PHP_SAPI=cgi
-PHP_BUILD_PROGRAM
-dnl paths to the targets relative to the build directory
-SAPI_PROGRAM=php
-dnl on HP-UX, the extension is .sl. Need to improve this
-SAPI_SHARED=libs/libphp4.so
-SAPI_STATIC=libs/libphp4.a
 
-PHP_CONFIGURE_PART(Configuring SAPI modules)
-
-esyscmd(./scripts/config-stubs sapi)
-
-AC_MSG_CHECKING(for chosen SAPI module)
-AC_MSG_RESULT($PHP_SAPI)
-	
-divert(4)
+divert(5)
 
 PHP_CONFIGURE_PART(Configuring extensions)
 	
@@ -610,7 +583,7 @@ if test "$PHP_VERSIONING" = "yes"; then
   fi
 fi
 
-divert(5)
+divert(6)
 
 enable_shared=yes
 enable_static=yes
@@ -634,13 +607,6 @@ fi
 
 PHP_REGEX
 
-case "`uname -s`" in
-SunOS*)
-	CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS";;
-esac
-
-CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-
 PHP_CONFIGURE_PART(Configuring Zend)
 LIBZEND_BASIC_CHECKS
 LIBZEND_OTHER_CHECKS
@@ -648,7 +614,7 @@ LIBZEND_OTHER_CHECKS
 if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
   TSRM_LIB='TSRM/libtsrm.la'
   TSRM_DIR=TSRM
-  AC_DEFINE(ZTS)
+  AC_DEFINE(ZTS,1,[ ])
   INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM"
   PHP_THREAD_SAFETY=yes
 else
@@ -656,22 +622,13 @@ else
 fi
 
 if test "$abs_srcdir" != "$abs_builddir"; then
-  INCLUDES="$INCLUDES -I\$(top_srcdir)/Zend"
+  INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend"
   if test "$PHP_THREAD_SAFETY" = "yes"; then
     INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM"
   fi
 fi
 
-dnl *** Commented out - generates slow code and consumes a lot of 
-dnl *** resources during compilation - we need to figure out how
-dnl *** to supply it only when absolutely necessary
-dnl If we are using gcc add -fpic to make dl() work on some platforms
-dnl test -n "$GCC" && CFLAGS="$CFLAGS -fpic"
-
-dnl add -fPIC option on Solaris if we are building dynamic extensions
-dnl PHP_SOLARIS_PIC_WEIRDNESS
-
-EXTRA_LIBS="$EXTRA_LIBS $LIBS"
+EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
 LIBS=""
 LDFLAGS=""
 if test "$PHP_THREAD_SAFETY" = "yes"; then
@@ -687,18 +644,44 @@ fi
 
 
 phplibdir="`pwd`/modules"
+$php_shtool mkdir -p $phplibdir
 phptempdir="`pwd`/libs"
 
+test "$prefix" = "NONE" && prefix="/usr/local"
+test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
+
+dnl Build extension directory path
+
+if test "$PHP_DEBUG" = "1"; then
+  PART1=debug
+else
+  PART1=no-debug
+fi
+
+if test "$enable_experimental_zts" = "yes"; then
+  PART2=zts
+else
+  PART2=non-zts
+fi
+
+ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/modules.h|sed 's/#define ZEND_MODULE_API_NO //'`
+
+EXTENSION_DIR="$prefix/lib/php/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO"
+
+PEAR_INSTALLDIR="$prefix/lib/php"
+
+INCLUDE_PATH=".:$PEAR_INSTALLDIR"
+
 AC_BUILD_RPATH
 
 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
-	
+
 PHP_BUILD_DATE=`date '+%Y-%m-%d'`
-AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE")
+AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
 PHP_UNAME=`uname -a`
-AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME")
+AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
 PHP_OS=`uname`
-AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS")
+AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
 
 
 	
@@ -718,18 +701,24 @@ PHP_SUBST(CONFIGURE_COMMAND)
 PHP_SUBST(CPP)
 PHP_SUBST(CPPFLAGS)
 PHP_SUBST(CXX)
+PHP_SUBST(CXXFLAGS)
+PHP_SUBST(CXX_PHP_COMPILE)
 PHP_SUBST(DEBUG_CFLAGS)
 PHP_SUBST(DEFS)
+PHP_SUBST(EXTENSION_DIR)
 PHP_SUBST(EXTRA_LDFLAGS)
 PHP_SUBST(EXTRA_LIBS)
 PHP_SUBST(INCLUDES)
+PHP_SUBST(INCLUDE_PATH)
 PHP_SUBST(INSTALL_IT)
 PHP_SUBST(LEX)
 PHP_SUBST(LEX_OUTPUT_ROOT)
 PHP_SUBST(LFLAGS)
 PHP_SUBST(LIBTOOL)
+PHP_SUBST(LN_S)
 PHP_SUBST(NATIVE_RPATHS)
 PHP_SUBST(PEAR_DIR)
+PHP_SUBST(PEAR_INSTALLDIR)
 PHP_SUBST(PHP_BUILD_DATE)
 PHP_SUBST(PHP_COMPILE)
 PHP_SUBST(PHP_LDFLAGS)
@@ -740,45 +729,85 @@ PHP_SUBST(PHP_SAPI)
 PHP_SUBST(PHP_VERSION)
 PHP_SUBST(PROG_SENDMAIL)
 PHP_SUBST(SHELL)
-PHP_SUBST(SHLIBTOOL)
+PHP_SUBST(SHARED_LIBTOOL)
 PHP_SUBST(TSRM_DIR)
 PHP_SUBST(TSRM_LIB)
 PHP_SUBST(WARNING_LEVEL)
 PHP_SUBST(YACC)
 
 PHP_CONFIGURE_PART(Configuring libtool)
+
+old_CC="$CC"
+
+if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
+  CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
+  INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
+  cat >meta_ccld<<EOF
+#! /bin/sh
+exec $CC $ac_cv_pthreads_cflags \$@
+EOF
+  CC="$abs_builddir/meta_ccld"
+  chmod +x meta_ccld
+fi
+
+dnl This will go away, if we have a facility to run per-extension code
+dnl after the thread_safety decision was done
+if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
+  CPPFLAGS="$CPPFLAGS -DTHREAD=1"
+fi
+
 AM_PROG_LIBTOOL
 if test "$enable_debug" != "yes"; then
   AM_SET_LIBTOOL_VARIABLE([--silent])
 fi
 
 PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<'
+CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<'
 
 if test "$enable_shared" = "yes"; then
-  SHLIBTOOL='$(LIBTOOL)'
+  SHARED_LIBTOOL='$(LIBTOOL)'
 else
-  if test -n "$EXT_SHARED"; then
+  if test "$lib_build_shared" = "yes"; then
     PHP_CONFIGURE_PART(Configuring shared libtool)
     $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
-    SHLIBTOOL='$(SHELL) $(top_builddir)/shlibtool'
+    SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool'
   else
     PHP_COMPILE='$(COMPILE) -c $< && touch $@'
+    CXX_PHP_COMPILE='$(CXX_COMPILE) -c $< && touch $@'
   fi
 fi
 
-test "$prefix" = "NONE" && prefix="/usr/local"
-test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
+CC="$old_CC"
+
+changequote({,})
+if test "$PHP_PIC" = "no"; then
+  cat >meta_cc<<EOF
+#! /bin/sh
+cmd="$CC \`echo \$@|sed s/-[fFD]PIC//g\`"
+exec \$cmd
+EOF
+  chmod +x meta_cc
+  CC="$abs_builddir/meta_cc"
+fi
+changequote([,])
 
 PHP_CONFIGURE_PART(Generating files)
 
-PHP_FAST_GENERATE
+PHP_GEN_CONFIG_VARS
+touch .deps
 
-#libphp4.module 
-AC_OUTPUT([php4.spec Zend/Makefile 
-           scripts/mkextlib build-defs.h
-		   $PHP_OUTPUT_FILES
-		   ], [], [
+ALL_OUTPUT_FILES="php4.spec Zend/Makefile build-defs.h $PHP_OUTPUT_FILES"
 
+AC_OUTPUT($ALL_OUTPUT_FILES, [], [
+
+if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES"; then
+  REDO_ALL=yes
+fi
+
+if test -n "\$REDO_ALL"; then
+  PHP_GEN_MAKEFILES($PHP_FAST_OUTPUT_FILES)
+fi
+		   
 if test ! -f $srcdir/ext/bcmath/number.c; then
 	echo "creating number.c"
 	echo "/* Dummy File */" > $srcdir/ext/bcmath/number.c
@@ -802,26 +831,25 @@ cat >Zend/zend_config.h <<FEO
 FEO
 
 # run this only when generating all the files?
-if true; then
-  chmod +x scripts/mkextlib
+if test -n "\$REDO_ALL"; then
   # Hacking while airborne considered harmful.
   #
-  echo "creating internal_functions.c"
+  echo "creating main/internal_functions.c"
   extensions=\`grep '^s.@EXT_STATIC@' \$0|sed -e 's/^.*@% *//' -e 's/%.*$//'\`
-  mv -f internal_functions.c internal_functions.c.old 2>/dev/null
-  sh $srcdir/genif.sh $srcdir/internal_functions.c.in $srcdir \$extensions > internal_functions.c
-  if cmp internal_functions.c.old internal_functions.c > /dev/null 2>&1; then
-      echo "internal_functions.c is unchanged"
-      mv internal_functions.c.old internal_functions.c
+  mv -f main/internal_functions.c main/internal_functions.c.old 2>/dev/null
+  sh $srcdir/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" \$extensions > main/internal_functions.c
+  if cmp main/internal_functions.c.old main/internal_functions.c > /dev/null 2>&1; then
+      echo "main/internal_functions.c is unchanged"
+      mv main/internal_functions.c.old main/internal_functions.c
   else
-      rm -f internal_functions.c.old
+      rm -f main/internal_functions.c.old
   fi
 
   if test -n "$PHP_APXS_BROKEN"; then
     echo "+--------------------------------------------------------------------+"
     echo "| WARNING: Your $APXS script is most likely broken."
     echo "|                                                                    |"
-    echo "| Please go read http://www.php.net/FAQ.php3#4.11 and make the       |"
+    echo "| Please go read http://www.php.net/FAQ.php#6.11 and make the        |"
     echo "| changes described there and try again.                             |"
   fi
 
@@ -830,16 +858,49 @@ if true; then
     if test "$REDIRECT" = "0"; then
       if test "$DISCARD_PATH" = "0"; then
         echo "+--------------------------------------------------------------------+"
-        echo "| Warning:                                                           |"
+        echo "|                        *** WARNING ***                             |"
+        echo "|                                                                    |"
         echo "| You will be compiling the CGI version of PHP without any           |"
         echo "| redirection checking.  By putting this cgi binary somewhere in     |"
         echo "| your web space, users may be able to circumvent existing .htaccess |"
         echo "| security by loading files directly through the parser.  See        |"
-        echo "| http://www.php.net/manual/config-security.php3 for more details.   |"
+        echo "| http://www.php.net/manual/security.php for more details.           |"
       fi
     fi
   fi
 
+
+  if test -n "$DEBUG_LOG"; then
+    rm -f config.cache
+cat <<X
++--------------------------------------------------------------------+
+|                       *** ATTENTION ***                            |
+|                                                                    |
+| Something is likely to be messed up here, because the configure    |
+| script was not able to detect a simple feature on your platform.   |
+| This is often caused by incorrect configuration parameters. Please |
+| see the file debug.log for error messages.                         |
+|                                                                    |
+| If you are unable to fix this, send the file debug.log to the      |
+| php-install@lists.php.net mailing list and include appropiate      |
+| information about your setup.                                      |
+X
+  fi
+
+  if test "$MYSQL_MODULE_TYPE" = "builtin" ; then
+cat <<X
++--------------------------------------------------------------------+
+|                        *** WARNING ***                             |
+|                                                                    |
+| You chose to compile PHP with the built-in MySQL support.  If you  |
+| are compiling a server module, and intend to use other server      |
+| modules that also use MySQL (e.g, mod_auth_mysql, PHP 3.0,         |
+| mod_perl) you must NOT rely on PHP's built-in MySQL support, and   |
+| instead build it with your local MySQL support files, by adding    |
+| --with-mysql=/path/to/mysql to your configure line.                |
+X
+  fi
+
   echo "+--------------------------------------------------------------------+"
   echo "| License:                                                           |"
   echo "| This software is subject to the PHP License, available in this     |"
@@ -849,6 +910,12 @@ if true; then
   echo "| the installation process at this point.                            |"
   echo "+--------------------------------------------------------------------+"
 
+cat<<X
+
+Thank you for using PHP.
+
+X
+
 fi
 ])
 

crypt.mak

@@ -1,204 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on crypt.dsp
-!IF "$(CFG)" == ""
-CFG=crypt - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to crypt - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "crypt - Win32 Release" && "$(CFG)" != "crypt - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "crypt.mak" CFG="crypt - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "crypt - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "crypt - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "crypt - Win32 Release"
-
-OUTDIR=.\module_Release
-INTDIR=.\module_Release
-# Begin Custom Macros
-OutDir=.\module_Release
-# End Custom Macros
-
-ALL : "$(OUTDIR)\php3_crypt.dll"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\crypt.obj"
-	-@erase "$(INTDIR)\sflcryp.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\php3_crypt.dll"
-	-@erase "$(OUTDIR)\php3_crypt.exp"
-	-@erase "$(OUTDIR)\php3_crypt.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "./" /I "../" /D HAVE_SFLCRYPT=1 /D "COMPILE_DL" /D "MSVC5" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\crypt.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\crypt.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=php.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\php3_crypt.pdb" /machine:I386 /out:"$(OUTDIR)\php3_crypt.dll" /implib:"$(OUTDIR)\php3_crypt.lib" /libpath:"cgi_release" 
-LINK32_OBJS= \
-	"$(INTDIR)\crypt.obj" \
-	"$(INTDIR)\sflcryp.obj"
-
-"$(OUTDIR)\php3_crypt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "crypt - Win32 Debug"
-
-OUTDIR=.\module_debug
-INTDIR=.\module_debug
-# Begin Custom Macros
-OutDir=.\module_debug
-# End Custom Macros
-
-ALL : "$(OUTDIR)\php3_crypt.dll"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\crypt.obj"
-	-@erase "$(INTDIR)\sflcryp.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\php3_crypt.dll"
-	-@erase "$(OUTDIR)\php3_crypt.exp"
-	-@erase "$(OUTDIR)\php3_crypt.ilk"
-	-@erase "$(OUTDIR)\php3_crypt.lib"
-	-@erase "$(OUTDIR)\php3_crypt.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../" /I "../../" /D HAVE_SFLCRYPT=1 /D "DEBUG" /D "COMPILE_DL" /D "MSVC5" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\crypt.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\crypt.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=php.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\php3_crypt.pdb" /debug /machine:I386 /out:"$(OUTDIR)\php3_crypt.dll" /implib:"$(OUTDIR)\php3_crypt.lib" /pdbtype:sept /libpath:"cgi_debug" 
-LINK32_OBJS= \
-	"$(INTDIR)\crypt.obj" \
-	"$(INTDIR)\sflcryp.obj"
-
-"$(OUTDIR)\php3_crypt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("crypt.dep")
-!INCLUDE "crypt.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "crypt.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "crypt - Win32 Release" || "$(CFG)" == "crypt - Win32 Debug"
-SOURCE=.\dl\crypt\crypt.c
-
-"$(INTDIR)\crypt.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\dl\crypt\sflcryp.c
-
-"$(INTDIR)\sflcryp.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-

cvsclean

@@ -0,0 +1,3 @@
+#! /bin/sh
+
+${MAKE:-make} -f build/build.mk cvsclean