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

Disable the test temporarily because "-d" flags in the command line doesn't
take effect under CGI mode. (See the relevant portion of cgi_main.c that begins at line 996)
2026-11-09 18:20:50 +00:00 · 2003-08-03 13:58:21 +00:00 · 2003-08-03 13:58:20 +00:00 · 2003-08-03 13:44:36 +00:00 · 2003-08-03 11:22:53 +00:00 · 2003-08-03 10:32:40 +00:00
2348 changed files with 259493 additions and 288599 deletions
@@ -1,6 +1,21 @@
+set $zts = 0
+
+define ____executor_globals
+	if $zts
+		set $eg = ((zend_executor_globals) (*((void ***) tsrm_ls))[executor_globals_id-1])
+	else
+		set $eg = executor_globals
+	end
+end
+
+document ____executor_globals
+	portable way of accessing executor_globals
+	type "set $zts = 1" if you use --enable-maintainer-zts on your configure line
+end
+
 define dump_bt
-    set $t = $arg0
-    while $t
+	set $t = $arg0
+	while $t
 		printf "[0x%08x] ", $t
 		if $t->function_state.function->common.function_name
 			printf "%s() ", $t->function_state.function->common.function_name
@@ -12,7 +27,7 @@ define dump_bt
 		end
 		set $t = $t->prev_execute_data
 		printf "\n"
-    end
+	end
 end

 document dump_bt
@@ -20,7 +35,7 @@ document dump_bt
 end

 define printzv
-	set $ind = 0
+	set $ind = 1
 	____printzv $arg0 0 
 end

@@ -28,60 +43,56 @@ document printzv
 	prints content of zval 
 end

-define ____printzv
+define ____printzv_contents
+	____executor_globals
 	set $zvalue = $arg0

-	if $zvalue->type == 0
+	if $zvalue.type == 0
 		set $typename = "NULL"
 	end
-	if $zvalue->type == 1
+	if $zvalue.type == 1
 		set $typename = "long"
 	end
-	if $zvalue->type == 2
+	if $zvalue.type == 2
 		set $typename = "double"
 	end
-	if $zvalue->type == 3
+	if $zvalue.type == 3
 		set $typename = "string"
 	end
-	if $zvalue->type == 4
+	if $zvalue.type == 4
 		set $typename = "array"
 	end
-	if $zvalue->type == 5
+	if $zvalue.type == 5
 		set $typename = "object"
 	end
-	if $zvalue->type == 6
+	if $zvalue.type == 6
 		set $typename = "bool"
 	end
-	if $zvalue->type == 7
+	if $zvalue.type == 7
 		set $typename = "resource"
 	end
-	if $zvalue->type == 8 
+	if $zvalue.type == 8 
 		set $typename = "constant"
 	end
-	if $zvalue->type == 9
+	if $zvalue.type == 9
 		set $typename = "const_array"
 	end

-	printf "[0x%08x] ", $zvalue
-
-	if $zvalue == executor_globals.uninitialized_zval_ptr
-		printf "*uninitialized* "
-	end
-	printf "(refcount=%d) %s: ", $zvalue->refcount, $typename
-	if $zvalue->type == 1
-		printf "%ld", $zvalue->value.lval
+	printf "(refcount=%d) %s: ", $zvalue.refcount, $typename
+	if $zvalue.type == 1
+		printf "%ld", $zvalue.value.lval
 	end
 	if $zvalue->type == 2
-		printf "%lf", $zvalue->value.dval
+		printf "%lf", $zvalue.value.dval
 	end
-	if $zvalue->type == 3
-		printf "\"%s\"(%d)", $zvalue->value.str.val, $zvalue->value.str.len
+	if $zvalue.type == 3
+		printf "\"%s\"(%d)", $zvalue.value.str.val, $zvalue.value.str.len
 	end
-	if $zvalue->type == 4
+	if $zvalue.type == 4
 		if ! $arg1
 			printf "{\n"
 			set $ind = $ind + 1
-			____print_ht $zvalue->value.ht
+			____print_ht $zvalue.value.ht
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0
@@ -91,35 +102,86 @@ define ____printzv
 			printf "}"
 		end
 	end
-	if $zvalue->type == 5
+	if $zvalue.type == 5
 		if ! $arg1
 			printf "(prop examination disabled due to a gdb bug)"
-#			set $ht = $zvalue->value.obj.handlers->get_properties($zvalue)
-#			printf "{\n"
-#			set $ind = $ind + 1
-#			____print_ht $ht
-#			set $ind = $ind - 1
-#			set $i = $ind
-#			while $i > 0
-#				printf "  "
-#				set $i = $i - 1
-#			end
-#			printf "}"
+			if $zvalue.value.obj.handlers->get_properties
+#				set $ht = $zvalue->value.obj.handlers->get_properties($zvalue)
+#				printf "{\n"
+#				set $ind = $ind + 1
+#				____print_ht $ht
+#				set $ind = $ind - 1
+#				set $i = $ind
+#				while $i > 0
+#					printf "  "
+#					set $i = $i - 1
+#				end
+#				printf "}"
+			end
 		end
 	end
-	if $zvalue->type == 6
-		if $zvalue->lval
+	if $zvalue.type == 6
+		if $zvalue.value.lval
 			printf "true"
 		else
 			printf "false"
 		end
 	end
-	if $zvalue->type == 7
-		printf "#%d", $zvalue->value.lval
+	if $zvalue.type == 7
+		printf "#%d", $zvalue.value.lval
 	end
 	printf "\n"
 end

+define ____printzv
+	____executor_globals
+	set $zvalue = $arg0
+
+	printf "[0x%08x] ", $zvalue
+
+	if $zvalue == $eg.uninitialized_zval_ptr
+		printf "*uninitialized* "
+	end
+
+	set $zcontents = *(struct _zval_struct *) $zvalue
+	if $arg1
+		____printzv_contents $zcontents $arg1
+	else
+		____printzv_contents $zcontents 0 
+	end
+end
+
+define ____print_const_table
+	set $ht = $arg0
+	set $p = $ht->pListHead
+
+	while $p != 0
+		set $const = *(zend_constant *) $p->pData
+
+		set $i = $ind
+		while $i > 0
+			printf "  "
+			set $i = $i - 1
+		end
+
+		if $p->nKeyLength > 0 
+			printf "\"%s\" => ", $p->arKey
+		else
+			printf "%d => ", $p->h
+		end
+
+		____printzv_contents $const.value 0
+		set $p = $p->pListNext
+	end
+end
+
+define print_const_table
+	set $ind = 1
+	printf "[0x%08x] {\n", $arg0
+	____print_const_table $arg0
+	printf "}\n"
+end
+
 define ____print_ht
 	set $ht = $arg0
 	set $p = $ht->pListHead
@@ -156,6 +218,7 @@ document print_ht
 end

 define printzn
+	____executor_globals
 	set $ind = 0
 	set $znode = $arg0
 	if $znode->op_type == 1
@@ -175,17 +238,17 @@ define printzn

 	if $znode->op_type == 1
 		printf ": "
-		____printzv &$znode->u.constant
+		____printzv &$znode->u.constant 0
 	end
 	if $znode->op_type == 2
 		printf ": "
-		set $tvar = (union _temp_variable *)((char *)executor_globals.current_execute_data->Ts + $znode->u.var)
-		____printzv ((union _temp_variable *)$tvar)->tmp_var
+		set $tvar = (union _temp_variable *)((char *)$eg.current_execute_data->Ts + $znode->u.var)
+		____printzv ((union _temp_variable *)$tvar)->tmp_var 0
 	end
 	if $znode->op_type == 4
 		printf ": "
-		set $tvar = (union _temp_variable *)((char *)executor_globals.current_execute_data->Ts + $znode->u.var)
-		____printzv *$tvar->var.ptr_ptr
+		set $tvar = (union _temp_variable *)((char *)$eg.current_execute_data->Ts + $znode->u.var)
+		____printzv *$tvar->var.ptr_ptr 0
 	end
 	if $znode->op_type == 8
 		printf "\n"
@@ -48,81 +48,27 @@ Exceptions:
    doing so, should return that new length, so it doesn't have to be
    recalculated with strlen() (e.g. php_addslashes())

-[5] Use php_error_docref() group of functions to report any errors/warnings 
-    during code execution. Use descriptive error messages, and try to avoid 
-    using identical error strings for different stages of an error. For 
-    example, if in order to obtain a URL you have to parse the URL, connect,
-    and retreive the text, assuming something can go wrong at each of these 
-    stages, don't report an error "Unable to get URL" on all of them, but 
-    instead, write something like "Unable to parse URL", "Unable to connect 
-    to URL server" and "Unable to fetch URL text", respectively.
-
-    It has been silently agreed to prefix every php_error() message with the
-    name of the current function if applicable:
-
-    php_error(E_WHATEVER, "%s(): Desc.", get_active_function_name(TSRMLS_C));
-
-    This can be done automatically using php_error_docref(). The first
-    parameter, docref, is either NULL or the URL of a page describing the 
-    error in detail. In most cases you will pass NULL, to generate the URL
-    from the name of the function being executed:
-
-    php_error_docref(NULL TSRMLS_CC, E_WHATEVER, "Desc.");
-
-    If you pass a URL, it can either be a full URL beginning with "http://":
-
-    php_error_docref("http://externalsite.tld/page.ext#error" 
-                     TSRMLS_CC, E_WHATEVER, "Desc.");
-
-    Or the name of a manual page without file extension, but with an optional 
-    target anchor. Or simply the anchor within the manual page of the current
-    function. When using function names you must replace '_' by '-':
-
-    php_error_docref("function.ext-func#error" TSRMLS_CC, E_WHATEVER, "Desc.");
-
-    To display one or two important parameters after the function name, use 
-    php_error_docref1() or php_error_docref2(). For example, file functions 
-    should display the name of the file opened:
-
-    php_error_docref1("function.fopen" TSRMLS_CC, filename, 
-                      E_WHATEVER, "Desc.");
-
-    php_error_docref2("function.fopen" TSRMLS_CC, filename, openmode, 
-                      E_WHATEVER, "Desc.");
-
-    Fixing ("unifying") existing php_error() message is a good thing [tm].
-
-[6] NEVER USE strncat().  If you're absolutely sure you know what you're doing,
+[5] NEVER USE strncat().  If you're absolutely sure you know what you're doing,
    check its man page again, and only then, consider using it, and even then,
    try avoiding it.

-[7] Use PHP_* macros in the PHP source, and ZEND_* macros in the Zend
+[6] Use PHP_* macros in the PHP source, and ZEND_* macros in the Zend
    part of the source. Although the PHP_* macro's are mostly aliased to the
    ZEND_* macros it gives a better understanding on what kind of macro you're
    calling.

-[8] Use assert(). assert.h is included in php.h if it is available.  Not only
-    does good assertion catch bugs, but it also helps with code readability.
-     - Do not use assert for error handling. Use assert only for the 
-       condition that must be always true.
-     - Do not use assignments in assert conditions.  If you assign inside an 
-       assert condition, you risk an elusive bug that would be very difficult 
-       to spot in a debug build, due to the side effect of the assignment.  
-       Function calls in assert conditions may also cause this problem, if 
-       they modify one of their arguments or global variables.
-
-[9] When commenting out code using a #if statement, do NOT use 0 only. Instead
+[7] When commenting out code using a #if statement, do NOT use 0 only. Instead
    use "<cvs username here>_0". For example, #if FOO_0, where FOO is your
    cvs user foo.  This allows easier tracking of why code was commented out, 
    especially in bundled libraries.  

-[10] Do not define functions that are not available.  For instance, if a
+[8] Do not define functions that are not available.  For instance, if a
     library is missing a function, do not define the PHP version of the
     function, and do not raise a run-time error about the function not
     existing.  End users should use function_exists() to test for the
     existence of a function

-[11] Prefer emalloc(), efree(), estrdup(), etc. to their standard C library
+[9] Prefer emalloc(), efree(), estrdup(), etc. to their standard C library
     counterparts.  These functions implement an internal "safety-net"
     mechanism that ensures the deallocation of any unfreed memory at the
     end of a request.  They also provide useful allocation and overflow
@@ -158,8 +104,7 @@ Naming Conventions
    'hw_GetObjectByQueryCollObj'
    'pg_setclientencoding'
    'jf_n_s_i'
-    
-    
+
 [2] If they are part of a "parent set" of functions, that parent should
    be included in the user function name, and should be clearly related
    to the parent program or function family. This should be in the form
@@ -180,7 +125,7 @@ Naming Conventions
    with "_php_", and followed by a word or an underscore-delimited list of
    words, in lowercase letters, that describes the function.  If applicable,
    they should be declared 'static'.
-    
+
 [4] Variable names must be meaningful.  One letter variable names must be
    avoided, except for places where the variable has no real meaning or
    a trivial meaning (e.g. for (i=0; i<100; i++) ...).
@@ -188,6 +133,35 @@ Naming Conventions
 [5] Variable names should be in lowercase.  Use underscores to separate
    between words.

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

 Syntax and indentation
 ----------------------
@@ -26,45 +26,37 @@ Status legend

 == Server APIs ==

-------------------------------------------------------------------------------
-EXTENSION:           activescript
-COMMENT:             See http://pecl.php.net/package/PHPScript
 -------------------------------------------------------------------------------
 EXTENSION:           aolserver
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
+EXTENSION:           activescript
+PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>
+MAINTENANCE:         Odd Fixes
+STATUS:              Experimental
+-------------------------------------------------------------------------------
 EXTENSION:           apache
 PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           apache2filter
+EXTENSION:           apache2
 PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Experimental
 -------------------------------------------------------------------------------
-EXTENSION:           apache2handler
-PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>, Ilia Alshanetsky <iliaa@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           caudium
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           cgi
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           cli
-MAINTENANCE:         Unknown
+MAINTENANCE:         Marcus Boerger <helly@php.net>, Edin Kadribasic <edink@php.net>
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           embed
-PRIMARY MAINTAINER:  Edin Kadribasic <edink@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
+EXTENSION:           fhttpd
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           isapi
 MAINTENANCE:         Unknown
@@ -88,7 +80,7 @@ MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           servlet
-PRIMARY MAINTAINER:  Sam Ruby <rubys@php.net>
+PRIMARY MAINTAINER:  Sam Ruby <rubys@us.ibm.com>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -96,12 +88,8 @@ EXTENSION:           thttpd
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           tux
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           webjames
-PRIMARY MAINTAINER:  Alex Waugh <alexwaugh@php.net>
+PRIMARY MAINTAINER:  Alex Waugh <alex@alexwaugh.com>
 MAINTENANCE:         Maintained
 STATUS:              Experimental
 -------------------------------------------------------------------------------
@@ -109,16 +97,12 @@ STATUS:              Experimental

 == Database extensions ==

-------------------------------------------------------------------------------
-EXTENSION:           db
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Unknown
-STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           dba
 PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
+COMMENT:             DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini
 -------------------------------------------------------------------------------
 EXTENSION:           dbase
 PRIMARY MAINTAINER:  Jim Winstead <jimw@php.net>
@@ -126,19 +110,23 @@ MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           dbx
-PRIMARY MAINTAINER:  Marc Boeren <mboeren@php.net>
+PRIMARY MAINTAINER:  Marc Boeren <M.Boeren@guidance.nl>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.6
 COMMENT:             DB abstraction for odbc, mysql, pgsql, mssql, fbsql and more, see documentation
 -------------------------------------------------------------------------------
-EXTENSION:           fbsql
-PRIMARY MAINTAINER:  Frank M. Kromann <fmk@php.net>
+EXTENSION:           filepro
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
+EXTENSION:           hyperwave
+PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           informix
-PRIMARY MAINTAINER:  Danny Heijl <danny@php.net>
+PRIMARY MAINTAINER:  Danny Heijl <Danny.Heijl@cevi.be>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -149,7 +137,7 @@ STATUS:              Experimental
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           interbase
-PRIMARY MAINTAINER:  Jouni Ahto <jah@php.net>, Ard Biesheuvel <abies@php.net>
+PRIMARY MAINTAINER:  Jouni Ahto <jouni.ahto@exdec.fi>
 MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -157,43 +145,39 @@ EXTENSION:           msql
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           msession
+PRIMARY MAINTAINER   Mark L. Woodward mlwmohawk@mohawksoft.com
+MAINTENANCE:         Maintained
+STATUS:              Working/Experimental
+COMMENT:             Tested on Linux, should work on other UNIX platforms. Backend server code can compile under Windows.
+-------------------------------------------------------------------------------
 EXTENSION:           mssql
-PRIMARY MAINTAINER:  Frank M. Kromann <fmk@php.net>
+PRIMARY MAINTAINER:  Frank M. Kromann <fmk@swwwing.com>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             Tested on phpts and isapi versions
 -------------------------------------------------------------------------------
 EXTENSION:           mysql
-PRIMARY MAINTAINER:  Zak Greant <zak@php.net>, Georg Richter <georg@php.net>
+PRIMARY MAINTAINER:  Zak Greant <zak@mysql.com>, Georg Richter <georg@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           oci8
-PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>
+EXTENSION:           mysqli
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           odbc
-PRIMARY MAINTAINER:  Dan Kalowsky <kalowsky@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-COMMENT:             Working 
-------------------------------------------------------------------------------
-EXTENSION:           oracle
-MAINTENANCE:         Orphaned
-STATUS:              Working
-COMMENT:             Using the new OCI8 driver is encouraged where possible.
-------------------------------------------------------------------------------
-EXTENSION:           ovrimos
-MAINTENANCE:         Unknown
-STATUS:              Unknown
+STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           pgsql
-PRIMARY MAINTAINER:  Yasuo Ohgaki <yohgaki@php.net>
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Yasuo Ohgaki <yohgaki@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less have fatal bug.
 -------------------------------------------------------------------------------
+EXTENSION:           sqlite
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Wez Furlong <wez@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           sybase
 MAINTENANCE:         Unknown
 STATUS:              Not Working
@@ -202,17 +186,89 @@ EXTENSION:           sybase_ct
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           oci8
+PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           odbc
+PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+COMMENT:             Working 
+-------------------------------------------------------------------------------
+EXTENSION:           oracle
+PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+COMMENT:             Using the new OCI8 driver is encouraged where possible.
+-------------------------------------------------------------------------------
+
+
+== XML extensions ==
+
+-------------------------------------------------------------------------------
+EXTENSION:           dom
+PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>, Marcus Boerger <helly@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
+-------------------------------------------------------------------------------
+EXTENSION:           simplexml
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
+-------------------------------------------------------------------------------
+EXTENSION:           wddx
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           xml
+PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           xmlrpc
+PRIMARY MAINTAINER:  Dan Libby
+MAINTENANCE:         UNKNOWN
+STATUS:              Experimental
+-------------------------------------------------------------------------------
+EXTENSION:           xsl
+PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
+-------------------------------------------------------------------------------


 == 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:           bz2
-COMMENT:             See http://pecl.php.net/package/bz2
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
+MAINTENANCE:         Odd Fixes
+STATUS:              Working
+SINCE:               4.0.3
+-------------------------------------------------------------------------------
+EXTENSION:           dio
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANCE:         Orphaned
+STATUS:              Working
+SINCE:               4.0.6
+-------------------------------------------------------------------------------
+EXTENSION:           cyrus
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANCE:         Orphaned
+STATUS:              Working
+SINCE:               4.0.6
 -------------------------------------------------------------------------------
 EXTENSION:           calendar
 PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
@@ -220,7 +276,7 @@ MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           com
-PRIMARY MAINTAINER:  Harald Radi <phanto@php.net>
+PRIMARY MAINTAINER:  Harald Radi <h.radi@nme.at>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -230,7 +286,9 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           crack
-COMMENT:             See http://pecl.php.net/package/crack
+MAINTENANCE:         Unknown
+STATUS:              Experimental
+SINCE:               4.0.5
 -------------------------------------------------------------------------------
 EXTENSION:           ctype
 PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
@@ -238,32 +296,23 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           curl
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>,Ilia Alshanetsky <iliaa@php.net>
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
-EXTENSION:           cyrus
-COMMENT:             See http://pecl.php.net/package/cyrus
-------------------------------------------------------------------------------
-EXTENSION:           dio
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Orphaned
-STATUS:              Working
-SINCE:               4.0.6
-------------------------------------------------------------------------------
-EXTENSION:           domxml
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+EXTENSION:           cybercash
+PRIMARY MAINTAINER:  Evan Klinger <evan715@sirius.com>
 MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           dotnet
-PRIMARY MAINTAINER:  Sam Ruby <rubys@php.net>
+PRIMARY MAINTAINER:  Sam Ruby <rubys@us.ibm.com>
 MAINTENANCE:         Maintained
 STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           exif
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.2
@@ -273,15 +322,8 @@ PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           filepro
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           fribidi
-COMMENT:             See http://pecl.php.net/package/fribidi
-------------------------------------------------------------------------------
 EXTENSION:           ftp
-PRIMARY MAINTAINER:  Stefan Esser <sesser@php.net>
+PRIMARY MAINTAINER:  Stefan Esser (sesser@php.net)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -299,15 +341,9 @@ MAINTENANCE:         Unknown
 STATUS:              Unknown
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
-EXTENSION:           hwapi
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
+EXTENSION:           icap
 MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           hyperwave
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
+STATUS:              Obsolete
 -------------------------------------------------------------------------------
 EXTENSION:           iconv
 PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net>
@@ -315,17 +351,12 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           imap
-PRIMARY MAINTAINER:  Chuck Hagenbuch <chagenbu@php.net>, Ilia Alshanetsky <iliaa@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>
+MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           ircg
-PRIMARY MAINTAINER:  Sascha Schumann <sas@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           java
-PRIMARY MAINTAINER:  Sam Ruby <rubys@php.net>
+PRIMARY MAINTAINER:  Sam Ruby <rubys@us.ibm.com>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -340,50 +371,26 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mcal
-PRIMARY MAINTAINER:  Chuck Hagenbuch <chagenbu@php.net>
+PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>
 MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mcrypt
-PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
+PRIMARY MAINTAINER:  Derick Rethans <d.rethans@jdimedia.nl>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mhash
-PRIMARY MAINTAINER:  Sascha Schumann <sas@php.net>
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           mime_magic
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-------------------------------------------------------------------------------
-EXTENSION:           ming
-PRIMARY MAINTAINER:  Frank M. Kromann <fmk@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-------------------------------------------------------------------------------
-EXTENSION:           mnogosearch
-PRIMARY MAINTAINER:  Sergey Kartashoff <gluke@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           msession
-PRIMARY MAINTAINER   Mark L. Woodward <mlwmohawk@php.net>
+EXTENSION:           muscat
+PRIMARY MAINTAINER:  Sam Liddicott <sam@ananova.com>
 MAINTENANCE:         Maintained
-STATUS:              Working/Experimental
-COMMENT:             Tested on Linux, should work on other UNIX platforms. Backend server code can compile under Windows.
-------------------------------------------------------------------------------
-EXTENSION:           notes
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           ncurses
-PRIMARY MAINTAINER   Ilia Alshanetsky <iliaa@php.net>, Wez Furlong <wez@php.net>, Hartmut Holzgraefe <hholzgra@php.net>, Georg Richter <georg@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Experimental
+STATUS:              Working
+SINCE:               4.0.5
+COMMENT:             Not tested against windows, only core API completed, rest under development
 -------------------------------------------------------------------------------
 EXTENSION:           openssl
 PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>
@@ -396,10 +403,6 @@ PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Experimental
 -------------------------------------------------------------------------------
-EXTENSION:           pcntl
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-------------------------------------------------------------------------------
 EXTENSION:           pcre
 PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Maintained
@@ -411,18 +414,25 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           pfpro
-PRIMARY MAINTAINER:  David Croft <david@php.net>
+PRIMARY MAINTAINER:  David Croft <david@infotrek.co.uk>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           posix
-PRIMARY MAINTAINER:  Kristian Köhntopp <kk@php.net>
+PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           printer
+PRIMARY MAINTAINER:  Daniel Beulshausen <daniel@php4win.de>
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               4.0.4
+COMMENT:             Only for Win32
+-------------------------------------------------------------------------------
 EXTENSION:           pspell
-PRIMARY MAINTAINER:  Vlad Krupin <vlad@php.net>
+PRIMARY MAINTAINER:  Vlad Krupin <phpdevel@echospace.com>
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 SINCE:               4.0.2
@@ -437,12 +447,24 @@ MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           recode
-PRIMARY MAINTAINER:  Kristian Köhntopp <kk@php.net>
+PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           sablot
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANCE:         Obsolete
+STATUS:              Experimental
+SINCE:               4.0.3
+-------------------------------------------------------------------------------
+EXTENSION:           satellite
+PRIMARY MAINTAINER:  David Eriksson <eriksson@php.net>
+MAINTENANCE:         Odd Fixes
+STATUS:              Experimental
+SINCE:               4.0.3
+-------------------------------------------------------------------------------
 EXTENSION:           session
-PRIMARY MAINTAINER:  Sascha Schumann <sas@php.net>, Ilia Alshanetsky <iliaa@php.net>
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -458,7 +480,7 @@ MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sockets
-PRIMARY MAINTAINER:  Chris Vandomelen <chrisv@php.net>
+PRIMARY MAINTAINER:  Chris Vandomelen <chrisv@b0rked.dhs.org>
 MAINTENANCE:         Maintained
 STATUS:              Experimental
 SINCE:               4.0.2
@@ -469,10 +491,6 @@ MAINTENANCE:         Orphaned
 STATUS:              Deprecated (Use the ming swf extension instead)
 COMMENT:             Only for Unix (won't change)
 -------------------------------------------------------------------------------
-EXTENSION:           sysvmsg
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-------------------------------------------------------------------------------
 EXTENSION:           sysvsem
 MAINTENANCE:         Unknown
 STATUS:              Unknown
@@ -481,47 +499,29 @@ EXTENSION:           sysvshm
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           tokenizer
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           w32api
+EXTENSION:           vpopmail
 MAINTENANCE:         Unknown
 STATUS:              Experimental
-------------------------------------------------------------------------------
-EXTENSION:           wddx
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           xml
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           xmlrpc
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-------------------------------------------------------------------------------
-EXTENSION:           xslt
-PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
-MAINTENANCE:         Odd Fixes
-STATUS:              Working (mostly)
+SINCE:               4.0.5
 -------------------------------------------------------------------------------
 EXTENSION:           yaz
-COMMENT:             See http://pecl.php.net/package/yaz
+PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
+MAINTENANCE:         Maintained
+STATUS:              Unknown
+SINCE:               4.0.1
 -------------------------------------------------------------------------------
 EXTENSION:           yp
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           zip
-COMMENT:             See http://pecl.php.net/package/zip
-------------------------------------------------------------------------------
 EXTENSION:           zlib
-PRIMARY MAINTAINER:  Stefan Roehrich <sr@php.net>
+PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-
+EXTENSION:           zziplib
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hholzgra@php.net>
+MAINTENANCE:         Odd Fixes
+STATUS:              Working
+SINCE:               4.0.5
+-------------------------------------------------------------------------------
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
-                  The PHP License, version 3.01
-Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+                  The PHP License, Version 3.0
+Copyright (c) 1999 - 2003 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

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

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

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

-PHP includes the Zend Engine, freely available at
+This product includes the Zend Engine, freely available at
 <http://www.zend.com>.
@@ -14,22 +14,22 @@ all: $(all_targets)
 	
 build-modules: $(PHP_MODULES)

-libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-	-@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
+	-@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1

-libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-	$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so
+libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+	$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp5.so

 install: $(all_targets) $(install_targets)

 install-sapi: $(OVERALL_TARGET)
 	@echo "Installing PHP SAPI module:       $(PHP_SAPI)"
 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-	-@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
+	-@if test ! -r $(phptempdir)/libphp5.$(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); \
+			if test -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i; then \
+				$(LN_S) $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); \
 				break; \
 			fi; \
 		done; \
@@ -38,10 +38,10 @@ install-sapi: $(OVERALL_TARGET)

 install-modules: build-modules
 	@test -d modules && \
-	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
-	@echo "Installing shared extensions:     $(INSTALL_ROOT)$(EXTENSION_DIR)/"
-	@rm -f modules/*.la >/dev/null 2>&1
-	@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
+	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) && \
+	echo "Installing shared extensions:     $(INSTALL_ROOT)$(EXTENSION_DIR)/" && \
+	rm -f modules/*.la && \
+	$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) >/dev/null 2>&1 || true

 install-tester:
 	@echo "Installing regression tester:     $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/"
@@ -61,17 +61,15 @@ test:
 	fi

 clean:
-	find . -name \*.lo | xargs rm -f
-	find . -name \*.o | xargs rm -f
-	find . -name \*.la | xargs rm -f
-	find . -name \*.a | xargs rm -f
+	find . -name \*.lo -o -name \*.o | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
-	rm -f libphp4.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
+	rm -f libphp5.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*

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

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

   6. Test your changes before committing them. We mean it. Really.
-      To do so use "make test".
-   
-   7. For development use the --enable-maintainer-zts switch to ensure your
-      code handles TSRM correctly and doesn't break for thos who need that.
-
-Currently we have the following branches in use:
-HEAD     Will become PHP 6.0. This CVS branch is for active development.
-PHP_5_2  Is used to release the PHP 5.2.x series. Only minor feature
-         enhancements may go in here, but please keep that as infrequent as
-         possible.
-PHP_5_1  This branch is closed.
-PHP_4_4  Is used to release the PHP 4.4.x series. Only bugfixes are permitted
-         on this branch (Consult the releasemaster prior to commit).
-PHP_4_3  This branch is closed.
+	

 The next few rules are more of a technical nature.

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

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

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

 The format of the commit messages is pretty simple.

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

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

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

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

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

-The # lines will be omitted from the ChangeLog automagically.
-
-Use the [DOC] tag in your log message whenever you feel that your changes
-imply a documentation modification. The php-doc team will automatically
-get notified about your commit through the php-doc mailing list.
+The lines above marked with @ will go into NEWS file automagically, and the
+# lines will be omitted from the ChangeLog. Alternatively, you might want
+to modify NEWS file directly and not use the @ lines.

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

 Example:

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

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

 You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
 to look at PHP CVS repository in various ways.
@@ -1,3 +1,7 @@
+(NOTE: you may also want to take a look at the pear package
+	     PECL_Gen, a PHP-only alternative for this script that
+			 supports way more extension writing tasks and is 
+			 supposed to replace ext_skel completely in the long run ...)

 WHAT IT IS

@@ -17,7 +21,8 @@ HOW TO USE IT

  [ Note that GNU awk is likely required for this script to work.  Debian 
    systems seem to default to using mawk, so you may need to change the 
-    #! line in skeleton/create_stubs to use gawk explicitly. ]
+    #! line in skeleton/create_stubs and the cat $proto | awk line in
+    ext_skel to use gawk explicitly. ]

  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 
@@ -42,14 +42,14 @@ Type specifiers
 z	- the actual zval

 The following characters also have a meaning in the specifier string:
-     | - indicates that the remaining parameters are optional, they
-		 should be initialized to default values by the extension since they
-		 will not be touched by the parsing function if they are not
-		 passed to it.
-	 / - use SEPARATE_ZVAL_IF_NOT_REF() on the parameter it follows
-	 ! - the parameter it follows can be of specified type or NULL (only applies
-	     to 'a', 'o', 'O', 'r', and 'z'). If NULL is passed, the results
-		 pointer is set to NULL as well.
+	| - indicates that the remaining parameters are optional, they
+	    should be initialized to default values by the extension since they
+	    will not be touched by the parsing function if they are not
+	    passed to it.
+	/ - use SEPARATE_ZVAL_IF_NOT_REF() on the parameter it follows
+	! - the parameter it follows can be of specified type or NULL (only applies
+	    to 'a', 'o', 'O', 'r', and 'z'). If NULL is passed, the results
+	    pointer is set to NULL as well.

 Examples
 --------
@@ -37,9 +37,10 @@ PHPAPI int php_stream_close(php_stream * stream);
 PHPAPI int php_stream_flush(php_stream * stream);
 PHPAPI int php_stream_seek(php_stream * stream, off_t offset, int whence);
 PHPAPI off_t php_stream_tell(php_stream * stream);
+PHPAPI int php_stream_lock(php_stream * stream, int mode);

 These (should) behave in the same way as the ANSI stdio functions with similar
-names: fread, fwrite, fprintf, feof, fgetc, fgets, fclose, fflush, fseek, ftell.
+names: fread, fwrite, fprintf, feof, fgetc, fgets, fclose, fflush, fseek, ftell, flock.

 Opening Streams
 ===============
@@ -157,6 +158,11 @@ can lead to a crash when the resource is later used/released.
 NOTE: If you are opening a stream and need it to be seekable, use the
 STREAM_MUST_SEEK option to php_stream_open_wrapper();

+PHPAPI int php_stream_supports_lock(php_stream * stream);
+
+This function will return either 1 (success) or 0 (failure) indicating whether or
+not a lock can be set on this stream. Typically you can only set locks on stdio streams.
+
 Casting Streams
 ===============
 What if your extension needs to access the FILE* of a user level file pointer?
@@ -123,5 +123,4 @@ commit log. If your patch affects end-users, a brief description
 and your name might be added to the NEWS file.


-
 Thank you for submitting patch for PHP!
@@ -1,6 +1,6 @@
 [IMPORTANT NOTICE]
 ------------------
- Do _not_ ask to developers why some or all tests are failed under
+ Please do not ask developers why some or all tests are failing in
 your environment! Let us know if you find why it fails. Thank you.


@@ -108,7 +108,7 @@ Example script to be run by cron(1):
 ========== qa-test.sh =============
 #!/bin/sh

-CO_DIR=$HOME/cvs/php4
+CO_DIR=$HOME/cvs/php5
 MYMAIL=qa-test@domain.com
 TMPDIR=/var/tmp
 TODAY=`date +"%Y%m%d"`
@@ -119,7 +119,7 @@ export MAKE=gmake
 export CC=gcc

 # Set test environment
-export NO_INTERACTIVITY=1
+export NO_INTERACTION=1
 export REPORT_EXIT_STATUS=1

 cd $CO_DIR
@@ -141,145 +141,8 @@ advised to test for non-zero, rather then a specific value.
 [Creating new test files]
 -------------------------
 Writing test file is very easy if you are used to PHP. 
+See the HOWTO at http://qa.php.net/write-test.php

-Here is an actual test file from standard module.
-
-===== ext/standard/tests/strings/strtr.phpt =======
--TEST--
-strtr() function
--FILE--
-<?php
-/* Do not change this test it is a REATME.TESTING example. */
-$trans = array("hello"=>"hi", "hi"=>"hello", "a"=>"A", "world"=>"planet");
-var_dump(strtr("# hi all, I said hello world! #", $trans));
-?>
--EXPECT--
-string(32) "# hello All, I sAid hi planet! #"
-===== ext/standard/tests/strings/strtr.phpt =======
-
-As you can see the file is devided into several sections. Below is a
-list of all possible sections:
-
-"--TEST--"        is title of the test (required).
-"--SKIPIF--"      is condition when to skip this test (optional).
-"--POST--"        is POST variable passed to test script (optional).
-"--GET--"         is GET variable passed to test script (optional).
-"--INI--"         each line contains an ini setting e.g. foo=bar (optional).
-"--FILE--"        is the test script (required).
-"--EXPECT--"      is the expected output from the test script (required).
-"--EXPECTF--"     is an alternative of --EXPECT--. The difference is that
-                  this form uses sscanf for output validation (alternative).
-"--EXPECTREGEX--" is an alternative of --EXPECT--. This form allows the tester
-                  to specify the result in a regular expression (alternative).
-
-A test must at least contain the sections TEST, FILE and either EXPECT
-or EXPECTF. When a test is called run-test.php takes the name from the
-TEST section and writes the FILE section into a ".php" file with the 
-same name as the ".phpt" file. This ".php" file will then be executed
-and its output compared to the contents of the EXPECT section. It is a
-good idea to generate output with var_dump() calls.
-
-/ext/standard/tests/strings/str_shuffle.phpt is a good example for using 
-EXPECTF instead of EXPECT. From time to time the algorithm used for shuffle 
-changed and sometimes the machine used to execute the code has influence 
-on the result of shuffle. But it always returns a three character string 
-detectable by %s. Other scan-able forms are %i for integers, %d for numbers
-only, %f for floating point values, %c for single characters and %x for 
-hexadecimal values.
-
-==== /ext/standard/tests/strings/str_shuffle.phpt ===
--TEST--
-Testing str_shuffle.
--FILE--
-<?php
-/* Do not change this test it is a REATME.TESTING example. */
-$s = '123';
-var_dump(str_shuffle($s));
-var_dump($s);
-?>
--EXPECTF--
-string(3) %s
-string(3) "123"
-==== end of /ext/standard/tests/strings/str_shuffle.phpt ===
-
-/ext/standard/tests/strings/strings001.phpt is a good example for using 
-EXPECTREGEX instead of EXPECT. This test also shows that in EXPECTREGEX 
-some characters need to be escaped since otherwise they would be 
-interpreted as a regular expression.
-
-==== /ext/standard/tests/strings/strings001.phpt ===
--TEST--
-Test whether strstr() and strrchr() are binary safe.
--FILE--
-<?php
-/* Do not change this test it is a REATME.TESTING example. */
-$s = "alabala nica".chr(0)."turska panica";
-var_dump(strstr($s, "nic"));
-var_dump(strrchr($s," nic"));
-?>
--EXPECTREGEX--
-string\(18\) \"nica\x00turska panica\"
-string\(19\) \" nica\x00turska panica\"
-==== end of /ext/standard/tests/strings/strings001.phpt ===
-
-Some tests depend on modules or functions available only in certain versions 
-or they even require minimum version of php or zend. These tests should be 
-skipped when the requirement cannot be fullfilled. To achieve this you can
-use the SKIPIF section. To tell run-test.php that your test should be skipped
-the SKIPIF section must print out the word "skip" followed by a reason why
-the test should skip.
-
-==== /ext/exif/tests/exif005.phpt ===
--TEST--
-Check for exif_read_data, unusual IFD start
--SKIPIF--
-<?php 
-	if (!extension_loaded('exif')) print 'skip exif extension not available';
-?>
--FILE--
-<?php
-/* Do not change this test it is a REATME.TESTING example.
- * test5.jpg is a 1*1 image that contains an Exif section with ifd = 00000009h
- */
-$image  = exif_read_data('./ext/exif/tests/test5.jpg','',true,false);
-var_dump($image['IFD0']);
-?>
--EXPECT--
-array(2) {
-  ["ImageDescription"]=>
-  string(11) "Ifd00000009"
-  ["DateTime"]=>
-  string(19) "2002:10:18 20:06:00"
-}
-==== end of /ext/exif/tests/exif005.phpt ===
-
-Test script and SKIPIF code should be directly written into *.phpt. However, 
-it is recommended to use include files when more test scripts depend on the 
-same SKIPIF code or when certain test files need the same values for some 
-input. But no file used by any test should have one of the following 
-extensions: ".php", ".log", ".exp", ".out" or ".diff".
-
-Tests should be named according to the following list:
-
-Class:                       Name:                  Example:
-Tests for bugs               bug<bugid>.phpt        bug17123.phpt
-Tests for functions          <functionname>.phpt    dba_open.phpt
-General tests for extensions <extname><no>.phpt     dba3.phpt
-
-When you use an include file for the SKIPIF section it should be named
-"skipif.inc" and an include file used in the FILE section of many tests
-should be named "test.inc".
-
-NOTE: All tests should run correctly with error_reporting(E_ALL) and
-display_errors=1. This is the default when called from run-test.php.
-If you have a good reason for lowering the error reporting, use --INI--
-section and comment this in your testcode.
-
-NOTE: If your test intentionally generates a PHP warning message use 
-$php_errormsg variable, which you can then output. This will result 
-in a consistent error message output across all platforms and PHP 
-configurations, preventing your test from failing due inconsistencies 
-in the error message content.

 [How to help us]
 ----------------
@@ -0,0 +1,137 @@
+[IMPORTANT NOTICE]
+------------------
+This is an addendum to README.TESTING with additional information 
+specific to run-tests2.php.
+
+run-tests2.php is backward compatible with tests developed for
+the original run-tests.php script.  run-tests2 is *not* used by
+'make test'.  run-tests2 was developed to provide support for
+testing PHP under it's primary environment, HTTP, and can run the
+PHP tests under any of the SAPI modules that are direct executables, 
+or are accessable via HTTP.
+
+[New features]
+----------------
+* Command line interface:
+  You can run 'php run-tests2.php -h' to get all the possible options.
+* Configuration file:
+  the -c argument will allow you to use a configuration file.  This is
+  handy if you are testing multiple environments and need various options
+  depending on the environment.
+  see run-tests-config.php for details.
+* CGI Emulation:
+  Will emulate a CGI environment when testing with the cgi sapi executable.
+* HTTP testing:
+  can be configured to run test scripts through an HTTP server running
+  on localhost.  localhost is required since either the web server must
+  alias a directory to the php source directory, or the test scripts
+  must be copied to a directory under the web server 
+  (see config options TEST_WEB_BASE_URL, TEST_BASE_PATH, and TEST_WEB_EXT)
+* New sections supported for test files (see below)
+
+When running tests over http, tests that require ini settings different that what
+the web server runs under will be skipped.  Since the test harness defines a number
+of ini settings by default, the web server may require special configuration to
+make testing work.
+
+[Example Usage]
+----------------
+Some (but not all!) examples of usage:
+
+1. run tests from the php source directory
+    php run-tests2.php -p /path/to/php-cli
+
+2. run tests using cgi emulation
+    php run-tests2.php -p /path/to/php-cgi
+
+3. run tests over http, copying test files into document root
+    php run-tests2.php -w -u http://localhost/test -m /path/to/htdocs/test
+
+4. run tests over http, php sources have been aliased in web server
+    php run-tests2.php -w -u http://localhost/test
+    
+5. run tests using configuration file
+    php run-tests2.php -c /path/to/run-tests-config.php
+
+6. run tests using configuration file, but overriding some settings:
+   (config file must be first)
+    php run-tests2.php -c /path/to/run-tests-config.php -w -t 3 -d /path/to/testdir
+
+NOTE: configuration as described in README.TESTING still works.
+
+[New Test Sections] 
+----------------
+In addition to the traditional test sections 
+(see http://qa.php.net/write-test.php), several new sections are available 
+under run-tests2.
+
+--POST--
+This is not a new section, but not multipart posts are supported for testing
+file uploads, or other types of POST data.
+
+--CGI--
+This section takes no value.  It merely provides a simple marker for tests
+that MUST be run as CGI, even if there is no --POST-- or --GET-- sections
+in the test file.
+
+--DESCRIPTION--
+Not used for anything, just a section for documenting the test
+
+--ENV--
+This section get's eval()'d to help build an environment for the 
+execution of the test.  This can be used to change environment
+vars that are used for CGI emulation, or simply to set env vars
+for cli testing.  A full example looks like:
+
+  --ENV--
+  return <<<END
+  PATH_TRANSLATED=$filename
+  PATH_INFO=$scriptname
+  SCRIPT_NAME=$scriptname
+  END;
+
+Some variables are made easily available for use in this section, they
+include:
+  $filename     full native path to file, will become PATH_TRANSLATED
+  $filepath     =dirname($filename)
+  $scriptname   this is what will become SCRIPT_NAME unless you override it
+  $docroot      the equivelant of DOCUMENT_ROOT under Apache
+  $cwd          the directory that the test is being initiated from
+  $this->conf   all run-tests2 configuration vars
+  $this->env    all environment variables that will get passed to the test
+
+
+--REQUEST--
+This section is also eval'd, and is similar in nature to --ENV--.  However,
+this section is used to build the url used in an HTTP request.  Valid values
+to set in this section would include:
+  SCRIPT_NAME   The inital part of the request url
+  PATH_INFO     The pathinfo part of a request url
+  FRAGMENT      The fragment section of a url (after #)
+  QUERY_STRING  The query part of a url (after ?)
+
+  --REQUEST--
+  return <<<END
+  PATH_INFO=/path/info
+  END;
+
+--HEADERS--
+This section is also eval'd.  It is used to provide additional headers sent
+in an HTTP request, such as content type for multipart posts, cookies, etc.
+
+  --HEADERS--
+  return <<<END
+  Content-Type=multipart/form-data; boundary=---------------------------240723202011929
+  Content-Length=100
+  END;
+
+--EXPECTHEADERS--
+This section can be used to define what headers are required to be
+received back from a request, and is checked in addition to the
+regular expect sections.  For example:
+
+  --EXPECTHEADERS--
+  Status: 404
+
+
+
@@ -108,7 +108,7 @@ module, program, etc).

 For example for APXS:

-PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c)
+PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php5.c php_apache.c)



@@ -21,29 +21,13 @@ If you have any problems, please check the support site for more
 up-to-date information and advice.


-Quick guide to installing FastCGI with Zeus
-------------------------------------------
+Quick guide to installing CGI/FastCGI with Zeus
+-----------------------------------------------

-Step 1 - obtain and install FastCGI development kit.
-
-Grab the package from:
-http://www.fastcgi.com/dist/devkit_2.2.0.tar.gz
-
-Extract the package and follow the instructions:
-        ./configure
-        make
-        make export
-(run the last as root)
-
-This will install to /usr/local/lib/libfcgi.a
-                and  /usr/local/include/*fcgi*
-
-
-
-Step 2 - Compile PHP as FastCGI.
+Step 1 - Compile PHP as FastCGI.

 Compile as follows:
-        ./configure --with-fastcgi
+        ./configure --enable-fastcgi
        make

 Note that PHP has many options to the configure script -
@@ -55,7 +39,7 @@ program called 'php'. Copy this into your document root, under a
 dedicated FastCGI directory (e.g. $DOCROOT/fcgi-bin/php)


-Step 3 - configure Zeus
+Step 2 - configure Zeus

 Four stages:
        -  enable FastCGI
@@ -98,7 +82,7 @@ Click 'update' to commit these changes
 Finally restart your virtual server for these changes to take effect.


-Step 4 - start PHP as a FastCGI runner
+Step 3 - start PHP as a FastCGI runner

 When you start PHP, it will pre-fork a given number of child processes
 to handle incoming PHP requests. Each process will handle a given
@@ -106,8 +90,10 @@ number of requests before exiting (and being replaced by a newly
 forked process). You can control these two parameters by setting the
 following environment variables BEFORE starting the FastCGI runner:

-PHP_FCGI_CHILDREN - the number of child processes to pre-fork. If not
-set, defaults to 8.
+PHP_FCGI_CHILDREN - the number of child processes to pre-fork. This
+variable MUST be set, if not then the PHP will not run as a FastCGI.
+We recommend a value of 8 for a fairly busy site. If you have many,
+long-running PHP scripts, then you may need to increase this further.

 PHP_FCGI_MAX_REQUESTS - the number of requests each PHP child process
 handles before exiting. If not set, defaults to 500.
@@ -0,0 +1,188 @@
+Input Filter Support in PHP5
+----------------------------
+
+XSS (Cross Site Scripting) hacks are becoming more and more prevalent,
+and can be quite difficult to prevent.  Whenever you accept user data
+and somehow display this data back to users, you are likely vulnerable
+to XSS hacks.
+
+The Input Filter support in PHP5 is aimed at providing the framework
+through which a company-wide or site-wide security policy can be
+enforced.  It is implemented as a SAPI hook and is called from the
+treat_data and post handler functions.  To implement your own security
+policy you will need to write a standard PHP extension.  
+
+A simple implementation might look like the following.  This stores the
+original raw user data and adds a my_get_raw() function while the normal
+$_POST, $_GET and $_COOKIE arrays are only populated with stripped
+data.  In this simple example all I am doing is calling strip_tags() on
+the data.  If register_globals is turned on, the default globals that
+are created will be stripped ($foo) while a $RAW_foo is created with the
+original user input.
+
+ZEND_BEGIN_MODULE_GLOBALS(my_input_filter)
+        zval *post_array;
+        zval *get_array;
+        zval *cookie_array;
+ZEND_END_MODULE_GLOBALS(my_input_filter)
+
+#ifdef ZTS
+#define IF_G(v) TSRMG(my_input_filter_globals_id, zend_my_input_filter_globals *, v)
+#else
+#define IF_G(v) (my_input_filter_globals.v)
+#endif
+
+ZEND_DECLARE_MODULE_GLOBALS(my_input_filter)
+
+function_entry my_input_filter_functions[] = {
+    PHP_FE(my_get_raw,   NULL)
+    {NULL, NULL, NULL}
+};
+
+zend_module_entry my_input_filter_module_entry = {
+    STANDARD_MODULE_HEADER,
+    "my_input_filter",
+    my_input_filter_functions,
+    PHP_MINIT(my_input_filter),
+    PHP_MSHUTDOWN(my_input_filter),
+    NULL,
+    PHP_RSHUTDOWN(my_input_filter),
+    PHP_MINFO(my_input_filter),
+    "0.1",
+    STANDARD_MODULE_PROPERTIES
+};
+
+PHP_MINIT_FUNCTION(my_input_filter)
+{
+    ZEND_INIT_MODULE_GLOBALS(my_input_filter, php_my_input_filter_init_globals, NULL);
+
+    REGISTER_LONG_CONSTANT("POST", PARSE_POST, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("GET", PARSE_GET, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("COOKIE", PARSE_COOKIE, CONST_CS | CONST_PERSISTENT);
+
+    sapi_register_input_filter(my_sapi_input_filter);
+    return SUCCESS;
+}
+
+PHP_RSHUTDOWN_FUNCTION(my_input_filter)
+{
+    if(IF_G(get_array)) {
+        zval_ptr_dtor(&IF_G(get_array));
+        IF_G(get_array) = NULL;
+    }
+    if(IF_G(post_array)) {
+        zval_ptr_dtor(&IF_G(post_array));
+        IF_G(post_array) = NULL;
+    }
+    if(IF_G(cookie_array)) {
+        zval_ptr_dtor(&IF_G(cookie_array));
+        IF_G(cookie_array) = NULL;
+    }
+    return SUCCESS;
+}
+
+PHP_MINFO_FUNCTION(my_input_filter)
+{
+    php_info_print_table_start();
+    php_info_print_table_row( 2, "My Input Filter Support", "enabled" );
+    php_info_print_table_row( 2, "Revision", "$Revision$");
+    php_info_print_table_end();
+}
+
+unsigned int  my_sapi_input_filter(int arg, char *var, char **val, unsigned int val_len)
+{
+    zval new_var;
+    zval *array_ptr = NULL;
+    char *raw_var;
+    int var_len;
+
+    assert(*val != NULL);
+
+    switch(arg) {
+        case PARSE_GET:
+            if(!IF_G(get_array)) {
+                ALLOC_ZVAL(array_ptr);
+                array_init(array_ptr);
+                INIT_PZVAL(array_ptr);
+            }
+            IF_G(get_array) = array_ptr;
+            break;
+        case PARSE_POST:
+            if(!IF_G(post_array)) {
+                ALLOC_ZVAL(array_ptr);
+                array_init(array_ptr);
+                INIT_PZVAL(array_ptr);
+            }
+            IF_G(post_array) = array_ptr;
+            break;
+        case PARSE_COOKIE:
+            if(!IF_G(cookie_array)) {
+                ALLOC_ZVAL(array_ptr);
+                array_init(array_ptr);
+                INIT_PZVAL(array_ptr);
+            }
+            IF_G(cookie_array) = array_ptr;
+            break;
+    }
+    Z_STRLEN(new_var) = val_len;
+    Z_STRVAL(new_var) = estrndup(*val, val_len);
+    Z_TYPE(new_var) = IS_STRING;
+
+    var_len = strlen(var);
+    raw_var = emalloc(var_len+5);  /* RAW_ and a \0 */
+    strcpy(raw_var, "RAW_");
+    strlcat(raw_var,var,var_len+5);
+
+    php_register_variable_ex(raw_var, &new_var, array_ptr TSRMLS_DC);
+
+    php_strip_tags(*val, val_len, NULL, NULL, 0);
+
+    return strlen(*val);
+}
+
+PHP_FUNCTION(my_get_raw)
+{
+    long arg;
+    char *var;
+    int var_len;
+    zval **tmp;
+    zval *array_ptr = NULL;
+    HashTable *hash_ptr;
+    char *raw_var;
+
+    if(zend_parse_parameters(2 TSRMLS_CC, "ls|l", &arg, &var, &var_len) == FAILURE) {
+        return;
+    }
+
+    switch(arg) {
+        case PARSE_GET:
+            array_ptr = IF_G(get_array);
+            break;
+        case PARSE_POST:
+            array_ptr = IF_G(post_array);
+            break;
+        case PARSE_COOKIE:
+            array_ptr = IF_G(post_array);
+            break;
+    }
+
+    if(!array_ptr) RETURN_FALSE;
+
+    /*
+     * I'm changing the variable name here because when running with register_globals on,
+     * the variable will end up in the global symbol table
+     */
+    raw_var = emalloc(var_len+5);  /* RAW_ and a \0 */
+    strcpy(raw_var, "RAW_");
+    strlcat(raw_var,var,var_len+5);
+    hash_ptr = HASH_OF(array_ptr);
+
+    if(zend_hash_find(hash_ptr, raw_var, var_len+5, (void **)&tmp) == SUCCESS) {
+        *return_value = **tmp;
+        zval_copy_ctor(return_value);
+    } else {
+        RETVAL_FALSE;
+    }
+    efree(raw_var);
+}
+
@@ -3,18 +3,17 @@ parenthesis means that person has taken on this project.

 Zend
 ----
-    For PHP 4.3.0:
-    * Allow foreach ($array as $k => &$val) syntax. right now we cannot 
-      traverse an array without copying each element.
    * Allow foreach ($array as $k => list($a, $b)) syntax for multi
      dimensional arrays.
    * Look at replacing c-lib call tolower().
    * Make hash API functions work with HASH_OF() to save time.
    * Allow to set a default value for call-by-reference-parameters. 
      eg: function hello (&$pallo = NULL) {} 
-    * Disallow function(method) redefinition in class.
-
-    For PHP 5.0.0:
+    * Add configure test to determine if dlsym() requires underscore and set
+      DLSYM_NEEDS_UNDERSCORE accordingly. Perl and zsh have it in configure, 
+      for example. (DONE?)
+    * Allow foreach ($array as $k => &$val) syntax. right now we cannot 
+      traverse an array without copying each element.
    * Native large number support (probably with GNU GMP)
    * Const'ify APIs. Right now, many functions leave parameters untouched,
      but don't declare those as const. This makes interaction with other
@@ -23,26 +22,11 @@ Zend

 global
 ------
-    For PHP 4.3.0:
-    * Add aliases to functions to conform to new naming conventions, e.g.
-      str_to_upper().
-    * Make all extensions thread-safe.
-    * Make everything on the language-level independent of your locale 
-      settings.
-    * Change PHP error messages, so that they point to pages or sections 
-      in the PHP Manual.
    * 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
-      dependencies. (eg ftp) (DONE?)
    * on some platforms unimplemented function will just do nothing 
      (e.g. symlink) they should print a warning or not even be defined!
      (DONE ?)
-    * Use arg_separator.input to implode args in the CGI sapi extension
-      and arg_separator.input to explode in php_build_argv(). (DONE?)
-
-    For PHP 5.0.0
-    * bundle and use curl lib for fopen wrapper.
    * --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 
@@ -55,16 +39,28 @@ global
    * Move most extensions and PEAR packages out of the PHP CVS tree,
      include them again during release packaging.

-
    Other
    * use thread-safe resolver functions (either require BIND 8 or adns).
    * implement javadoc based function docs template system.
-    * provide optional IPv6 support.
+    * provide optional IPv6 support (seems to be done?).
    * find a better way to implement script timeouts. SIGVTALRM is used
      by some POSIX threads implementations (i.e. OpenBSD) and is not
      available in ZTS mode.
    * Implement flush feature suitable for nested output buffers.

+Streams
+-------
+    * Route filestat.c through the wrapper layer; isolate the statcache code
+      so that it is independent of php functions and can be applied to any
+      stream/path.
+    * Implement generalized connection pool for stated protocols such as
+      ftp and http/1.1 (using keep-alive) to avoid having to negotiate
+      new command/request stream for each subsequent call; Possibly store 
+      resources in contexts (creating a default context if necessary) to 
+      allow segmentation of connection pools.
+    * Add a method to take ownership of the memory buffer in memory streams so
+      that generating string values for zvals doesn't require an estrdup.
+    * bundle and use curl lib for fopen wrapper.

 documentation
 -------------
@@ -139,7 +135,6 @@ ext/session

 ext/sockets
 -----------
-    * Implement IPv6
    * Review/Fix vectors

 ext/standard
@@ -148,13 +143,7 @@ ext/standard
    * Possibly modify parsing of GPC data to automatically create arrays if
      variable name is seen more than once.
    * Implement regex-cache for url-functions.
-    * stri_replace(). (Andrei)
    * Move socket related functions to fsock.c.
-    * NOT binary safe:
-        strtok()
-        basename()
-        dirname()
-        strrpos()

 ext/wddx
 --------
@@ -170,3 +159,5 @@ ext/wddx
 other cool stuff
 ----------------
    * PVM extension
+
+vim:et:sw=4:ts=4
@@ -0,0 +1,211 @@
+Component:      Zend Engine 2
+
+                Important stuff to finish: PPP members/PPP methods, 
+                support of overloaded extensions, possibly differentiate 
+                between class and namespace as discussed with Stig in 
+                Germany.
+Responsibility: Zeev, Andi, Stas
+Time frame:     Couple of months for first part and extensions will be
+                ongoing while PHP is being fixed.
+                Things to leave for later versions: Native aggregation
+                support, accessing static members via object and not class.
+
+
+Component:      Aggregation
+Responsibility: Andi, Stig?
+Time frame:     ?
+
+
+Component:      Introspection
+
+                get_function_definition(<is_callable> [field]) =>
+                array(
+                	file => filename
+                	line_start =>
+                	line_end =>
+                	parameters => array( name, byref, default )
+                	static_variables => array( name, value/default )
+                	scope => 'namespace' | 'class' | null
+                	namespace => classname | namespacename | 'main'
+                	protection => protection_flags
+                	phpdoc => pre-scanned-phpdoc-string
+                	type => 'internal' | 'user'
+                )
+                
+                get_class_definition(<class> [field]) =>
+                array(
+                	type => 'internal' | 'user'
+                	file => filename
+                	line_start => 
+                	line_end =>
+                	name => pretty-name
+                	parent => classname | namespace | null
+                	flags => bitfield (ABSTRACT)
+                	methods => array( array( name, phpdoc ) )
+                	default_properties => array( array( name, value, phpdoc ) )
+                	private_properties => array( array( name, value, phpdoc ) )
+                	protected_properties => array( array( name, value, phpdoc ) )
+                	public_properties => array( array( name, value, phpdoc ) )
+                	static_members => array( array( name, value, phpdoc ) )
+                	constants => array( array( name, value, phpdoc ) )
+                	classes => array( array( name, phpdoc ) )
+                	phpdoc => pre-scanned-phpdoc-string
+                )
+                
+                get_constant_definition(<constant> [field]) =>
+                array(
+                	file => filename
+                	line_start =>
+                	line_end =>
+                	name => 
+                	value =>
+                	phpdoc =>
+                )
+                
+                get_global_variable_defintion(<name> [field]) =>
+                array(
+                	file =>
+                	line_start =>
+                	line_end =>
+                	name =>
+                	phpdoc =>
+                )
+                
+                We tried to take into account the implementation of each piece of
+                information, and there are some that are problematic, especially those
+                regarding constants and global variables (where do we store the extra
+                information?)
+                
+                With "pre-scanned-phpdoc-string" we mean converting:
+                
+                /**
+                 * Blah blah blah
+                 * @param foo ...
+                 */
+                
+                to:
+                
+                Blah blah blah
+                @param foo
+                
+                The rest of the phpdoc handling should be left to an extension.
+Responsibility: Stig, Andrei, Harald
+Time frame:     ?
+
+
+Component:      Redesign of API Versioning
+Responsibility: ?
+Time frame:     1 month
+
+
+Component:      Thread Safety
+                Identify the extensions that are not thread safe by design 
+                or due to dependant libraries and identify them as such. 
+                If possible try to resolve thread safety issue via code 
+                improvements (if php code or patches will be accepted by 
+                library maintainers).   For situations where thread safety 
+                cannot easily be acheived a flag in the extension API is 
+                set so PHP can identify non-thread safe extensions.  These 
+                extensions will not be loaded in a ZTS compiled binary 
+                (unless it is cli/cgi).
+
+Responsibility: ?
+Time frame:     ?
+
+
+Component:      SAPI
+                Environment variables defined in the CGI spec need to be 
+                verified in each SAPI module that they conform to the CGI 
+                spec correctly.  If they do not, the SAPI module needs to 
+                fix the variable prior to script execution.  Having this 
+                conformity will aid in having PHP scripts run correctly 
+                under different sapi modules.
+
+Responsibility: Shane Caraveo & each sapi module owner
+Timeframe:      ? (but shouldn't be much effort, most modules are probably ok)
+
+
+Component:      Input Filtering
+                - Implement a SAPI input filter hook that will get called
+                  just before registering a variable in the 
+                  treat_data/post_handler hooks.  (done)
+                - Make sure this is also done in mbstring  (done)
+                - Provide access functions, or perhaps a new 
+                  $_RAW_GET/POST/Cookie set of superglobals to get at the
+                  unfiltered data
+                - Provide a .ini directive which allows people to set their
+                  input filter to one of the built-in strip_tags,
+                  htmlspecialchars or whatever other internal function might
+                  be useful here.
+                - (The main benefit of this is to make it easier for people
+                   to solve the XSS problem once and for all without having
+                   to go through every line of their code and adding input
+                   validation/filtering everywhere)
+Responsibility: Rasmus
+Timeframe:      Yesterday
+
+
+Component:      RPC Abstraction Layer
+                Porting java, com, dotnet, xmlrpc, corba, soap and python, srm
+                (are there more ?) to work with the new oo api and preferably
+                by using ext/rpc.
+Responsibility: Harald
+Time frame:     2 months (but i have to wait for a few engine features first)
+
+
+Component:      OO Extensions
+                Each OO extension has to be revised and rewritten to fit into
+                the new OO model. We should decide which extensions are a must
+                to have for the release and which can be ported by the maintainer
+                later as a separate pecl release.
+                A list of extensions to be extended that have to be investigated:
+                  * browscap
+                  * aggregate
+                  * all *sql extensions (*_fetch_object)
+                  * domxml (seems like christian is rewriting it anyways)
+                  * ming
+Responsibility: Harald (, extension maintainers)
+
+
+Component:      Abstract Data Types (ADT)
+Responsibility: Sterling, Harald
+Time frame:     ?
+
+
+Component:      MySQL Extension
+                Complete rewrite, leveraging the new MySQL 4 / MySQL 5
+                features.
+Responsibility: Georg Richter, Zak Greant
+Timeframe:      ?
+
+
+Component:      XML
+                - Rewrite DOMXML and incorporate all (or most of) W3C-DOM2.
+                - Use the new ZE2 features (Exceptions, setter/getter).
+                - Add SAX(2), XML Schema.
+                - XSLT, HTML, XPath, XPointer, DTD Validation will still be
+                  supported, have to find a meaningful API for it.
+                - Break BC, warn users now.
+                - Look at the libxml2 patch by lukas schröder and see if we can prevent
+                  memory leaks with it (anyway, getting rid of mem-leaks and intelligent
+                  memory management is on top prio...)
+                - In the longer term, domxml (or another name, as with todays features
+                  domxml is a little bit misleading) shall be the main xml-class, which
+                  covers most of what's needed for decent XML support in PHP ;)
+                  But there is certainly place for others like Sablotron etc.
+Responsibility: Christian Stocker
+Timeframe:      ?
+
+
+Component:      Test Suite
+                Extending the test suite with atleast a test for every
+                function in an extension that doesn't require external
+                resources. Also developing an automated test thing which
+                cvs ups's, compiles and tests the build on a daily base on
+                as much platforms/extensions as possible.
+
+                The test suite will also be extended to support threaded
+                testing and testing for differing sapi modules (via http
+                calls or other methods).
+Reponsibility:  Derick (, extension maintainers)
+Time frame:     3 months
@@ -0,0 +1,3 @@
+- clean up .cvsignores
+- purge Makefile.ins and replace PHP_EXTENSION in config.m4s
+  with appropiate calls to PHP_NEW_EXTENSION
@@ -1,112 +0,0 @@
-    This is an overview over existing segfaults in the current PHP source
-    tree.
-
-
-Fixed:
-
-    mb_convert_encoding (Moriyoshi)
-    socket_iovec_alloc (Rasmus)
-    exif_imagetype,exif_thumbnail (Rasmus)
-    dbase_open (Rasmus)
-    array_pad (Rasmus)
-    setlocale (Rasmus)
-    unregister_tick_function (Rasmus)
-    bcsub (Rasmus)
-    str_repeat (Ilia)
-    imagecopyresized (Ilia)
-    mhash_keygen_s2k (Ilia)
-    bundled gd (Ilia)
-    mb_ereg, mb_ereg_match, mb_eregi, mb_split (Moriyoshi)
-    xml_parser_create (Moriyoshi)
-    ob_start (Sascha)
-    imagecreate/-truecolor (Sascha)
-    flock (Sascha)
-    register_shutdown_function (Sascha)
-    mb_strcut('', [number greater than the length of first arg]) (Moriyoshi)
-    ext/exif, ext/dba (Marcus)
-    php_base64_encode (Moriyoshi)
-    pack (Ilia)
-	
-Open:
-
-    the dbase extension         (1)
-    socket_select               (2)
-	
-(1) heap corruption, mostly visible in malloc-related calls.  Whether you see 
-    this or not might depend on your libc/compiler.  Hard to track down,
-    because the result of the corruption might be quite delayed.
-
-    Reproducable with glibc-2.3/gcc 3.2.2 by:
-	
-cat <<X | php do_crash
-dbase_add_record
-dbase_close
-dbase_create
-dbase_delete_record
-dbase_get_record
-dbase_get_record_with_names
-dbase_numfields
-dbase_numrecords
-dbase_open
-X 
-
-(2) heap corruption, dies in efree()/execute()
-
-Methodology
-
-    1. Use a plain PHP_4_3 tree
-    2. Use the config.nice from ammendment 1.
-    3. Download the test script from:
-
-        <URL:http://schumann.cx/do_crash.txt>
-
-    4a. Use the scripts funcparse.awk/genfunclist.sh from phpdoc/scripts
-        for creating a plain text function list.  Feed that list to
-        the script.  Avoid calls like pcntl_fork.  Manually remove functions
-        which take too long to finish/eat up all memory.
-    
-    4b. For testing a single function, echo the name of the function to
-        the script like this:
-
-        echo dbase_open | php do_crash.txt
-
-Amendment 1.
-
-CFLAGS='-O0 -g' \
-'../src/php4/configure' \
-'--enable-pcntl' \
-'--enable-shmop' \
-'--enable-sysvsem' \
-'--enable-sysvshm' \
-'--enable-wddx' \
-'--enable-yp' \
-'--enable-filepro' \
-'--enable-ftp' \
-'--enable-dba' \
-'--enable-dbase' \
-'--enable-dio' \
-'--enable-exif' \
-'--enable-mbstring' \
-'--enable-mbregex' \
-'--enable-sockets' \
-'--enable-bcmath' \
-'--enable-calendar' \
-'--enable-pcntl' \
-'--enable-shmop' \
-'--enable-sysvsem' \
-'--enable-sysvshm' \
-'--enable-wddx' \
-'--enable-yp' \
-'--enable-filepro' \
-'--enable-ftp' \
-'--enable-dba' \
-'--enable-dbase' \
-'--enable-dio' \
-'--enable-exif' \
-'--enable-mbstring' \
-'--enable-mbregex' \
-'--enable-sockets' \
-'--enable-bcmath' \
-'--enable-calendar' \
-"$@"
-
@@ -157,16 +157,10 @@ TSRM_API void tsrm_shutdown(void)
 				int j;

 				next_p = p->next;
-				for (j=0; j<p->count; j++) {
-				/* Disabled - calling dtors in tsrm_shutdown makes
-					modules registering TSRM ids to crash, if they have
-					dtors, since the module is unloaded before tsrm_shutdown 
-					is called. Can be re-enabled after tsrm_free_id is 
-					implemented.
+				for (j=0; j<id_count; j++) {
 					if (resource_types_table && resource_types_table[j].dtor) {
 						resource_types_table[j].dtor(p->storage[j], &p->storage);
 					}
-				*/
 					free(p->storage[j]);
 				}
 				free(p->storage);
@@ -190,7 +184,6 @@ TSRM_API void tsrm_shutdown(void)
 #if defined(GNUPTH)
 	pth_kill();
 #elif defined(PTHREADS)
-	pthread_setspecific(tls_key, 0);
 	pthread_key_delete(tls_key);
 #elif defined(TSRM_WIN32)
 	TlsFree(tls_key);
@@ -285,11 +278,11 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 		}
 	}

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


@@ -300,6 +293,15 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 	int hash_value;
 	tsrm_tls_entry *thread_resources;

+#ifdef NETWARE
+	/* The below if loop is added for NetWare to fix an abend while unloading PHP
+	 * when an Apache unload command is issued on the system console.
+	 * While exiting from PHP, at the end for some reason, this function is called
+	 * with tsrm_tls_table = NULL. When this happened, the server abends when
+	 * tsrm_tls_table is accessed since it is NULL.
+	 */
+	if(tsrm_tls_table) {
+#endif
 	if (!th_id) {
 #if defined(PTHREADS)
 		/* Fast path for looking up the resources for the current
@@ -362,6 +364,9 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 	 * changes to the structure as we read it.
 	 */
 	TSRM_SAFE_RETURN_RSRC(thread_resources->storage, id, thread_resources->count);
+#ifdef NETWARE
+	}	/* if(tsrm_tls_table) */
+#endif
 }


@@ -428,6 +433,13 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 {
 #ifdef TSRM_WIN32
 	return GetCurrentThreadId();
+#elif defined(NETWARE)
+	/* There seems to be some problem with the LibC call: NXThreadGetId().
+	 * Due to this, the PHPMyAdmin application is abending in PHP calls.
+	 * Used the call, kCurrentThread instead and it works fine.
+	 */
+/*	return NXThreadGetId(); */
+	return kCurrentThread();
 #elif defined(GNUPTH)
 	return pth_self();
 #elif defined(PTHREADS)
@@ -448,9 +460,24 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 {
 	MUTEX_T mutexp;
+#ifdef NETWARE
+#ifndef USE_MPK
+	/* To use the Recursive Mutex Locking of LibC */
+	long flags = NX_MUTEX_RECURSIVE;
+	NXHierarchy_t order = 0;
+	NX_LOCK_INFO_ALLOC (lockInfo, "PHP-TSRM", 0);
+#endif
+#endif
+
 #ifdef TSRM_WIN32
 	mutexp = malloc(sizeof(CRITICAL_SECTION));
 	InitializeCriticalSection(mutexp);
+#elif defined(NETWARE)
+#ifdef USE_MPK
+	mutexp = kMutexAlloc((BYTE*)"PHP-TSRM");
+#else
+	mutexp = NXMutexAlloc(flags, order, &lockInfo);
+#endif
 #elif defined(GNUPTH)
 	mutexp = (MUTEX_T) malloc(sizeof(*mutexp));
 	pth_mutex_init(mutexp);
@@ -482,6 +509,12 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
 		DeleteCriticalSection(mutexp);
 		free(mutexp);
+#elif defined(NETWARE)
+#ifdef USE_MPK
+		kMutexFree(mutexp);
+#else
+		NXMutexFree(mutexp);
+#endif
 #elif defined(GNUPTH)
 		free(mutexp);
 #elif defined(PTHREADS)
@@ -511,6 +544,12 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
 	EnterCriticalSection(mutexp);
 	return 1;
+#elif defined(NETWARE)
+#ifdef USE_MPK
+	return kMutexLock(mutexp);
+#else
+	return NXLock(mutexp);
+#endif
 #elif defined(GNUPTH)
 	return pth_mutex_acquire(mutexp, 0, NULL);
 #elif defined(PTHREADS)
@@ -536,6 +575,12 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
 	LeaveCriticalSection(mutexp);
 	return 1;
+#elif defined(NETWARE)
+#ifdef USE_MPK
+	return kMutexUnlock(mutexp);
+#else
+	return NXUnlock(mutexp);
+#endif
 #elif defined(GNUPTH)
 	return pth_mutex_release(mutexp);
 #elif defined(PTHREADS)
@@ -14,8 +14,8 @@
 #define TSRM_H

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

 #ifdef WIN32
@@ -37,7 +37,17 @@
 #ifdef ZTS

 #ifdef TSRM_WIN32
+# ifndef TSRM_INCLUDE_FULL_WINDOWS_HEADERS
+#  define WIN32_LEAN_AND_MEAN
+# endif
 # include <windows.h>
+#elif defined(NETWARE)
+# include <nks/thread.h>
+#ifdef USE_MPK
+# include <mpklib4php.h>
+#else
+# include <nks/synch.h>
+#endif
 #elif defined(GNUPTH)
 # include <pth.h>
 #elif defined(PTHREADS)
@@ -55,6 +65,13 @@ typedef int ts_rsrc_id;
 #ifdef TSRM_WIN32
 # define THREAD_T DWORD
 # define MUTEX_T CRITICAL_SECTION *
+#elif defined(NETWARE)
+# define THREAD_T NXThreadId_t
+#ifdef USE_MPK
+# define MUTEX_T MUTEX
+#else
+# define MUTEX_T NXMutex_t *
+#endif
 #elif defined(GNUPTH)
 # define THREAD_T pth_t
 # define MUTEX_T pth_mutex_t *
@@ -132,6 +149,8 @@ TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread
 #define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)-1)

 #define TSRMLS_FETCH()			void ***tsrm_ls = (void ***) ts_resource_ex(0, NULL)
+#define TSRMLS_FETCH_FROM_CTX(ctx)	void ***tsrm_ls = (void ***) ctx
+#define TSRMLS_SET_CTX(ctx)		(void ***) ctx = tsrm_ls
 #define TSRMG(id, type, element)	(((type) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
 #define TSRMLS_D	void ***tsrm_ls
 #define TSRMLS_DC	, TSRMLS_D
@@ -145,6 +164,8 @@ TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread
 #else /* non ZTS */

 #define TSRMLS_FETCH()
+#define TSRMLS_FETCH_FROM_CTX(ctx)
+#define TSRMLS_SET_CTX(ctx)
 #define TSRMLS_D	void
 #define TSRMLS_DC
 #define TSRMLS_C
@@ -1,5 +1,5 @@

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

@@ -30,7 +30,7 @@ dnl PTHREADS_FLAGS
 dnl
 dnl Set some magic defines to achieve POSIX threads conformance
 dnl
-AC_DEFUN([PTHREADS_FLAGS],[
+AC_DEFUN(PTHREADS_FLAGS,[
  if test -z "$host_alias" && test -n "$host"; then
    host_alias=$host
  fi
@@ -65,7 +65,7 @@ dnl PTHREADS_CHECK_COMPILE
 dnl
 dnl Check whether the current setup can use POSIX threads calls
 dnl
-AC_DEFUN([PTHREADS_CHECK_COMPILE], [
+AC_DEFUN(PTHREADS_CHECK_COMPILE, [
 AC_TRY_RUN( [
 #include <pthread.h>
 #include <stddef.h>
@@ -84,15 +84,7 @@ int main() {
  pthreads_working=yes
  ], [
  pthreads_working=no
-  ], [
-  dnl For cross compiling running this test is of no use. NetWare supports pthreads
-  pthreads_working=no
-  case $host_alias in
-  *netware*)
-    pthreads_working=yes
-  esac
-]
-) ] )dnl
+  ], pthreads_working=no ) ] )dnl
 dnl
 dnl PTHREADS_CHECK()
 dnl
@@ -108,7 +100,7 @@ dnl  -pthreads         gcc (Solaris)
 dnl  -qthreaded        AIX cc V5
 dnl  -threads          gcc (HP-UX)
 dnl
-AC_DEFUN([PTHREADS_CHECK],[
+AC_DEFUN(PTHREADS_CHECK,[

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

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

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

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


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

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

 ])

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

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

@@ -89,21 +89,20 @@ fi
 ])


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

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

 AC_ARG_WITH(tsrm-pth,
-[  --with-tsrm-pth[=pth-config]
-                          Use GNU Pth.],[
+[  --with-tsrm-pth[=pth-config]    Use GNU Pth.],[
  TSRM_PTH=$withval
 ],[
  TSRM_PTH=no
 ])

 AC_ARG_WITH(tsrm-st,
-[  --with-tsrm-st          Use SGI's State Threads],[
+[  --with-tsrm-st],[
  TSRM_ST=$withval
 ],[
  TSRM_ST=no
@@ -3,7 +3,9 @@

 #define HAVE_UTIME 1

-/* Though we have alloca(), this seems to be causing some problem with the stack pointer -- hence not using it */
-/* #define HAVE_ALLOCA 1 */
+/* Though we have alloca(), this seems to be causing some problem
+ * with the stack pointer. Hence not using it
+ */
+/*#define HAVE_ALLOCA 1*/

 #endif
@@ -3,7 +3,6 @@

 #define HAVE_UTIME 1
 #define HAVE_ALLOCA 1
-#define HAVE_REALPATH 1

 #include <malloc.h>
 #include <stdlib.h>
@@ -10,7 +10,7 @@
 #elif defined(NETWARE)
 # include "tsrm_config.nw.h"
 #else
-# include <tsrm_config.h>
+# include "tsrm_config.h"
 # include <sys/param.h>
 #endif

@@ -22,10 +22,12 @@
 #ifndef __GNUC__
 # ifndef HAVE_ALLOCA_H
 #  ifdef _AIX
-#pragma alloca
+ #pragma alloca
 #  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
+#    ifndef NETWARE
 char *alloca ();
+#    endif
 #   endif
 #  endif
 # endif
@@ -42,8 +44,6 @@ char *alloca ();
 #ifndef MAXPATHLEN
 # ifdef PATH_MAX
 #  define MAXPATHLEN PATH_MAX
-# elif defined(MAX_PATH)
-#  define MAXPATHLEN MAX_PATH
 # else
 #  define MAXPATHLEN 256
 # endif
@@ -2,17 +2,18 @@
   +----------------------------------------------------------------------+
   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2008 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.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: Venkat Raghavan S <rvenkat@novell.com>                      |
+   |          Anantha Kesari H Y <hyanantha@novell.com>                   |
   +----------------------------------------------------------------------+
 */

@@ -39,8 +40,9 @@

 #include "mktemp.h"

-/* strtok() call in LibC is abending when used in a different address space -- hence using
-   PHP's version itself for now : Venkat (30/4/02) */
+/* strtok() call in LibC is abending when used in a different address space
+ * -- hence using PHP's version itself for now
+ */
 #include "tsrm_strtok_r.h"
 #define tsrm_strtok_r(a,b,c) strtok((a),(b))

@@ -50,211 +52,189 @@

 TSRM_API FILE* popen(const char *commandline, const char *type)
 {
-    char *command = NULL, *argv[MAX_ARGS] = {'\0'}, **env = NULL;
+	char *command = NULL, *argv[MAX_ARGS] = {'\0'}, **env = NULL;
 	char *tempName = "sys:/php/temp/phpXXXXXX.tmp";
-    char *filePath = NULL;
-    char *ptr = NULL;
-    int ptrLen = 0, argc = 0, i = 0, envCount = 0, err = 0;
+	char *filePath = NULL;
+	char *ptr = NULL;
+	int ptrLen = 0, argc = 0, i = 0, envCount = 0, err = 0;
 	FILE *stream = NULL;
 #if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-    int pipe_handle;
-    int mode = O_RDONLY;
+	int pipe_handle;
+	int mode = O_RDONLY;
 #else
-    NXHandle_t pipe_handle;
-    NXMode_t mode = NX_O_RDONLY;
+	NXHandle_t pipe_handle;
+	NXMode_t mode = NX_O_RDONLY;
 #endif
-    NXExecEnvSpec_t envSpec;
-    NXNameSpec_t nameSpec;
-    NXVmId_t newVM = 0;
+	NXExecEnvSpec_t envSpec;
+	NXNameSpec_t nameSpec;
+	NXVmId_t newVM = 0;

-    /* Check for validity of input parameters */
-    if (!commandline || !type)
-        return NULL;
+	/* Check for validity of input parameters */
+	if (!commandline || !type)
+		return NULL;

-    /* Get temporary file name */
-    filePath = mktemp(tempName);
-/*consoleprintf ("PHP | popen: file path = %s, mode = %s\n", filePath, type);*/
+	/* Get temporary file name */
+	filePath = mktemp(tempName);
 	if (!filePath)
 		return NULL;

-    /* Set pipe mode according to type -- for now allow only "r" or "w" */
-    if (strcmp(type, "r") == 0)
+	/* Set pipe mode according to type -- for now allow only "r" or "w" */
+	if (strcmp(type, "r") == 0)
 #if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-        mode = O_RDONLY;
+		mode = O_RDONLY;
 #else
-        mode = NX_O_RDONLY;
+		mode = NX_O_RDONLY;
 #endif
-    else if (strcmp(type, "w") == 0)
+	else if (strcmp(type, "w") == 0)
 #if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-        mode = O_WRONLY;
+		mode = O_WRONLY;
 #else
-        mode = NX_O_WRONLY;
+		mode = NX_O_WRONLY;
 #endif
-    else
-        return NULL;
+	else
+		return NULL;

 #ifdef USE_PIPE_OPEN
-    pipe_handle = pipe_open(filePath, mode);
-/*consoleprintf ("PHP | popen: pipe_open() returned %d\n", pipe_handle);*/
-    if (pipe_handle == -1)
-        return NULL;
+	pipe_handle = pipe_open(filePath, mode);
+	if (pipe_handle == -1)
+		return NULL;
 #elif defined(USE_MKFIFO)
-    pipe_handle = mkfifo(filePath, mode);
-consoleprintf ("PHP | popen: mkfifo() returned %d\n", pipe_handle);
-    if (pipe_handle == -1)
-        return NULL;
+	pipe_handle = mkfifo(filePath, mode);
+	if (pipe_handle == -1)
+		return NULL;
 #else
-    /*
-        - NetWare doesn't require first parameter
-        - Allowing LibC to choose the buffer size for now
-    */
-    err = NXFifoOpen(0, filePath, mode, 0, &pipe_handle);
-/*consoleprintf ("PHP | popen: NXFifoOpen() returned %d\n", err);*/
-    if (err)
-        return NULL;
+	/* - NetWare doesn't require first parameter
+	 * - Allowing LibC to choose the buffer size for now
+	 */
+	err = NXFifoOpen(0, filePath, mode, 0, &pipe_handle);
+	if (err)
+		return NULL;
 #endif

-    /* Copy the environment variables in preparation for the spawn call */
+	/* Copy the environment variables in preparation for the spawn call */
+	envCount = NXGetEnvCount() + 1;  /* add one for NULL */
+	env = (char **) NXMemAlloc(sizeof(char *) * envCount, 0);
+	if (!env)
+		return NULL;

-    envCount = NXGetEnvCount() + 1;  /* add one for NULL */
-    env = (char**)NXMemAlloc(sizeof(char*) * envCount, 0);
-    if (!env)
-        return NULL;
+	err = NXCopyEnv(env, envCount);
+	if (err) {
+		NXMemFree (env);
+		return NULL;
+	}

-    err = NXCopyEnv(env, envCount);
-consoleprintf ("PHP | popen: NXCopyEnv() returned %d\n", err);
-    if (err)
-    {
-        NXMemFree (env);
-        return NULL;
-    }
+	/* Separate commandline string into words */
+	ptr = tsrm_strtok_r((char*)commandline, WHITESPACE, NULL);
+	ptrLen = strlen(ptr);

-    /* Separate commandline string into words */
-consoleprintf ("PHP | popen: commandline = %s\n", commandline);
-    ptr = tsrm_strtok_r((char*)commandline, WHITESPACE, NULL);
-    ptrLen = strlen(ptr);
+	command = (char*)malloc(ptrLen + 1);
+	if (!command) {
+		NXMemFree (env);
+		return NULL;
+	}

-    command = (char*)malloc(ptrLen + 1);
-    if (!command)
-    {
-        NXMemFree (env);
-        return NULL;
-    }
+	strcpy (command, ptr);

-    strcpy (command, ptr);
+	ptr = tsrm_strtok_r(NULL, WHITESPACE, NULL);
+	while (ptr && (argc < MAX_ARGS)) {
+		ptrLen = strlen(ptr);

-    ptr = tsrm_strtok_r(NULL, WHITESPACE, NULL);
-    while (ptr && (argc < MAX_ARGS))
-    {
-        ptrLen = strlen(ptr);
+		argv[argc] = (char*)malloc(ptrLen + 1);
+		if (!argv[argc]) {
+			NXMemFree (env);
+			if (command)
+				free (command);

-        argv[argc] = (char*)malloc(ptrLen + 1);
-        if (!argv[argc])
-        {
-            NXMemFree (env);
+			for (i = 0; i < argc; i++) {
+				if (argv[i])
+					free (argv[i]);
+			}

-            if (command)
-                free (command);
+			return NULL;
+		}

-            for (i = 0; i < argc; i++)
-            {
-                if (argv[i])
-                free (argv[i]);
-            }
+		strcpy (argv[argc], ptr);
+		argc++;
+		ptr = tsrm_strtok_r(NULL, WHITESPACE, NULL);
+	}

-            return NULL;
-        }
+	/* Setup the execution environment and spawn new process */
+	envSpec.esFlags = 0;    /* Not used */
+	envSpec.esArgc = argc;
+	envSpec.esArgv = (void **) argv;
+	envSpec.esEnv = (void **) env;

-        strcpy (argv[argc], ptr);
+/*	envSpec.esStdin.ssType = */
+	envSpec.esStdout.ssType = NX_OBJ_FIFO;
+	envSpec.esStderr.ssType = NX_OBJ_FILE;

-        argc++;
-
-        ptr = tsrm_strtok_r(NULL, WHITESPACE, NULL);
-    }
-consoleprintf ("PHP | popen: commandline string parsed into tokens\n");
-    /* Setup the execution environment and spawn new process */
-
-    envSpec.esFlags = 0;    /* Not used */
-    envSpec.esArgc = argc;
-    envSpec.esArgv = (void**)argv;
-    envSpec.esEnv = (void**)env;
-
-    envSpec.esStdin.ssType =
-    envSpec.esStdout.ssType = NX_OBJ_FIFO;
-    envSpec.esStderr.ssType = NX_OBJ_FILE;
+	/* 'ssHandle' is not a struct/union/class member */
 /*
-    envSpec.esStdin.ssHandle =
-    envSpec.esStdout.ssHandle =
-    envSpec.esStderr.ssHandle = -1;
+	envSpec.esStdin.ssHandle =
+	envSpec.esStdout.ssHandle =
+	envSpec.esStderr.ssHandle = -1;
 */
-    envSpec.esStdin.ssPathCtx =
-    envSpec.esStdout.ssPathCtx =
-    envSpec.esStderr.ssPathCtx = NULL;
+	envSpec.esStdin.ssPathCtx = NULL;
+	envSpec.esStdout.ssPathCtx = NULL;
+	envSpec.esStderr.ssPathCtx = NULL;

 #if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-    if (mode == O_RDONLY)
+	if (mode == O_RDONLY) {
 #else
-    if (mode == NX_O_RDONLY)
+	if (mode == NX_O_RDONLY) {
 #endif
-    {
-        envSpec.esStdin.ssPath = filePath;
-        envSpec.esStdout.ssPath = stdout;
-    }
-    else /* Write Only */
-    {
-        envSpec.esStdin.ssPath = stdin;
-        envSpec.esStdout.ssPath = filePath;
-    }
+		envSpec.esStdin.ssPath = filePath;
+		envSpec.esStdout.ssPath = stdout;
+	} else { /* Write Only */
+		envSpec.esStdin.ssPath = stdin;
+		envSpec.esStdout.ssPath = filePath;
+	}

-    envSpec.esStderr.ssPath = stdout;
+	envSpec.esStderr.ssPath = stdout;

-    nameSpec.ssType = NX_OBJ_FIFO;
-/*    nameSpec.ssHandle = 0; */ /* Not used */
-    nameSpec.ssPathCtx = NULL;  /* Not used */
-    nameSpec.ssPath = argv[0];
-consoleprintf ("PHP | popen: environment setup\n");
-    err = NXVmSpawn(&nameSpec, &envSpec, 0, &newVM);
-consoleprintf ("PHP | popen: NXVmSpawn() returned %d\n", err);
-    if (!err)
-        /* Get file pointer corresponding to the pipe (file) opened */
-        stream = fdopen(pipe_handle, type);
+	nameSpec.ssType = NX_OBJ_FIFO;
+/*	nameSpec.ssHandle = 0; */	/* 'ssHandle' is not a struct/union/class member */
+	nameSpec.ssPathCtx = NULL;  /* Not used */
+	nameSpec.ssPath = argv[0];
+	err = NXVmSpawn(&nameSpec, &envSpec, 0, &newVM);
+	if (!err)
+		/* Get file pointer corresponding to the pipe (file) opened */
+		stream = fdopen(pipe_handle, type);

-    /* Clean-up */
+	/* Clean-up */
+	if (env)
+		NXMemFree (env);

-    if (env)
-        NXMemFree (env);
-
-    if (pipe_handle)
+	if (pipe_handle)
 #if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-        close(pipe_handle);
+		close(pipe_handle);
 #else
-        NXClose(pipe_handle);
+		NXClose(pipe_handle);
 #endif

-    if (command)
-        free (command);
+	if (command)
+		free (command);

-    for (i = 0; i < argc; i++)
-    {
-        if (argv[i])
-            free (argv[i]);
-    }
-consoleprintf ("PHP | popen: all clean-up done, returning...\n");
-    return stream;
+	for (i = 0; i < argc; i++) {
+		if (argv[i])
+			free (argv[i]);
+	}
+
+	return stream;
 }

 TSRM_API int pclose(FILE* stream)
 {
-    int err = 0;
-    NXHandle_t fd = 0;
+	int err = 0;
+	NXHandle_t fd = 0;

-    /* Get the process associated with this pipe (file) handle and terminate it */
-    fd = fileno(stream);
-    NXClose (fd);
+	/* Get the process associated with this pipe (file) handle and terminate it */
+	fd = fileno(stream);
+	NXClose (fd);

-    err = fclose(stream);
+	err = fclose(stream);

-    return err;
+	return err;
 }

-#endif
+#endif	/* NETWARE */
@@ -2,17 +2,18 @@
   +----------------------------------------------------------------------+
   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2008 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.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: Venkat Raghavan S <rvenkat@novell.com>                      |
+   |          Anantha Kesari H Y <hyanantha@novell.com>                   |
   +----------------------------------------------------------------------+
 */

@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2008 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.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.               |
@@ -37,7 +37,8 @@
 #endif

 #ifdef NETWARE
-#include <fsio.h>
+/*#include "pipe.h"*/
+#include "tsrm_nw.h"
 #endif

 #ifndef HAVE_REALPATH
@@ -48,7 +49,7 @@

 #include "TSRM.h"

-/* Only need mutex for popen() in Windows and NetWare, because it doesn't chdir() on UNIX */
+/* Only need mutex for popen() in Windows and NetWare because it doesn't chdir() on UNIX */
 #if (defined(TSRM_WIN32) || defined(NETWARE)) && defined(ZTS)
 MUTEX_T cwd_mutex;
 #endif
@@ -136,9 +137,15 @@ static int php_check_dots(const char *element, int n)
 	
 static int php_is_dir_ok(const cwd_state *state) 
 {
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 	struct stat buf;

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

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

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

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

 	return (1);
@@ -183,20 +196,8 @@ CWD_API void virtual_cwd_startup(void)
 {
 	char cwd[MAXPATHLEN];
 	char *result;
-#ifdef NETWARE
-	result = getcwdpath(cwd, NULL, 1);
-	if(result)
-	{
-		char *c=cwd;
-		while(c = strchr(c, '\\'))
-		{
-			*c='/';
-			++c;
-		}
-	}
-#else
-	result = getcwd(cwd, sizeof(cwd));
-#endif
+
+	result = getcwd(cwd, sizeof(cwd));	
 	if (!result) {
 		cwd[0] = '\0';
 	}
@@ -300,22 +301,15 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func

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

 #if !defined(TSRM_WIN32) && !defined(NETWARE)
 	/* cwd_length can be 0 when getcwd() fails.
 	 * This can happen under solaris when a dir does not have read permissions
 	 * but *does* have execute permissions */
 	if (IS_ABSOLUTE_PATH(path, path_length) || (state->cwd_length < 1)) {
-		if (use_realpath) {
-			if (realpath(path, resolved_path)) {
-				path = resolved_path;
-				path_length = strlen(path);
-			} else {
-				/* disable for now
-				return 1; */
-			}
+		if (use_realpath && realpath(path, resolved_path)) {
+			path = resolved_path;
+			path_length = strlen(path);
 		}
 	} else { /* Concat current directory with relative path and then run realpath() on it */
 		char *tmp;
@@ -331,19 +325,9 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 		memcpy(ptr, path, path_length);
 		ptr += path_length;
 		*ptr = '\0';
-		if (strlen(tmp) >= MAXPATHLEN) {
-			free(tmp);
-			return 1;
-		}
-		if (use_realpath) {
-			if (realpath(tmp, resolved_path)) {
-				path = resolved_path;
-				path_length = strlen(path);
-			} else {
-				/* disable for now
-				free(tmp);
-				return 1; */
-			}
+		if (use_realpath && realpath(tmp, resolved_path)) {
+			path = resolved_path;
+			path_length = strlen(path);
 		}
 		free(tmp);
 	}
@@ -359,9 +343,6 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
        copy_amount = COPY_WHEN_ABSOLUTE(path_copy);
 		is_absolute = 1;
 #ifdef TSRM_WIN32
-	} else if (IS_UNC_PATH(path_copy, path_length)) {
-		copy_amount = 2;
-		is_absolute = 1;
 	} else if (IS_SLASH(path_copy[0])) {
 		copy_amount = 2;
 #endif
@@ -417,20 +398,8 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
 				}
 #elif defined(NETWARE)
-				/* 
-					Below code keeps appending to state->cwd a File system seperator
-					cases where this appending should not happen is given below,
-					a) sys: should just be left as it is
-					b) sys:system should just be left as it is,
-					Colon is allowed only in the first token as volume names alone can have the : in their names.
-					Files and Directories cannot have : in their names
-					So the check goes like this,
-					For second token and above simply append the DEFAULT_SLASH to the state->cwd.
-					For first token check for the existence of : 
-					if it exists don't append the DEFAULT_SLASH to the state->cwd.
-				*/
-				if(((state->cwd_length == 0) && (strchr(ptr, ':') == NULL)) || (state->cwd_length > 0))
-				{
+				/* If the token is a volume name, it will have colon at the end -- so, no slash before it */
+				if (ptr[ptr_length-1] != ':') {
 					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
 				}
 #else
@@ -570,7 +539,6 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC)
 	return f;
 }

-#if !defined(TSRM_WIN32)
 CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC)
 {
 	cwd_state new_state;
@@ -579,13 +547,16 @@ CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC)
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
 	virtual_file_ex(&new_state, pathname, NULL, 1);

+#if defined(TSRM_WIN32)
+	ret = tsrm_win32_access(new_state.cwd, mode);
+#else
 	ret = access(new_state.cwd, mode);
+#endif
 	
 	CWD_STATE_FREE(&new_state);
 	
 	return ret;
 }
-#endif


 #if HAVE_UTIME
@@ -694,23 +665,37 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC)
 	return retval;
 }

+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC)
 {
 	cwd_state new_state;
 	int retval;

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

 	retval = stat(new_state.cwd, buf);

 	CWD_STATE_FREE(&new_state);
 	return retval;
 }
+#else
+CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC)
+{
+	cwd_state new_state;
+	int retval;

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

 	command_length = strlen(command);

-	dir_length = CWDG(cwd).cwd_length;
-	dir = CWDG(cwd).cwd;
-	while (dir_length > 0) {
-		if (*dir == '\'') extra+=3;
-		dir++;
-		dir_length--;
-	}
-	dir_length = CWDG(cwd).cwd_length;
-	dir = CWDG(cwd).cwd;
-
-	ptr = command_line = (char *) malloc(command_length + sizeof("cd '' ; ") + dir_length +extra+1+1);
+	ptr = command_line = (char *) malloc(command_length + sizeof("cd  ; ") + CWDG(cwd).cwd_length+1);
 	if (!command_line) {
 		return NULL;
 	}
@@ -859,21 +833,8 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 	if (CWDG(cwd).cwd_length == 0) {
 		*ptr++ = DEFAULT_SLASH;
 	} else {
-		*ptr++ = '\'';
-		while (dir_length > 0) {
-			switch (*dir) {
-			case '\'':
-				*ptr++ = '\'';
-				*ptr++ = '\\';
-				*ptr++ = '\'';
-				/* fall-through */
-			default:
-				*ptr++ = *dir;
-			}
-			dir++;
-			dir_length--;
-		}
-		*ptr++ = '\'';
+		memcpy(ptr, CWDG(cwd).cwd, CWDG(cwd).cwd_length);
+		ptr += CWDG(cwd).cwd_length;
 	}
 	
 	*ptr++ = ' ';
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2008 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.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.               |
@@ -41,10 +41,6 @@
 #include <unistd.h>
 #endif

-#if defined(__osf__) || defined(_AIX)
-#include <errno.h>
-#endif
-
 #ifdef TSRM_WIN32
 #include "readdir.h"
 #include <sys/utime.h>
@@ -57,9 +53,8 @@ typedef unsigned short mode_t;
 #define IS_SLASH_P(c)	(*(c) == '/' || \
        (*(c) == '\\' && !IsDBCSLeadByte(*(c-1))))

-/* COPY_WHEN_ABSOLUTE also takes path as argument because netware needs it
- * to account for volume name that is unique to NetWare absolute paths
- */
+/* COPY_WHEN_ABSOLUTE is 2 under Win32 because by chance both regular absolute paths
+   in the file system and UNC paths need copying of two characters */
 #define COPY_WHEN_ABSOLUTE(path) 2
 #define IS_UNC_PATH(path, len) \
 	(len >= 2 && IS_SLASH(path[0]) && IS_SLASH(path[1]))
@@ -75,9 +70,10 @@ typedef unsigned short mode_t;
 #define DEFAULT_DIR_SEPARATOR	';'
 #define IS_SLASH(c)	((c) == '/' || (c) == '\\')
 #define IS_SLASH_P(c)	IS_SLASH(*(c))
-/* Colon indicates volume name, either first character should be forward slash or backward slash */
+#define COPY_WHEN_ABSOLUTE(path) \
+    (strchr(path, ':') - path + 1)  /* Take the volume name which ends with a colon */
 #define IS_ABSOLUTE_PATH(path, len) \
-    ((strchr(path, ':') != NULL) || ((len >= 1) && ((path[0] == '/') || (path[0] == '\\'))))
+    (strchr(path, ':') != NULL) /* Colon indicates volume name */

 #else
 #ifdef HAVE_DIRENT_H
@@ -141,7 +137,11 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC);
 CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...);
 CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC);
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC);
+#else
+CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC);
+#endif
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC);
 #endif
@@ -150,28 +150,21 @@ CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC);
 CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC);
 CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC);
-
-#if !defined(TSRM_WIN32)
 CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC);
+#if defined(TSRM_WIN32)
+/* these are not defined in win32 headers */
+#ifndef W_OK
+#define W_OK 0x02
+#endif
+#ifndef R_OK
+#define R_OK 0x04
+#endif
+#ifndef X_OK
+#define X_OK 0x01
+#endif
+#ifndef F_OK
+#define F_OK 0x00
 #endif
-
-/* On AIX & Tru64 when a file does not exist realpath() returns
- * NULL, and sets errno to ENOENT. Unlike in other libc implementations
- * the destination is not filled and remains undefined. Therefor, we
- * must populate it manually using strcpy as done on systems with no
- * realpath() function.
- */
-#if defined(__osf__) || defined(_AIX)
-static char *php_realpath_hack(char *src, char *dest)
-{
-	char *ret;
-
-	if ((ret = realpath(src, dest)) == NULL && errno == ENOENT) {
-		return strcpy(dest, src);
-	} else {
-		return ret;
-	}
-}
 #endif

 #if HAVE_UTIME
@@ -213,7 +206,7 @@ typedef struct _virtual_cwd_globals {
 #define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path TSRMLS_CC)
 #define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
 #define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
-#ifndef TSRM_WIN32 
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 #define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
 #endif
 #define VCWD_UNLINK(path) virtual_unlink(path TSRMLS_CC)
@@ -248,14 +241,14 @@ typedef struct _virtual_cwd_globals {
 #define VCWD_RMDIR(pathname) rmdir(pathname)
 #define VCWD_OPENDIR(pathname) opendir(pathname)
 #define VCWD_POPEN(command, type) popen(command, type)
+#if defined(TSRM_WIN32)
+#define VCWD_ACCESS(pathname, mode) tsrm_win32_access(pathname, mode)
+#else
 #define VCWD_ACCESS(pathname, mode) access(pathname, mode)
+#endif

 #ifdef HAVE_REALPATH
-#if defined(__osf__) || defined(_AIX)
-#define VCWD_REALPATH(path, real_path) php_realpath_hack(path, real_path)
-#else
 #define VCWD_REALPATH(path, real_path) realpath(path, real_path)
-#endif
 #else
 #define VCWD_REALPATH(path, real_path) strcpy(real_path, path)
 #endif
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2008 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.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.               |
@@ -24,6 +24,8 @@
 #include <process.h>
 #include <time.h>

+#define TSRM_INCLUDE_FULL_WINDOWS_HEADERS
+
 #include "TSRM.h"

 #ifdef TSRM_WIN32
@@ -81,6 +83,19 @@ TSRM_API void tsrm_win32_shutdown(void)
 #endif
 }

+TSRM_API int tsrm_win32_access(const char *pathname, int mode)
+{
+	SHFILEINFO sfi;
+
+	if (mode == 1 /*X_OK*/) {
+		return access(pathname, 0) == 0 && 
+			SHGetFileInfo(pathname, 0, &sfi, sizeof(SHFILEINFO), SHGFI_EXETYPE) != 0 ? 0 : -1;
+	} else {
+		return access(pathname, mode);
+	}
+}
+
+
 static process_pair *process_get(FILE *stream TSRMLS_DC)
 {
 	process_pair *ptr;
@@ -359,13 +374,4 @@ TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf) {
 			return -1;
 	}
 }
-
-TSRM_API char *realpath(char *orig_path, char *buffer)
-{
-	int ret = GetFullPathName(orig_path, _MAX_PATH, buffer, NULL);
-	if(!ret || ret > _MAX_PATH) {
-		return NULL;
-	}
-	return buffer;
-}
-#endif
+#endif
@@ -2,12 +2,12 @@
   +----------------------------------------------------------------------+
   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2008 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 3.0 of the PHP license,       |
   | that is bundled with this package in the file LICENSE, and is        |
   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | http://www.php.net/license/3_0.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.               |
@@ -95,11 +95,11 @@ TSRM_API void tsrm_win32_shutdown(void);
 TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env);
 TSRM_API FILE *popen(const char *command, const char *type);
 TSRM_API int pclose(FILE *stream);
+TSRM_API int tsrm_win32_access(const char *pathname, int mode);

 TSRM_API int shmget(int key, int size, int flags);
 TSRM_API void *shmat(int key, const void *shmaddr, int flags);
 TSRM_API int shmdt(const void *shmaddr);
 TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf);

-TSRM_API char *realpath(char *orig_path, char *buffer);
 #endif
@@ -0,0 +1,186 @@
+// $Header$
+
+// FlexLexer.h -- define interfaces for lexical analyzer classes generated
+//		  by flex
+
+// Copyright (c) 1993 The Regents of the University of California.
+// All rights reserved.
+//
+// This code is derived from software contributed to Berkeley by
+// Kent Williams and Tom Epperly.
+//
+// Redistribution and use in source and binary forms with or without
+// modification are permitted provided that: (1) source distributions retain
+// this entire copyright notice and comment, and (2) distributions including
+// binaries display the following acknowledgement:  ``This product includes
+// software developed by the University of California, Berkeley and its
+// contributors'' in the documentation or other materials provided with the
+// distribution and in all advertising materials mentioning features or use
+// of this software.  Neither the name of the University nor the names of
+// its contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+// This file defines FlexLexer, an abstract class which specifies the
+// external interface provided to flex C++ lexer objects, and yyFlexLexer,
+// which defines a particular lexer class.
+//
+// If you want to create multiple lexer classes, you use the -P flag
+// to rename each yyFlexLexer to some other xxFlexLexer.  You then
+// include <FlexLexer.h> in your other sources once per lexer class:
+//
+//	#undef yyFlexLexer
+//	#define yyFlexLexer xxFlexLexer
+//	#include <FlexLexer.h>
+//
+//	#undef yyFlexLexer
+//	#define yyFlexLexer zzFlexLexer
+//	#include <FlexLexer.h>
+//	...
+
+#ifndef FLEXLEXER_H
+// Never included before - need to define base class.
+#define FLEXLEXER_H
+#include <iostream.h>
+
+extern "C++" {
+
+struct yy_buffer_state;
+typedef int yy_state_type;
+
+class FlexLexer {
+public:
+	virtual ~FlexLexer()	{ }
+
+	const char* YYText()	{ return yytext; }
+	int YYLeng()		{ return yyleng; }
+
+	virtual void
+		yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
+	virtual struct yy_buffer_state*
+		yy_create_buffer( istream* s, int size ) = 0;
+	virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
+	virtual void yyrestart( istream* s ) = 0;
+
+	virtual int yylex() = 0;
+
+	// Call yylex with new input/output sources.
+	int yylex( istream* new_in, ostream* new_out = 0 )
+		{
+		switch_streams( new_in, new_out );
+		return yylex();
+		}
+
+	// Switch to new input/output streams.  A nil stream pointer
+	// indicates "keep the current one".
+	virtual void switch_streams( istream* new_in = 0,
+					ostream* new_out = 0 ) = 0;
+
+	int lineno() const		{ return yylineno; }
+
+	int debug() const		{ return yy_flex_debug; }
+	void set_debug( int flag )	{ yy_flex_debug = flag; }
+
+protected:
+	char* yytext;
+	int yyleng;
+	int yylineno;		// only maintained if you use %option yylineno
+	int yy_flex_debug;	// only has effect with -d or "%option debug"
+};
+
+}
+#endif
+
+#if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
+// Either this is the first time through (yyFlexLexerOnce not defined),
+// or this is a repeated include to define a different flavor of
+// yyFlexLexer, as discussed in the flex man page.
+#define yyFlexLexerOnce
+
+class yyFlexLexer : public FlexLexer {
+public:
+	// arg_yyin and arg_yyout default to the cin and cout, but we
+	// only make that assignment when initializing in yylex().
+	yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 );
+
+	virtual ~yyFlexLexer();
+
+	void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
+	struct yy_buffer_state* yy_create_buffer( istream* s, int size );
+	void yy_delete_buffer( struct yy_buffer_state* b );
+	void yyrestart( istream* s );
+
+	virtual int yylex();
+	virtual void switch_streams( istream* new_in, ostream* new_out );
+
+protected:
+	virtual int LexerInput( char* buf, int max_size );
+	virtual void LexerOutput( const char* buf, int size );
+	virtual void LexerError( const char* msg );
+
+	void yyunput( int c, char* buf_ptr );
+	int yyinput();
+
+	void yy_load_buffer_state();
+	void yy_init_buffer( struct yy_buffer_state* b, istream* s );
+	void yy_flush_buffer( struct yy_buffer_state* b );
+
+	int yy_start_stack_ptr;
+	int yy_start_stack_depth;
+	int* yy_start_stack;
+
+	void yy_push_state( int new_state );
+	void yy_pop_state();
+	int yy_top_state();
+
+	yy_state_type yy_get_previous_state();
+	yy_state_type yy_try_NUL_trans( yy_state_type current_state );
+	int yy_get_next_buffer();
+
+	istream* yyin;	// input source for default LexerInput
+	ostream* yyout;	// output sink for default LexerOutput
+
+	struct yy_buffer_state* yy_current_buffer;
+
+	// yy_hold_char holds the character lost when yytext is formed.
+	char yy_hold_char;
+
+	// Number of characters read into yy_ch_buf.
+	int yy_n_chars;
+
+	// Points to current character in buffer.
+	char* yy_c_buf_p;
+
+	int yy_init;		// whether we need to initialize
+	int yy_start;		// start state number
+
+	// Flag which is used to allow yywrap()'s to do buffer switches
+	// instead of setting up a fresh yyin.  A bit of a hack ...
+	int yy_did_buffer_switch_on_eof;
+
+	// The following are not always needed, but may be depending
+	// on use of certain flex features (like REJECT or yymore()).
+
+	yy_state_type yy_last_accepting_state;
+	char* yy_last_accepting_cpos;
+
+	yy_state_type* yy_state_buf;
+	yy_state_type* yy_state_ptr;
+
+	char* yy_full_match;
+	int* yy_full_state;
+	int yy_full_lp;
+
+	int yy_lp;
+	int yy_looking_for_trail_begin;
+
+	int yy_more_flag;
+	int yy_more_len;
+	int yy_more_offset;
+	int yy_prev_more_offset;
+};
+
+#endif
@@ -0,0 +1,56 @@
+-------------------------------------------------------------------- 
+                The Zend Engine License, Version 2.00
+Copyright (c) 1999-2003 Zend Technologies Ltd. All rights reserved.
+-------------------------------------------------------------------- 
+
+Redistribution and use in source and binary forms, with or without
+modification, is permitted provided that the following conditions
+are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer. 
+ 
+  2. Redistributions in binary form must reproduce the above 
+     copyright notice, this list of conditions and the following 
+     disclaimer in the documentation and/or other materials provided
+     with the distribution.
+ 
+  3. The names "Zend" and "Zend Engine" must not be used to endorse
+     or promote products derived from this software without prior
+     permission from Zend Technologies Ltd. For written permission,
+     please contact license@zend.com. 
+ 
+  4. Zend Technologies Ltd. may publish revised and/or new versions
+     of the license from time to time. Each version will be given a
+     distinguishing version number.
+     Once covered code has been published under a particular version
+     of the license, you may always continue to use it under the
+     terms of that version. You may also choose to use such covered
+     code under the terms of any subsequent version of the license
+     published by Zend Technologies Ltd. No one other than Zend
+     Technologies Ltd. has the right to modify the terms applicable
+     to covered code created under this License.
+
+  5. Redistributions of any form whatsoever must retain the following
+     acknowledgment:
+     "This product includes the Zend Engine, freely available at
+     http://www.zend.com"
+
+  6. All advertising materials mentioning features or use of this
+     software must display the following acknowledgment:
+     "The Zend Engine is freely available at http://www.zend.com"
+
+THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND 
+ANY EXPRESSED 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 ZEND
+TECHNOLOGIES LTD.  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.
+
+-------------------------------------------------------------------- 
@@ -0,0 +1,52 @@
+## Process this file with automake to produce Makefile.in -*- makefile -*-
+
+#CLEANFILES = zend_language_parser.c zend_language_parser.h zend_language_scanner.c zend_language_parser.output zend_ini_parser.c zend_ini_parser.h zend_ini_scanner.c zend_ini_parser.output
+
+AUTOMAKE_OPTIONS=foreign
+noinst_LTLIBRARIES=libZend.la
+
+libZend_la_SOURCES=\
+	zend_language_parser.y zend_language_scanner.l \
+	zend_ini_parser.y zend_ini_scanner.l \
+	zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
+	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
+	zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
+	zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
+	zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
+	zend_objects_API.c zend_ts_hash.c zend_stream.c zend_mm.c \
+	zend_default_classes.c zend_reflection_api.c
+
+libZend_la_LDFLAGS =
+libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
+
+# automake isn't too clever about "non-standard" use of lex and yacc
+
+$(libZend_la_OBJECTS): zend_language_parser.h
+
+zend_ini_scanner.lo: zend_ini_parser.h
+
+# Language parser/scanner rules
+
+zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
+	$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l
+
+zend_language_parser.h: zend_language_parser.c
+zend_language_parser.c: $(srcdir)/zend_language_parser.y
+	$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o zend_language_parser.c
+
+# INI parser/scanner rules
+
+zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
+	$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c
+
+zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
+	$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l
+
+zend_ini_parser.h: zend_ini_parser.c
+
+depend:
+
+zend_execute.lo: $(srcdir)/zend_execute.c
+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(INLINE_CFLAGS) -c $(srcdir)/zend_execute.c
+
@@ -0,0 +1,195 @@
+Creating an object
+------------------
+
+Object can be created in the following ways:
+
+1. As a result of a function call. E.g.:
+
+$foo = create_new_foo("parameter");
+$foo->run();
+
+The function should create a new zval, create new object and get the
+handle for it, set handle and handler table as needed. Note that the
+handle is the only ID of the object, so it should be enough to
+identify it.
+
+2. Overriding create_object handler for class. E.g.:
+
+$foo = new Java("some.Class.here", "parameter");
+$foo->run();
+
+The  create_object handler function should create a new zval, create
+new object and get the handle for it, set handle and handler table as
+needed, and also provide constructor method that would handle
+constructor call. The get_constructor handler table entry should be
+used for that. Do not rely class entry's constructor, unless you refer
+to it from get_constructor handler.
+
+Object maintenance
+------------------
+
+The handlers add_ref and del_ref are called when a new zval referring
+to the object is created. This does not create a new object - both
+zvals still refer to the same object.
+
+clone_obj handler should create a new object, identical to an old one, 
+but being a separate entity.
+
+delete_obj should destroy an object, all references to it become
+invalid.
+
+Object access - read
+--------------------
+
+read_property is used to read object's property. This value is not
+meant to be changed. The handler returns zval * with the value.
+
+Object access - write
+---------------------
+
+write_property is used to directly write object's property by
+name.  This handler is used to assign property variables or to change them 
+in operations like += or ++ (unless get_property_zval_ptr is also set).
+
+get_property_zval_ptr is used to obtain pointer to modifyable zval for 
+operations like += or ++. This should be used only if your object model 
+stores properties as real zval's that can be modified from outside. 
+Otherwise this handler should be NULL and the engine will use 
+read_property and write_property instead.
+
+get_property_ptr is used to obtain zval ** for future writing to
+it. If your object properties are stored as zval*, return real place
+where the property is stored. If the aren't, the best way is to create 
+proxy object and handle it via get and set methods (see below). 
+This method is meant to be used for send-by-reference and assign-by-reference
+use of object properties. If you don;t want to implement property
+referencing for your objects, you can set this handler to NULL. 
+
+get and set handlers are used when engine needs to access the object
+as a value. E.g., in the following situation:
+
+$foo =& $obj->bar;
+$foo = 1;
+
+if $foo is an object (e.g., proxy object from get_property_ptr) it
+would be accessed using write handler.
+
+Object access - method call
+---------------------------
+
+get_method handler is used to find method description by name. It
+should set right type, function name and parameter mask for the
+method. If the type is ZEND_OVERLOADED_FUNCTION, the method would be
+called via call_method handler, otherwise it would be called with
+standard Zend means.
+
+get_constructor performs the same function as get_method, but for the
+object constructor. 
+
+call_method handler is used to perform method call. Parameters are
+passed like to any other Zend internal function. 
+
+Object - comparison
+-------------------
+
+Objects can be compared via compare_objects handler. This is used with 
+== operation, === compares objects by handles, i.e., return true if
+and only if it's really the same object. Note that objects from
+different object types (i.e., having different handlers) can not be
+compared. 
+
+Objects - reflection
+--------------------
+
+get_class_name is used to retrieve class name of the object. 
+get_class_entry returns class entry (zend_class_entry) for the object,
+in case there exists PHP class for it.
+No other reflection functions are currently implemented.
+
+Objects - data structures and handlers
+---------------------------------------
+
+The object is represented by the following structure:
+
+struct _zend_object_value {
+	zend_object_handle handle;
+	zend_object_handlers *handlers;
+};
+
+handle is an ID of the object among the objects of the same type (not
+class!). The type of the object and how it behaves is determined by
+the handler table.
+
+typedef struct _zend_object_handlers {
+	zend_object_add_ref_t                    add_ref;
+	zend_object_del_ref_t                    del_ref;
+	zend_object_delete_obj_t                 delete_obj;
+	zend_object_clone_obj_t                  clone_obj;	
+	zend_object_read_property_t              read_property;
+	zend_object_write_property_t             write_property;
+	zend_object_get_property_ptr_t           get_property_ptr;
+	zend_object_get_property_zval_ptr_t      get_property_zval_ptr;
+	zend_object_get_t                        get;
+	zend_object_set_t                        set;
+	zend_object_has_property_t               has_property;
+	zend_object_unset_property_t             unset_property;
+	zend_object_get_properties_t             get_properties;
+	zend_object_get_method_t                 get_method;
+	zend_object_call_method_t                call_method;
+	zend_object_get_constructor_t            get_constructor;
+	zend_object_get_class_entry_t            get_class_entry;
+	zend_object_get_class_name_t             get_class_name;
+	zend_object_compare_t                    compare_objects;
+} zend_object_handlers;
+
+See zend_object_handlers.h for prototypes. All objects are passed as zval's.
+
+Handlers explained:
+
+add_ref - called when a copy of the object handle is created.
+
+del_ref - called when a copy of the object handle is destroyed.
+
+delete_obj - called when an object needs to be destroyed.
+
+clone_obj - called when a new object identical to an old one should be 
+created (unlike Zend Engine 1, this never happens unless explicitly
+asked for).
+
+read_property - returns zval *, containing the value of the
+property. Is used when value of the property should be retrieved for
+reading.
+
+write_property - assigns value to certain property of the object. 
+
+get_property_zval_ptr - retrieves zval** for being directly modified by 
+the engine. If your properties are not zval's, don't define it.
+
+get_property_ptr - retrieves zval** for the property of the value, to
+be used for read and write. If object properties are not zval's
+natively, this method should create and return proxy object for use
+with get and set methods.
+
+get - retrieves zval* for object contents. To be used mainly with
+proxy objects from get_property_ptr, but also may be used for
+convert_to_* functions.
+
+set - sets value for object contents. To be used mainly with
+proxy objects from get_property_ptr.
+
+has_property - checks if the object has certain property set.
+
+unset_property - removes value for the property of the object
+
+get_method - retrieves description of the method
+
+call_method - calls the method (parameters should be put on stack like 
+for any other PHP internal function).
+
+get_constructor - get description for the object constructor method
+
+get_class_entry - should return the class entry for the object
+
+get_class_name - get the name of the class the object belongs to
+
+compare_objects - compares if two objects are equal
@@ -0,0 +1,136 @@
+Revamped object model using object handles
+===========================================
+
+Background
+----------
+
+In the Zend Engine 1.0 (and its predecessor the PHP 3 scripting
+engine) the object model's design is that instantiated objects are
+language values. This means that when programmers are performing
+operations, such variable assignment and passing parameters to
+functions, objects are handled very similarly to the way other
+primitive types are handled such as integers and strings.
+Semantically this means that the whole object is being copied. The
+approach Java takes is different where one refers to objects by handle
+and not by value (one can think of a handle as an objects' ID).
+
+Need
+----
+
+Unfortunately, the approach taken up to now has severely limited the
+Zend Engine's object oriented model, both feature and simplicity
+wise. One of the main problems with the former approach is that object
+instantiation and duplication is very hard to control, a problem which
+can not only lead to inefficient development but also often to strange
+run-time behavior. Changing the object model to a handle oriented
+model will allow the addressing of many needs such as destructors,
+de-referencing method return values, tight control of object
+duplication and more.
+
+Overview
+--------
+
+The proposed object model is very much influenced by the Java
+model. In general, when you create a new object you will be getting a
+handle to the object instead of the object itself. When this handle is
+sent to functions, assigned and copied it is only the handle which is
+copied/sent/assigned. The object itself is never copied nor
+duplicated. This results in all handles of this object to always point
+at the same object making it a very consistent solution and saving
+unnecessary duplication and confusing behavior.
+
+Functionality
+-------------
+
+After this change the basic use of objects will be almost identical to
+previous versions of the scripting engine.  However, you won't bump
+into awkward and confusing copying & destructing of objects.  In order
+to create and use a new object instance you will do the following:
+$object = new MyClass(); $object->method();
+
+The previous code will assign $object the handle of a new instance of
+the class MyClass and call one of its methods.
+
+ 
+Consider the following code:
+
+1	class MyClass
+2	{
+3		function setMember($value)
+4		{
+5			$this->member = $value;
+6		}
+7	
+8		function getMember()
+9		{
+10			return $this->member;
+11		}
+12	}
+13	
+14	function foo($obj)
+15	{
+16		$obj->setMember("foo");
+17	}
+18	
+19	$object = new MyClass();
+20	$object->setMember("bar");
+21	foo($object);
+22	print $object->getMember();
+
+Without the new Java-like handles, at line 20 the objects' data member
+member is set to the string value of "bar".  Because of the internal
+representation of objects in the Zend Engine 1.0, the object is marked
+as a reference, and when it is sent by value to the function foo, it
+is duplicated (!).  Therefore, the call to foo() on line 21 will
+result in the $obj->setMember("foo") call being called on a duplicate
+of $object. Line 22 will then result in "bar" being printed.
+
+This is how the scripting engine has worked until today. Most
+developers are probably unaware of the fact that they aren't always
+talking to the same object but often duplicates; others may have
+realized this can usually be solved by always passing objects by
+reference (unless a replica is actually desired, which is uncommon).
+
+The new object model will allow for a much more intuitive
+implementation of the code.  On line 21, the object's handle (ID) is
+passed to foo() by value. Inside foo(), the object is fetched
+according to this handle and, therefore, the setMember() method is
+called on the originally instantiated object and not a copy.  Line 22
+will therefore result in "foo" being printed.  This approach gives
+developers tighter control of when objects are created and duplicated.
+An additional not-as-important benefit is that the object handle will
+be passed to foo() by value, which most probably will also save
+unnecessary duplication of the value containing the ID itself and thus
+additionally improving run-time performance.
+
+This was just a simple description of why the new object model solves
+awkward behavior and makes object handling much easier, intuitive and
+efficient.  The importance of this change goes far beyond what is
+mentioned in this section as you will see in further sections which
+describe new features with a majority of them being based on this
+change.
+
+Compatibility Notes
+--------------------
+
+Many PHP programmers aren't even aware of the copying quirks of the
+current object model and, therefore, there is a relatively good chance
+that the amount of PHP applications that will work out of the box or
+after a very small amount of modifications would be high.
+
+To simplify migration, version 2.0 will support an optional
+'auto-clone' feature, which will perform a cloning of the object
+whenever it would have been copied in version 1.0.  Optionally, it
+will also be possible to request that the engine will emit an E_NOTICE
+message whenever such an automatic clone occurs, in order to allow
+developers to gradually migrate to the version 2.0-style behavior
+(without automatic clones).
+
+Dependencies
+------------
+
+The new object model is not dependent on other features.  Many of the
+other Zend Engine 2.0 features, such as the $foo->bar()->barbara()
+syntax, destructors and others completely rely on this new object
+model.
+
@@ -0,0 +1,169 @@
+Title:           Zend 2.0 Namespaces
+Version:         $Revision$
+Status:          draft
+Maintainer:      Stig S. Bakken <ssb@php.net>
+Created:         2001-09-08
+Modified:        2001-09-08
+                  
+
+1. Background/Need
+==================
+
+PHP and Zend 1.0 have come to a point where a lot of reusable code is
+being written; from simple functions and classes to entire application
+frameworks.  It is becoming increasingly difficult to avoid symbol
+name collisions with the current scoping methods.
+
+The symbol scopes available in Zend 1.0 are the global scope, the
+class scope and the function scope.  All scopes but classes may
+contain variables, only the class and global scopes may contain
+functions, while only the global scope may contain constants and
+classes.  This means that all of Zend 1.0's scoping methods are
+inherently limited for solving symbol name collision problems.
+
+
+2. Overview
+===========
+
+Namespaces in Zend 2.0 provide a way to manage the symbol collision
+problem by making it possible to define multiple symbol tables able to
+contain all types of symbols.  Zend will get the notion of a current
+namespace, defaulting to the current global one.  The current name
+space may be changed on a file-by-file basis.  Symbols in other name
+spaces than the current one may be referenced using a new namespace
+operator.  It will be possible to "import" symbols from one namespace
+into another.
+
+
+3. Functionality
+================
+
+3.1. Namespace Syntax
+=====================
+
+The namespace operator ":" is used to refer to symbols in other
+namespaces than the current one:
+
+Class:          Namespace:class
+Function:       Namespace:function
+Static method:  Namespace:class::method
+Variable:       $Namespace:variable
+Constant:       Namespace:CONSTANT
+Class variable: $Namespace:class::variable
+
+To refer to symbols in the global namespace, symbols are prefixed with
+only the namespace operator:
+
+Class:          :class
+Function:       :function
+Static method:  :class::method
+Variable:       $:variable
+Constant:       :CONSTANT
+Class variable: $:class::variable
+
+Note: $:variable will effectively be just another syntax for
+$GLOBALS['variable'].
+
+A namespace may have a name containing a ":", it is always the last
+":" character in the symbol qualifier that is the actual namespace
+operator:
+
+Class:          Name:Space:class
+Function:       Name:Space:function
+Static method:  Name:Space:class::method
+Variable:       $Name:Space:variable
+Constant:       Name:Space:CONSTANT
+Class variable: $Name:Space:class::variable
+
+(Here, the ":" between "Name" and "Space" is part of the name, it is
+the one after "Space" that is the namespace operator.)
+
+
+3.2. Defining Namespaces
+========================
+
+Individual files may define a namespace that will apply to the entire
+file.  If no "namespace" operator occurs in the file, it will be in
+the global namespace:
+
+ 1 namespace HTML;
+ 2 
+ 3 class Form {
+ 4     function Form() {
+ 5         // constructor
+ 6     }
+ 7     // ...
+ 8 }
+
+Or with the "nested" name syntax:
+
+ 1 namespace HTML:Form;
+ 2 
+ 3 class Image {
+ 4     var $src;
+ 5     function Image($src) {
+ 6         $this->src = $src;
+ 7     }
+ 8     // ...
+ 9 }
+
+Code executed within the "HTML" namespace may refer to the Form class
+as just "Form".  Code executed from within other namespaces has to
+refer to it as "HTML:Form".  The "namespace" statement must occur
+before any other statements in the file.
+
+# [ssb 2001-09-08]:
+# Should it be possible to "add" symbols to a namespace by including a
+# second file with the same namespace statement?
+
+
+3.3. Importing Symbols
+======================
+
+It is possible to import symbols from another namespace into the
+current one with the "import" statement:
+
+  import * from HTML;          // all symbols
+
+  import Form from HTML;       // single symbols
+
+  import Form,Table from HTML; // multiple symbols
+
+There is a potential for name clashes between symols of different
+types that have the same qualifier syntax.  These are resolved in this
+order: class, function, constant.
+
+Optionally, the symbol type may be explicitly given to import (as
+"class", "function", "variable" or "constant"):
+
+  import class Form from HTML;
+
+And finally, you may import all symbols of a given type:
+
+  import constant * from HTML:Table;
+
+The namespace with its symbols must already be defined before using
+"import".
+
+
+4. Compatibility Notes
+======================
+
+Old code that does not take advantage of namespaces will run without
+modifications.
+
+
+5. Dependencies
+===============
+
+The class variable syntax depends on this class variables being
+implemented in the new ZE2 object model.
+
+
+6. Acknowledgements
+===================
+
+Andi Gutmans <andi@zend.com> and Zeev Suraski <zeev@zend.com> for
+initial ZE2 namespaces proposal
+
+Dean Hall <php@apt7.com> for the initial symbol qualification syntax
@@ -0,0 +1,72 @@
+Title:           Loose type requirements for functions
+Version:         $Revision$
+Status:          draft
+Maintainer:      Brian Moon <brianm@dealnews.com>
+Created:         2001-09-17
+Modified:        2001-09-17
+
+
+1. Background/Need
+==================
+
+Many internal function of PHP will reject parameters because of their
+type (the array and variable function come to mind).  For userland
+this is not an easy task as there is no uniform way to do it.  An
+addition to the engine for requiring loose types would allow
+delevopers to know that the data passed to their functions is of the
+correct type and reduce the need for duplicating the same code in
+every function to check for the type of data.
+
+
+2. Overview
+===========
+
+Loose typing mostly means evaluating the contents of the variable and
+not the type of the variable itself.  The requirements for this would
+and should work much like several of the is_* functions do now.
+
+The typing of parameters would be optional and those not typed would
+simply continue to be treated as they are now.
+
+3. Functionality
+================
+
+3.1. Allowed Types
+==================
+
+Only loose types should be needed to ensure the data is usable by the
+function.  Duplicating the functionallity of is_scalar, is_resource,
+is_array and is_object should give developers all the information they
+need to use a variable correctly.
+
+3.2. Syntax
+===========
+
+The current function syntax should be expanded to allow typing of
+variables inline in a C style.
+
+function foo ($var){
+}
+
+could be changed to require an array such as:
+
+function foo (array $var){
+}
+
+3.3. Errors
+===========
+
+Mis-matches in type should be reported as fatal errors and should halt
+the execution of a script as that function can not be run and code
+following could not reliably run.
+
+
+4. Compatibility Notes
+======================
+
+Old code that does not take advantage of this will run without
+modifications.
+
+
+
+
@@ -0,0 +1,107 @@
+Title:           Delegation
+                 (a/k/a. Object-Based Inheritance)
+Version:         $Revision$
+Status:          draft
+Maintainer:      Sebastian Bergmann <sb@sebastian-bergmann.de>
+
+
+Dynamic Delegation
+
+  Syntax / Example
+
+    <?php
+    class aDelegatee {
+      function doSomething() {
+        echo 'hubu';
+      }
+    }
+
+    class anotherDelegatee {
+      function doSomething() {
+        echo 'tubu';
+      }
+    }
+
+    class Foo {
+      delegatee $bar;
+
+      function setDelegatee($delegatee) {
+        $this->delegatee = $delegatee;
+      }
+    }
+
+    $foo = new Foo;
+
+    $foo->setDelegatee(new aDelegatee);
+    $foo->doSomething(); /* prints "hubu" */
+
+    $foo->setDelegatee(new anotherDelegatee);
+    $foo->doSomething(); /* prints "tubu" */
+    ?>
+
+  Semantics / Synopsis
+
+    The "Foo" class may use all methods available in "$bar" as if they 
+    where locally defined or inherited from a superclass. The essential 
+    difference is that by assigning another object to "$bar" it is 
+    possible to dynamically switch between different implementations for 
+    these methods.
+
+
+Fixed Delegation
+
+  Syntax / Example
+
+    <?php
+    class aDelegatee {
+      function doSomething() {
+        echo 'hubu';
+      }
+    }
+
+    class Foo {
+      final delegatee $bar = new aDelegatee;
+    }
+
+    $foo = new Foo;
+
+    $foo->doSomething(); /* prints "hubu" */
+    ?>
+
+  Semantics / Synopsis
+
+    The "Foo" class may use all methods available in "$bar" as if they 
+    where locally defined or inherited from a superclass. The difference
+    to the dynamic delegation is that once the delegatee object is set,
+    it cannot be changed.
+
+
+Default Delegation
+
+  Syntax / Example
+
+    <?php
+      class Foo {
+        function __delegate($name, $parameters = array()) {
+          echo $name;
+        }
+      }
+
+      $foo = new Foo;
+      $foo->bar(); /* prints "bar" */
+    ?>
+
+  Semantics / Synopsis
+
+    If a class has a __delegate() method, it is called whenever a
+    method on an object of this class is called that is
+
+      * Not defined in the class.
+
+      * Not provided by a delegatee object.
+
+    The __delegate() method is called with the name and parameters
+    of the method call.
+
+    This supersedes / obsoletes similar functionality introduced in
+    Zend Engine 1 by ext/overload.
@@ -0,0 +1,753 @@
+Changes in the Zend Engine 2.0
+
+    * New Object Model.
+
+      The Zend Engine's handling of objects has been completely
+      changed in order to allow for new features, but also to increase
+      its performance.
+
+      Objects were handled in previous versions like primitive types
+      (for instance integers and strings). The drawback of this method
+      is, that semantically the whole object was copied when a
+      variable was assigned or parameters were passed to a method. The
+      new approach refers to objects by handle and not by value (one
+      can think of a handle as an object's ID).
+
+      Many PHP programmers aren't even aware of the copying quirks of
+      the old object model and, therefore, there is a relatively good
+      chance that the amount of PHP applications that will work out of
+      the box or after a very small amount of modifications would be
+      high.
+
+    * Private and Protected Members.
+
+      The Zend Engine 2.0 introduces private and protected member 
+      variables. Note that for performance reasons no error message is 
+      emitted in case of an illegal access to a private or protectecd 
+      member variable.
+
+      Example:
+
+        <?php
+        class MyClass {
+            private $Hello = "Hello, World!\n";
+            protected $Bar = "Hello, Foo!\n";
+            protected $Foo = "Hello, Bar!\n";
+
+            function printHello() {
+                print "MyClass::printHello() " . $this->Hello;
+                print "MyClass::printHello() " . $this->Bar;
+                print "MyClass::printHello() " . $this->Foo;
+            }
+        }
+
+        class MyClass2 extends MyClass {
+            protected $Foo;
+            
+            function printHello() {
+                MyClass::printHello();                          /* Should print */
+                print "MyClass2::printHello() " . $this->Hello; /* Shouldn't print out anything */
+                print "MyClass2::printHello() " . $this->Bar;   /* Shouldn't print (not declared)*/
+                print "MyClass2::printHello() " . $this->Foo;   /* Should print */
+            }
+        }
+
+        $obj = new MyClass();
+        print $obj->Hello;  /* Shouldn't print out anything */
+        print $obj->Bar;    /* Shouldn't print out anything */
+        print $obj->Foo;    /* Shouldn't print out anything */
+        $obj->printHello(); /* Should print */
+
+        $obj = new MyClass2();
+        print $obj->Hello;  /* Shouldn't print out anything */
+        print $obj->Bar;    /* Shouldn't print out anything */
+        print $obj->Foo;    /* Shouldn't print out anything */
+        $obj->printHello();
+        ?>
+        
+      Protected member variables can be accessed in classes extending the 
+      class they are declared in, whereas private member variables can 
+      only be accessed by the class they belong to.
+
+    * Private and protected methods.
+
+      The Zend Engine 2.0 introduces private and protected methods.
+
+      Example:
+
+        <?php
+        class Foo {
+          private function aPrivateMethod() {
+            echo "Foo::aPrivateMethod() called.\n";
+          }
+
+          protected function aProtectedMethod() {
+            echo "Foo::aProtectedMethod() called.\n";
+            $this->aPrivateMethod();
+          }
+        }
+
+        class Bar extends Foo {
+          public function aPublicMethod() {
+            echo "Bar::aPublicMethod() called.\n";
+            $this->aProtectedMethod();
+          }
+        }
+
+        $o = new Bar;
+        $o->aPublicMethod();
+        ?>
+
+      Old code that has no user-defined classes or functions named 
+      'public', 'protected' or 'private' should run without modifications.
+
+    * Abstract Classes and Methods.
+
+      The Zend Engine 2.0 introduces abstract classes and methods. An 
+      abstract method only declares the method's signature and does not 
+      provide an implementation. A class that contains abstract methods 
+      needs to be declared abstract.
+
+      Example:
+
+        <?php
+        abstract class AbstractClass {
+          abstract public function test();
+        }
+
+        class ImplementedClass extends AbstractClass {
+          public function test() {
+            echo "ImplementedClass::test() called.\n";
+          }
+        }
+
+        $o = new ImplementedClass;
+        $o->test();
+        ?>
+
+      Abstract classes cannot be instantiated.
+
+      Old code that has no user-defined classes or functions named 
+      'abstract' should run without modifications.
+
+    * Interfaces.
+
+      The Zend Engine 2.0 introduces interfaces. A class may implement
+      an arbitrary list of interfaces.
+
+      Example:
+
+        <?php
+        interface Throwable {
+          public function getMessage();
+        }
+
+        class Exception implements Throwable {
+          public function getMessage() {
+            // ...
+          }
+        }
+        ?>
+
+      Old code that has no user-defined classes or functions named 
+      'interface' or 'implements' should run without modifications.
+
+    * Class Type Hints.
+
+      While remaining loosely typed the Zend Engine 2.0 introduces the 
+      ability to use class type hints to declare the expected class of 
+      objects that are passed as parameters to a method.
+
+      Example:
+
+        <?php
+        interface Foo {
+          function a(Foo $foo);
+        }
+
+        interface Bar {
+          function b(Bar $bar);
+        }
+
+        class FooBar implements Foo, Bar {
+          function a(Foo $foo) {
+            // ...
+          }
+
+          function b(Bar $bar) {
+            // ...
+          }
+        }
+
+        $a = new FooBar;
+        $b = new FooBar;
+
+        $a->a($b);
+        $a->b($b);
+        ?>
+
+      These class type hints are not checked upon compilation, as would
+      be the case in a typed language, but during runtime.
+
+      This means that
+
+        function foo(ClassName $object) {
+          // ...
+        }
+
+      is equivalent to
+
+        function foo($object) {
+          if (!($object instanceof ClassName)) {
+            die('Argument 1 must be an instance of ClassName');
+          }
+        }
+
+      This syntax only applies to objects/classes, not built-in types.
+
+    * final.
+
+      The Zend Engine 2.0 introduces the "final" keyword to declare
+      final members and methods. Those cannot be overridden by
+      sub-classes.
+
+      Example:
+
+        <?php
+        class Foo {
+          final function bar() {
+            // ...
+          }
+        }
+        ?>
+
+      Old code that has no user-defined classes or functions named 
+      'final' should run without modifications.
+
+    * Object Cloning.
+
+      The Zend Engine 1.0 offered no way a user could decide what copy
+      constructor to run when an object is duplicated. During
+      duplication, the Zend Engine 1.0 did a bitwise copy making an
+      identical replica of all the object's properties.
+
+      Creating a copy of an object with fully replicated properties is
+      not always the wanted behavior. A good example of the need for
+      copy constructors, is if you have an object which represents a
+      GTK window and the object holds the resource of this GTK window,
+      when you create a duplicate you might want to create a new
+      window with the same properties and have the new object hold the
+      resource of the new window. Another example is if your object
+      holds a reference to another object which it uses and when you
+      replicate the parent object you want to create a new instance of
+      this other object so that the replica has its own separate copy.
+
+      An object copy is created by calling the object's __clone()
+      method.
+
+      Example:
+
+        <?php
+        $copy_of_object = $object->__clone();
+        ?>
+
+      When the developer asks to create a new copy of an object, the
+      Zend Engine will check if a __clone() method has been defined or
+      not. If not, it will call a default __clone() which will copy
+      all of the object's properties. If a __clone() method is
+      defined, then it will be responsible to set the necessary
+      properties in the created object. For convenience, the engine
+      will supply a function that imports all of the properties from
+      the source object, so that they can start with a by-value
+      replica of the source object, and only override properties that
+      need to be changed. [The function hasn't been implemented yet]
+
+      Example:
+
+        <?php
+        class MyCloneable {
+            static $id = 0;
+
+            function MyCloneable() {
+                $this->id = self::$id++;
+            }
+
+            function __clone() {
+                $this->name = $that->name;
+                $this->address = 'New York';
+                $this->id = self::$id++;
+            }
+        }
+
+        $obj = new MyCloneable();
+
+        $obj->name    = 'Hello';
+        $obj->address = 'Tel-Aviv';
+
+        print $obj->id . "\n";
+
+        $obj = $obj->__clone();
+
+        print $obj->id . "\n";
+        print $obj->name . "\n";
+        print $obj->address . "\n";
+        ?>
+
+    * Unified Constructors.
+
+      The Zend Engine allows developers to declare constructor methods
+      for classes. Classes which have a constructor method call this
+      method on each newly-created object, so it is suitable for any
+      initialization that the object may need before it can be used.
+
+      With the Zend Engine 1.0, constructor methods were class methods
+      that had the same name as the class itself. Since it is very
+      common to call parent constructors from derived classes, the way
+      the Zend Engine 1.0 worked made it a bit cumbersome to move
+      classes around in a large class hierarchy. If a class is moved
+      to reside under a different parent, the constructor name of that
+      parent changes as well, and the code in the derived class that
+      calls the parent constructor has to be modified.
+
+      The Zend Engine 2.0 introduces a standard way of declaring
+      constructor methods by calling them by the name __construct().
+
+      Example:
+
+        <?php
+        class BaseClass {
+            function __construct() {
+                print "In BaseClass constructor\n";
+            }
+        }
+
+        class SubClass extends BaseClass {
+            function __construct() {
+                parent::__construct();
+                print "In SubClass constructor\n";
+            }
+        }
+
+        $obj = new BaseClass();
+        $obj = new SubClass();
+        ?>
+
+      For backwards compatibility, if the Zend Engine 2.0 cannot find
+      a __construct() function for a given class, it will search for
+      the old-style constructor function, by the name of the class.
+      Effectively, it means that the only case that would have
+      compatibility issues is if the class had a method named
+      __construct() which was used for different semantics.
+
+    * Destructors.
+
+      Having the ability to define destructors for objects can be very
+      useful. Destructors can log messages for debugging, close
+      database connections and do other clean-up work.
+
+      No mechanism for object destructors existed in the Zend Engine
+      1.0, although PHP had already support for registering functions
+      which should be run on request shutdown.
+
+      The Zend Engine 2.0 introduces a destructor concept similar to
+      that of other object-oriented languages, such as Java: When the
+      last reference to an object is destroyed the object's
+      destructor, which is a class method name __destruct() that
+      recieves no parameters, is called before the object is freed
+      from memory.
+
+      Example:
+
+        <?php
+        class MyDestructableClass {
+            function __construct() {
+                print "In constructor\n";
+                $this->name = 'MyDestructableClass';
+            }
+
+            function __destruct() {
+                print 'Destroying ' . $this->name . "\n";
+            }
+        }
+
+        $obj = new MyDestructableClass();
+        ?>
+
+      Like constructors, parent destructors will not be called
+      implicitly by the engine. In order to run a parent destructor,
+      one would have to explicitly call parent::__destruct() in the
+      destructor body.
+
+    * Constants.
+
+      The Zend Engine 2.0 introduces per-class constants.
+
+      Example:
+
+        <?php
+        class Foo {
+            const constant = 'constant';
+        }
+
+        echo 'Foo::constant = ' . Foo::constant . "\n";
+        ?>
+
+      The Zend Engine 2.0 allows for expressions within constants:
+
+        <?php
+        class Bar {
+            const a = 1<<0;
+            const b = 1<<1;
+            const c = a | b;
+        }
+        ?>
+
+      Old code that has no user-defined classes or functions 
+      named 'const' will run without modifications.
+
+    * Exceptions.
+
+      The Zend Engine 1.0 had no exception handling. The Zend Engine 2.0
+      introduces a exception model similar to that of other programming
+      languages.
+
+      Example:
+
+        <?php
+        class MyException {
+            function __construct($exception) {
+                $this->exception = $exception;
+            }
+
+            function Display() {
+                print "MyException: $this->exception\n";
+            }
+        }
+
+        class MyExceptionFoo extends MyException {
+            function __construct($exception) {
+                $this->exception = $exception;
+            }
+
+            function Display() {
+                print "MyException: $this->exception\n";
+            }
+        }
+
+        try {
+            throw new MyExceptionFoo('Hello');
+        }
+
+        catch (MyException $exception) {
+            $exception->Display();
+        }
+        ?>
+
+      Old code that has no user-defined classes or functions 'catch', 
+      'throw' and 'try' will run without modifications.
+
+    * Dereferencing objects returned from functions.
+
+      Example:
+
+        <?php
+        class Circle {
+            function draw() {
+                print "Circle\n";
+            }
+        }
+
+        class Square {
+            function draw() {
+                print "Square\n";
+            }
+        }
+
+        function ShapeFactoryMethod($shape) {
+            switch ($shape) {
+                case 'Circle': return new Circle();
+                case 'Square': return new Square();
+            }
+        }
+
+        ShapeFactoryMethod('Circle')->draw();
+        ShapeFactoryMethod('Square')->draw();
+        ?>
+
+    * Static member variables of static classes can now be
+      initialized.
+
+      Example:
+
+        <?php
+        class foo {
+            static $my_static = 5;
+        }
+
+        print foo::$my_static;
+        ?>
+
+    * Static Methods.
+
+      The Zend Engine 2.0 introduces the 'static' keyword to declare
+      a method static, thus callable from outside the object context.
+
+      Example:
+
+        <?php
+        class Foo {
+          public static function aStaticMethod() {
+            // ...
+          }
+        }
+
+        Foo::aStaticMethod();
+        ?>
+
+      The pseudo variable $this is not available inside a method that
+      has been declared static.
+
+    * instanceof (TBD)
+
+    * Static function variables.
+
+      Statics are now treated at compile-time which allows developers
+      to assign variables to statics by reference. This change also
+      greatly improves their performance but means that indirect
+      references to statics will not work anymore.
+
+    * Parameters that are passed by reference to a function
+      may now have default values.
+
+      Example:
+
+        <?php
+        function my_function(&$var = null) {
+             if ($var === null) {
+                 die('$var needs to have a value');
+             }
+        }
+        ?>
+
+    * __autoload().
+
+      The __autoload() interceptor function will be automatically called 
+      when an undeclared class is to be instantiated. The name of that 
+      class will be passed to the __autoload() interceptor function as its 
+      only argument.
+
+      Example:
+
+        <?php
+        function __autoload($className) {
+          include_once $className . '.php';
+        }
+
+        $object = new ClassName;
+        ?>
+
+    * Method calls and property accesses can be overloaded
+      by class methods  __call(), __get() and __set().
+
+      __get() and __set() Example:
+
+        <?php
+            class Setter {
+                public $n;
+                public $x = array('a' => 1, 'b' => 2, 'c' => 3);
+
+                function __get($nm) {
+                    print "Getting [$nm]\n";
+
+                    if(isset($this->x[$nm])) {
+                        $r = $this->x[$nm];
+                        print "Returning: $r\n";
+                        return $r;
+                    } else {
+                        print "Nothing!\n";
+                    }
+                }
+
+                function __set($nm, $val) {
+                    print "Setting [$nm] to $val\n";
+
+                    if(isset($this->x[$nm])) {
+                        $this->x[$nm] = $val;
+                        print "OK!\n";
+                    } else {
+                        print "Not OK!\n";
+                    }
+                }
+            }
+
+            $foo = new Setter();
+            $foo->n = 1;
+            $foo->a = 100;
+            $foo->a++;
+            $foo->z++;
+            var_dump($foo);
+        ?>
+
+      __call() Example:
+
+        <?php
+            class Caller {
+                var $x = array(1, 2, 3);
+
+                function __call($m, $a) {
+                     print "Method $m called:\n";
+                     var_dump($a);
+                     return $this->x;
+                }
+            }
+
+            $foo = new Caller();
+            $a = $foo->test(1, '2', 3.4, true);
+            var_dump($a);
+        ?>
+
+
+Changes in the Zend Engine 1.0
+
+  The Zend Engine was designed from the ground up for increased speed,
+  reduced memory consumption and more reliable execution. We dare say
+  it meets all of these goals and does so pretty well. Beyond that,
+  there are several improvements in the language engine features:
+
+    * References support.
+
+      $foo = &$a; would make $foo and $a be two names to the same
+      variable. This works with arrays as well, on either side; e.g.,
+      $foo = &$a[7]; would make $foo and $a[7] be two names to the
+      same variable. Changing one would change the other and vice
+      versa.
+
+    * Object overloading support.
+
+      This feature allows various OO libraries to use the OO notation
+      of PHP to access their functionality. Right now, no use is made
+      of that feature, but we'd have a COM module ready by the time
+      PHP 4.0 is released. A CORBA module would probably follow.
+
+    * include() and eval() are now functions, and not statements.
+
+      That means they return a value. The default return value from
+      include() and eval() is 1, so that you can do if (include())
+      without further coding. The return value may be changed by
+      returning a value from the global scope of the included file or
+      the evaluated string. For example, if 'return 7;' is executed in
+      the global scope of foo.inc, include('foo.inc') would evaluate
+      to 7.
+
+    * Automatic resource deallocation.
+
+      Several people have been bitten by the fact that PHP 3.0 had no
+      concept of reference counting. The Zend Engine adds full
+      reference counting for every value in the system, including
+      resources. As soon as a resource is no longer referenced from
+      any variable, it is automatically destroyed to save memory and
+      resources. The most obvious example for the advantage in this is
+      a loop that has an SQL query inside it, something like '$result
+      = sql_query(...);'. In PHP 3.0, every iteration resulted in
+      another SQL result-set allocated in the memory, and all of the
+      result sets weren't destroyed until the end of the script's
+      execution. With the Zend Engine, as soon as we overwrite an old
+      result set with a new one, the old result set which is no longer
+      referenced, is destroyed.
+
+    * Full support for nesting arrays and objects within each other,
+      in as many levels as you want.
+
+    * true and false are now constants of type boolean.
+
+      Comparing any other value to them would convert that value to a
+      boolean first, and conduct the comparison later. That means, for
+      example, that 5==true would evaluate to true (in PHP 3.0, true
+      was nothing but a constant for the integer value of 1, so
+      5==true was identical to 5==1, which was false).
+
+    * Runtime binding of function names.
+
+      This complex name has a simple explanation - you can now call
+      functions before they're declared!
+
+    * Added here-docs support.
+
+    * Added foreach.
+
+      Two syntaxes supported:
+
+        foreach(array_expr as $val) statement
+        foreach(array_expr as $key => $val) statement
+
+    * A true unset() implementation.
+
+      A variable or element that is unset(), is now sent to oblivion
+      in its entirely, no trace remains from it.
+
+    * Output buffering support.
+
+      Use ob_start() to begin output buffering, ob_end_flush() to end
+      buffering and send out the buffered contents, ob_end_clean() to
+      end buffering without sending the buffered contents, and
+      ob_get_contents() to retreive the current contents of the output
+      buffer. Header information (header(), content type, cookies) are
+      not buffered. By turning on output buffering, you can
+      effectively send header information all throughout your file,
+      regardless of whether you've emitted body output or not.
+
+    * Full variable reference within quoted strings:
+
+        ${expr}    - full indirect reference support for scalar
+                     variables
+        {variable} - full variable support
+
+        For example:
+
+          $foo[5]['bar'] = 'foobar';
+          print "{$foo[5]["bar"]}";  // would print "foobar"
+
+    * Ability to call member functions of other classes from within
+      member functions or from the global scope.
+
+      You can now, for example, override a parent function with a
+      child function, and call the parent function from it.
+
+    * Runtime information for classes (class name, parent, available
+      functions, etc.).
+
+    * Much more efficient syntax highlighter - runs much quicker,
+      performs more reliably, and generates much tighter HTML.
+
+    * A full-featured debugger has been integrated with the language
+      (supports breakpoints, expression evaluation, step-in/over,
+      function call backtrace, and more).
+
+  The Zend Engine claims 100% compatability with the engine of PHP
+  3.0, and is 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 existent, since
+      initializing a static variable with anything but a simple
+      static value makes no sense at all.
+
+    * The scope of break and continue is local to that of an
+      include()'d file or an eval()'d string. The impact should
+      be somewhat smaller of the one above.
+
+    * The return statement no longer works from a require()'d file. It
+      hardly worked in PHP 3.0, so the impact should be fairly small. If
+      you want this functionality - use include() instead.
+
+    * unset() is no longer a function, but a statement.
+
+    * The following letter combination is not supported within
+      encapsulated strings:  "{$".  If you have a string that includes
+      this letter combination, for example, print "{$somevar"; (which
+      printed the letter { and the contents of the variable $somevar in
+      PHP 3.0), it will result in a parse error with the Zend Engine.
+      In this case, you would have to change the code to print
+      "\{$somevar"; This incompatability is due to the full variable
+      reference within quoted strings feature added in the Zend
+      Engine.
@@ -0,0 +1,594 @@
+# Microsoft Developer Studio Project File - Name="Zend" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=Zend - Win32 Release_inline
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "Zend.mak".
+!MESSAGE
+!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 "Zend.mak" CFG="Zend - Win32 Release_inline"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# 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 "_LIB" /D "Zend_EXPORTS" /D ZEND_DEBUG=0 /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug"
+# ADD RSC /l 0x40d /d "NDebug"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /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 "_LIB" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40d /d "_Debug"
+# ADD RSC /l 0x40d /d "_Debug"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Zend___Win32_Release_inline"
+# PROP BASE Intermediate_Dir "Zend___Win32_Release_inline"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release_inline"
+# PROP Intermediate_Dir "Release_inline"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D ZEND_DEBUG=0 /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug"
+# ADD RSC /l 0x40d /d "NDebug"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "Zend - Win32 Release"
+# Name "Zend - Win32 Debug"
+# Name "Zend - Win32 Release_inline"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\zend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_builtin_functions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_default_classes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_dynamic_array.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.c"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_mm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_object_handlers.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_opcode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_qsort.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_reflection_api.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_sprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stream.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ts_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\FlexLexer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_builtin_functions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_config.w32.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_default_classes.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_dynamic_array.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_errors.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute_locks.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_fast_cache.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_globals.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_globals_macros.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_istdiostream.h
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.h"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_mm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_modules.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_object_handlers.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects_API.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_qsort.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_reflection_api.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stream.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ts_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.h
+# End Source File
+# End Group
+# Begin Group "Parsers"
+
+# PROP Default_Filter "y"
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.y
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.y"
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Scanners"
+
+# PROP Default_Filter "l"
+# Begin Source File
+
+SOURCE=.\flex.skl
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.l
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.l"
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Text Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\ZEND_BUGS
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_CHANGES
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_TODO
+# End Source File
+# End Group
+# Begin Group "Resources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\zend.ico
+# End Source File
+# End Group
+# End Target
+# End Project
@@ -0,0 +1,236 @@
+dnl
+dnl $Id$
+dnl
+dnl This file contains Zend specific autoconf functions.
+dnl
+
+AC_DEFUN(LIBZEND_BISON_CHECK,[
+
+if test "$YACC" != "bison -y"; then
+    AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.)
+else
+    AC_MSG_CHECKING(bison version)
+    set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /'`
+    if test "${1}" = "1" -a "${2}" -lt "28"; then
+        AC_MSG_WARN(You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2}).)
+    fi
+    AC_MSG_RESULT(${1}.${2} (ok))
+fi
+
+])
+
+AC_DEFUN(LIBZEND_BASIC_CHECKS,[
+
+AC_REQUIRE([AC_PROG_YACC])
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CC_C_O])
+AC_REQUIRE([AC_PROG_LEX])
+AC_REQUIRE([AC_HEADER_STDC])
+
+LIBZEND_BISON_CHECK
+
+dnl Ugly hack to get around a problem with gcc on AIX.
+if test "$CC" = "gcc" -a "$ac_cv_prog_cc_g" = "yes" -a \
+   "`uname -sv`" = "AIX 4"; then
+	CFLAGS=`echo $CFLAGS | sed -e 's/-g//'`
+fi
+
+dnl Hack to work around a Mac OS X cpp problem
+dnl Known versions needing this workaround are 5.3 and 5.4
+if test "$ac_cv_prog_gcc" = "yes" -a "`uname -s`" = "Rhapsody"; then
+        CPPFLAGS="$CPPFLAGS -traditional-cpp"
+fi
+
+AC_CHECK_HEADERS(
+limits.h \
+malloc.h \
+string.h \
+unistd.h \
+stdarg.h \
+sys/types.h \
+sys/time.h \
+signal.h \
+unix.h \
+stdlib.h \
+dlfcn.h)
+
+AC_TYPE_SIZE_T
+AC_TYPE_SIGNAL
+
+AC_DEFUN(LIBZEND_LIBDL_CHECKS,[
+AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
+AC_CHECK_FUNC(dlopen,[AC_DEFINE(HAVE_LIBDL, 1,[ ])])
+])
+
+AC_DEFUN(LIBZEND_DLSYM_CHECK,[
+dnl
+dnl Ugly hack to check if dlsym() requires a leading underscore in symbol name.
+dnl
+AC_MSG_CHECKING([whether dlsym() requires a leading underscore in symbol names])
+_LT_AC_TRY_DLOPEN_SELF([
+  AC_MSG_RESULT(no)
+], [
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(DLSYM_NEEDS_UNDERSCORE, 1, [Define if dlsym() requires a leading underscore in symbol names. ])
+], [
+  AC_MSG_RESULT(no)
+], [])
+])
+
+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
+AC_FUNC_MEMCMP
+AC_FUNC_ALLOCA
+AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass)
+AC_ZEND_BROKEN_SPRINTF
+
+AC_CHECK_FUNCS(finite isfinite isinf isnan)
+
+ZEND_FP_EXCEPT
+	
+])
+
+AC_DEFUN(LIBZEND_ENABLE_DEBUG,[
+
+AC_ARG_ENABLE(debug,
+[  --enable-debug         Compile with debugging symbols],[
+  ZEND_DEBUG=$enableval
+],[
+  ZEND_DEBUG=no
+])  
+
+])
+
+AC_DEFUN(LIBZEND_OTHER_CHECKS,[
+
+AC_ARG_ENABLE(maintainer-zts,
+[  --enable-maintainer-zts   Enable thread safety - for code maintainers only],[
+  ZEND_MAINTAINER_ZTS=$enableval
+],[
+  ZEND_MAINTAINER_ZTS=no
+])  
+
+AC_ARG_ENABLE(inline-optimization,
+[  --disable-inline-optimization If building zend_execute.lo fails, try
+                                this switch.],[
+  ZEND_INLINE_OPTIMIZATION=$enableval
+],[
+  ZEND_INLINE_OPTIMIZATION=yes
+])
+
+AC_ARG_ENABLE(memory-limit,
+[  --enable-memory-limit   Compile with memory limit support. ], [
+  ZEND_MEMORY_LIMIT=$enableval
+],[
+  ZEND_MEMORY_LIMIT=no
+])
+
+AC_MSG_CHECKING(whether to enable thread-safety)
+AC_MSG_RESULT($ZEND_MAINTAINER_ZTS)
+
+AC_MSG_CHECKING(whether to enable inline optimization for GCC)
+AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION)
+
+AC_MSG_CHECKING(whether to enable a memory limit)
+AC_MSG_RESULT($ZEND_MEMORY_LIMIT)
+
+AC_MSG_CHECKING(whether to enable Zend debugging)
+AC_MSG_RESULT($ZEND_DEBUG)
+	
+if test "$ZEND_DEBUG" = "yes"; then
+  AC_DEFINE(ZEND_DEBUG,1,[ ])
+  echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
+  if test "$CFLAGS" = "-g -O2"; then
+  	CFLAGS=-g
+  fi
+  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,[ ])
+fi
+
+test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
+
+if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
+  AC_DEFINE(ZTS,1,[ ])
+  CFLAGS="$CFLAGS -DZTS"
+  LIBZEND_CPLUSPLUS_CHECKS
+fi  
+
+if test "$ZEND_MEMORY_LIMIT" = "yes"; then
+  AC_DEFINE(MEMORY_LIMIT, 1, [Memory limit])
+else
+  AC_DEFINE(MEMORY_LIMIT, 0, [Memory limit])
+fi
+
+
+changequote({,})
+if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
+  INLINE_CFLAGS=`echo $ac_n "$CFLAGS $ac_c" | sed s/-O[0-9s]*//`
+else
+  INLINE_CFLAGS="$CFLAGS"
+fi
+changequote([,])
+
+AC_C_INLINE
+
+AC_SUBST(INLINE_CFLAGS)
+
+
+dnl test and set the alignment define for ZEND_MM
+dnl this also does the logarithmic test for ZEND_MM.
+AC_MSG_CHECKING(for MM alignment and log values)
+
+AC_TRY_RUN([
+#include <stdio.h>
+
+typedef union _mm_align_test {
+  void *ptr;
+  double dbl;
+  long lng;
+} mm_align_test;
+
+#if (defined (__GNUC__) && __GNUC__ >= 2)
+#define ZEND_MM_ALIGNMENT (__alignof__ (mm_align_test))
+#else
+#define ZEND_MM_ALIGNMENT (sizeof(mm_align_test))
+#endif
+
+int main()
+{
+  int i = ZEND_MM_ALIGNMENT;
+  int zeros = 0;
+  FILE *fp;
+
+  while (i & ~0x1) {
+    zeros++;
+    i = i >> 1;
+  }
+
+  fp = fopen("conftest.zend", "w");
+  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);  
+  fclose(fp);
+
+  exit(0);
+}
+], [
+  LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
+  LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
+  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ])
+  AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ]) 
+])
+
+AC_MSG_RESULT(done)
+
+])
+
+
+AC_DEFUN(LIBZEND_CPLUSPLUS_CHECKS,[
+
+])
+
@@ -0,0 +1,258 @@
+# Microsoft Developer Studio Generated Dependency File, included by ZendCore.mak
+
+.\zend_alloc.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	
+
+.\alloca.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_config.w32.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_compile.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+.\zend_constants.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_operators.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_execute.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+.\zend_highlight.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_highlight.h"\
+	".\zend_llist.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_language_parser.tab.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_llist.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_llist.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_opcode.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+.\zend_operators.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_ptr_stack.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_ptr_stack.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_stack.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_stack.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_variables.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	".\zend_list.h"\
+	
+
+.\zend.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_operators.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_API.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	".\zend_list.h"\
+	
+
+.\zend_hash.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_config.w32.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_ini.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
@@ -0,0 +1,715 @@
+# Microsoft Developer Studio Project File - Name="ZendTS" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=ZendTS - Win32 Release_TSDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "ZendTS.mak".
+!MESSAGE
+!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 "ZendTS.mak" CFG="ZendTS - Win32 Release_TSDbg"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "ZendTS - Win32 Release_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "ZendTS - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "ZendTS - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")
+!MESSAGE "ZendTS - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Release_TS"
+# PROP BASE Intermediate_Dir "Release_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release_TS"
+# 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 ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_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"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Debug_TS"
+# PROP BASE Intermediate_Dir "Debug_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Debug_TS"
+# 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 ZEND_DEBUG=1 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_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
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "ZendTS___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "ZendTS___Win32_Release_TS_inline"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release_TS_inline"
+# PROP Intermediate_Dir "Release_TS_inline"
+# 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 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 "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug_TS"
+# ADD RSC /l 0x40d /d "NDebug_TS"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "ZendTS___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "ZendTS___Win32_Release_TSDbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release_TSDbg"
+# PROP Intermediate_Dir "Release_TSDbg"
+# PROP Target_Dir ""
+# ADD BASE 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 "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /Zi /Od /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 "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug_TS"
+# ADD RSC /l 0x40d /d "NDebug_TS"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "ZendTS - Win32 Release_TS"
+# Name "ZendTS - Win32 Debug_TS"
+# Name "ZendTS - Win32 Release_TS_inline"
+# Name "ZendTS - Win32 Release_TSDbg"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\zend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_builtin_functions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_default_classes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_dynamic_array.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.c"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_mm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_object_handlers.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_opcode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_qsort.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_reflection_api.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_sprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stream.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ts_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\FlexLexer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_builtin_functions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_config.w32.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_default_classes.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_dynamic_array.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_errors.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute_locks.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_fast_cache.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_globals.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_globals_macros.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_istdiostream.h
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.h"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_mm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_modules.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_object_handlers.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects_API.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_qsort.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_reflection_api.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stream.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ts_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.h
+# End Source File
+# End Group
+# Begin Group "Parsers"
+
+# PROP Default_Filter "y"
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.y
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.y"
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Scanners"
+
+# PROP Default_Filter "l"
+# Begin Source File
+
+SOURCE=.\flex.skl
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.l
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.l"
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Text Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\LICENSE
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_BUGS
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_CHANGES
+# End Source File
+# End Group
+# Begin Group "Resources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\zend.ico
+# End Source File
+# End Group
+# End Target
+# End Project
@@ -0,0 +1,105 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#define ZEND_API
+#define ZEND_DLEXPORT
+#define ZEND_DLIMPORT
+
+#ifndef NETWARE
+@TOP@
+#endif
+
+#undef uint
+#undef ulong
+
+/* Define if you want to enable memory limit support */
+#define MEMORY_LIMIT 0
+
+#ifndef NETWARE
+@BOTTOM@
+#endif
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_IEEEFP_H
+# include <ieeefp.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#if ZEND_BROKEN_SPRINTF
+int zend_sprintf(char *buffer, const char *format, ...);
+#else
+# define zend_sprintf sprintf
+#endif
+
+#include <math.h>
+
+#ifndef zend_isnan
+#ifdef HAVE_ISNAN
+#define zend_isnan(a) isnan(a)
+#elif defined(NAN)
+#define zend_isnan(a) (((a)==NAN)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+#else
+#define zend_isnan(a) 0
+#endif
+#endif
+
+#ifdef HAVE_ISINF
+#define zend_isinf(a) isinf(a)
+#elif defined(INFINITY)
+/* Might not work, but is required by ISO C99 */
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
+#else
+#define zend_isinf(a) 0
+#endif
+
+#ifdef HAVE_FINITE
+#define zend_finite(a) finite(a)
+#elif defined(HAVE_ISFINITE) || defined(isfinite)
+#define zend_finite(a) isfinite(a)
+#elif defined(fpclassify)
+#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
+#else
+#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,47 @@
+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
+AC_DEFUN(AC_ZEND_BROKEN_SPRINTF,[
+  AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
+    AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
+      ac_cv_broken_sprintf=no
+    ],[
+      ac_cv_broken_sprintf=yes
+    ],[
+      ac_cv_broken_sprintf=no
+    ])
+  ])
+  if test "$ac_cv_broken_sprintf" = "yes"; then
+    ac_result=1
+  else
+    ac_result=0
+  fi
+  AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken])
+])
+
+AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
+  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
+])
+
@@ -0,0 +1,43 @@
+# Makefile to generate build tools
+#
+# Standard usage:
+#        make -f build.mk
+#
+# Written by Sascha Schumann
+#
+# $Id$ 
+
+
+LT_TARGETS = ltmain.sh ltconfig
+
+config_h_in = zend_config.h.in
+
+makefile_am_files = Makefile.am
+makefile_in_files = $(makefile_am_files:.am=.in)
+makefile_files    = $(makefile_am_files:e.am=e)
+
+targets = $(makefile_in_files) $(LT_TARGETS) configure $(config_h_in)
+
+all: $(targets)
+
+clean:
+	rm -f $(targets)
+
+$(LT_TARGETS):
+	rm -f $(LT_TARGETS)
+	libtoolize --automake $(AMFLAGS) -f
+
+$(makefile_in_files): $(makefile_am_files)
+	automake -a -i $(AMFLAGS) $(makefile_files)
+
+aclocal.m4: configure.in acinclude.m4
+	aclocal
+
+$(config_h_in): configure.in acconfig.h
+# explicitly remove target since autoheader does not seem to work 
+# correctly otherwise (timestamps are not updated)
+	@rm -f $@
+	autoheader
+
+configure: aclocal.m4 configure.in
+	autoconf
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+case "$1" in
+--copy)
+	automake_flags=--copy
+	shift
+;;
+esac
+
+libtoolize --force --automake $automake_flags
+
+mv aclocal.m4 aclocal.m4.old 2>/dev/null
+aclocal
+if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then
+    echo "buildconf: keeping ${1}aclocal.m4"
+    mv aclocal.m4.old aclocal.m4
+else
+    echo "buildconf: created or modified ${1}aclocal.m4"
+fi
+
+autoheader
+
+automake --add-missing --include-deps $automake_flags
+
+mv configure configure.old 2>/dev/null
+autoconf
+if cmp configure.old configure > /dev/null 2>&1; then
+    echo "buildconf: keeping ${1}configure"
+    mv configure.old configure
+else
+    echo "buildconf: created or modified ${1}configure"
+fi
+
@@ -0,0 +1,47 @@
+dnl $Id$
+dnl Process this file with autoconf to produce a configure script.
+
+AC_INIT(zend.c)
+AM_INIT_AUTOMAKE(zend, 0.80A, nodefine)
+AM_CONFIG_HEADER(zend_config.h)
+AM_SANITY_CHECK
+AM_MAINTAINER_MODE
+AC_PROG_CC
+AM_PROG_LEX
+AM_PROG_CC_STDC
+ZEND_VERSION=$VERSION
+
+dnl We want this one before the checks, so the checks can modify CFLAGS.
+test -z "$CFLAGS" && auto_cflags=1
+
+sinclude(Zend.m4)
+
+LIBZEND_BASIC_CHECKS
+LIBZEND_LIBDL_CHECKS
+LIBZEND_DLSYM_CHECK
+
+AM_PROG_LIBTOOL
+if test "$enable_debug" != "yes"; then
+  AM_SET_LIBTOOL_VARIABLE([--silent])
+fi
+
+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"
+       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+fi
+
+LIBZEND_ENABLE_DEBUG
+LIBZEND_OTHER_CHECKS
+
+ZEND_EXTRA_LIBS="$LIBS"
+LIBS=""
+AC_SUBST(ZEND_EXTRA_LIBS)
+AC_OUTPUT(Makefile)
+
+# Local Variables:
+# tab-width: 4
+# End:
@@ -0,0 +1,22 @@
+--TEST--
+Bug #19859 (__call() does not catch call_user_func_array() calls)
+--SKIPIF--
+<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
+--FILE--
+<?php
+class test
+{
+  function __call($method,$args)
+  {
+    print "test::__call invoked for method '$method'\n";
+  }
+}
+$x = new test;
+$x->fake(1);
+call_user_func_array(array($x,'fake'),array(1));
+call_user_func(array($x,'fake'),2);
+?>
+--EXPECT--
+test::__call invoked for method 'fake'
+test::__call invoked for method 'fake'
+test::__call invoked for method 'fake'
@@ -0,0 +1,43 @@
+--TEST--
+Bug #20240 (order of destructor calls)
+--SKIPIF--
+<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
+--FILE--
+<?php
+
+class test
+{
+    var $member;
+
+    function test() {
+        $this->member = 1;
+        register_shutdown_function(array($this, 'destructor'));
+    }
+
+    function destructor() {
+        print __METHOD__ . "\n";
+    }
+
+    function __destruct() {
+        print __METHOD__ . "\n";
+    }
+
+    function add() {
+        $this->member += 1;
+        print $this->member."\n";
+    }
+}
+
+$t = new test();
+
+$t->add();
+$t->add();
+
+echo "Done\n";
+?>
+--EXPECT--
+2
+3
+Done
+test::destructor
+test::__destruct
@@ -0,0 +1,26 @@
+--TEST--
+Bug #20242 (Method call in front of class definition)
+--SKIPIF--
+<?php if (version_compare(zend_version(), '2.0.0-dev', '>=')) die('skip ZendEngine 2 does not support this'); ?>
+--FILE--
+<?php
+
+// THIS IS A WON'T FIX FOR ZE2
+
+test::show_static();
+
+$t = new test;
+$t->show_method();
+
+class test {
+	static function show_static() {
+		echo "static\n";
+	}
+	function show_method() {
+		echo "method\n";
+	}
+}
+?>
+--EXPECT--
+static
+method
@@ -0,0 +1,37 @@
+--TEST--
+Bug #21478 (Zend/zend_alloc.c :: shutdown_memory_manager produces segfault) 
+--SKIPIF--
+<?php 
+	if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); 
+	if (!function_exists('stream_filter_register') die('skip stream_filter_register() not available');
+?>
+--FILE--
+<?php
+class debugfilter extends php_user_filter {
+  function filter($in, $out, &$consumed, $closing) {
+    while ($bucket = stream_bucket_make_writeable($in)) {
+      $bucket->data = strtoupper($bucket->data);
+      stream_bucket_append($out, $bucket);
+      $consumed += strlen($bucket->data);
+    }
+    return PSFS_PASS_ON;
+  }
+}
+
+stream_filter_register("myfilter","debugfilter");
+
+$fp = fopen(dirname(__FILE__)."/test.txt","w");
+stream_filter_append($fp, "myfilter");
+stream_filter_append($fp, "myfilter");
+stream_filter_append($fp, "myfilter");
+fwrite($fp, "This is a test.\n");
+print "Done.\n";
+fclose($fp);
+// Uncommenting the following 'print' line causes the segfault to stop occuring
+// print "2\n";  
+readfile(dirname(__FILE__)."/test.txt");
+unlink(dirname(__FILE__)."/test.txt");
+?>
+--EXPECT--
+Done.
+THIS IS A TEST.
@@ -0,0 +1,39 @@
+--TEST--
+Bug #21888 (protected property and protected method of the same name)
+--SKIPIF--
+<?php 
+	if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); 
+?>
+--FILE--
+<?php
+class mom {
+
+  protected $prot = "protected property\n";
+
+  protected function prot() {
+    print "protected method\n";
+  } 
+}
+
+class child extends mom {
+  
+  public function callMom() {
+    $this->prot();
+  }
+  
+  public function viewMom() {
+    print $this->prot;
+  }
+  
+}
+
+$c = new child();
+$c->callMom();
+$c->viewMom();
+?>
+--EXPECT--
+protected method
+protected property
+--EXPECT--
+protected method
+protected property
@@ -0,0 +1,31 @@
+--TEST--
+bug #22725 (A derived class can call a parent's protected method that calls a private method)
+--SKIPIF--
+<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
+--FILE--
+<?php
+class Foo {
+    private function aPrivateMethod() {
+        echo "Foo::aPrivateMethod() called.\n";
+    }
+
+    protected function aProtectedMethod() {
+        echo "Foo::aProtectedMethod() called.\n";
+        $this->aPrivateMethod();
+    }
+}
+
+class Bar extends Foo {
+    public function aPublicMethod() {
+        echo "Bar::aPublicMethod() called.\n";
+        $this->aProtectedMethod();
+    }
+}
+
+$o = new Bar;
+$o->aPublicMethod();
+?>
+--EXPECT--
+Bar::aPublicMethod() called.
+Foo::aProtectedMethod() called.
+Foo::aPrivateMethod() called.
@@ -0,0 +1,24 @@
+--TEST--
+Bug #22836 (returning references to NULL)
+--SKIPIF--
+<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
+--FILE--
+<?php
+function &f()
+{
+	$x = "foo";
+        var_dump($x);
+        print "'$x'\n";
+        return ($a);
+}
+for ($i = 0; $i < 8; $i++) {
+	$h =& f();
+}
+?>
+--EXPECTF--
+string(3) "foo"
+'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Fatal error: Only variables or references can be returned by reference in %s on line %d
@@ -0,0 +1,24 @@
+--TEST--
+Bug #24436 (isset()/empty() produce errors with non-existent variables in classes)
+--SKIPIF--
+<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
+--INI--
+error_reporting=2047
+--FILE--
+<?php
+class test {
+        function __construct() {
+                if (empty($this->test[0][0])) { print "test1\n";}
+                if (!isset($this->test[0][0])) { print "test2\n";}
+                if (empty($this->test)) { print "test1\n";}
+                if (!isset($this->test)) { print "test2\n";}
+        }
+}
+
+$test1 = new test();
+?>
+--EXPECT--
+test1
+test2
+test1
+test2
@@ -0,0 +1,30 @@
+--TEST--
+Bug #24635: crash on dtor calling other functions
+--SKIPIF--
+<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
+--FILE--
+<?php
+class SiteClass {
+	function __construct()	{ $this->page = new PageClass(); }
+}
+class PageClass {
+	function Display() {
+		$section = new SectionClass("PageClass::Display");
+	}
+}
+class SectionClass {
+	function __construct($comment) {
+		$this->Comment = $comment;
+ 	}
+	function __destruct() {
+		out($this->Comment); // this line doesn't crash PHP 
+ 		out("\n<!-- End Section: " . $this->Comment . "-->"); // this line
+ 	}
+}
+function out($code) { return; }
+$site = new SiteClass(); 
+$site->page->Display();
+echo "OK\n";
+?>
+--EXPECT--
+OK
@@ -0,0 +1,14 @@
+--TEST--
+Bug #24699  	Memory Leak with per-class constants
+--SKIPIF--
+<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
+--FILE--
+<?php
+<?
+class TEST { const FOO = SEEK_CUR; };
+class TEST2 { const FOO = 1; };
+class TEST3 { const FOO = PHP_VERSION; };
+print TEST::FOO."\n";
+?>
+--EXPECT--
+1
@@ -0,0 +1,275 @@
+Example 1: A singleton (static members)
+=======================================
+
+<?php
+
+	class Counter {
+		var $counter = 0;
+		
+		function increment_and_print()
+		{
+				print ++$this->counter;
+				print "\n";
+		}	
+	}
+	
+	
+	class SingletonCounter {
+		static $m_instance = NULL;
+		
+		function Instance()
+		{
+				if (self::$m_instance == NULL) {
+					self::$m_instance = new Counter();
+				}
+				return self::$m_instance;
+		}	
+	}
+	
+	SingletonCounter::Instance()->increment_and_print();
+	SingletonCounter::Instance()->increment_and_print();
+	SingletonCounter::Instance()->increment_and_print();
+	
+?>
+
+Example 2: Factory method (derefencing objects returned from functions)
+=======================================================================
+
+<?php
+	
+	class Circle {
+		function draw()
+		{
+			print "Circle\n";	
+		}
+	}
+	
+	class Square {
+		function draw()
+		{
+			print "Square\n";	
+		}
+	}
+	
+	function ShapeFactoryMethod($shape)
+	{
+		switch ($shape) {
+			case "Circle":
+				return new Circle();
+			case "Square":
+				return new Square();
+		}	
+	}
+	
+	ShapeFactoryMethod("Circle")->draw();
+	ShapeFactoryMethod("Square")->draw();
+	
+	
+?>
+
+Example 3: Class constants and class scope
+==========================================
+
+<?php
+
+	class ErrorCodes {
+		const FATAL = "Fatal error\n";
+		const WARNING = "Warning\n";
+		const INFO = "Informational message\n";
+		
+		function print_fatal_error_codes()
+		{
+			print "FATAL = " . FATAL;
+			print "self::FATAL = " . self::FATAL;
+		}
+	}
+	
+	/* Call the static function and move into the ErrorCodes scope */
+	ErrorCodes::print_fatal_error_codes();
+
+?>
+
+Example 4: Regular object method using both local and global functions
+======================================================================
+
+<?php
+
+	class HelloWorld {
+		const HELLO_WORLD = "Hello, World!\n";
+		
+		function get_hello_world()
+		{
+			return HELLO_WORLD;
+		}
+		
+		function length_of_hello_world()
+		{
+			$str = $this->get_hello_world();
+			return strlen($str);
+		}	
+	}
+	
+	$obj = new HelloWorld();
+	print "length_of_hello_world() = " . $obj->length_of_hello_world();
+	print "\n";
+?>
+
+Example 5: Multiple derefencing of objects returned from methods
+================================================================
+
+<?php
+
+
+	class Name {
+		function Name($_name)
+		{
+			$this->name = $_name;	
+		}
+		
+		function display()
+		{
+			print $this->name;
+			print "\n";
+		}
+	}
+	
+	class Person {
+		function Person($_name, $_address)
+		{
+			$this->name = new Name($_name);
+		}
+		
+		function getName()
+		{
+			return $this->name;	
+		}
+	}	
+
+	$person = new Person("John", "New York");
+	$person->getName()->display();
+	
+?>
+
+Example 6: Exception handling
+=============================
+
+<?
+	class MyException {
+		function MyException($_error) {
+			$this->error = $_error;	
+		}
+		
+		function getException()
+		{
+			return $this->error;	
+		}
+	}
+	
+	function ThrowException()
+	{
+		throw new MyException("'This is an exception!'");	
+	}
+	
+	
+	try {
+	} catch (MyException $exception) {
+		print "There was an exception: " . $exception->getException();
+		print "\n";
+	}
+	
+	try {
+		ThrowException();	
+	} catch (MyException $exception) {
+		print "There was an exception: " . $exception->getException();
+		print "\n";
+	}
+	
+?>
+
+Example 7: __clone()
+===================
+
+<?
+	class MyCloneable {
+		static $id = 0;
+		
+		function MyCloneable()
+		{
+			$this->id = self::$id++;
+		}
+		
+		function __clone()
+		{
+			$this->name = $that->name;
+			$this->address = "New York";
+			$this->id = self::$id++;
+		}
+	}
+	
+
+	
+	$obj = new MyCloneable();
+
+	$obj->name = "Hello";
+	$obj->address = "Tel-Aviv";
+	
+	print $obj->id;
+	print "\n";
+	
+	$obj = $obj->__clone();
+	
+	print $obj->id;
+	print "\n";
+	print $obj->name;
+	print "\n";
+	print $obj->address;
+	print "\n";
+?>
+
+Example 8: Unified constructors
+===============================
+
+<?
+
+	class BaseClass {
+		function __construct()
+		{
+			print "In BaseClass constructor\n";	
+		}
+	}
+	
+	class SubClass extends BaseClass {
+		function __construct()
+		{
+				parent::__construct();
+				print "In SubClass constructor\n";	
+		}
+	}
+	
+	$obj = new BaseClass();
+	
+	$obj = new SubClass();
+	
+?>
+
+Example 9: Destructors
+=======================
+
+<?php
+
+class MyDestructableClass {
+	function __construct()
+	{
+		print "In constructor\n";
+		$this->name = "MyDestructableClass";
+	}	
+	
+	function __destruct()
+	{
+		print "Destroying " . $this->name . "\n";
+	}	
+}
+
+$obj = new MyDestructableClass();
+
+?>
@@ -0,0 +1,608 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_H
+#define ZEND_H
+
+#define ZEND_VERSION "2.0.0-dev"
+
+#define ZEND_ENGINE_2
+
+#ifdef __cplusplus
+#define BEGIN_EXTERN_C() extern "C" {
+#define END_EXTERN_C() }
+#else
+#define BEGIN_EXTERN_C()
+#define END_EXTERN_C()
+#endif
+
+#include <stdio.h>
+
+/*
+ * general definitions
+ */
+
+#ifdef ZEND_WIN32
+# include "zend_config.w32.h"
+# define ZEND_PATHS_SEPARATOR		';'
+#elif defined(NETWARE)
+# include "zend_config.nw.h"
+# include "acconfig.h"
+#elif defined(__riscos__)
+# include "zend_config.h"
+# define ZEND_PATHS_SEPARATOR		';'
+#else
+# include "zend_config.h"
+# define ZEND_PATHS_SEPARATOR		':'
+#endif
+
+
+#ifdef ZEND_WIN32
+/* Only use this macro if you know for sure that all of the switches values
+   are covered by its case statements */
+#define EMPTY_SWITCH_DEFAULT_CASE() \
+			default:				\
+				__assume(0);		\
+				break;
+#else
+#define EMPTY_SWITCH_DEFAULT_CASE()
+#endif
+
+/* all HAVE_XXX test have to be after the include of zend_config above */
+
+#ifdef HAVE_UNIX_H
+# include <unix.h>
+#endif
+
+#ifdef HAVE_STDARG_H
+# include <stdarg.h>
+#endif
+
+#ifdef HAVE_DLFCN_H
+# include <dlfcn.h>
+#endif
+
+#if HAVE_MACH_O_DYLD_H
+#include <mach-o/dyld.h>
+
+/* MH_BUNDLE loading functions for Mac OS X / Darwin */
+void *zend_mh_bundle_load (char* bundle_path);
+int zend_mh_bundle_unload (void *bundle_handle);
+void *zend_mh_bundle_symbol(void *bundle_handle, const char *symbol_name);
+const char *zend_mh_bundle_error(void);
+
+#endif /* HAVE_MACH_O_DYLD_H */
+
+#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
+# if defined(DLSYM_NEEDS_UNDERSCORE)
+#  define DL_FETCH_SYMBOL(h,s)		dlsym((h), "_" s)
+# else
+#  define DL_FETCH_SYMBOL			dlsym
+# endif
+# define DL_ERROR					dlerror
+# define DL_HANDLE					void *
+# define ZEND_EXTENSIONS_SUPPORT	1
+#elif defined(HAVE_MACH_O_DYLD_H)
+# define DL_LOAD(libname)			zend_mh_bundle_load(libname)
+# define DL_UNLOAD(handle)			zend_mh_bundle_unload(handle)
+# define DL_FETCH_SYMBOL(h,s)		zend_mh_bundle_symbol(h,s)
+# define DL_ERROR					zend_mh_bundle_error
+# define DL_HANDLE					void *
+# define ZEND_EXTENSIONS_SUPPORT	1
+#elif defined(ZEND_WIN32)
+# define DL_LOAD(libname)			LoadLibrary(libname)
+# define DL_FETCH_SYMBOL			GetProcAddress
+# define DL_UNLOAD					FreeLibrary
+# define DL_HANDLE					HMODULE
+# define ZEND_EXTENSIONS_SUPPORT	1
+#else
+# define DL_HANDLE					void *
+# define ZEND_EXTENSIONS_SUPPORT	0
+#endif
+
+#if HAVE_ALLOCA_H && !defined(_ALLOCA_H)
+#  include <alloca.h>
+#endif
+
+/* AIX requires this to be the first thing in the file.  */
+#ifndef __GNUC__
+# ifndef HAVE_ALLOCA_H
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#   endif
+#  endif
+# endif
+#endif
+
+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX))
+# 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
+#define ZEND_FILE_LINE_ORIG_D			char *__zend_orig_filename, uint __zend_orig_lineno
+#define ZEND_FILE_LINE_ORIG_DC			, ZEND_FILE_LINE_ORIG_D
+#define ZEND_FILE_LINE_RELAY_C			__zend_filename, __zend_lineno
+#define ZEND_FILE_LINE_RELAY_CC			, ZEND_FILE_LINE_RELAY_C
+#define ZEND_FILE_LINE_C				__FILE__, __LINE__
+#define ZEND_FILE_LINE_CC				, ZEND_FILE_LINE_C
+#define ZEND_FILE_LINE_EMPTY_C			NULL, 0
+#define ZEND_FILE_LINE_EMPTY_CC			, ZEND_FILE_LINE_EMPTY_C
+#define ZEND_FILE_LINE_ORIG_RELAY_C		__zend_orig_filename, __zend_orig_lineno
+#define ZEND_FILE_LINE_ORIG_RELAY_CC	, ZEND_FILE_LINE_ORIG_RELAY_C
+#else
+#define ZEND_FILE_LINE_D
+#define ZEND_FILE_LINE_DC
+#define ZEND_FILE_LINE_ORIG_D
+#define ZEND_FILE_LINE_ORIG_DC
+#define ZEND_FILE_LINE_RELAY_C
+#define ZEND_FILE_LINE_RELAY_CC
+#define ZEND_FILE_LINE_C
+#define ZEND_FILE_LINE_CC
+#define ZEND_FILE_LINE_EMPTY_C
+#define ZEND_FILE_LINE_EMPTY_CC
+#define ZEND_FILE_LINE_ORIG_RELAY_C
+#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"
+
+#include "zend_types.h"
+
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
+#ifndef LONG_MAX
+#define LONG_MAX 2147483647L
+#endif
+
+#ifndef LONG_MIN
+#define LONG_MIN (- LONG_MAX - 1)
+#endif
+
+#undef SUCCESS
+#undef FAILURE
+#define SUCCESS 0
+#define FAILURE -1				/* this MUST stay a negative number, or it may affect functions! */
+
+
+#include "zend_hash.h"
+#include "zend_ts_hash.h"
+#include "zend_llist.h"
+
+#define INTERNAL_FUNCTION_PARAMETERS int ht, zval *return_value, zval *this_ptr, int return_value_used TSRMLS_DC
+#define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, this_ptr, return_value_used TSRMLS_CC
+
+
+/*
+ * zval
+ */
+typedef struct _zval_struct zval;
+typedef struct _zend_class_entry zend_class_entry;
+
+typedef struct _zend_object {
+	zend_class_entry *ce;
+	HashTable *properties;
+	int in_get:1;
+	int in_set:1;
+} zend_object;
+
+typedef unsigned int zend_object_handle;
+typedef	struct _zend_object_value zend_object_value;
+
+#include "zend_object_handlers.h"
+
+struct _zend_object_value {
+	zend_object_handle handle;
+	zend_object_handlers *handlers;
+};
+
+typedef union _zvalue_value {
+	long lval;					/* long value */
+	double dval;				/* double value */
+	struct {
+		char *val;
+		int len;
+	} str;
+	HashTable *ht;				/* hash table value */
+	zend_object_value obj;
+} zvalue_value;
+
+
+struct _zval_struct {
+	/* Variable information */
+	zvalue_value value;		/* value */
+	zend_uint refcount;
+	zend_uchar type;	/* active type */
+	zend_uchar is_ref;
+};
+
+struct _zend_op_array;
+
+typedef struct _zend_function_entry {
+	char *fname;
+	void (*handler)(INTERNAL_FUNCTION_PARAMETERS);
+	unsigned char *func_arg_types;
+} zend_function_entry;
+
+
+typedef struct _zend_property_reference {
+	int type;  /* read, write or r/w */
+	zval *object;
+	zend_llist *elements_list;
+} zend_property_reference;
+
+
+
+typedef struct _zend_overloaded_element {
+	int type;		/* array offset or object proprety */
+	zval element;
+} zend_overloaded_element;
+
+/* excpt.h on Digital Unix 4.0 defines function_table */
+#undef function_table
+
+/* A lot of stuff needs shifiting around in order to include zend_compile.h here */
+union _zend_function;
+
+#define ZEND_CE_ABSTRACT ZEND_ACC_ABSTRACT /* same as ZEND_ACC_ABSTRACT */
+
+struct _zend_class_entry {
+	char type;
+	char *name;
+	zend_uint name_length;
+	struct _zend_class_entry *parent; 
+	int refcount;
+	zend_bool constants_updated;
+	zend_uint ce_flags;
+
+	HashTable function_table;
+	HashTable default_properties;
+	HashTable properties_info;
+	HashTable *static_members;
+	HashTable constants_table;
+	zend_function_entry *builtin_functions;
+
+	union _zend_function *constructor;
+	union _zend_function *destructor;
+	union _zend_function *clone;
+	union _zend_function *__get;
+	union _zend_function *__set;
+	union _zend_function *__call;
+
+	
+	/* handlers */
+	zend_object_value (*create_object)(zend_class_entry *class_type TSRMLS_DC);
+
+	zend_class_entry **interfaces;
+	zend_uint num_interfaces;
+
+	char *filename;
+	zend_uint line_start;
+	zend_uint line_end;
+	char *doc_comment;
+	zend_uint doc_comment_len;
+
+	/* old handlers */
+#if 0
+	void (*handle_function_call)(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
+	zval (*handle_property_get)(zend_property_reference *property_reference);
+	int (*handle_property_set)(zend_property_reference *property_reference, zval *value);
+#endif
+};
+
+#include "zend_stream.h"
+typedef struct _zend_utility_functions {
+	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);
+	void (*message_handler)(long message, void *data);
+	void (*block_interruptions)(void);
+	void (*unblock_interruptions)(void);
+	int (*get_configuration_directive)(char *name, uint name_length, zval *contents);
+	void (*ticks_function)(int ticks);
+	void (*on_timeout)(int seconds TSRMLS_DC);
+	int (*stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC);
+} zend_utility_functions;
+
+		
+typedef struct _zend_utility_values {
+	char *import_use_extension;
+	uint import_use_extension_length;
+	zend_bool html_errors;
+} 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 */
+#define IS_NULL		0
+#define IS_LONG		1
+#define IS_DOUBLE	2
+#define IS_STRING	3
+#define IS_ARRAY	4
+#define IS_OBJECT	5
+#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	10 /* for parser internal use only */
+
+/* Ugly hack to support constants as static array indices */
+#define IS_CONSTANT_INDEX	0x80
+
+
+/* overloaded elements data types */
+#define OE_IS_ARRAY	(1<<0)
+#define OE_IS_OBJECT	(1<<1)
+#define OE_IS_METHOD	(1<<2)
+
+
+/* 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(TSRMLS_D);
+void zend_register_standard_ini_entries(TSRMLS_D);
+
+#ifdef ZTS
+void zend_post_startup(TSRMLS_D);
+#endif
+
+void zend_set_utility_values(zend_utility_values *utility_values);
+
+BEGIN_EXTERN_C()
+ZEND_API void _zend_bailout(char *filename, uint lineno);
+END_EXTERN_C()
+
+#define zend_bailout()		_zend_bailout(__FILE__, __LINE__)
+
+#define zend_try												\
+	{															\
+		jmp_buf orig_bailout;									\
+		zend_bool orig_bailout_set=EG(bailout_set);				\
+																\
+		EG(bailout_set) = 1;									\
+		memcpy(&orig_bailout, &EG(bailout), sizeof(jmp_buf));	\
+		if (setjmp(EG(bailout))==0)
+#define zend_catch												\
+		else
+#define zend_end_try()											\
+		memcpy(&EG(bailout), &orig_bailout, sizeof(jmp_buf));	\
+		EG(bailout_set) = orig_bailout_set;						\
+	}
+#define zend_first_try		EG(bailout_set)=0;	zend_try
+
+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 TSRMLS_DC);
+ZEND_API void zend_print_flat_zval_r(zval *expr TSRMLS_DC);
+ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent TSRMLS_DC);
+ZEND_API void zend_output_debug_string(zend_bool trigger_break, char *format, ...);
+
+void zend_activate(TSRMLS_D);
+void zend_deactivate(TSRMLS_D);
+void zend_activate_modules(TSRMLS_D);
+void zend_deactivate_modules(TSRMLS_D);
+void zend_exec_finished(TSRMLS_D);
+
+#if ZEND_DEBUG
+#define Z_DBG(expr)		(expr)
+#else
+#define	Z_DBG(expr)
+#endif
+
+ZEND_API extern char *empty_string;
+
+ZEND_API void free_estring(char **str_p);
+
+
+#define STR_FREE(ptr) if (ptr && ptr!=empty_string) { efree(ptr); }
+#define STR_FREE_REL(ptr) if (ptr && ptr!=empty_string) { efree_rel(ptr); }
+
+#define STR_REALLOC(ptr, size)										\
+	if (ptr!=empty_string) {										\
+		ptr = (char *) erealloc(ptr, size);							\
+	} else {														\
+		ptr = (char *) emalloc(size);								\
+		memset(ptr, 0, size);										\
+	}
+
+/* output support */
+#define ZEND_WRITE(str, str_len)		zend_write((str), (str_len))
+#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 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_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);
+extern void (*zend_on_timeout)(int seconds TSRMLS_DC);
+extern ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC);
+
+
+ZEND_API void zend_error(int type, const char *format, ...);
+
+void zenderror(char *error);
+
+/* The following #define is used for code duality in PHP for Engine 1 & 2 */
+#define ZEND_STANDARD_CLASS_DEF_PTR zend_standard_class_def
+extern ZEND_API zend_class_entry *zend_standard_class_def;
+extern ZEND_API zend_utility_values zend_uv;
+extern ZEND_API zval zval_used_for_init;
+
+END_EXTERN_C()
+
+#define ZEND_UV(name) (zend_uv.name)
+
+
+#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_configuration_directive(char *name, uint name_length, zval *contents);
+
+
+/* Messages for applications of Zend */
+#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;		\
+	(z)->is_ref = 0;	
+
+#define INIT_ZVAL(z) z = zval_used_for_init;
+
+#define ALLOC_INIT_ZVAL(zp)						\
+	ALLOC_ZVAL(zp);		\
+	INIT_ZVAL(*zp);
+
+#define MAKE_STD_ZVAL(zv)				 \
+	ALLOC_ZVAL(zv); \
+	INIT_PZVAL(zv);
+
+#define PZVAL_IS_REF(z)		((z)->is_ref)
+
+#define SEPARATE_ZVAL(ppzv)									\
+	{														\
+		zval *orig_ptr = *(ppzv);							\
+															\
+		if (orig_ptr->refcount>1) {							\
+			orig_ptr->refcount--;							\
+			ALLOC_ZVAL(*(ppzv));							\
+			**(ppzv) = *orig_ptr;							\
+			zval_copy_ctor(*(ppzv));						\
+			(*(ppzv))->refcount=1;							\
+			(*(ppzv))->is_ref = 0;							\
+		}													\
+	}
+
+#define SEPARATE_ZVAL_IF_NOT_REF(ppzv)		\
+	if (!PZVAL_IS_REF(*ppzv)) {				\
+		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);							\
+	if ((pzv)->refcount>1) {				\
+		zval_copy_ctor(&(zv));				\
+		(pzv)->refcount--;					\
+	} else {								\
+		FREE_ZVAL(pzv);						\
+	}										\
+	INIT_PZVAL(&(zv));
+
+#define REPLACE_ZVAL_VALUE(ppzv_dest, pzv_src, copy) {	\
+	int is_ref, refcount;						\
+												\
+	SEPARATE_ZVAL_IF_NOT_REF(ppzv_dest);		\
+	is_ref = (*ppzv_dest)->is_ref;				\
+	refcount = (*ppzv_dest)->refcount;			\
+	zval_dtor(*ppzv_dest);						\
+	**ppzv_dest = *pzv_src;						\
+	if (copy) {                                 \
+		zval_copy_ctor(*ppzv_dest);				\
+    }		                                    \
+	(*ppzv_dest)->is_ref = is_ref;				\
+	(*ppzv_dest)->refcount = refcount;			\
+}
+
+#define ZEND_MAX_RESERVED_RESOURCES	4
+
+
+#endif /* ZEND_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,452 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   |          Andrei Zmievski <andrei@php.net>                            |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_API_H
+#define ZEND_API_H
+
+#include "zend_modules.h"
+#include "zend_list.h"
+#include "zend_fast_cache.h"
+#include "zend_operators.h"
+#include "zend_variables.h"
+#include "zend_execute.h"
+
+
+BEGIN_EXTERN_C()
+#define ZEND_FN(name) zif_##name
+#define ZEND_NAMED_FUNCTION(name) void name(INTERNAL_FUNCTION_PARAMETERS)
+#define ZEND_FUNCTION(name) ZEND_NAMED_FUNCTION(ZEND_FN(name))
+#define ZEND_METHOD(class, name) ZEND_NAMED_FUNCTION(ZEND_FN(class##_##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_STATIC_FE(name, impl_name, arg_types) { name, impl_name, arg_types },
+#define ZEND_ME(class, name, arg_types) ZEND_NAMED_FE(name, ZEND_FN(class##_##name), arg_types)
+
+/* Name macros */
+#define ZEND_MODULE_STARTUP_N(module)       zm_startup_##module
+#define ZEND_MODULE_SHUTDOWN_N(module)		zm_shutdown_##module
+#define ZEND_MODULE_ACTIVATE_N(module)		zm_activate_##module
+#define ZEND_MODULE_DEACTIVATE_N(module)	zm_deactivate_##module
+#define ZEND_MODULE_EXEC_FINISHED_N(module)	zm_exec_finished_##module
+#define ZEND_MODULE_INFO_N(module)			zm_info_##module
+
+/* Declaration macros */
+#define ZEND_MODULE_STARTUP_D(module)		int ZEND_MODULE_STARTUP_N(module)(INIT_FUNC_ARGS)
+#define ZEND_MODULE_SHUTDOWN_D(module)		int ZEND_MODULE_SHUTDOWN_N(module)(SHUTDOWN_FUNC_ARGS)
+#define ZEND_MODULE_ACTIVATE_D(module)		int ZEND_MODULE_ACTIVATE_N(module)(INIT_FUNC_ARGS)
+#define ZEND_MODULE_DEACTIVATE_D(module)	int ZEND_MODULE_DEACTIVATE_N(module)(SHUTDOWN_FUNC_ARGS)
+#define ZEND_MODULE_EXEC_FINISHED_D(module)	int ZEND_MODULE_EXEC_FINISHED_N(module)(void)
+#define ZEND_MODULE_INFO_D(module)			void ZEND_MODULE_INFO_N(module)(ZEND_MODULE_INFO_FUNC_ARGS)
+
+#define ZEND_GET_MODULE(name) \
+    BEGIN_EXTERN_C()\
+	ZEND_DLEXPORT zend_module_entry *get_module(void) { return &name##_module_entry; }\
+    END_EXTERN_C()
+
+#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)							\
+	ts_rsrc_id module_name##_globals_id;
+#define ZEND_EXTERN_MODULE_GLOBALS(module_name)								\
+	extern ts_rsrc_id module_name##_globals_id;
+#define ZEND_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor)	\
+	ts_allocate_id(&module_name##_globals_id, sizeof(zend_##module_name##_globals), (ts_allocate_ctor) globals_ctor, (ts_allocate_dtor) globals_dtor);
+
+#else
+
+#define ZEND_DECLARE_MODULE_GLOBALS(module_name)							\
+	zend_##module_name##_globals module_name##_globals;
+#define ZEND_EXTERN_MODULE_GLOBALS(module_name)								\
+	extern 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 INIT_CLASS_ENTRY(class_container, class_name, functions) INIT_OVERLOADED_CLASS_ENTRY(class_container, class_name, functions, NULL, NULL, NULL)
+
+#define INIT_OVERLOADED_CLASS_ENTRY(class_container, class_name, functions, handle_fcall, handle_propget, handle_propset) \
+	{															\
+		class_container.name = strdup(class_name);				\
+		class_container.name_length = sizeof(class_name) - 1;	\
+		class_container.builtin_functions = functions;			\
+		class_container.constructor = NULL;						\
+		class_container.destructor = NULL;						\
+		class_container.clone = NULL;							\
+		class_container.create_object = NULL;	 				\
+		class_container.__call = handle_fcall;	\
+		class_container.__get = handle_propget;	\
+		class_container.__set = handle_propset;	\
+		class_container.num_interfaces = 0; \
+	}
+
+int zend_next_free_module(void);
+
+ZEND_API int zend_get_parameters(int ht, int param_count, ...);
+ZEND_API int _zend_get_parameters_array(int ht, int param_count, zval **argument_array TSRMLS_DC);
+ZEND_API int zend_get_parameters_ex(int param_count, ...);
+ZEND_API int _zend_get_parameters_array_ex(int param_count, zval ***argument_array TSRMLS_DC);
+
+#define zend_get_parameters_array(ht, param_count, argument_array)			\
+	_zend_get_parameters_array(ht, param_count, argument_array TSRMLS_CC)
+#define zend_get_parameters_array_ex(param_count, argument_array)			\
+	_zend_get_parameters_array_ex(param_count, argument_array TSRMLS_CC)
+
+
+/* Parameter parsing API -- andrei */
+
+#define ZEND_PARSE_PARAMS_QUIET 1<<1
+ZEND_API int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...);
+ZEND_API int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);
+ZEND_API char *zend_zval_type_name(zval *arg);
+
+ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr, char *type_spec, ...);
+ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC, zval *this_ptr, char *type_spec, zend_class_entry *ce, void **object, ...);
+
+/* End of parameter parsing API -- andrei */
+
+int zend_register_functions(zend_class_entry *scope, zend_function_entry *functions, HashTable *function_table, int type TSRMLS_DC);
+void zend_unregister_functions(zend_function_entry *functions, int count, HashTable *function_table TSRMLS_DC);
+ZEND_API int zend_register_module(zend_module_entry *module_entry);
+
+ZEND_API zend_class_entry *zend_register_internal_class(zend_class_entry *class_entry TSRMLS_DC);
+ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce, char *parent_name TSRMLS_DC);
+
+ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC);
+ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_DC);
+
+ZEND_API void zend_wrong_param_count(TSRMLS_D);
+ZEND_API zend_bool zend_is_callable(zval *callable, zend_bool syntax_only, char **callable_name);
+ZEND_API char *zend_get_module_version(char *module_name);
+ZEND_API int zend_declare_property(zend_class_entry *ce, char *name, int name_length, zval *property, int access_type);
+
+
+ZEND_API zend_class_entry *zend_get_class_entry(zval *zobject TSRMLS_DC);
+
+#define getThis() (this_ptr)
+
+#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 ZEND_WRONG_PARAM_COUNT()					{ zend_wrong_param_count(TSRMLS_C); return; }
+#define ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret)		{ zend_wrong_param_count(TSRMLS_C); return ret; }
+
+#ifndef ZEND_WIN32
+#define DLEXPORT
+#endif
+
+ZEND_API int zend_startup_module(zend_module_entry *module);
+
+#define array_init(arg)			_array_init((arg) ZEND_FILE_LINE_CC)
+#define object_init(arg)		_object_init((arg) ZEND_FILE_LINE_CC TSRMLS_CC)
+#define object_init_ex(arg, ce)	_object_init_ex((arg), (ce) ZEND_FILE_LINE_CC TSRMLS_CC)
+#define object_and_properties_init(arg, ce, properties)	_object_and_properties_init((arg), (ce), (properties) ZEND_FILE_LINE_CC TSRMLS_CC)
+ZEND_API int _array_init(zval *arg ZEND_FILE_LINE_DC);
+ZEND_API int _object_init(zval *arg ZEND_FILE_LINE_DC TSRMLS_DC);
+ZEND_API int _object_init_ex(zval *arg, zend_class_entry *ce ZEND_FILE_LINE_DC TSRMLS_DC);
+ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *ce, HashTable *properties ZEND_FILE_LINE_DC TSRMLS_DC);
+
+/* no longer supported */
+ZEND_API int add_assoc_function(zval *arg, char *key, void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS));
+
+ZEND_API int add_assoc_long_ex(zval *arg, char *key, uint key_len, long n);
+ZEND_API int add_assoc_null_ex(zval *arg, char *key, uint key_len);
+ZEND_API int add_assoc_bool_ex(zval *arg, char *key, uint key_len, int b);
+ZEND_API int add_assoc_resource_ex(zval *arg, char *key, uint key_len, int r);
+ZEND_API int add_assoc_double_ex(zval *arg, char *key, uint key_len, double d);
+ZEND_API int add_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate);
+ZEND_API int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate);
+ZEND_API int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value);
+
+#define add_assoc_long(__arg, __key, __n) add_assoc_long_ex(__arg, __key, strlen(__key)+1, __n)
+#define add_assoc_null(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key) + 1)
+#define add_assoc_bool(__arg, __key, __b) add_assoc_bool_ex(__arg, __key, strlen(__key)+1, __b)
+#define add_assoc_resource(__arg, __key, __r) add_assoc_resource_ex(__arg, __key, strlen(__key)+1, __r)
+#define add_assoc_double(__arg, __key, __d) add_assoc_double_ex(__arg, __key, strlen(__key)+1, __d)
+#define add_assoc_string(__arg, __key, __str, __duplicate) add_assoc_string_ex(__arg, __key, strlen(__key)+1, __str, __duplicate)
+#define add_assoc_stringl(__arg, __key, __str, __length, __duplicate) add_assoc_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate)
+#define add_assoc_zval(__arg, __key, __value) add_assoc_zval_ex(__arg, __key, strlen(__key)+1, __value)
+
+/* unset() functions are only suported for legacy modules and null() functions should be used */
+#define add_assoc_unset(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key) + 1)
+#define add_index_unset(__arg, __key) add_index_null(__arg, __key)
+#define add_next_index_unset(__arg) add_next_index_null(__arg)
+#define add_property_unset(__arg, __key) add_property_null(__arg, __key)
+
+ZEND_API int add_index_long(zval *arg, uint idx, long n);
+ZEND_API int add_index_null(zval *arg, uint idx);
+ZEND_API int add_index_bool(zval *arg, uint idx, int b);
+ZEND_API int add_index_resource(zval *arg, uint idx, int r);
+ZEND_API int add_index_double(zval *arg, uint idx, double d);
+ZEND_API int add_index_string(zval *arg, uint idx, char *str, int duplicate);
+ZEND_API int add_index_stringl(zval *arg, uint idx, char *str, uint length, int duplicate);
+ZEND_API int add_index_zval(zval *arg, uint index, zval *value);
+
+ZEND_API int add_next_index_long(zval *arg, long n);
+ZEND_API int add_next_index_null(zval *arg);
+ZEND_API int add_next_index_bool(zval *arg, int b);
+ZEND_API int add_next_index_resource(zval *arg, int r);
+ZEND_API int add_next_index_double(zval *arg, double d);
+ZEND_API int add_next_index_string(zval *arg, char *str, int duplicate);
+ZEND_API int add_next_index_stringl(zval *arg, char *str, uint length, int duplicate);
+ZEND_API int add_next_index_zval(zval *arg, zval *value);
+
+ZEND_API int add_get_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, void **dest, int duplicate);
+ZEND_API int add_get_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, void **dest, int duplicate);
+
+#define add_get_assoc_string(__arg, __key, __str, __dest, __duplicate) add_get_assoc_string_ex(__arg, __key, strlen(__key)+1, __str, __dest, __duplicate)
+#define add_get_assoc_stringl(__arg, __key, __str, __length, __dest, __duplicate) add_get_assoc_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __dest, __duplicate)
+
+ZEND_API int add_get_index_long(zval *arg, uint idx, long l, void **dest);
+ZEND_API int add_get_index_double(zval *arg, uint idx, double d, void **dest);
+ZEND_API int add_get_index_string(zval *arg, uint idx, char *str, void **dest, int duplicate);
+ZEND_API int add_get_index_stringl(zval *arg, uint idx, char *str, uint length, void **dest, int duplicate);
+
+ZEND_API int add_property_long_ex(zval *arg, char *key, uint key_len, long l TSRMLS_DC);
+ZEND_API int add_property_null_ex(zval *arg, char *key, uint key_len TSRMLS_DC);
+ZEND_API int add_property_bool_ex(zval *arg, char *key, uint key_len, int b TSRMLS_DC);
+ZEND_API int add_property_resource_ex(zval *arg, char *key, uint key_len, long r TSRMLS_DC);
+ZEND_API int add_property_double_ex(zval *arg, char *key, uint key_len, double d TSRMLS_DC);
+ZEND_API int add_property_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate TSRMLS_DC);
+ZEND_API int add_property_stringl_ex(zval *arg, char *key, uint key_len,  char *str, uint length, int duplicate TSRMLS_DC);
+ZEND_API int add_property_zval_ex(zval *arg, char *key, uint key_len, zval *value TSRMLS_DC);
+
+#define add_property_long(__arg, __key, __n) add_property_long_ex(__arg, __key, strlen(__key)+1, __n TSRMLS_CC)
+#define add_property_null(__arg, __key) add_property_null_ex(__arg, __key, strlen(__key) + 1 TSRMLS_CC)
+#define add_property_bool(__arg, __key, __b) add_property_bool_ex(__arg, __key, strlen(__key)+1, __b TSRMLS_CC)
+#define add_property_resource(__arg, __key, __r) add_property_resource_ex(__arg, __key, strlen(__key)+1, __r TSRMLS_CC)
+#define add_property_double(__arg, __key, __d) add_property_double_ex(__arg, __key, strlen(__key)+1, __d TSRMLS_CC) 
+#define add_property_string(__arg, __key, __str, __duplicate) add_property_string_ex(__arg, __key, strlen(__key)+1, __str, __duplicate TSRMLS_CC)
+#define add_property_stringl(__arg, __key, __str, __length, __duplicate) add_property_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate TSRMLS_CC)
+#define add_property_zval(__arg, __key, __value) add_property_zval_ex(__arg, __key, strlen(__key)+1, __value TSRMLS_CC)       
+
+ZEND_API int call_user_function(HashTable *function_table, zval **object_pp, zval *function_name, zval *retval_ptr, int param_count, zval *params[] TSRMLS_DC);
+ZEND_API int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *function_name, zval **retval_ptr_ptr, int param_count, zval **params[], int no_separation, HashTable *symbol_table TSRMLS_DC);
+ZEND_API int fast_call_user_function(HashTable *function_table, zval **object_pp, zval *function_name, zval **retval_ptr_ptr, int param_count, zval **params[], int no_separation, HashTable *symbol_table, zend_function **function_pointer TSRMLS_DC);
+
+ZEND_API int zend_set_hash_symbol(zval *symbol, char *name, int name_length,
+                                  zend_bool is_ref, int num_symbol_tables, ...);
+
+#define add_method(arg, key, method)	add_assoc_function((arg), (key), (method))
+
+ZEND_API ZEND_FUNCTION(display_disabled_function);
+ZEND_API ZEND_FUNCTION(display_disabled_class);
+
+#if ZEND_DEBUG
+#define CHECK_ZVAL_STRING(z) \
+	if ((z)->value.str.val[ (z)->value.str.len ] != '\0') { zend_error(E_WARNING, "String is not zero-terminated (%s)", (z)->value.str.val); }
+#define CHECK_ZVAL_STRING_REL(z) \
+	if ((z)->value.str.val[ (z)->value.str.len ] != '\0') { zend_error(E_WARNING, "String is not zero-terminated (%s) (source: %s:%d)", (z)->value.str.val ZEND_FILE_LINE_RELAY_CC); }
+#else
+#define CHECK_ZVAL_STRING(z)
+#define CHECK_ZVAL_STRING_REL(z)
+#endif
+
+#define ZVAL_RESOURCE(z, l) {			\
+		(z)->type = IS_RESOURCE;        \
+		(z)->value.lval = l;	        \
+	}
+
+#define ZVAL_BOOL(z, b) {				\
+		(z)->type = IS_BOOL;	        \
+		(z)->value.lval = b;	        \
+	}
+
+#define ZVAL_NULL(z) {					\
+		(z)->type = IS_NULL;	        \
+	}
+
+#define ZVAL_LONG(z, l) {				\
+		(z)->type = IS_LONG;	        \
+		(z)->value.lval = l;	        \
+	}
+
+#define ZVAL_DOUBLE(z, d) {				\
+		(z)->type = IS_DOUBLE;	        \
+		(z)->value.dval = d;	        \
+	}
+
+#define ZVAL_STRING(z, s, duplicate) {	\
+		char *__s=(s);					\
+		(z)->value.str.len = strlen(__s);	\
+		(z)->value.str.val = (duplicate?estrndup(__s, (z)->value.str.len):__s);	\
+		(z)->type = IS_STRING;	        \
+	}
+
+#define ZVAL_STRINGL(z, s, l, duplicate) {	\
+		char *__s=(s); int __l=l;		\
+		(z)->value.str.len = __l;	    \
+		(z)->value.str.val = (duplicate?estrndup(__s, __l):__s);	\
+		(z)->type = IS_STRING;		    \
+	}
+
+#define ZVAL_EMPTY_STRING(z) {	        \
+		(z)->value.str.len = 0;  	    \
+		(z)->value.str.val = empty_string; \
+		(z)->type = IS_STRING;		    \
+	}
+
+#define ZVAL_FALSE(z)  					ZVAL_BOOL(z, 0)
+#define ZVAL_TRUE(z)  					ZVAL_BOOL(z, 1)
+
+#define RETVAL_RESOURCE(l)				ZVAL_RESOURCE(return_value, l)
+#define RETVAL_BOOL(b)					ZVAL_BOOL(return_value, b)
+#define RETVAL_NULL() 					ZVAL_NULL(return_value)
+#define RETVAL_LONG(l) 					ZVAL_LONG(return_value, l)
+#define RETVAL_DOUBLE(d) 				ZVAL_DOUBLE(return_value, d)
+#define RETVAL_STRING(s, duplicate) 		ZVAL_STRING(return_value, s, duplicate)
+#define RETVAL_STRINGL(s, l, duplicate) 	ZVAL_STRINGL(return_value, s, l, duplicate)
+#define RETVAL_EMPTY_STRING() 			ZVAL_EMPTY_STRING(return_value)
+#define RETVAL_FALSE  					ZVAL_BOOL(return_value, 0)
+#define RETVAL_TRUE   					ZVAL_BOOL(return_value, 1)
+
+#define RETURN_RESOURCE(l) 				{ RETVAL_RESOURCE(l); return; }
+#define RETURN_BOOL(b) 					{ RETVAL_BOOL(b); return; }
+#define RETURN_NULL() 					{ RETVAL_NULL(); return;}
+#define RETURN_LONG(l) 					{ RETVAL_LONG(l); return; }
+#define RETURN_DOUBLE(d) 				{ RETVAL_DOUBLE(d); return; }
+#define RETURN_STRING(s, duplicate) 	{ RETVAL_STRING(s, duplicate); return; }
+#define RETURN_STRINGL(s, l, duplicate) { RETVAL_STRINGL(s, l, duplicate); return; }
+#define RETURN_EMPTY_STRING() 			{ RETVAL_EMPTY_STRING(); return; }
+#define RETURN_FALSE  					{ RETVAL_FALSE; return; }
+#define RETURN_TRUE   					{ RETVAL_TRUE; return; }
+
+#define SET_VAR_STRING(n, v) {																				\
+								{																			\
+									zval *var;																\
+									ALLOC_ZVAL(var);														\
+									ZVAL_STRING(var, v, 0);													\
+									ZEND_SET_GLOBAL_VAR(n, var);											\
+								}																			\
+							}
+
+#define SET_VAR_STRINGL(n, v, l) {														\
+									{													\
+										zval *var;										\
+										ALLOC_ZVAL(var);								\
+										ZVAL_STRINGL(var, v, l, 0);						\
+										ZEND_SET_GLOBAL_VAR(n, var);					\
+									}													\
+								}
+
+#define SET_VAR_LONG(n, v)	{															\
+								{														\
+									zval *var;											\
+									ALLOC_ZVAL(var);									\
+									ZVAL_LONG(var, v);									\
+									ZEND_SET_GLOBAL_VAR(n, var);						\
+								}														\
+							}
+
+#define SET_VAR_DOUBLE(n, v) {															\
+								{														\
+									zval *var;											\
+									ALLOC_ZVAL(var);									\
+									ZVAL_DOUBLE(var, v);								\
+									ZEND_SET_GLOBAL_VAR(n, var);						\
+								}														\
+							}
+
+
+#define ZEND_SET_SYMBOL(symtable, name, var)										\
+	{																				\
+		char *_name = (name);														\
+																					\
+		ZEND_SET_SYMBOL_WITH_LENGTH(symtable, _name, strlen(_name)+1, var, 1, 0);	\
+	}
+
+#define ZEND_SET_SYMBOL_WITH_LENGTH(symtable, name, name_length, var, _refcount, _is_ref)				\
+	{																									\
+		zval **orig_var;																				\
+																										\
+		if (zend_hash_find(symtable, (name), (name_length), (void **) &orig_var)==SUCCESS				\
+			&& PZVAL_IS_REF(*orig_var)) {																\
+			(var)->refcount = (*orig_var)->refcount;													\
+			(var)->is_ref = 1;																			\
+																										\
+			if (_refcount) {																			\
+				(var)->refcount += _refcount-1;															\
+			}																							\
+			zval_dtor(*orig_var);																		\
+			**orig_var = *(var);																		\
+			FREE_ZVAL(var);																					\
+		} else {																						\
+			(var)->is_ref = _is_ref;																	\
+			if (_refcount) {																			\
+				(var)->refcount = _refcount;															\
+			}																							\
+			zend_hash_update(symtable, (name), (name_length), &(var), sizeof(zval *), NULL);			\
+		}																								\
+	}
+
+
+#define ZEND_SET_GLOBAL_VAR(name, var)				\
+	ZEND_SET_SYMBOL(&EG(symbol_table), name, var)
+
+#define ZEND_SET_GLOBAL_VAR_WITH_LENGTH(name, name_length, var, _refcount, _is_ref)		\
+	ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), name, name_length, var, _refcount, _is_ref)
+
+#define ZEND_DEFINE_PROPERTY(class_ptr, name, value, mask)								\
+{																					\
+	char *_name = (name);															\
+	int namelen = strlen(_name);													\
+	zend_declare_property(class_ptr, _name, namelen, value, mask);		\
+}
+
+#define HASH_OF(p) ((p)->type==IS_ARRAY ? (p)->value.ht : (((p)->type==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties((p) TSRMLS_CC) : NULL)))
+#define ZVAL_IS_NULL(z) ((z)->type==IS_NULL)
+
+/* For compatibility */
+#define ZEND_MINIT			ZEND_MODULE_STARTUP_N
+#define ZEND_MSHUTDOWN		ZEND_MODULE_SHUTDOWN_N
+#define ZEND_RINIT			ZEND_MODULE_ACTIVATE_N
+#define ZEND_RSHUTDOWN		ZEND_MODULE_DEACTIVATE_N
+#define ZEND_MINFO			ZEND_MODULE_INFO_N
+
+#define ZEND_MINIT_FUNCTION			ZEND_MODULE_STARTUP_D
+#define ZEND_MSHUTDOWN_FUNCTION		ZEND_MODULE_SHUTDOWN_D
+#define ZEND_RINIT_FUNCTION			ZEND_MODULE_ACTIVATE_D
+#define ZEND_RSHUTDOWN_FUNCTION		ZEND_MODULE_DEACTIVATE_D
+#define ZEND_MINFO_FUNCTION			ZEND_MODULE_INFO_D
+
+END_EXTERN_C()
+	
+#endif /* ZEND_API_H */
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,791 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include "zend.h"
+#include "zend_alloc.h"
+#include "zend_globals.h"
+#include "zend_fast_cache.h"
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#include "zend_mm.h"
+
+#ifndef ZTS
+ZEND_API zend_alloc_globals alloc_globals;
+#endif
+
+
+#ifdef ZEND_MM
+#define ZEND_DISABLE_MEMORY_CACHE 0
+#else
+#define ZEND_DISABLE_MEMORY_CACHE 0
+#endif
+
+#ifdef ZEND_MM
+#define ZEND_DO_MALLOC(size)		zend_mm_alloc(&AG(mm_heap), size)
+#define ZEND_DO_FREE(ptr)			zend_mm_free(&AG(mm_heap), ptr)
+#define ZEND_DO_REALLOC(ptr, size)	zend_mm_realloc(&AG(mm_heap), ptr, size)
+#elif defined(ZEND_WIN32)
+#define ZEND_DO_MALLOC(size)		(AG(memory_heap) ? HeapAlloc(AG(memory_heap), HEAP_NO_SERIALIZE, size) : malloc(size))
+#define ZEND_DO_FREE(ptr)			(AG(memory_heap) ? HeapFree(AG(memory_heap), HEAP_NO_SERIALIZE, ptr) : free(ptr))
+#define ZEND_DO_REALLOC(ptr, size)	(AG(memory_heap) ? HeapReAlloc(AG(memory_heap), HEAP_NO_SERIALIZE, ptr, size) : realloc(ptr, size))
+#else
+#define ZEND_DO_MALLOC(size)		malloc(size)
+#define ZEND_DO_FREE(ptr)			free(ptr)
+#define ZEND_DO_REALLOC(ptr, size)	realloc(ptr, size)
+#endif
+
+#if ZEND_DEBUG
+# define END_MAGIC_SIZE sizeof(long)
+static long mem_block_end_magic = MEM_BLOCK_END_MAGIC;
+#else
+# define END_MAGIC_SIZE 0
+#endif
+
+
+# if MEMORY_LIMIT
+#  if ZEND_DEBUG
+#define CHECK_MEMORY_LIMIT(s, rs) _CHECK_MEMORY_LIMIT(s, rs, __zend_filename, __zend_lineno)
+#  else
+#define CHECK_MEMORY_LIMIT(s, rs)	_CHECK_MEMORY_LIMIT(s, rs, NULL, 0)
+#  endif
+
+#define _CHECK_MEMORY_LIMIT(s, rs, file, lineno) { AG(allocated_memory) += rs;\
+								if (AG(memory_limit)<AG(allocated_memory)) {\
+									int php_mem_limit = AG(memory_limit); \
+									if (AG(memory_limit)+1048576 > AG(allocated_memory) - rs) { \
+										AG(memory_limit) = AG(allocated_memory) + 1048576; \
+										if (file) { \
+											zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)", php_mem_limit, s); \
+										} else { \
+											zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)", php_mem_limit, file, lineno, s); \
+										} \
+									} else { \
+										if (file) { \
+											fprintf(stderr, "Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)\n", php_mem_limit, file, lineno, s); \
+										} else { \
+											fprintf(stderr, "Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)\n", php_mem_limit, s); \
+										} \
+										exit(1); \
+									} \
+								} \
+							}
+# endif
+
+#ifndef CHECK_MEMORY_LIMIT
+#define CHECK_MEMORY_LIMIT(s, rs)
+#endif
+
+
+#define REMOVE_POINTER_FROM_LIST(p)				\
+	if (p==AG(head)) {							\
+		AG(head) = p->pNext;					\
+	} else {									\
+		p->pLast->pNext = p->pNext;				\
+	}											\
+	if (p->pNext) {								\
+		p->pNext->pLast = p->pLast;				\
+	}
+
+#define ADD_POINTER_TO_LIST(p)		\
+	p->pNext = AG(head);		\
+	if (AG(head)) {				\
+		AG(head)->pLast = p;	\
+	}							\
+	AG(head) = p;				\
+	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();
+	TSRMLS_FETCH();
+
+	CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size);
+
+#if !ZEND_DISABLE_MEMORY_CACHE
+	if ((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;
+		p->orig_filename = __zend_orig_filename;
+		p->orig_lineno = __zend_orig_lineno;
+		p->magic = MEM_BLOCK_START_MAGIC;
+		p->reported = 0;
+		/* Setting the thread id should not be necessary, because we fetched this block
+		 * from this thread's cache
+		 */
+		AG(cache_stats)[CACHE_INDEX][1]++;
+		memcpy((((char *) p) + sizeof(zend_mem_header) + MEM_HEADER_PADDING + size), &mem_block_end_magic, sizeof(long));
+#endif
+		p->cached = 0;
+		p->size = size;
+		return (void *)((char *)p + sizeof(zend_mem_header) + MEM_HEADER_PADDING);
+	} else {
+#endif
+#if ZEND_DEBUG
+		if (CACHE_INDEX<MAX_CACHED_MEMORY) {
+			AG(cache_stats)[CACHE_INDEX][0]++;
+		}
+#endif
+		p  = (zend_mem_header *) ZEND_DO_MALLOC(sizeof(zend_mem_header) + MEM_HEADER_PADDING + SIZE + END_MAGIC_SIZE);
+#if !ZEND_DISABLE_MEMORY_CACHE
+	}
+#endif
+
+	HANDLE_BLOCK_INTERRUPTIONS();
+
+	if (!p) {
+		fprintf(stderr,"FATAL:  emalloc():  Unable to allocate %ld bytes\n", (long) size);
+#if ZEND_DEBUG && defined(HAVE_KILL) && defined(HAVE_GETPID)
+		kill(getpid(), SIGSEGV);
+#else
+		exit(1);
+#endif
+		HANDLE_UNBLOCK_INTERRUPTIONS();
+		return (void *)p;
+	}
+	p->cached = 0;
+#if ZEND_DEBUG || !defined(ZEND_MM)
+	ADD_POINTER_TO_LIST(p);
+#endif
+	p->size = size; /* Save real size for correct cache output */
+#if ZEND_DEBUG
+	p->filename = __zend_filename;
+	p->lineno = __zend_lineno;
+	p->orig_filename = __zend_orig_filename;
+	p->orig_lineno = __zend_orig_lineno;
+	p->magic = MEM_BLOCK_START_MAGIC;
+	p->reported = 0;
+# ifdef ZTS
+	p->thread_id = tsrm_thread_id();
+# endif
+	memcpy((((char *) p) + sizeof(zend_mem_header) + MEM_HEADER_PADDING + size), &mem_block_end_magic, sizeof(long));
+#endif
+#if MEMORY_LIMIT
+	CHECK_MEMORY_LIMIT(size, SIZE);
+	if (AG(allocated_memory) > AG(allocated_memory_peak)) {
+		AG(allocated_memory_peak) = AG(allocated_memory);
+	}
+#endif
+
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+	return (void *)((char *)p + sizeof(zend_mem_header) + MEM_HEADER_PADDING);
+}
+
+#include "zend_multiply.h"
+
+ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+
+	if (nmemb < LONG_MAX
+			&& size < LONG_MAX
+			&& offset < LONG_MAX
+			&& nmemb >= 0
+			&& size >= 0
+			&& offset >= 0) {
+		long lval;
+		double dval;
+		int use_dval;
+
+		ZEND_SIGNED_MULTIPLY_LONG(nmemb, size, lval, dval, use_dval);
+
+		if (!use_dval
+				&& lval < (long) (LONG_MAX - offset)) {
+			return emalloc_rel(lval + offset);
+		}
+	}
+
+	zend_error(E_ERROR, "Possible integer overflow in memory allocation (%ld * %ld + %ld)", nmemb, size, offset);
+	return 0;
+}
+
+
+
+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) - MEM_HEADER_PADDING);
+	DECLARE_CACHE_VARS();
+	TSRMLS_FETCH();
+
+#if defined(ZTS) && TSRM_DEBUG
+	if (p->thread_id != tsrm_thread_id()) {
+		tsrm_error(TSRM_ERROR_LEVEL_ERROR, "Memory block allocated at %s:(%d) on thread %x freed at %s:(%d) on thread %x, ignoring",
+			p->filename, p->lineno, p->thread_id,
+			__zend_filename, __zend_lineno, tsrm_thread_id());
+		return;
+	}
+#endif
+
+	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);
+#endif
+#if !ZEND_DISABLE_MEMORY_CACHE
+	if ((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
+		return;
+	}
+#endif
+	HANDLE_BLOCK_INTERRUPTIONS();
+#if ZEND_DEBUG || !defined(ZEND_MM)
+	REMOVE_POINTER_FROM_LIST(p);
+#endif
+
+#if MEMORY_LIMIT
+	AG(allocated_memory) -= SIZE;
+#endif
+	
+	ZEND_DO_FREE(p);
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+}
+
+
+ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	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, 0, final_size);
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+	return p;
+}
+
+
+ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	zend_mem_header *p;
+	zend_mem_header *orig;
+	DECLARE_CACHE_VARS();
+	TSRMLS_FETCH();
+
+	if (!ptr) {
+		return _emalloc(size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	}
+
+	p = orig = (zend_mem_header *) ((char *)ptr-sizeof(zend_mem_header)-MEM_HEADER_PADDING);
+
+#if defined(ZTS) && TSRM_DEBUG
+	if (p->thread_id != tsrm_thread_id()) {
+		void *new_p;
+
+		tsrm_error(TSRM_ERROR_LEVEL_ERROR, "Memory block allocated at %s:(%d) on thread %x reallocated at %s:(%d) on thread %x, duplicating",
+			p->filename, p->lineno, p->thread_id,
+			__zend_filename, __zend_lineno, tsrm_thread_id());
+		new_p = _emalloc(size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+		memcpy(new_p, ptr, p->size);
+		return new_p;
+	}
+#endif
+
+	CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size);
+
+	HANDLE_BLOCK_INTERRUPTIONS();
+#if ZEND_DEBUG || !defined(ZEND_MM)
+	REMOVE_POINTER_FROM_LIST(p);
+#endif
+	p = (zend_mem_header *) ZEND_DO_REALLOC(p, sizeof(zend_mem_header)+MEM_HEADER_PADDING+SIZE+END_MAGIC_SIZE);
+	if (!p) {
+		if (!allow_failure) {
+			fprintf(stderr,"FATAL:  erealloc():  Unable to allocate %ld bytes\n", (long) size);
+#if ZEND_DEBUG && HAVE_KILL && HAVE_GETPID
+			kill(getpid(), SIGSEGV);
+#else
+			exit(1);
+#endif
+		}
+#if ZEND_DEBUG || !defined(ZEND_MM)
+		ADD_POINTER_TO_LIST(orig);
+#endif
+		HANDLE_UNBLOCK_INTERRUPTIONS();
+		return (void *)NULL;
+	}
+#if ZEND_DEBUG || !defined(ZEND_MM)
+	ADD_POINTER_TO_LIST(p);
+#endif
+#if ZEND_DEBUG
+	p->filename = __zend_filename;
+	p->lineno = __zend_lineno;
+	p->magic = MEM_BLOCK_START_MAGIC;
+	memcpy((((char *) p) + sizeof(zend_mem_header) + MEM_HEADER_PADDING + size), &mem_block_end_magic, sizeof(long));
+#endif	
+#if MEMORY_LIMIT
+	CHECK_MEMORY_LIMIT(size - p->size, SIZE - REAL_SIZE(p->size));
+	if (AG(allocated_memory) > AG(allocated_memory_peak)) {
+		AG(allocated_memory_peak) = AG(allocated_memory);
+	}
+#endif
+
+	p->size = size;
+
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+	return (void *)((char *)p+sizeof(zend_mem_header)+MEM_HEADER_PADDING);
+}
+
+
+ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	int length;
+	char *p;
+
+	length = strlen(s)+1;
+	HANDLE_BLOCK_INTERRUPTIONS();
+	p = (char *) _emalloc(length ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	if (!p) {
+		HANDLE_UNBLOCK_INTERRUPTIONS();
+		return (char *)NULL;
+	}
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+	memcpy(p, s, length);
+	return p;
+}
+
+
+ZEND_API char *_estrndup(const char *s, uint length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	char *p;
+
+	HANDLE_BLOCK_INTERRUPTIONS();
+	p = (char *) _emalloc(length+1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	if (!p) {
+		HANDLE_UNBLOCK_INTERRUPTIONS();
+		return (char *)NULL;
+	}
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+	memcpy(p, s, length);
+	p[length] = 0;
+	return p;
+}
+
+
+ZEND_API char *zend_strndup(const char *s, uint length)
+{
+	char *p;
+
+	p = (char *) malloc(length+1);
+	if (!p) {
+		return (char *)NULL;
+	}
+	if (length) {
+		memcpy(p, s, length);
+	}
+	p[length] = 0;
+	return p;
+}
+
+
+ZEND_API int zend_set_memory_limit(unsigned int memory_limit)
+{
+#if MEMORY_LIMIT
+	TSRMLS_FETCH();
+
+	AG(memory_limit) = memory_limit;
+	return SUCCESS;
+#else
+	return FAILURE;
+#endif
+}
+
+
+ZEND_API void start_memory_manager(TSRMLS_D)
+{
+	AG(head) = NULL;
+	
+#if MEMORY_LIMIT
+	AG(memory_limit) = 1<<30;		/* ridiculous limit, effectively no limit */
+	AG(allocated_memory) = 0;
+	AG(memory_exhausted) = 0;
+	AG(allocated_memory_peak) = 0;
+#endif
+
+#if ZEND_ENABLE_FAST_CACHE
+	memset(AG(fast_cache_list_head), 0, sizeof(AG(fast_cache_list_head)));
+#endif
+#if !ZEND_DISABLE_MEMORY_CACHE
+	memset(AG(cache_count), 0, sizeof(AG(cache_count)));
+#endif
+
+#ifdef ZEND_MM
+	zend_mm_startup(&AG(mm_heap), 256*1024);
+#elif defined(ZEND_WIN32)
+	AG(memory_heap) = HeapCreate(HEAP_NO_SERIALIZE, 256*1024, 0);
+#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
+}
+
+
+ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC)
+{
+	zend_mem_header *p, *t;
+
+#if ZEND_DEBUG
+	int had_leaks = 0;
+#endif
+
+#if defined(ZEND_MM) && !ZEND_DEBUG
+	if (clean_cache) {
+		zend_mm_shutdown(&AG(mm_heap));
+		return;
+	}
+#elif defined(ZEND_WIN32) && !ZEND_DEBUG
+	if (clean_cache && AG(memory_heap)) {
+		HeapDestroy(AG(memory_heap));
+		return;
+	}
+#endif
+
+#if ZEND_ENABLE_FAST_CACHE
+	{
+		zend_fast_cache_list_entry *fast_cache_list_entry, *next_fast_cache_list_entry;
+		unsigned int fci;
+
+		for (fci=0; fci<MAX_FAST_CACHE_TYPES; fci++) {
+			fast_cache_list_entry = AG(fast_cache_list_head)[fci];
+			while (fast_cache_list_entry) {
+				next_fast_cache_list_entry = fast_cache_list_entry->next;
+				efree(fast_cache_list_entry);
+				fast_cache_list_entry = next_fast_cache_list_entry;
+			}
+			AG(fast_cache_list_head)[fci] = NULL;
+		}
+	}
+#endif /* ZEND_ENABLE_FAST_CACHE */
+
+#if !ZEND_DISABLE_MEMORY_CACHE && !defined(ZEND_MM)
+	if (1 || clean_cache) {
+		unsigned int i, j;
+		zend_mem_header *ptr;
+
+		for (i=1; i<MAX_CACHED_MEMORY; i++) {
+			for (j=0; j<AG(cache_count)[i]; j++) {
+				ptr = (zend_mem_header *) AG(cache)[i][j];
+#if MEMORY_LIMIT
+				AG(allocated_memory) -= REAL_SIZE(ptr->size);
+#endif
+				REMOVE_POINTER_FROM_LIST(ptr);
+				ZEND_DO_FREE(ptr);
+			}
+			AG(cache_count)[i] = 0;
+		}
+	}
+#endif /* !ZEND_DISABLE_MEMORY_CACHE */
+
+#if ZEND_DEBUG || !defined(ZEND_MM)
+	p = AG(head);
+	t = AG(head);
+	while (t) {
+		if (!t->cached) {
+#if ZEND_DEBUG
+			if (!t->cached && !t->reported) {
+				zend_mem_header *iterator;
+				int total_leak=0, total_leak_count=0;
+
+				had_leaks = 1;
+				if (!silent) {
+					zend_message_dispatcher(ZMSG_MEMORY_LEAK_DETECTED, t);
+				}
+				t->reported = 1;
+				for (iterator=t->pNext; iterator; iterator=iterator->pNext) {
+					if (!iterator->cached
+						&& iterator->filename==t->filename
+						&& iterator->lineno==t->lineno) {
+						total_leak += iterator->size;
+						total_leak_count++;
+						iterator->reported = 1;
+					}
+				}
+				if (!silent && total_leak_count>0) {
+					zend_message_dispatcher(ZMSG_MEMORY_LEAK_REPEATED, (void *) (long) (total_leak_count));
+				}
+			}
+#endif
+#if MEMORY_LIMIT
+			AG(allocated_memory) -= REAL_SIZE(t->size);
+#endif
+			p = t->pNext;
+			REMOVE_POINTER_FROM_LIST(t);
+			ZEND_DO_FREE(t);
+			t = p;
+		} else {
+			t = t->pNext;
+		}
+	}
+
+#if MEMORY_LIMIT
+	AG(memory_exhausted)=0;
+	AG(allocated_memory_peak) = 0;
+#endif
+
+
+#if (ZEND_DEBUG)
+	do {
+		zval display_memory_cache_stats;
+		int i, j;
+
+		if (clean_cache) {
+			/* we're shutting down completely, don't even touch the INI subsystem */
+			break;
+		}
+		if (zend_get_configuration_directive("display_memory_cache_stats", sizeof("display_memory_cache_stats"), &display_memory_cache_stats)==FAILURE) {
+			break;
+		}
+		if (!atoi(display_memory_cache_stats.value.str.val)) {
+			break;
+		}
+		fprintf(stderr, "Memory cache statistics\n"
+						"-----------------------\n\n"
+						"[zval, %2ld]\t\t%d / %d (%.2f%%)\n"
+						"[hash, %2ld]\t\t%d / %d (%.2f%%)\n",
+						(long) sizeof(zval),
+						AG(fast_cache_stats)[ZVAL_CACHE_LIST][1], AG(fast_cache_stats)[ZVAL_CACHE_LIST][0]+AG(fast_cache_stats)[ZVAL_CACHE_LIST][1],
+						((double) AG(fast_cache_stats)[ZVAL_CACHE_LIST][1] / (AG(fast_cache_stats)[ZVAL_CACHE_LIST][0]+AG(fast_cache_stats)[ZVAL_CACHE_LIST][1]))*100,
+						(long) sizeof(HashTable),
+						AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][1], AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][0]+AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][1],
+						((double) AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][1] / (AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][0]+AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][1]))*100);
+
+
+		for (i=0; i<MAX_CACHED_MEMORY; i+=2) {
+			fprintf(stderr, "[%2d, %2d]\t\t", i, i+1);
+			for (j=0; j<2; j++) {
+				fprintf(stderr, "%d / %d (%.2f%%)\t\t",
+						AG(cache_stats)[i+j][1], AG(cache_stats)[i+j][0]+AG(cache_stats)[i+j][1],
+						((double) AG(cache_stats)[i+j][1] / (AG(cache_stats)[i+j][0]+AG(cache_stats)[i+j][1]))*100);
+			}
+			fprintf(stderr, "\n");
+		}
+					
+	} while (0);
+#endif
+
+#endif
+
+#if defined(ZEND_MM) && ZEND_DEBUG
+	if (clean_cache) {
+		zend_mm_shutdown(&AG(mm_heap));
+		return;
+	}
+#elif defined(ZEND_WIN32) && ZEND_DEBUG
+	if (clean_cache && AG(memory_heap)) {
+		HeapDestroy(AG(memory_heap));
+		return;
+	}
+#endif
+}
+
+
+#if ZEND_DEBUG
+void zend_debug_alloc_output(char *format, ...)
+{
+	char output_buf[256];
+	va_list args;
+
+	va_start(args, format);
+	vsprintf(output_buf, format, args);
+	va_end(args);
+
+#ifdef ZEND_WIN32
+	OutputDebugString(output_buf);
+#else
+	fprintf(stderr, "%s", output_buf);
+#endif
+}
+
+
+ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	zend_mem_header *p = (zend_mem_header *) ((char *)ptr - sizeof(zend_mem_header) - MEM_HEADER_PADDING);
+	int no_cache_notice=0;
+	int valid_beginning=1;
+	int had_problems=0;
+	long end_magic;
+
+	if (silent==2) {
+		silent = 1;
+		no_cache_notice = 1;
+	}
+	if (silent==3) {
+		silent = 0;
+		no_cache_notice = 1;
+	}
+	if (!silent) {
+		zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL);
+		zend_debug_alloc_output("---------------------------------------\n");
+		zend_debug_alloc_output("%s(%d) : Block 0x%0.8lX status:\n" ZEND_FILE_LINE_RELAY_CC, (long) p);
+		if (__zend_orig_filename) {
+			zend_debug_alloc_output("%s(%d) : Actual location (location was relayed)\n" ZEND_FILE_LINE_ORIG_RELAY_CC);
+		}
+		zend_debug_alloc_output("%10s\t","Beginning:  ");
+	}
+
+	switch (p->magic) {
+		case MEM_BLOCK_START_MAGIC:
+			if (!silent) {
+				zend_debug_alloc_output("OK (allocated on %s:%d, %d bytes)\n", p->filename, p->lineno, p->size);
+			}
+			break; /* ok */
+		case MEM_BLOCK_FREED_MAGIC:
+			if (!silent) {
+				zend_debug_alloc_output("Freed\n");
+				had_problems = 1;
+			} else {
+				return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+			}
+			break;
+		case MEM_BLOCK_CACHED_MAGIC:
+			if (!silent) {
+				if (!no_cache_notice) {
+					zend_debug_alloc_output("Cached (allocated on %s:%d, %d bytes)\n", p->filename, p->lineno, p->size);
+					had_problems = 1;
+				}
+			} else {
+				if (!no_cache_notice) {
+					return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+				}
+			}
+			break;
+		default:
+			if (!silent) {
+				zend_debug_alloc_output("Overrun (magic=0x%0.8lX, expected=0x%0.8lX)\n", p->magic, MEM_BLOCK_START_MAGIC);
+			} else {
+				return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+			}
+			had_problems = 1;
+			valid_beginning = 0;
+			break;
+	}
+
+
+	memcpy(&end_magic, (((char *) p)+sizeof(zend_mem_header)+MEM_HEADER_PADDING+p->size), sizeof(long));
+
+	if (valid_beginning && (end_magic != MEM_BLOCK_END_MAGIC)) {
+		char *overflow_ptr, *magic_ptr=(char *) &mem_block_end_magic;
+		int overflows=0;
+		int i;
+
+		if (silent) {
+			return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+		}
+		had_problems = 1;
+		overflow_ptr = (char *) &end_magic;
+
+		for (i=0; i<sizeof(long); i++) {
+			if (overflow_ptr[i]!=magic_ptr[i]) {
+				overflows++;
+			}
+		}
+
+		zend_debug_alloc_output("%10s\t", "End:");
+		zend_debug_alloc_output("Overflown (magic=0x%0.8lX instead of 0x%0.8lX)\n", end_magic, 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));
+		} else {
+			zend_debug_alloc_output("%d byte(s) overflown\n", overflows);
+		}
+	} else if (!silent) {
+		zend_debug_alloc_output("%10s\t", "End:");
+		if (valid_beginning) {
+			zend_debug_alloc_output("OK\n");
+		} else {
+			zend_debug_alloc_output("Unknown\n");
+		}
+	}
+
+	if (had_problems) {
+		int foo = 5;
+
+		foo += 1;
+	}
+		
+	if (!silent) {
+		zend_debug_alloc_output("---------------------------------------\n");
+	}
+	return ((!had_problems) ? 1 : 0);
+}
+
+
+ZEND_API void _full_mem_check(int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	zend_mem_header *p;
+	int errors=0;
+	TSRMLS_FETCH();
+
+	p = AG(head);
+	
+
+	zend_debug_alloc_output("------------------------------------------------\n");
+	zend_debug_alloc_output("Full Memory Check at %s:%d\n" ZEND_FILE_LINE_RELAY_CC);
+
+	while (p) {
+		if (!_mem_block_check((void *)((char *)p + sizeof(zend_mem_header) + MEM_HEADER_PADDING), (silent?2:3) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC)) {
+			errors++;
+		}
+		p = p->pNext;
+	}
+	zend_debug_alloc_output("End of full memory check %s:%d (%d errors)\n" ZEND_FILE_LINE_RELAY_CC, errors);
+	zend_debug_alloc_output("------------------------------------------------\n");
+}
+#endif
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,146 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_ALLOC_H
+#define ZEND_ALLOC_H
+
+#include <stdio.h>
+
+#include "../TSRM/TSRM.h"
+#include "zend_globals_macros.h"
+
+#include "zend_mm.h"
+
+#define MEM_BLOCK_START_MAGIC	0x7312F8DCL
+#define MEM_BLOCK_END_MAGIC		0x2A8FCC84L
+#define MEM_BLOCK_FREED_MAGIC	0x99954317L
+#define MEM_BLOCK_CACHED_MAGIC	0xFB8277DCL
+
+typedef struct _zend_mem_header {
+#if ZEND_DEBUG
+	long magic;
+	char *filename;
+	uint lineno;
+	int reported;
+	char *orig_filename;
+	uint orig_lineno;
+# ifdef ZTS
+	THREAD_T thread_id;
+# endif
+#endif
+#if ZEND_DEBUG || !defined(ZEND_MM)
+    struct _zend_mem_header *pNext;
+    struct _zend_mem_header *pLast;
+#endif
+	unsigned int size:31;
+	unsigned int cached:1;
+} zend_mem_header;
+
+typedef union _align_test {
+	void *ptr;
+	double dbl;
+	long lng;
+} align_test;
+
+#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
+#define PLATFORM_ALIGNMENT (sizeof(align_test))
+#endif
+
+#define MEM_HEADER_PADDING (((PLATFORM_ALIGNMENT-sizeof(zend_mem_header))%PLATFORM_ALIGNMENT+PLATFORM_ALIGNMENT)%PLATFORM_ALIGNMENT)
+
+
+BEGIN_EXTERN_C()
+
+ZEND_API char *zend_strndup(const char *s, unsigned int length);
+
+ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset 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_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+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);
+
+/* Standard wrapper macros */
+#define emalloc(size)					_emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define safe_emalloc(nmemb, size, offset)       _safe_emalloc((nmemb), (size), (offset) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define efree(ptr)						_efree((ptr) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define ecalloc(nmemb, size)			_ecalloc((nmemb), (size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define erealloc(ptr, size)				_erealloc((ptr), (size), 0 ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define erealloc_recoverable(ptr, size)	_erealloc((ptr), (size), 1 ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define estrdup(s)						_estrdup((s) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define estrndup(s, length)				_estrndup((s), (length) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+
+/* Relay wrapper macros */
+#define emalloc_rel(size)					_emalloc((size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define safe_emalloc_rel(nmemb, size, offset)   _safe_emalloc((nmemb), (size), (offset) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define efree_rel(ptr)						_efree((ptr) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define ecalloc_rel(nmemb, size)			_ecalloc((nmemb), (size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define erealloc_rel(ptr, size)				_erealloc((ptr), (size), 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define erealloc_recoverable_rel(ptr, size)	_erealloc((ptr), (size), 1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define estrdup_rel(s)						_estrdup((s) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define estrndup_rel(s, length)				_estrndup((s), (length) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+
+/* Selective persistent/non persistent allocation macros */
+#define pemalloc(size, persistent) ((persistent)?malloc(size):emalloc(size))
+#define pefree(ptr, persistent)  ((persistent)?free(ptr):efree(ptr))
+#define pecalloc(nmemb, size, persistent) ((persistent)?calloc((nmemb), (size)):ecalloc((nmemb), (size)))
+#define perealloc(ptr, size, persistent) ((persistent)?realloc((ptr), (size)):erealloc((ptr), (size)))
+#define perealloc_recoverable(ptr, size, persistent) ((persistent)?realloc((ptr), (size)):erealloc_recoverable((ptr), (size)))
+#define pestrdup(s, persistent) ((persistent)?strdup(s):estrdup(s))
+
+#define safe_estrdup(ptr)  ((ptr)?(estrdup(ptr)):(empty_string))
+#define safe_estrndup(ptr, len) ((ptr)?(estrndup((ptr), (len))):(empty_string))
+
+ZEND_API int zend_set_memory_limit(unsigned int memory_limit);
+
+ZEND_API void start_memory_manager(TSRMLS_D);
+ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC);
+
+#if ZEND_DEBUG
+ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+ZEND_API void _full_mem_check(int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+void zend_debug_alloc_output(char *format, ...);
+#define mem_block_check(ptr, silent) _mem_block_check(ptr, silent ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define full_mem_check(silent) _full_mem_check(silent ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#else
+#define mem_block_check(type, ptr, silent)
+#define full_mem_check(silent)
+#endif
+
+
+END_EXTERN_C()
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,35 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_BUILTIN_FUNCTIONS_H
+#define ZEND_BUILTIN_FUNCTIONS_H
+
+int zend_startup_builtin_functions(TSRMLS_D);
+
+#endif /* ZEND_BUILTIN_FUNCTIONS_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,791 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_COMPILE_H
+#define ZEND_COMPILE_H
+
+#include "zend.h"
+
+#ifdef HAVE_STDARG_H
+# include <stdarg.h>
+#endif
+
+#include "zend_llist.h"
+
+#define DEBUG_ZEND 0
+
+#define FREE_PNODE(znode)	zval_dtor(&znode->u.constant);
+#define FREE_OP(Ts, op, should_free) if (should_free) zval_dtor(should_free);
+
+#define SET_UNUSED(op)  (op).op_type = IS_UNUSED
+
+#define INC_BPC(op_array)	if (CG(interactive)) { ((op_array)->backpatch_count++); }
+#define DEC_BPC(op_array)	if (CG(interactive)) { ((op_array)->backpatch_count--); }
+#define HANDLE_INTERACTIVE()  if (CG(interactive)) { execute_new_code(TSRMLS_C); }
+
+#define RESET_DOC_COMMENT()      \
+    {                            \
+        CG(doc_comment) = NULL;  \
+        CG(doc_comment_len) = 0; \
+    }
+
+typedef struct _zend_op_array zend_op_array;
+typedef struct _zend_op zend_op;
+
+typedef struct _znode {
+	int op_type;
+	zend_llist *throw_list; /* Try and save this space later on */
+	union {
+		zval constant;
+
+		zend_uint var;
+		zend_uint opline_num; /*  Needs to be signed */
+		zend_op_array *op_array;
+		zend_op *jmp_addr;
+		struct {
+			zend_uint var;	/* dummy */
+			zend_uint type;
+		} EA;
+	} u;
+} znode;
+
+typedef struct _zend_execute_data zend_execute_data;
+
+#define ZEND_OPCODE_HANDLER_ARGS zend_execute_data *execute_data, zend_op_array *op_array TSRMLS_DC
+#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU execute_data, op_array TSRMLS_CC
+
+typedef int (*opcode_handler_t) (ZEND_OPCODE_HANDLER_ARGS);
+
+extern opcode_handler_t zend_opcode_handlers[512];
+
+struct _zend_op {
+	opcode_handler_t handler;
+	znode result;
+	znode op1;
+	znode op2;
+	ulong extended_value;
+	uint lineno;
+	zend_uchar opcode;
+};
+
+
+typedef struct _zend_brk_cont_element {
+	int cont;
+	int brk;
+	int parent;
+} zend_brk_cont_element;
+
+
+#define ZEND_ACC_STATIC			0x01
+#define ZEND_ACC_ABSTRACT		0x02
+#define ZEND_ACC_FINAL			0x04
+#define ZEND_ACC_INTERFACE		0x08
+#define ZEND_ACC_ABSTRACT_CLASS	0x10
+#define ZEND_ACC_FINAL_CLASS	0x20
+
+/* The order of those must be kept - public < protected < private */
+#define ZEND_ACC_PUBLIC		0x100
+#define ZEND_ACC_PROTECTED	0x200
+#define ZEND_ACC_PRIVATE	0x400
+#define ZEND_ACC_PPP_MASK  (ZEND_ACC_PUBLIC | ZEND_ACC_PROTECTED | ZEND_ACC_PRIVATE)
+
+#define ZEND_ACC_CHANGED	0x800
+#define ZEND_ACC_IMPLICIT_PUBLIC	0x1000
+
+char *zend_visibility_string(zend_uint fn_flags);
+
+
+typedef struct _zend_property_info {
+	zend_uint flags;
+	char *name;
+	int name_length;
+	ulong h;
+} zend_property_info;
+
+
+struct _zend_op_array {
+	/* Common elements */
+	zend_uchar type;
+	zend_uchar *arg_types;
+	char *function_name;		
+	zend_class_entry *scope;
+	zend_uint fn_flags;
+	union _zend_function *prototype;
+	/* END of common elements */
+
+	zend_uint *refcount;
+
+	zend_op *opcodes;
+	zend_uint last, size;
+
+	zend_uint T;
+
+	zend_brk_cont_element *brk_cont_array;
+	zend_uint last_brk_cont;
+	zend_uint current_brk_cont;
+
+	/* static variables support */
+	HashTable *static_variables;
+
+	zend_op *start_op;
+	int backpatch_count;
+
+	zend_bool return_reference;
+	zend_bool done_pass_two;
+	zend_bool uses_this;
+
+	char *filename;
+	zend_uint line_start;
+	zend_uint line_end;
+	char *doc_comment;
+	zend_uint doc_comment_len;
+
+	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
+};
+
+
+typedef struct _zend_internal_function {
+	/* Common elements */
+	zend_uchar type;
+	zend_uchar *arg_types;
+	char *function_name;		
+	zend_class_entry *scope;
+	zend_uint fn_flags;	
+	union _zend_function *prototype;
+	/* END of common elements */
+
+	void (*handler)(INTERNAL_FUNCTION_PARAMETERS);
+} zend_internal_function;
+
+#define ZEND_FN_SCOPE_NAME(function)  ((function) && (function)->common.scope ? (function)->common.scope->name : "")
+
+typedef union _zend_function {
+	zend_uchar type;	/* MUST be the first element of this struct! */
+
+	struct {
+		zend_uchar type;  /* never used */
+		zend_uchar *arg_types;
+		char *function_name;
+		zend_class_entry *scope;
+		zend_uint fn_flags;
+		union _zend_function *prototype;
+	} common;
+	
+	zend_op_array op_array;
+	zend_internal_function internal_function;
+} zend_function;
+
+
+typedef struct _zend_function_state {
+	HashTable *function_symbol_table;
+	zend_function *function;
+	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
+} zend_function_state;
+
+
+typedef struct _zend_switch_entry {
+	znode cond;
+	int default_case;
+	int control_var;
+} zend_switch_entry;
+
+
+typedef struct _list_llist_element {
+	znode var;
+	zend_llist dimensions;
+	znode value;
+} list_llist_element;
+
+union _temp_variable;
+
+struct _zend_execute_data {
+	struct _zend_op *opline;
+	zend_function_state function_state;
+	zend_function *fbc; /* Function Being Called */
+	zend_function *fbc_constructor;
+	zend_op_array *op_array;
+	zval *object;
+	union _temp_variable *Ts;
+	zend_bool original_in_execution;
+	zend_class_entry *calling_scope;
+	struct _zend_execute_data *prev_execute_data;
+};
+
+#define EX(element) execute_data.element
+
+
+#define IS_CONST	(1<<0)
+#define IS_TMP_VAR	(1<<1)
+#define IS_VAR		(1<<2)
+#define IS_UNUSED	(1<<3)	/* Unused variable */
+
+#define EXT_TYPE_UNUSED		(1<<0)
+
+#include "zend_globals.h"
+
+BEGIN_EXTERN_C()
+
+void init_compiler(TSRMLS_D);
+void shutdown_compiler(TSRMLS_D);
+void zend_init_compiler_data_structures(TSRMLS_D);
+
+extern ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC);
+
+ZEND_API int lex_scan(zval *zendlval TSRMLS_DC);
+void startup_scanner(TSRMLS_D);
+void shutdown_scanner(TSRMLS_D);
+
+ZEND_API char *zend_set_compiled_filename(char *new_compiled_filename TSRMLS_DC);
+ZEND_API void zend_restore_compiled_filename(char *original_compiled_filename TSRMLS_DC);
+ZEND_API char *zend_get_compiled_filename(TSRMLS_D);
+ZEND_API int zend_get_compiled_lineno(TSRMLS_D);
+
+#ifdef ZTS
+const char *zend_get_zendtext(TSRMLS_D);
+int zend_get_zendleng(TSRMLS_D);
+#endif
+
+
+/* parser-driven code generators */
+void zend_do_fold_binary_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC);
+void zend_do_fold_constant(znode *result, znode *constant_name TSRMLS_DC);
+void zend_do_binary_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC);
+void zend_do_unary_op(zend_uchar op, znode *result, znode *op1 TSRMLS_DC);
+void zend_do_binary_assign_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC);
+void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC);
+void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar TSRMLS_DC);
+void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC);
+void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar op TSRMLS_DC);
+void zend_do_indirect_references(znode *result, znode *num_references, znode *variable TSRMLS_DC);
+void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC);
+void zend_do_fetch_global_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC);
+
+void fetch_array_begin(znode *result, znode *varname, znode *first_dim TSRMLS_DC);
+void fetch_array_dim(znode *result, znode *parent, znode *dim TSRMLS_DC);
+void fetch_string_offset(znode *result, znode *parent, znode *offset TSRMLS_DC);
+void zend_do_fetch_static_member(znode *class_znode TSRMLS_DC);
+void zend_do_print(znode *result, znode *arg TSRMLS_DC);
+void zend_do_echo(znode *arg TSRMLS_DC);
+typedef int (*unary_op_type)(zval *, zval *);
+ZEND_API unary_op_type get_unary_op(int opcode);
+ZEND_API void *get_binary_op(int opcode);
+
+void zend_do_while_cond(znode *expr, znode *close_bracket_token TSRMLS_DC);
+void zend_do_while_end(znode *while_token, znode *close_bracket_token TSRMLS_DC);
+void zend_do_do_while_begin(TSRMLS_D);
+void zend_do_do_while_end(znode *do_token, znode *expr_open_bracket, znode *expr TSRMLS_DC);
+
+
+void zend_do_if_cond(znode *cond, znode *closing_bracket_token TSRMLS_DC);
+void zend_do_if_after_statement(znode *closing_bracket_token, unsigned char initialize TSRMLS_DC);
+void zend_do_if_end(TSRMLS_D);
+
+void zend_do_for_cond(znode *expr, znode *second_semicolon_token TSRMLS_DC);
+void zend_do_for_before_statement(znode *cond_start, znode *second_semicolon_token TSRMLS_DC);
+void zend_do_for_end(znode *second_semicolon_token TSRMLS_DC);
+
+void zend_do_pre_incdec(znode *result, znode *op1, zend_uchar op TSRMLS_DC);
+void zend_do_post_incdec(znode *result, znode *op1, zend_uchar op TSRMLS_DC);
+
+void zend_do_begin_variable_parse(TSRMLS_D);
+void zend_do_end_variable_parse(int type, int arg_offset TSRMLS_DC);
+
+void zend_check_writable_variable(znode *variable);
+
+void zend_do_free(znode *op1 TSRMLS_DC);
+
+void zend_do_init_string(znode *result TSRMLS_DC);
+void zend_do_add_char(znode *result, znode *op1, znode *op2 TSRMLS_DC);
+void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC);
+void zend_do_add_variable(znode *result, znode *op1, znode *op2 TSRMLS_DC);
+
+int zend_do_verify_access_types(znode *current_access_type, znode *new_modifier);
+void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, znode *fn_flags_znode TSRMLS_DC);
+void zend_do_end_function_declaration(znode *function_token TSRMLS_DC);
+void zend_do_receive_arg(zend_uchar op, znode *var, znode *offset, znode *initialization, znode *class_type, zend_uchar pass_type TSRMLS_DC);
+int zend_do_begin_function_call(znode *function_name TSRMLS_DC);
+void zend_do_begin_method_call(znode *left_bracket TSRMLS_DC);
+void zend_do_begin_dynamic_function_call(znode *function_name TSRMLS_DC);
+void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC);
+void zend_do_fetch_class_name(znode *result, znode *class_entry, znode *class_name, zend_bool case_sensitive TSRMLS_DC);
+void zend_do_begin_class_member_function_call(TSRMLS_D);
+void zend_do_end_function_call(znode *function_name, znode *result, znode *argument_list, int is_method, int is_dynamic_fcall TSRMLS_DC);
+void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC);
+
+void zend_do_try(znode *try_token TSRMLS_DC);
+void zend_do_begin_catch(znode *try_token, znode *catch_class, znode *catch_var, zend_bool first_catch TSRMLS_DC);
+void zend_do_end_catch(znode *try_token TSRMLS_DC);
+void zend_do_throw(znode *expr TSRMLS_DC);
+
+ZEND_API int do_bind_function(zend_op *opline, HashTable *function_table, HashTable *class_table, int compile_time);
+ZEND_API zend_class_entry *do_bind_class(zend_op *opline, HashTable *function_table, HashTable *class_table TSRMLS_DC);
+ZEND_API zend_class_entry *do_bind_inherited_class(zend_op *opline, HashTable *function_table, HashTable *class_table, zend_class_entry *parent_ce TSRMLS_DC);
+ZEND_API void zend_do_inherit_interfaces(zend_class_entry *ce, zend_class_entry *ce2);
+ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry *iface);
+void zend_do_implements_interface(znode *interface_znode TSRMLS_DC);
+
+void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce);
+void zend_do_early_binding(TSRMLS_D);
+
+void zend_do_pass_param(znode *param, zend_uchar op, int offset TSRMLS_DC);
+
+
+void zend_do_boolean_or_begin(znode *expr1, znode *op_token TSRMLS_DC);
+void zend_do_boolean_or_end(znode *result, znode *expr1, znode *expr2, znode *op_token TSRMLS_DC);
+void zend_do_boolean_and_begin(znode *expr1, znode *op_token TSRMLS_DC);
+void zend_do_boolean_and_end(znode *result, znode *expr1, znode *expr2, znode *op_token TSRMLS_DC);
+
+void zend_do_brk_cont(zend_uchar op, znode *expr TSRMLS_DC);
+
+void zend_do_switch_cond(znode *cond TSRMLS_DC);
+void zend_do_switch_end(znode *case_list TSRMLS_DC);
+void zend_do_case_before_statement(znode *case_list, znode *case_token, znode *case_expr TSRMLS_DC);
+void zend_do_case_after_statement(znode *result, znode *case_token TSRMLS_DC);
+void zend_do_default_before_statement(znode *case_list, znode *default_token TSRMLS_DC);
+
+void zend_do_begin_class_declaration(znode *class_token, znode *class_name, znode *parent_class_name TSRMLS_DC);
+void zend_do_end_class_declaration(znode *class_token, znode *parent_token TSRMLS_DC);
+void zend_do_declare_property(znode *var_name, znode *value, zend_uint access_type TSRMLS_DC);
+void zend_do_declare_implicit_property(TSRMLS_D);
+void zend_do_declare_class_constant(znode *var_name, znode *value TSRMLS_DC);
+
+void zend_do_fetch_property(znode *result, znode *object, znode *property TSRMLS_DC);
+
+
+void zend_do_push_object(znode *object TSRMLS_DC);
+void zend_do_pop_object(znode *object TSRMLS_DC);
+
+
+void zend_do_begin_new_object(znode *new_token, znode *class_type TSRMLS_DC);
+void zend_do_end_new_object(znode *result, znode *new_token, znode *argument_list TSRMLS_DC);
+
+void zend_do_fetch_constant(znode *result, znode *constant_container, znode *constant_name, int mode TSRMLS_DC);
+
+void zend_do_shell_exec(znode *result, znode *cmd TSRMLS_DC);
+
+void zend_do_init_array(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC);
+void zend_do_add_array_element(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC);
+void zend_do_add_static_array_element(znode *result, znode *offset, znode *expr);
+void zend_do_list_init(TSRMLS_D);
+void zend_do_list_end(znode *result, znode *expr TSRMLS_DC);
+void zend_do_add_list_element(znode *element TSRMLS_DC);
+void zend_do_new_list_begin(TSRMLS_D);
+void zend_do_new_list_end(TSRMLS_D);
+
+void zend_do_cast(znode *result, znode *expr, int type TSRMLS_DC);
+void zend_do_include_or_eval(int type, znode *result, znode *op1 TSRMLS_DC);
+
+void zend_do_unset(znode *variable TSRMLS_DC);
+void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC);
+
+void zend_do_instanceof(znode *result, znode *expr, znode *class_znode, int type TSRMLS_DC);
+
+void zend_do_foreach_begin(znode *foreach_token, znode *array, znode *open_brackets_token, znode *as_token, int variable TSRMLS_DC);
+void zend_do_foreach_cont(znode *value, znode *key, znode *as_token, znode *foreach_token TSRMLS_DC);
+void zend_do_foreach_end(znode *foreach_token, znode *open_brackets_token TSRMLS_DC);
+
+void zend_do_declare_begin(TSRMLS_D);
+void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC);
+void zend_do_declare_end(znode *declare_token TSRMLS_DC);
+
+void zend_do_end_heredoc(TSRMLS_D);
+
+void zend_do_exit(znode *result, znode *message TSRMLS_DC);
+
+void zend_do_begin_silence(znode *strudel_token TSRMLS_DC);
+void zend_do_end_silence(znode *strudel_token TSRMLS_DC);
+
+void zend_do_begin_qm_op(znode *cond, znode *qm_token TSRMLS_DC);
+void zend_do_qm_true(znode *true_value, znode *qm_token, znode *colon_token TSRMLS_DC);
+void zend_do_qm_false(znode *result, znode *false_value, znode *qm_token, znode *colon_token TSRMLS_DC);
+
+void zend_do_extended_info(TSRMLS_D);
+void zend_do_extended_fcall_begin(TSRMLS_D);
+void zend_do_extended_fcall_end(TSRMLS_D);
+
+void zend_do_ticks(TSRMLS_D);
+
+void zend_do_abstract_method(znode *function_name, znode *modifiers, znode *body TSRMLS_DC);
+
+ZEND_API void function_add_ref(zend_function *function);
+
+#define INITIAL_OP_ARRAY_SIZE 64
+
+
+/* helper functions in zend_language_scanner.l */
+ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSRMLS_DC);
+ZEND_API zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC);	
+ZEND_API zend_op_array *compile_filename(int type, zval *filename TSRMLS_DC);
+ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_count, ...);
+ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC);
+ZEND_API void init_op_array(zend_op_array *op_array, zend_uchar type, int initial_ops_size TSRMLS_DC);
+ZEND_API void destroy_op_array(zend_op_array *op_array TSRMLS_DC);
+ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle TSRMLS_DC);
+ZEND_API void zend_file_handle_dtor(zend_file_handle *fh);
+ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC);
+ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC);
+
+ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC);
+ZEND_API void destroy_zend_class(zend_class_entry **pce);
+void zend_class_add_ref(zend_class_entry **ce);
+
+void mangle_property_name(char **dest, int *dest_length, char *src1, int src1_length, char *src2, int src2_length);
+void unmangle_property_name(char *mangled_property, char **prop_name, char **class_name);
+void zend_duplicate_property_info(zend_property_info *property_info);
+void zend_destroy_property_info(zend_property_info *property_info);
+
+#define ZEND_FUNCTION_DTOR (void (*)(void *)) destroy_zend_function
+#define ZEND_CLASS_DTOR (void (*)(void *)) destroy_zend_class
+
+zend_op *get_next_op(zend_op_array *op_array TSRMLS_DC);
+void init_op(zend_op *op TSRMLS_DC);
+int get_next_op_number(zend_op_array *op_array);
+int print_class(zend_class_entry *class_entry TSRMLS_DC);
+void print_op_array(zend_op_array *op_array, int optimizations);
+int pass_two(zend_op_array *op_array TSRMLS_DC);
+zend_brk_cont_element *get_next_brk_cont_element(zend_op_array *op_array);
+ZEND_API zend_bool zend_is_compiling(TSRMLS_D);
+ZEND_API char *zend_make_compiled_string_description(char *name TSRMLS_DC);
+void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify_handlers TSRMLS_DC);
+int zend_get_class_fetch_type(char *class_name, uint class_name_len);
+
+typedef zend_bool (*zend_auto_global_callback)(char *name, uint name_len TSRMLS_DC);
+typedef struct _zend_auto_global {
+	char *name;
+	uint name_len;
+	zend_auto_global_callback auto_global_callback;
+	zend_bool armed;
+} zend_auto_global;
+
+void zend_auto_global_dtor(zend_auto_global *auto_global);
+ZEND_API int zend_register_auto_global(char *name, uint name_len, zend_auto_global_callback auto_global_callback TSRMLS_DC);
+ZEND_API zend_bool zend_is_auto_global(char *name, uint name_len TSRMLS_DC);
+
+int zendlex(znode *zendlval TSRMLS_DC);
+
+/* BEGIN: OPCODES */
+#define ZEND_NOP					0
+									
+#define ZEND_ADD					1
+#define ZEND_SUB					2
+#define ZEND_MUL					3
+#define ZEND_DIV					4
+#define ZEND_MOD					5
+#define ZEND_SL						6
+#define ZEND_SR						7
+#define ZEND_CONCAT					8
+#define ZEND_BW_OR					9
+#define ZEND_BW_AND					10
+#define ZEND_BW_XOR					11
+#define ZEND_BW_NOT					12
+#define ZEND_BOOL_NOT				13
+#define ZEND_BOOL_XOR				14
+#define ZEND_IS_IDENTICAL			15
+#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				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				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					40
+#define ZEND_PRINT					41
+
+#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			53
+#define ZEND_ADD_CHAR				54
+#define ZEND_ADD_STRING				55
+#define ZEND_ADD_VAR				56
+
+#define ZEND_BEGIN_SILENCE			57
+#define ZEND_END_SILENCE			58
+
+#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					63
+#define ZEND_RECV_INIT				64
+									
+#define ZEND_SEND_VAL				65
+#define ZEND_SEND_VAR				66
+#define ZEND_SEND_REF				67
+
+#define ZEND_NEW 					68
+#define ZEND_JMP_NO_CTOR			69
+#define ZEND_FREE					70
+									
+#define ZEND_INIT_ARRAY				71
+#define ZEND_ADD_ARRAY_ELEMENT		72
+									
+#define ZEND_INCLUDE_OR_EVAL		73
+									
+#define ZEND_UNSET_VAR				74
+#define ZEND_UNSET_DIM_OBJ			75
+									
+#define ZEND_FE_RESET				77
+#define ZEND_FE_FETCH				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				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		98
+#define ZEND_FETCH_CONSTANT			99
+
+/* Hole - 100 */
+
+#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					105
+
+#define ZEND_SEND_VAR_NO_REF		106
+
+#define ZEND_CATCH					107
+#define ZEND_THROW					108
+
+#define ZEND_FETCH_CLASS			109
+
+#define ZEND_CLONE					110
+
+#define ZEND_INIT_CTOR_CALL			111
+#define ZEND_INIT_METHOD_CALL		112
+#define ZEND_INIT_STATIC_METHOD_CALL 113
+
+#define ZEND_ISSET_ISEMPTY_VAR		114
+#define ZEND_ISSET_ISEMPTY_DIM_OBJ	115
+
+#define	ZEND_IMPORT_FUNCTION		116
+#define	ZEND_IMPORT_CLASS			117
+#define	ZEND_IMPORT_CONST			118
+									
+#define ZEND_PRE_INC_OBJ			132
+#define ZEND_PRE_DEC_OBJ			133
+#define ZEND_POST_INC_OBJ			134
+#define ZEND_POST_DEC_OBJ			135
+								 	
+#define ZEND_ASSIGN_OBJ				136
+#define ZEND_OP_DATA				137
+
+#define ZEND_INSTANCEOF				138
+
+#define ZEND_DECLARE_CLASS				139
+#define ZEND_DECLARE_INHERITED_CLASS	140
+#define ZEND_DECLARE_FUNCTION			141
+
+#define ZEND_RAISE_ABSTRACT_ERROR	142
+
+
+
+#define ZEND_ADD_INTERFACE			144
+#define ZEND_VERIFY_INSTANCEOF		145
+#define ZEND_VERIFY_ABSTRACT_CLASS	146
+
+#define ZEND_ASSIGN_DIM				147
+
+/* end of block */
+/* END: OPCODES */
+
+
+
+
+/* global/local fetches */
+#define ZEND_FETCH_GLOBAL			0
+#define ZEND_FETCH_LOCAL			1
+#define ZEND_FETCH_STATIC			2
+#define ZEND_FETCH_STATIC_MEMBER	3
+
+
+/* obj/dim unsets */
+#define ZEND_UNSET_DIM				1
+#define ZEND_UNSET_OBJ				2
+
+/* class fetches */
+#define ZEND_FETCH_CLASS_DEFAULT	0
+#define ZEND_FETCH_CLASS_SELF		1
+#define ZEND_FETCH_CLASS_PARENT		2
+#define ZEND_FETCH_CLASS_MAIN		3
+#define ZEND_FETCH_CLASS_GLOBAL		4
+#define ZEND_FETCH_CLASS_AUTO		5
+
+
+/* variable parsing type (compile-time) */
+#define ZEND_PARSED_MEMBER				(1<<0)
+#define ZEND_PARSED_METHOD_CALL			(1<<1)
+#define ZEND_PARSED_STATIC_MEMBER		(1<<2)
+#define ZEND_PARSED_FUNCTION_CALL		(1<<3)
+#define ZEND_PARSED_VARIABLE			(1<<4)
+#define ZEND_PARSED_REFERENCE_VARIABLE	(1<<5)
+
+
+/* unset types */
+#define ZEND_UNSET_REG 0
+
+/* var status for backpatching */
+#define BP_VAR_R			0
+#define BP_VAR_W			1
+#define BP_VAR_RW			2
+#define BP_VAR_IS			3
+#define BP_VAR_NA			4	/* if not applicable */
+#define BP_VAR_FUNC_ARG		5
+#define BP_VAR_UNSET		6
+
+
+#define ZEND_INTERNAL_FUNCTION		1
+#define ZEND_USER_FUNCTION			2
+#define ZEND_OVERLOADED_FUNCTION	3
+#define	ZEND_EVAL_CODE				4
+
+#define ZEND_INTERNAL_CLASS         1
+#define ZEND_USER_CLASS             2
+
+#define ZEND_EVAL				(1<<0)
+#define ZEND_INCLUDE			(1<<1)
+#define ZEND_INCLUDE_ONCE		(1<<2)
+#define ZEND_REQUIRE			(1<<3)
+#define ZEND_REQUIRE_ONCE		(1<<4)
+
+#define ZEND_ISSET				(1<<0)
+#define ZEND_ISEMPTY			(1<<1)
+
+#define ZEND_CT	(1<<0)
+#define ZEND_RT (1<<1)
+
+
+#define ZEND_HANDLE_FILENAME		0
+#define ZEND_HANDLE_FD				1
+#define ZEND_HANDLE_FP				2
+#define ZEND_HANDLE_STDIOSTREAM		3
+#define ZEND_HANDLE_FSTREAM			4
+#define ZEND_HANDLE_STREAM			5
+
+#define ZEND_FETCH_STANDARD		0
+#define ZEND_FETCH_ADD_LOCK		1
+
+#define ZEND_MEMBER_FUNC_CALL	1<<0
+
+#define ZEND_ARG_SEND_BY_REF (1<<0)
+#define ZEND_ARG_COMPILE_TIME_BOUND (1<<1)
+
+#define AI_USE_PTR(ai) \
+	if ((ai).ptr_ptr) { \
+		(ai).ptr = *((ai).ptr_ptr); \
+		(ai).ptr_ptr = &((ai).ptr); \
+	} else { \
+		(ai).ptr = NULL; \
+	}
+
+/* Lost In Stupid Parentheses */
+#define ARG_SHOULD_BE_SENT_BY_REF(offset, conduct_check, arg_types)	\
+	(																\
+		conduct_check												\
+		&& arg_types												\
+		&&															\
+		(															\
+			(														\
+				offset<=arg_types[0]								\
+				&& arg_types[offset]==BYREF_FORCE					\
+			)														\
+		||	(														\
+				offset>=arg_types[0]								\
+				&& arg_types[arg_types[0]]==BYREF_FORCE_REST		\
+			)														\
+		)															\
+	)
+
+#define ZEND_RETURN_VAL 0
+#define ZEND_RETURN_REF 1
+
+END_EXTERN_C()
+
+#define ZEND_CLONE_FUNC_NAME		"__clone"
+#define ZEND_CONSTRUCTOR_FUNC_NAME	"__construct"
+#define ZEND_DESTRUCTOR_FUNC_NAME	"__destruct"
+#define ZEND_GET_FUNC_NAME          "__get"
+#define ZEND_SET_FUNC_NAME          "__set"
+#define ZEND_CALL_FUNC_NAME         "__call"
+
+#endif /* ZEND_COMPILE_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,88 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_CONFIG_NW_H
+#define ZEND_CONFIG_NW_H
+
+
+#include <string.h>
+#include <float.h>
+
+typedef unsigned long ulong;
+typedef unsigned int uint;
+
+#define HAVE_ALLOCA 1
+#define HAVE_LIMITS_H 1
+/* #include <malloc.h> */
+
+#define HAVE_STRING_H 1
+
+#undef HAVE_KILL
+#define HAVE_GETPID 1
+/* #define HAVE_ALLOCA_H 1 */
+#define HAVE_MEMCPY 1
+#define HAVE_STRDUP 1
+#define HAVE_SYS_TYPES_H 1
+/* #define HAVE_STDIOSTR_H 1 */
+#define HAVE_CLASS_ISTDIOSTREAM
+#define istdiostream stdiostream
+#define HAVE_STDARG_H	1
+#define HAVE_DLFCN_H	1
+/* #define HAVE_LIBDL 1 */
+#define HAVE_SNPRINTF	1
+#define HAVE_VSNPRINTF	1
+
+/*
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+#define zend_isinf(a)	0
+#define zend_finite(x)	_finite(x)
+#define zend_isnan(x)	_isnan(x)
+*/
+
+#define zend_sprintf sprintf
+
+/* This will cause the compilation process to be MUCH longer, but will generate
+ * a much quicker PHP binary
+ */
+/* 
+#undef inline
+#ifdef ZEND_WIN32_FORCE_INLINE
+# define inline __forceinline
+#else
+# define inline
+#endif
+*/
+
+/*
+#define zend_finite(A) _finite(A)
+#define zend_isnan(A) _isnan(A)
+*/
+
+#endif /* ZEND_CONFIG_NW_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,107 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_CONFIG_W32_H
+#define ZEND_CONFIG_W32_H
+
+#define HAVE_ALLOCA 1
+#define HAVE_LIMITS_H 1
+#define _CRTDBG_MAP_ALLOC
+
+#include <malloc.h>
+#include <stdlib.h>
+#include <crtdbg.h>
+
+#include <string.h>
+
+#ifndef ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <winsock2.h>
+#include <windows.h>
+
+#include <float.h>
+
+typedef unsigned long ulong;
+typedef unsigned int uint;
+
+#undef HAVE_KILL
+#define HAVE_GETPID 1
+/* #define HAVE_ALLOCA_H 1 */
+#define HAVE_MEMCPY 1
+#define HAVE_STRDUP 1
+#define HAVE_SYS_TYPES_H 1
+#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 snprintf _snprintf
+#define vsnprintf _vsnprintf
+#define strcasecmp(s1, s2) stricmp(s1, s2)
+#define strncasecmp(s1, s2, n) strnicmp(s1, s2, n)
+#define zend_isinf(a)	((_fpclass(a) == _FPCLASS_PINF) || (_fpclass(a) == _FPCLASS_NINF))
+#define zend_finite(x)	_finite(x)
+#define zend_isnan(x)	_isnan(x)
+
+#define zend_sprintf sprintf
+
+/* This will cause the compilation process to be MUCH longer, but will generate
+ * a much quicker PHP binary
+ */
+#undef inline
+#ifdef ZEND_WIN32_FORCE_INLINE
+# define inline __forceinline
+#else
+# define inline
+#endif
+
+#ifdef LIBZEND_EXPORTS
+#	define ZEND_API __declspec(dllexport)
+#else
+#	define ZEND_API __declspec(dllimport)
+#endif
+
+#define ZEND_DLEXPORT		__declspec(dllexport)
+#define ZEND_DLIMPORT		__declspec(dllimport)
+
+/* 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 */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,337 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include "zend.h"
+#include "zend_constants.h"
+#include "zend_execute.h"
+#include "zend_variables.h"
+#include "zend_operators.h"
+#include "zend_globals.h"
+
+
+void free_zend_constant(zend_constant *c)
+{
+	if (!(c->flags & CONST_PERSISTENT)) {
+		zval_dtor(&c->value);
+	}
+	free(c->name);
+}
+
+
+void copy_zend_constant(zend_constant *c)
+{
+	c->name = zend_strndup(c->name, c->name_len);
+	if (!(c->flags & CONST_PERSISTENT)) {
+		zval_copy_ctor(&c->value);
+	}
+}
+
+
+void zend_copy_constants(HashTable *target, HashTable *source)
+{
+	zend_constant tmp_constant;
+
+	zend_hash_copy(target, source, (copy_ctor_func_t) copy_zend_constant, &tmp_constant, sizeof(zend_constant));
+}
+
+
+static int clean_non_persistent_constant(zend_constant *c TSRMLS_DC)
+{
+	if (c->flags & CONST_PERSISTENT) {
+		return EG(full_tables_cleanup) ? 0 : ZEND_HASH_APPLY_STOP;
+	} else {
+		return EG(full_tables_cleanup) ? 1 : ZEND_HASH_APPLY_REMOVE;
+	}
+}
+
+
+static int clean_module_constant(zend_constant *c, int *module_number TSRMLS_DC)
+{
+	if (c->module_number == *module_number) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+
+void clean_module_constants(int module_number TSRMLS_DC)
+{
+	zend_hash_apply_with_argument(EG(zend_constants), (apply_func_arg_t) clean_module_constant, (void *) &module_number TSRMLS_CC);
+}
+
+
+int zend_startup_constants(TSRMLS_D)
+{
+	EG(zend_constants) = (HashTable *) malloc(sizeof(HashTable));
+
+	if (zend_hash_init(EG(zend_constants), 20, NULL, ZEND_CONSTANT_DTOR, 1)==FAILURE) {
+		return FAILURE;
+	}
+	return SUCCESS;
+}
+
+
+
+void zend_register_standard_constants(TSRMLS_D)
+{
+	REGISTER_MAIN_LONG_CONSTANT("E_ERROR", E_ERROR, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_WARNING", E_WARNING, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_PARSE", E_PARSE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_NOTICE", E_NOTICE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_CORE_ERROR", E_CORE_ERROR, CONST_PERSISTENT | CONST_CS);
+	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);
+
+	/* true/false constants */
+	{
+		zend_constant c;
+	
+		c.value.type = IS_BOOL;
+		c.flags = CONST_PERSISTENT;
+		c.module_number = 0;
+
+		c.name = zend_strndup(ZEND_STRS("TRUE"));
+		c.name_len = sizeof("TRUE");
+		c.value.value.lval = 1;
+		c.value.type = IS_BOOL;
+		zend_register_constant(&c TSRMLS_CC);
+		
+		c.name = zend_strndup(ZEND_STRS("FALSE"));
+		c.name_len = sizeof("FALSE");
+		c.value.value.lval = 0;
+		c.value.type = IS_BOOL;
+		zend_register_constant(&c TSRMLS_CC);
+
+		c.name = zend_strndup(ZEND_STRS("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 TSRMLS_CC);
+
+		c.name = zend_strndup(ZEND_STRS("NULL"));
+		c.name_len = sizeof("NULL");
+		c.value.type = IS_NULL;
+		zend_register_constant(&c TSRMLS_CC);
+	}
+}
+
+
+int zend_shutdown_constants(TSRMLS_D)
+{
+	zend_hash_destroy(EG(zend_constants));
+	free(EG(zend_constants));
+	return SUCCESS;
+}
+
+
+void clean_non_persistent_constants(TSRMLS_D)
+{
+	if (EG(full_tables_cleanup)) {
+		zend_hash_apply(EG(zend_constants), (apply_func_t) clean_non_persistent_constant TSRMLS_CC);
+	} else {
+		zend_hash_reverse_apply(EG(zend_constants), (apply_func_t) clean_non_persistent_constant TSRMLS_CC);
+	}
+}
+
+
+ZEND_API void zend_register_long_constant(char *name, uint name_len, long lval, int flags, int module_number TSRMLS_DC)
+{
+	zend_constant c;
+	
+	c.value.type = IS_LONG;
+	c.value.value.lval = lval;
+	c.flags = flags;
+	c.name = zend_strndup(name, name_len);
+	c.name_len = name_len;
+	c.module_number = module_number;
+	zend_register_constant(&c TSRMLS_CC);
+}
+
+
+ZEND_API void zend_register_double_constant(char *name, uint name_len, double dval, int flags, int module_number TSRMLS_DC)
+{
+	zend_constant c;
+	
+	c.value.type = IS_DOUBLE;
+	c.value.value.dval = dval;
+	c.flags = flags;
+	c.name = zend_strndup(name, name_len);
+	c.name_len = name_len;
+	c.module_number = module_number;
+	zend_register_constant(&c TSRMLS_CC);
+}
+
+
+ZEND_API void zend_register_stringl_constant(char *name, uint name_len, char *strval, uint strlen, int flags, int module_number TSRMLS_DC)
+{
+	zend_constant c;
+	
+	c.value.type = IS_STRING;
+	c.value.value.str.val = strval;
+	c.value.value.str.len = strlen;
+	c.flags = flags;
+	c.name = zend_strndup(name, name_len);
+	c.name_len = name_len;
+	c.module_number = module_number;
+	zend_register_constant(&c TSRMLS_CC);
+}
+
+
+ZEND_API void zend_register_string_constant(char *name, uint name_len, char *strval, int flags, int module_number TSRMLS_DC)
+{
+	zend_register_stringl_constant(name, name_len, strval, strlen(strval), flags, module_number TSRMLS_CC);
+}
+
+
+ZEND_API int zend_get_constant(char *name, uint name_len, zval *result TSRMLS_DC)
+{
+	zend_constant *c;
+	char *lookup_name;
+	int retval = 1;
+	char *colon;
+
+	if ((colon = memchr(name, ':', name_len)) && colon[1] == ':') {
+		/* class constant */
+		zend_class_entry **ce = NULL, *scope;
+		int class_name_len = colon-name;
+		int const_name_len = name_len - class_name_len - 2;
+		char *constant_name = colon+2;
+		zval **ret_constant;
+
+		if (EG(in_execution)) {
+			scope = EG(scope);
+		} else {
+			scope = CG(active_class_entry);
+		}
+		
+		lookup_name = do_alloca(class_name_len+1);
+		zend_str_tolower_copy(lookup_name, name, class_name_len);
+		lookup_name[class_name_len] = '\0';
+		if (class_name_len == sizeof("self")-1 && strcmp(lookup_name, "self") == 0) {
+			if (scope) {
+				ce = &scope;
+			} else {
+				zend_error(E_ERROR, "Cannot access self:: when no class scope is active");
+				retval = 0;
+			}
+		} else if (class_name_len == sizeof("parent")-1 && strcmp(lookup_name, "parent") == 0) {
+			if (!scope) {   	 
+				zend_error(E_ERROR, "Cannot access parent:: when no class scope is active");
+			} else if (!scope->parent) { 	 
+				zend_error(E_ERROR, "Cannot access parent:: when current class scope has no parent"); 	 
+			} else {
+				ce = &scope->parent;
+			}
+		} else {
+			if (zend_lookup_class(lookup_name, class_name_len, &ce TSRMLS_CC) != SUCCESS) {
+				retval = 0;
+			}
+		}
+
+		if (retval && ce) {
+			if (zend_hash_find(&((*ce)->constants_table), constant_name, const_name_len+1, (void **) &ret_constant) != SUCCESS) {
+				retval = 0;
+			}
+		} else {
+			retval = 0;
+		}
+
+		if (retval) {
+			*result = **ret_constant;
+			zval_copy_ctor(result);
+		}
+		
+		free_alloca(lookup_name);
+		return retval;
+	}
+	
+	if (zend_hash_find(EG(zend_constants), name, name_len+1, (void **) &c) == FAILURE) {
+		lookup_name = do_alloca(name_len+1);
+		zend_str_tolower_copy(lookup_name, name, name_len);
+		lookup_name[name_len] = '\0';
+		 
+		if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, (void **) &c)==SUCCESS) {
+			if ((c->flags & CONST_CS) && memcmp(c->name, name, name_len)!=0) {
+				retval=0;
+			}
+		} else {
+			retval=0;
+		}
+		free_alloca(lookup_name);
+	}
+
+	if (retval) {
+		*result = c->value;
+		zval_copy_ctor(result);
+		result->refcount = 1;
+		result->is_ref = 0;
+	}
+
+	return retval;
+}
+
+
+ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC)
+{
+	char *lowercase_name;
+	int ret = SUCCESS;
+
+#if 0
+	printf("Registering constant for module %d\n", c->module_number);
+#endif
+
+	if (!(c->flags & CONST_CS)) {
+		/* keep in mind that c->name_len already contains the '\0' */
+		lowercase_name = do_alloca(c->name_len);
+		zend_str_tolower_copy(lowercase_name, c->name, c->name_len - 1);
+	} else {
+		lowercase_name = do_alloca(c->name_len + 1);
+		memcpy(lowercase_name, c->name, c->name_len);
+		lowercase_name[c->name_len] = '\0';
+	}
+
+	if (zend_hash_add(EG(zend_constants), lowercase_name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {
+		free(c->name);
+		if (!(c->flags & CONST_PERSISTENT)) {
+			zval_dtor(&c->value);
+		}
+		zend_error(E_NOTICE,"Constant %s already defined", lowercase_name);
+		ret = FAILURE;
+	}
+	free_alloca(lowercase_name);
+	return ret;
+}
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,75 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_CONSTANTS_H
+#define ZEND_CONSTANTS_H
+
+#include "zend_globals.h"
+
+#define CONST_CS				(1<<0)				/* Case Sensitive */
+#define CONST_PERSISTENT		(1<<1)				/* Persistent */
+
+typedef struct _zend_constant {
+	zval value;
+	int flags;
+	char *name;
+	uint name_len;
+	int module_number;
+} zend_constant;
+
+#define REGISTER_LONG_CONSTANT(name, lval, flags)  zend_register_long_constant((name), sizeof(name), (lval), (flags), module_number TSRMLS_CC)
+#define REGISTER_DOUBLE_CONSTANT(name, dval, flags)  zend_register_double_constant((name), sizeof(name), (dval), (flags), module_number TSRMLS_CC)
+#define REGISTER_STRING_CONSTANT(name, str, flags)  zend_register_string_constant((name), sizeof(name), (str), (flags), module_number TSRMLS_CC)
+#define REGISTER_STRINGL_CONSTANT(name, str, len, flags)  zend_register_stringl_constant((name), sizeof(name), (str), (len), (flags), module_number TSRMLS_CC)
+
+#define REGISTER_MAIN_LONG_CONSTANT(name, lval, flags)  zend_register_long_constant((name), sizeof(name), (lval), (flags), 0 TSRMLS_CC)
+#define REGISTER_MAIN_DOUBLE_CONSTANT(name, dval, flags)  zend_register_double_constant((name), sizeof(name), (dval), (flags), 0 TSRMLS_CC)
+#define REGISTER_MAIN_STRING_CONSTANT(name, str, flags)  zend_register_string_constant((name), sizeof(name), (str), (flags), 0 TSRMLS_CC)
+#define REGISTER_MAIN_STRINGL_CONSTANT(name, str, len, flags)  zend_register_stringl_constant((name), sizeof(name), (str), (len), (flags), 0 TSRMLS_CC)
+
+BEGIN_EXTERN_C()
+void clean_module_constants(int module_number TSRMLS_DC);
+void free_zend_constant(zend_constant *c);
+int zend_startup_constants(TSRMLS_D);
+int zend_shutdown_constants(TSRMLS_D);
+void zend_register_standard_constants(TSRMLS_D);
+void clean_non_persistent_constants(TSRMLS_D);
+ZEND_API int zend_get_constant(char *name, uint name_len, zval *result TSRMLS_DC);
+ZEND_API void zend_register_long_constant(char *name, uint name_len, long lval, int flags, int module_number TSRMLS_DC);
+ZEND_API void zend_register_double_constant(char *name, uint name_len, double dval, int flags, int module_number TSRMLS_DC);
+ZEND_API void zend_register_string_constant(char *name, uint name_len, char *strval, int flags, int module_number TSRMLS_DC);
+ZEND_API void zend_register_stringl_constant(char *name, uint name_len, char *strval, uint strlen, int flags, int module_number TSRMLS_DC);
+ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC);
+void zend_copy_constants(HashTable *target, HashTable *sourc);
+void copy_zend_constant(zend_constant *c);
+END_EXTERN_C();
+
+#define ZEND_CONSTANT_DTOR (void (*)(void *)) free_zend_constant
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,142 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Sterling Hughes <sterling@php.net>                          |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include "zend.h"
+#include "zend_API.h"
+#include "zend_reflection_api.h"
+
+zend_class_entry *default_exception_ptr;
+
+ZEND_FUNCTION(exception)
+{
+	zval **message;
+	zval **code;
+	zval  *tmp;
+	zval  *object;
+	int    argc = ZEND_NUM_ARGS();
+
+	if (zend_get_parameters_ex(argc, &message, &code) == FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	object = getThis();
+
+	if (argc > 0) {
+		convert_to_string_ex(message);
+		zval_add_ref(message);
+		zend_hash_update(Z_OBJPROP_P(object), "message", sizeof("message"), (void **) message, sizeof(zval *), NULL);
+	}
+
+	if (argc > 1) {
+		convert_to_long_ex(code);
+		zval_add_ref(code);
+		zend_hash_update(Z_OBJPROP_P(object), "code", sizeof("code"), (void **) code, sizeof(zval *), NULL);
+	}
+
+	MAKE_STD_ZVAL(tmp);
+	ZVAL_STRING(tmp, zend_get_executed_filename(TSRMLS_C), 1);
+	zend_hash_update(Z_OBJPROP_P(object), "file", sizeof("file"), (void **) &tmp, sizeof(zval *), NULL);
+	tmp = NULL;
+
+	MAKE_STD_ZVAL(tmp);
+	ZVAL_LONG(tmp, zend_get_executed_lineno(TSRMLS_C));
+	zend_hash_update(Z_OBJPROP_P(object), "line", sizeof("line"), (void **) &tmp, sizeof(zval *), NULL);
+}
+
+#define DEFAULT_0_PARAMS \
+	if (ZEND_NUM_ARGS() > 0) { \
+		ZEND_WRONG_PARAM_COUNT(); \
+	}
+
+static void _default_exception_get_entry(zval *object, char *name, int name_len, zval *return_value TSRMLS_DC)
+{
+	zval **value;
+
+	if (zend_hash_find(Z_OBJPROP_P(object), name, name_len, (void **) &value) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	*return_value = **value;
+	zval_copy_ctor(return_value);
+}
+
+ZEND_FUNCTION(getfile)
+{
+	DEFAULT_0_PARAMS;
+
+	_default_exception_get_entry(getThis(), "file", sizeof("file"), return_value TSRMLS_CC);
+}
+
+ZEND_FUNCTION(getline)
+{
+	DEFAULT_0_PARAMS;
+
+	_default_exception_get_entry(getThis(), "line", sizeof("line"), return_value TSRMLS_CC);
+}
+
+ZEND_FUNCTION(getmessage)
+{
+	DEFAULT_0_PARAMS;
+
+	_default_exception_get_entry(getThis(), "message", sizeof("message"), return_value TSRMLS_CC);
+}
+
+ZEND_FUNCTION(getcode)
+{
+	DEFAULT_0_PARAMS;
+
+	_default_exception_get_entry(getThis(), "code", sizeof("code"), return_value TSRMLS_CC);
+}
+
+static zend_function_entry default_exception_functions[] = {
+	ZEND_FE(exception, NULL)
+	ZEND_FE(getmessage, NULL)
+	ZEND_FE(getcode, NULL)
+	ZEND_FE(getfile, NULL)
+	ZEND_FE(getline, NULL)
+	{NULL, NULL, NULL}
+};
+
+static void zend_register_default_exception(TSRMLS_D)
+{
+	zend_class_entry default_exception;
+
+	INIT_CLASS_ENTRY(default_exception, "exception", default_exception_functions);
+	default_exception_ptr = zend_register_internal_class(&default_exception TSRMLS_CC);
+}
+
+ZEND_API zend_class_entry *zend_exception_get_default(void)
+{
+	return default_exception_ptr;
+}
+
+ZEND_API void zend_register_default_classes(TSRMLS_D)
+{
+	zend_register_default_exception(TSRMLS_C);
+	zend_register_reflection_api(TSRMLS_C);
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,39 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Sterling Hughes <sterling@php.net>                          |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_DEFAULT_CLASSES_H
+#define ZEND_DEFAULT_CLASSES_H
+
+BEGIN_EXTERN_C()
+
+ZEND_API zend_class_entry *zend_exception_get_default(void);
+ZEND_API void zend_register_default_classes(TSRMLS_D);
+	
+END_EXTERN_C()
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,72 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include "zend.h"
+
+typedef struct _dynamic_array {
+        char *array;
+        unsigned int element_size;
+        unsigned int current;
+        unsigned int allocated;
+} dynamic_array;
+
+ZEND_API int zend_dynamic_array_init(dynamic_array *da, unsigned int element_size, unsigned int size)
+{
+	da->element_size = element_size;
+	da->allocated = size;
+	da->current = 0;
+	da->array = (char *) emalloc(size*element_size);
+	if (da->array == NULL) {
+		return 1;
+	}
+	return 0;
+}
+
+ZEND_API void *zend_dynamic_array_push(dynamic_array *da)
+{
+	if (da->current == da->allocated) {
+		da->allocated *= 2;
+		da->array = (char *) erealloc(da->array, da->allocated*da->element_size);
+	}
+	return (void *)(da->array+(da->current++)*da->element_size);
+}
+
+ZEND_API void *zend_dynamic_array_pop(dynamic_array *da)
+{
+	return (void *)(da->array+(--(da->current))*da->element_size);
+
+}
+
+ZEND_API void *zend_dynamic_array_get_element(dynamic_array *da, unsigned int index)
+{
+	if (index >= da->current) {
+		return NULL;
+	}
+	return (void *)(da->array+index*da->element_size);
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,47 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_DYNAMIC_ARRAY_H
+#define ZEND_DYNAMIC_ARRAY_H
+
+typedef struct _dynamic_array {
+	char *array;
+	unsigned int element_size;
+	unsigned int last_used;
+	unsigned int allocated;
+} dynamic_array;
+
+BEGIN_EXTERN_C()
+ZEND_API int zend_dynamic_array_init(dynamic_array *da);
+ZEND_API void *zend_dynamic_array_push(dynamic_array *da);
+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 */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,48 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_ERRORS_H
+#define ZEND_ERRORS_H
+
+#define E_ERROR				(1<<0L)
+#define E_WARNING			(1<<1L)
+#define E_PARSE				(1<<2L)
+#define E_NOTICE			(1<<3L)
+#define E_CORE_ERROR		(1<<4L)
+#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 | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE)
+#define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
+
+#endif /* ZEND_ERRORS_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,142 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Sterling Hughes <sterling@php.net>                          |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include "zend.h"
+#include "zend_API.h"
+#include "zend_reflection_api.h"
+
+zend_class_entry *default_exception_ptr;
+
+ZEND_FUNCTION(exception)
+{
+	zval **message;
+	zval **code;
+	zval  *tmp;
+	zval  *object;
+	int    argc = ZEND_NUM_ARGS();
+
+	if (zend_get_parameters_ex(argc, &message, &code) == FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	object = getThis();
+
+	if (argc > 0) {
+		convert_to_string_ex(message);
+		zval_add_ref(message);
+		zend_hash_update(Z_OBJPROP_P(object), "message", sizeof("message"), (void **) message, sizeof(zval *), NULL);
+	}
+
+	if (argc > 1) {
+		convert_to_long_ex(code);
+		zval_add_ref(code);
+		zend_hash_update(Z_OBJPROP_P(object), "code", sizeof("code"), (void **) code, sizeof(zval *), NULL);
+	}
+
+	MAKE_STD_ZVAL(tmp);
+	ZVAL_STRING(tmp, zend_get_executed_filename(TSRMLS_C), 1);
+	zend_hash_update(Z_OBJPROP_P(object), "file", sizeof("file"), (void **) &tmp, sizeof(zval *), NULL);
+	tmp = NULL;
+
+	MAKE_STD_ZVAL(tmp);
+	ZVAL_LONG(tmp, zend_get_executed_lineno(TSRMLS_C));
+	zend_hash_update(Z_OBJPROP_P(object), "line", sizeof("line"), (void **) &tmp, sizeof(zval *), NULL);
+}
+
+#define DEFAULT_0_PARAMS \
+	if (ZEND_NUM_ARGS() > 0) { \
+		ZEND_WRONG_PARAM_COUNT(); \
+	}
+
+static void _default_exception_get_entry(zval *object, char *name, int name_len, zval *return_value TSRMLS_DC)
+{
+	zval **value;
+
+	if (zend_hash_find(Z_OBJPROP_P(object), name, name_len, (void **) &value) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	*return_value = **value;
+	zval_copy_ctor(return_value);
+}
+
+ZEND_FUNCTION(getfile)
+{
+	DEFAULT_0_PARAMS;
+
+	_default_exception_get_entry(getThis(), "file", sizeof("file"), return_value TSRMLS_CC);
+}
+
+ZEND_FUNCTION(getline)
+{
+	DEFAULT_0_PARAMS;
+
+	_default_exception_get_entry(getThis(), "line", sizeof("line"), return_value TSRMLS_CC);
+}
+
+ZEND_FUNCTION(getmessage)
+{
+	DEFAULT_0_PARAMS;
+
+	_default_exception_get_entry(getThis(), "message", sizeof("message"), return_value TSRMLS_CC);
+}
+
+ZEND_FUNCTION(getcode)
+{
+	DEFAULT_0_PARAMS;
+
+	_default_exception_get_entry(getThis(), "code", sizeof("code"), return_value TSRMLS_CC);
+}
+
+static zend_function_entry default_exception_functions[] = {
+	ZEND_FE(exception, NULL)
+	ZEND_FE(getmessage, NULL)
+	ZEND_FE(getcode, NULL)
+	ZEND_FE(getfile, NULL)
+	ZEND_FE(getline, NULL)
+	{NULL, NULL, NULL}
+};
+
+static void zend_register_default_exception(TSRMLS_D)
+{
+	zend_class_entry default_exception;
+
+	INIT_CLASS_ENTRY(default_exception, "exception", default_exception_functions);
+	default_exception_ptr = zend_register_internal_class(&default_exception TSRMLS_CC);
+}
+
+ZEND_API zend_class_entry *zend_exception_get_default(void)
+{
+	return default_exception_ptr;
+}
+
+ZEND_API void zend_register_default_classes(TSRMLS_D)
+{
+	zend_register_default_exception(TSRMLS_C);
+	zend_register_reflection_api(TSRMLS_C);
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,39 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Sterling Hughes <sterling@php.net>                          |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_DEFAULT_CLASSES_H
+#define ZEND_DEFAULT_CLASSES_H
+
+BEGIN_EXTERN_C()
+
+ZEND_API zend_class_entry *zend_exception_get_default(void);
+ZEND_API void zend_register_default_classes(TSRMLS_D);
+	
+END_EXTERN_C()
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,184 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_EXECUTE_H
+#define ZEND_EXECUTE_H
+
+#include "zend_compile.h"
+#include "zend_hash.h"
+#include "zend_variables.h"
+#include "zend_operators.h"
+
+typedef union _temp_variable {
+	zval tmp_var;
+	struct {
+		zval **ptr_ptr;
+		zval *ptr;
+	} var;
+	struct {
+		zval tmp_var; /* a dummy */
+
+		union {
+			struct {
+				zval *str;
+				zend_uint offset;
+			} str_offset;
+			zend_property_reference overloaded_element;
+		} data;
+			
+		unsigned char type;
+		zend_class_entry *class_entry;
+	} EA;
+} temp_variable;
+
+
+BEGIN_EXTERN_C()
+ZEND_API extern void (*zend_execute)(zend_op_array *op_array TSRMLS_DC);
+ZEND_API extern void (*zend_execute_internal)(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC);
+
+void init_executor(TSRMLS_D);
+void shutdown_executor(TSRMLS_D);
+ZEND_API void execute(zend_op_array *op_array TSRMLS_DC);
+ZEND_API void execute_internal(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC);
+ZEND_API int zend_is_true(zval *op);
+static inline void safe_free_zval_ptr(zval *p)
+{
+	TSRMLS_FETCH();
+
+	if (p!=EG(uninitialized_zval_ptr)) {
+		FREE_ZVAL(p);
+	}
+}
+ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***ce TSRMLS_DC);
+ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC);
+
+static 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:
+			/* OBJ-TBI */
+			result = 1;
+			break;
+		default:
+			result = 0;
+			break;
+	}
+	return result;
+}
+
+ZEND_API int zval_update_constant(zval **pp, void *arg TSRMLS_DC);
+
+/* dedicated Zend executor functions - do not use! */
+static inline void zend_ptr_stack_clear_multiple(TSRMLS_D)
+{
+	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;
+}
+
+static inline int zend_ptr_stack_get_arg(int requested_arg, void **data TSRMLS_DC)
+{
+	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;
+}
+
+void execute_new_code(TSRMLS_D);
+
+
+/* services */
+ZEND_API char *get_active_function_name(TSRMLS_D);
+ZEND_API char *zend_get_executed_filename(TSRMLS_D);
+ZEND_API uint zend_get_executed_lineno(TSRMLS_D);
+ZEND_API zend_bool zend_is_executing(TSRMLS_D);
+
+ZEND_API void zend_set_timeout(long seconds);
+ZEND_API void zend_unset_timeout(TSRMLS_D);
+ZEND_API void zend_timeout(int dummy);
+ZEND_API zend_class_entry *zend_fetch_class(char *class_name, uint class_name_len, int fetch_type TSRMLS_DC);
+
+#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))
+
+void zend_assign_to_variable_reference(znode *result, zval **variable_ptr_ptr, zval **value_ptr_ptr, temp_variable *Ts TSRMLS_DC);
+
+#define IS_OVERLOADED_OBJECT 1
+#define IS_STRING_OFFSET 2
+
+/* The following tries to resolve the classname of a zval of type object.
+ * Since it is slow it should be only used in error messages.
+ */
+#define Z_OBJ_CLASS_NAME_P(zval) ((zval) && (zval)->type == IS_OBJECT && Z_OBJ_HT_P(zval)->get_class_entry != NULL && Z_OBJ_HT_P(zval)->get_class_entry(zval TSRMLS_CC) ? Z_OBJ_HT_P(zval)->get_class_entry(zval TSRMLS_CC)->name : "")
+
+END_EXTERN_C()
+
+#endif /* ZEND_EXECUTE_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,61 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_EXECUTE_LOCKS_H
+#define ZEND_EXECUTE_LOCKS_H
+
+#define PZVAL_LOCK(z) zend_pzval_lock_func(z)
+
+static inline void zend_pzval_lock_func(zval *z)
+{
+	z->refcount++;
+}
+
+#define PZVAL_UNLOCK(z) zend_pzval_unlock_func(z TSRMLS_CC)
+
+static inline void zend_pzval_unlock_func(zval *z TSRMLS_DC)
+{
+	z->refcount--;
+	if (!z->refcount) {
+		z->refcount = 1;
+		z->is_ref = 0;
+		EG(garbage)[EG(garbage_ptr)++] = z;
+	}
+}
+
+static inline void zend_clean_garbage(TSRMLS_D)
+{
+	while (EG(garbage_ptr)) {
+		zval_ptr_dtor(&EG(garbage)[--EG(garbage_ptr)]);
+	}
+}
+
+#define SELECTIVE_PZVAL_LOCK(pzv, pzn)		if (!((pzn)->u.EA.type & EXT_TYPE_UNUSED)) { PZVAL_LOCK(pzv); }
+
+#endif /* ZEND_EXECUTE_LOCKS_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,295 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include "zend_extensions.h"
+
+ZEND_API zend_llist zend_extensions;
+static int last_resource_number;
+
+int zend_load_extension(char *path)
+{
+#if ZEND_EXTENSIONS_SUPPORT
+	DL_HANDLE handle;
+	zend_extension *new_extension;
+	zend_extension_version_info *extension_version_info;
+
+	handle = DL_LOAD(path);
+	if (!handle) {
+#ifndef ZEND_WIN32
+		fprintf(stderr, "Failed loading %s:  %s\n", path, DL_ERROR());
+#else
+		fprintf(stderr, "Failed loading %s\n", path);
+#endif
+		return FAILURE;
+	}
+
+	extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "extension_version_info");
+	if (!extension_version_info) {
+		extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "_extension_version_info");
+	}
+	new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "zend_extension_entry");
+	if (!new_extension) {
+		new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "_zend_extension_entry");
+	}
+	if (!extension_version_info || !new_extension) {
+		fprintf(stderr, "%s doesn't appear to be a valid Zend extension\n", path);
+		DL_UNLOAD(handle);
+		return FAILURE;
+	}
+
+
+	/* allow extension to proclaim compatibility with any Zend version */
+	if (extension_version_info->zend_extension_api_no != ZEND_EXTENSION_API_NO &&(!new_extension->api_no_check || new_extension->api_no_check(ZEND_EXTENSION_API_NO) != SUCCESS)) {
+		if (extension_version_info->zend_extension_api_no > ZEND_EXTENSION_API_NO) {
+			fprintf(stderr, "%s requires Zend Engine API version %d.\n"
+					"The Zend Engine API version %d which is installed, is outdated.\n\n",
+					new_extension->name,
+					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) {
+			fprintf(stderr, "%s requires Zend Engine API version %d.\n"
+					"The Zend Engine API version %d which is installed, is newer.\n"
+					"Contact %s at %s for a later version of %s.\n\n",
+					new_extension->name,
+					extension_version_info->zend_extension_api_no,
+					ZEND_EXTENSION_API_NO,
+					new_extension->author,
+					new_extension->URL,
+					new_extension->name);
+			DL_UNLOAD(handle);
+			return FAILURE;
+		} 
+	} else if (ZTS_V!=extension_version_info->thread_safe) {
+		fprintf(stderr, "Cannot load %s - it %s thread safe, whereas Zend %s\n",
+					new_extension->name,
+					(extension_version_info->thread_safe?"is":"isn't"),
+					(ZTS_V?"is":"isn't"));
+		DL_UNLOAD(handle);
+		return FAILURE;
+	} else if (ZEND_DEBUG!=extension_version_info->debug) {
+		fprintf(stderr, "Cannot load %s - it %s debug information, whereas Zend %s\n",
+					new_extension->name,
+					(extension_version_info->debug?"contains":"does not contain"),
+					(ZEND_DEBUG?"does":"does not"));
+		DL_UNLOAD(handle);
+		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;
+
+	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);*/
+#endif
+
+	return SUCCESS;
+}
+
+
+static void zend_extension_shutdown(zend_extension *extension TSRMLS_DC)
+{
+#if ZEND_EXTENSIONS_SUPPORT
+	if (extension->shutdown) {
+		extension->shutdown(extension);
+	}
+#endif
+}
+
+static int zend_extension_startup(zend_extension *extension)
+{
+#if ZEND_EXTENSIONS_SUPPORT
+	if (extension->startup) {
+		if (extension->startup(extension)!=SUCCESS) {
+			return 1;
+		}
+		zend_append_version_info(extension);
+	}
+#endif
+	return 0;
+}
+
+
+int zend_startup_extensions_mechanism()
+{
+	/* Startup extensions mechanism */
+	zend_llist_init(&zend_extensions, sizeof(zend_extension), (void (*)(void *)) zend_extension_dtor, 1);
+	last_resource_number = 0;
+	return SUCCESS;
+}
+
+
+int zend_startup_extensions()
+{
+	zend_llist_apply_with_del(&zend_extensions, (int (*)(void *)) zend_extension_startup);
+	return SUCCESS;
+}
+
+
+void zend_shutdown_extensions(TSRMLS_D)
+{
+	zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_shutdown TSRMLS_CC);
+	zend_llist_destroy(&zend_extensions);
+}
+
+
+void zend_extension_dtor(zend_extension *extension)
+{
+#if ZEND_EXTENSIONS_SUPPORT && !ZEND_DEBUG
+	if (extension->handle) {
+		DL_UNLOAD(extension->handle);
+	}
+#endif
+}
+
+
+static void zend_extension_message_dispatcher(zend_extension *extension, int num_args, va_list args TSRMLS_DC)
+{
+	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)
+{
+	TSRMLS_FETCH();
+
+	zend_llist_apply_with_arguments(&zend_extensions, (llist_apply_with_args_func_t) zend_extension_message_dispatcher TSRMLS_CC, 2, message, arg);
+}
+
+
+ZEND_API int zend_get_resource_handle(zend_extension *extension)
+{
+	if (last_resource_number<ZEND_MAX_RESERVED_RESOURCES) {
+		extension->resource_number = last_resource_number;
+		return last_resource_number++;
+	} else {
+		return -1;
+	}
+}
+
+
+ZEND_API zend_extension *zend_get_extension(char *extension_name)
+{
+	zend_llist_element *element;
+
+	for (element = zend_extensions.head; element; element = element->next) {
+		zend_extension *extension = (zend_extension *) element->data;
+
+		if (!strcmp(extension->name, extension_name)) {
+			return extension;
+		}
+	}
+	return NULL;
+}
+
+/*
+ * Support for dynamic loading of MH_BUNDLEs on Darwin / Mac OS X
+ *
+ */
+ 
+#if HAVE_MACH_O_DYLD_H
+
+void *zend_mh_bundle_load(char* bundle_path) 
+{
+	NSObjectFileImage bundle_image;
+	NSModule bundle_handle;
+	NSSymbol bundle_init_nssymbol;
+	void (*bundle_init)(void);
+
+	if (NSCreateObjectFileImageFromFile(bundle_path, &bundle_image) != NSObjectFileImageSuccess) {
+		return NULL;
+	}
+	
+	bundle_handle = NSLinkModule(bundle_image, bundle_path, NSLINKMODULE_OPTION_PRIVATE);
+	NSDestroyObjectFileImage(bundle_image);
+	
+	/* call the init function of the bundle */
+	bundle_init_nssymbol = NSLookupSymbolInModule(bundle_handle, "__init");
+	if (bundle_init_nssymbol != NULL) {
+		bundle_init = NSAddressOfSymbol(bundle_init_nssymbol);
+		bundle_init();
+	}
+	
+	return bundle_handle;
+}
+
+int zend_mh_bundle_unload(void *bundle_handle)
+{
+	NSSymbol bundle_fini_nssymbol;
+	void (*bundle_fini)(void);
+	
+	/* call the fini function of the bundle */
+	bundle_fini_nssymbol = NSLookupSymbolInModule(bundle_handle, "__fini");
+	if (bundle_fini_nssymbol != NULL) {
+		bundle_fini = NSAddressOfSymbol(bundle_fini_nssymbol);
+		bundle_fini();
+	}
+	
+	return (int) NSUnLinkModule(bundle_handle, NULL);
+}
+
+void *zend_mh_bundle_symbol(void *bundle_handle, const char *symbol_name)
+{
+	NSSymbol symbol;
+	symbol = NSLookupSymbolInModule(bundle_handle, symbol_name);
+	return NSAddressOfSymbol(symbol);
+}
+
+const char *zend_mh_bundle_error(void)
+{
+	/* Witness the state of the art error reporting */
+	return NULL;
+}
+
+#endif /* HAVE_MACH_O_DYLD_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,125 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_EXTENSIONS_H
+#define ZEND_EXTENSIONS_H
+
+#include "zend_compile.h"
+
+#define ZEND_EXTENSION_API_NO	90021012
+
+typedef struct _zend_extension_version_info {
+	int zend_extension_api_no;
+	char *required_zend_version;
+	unsigned char thread_safe;
+	unsigned char debug;
+} zend_extension_version_info;
+
+
+typedef struct _zend_extension zend_extension;
+
+/* Typedef's for zend_extension function pointers */
+typedef int (*startup_func_t)(zend_extension *extension);
+typedef void (*shutdown_func_t)(zend_extension *extension);
+typedef void (*activate_func_t)(void);
+typedef void (*deactivate_func_t)(void);
+
+typedef void (*message_handler_func_t)(int message, void *arg);
+
+typedef void (*op_array_handler_func_t)(zend_op_array *op_array);
+
+typedef void (*statement_handler_func_t)(zend_op_array *op_array);
+typedef void (*fcall_begin_handler_func_t)(zend_op_array *op_array);
+typedef void (*fcall_end_handler_func_t)(zend_op_array *op_array);
+
+typedef void (*op_array_ctor_func_t)(zend_op_array *op_array);
+typedef void (*op_array_dtor_func_t)(zend_op_array *op_array);
+
+struct _zend_extension {
+	char *name;
+	char *version;
+	char *author;
+	char *URL;
+	char *copyright;
+
+	startup_func_t startup;
+	shutdown_func_t shutdown;
+	activate_func_t activate;
+	deactivate_func_t deactivate;
+
+	message_handler_func_t message_handler;
+
+	op_array_handler_func_t op_array_handler;
+
+	statement_handler_func_t statement_handler;	
+	fcall_begin_handler_func_t fcall_begin_handler;
+	fcall_end_handler_func_t fcall_end_handler;
+
+	op_array_ctor_func_t op_array_ctor;
+	op_array_dtor_func_t op_array_dtor;
+
+	int (*api_no_check)(int api_no);
+	void *reserved2;
+	void *reserved3;
+	void *reserved4;
+	void *reserved5;
+	void *reserved6;
+	void *reserved7;
+	void *reserved8;
+
+	DL_HANDLE handle;
+	int resource_number;
+};
+
+
+ZEND_API int zend_get_resource_handle(zend_extension *extension);
+ZEND_API void zend_extension_dispatch_message(int message, void *arg);
+
+#define ZEND_EXTMSG_NEW_EXTENSION		1
+
+
+#define ZEND_EXTENSION()	\
+	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
+#define COMPAT_ZEND_EXTENSION_PROPERTIES   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1
+
+
+ZEND_API extern zend_llist zend_extensions;
+
+void zend_extension_dtor(zend_extension *extension);
+ZEND_API int zend_load_extension(char *path);
+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_mechanism(void);
+int zend_startup_extensions(void);
+void zend_shutdown_extensions(TSRMLS_D);
+ZEND_API zend_extension *zend_get_extension(char *extension_name);
+
+#endif /* ZEND_EXTENSIONS_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,142 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_FAST_CACHE_H
+#define ZEND_FAST_CACHE_H
+
+#ifndef ZEND_ENABLE_FAST_CACHE
+# if ZEND_DEBUG
+# define ZEND_ENABLE_FAST_CACHE 0
+# else
+# define ZEND_ENABLE_FAST_CACHE 0
+# endif
+#endif
+
+typedef struct _zend_fast_cache_list_entry {
+	struct _zend_fast_cache_list_entry *next;
+} zend_fast_cache_list_entry;
+
+#define MAX_FAST_CACHE_TYPES	4
+
+
+#define ZVAL_CACHE_LIST			0
+#define HASHTABLE_CACHE_LIST	1
+
+#if ZEND_ENABLE_FAST_CACHE
+
+
+#include "zend_globals.h"
+#include "zend_globals_macros.h"
+#include "zend_alloc.h"
+
+
+#if ZEND_DEBUG
+# define RECORD_ZVAL_CACHE_HIT(fc_type)		AG(fast_cache_stats)[fc_type][1]++;
+# define RECORD_ZVAL_CACHE_MISS(fc_type)	AG(fast_cache_stats)[fc_type][0]++;
+#else
+# define RECORD_ZVAL_CACHE_HIT(fc_type)
+# define RECORD_ZVAL_CACHE_MISS(fc_type)
+#endif
+
+
+#define ZEND_FAST_ALLOC(p, type, fc_type)								\
+	{																\
+		TSRMLS_FETCH();												\
+																	\
+		if (((p) = (type *) AG(fast_cache_list_head)[fc_type])) {	\
+			AG(fast_cache_list_head)[fc_type] = ((zend_fast_cache_list_entry *) AG(fast_cache_list_head)[fc_type])->next;	\
+			RECORD_ZVAL_CACHE_HIT(fc_type);							\
+		} else {													\
+			(p) = (type *) emalloc(sizeof(type));					\
+			RECORD_ZVAL_CACHE_MISS(fc_type);						\
+		}															\
+	}
+
+
+#define ZEND_FAST_FREE(p, fc_type)										\
+	{																\
+		TSRMLS_FETCH();												\
+																	\
+		((zend_fast_cache_list_entry *) (p))->next = (zend_fast_cache_list_entry *) AG(fast_cache_list_head)[fc_type];	\
+		AG(fast_cache_list_head)[fc_type] = (zend_fast_cache_list_entry *) (p);			\
+	}
+
+#define ZEND_FAST_ALLOC_REL(p, type, fc_type)	\
+	ZEND_FAST_ALLOC(p, type, fc_type)
+
+#define ZEND_FAST_FREE_REL(p, fc_type)	\
+	ZEND_FAST_FREE(p, fc_type)
+
+
+#else /* !ZEND_ENABLE_FAST_CACHE */
+
+#define ZEND_FAST_ALLOC(p, type, fc_type)	\
+	(p) = (type *) emalloc(sizeof(type))
+
+#define ZEND_FAST_FREE(p, fc_type)	\
+	efree(p)
+
+#define ZEND_FAST_ALLOC_REL(p, type, fc_type)	\
+	(p) = (type *) emalloc_rel(sizeof(type))
+
+#define ZEND_FAST_FREE_REL(p, fc_type)	\
+	efree_rel(p)
+
+#endif /* ZEND_ENABLE_FAST_CACHE */
+
+
+
+
+/* fast cache for zval's */
+#define ALLOC_ZVAL(z)	\
+	ZEND_FAST_ALLOC(z, zval, ZVAL_CACHE_LIST)
+
+#define FREE_ZVAL(z)	\
+	ZEND_FAST_FREE(z, ZVAL_CACHE_LIST)
+
+#define ALLOC_ZVAL_REL(z)	\
+	ZEND_FAST_ALLOC_REL(z, zval, ZVAL_CACHE_LIST)
+
+#define FREE_ZVAL_REL(z)	\
+	ZEND_FAST_FREE_REL(z, ZVAL_CACHE_LIST)
+
+/* fast cache for HashTables */
+#define ALLOC_HASHTABLE(ht)	\
+	ZEND_FAST_ALLOC(ht, HashTable, HASHTABLE_CACHE_LIST)
+
+#define FREE_HASHTABLE(ht)	\
+	ZEND_FAST_FREE(ht, HASHTABLE_CACHE_LIST)
+
+#define ALLOC_HASHTABLE_REL(ht)	\
+	ZEND_FAST_ALLOC_REL(ht, HashTable, HASHTABLE_CACHE_LIST)
+
+#define FREE_HASHTABLE_REL(ht)	\
+	ZEND_FAST_FREE_REL(ht, HASHTABLE_CACHE_LIST)
+
+#endif /* ZEND_FAST_CACHE_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,284 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef ZEND_GLOBALS_H
+#define ZEND_GLOBALS_H
+
+
+#include <setjmp.h>
+
+#include "zend_globals_macros.h"
+
+#include "zend_stack.h"
+#include "zend_ptr_stack.h"
+#include "zend_hash.h"
+#include "zend_llist.h"
+#include "zend_fast_cache.h"
+#include "zend_objects.h"
+#include "zend_objects_API.h"
+
+/* Define ZTS if you want a thread-safe Zend */
+/*#undef ZTS*/
+
+#ifdef ZTS
+
+BEGIN_EXTERN_C()
+ZEND_API extern int compiler_globals_id;
+ZEND_API extern int executor_globals_id;
+ZEND_API extern int alloc_globals_id;
+END_EXTERN_C()
+
+#endif
+
+#define SYMTABLE_CACHE_SIZE 32
+
+
+#include "zend_compile.h"
+
+/* excpt.h on Digital Unix 4.0 defines function_table */
+#undef function_table
+
+
+typedef struct _zend_declarables {
+	zval ticks;
+} zend_declarables;
+
+
+struct _zend_compiler_globals {
+	zend_stack bp_stack;
+	zend_stack switch_cond_stack;
+	zend_stack foreach_copy_stack;
+	zend_stack object_stack;
+	zend_stack declare_stack;
+
+	zend_class_entry *active_class_entry;
+
+	/* variables for list() compilation */
+	zend_llist list_llist;
+	zend_llist dimension_llist;
+	zend_stack list_stack;
+
+	zend_stack function_call_stack;
+
+	char *compiled_filename;
+
+	int zend_lineno;
+	int comment_start_line;
+	char *heredoc;
+	int heredoc_len;
+
+	zend_op_array *active_op_array;
+
+	HashTable *function_table;	/* function symbol table */
+	HashTable *class_table;		/* class table */
+
+	HashTable filenames_table;
+
+	HashTable *auto_globals;
+
+	zend_bool in_compilation;
+	zend_bool short_tags;
+	zend_bool asp_tags;
+	zend_bool allow_call_time_pass_reference;
+
+	zend_declarables declarables;
+
+	/* For extensions support */
+	zend_bool extended_info;	/* generate extension information for debugger/profiler */
+	zend_bool handle_op_arrays;	/* run op_arrays through op_array handlers */
+
+	zend_bool unclean_shutdown;
+
+	zend_bool ini_parser_unbuffered_errors;
+
+	zend_llist open_files;
+
+	zend_llist *throw_list;
+	long catch_begin;
+
+	struct _zend_ini_parser_param *ini_parser_param;
+
+	int interactive;
+
+	zend_uint start_lineno;
+	zend_bool increment_lineno;
+
+	znode implementing_class;
+
+	zend_uint access_type;
+
+	char *doc_comment;
+	zend_uint doc_comment_len;
+};
+
+
+struct _zend_executor_globals {
+	zval **return_value_ptr_ptr;
+
+	zval uninitialized_zval;
+	zval *uninitialized_zval_ptr;
+
+	zval error_zval;
+	zval *error_zval_ptr;
+
+	zend_function_state *function_state_ptr;
+	zend_ptr_stack arg_types_stack;
+
+	/* symbol table cache */
+	HashTable *symtable_cache[SYMTABLE_CACHE_SIZE];
+	HashTable **symtable_cache_limit;
+	HashTable **symtable_cache_ptr;
+
+	zend_op **opline_ptr;
+
+	HashTable *active_symbol_table;
+	HashTable symbol_table;		/* main symbol table */
+
+	HashTable included_files;	/* files already included */
+
+	jmp_buf bailout;
+
+	int error_reporting;
+	int orig_error_reporting;
+	int exit_status;
+
+	zend_op_array *active_op_array;
+
+	HashTable *function_table;	/* function symbol table */
+	HashTable *class_table;		/* class table */
+	HashTable *zend_constants;	/* constants table */
+
+	zend_class_entry *scope;
+
+	zval *This;
+
+	long precision;
+
+	int ticks_count;
+
+	zend_bool in_execution;
+	zend_bool bailout_set;
+	zend_bool full_tables_cleanup;
+	zend_bool implicit_clone;
+
+	/* for extended information support */
+	zend_bool no_extensions;
+
+#ifdef ZEND_WIN32
+	zend_bool timed_out;
+#endif
+
+	HashTable regular_list;
+	HashTable persistent_list;
+
+	zend_ptr_stack argument_stack;
+	zval *free_op1, *free_op2;
+	int (*unary_op)(zval *result, zval *op1);
+	int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+
+	zval *garbage[2];
+	int garbage_ptr;
+
+	zval *user_error_handler;
+	zval *user_exception_handler;
+	zend_ptr_stack user_error_handlers;
+	zend_ptr_stack user_exception_handlers;
+
+	/* timeout support */
+	int timeout_seconds;
+
+	int lambda_count;
+
+	HashTable *ini_directives;
+	zend_objects_store objects_store;
+	zval *exception;
+
+	struct _zend_execute_data *current_execute_data;
+
+	zend_property_info std_property_info;
+
+	/* locale stuff */
+	char float_separator[1];
+
+	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
+};
+
+#include "zend_mm.h"
+
+struct _zend_alloc_globals {
+	zend_mem_header *head;		/* standard list */
+	void *cache[MAX_CACHED_MEMORY][MAX_CACHED_ENTRIES];
+	unsigned int cache_count[MAX_CACHED_MEMORY];
+	void *fast_cache_list_head[MAX_FAST_CACHE_TYPES];
+
+#ifdef ZEND_WIN32
+	HANDLE memory_heap;
+#endif
+
+#if ZEND_DEBUG
+	/* for performance tuning */
+	int cache_stats[MAX_CACHED_MEMORY][2];
+	int fast_cache_stats[MAX_FAST_CACHE_TYPES][2];
+#endif
+#if MEMORY_LIMIT
+	unsigned int memory_limit;
+	unsigned int allocated_memory;
+	unsigned int allocated_memory_peak;
+	unsigned char memory_exhausted;
+#endif
+#ifdef ZEND_MM
+	zend_mm_heap mm_heap;
+#endif
+};
+
+struct _zend_scanner_globals {
+	zend_file_handle *yy_in;
+	zend_file_handle *yy_out;
+	int yy_leng;
+	char *yy_text;
+	struct yy_buffer_state *current_buffer;
+	char *c_buf_p;
+	int init;
+	int start;
+	int lineno;
+	char _yy_hold_char;
+	int yy_n_chars;
+	int _yy_did_buffer_switch_on_eof;
+	int _yy_last_accepting_state; /* Must be of the same type as yy_state_type,
+								   * if for whatever reason it's no longer int!
+								   */
+	char *_yy_last_accepting_cpos;
+	int _yy_more_flag;
+	int _yy_more_len;
+	int yy_start_stack_ptr;
+	int yy_start_stack_depth;
+	int *yy_start_stack;
+};
+
+#endif /* ZEND_GLOBALS_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -0,0 +1,117 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#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;
+typedef struct _zend_alloc_globals zend_alloc_globals;
+typedef struct _zend_scanner_globals zend_scanner_globals;
+
+/* Compiler */
+#ifdef ZTS
+# define CG(v) TSRMG(compiler_globals_id, zend_compiler_globals *, v)
+BEGIN_EXTERN_C()
+int zendparse(void *compiler_globals);
+END_EXTERN_C()
+#else
+# define CG(v) (compiler_globals.v)
+extern ZEND_API struct _zend_compiler_globals compiler_globals;
+int zendparse(void);
+#endif
+
+
+/* Executor */
+#ifdef ZTS
+# define EG(v) TSRMG(executor_globals_id, zend_executor_globals *, v)
+#else
+# define EG(v) (executor_globals.v)
+extern ZEND_API zend_executor_globals executor_globals;
+#endif
+
+
+/* Memory Manager */
+#ifdef ZTS
+# define AG(v) TSRMG(alloc_globals_id, zend_alloc_globals *, v)
+#else
+# define AG(v) (alloc_globals.v)
+extern ZEND_API zend_alloc_globals alloc_globals;
+#endif
+
+
+/* Language Scanner */
+#ifdef ZTS
+# define LANG_SCNG(v) TSRMG(language_scanner_globals_id, zend_scanner_globals *, v)
+extern ZEND_API ts_rsrc_id language_scanner_globals_id;
+#else
+# define LANG_SCNG(v) (language_scanner_globals.v)
+extern ZEND_API zend_scanner_globals language_scanner_globals;
+#endif
+
+
+/* INI Scanner */
+#ifdef ZTS
+# define INI_SCNG(v) TSRMG(ini_scanner_globals_id, zend_scanner_globals *, v)
+extern ZEND_API ts_rsrc_id ini_scanner_globals_id;
+#else
+# define INI_SCNG(v) (ini_scanner_globals.v)
+extern ZEND_API zend_scanner_globals ini_scanner_globals;
+#endif
+
+
+/* For limited downwards source compatibility */
+#define CLS_FETCH()
+#define ELS_FETCH()
+#define ALS_FETCH()
+#define PLS_FETCH()
+#define SLS_FETCH()
+#define CLS_D
+#define ELS_D
+#define ALS_D
+#define PLS_D
+#define SLS_D
+#define CLS_DC
+#define ELS_DC
+#define ALS_DC
+#define PLS_DC
+#define SLS_DC
+#define CLS_C
+#define ELS_C
+#define ALS_C
+#define PLS_C
+#define SLS_C
+#define CLS_CC
+#define ELS_CC
+#define ALS_CC
+#define PLS_CC
+#define SLS_CC
+
+
+#endif /* ZEND_GLOBALS_MACROS_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */