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

Made the tests (and not only run-tests.php) actually use php.ini-dist, and
removed unused php.ini file.
2026-11-08 09:47:30 +00:00 · 2002-06-16 10:58:56 +00:00 · 2002-06-16 10:58:54 +00:00 · 2002-06-16 06:05:23 +00:00 · 2002-06-16 05:43:48 +00:00 · 2002-06-16 02:24:18 +00:00
1357 changed files with 183487 additions and 73381 deletions
@@ -60,6 +60,19 @@ Exceptions:
    check its man page again, and only then, consider using it, and even then,
    try avoiding it.

+[7] Use ZEND_* macros instead of PHP_* macros. Use of PHP_* macros is not
+    recommended. Since most of the PHP_* macros are ZEND_* macro aliases, using
+    the PHP_* macros makes browsing the source code with a tag search harder.
+
+[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.

 Naming Conventions
 ------------------
@@ -134,6 +147,8 @@ Syntax and indentation
    style.  This applies to just about everything, starting with
    indentation and comment styles and up to function declaration
    syntax.
+
+    (see also http://www.tuxedo.org/~esr/jargon/html/entry/indent-style.html)
    
 [3] Be generous with whitespace and braces.  Always prefer:

@@ -1,2 +1,2 @@
-For the list of people who've put work into PHP 4.0, please see
+For the list of people who've put work into PHP, please see
 http://www.php.net/credits.php
@@ -36,6 +36,11 @@ PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           apache2
+PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
+-------------------------------------------------------------------------------
 EXTENSION:           cgi
 MAINTENANCE:         Unknown
 STATUS:              Working
@@ -98,7 +103,7 @@ 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
+COMMENT:             DB abstraction for odbc, mysql, pgsql, mssql, fbsql and more, see documentation
 -------------------------------------------------------------------------------
 EXTENSION:           filepro
 MAINTENANCE:         Unknown
@@ -129,6 +134,12 @@ 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@swwwing.com>
 MAINTENANCE:         Maintained
@@ -143,6 +154,7 @@ EXTENSION:           pgsql
 PRIMARY MAINTAINER:  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:           sybase
 MAINTENANCE:         Unknown
@@ -158,7 +170,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           odbc
-PRIMARY MAINTAINER:  Andreas Karajannis <Karajannis@gmd.de>
+PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             Working except for persistent connections
@@ -190,8 +202,9 @@ STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
 EXTENSION:           calendar
-MAINTENANCE:         Unknown
-STATUS:              Unknown
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hartmut@six.de>
+MAINTENANCE:         Odd Fixes
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           com
 PRIMARY MAINTAINER:  Harald Radi <h.radi@nme.at>
@@ -208,6 +221,11 @@ MAINTENANCE:         Unknown
 STATUS:              Experimental
 SINCE:               4.0.5
 -------------------------------------------------------------------------------
+EXTENSION:           ctype
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hartmut@six.de>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           curl
 PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
 MAINTENANCE:         Maintained
@@ -230,9 +248,10 @@ MAINTENANCE:         Maintained
 STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           exif
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-SINCE:               4.0.1
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               4.2
 -------------------------------------------------------------------------------
 EXTENSION:           fdf
 PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
@@ -272,8 +291,13 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           ldap
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
-MAINTENANCE:         Odd Fixes
+PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           mbstring
+PRIMARY MAINTAINER:  Rui Hirokawa <hirokawa@php.net>
+MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mcal
@@ -282,7 +306,7 @@ MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mcrypt
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
+PRIMARY MAINTAINER:  Derick Rethans <d.rethans@jdimedia.nl>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -359,7 +383,7 @@ STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sablot
 PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Maintained
+MAINTENANCE:         Obsolete
 STATUS:              Experimental
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
@@ -375,8 +399,8 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           shmop
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Unknown
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
+MAINTENANCE:         Maintained
 STATUS:              Experimental
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
@@ -420,6 +444,11 @@ PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           xslt
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANC:          Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           yaz
 PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
 MAINTENANCE:         Maintained
@@ -1,9 +1,17 @@
-Installation Instructions for PHP 4.0
-------------------------------------
+Installation Instructions for PHP 4
+-----------------------------------

-For the impatient here is a quick set of steps that will build PHP as
-first a dynamic Apache module (DSO) for Apache 1.3.x with MySQL support 
-and then a static module.  A more verbose explanation follows.  
+STOP!
+
+Before going any further, please remember you are going to find more 
+up to date instructions in the online manual, located here:
+
+http://www.php.net/manual/en/install.apache.php
+
+It is strongly recommended that you read the manual page before going
+further. However, for the impatient, here is a quick set of steps that 
+will build PHP as (first) a dynamic Apache module (DSO) for Apache 1.3.x 
+with MySQL support and then a static module.  A more verbose explanation follows.  

 For installing PHP on other web servers, refer to one of the following
 files:
@@ -14,24 +22,26 @@ files:
    sapi/thttpd/README
    README.Zeus

-Note!  Only install either the static module or the dynamic one.  Do not
-install both.  
+Some notes:

-Note 2!  If you are recompiling PHP to add new extensions or upgrading
-something like GD, remove the config.cache file before you re-run 
-configure.
+1: Only install either the static module or the dynamic one.  Do not
+   install both.  

-Note 3!  If you are on Linux and have installed shared libraries, make
-sure the location of these shared libraries are listed in your 
-/etc/ld.so.conf file.  For example, if you have:
+2:  If you are recompiling PHP to add new extensions or upgrading
+    something like GD, remove the config.cache file before you re-run 
+    configure.

-  /usr/local/lib/mysql/libmysqlclient.so
+3:  If you are on Linux and have installed shared libraries, make
+    sure the location of these shared libraries are listed in your 
+    /etc/ld.so.conf file.  For example, if you have:

-Make sure /etc/ld.so.conf contains:
+       /usr/local/lib/mysql/libmysqlclient.so

-  /usr/local/lib/mysql
+    Make sure /etc/ld.so.conf contains:

-Then run ldconfig.
+      /usr/local/lib/mysql
+
+    Then run ldconfig.

 If you want both PHP 3 and 4 modules in the same Apache server, check the
 bottom of this file for instructions.
@@ -52,8 +62,8 @@ Compiled-in modules:
 Chances are you will see a lot more modules than these two. That's ok, 
 as long as mod_so.c shows up you can proceed with the following steps:

-$ gunzip -c php-4.0.x.tar.gz | tar xf -
-$ cd php-4.0.x
+$ gunzip -c php-4.x.y.tar.gz | tar xf -
+$ cd php-4.x.y
 $ ./configure --with-mysql --with-apxs
 $ make
 $ make install
@@ -83,9 +93,9 @@ $ cd apache_1.3.x
 $ ./configure
 $ cd ..

-$ gunzip -c php-4.0.x.tar.gz | tar xf -
-$ cd php-4.0.x
-$ ./configure --with-mysql --with-apache=../apache_1.3.x --enable-track-vars
+$ gunzip -c php-4.x.y.tar.gz | tar xf -
+$ cd php-4.x.y
+$ ./configure --with-mysql --with-apache=../apache_1.3.x
 $ make
 $ make install

@@ -96,7 +106,7 @@ $ ./configure --prefix=/www --activate-module=src/modules/php4/libphp4.a
 $ make
 (you should now have an httpd binary which you can copy to your Apache bin dir if
  is is your first install then you need to "make install" as well)
-$ cd ../php-4.0.x
+$ cd ../php-4.x.y
 $ cp php.ini-dist /usr/local/lib/php.ini
 You can edit /usr/local/lib/php.ini file to set PHP options.
 Edit your httpd.conf or srm.conf file and add:
@@ -115,12 +125,12 @@ Installing PHP can be done in four simple steps:

 1. Unpack your distribution file.  

-   You will have downloaded a file named something like php-4.0.x.tar.gz.
-   Unzip this file with a command like: gunzip php-4.0.x.tar.gz
+   You will have downloaded a file named something like php-4.x.y.tar.gz.
+   Unzip this file with a command like: gunzip php-4.x.y.tar.gz

-   Next you have to untar it with: tar -xvf php-4.0.x.tar
+   Next you have to untar it with: tar -xvf php-4.x.y.tar

-   This will create a php-4.0.x directory.  cd into this new directory.
+   This will create a php-4.x.y directory.  cd into this new directory.

 2a. Configure PHP (Dynamic Module) - Skip to 2b if you wish to build
    a static module
@@ -380,16 +390,11 @@ WHY DISABLING -fPIC WORKS ON LINUX

 USING PHP 3 AND PHP 4 AS CONCURRENT APACHE MODULES

-   Recent operating systems provide the ability to perform versioning and
-   scoping. This features make it possible to let PHP 3 and PHP 4 run as
-   concurrent modules in one Apache server. 
-   
-   This feature is known to work on the following platforms:
+   With some (newer) installations of Apache, it's possible to compile both
+   PHP 3 and PHP 4, and run them concurrently. 

-   - Linux with recent binutils (binutils 2.9.1.0.25 tested)
-   - Solaris 2.5 or better
-   - FreeBSD (3.2, 4.0 tested)
-   - IRIX64 6.5
+   Note, it's only really wise to do this if you need to use the PHP 3 engine
+   to maintain backwards compatibility. 
   
   To enable it, configure PHP 3 and PHP 4 to use APXS (--with-apxs) and the
   necessary link extensions (--enable-versioning). Otherwise, all standard
@@ -399,8 +404,8 @@ USING PHP 3 AND PHP 4 AS CONCURRENT APACHE MODULES
 				--with-apxs=/apache/bin/apxs \
 				--enable-versioning \
 				--with-mysql \
-				--enable-track-vars

-   If this also works on your platform or if you know a way to do it, please
-   report it to our bug database at http://bugs.php.net
+
+
+

@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
-                  The PHP License, version 2.02
-Copyright (c) 1999, 2000 The PHP Group. All rights reserved.
+                  The PHP License, version 3.0a1
+Copyright (c) 1999 - 2002 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -37,20 +37,6 @@ are met:
     "This product includes PHP, freely available from
     http://www.php.net/".

-  6. The software incorporates the Zend Engine, a product of Zend
-     Technologies, Ltd. ("Zend"). The Zend Engine is licensed to the
-     PHP Association (pursuant to a grant from Zend that can be
-     found at http://www.php.net/license/ZendGrant/) for
-     distribution to you under this license agreement, only as a
-     part of PHP.  In the event that you separate the Zend Engine
-     (or any portion thereof) from the rest of the software, or
-     modify the Zend Engine, or any portion thereof, your use of the
-     separated or modified Zend Engine software shall not be governed
-     by this license, and instead shall be governed by the license
-     set forth at http://www.zend.com/license/ZendLicense/. 
-
-
-
 THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
 ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
@@ -73,3 +59,6 @@ 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>.
+
+This product includes the Zend Engine, freely available at
+<http://www.zend.com>.
@@ -0,0 +1,18 @@
+$(builddir)/zend_language_scanner.lo: $(builddir)/zend_language_parser.h
+$(builddir)/zend_ini_scanner.lo: $(builddir)/zend_ini_parser.h
+
+$(builddir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
+	$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l
+
+$(builddir)/zend_language_parser.h: $(builddir)/zend_language_parser.c
+$(builddir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
+	$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o $@
+
+$(builddir)/zend_ini_parser.h: $(builddir)/zend_ini_parser.c
+$(builddir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
+	$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
+
+$(builddir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
+	$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l
+
+$(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(builddir)/zend_language_parser.h
@@ -0,0 +1,72 @@
+mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
+INSTALL = $(top_srcdir)/build/shtool install -c
+INSTALL_DATA = $(INSTALL) -m 644
+
+DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
+COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)
+
+
+all: $(all_targets) 
+
+build-modules: $(PHP_MODULES)
+
+libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+	$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+
+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) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so
+
+php: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+	$(LIBTOOL) --mode=link $(CC) -export-dynamic $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+
+sapi/cli/php: $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
+	$(LIBTOOL) --mode=link $(CC) -export-dynamic $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+
+install: $(install_targets) 
+
+
+install-cli: sapi/cli/php
+	$(INSTALL_CLI)
+
+install-sapi: libphp4.la
+	-@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
+	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+	-@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
+		for i in 0.0.0 0.0 0; do \
+			if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
+				$(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
+				break; \
+			fi; \
+		done; \
+	fi
+	$(INSTALL_IT)
+
+install-modules:
+	@test -d modules && \
+	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) && \
+	echo "installing shared modules into $(EXTENSION_DIR)" && \
+	rm -f modules/*.la && \
+	cp modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) >/dev/null 2>&1 || true
+
+install-tester:
+	@echo "Installing regression tester"
+	@$(mkinstalldirs) $(PEAR_INSTALLDIR)
+	@$(INSTALL) -m 755 $(top_srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
+
+install-su: install-pear install-tester
+
+test: sapi/cli/php
+	@TEST_PHP_EXECUTABLE=$(top_builddir)/sapi/cli/php \
+			$(top_builddir)/sapi/cli/php -c php.ini-dist $(top_srcdir)/run-tests.php
+
+clean:
+	find . -name \*.lo -o -name \*.o -o -name \*.la -o -name \*.a| xargs rm -f
+	find . -name .libs -a -type d|xargs rm -rf
+	rm -f libphp4.la php sapi/cli/php 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
+	find . -name Makefile | xargs rm -f
+
+.PHONY: all clean install distclean test
+.NOEXPORT:
@@ -1,63 +0,0 @@
-
-ZEND_DIR = $(srcdir)/Zend
-SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
-
-LTLIBRARY_NAME = libphp4.la
-LTLIBRARY_SOURCES = stub.c
-
-LTLIBRARY_DEPENDENCIES = \
-		Zend/libZend.la \
-		sapi/$(PHP_SAPI)/libsapi.la \
-		main/libmain.la \
-		$(REGEX_LIB) \
-		$(EXT_LTLIBS) \
-		$(TSRM_LIB)
-
-LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
-LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
-
-PROGRAM_NAME         = php
-PROGRAM_SOURCES      = stub.c
-PROGRAM_LDADD        = libphp4.la $(EXT_PROGRAM_LDADD)
-PROGRAM_LDFLAGS      = -export-dynamic	
-PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
-
-targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
-
-install_targets = install-sapi install-modules
-
-include $(top_srcdir)/build/rules.mk
-include $(top_srcdir)/build/library.mk
-include $(top_srcdir)/build/program.mk
-
-install-sapi:
-	@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
-	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-	-@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
-		for i in 0.0.0 0.0 0; do \
-			if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
-				$(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
-				break; \
-			fi; \
-		done; \
-	fi
-	$(INSTALL_IT)
-
-install-modules:
-	@test -d modules && \
-	$(mkinstalldirs) $(INSTALL_ROOT)$(moduledir) && \
-	echo "installing shared modules into $(moduledir)" && \
-	rm -f modules/*.la && \
-	cp modules/* $(INSTALL_ROOT)$(moduledir) >/dev/null 2>&1 || true
-
-install-tester:
-	@echo "Installing regression tester"
-	@$(mkinstalldirs) $(PEAR_INSTALLDIR)
-	@$(INSTALL) -m 755 $(srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
-
-install-pear: install-modules
-	(cd pear && $(MAKE) install)
-
-install-su: install-pear install-tester
-
-.NOEXPORT:
@@ -1,25 +1,317 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 200?, Version 4.2.0-dev
+?? ??? 2002, Version 4.3.0
+- Added preliminary SAX-Input support. It's now possible to build a DomDocument
+  with SAX-Events (added domxml_parser_start_document(), domxml_parser_end_document(),
+  domxml_parser_start_element(tagname[,attributes]), domxml_parser_end_element(tagname),
+  domxml_parser_characters(characters), domxml_parser_cdata_block(cdata),
+  domxml_parser_comment(comment), domxml_parser_get_document(). (chregu)
+- Bundle gd library 2.0.1 with php (ext/gd/libgd) (Rasmus), tweak config.m4 to
+  work with it (Jani), smallers tweaks for Win32 (Markus, Edin)
+- Fixed bug with Apache which let PHP_AUTH_* variables to be set when
+  external basic auth mechanism was used. (Jani)
+- Fixed bzopen() crash in thread-safe mode. (Andrei)
+- Added better error-messages (3rd parameter) and validating of DTDs (2nd
+  parameter) to domxml_open_mem() and domxml_open_file(). (Christian)
+- Added domxml_doc_validate() for validating existing DomDocuments with a DTD.
+  (Christian)
+- Added ability to capture string offsets in preg_match_*() results.
+  (David Brown, Andrei)
+- Fixed set_error_handler() to accept methods as callbacks and also report
+  invalid callbacks. (Andrei)
+- Fixed a memory corruption bug in overload extension. (Andrei)
+- Fixed error handling in fsockopen() on win32. (Jason)
+- Added win32 support for the timeout parameter of fsockopen(). (Jason)
+- Fixed shuffle() to provide equal distribution of values. (Andrei)
+- Added --with-mysql-sock configure option which can be used to override
+  the unix socket location. (e.g. NFS compiles, etc.) (James Cox)
+- Fixed is_a() to properly work on extension registered classes. (Andrei)
+- Added new constants: PHP_PREFIX and PHP_SHLIB_SUFFIX. (Stig)
+- Added STDIN, STDOUT and STDERR constants for CLI sapi reflecting opened
+  streams to their respective I/O counterparts. (Edin)
+- Added pctnl_alarm() function. (Edin)
+- Fixed array_rand() on thread-safe platforms such as Windows. (Edin)
+- If zlib.output_compression is enabled and a page is compressed 
+  a "Vary: Accept-Encoding" header is added. (Stefan)
+- Renamed getallheaders() to apache_request_headers() and kept getallheaders() 
+  as an alias to it. Also added apache_response_headers() which returns the 
+  current response headers from Apache. (Rasmus)
+- Added missing AddRef() calls in the COM extension. This should fix weird 
+  behaviour (in particular with ADODB). (Harald)
+- Fixed some dummy errors. (dets)
+- Fix segfault in version_compare(). (Stig)
+- Added compressed Flash MX files support to getimagesize(). (Derick)
+- Added ability to capture string offsets in preg_split() results.
+  (David Brown, Andrei)
+- Fixed a crash bug in token_get_all(). (Andrei)
+- Implemented glob() for Unix/Win32. (Hartmut, Edin, Markus)
+- Added domxml_doc_set_root() to change the root node. (Lukas Schroeder)
+- Fixed a crash bug in stripslashes() when working in sybase mode. (Rasmus)
+- Added experimental support for Simplified Chinese, Traditional Chinese and
+  Korean encodings into mbstring. (Rui)
+- Misc. Win32 mail() enhancements: support 'From:' header (msisolak@yahoo.com),
+  support Bcc header, case-insensitive headers, enhanced error reporting,
+  automatic proper line ending conversion, fix crash with Cc, fix buffer
+  overflows with $header. (Markus)
+- Improved IMAP extension performance. (adam.kauffman@mindspring.com,
+  rjs3@andrew.cmu.edu, Jon)
+- Added optional 5th parameter to domxml_xslt_process(). When set, profiling
+  information is saved to the specified file. (chregu)
+- Added MD5 support for crypt() on Windows. (Edin)
+- Fixed resource bug in LDAP extension. (Stig Venaas)
+- Fixed crash in output buffering when buffer is overwritten in a callback. 
+  (Yasuo)
+- Added output_add_rewrite_var() and output_remove_rewrite_var() to inject
+  and remove variables from the URL-Rewriter. (Thies)
+- The Windows build can now be configured more comfortably, for example 
+  when dealing with built-in extensions. (Sebastian)
+- Added optional 3rd parameter to mysql_select_db() which makes it return
+  the previously selected database name. (Jani)
+- Added large OID value (2^31 to 2^32) support for pg_lo_import(),
+  pg_lo_unlink(), pg_lo_open() and pg_lo_export(). (Yasuo)
+- Made the mbstring extension to be enabled by default. (Yasuo)
+- Fixed mixing OCIPlogon() and OCINLogon() to not leak Oracle-Sessions. (Thies)
+- Added php.ini options for EXIF extension to encode and decode Unicode/JIS
+  user comments. (Marcus)
+- Changed the "-c" CLI/CGI option to allow both 'filename' and
+  'path to php.ini'. (Yasuo)
+- Added version information to the .dll and .exe files created under Windows.
+  (jtate)
+- Added __FUNCTION__ and __CLASS__ constants. (Jani, Zend Engine)
+- Added pg_metadate(), pg_convert(), pg_insert(), pg_select(), pg_update()
+  and pg_delete(). (Yasuo)
+- Added optional 2nd parameter for pg_result_status() to specify return type. 
+  (Yasuo)
+- Added "log_errors_max_len" php.ini option which controls maximum length for 
+  error messages. (Marcus)
+- Added "ignore_repeated_errors" and "ignore_repeated_source" php.ini options
+  which can be used to disable logging of repeated error messages. (Marcus)
+- Made pg_last_notice() work correctly. (Yasuo)
+- Added "pgsql.ignore_notice" and "pgsql.log_notice" php.ini options. (Yasuo)
+- Added "zlib.output_compression_level" php.ini option. (Stig)
+- Added support for --with-apxs build on Mac OS X / Darwin. (markonen)
+- Added support for dynamically loaded extensions on OS X / Darwin. 
+  NOTE: This requires Apache 1.3.25 or later. (kalowsky, markonen)
+- Fixed CR/LF processing in quoted_printable_decode() on Win32. (kir)
+- Made crack extension available on Win32. Cracklib libraries for Win32 are
+  available at http://www.jtatesoftware.com/cracklib/. (jtate)
+- Added mysql_info() function. (Jan)
+- Added mysql_list_processes() and mysql_stat() functions. (Georg)
+- Added file_get_contents() which returns the contents of a file as a string. 
+  This function also supports the URL wrappers. (Wez)
+- Changed 'zlib:' fopen wrapper to 'compress.zlib://' to avoid ambiguities
+  when filenames have ':' characters. (Wez)
+- Added URL-wrapper support to exif. (Marcus)
+- PHP now has a new stream system that allows it to do some clever stuff with
+  fopen() and fsockopen().  As a result:
+  . URL wrappers natively supports https:// URLs
+  . fsockopen() adds support for ssl:// and tls:// connections via TCP/IP
+  . copy($srcfilename, $destfilename) can now be used with URL wrappers
+  . zlib wrappers/streams can be used even on systems without fopencookie()
+  . Added 'compress.bzip2://' stream and wrapper support.
+  . Added user-space streams - it is now possible to define a class in PHP
+    code and register it as a URL wrapper.
+  . Most extensions now support streams when passing files, which means
+    that those extensions will support URL wrappers. (Wez)
+  . Added memory stream support. (Marcus)
+- Fixed memory allocation problem on systems that have iconv() support in libc.
+  (Yasuo)
+- Made var_dump() handle recursive structures better. (Yasuo)
+- Added exif_imagetype() function. (Marcus)
+- New improved build system. Among other improvements, replaces the slow 
+  recursive make with one global Makefile and eases the integration of proper
+  dependencies. Automake is only needed for its aclocal tool. The build 
+  process is now more portable and less resource-consuming. (Sascha)
+
+13 May 2002, Version 4.2.1
+- Added safe-mode checks to show_source(), parse_ini_file() and rmdir(). Also
+  fixed security problems with safe_mode_include_dir directive. (Rasmus)
+- Changed HTTP upload code to accept 0 byte file uploads. (Zeev)
+- Major update of domxml. New functions, better DOM compliance and bug fixes:
+  * Changed the old $node->append_child() to $node->append_sibling() since
+    the new append_child() behaves correctly (= W3C standard).
+  * Added domxml functions:
+    . domxml_elem_get_elements_by_tagname() 
+    . domxml_doc_get_elements_by_tagname()
+    . domxml_doc_get_element_by_id()
+    . domxml_elem_remove_attribute()
+    . domxml_elem_get_attribute_node()
+  * Fixed a segfault in domxml_unlink(). 
+  * Added formatting option to domxml_dump_mem(). 
+  (Uwe, jtate, Chregu)
+- Fixed a bug in socket_select() that could cause unexpected behavior when
+  using a statement like $w = $e = array($sock); This change unfortunately
+  prevents the use of constant values (e.g. NULL) for the socket array
+  paramaters. Instead, use a temporary variable or an expression with the
+  leftmost member being a temporary variable. ex.:
+  socket_select($w, $r, $e = NULL, 10); (Jason)
+- Fixed crashes in the session serializer. (Stas)
+- Fixed malformed atime/mtime with touch(). (Yasuo)
+- Fixed a couple of bugs in array_sum() and array_merge(). (Andrei)
+- Fixed SJIS directory name handling under Windows. (Rui)
+- Fixed empty mb_output_handler() output when Content-Type is specified.
+  (Yasuo) 
+- Fixed the false logic in ext/session which made SID constant not to be
+  defined when cookies are disabled. (Sascha)
+- Fixed possible crash bug in HTTP uploads. (Patch: Lucas Schroeder)
+- Fixed possible NULL-pointer dereferencing in the COM extension which
+  caused 'Error in php_OLECHAR_to_char()' warnings on various places.
+  Also modified the API to consistently return NULL in case of an error.
+  (Alan, Harald)
+- Fixed a bug in the COM extension that caused outproc servers to 'hang'
+  because of a missing Release() call. (Alan, Harald)
+
+22 Apr 2002, Version 4.2.0
+- ATTENTION!! register_globals defaults to 'off' now !!!
+- Note: Apache2 support is EXPERIMENTAL.
+- PostgreSQL functions are renamed, but all old function names are available.
+  Old function names will be available long enough. User can safely use old
+  function names. (Yasuo)
+- Moved ext/mailparse to PECL. See http://thebrainroom.com/opensource/php/
+  for more information and to download the extension. (Wez/Jim)
+- Fixed pg_last_notice() crash. (Yasuo)
+- Modified the mysql extension to disable 'LOAD LOCAL' when safe mode is 
+  enabled. (Jason)
+- Added CLI (command line interface) sapi which is more suitable for writing 
+  shell scripts. Some of the differences to CGI sapi are: no HTTP headers, 
+  plain text error messages, does not change working directory, have a new -r
+  option which executes a piece of PHP code directly from the commmand line, etc.
+  "make install" will install CLI SAPI version of php in {PREFIX}/bin/php while
+  CGI is renamed and installed as {PREFIX}/bin/php-cgi. (Edin)
+- Fixed HTTP file upload support to handle big files better. (Jani)
+- Major modifications to the Sockets Extension and its API (Jason):
+  . Fixed numerous bugs.
+  . Added automatic host lookup capability to all functions that take addr's.
+    example: socket_connect($sock, 'www.yahoo.com', 80);
+  . Corrected and standardized host lookup errors
+  . Modified socket_recv() behavior. [$r=socket_recv($sock, $buf, $len, $flags)]
+  . Added socket_set_block() which changes a socket into blocking IO mode
+  . Modified socket_last_error() to not clear the last error
+  . Added socket_clear_error() which clears the last error on a socket
+  . Removed all code pertaining to fd_sets (socket_fd_*)
+  . Modified/Improved socket_select() to accept array of resources instead of 
+    fd_sets. example: 
+    <?php 
+          $wfds=$rfds=array($sock1, $sock2, $sock3, $sock7);
+          $r=socket_select($rfds, $wfds, NULL, 1);
+          print "Ready to read:\n"; var_dump($rfds);
+    ?>
+- Fixed segfault in ibase_close() if user does not free the resultset.
+  Bugs #15419, #15992. (daniela)
+- Added optional 3rd parameter "int encoding_mode" to gzencode() and fixed 
+  parameters to conform documentation. (Stefan)
+- Changed read_exif_data() to be an alias of exif_read_data(). (Marcus)
+- Added exif_tagname() function which returns the names of tags and
+  exif_thumbnail() function to extract embedded thumbnails. (Marcus)
+- Fixed iconv support with FreeBSD. (kalowsky)
+- Cleaned up the posix extension: (Markus)
+  . Removed unwanted warning messages
+  . Added posix_errno() and posix_strerror() for fetching error messages
+  . Changed the way posix_getgrnam() and posix_getgrgid() return their values 
+    (breaks BC but makes more sense)
+  . Does not include functions in symbol table which aren't supported on host 
+    system. 
+- Added TIFF support for getimagesize() and read_exif_data(). (Marcus)
+- Changed the Velocis extension namespace to Birdstep to reflect new product 
+  name. Added aliases for BC. (James)
+- Added safe_mode checks for opendir(). (jflemer)
+- Changed the 2nd parameter in pgsql_fetch_*() functions to support NULL if
+  all 3 parameters are supplied, but you do not want to provide a row number.
+  (Derick)
+- Improved iconv() when using libc's iconv. (Yasuo)
+- Added PHP_SAPI constant which contains the name of running SAPI. (Edin)
+- Added ob_get_status() which returns an array of buffers with their status.
+  (Yasuo)
+- Fixed a crash bug in ob_end_*() functions. ob_end_*() will not delete
+  buffers that may not be deleted. (Yasuo)
+- Added 3rd parameter "bool erase" to ob_start(). If FALSE, the buffer may not
+  be deleted until script finishes. (Yasuo)
+- Changed ob_*() functions to return TRUE for success, FALSE for failure.
+  (Yasuo)
+- Added sybase_ct support to dbx module. (Marc)
+- Fixed error message handling with PostgreSQL 7.2. (Rui)
+- Added object aggregation capability, see aggregation_*() functions. (Andrei)
+- Added debug_zval_dump() which works similarly to var_dump, but displays 
+  extra internal information such as refcounts and true type names. (Jason)
+- Added Andrei's tokenizer extension. (Stig)
+- Fixed a bug in the COM extension which caused php to crash in
+  php_COM_get_ids_of_names(). (Paul, Harald)
+- Removed ext/satellite. It is now part of PEAR. (eriksson)
+- Changed php.ini directive 'safe_mode_include_dir' to accept a (semi)colon 
+  separated path (like 'include_path') rather than a single directory.
+  (jflemer)
+- Added is_a() function that can be used to test whether object is of a certain
+  class or is derived from it. (Andrei, Zend Engine)
+- Added optional parameter to highlight_string() and highlight_file() which
+  makes these functions to return a highlighted string instead of dumping
+  it to standard output. (Derick)
+- Added EXTR_IF_EXISTS and EXTR_PREFIX_IF_EXISTS flags to extract(). (Rasmus)
+- Fixed a segfault in pg_pconnect(). If PostgreSQL server is restarted, broken 
+  connection is detected and reconnected. (Yasuo)
+- Fixed --enable-safe-mode configure option. (Yasuo)
+- Added function domxml_dump_node($doc,$node). Dumps a node plus all children 
+  into a string. (chregu)
+- Added function domxml_node_get_content(). (chregu)
+- Added function domxml_dump_file($filename,[$compression]). Dumps XML to
+  a file and uses compression, if specified. (chregu)
+- Added exslt integration to domxml extension (http://exslt.org for details).
+  Configure with --with-dom-exslt[=DIR] (and --with-dom-xslt). 
+  (chregu,jaroslaw)
+- Fixed session_unset() to not touch any globals if register_globals is off.
+  (Thies)
+- Added 3 new optional parameters to OCIFetchStatement(). They control
+  the number of rows to skip at the beginning of the cursor, the
+  maximun numer of rows that should be fetched and the format of the
+  returned array. (Thies)
+- Updated the XSLT extension to support Sablotron 0.8. (Petr Cimprich)
+- Fixed a bug in preg_match() and preg_match_all() when matching strings 
+  contain null bytes. (Andrei)
+- Added xpath_register_ns() function. This makes it possible to issue XPath 
+  queries with namespaces like for example: "//namespace:sampletag".
+  (Chris Jarecki)
+- Added multi-byte enabled regular expression functions. (Rui)
+- Added optional second parameter to count() which can be used to specify
+  either normal or recursive counting. (patch by Vlad Bosinceanu <glipy@fx.ro>)
+- Added mb_get_info() to get internal settings of mbstring. (Rui)
+- Added async query functions to PostgreSQL module. (Yasuo)
+- Added pg_copy_to()/pg_copy_from() for PostgreSQL module. (Youichi, Yasuo)
+- Added IPv6 support for FTP extension. (Stig Venaas)
+- Improved the speed of wordwrap() significantly. (Jim)
+- Fixed pow()'s incorrect behaviour when dealing with powers of 0. (Jim)
+- Added is_finite(), is_infinite() and is_nan(). (Jim)
+- Fixed segfault in wordwrap() when wrapping to zero width and using
+  multi-character break or trying to force cut (bug #12768). (Jim)
+- Fixed several bugs in dbase extension (dbase_pack() truncate file to right
+  size, fix 6852 #1 and 6852 #2). (Vlad)
+- Fixed bug in krsort() where an extra character was being compared. (Andi)
+- Fixed bug that made pspell include pspell.h from a wrong location. (Vlad)
+- Added function overload in mbstring to add multibyte support for 
+  string and mail functions. (Rui)
+- Added flags parameter to preg_grep(). The only flag currently is
+  PREG_GREP_INVERT that will make the function return entries that
+  did not match. (Andrei)
+- Fixed several crash bugs in the xslt extension. (Markus, Derick)
+- Fixed problem with dbase not returning very large (larger than long)
+  integers properly. (Vlad)
 - Added concepts to IRCG: bailout-on-trivial issue, write output to
-  files, fetch a ressource upon connection end. (Sascha)
+  files, fetch a resource upon connection end. (Sascha)
 - Fixed POST-related bugs in thttpd, added QUERY_STRING, HTTP_HOST,
  HTTP_ACCEPT_LANGUAGE to the script environment, improved patch
  to send correct MIME types, and added support for /nocache/. (Sascha)
 - Fixed several bugs and memleaks in the domxml extension. (Markus)
 - Added var_export() which outputs a representation of a variable as reusable 
  PHP code. (Derick)
- Added -w option to the cgi-version which strips all comments and whitespace
+- Added -w option to the CGI-version to strip all comments and whitespace
  from the script. (Thies)
 - Added support for SO_RCVTIMEO and SO_SNDTIMEO to ext/sockets. (Jason)
 - Added ob_get_level() which returns the nesting level of the output buffering
  mechanism. (Yasuo, Derick)
 - Added ob_flush() and ob_clean() functions which flush and clean an output 
  buffer without destroying the buffer. (Derick)
- Added a parameter to mysql_connect() to force a new database link to be
-  created. (Markus, Derick)
+- Added new optional parameter to mysql_connect() which forces a new database 
+  link to be created. (Markus, Derick)
 - Added ldap_sort() function. (Stig Venaas)
- Added md5_file(), which calculaties the MD5 sum of a file.
+- Added md5_file() function which calculates the MD5 sum of a file.
  Patch by Alessandro Astarita <aleast@capri.it> (Derick)
 - Added support for parsing recordsets contained in WDDX packets. (Andrei)
 - Renamed key_exists() to array_key_exists(). (Derick)
@@ -27,25 +319,21 @@ PHP 4                                                                      NEWS
  images. (Rasmus)
 - Added support for bind_textdomain_codeset(). (rudib@email.si)
 - Added generic Win 32 API extension. (jmoore)
- Fixed Bug #9878. Patch by bfoddy@mediaone.net. (jmoore)
 - Removed warning message about NONEXISTENT character set from mysql_connect() 
  when the server's default character set != latin1. (Mysql Team)
- Added Direct I/O extension for lowlevel access to the POSIX layer. (sterling)
- New SAPI module for the WebJames server on RISC OS. (Alex Waugh)
- Made ldap_add (and modify) functions to throw a warning with illegal value 
-  arrays. Previously segfaulted or added wrong value. (Stig Venaas)
- Added Udm_Check_Charset() function into mnoGoSearch extension. (gluke)
+- Added Direct I/O extension for lowlevel access to the POSIX layer. (Sterling)
+- Added SAPI module for the WebJames server on RISC OS. (Alex Waugh)
+- Fixed ldap_add() and ldap_modify() functions to throw a warning with illegal 
+  value arrays. Previously segfaulted or added wrong value. (Stig Venaas)
+- Added udm_check_charset() function into mnoGoSearch extension. (gluke)
 - Fixed mnoGoSearch extension to support mnogosearch-3.2.x. (gluke)
- Fixed bug #13885 (gmdate() timezone handling on windows). (jmoore)
- Fixed behaviour of strtok(). Bug #13866. (jmoore)
 - Made fbsql_num_rows() to return the correct value on all select statements.
  (Frank)
- Fixed HTTP file upload support to handle big files better. (Jani)
- Added array_chunk() function that splits an array into chunks of specified
+- Added array_chunk() function which splits an array into chunks of specified
  size. (Andrei)
- Fixed a bug which caused $HTTP_RAW_POST_DATA not to be populated on a missing
-  content-type even when always_populate_raw_post_data was On - fixed. (Rasmus)
- Added session_cache_expire() function. Patch by anuradha@gnu.org (Andrei)
+- Fixed $HTTP_RAW_POST_DATA to be populated on a missing content-type when 
+  always_populate_raw_post_data is on. (Rasmus)
+- Added session_cache_expire() function. (patch by anuradha@gnu.org) (Andrei)
 - Added array_fill() function. (Rasmus)
 - Made Authorization header to be hidden from phpinfo() output in safe_mode. 
  (Rasmus)
@@ -54,12 +342,12 @@ PHP 4                                                                      NEWS
  array entries to string. (Andrei)
 - Added user-space object overloading extension. (Andrei)
 - Added ldap_start_tls() function. (Stig Venaas, patch by kuenne@rentec.com)
- Have rand() and mt_rand() seed automatically if srand() or mt_srand() has
-  not been called. (Sterling)
- Fixed is_dir(), is_writeable(), is_readable(), is_executable(), is_link() and
-  is_file() functions to not throw a 'file does not exist' warning. (Sterling)
- Added array_change_key_case() function that returns array with
-  with all string keys lowercased or uppercased. (EdinK)
+- Changed rand() and mt_rand() to be seed automatically if srand() or
+  mt_srand() has not been called. (Sterling)
+- Changed the seed options to srand() and mt_srand() to be optional. If the 
+  seed is not specified the most random seed possible is generated. (Sterling)
+- Added array_change_key_case() function which returns an array with all 
+  string keys lowercased or uppercased. (Edin)
 - Added parameter to ircg_pconnect to suppress treating non-fatal errors
  as fatal, and added conversion of Windows quotes to &quot;. (Sascha)
 - Added pcntl_exec() function which behaves similar to the system execve.
@@ -70,22 +358,51 @@ PHP 4                                                                      NEWS
 - Added mcrypt_generic_deinit() to replace mcrypt_generic_end(). (Derick)
 - Added apache_setenv() function for injecting variables into Apache's
  subprocess_env table. (Rasmus)
- Added support for 'int', 'bool', 'float' and 'null' for settype(). (Jeroen)
+- Added support for 'int', 'bool', 'float' and 'null' in settype(). (Jeroen)
 - Added IPv6 support to gethostbyaddr().
  (Patch by Matthias Wimmer <matthias@charente.de> and venaas)
- Made the seed options to srand() and mt_srand() optional. If the seed is
-  not specified generate the most random seed possible. (Sterling)
 - Fixed LONG_VARCHAR type crashing in ODBC extension. Patch by Walter Franzini.
  (kalowsky)
- Made in_array() and search_array() allow the needle to be an array in itself.
-  (Andrei)
+- Changed in_array() and search_array() to allow the needle to be an array 
+  in itself. (Andrei)
 - Added ini_get_all() function which returns all registered ini entries
  or entries for the specified extension. (Jani)
- Added mailparse_uudecode_all() which extracts all uuencoded attachments
- Added support for chinese encodings to htmlentities() and htmlspecialchars().
+- Added mailparse_uudecode_all() which extracts all uuencoded attachments. 
+  (Wez)
+- Added support for chinese encodings in htmlentities() and htmlspecialchars().
  (Patch by Alan Knowles <alan_k@hklc.com> and Wez)
 - Improved support for autoconf-2.50+/libtool 1.4b+. (Jan Kneschke, Sascha)

+27 Feb 2002, Version 4.1.2
+- Fixed start up failure when mm save handler is used and there are multiple
+  SAPIs working at the same time. (Yasuo)
+- Fixed the Roxen SAPI. (Yasuo)
+- Fixed a buffer overflow in the RFC-1867 file upload code. (Stefan)
+- Fixed a crash bug in the session module. (Yasuo)
+- Fixed a crash bug in the pspell module. (Yasuo)
+- Changed the default output encoding of mbstring 'pass' to fix
+  initialization problem. (Rui)
+
+26 Dec 2001, Version 4.1.1
+- Fixed incompatibility with Windows .NET / IIS 6 - may improve stability
+  under other versions of IIS. (Zeev)
+- Fixed bug that caused crashes or error notices on shutdown on threaded
+  platforms. (Zeev)
+- Fixed several crash bugs in the xslt extension. (Markus, Derick)
+- Fixed problem with dbase not returning very large (larger than long)
+  integers properly. (Vlad)
+- Fixed several bugs and memleaks in the domxml extension. (Markus)
+- Fixed bug in gmmktime() which was one hour off during standard time -
+  bug #9878. Patch by bfoddy@mediaone.net. (jmoore)
+- Fixed bug in gmdate() timezone handling on Windows - bug #13885. (jmoore)
+- Fixed several crash bugs in the mcrypt extension. (Derick)
+- Made the mcrypt extension compile with the libmcrypt 2.2 series again.
+  (Sterling)
+- Fixed a bug where the is_file() family of functions would in-correctly give
+  an error when they were given filenames that didn't exist. (Sterling)
+- Fixed a bug in the strtotime() function where it was incorrectly recognizing
+  GMT +0100 and GMT -0100. (Derick)
+
 10 Dec 2001, Version 4.1.0
 - Worked around a bug in the MySQL client library that could cause PHP to hang
  when using unbuffered queries. (Zeev)
@@ -121,7 +438,7 @@ PHP 4                                                                      NEWS
 - Fixed a crash in dbase_replace_record. (Patch by robin.marlow@dps-int.com)
 - Fixed a crash in msql_result(). (Zeev)
 - Added support for single dimensional SafeArrays and Enumerations.
-  Added an is_enum() function to check if a component implements an
+  Added com_isenum() function to check if a component implements an
  enumeration. (Alan, Harald)
 - Fixed a bug in dbase_get_record() and dbase_get_record_with_names().
  boolean fields are now returned correctly.
@@ -161,7 +478,7 @@ PHP 4                                                                      NEWS
  string to the gmp-number. (Troels)
 - Added the Cyrus-IMAP extension, which allows a direct interface to Cyrus' 
  more advanced capabilities. (Sterling)
- Enhance read_exif_data() to support multiple comment tags (Rasmus)
+- Enhanced read_exif_data() to support multiple comment tags. (Rasmus)
 - Fixed a crash bug in array_map() when NULL callback was passed in. (Andrei)
 - Change from E_ERROR to E_WARNING in the exif extension (Rasmus)
 - New pow() implementation, which returns an integer when possible,
@@ -1,6 +1,7 @@
 This is the first file you should be reading after you get your CVS account.
 We'll assume you're basically familiar with CVS, but feel free to post
-your questions on the mailing list.
+your questions on the mailing list. Please have a look at 
+http://cvsbook.red-bean.com/ for more detailed information on CVS.

 PHP is developed through the efforts of a large number of people.
 Collaboration is a Good Thing(tm), and CVS lets us do this. Thus, following
@@ -89,6 +90,15 @@ 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.
+
+Example:
+
+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 and NEWS right away, don't worry!
 These files are updated once a day, so your stuff will not show up until
 somewhat later. Don't go adding stuff to NEWS by hand if you already put @
@@ -13,11 +13,16 @@ HOW TO USE IT

   ./ext_skel --extname=module_name

-  and everything you need is placed in directory module_name. In fact, if you
-  don't need to test the existence of any external header files, libraries or
-  functions in them, the module is already almost ready to be compiled in PHP.
-  Just remove 3 comments in your_module_name/config.m4, cd back up to PHP
-  sources top directory, and do
+  and everything you need is placed in directory module_name. 
+
+  [ 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. ]
+
+  If you don't need to test the existence of any external header files, 
+  libraries or functions in them, the module is already almost ready to be 
+  compiled in PHP.  Just remove 3 comments in your_module_name/config.m4, 
+  cd back up to PHP sources top directory, and do

    ./buildconf; ./configure --enable-module_name; make

@@ -7,7 +7,6 @@ HOW TO CREATE A SELF-CONTAINED PHP EXTENSION
  the PHP source. To create such an extension, three things are
  required:

-  - Makefile template (Makefile.in)
  - Configuration file (config.m4)
  - Source code for your module

@@ -74,28 +73,9 @@ DEFINING THE NEW EXTENSION
  need to specify anything).


-CREATING THE MAKEFILE TEMPLATE 
-  
-  The Makefile Template (Makefile.in) contains three lines:
-
------------------------------------------------------------------------------
-LTLIBRARY_SHARED_NAME = foobar.la
-LTLIBRARY_SOURCES     = foo.c bar.c
-
-include $(top_srcdir)/build/dynlib.mk
------------------------------------------------------------------------------
-
-  LTLIBRARY_SHARED_NAME specifies the name of the extension.
-  It must be of the form `ext-name.la'.
-
  LTLIBRARY_SOURCES specifies the names of the sources files. You can
  name an arbitrary number of source files here.

-  The final include directive includes the build rules (you usually
-  don't need to care about what happens there). rules.mk and other
-  files are installed by phpize which we will cover later.
-
-
 CREATING THE M4 CONFIGURATION FILE

  The m4 configuration can perform additional checks. For a 
@@ -107,13 +87,17 @@ PHP_ARG_ENABLE(foobar,whether to enable foobar,
 [  --enable-foobar            Enable foobar])

 if test "$PHP_FOOBAR" != "no"; then
-  PHP_EXTENSION(foobar, $ext_shared)
+  PHP_NEW_EXTENSION(foobar, foo.c bar.c, $ext_shared)
 fi
 ------------------------------------------------------------------------------

  PHP_ARG_ENABLE will automatically set the correct variables, so
-  that the extension will be enabled by PHP_EXTENSION in shared mode.
+  that the extension will be enabled by PHP_NEW_EXTENSION in shared mode.

+  The first argument of PHP_NEW_EXTENSION describes the name of the
+  extension.  The second names the source-code files.  The third passes
+  $ext_shared which is set by PHP_ARG_ENABLE/WITH to PHP_NEW_EXTENSION.
+  
  Please use always PHP_ARG_ENABLE or PHP_ARG_WITH. Even if you do not
  plan to distribute your module with PHP, these facilities allow you
  to integrate your module easily into the main PHP module framework.
@@ -131,8 +115,8 @@ CREATING SOURCE FILES

 CREATING THE SELF-CONTAINED EXTENSION

-  Put Makefile.in, config.m4 and the source files into one directory.
-  Then run phpize (this is installed during make install by PHP 4.0).
+  Put config.m4 and the source files into one directory. Afterwards,
+  run phpize (this is installed during make install by PHP 4.0).
  For example, if you configured PHP with --prefix=/php, you would run

     $ /php/bin/phpize
@@ -157,17 +141,13 @@ ADDING SHARED MODULE SUPPORT TO A MODULE
  support to an existing module called foo.

  1. In config.m4, use PHP_ARG_WITH/PHP_ARG_ENABLE. Then you will
-     automatically be able to use --with-foo=shared or
-     --enable-foo=shared.
+     automatically be able to use --with-foo=shared[,..] or
+     --enable-foo=shared[,..].

-  2. In config.m4, use PHP_EXTENSION(foo, $ext_shared) to enable
+  2. In config.m4, use PHP_NEW_EXTENSION(foo,.., $ext_shared) to enable
     building the extension.

-  3. Add the following line to Makefile.in:
-
-        LTLIBRARY_SHARED_NAME = foo.la
-
-  4. Add the following lines to your C source file:
+  3. Add the following lines to your C source file:

        #ifdef COMPILE_DL_FOO
        ZEND_GET_MODULE(foo)
@@ -4,9 +4,6 @@ $Id$

 Please send comments to: Wez Furlong <wez@thebrainroom.com>

-Note: this doc is preliminary and is intended to give the reader an idea of
-how streams work and should be used.
-
 Why Streams?
 ============
 You may have noticed a shed-load of issock parameters flying around the PHP
@@ -26,7 +23,7 @@ The main functions are:

 PHPAPI size_t php_stream_read(php_stream * stream, char * buf, size_t count);
 PHPAPI size_t php_stream_write(php_stream * stream, const char * buf, size_t
-	  	count);
+        count);
 PHPAPI int php_stream_eof(php_stream * stream);
 PHPAPI int php_stream_getc(php_stream * stream);
 PHPAPI char *php_stream_gets(php_stream * stream, char *buf, size_t maxlen);
@@ -40,16 +37,119 @@ names: fread, fwrite, feof, fgetc, fgets, fclose, fflush, fseek, ftell.

 Opening Streams
 ===============
-Ultimately, I aim to implement an fopen_wrapper-like call to do this with
-minimum fuss.
-Currently, mostly for testing purposes, you can use php_stream_fopen to open a
-stream on a regular file.
+In most cases, you should use this API:

-PHPAPI php_stream * php_stream_fopen(const char * filename, const char *
-		mode);
+PHPAPI php_stream *php_stream_open_wrapper(char *path, char *mode,
+    int options, char **opened_path TSRMLS_DC);

-This call behaves just like fopen(), except it returns a stream instead of a
-FILE *
+Where:
+    path is the file or resource to open.
+    mode is the stdio compatible mode eg: "wb", "rb" etc.
+    options is a combination of the following values:
+        IGNORE_PATH  (default) - don't use include path to search for the file
+        USE_PATH        - use include path to search for the file
+        IGNORE_URL      - do not use plugin wrappers
+        REPORT_ERRORS   - show errors in a standard format if something
+                          goes wrong.
+        STREAM_MUST_SEEK - If you really need to be able to seek the stream
+                           and don't need to be able to write to the original
+                           file/URL, use this option to arrange for the stream
+                           to be copied (if needed) into a stream that can
+                           be seek()ed.
+                           
+    opened_path is used to return the path of the actual file opened,
+    but if you used STREAM_MUST_SEEK, may not be valid.  You are
+    responsible for efree()ing opened_path.  opened_path may be (and usually
+    is) NULL.
+
+If you need to open a specific stream, or convert standard resources into
+streams there are a range of functions to do this defined in php_streams.h.
+A brief list of the most commonly used functions:
+
+PHPAPI php_stream *php_stream_fopen_from_file(FILE *file, const char *mode);
+    Convert a FILE * into a stream.
+
+PHPAPI php_stream *php_stream_fopen_tmpfile(void);
+    Open a FILE * with tmpfile() and convert into a stream.
+
+PHPAPI php_stream *php_stream_fopen_temporary_file(const char *dir,
+    const char *pfx, char **opened_path TSRMLS_DC);
+    Generate a temporary file name and open it.
+
+There are some network enabled relatives in php_network.h:
+
+PHPAPI php_stream *php_stream_sock_open_from_socket(int socket, int persistent);
+    Convert a socket into a stream.
+
+PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short port,
+		int socktype, int timeout, int persistent);
+    Open a connection to a host and return a stream.
+
+PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent,
+    struct timeval *timeout);
+    Open a UNIX domain socket.
+   
+
+Stream Utilities
+================
+
+If you need to copy some data from one stream to another, you will be please
+to know that the streams API provides a standard way to do this:
+
+PHPAPI size_t php_stream_copy_to_stream(php_stream *src,
+    php_stream *dest, size_t maxlen);
+
+If you want to copy all remaining data from the src stream, pass
+PHP_STREAM_COPY_ALL as the maxlen parameter, otherwise maxlen indicates the
+number of bytes to copy.
+This function will try to use mmap where available to make the copying more
+efficient.
+
+If you want to read the contents of a stream into an allocated memory buffer,
+you should use:
+
+PHPAPI size_t php_stream_copy_to_mem(php_stream *src, char **buf,
+    size_t maxlen, int persistent);
+
+This function will set buf to the address of the buffer that it allocated,
+which will be maxlen bytes in length, or will be the entire length of the
+data remaining on the stream if you set maxlen to PHP_STREAM_COPY_ALL.
+The buffer is allocated using pemalloc(); you need to call pefree() to
+release the memory when you are done.
+As with copy_to_stream, this function will try use mmap where it can.
+
+If you have an existing stream and need to be able to seek() it, you
+can use this function to copy the contents into a new stream that can
+be seek()ed:
+
+PHPAPI int php_stream_make_seekable(php_stream *origstream, php_stream **newstream);
+
+It returns one of the following values:
+#define PHP_STREAM_UNCHANGED	0 /* orig stream was seekable anyway */
+#define PHP_STREAM_RELEASED		1 /* newstream should be used; origstream is no longer valid */
+#define PHP_STREAM_FAILED		2 /* an error occurred while attempting conversion */
+#define PHP_STREAM_CRITICAL		3 /* an error occurred; origstream is in an unknown state; you should close origstream */
+
+make_seekable will always set newstream to be the stream that is valid
+if the function succeeds.
+When you have finished, remember to close the stream.
+
+NOTE: If you only need to seek forwards, there is no need to call this
+function, as the php_stream_seek can emulate forward seeking when the
+whence parameter is SEEK_CUR.
+
+NOTE: Writing to the stream may not affect the original source, so it
+only makes sense to use this for read-only use.
+
+NOTE: If the origstream is network based, this function will block
+until the whole contents have been downloaded.
+
+NOTE: Never call this function with an origstream that is referenced
+as a resource! It will close the origstream on success, and this
+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();

 Casting Streams
 ===============
@@ -59,14 +159,14 @@ You need to "cast" the stream into a FILE*, and this is how you do it:
 FILE * fp;
 php_stream * stream; /* already opened */

-if (php_stream_cast(stream, PHP_STREAM_AS_STDIO, &fp, 1) == FAILURE)	{
-	RETURN_FALSE;
+if (php_stream_cast(stream, PHP_STREAM_AS_STDIO, (void*)&fp, REPORT_ERRORS) == FAILURE)    {
+    RETURN_FALSE;
 }

 The prototype is:

 PHPAPI int php_stream_cast(php_stream * stream, int castas, void ** ret, int
-		show_err);
+        show_err);

 The show_err parameter, if non-zero, will cause the function to display an
 appropriate error message of type E_WARNING if the cast fails.
@@ -83,8 +183,14 @@ if you mix ANSI stdio calls on the FILE* with php stream calls on the stream.
 If your system has the fopencookie function, php streams can synthesize a
 FILE* on top of any stream, which is useful for SSL sockets, memory based
 streams, data base streams etc. etc.
-NOTE: There might be situations where this is not desireable, and we need to
-provide a flag to inform the casting routine of this.
+
+In situations where this is not desireable, you should query the stream
+to see if it naturally supports FILE *.  You can use this code snippet
+for this purpose:
+
+    if (php_stream_is(stream, PHP_STREAM_IS_STDIO)) {
+        /* can safely cast to FILE* with no adverse side effects */
+    }

 You can use:

@@ -93,10 +199,15 @@ PHPAPI int php_stream_can_cast(php_stream * stream, int castas)
 to find out if a stream can be cast, without actually performing the cast, so
 to check if a stream is a socket you might use:

-if (php_stream_can_cast(stream, PHP_STREAM_AS_SOCKETD) == SUCCESS)	{
-	/* it's a socket */
+if (php_stream_can_cast(stream, PHP_STREAM_AS_SOCKETD) == SUCCESS)  {
+    /* it can be a socket */
 }

+Please note the difference between php_stream_is and php_stream_can_cast;
+stream_is tells you if the stream is a particular type of stream, whereas
+can_cast tells you if the stream can be forced into the form you request.
+The former doesn't change anything, while the later *might* change some
+state in the stream.

 Stream Internals
 ================
@@ -109,10 +220,10 @@ underlying implementation.
 The php_streams ops struct consists of pointers to methods that implement
 read, write, close, flush, seek, gets and cast operations.  Of these, an
 implementation need only implement write, read, close and flush.  The gets
-method is intended to be used for non-buffered streams if there is an
-underlying method that can efficiently behave as fgets.  The ops struct also
-contains a label for the implementation that will be used when printing error
-messages - the stdio implementation has a label of "STDIO" for example.
+method is intended to be used for streams if there is an underlying method
+that can efficiently behave as fgets.  The ops struct also contains a label
+for the implementation that will be used when printing error messages - the
+stdio implementation has a label of "STDIO" for example.

 The idea is that a stream implementation defines a php_stream_ops struct, and
 associates it with a php_stream using php_stream_alloc.
@@ -121,17 +232,17 @@ As an example, the php_stream_fopen() function looks like this:

 PHPAPI php_stream * php_stream_fopen(const char * filename, const char * mode)
 {
-	FILE * fp = fopen(filename, mode);
-	php_stream * ret;
-	
-	if (fp)	{
-		ret = php_stream_alloc(&php_stream_stdio_ops, fp, 0, 0, mode);
-		if (ret)
-			return ret;
+    FILE * fp = fopen(filename, mode);
+    php_stream * ret;
+    
+    if (fp) {
+        ret = php_stream_alloc(&php_stream_stdio_ops, fp, 0, 0, mode);
+        if (ret)
+            return ret;

-		fclose(fp);
-	}
-	return NULL;
+        fclose(fp);
+    }
+    return NULL;
 }

 php_stream_stdio_ops is a php_stream_ops structure that can be used to handle
@@ -143,7 +254,7 @@ to be passed back to fopen_wrapper (or it's yet to be implemented successor).
 The prototype for php_stream_alloc is this:

 PHPAPI php_stream * php_stream_alloc(php_stream_ops * ops, void * abstract,
-		size_t bufsize, int persistent, const char * mode)
+        size_t bufsize, int persistent, const char * mode)

 ops is a pointer to the implementation,
 abstract holds implementation specific data that is relevant to this instance
@@ -164,6 +275,19 @@ into a FILE*, so it should be compatible with the mode parameter of fopen().
 Writing your own stream implementation
 ======================================

+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+RULE #1: when writing your own streams: make sure you have configured PHP with
+--enable-debug.
+I've taken some great pains to hook into the zend memory manager to help track
+down allocation problems.  It will also help you spot incorrect use of the
+STREAMS_DC, STREAMS_CC and the semi-private STREAMS_REL_CC macros for function
+definitions.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+RULE #2: Please use the stdio stream as a reference; it will help you
+understand the semantics of the stream operations, and it will always
+be more up to date than these docs :-)
+
 First, you need to figure out what data you need to associate with the
 php_stream.  For example, you might need a pointer to some memory for memory
 based streams, or if you were making a stream to read data from an RDBMS like
@@ -176,9 +300,9 @@ appropriately), and use the abstract pointer to refer to it.

 For structured state you might have this:

-struct my_state	{
-	MYSQL conn;
-	MYSQL_RES * result;
+struct my_state {
+    MYSQL conn;
+    MYSQL_RES * result;
 };

 struct my_state * state = pemalloc(sizeof(struct my_state), persistent);
@@ -201,32 +325,32 @@ For example, for reading from this wierd mysql stream:

 static size_t php_mysqlop_read(php_stream * stream, char * buf, size_t count)
 {
-	struct my_state * state = (struct my_state*)stream->abstract;
+    struct my_state * state = (struct my_state*)stream->abstract;

-	if (buf == NULL && count == 0)	{
-		/* in this special case, php_streams is asking if we have reached the
-		 * end of file */
-		if (... at end of file ...)
-			return EOF;
-		else
-			return 0;
-	}
-	
-	/* pull out some data from the stream and put it in buf */
-	... mysql_fetch_row(state->result) ...
-	/* we could do something strange, like format the data as XML here,
-		and place that in the buf, but that brings in some complexities,
-		such as coping with a buffer size too small to hold the data,
-		so I won't even go in to how to do that here */
+    if (buf == NULL && count == 0)  {
+        /* in this special case, php_streams is asking if we have reached the
+         * end of file */
+        if (... at end of file ...)
+            return EOF;
+        else
+            return 0;
+    }
+    
+    /* pull out some data from the stream and put it in buf */
+    ... mysql_fetch_row(state->result) ...
+    /* we could do something strange, like format the data as XML here,
+        and place that in the buf, but that brings in some complexities,
+        such as coping with a buffer size too small to hold the data,
+        so I won't even go in to how to do that here */
 }

 Implement the other operations - remember that write, read, close and flush
 are all mandatory.  The rest are optional.  Declare your stream ops struct:

 php_stream_ops my_ops = {
-	php_mysqlop_write, php_mysqlop_read, php_mysqlop_close,
-	php_mysqlop_flush, NULL, NULL, NULL,
-	"Strange mySQL example"
+    php_mysqlop_write, php_mysqlop_read, php_mysqlop_close,
+    php_mysqlop_flush, NULL, NULL, NULL,
+    "Strange mySQL example"
 }

 Thats it!
@@ -240,4 +364,4 @@ connection and then use pefree to dispose of the struct you allocated.
 You may read the stream->persistent field to determine if your struct was
 allocated in persistent mode or not.

-vim:tw=78
+vim:tw=78:et
@@ -0,0 +1,121 @@
+Submitting Patch for PHP
+========================
+
+This document describes how to submit a patch for PHP. Since you are
+reading this document, you are willing to submit a patch for PHP.
+Please keep reading! Submitting a patch for PHP is easy. The hard
+part is making it acceptable for inclusion into our repository. :-)
+
+How to create patch?  
+-------------------- 
+We are working with CVS. You need to get CVS source to create a patch
+that we accept.  Visit http://www.php.net/anoncvs.php to get CVS
+source. You can check out older versions, but make sure you get
+the default branch (i.e. Do not use -r option when you check out the 
+CVS source)
+
+Read CODING_STANDARDS file before you start working.
+
+Now you are ready to create a patch. Modify source to fix a bug in PHP or
+add a new feature to PHP. After you finished editing, please test your
+patch. Read README.TESTING for testing.
+
+After you finish testing your patch, take diff file using 
+"cvs diff > your.patch" command.
+
+Read README.TESTING for submitting a test script for your patch. This is
+not strictly required, but it is preferred to submit a test script along
+with your patch. Making new test script is very easy. It also helps us
+to understand what you have been fixed or added to PHP.
+
+
+Tips for creating patch 
+----------------------- 
+If you would like to fix multiple bugs. It is easier for us if you
+could create 1 patch for 1 bug, but this is not strictly required.
+Note though that you might get little response, if your patch is
+too hard to review.
+
+If you would like change/add many lines, it is better to ask module
+maintainer and/or php-dev@lists.php.net, or pear-dev@lists.php.net if
+you are patching PEAR. Official module maintainers can be found in
+EXTENSIONS file in PHP source.
+
+If you are new to CVS (Concurrent Versions System), visit 
+http://cvshome.org/ for details.
+
+
+Recommended CVS client settings for creating patch file
+------------------------------------------------------
+Recommended ~/.cvsrc file setting is:
+------
+cvs -z3
+update -d -P
+checkout -P
+diff -u
+
+------
+diff -u means:
+ -u     Use the unified output format.
+
+With this CVS setting, you don't have to worry about adding/deleting
+newlines and spaces.
+
+
+Check list for submitting patch
+-------------------------------
+ - Did you run "make test" to check if your patch didn't break
+   other features?
+ - Did you compile PHP with --enable-debug and check php/webserver 
+   error logs when you test your patch?
+ - Did you build PHP for multi-threaded web servers. (Optional)
+ - Did you create test script for "make test"? (Recommended)
+ - Did you check your patch is unified format and it does not 
+   contain white space changes? (If you are not using recommended 
+   cvs setting)
+ - Did you update CVS source before you take final patch?
+ - Did you read the patch again?
+
+
+Where to send your patch?
+-------------------------
+If you are patching C source, send the patch to php-dev@lists.php.net. 
+If you are patching a module, you should also send the patch to the 
+maintainer. Official module maintainers are listed in EXTENSION file 
+in source.
+
+If you are patching PEAR, send the patch to pear-dev@lists.php.net.
+
+Please add the prefix "[PATCH]" to your email subject and make sure
+to include the patch as a MIME attachment even if it is short. 
+Test scripts should be included in the same email.
+Explain what has been fixed/added/changed by your patch.
+
+Finally, add the bug Id(s) which can be closed by your patch, if any.
+
+
+What happens after you submit your patch
+-------------------------------------- 
+If your patch is easy to review and has obviously no side-effects,
+it might take up to a few hours until someone commits it.
+
+Because this is a volunteer-driven effort, more complex patches will
+require more patience on your side. 
+
+If you did not receive any feedback in a few days, please consider
+resubmitting the description of your patch, along-side with
+these questions:
+
+- Is my patch too hard to review? Because of which factors?
+- Should I split it up in multiple parts?
+- Are there any unwanted whitespace changes?
+
+
+What happens when your patch is applied?
+---------------------------------------- 
+Your name will be included together with your email address in the CVS 
+commit log. If your patch affects end-users, a brief description
+and your name might be added to the NEWS file.
+
+
+Thank you for submitting patch for PHP!
@@ -0,0 +1,175 @@
+[IMPORTANT NOTICE]
+------------------
+ Do _not_ ask to developers why some or all tests are failed under
+your environment! Let us know if you find why it fails. Thank you.
+
+
+[Testing Basics] 
+----------------
+ To execute test scripts, you must build PHP with some SAPI, then you
+type "make test" to execute all or some test scripts saved under
+"tests" directory under source root directory.
+
+Usage:
+make test
+
+ "make test" basically executes "run-tests.php" script
+under source root. Therefore you can execute the script
+as follows
+
+./sapi/cli/php -c /path/to/php.ini/ run-tests.php [ext/some_extension_name]
+
+
+
+[Which "php" executable "make test" look for]
+---------------------------------------------
+ "make test" executes "run-tests.php" script with "php" binary.  Some
+test scripts such as session must be executed by CGI SAPI. Therefore,
+you must build PHP with CGI SAPI to perform all tests.
+
+ If PHP is not build with CGI SAPI, "run-tests.php" script uses CLI
+SAPI. Tests that may not executed by CLI SAPI will be skipped.
+
+NOTE: PHP binary executing "run-tests.php" and php binary used for
+executing test scripts may differ. If you use different PHP binary for
+executing "run-tests.php" script, you may get errors.
+
+
+[Which php.ini is used]
+-----------------------
+ "make test" force to use php.ini-dist as default config file. If 
+you would like to test with other configuration file, user 
+"run-tests.php" script.
+
+Example:
+./sapi/cli/php -c /path/to/php.ini/ ext/standard
+
+If you use php.ini other than php.ini-dist, you may see more failed
+tests.
+
+
+[Which test scripts are executed]
+---------------------------------
+ "run-tests.php" ("make test") executes all test scripts by default
+by looking all directory named "tests". If there are files have "phpt"
+extension, "run-tests.php" takes test php code from the file and 
+executes it.
+
+ Tester can easily executes tests selectively with as follows.
+
+Example:
+./sapi/cli/php -c /path/to/php.ini/ run-tests.php ext/mbstring
+
+
+[Test results]
+--------------
+ Test results are printed to standard output. If there is a failed test, 
+"run-tests.php" script saves the result, expected result and code
+executed to the test script directory. For example, if 
+ext/myext/tests/myext.phpt is failed to pass, following files are 
+created:
+
+ext/myext/tests/myext.out  - output from test script
+ext/myext/tests/myext.exp  - expected output
+ext/myext/tests/myext.php  - test script executed
+
+ Tester can verify these files, if failed test is actually a bug
+or not. 
+
+
+[Creating new test files]
+-------------------------
+ Writing test file is very easy if you are used to PHP. Test file
+has following format. Here is a actual test file from iconv module.
+
+===== ext/iconv/002.phpt =======
+--TEST--
+UCS4BE to ASCII
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
+<?php include('002.inc'); ?>
+--EXPECT--
+&#97;&#98;&#99;&#100;
+abcd
+===== end of ext/iconv/002.phpt =======
+
+"--TEST--" is title of the test.
+"--SKIPIF--" is condition when to skip this test.
+"--POST--" is POST variable passed to test script.
+"--GET--" is GET variable passed to test script.
+"--FILE--" is the test script.
+"--EXPECT--" is the expected output from the test script.
+
+ext/iconv/002.phpt uses 2 files. "skipif.inc" is used to skip
+test when test cannot be performed such as iconv module is not
+compiled or loaded. 
+
+==== ext/iconv/skipif.inc ====
+<?php
+// This script prints "skip" if condition does not meet.
+
+if (!extension_loaded("iconv") && ini_get("enable_dl")) {
+  $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
+  @dl("iconv$dlext");
+}
+if (!extension_loaded("iconv")) {
+    die("skip\n");
+}
+?>
+==== end of ext/iconv/skipif.inc ====
+
+ext/inconv/002.inc is the test script. "run-tests.php" script
+executes test script with CGI executable.
+
+==== ext/iconv/002.inc ===
+<?php
+/*
+Expected output:
+&#97;&#98;&#99;&#100;
+abcd
+*/
+
+   $s = unpack("V*", iconv("ascii","UCS-4LE", "abcd"));
+   foreach($s as $c) { print "&#$c;"; } print "\n";
+
+   $s = pack("NNNN", 97, 98, 99, 100);
+   $q = iconv("UCS-4BE", "ascii", $s);
+   print $q; print "\n";
+?>
+=== end of ext/iconv/002.inc ===
+
+Test script and skipif code may be directly write into *.phpt.
+However, it is recommended to use other files for ease of writing
+test script. For instance, you can execute test script under 
+ext/iconv as follows:
+
+./sapi/cli/php -c /path/to/php.ini/ ext/iconv
+
+
+[How to help us]
+----------------
+ If you find bug in PHP, you can submit bug report AND test script 
+for us. You don't have to write complete script, just give us test
+script with following format. Please test the script and make sure
+you write the correct ACTUAL OUTPUT and EXPECTED OUTPUT before you
+submit.
+
+<?php
+/* 
+Bug #12345
+substr() bug. Do not return expected string.
+
+ACTUAL OUTPUT
+XYXA
+
+EXPECTED OUTPUT
+ABCD
+*/
+
+$str = "XYZABCD";
+echo substr($str,3,7);
+
+?>
@@ -0,0 +1,123 @@
+PHP Build System V5 Overview
+
+- supports Makefile.ins during transition phase
+- not-really-portable Makefile includes have been eliminated
+- supports seperate build directories without VPATH by using
+  explicit rules only
+- does not waste disk-space/CPU-time for building temporary libraries
+  => especially noticeable on slower systems
+- slow recursive make replaced with one global Makefile
+- eases integration of proper dependencies
+- adds PHP_DEFINE(what[, value]) which creates a single include-file
+  per what.  This will allow more fine-grained dependencies.
+- abandoning the "one library per directory" concept
+- improved integration of the CLI
+- several new targets
+  build-modules: builds and copies dynamic modules into modules/
+  install-cli: installs the CLI only, so that the install-sapi
+               target does only what its name says
+- finally abandoned automake (still requires aclocal at this time)
+- changed some configure-time constructs to run at buildconf-time
+- upgraded shtool to 1.5.4
+- removed $(moduledir) (use EXTENSION_DIR)
+
+The Reason For a New System
+
+It became more and more apparent that there is a severe need
+for addressing the portability concerns and improving the chance
+that your build is correct (how often have you been told to
+"make clean"? When this is done, you won't need to anymore).
+
+
+If You Build PHP on a Unix System
+
+
+You, as a user of PHP, will notice no changes.  Of course, the build
+system will be faster, look better and work smarter.
+
+
+
+If You Are Developing PHP
+
+
+
+
+Extension developers:
+
+Makefile.ins are abandoned.  The files which are to be compiled
+are specified in the config.m4 now using the following macro:
+
+PHP_NEW_EXTENSION(foo, foo.c bar.c baz.cpp, $ext_shared)
+
+E.g. this enables the extension foo which consists of three source-code
+modules, two in C and one in C++.  And dependending on the user's
+wishes, the extension will even be built as a dynamic module.
+
+The full syntax:
+
+PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags]]])
+
+Please have a look at acinclude.m4 for the gory details and meanings
+of the other parameters.
+
+And that's basically it for the extension side.
+
+If you previously built sub-libraries for this module, add
+the source-code files here as well.  If you need to specify
+separate include directories, do it this way:
+
+PHP_NEW_EXTENSION(foo, foo.c mylib/bar.c mylib/gregor.c,,,-I@ext_srcdir@/lib)
+
+E.g. this builds the three files which are located relative to the
+extension source directory and compiles all three files with the
+special include directive (@ext_srcdir@ is automatically replaced).
+
+Now, you need to tell the build system that you want to build files
+in a directory called $ext_builddir/lib:
+
+PHP_ADD_BUILD_DIR($ext_builddir/lib)
+
+Make sure to call this after PHP_NEW_EXTENSION, because $ext_builddir
+is only set by the latter.
+
+If you have a complex extension, you might to need add special
+Make rules.  You can do this by calling PHP_ADD_MAKEFILE_FRAGMENT
+in your config.m4 after PHP_NEW_EXTENSION.
+
+This will read a file in the source-dir of your extension called
+Makefile.frag.  In this file, $(builddir) and $(srcdir) will be
+replaced by the values which are correct for your extension
+and which are again determined by the PHP_NEW_EXTENSION macro.
+
+Make sure to prefix *all* relative paths correctly with either
+$(builddir) or $(srcdir).  Because the build system does not
+change the working directory anymore, we must use either
+absolute paths or relative ones to the top build-directory.
+Correct prefixing ensures that.
+
+
+SAPI developers:
+
+Instead of using PHP_SAPI=foo/PHP_BUILD_XYZ, you will need to type
+
+PHP_SELECT_SAPI(name, type, sources.c)
+
+I.e. specify the source-code files as above and also pass the
+information regarding how PHP is supposed to be built (shared
+module, program, etc).
+
+For example for APXS:
+
+PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c)
+
+
+
+General info
+
+The foundation for the new system is the flexible handling of
+sources and their contexts.  With the help of macros you
+can define special flags for each source-file, where it is
+located, in which target context it can work, etc.
+
+Have a look at the well documented macros
+PHP_ADD_SOURCES(_X) in acinclude.m4.
@@ -1,186 +0,0 @@
-	Advisory on the PHP Release Cycle
-
-
-Copyright & Liciencing
-
-  This Document is  (c)  Copyright 2000,2001 by The PHP Group 
-
-  This Document is distributed under the terms of the GNU General
-  Public License as published by the Free Software Foundation; 
-  either version 2 of the License, or (at your option) any later
-  version. 
-
-
-Table of Contents
-
-  1. Introduction
-  2. Dealing with bugs
-  2.1  As a QA Team Member
-  2.2  As a Developer
-  3. Releaseing another RC
-  4. CVS During the Release Process
-  4.1  Useful CVS Commands	  
-  5  The Final Release
-  6  Summary
-
-
-1. Introduction
-
-   This cycle should take place over roughly 10 days.  When it is
-   decided it is time for an Release to occur Andi/Zeev (Or 
-   Whoever) will tarball RC1, Tag & Branch CVS (see section 4)
-   and then announce the RC on PHP-QA and PHP-DEV.  At this 
-   point the build tracker and QA Bug System come into play.
-   If you successfully build PHP then report it in the build
-   tracker, If you then run and complete all the tests you
-   should report this too in the build tracker when
-   these features become avalible.
-
-2. Dealing with Bugs
-
-2.1 As a QA Team member
-
-   If you find a bug in an RC that you think is a showstopper
-   then, even if it is a known bug, you should report it in the
-   QA Bug system.  This marks the bug for discussion at least,
-   and preferably fixing before the actual release.  This system
-   is separate from the main bugs system so that important bugs
-   dont get lost in the midst if lots of feature/change request
-   in the approach to a release.  It is imperitive where 
-   appropraite that as a QA'er a test script, Configure options
-   and PHP.ini files are provided to enable the developer to
-   reproduce the bug, this is an important part of our job.  If
-   you have a serious bug then you should also create a test
-   script to be added to the tests dir of the php source so
-   that at the end of the process to enable us to make sure bug
-   does not return.  It is not difficult to create these test
-   scripts and a readme on it can be found in
-   php4/tests/README.
-
-
-2.2 As a Developer
-
-   What should happen is that when a bug is reported it
-   is send to php-dev and php-qa as with other bugs.  We should
-   have far stricter assignment system in this bug cycle rather
-   than just leaving them. Once again bugs should be able to be
-   marked as To Be Fixed Before release or moved to other bug
-   system. (This is currently the Release Masters responsibility)
-
-   Then before the actual release the qa bugs system can be
-   checked and if there are outstanding To Be Fixed Before
-   release bugs the Developers can see this easyly rather than
-   show stoppers being dismissed and not worried about.
-
-   When a bug is fixed the QAer who reported the bug is emailed
-   and asked to test again and see if the bug is fixed.
-
-3 Releasing another RC
-
-   If it is felt necessary that a 2nd RC is needed then it
-   should be packaged as before and announced to both lists
-   again. The testing process then starts again, the RC2 is 
-   added to the build tracker and QA'ers are asked to build and
-   retest the scripts as appropriate, espectially if you
-   reported a bug, you should test thourghly for your 
-   bug and make sure it no longer occurs. This will normally
-   add anouther 3 days to the cycle, giving QA'ers time to
-   build test and report back, then for developers to 
-   fix any problems.
-
-4 CVS during the release process
-
-   At the point where the first RC is create a branch is
-   formed. This branch is not altered form that point onward
-   other than major bug fixes. Minor non important bug 
-   fixes should not be applied to this branch but to the main
-   tree instead. Any major bug fixes should be applied to both
-   trees. The developer should test and check the RC tree then
-   also test and check the MAIN tree. This is their
-   responsibility to make sure (as far as possible) that the
-   bug fix works on both trees.
-
-4.1 Useful CVS Commands
-
-   To create a Branch <Should only be done by person tarballing
-   the RC (The Release Master)>:
-
-	$ cvs tag -b php_4_0_<Version>RC<NUMBER> 
-   IE:
-	$ cvs tag -b php_4_0_1RC1
-
-   This should be executed in the PHP directory of an up to
-   date checkout. Remember to also tag the Zend and TSRM repositories.
-
-   You can retrieve a branch in one of two ways: by checking it
-   out fresh from the repository, or by switching an existing
-   working copy over to the branch, I would suggest you
-   checkout a new copy.
-
-   To check out a new copy:
-	$ cvs checkout -r php_4_0_<Version>RC<NUMBER> php4
-   IE:
-	$ cvs checkout -r php_4_0_1RC1 php4
-
-
-   To switch a working copy (Not recomended due to possible
-   commiting to wrong branch)
-	$ cvs update -r php_4_0_<Version>RC<NUMBER> php4
-   IE:
-	$ cvs update -r php_4_0_1RC1 php4
-
-   This should be done in the PHP4 directory itself.
-
-   To revert back to normal branch you should use the
-   following:
-	$ cvs update -A
-
-   To Commit to the branch you follow exactly the same
-   procedure as normal
-	$ cvs commit file.c
-
-   MAKE SURE YOU DO NOT COMMIT TO THE WRONG BRANCH.
-
-5 The Final Release
-
-   When it is time to make the final release the following
-   proceedure should be followed. The person who is tarballing
-   the final release should check the QA bugs system and make
-   sure there are no showstoppers left unfixed. If there are
-   then bug the person the bug is assigned to until they fix
-   it. If there are no more qa bugs then they should tag the
-   branch as  php_4_0_<Version> and tarball as usual. An email
-   should be sent to PHP-GEN, PHP_DEV and PHP-QA about the new
-   release and it should be added to php.net. The windows
-   binaries and servelets should be built as soon as possible
-   and added too, as should the windows installer.
-
-6 Summary
-
-   Here is a summary of what a release cycle might look like:
-
-   Thurs: RC is agreed on and packaged, an email is sent to   
-          PHP_QA and PHP-DEV, the CVS is Branched and the     
-          Release Cycle Begins. 
-
-   Mon:   After a weekends testing most show stoppers should  
-          have been found (Hopefully) and the developers get to
-          work on fixing them.
-
-   Thurs: A second RC is released if needed with the new bug  
-          fixes in and the QAers test again.
-
-   Sun:   A review is made of all outstanding bugs and any show
-          stoppers should be fixed. if there are no show      
-          stoppers then the final release is packaged and     
-          released on the monday morning on php.net
-
-   Mon:   Release is made.
-
-
-James
--  
-James Moore
-PHP QA Team
-jmoore@php.net
-
@@ -3,117 +3,149 @@ parenthesis means that person has taken on this project.

 Zend
 ----
-    * allow foreach ($array as $k => &$val) syntax. right now we cannot 
+    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
+    * Allow foreach ($array as $k => list($a, $b)) syntax for multi
      dimensional arrays.
-    * look at replacing c-lib call tolower().
-    * make hash API functions work with HASH_OF() to save time.
-    * native large number support (probably with GNU GMP)
-    * Const'ify APIs. Right now, many functions leave parameters untouched,
-      but don't declare those as const. This makes interaction with other
-      interfaces difficult which pass const parameters to us. 
-    * add try..catch/throw exception handling
+    * 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.
    * Add configure test to determine if dlsym() requires underscore and set
      DLSYM_NEEDS_UNDERSCORE accordingly. Perl and zsh have it in configure, 
-      for example.
+      for example. (DONE?)
+
+    For PHP 5.0.0:
+    * Native large number support (probably with GNU GMP)
+    * Const'ify APIs. Right now, many functions leave parameters untouched,
+      but don't declare those as const. This makes interaction with other
+      interfaces difficult which pass const parameters to us.
+

 global
 ------
-    * when used in standalone (skell-script like) mode don't urldecode
-      arguments passed to php. right now it's not possible to say
-        /usr/local/bin/php somescript.php dog+cat.txt
-      as "dog+cat.txt" will arrive in php as "dog cat.txt". 
-    * make everything on the language-level independent of your locale setings.
-    * always build the standalone executable as well as the chosen SAPI 
-      target.
-    * make sure all source files have the "right" copyright.
-    * the following modules still use PHP3_TLS_*() macros (and thereby don't 
-      work in ZTS mode): ext/db/db.c, ext/gd/gd.c
-    * make sure that all ZTS globals get destructed. Most ts_allocate_id()
+    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
-      dependices. (eg ftp)
+    * 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?)
+    * Change the odbc_fetch_into() function to require ALWAYS the first two
+      parameters ($conn_id and $array), and make the third (row) be optional.
+    * Remove --with-openlink configure option (--with-iodbc replaces it).
+    * Implement flush feature suitable for nested output buffers.
+
+    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 
      reentrancy-safe functions (DONE?).
-    * on some platforms unimplemented function will just do nothing (e.g. symlink)
-      they should print a warning or not even be defined!
-    * implement javadoc based function docs template system.
-    * use thread-safe resolver functions (either require BIND 8 or adns).
-    * provide optional IPv6 support.
    * make SAPI conform to CGI/1.1. Currently, all SAPI modules
      define REMOTE_ADDR etc. themselves and reach only various level
      of compliance.
+    * see what functions might need to be changed to use HashPosition, so
+      that the internal array pointer is not affected.
+    * Move most extensions and PEAR packages out of the PHP CVS tree,
+      include them again during release packaging.
+
+
+    Other
+    * use thread-safe resolver functions (either require BIND 8 or adns).
+    * implement javadoc based function docs template system.
+    * provide optional IPv6 support.
    * find a better way to implement script timeouts. SIGVTALRM is used
      by some POSIX threads implementations (i.e. OpenBSD) and is not
      available in ZTS mode.
-    * add aliases to functions to conform to new naming conventions, e.g.
-      str_to_upper().
-    * see what functions might need to be changed to use HashPosition, so
-      that the internal array pointer is not affected.
+

 documentation
 -------------
-    * add remarks in the documentation which functions are not implemented on win32.
-    * add remarks in the documentation which functions are not binary-safe.
-    * improve documentation for the sablotron extension
-    * update curl documentation
-    * write documentation for the bzip2 extension
-    * write documentation for the zziplib extension
+    * Add remarks in the documentation which functions are not implemented 
+      on win32. 
+    * Add remarks in the documentation which functions are not binary-safe.
+    * Update curl documentation (DONE?)
+    * Add developer documentation.
+    * Add detailed documentation for Java extension.
+
+ext/bz2
+-------
+    * Add ini setting for decompression buffer size. The default 4k is to small
+      for big files and takes ages to decompress. However, 40k which perform
+      quite good with big files may be to much under certain environments as
+      default setting. There should be consideren different default sizes for
+      different SAPIS (e.g. apache and cli).

 ext/curl
 --------
-    * Use the cURL write handler to save data for use when returning data or outputting
-      data.
    * Have a warning scheme for when people use unsupported features.

-ext/dav
--------
-    * rewrite.
-
 ext/oci8
 --------
-    * all OCIFetch*() functions should return 0 for no more data and false on error.
-    * have a flag that trims trailing spaces from CHAR fields on retrieval.
-    * make allow_call_time_pass_reference=Off working.
-    * for additional todo information, see oci8.c, in ext/oci8
+    * All OCIFetch*() functions should return 0 for no more data and false on 
+      error.
+    * Have a flag that trims trailing spaces from CHAR fields on retrieval.
+    * Make allow_call_time_pass_reference=Off working.
+    * For additional todo information, see oci8.c, in ext/oci8

 ext/pcre
 --------
    * Allow user to set PCRE_NOTEMPTY, PCRE_ANCHORED at execution time, maybe
-    * add option to preg_grep() to return entries that _don't_ match

-ext/sablot
----------
-    * Re-write the error handling and reporting interface
-    * Cleanup the underlying code a bit
-    * Add proper support for the message handlers
+ext/pcntl
+---------
+    * Change internal callback handler to use TICKS
+    * Remove all zend_extension code
+    * Add object callback support to pcntl_signal()
+
+ext/pgsql
+---------
+    For PHP 4.3.0:
+    * Add pg_metadata() with metadata cache feature.
+    * Add pg_convert() to check and convert array value for query.
+    * Add pg_insert/pg_update/pg_delete/pg_select for simple query.

 ext/session
 -----------
-    * maybe implement finer-grained session variables that could be 
+    For PHP 4.3.0:
+    * session_abort() to abort session. ie: Do not save session data.
+    * Allow unset($_SESSION) or unset($HTTP_SESSION_VARS) to unset
+      session vars regardless of register_globals setting.
+
+    Other:
+    * Maybe implement finer-grained session variables that could be 
      locked individually.
-    * write a network-transparent storage back-end with fallover
+    * Write a network-transparent storage back-end with fallover
      facilities
-    * provide a callback facility which is executed upon encountering
-      an unknown classname during deserialization
+    * Provide a callback facility which is executed upon encountering
+      an unknown class name during deserialization

 ext/sockets
 -----------
-    * Make the extension work on windows (Daniel Beulshausen)
-    * Make the extension work with Solaris and the Sun GCC
+    * Implement IPv6
+    * Review/Fix vectors

 ext/standard
 ------------
-    * add a version number to data serialized via serialize().
-    * array_add(). (Andrei)
-    * possibly modify parsing of GPC data to automatically create arrays if
+    * Add a version number to data serialized via serialize().
+    * Possibly modify parsing of GPC data to automatically create arrays if
      variable name is seen more than once.
-    * implement regex-cache for url-functions.
+    * Implement regex-cache for url-functions.
    * stri_replace(). (Andrei)
-    * move socket related functions to fsock.c.
+    * Move socket related functions to fsock.c.
    * NOT binary safe:
        strtok()
        basename()
@@ -121,19 +153,12 @@ ext/standard
        strrpos()
        strrchr()
        strip_tags()
-    * rewrite win32 SMTP code to be useable for *ix to, maybe as a (default)
-      module of its own (Hartmut)
-
-ext/zziplib
------------
-    * more fully support the zziplib api

 ext/wddx
 --------
-    * See if we can support the remaining datatypes:
+    * See if we can support the remaining data types:
        dateTime
        binary
-        recordset

        http://www.wddx.org/WDDX_SDK_10a/7__References/WDDX_DTD.htm
        (Andrei)
@@ -1,35 +0,0 @@
-* Change the odbc_fetch_into() function to require ALWAYS the first two
-  parameters ($conn_id and $array), and make the third (row) be optional.
-
-* Remove --with-openlink configure option (--with-iodbc replaces it).
-
-* Always build CGI (--disable-cgi option to disable).
-
-* Move most extensions and PEAR packages out of the PHP CVS tree,
-  include them again during release packaging.
-
-* Renaming functions, so that they all are conform to one standard form.
-
-* Allow foreach($array as $key => &$value).
-
-* Allow foreach($array as list($var1, $var2)).
-
-* Clean up "$instance = &new object" syntax (default to the =& behaviour?).
-
-* Allow to set a default value for call-by-reference-parameters. eg:
-  function hallo (&$pallo = NULL) {}
-
-* Change PHP error messages, so that they point to pages or sections in the
-  PHP Manual.
-
-* Fix Zend shallow copy issues with objects and arrays.
-
-* Make all extensions thread-safe.
-
-* Finish PHP streams abstraction, nuke all that issock stuff, implement SSL
-  socket support. (wez)
-  - ext/ftp/ -> all FILEs to streams
-  - ext/bz2/ -> convert to stream impl.
-
-* Using arg_separator.input to implode args in the CGI sapi extension
-  and arg_separator.input to explode in php_build_argv().
@@ -0,0 +1,3 @@
+- clean up .cvsignores
+- purge Makefile.ins and replace PHP_EXTENSION in config.m4s
+  with appropiate calls to PHP_NEW_EXTENSION
@@ -0,0 +1,26 @@
+Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+- Neither name of the copyright holders nor the names of their contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
+IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -0,0 +1,6 @@
+## process this file with automake to produce Makefile.am
+AUTOMAKE_OPTIONS=foreign
+noinst_LTLIBRARIES=libtsrm.la
+libtsrm_la_SOURCES = TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c
+
+depend:
@@ -0,0 +1,2 @@
+- Improve the lock in ts_resource_ex() in order to cover less code.
+  This can probably be done by more careful hash table access
@@ -0,0 +1,603 @@
+/*
+   +----------------------------------------------------------------------+
+   | Thread Safe Resource Manager                                         |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski|
+   | This source file is subject to the TSRM license, that is bundled     |
+   | with this package in the file LICENSE                                |
+   +----------------------------------------------------------------------+
+   | Authors:  Zeev Suraski <zeev@zend.com>                               |
+   +----------------------------------------------------------------------+
+*/
+
+#include "TSRM.h"
+
+#ifdef ZTS
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#if HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
+typedef struct _tsrm_tls_entry tsrm_tls_entry;
+
+struct _tsrm_tls_entry {
+	void **storage;
+	int count;
+	THREAD_T thread_id;
+	tsrm_tls_entry *next;
+};
+
+
+typedef struct {
+	size_t size;
+	ts_allocate_ctor ctor;
+	ts_allocate_dtor dtor;
+} tsrm_resource_type;
+
+
+/* The memory manager table */
+static tsrm_tls_entry	**tsrm_tls_table=NULL;
+static int				tsrm_tls_table_size;
+static ts_rsrc_id		id_count;
+
+/* The resource sizes table */
+static tsrm_resource_type	*resource_types_table=NULL;
+static int					resource_types_table_size;
+
+
+static MUTEX_T tsmm_mutex;	/* thread-safe memory manager mutex */
+
+/* New thread handlers */
+static tsrm_thread_begin_func_t tsrm_new_thread_begin_handler;
+static tsrm_thread_end_func_t tsrm_new_thread_end_handler;
+
+/* Debug support */
+int tsrm_error(int level, const char *format, ...);
+
+/* Read a resource from a thread's resource storage */
+static int tsrm_error_level;
+static FILE *tsrm_error_file;
+
+#if TSRM_DEBUG
+#define TSRM_ERROR(args) tsrm_error args
+#define TSRM_SAFE_RETURN_RSRC(array, offset, range)																		\
+	{																													\
+		int unshuffled_offset = TSRM_UNSHUFFLE_RSRC_ID(offset);															\
+																														\
+		if (offset==0) {																								\
+			return &array;																								\
+		} else if ((unshuffled_offset)>=0 && (unshuffled_offset)<(range)) {												\
+			TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Successfully fetched resource id %d for thread id %ld - 0x%0.8X",		\
+						unshuffled_offset, (long) thread_resources->thread_id, array[unshuffled_offset]));				\
+			return array[unshuffled_offset];																			\
+		} else {																										\
+			TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Resource id %d is out of range (%d..%d)",								\
+						unshuffled_offset, TSRM_SHUFFLE_RSRC_ID(0), TSRM_SHUFFLE_RSRC_ID(thread_resources->count-1)));	\
+			return NULL;																								\
+		}																												\
+	}
+#else
+#define TSRM_ERROR
+#define TSRM_SAFE_RETURN_RSRC(array, offset, range)		\
+	if (offset==0) {									\
+		return &array;									\
+	} else {											\
+		return array[TSRM_UNSHUFFLE_RSRC_ID(offset)];	\
+	}
+#endif
+
+#if defined(PTHREADS)
+/* Thread local storage */
+static pthread_key_t tls_key;
+#elif defined(TSRM_ST)
+static int tls_key;
+#elif defined(TSRM_WIN32)
+static DWORD tls_key;
+#endif
+
+
+/* Startup TSRM (call once for the entire process) */
+TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename)
+{
+#if defined(GNUPTH)
+	pth_init();
+#elif defined(PTHREADS)
+	pthread_key_create( &tls_key, 0 );
+#elif defined(TSRM_ST)
+	st_init();
+	st_key_create(&tls_key, 0);
+#elif defined(TSRM_WIN32)
+	tls_key = TlsAlloc();
+#endif
+
+	tsrm_error_file = stderr;
+	tsrm_error_set(debug_level, debug_filename);
+	tsrm_tls_table_size = expected_threads;
+
+	tsrm_tls_table = (tsrm_tls_entry **) calloc(tsrm_tls_table_size, sizeof(tsrm_tls_entry *));
+	if (!tsrm_tls_table) {
+		TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate TLS table"));
+		return 0;
+	}
+	id_count=0;
+
+	resource_types_table_size = expected_resources;
+	resource_types_table = (tsrm_resource_type *) calloc(resource_types_table_size, sizeof(tsrm_resource_type));
+	if (!resource_types_table) {
+		TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate resource types table"));
+		free(tsrm_tls_table);
+		tsrm_tls_table = NULL;
+		return 0;
+	}
+
+	tsmm_mutex = tsrm_mutex_alloc();
+
+	tsrm_new_thread_begin_handler = tsrm_new_thread_end_handler = NULL;
+
+	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Started up TSRM, %d expected threads, %d expected resources", expected_threads, expected_resources));
+	return 1;
+}
+
+
+/* Shutdown TSRM (call once for the entire process) */
+TSRM_API void tsrm_shutdown(void)
+{
+	int i;
+
+	if (tsrm_tls_table) {
+		for (i=0; i<tsrm_tls_table_size; i++) {
+			tsrm_tls_entry *p = tsrm_tls_table[i], *next_p;
+
+			while (p) {
+				int j;
+
+				next_p = p->next;
+				for (j=0; j<id_count; j++) {
+					free(p->storage[j]);
+				}
+				free(p->storage);
+				free(p);
+				p = next_p;
+			}
+		}
+		free(tsrm_tls_table);
+		tsrm_tls_table = NULL;
+	}
+	if (resource_types_table) {
+		free(resource_types_table);
+		resource_types_table=NULL;
+	}
+	tsrm_mutex_free(tsmm_mutex);
+	tsmm_mutex = NULL;
+	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Shutdown TSRM"));
+	if (tsrm_error_file!=stderr) {
+		fclose(tsrm_error_file);
+	}
+#if defined(GNUPTH)
+	pth_kill();
+#elif defined(PTHREADS)
+	pthread_key_delete(tls_key);
+#elif defined(TSRM_WIN32)
+	TlsFree(tls_key);
+#endif
+}
+
+
+/* allocates a new thread-safe-resource id */
+TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor)
+{
+	int i;
+
+	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Obtaining a new resource id, %d bytes", size));
+
+	tsrm_mutex_lock(tsmm_mutex);
+
+	/* obtain a resource id */
+	*rsrc_id = TSRM_SHUFFLE_RSRC_ID(id_count++);
+	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Obtained resource id %d", *rsrc_id));
+
+	/* store the new resource type in the resource sizes table */
+	if (resource_types_table_size < id_count) {
+		resource_types_table = (tsrm_resource_type *) realloc(resource_types_table, sizeof(tsrm_resource_type)*id_count);
+		if (!resource_types_table) {
+			tsrm_mutex_unlock(tsmm_mutex);
+			TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate storage for resource"));
+			*rsrc_id = 0;
+			return 0;
+		}
+		resource_types_table_size = id_count;
+	}
+	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].size = size;
+	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].ctor = ctor;
+	resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].dtor = dtor;
+
+	/* enlarge the arrays for the already active threads */
+	for (i=0; i<tsrm_tls_table_size; i++) {
+		tsrm_tls_entry *p = tsrm_tls_table[i];
+
+		while (p) {
+			if (p->count < id_count) {
+				int j;
+
+				p->storage = (void *) realloc(p->storage, sizeof(void *)*id_count);
+				for (j=p->count; j<id_count; j++) {
+					p->storage[j] = (void *) malloc(resource_types_table[j].size);
+					if (resource_types_table[j].ctor) {
+						resource_types_table[j].ctor(p->storage[j], &p->storage);
+					}
+				}
+				p->count = id_count;
+			}
+			p = p->next;
+		}
+	}
+	tsrm_mutex_unlock(tsmm_mutex);
+
+	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Successfully allocated new resource id %d", *rsrc_id));
+	return *rsrc_id;
+}
+
+
+static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_T thread_id)
+{
+	int i;
+
+	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Creating data structures for thread %x", thread_id));
+	(*thread_resources_ptr) = (tsrm_tls_entry *) malloc(sizeof(tsrm_tls_entry));
+	(*thread_resources_ptr)->storage = (void **) malloc(sizeof(void *)*id_count);
+	(*thread_resources_ptr)->count = id_count;
+	(*thread_resources_ptr)->thread_id = thread_id;
+	(*thread_resources_ptr)->next = NULL;
+
+#if defined(PTHREADS)
+	/* Set thread local storage to this new thread resources structure */
+	pthread_setspecific(tls_key, (void *) *thread_resources_ptr);
+#elif defined(TSRM_ST)
+	st_thread_setspecific(tls_key, (void *) *thread_resources_ptr);
+#elif defined(TSRM_WIN32)
+	TlsSetValue(tls_key, (void *) *thread_resources_ptr);
+#endif
+
+	if (tsrm_new_thread_begin_handler) {
+		tsrm_new_thread_begin_handler(thread_id, &((*thread_resources_ptr)->storage));
+	}
+	for (i=0; i<id_count; i++) {
+		(*thread_resources_ptr)->storage[i] = (void *) malloc(resource_types_table[i].size);
+		if (resource_types_table[i].ctor) {
+			resource_types_table[i].ctor((*thread_resources_ptr)->storage[i], &(*thread_resources_ptr)->storage);
+		}
+	}
+
+	tsrm_mutex_unlock(tsmm_mutex);
+
+	if (tsrm_new_thread_end_handler) {
+		tsrm_new_thread_end_handler(thread_id, &((*thread_resources_ptr)->storage));
+	}
+}
+
+
+/* fetches the requested resource for the current thread */
+TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
+{
+	THREAD_T thread_id;
+	int hash_value;
+	tsrm_tls_entry *thread_resources;
+
+	if (!th_id) {
+#if defined(PTHREADS)
+		/* Fast path for looking up the resources for the current
+		 * thread. Its used by just about every call to
+		 * ts_resource_ex(). This avoids the need for a mutex lock
+		 * and our hashtable lookup.
+		 */
+		thread_resources = pthread_getspecific(tls_key);
+#elif defined(TSRM_ST)
+		thread_resources = st_thread_getspecific(tls_key);
+#elif defined(TSRM_WIN32)
+		thread_resources = TlsGetValue(tls_key);
+#else
+		thread_resources = NULL;
+#endif
+		if (thread_resources) {
+			TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Fetching resource id %d for current thread %d", id, (long) thread_resources->thread_id));
+			/* Read a specific resource from the thread's resources.
+			 * This is called outside of a mutex, so have to be aware about external
+			 * changes to the structure as we read it.
+			 */
+			TSRM_SAFE_RETURN_RSRC(thread_resources->storage, id, thread_resources->count);
+		}
+		thread_id = tsrm_thread_id();
+	} else {
+		thread_id = *th_id;
+	}
+
+	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Fetching resource id %d for thread %ld", id, (long) thread_id));
+	tsrm_mutex_lock(tsmm_mutex);
+
+	hash_value = THREAD_HASH_OF(thread_id, tsrm_tls_table_size);
+	thread_resources = tsrm_tls_table[hash_value];
+
+	if (!thread_resources) {
+		allocate_new_resource(&tsrm_tls_table[hash_value], thread_id);
+		return ts_resource_ex(id, &thread_id);
+	} else {
+		 do {
+			if (thread_resources->thread_id == thread_id) {
+				break;
+			}
+			if (thread_resources->next) {
+				thread_resources = thread_resources->next;
+			} else {
+				allocate_new_resource(&thread_resources->next, thread_id);
+				return ts_resource_ex(id, &thread_id);
+				/*
+				 * thread_resources = thread_resources->next;
+				 * break;
+				 */
+			}
+		 } while (thread_resources);
+	}
+	tsrm_mutex_unlock(tsmm_mutex);
+	/* Read a specific resource from the thread's resources.
+	 * This is called outside of a mutex, so have to be aware about external
+	 * changes to the structure as we read it.
+	 */
+	TSRM_SAFE_RETURN_RSRC(thread_resources->storage, id, thread_resources->count);
+}
+
+
+/* frees all resources allocated for the current thread */
+void ts_free_thread(void)
+{
+	tsrm_tls_entry *thread_resources;
+	int i;
+	THREAD_T thread_id = tsrm_thread_id();
+	int hash_value;
+	tsrm_tls_entry *last=NULL;
+
+	tsrm_mutex_lock(tsmm_mutex);
+	hash_value = THREAD_HASH_OF(thread_id, tsrm_tls_table_size);
+	thread_resources = tsrm_tls_table[hash_value];
+
+	while (thread_resources) {
+		if (thread_resources->thread_id == thread_id) {
+			for (i=0; i<thread_resources->count; i++) {
+				if (resource_types_table[i].dtor) {
+					resource_types_table[i].dtor(thread_resources->storage[i], &thread_resources->storage);
+				}
+			}
+			for (i=0; i<thread_resources->count; i++) {
+				free(thread_resources->storage[i]);
+			}
+			free(thread_resources->storage);
+			if (last) {
+				last->next = thread_resources->next;
+			} else {
+				tsrm_tls_table[hash_value] = thread_resources->next;
+			}
+#if defined(PTHREADS)
+			pthread_setspecific(tls_key, 0);
+#elif defined(TSRM_WIN32)
+			TlsSetValue(tls_key, 0);
+#endif
+			free(thread_resources);
+			break;
+		}
+		if (thread_resources->next) {
+			last = thread_resources;
+		}
+		thread_resources = thread_resources->next;
+	}
+	tsrm_mutex_unlock(tsmm_mutex);
+}
+
+
+/* deallocates all occurrences of a given id */
+void ts_free_id(ts_rsrc_id id)
+{
+}
+
+
+
+
+/*
+ * Utility Functions
+ */
+
+/* Obtain the current thread id */
+TSRM_API THREAD_T tsrm_thread_id(void)
+{
+#ifdef TSRM_WIN32
+	return GetCurrentThreadId();
+#elif defined(NETWARE)
+	return NXThreadGetId();
+#elif defined(GNUPTH)
+	return pth_self();
+#elif defined(PTHREADS)
+	return pthread_self();
+#elif defined(NSAPI)
+	return systhread_current();
+#elif defined(PI3WEB)
+	return PIThread_getCurrent();
+#elif defined(TSRM_ST)
+	return st_thread_self();
+#endif
+}
+
+
+/* Allocate a mutex */
+TSRM_API MUTEX_T tsrm_mutex_alloc(void)
+{
+    MUTEX_T mutexp;
+#ifdef NETWARE
+    long flags = 0;  /* Don't require NX_MUTEX_RECURSIVE, I guess */
+    NXHierarchy_t order = 0;
+    NX_LOCK_INFO_ALLOC (lockInfo, "PHP-TSRM", 0);
+#endif    
+
+#ifdef TSRM_WIN32
+    mutexp = malloc(sizeof(CRITICAL_SECTION));
+	InitializeCriticalSection(mutexp);
+#elif defined(NETWARE)
+    mutexp = NXMutexAlloc(flags, order, &lockInfo); /* return value ignored for now */
+#elif defined(GNUPTH)
+	mutexp = (MUTEX_T) malloc(sizeof(*mutexp));
+	pth_mutex_init(mutexp);
+#elif defined(PTHREADS)
+	mutexp = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t));
+	pthread_mutex_init(mutexp,NULL);
+#elif defined(NSAPI)
+	mutexp = crit_init();
+#elif defined(PI3WEB)
+	mutexp = PIPlatform_allocLocalMutex();
+#elif defined(TSRM_ST)
+	mutexp = st_mutex_new();
+#endif
+#ifdef THR_DEBUG
+		printf("Mutex created thread: %d\n",mythreadid());
+#endif
+    return( mutexp );
+}
+
+
+/* Free a mutex */
+TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
+{
+    if (mutexp) {
+#ifdef TSRM_WIN32
+		DeleteCriticalSection(mutexp);
+#elif defined(NETWARE)
+		NXMutexFree(mutexp);
+#elif defined(GNUPTH)
+		free(mutexp);
+#elif defined(PTHREADS)
+		pthread_mutex_destroy(mutexp);
+		free(mutexp);
+#elif defined(NSAPI)
+		crit_terminate(mutexp);
+#elif defined(PI3WEB)
+		PISync_delete(mutexp);
+#elif defined(TSRM_ST)
+		st_mutex_destroy(mutexp);
+#endif
+    }
+#ifdef THR_DEBUG
+		printf("Mutex freed thread: %d\n",mythreadid());
+#endif
+}
+
+
+/* Lock a mutex */
+TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
+{
+	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Mutex locked thread: %ld", tsrm_thread_id()));
+#ifdef TSRM_WIN32
+	EnterCriticalSection(mutexp);
+	return 1;
+#elif defined(NETWARE)
+	return NXLock(mutexp);	
+#elif defined(GNUPTH)
+	return pth_mutex_acquire(mutexp, 0, NULL);
+#elif defined(PTHREADS)
+	return pthread_mutex_lock(mutexp);
+#elif defined(NSAPI)
+	return crit_enter(mutexp);
+#elif defined(PI3WEB)
+	return PISync_lock(mutexp);
+#elif defined(TSRM_ST)
+	return st_mutex_lock(mutexp);
+#endif
+}
+
+
+/* Unlock a mutex */
+TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
+{
+	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Mutex unlocked thread: %ld", tsrm_thread_id()));
+#ifdef TSRM_WIN32
+	LeaveCriticalSection(mutexp);
+	return 1;
+#elif defined(NETWARE)
+	return NXUnlock(mutexp);
+#elif defined(GNUPTH)
+	return pth_mutex_release(mutexp);
+#elif defined(PTHREADS)
+	return pthread_mutex_unlock(mutexp);
+#elif defined(NSAPI)
+	return crit_exit(mutexp);
+#elif defined(PI3WEB)
+	return PISync_unlock(mutexp);
+#elif defined(TSRM_ST)
+	return st_mutex_unlock(mutexp);
+#endif
+}
+
+
+TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler)
+{
+	void *retval = (void *) tsrm_new_thread_begin_handler;
+
+	tsrm_new_thread_begin_handler = new_thread_begin_handler;
+	return retval;
+}
+
+
+TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler)
+{
+	void *retval = (void *) tsrm_new_thread_end_handler;
+
+	tsrm_new_thread_end_handler = new_thread_end_handler;
+	return retval;
+}
+
+
+
+/*
+ * Debug support
+ */
+
+#if TSRM_DEBUG
+int tsrm_error(int level, const char *format, ...)
+{
+	if (level<=tsrm_error_level) {
+		va_list args;
+		int size;
+
+		fprintf(tsrm_error_file, "TSRM:  ");
+		va_start(args, format);
+		size = vfprintf(tsrm_error_file, format, args);
+		va_end(args);
+		fprintf(tsrm_error_file, "\n");
+		fflush(tsrm_error_file);
+		return size;
+	} else {
+		return 0;
+	}
+}
+#endif
+
+
+void tsrm_error_set(int level, char *debug_filename)
+{
+	tsrm_error_level = level;
+
+#if TSRM_DEBUG
+	if (tsrm_error_file!=stderr) { /* close files opened earlier */
+		fclose(tsrm_error_file);
+	}
+
+	if (debug_filename) {
+		tsrm_error_file = fopen(debug_filename, "w");
+		if (!tsrm_error_file) {
+			tsrm_error_file = stderr;
+		}
+	} else {
+		tsrm_error_file = stderr;
+	}
+#endif
+}
+
+#endif /* ZTS */
@@ -0,0 +1,186 @@
+# Microsoft Developer Studio Project File - Name="TSRM" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=TSRM - Win32 Debug_TS
+!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 "TSRM.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 "TSRM.mak" CFG="TSRM - Win32 Debug_TS"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "TSRM - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "TSRM - Win32 Release_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "TSRM - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")
+!MESSAGE "TSRM - 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)" == "TSRM - Win32 Debug_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "TSRM___Win32_Debug_TS"
+# PROP BASE Intermediate_Dir "TSRM___Win32_Debug_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_TS"
+# PROP Intermediate_Dir "Debug_TS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "C:\Projects\TSRM" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=1 /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)" == "TSRM - Win32 Release_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "TSRM___Win32_Release_TS"
+# PROP BASE Intermediate_Dir "TSRM___Win32_Release_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 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" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
+# 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)" == "TSRM - Win32 Release_TS_inline"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "TSRM___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "TSRM___Win32_Release_TS_inline"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 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" /D "WIN32" /D "_MBCS" /D "_LIB" /D "TSRM_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
+# 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)" == "TSRM - Win32 Release_TSDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "TSRM___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "TSRM___Win32_Release_TSDbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 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" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
+# 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 "TSRM - Win32 Debug_TS"
+# Name "TSRM - Win32 Release_TS"
+# Name "TSRM - Win32 Release_TS_inline"
+# Name "TSRM - Win32 Release_TSDbg"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\TSRM.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_strtok_r.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_virtual_cwd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_win32.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\readdir.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TSRM.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_config.w32.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_config_common.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_strtok_r.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_virtual_cwd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tsrm_win32.h
+# End Source File
+# End Group
+# End Target
+# End Project
@@ -0,0 +1,150 @@
+/*
+   +----------------------------------------------------------------------+
+   | Thread Safe Resource Manager                                         |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski|
+   | This source file is subject to the TSRM license, that is bundled     |
+   | with this package in the file LICENSE                                |
+   +----------------------------------------------------------------------+
+   | Authors:  Zeev Suraski <zeev@zend.com>                               |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef TSRM_H
+#define TSRM_H
+
+/* #ifndef WIN32 */
+#if !defined(WIN32) && !defined(NETWARE)
+# include "tsrm_config.h"
+#endif
+
+#ifdef WIN32
+# define TSRM_WIN32
+#endif
+
+#ifdef TSRM_WIN32
+#	ifdef TSRM_EXPORTS
+#	define TSRM_API __declspec(dllexport)
+#	else
+#	define TSRM_API __declspec(dllimport)
+#	endif
+#else
+#	define TSRM_API
+#endif
+
+/* Only compile multi-threading functions if we're in ZTS mode */
+#ifdef ZTS
+
+#ifdef TSRM_WIN32
+# include <windows.h>
+#elif defined(NETWARE)
+# include <nks/thread.h>
+# include <nks/synch.h>
+#elif defined(GNUPTH)
+# include <pth.h>
+#elif defined(PTHREADS)
+# include <pthread.h>
+#elif defined(TSRM_ST)
+# include <st.h>
+#endif
+
+typedef int ts_rsrc_id;
+
+/* Define THREAD_T and MUTEX_T */
+#ifdef TSRM_WIN32
+# define THREAD_T DWORD
+# define MUTEX_T CRITICAL_SECTION *
+#elif defined(NETWARE)
+# define THREAD_T NXThreadId_t
+# define MUTEX_T NXMutex_t *
+#elif defined(GNUPTH)
+# define THREAD_T pth_t
+# define MUTEX_T pth_mutex_t *
+#elif defined(PTHREADS)
+# define THREAD_T pthread_t
+# define MUTEX_T pthread_mutex_t *
+#elif defined(NSAPI)
+# define THREAD_T SYS_THREAD
+# define MUTEX_T CRITICAL
+#elif defined(PI3WEB)
+# define THREAD_T PIThread *
+# define MUTEX_T PISync *
+#elif defined(TSRM_ST)
+# define THREAD_T st_thread_t
+# define MUTEX_T st_mutex_t
+#endif
+
+typedef void (*ts_allocate_ctor)(void *, void ***);
+typedef void (*ts_allocate_dtor)(void *, void ***);
+
+#define THREAD_HASH_OF(thr,ts)  (unsigned long)thr%(unsigned long)ts
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* startup/shutdown */
+TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename);
+TSRM_API void tsrm_shutdown(void);
+
+/* allocates a new thread-safe-resource id */
+TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor);
+
+/* fetches the requested resource for the current thread */
+TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id);
+#define ts_resource(id)			ts_resource_ex(id, NULL)
+
+/* frees all resources allocated for the current thread */
+TSRM_API void ts_free_thread(void);
+
+/* deallocates all occurrences of a given id */
+TSRM_API void ts_free_id(ts_rsrc_id id);
+
+
+/* Debug support */
+#define TSRM_ERROR_LEVEL_ERROR	1
+#define TSRM_ERROR_LEVEL_CORE	2
+#define TSRM_ERROR_LEVEL_INFO	3
+
+typedef void (*tsrm_thread_begin_func_t)(THREAD_T thread_id, void ***tsrm_ls);
+typedef void (*tsrm_thread_end_func_t)(THREAD_T thread_id, void ***tsrm_ls);
+
+
+TSRM_API int tsrm_error(int level, const char *format, ...);
+TSRM_API void tsrm_error_set(int level, char *debug_filename);
+
+/* utility functions */
+TSRM_API THREAD_T tsrm_thread_id(void);
+TSRM_API MUTEX_T tsrm_mutex_alloc(void);
+TSRM_API void tsrm_mutex_free(MUTEX_T mutexp);
+TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp);
+TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp);
+
+TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler);
+TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
+
+#define TSRM_SHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)+1)
+#define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)-1)
+
+#define TSRMLS_FETCH()			void ***tsrm_ls = (void ***) ts_resource_ex(0, NULL)
+#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
+#define TSRMLS_C	tsrm_ls
+#define TSRMLS_CC	, TSRMLS_C
+
+#ifdef __cplusplus
+}
+#endif
+
+#else /* non ZTS */
+
+#define TSRMLS_FETCH()
+#define TSRMLS_D	void
+#define TSRMLS_DC
+#define TSRMLS_C
+#define TSRMLS_CC
+
+#endif /* ZTS */
+
+#endif /* TSRM_H */
@@ -0,0 +1 @@
+#undef PTHREADS
@@ -0,0 +1,5 @@
+
+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 = tsrm_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,31 @@
+dnl $Id$
+dnl
+dnl Minimalistic configure.in for TSRM.
+dnl
+
+AC_INIT(TSRM.c)
+AM_INIT_AUTOMAKE(TSRM, 1.0, nodefine)
+AM_CONFIG_HEADER(tsrm_config.h)
+
+sinclude(tsrm.m4)
+	
+TSRM_BASIC_CHECKS
+TSRM_THREADS_CHECKS
+	
+AM_PROG_LIBTOOL
+if test "$enable_debug" != "yes"; then
+  AM_SET_LIBTOOL_VARIABLE([--silent])
+fi
+
+dnl TSRM_PTHREAD
+
+AC_CHECK_HEADERS(
+utime.h \
+dirent.h \
+stdarg.h \
+alloca.h \
+unistd.h \
+limits.h
+)
+
+AC_OUTPUT(Makefile)
@@ -0,0 +1,44 @@
+#ifndef READDIR_H
+#define READDIR_H
+
+
+/*
+ * Structures and types used to implement opendir/readdir/closedir
+ * on Windows 95/NT.
+ */
+
+#include <io.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+
+/* struct dirent - same as Unix */
+
+struct dirent {
+	long d_ino;					/* inode (always 1 in WIN32) */
+	off_t d_off;				/* offset to this dirent */
+	unsigned short d_reclen;	/* length of d_name */
+	char d_name[_MAX_FNAME + 1];	/* filename (null terminated) */
+};
+
+
+/* typedef DIR - not the same as Unix */
+typedef struct {
+	long handle;				/* _findfirst/_findnext handle */
+	short offset;				/* offset into directory */
+	short finished;				/* 1 if there are not more files */
+	struct _finddata_t fileinfo;	/* from _findfirst/_findnext */
+	char *dir;					/* the dir we are reading */
+	struct dirent dent;			/* the dirent to return */
+} DIR;
+
+/* Function prototypes */
+DIR *opendir(const char *);
+struct dirent *readdir(DIR *);
+int readdir_r(DIR *, struct dirent *, struct dirent **);
+int closedir(DIR *);
+void rewinddir(DIR *);
+
+
+#endif /* READDIR_H */
@@ -0,0 +1,160 @@
+dnl  Copyright (c) 1999, 2000 Sascha Schumann. All rights reserved.
+dnl 
+dnl  Redistribution and use in source and binary forms, with or without
+dnl  modification, are permitted provided that the following conditions
+dnl  are met:
+dnl 
+dnl  1. Redistributions of source code must retain the above copyright
+dnl     notice, this list of conditions and the following disclaimer.
+dnl 
+dnl  2. Redistributions in binary form must reproduce the above copyright
+dnl     notice, this list of conditions and the following disclaimer in
+dnl     the documentation and/or other materials provided with the
+dnl     distribution.
+dnl 
+dnl  THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY
+dnl  EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+dnl  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+dnl  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL SASCHA SCHUMANN OR
+dnl  HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+dnl  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+dnl  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+dnl  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+dnl  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+dnl  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+dnl  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+dnl  OF THE POSSIBILITY OF SUCH DAMAGE.
+
+dnl
+dnl PTHREADS_FLAGS
+dnl
+dnl Set some magic defines to achieve POSIX threads conformance
+dnl
+AC_DEFUN(PTHREADS_FLAGS,[
+  if test -z "$host_alias" && test -n "$host"; then
+    host_alias=$host
+  fi
+  if test -z "$host_alias"; then
+    AC_MSG_ERROR(host_alias is not set. Make sure to run config.guess)
+  fi
+  case $host_alias in
+  *solaris*)
+    PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";;
+  *freebsd*)
+    PTHREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE";;
+  *linux*)
+    PTHREAD_FLAGS=-D_REENTRANT;;
+  *aix*)
+    PTHREAD_FLAGS=-D_THREAD_SAFE;;
+  *irix*)
+    PTHREAD_FLAGS=-D_POSIX_THREAD_SAFE_FUNCTIONS;;
+  *hpux*)
+    PTHREAD_FLAGS=-D_REENTRANT;;
+  *sco*)
+    PTHREAD_FLAGS=-D_REENTRANT;;
+dnl Solves sigwait() problem, creates problems with u_long etc.
+dnl    PTHREAD_FLAGS="-D_REENTRANT -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE_EXTENDED=1";;
+  esac
+
+  if test -n "$PTHREAD_FLAGS"; then
+    CPPFLAGS="$CPPFLAGS $PTHREAD_FLAGS"
+  fi
+])dnl
+dnl
+dnl PTHREADS_CHECK_COMPILE
+dnl
+dnl Check whether the current setup can use POSIX threads calls
+dnl
+AC_DEFUN(PTHREADS_CHECK_COMPILE, [
+AC_TRY_RUN( [
+#include <pthread.h>
+#include <stddef.h>
+
+void *thread_routine(void *data) {
+    return data;
+}
+
+int main() {
+    pthread_t thd;
+    pthread_mutexattr_t mattr;
+    int data = 1;
+    pthread_mutexattr_init(&mattr);
+    return pthread_create(&thd, NULL, thread_routine, &data);
+} ], [
+  pthreads_working=yes
+  ], [
+  pthreads_working=no
+  ], pthreads_working=no ) ] )dnl
+dnl
+dnl PTHREADS_CHECK()
+dnl
+dnl Try to find a way to enable POSIX threads
+dnl
+dnl  Magic flags
+dnl  -kthread          gcc (FreeBSD)
+dnl  -Kthread          UDK cc (UnixWare)
+dnl  -mt               WorkShop cc (Solaris)
+dnl  -mthreads         gcc (AIX)
+dnl  -pthread          gcc (Linux, FreeBSD, NetBSD, OpenBSD)
+dnl  -pthreads         gcc (Solaris) 
+dnl  -qthreaded        AIX cc V5
+dnl  -threads          gcc (HP-UX)
+dnl
+AC_DEFUN(PTHREADS_CHECK,[
+
+save_CFLAGS=$CFLAGS
+save_LIBS=$LIBS
+PTHREADS_ASSIGN_VARS
+PTHREADS_CHECK_COMPILE
+LIBS=$save_LIBS
+CFLAGS=$save_CFLAGS
+
+AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[
+ac_cv_pthreads_cflags=
+if test "$pthreads_working" != "yes"; then
+  for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 
+    ac_save=$CFLAGS
+    CFLAGS="$CFLAGS $flag"
+    PTHREADS_CHECK_COMPILE
+    CFLAGS=$ac_save
+    if test "$pthreads_working" = "yes"; then
+      ac_cv_pthreads_cflags=$flag
+      break
+    fi
+  done
+fi
+])
+
+AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
+ac_cv_pthreads_lib=
+if test "$pthreads_working" != "yes"; then
+  for lib in pthread pthreads c_r; do
+    ac_save=$LIBS
+    LIBS="$LIBS -l$lib"
+    PTHREADS_CHECK_COMPILE
+    LIBS=$ac_save
+    if test "$pthreads_working" = "yes"; then
+      ac_cv_pthreads_lib=$lib
+      break
+    fi
+  done
+fi
+])
+
+if test "$pthreads_working" = "yes"; then
+  threads_result="POSIX-Threads found"
+else
+  threads_result="POSIX-Threads not found"
+fi
+])dnl
+dnl
+dnl
+AC_DEFUN(PTHREADS_ASSIGN_VARS,[
+if test -n "$ac_cv_pthreads_lib"; then
+  LIBS="$LIBS -l$ac_cv_pthreads_lib"
+fi
+
+if test -n "$ac_cv_pthreads_cflags"; then
+  CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
+fi
+])dnl
@@ -0,0 +1,124 @@
+
+dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
+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
+  cmd='$CC $1 -c conftest.c'
+  if eval $cmd 2>&1 | egrep -e $1 >/dev/null ; then
+    ac_result=no
+  else
+    ac_result=yes
+  fi
+  eval $gcc_arg_name=$ac_result
+  rm -f conftest.*
+  ])
+  if eval test "\$$gcc_arg_name" = "yes"; then
+    $2
+  else
+    :
+    $3
+  fi
+])
+
+AC_DEFUN(TSRM_BASIC_CHECKS,[
+
+AC_REQUIRE([AC_PROG_CC])dnl
+dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
+AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
+
+AC_CHECK_HEADERS(stdarg.h)
+
+])
+
+
+AC_DEFUN(TSRM_CHECK_PTH,[
+
+AC_MSG_CHECKING(for GNU Pth)
+PTH_PREFIX="`$1 --prefix`"
+if test -z "$PTH_PREFIX"; then
+  AC_MSG_RESULT(Please check your Pth installation)
+fi
+
+CPPFLAGS="$CPPFLAGS `$1 --cflags`"
+LDFLAGS="$LDFLAGS `$1 --ldflags`"
+LIBS="$LIBS `$1 --libs`"
+
+AC_DEFINE(GNUPTH, 1, [Whether you use GNU Pth])
+AC_MSG_RESULT(yes - installed in $PTH_PREFIX)
+
+])
+
+AC_DEFUN(TSRM_CHECK_ST,[
+  if test -r "$1/include/st.h"; then
+    CPPFLAGS="$CPPFLAGS -I$1/include"
+    LDFLAGS="$LDFLAGS -L$1/lib"
+  elif test -r "$1/st.h"; then
+    CPPFLAGS="$CPPFLAGS -I$1"
+    LDFLAGS="$LDFLAGS -L$1"
+  fi
+  AC_CHECK_HEADERS(st.h,[],[
+    AC_MSG_ERROR([Sorry[,] I was unable to locate the State Threads header file.  Please specify the prefix using --with-tsrm-st=/prefix])
+  ])
+  LIBS="$LIBS -lst"
+  AC_MSG_CHECKING(for SGI's State Threads)
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(TSRM_ST, 1, [ ])
+])
+
+sinclude(threads.m4)
+sinclude(TSRM/threads.m4)
+
+AC_DEFUN(TSRM_CHECK_PTHREADS,[
+		
+PTHREADS_CHECK
+		
+if test "$pthreads_working" != "yes"; then
+  AC_MSG_ERROR(Your system seems to lack POSIX threads.)
+fi
+		
+AC_DEFINE(PTHREADS, 1, Whether to use Pthreads)
+
+AC_MSG_CHECKING(for POSIX threads)
+AC_MSG_RESULT(yes)
+])
+
+
+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.],[
+  TSRM_PTH=$withval
+],[
+  TSRM_PTH=no
+])
+
+AC_ARG_WITH(tsrm-st,
+[  --with-tsrm-st],[
+  TSRM_ST=$withval
+],[
+  TSRM_ST=no
+])
+
+AC_ARG_WITH(tsrm-pthreads,
+[  --with-tsrm-pthreads    Use POSIX threads (default)],[
+  TSRM_PTHREADS=$withval
+],[
+  TSRM_PTHREADS=yes
+])
+
+test "$TSRM_PTH" = "yes" && TSRM_PTH=pth-config
+
+if test "$TSRM_PTH" != "no"; then
+  TSRM_CHECK_PTH($TSRM_PTH)
+elif test "$TSRM_ST" != "no"; then
+  TSRM_CHECK_ST($TSRM_ST)
+elif test "$TSRM_PTHREADS" != "no"; then
+  TSRM_CHECK_PTHREADS
+fi
+
+])
@@ -0,0 +1,9 @@
+#ifndef TSRM_CONFIG_NW_H
+#define TSRM_CONFIG_NW_H
+
+#define HAVE_UTIME 1
+
+/* Though we have alloca(), this seems to be causing some problem with the stack pointer -- hence not using it */
+/* #define HAVE_ALLOCA 1 */
+
+#endif
@@ -0,0 +1,15 @@
+#ifndef TSRM_CONFIG_W32_H
+#define TSRM_CONFIG_W32_H
+
+#define HAVE_UTIME 1
+#define HAVE_ALLOCA 1
+
+#undef inline
+#ifdef ZEND_WIN32_FORCE_INLINE
+# define inline __forceinline
+#else
+# define inline
+#endif
+
+
+#endif
@@ -0,0 +1,60 @@
+#ifndef TSRM_CONFIG_COMMON_H
+#define TSRM_CONFIG_COMMON_H
+
+#if WINNT|WIN32
+# define TSRM_WIN32
+#endif
+
+#ifdef TSRM_WIN32
+# include "tsrm_config.w32.h"
+#elif defined(NETWARE)
+# include "tsrm_config.nw.h"
+#else
+# include "tsrm_config.h"
+# include <sys/param.h>
+#endif
+
+#ifdef TSRM_WIN32
+#include <malloc.h>
+#endif
+
+/* AIX requires this to be the first thing in the file.  */
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#   endif
+#  endif
+# endif
+#endif
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#if HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
+#ifndef MAXPATHLEN
+# ifdef PATH_MAX
+#  define MAXPATHLEN PATH_MAX
+# else
+#  define MAXPATHLEN 256
+# endif
+#endif
+
+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2))
+# define tsrm_do_alloca(p) alloca(p)
+# define tsrm_free_alloca(p)
+#else
+# define tsrm_do_alloca(p)   malloc(p)
+# define tsrm_free_alloca(p) free(p)
+#endif
+
+#endif /* TSRM_CONFIG_COMMON_H */
@@ -0,0 +1,260 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 4                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2002 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Venkat Raghavan S <rvenkat@novell.com>                      |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+
+#include "TSRM.h"
+
+#ifdef NETWARE
+
+#ifdef USE_MKFIFO
+#include <sys/stat.h>
+#elif !defined(USE_PIPE_OPEN)   /* NXFifoOpen */
+#include <nks/fsio.h>
+#endif
+
+#include <nks/vm.h>
+#include <nks/memory.h>
+
+#include <string.h>
+
+#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) */
+#include "tsrm_strtok_r.h"
+#define tsrm_strtok_r(a,b,c) strtok((a),(b))
+
+#define WHITESPACE  " \t"
+#define MAX_ARGS    10
+
+
+TSRM_API FILE* popen(const char *commandline, const char *type)
+{
+    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;
+	FILE *stream = NULL;
+#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
+    int pipe_handle;
+    int mode = O_RDONLY;
+#else
+    NXHandle_t pipe_handle;
+    NXMode_t mode = NX_O_RDONLY;
+#endif
+    NXExecEnvSpec_t envSpec;
+    NXNameSpec_t nameSpec;
+    NXVmId_t newVM = 0;
+
+    /* 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);*/
+	if (!filePath)
+		return NULL;
+
+    /* 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;
+#else
+        mode = NX_O_RDONLY;
+#endif
+    else if (strcmp(type, "w") == 0)
+#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
+        mode = O_WRONLY;
+#else
+        mode = NX_O_WRONLY;
+#endif
+    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;
+#elif defined(USE_MKFIFO)
+    pipe_handle = mkfifo(filePath, mode);
+consoleprintf ("PHP | popen: mkfifo() returned %d\n", pipe_handle);
+    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;
+#endif
+
+    /* 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;
+
+    err = NXCopyEnv(env, envCount);
+consoleprintf ("PHP | popen: NXCopyEnv() returned %d\n", err);
+    if (err)
+    {
+        NXMemFree (env);
+        return NULL;
+    }
+
+    /* 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;
+    }
+
+    strcpy (command, 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);
+
+            for (i = 0; i < argc; i++)
+            {
+                if (argv[i])
+                free (argv[i]);
+            }
+
+            return NULL;
+        }
+
+        strcpy (argv[argc], ptr);
+
+        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;
+/*
+    envSpec.esStdin.ssHandle =
+    envSpec.esStdout.ssHandle =
+    envSpec.esStderr.ssHandle = -1;
+*/
+    envSpec.esStdin.ssPathCtx =
+    envSpec.esStdout.ssPathCtx =
+    envSpec.esStderr.ssPathCtx = NULL;
+
+#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
+    if (mode == O_RDONLY)
+#else
+    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.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);
+
+    /* Clean-up */
+
+    if (env)
+        NXMemFree (env);
+
+    if (pipe_handle)
+#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
+        close(pipe_handle);
+#else
+        NXClose(pipe_handle);
+#endif
+
+    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;
+}
+
+TSRM_API int pclose(FILE* stream)
+{
+    int err = 0;
+    NXHandle_t fd = 0;
+
+    /* Get the process associated with this pipe (file) handle and terminate it */
+    fd = fileno(stream);
+    NXClose (fd);
+
+    err = fclose(stream);
+
+    return err;
+}
+
+#endif
@@ -12,23 +12,17 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Author: David Eriksson <david@2good.com>                            |
+   | Authors: Venkat Raghavan S <rvenkat@novell.com>                      |
   +----------------------------------------------------------------------+
- */
+*/

-/*
- * $Id$
- * vim: syntax=c tabstop=2 shiftwidth=2
- */

-/*
- * OrbitEnum class
- */
-#ifndef __enum_h__
-#define __enum_h__
+#ifndef TSRM_NW_H
+#define TSRM_NW_H

-#include "class.h"
+#include "TSRM.h"

-DECLARE_CLASS(OrbitEnum);
+TSRM_API FILE* popen(const char *command, const char *type);
+TSRM_API int pclose(FILE* stream);

-#endif /* __enum_h__ */
+#endif
@@ -0,0 +1,63 @@
+#include <stdio.h>
+
+#include "tsrm_config_common.h"
+#include "tsrm_strtok_r.h"
+
+static inline int in_character_class(char ch, const char *delim)
+{
+	while (*delim) {
+		if (*delim == ch) {
+			return 1;
+		}
+		delim++;
+	}
+	return 0;
+}
+
+char *tsrm_strtok_r(char *s, const char *delim, char **last)
+{
+	char *token;
+
+	if (s == NULL) {
+		s = *last;
+	}
+
+	while (*s && in_character_class(*s, delim)) {
+		s++;
+	}
+	if (!*s) {
+		return NULL;
+	}
+
+	token = s;
+
+	while (*s && !in_character_class(*s, delim)) {
+		s++;
+	}
+	if (!*s) {
+		*last = s;
+	} else {
+		*s = '\0';
+		*last = s + 1;
+	}
+	return token;
+}
+
+#if 0
+
+main()
+{
+	char foo[] = "/foo/bar//\\barbara";
+	char *last;
+	char *token;
+
+	token = tsrm_strtok_r(foo, "/\\", &last);
+	while (token) {
+		printf ("Token = '%s'\n", token);
+		token = tsrm_strtok_r(NULL, "/\\", &last);
+	}
+	
+	return 0;
+}
+
+#endif
@@ -0,0 +1,6 @@
+#ifndef TSRM_STRTOK_R
+#define TSRM_STRTOK_R
+
+char *tsrm_strtok_r(char *s, const char *delim, char **last);
+
+#endif
@@ -0,0 +1,864 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 4                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2002 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Sascha Schumann <sascha@schumann.cx>                        |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <stdio.h>
+#include <limits.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <fcntl.h>
+
+#include "tsrm_virtual_cwd.h"
+#include "tsrm_strtok_r.h"
+
+#ifdef TSRM_WIN32
+#include <io.h>
+#include "tsrm_win32.h"
+#endif
+
+#ifdef NETWARE
+/*#include "pipe.h"*/
+#include "tsrm_nw.h"
+#endif
+
+#define VIRTUAL_CWD_DEBUG 0
+
+#include "TSRM.h"
+
+/* 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
+
+#ifdef ZTS
+static ts_rsrc_id cwd_globals_id;
+#else
+static virtual_cwd_globals cwd_globals;
+#endif
+
+cwd_state main_cwd_state; /* True global */
+
+#ifndef TSRM_WIN32
+#include <unistd.h>
+#else
+#include <direct.h>
+#endif
+
+#ifndef S_ISDIR
+#define S_ISDIR(mode) ((mode) & _S_IFDIR)
+#endif
+
+#ifndef S_ISREG
+#define S_ISREG(mode) ((mode) & _S_IFREG)
+#endif
+
+#ifdef TSRM_WIN32
+#include <tchar.h>
+#define tsrm_strtok_r(a,b,c) _tcstok((a),(b))
+#define TOKENIZER_STRING "/\\"
+	
+static int php_check_dots(const char *element, int n) 
+{
+	while (n-- > 0) if (element[n] != '.') break;
+
+	return (n != -1);
+}
+	
+#define IS_DIRECTORY_UP(element, len) \
+	(len >= 2 && !php_check_dots(element, len))
+
+#define IS_DIRECTORY_CURRENT(element, len) \
+	(len == 1 && ptr[0] == '.')
+
+#elif defined(NETWARE)
+/* NetWare has strtok() (in LibC) and allows both slashes in paths, like Windows --
+   but rest of the stuff is like Unix */
+/* strtok() call in LibC is abending when used in a different address space -- hence using
+   PHP's version itself for now */
+/*#define tsrm_strtok_r(a,b,c) strtok((a),(b))*/
+#define TOKENIZER_STRING "/\\"
+
+#else
+#define TOKENIZER_STRING "/"
+#endif
+
+
+/* default macros */
+
+#ifndef IS_DIRECTORY_UP
+#define IS_DIRECTORY_UP(element, len) \
+	(len == 2 && memcmp(element, "..", 2) == 0)
+#endif
+
+#ifndef IS_DIRECTORY_CURRENT
+#define IS_DIRECTORY_CURRENT(element, len) \
+	(len == 1 && ptr[0] == '.')
+#endif
+
+/* define this to check semantics */
+#define IS_DIR_OK(s) (1)
+	
+#ifndef IS_DIR_OK
+#define IS_DIR_OK(state) (php_is_dir_ok(state) == 0)
+#endif
+
+
+#define CWD_STATE_COPY(d, s)				\
+	(d)->cwd_length = (s)->cwd_length;		\
+	(d)->cwd = (char *) malloc((s)->cwd_length+1);	\
+	memcpy((d)->cwd, (s)->cwd, (s)->cwd_length+1);
+
+#define CWD_STATE_FREE(s)			\
+	free((s)->cwd);
+	
+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);
+}
+
+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);
+}
+
+static void cwd_globals_ctor(virtual_cwd_globals *cwd_globals TSRMLS_DC)
+{
+	CWD_STATE_COPY(&cwd_globals->cwd, &main_cwd_state);
+}
+
+static void cwd_globals_dtor(virtual_cwd_globals *cwd_globals TSRMLS_DC)
+{
+	CWD_STATE_FREE(&cwd_globals->cwd);
+}
+
+static char *tsrm_strndup(const char *s, size_t length)
+{
+    char *p;
+
+    p = (char *) malloc(length+1);
+    if (!p) {
+        return (char *)NULL;
+    }
+    if (length) {
+        memcpy(p,s,length);
+    }
+    p[length]=0;
+    return p;
+}
+
+CWD_API void virtual_cwd_startup(void)
+{
+	char cwd[MAXPATHLEN];
+	char *result;
+
+	result = getcwd(cwd, sizeof(cwd));	
+	if (!result) {
+		cwd[0] = '\0';
+	}
+	main_cwd_state.cwd = strdup(cwd);
+	main_cwd_state.cwd_length = strlen(cwd);
+
+#ifdef ZTS
+	ts_allocate_id(&cwd_globals_id, sizeof(virtual_cwd_globals), (ts_allocate_ctor) cwd_globals_ctor, (ts_allocate_dtor) cwd_globals_dtor);
+#else
+	cwd_globals_ctor(&cwd_globals TSRMLS_CC);
+#endif
+
+#if defined(TSRM_WIN32) && defined(ZTS)
+	cwd_mutex = tsrm_mutex_alloc();
+#endif
+}
+
+CWD_API void virtual_cwd_shutdown(void)
+{
+#ifndef ZTS
+	cwd_globals_dtor(&cwd_globals TSRMLS_CC);
+#endif
+#if defined(TSRM_WIN32) && defined(ZTS)
+	tsrm_mutex_free(cwd_mutex);
+#endif
+
+	free(main_cwd_state.cwd); /* Don't use CWD_STATE_FREE because the non global states will probably use emalloc()/efree() */
+}
+
+CWD_API char *virtual_getcwd_ex(size_t *length TSRMLS_DC)
+{
+	cwd_state *state;
+
+	state = &CWDG(cwd);
+
+	if (state->cwd_length == 0) {
+		char *retval;
+
+		*length = 1;
+		retval = (char *) malloc(2);
+		retval[0] = DEFAULT_SLASH;
+		retval[1] = '\0';	
+		return retval;
+	}
+
+#ifdef TSRM_WIN32
+	/* If we have something like C: */
+	if (state->cwd_length == 2 && state->cwd[state->cwd_length-1] == ':') {
+		char *retval;
+
+		*length = state->cwd_length+1;
+		retval = (char *) malloc(*length+1);
+		memcpy(retval, state->cwd, *length);
+		retval[*length-1] = DEFAULT_SLASH;
+		retval[*length] = '\0';
+		return retval;
+	}
+#endif
+	*length = state->cwd_length;
+	return strdup(state->cwd);
+}
+
+
+/* Same semantics as UNIX getcwd() */
+CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC)
+{
+	size_t length;
+	char *cwd;
+
+	cwd = virtual_getcwd_ex(&length TSRMLS_CC);
+
+	if (buf == NULL) {
+		return cwd;
+	}
+	if (length > size-1) {
+		free(cwd);
+		errno = ERANGE; /* Is this OK? */
+		return NULL;
+	}
+	memcpy(buf, cwd, length+1);
+	free(cwd);
+	return buf;
+}
+
+/* Resolve path relatively to state and put the real path into state */
+/* returns 0 for ok, 1 for error */
+CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path)
+{
+	int path_length = strlen(path);
+	char *ptr, *path_copy;
+	char *tok = NULL;
+	int ptr_length;
+	cwd_state *old_state;
+	int ret = 0;
+	int copy_amount = -1;
+	char *free_path;
+	unsigned char is_absolute = 0;
+#ifndef TSRM_WIN32
+	char resolved_path[MAXPATHLEN];
+#endif
+
+	if (path_length == 0) 
+		return (0);
+
+#if !defined(TSRM_WIN32) && !defined(__BEOS__) && !defined(NETWARE)
+	if (IS_ABSOLUTE_PATH(path, path_length)) {
+		if (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;
+		char *ptr;
+
+		ptr = tmp = (char *) malloc(state->cwd_length+path_length+sizeof("/"));
+		if (!tmp) {
+			return 1;
+		}
+		memcpy(ptr, state->cwd, state->cwd_length);
+		ptr += state->cwd_length;
+		*ptr++ = DEFAULT_SLASH;
+		memcpy(ptr, path, path_length);
+		ptr += path_length;
+		*ptr = '\0';
+		if (realpath(tmp, resolved_path)) {
+			path = resolved_path;
+			path_length = strlen(path);
+		}
+		free(tmp);
+	}
+#endif
+	free_path = path_copy = tsrm_strndup(path, path_length);
+
+	old_state = (cwd_state *) malloc(sizeof(cwd_state));
+	CWD_STATE_COPY(old_state, state);
+#if VIRTUAL_CWD_DEBUG
+	fprintf(stderr,"cwd = %s path = %s\n", state->cwd, path);
+#endif
+	if (IS_ABSOLUTE_PATH(path_copy, path_length)) {
+/* COPY_WHEN_ABSOLUTE needs to account for volume name that is unique to NetWare absolute paths */
+#ifndef NETWARE
+		copy_amount = COPY_WHEN_ABSOLUTE;
+#else
+        copy_amount = COPY_WHEN_ABSOLUTE(path_copy);
+#endif
+		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
+	}
+
+	if (copy_amount != -1) {
+		state->cwd = (char *) realloc(state->cwd, copy_amount + 1);
+		if (copy_amount) {
+			if (is_absolute) {
+				memcpy(state->cwd, path_copy, copy_amount);
+				path_copy += copy_amount;
+			} else {
+				memcpy(state->cwd, old_state->cwd, copy_amount);
+			}
+		}
+		state->cwd[copy_amount] = '\0';
+		state->cwd_length = copy_amount;
+	}
+
+
+	ptr = tsrm_strtok_r(path_copy, TOKENIZER_STRING, &tok);
+	while (ptr) {
+		ptr_length = strlen(ptr);
+
+		if (IS_DIRECTORY_UP(ptr, ptr_length)) {
+			char save;
+
+			save = DEFAULT_SLASH;
+
+#define PREVIOUS state->cwd[state->cwd_length - 1]
+
+			while (IS_ABSOLUTE_PATH(state->cwd, state->cwd_length) &&
+					!IS_SLASH(PREVIOUS)) {
+				save = PREVIOUS;
+				PREVIOUS = '\0';
+				state->cwd_length--;
+			}
+
+			if (!IS_ABSOLUTE_PATH(state->cwd, state->cwd_length)) {
+				state->cwd[state->cwd_length++] = save;
+				state->cwd[state->cwd_length] = '\0';
+			} else {
+				PREVIOUS = '\0';
+				state->cwd_length--;
+			}
+		} else if (!IS_DIRECTORY_CURRENT(ptr, ptr_length)) {
+			state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1+1);
+#ifdef TSRM_WIN32
+			/* Windows 9x will consider C:\\Foo as a network path. Avoid it. */
+			if ((state->cwd[state->cwd_length-1]!='\\' && state->cwd[state->cwd_length-1]!='/') || 
+				IsDBCSLeadByte(state->cwd[state->cwd_length-2])) {
+				state->cwd[state->cwd_length++] = DEFAULT_SLASH;
+			}
+#elif defined(NETWARE)
+            /* 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
+			state->cwd[state->cwd_length++] = DEFAULT_SLASH;
+#endif
+			memcpy(&state->cwd[state->cwd_length], ptr, ptr_length+1);
+			state->cwd_length += ptr_length;
+		}
+		ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok);
+	}
+
+/* COPY_WHEN_ABSOLUTE needs to account for volume name that is unique to NetWare absolute paths */
+#ifndef NETWARE
+	if (state->cwd_length == COPY_WHEN_ABSOLUTE) {
+#else
+	if (state->cwd_length == COPY_WHEN_ABSOLUTE(state->cwd)) {
+#endif
+		state->cwd = (char *) realloc(state->cwd, state->cwd_length+1+1);
+		state->cwd[state->cwd_length] = DEFAULT_SLASH;
+		state->cwd[state->cwd_length+1] = '\0';
+		state->cwd_length++;
+	}
+
+	if (verify_path && verify_path(state)) {
+		CWD_STATE_FREE(state);
+
+		*state = *old_state;
+
+		ret = 1;
+	} else {
+		CWD_STATE_FREE(old_state);
+		ret = 0;
+	}
+	
+	free(old_state);
+	
+	free(free_path);
+#if VIRTUAL_CWD_DEBUG
+	fprintf (stderr, "virtual_file_ex() = %s\n",state->cwd);
+#endif
+	return (ret);
+}
+
+CWD_API int virtual_chdir(const char *path TSRMLS_DC)
+{
+	return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok)?-1:0;
+}
+
+CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path TSRMLS_DC) TSRMLS_DC)
+{
+	int length = strlen(path);
+	char *temp;
+	int retval;
+
+	if (length == 0) {
+		return 1; /* Can't cd to empty string */
+	}	
+	while(--length >= 0 && !IS_SLASH(path[length])) {
+	}
+
+	if (length == -1) {
+		/* No directory only file name */
+		errno = ENOENT;
+		return -1;
+	}
+
+/* COPY_WHEN_ABSOLUTE needs to account for volume name that is unique to NetWare absolute paths */
+#ifndef NETWARE
+	if (length == COPY_WHEN_ABSOLUTE && IS_ABSOLUTE_PATH(path, length+1)) { /* Also use trailing slash if this is absolute */
+#else
+	if (length == COPY_WHEN_ABSOLUTE(path) && IS_ABSOLUTE_PATH(path, length+1)) { /* Also use trailing slash if this is absolute */
+#endif
+		length++;
+	}
+	temp = (char *) tsrm_do_alloca(length+1);
+	memcpy(temp, path, length);
+	temp[length] = 0;
+#if VIRTUAL_CWD_DEBUG
+	fprintf (stderr, "Changing directory to %s\n", temp);
+#endif
+	retval = p_chdir(temp TSRMLS_CC);
+	tsrm_free_alloca(temp);
+	return retval;
+}
+
+CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC)
+{
+	cwd_state new_state;
+	int retval;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	retval = virtual_file_ex(&new_state, path, NULL);
+	
+	if (!retval) {
+		int len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;
+		memcpy(real_path, new_state.cwd, len);
+		real_path[len] = '\0';
+		return real_path;
+	}
+
+	return NULL;
+}
+
+CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_func verify_path TSRMLS_DC)
+{
+	cwd_state new_state;
+	int retval;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	retval = virtual_file_ex(&new_state, path, verify_path);
+
+	*filepath = new_state.cwd;
+
+	return retval;
+
+}
+
+CWD_API int virtual_filepath(const char *path, char **filepath TSRMLS_DC)
+{
+	return virtual_filepath_ex(path, filepath, php_is_file_ok TSRMLS_CC);
+}
+
+CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC)
+{
+	cwd_state new_state;
+	FILE *f;
+
+	if (path[0] == '\0') { /* Fail to open empty path */
+		return NULL;
+	}
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, path, NULL);
+
+	f = fopen(new_state.cwd, mode);
+
+	CWD_STATE_FREE(&new_state);
+	return f;
+}
+
+#if HAVE_UTIME
+CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC)
+{
+	cwd_state new_state;
+	int ret;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, filename, NULL);
+
+	ret = utime(new_state.cwd, buf);
+
+	CWD_STATE_FREE(&new_state);
+	return ret;
+}
+#endif
+
+CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC)
+{
+	cwd_state new_state;
+	int ret;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, filename, NULL);
+
+	ret = chmod(new_state.cwd, mode);
+
+	CWD_STATE_FREE(&new_state);
+	return ret;
+}
+
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
+CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group TSRMLS_DC)
+{
+	cwd_state new_state;
+	int ret;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, filename, NULL);
+
+	ret = chown(new_state.cwd, owner, group);
+
+	CWD_STATE_FREE(&new_state);
+	return ret;
+}
+#endif
+
+CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...)
+{
+	cwd_state new_state;
+	int f;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, path, NULL);
+
+	if (flags & O_CREAT) {
+		mode_t mode;
+		va_list arg;
+
+		va_start(arg, flags);
+		mode = (mode_t) va_arg(arg, int);
+		va_end(arg);
+
+		f = open(new_state.cwd, flags, mode);
+	} else {
+		f = open(new_state.cwd, flags);
+	}	
+	CWD_STATE_FREE(&new_state);
+	return f;
+}
+
+CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC)
+{
+	cwd_state new_state;
+	int f;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, path, NULL);
+
+	f = creat(new_state.cwd,  mode);
+
+	CWD_STATE_FREE(&new_state);
+	return f;
+}
+
+CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC)
+{
+	cwd_state old_state;
+	cwd_state new_state;
+	int retval;
+
+	CWD_STATE_COPY(&old_state, &CWDG(cwd));
+	virtual_file_ex(&old_state, oldname, NULL);
+	oldname = old_state.cwd;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, newname, NULL);
+	newname = new_state.cwd;
+ 
+	retval = rename(oldname, newname);
+
+	CWD_STATE_FREE(&old_state);
+	CWD_STATE_FREE(&new_state);
+
+	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));
+	virtual_file_ex(&new_state, path, NULL);
+
+	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;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, path, NULL);
+
+	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;
+	int retval;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, path, NULL);
+
+	retval = lstat(new_state.cwd, buf);
+
+	CWD_STATE_FREE(&new_state);
+	return retval;
+}
+#endif
+
+CWD_API int virtual_unlink(const char *path TSRMLS_DC)
+{
+	cwd_state new_state;
+	int retval;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, path, NULL);
+
+	retval = unlink(new_state.cwd);
+
+	CWD_STATE_FREE(&new_state);
+	return retval;
+}
+
+CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC)
+{
+	cwd_state new_state;
+	int retval;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, pathname, NULL);
+
+#ifdef TSRM_WIN32
+	retval = mkdir(new_state.cwd);
+#else
+	retval = mkdir(new_state.cwd, mode);
+#endif
+	CWD_STATE_FREE(&new_state);
+	return retval;
+}
+
+CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC)
+{
+	cwd_state new_state;
+	int retval;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, pathname, NULL);
+
+	retval = rmdir(new_state.cwd);
+
+	CWD_STATE_FREE(&new_state);
+	return retval;
+}
+
+#ifdef TSRM_WIN32
+DIR *opendir(const char *name);
+#endif
+
+CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC)
+{
+	cwd_state new_state;
+	DIR *retval;
+
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, pathname, NULL);
+
+	retval = opendir(new_state.cwd);
+
+	CWD_STATE_FREE(&new_state);
+	return retval;
+}
+
+#ifdef TSRM_WIN32
+
+/* On Windows the trick of prepending "cd cwd; " doesn't work so we need to perform
+   a real chdir() and mutex it
+ */
+CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
+{
+	char prev_cwd[MAXPATHLEN];
+	char *getcwd_result;
+	FILE *retval;
+
+	getcwd_result = getcwd(prev_cwd, MAXPATHLEN);
+	if (!getcwd_result) {
+		return NULL;
+	}
+
+#ifdef ZTS
+	tsrm_mutex_lock(cwd_mutex);
+#endif
+
+	chdir(CWDG(cwd).cwd);
+	retval = popen(command, type);
+	chdir(prev_cwd);
+
+#ifdef ZTS
+	tsrm_mutex_unlock(cwd_mutex);
+#endif
+
+	return retval;
+}
+
+#elif defined(NETWARE)
+
+/* On NetWare, the trick of prepending "cd cwd; " doesn't work so we need to perform
+   a VCWD_CHDIR() and mutex it
+ */
+CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
+{
+	char prev_cwd[MAXPATHLEN];
+	char *getcwd_result;
+	FILE *retval;
+
+	getcwd_result = VCWD_GETCWD(prev_cwd, MAXPATHLEN);
+	if (!getcwd_result) {
+		return NULL;
+	}
+
+#ifdef ZTS
+	tsrm_mutex_lock(cwd_mutex);
+#endif
+
+	VCWD_CHDIR(CWDG(cwd).cwd);
+	retval = popen(command, type);
+	VCWD_CHDIR(prev_cwd);
+
+#ifdef ZTS
+	tsrm_mutex_unlock(cwd_mutex);
+#endif
+
+	return retval;
+}
+
+#else /* Unix */
+
+CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
+{
+	int command_length;
+	char *command_line;
+	char *ptr;
+	FILE *retval;
+
+	command_length = strlen(command);
+
+	ptr = command_line = (char *) malloc(command_length + sizeof("cd  ; ") + CWDG(cwd).cwd_length+1);
+	if (!command_line) {
+		return NULL;
+	}
+	memcpy(ptr, "cd ", sizeof("cd ")-1);
+	ptr += sizeof("cd ")-1;
+
+	if (CWDG(cwd).cwd_length == 0) {
+		*ptr++ = DEFAULT_SLASH;
+	} else {
+		memcpy(ptr, CWDG(cwd).cwd, CWDG(cwd).cwd_length);
+		ptr += CWDG(cwd).cwd_length;
+	}
+	
+	*ptr++ = ' ';
+	*ptr++ = ';';
+	*ptr++ = ' ';
+
+	memcpy(ptr, command, command_length+1);
+	retval = popen(command_line, type);
+
+	free(command_line);
+	return retval;
+}
+
+#endif
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
@@ -0,0 +1,241 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 4                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2002 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Sascha Schumann <sascha@schumann.cx>                        |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef VIRTUAL_CWD_H
+#define VIRTUAL_CWD_H
+
+#include "TSRM.h"
+#include "tsrm_config_common.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <ctype.h>
+
+#ifdef HAVE_UTIME_H
+#include <utime.h>
+#endif
+
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
+#ifndef TSRM_WIN32
+#include <unistd.h>
+#endif
+
+#ifdef TSRM_WIN32
+#include "readdir.h"
+#include <sys/utime.h>
+/* mode_t isn't defined on Windows */
+typedef unsigned short mode_t;
+
+#define DEFAULT_SLASH '\\'
+#define DEFAULT_DIR_SEPARATOR	';'
+#define IS_SLASH(c)	((c) == '/' || (c) == '\\')
+#define IS_SLASH_P(c)	(*(c) == '/' || \
+        (*(c) == '\\' && !IsDBCSLeadByte(*(c-1))))
+#define COPY_WHEN_ABSOLUTE 2
+#define IS_ABSOLUTE_PATH(path, len) \
+	(len >= 2 && isalpha(path[0]) && path[1] == ':')
+#define IS_UNC_PATH(path, len) \
+	(len >= 2 && IS_SLASH(path[0]) && IS_SLASH(path[1]))
+
+#elif defined(NETWARE)
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+
+#define DEFAULT_SLASH '/'
+#define DEFAULT_DIR_SEPARATOR	';'
+#define IS_SLASH(c)	((c) == '/' || (c) == '\\')
+#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) /* Colon indicates volume name */
+
+#else
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+
+#define DEFAULT_SLASH '/'
+
+#ifdef __riscos__
+#define DEFAULT_DIR_SEPARATOR  ';'
+#else
+#define DEFAULT_DIR_SEPARATOR  ':'
+#endif
+
+#define IS_SLASH(c)	((c) == '/')
+#define IS_SLASH_P(c)	(*(c) == '/')
+
+#endif
+
+
+#ifndef COPY_WHEN_ABSOLUTE
+#define COPY_WHEN_ABSOLUTE 0
+#endif
+
+#ifndef IS_ABSOLUTE_PATH	
+#define IS_ABSOLUTE_PATH(path, len) \
+	(IS_SLASH(path[0]))
+#endif
+
+#ifdef TSRM_EXPORTS
+#define CWD_EXPORTS
+#endif
+
+#ifdef TSRM_WIN32
+#       ifdef CWD_EXPORTS
+#       define CWD_API __declspec(dllexport)
+#       else
+#       define CWD_API __declspec(dllimport)
+#       endif
+#else
+#define CWD_API
+#endif
+
+typedef struct _cwd_state {
+	char *cwd;
+	int cwd_length;
+} cwd_state;
+
+typedef int (*verify_path_func)(const cwd_state *);
+
+CWD_API void virtual_cwd_startup(void);
+CWD_API void virtual_cwd_shutdown(void);
+CWD_API char *virtual_getcwd_ex(size_t *length TSRMLS_DC);
+CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC);
+CWD_API int virtual_chdir(const char *path TSRMLS_DC);
+CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path TSRMLS_DC) TSRMLS_DC);
+CWD_API int virtual_filepath(const char *path, char **filepath TSRMLS_DC);
+CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_func verify_path TSRMLS_DC);
+CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC);
+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
+CWD_API int virtual_unlink(const char *path TSRMLS_DC);
+CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC);
+CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC);
+CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC);
+CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC);
+#if HAVE_UTIME
+CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC);
+#endif
+CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC);
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
+CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group TSRMLS_DC);
+#endif
+
+CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path);
+
+typedef struct _virtual_cwd_globals {
+	cwd_state cwd;
+} virtual_cwd_globals;
+
+#ifdef ZTS
+# define CWDG(v) TSRMG(cwd_globals_id, virtual_cwd_globals *, v)
+#else
+# define CWDG(v) (cwd_globals.v)
+#endif
+
+/* The actual macros to be used in programs using TSRM
+ * If the program defines VIRTUAL_DIR it will use the
+ * virtual_* functions 
+ */
+
+#ifdef VIRTUAL_DIR
+
+#define VCWD_GETCWD(buff, size) virtual_getcwd(buff, size TSRMLS_CC)
+#define VCWD_FOPEN(path, mode) virtual_fopen(path, mode TSRMLS_CC)
+/* Because open() has two modes, we have to macros to replace it */
+#define VCWD_OPEN(path, flags) virtual_open(path TSRMLS_CC, flags)
+#define VCWD_OPEN_MODE(path, flags, mode) virtual_open(path TSRMLS_CC, flags, mode)
+#define VCWD_CREAT(path, mode) virtual_creat(path, mode TSRMLS_CC)
+#define VCWD_CHDIR(path) virtual_chdir(path TSRMLS_CC)
+#define VCWD_CHDIR_FILE(path) virtual_chdir_file(path, virtual_chdir TSRMLS_CC)
+#define VCWD_GETWD(buf)
+#define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path TSRMLS_CC)
+#define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
+#define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
+#define VCWD_LSTAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
+#else
+#define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
+#endif
+#define VCWD_UNLINK(path) virtual_unlink(path TSRMLS_CC)
+#define VCWD_MKDIR(pathname, mode) virtual_mkdir(pathname, mode TSRMLS_CC)
+#define VCWD_RMDIR(pathname) virtual_rmdir(pathname TSRMLS_CC)
+#define VCWD_OPENDIR(pathname) virtual_opendir(pathname TSRMLS_CC)
+#define VCWD_POPEN(command, type) virtual_popen(command, type TSRMLS_CC)
+#if HAVE_UTIME
+#define VCWD_UTIME(path, time) virtual_utime(path, time TSRMLS_CC)
+#endif
+#define VCWD_CHMOD(path, mode) virtual_chmod(path, mode TSRMLS_CC)
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
+#define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group TSRMLS_CC)
+#endif
+
+#else
+
+#define VCWD_GETCWD(buff, size) getcwd(buff, size)
+#define VCWD_FOPEN(path, mode)  fopen(path, mode)
+#define VCWD_OPEN(path, flags) open(path, flags)
+#define VCWD_OPEN_MODE(path, flags, mode)	open(path, flags, mode)
+#define VCWD_CREAT(path, mode) creat(path, mode)
+#define VCWD_RENAME(oldname, newname) rename(oldname, newname)
+#define VCWD_CHDIR(path) chdir(path)
+#define VCWD_CHDIR_FILE(path) virtual_chdir_file(path, chdir)
+#define VCWD_GETWD(buf) getwd(buf)
+#define VCWD_STAT(path, buff) stat(path, buff)
+#define VCWD_LSTAT(path, buff) lstat(path, buff)
+#define VCWD_UNLINK(path) unlink(path)
+#define VCWD_MKDIR(pathname, mode) mkdir(pathname, mode)
+#define VCWD_RMDIR(pathname) rmdir(pathname)
+#define VCWD_OPENDIR(pathname) opendir(pathname)
+#define VCWD_POPEN(command, type) popen(command, type)
+
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
+#define VCWD_REALPATH(path, real_path) realpath(path, real_path)
+#else
+#define VCWD_REALPATH(path, real_path) strcpy(real_path, path)
+#endif
+
+#if HAVE_UTIME
+#define VCWD_UTIME(path, time) utime(path, time)
+#endif
+#define VCWD_CHMOD(path, mode) chmod(path, mode)
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
+#define VCWD_CHOWN(path, owner, group) chown(path, owner, group)
+#endif
+
+#endif
+
+#endif /* VIRTUAL_CWD_H */
@@ -0,0 +1,359 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 4                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2002 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Daniel Beulshausen <daniel@php4win.de>                      |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <io.h>
+#include <process.h>
+#include <time.h>
+
+#include "TSRM.h"
+
+#ifdef TSRM_WIN32
+#include <windows.h>
+#include "tsrm_win32.h"
+
+#ifdef ZTS
+static ts_rsrc_id win32_globals_id;
+#else
+static tsrm_win32_globals win32_globals;
+#endif
+
+static void tsrm_win32_ctor(tsrm_win32_globals *globals TSRMLS_DC)
+{
+	globals->process = NULL;
+	globals->shm	 = NULL;
+	globals->process_size = 0;
+	globals->shm_size	  = 0;
+	globals->comspec = _strdup((GetVersion()<0x80000000)?"cmd.exe":"command.com");
+}
+
+static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC)
+{
+	shm_pair *ptr;
+
+	if (globals->process) {
+		free(globals->process);
+	}
+
+	if (globals->shm) {
+		for (ptr = globals->shm; ptr < (globals->shm + globals->shm_size); ptr++) {
+			UnmapViewOfFile(ptr->addr);
+			CloseHandle(ptr->segment);
+			UnmapViewOfFile(ptr->descriptor);
+			CloseHandle(ptr->info);
+		}
+		free(globals->shm);
+	}
+
+	free(globals->comspec);
+}
+
+TSRM_API void tsrm_win32_startup(void)
+{
+#ifdef ZTS
+	ts_allocate_id(&win32_globals_id, sizeof(tsrm_win32_globals), (ts_allocate_ctor)tsrm_win32_ctor, (ts_allocate_ctor)tsrm_win32_dtor);
+#else
+	tsrm_win32_ctor(&win32_globals TSRMLS_CC);
+#endif
+}
+
+TSRM_API void tsrm_win32_shutdown(void)
+{
+#ifndef ZTS
+	tsrm_win32_dtor(&win32_globals TSRMLS_CC);
+#endif
+}
+
+static process_pair *process_get(FILE *stream TSRMLS_DC)
+{
+	process_pair *ptr;
+	process_pair *newptr;
+	
+	for (ptr = TWG(process); ptr < (TWG(process) + TWG(process_size)); ptr++) {
+		if (ptr->stream == stream) {
+			break;
+		}
+	}
+	
+	if (ptr < (TWG(process) + TWG(process_size))) {
+		return ptr;
+	}
+	
+	newptr = (process_pair*)realloc((void*)TWG(process), (TWG(process_size)+1)*sizeof(process_pair));
+	if (newptr == NULL) {
+		return NULL;
+	}
+	
+	TWG(process) = newptr;
+	ptr = newptr + TWG(process_size);
+	TWG(process_size)++;
+	return ptr;
+}
+
+static shm_pair *shm_get(int key, void *addr)
+{
+	shm_pair *ptr;
+	shm_pair *newptr;
+	TSRMLS_FETCH();
+	
+	for (ptr = TWG(shm); ptr < (TWG(shm) + TWG(shm_size)); ptr++) {
+		if (!ptr->descriptor) {
+			continue;
+		}
+		if (!addr && ptr->descriptor->shm_perm.key == key) {
+			break;
+		} else if (ptr->addr == addr) {
+			break;
+		}
+	}
+
+	if (ptr < (TWG(shm) + TWG(shm_size))) {
+		return ptr;
+	}
+	
+	newptr = (shm_pair*)realloc((void*)TWG(shm), (TWG(shm_size)+1)*sizeof(shm_pair));
+	if (newptr == NULL) {
+		return NULL;
+	}
+	
+	TWG(shm) = newptr;
+	ptr = newptr + TWG(shm_size);
+	TWG(shm_size)++;
+	return ptr;
+}
+
+static HANDLE dupHandle(HANDLE fh, BOOL inherit) {
+	HANDLE copy, self = GetCurrentProcess();
+	if (!DuplicateHandle(self, fh, self, &copy, 0, inherit, DUPLICATE_SAME_ACCESS|DUPLICATE_CLOSE_SOURCE)) {
+		return NULL;
+	}
+	return copy;
+}
+
+TSRM_API FILE *popen(const char *command, const char *type)
+{
+	FILE *stream = NULL;
+	int fno, str_len = strlen(type), read, mode;
+	STARTUPINFO startup;
+	PROCESS_INFORMATION process;
+	SECURITY_ATTRIBUTES security;
+	HANDLE in, out;
+	char *cmd;
+	process_pair *proc;
+	TSRMLS_FETCH();
+
+	security.nLength				= sizeof(SECURITY_ATTRIBUTES);
+	security.bInheritHandle			= TRUE;
+	security.lpSecurityDescriptor	= NULL;
+
+	if (!str_len || !CreatePipe(&in, &out, &security, 2048L)) {
+		return NULL;
+	}
+	
+	memset(&startup, 0, sizeof(STARTUPINFO));
+	memset(&process, 0, sizeof(PROCESS_INFORMATION));
+
+	startup.cb			= sizeof(STARTUPINFO);
+	startup.dwFlags		= STARTF_USESTDHANDLES;
+	startup.hStdError	= GetStdHandle(STD_ERROR_HANDLE);
+
+	read = (type[0] == 'r') ? TRUE : FALSE;
+	mode = ((str_len == 2) && (type[1] == 'b')) ? O_BINARY : O_TEXT;
+
+
+	if (read) {
+		in = dupHandle(in, FALSE);
+		startup.hStdInput  = GetStdHandle(STD_INPUT_HANDLE);
+		startup.hStdOutput = out;
+	} else {
+		out = dupHandle(out, FALSE);
+		startup.hStdInput  = in;
+		startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+	}
+
+	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c "));
+	sprintf(cmd, "%s /c %s", TWG(comspec), command);
+	if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &process)) {
+		return NULL;
+	}
+	free(cmd);
+
+	CloseHandle(process.hThread);
+	proc = process_get(NULL TSRMLS_CC);
+
+	if (read) {
+		fno = _open_osfhandle((long)in, _O_RDONLY | mode);
+		CloseHandle(out);
+	} else {
+		fno = _open_osfhandle((long)out, _O_WRONLY | mode);
+		CloseHandle(in);
+	}
+
+	stream = _fdopen(fno, type);
+	proc->prochnd = process.hProcess;
+	proc->stream = stream;
+	return stream;
+}
+
+TSRM_API int pclose(FILE *stream)
+{
+	DWORD termstat = 0;
+	process_pair *process;
+	TSRMLS_FETCH();
+
+	if ((process = process_get(stream TSRMLS_CC)) == NULL) {
+		return 0;
+	}
+
+	fflush(process->stream);
+    fclose(process->stream);
+
+	WaitForSingleObject(process->prochnd, INFINITE);
+	GetExitCodeProcess(process->prochnd, &termstat);
+	process->stream = NULL;
+	CloseHandle(process->prochnd);
+
+	return termstat;
+}
+
+TSRM_API int shmget(int key, int size, int flags)
+{
+	shm_pair *shm;
+	char shm_segment[26], shm_info[29];
+	HANDLE shm_handle, info_handle;
+	BOOL created = FALSE;
+
+	if (size < 0) {
+		return -1;
+	}
+
+	sprintf(shm_segment, "TSRM_SHM_SEGMENT:%d", key);
+	sprintf(shm_info, "TSRM_SHM_DESCRIPTOR:%d", key);
+
+	shm_handle  = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment);
+	info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);
+
+	if ((!shm_handle && !info_handle)) {
+		if (flags & IPC_EXCL) {
+			return -1;
+		}
+		if (flags & IPC_CREAT) {
+			shm_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, size, shm_segment);
+			info_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(shm->descriptor), shm_info);
+			created		= TRUE;
+		}
+		if ((!shm_handle || !info_handle)) {
+			return -1;
+		}
+	}
+
+	shm = shm_get(key, NULL);
+	shm->segment = shm_handle;
+	shm->info	 = info_handle;
+	shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
+
+	if (created) {
+		shm->descriptor->shm_perm.key	= key;
+		shm->descriptor->shm_segsz		= size;
+		shm->descriptor->shm_ctime		= time(NULL);
+		shm->descriptor->shm_cpid		= getpid();
+		shm->descriptor->shm_perm.mode	= flags;
+
+		shm->descriptor->shm_perm.cuid	= shm->descriptor->shm_perm.cgid= 0;
+		shm->descriptor->shm_perm.gid	= shm->descriptor->shm_perm.uid = 0;
+		shm->descriptor->shm_atime		= shm->descriptor->shm_dtime	= 0;
+		shm->descriptor->shm_lpid		= shm->descriptor->shm_nattch	= 0;
+		shm->descriptor->shm_perm.mode	= shm->descriptor->shm_perm.seq	= 0;
+	}
+
+	if (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz ) {
+		CloseHandle(shm->segment);
+		UnmapViewOfFile(shm->descriptor);
+		CloseHandle(shm->info);
+		return -1;
+	}
+
+	return key;
+}
+
+TSRM_API void *shmat(int key, const void *shmaddr, int flags)
+{
+	shm_pair *shm = shm_get(key, NULL);
+
+	if (!shm->segment) {
+		return (void*)-1;
+	}
+
+	shm->descriptor->shm_atime = time(NULL);
+	shm->descriptor->shm_lpid  = getpid();
+	shm->descriptor->shm_nattch++;
+
+	shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
+
+	return shm->addr;
+}
+
+TSRM_API int shmdt(const void *shmaddr)
+{
+	shm_pair *shm = shm_get(0, (void*)shmaddr);
+
+	if (!shm->segment) {
+		return -1;
+	}
+
+	shm->descriptor->shm_dtime = time(NULL);
+	shm->descriptor->shm_lpid  = getpid();
+	shm->descriptor->shm_nattch--;
+
+	return UnmapViewOfFile(shm->addr) ? 0 : -1;
+}
+
+TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf) {
+	shm_pair *shm = shm_get(key, NULL);
+
+	if (!shm->segment) {
+		return -1;
+	}
+
+	switch (cmd) {
+		case IPC_STAT:
+			memcpy(buf, shm->descriptor, sizeof(struct shmid_ds));
+			return 0;
+
+		case IPC_SET:
+			shm->descriptor->shm_ctime		= time(NULL);
+			shm->descriptor->shm_perm.uid	= buf->shm_perm.uid;
+			shm->descriptor->shm_perm.gid	= buf->shm_perm.gid;
+			shm->descriptor->shm_perm.mode	= buf->shm_perm.mode;
+			return 0;
+
+		case IPC_RMID:
+			if (shm->descriptor->shm_nattch < 1) {
+				shm->descriptor->shm_perm.key = -1;
+			}
+			return 0;
+
+		default:
+			return -1;
+	}
+}
+#endif
@@ -0,0 +1,107 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 4                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2002 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Daniel Beulshausen <daniel@php4win.de>                      |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef TSRM_WIN32_H
+#define TSRM_WIN32_H
+
+#include "TSRM.h"
+
+#ifdef TSRM_WIN32
+#include <windows.h>
+
+struct ipc_perm {
+	int			key;
+	unsigned short	uid;
+	unsigned short	gid;
+	unsigned short	cuid;
+	unsigned short	cgid;
+	unsigned short	mode;
+	unsigned short	seq;
+};
+
+struct shmid_ds {
+	struct	ipc_perm	shm_perm;
+	int				shm_segsz;
+	time_t			shm_atime;
+	time_t			shm_dtime;
+	time_t			shm_ctime;
+	unsigned short	shm_cpid;
+	unsigned short	shm_lpid;
+	short			shm_nattch;
+};
+
+typedef struct {
+	FILE	*stream;
+	HANDLE	prochnd;
+} process_pair;
+
+typedef struct {
+	void	*addr;
+	HANDLE	info;
+	HANDLE	segment;
+	struct	shmid_ds	*descriptor;
+} shm_pair;
+
+typedef struct {
+	process_pair	*process;
+	shm_pair		*shm;
+	int				process_size;
+	int				shm_size;
+	char			*comspec;
+} tsrm_win32_globals;
+
+#ifdef ZTS
+# define TWG(v) TSRMG(win32_globals_id, tsrm_win32_globals *, v)
+#else
+# define TWG(v) (win32_globals.v)
+#endif
+
+#endif
+
+#define IPC_PRIVATE	0
+#define IPC_CREAT	00001000
+#define IPC_EXCL	00002000
+#define IPC_NOWAIT	00004000
+
+#define IPC_RMID	0
+#define IPC_SET		1
+#define IPC_STAT	2
+#define IPC_INFO	3
+
+#define SHM_R		PAGE_READONLY
+#define SHM_W		PAGE_READWRITE
+
+#define	SHM_RDONLY	FILE_MAP_READ
+#define	SHM_RND		FILE_MAP_WRITE
+#define	SHM_REMAP	FILE_MAP_COPY
+
+
+TSRM_API void tsrm_win32_startup(void);
+TSRM_API void tsrm_win32_shutdown(void);
+
+TSRM_API FILE *popen(const char *command, const char *type);
+TSRM_API int pclose(FILE *stream);
+
+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);
+
+#endif
@@ -2,8 +2,148 @@ dnl $Id$
 dnl
 dnl This file contains local autoconf functions.

-sinclude(dynlib.m4)
+dnl PHP_ADD_MAKEFILE_FRAGMENT([srcfile[, ext_srcdir[, ext_builddir]]])
+dnl
+dnl Processes a file called Makefile.frag in the source directory
+dnl of the most recently added extension. $(srcdir) and $(builddir)
+dnl are substituted with the proper paths. Can be used to supply
+dnl custom rules and/or additional targets.
+dnl
+AC_DEFUN(PHP_ADD_MAKEFILE_FRAGMENT,[
+  ifelse($1,,src=$ext_srcdir/Makefile.frag,src=$1)
+  ifelse($2,,ac_srcdir=$ext_srcdir,ac_srcdir=$2)
+  ifelse($3,,ac_builddir=$ext_builddir,ac_builddir=$3)
+  sed -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
+])

+
+dnl PHP_DEFINE(WHAT[, value])
+dnl
+dnl Creates builddir/include/what.h and in there #define WHAT value
+dnl
+AC_DEFUN(PHP_DEFINE,[
+  [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" > include/php_]translit($1,A-Z,a-z)[.h]
+])
+
+dnl PHP_INIT_BUILD_SYSTEM
+dnl
+AC_DEFUN(PHP_INIT_BUILD_SYSTEM,[
+mkdir include >/dev/null 2>&1
+> Makefile.objects
+> Makefile.fragments
+dnl We need to play tricks here to avoid matching the egrep line itself
+pattern=define
+egrep $pattern'.*include/php' $srcdir/configure|sed 's/.*>//'|xargs touch 2>/dev/null
+])
+
+dnl PHP_GEN_GLOBAL_MAKEFILE
+dnl 
+dnl Generates the global makefile.
+dnl
+AC_DEFUN(PHP_GEN_GLOBAL_MAKEFILE,[
+  cat >Makefile <<EOF
+srcdir = $abs_srcdir
+builddir = $abs_builddir
+top_srcdir = $abs_srcdir
+top_builddir = $abs_builddir
+EOF
+  for i in $PHP_VAR_SUBST; do
+    eval echo "$i = \$$i" >> Makefile
+  done
+
+  cat $abs_srcdir/Makefile.global Makefile.fragments Makefile.objects >> Makefile
+])
+
+dnl PHP_ADD_SOURCES(source-path, sources[, special-flags[, type]])
+dnl
+dnl Adds sources which are located relative to source-path to the 
+dnl array of type type.  Sources are processed with optional 
+dnl special-flags which are passed to the compiler.  Sources
+dnl can be either written in C or C++ (filenames shall end in .c 
+dnl or .cpp, respectively).
+dnl
+dnl Note: If source-path begins with a "/", the "/" is removed and
+dnl the path is interpreted relative to the top build-directory.
+dnl
+dnl which array to append to?
+AC_DEFUN(PHP_ADD_SOURCES,[
+  PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
+])
+dnl
+dnl PHP_ASSIGN_BUILD_VARS(type)
+dnl internal, don't use
+AC_DEFUN(PHP_ASSIGN_BUILD_VARS,[
+ifelse($1,shared,[
+  b_c_pre=$shared_c_pre
+  b_cxx_pre=$shared_cxx_pre
+  b_c_meta=$shared_c_meta
+  b_cxx_meta=$shared_cxx_meta
+  b_c_post=$shared_c_post
+  b_cxx_post=$shared_cxx_post
+],[
+  b_c_pre=$php_c_pre
+  b_cxx_pre=$php_cxx_pre
+  b_c_meta=$php_c_meta
+  b_cxx_meta=$php_cxx_meta
+  b_c_post=$php_c_post
+  b_cxx_post=$php_cxx_post
+])dnl
+  b_lo=[$]$1_lo
+])
+
+dnl PHP_ADD_SOURCES_X(source-path, sources[, special-flags[, target-var[, shared[, special-post-flags]]]])
+dnl
+dnl Additional to PHP_ADD_SOURCES (see above), this lets you set the
+dnl name of the array target-var directly, as well as whether
+dnl shared objects will be built from the sources.  Should not be 
+dnl used directly.
+dnl 
+AC_DEFUN(PHP_ADD_SOURCES_X,[
+dnl relative to source- or build-directory?
+dnl ac_srcdir/ac_bdir include trailing slash
+  case $1 in
+  ""[)] ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*[)] ac_srcdir=`echo $ac_n "$1$ac_c"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *[)] ac_srcdir="$abs_srcdir/$1/"; ac_bdir="$1/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+  
+dnl how to build .. shared or static?
+  ifelse($5,yes,PHP_ASSIGN_BUILD_VARS(shared),PHP_ASSIGN_BUILD_VARS(php))
+
+dnl iterate over the sources
+  old_IFS=[$]IFS
+  for ac_src in $2; do
+  
+dnl remove the suffix
+      IFS=.
+      set $ac_src
+      ac_obj=[$]1
+      IFS=$old_IFS
+      
+dnl append to the array which has been dynamically chosen at m4 time
+      $4="[$]$4 [$]ac_bdir[$]ac_obj.lo"
+
+dnl choose the right compiler/flags/etc. for the source-file
+      case $ac_src in
+	  *.c[)] ac_comp="$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $6$b_c_post" ;;
+	  *.cpp[)] ac_comp="$b_cxx_pre $3 $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $6$b_cxx_post" ;;
+      esac
+
+dnl create a rule for the object/source combo
+	  cat >>Makefile.objects<<EOF
+$ac_bdir[$]ac_obj.lo: $ac_srcdir[$]ac_src
+	$ac_comp
+EOF
+  done
+])
+
+dnl
+dnl Disable building CLI
+dnl
+AC_DEFUN(PHP_DISABLE_CLI,[
+  disable_cli=1
+])
+	
 dnl
 dnl Separator into the configure --help display.
 dnl 
@@ -43,31 +183,37 @@ AC_DEFUN(PHP_REMOVE_USR_LIB,[
  done
  $1=[$]ac_new_flags
 ])
-    
+
 AC_DEFUN(PHP_SETUP_OPENSSL,[
-  if test "$PHP_OPENSSL" = "no"; then
+  if test "$PHP_OPENSSL" = "yes"; then
    PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
  fi

  for i in $PHP_OPENSSL; do
    if test -r $i/include/openssl/evp.h; then
-      OPENSSL_DIR=$i
-      OPENSSL_INC=$i/include
+      OPENSSL_INCDIR=$i/include
+    fi
+    if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
+      OPENSSL_LIBDIR=$i/lib
    fi
  done

-  if test -z "$OPENSSL_DIR"; then
+  if test -z "$OPENSSL_INCDIR"; then
    AC_MSG_ERROR([Cannot find OpenSSL's <evp.h>])
  fi

+  if test -z "$OPENSSL_LIBDIR"; then
+    AC_MSG_ERROR([Cannot find OpenSSL's libraries])
+  fi
+
  old_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS=-I$OPENSSL_INC
+  CPPFLAGS=-I$OPENSSL_INCDIR
  AC_MSG_CHECKING([for OpenSSL version])
  AC_EGREP_CPP(yes,[
-  #include <openssl/opensslv.h>
-  #if OPENSSL_VERSION_NUMBER >= 0x0090500fL
+#include <openssl/opensslv.h>
+#if OPENSSL_VERSION_NUMBER >= 0x0090500fL
  yes
-  #endif
+#endif
  ],[
    AC_MSG_RESULT([>= 0.9.5])
  ],[
@@ -75,20 +221,27 @@ AC_DEFUN(PHP_SETUP_OPENSSL,[
  ])
  CPPFLAGS=$old_CPPFLAGS

-  PHP_ADD_LIBPATH($OPENSSL_DIR/lib)
+  PHP_ADD_INCLUDE($OPENSSL_INCDIR)
+  PHP_ADD_LIBPATH($OPENSSL_LIBDIR)

-  AC_CHECK_LIB(crypto, CRYPTO_free, [
+  PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
    PHP_ADD_LIBRARY(crypto)
  ],[
    AC_MSG_ERROR([libcrypto not found!])
+  ],[
+    -L$OPENSSL_LIBDIR
  ])

-  AC_CHECK_LIB(ssl, SSL_CTX_set_ssl_version, [
+  PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [
    PHP_ADD_LIBRARY(ssl)
  ],[
    AC_MSG_ERROR([libssl not found!])
+  ],[
+    -L$OPENSSL_LIBDIR
  ])
-  PHP_ADD_INCLUDE($OPENSSL_INC)
+
+  OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
+  AC_SUBST(OPENSSL_INCDIR_OPT)
 ])

 dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD)
@@ -187,6 +340,9 @@ AC_DEFUN(PHP_SHLIB_SUFFIX_NAME,[
  *hpux*)
 	SHLIB_SUFFIX_NAME=sl
 	;;
+  *darwin*)
+	SHLIB_SUFFIX_NAME=dylib
+	;;
  esac
 ])

@@ -245,6 +401,8 @@ AC_DEFUN(PHP_MISSING_PREAD_DECL,[
      ],[
        ac_cv_pread=no
      ])
+    ],[
+      ac_cv_pread=no
    ])
  ])
  ])
@@ -279,6 +437,8 @@ AC_DEFUN(PHP_MISSING_PWRITE_DECL,[
      ],[
        ac_cv_pwrite=no
      ])
+    ],[
+      ac_cv_pwrite=no
    ])
  ])
  ])
@@ -328,16 +488,14 @@ AC_DEFUN(PHP_LIBGCC_LIBPATH,[
  changequote([,])
 ])

-AC_DEFUN(PHP_ARG_ANALYZE,[
+AC_DEFUN(PHP_ARG_ANALYZE_EX,[
+ext_output="yes, shared"
+ext_shared=yes
 case [$]$1 in
 shared,*)
-  ext_output="yes, shared"
-  ext_shared=yes
  $1=`echo "[$]$1"|sed 's/^shared,//'`
  ;;
 shared)
-  ext_output="yes, shared"
-  ext_shared=yes
  $1=yes
  ;;
 no)
@@ -350,13 +508,12 @@ no)
  ;;
 esac

-if test "$php_always_shared" = "yes"; then
-  ext_output="yes, shared"
-  ext_shared=yes
-  test "[$]$1" = "no" && $1=yes
-fi
+PHP_ALWAYS_SHARED([$1])
+])

-AC_MSG_RESULT([$ext_output])
+AC_DEFUN(PHP_ARG_ANALYZE,[
+PHP_ARG_ANALYZE_EX([$1])
+ifelse([$2],,,[AC_MSG_RESULT([$ext_output])])
 ])

 dnl
@@ -370,9 +527,9 @@ PHP_REAL_ARG_WITH([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_))
 ])

 AC_DEFUN(PHP_REAL_ARG_WITH,[
-AC_MSG_CHECKING([$2])
+ifelse([$2],,,[AC_MSG_CHECKING([$2])])
 AC_ARG_WITH($1,[$3],$5=[$]withval,$5=ifelse($4,,no,$4))
-PHP_ARG_ANALYZE($5)
+PHP_ARG_ANALYZE($5,[$2])
 ])

 dnl
@@ -386,9 +543,9 @@ PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_))
 ])

 AC_DEFUN(PHP_REAL_ARG_ENABLE,[
-AC_MSG_CHECKING([$2])
+ifelse([$2],,,[AC_MSG_CHECKING([$2])])
 AC_ARG_ENABLE($1,[$3],$5=[$]enableval,$5=ifelse($4,,no,$4))
-PHP_ARG_ANALYZE($5)
+PHP_ARG_ANALYZE($5,[$2])
 ])

 AC_DEFUN(PHP_MODULE_PTR,[
@@ -473,10 +630,6 @@ AC_DEFUN(PHP_SUBST_OLD,[
  AC_SUBST($1)
 ])

-AC_DEFUN(PHP_FAST_OUTPUT,[
-  PHP_FAST_OUTPUT_FILES="$PHP_FAST_OUTPUT_FILES $1"
-])
-
 AC_DEFUN(PHP_MKDIR_P_CHECK,[
  AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[
    test -d conftestdir && rm -rf conftestdir
@@ -492,19 +645,6 @@ dnl `mkdir -p' must be quiet about creating existing directories
  ])
 ])

-AC_DEFUN(PHP_GEN_CONFIG_VARS,[
-  PHP_MKDIR_P_CHECK
-  echo creating config_vars.mk
-  > config_vars.mk
-  for i in $PHP_VAR_SUBST; do
-    eval echo "$i = \$$i" >> config_vars.mk
-  done
-])
-
-AC_DEFUN(PHP_GEN_MAKEFILES,[
-  $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $1
-])
-
 AC_DEFUN(PHP_TM_GMTOFF,[
 AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
 [AC_TRY_COMPILE([#include <sys/types.h>
@@ -625,13 +765,34 @@ dnl
 dnl PHP_BUILD_SHARED
 dnl
 AC_DEFUN(PHP_BUILD_SHARED,[
+  PHP_BUILD_PROGRAM
+  OVERALL_TARGET=libphp4.la
  php_build_target=shared
+  
+  php_c_pre=$shared_c_pre
+  php_c_meta=$shared_c_meta
+  php_c_post=$shared_c_post
+  php_cxx_pre=$shared_cxx_pre
+  php_cxx_meta=$shared_cxx_meta
+  php_cxx_post=$shared_cxx_post
+  php_lo=$shared_lo
 ])

 dnl
 dnl PHP_BUILD_STATIC
 dnl
 AC_DEFUN(PHP_BUILD_STATIC,[
+  PHP_BUILD_PROGRAM
+  OVERALL_TARGET=libphp4.la
+  php_build_target=static
+])
+
+dnl
+dnl PHP_BUILD_BUNDLE
+dnl
+AC_DEFUN(PHP_BUILD_BUNDLE,[
+  PHP_BUILD_PROGRAM
+  OVERALL_TARGET=libs/libphp4.bundle
  php_build_target=static
 ])

@@ -639,6 +800,23 @@ dnl
 dnl PHP_BUILD_PROGRAM
 dnl
 AC_DEFUN(PHP_BUILD_PROGRAM,[
+  OVERALL_TARGET=php
+  php_c_pre='$(CC)'
+  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
+  php_c_post=' && echo > $[@]'
+  php_cxx_pre='$(CXX)'
+  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
+  php_cxx_post=' && echo > $[@]'
+  php_lo=o
+  
+  shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
+  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -prefer-pic'
+  shared_c_post=
+  shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
+  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) -prefer-pic'
+  shared_cxx_post=
+  shared_lo=lo
+
  php_build_target=program
 ])

@@ -674,7 +852,17 @@ AC_DEFUN(PHP_EXPAND_PATH,[
    $2="$ep_realdir/`basename \"$1\"`"
  fi
 ])
-
+dnl
+dnl internal, don't use
+AC_DEFUN(PHP_ADD_LIBPATH_GLOBAL,[
+  AC_PHP_ONCE(LIBPATH, $1, [
+    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$1"
+    LDFLAGS="$LDFLAGS -L$1"
+    PHP_RPATHS="$PHP_RPATHS $1"
+  ])
+])dnl
+dnl
+dnl
 dnl
 dnl PHP_ADD_LIBPATH(path[, shared-libadd])
 dnl
@@ -683,15 +871,15 @@ dnl
 AC_DEFUN(PHP_ADD_LIBPATH,[
  if test "$1" != "/usr/lib"; then
    PHP_EXPAND_PATH($1, ai_p)
-    if test "$ext_shared" = "yes" && test -n "$2"; then
-      $2="-R$1 -L$1 [$]$2"
-    else
-      AC_PHP_ONCE(LIBPATH, $ai_p, [
-        test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
-        LDFLAGS="$LDFLAGS -L$ai_p"
-        PHP_RPATHS="$PHP_RPATHS $ai_p"
-      ])
-    fi
+    ifelse([$2],,[
+      PHP_ADD_LIBPATH_GLOBAL([$ai_p])
+    ],[
+      if test "$ext_shared" = "yes"; then
+        $2="-R$ai_p -L$ai_p [$]$2"
+      else
+        PHP_ADD_LIBPATH_GLOBAL([$ai_p])
+      fi
+    ])
  fi
 ])

@@ -702,7 +890,7 @@ dnl builds RPATH from PHP_RPATHS
 dnl
 AC_DEFUN(PHP_BUILD_RPATH,[
  if test "$PHP_RPATH" = "yes" && test -n "$PHP_RPATHS"; then
-    OLD_RPATHS="$PHP_RPATHS"
+    OLD_RPATHS=$PHP_RPATHS
    unset PHP_RPATHS
    for i in $OLD_RPATHS; do
      PHP_LDFLAGS="$PHP_LDFLAGS -L$i"
@@ -730,31 +918,36 @@ AC_DEFUN(PHP_ADD_INCLUDE,[
    ])
  fi
 ])
-
-AC_DEFUN(PHP_X_ADD_LIBRARY,[
-  ifelse($2,,$3="-l$1 [$]$3", $3="[$]$3 -l$1")
-])
-
+dnl
+dnl internal, don't use
+AC_DEFUN(PHP_X_ADD_LIBRARY,[dnl
+  ifelse([$2],,$3="-l$1 [$]$3", $3="[$]$3 -l$1") dnl
+])dnl
+dnl
+dnl internal, don't use
+AC_DEFUN(PHP_ADD_LIBRARY_SKELETON,[
+  case $1 in
+  c|c_r|pthread*) ;;
+  *) ifelse($3,,[
+    PHP_X_ADD_LIBRARY($1,$2,$5)
+  ],[
+    if test "$ext_shared" = "yes"; then
+      PHP_X_ADD_LIBRARY($1,$2,$3)
+    else
+      $4($1,$2)
+    fi
+  ]) ;;
+  esac
+])dnl
+dnl
+dnl
 dnl
 dnl PHP_ADD_LIBRARY(library[, append[, shared-libadd]])
 dnl
 dnl add a library to the link line
 dnl
 AC_DEFUN(PHP_ADD_LIBRARY,[
- case $1 in
- c|c_r|pthread*) ;;
- *)
-ifelse($3,,[
-   PHP_X_ADD_LIBRARY($1,$2,LIBS)
-],[
-   if test "$ext_shared" = "yes"; then
-     PHP_X_ADD_LIBRARY($1,$2,$3)
-   else
-     PHP_ADD_LIBRARY($1,$2)
-   fi
-])
-  ;;
-  esac
+  PHP_ADD_LIBRARY_SKELETON([$1],[$2],[$3],[PHP_ADD_LIBRARY],[LIBS])
 ])

 dnl
@@ -763,22 +956,9 @@ dnl
 dnl add a library to the link line (deferred)
 dnl
 AC_DEFUN(PHP_ADD_LIBRARY_DEFER,[
- case $1 in
- c|c_r|pthread*) ;;
- *)
-ifelse($3,,[
-   PHP_X_ADD_LIBRARY($1,$2,DLIBS)
-],[
-   if test "$ext_shared" = "yes"; then
-     PHP_X_ADD_LIBRARY($1,$2,$3)
-   else
-     PHP_ADD_LIBRARY_DEFER($1,$2)
-   fi
+  PHP_ADD_LIBRARY_SKELETON([$1],[$2],[$3],[PHP_ADD_LIBRARY_DEFER],[DLIBS])
 ])
-  ;;
-  esac
-])
-  
+
 dnl
 dnl PHP_ADD_LIBRARY_WITH_PATH(library, path[, shared-libadd])
 dnl
@@ -818,8 +998,8 @@ AC_DEFUN(PHP_ADD_LIBRARY_DEFER_WITH_PATH,[
 dnl
 dnl Set libtool variable
 dnl
-AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
-  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
+AC_DEFUN(PHP_SET_LIBTOOL_VARIABLE,[
+  LIBTOOL='$(SHELL) libtool $1'
 ])

 dnl
@@ -850,21 +1030,15 @@ AC_DEFUN(PHP_CHECK_CC_OPTION,[
 AC_DEFUN(PHP_REGEX,[

 if test "$REGEX_TYPE" = "php"; then
-  REGEX_LIB=regex/libregex.la
-  REGEX_DIR=regex
  AC_DEFINE(HSREGEX,1,[ ])
  AC_DEFINE(REGEX,1,[ ])
-  PHP_FAST_OUTPUT(regex/Makefile)
+  PHP_ADD_SOURCES(regex, regcomp.c regexec.c regerror.c regfree.c)
 elif test "$REGEX_TYPE" = "system"; then
  AC_DEFINE(REGEX,0,[ ])
 fi

 AC_MSG_CHECKING([which regex library to use])
 AC_MSG_RESULT([$REGEX_TYPE])
-
-PHP_SUBST(REGEX_DIR)
-PHP_SUBST(REGEX_LIB)
-PHP_SUBST(HSREGEX)
 ])

 dnl
@@ -901,40 +1075,115 @@ AC_DEFUN(PHP_AC_BROKEN_SPRINTF,[
  fi
 ])

+dnl PHP_SHARED_MODULE(module-name, object-var, build-dir)
 dnl
-dnl PHP_EXTENSION(extname [, shared])
+dnl Basically sets up the link-stage for building module-name
+dnl from object_var in build-dir.
+dnl
+AC_DEFUN(PHP_SHARED_MODULE,[
+  PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.la"
+  PHP_SUBST($2)
+  cat >>Makefile.objects<<EOF
+\$(phplibdir)/$1.la: $3/$1.la
+	\$(LIBTOOL) --mode=install cp $3/$1.la \$(phplibdir)
+
+$3/$1.la: \$($2) \$(translit($1,a-z-,A-Z_)_SHARED_DEPENDENCIES)
+	\$(LIBTOOL) --mode=link \$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) -o \[$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z-,A-Z_)_SHARED_LIBADD)
+
+EOF
+])
+
+dnl
+dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags]])
+dnl
+dnl Selects the SAPI name and type (static, shared, programm)
+dnl and optionally also the source-files for the SAPI-specific
+dnl objects.
+dnl
+AC_DEFUN(PHP_SELECT_SAPI,[
+  PHP_SAPI=$1
+  
+  case "$2" in
+  static) PHP_BUILD_STATIC;;
+  shared) PHP_BUILD_SHARED;;
+  bundle) PHP_BUILD_BUNDLE;;
+  program) PHP_BUILD_PROGRAM;;
+  esac
+    
+  ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
+])
+
+dnl deprecated
+AC_DEFUN(PHP_EXTENSION,[
+  sources=`awk -f $abs_srcdir/scan_makefile_in.awk < []PHP_EXT_SRCDIR($1)[]/Makefile.in`
+
+  PHP_NEW_EXTENSION($1, $sources, $2, $3)
+
+  if test -r "$ext_srcdir/Makefile.frag"; then
+    PHP_ADD_MAKEFILE_FRAGMENT
+  fi
+])
+
+AC_DEFUN(PHP_ADD_BUILD_DIR,[
+  BUILD_DIR="$BUILD_DIR $1"
+])
+
+AC_DEFUN(PHP_GEN_BUILD_DIRS,[
+  PHP_MKDIR_P_CHECK
+  if test "$ac_cv_mkdir_p" = "yes"; then
+    mkdir -p $BUILD_DIR
+  fi
+])
+
+dnl
+dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags]]])
 dnl
 dnl Includes an extension in the build.
 dnl
-dnl "extname" is the name of the ext/ subdir where the extension resides
+dnl "extname" is the name of the ext/ subdir where the extension resides.
+dnl "sources" is a list of files relative to the subdir which are used
+dnl to build the extension.
 dnl "shared" can be set to "shared" or "yes" to build the extension as
-dnl a dynamically loadable library.
-dnl
-AC_DEFUN(PHP_EXTENSION,[
-  EXT_SUBDIRS="$EXT_SUBDIRS $1"
-  
-  if test -d "$abs_srcdir/ext/$1"; then
-dnl ---------------------------------------------- Internal Module
-    ext_builddir=ext/$1
-    ext_srcdir=$abs_srcdir/ext/$1
-  else
-dnl ---------------------------------------------- External Module
-    ext_builddir=.
-    ext_srcdir=$abs_srcdir
-  fi
+dnl a dynamically loadable library. Optional parameter "sapi_class" can
+dnl be set to "cli" to mark extension build only with CLI or CGI sapi's.
+dnl extra-cflags are passed to the compiler, with @ext_srcdir@ being
+dnl substituted.
+AC_DEFUN(PHP_NEW_EXTENSION,[
+  ext_builddir=[]PHP_EXT_BUILDDIR($1)
+  ext_srcdir=[]PHP_EXT_SRCDIR($1)

-  if test "$2" != "shared" && test "$2" != "yes"; then
+  ifelse($5,,ac_extra=,[ac_extra=`echo $ac_n "$5$ac_c"|sed s#@ext_srcdir@#$ext_srcdir#g`])
+
+  if test "$3" != "shared" && test "$3" != "yes" && test "$4" != "cli"; then
 dnl ---------------------------------------------- Static module
-    LIB_BUILD($ext_builddir)
-    EXT_LTLIBS="$EXT_LTLIBS $ext_builddir/lib$1.la"
+
+    PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
    EXT_STATIC="$EXT_STATIC $1"
-  else 
+    if test "$3" != "nocli"; then
+      EXT_CLI_LTLIBS="$EXT_CLI_LTLIBS $abs_builddir/$ext_builddir/lib$1.la"
+      EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
+    fi
+  else
+    if test "$3" = "shared" || test "$3" = "yes"; then
 dnl ---------------------------------------------- Shared module
-    LIB_BUILD($ext_builddir,yes)
-    AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z-,A-Z_), 1, Whether to build $1 as dynamic module)
+      PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes)
+      PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir)
+      AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z-,A-Z_), 1, Whether to build $1 as dynamic module)
+    fi
  fi

-  PHP_FAST_OUTPUT($ext_builddir/Makefile)
+  if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
+dnl ---------------------------------------------- CLI static module
+    if test "$PHP_SAPI" = "cgi"; then
+      PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
+      EXT_STATIC="$EXT_STATIC $1"
+    else
+      PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
+    fi
+    EXT_CLI_LTLIBS="$EXT_CLI_LTLIBS $abs_builddir/$ext_builddir/lib$1.la"
+    EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
+  fi
+  PHP_ADD_BUILD_DIR($ext_builddir)
 ])

 dnl
@@ -969,22 +1218,9 @@ dnl and sets $shared to "yes" or "no", and removes "shared,?" stuff
 dnl from $withval.
 dnl
 AC_DEFUN(PHP_WITH_SHARED,[
-    case $withval in
-	shared)
-	    shared=yes
-	    withval=yes
-	    ;;
-	shared,*)
-	    shared=yes
-	    withval=`echo $withval | sed -e 's/^shared,//'`      
-	    ;;
-	*)
-	    shared=no
-	    ;;
-    esac
-    if test -n "$php_always_shared"; then
-		shared=yes
-	fi
+  PHP_ARG_ANALYZE_EX(withval)
+  shared=$ext_shared
+  unset ext_shared ext_output
 ])

 dnl The problem is that the default compilation flags in Solaris 2.6 won't
@@ -1087,11 +1323,6 @@ int main(void) {
  fi
 ])

-AC_DEFUN(AC_ADD_LIBPATH, [indir([PHP_ADD_LIBPATH], $@)])
-AC_DEFUN(AC_ADD_LIBRARY, [indir([PHP_ADD_LIBRARY], $@)])
-AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH, [indir([PHP_ADD_LIBRARY_WITH_PATH], $@)])
-AC_DEFUN(AC_ADD_INCLUDE, [indir([PHP_ADD_INCLUDE], $@)])
-
 AC_DEFUN(PHP_FOPENCOOKIE,[
 	AC_CHECK_FUNC(fopencookie, [ have_glibc_fopencookie=yes ])

@@ -1150,3 +1381,78 @@ AC_DEFUN(PHP_CHECK_LIBRARY, [
  ])dnl
 ])

+dnl 
+dnl PHP_SETUP_ICONV(shared-add [, action-found [, action-not-found]])
+dnl
+dnl Common setup macro for iconv
+dnl
+AC_DEFUN(PHP_SETUP_ICONV, [
+  found_iconv=no
+  unset ICONV_DIR
+
+  dnl
+  dnl Check libc first if no path is provided in --with-iconv
+  dnl
+  if test "$PHP_ICONV" = "yes"; then
+    AC_CHECK_FUNC(iconv, [
+      PHP_DEFINE(HAVE_ICONV)
+      found_iconv=yes
+    ],[
+      AC_CHECK_FUNC(libiconv,[
+        PHP_DEFINE(HAVE_LIBICONV)
+        found_iconv=yes
+      ])
+    ])
+  fi
+
+  dnl
+  dnl Check external libs for iconv funcs
+  dnl
+  if test "$found_iconv" = "no"; then
+
+    for i in $PHP_ICONV /usr/local /usr; do
+      if test -r $i/include/giconv.h; then
+        AC_DEFINE(HAVE_GICONV_H, 1, [ ])
+        ICONV_DIR=$i
+        iconv_lib_name=giconv
+        break
+      elif test -r $i/include/iconv.h; then
+        ICONV_DIR=$i
+        iconv_lib_name=iconv
+        break
+      fi
+    done
+
+    if test -z "$ICONV_DIR"; then
+      AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>])
+    fi
+  
+    if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a ||
+       test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
+    then
+      PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [
+        found_iconv=yes
+        PHP_DEFINE(HAVE_LIBICONV)
+      ], [
+        PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
+          found_iconv=yes
+          PHP_DEFINE(HAVE_ICONV)
+        ], [], [
+          -L$ICONV_DIR/lib
+        ])
+      ], [
+        -L$ICONV_DIR/lib
+      ])
+    fi
+  fi
+
+  if test "$found_iconv" = "yes"; then
+    if test -n "$ICONV_DIR"; then
+      AC_DEFINE(HAVE_ICONV, 1, [ ])
+      PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1)
+      PHP_ADD_INCLUDE($ICONV_DIR/include)
+    fi
+    $2
+ifelse([$3],[],,[else $3])
+  fi
+])
@@ -150,6 +150,10 @@ LS stands for 'Local Storage', _C stands for Call and _CC stands for Call
 Comma, _D stands for Declaration and _DC stands for Declaration Comma.
 Note that there's NO comma between the last argument and ???LS_DC or ???LS_CC.

+If you do not pass the structure as an argument you can always fetch it by
+using the appropriate ???LS_FETCH() macros within a functions variable
+declarations.
+
 In general, every module that makes use of globals should use this approach
 if it plans to be thread safe.

@@ -1,34 +0,0 @@
-#! /bin/sh
-#  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
-#  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
-#  +----------------------------------------------------------------------+
-#  | This source file is subject to version 2.02 of the PHP license,      |
-#  | that is bundled with this package in the file LICENSE, and is        |
-#  | available at through the world-wide-web at                           |
-#  | http://www.php.net/license/2_02.txt.                                 |
-#  | If you did not receive a copy of the PHP license and are unable to   |
-#  | obtain it through the world-wide-web, please send a note to          |
-#  | license@php.net so we can mail you a copy immediately.               |
-#  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-#  +----------------------------------------------------------------------+
-#
-# $Id$ 
-#
-
-# cwd must be top_srcdir
-test -f build/bsd_makefile || exit 2
-
-test -f bsd_converted && exit 0
-
-tmpfile=`mktemp /tmp/bsd_makefile.XXXXXX 2>/dev/null` || tmpfile="tmp.$$"
-for i in build/*.mk; do
-    sed 's/^include \(.*\)/.include "\1"/' $i >$tmpfile \
-        && cp $tmpfile $i
-done
-rm -f $tmpfile
-
-touch bsd_converted
-exit 0
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -30,37 +30,16 @@ config_h_in = main/php_config.h.in

 acconfig_h_SOURCES = acconfig.h.in $(config_h_files)

-targets = $(TOUCH_FILES) $(makefile_in_files) configure $(config_h_in)
+targets = $(TOUCH_FILES) configure $(config_h_in)


-all: Zend/Makefile.am TSRM/Makefile.am $(targets)
-
-Zend/Makefile.am:
-	test -d Zend || (test -d ../Zend && ln -s ../Zend Zend)
-
-TSRM/Makefile.am:
-	test -d TSRM || (test -d ../TSRM && ln -s ../TSRM TSRM)
+all: $(targets)

 acconfig.h: $(acconfig_h_SOURCES)
 	@echo rebuilding $@
 	cat $(acconfig_h_SOURCES) > $@

-$(makefile_in_files): $(makefile_am_files) aclocal.m4 configure.in $(config_m4_files)
-	@echo rebuilding Makefile templates
-	@for i in $(LT_TARGETS); do \
-		if test -f "$$i"; then \
-			mv $$i $$i.bak; \
-			cp $$i.bak $$i; \
-		fi; \
-	done
-	@test -f want_dependencies || flag=-i; \
-	automake -a $$flag $(AMFLAGS) $(makefile_files) 2>&1 | $(SUPPRESS_WARNINGS)
-	@for i in $(LT_TARGETS); do mv $$i.bak $$i; done
-
-aclocal.m4: configure.in acinclude.m4 dynlib.m4
-	aclocal 2>&1 | $(SUPPRESS_WARNINGS)
-
-SUPPRESS_WARNINGS = (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|.*AM_PROG_LEX.*|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times)'||true)
+SUPPRESS_WARNINGS = (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_PROG_CPP was called before AC_PROG_CC)'||true)

 $(config_h_in): configure acconfig.h
 # explicitly remove target since autoheader does not seem to work 
@@ -72,6 +51,9 @@ $(config_h_in): configure acconfig.h
 $(TOUCH_FILES):
 	touch $(TOUCH_FILES)

+aclocal.m4: configure.in acinclude.m4
+	aclocal 2>&1 | $(SUPPRESS_WARNINGS)
+	
 configure: aclocal.m4 configure.in $(config_m4_files)
 	@echo rebuilding $@
 	@autoconf 2>&1 | $(SUPPRESS_WARNINGS)
@@ -16,7 +16,7 @@
 #  |          Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
-# $Id: buildcheck.sh,v 1.13 2001-12-11 15:28:53 sebastian Exp $ 
+# $Id: buildcheck.sh,v 1.16 2002-03-04 08:28:57 sas Exp $ 
 #

 echo "buildconf: checking installation..."
@@ -39,6 +39,7 @@ else
 echo "buildconf: autoconf version $ac_version (ok)"
 fi

+
 # automake 1.4 or newer
 am_version=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 am_version_clean=`echo $am_version|sed -e 's/-p[0-9]*$//'`
@@ -61,7 +62,7 @@ fi
 # libtool 1.4 or newer
 libtool=`which libtool`
 if test ! -f "$libtool"; then libtool=`which glibtool`; fi
-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/^[^0-9]*//' -e 's/[- ].*//'`
+lt_pversion=`$libtool --version 2>/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- ].*//p'`
 if test "$lt_pversion" = ""; then
 echo "buildconf: libtool not found."
 echo "           You need libtool version 1.4 or newer installed"
@@ -1,24 +0,0 @@
-#  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
-#  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
-#  +----------------------------------------------------------------------+
-#  | This source file is subject to version 2.02 of the PHP license,      |
-#  | that is bundled with this package in the file LICENSE, and is        |
-#  | available at through the world-wide-web at                           |
-#  | http://www.php.net/license/2_02.txt.                                 |
-#  | If you did not receive a copy of the PHP license and are unable to   |
-#  | obtain it through the world-wide-web, please send a note to          |
-#  | license@php.net so we can mail you a copy immediately.               |
-#  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-#  +----------------------------------------------------------------------+
-#
-# $Id$ 
-#
-
-all: all-recursive
-
-include $(builddir)/libs.mk
-
-include $(top_srcdir)/build/rules.mk
@@ -1,80 +0,0 @@
-#! /bin/sh
-#
-#  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
-#  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
-#  +----------------------------------------------------------------------+
-#  | This source file is subject to version 2.02 of the PHP license,      |
-#  | that is bundled with this package in the file LICENSE, and is        |
-#  | available at through the world-wide-web at                           |
-#  | http://www.php.net/license/2_02.txt.                                 |
-#  | If you did not receive a copy of the PHP license and are unable to   |
-#  | obtain it through the world-wide-web, please send a note to          |
-#  | license@php.net so we can mail you a copy immediately.               |
-#  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-#  +----------------------------------------------------------------------+
-#
-# $Id: fastgen.sh,v 1.13 2001-12-11 15:28:53 sebastian Exp $ 
-#
-
-if test "$#" = "0"; then
-  echo "Usage: fastgen.sh <srcdir> <mkdir_p> <bsdmakefile_p> <file>"
-fi
-
-srcdir=$1
-shift
-
-mkdir_p=$1
-shift
-
-bsd_makefile=$1
-shift
-
-top_srcdir=`(cd $srcdir; pwd)`
-top_builddir=`pwd`
-
-if test "$mkdir_p" = "yes"; then
-  mkdir_p="mkdir -p"
-else
-  mkdir_p="$top_srcdir/build/shtool mkdir -p"
-fi
-
-if test "$bsd_makefile" = "yes"; then
-  (cd $top_srcdir; ./build/bsd_makefile)
-
-  for makefile in $@; do
-    echo "fastgen.sh: creating $makefile"
-    dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
-    $mkdir_p "$dir/"
-
-    cat - $top_srcdir/$makefile.in <<EOF |sed 's/^include \(.*\)/.include "\1"/' >$makefile 
-top_srcdir   = $top_srcdir
-top_builddir = $top_builddir
-srcdir       = $top_srcdir/$dir
-builddir     = $top_builddir/$dir
-VPATH        = $top_srcdir/$dir
-EOF
-
-    test -z "$dir" && dir=.
-    touch $dir/.deps
-  done
-else  
-  for makefile in $@; do
-    echo "fastgen.sh: creating $makefile"
-    dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
-    $mkdir_p "$dir/"
-
-    cat - $top_srcdir/$makefile.in <<EOF >$makefile
-top_srcdir   = $top_srcdir
-top_builddir = $top_builddir
-srcdir       = $top_srcdir/$dir
-builddir     = $top_builddir/$dir
-VPATH        = $top_srcdir/$dir
-EOF
-  
-    test -z "$dir" && dir=.
-    touch $dir/.deps
-  done
-fi
@@ -1,24 +1,24 @@
 #! /bin/sh

-# $Id: genif.sh,v 1.2 2001-03-30 14:02:20 sas Exp $
+# $Id: genif.sh,v 1.3 2002-03-22 10:22:41 sas Exp $
 # replacement for genif.pl

-infile="$1"
+infile=$1
 shift
-srcdir="$1"
+srcdir=$1
 shift
-extra_module_ptrs="$1"
+extra_module_ptrs=$1
 shift
-awk="$1"
+awk=$1
 shift

-if test "$infile" = "" -o "$srcdir" = ""; then
+if test -z "$infile" || test -z "$srcdir"; then
 	echo "please supply infile and srcdir"
 	exit 1
 fi

-module_ptrs="$extra_module_ptrs"
-header_list=""
+module_ptrs=$extra_module_ptrs
+header_list=
 olddir=`pwd`
 cd $srcdir

@@ -1,23 +0,0 @@
-#  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
-#  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
-#  +----------------------------------------------------------------------+
-#  | This source file is subject to version 2.02 of the PHP license,      |
-#  | that is bundled with this package in the file LICENSE, and is        |
-#  | available at through the world-wide-web at                           |
-#  | http://www.php.net/license/2_02.txt.                                 |
-#  | If you did not receive a copy of the PHP license and are unable to   |
-#  | obtain it through the world-wide-web, please send a note to          |
-#  | license@php.net so we can mail you a copy immediately.               |
-#  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-#  +----------------------------------------------------------------------+
-#
-# $Id$ 
-#
-
-LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
-
-$(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
-	$(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
@@ -1,24 +0,0 @@
-#  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
-#  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
-#  +----------------------------------------------------------------------+
-#  | This source file is subject to version 2.02 of the PHP license,      |
-#  | that is bundled with this package in the file LICENSE, and is        |
-#  | available at through the world-wide-web at                           |
-#  | http://www.php.net/license/2_02.txt.                                 |
-#  | If you did not receive a copy of the PHP license and are unable to   |
-#  | obtain it through the world-wide-web, please send a note to          |
-#  | license@php.net so we can mail you a copy immediately.               |
-#  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-#  +----------------------------------------------------------------------+
-#
-# $Id$ 
-#
-
-targets = $(LTLIBRARY_NAME)
-
-include $(top_srcdir)/build/rules.mk
-include $(top_srcdir)/build/library.mk
-
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$
@@ -1,23 +0,0 @@
-#  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
-#  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
-#  +----------------------------------------------------------------------+
-#  | This source file is subject to version 2.02 of the PHP license,      |
-#  | that is bundled with this package in the file LICENSE, and is        |
-#  | available at through the world-wide-web at                           |
-#  | http://www.php.net/license/2_02.txt.                                 |
-#  | If you did not receive a copy of the PHP license and are unable to   |
-#  | obtain it through the world-wide-web, please send a note to          |
-#  | license@php.net so we can mail you a copy immediately.               |
-#  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-#  +----------------------------------------------------------------------+
-#
-# $Id$ 
-#
-
-PROGRAM_OBJECTS = $(PROGRAM_SOURCES:.c=.lo)
-
-$(PROGRAM_NAME): $(PROGRAM_DEPENDENCIES) $(PROGRAM_OBJECTS)
-	$(LINK_CLEAN) $(PROGRAM_LDFLAGS) $(PROGRAM_OBJECTS) $(PROGRAM_LDADD)
@@ -1,68 +0,0 @@
-#  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
-#  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
-#  +----------------------------------------------------------------------+
-#  | This source file is subject to version 2.02 of the PHP license,      |
-#  | that is bundled with this package in the file LICENSE, and is        |
-#  | available at through the world-wide-web at                           |
-#  | http://www.php.net/license/2_02.txt.                                 |
-#  | If you did not receive a copy of the PHP license and are unable to   |
-#  | obtain it through the world-wide-web, please send a note to          |
-#  | license@php.net so we can mail you a copy immediately.               |
-#  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-#  +----------------------------------------------------------------------+
-#
-# $Id$ 
-#
-
-include $(top_srcdir)/build/rules_common.mk
-
-all: all-recursive
-install: install-recursive
-
-distclean-recursive depend-recursive clean-recursive all-recursive install-recursive:
-	@otarget=`echo $@|sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for i in $$list; do \
-		target="$$otarget"; \
-		echo "Making $$target in $$i"; \
-		if test "$$i" = "."; then \
-			ok=yes; \
-			target="$$target-p"; \
-		fi; \
-		(cd $$i && $(MAKE) $$target) || exit 1; \
-	done; \
-	if test "$$otarget" = "all" && test -z '$(targets)'; then ok=yes; fi; \
-	if test "$$ok" != "yes"; then $(MAKE) "$$otarget-p" || exit 1; fi
-
-all-p: $(targets)
-install-p: $(targets) $(install_targets)
-distclean-p depend-p clean-p:
-
-depend: depend-recursive
-	@echo $(top_srcdir) $(top_builddir) $(srcdir) $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c *.c | $(AWK) -f $(top_srcdir)/build/mkdep.awk > $(builddir)/.deps || true
-
-clean: clean-recursive clean-x
-
-clean-x:
-	rm -f $(targets) *.lo *.slo *.la *.o $(CLEANFILES)
-	rm -rf .libs
-
-distclean: distclean-recursive clean-x
-	rm -f config.cache config.log config.status config_vars.mk libtool \
-	php_config.h stamp-h Makefile build-defs.h php4.spec libphp4.module
-
-test: $(top_builddir)/php
-	@if test "$(TESTS)" = ""; then \
-		TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -C -q $(top_srcdir)/run-tests.php $(srcdir); \
-	else \
-		TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -C -q $(top_srcdir)/run-tests.php $(TESTS); \
-	fi
-
-include $(builddir)/.deps
-
-.PHONY: all-recursive clean-recursive install-recursive \
-$(install_targets) install all clean depend depend-recursive shared \
-distclean-recursive distclean clean-x all-p install-p distclean-p \
-depend-p clean-p
@@ -1,77 +0,0 @@
-#  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
-#  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
-#  +----------------------------------------------------------------------+
-#  | This source file is subject to version 2.02 of the PHP license,      |
-#  | that is bundled with this package in the file LICENSE, and is        |
-#  | available at through the world-wide-web at                           |
-#  | http://www.php.net/license/2_02.txt.                                 |
-#  | If you did not receive a copy of the PHP license and are unable to   |
-#  | obtain it through the world-wide-web, please send a note to          |
-#  | license@php.net so we can mail you a copy immediately.               |
-#  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-#  +----------------------------------------------------------------------+
-#
-# $Id$ 
-#
-
-include $(top_builddir)/config_vars.mk
-
-COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)
-COMPILE      = $(CC)  $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
-CXX_COMPILE  = $(CXX) $(COMMON_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
-
-SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) -prefer-pic $(EXTRA_CFLAGS) -c $< && touch $@
-CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) -prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@
-
-LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LDFLAGS) -o $@
-LINK_CLEAN = $(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@
-
-mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
-INSTALL = $(top_srcdir)/build/shtool install -c
-INSTALL_DATA = $(INSTALL) -m 644
-
-DEFS = -I. -I$(srcdir) -I$(top_builddir)/main -I$(top_srcdir)
-
-moduledir    = $(EXTENSION_DIR)
-
-CXX_SUFFIX = .cpp
-
-.SUFFIXES:
-.SUFFIXES: .slo .c $(CXX_SUFFIX) .lo .o .s .y .l
-
-.c.o:
-	$(COMPILE) -c $<
-
-$(CXX_SUFFIX).o:
-	$(CXX_COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.c.lo:
-	$(PHP_COMPILE)
-
-$(CXX_SUFFIX).lo:
-	$(CXX_PHP_COMPILE)
-
-.s.lo:
-	$(PHP_COMPILE)
-
-.c.slo:
-	$(SHARED_COMPILE)
-
-$(CXX_SUFFIX).slo:
-	$(CXX_SHARED_COMPILE)
-
-.y.c:
-	$(YACC) $(YFLAGS) $< && mv y.tab.c $*.c
-	if test -f y.tab.h; then \
-	if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
-	else :; fi
-
-.l.c:
-	$(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@
-
@@ -1,76 +0,0 @@
-#  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
-#  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
-#  +----------------------------------------------------------------------+
-#  | This source file is subject to version 2.02 of the PHP license,      |
-#  | that is bundled with this package in the file LICENSE, and is        |
-#  | available at through the world-wide-web at                           |
-#  | http://www.php.net/license/2_02.txt.                                 |
-#  | If you did not receive a copy of the PHP license and are unable to   |
-#  | obtain it through the world-wide-web, please send a note to          |
-#  | license@php.net so we can mail you a copy immediately.               |
-#  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-#  +----------------------------------------------------------------------+
-#
-# $Id$ 
-#
-
-include $(top_srcdir)/build/rules_common.mk
-
-install_targets = install-modules
-
-all: all-recursive
-install: install-recursive
-
-distclean-recursive depend-recursive clean-recursive all-recursive install-recursive:
-	@otarget=`echo $@|sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for i in $$list; do \
-		target="$$otarget"; \
-		echo "Making $$target in $$i"; \
-		if test "$$i" = "."; then \
-			ok=yes; \
-			target="$$target-p"; \
-		fi; \
-		(cd $$i && $(MAKE) $$target) || exit 1; \
-	done; \
-	if test "$$otarget" = "all" && test -z '$(targets)'; then ok=yes; fi; \
-	if test "$$ok" != "yes"; then $(MAKE) "$$otarget-p" || exit 1; fi
-
-all-p: $(targets)
-install-p: $(targets) $(install_targets)
-distclean-p depend-p clean-p:
-
-depend: depend-recursive
-	@echo $(top_srcdir) $(top_builddir) $(srcdir) $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c *.c | $(AWK) -f $(top_srcdir)/build/mkdep.awk > $(builddir)/.deps || true
-
-clean: clean-recursive clean-x
-
-clean-x:
-	rm -f $(targets) *.lo *.slo *.la *.o $(CLEANFILES)
-	rm -rf .libs
-
-distclean: distclean-recursive clean-x
-	rm -f config.cache config.log config.status config_vars.mk libtool \
-	config.h stamp-h Makefile build-defs.h php4.spec libphp4.module
-
-cvsclean:
-	@for i in `find . -name .cvsignore`; do \
-		(cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore` *.o *.a || true); \
-	done
-	@rm -f $(SUBDIRS) 2>/dev/null || true
-
-install-modules:
-	@test -d modules && \
-	$(mkinstalldirs) $(moduledir) && \
-	echo "installing shared modules into $(moduledir)" && \
-	rm -f modules/*.la && \
-	cp modules/* $(moduledir) || true
-
-include $(builddir)/.deps
-
-.PHONY: all-recursive clean-recursive install-recursive \
-$(install_targets) install all clean depend depend-recursive shared \
-distclean-recursive distclean clean-x all-p install-p distclean-p \
-depend-p clean-p
@@ -1,13 +1,13 @@
 #!/bin/sh
 ##
 ##  GNU shtool -- The GNU Portable Shell Tool
-##  Copyright (c) 1994-2000 Ralf S. Engelschall <rse@engelschall.com>
+##  Copyright (c) 1994-2001 Ralf S. Engelschall <rse@engelschall.com>
 ##
 ##  See http://www.gnu.org/software/shtool/ for more information.
 ##  See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
 ##
-##  Version 1.4.9 (16-Apr-2000)
-##  Ingredients: 3/17 available modules
+##  Version:  1.5.4 (14-Jun-2001)
+##  Contents: 3/17 available modules
 ##

 ##
@@ -26,7 +26,7 @@
 ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ##  USA, or contact Ralf S. Engelschall <rse@engelschall.com>.
 ##
-##  Notice: Given that you include this file verbatim into your own
+##  NOTICE: Given that you include this file verbatim into your own
 ##  source tree, you are justified in saying that it remains separate
 ##  from your package, and that this way you are simply just using GNU
 ##  shtool. So, in this situation, there is no requirement that your
@@ -55,7 +55,7 @@
 ##    arx        Extended archive command
 ##    slo        Separate linker options by library class
 ##    scpp       Sharing C Pre-Processor
-##    version    Generate and maintain a version information file
+##    version    Maintain a version information file
 ##    path       Deal with program paths
 ##

@@ -65,21 +65,22 @@ if [ $# -eq 0 ]; then
    exit 1
 fi
 if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
-    echo "This is GNU shtool, version 1.4.9 (16-Apr-2000)"
-    echo "Copyright (c) 1994-2000 Ralf S. Engelschall <rse@engelschall.com>"
+    echo "This is GNU shtool, version 1.5.4 (14-Jun-2001)"
+    echo "Copyright (c) 1994-2001 Ralf S. Engelschall <rse@engelschall.com>"
    echo "Report bugs to <bug-shtool@gnu.org>"
    echo ''
-    echo "Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]" 
+    echo "Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]"
    echo ''
    echo 'Available global <options>:'
    echo '  -v, --version   display shtool version information'
    echo '  -h, --help      display shtool usage help page (this one)'
    echo '  -d, --debug     display shell trace information'
+    echo '  -r, --recreate  recreate this shtool script via shtoolize'
    echo ''
    echo 'Available <cmd-name> [<cmd-options>] [<cmd-args>]:'
    echo '  echo     [-n] [-e] [<str> ...]'
    echo '  install  [-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>]'
-    echo '           [-e<ext>] <file> <path>'
+    echo '           [-e<sed-cmd>] <file> [<file> ...] <path>'
    echo '  mkdir    [-t] [-f] [-p] [-m<mode>] <dir> [<dir> ...]'
    echo ''
    echo 'Not available <cmd-name> (because module was not built-in):'
@@ -90,21 +91,25 @@ if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
    echo '  mkln     [-t] [-f] [-s] <src-path> [<src-path> ...] <dst-path>'
    echo '  mkshadow [-v] [-t] [-a] <src-dir> <dst-dir>'
    echo '  fixperm  [-v] [-t] <path> [<path> ...]'
-    echo '  tarball  [-t] [-v] [-o <tarball>] [-c <prog>] [-d <dir>] [-u'
-    echo '           <user>] [-g <group>] [-e <pattern>] <path> [<path> ...]'
+    echo '  tarball  [-t] [-v] [-o<tarball>] [-c<prog>] [-d<dir>] [-u<user>]'
+    echo '           [-g<group>] [-e<pattern>] <path> [<path> ...]'
    echo '  guessos  '
    echo '  arx      [-t] [-C<cmd>] <op> <archive> [<file> ...]'
    echo '  slo      [-p<str>] -- -L<dir> -l<lib> [-L<dir> -l<lib> ...]'
    echo '  scpp     [-v] [-p] [-f<filter>] [-o<ofile>] [-t<tfile>] [-M<mark>]'
    echo '           [-D<dname>] [-C<cname>] <file> [<file> ...]'
-    echo '  version  [-l<lang>] [-n<name>] [-p<prefix>] [-s<version>] [-i<knob>]'
-    echo '           [-d<type>] <file>'
+    echo '  version  [-l<lang>] [-n<name>] [-p<prefix>] [-s<version>] [-e]'
+    echo '           [-i<knob>] [-d<type>] <file>'
    echo '  path     [-s] [-r] [-d] [-b] [-m] [-p<path>] <str> [<str> ...]'
    echo ''
    exit 0
 fi
 if [ ".$1" = ".-v" -o ".$1" = ."--version" ]; then
-    echo "GNU shtool 1.4.9 (16-Apr-2000)"
+    echo "GNU shtool 1.5.4 (14-Jun-2001)"
+    exit 0
+fi
+if [ ".$1" = ".-r" -o ".$1" = ."--recreate" ]; then
+    shtoolize -ofoo echo install mkdir
    exit 0
 fi
 if [ ".$1" = ".-d" -o ".$1" = ."--debug" ]; then
@@ -142,15 +147,15 @@ case $tool in
        ;;
    install )
        str_tool="install"
-        str_usage="[-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<ext>] <file> <path>"
-        arg_spec="2="
-        opt_spec="v.t.c.C.s.m:o:g:e:"
+        str_usage="[-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<sed-cmd>] <file> [<file> ...] <path>"
+        arg_spec="2+"
+        opt_spec="v.t.c.C.s.m:o:g:e+"
        opt_v=no
        opt_t=no
        opt_c=no
        opt_C=no
        opt_s=no
-        opt_m=""
+        opt_m="0755"
        opt_o=""
        opt_g=""
        opt_e=""
@@ -312,6 +317,7 @@ if [ ".$gen_tmpfile" = .yes ]; then
    tmpfile="$tmpdir/.shtool.$$"
    rm -f $tmpfile >/dev/null 2>&1
    touch $tmpfile
+    chmod 600 $tmpfile
 fi

 ##
@@ -323,7 +329,7 @@ case $tool in
 echo )
    ##
    ##  echo -- Print string with optional construct expansion
-    ##  Copyright (c) 1998-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2001 Ralf S. Engelschall <rse@engelschall.com>
    ##  Originally written for WML as buildinfo
    ##
    
@@ -347,7 +353,7 @@ echo )
    fi
    
    #   determine terminal bold sequence
-    term_bold='' 
+    term_bold=''
    term_norm=''
    if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[Bb]'`" != . ]; then
        case $TERM in
@@ -398,7 +404,7 @@ echo )
    
    #   determine user name
    username=''
-    if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[uU]'`" != . ]; then
+    if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[uUgG]'`" != . ]; then
        username="$LOGNAME"
        if [ ".$username" = . ]; then
            username="$USER"
@@ -440,8 +446,38 @@ echo )
        fi
    fi
    
-    #   determine host name
+    #   determine (primary) group id
+    groupid=''
+    if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[gG]'`" != . ]; then
+        groupid=`egrep "^${username}:" /etc/passwd 2>/dev/null | \
+                 sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
+        if [ ".$groupid" = . ]; then
+            groupid=`(ypcat passwd) 2>/dev/null | egrep "^${username}:" | \
+                     sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
+            if [ ".$groupid" = . ]; then
+                groupid='?'
+            fi
+        fi
+    fi
+    
+    #   determine (primary) group name
+    groupname=''
+    if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%g'`" != . ]; then
+        groupname=`egrep "^[^:]*:[^:]*:${groupid}:" /etc/group 2>/dev/null | \
+                   sed -e 's/:.*$//'`
+        if [ ".$groupname" = . ]; then
+            groupname=`(ypcat group) 2>/dev/null | \
+                       egrep "^[^:]*:[^:]*:${groupid}:" | \
+                       sed -e 's/:.*$//'`
+            if [ ".$groupname" = . ]; then
+                groupname='?'
+            fi
+        fi
+    fi
+    
+    #   determine host and domain name
    hostname=''
+    domainname=''
    if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%h'`" != . ]; then
        hostname="`(uname -n) 2>/dev/null |\
                   awk '{ printf("%s", $1); }'`"
@@ -459,9 +495,6 @@ echo )
                ;;
        esac
    fi
-    
-    #   determine domain name
-    domainname=''
    if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%d'`" != . ]; then
        if [ ".$domainname" = . ]; then
            if [ -f /etc/resolv.conf ]; then
@@ -521,6 +554,8 @@ echo )
                  -e "s/%b/${term_norm}/g" \
                  -e "s/%u/${username}/g" \
                  -e "s/%U/${userid}/g" \
+                  -e "s/%g/${groupname}/g" \
+                  -e "s/%G/${groupid}/g" \
                  -e "s/%h/${hostname}/g" \
                  -e "s/%d/${domainname}/g" \
                  -e "s/%D/${time_day}/g" \
@@ -546,114 +581,144 @@ echo )
 install )
    ##
    ##  install -- Install a program, script or datafile
-    ##  Copyright (c) 1997-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1997-2001 Ralf S. Engelschall <rse@engelschall.com>
    ##  Originally written for shtool
    ##
    
-    src="$1"
-    dst="$2"
+    #   determine source(s) and destination
+    argc=$#
+    srcs=""
+    while [ $# -gt 1 ]; do
+        srcs="$srcs $1"
+        shift
+    done
+    dstpath="$1"
    
-    #  If destination is a directory, append the input filename
-    if [ -d $dst ]; then
-        dst=`echo "$dst" | sed -e 's:/$::'`
-        dstfile=`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'`
-        dst="$dst/$dstfile"
+    #   type check for destination
+    dstisdir=0
+    if [ -d $dstpath ]; then
+        dstpath=`echo "$dstpath" | sed -e 's:/$::'`
+        dstisdir=1
    fi
    
-    #  Add a possible extension to src and dst
-    if [ ".$opt_e" != . ]; then
-        src="$src$opt_e"
-        dst="$dst$opt_e"
-    fi
-    
-    #  Check for correct arguments
-    if [ ".$src" = ".$dst" ]; then
-        echo "$msgprefix:Error: source and destination are the same" 1>&2
+    #   consistency check for destination
+    if [ $argc -gt 2 -a $dstisdir = 0 ]; then
+        echo "$msgprefix:Error: multiple sources require destination to be directory" 1>&2
        exit 1
    fi
    
-    #  Make a temp file name in the destination directory
-    dstdir=`echo $dst | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;'`
-    dsttmp="$dstdir/#INST@$$#"
+    #   iterate over all source(s)
+    for src in $srcs; do
+        dst=$dstpath
    
-    #  Verbosity
-    if [ ".$opt_v" = .yes ]; then
-        echo "$src -> $dst" 1>&2
-    fi
+        #   if destination is a directory, append the input filename
+        if [ $dstisdir = 1 ]; then
+            dstfile=`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'`
+            dst="$dst/$dstfile"
+        fi
    
-    #  Copy or move the file name to the temp name
-    #  (because we might be not allowed to change the source)
-    if [ ".$opt_C" = .yes ]; then
-        opt_c=yes
-    fi
-    if [ ".$opt_c" = .yes ]; then
-        if [ ".$opt_t" = .yes ]; then
-            echo "cp $src $dsttmp" 1>&2
+        #   check for correct arguments
+        if [ ".$src" = ".$dst" ]; then
+            echo "$msgprefix:Warning: source and destination are the same - skipped" 1>&2
+            continue
        fi
-        cp $src $dsttmp || exit $?
-    else
-        if [ ".$opt_t" = .yes ]; then
-            echo "mv $src $dsttmp" 1>&2
+        if [ -d "$src" ]; then
+            echo "$msgprefix:Warning: source \`$src' is a directory - skipped" 1>&2
+            continue
        fi
-        mv $src $dsttmp || exit $?
-    fi
    
-    #  Adjust the target file
-    #  (we do chmod last to preserve setuid bits)
-    if [ ".$opt_s" = .yes ]; then
-        if [ ".$opt_t" = .yes ]; then
-            echo "strip $dsttmp" 1>&2
-        fi
-        strip $dsttmp || exit $?
-    fi
-    if [ ".$opt_o" != . ]; then
-        if [ ".$opt_t" = .yes ]; then
-            echo "chown $opt_o $dsttmp" 1>&2
-        fi
-        chown $opt_o $dsttmp || exit $?
-    fi
-    if [ ".$opt_g" != . ]; then
-        if [ ".$opt_t" = .yes ]; then
-            echo "chgrp $opt_g $dsttmp" 1>&2
-        fi
-        chgrp $opt_g $dsttmp || exit $?
-    fi
-    if [ ".$opt_m" != . ]; then
-        if [ ".$opt_t" = .yes ]; then
-            echo "chmod $opt_m $dsttmp" 1>&2
-        fi
-        chmod $opt_m $dsttmp || exit $?
-    fi
+        #   make a temp file name in the destination directory
+        dsttmp=`echo $dst |\
+                sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;' \
+                    -e "s;\$;/#INST@$$#;"`
    
-    #   Determine whether to do a quick install
-    #   (has to be done _after_ the strip was already done)
-    quick=no
-    if [ ".$opt_C" = .yes ]; then
-        if [ -r $dst ]; then
-            if cmp -s $src $dst; then
-                quick=yes
+        #   verbosity
+        if [ ".$opt_v" = .yes ]; then
+            echo "$src -> $dst" 1>&2
+        fi
+    
+        #   copy or move the file name to the temp name
+        #   (because we might be not allowed to change the source)
+        if [ ".$opt_C" = .yes ]; then
+            opt_c=yes
+        fi
+        if [ ".$opt_c" = .yes ]; then
+            if [ ".$opt_t" = .yes ]; then
+                echo "cp $src $dsttmp" 1>&2
+            fi
+            cp $src $dsttmp || exit $?
+        else
+            if [ ".$opt_t" = .yes ]; then
+                echo "mv $src $dsttmp" 1>&2
+            fi
+            mv $src $dsttmp || exit $?
+        fi
+    
+        #   adjust the target file
+        if [ ".$opt_e" != . ]; then
+            sed='sed'
+            for e in $opt_e; do
+                sed="$sed -e '$e'"
+            done
+            cp $dsttmp $dsttmp.old
+            eval "$sed <$dsttmp.old >$dsttmp" || exit $?
+            rm -f $dsttmp.old
+        fi
+        if [ ".$opt_s" = .yes ]; then
+            if [ ".$opt_t" = .yes ]; then
+                echo "strip $dsttmp" 1>&2
+            fi
+            strip $dsttmp || exit $?
+        fi
+        if [ ".$opt_o" != . ]; then
+            if [ ".$opt_t" = .yes ]; then
+                echo "chown $opt_o $dsttmp" 1>&2
+            fi
+            chown $opt_o $dsttmp || exit $?
+        fi
+        if [ ".$opt_g" != . ]; then
+            if [ ".$opt_t" = .yes ]; then
+                echo "chgrp $opt_g $dsttmp" 1>&2
+            fi
+            chgrp $opt_g $dsttmp || exit $?
+        fi
+        if [ ".$opt_m" != ".-" ]; then
+            if [ ".$opt_t" = .yes ]; then
+                echo "chmod $opt_m $dsttmp" 1>&2
+            fi
+            chmod $opt_m $dsttmp || exit $?
+        fi
+    
+        #   determine whether to do a quick install
+        #   (has to be done _after_ the strip was already done)
+        quick=no
+        if [ ".$opt_C" = .yes ]; then
+            if [ -r $dst ]; then
+                if cmp -s $src $dst; then
+                    quick=yes
+                fi
            fi
        fi
-    fi
    
-    #   Finally install the file to the real destination
-    if [ $quick = yes ]; then
-        if [ ".$opt_t" = .yes ]; then
-            echo "rm -f $dsttmp" 1>&2
+        #   finally, install the file to the real destination
+        if [ $quick = yes ]; then
+            if [ ".$opt_t" = .yes ]; then
+                echo "rm -f $dsttmp" 1>&2
+            fi
+            rm -f $dsttmp
+        else
+            if [ ".$opt_t" = .yes ]; then
+                echo "rm -f $dst && mv $dsttmp $dst" 1>&2
+            fi
+            rm -f $dst && mv $dsttmp $dst
        fi
-        rm -f $dsttmp
-    else
-        if [ ".$opt_t" = .yes ]; then
-            echo "rm -f $dst && mv $dsttmp $dst" 1>&2
-        fi
-        rm -f $dst && mv $dsttmp $dst
-    fi
+    done
    ;;

 mkdir )
    ##
    ##  mkdir -- Make one or more directories
-    ##  Copyright (c) 1996-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1996-2001 Ralf S. Engelschall <rse@engelschall.com>
    ##  Originally written for public domain by Noah Friedman <friedman@prep.ai.mit.edu>
    ##  Cleaned up and enhanced for shtool
    ##
@@ -662,7 +727,7 @@ mkdir )
    for p in ${1+"$@"}; do
        #   if the directory already exists...
        if [ -d "$p" ]; then
-            if [ ".$opt_f" = .no ] && [ ".$opt_p" = .no ]; then
+            if [ ".$opt_f" = .no -a ".$opt_p" = .no ]; then
                echo "$msgprefix:Error: directory already exists: $p" 1>&2
                errstatus=1
                break
@@ -676,6 +741,12 @@ mkdir )
                echo "mkdir $p" 1>&2
            fi
            mkdir $p || errstatus=$?
+            if [ ".$opt_m" != . ]; then
+                if [ ".$opt_t" = .yes ]; then
+                    echo "chmod $opt_m $p" 1>&2
+                fi
+                chmod $opt_m $p || errstatus=$?
+            fi
        else
            #   the smart situation
            set fnord `echo ":$p" |\
@@ -1,34 +0,0 @@
-#! /bin/sh
-#  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
-#  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
-#  +----------------------------------------------------------------------+
-#  | This source file is subject to version 2.02 of the PHP license,      |
-#  | that is bundled with this package in the file LICENSE, and is        |
-#  | available at through the world-wide-web at                           |
-#  | http://www.php.net/license/2_02.txt.                                 |
-#  | If you did not receive a copy of the PHP license and are unable to   |
-#  | obtain it through the world-wide-web, please send a note to          |
-#  | license@php.net so we can mail you a copy immediately.               |
-#  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-#  +----------------------------------------------------------------------+
-#
-# $Id$ 
-#
-
-# cwd must be top_srcdir
-test -f build/sysv_makefile || exit 2
-
-test -f bsd_converted || exit 1
-
-tmpfile=`mktemp /tmp/sysv_makefile.XXXXXX` || tmpfile="tmp.$$"
-for i in build/*.mk; do
-    sed 's/^\.include "\(.*\)"/include \1/' $i >$tmpfile \
-        && cp $tmpfile $i
-done
-rm -f $tmpfile
-
-rm bsd_converted
-exit 0
@@ -3,37 +3,9 @@ dnl ## Process this file with autoconf to produce a configure script.

 divert(1)

-AC_INIT(README.CVS-RULES)
-
-PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile)
-
-if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then
-  AC_MSG_ERROR([--with-shared-apache is not supported. Please refer to the documentation for using APXS])
-fi
-
-if test -n "$with_apache" && test -n "$with_apxs"; then
-  AC_MSG_ERROR([--with-apache and --with-apxs cannot be used together])
-fi
-
-cwd=`pwd`
-
-PHP_CONFIG_NICE(config.nice)
-
-for arg in $0 "$@"; do
-  CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
-done
-
-php_shtool=$srcdir/build/shtool
-T_MD=`$php_shtool echo -n -e %B`
-T_ME=`$php_shtool echo -n -e %b`
-
-dnl Because ``make install'' is often performed by the superuser,
-dnl we create the libs subdirectory as the user who configures PHP.
-dnl Otherwise, the current user will not be able to delete libs
-dnl or the contents of libs.
-
-$php_shtool mkdir -p libs
-rm -f libs/*
+dnl ## Diversion 1 is the autoconf + automake setup phase. We also
+dnl ## set the PHP version, deal with platform-specific compile
+dnl ## options and check for the basic compile tools.

 dnl ## Diversion 2 is the initial checking of OS features, programs,
 dnl ## libraries and so on.
@@ -45,49 +17,79 @@ dnl ## tags are enabled, and the default behaviour of php.ini options.
 dnl ## This is also where an SAPI interface is selected (choosing between
 dnl ## Apache module, CGI etc.)

-dnl ## In diversion 4 we check which extensions should be compiled.
-dnl ## All of these are normally in the extension directories.
+dnl ## In diversion 4 we check user-configurable general settings.

+dnl ## In diversion 5 we check which extensions should be compiled.
+dnl ## All of these are normally in the extension directories.
 dnl ## Diversion 5 is the last one.  Here we generate files and clean up.

-dnl ## This is where the version number is changed from now on!
-AM_INIT_AUTOMAKE(php, 4.2.0-dev, nodefine)
+
+dnl Basic autoconf + automake initialization, generation of config.nice.
+dnl -------------------------------------------------------------------------
+
+AC_INIT(README.CVS-RULES)
+
+PHP_CONFIG_NICE(config.nice)
+for arg in $0 "$@"; do
+  CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
+done
+
+AC_CANONICAL_HOST
+AC_CONFIG_HEADER(main/php_config.h)
+
+MAJOR_VERSION=4
+MINOR_VERSION=3
+RELEASE_VERSION=0
+EXTRA_VERSION="-dev"
+VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
+
+dnl Define where extension directories are located in the configure context
+AC_DEFUN(PHP_EXT_BUILDDIR,[ext/$1])dnl
+AC_DEFUN(PHP_EXT_DIR,[ext/$1])dnl
+AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir/ext/$1])dnl
+AC_DEFUN(PHP_ALWAYS_SHARED,[])dnl
+
+dnl Setting up the PHP version based on the information above.
+dnl -------------------------------------------------------------------------

 PHP_VERSION=$VERSION
 echo "/* automatically generated by configure */" > php_version.h.new
 echo "/* edit configure.in to change version number */" >> php_version.h.new
+echo "#define PHP_MAJOR_VERSION $MAJOR_VERSION" >> php_version.h.new
+echo "#define PHP_MINOR_VERSION $MINOR_VERSION" >> php_version.h.new
+echo "#define PHP_RELEASE_VERSION $RELEASE_VERSION" >> php_version.h.new
+echo "#define PHP_EXTRA_VERSION \"$EXTRA_VERSION\"" >> php_version.h.new
 echo "#define PHP_VERSION \"$PHP_VERSION\"" >> php_version.h.new
 cmp php_version.h.new php_version.h >/dev/null 2>&1
 if test $? -ne 0 ; then
    rm -f php_version.h && mv php_version.h.new php_version.h && \
    echo 'Updated php_version.h'
 else
-	rm -f php_version.h.new
+    rm -f php_version.h.new
 fi

-AM_CONFIG_HEADER(main/php_config.h)
-AM_MAINTAINER_MODE
-AC_CANONICAL_HOST

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

-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_YACC
-if test "$YACC" != "bison -y"; then
-    AC_MSG_WARN([You will need bison if you want to regenerate the PHP parsers.])
-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))
+dnl Catch common errors here to save a few seconds of our users' time
+dnl -------------------------------------------------------------------------
+
+if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then
+  AC_MSG_ERROR([--with-shared-apache is not supported. Please refer to the documentation for using APXS])
 fi

-AC_PROG_CC
-AC_AIX
+if test -n "$with_apache" && test -n "$with_apxs"; then
+  AC_MSG_ERROR([--with-apache and --with-apxs cannot be used together])
+fi
+
+
+
+dnl Platform-specific compile settings.
+dnl -------------------------------------------------------------------------
+
+dnl if host_alias is empty, ac_cv_host_alias may still have the info
+if test -z "$host_alias"; then
+    host_alias=$ac_cv_host_alias
+fi

 BSD_MAKEFILE=no

@@ -101,7 +103,7 @@ case $host_alias in
 *dgux*)
    CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR";;
 *darwin*|*rhapsody*)
-    CPPFLAGS="$CPPFLAGS -traditional-cpp";;
+    CPPFLAGS="$CPPFLAGS -no-cpp-precomp";;
 *bsdi*)
    BSD_MAKEFILE=yes;;
 *beos*)
@@ -111,18 +113,95 @@ case $host_alias in
    CPPFLAGS="$CPPFLAGS -D_XPG_IV";;
 esac

-AM_PROG_CC_STDC

-AC_PROG_RANLIB
+
+dnl Settings we want to make before the checks.
+dnl -------------------------------------------------------------------------
+
+cwd=`pwd`
+
+PHP_INIT_BUILD_SYSTEM
+
+php_shtool=$srcdir/build/shtool
+T_MD=`$php_shtool echo -n -e %B`
+T_ME=`$php_shtool echo -n -e %b`
+
+dnl We want this one before the checks, so the checks can modify CFLAGS.
+test -z "$CFLAGS" && auto_cflags=1
+
+dnl AC_AIX needs to be before any macros that run the C compiler. 
+AC_AIX
+
+abs_srcdir=`(cd $srcdir; pwd)`
+abs_builddir=`pwd`
+
+php_abs_top_srcdir=$abs_srcdir
+php_abs_top_builddir=$abs_builddir
+
+dnl Because ``make install'' is often performed by the superuser,
+dnl we create the libs subdirectory as the user who configures PHP.
+dnl Otherwise, the current user will not be able to delete libs
+dnl or the contents of libs.
+
+$php_shtool mkdir -p libs
+rm -f libs/*
+
+dnl Checks for programs.
+dnl -------------------------------------------------------------------------
+
+AC_PROG_CC
 AC_PROG_CC_C_O
+dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf
+dnl AC_PROG_CC_STDC
+AC_PROG_CPP
+dnl AC_PROG_CXX
+dnl AC_PROG_CXXCPP
+dnl check for -R, etc. switch
+AC_MSG_CHECKING([whether compiler supports -R])
+AC_CACHE_VAL(php_cv_cc_dashr,[
+  SAVE_LIBS=$LIBS
+  LIBS="-R /usr/lib $LIBS"
+  AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
+  LIBS=$SAVE_LIBS
+])
+AC_MSG_RESULT([$php_cv_cc_dashr])
+if test $php_cv_cc_dashr = "yes"; then
+  ld_runpath_switch=-R
+else
+  AC_MSG_CHECKING([whether compiler supports -Wl,-rpath,])
+  AC_CACHE_VAL(php_cv_cc_rpath, [
+    SAVE_LIBS=$LIBS
+    LIBS="-Wl,-rpath,/usr/lib $LIBS"
+    AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
+    LIBS=$SAVE_LIBS
+  ])
+  AC_MSG_RESULT([$php_cv_cc_rpath])
+  if test $php_cv_cc_rpath = "yes"; then
+    ld_runpath_switch=-Wl,-rpath,
+  else
+    dnl something innocuous
+    ld_runpath_switch=-L
+  fi
+fi
+AC_PROG_RANLIB
 AC_PROG_LN_S
-
+AC_PROG_AWK
+AC_PROG_YACC
+if test "$YACC" != "bison -y"; then
+    AC_MSG_WARN([You will need bison if you want to regenerate the PHP parsers.])
+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_PROG_LEX
 if test -n "$LEX"; then
  AC_DECL_YYTEXT
  :
 fi
-
 dnl ## Make flex scanners use const if they can, even if __STDC__ is not
 dnl ## true, for compilers like Sun's that only set __STDC__ true in
 dnl ## "limit-to-ANSI-standard" mode, not in "ANSI-compatible" mode
@@ -131,22 +210,39 @@ if test "$ac_cv_c_const" = "yes" ; then
  LEX_CFLAGS="-DYY_USE_CONST"
 fi

-abs_srcdir=`(cd $srcdir; pwd)`
-abs_builddir=`pwd`
+
+
+dnl Include Zend and TSRM configurations.
+dnl -------------------------------------------------------------------------

 sinclude(Zend/acinclude.m4)
 sinclude(Zend/Zend.m4)
 sinclude(TSRM/tsrm.m4)

+
+
 divert(2)
-PHP_HELP_SEPARATOR([SAPI modules:])
+
+dnl ## Diversion 2 is where we set PHP-specific options and come up
+dnl ## with reasonable default values for them. We check for pthreads here
+dnl ## because the information is needed by the SAPI configuration.
+dnl ## This is also where an SAPI interface is selected (choosing between
+dnl ## Apache module, CGI etc.)
+
+dnl .
+dnl -------------------------------------------------------------------------

 PTHREADS_CHECK
-
+PHP_HELP_SEPARATOR([SAPI modules:])
 PHP_SHLIB_SUFFIX_NAME
-
-PHP_SAPI=cgi
+PHP_SAPI=default
 PHP_BUILD_PROGRAM
+
+
+
+dnl SAPI configuration.
+dnl -------------------------------------------------------------------------
+
 dnl paths to the targets are relative to the build directory
 SAPI_PROGRAM=php
 SAPI_SHARED=libs/libphp4.$SHLIB_SUFFIX_NAME
@@ -157,6 +253,10 @@ PHP_CONFIGURE_PART(Configuring SAPI modules)

 esyscmd(./scripts/config-stubs sapi)

+if test "$PHP_SAPI" = "default"; then
+  PHP_SELECT_SAPI(cgi, program, cgi_main.c getopt.c)
+fi
+
 AC_MSG_CHECKING([for chosen SAPI module])
 AC_MSG_RESULT([$PHP_SAPI])

@@ -165,55 +265,38 @@ if test "$enable_experimental_zts" = "yes"; then
  PTHREADS_FLAGS
 fi

+
 divert(3)

+dnl ## In diversion 3 we check for compile-time options to the PHP
+dnl ## core and how to deal with different system dependencies.  This
+dnl ## includes what regex library is used and whether debugging or short
+dnl ## tags are enabled, and the default behaviour of php.ini options.
+
+
+
+dnl Starting system checks.
+dnl -------------------------------------------------------------------------
+
 PHP_CONFIGURE_PART(Running system checks)

 PHP_MISSING_TIME_R_DECL
-
-dnl check for -R, etc. switch
-AC_MSG_CHECKING([whether compiler supports -R])
-AC_CACHE_VAL(php_cv_cc_dashr,[
-	SAVE_LIBS=$LIBS
-	LIBS="-R /usr/lib $LIBS"
-	AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
-	LIBS=$SAVE_LIBS])
-AC_MSG_RESULT([$php_cv_cc_dashr])
-if test $php_cv_cc_dashr = "yes"; then
-	ld_runpath_switch=-R
-else
-	AC_MSG_CHECKING([whether compiler supports -Wl,-rpath,])
-	AC_CACHE_VAL(php_cv_cc_rpath,[
-		SAVE_LIBS=$LIBS
-		LIBS="-Wl,-rpath,/usr/lib $LIBS"
-		AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
-		LIBS=$SAVE_LIBS])
-	AC_MSG_RESULT([$php_cv_cc_rpath])
-	if test $php_cv_cc_rpath = "yes"; then
-		ld_runpath_switch=-Wl,-rpath,
-	else
-		dnl something innocuous
-		ld_runpath_switch=-L
-	fi
-fi
-
 PHP_PROG_SENDMAIL
-
 dnl Check whether the system uses EBCDIC (not ASCII) as its native codeset
 PHP_EBCDIC
-
-dnl
 dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary
 dnl and source packages.  This should be harmless on other OSs.
-dnl
 if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
       CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
 fi
-
 INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
+test -d /usr/ucblib && PHP_ADD_LIBPATH(/usr/ucblib)


+dnl First, library checks.
+dnl -------------------------------------------------------------------------
+
 AC_CHECK_LIB(socket, socket, [
 PHP_ADD_LIBRARY(socket)
 AC_DEFINE(HAVE_LIBSOCKET,1,[ ]) ], [
@@ -224,10 +307,18 @@ AC_CHECK_LIB(socket, socket, [
 dnl Some systems (OpenServer 5) dislike -lsocket -lnsl, so we try
 dnl to avoid -lnsl checks, if we already have the functions which
 dnl are usually in libnsl
+dnl Also, uClibc will bark at linking with glibc's libnsl.

+unset ac_cv_func_gethostname
 unset ac_cv_func_yp_get_default_domain
-AC_CHECK_FUNC(yp_get_default_domain,
- [php_no_nsl_checks=yes],[])
+AC_CHECK_FUNC(gethostname, [
+  php_no_nsl_checks=yes
+],[
+  AC_CHECK_FUNC(yp_get_default_domain, [
+    php_no_nsl_checks=yes
+  ])
+])
+unset ac_cv_func_gethostname
 unset ac_cv_func_yp_get_default_domain

 if test "$php_no_nsl_checks" != "yes"; then
@@ -273,21 +364,28 @@ AC_CHECK_LIB(socket, res_search, [
 ]) 
 ])

+
+
+dnl Then headers.
+dnl -------------------------------------------------------------------------
+
 dnl Checks for header files.
 AC_HEADER_STDC

 dnl In QNX opendir resides in libc but dirent.h is still required
 if test "`uname -s 2>/dev/null`" != "QNX"; then
-	AC_HEADER_DIRENT
+  AC_HEADER_DIRENT
 else
-	AC_CHECK_HEADERS(dirent.h)
+  AC_CHECK_HEADERS(dirent.h)
 fi
 PHP_MISSING_FCLOSE_DECL
 dnl QNX requires unix.h to allow functions in libunix to work properly
 AC_CHECK_HEADERS(
+ApplicationServices/ApplicationServices.h \
 alloca.h \
 arpa/inet.h \
 arpa/nameser.h \
+assert.h \
 crypt.h \
 fcntl.h \
 grp.h \
@@ -295,6 +393,7 @@ ieeefp.h \
 langinfo.h \
 limits.h \
 locale.h \
+mach-o/dyld.h \
 netinet/in.h \
 pwd.h \
 resolv.h \
@@ -307,6 +406,7 @@ sysexits.h \
 sys/file.h \
 sys/mman.h \
 sys/mount.h \
+sys/poll.h \
 sys/resource.h \
 sys/select.h \
 sys/socket.h \
@@ -321,9 +421,14 @@ sys/wait.h \
 unistd.h \
 unix.h \
 utime.h \
+sys/utsname.h \
 )

+
+
 dnl Checks for typedefs, structures, and compiler characteristics.
+dnl -------------------------------------------------------------------------
+
 AC_STRUCT_TM
 AC_STRUCT_TIMEZONE

@@ -334,17 +439,15 @@ PHP_SOCKLEN_T
 AC_CHECK_SIZEOF(long, 8)
 AC_CHECK_SIZEOF(int, 4)

-test -d /usr/ucblib && PHP_ADD_LIBPATH(/usr/ucblib)
-
 dnl Check for members of the stat structure
 AC_STRUCT_ST_BLKSIZE
 dnl AC_STRUCT_ST_BLOCKS will screw QNX because fileblocks.o does not exists
 dnl The WARNING_LEVEL required because cc in QNX hates -w option without an argument
 if test "`uname -s 2>/dev/null`" != "QNX"; then
-	AC_STRUCT_ST_BLOCKS
+  AC_STRUCT_ST_BLOCKS
 else
-    AC_MSG_WARN([warnings level for cc set to 0])
-	WARNING_LEVEL=0
+  AC_MSG_WARN([warnings level for cc set to 0])
+  WARNING_LEVEL=0
 fi
 AC_STRUCT_ST_RDEV

@@ -352,17 +455,30 @@ dnl Checks for types
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T

+dnl Check for struct sockaddr_storage
+AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_sockaddr_storage,
+[AC_TRY_COMPILE([ #include <sys/types.h>
+#include <sys/socket.h>], [struct sockaddr_storage s; s],
+  ac_cv_sockaddr_storage=yes, ac_cv_sockaddr_storage=no)])
+if test "$ac_cv_sockaddr_storage" = yes; then
+  AC_DEFINE(HAVE_SOCKADDR_STORAGE,1,[Whether you have struct sockaddr_storage])
+fi
+
 dnl Check for IPv6 support
 AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support,
-[AC_TRY_COMPILE([ #include <sys/types.h>
+[AC_TRY_LINK([ #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>], [struct sockaddr_in6 s; int i=AF_INET6; s],
-  ac_cv_ipv6_support=yes, ac_cv_ipv6_support=no)])
+#include <netinet/in.h>], [struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0;],
+  [ac_cv_ipv6_support=yes], [ac_cv_ipv6_support=no])])
 if test "$ac_cv_ipv6_support" = yes; then
  AC_DEFINE(HAVE_IPV6,1,[Whether you have IPv6 support])
 fi

+
+
 dnl Checks for library functions.
+dnl -------------------------------------------------------------------------
+
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(
 asctime_r \
@@ -465,7 +581,16 @@ if test $ac_cv_type_in_addr_t = no; then
  AC_DEFINE(in_addr_t, u_int, [ ])
 fi

+
+
 divert(4)
+
+dnl ## In diversion 4 we check user-configurable general settings.
+
+dnl General settings.
+dnl -------------------------------------------------------------------------
+
+
 PHP_HELP_SEPARATOR([General settings:])

 PHP_ARG_ENABLE(debug, whether to include debugging symbols,
@@ -483,6 +608,15 @@ PHP_ARG_WITH(layout,[layout of installed files],
 [  --with-layout=TYPE      Sets how installed files will be laid out.  Type is
                          one of "PHP" (default) or "GNU"], PHP)

+case $PHP_LAYOUT in
+  GNU)
+    oldstyleextdir=no
+    ;;
+  *)
+    oldstyleextdir=yes
+    ;;
+esac
+
 PHP_ARG_WITH(config-file-path,[path to configuration file],
 [  --with-config-file-path=PATH  
                          Sets the path in which to look for php.ini,
@@ -492,28 +626,28 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then
  case $PHP_LAYOUT in
    GNU)
      PHP_CONFIG_FILE_PATH=$sysconfdir
-      oldstyleextdir=no;;
+      ;;
    *)
      PHP_CONFIG_FILE_PATH=$libdir
-      oldstyleextdir=yes;;
+      ;;
  esac
 fi

 # compatibility
-if test "x$with_pear" = "x" -a "x$enable_pear" = "xno"; then
-    with_pear=no
+if test -z "$with_pear" && test "$enable_pear" = "no"; then
+  with_pear=no
 fi

 PHP_ARG_WITH(pear, [whether to install PEAR, and where],
 [  --with-pear=DIR         Install PEAR in DIR (default PREFIX/lib/php)
  --without-pear          Do not install PEAR], DEFAULT)

-if test "$PHP_PEAR" != "no"; then
-  PEAR_DIR=pear
+if test "$PHP_PEAR" != "no" && test "$disable_cli" != "1"; then
+  install_pear="install-pear install-build install-headers install-programs"
  PEAR_INSTALLDIR=$PHP_PEAR
 fi

-if test "$PHP_PEAR" = "DEFAULT" -o "x$PHP_PEAR" = "xyes"; then
+if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
  case $PHP_LAYOUT in
    GNU) PEAR_INSTALLDIR=$datadir/pear;;
    *)   PEAR_INSTALLDIR=$libdir/php;;
@@ -537,29 +671,27 @@ AC_ARG_WITH(exec-dir,
                          defaults to /usr/local/php/bin],
 [
  if test "$withval" != "no"; then
-  	if test "$withval" = "yes"; then
-		AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
-    	AC_MSG_RESULT([/usr/local/php/bin])
-   	else
-		AC_DEFINE_UNQUOTED(PHP_SAFE_MODE_EXEC_DIR,"$withval", [ ])
-    	AC_MSG_RESULT([$withval])
-   	fi
+    if test "$withval" = "yes"; then
+      AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
+      AC_MSG_RESULT([/usr/local/php/bin])
+    else
+      AC_DEFINE_UNQUOTED(PHP_SAFE_MODE_EXEC_DIR,"$withval", [ ])
+      AC_MSG_RESULT([$withval])
+    fi
  else
-	AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
-   	AC_MSG_RESULT([/usr/local/php/bin])
+    AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
+    AC_MSG_RESULT([/usr/local/php/bin])
  fi
 ],[
-	AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
-   	AC_MSG_RESULT([/usr/local/php/bin])
+  AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
+  AC_MSG_RESULT([/usr/local/php/bin])
 ])

 PHP_ARG_WITH(openssl,for OpenSSL support,
 [  --with-openssl[=DIR]    Include OpenSSL support (requires OpenSSL >= 0.9.5) ])
-if test "$PHP_OPENSSL" = "yes"; then
-  PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
-fi

 if test "$PHP_OPENSSL" != "no"; then
+  ext_openssl_shared=$ext_shared
  PHP_SETUP_OPENSSL
 fi

@@ -621,22 +753,24 @@ if test "$PHP_DMALLOC" = "yes"; then
  ])
 fi

-# temporary until streams are better integrated
-PHP_ARG_ENABLE(php-streams,whether to enable php streams,
-[  --enable-php-streams    Include experimental php streams.
-                          Do not use unless you are testing the code!])
-
-if test "$PHP_PHP_STREAMS" = "yes"; then
-  AC_DEFINE(HAVE_PHP_STREAM, 1, [Whether to use php streams])
-fi
-
 AC_CHECK_LIB(crypt, crypt, [
  PHP_ADD_LIBRARY(crypt)
  PHP_ADD_LIBRARY(crypt, 1)
  AC_DEFINE(HAVE_CRYPT,1,[ ]) 
 ])

+
+
 divert(5)
+
+dnl ## In diversion 5 we check which extensions should be compiled.
+dnl ## All of these are normally in the extension directories.
+
+
+
+dnl Extension configuration.
+dnl -------------------------------------------------------------------------
+
 PHP_HELP_SEPARATOR([Extensions:

  --with-EXTENSION=[shared[,PATH]]
@@ -654,8 +788,9 @@ PHP_CONFIGURE_PART(Configuring extensions)
 # reading config stubs
 esyscmd(./scripts/config-stubs ext)

-PHP_FAST_OUTPUT(sapi/$PHP_SAPI/Makefile)

+dnl Other settings.
+dnl -------------------------------------------------------------------------

 PHP_HELP_SEPARATOR([Other settings:])

@@ -683,30 +818,25 @@ unset with_pic
 case $php_build_target in
 program|static)
    standard_libtool_flag='-prefer-non-pic -static'
-    if test "$lib_build_shared" != "yes"; then
+    if test -z "$PHP_MODULES"; then
        enable_shared=no
    fi
-    PHP_COMPILE='$(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -c $< && touch $@'
-    CXX_PHP_COMPILE='$(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c $< && touch $@'
 ;;
 shared)
    enable_static=no
    standard_libtool_flag=-prefer-pic
-    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version"
+    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
 ;;
 esac

-if test "$PHP_SAPI" = "cgi"; then
-  PHP_PROGRAM=php
-fi
-
-if test "$PHP_SAPI" = "fastcgi"; then
-  PHP_PROGRAM=php
-fi
-
-
 PHP_REGEX

+EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
+unset LIBS LDFLAGS
+
+dnl Configuring Zend and TSRM.
+dnl -------------------------------------------------------------------------
+
 PHP_CONFIGURE_PART(Configuring Zend)
 LIBZEND_BASIC_CHECKS
 LIBZEND_OTHER_CHECKS
@@ -727,7 +857,7 @@ if test "$abs_srcdir" != "$abs_builddir"; then
  INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM"
 fi

-EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
+ZEND_EXTRA_LIBS="$LIBS"
 unset LIBS LDFLAGS

 PHP_CONFIGURE_PART(Configuring TSRM)
@@ -783,16 +913,16 @@ if test -z "$EXTENSION_DIR"; then
      part2=non-zts
    fi
    extbasedir=$part1-$part2-$extbasedir
-  	EXTENSION_DIR=$libdir/extensions/$extbasedir
+    EXTENSION_DIR=$libdir/extensions/$extbasedir
  else
-  	if test "$enable_experimental_zts" = "yes"; then
-  	  extbasedir=$extbasedir-zts
-  	fi
-  	
-  	if test "$PHP_DEBUG" = "1"; then
-  	  extbasedir=$extbasedir-debug
-  	fi
-  	EXTENSION_DIR=$libdir/$extbasedir
+    if test "$enable_experimental_zts" = "yes"; then
+      extbasedir=$extbasedir-zts
+    fi
+    
+    if test "$PHP_DEBUG" = "1"; then
+      extbasedir=$extbasedir-debug
+    fi
+    EXTENSION_DIR=$libdir/$extbasedir
  fi
 fi

@@ -835,15 +965,26 @@ AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
 PHP_OS=`uname`
 AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])

+if test "$disable_cli" != "1"; then
+  PHP_CLI_TARGET=sapi/cli/php
+  PHP_INSTALL_CLI_TARGET="install-cli"
+  PHP_ADD_SOURCES(sapi/cli, php_cli.c getopt.c,, cli)
+fi
+
+PHP_SUBST(PHP_CLI_TARGET)
+PHP_SUBST(PHP_SAPI_OBJS)
+PHP_SUBST(PHP_CLI_OBJS)
+PHP_SUBST(PHP_GLOBAL_OBJS)
+
+PHP_SUBST(PHP_MODULES)

-PHP_SUBST(EXT_SUBDIRS)
-PHP_SUBST(EXT_STATIC)
-PHP_SUBST(EXT_SHARED)
 PHP_SUBST(EXT_LIBS)
-PHP_SUBST(EXT_LTLIBS)

 PHP_SUBST_OLD(abs_builddir)
 PHP_SUBST_OLD(abs_srcdir)
+PHP_SUBST_OLD(php_abs_top_builddir)
+PHP_SUBST_OLD(php_abs_top_srcdir)
+
 PHP_SUBST(bindir)
 PHP_SUBST(exec_prefix)
 PHP_SUBST(includedir)
@@ -871,7 +1012,9 @@ PHP_SUBST(DEFS)
 PHP_SUBST_OLD(EXTENSION_DIR)
 PHP_SUBST(EXTRA_LDFLAGS)
 PHP_SUBST_OLD(EXTRA_LIBS)
-PHP_SUBST(INCLUDES)
+PHP_SUBST_OLD(ZEND_EXTRA_LIBS)
+PHP_SUBST_OLD(INCLUDES)
+PHP_SUBST_OLD(EXTRA_INCLUDES)
 PHP_SUBST_OLD(INCLUDE_PATH)
 PHP_SUBST_OLD(INSTALL_IT)
 PHP_SUBST(LEX)
@@ -880,16 +1023,15 @@ PHP_SUBST(LFLAGS)
 PHP_SUBST(LIBTOOL)
 PHP_SUBST(LN_S)
 PHP_SUBST_OLD(NATIVE_RPATHS)
-PHP_SUBST(PEAR_DIR)
 PHP_SUBST_OLD(PEAR_INSTALLDIR)
 PHP_SUBST(PHP_BUILD_DATE)
 PHP_SUBST(PHP_COMPILE)
 PHP_SUBST_OLD(PHP_LDFLAGS)
 PHP_SUBST_OLD(PHP_LIBS)
-PHP_SUBST(PHP_PROGRAM)
+PHP_SUBST(OVERALL_TARGET)
 PHP_SUBST(PHP_RPATHS)
 PHP_SUBST(PHP_SAPI)
-PHP_SUBST(PHP_VERSION)
+PHP_SUBST_OLD(PHP_VERSION)
 PHP_SUBST(PROG_SENDMAIL)
 PHP_SUBST(SHELL)
 PHP_SUBST(SHARED_LIBTOOL)
@@ -897,6 +1039,7 @@ PHP_SUBST(TSRM_DIR)
 PHP_SUBST(TSRM_LIB)
 PHP_SUBST(WARNING_LEVEL)
 PHP_SUBST_OLD(YACC)
+PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)

 old_CC=$CC

@@ -917,9 +1060,9 @@ if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
  CPPFLAGS="$CPPFLAGS -DTHREAD=1"
 fi

-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 if test "$enable_debug" != "yes"; then
-  AM_SET_LIBTOOL_VARIABLE([--silent])
+  PHP_SET_LIBTOOL_VARIABLE([--silent])
 fi


@@ -933,32 +1076,80 @@ PHP_CONFIGURE_PART(Generating files)

 CXXFLAGS_CLEAN=$CXXFLAGS
 CFLAGS_CLEAN=$CFLAGS
-CFLAGS="$CFLAGS $standard_libtool_flag"
+CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
 INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"

-PHP_GEN_CONFIG_VARS
+all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
+install_targets="install-sapi install-modules $PHP_INSTALL_CLI_TARGET $install_pear"
+PHP_SUBST(all_targets)
+PHP_SUBST(install_targets)
+
+PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
+
+PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \
+       safe_mode.c fopen_wrappers.c alloca.c \
+       php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
+       strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
+       streams.c network.c php_open_temporary_file.c php_logos.c \
+       output.c memory_streams.c user_streams.c)
+PHP_ADD_SOURCES(/main, internal_functions.c,, sapi)
+PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli)
+
+PHP_ADD_SOURCES(/Zend,  zend_language_parser.c zend_language_scanner.c \
+    zend_ini_parser.c zend_ini_scanner.c)
+
+PHP_ADD_SOURCES(Zend, \
+    zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.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_multibyte.c)
+
+if test -r "$abs_srcdir/Zend/zend_objects.c"; then
+  PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c)
+fi
+
+dnl Selectively disable optimization due to high RAM usage during
+dnl compiling the executor.
+if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
+  flag=-O0
+else
+  flag=
+fi
+
+PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag)
+
+PHP_ADD_BUILD_DIR(main)
+PHP_ADD_BUILD_DIR(regex)
+PHP_ADD_BUILD_DIR(sapi/$PHP_SAPI sapi/cli)
+PHP_ADD_BUILD_DIR(TSRM)
+PHP_ADD_BUILD_DIR(Zend)
+
+
+PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
+PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend)
+
+PHP_GEN_BUILD_DIRS
+PHP_GEN_GLOBAL_MAKEFILE

 $php_shtool mkdir -p pear/scripts
-ALL_OUTPUT_FILES="php4.spec Zend/Makefile main/build-defs.h \
-pear/scripts/pear pear/scripts/phpize pear/scripts/php-config \
-pear/scripts/pearize pear/scripts/phptar TSRM/Makefile $PHP_OUTPUT_FILES"
+ALL_OUTPUT_FILES="php4.spec main/build-defs.h \
+pear/scripts/phpize pear/scripts/php-config \
+$PHP_OUTPUT_FILES"

 AC_OUTPUT($ALL_OUTPUT_FILES, [], [

-if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then
+if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test "\$CONFIG_FILES" = " $ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then
  REDO_ALL=yes
 fi

-if test -n "\$REDO_ALL"; then
-  PHP_GEN_MAKEFILES($PHP_FAST_OUTPUT_FILES)
-fi
-		   
 if test ! -f $srcdir/ext/bcmath/number.c; then
-	echo "creating number.c"
-	echo "/* Dummy File */" > $srcdir/ext/bcmath/number.c
-	echo "creating number.h"
-	echo "/* Dummy File */" > $srcdir/ext/bcmath/number.h
+  echo "creating number.c"
+  echo "/* Dummy File */" > $srcdir/ext/bcmath/number.c
+  echo "creating number.h"
+  echo "/* Dummy File */" > $srcdir/ext/bcmath/number.h
 fi

 ################################################################
@@ -985,6 +1176,11 @@ if test -n "\$REDO_ALL"; then
  extensions="$EXT_STATIC"
 dnl mv -f main/internal_functions.c main/internal_functions.c.old 2>/dev/null
  sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$extensions > main/internal_functions.c
+
+  echo "creating main/internal_functions_cli.c"
+  cli_extensions="$EXT_CLI_STATIC"
+  sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$cli_extensions > main/internal_functions_cli.c
+
 dnl  if cmp main/internal_functions.c.old main/internal_functions.c > /dev/null 2>&1; then
 dnl      echo "main/internal_functions.c is unchanged"
 dnl      mv main/internal_functions.c.old main/internal_functions.c
@@ -992,11 +1188,20 @@ dnl  else
 dnl      rm -f main/internal_functions.c.old
 dnl  fi

+  if test $UNAME = "FreeBSD" && test $PHP_SAPI = "apache2filter" && test $TSRM_PTH != "pth-config" ; then
+    echo "+--------------------------------------------------------------------+"
+    echo "|                        *** WARNING ***                             |"
+    echo "|                                                                    |"
+    echo "| In order to build PHP as a Apache2 module on FreeBSD, you have to  |"
+    echo "| add  --with-tsrm-pth to your ./configure line. Therefore you need  |"
+    echo "| to install gnu-pth from /usr/ports/devel/pth.                      |"
+  fi
+
  if test -n "$PHP_APXS_BROKEN"; then
    echo "+--------------------------------------------------------------------+"
    echo "| WARNING: Your $APXS script is most likely broken."
    echo "|                                                                    |"
-    echo "| Please go read http://www.php.net/manual/en/faq.build.php#AEN61338 |"
+    echo "| Please go read http://www.php.net/faq.build#faq.build.apxs         |"
    echo "| and make the changes described there and try again.                |"
  fi

@@ -1034,7 +1239,7 @@ cat <<X
 X
  fi

-  if test "$MYSQL_MODULE_TYPE" = "builtin" ; then
+  if test "$MYSQL_MODULE_TYPE" = "builtin" && test "$PHP_SAPI" != "cgi" && test "$PHP_SAPI" != "cli"; then
 cat <<X
 +--------------------------------------------------------------------+
 |                        *** WARNING ***                             |
@@ -1083,6 +1288,17 @@ cat<<X
 | If you do not agree with the terms of this license, you must abort |
 | the installation process at this point.                            |
 +--------------------------------------------------------------------+
+|                          *** NOTE ***                              |
+|            The default for register_globals is now OFF!            |
+|                                                                    |
+| If your application relies on register_globals being ON, you       |
+| should explicitly set it to on in your php.ini file.               |
+| Note that you are strongly encouraged to read                      |
+| http://www.php.net/manual/en/security.registerglobals.php          |
+| about the implications of having register_globals set to on, and   |
+| avoid using it if possible.                                        |
+--------------------------------------------------------------------+
+

 Thank you for using PHP.

@@ -1,88 +0,0 @@
-#  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
-#  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
-#  +----------------------------------------------------------------------+
-#  | This source file is subject to version 2.02 of the PHP license,      |
-#  | that is bundled with this package in the file LICENSE, and is        |
-#  | available at through the world-wide-web at                           |
-#  | http://www.php.net/license/2_02.txt.                                 |
-#  | If you did not receive a copy of the PHP license and are unable to   |
-#  | obtain it through the world-wide-web, please send a note to          |
-#  | license@php.net so we can mail you a copy immediately.               |
-#  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
-#  +----------------------------------------------------------------------+
-#
-# $Id$ 
-#
-
-
-
-AC_DEFUN(LIB_SHARED_CONVENIENCE,[
-  lib_target="\$(LTLIBRARY_NAME)"
-  cat >>$1<<EOF
-\$(LTLIBRARY_NAME): \$(LTLIBRARY_SHARED_OBJECTS) \$(LTLIBRARY_DEPENDENCIES)
-	\$(SHARED_LIBTOOL) --mode=link \$(COMPILE) \$(LDFLAGS) -o \[$]@ \$(LTLIBRARY_LDFLAGS) \$(LTLIBRARY_OBJECTS) \$(LTLIBRARY_SHARED_LIBADD)
-
-EOF
-])
-
-AC_DEFUN(LIB_SHARED_MODULE,[
-  lib_target="\$(LTLIBRARY_SHARED_NAME)"
-  cat >>$1<<EOF
-\$(LTLIBRARY_SHARED_NAME): \$(LTLIBRARY_SHARED_OBJECTS) \$(LTLIBRARY_DEPENDENCIES)
-	\$(SHARED_LIBTOOL) --mode=link \$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) -o \[$]@ -avoid-version -module -rpath \$(phplibdir) \$(LTLIBRARY_LDFLAGS) \$(LTLIBRARY_OBJECTS) \$(LTLIBRARY_SHARED_LIBADD)
-	\$(SHARED_LIBTOOL) --mode=install cp \[$]@ \$(phplibdir)
-
-EOF
-])
-
-AC_DEFUN(LIB_STATIC_CONVENIENCE,[
-  lib_target="\$(LTLIBRARY_NAME)"
-  cat >>$1<<EOF
-\$(LTLIBRARY_NAME): \$(LTLIBRARY_OBJECTS) \$(LTLIBRARY_DEPENDENCIES)
-	\$(LINK) \$(LTLIBRARY_LDFLAGS) \$(LTLIBRARY_OBJECTS) \$(LTLIBRARY_LIBADD)
-
-EOF
-])
-
-dnl LIB_BUILD(path, shared, convenience)
-dnl sets up path to build a shared/static convenience/module
-AC_DEFUN(LIB_BUILD,[
-  lib_makefile="$1/libs.mk"
-  lib_target=""
-  
-  $php_shtool mkdir -p $1
-  if test "$BSD_MAKEFILE" = "yes"; then
-    lib_include_conf=".include \"\$(top_builddir)/config_vars.mk\""
-  else
-    lib_include_conf="include \$(top_builddir)/config_vars.mk"
-  fi
-  cat >$lib_makefile<<EOF
-$lib_include_conf
-LTLIBRARY_OBJECTS = \$(LTLIBRARY_SOURCES:.c=.lo) \$(LTLIBRARY_OBJECTS_X)
-LTLIBRARY_SHARED_OBJECTS = \$(LTLIBRARY_OBJECTS:.lo=.slo)
-EOF
-
-  if test "$2" = "shared" || test "$2" = "yes"; then
-    lib_build_shared=yes
-    if test -n "$3"; then
-dnl ---------------------------------------- Shared Convenience
-      LIB_SHARED_CONVENIENCE($lib_makefile)
-    else
-dnl ---------------------------------------- Shared Module
-      LIB_SHARED_MODULE($lib_makefile)
-    fi
-  else
-dnl ---------------------------------------- Static Convenience = Static Module
-    LIB_STATIC_CONVENIENCE($lib_makefile)
-  fi
-
-dnl ---------------------------------------- Generate build targets
-  if test -n "$lib_target"; then
-    cat >>$lib_makefile<<EOF
-targets = $lib_target
-EOF
-  fi
-])
@@ -1,4 +0,0 @@
-
-SUBDIRS = $(EXT_SUBDIRS)
-
-include $(top_srcdir)/build/rules.mk
@@ -1,5 +0,0 @@
-
-LTLIBRARY_NAME    = libaspell.la
-LTLIBRARY_SOURCES = aspell.c
-
-include $(top_srcdir)/build/dynlib.mk
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors:                                                             |
+   | Author: Rasmus Lerdorf <rasmus@php.net>                              |
   +----------------------------------------------------------------------+
 */

@@ -21,7 +21,7 @@ AC_ARG_WITH(aspell,
    fi
    AC_DEFINE(HAVE_ASPELL,1,[Whether you have aspell])
    AC_MSG_RESULT(yes)
-    PHP_EXTENSION(aspell)
+    PHP_NEW_EXTENSION(aspell, aspell.c)
  else
    AC_MSG_RESULT(no)
  fi
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
+   | Author: Rasmus Lerdorf <rasmus@php.net>                              |
   +----------------------------------------------------------------------+
 */

@@ -1,11 +0,0 @@
-
-LTLIBRARY_NAME    = libbcmath.la
-LTLIBRARY_SOURCES = bcmath.c number.c
-LTLIBRARY_SHARED_NAME = bcmath.la
-LTLIBRARY_DEPENDENCIES  = libbcmath/libbcmath.la
-LTLIBRARY_LIBADD        = $(LTLIBRARY_DEPENDENCIES)
-LTLIBRARY_SHARED_LIBADD = $(LTLIBRARY_LIBADD)
-
-SUBDIRS = libbcmath
-
-include $(top_srcdir)/build/dynlib.mk
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
+   | Author: Andi Gutmans <andi@zend.com>                                 |
   +----------------------------------------------------------------------+
 */

@@ -7,8 +7,11 @@ PHP_ARG_ENABLE(bcmath, whether to enable bc style precision math functions,

 if test "$PHP_BCMATH" != "no"; then
  AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath])
-  PHP_EXTENSION(bcmath, $ext_shared)
-  PHP_FAST_OUTPUT($ext_builddir/libbcmath/Makefile $ext_builddir/libbcmath/src/Makefile)
-  LIB_BUILD($ext_builddir/libbcmath,$ext_shared,yes)
-  LIB_BUILD($ext_builddir/libbcmath/src,$ext_shared,yes)
+  PHP_NEW_EXTENSION(bcmath, bcmath.c number.c \
+libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
+libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
+libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
+libbcmath/src/rmzero.c libbcmath/src/str2num.c,
+          $ext_shared,,-I@ext_srcdir@/libbcmath/src)
+  PHP_ADD_BUILD_DIR($ext_builddir/libbcmath/src)
 fi
@@ -1,9 +0,0 @@
-
-LTLIBRARY_NAME          = libbcmath.la
-LTLIBRARY_DEPENDENCIES  = src/libbcmath.la
-LTLIBRARY_LIBADD        = $(LTLIBRARY_DEPENDENCIES)
-LTLIBRARY_SHARED_LIBADD = $(LTLIBRARY_LIBADD)
-
-SUBDIRS = src
-
-include $(top_srcdir)/build/dynlib.mk
@@ -1,3 +0,0 @@
-# Documentation makefile
-
-MAINTAINERCLEANFILES= Makefile.in
@@ -1,171 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Documentation makefile
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-CC = @CC@
-MAKEINFO = @MAKEINFO@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-
-MAINTAINERCLEANFILES = Makefile.in
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps doc/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = doc
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-generic clean-am
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
@@ -1 +0,0 @@
-./" bcmath library documentation
@@ -1,7 +0,0 @@
-LTLIBRARY_NAME          = libbcmath.la
-LTLIBRARY_SOURCES       =		add.c div.c init.c neg.c outofmem.c raisemod.c rt.c sub.c \
-								compare.c divmod.c int2num.c num2long.c output.c recmul.c \
-								sqrt.c zero.c debug.c doaddsub.c nearzero.c num2str.c raise.c \
-								rmzero.c str2num.c 
-
-include $(top_srcdir)/build/dynlib.mk
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
+   | Author: Andi Gutmans <andi@zend.com>                                 |
   +----------------------------------------------------------------------+
 */

@@ -1,6 +0,0 @@
-# $Source$
-# $Id$
-
-define_option enable-bcmath 'Enable bc style precision math functions' yesno \
-    yes \
-'    Enables bc style arbitrary precision math functions.'
@@ -1,6 +0,0 @@
-
-LTLIBRARY_NAME    = libcalendar.la
-LTLIBRARY_SOURCES = calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c
-LTLIBRARY_SHARED_NAME = calendar.la
-
-include $(top_srcdir)/build/dynlib.mk
@@ -127,7 +127,11 @@ PHP_MINIT_FUNCTION(calendar)
 	REGISTER_LONG_CONSTANT("CAL_MONTH_JULIAN_LONG",		CAL_MONTH_JULIAN_LONG, CONST_CS|CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CAL_MONTH_JEWISH",			CAL_MONTH_JEWISH, CONST_CS|CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CAL_MONTH_FRENCH",			CAL_MONTH_FRENCH, CONST_CS|CONST_PERSISTENT);
-
+	/* constants for easter calculation */
+	REGISTER_LONG_CONSTANT("CAL_EASTER_DEFAULT",			CAL_EASTER_DEFAULT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CAL_EASTER_ROMAN",				CAL_EASTER_ROMAN, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CAL_EASTER_ALWAYS_GREGORIAN",	CAL_EASTER_ALWAYS_GREGORIAN, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CAL_EASTER_ALWAYS_JULIAN",		CAL_EASTER_ALWAYS_JULIAN, CONST_CS | CONST_PERSISTENT);
 	return SUCCESS;
 }

@@ -7,5 +7,5 @@ PHP_ARG_ENABLE(calendar,whether to enable calendar conversion support,

 if test "$PHP_CALENDAR" = "yes"; then
  AC_DEFINE(HAVE_CALENDAR,1,[ ])
-  PHP_EXTENSION(calendar, $ext_shared)
+  PHP_NEW_EXTENSION(calendar, calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c, $ext_shared)
 fi
@@ -29,36 +29,35 @@ static void _cal_easter(INTERNAL_FUNCTION_PARAMETERS, int gm)

 	/* based on code by Simon Kershaw, <webmaster@ely.anglican.org> */

-	pval *year_arg;
-	struct tm *ta, te;
-	time_t the_time;
+	struct tm te;
 	long year, golden, solar, lunar, pfm, dom, tmp, easter;
+	long method = CAL_EASTER_DEFAULT;

-	switch(ZEND_NUM_ARGS()) {
-	case 0:
-		the_time = time(NULL);
-		ta = localtime(&the_time);
-		year = ta->tm_year + 1900;
-		break;
-	case 1:
-		if (getParameters(ht, 1, &year_arg) == FAILURE) {
-			WRONG_PARAM_COUNT;
-		}
-		convert_to_long(year_arg);
-		year = Z_LVAL_P(year_arg);
-		break;
-	default:
-		WRONG_PARAM_COUNT;
+	/* Default to the current year if year parameter is not given */
+	{
+		time_t a;
+		struct tm b;
+		time(&a);
+		php_localtime_r(&a, &b);
+		year = 1900 + b.tm_year;
+	}
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+		"|ll", &year, &method) == FAILURE) {
+			return;
 	}
 
 	if (gm && (year<1970 || year>2037)) {				/* out of range for timestamps */
-		php3_error(E_WARNING, "easter_date() is only valid for years between 1970 and 2037 inclusive");
+		php_error(E_WARNING, "easter_date() is only valid for years between 1970 and 2037 inclusive");
 		RETURN_FALSE;
 	}

 	golden = (year % 19) + 1;					/* the Golden number */

-	if ( year <= 1752 ) {						/* JULIAN CALENDAR */
+	if ((year <= 1582 && method != CAL_EASTER_ALWAYS_GREGORIAN) ||
+	    (year >= 1583 && year <= 1752 && method != CAL_EASTER_ROMAN && method != CAL_EASTER_ALWAYS_GREGORIAN) ||
+	     method == CAL_EASTER_ALWAYS_JULIAN) {		/* JULIAN CALENDAR */
+	     
 		dom = (year + (year/4) + 5) % 7;			/* the "Dominical number" - finding a Sunday */
 		if (dom < 0) {
 			dom += 7;
@@ -126,7 +125,7 @@ PHP_FUNCTION(easter_date)
 }
 /* }}} */

-/* {{{ proto int easter_days([int year])
+/* {{{ proto int easter_days([int year, [int method]])
   Return the number of days after March 21 that Easter falls on for a given year (defaults to current year) */
 PHP_FUNCTION(easter_days)
 {
@@ -86,7 +86,7 @@

 #include "sdncal.h"

-#define SDN_OFFSET         2375474
+#define FRENCH_SDN_OFFSET         2375474
 #define DAYS_PER_4_YEARS   1461
 #define DAYS_PER_MONTH     30
 #define FIRST_VALID        2375840
@@ -107,7 +107,7 @@ void SdnToFrench(
 		*pDay = 0;
 		return;
 	}
-	temp = (sdn - SDN_OFFSET) * 4 - 1;
+	temp = (sdn - FRENCH_SDN_OFFSET) * 4 - 1;
 	*pYear = temp / DAYS_PER_4_YEARS;
 	dayOfYear = (temp % DAYS_PER_4_YEARS) / 4;
 	*pMonth = dayOfYear / DAYS_PER_MONTH + 1;
@@ -128,7 +128,7 @@ long int FrenchToSdn(
 	return ((year * DAYS_PER_4_YEARS) / 4
 			+ (month - 1) * DAYS_PER_MONTH
 			+ day
-			+ SDN_OFFSET);
+			+ FRENCH_SDN_OFFSET);
 }

 char *FrenchMonthName[14] =
@@ -128,7 +128,7 @@

 #include "sdncal.h"

-#define SDN_OFFSET         32045
+#define GREGOR_SDN_OFFSET         32045
 #define DAYS_PER_5_MONTHS  153
 #define DAYS_PER_4_YEARS   1461
 #define DAYS_PER_400_YEARS 146097
@@ -152,7 +152,7 @@ void SdnToGregorian(
 		*pDay = 0;
 		return;
 	}
-	temp = (sdn + SDN_OFFSET) * 4 - 1;
+	temp = (sdn + GREGOR_SDN_OFFSET) * 4 - 1;

 	/* Calculate the century (year/100). */
 	century = temp / DAYS_PER_400_YEARS;
@@ -227,7 +227,7 @@ long int GregorianToSdn(
 			+ ((year % 100) * DAYS_PER_4_YEARS) / 4
 			+ (month * DAYS_PER_5_MONTHS + 2) / 5
 			+ inputDay
-			- SDN_OFFSET);
+			- GREGOR_SDN_OFFSET);
 }

 char *MonthNameShort[13] =
@@ -267,7 +267,7 @@
 #define HALAKIM_PER_LUNAR_CYCLE ((29 * HALAKIM_PER_DAY) + 13753)
 #define HALAKIM_PER_METONIC_CYCLE (HALAKIM_PER_LUNAR_CYCLE * (12 * 19 + 7))

-#define SDN_OFFSET 347997
+#define JEWISH_SDN_OFFSET 347997
 #define NEW_MOON_OF_CREATION 31524

 #define SUNDAY    0
@@ -497,13 +497,13 @@ void SdnToJewish(
 	int tishri1After;
 	int yearLength;

-	if (sdn <= SDN_OFFSET) {
+	if (sdn <= JEWISH_SDN_OFFSET) {
 		*pYear = 0;
 		*pMonth = 0;
 		*pDay = 0;
 		return;
 	}
-	inputDay = sdn - SDN_OFFSET;
+	inputDay = sdn - JEWISH_SDN_OFFSET;

 	FindTishriMolad(inputDay, &metonicCycle, &metonicYear, &day, &halakim);
 	tishri1 = Tishri1(metonicYear, day, halakim);
@@ -728,7 +728,7 @@ long int JewishToSdn(
 					return (0);
 			}
 	}
-	return (sdn + SDN_OFFSET);
+	return (sdn + JEWISH_SDN_OFFSET);
 }

 /*
@@ -147,7 +147,7 @@

 #include "sdncal.h"

-#define SDN_OFFSET         32083
+#define JULIAN_SDN_OFFSET         32083
 #define DAYS_PER_5_MONTHS  153
 #define DAYS_PER_4_YEARS   1461

@@ -169,7 +169,7 @@ void SdnToJulian(
 		*pDay = 0;
 		return;
 	}
-	temp = (sdn + SDN_OFFSET) * 4 - 1;
+	temp = (sdn + JULIAN_SDN_OFFSET) * 4 - 1;

 	/* Calculate the year and day of year (1 <= dayOfYear <= 366). */
 	year = temp / DAYS_PER_4_YEARS;
@@ -236,7 +236,7 @@ long int JulianToSdn(
 	return ((year * DAYS_PER_4_YEARS) / 4
 			+ (month * DAYS_PER_5_MONTHS + 2) / 5
 			+ inputDay
-			- SDN_OFFSET);
+			- JULIAN_SDN_OFFSET);
 }

 /*
@@ -32,4 +32,19 @@ PHP_FUNCTION(cal_info);

 #define phpext_calendar_ptr calendar_module_ptr

+/*
+ * Specifying the easter calculation method
+ * 
+ * DEFAULT is Anglican, ie. use Julian calendar before 1753
+ * and Gregorian after that. With ROMAN, the cutoff year is 1582.
+ * ALWAYS_GREGORIAN and ALWAYS_JULIAN force the calendar
+ * regardless of date.
+ *
+ */
+ 
+#define CAL_EASTER_DEFAULT			0
+#define CAL_EASTER_ROMAN			1
+#define CAL_EASTER_ALWAYS_GREGORIAN	2
+#define CAL_EASTER_ALWAYS_JULIAN	3
+
 #endif
@@ -1,8 +0,0 @@
-# $Id$
-
-LTLIBRARY_NAME    = libccvs.la
-LTLIBRARY_SOURCES = ccvs.c
-LTLIBRARY_SHARED_NAME = ccvs.la
-LTLIBRARY_SHARED_LIBADD = $(CCVS_SHARED_LIBADD)
-
-include $(top_srcdir)/build/dynlib.mk
@@ -12,8 +12,8 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Brendan W. McAdams <bmcadams@php.net>             |
-   |              Doug DeJulio <ddj@redhat.com>                           |
+   | Authors: Brendan W. McAdams <bmcadams@php.net>                       |
+   |          Doug DeJulio <ddj@redhat.com>                               |
   +----------------------------------------------------------------------+
 */
 /*
@@ -113,7 +113,7 @@ ZEND_GET_MODULE(ccvs)
 /* Full Functions (The actual CCVS functions and any internal php hooked functions such as MINFO) */

 /* {{{ proto string ccvs_init(string name)
- ??? */
+   Initialize CCVS for use */
 PHP_FUNCTION(ccvs_init) /* cv_init() */
 {
  zval **name;
@@ -161,7 +161,7 @@ PHP_FUNCTION(ccvs_init) /* cv_init() */
 /* }}} */

 /* {{{ proto string ccvs_done(string sess)
- ??? */
+   Terminate CCVS engine and do cleanup work */
 PHP_FUNCTION(ccvs_done) /* cv_done() */
 {
  zval **sess;
@@ -183,7 +183,7 @@ PHP_FUNCTION(ccvs_done) /* cv_done() */
 /* }}} */

 /* {{{ proto string ccvs_new(string session, string invoice)
- ??? */
+   Create a new, blank transaction */
 PHP_FUNCTION(ccvs_new) /* cv_new() */
 {
  zval **psess;
@@ -215,7 +215,7 @@ PHP_FUNCTION(ccvs_new) /* cv_new() */
 /* }}} */

 /* {{{ proto string ccvs_add(string session, string invoice, string argtype, string argval)
- ??? */
+   Add data to a transaction */
 PHP_FUNCTION(ccvs_add) /* cv_add() */
 {
  zval **psess;
@@ -260,7 +260,7 @@ PHP_FUNCTION(ccvs_add) /* cv_add() */
 */

 /* {{{ proto string ccvs_delete(string session, string invoice)
- ??? */
+   Delete a transaction */
 PHP_FUNCTION(ccvs_delete) /* cv_delete() */
 {
  zval **psess;
@@ -286,7 +286,7 @@ PHP_FUNCTION(ccvs_delete) /* cv_delete() */
 /* }}} */

 /* {{{ proto string ccvs_auth(string session, string invoice)
- ??? */
+   Perform credit authorization test on a transaction */
 PHP_FUNCTION(ccvs_auth) /* cv_auth() */
 {
  zval **psess;
@@ -312,7 +312,7 @@ PHP_FUNCTION(ccvs_auth) /* cv_auth() */
 /* }}} */

 /* {{{ proto string ccvs_return(string session, string invoice)
- ??? */
+   Transfer funds from the merchant to the credit card holder */
 PHP_FUNCTION(ccvs_return) /* cv_return() */
 {
  zval **psess;
@@ -338,7 +338,7 @@ PHP_FUNCTION(ccvs_return) /* cv_return() */
 /* }}} */

 /* {{{ proto string ccvs_reverse(string session, string invoice)
- ??? */
+   Perform a full reversal on an already-processed authorization */
 PHP_FUNCTION(ccvs_reverse) /* cv_reverse() */
 {
  zval **psess;
@@ -364,7 +364,7 @@ PHP_FUNCTION(ccvs_reverse) /* cv_reverse() */
 /* }}} */

 /* {{{ proto string ccvs_sale(string session, string invoice)
- ??? */
+   Transfer funds from the credit card holder to the merchant */
 PHP_FUNCTION(ccvs_sale) /* cv_sale() */
 {
  zval **psess;
@@ -390,7 +390,7 @@ PHP_FUNCTION(ccvs_sale) /* cv_sale() */
 /* }}} */

 /* {{{ proto string ccvs_void(string session, string invoice)
- ??? */
+   Perform a full reversal on a completed transaction */
 PHP_FUNCTION(ccvs_void) /* cv_void() */
 {
  zval **psess;
@@ -416,7 +416,7 @@ PHP_FUNCTION(ccvs_void) /* cv_void() */
 /* }}} */

 /* {{{ proto string ccvs_status(string session, string invoice)
- ??? */
+   Check the status of an invoice */
 PHP_FUNCTION(ccvs_status) /* cv_status() */
 {
  zval **psess;
@@ -442,7 +442,7 @@ PHP_FUNCTION(ccvs_status) /* cv_status() */
 /* }}} */

 /* {{{ proto int ccvs_count(string session, string type)
- ??? */
+   Find out how many transactions of a given type are stored in the system */
 PHP_FUNCTION(ccvs_count) /* cv_count() */
 {
  zval **psess;
@@ -468,7 +468,7 @@ PHP_FUNCTION(ccvs_count) /* cv_count() */
 /* }}} */

 /* {{{ proto string ccvs_lookup(string session, string invoice, int inum)
- ??? */
+   Look up an item of a particular type in the database */
 PHP_FUNCTION(ccvs_lookup) /* cv_lookup() */
 {
  zval **psess;
@@ -498,7 +498,7 @@ PHP_FUNCTION(ccvs_lookup) /* cv_lookup() */
 /* }}} */

 /* {{{ proto string ccvs_report(string session, string type)
- ??? */
+   Return the status of the background communication process */
 PHP_FUNCTION(ccvs_report) /* cv_report() */
 {
  zval **psess;
@@ -525,7 +525,7 @@ PHP_FUNCTION(ccvs_report) /* cv_report() */
 /* }}} */

 /* {{{ proto string ccvs_command(string session, string type, string argval)
- ??? */
+   Performs a command which is peculiar to a single protocol, and thus is not available in the general CCVS API */
 PHP_FUNCTION(ccvs_command) /* cv_command() */
 {
  zval **psess;
@@ -555,7 +555,7 @@ PHP_FUNCTION(ccvs_command) /* cv_command() */
 /* }}} */

 /* {{{ proto string ccvs_textvalue(string session)
- ??? */
+   Get text return value for previous function call */
 PHP_FUNCTION(ccvs_textvalue) /* cv_textvalue() */
 {
  zval **psess;
@@ -12,8 +12,8 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Brendan W. McAdams <bmcadams@php.net>                  |
-   |              Doug DeJulio <ddj@redhat.com>                           |
+   | Authors: Brendan W. McAdams <bmcadams@php.net>                       |
+   |          Doug DeJulio <ddj@redhat.com>                               |
   +----------------------------------------------------------------------+
 */

@@ -22,6 +22,6 @@ if test "$PHP_CCVS" != "no"; then
  
  PHP_ADD_INCLUDE($CCVS_DIR/include)
  PHP_ADD_LIBRARY_WITH_PATH(ccvs, $CCVS_DIR/lib, CCVS_SHARED_LIBADD)
-  PHP_EXTENSION(ccvs, $ext_shared)
+  PHP_NEW_EXTENSION(ccvs, ccvs.c, $ext_shared)
  PHP_SUBST(CCVS_SHARED_LIBADD)
 fi
@@ -15,9 +15,10 @@
   | Author: Zeev Suraski <zeev@zend.com>                                 |
   |         Harald Radi  <h.radi@nme.at>                                 |
   |         Alan Brown   <abrown@pobox.com>                              |
+   |         Wez Furlong <wez@thebrainroom.com>                           |
   +----------------------------------------------------------------------+
 */
-
+/* $Id$ */
 /*
 * This module implements support for COM components that support the IDispatch
 * interface.  Both local (COM) and remote (DCOM) components can be accessed.
@@ -57,6 +58,7 @@

 #include <iostream.h>
 #include <math.h>
+#include <ocidl.h>

 #include "php.h"
 #include "php_ini.h"
@@ -65,11 +67,12 @@
 #include "php_VARIANT.h"

 static ITypeLib *php_COM_find_typelib(char *search_string, int mode TSRMLS_DC);
-static int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC);
 static int do_COM_offget(VARIANT *result, comval *array, pval *property, int cleanup TSRMLS_DC);
 static int do_COM_propget(VARIANT *var_result, comval *obj, pval *arg_property, int cleanup TSRMLS_DC);
 static void php_register_COM_class(TSRMLS_D);
 static void php_COM_init(int module_number TSRMLS_DC);
+static char *php_string_from_clsid(const CLSID *clsid TSRMLS_DC);
+static int com_enable_events(comval *obj, int enable);

 static int le_comval;
 static int codepage;
@@ -78,6 +81,9 @@ static int codepage;
 int resourcecounter = 1;
 #endif

+static unsigned char arg1and2_force_ref[] =
+                       { 2, BYREF_FORCE, BYREF_FORCE };
+
 function_entry COM_functions[] = {
 	PHP_FE(com_load,                                NULL)
 	PHP_FE(com_invoke,                              NULL)
@@ -87,6 +93,9 @@ function_entry COM_functions[] = {
 	PHP_FE(com_propput,                             NULL)
 	PHP_FE(com_load_typelib,                        NULL)
 	PHP_FE(com_isenum,                              NULL)
+	PHP_FE(com_event_sink,							arg1and2_force_ref)
+	PHP_FE(com_message_pump,                        NULL)
+	PHP_FE(com_print_typeinfo,                      NULL)

 	PHP_FALIAS(com_get,         com_propget,        NULL)
 	PHP_FALIAS(com_propset,     com_propput,        NULL)
@@ -133,18 +142,21 @@ PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DIS
 		if (FAILED(hr)) {
 			switch (hr) {
 				case DISP_E_EXCEPTION: {
-						int srclen=0;
-						char *src=estrdup("");
-						int desclen=0;
-						char *desc=estrdup("");
+						
+						char *src=estrdup("Unavailable");
+						int srclen=strlen(src);
+						char *desc=estrdup("Unavailable");
+						int desclen=strlen(desc);

 						if (ExceptInfo.bstrSource)
 						{
+							efree(src);
 							src = php_OLECHAR_to_char(ExceptInfo.bstrSource, &srclen, codepage TSRMLS_CC);
 							SysFreeString(ExceptInfo.bstrSource);
 						}
 						if (ExceptInfo.bstrDescription)
 						{
+							efree(desc);
 							desc = php_OLECHAR_to_char(ExceptInfo.bstrDescription, &desclen, codepage TSRMLS_CC);
 							SysFreeString(ExceptInfo.bstrDescription);
 						}
@@ -159,6 +171,7 @@ PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DIS
 							SysFreeString(ExceptInfo.bstrHelpFile);
 						}
 					}
+					break;
 				case DISP_E_PARAMNOTFOUND:
 				case DISP_E_TYPEMISMATCH:
 					*ErrString = pemalloc(25, 1);
@@ -257,7 +270,7 @@ PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* ppDisp, int cleanup
 	C_REFCOUNT(obj) = 1;
 	C_DISPATCH(obj) = pDisp;
 	C_HASTLIB(obj) = SUCCEEDED(C_DISPATCH_VT(obj)->GetTypeInfo(C_DISPATCH(obj), 0, LANG_NEUTRAL, &C_TYPEINFO(obj)));
-
+	
 	dispparams.rgvarg = NULL;
 	dispparams.rgdispidNamedArgs = NULL;
 	dispparams.cArgs = 0;
@@ -268,9 +281,11 @@ PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* ppDisp, int cleanup
 	if (C_HASENUM(obj) = SUCCEEDED(C_DISPATCH_VT(obj)->Invoke(C_DISPATCH(obj), DISPID_NEWENUM, &IID_NULL, LOCALE_SYSTEM_DEFAULT,
 															  DISPATCH_METHOD|DISPATCH_PROPERTYGET, &dispparams, var_result, NULL, NULL))) {
 		if (V_VT(var_result) == VT_UNKNOWN) {
+			V_UNKNOWN(var_result)->lpVtbl->AddRef(V_UNKNOWN(var_result));
 			C_HASENUM(obj) = SUCCEEDED(V_UNKNOWN(var_result)->lpVtbl->QueryInterface(V_UNKNOWN(var_result), &IID_IEnumVARIANT,
 																					 (void**)&C_ENUMVARIANT(obj)));
 		} else if (V_VT(var_result) == VT_DISPATCH) {
+			V_DISPATCH(var_result)->lpVtbl->AddRef(V_DISPATCH(var_result));
 			C_HASENUM(obj) = SUCCEEDED(V_DISPATCH(var_result)->lpVtbl->QueryInterface(V_DISPATCH(var_result), &IID_IEnumVARIANT,
 																					  (void**)&C_ENUMVARIANT(obj)));
 		}
@@ -354,6 +369,10 @@ PHPAPI HRESULT php_COM_destruct(comval *obj TSRMLS_DC)
 {
 	HRESULT hr = S_OK;

+	com_enable_events(obj, FALSE);
+	if (obj->sinkdispatch)
+		obj->sinkdispatch->lpVtbl->Release(obj->sinkdispatch);
+	
 	if (C_ISREFD(obj)) {
 		C_REFCOUNT(obj) = 1;
 		hr = php_COM_release(obj TSRMLS_CC);
@@ -497,49 +516,40 @@ PHP_FUNCTION(com_load)
 	}

 	if (server_name != NULL) {
-		/* if a server is passed, one obviously wants to instanciate a
-		 * remote server
-		 */
-		flags = CLSCTX_REMOTE_SERVER;
-
 		/* What is server name? A String or an array? */

-		if (Z_TYPE_P(server_name) == IS_ARRAY) {
+		if (Z_TYPE_P(server_name) == IS_NULL) {
+			server_name = NULL;
+		} else if (Z_TYPE_P(server_name) == IS_ARRAY) {
 			pval **tmp;
-			/* DAB: 22 Sept 2001 */
-			/* Aha - we have a number of possible */
-			/* arguments. They are in the hash */
-			/* By name: Server, Domain, Username, Password */
-			/* Flags. */
-			/* This has been crafted to maintian maximum backward */
-			/* compatability, If the server name is specified as a */
-			/* string, then the function shoule behave as before */
-			/* by defaulting username and password and using the */
-			/* (I believe) incorrect CLSCTX_SERVER instantiation */
-			/* paramter. However if server is specified in this array */
-			/* then we use either CLSCTX_REMOTE_SERVER or whatever */
-			/* flags are specified in the array */
+			/* DAB: 22 Sept 2001
+			 * Aha - we have a number of possible arguments.
+			 * They are in the hash By name: Server, Domain, Username, Password
+			 * Flags.
+			 * This has been crafted to maintian maximum backward compatability.
+			 * If the server name is specified as a string, then the function
+			 * should behave as before by defaulting username and password and
+			 * using the (I believe) incorrect CLSCTX_SERVER instantiation
+			 * paramter. However if server is specified in this array then we
+			 * use either CLSCTX_REMOTE_SERVER or whatever flags are specified
+			 * in the array */
 			HashTable *ht = Z_ARRVAL(*server_name);
 			if (FAILURE == zend_hash_find(ht, "Server", 7, (void **) &tmp)) {
 				server_name = NULL;
 			} else {
 				server_name = *tmp;
 				convert_to_string_ex(&server_name);
-				/* CLSCTX_SERVER includes INPROC and LOCAL */
-				/* SERVER. This means that any local server */
-				/* will be instantiated BEFORE even looking */
-				/* on a remote server. Thus if we have a */
-				/* server name, probably we want to access */
-				/* a remote machine or we would not have */
-				/* bothered specifying it. So it would be */
-				/* wrong to to connect locally. Futher, */
-				/* unless the name passed is a GUID, there has */
-				/* to be something to map the Prog.Id to GUID */
-				/* and unless that has been modified to remove */
-				/* the information about local instantiation */
-				/* CLSCTX_SERVER would force a local instantiation */
-				/* This setting can be overridden below if the user */
-				/* specifies a flags element */
+				/* CLSCTX_SERVER includes INPROC and LOCAL SERVER. This means
+				 * that any local server will be instantiated BEFORE even
+				 * looking on a remote server. Thus if we have a server name,
+				 * probably we want to access a remote machine or we would not
+				 * have bothered specifying it. So it would be wrong to to
+				 * connect locally. Futher, unless the name passed is a GUID,
+				 * there has to be something to map the Prog.Id to GUID and
+				 * unless that has been modified to remove the information
+				 * about local instantiation CLSCTX_SERVER would force a local
+				 * instantiation This setting can be overridden below if the
+				 * user specifies a flags element */
 				flags = CLSCTX_REMOTE_SERVER;
 			}
 			if (FAILURE == zend_hash_find(ht, "Username", 9, (void **) &tmp)) {
@@ -564,14 +574,12 @@ PHP_FUNCTION(com_load)
 				convert_to_long_ex(tmp);
 				flags = (CLSCTX) Z_LVAL_PP(tmp);
 			}
-		}
-		if (Z_TYPE_P(server_name) == IS_NULL) {
-			server_name = NULL;
 		} else {
 			if (!INI_INT("com.allow_dcom")) {
 				php_error(E_WARNING, "DCOM is disabled");
-				RETURN_FALSE;
+				RETURN_NULL();
 			} else {
+				flags = CLSCTX_REMOTE_SERVER;
 				convert_to_string_ex(&server_name);
 			}
 		}
@@ -615,7 +623,7 @@ PHP_FUNCTION(com_load)
 			error_message = php_COM_error_message(hr TSRMLS_CC);  
 			php_error(E_WARNING,"Invalid ProgID, GUID string, or Moniker: %s", error_message);
 			LocalFree(error_message);
-			RETURN_FALSE;
+			RETURN_NULL();
 		}
 	} else {
 		efree(ProgID);
@@ -675,7 +683,7 @@ PHP_FUNCTION(com_load)
 			LocalFree(error_message);
 			efree(clsid_str);
 			php_COM_destruct(obj TSRMLS_CC);
-			RETURN_FALSE;
+			RETURN_NULL();
 		}
 	}

@@ -710,7 +718,7 @@ PHP_FUNCTION(com_load)
 		}
 	}

-	RETURN_LONG(zend_list_insert(obj, IS_COM));
+	RETURN_RESOURCE(zend_list_insert(obj, IS_COM));
 }
 /* }}} */

@@ -912,7 +920,7 @@ PHP_FUNCTION(com_invoke)
 	}
 	arguments = (pval **) emalloc(sizeof(pval *)*arg_count);
 	if (zend_get_parameters_array(ht, arg_count, arguments) == FAILURE) {
-		RETURN_FALSE;
+		RETURN_NULL();
 	}

 	object = arguments[0];
@@ -923,7 +931,7 @@ PHP_FUNCTION(com_invoke)
 	obj = (comval *)zend_list_find(Z_LVAL_P(object), &type);
 	if (!obj || (type != IS_COM)) {
 		php_error(E_WARNING,"%d is not a COM object handler", Z_STRVAL_P(function_name));
-		RETURN_FALSE;
+		RETURN_NULL();
 	}

 	/* obtain property/method handler */
@@ -935,7 +943,7 @@ PHP_FUNCTION(com_invoke)
 		FREE_VARIANT(var_result);
 		efree(arguments);

-		RETURN_FALSE;
+		RETURN_NULL();
 	}

 	RETVAL_VARIANT(var_result);
@@ -1005,6 +1013,461 @@ PHP_FUNCTION(com_addref)
 }
 /* }}} */

+/* {{{ proto bool com_message_pump([int timeoutms])
+   Process COM messages, sleeping for up to timeoutms milliseconds */
+PHP_FUNCTION(com_message_pump)
+{
+	long timeoutms = 0;
+	MSG msg;
+	DWORD result;
+	
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &timeoutms) == FAILURE)
+		RETURN_FALSE;
+	
+	result = MsgWaitForMultipleObjects(0, NULL, FALSE, timeoutms, QS_ALLINPUT);
+
+	if (result == WAIT_OBJECT_0) {
+		while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+		}
+		/* we processed messages */
+		RETVAL_TRUE;
+	} else {
+		/* we did not process messages (timed out) */
+		RETVAL_FALSE;
+	}
+}
+/* }}} */
+
+
+static int com_enable_events(comval *obj, int enable)
+{
+	if (obj->sinkdispatch) {
+		IConnectionPointContainer *cont;
+		IConnectionPoint *point;
+		
+		if (SUCCEEDED(C_DISPATCH_VT(obj)->QueryInterface(C_DISPATCH(obj), &IID_IConnectionPointContainer, (void**)&cont))) {
+			
+			if (SUCCEEDED(cont->lpVtbl->FindConnectionPoint(cont, &obj->sinkid, &point))) {
+
+				if (enable) {
+					point->lpVtbl->Advise(point, (IUnknown*)obj->sinkdispatch, &obj->sinkcookie);
+				} else {
+					point->lpVtbl->Unadvise(point, obj->sinkcookie);
+				}
+				point->lpVtbl->Release(point);
+			}
+			cont->lpVtbl->Release(cont);
+		}
+	}
+	return 0;
+}
+
+static const struct {
+	VARTYPE vt;
+	const char *name;
+} vt_names[] = {
+	{ VT_NULL,		"VT_NULL" },
+	{ VT_EMPTY,		"VT_EMPTY" },
+	{ VT_UI1,		"VT_UI1" },
+	{ VT_I2,		"VT_I2" },
+	{ VT_I4,		"VT_I4" },
+	{ VT_R4,		"VT_R4" },
+	{ VT_R8,		"VT_R8" },
+	{ VT_BOOL,		"VT_BOOL" },
+	{ VT_ERROR,		"VT_ERROR" },
+	{ VT_CY,		"VT_CY" },
+	{ VT_DATE,		"VT_DATE" },
+	{ VT_BSTR,		"VT_BSTR" },
+	{ VT_DECIMAL,	"VT_DECIMAL" },
+	{ VT_UNKNOWN,	"VT_UNKNOWN" },
+	{ VT_DISPATCH,	"VT_DISPATCH" },
+	{ VT_VARIANT,	"VT_VARIANT" },
+	{ VT_I1,		"VT_I1" },
+	{ VT_UI2,		"VT_UI2" },
+	{ VT_UI4,		"VT_UI4" },
+	{ VT_INT,		"VT_INT" },
+	{ VT_UINT,		"VT_UINT" },
+	{ VT_ARRAY,		"VT_ARRAY" },
+	{ VT_BYREF,		"VT_BYREF" },
+	{ VT_VOID,		"VT_VOID" },
+	{ VT_PTR,		"VT_PTR" },
+	{ VT_HRESULT,	"VT_HRESULT" },
+	{ 0, NULL }
+};
+
+static inline const char *vt_to_string(VARTYPE vt)
+{
+	int i;
+	for (i = 0; vt_names[i].name != NULL; i++) {
+		if (vt_names[i].vt == vt)
+			return vt_names[i].name;
+	}
+	return "?";
+}
+
+static int process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int printdef, GUID *guid TSRMLS_DC)
+{
+	TYPEATTR *attr;
+	FUNCDESC *func;
+	int i;
+	OLECHAR *olename;
+	char *ansiname = NULL;
+	unsigned int ansinamelen;
+	int ret = 0;
+
+	if (FAILED(typeinfo->lpVtbl->GetTypeAttr(typeinfo, &attr)))
+		return 0;
+
+	/* verify that it is suitable */
+	if (id_to_name == NULL || attr->typekind == TKIND_DISPATCH) {
+
+		if (guid)
+			memcpy(guid, &attr->guid, sizeof(GUID));
+		
+		if (printdef) {
+			char *guidstring;
+
+			typeinfo->lpVtbl->GetDocumentation(typeinfo, MEMBERID_NIL, &olename, NULL, NULL, NULL);
+			ansiname = php_OLECHAR_to_char(olename, &ansinamelen, codepage TSRMLS_CC);
+			SysFreeString(olename);
+
+			guidstring = php_string_from_clsid(&attr->guid TSRMLS_CC);
+			php_printf("class %s { /* GUID=%s */\n", ansiname, guidstring);
+			efree(guidstring);
+
+			efree(ansiname);
+		}
+
+		if (id_to_name)
+			zend_hash_init(id_to_name, 0, NULL, ZVAL_PTR_DTOR, 0);
+
+		/* So we've got the dispatch interface; lets list the event methods */
+		for (i = 0; i < attr->cFuncs; i++) {
+			zval *tmp;
+			DISPID lastid = 0;	/* for props */
+			int isprop;
+
+			if (FAILED(typeinfo->lpVtbl->GetFuncDesc(typeinfo, i, &func)))
+				break;
+
+			isprop = (func->invkind & DISPATCH_PROPERTYGET || func->invkind & DISPATCH_PROPERTYPUT);
+
+			if (!isprop || lastid != func->memid) {
+
+				lastid = func->memid;
+				
+				typeinfo->lpVtbl->GetDocumentation(typeinfo, func->memid, &olename, NULL, NULL, NULL);
+				ansiname = php_OLECHAR_to_char(olename, &ansinamelen, codepage TSRMLS_CC);
+				SysFreeString(olename);
+
+				if (printdef) {
+					int j;
+					char *funcdesc;
+					unsigned int funcdesclen, cnames = 0;
+					BSTR *names;
+
+					names = (BSTR*)emalloc((func->cParams + 1) * sizeof(BSTR));
+
+					typeinfo->lpVtbl->GetNames(typeinfo, func->memid, names, func->cParams + 1, &cnames);
+					/* first element is the function name */
+					SysFreeString(names[0]);
+
+					php_printf("\t/* DISPID=%d */\n", func->memid);
+
+					if (func->elemdescFunc.tdesc.vt != VT_VOID) {
+						php_printf("\t/* %s [%d] */\n",
+								vt_to_string(func->elemdescFunc.tdesc.vt),
+								func->elemdescFunc.tdesc.vt
+								);
+					}
+
+					if (isprop) {
+
+						typeinfo->lpVtbl->GetDocumentation(typeinfo, func->memid, NULL, &olename, NULL, NULL);
+						if (olename) {
+							funcdesc = php_OLECHAR_to_char(olename, &funcdesclen, codepage TSRMLS_CC);
+							SysFreeString(olename);
+							php_printf("\t/* %s */\n", funcdesc);
+							efree(funcdesc);
+						}
+
+						php_printf("\tvar $%s;\n\n", ansiname);
+
+					} else {
+						/* a function */
+
+						php_printf("\tfunction %s(\n", ansiname);
+
+						for (j = 0; j < func->cParams; j++) {
+							ELEMDESC *elem = &func->lprgelemdescParam[j];
+
+							php_printf("\t\t/* %s [%d] ", vt_to_string(elem->tdesc.vt), elem->tdesc.vt);
+
+							if (elem->paramdesc.wParamFlags & PARAMFLAG_FIN)
+								php_printf("[in]");
+							if (elem->paramdesc.wParamFlags & PARAMFLAG_FOUT)
+								php_printf("[out]");
+
+							if (elem->tdesc.vt == VT_PTR) {
+								/* what does it point to ? */
+								php_printf(" --> %s [%d] ",
+										vt_to_string(elem->tdesc.lptdesc->vt),
+										elem->tdesc.lptdesc->vt
+										);
+							}
+
+							/* when we handle prop put and get, this will look nicer */
+							if (j+1 < (int)cnames) {
+								funcdesc = php_OLECHAR_to_char(names[j+1], &funcdesclen, codepage TSRMLS_CC);
+								SysFreeString(names[j+1]);
+							} else {
+								funcdesc = "???";
+							}
+
+							php_printf(" */ %s%s%c\n",
+									elem->tdesc.vt == VT_PTR ? "&$" : "$",
+									funcdesc,
+									j == func->cParams - 1 ? ' ' : ','
+									);
+
+							if (j+1 < (int)cnames)
+								efree(funcdesc);
+						}
+
+						php_printf("\t\t)\n\t{\n");
+
+						typeinfo->lpVtbl->GetDocumentation(typeinfo, func->memid, NULL, &olename, NULL, NULL);
+						if (olename) {
+							funcdesc = php_OLECHAR_to_char(olename, &funcdesclen, codepage TSRMLS_CC);
+							SysFreeString(olename);
+							php_printf("\t\t/* %s */\n", funcdesc);
+							efree(funcdesc);
+						}
+
+						php_printf("\t}\n");
+					}
+
+					efree(names);
+				}
+
+				if (id_to_name) {
+					zend_str_tolower(ansiname, ansinamelen);
+					MAKE_STD_ZVAL(tmp);
+					ZVAL_STRINGL(tmp, ansiname, ansinamelen, 0);
+					zend_hash_index_update(id_to_name, func->memid, (void*)&tmp, sizeof(zval *), NULL);
+				}
+			}
+			typeinfo->lpVtbl->ReleaseFuncDesc(typeinfo, func);
+
+		}
+
+		if (printdef)
+			php_printf("}\n");
+
+		ret = 1;
+	} else {
+		zend_error(E_WARNING, "Thats not a dispatchable interface!! type kind = %08x\n", attr->typekind);
+	}
+
+	typeinfo->lpVtbl->ReleaseTypeAttr(typeinfo, attr);
+
+	return ret;
+}
+
+static ITypeInfo *locate_typeinfo(char *typelibname, comval *obj, char *dispname, int sink TSRMLS_DC)
+{
+	ITypeInfo *typeinfo = NULL;
+	ITypeLib *typelib = NULL;
+	int gotguid = 0;
+	GUID iid;
+
+	if (obj) {
+		if (dispname == NULL && sink) {
+			IProvideClassInfo2 *pci2;
+			IProvideClassInfo *pci;
+
+			if (SUCCEEDED(C_DISPATCH_VT(obj)->QueryInterface(C_DISPATCH(obj), &IID_IProvideClassInfo2, (void**)&pci2))) {
+				gotguid = SUCCEEDED(pci2->lpVtbl->GetGUID(pci2, GUIDKIND_DEFAULT_SOURCE_DISP_IID, &iid));
+				pci2->lpVtbl->Release(pci2);
+			}
+			if (!gotguid && SUCCEEDED(C_DISPATCH_VT(obj)->QueryInterface(C_DISPATCH(obj), &IID_IProvideClassInfo, (void**)&pci))) {
+				/* examine the available interfaces */
+				/* TODO: write some code here */
+				pci->lpVtbl->Release(pci);
+			}
+		} else if (dispname && C_HASTLIB(obj)) {
+			unsigned int idx;
+			/* get the library from the object; the rest will be dealt with later */
+			C_TYPEINFO_VT(obj)->GetContainingTypeLib(C_TYPEINFO(obj), &typelib, &idx);	
+		} else if (typelibname == NULL) {
+			C_DISPATCH_VT(obj)->GetTypeInfo(C_DISPATCH(obj), 0, LANG_NEUTRAL, &typeinfo);
+		}
+	} else if (typelibname) {
+		/* Fetch the typelibrary and use that to look things up */
+		typelib = php_COM_find_typelib(typelibname, CONST_CS TSRMLS_CC);
+	} 
+
+	if (!gotguid && dispname && typelib) {
+		unsigned short cfound;
+		MEMBERID memid;
+		OLECHAR *olename = php_char_to_OLECHAR(dispname, strlen(dispname), CP_ACP TSRMLS_CC);
+		
+		cfound = 1;
+		if (FAILED(typelib->lpVtbl->FindName(typelib, olename, 0, &typeinfo, &memid, &cfound)) || cfound == 0) {
+			CLSID coclass;
+			ITypeInfo *coinfo;
+			
+			/* assume that it might be a progid instead */
+			if (SUCCEEDED(CLSIDFromProgID(olename, &coclass)) &&
+					SUCCEEDED(typelib->lpVtbl->GetTypeInfoOfGuid(typelib, &coclass, &coinfo))) {
+
+				/* enumerate implemented interfaces and pick the one as indicated by sink */
+				TYPEATTR *attr;
+				int i;
+
+				coinfo->lpVtbl->GetTypeAttr(coinfo, &attr);
+
+				for (i = 0; i < attr->cImplTypes; i++) {
+					HREFTYPE rt;
+					int tf;
+
+					if (FAILED(coinfo->lpVtbl->GetImplTypeFlags(coinfo, i, &tf)))
+						continue;
+
+					if ((sink && tf == (IMPLTYPEFLAG_FSOURCE|IMPLTYPEFLAG_FDEFAULT)) ||
+						(!sink && (tf & IMPLTYPEFLAG_FSOURCE) == 0)) {
+
+						/* flags match what we are looking for */
+
+						if (SUCCEEDED(coinfo->lpVtbl->GetRefTypeOfImplType(coinfo, i, &rt)))
+							if (SUCCEEDED(coinfo->lpVtbl->GetRefTypeInfo(coinfo, rt, &typeinfo)))
+								break;
+						
+					}
+				}
+				
+				coinfo->lpVtbl->ReleaseTypeAttr(coinfo, attr);
+				coinfo->lpVtbl->Release(coinfo);
+			}
+		}
+
+		
+		efree(olename);
+	} else if (gotguid) {
+		typelib->lpVtbl->GetTypeInfoOfGuid(typelib, &iid, &typeinfo);
+	}
+
+	if (typelib)
+		typelib->lpVtbl->Release(typelib);
+
+	return typeinfo;
+}
+
+/* {{{ proto bool com_print_typeinfo(mixed comobject | string typelib, string dispinterface, bool wantsink)
+   Print out a PHP class definition for a dispatchable interface */
+PHP_FUNCTION(com_print_typeinfo)
+{
+	zval *arg1;
+	char *ifacename = NULL;
+	char *typelibname = NULL;
+	int ifacelen;
+	zend_bool wantsink = 0;
+	comval *obj = NULL;
+	ITypeInfo *typeinfo;
+	
+	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/s!b", &arg1, &ifacename,
+				&ifacelen, &wantsink)) {
+		RETURN_FALSE;
+	}
+
+	if (Z_TYPE_P(arg1) == IS_OBJECT && (Z_OBJCE_P(arg1) == &COM_class_entry || !strcmp(Z_OBJCE_P(arg1)->name, "COM"))) {
+		zval **tmp;
+		zend_hash_index_find(Z_OBJPROP_P(arg1), 0, (void**)&tmp);
+		ZEND_FETCH_RESOURCE(obj, comval*, tmp, -1, "comval", IS_COM);
+	} else if (Z_TYPE_P(arg1) == IS_RESOURCE) {
+		ZEND_FETCH_RESOURCE(obj, comval*, &arg1, -1, "comval", IS_COM);
+	} else {
+		convert_to_string(arg1);
+		typelibname = Z_STRVAL_P(arg1);
+	}
+
+	typeinfo = locate_typeinfo(typelibname, obj, ifacename, wantsink TSRMLS_CC);
+	if (typeinfo) {
+		process_typeinfo(typeinfo, NULL, 1, NULL TSRMLS_CC);
+		typeinfo->lpVtbl->Release(typeinfo);
+		RETURN_TRUE;
+	} else {
+		zend_error(E_WARNING, "Unable to find typeinfo using the parameters supplied");
+	}
+	RETURN_FALSE;
+}
+/* }}} */
+
+/* {{{ proto bool com_event_sink(mixed comobject, object sinkobject [, mixed sinkinterface])
+   Connect events from a COM object to a PHP object */
+PHP_FUNCTION(com_event_sink)
+{
+	zval *object, *sinkobject, *sink=NULL;
+	char *dispname = NULL, *typelibname = NULL;
+	zend_bool gotguid = 0;
+	comval *obj;
+	ITypeInfo *typeinfo = NULL;
+
+	RETVAL_FALSE;
+	
+	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|z/", &object, &sinkobject, &sink)) {
+		RETURN_FALSE;
+	}
+
+	if (Z_TYPE_P(object) == IS_OBJECT && (Z_OBJCE_P(object) == &COM_class_entry || !strcmp(Z_OBJCE_P(object)->name, "COM"))) {
+		zval **tmp;
+		zend_hash_index_find(Z_OBJPROP_P(object), 0, (void**)&tmp);
+		ZEND_FETCH_RESOURCE(obj, comval*, tmp, -1, "comval", IS_COM);
+	} else {
+		ZEND_FETCH_RESOURCE(obj, comval*, &object, -1, "comval", IS_COM);
+	}
+
+	if (sink && Z_TYPE_P(sink) == IS_ARRAY) {
+		/* 0 => typelibname, 1 => dispname */
+		zval **tmp;
+
+		if (zend_hash_index_find(Z_ARRVAL_P(sink), 0, (void**)&tmp) == SUCCESS)
+			typelibname = Z_STRVAL_PP(tmp);
+		if (zend_hash_index_find(Z_ARRVAL_P(sink), 1, (void**)&tmp) == SUCCESS)
+			dispname = Z_STRVAL_PP(tmp);
+	} else if (sink != NULL) {
+		convert_to_string(sink);
+		dispname = Z_STRVAL_P(sink);
+	}
+	
+	typeinfo = locate_typeinfo(typelibname, obj, dispname, 1 TSRMLS_CC);
+
+	if (typeinfo) {
+		HashTable *id_to_name;
+		
+		ALLOC_HASHTABLE(id_to_name);
+		
+		if (process_typeinfo(typeinfo, id_to_name, 0, &obj->sinkid TSRMLS_CC)) {
+
+			/* Create the COM wrapper for this sink */
+			obj->sinkdispatch = php_COM_export_as_sink(sinkobject, &obj->sinkid, id_to_name TSRMLS_CC);
+
+			/* Now hook it up to the source */
+			com_enable_events(obj, TRUE);
+			RETVAL_TRUE;
+
+		} else {
+			FREE_HASHTABLE(id_to_name);
+		}
+	}
+	
+	if (typeinfo)
+		typeinfo->lpVtbl->Release(typeinfo);
+	
+}
+/* }}} */

 static int do_COM_offget(VARIANT *result, comval *array, pval *property, int cleanup TSRMLS_DC)
 {
@@ -1103,7 +1566,7 @@ static void do_COM_propput(pval *return_value, comval *obj, pval *arg_property,
 		FREE_VARIANT(var_result);
 		FREE_VARIANT(new_value);

-		RETURN_FALSE;
+		RETURN_NULL();
 	}

 	php_pval_to_variant(value, new_value, codepage TSRMLS_CC);
@@ -1123,33 +1586,36 @@ static void do_COM_propput(pval *return_value, comval *obj, pval *arg_property,
 			php_error(E_WARNING,"PropPut() failed: %s", error_message);
 		}
 		LocalFree(error_message);
-		efree(propname);

 		FREE_VARIANT(var_result);
-		FREE_VARIANT(new_value);

-		RETURN_FALSE;
+		efree(new_value);
+		efree(propname);
+
+		RETURN_NULL();
 	}

-	dispparams.cArgs = 0;
-	dispparams.cNamedArgs = 0;
+	if (return_value) {
+		dispparams.cArgs = 0;
+		dispparams.cNamedArgs = 0;

-	hr = php_COM_invoke(obj, dispid, DISPATCH_PROPERTYGET, &dispparams, var_result, &ErrString TSRMLS_CC);
+		hr = php_COM_invoke(obj, dispid, DISPATCH_PROPERTYGET, &dispparams, var_result, &ErrString TSRMLS_CC);

-	if (SUCCEEDED(hr)) {
-		php_variant_to_pval(var_result, return_value, codepage TSRMLS_CC);
-	} else {
-		*return_value = *value;
-		zval_copy_ctor(return_value);
-	}
+		if (SUCCEEDED(hr)) {
+			php_variant_to_pval(var_result, return_value, codepage TSRMLS_CC);
+		} else {
+			*return_value = *value;
+			zval_copy_ctor(return_value);
+		}

-	if (ErrString) {
-		pefree(ErrString, 1);
+		if (ErrString) {
+			pefree(ErrString, 1);
+		}
 	}

 	FREE_VARIANT(var_result);
-	FREE_VARIANT(new_value);

+	efree(new_value); // FREE_VARIANT does a VariantClear() which is not desired here !
 	efree(propname);
 }

@@ -1172,6 +1638,7 @@ PHP_FUNCTION(com_propget)
 	obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
 	if (!obj || (type != IS_COM)) {
 		php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
+		RETURN_NULL();
 	}
 	convert_to_string_ex(&arg_property);

@@ -1179,7 +1646,7 @@ PHP_FUNCTION(com_propget)

 	if (do_COM_propget(var_result, obj, arg_property, FALSE TSRMLS_CC) == FAILURE) {
 		FREE_VARIANT(var_result);
-		RETURN_FALSE;
+		RETURN_NULL();
 	}

 	RETVAL_VARIANT(var_result);
@@ -1205,6 +1672,7 @@ PHP_FUNCTION(com_propput)
 	obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
 	if (!obj || (type != IS_COM)) {
 		php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
+		RETURN_NULL();
 	}
 	convert_to_string_ex(&arg_property);

@@ -1321,6 +1789,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer

 			obj = obj_prop;
 			php_COM_set(obj, &V_DISPATCH(var_result), TRUE TSRMLS_CC);
+			VariantInit(var_result);	// to protect C_DISPATCH(obj) from being freed when var_result is destructed
 		} else {
 			php_variant_to_pval(var_result, &return_value, codepage TSRMLS_CC);

@@ -1328,7 +1797,6 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
 			obj_prop = NULL;
 		}

-		VariantInit(var_result);	// to protect C_DISPATCH(obj) from being freed when var_result is destructed
 		pval_destructor(&overloaded_property->element);
 	}

@@ -1345,7 +1813,6 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer

 PHPAPI int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value)
 {
-	pval result;
 	zend_overloaded_element *overloaded_property;
 	zend_llist_element *element;
 	pval **comval_handle;
@@ -1415,7 +1882,7 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
 	FREE_VARIANT(var_result);

 	overloaded_property = (zend_overloaded_element *) element->data;
-	do_COM_propput(&result, obj, &overloaded_property->element, value TSRMLS_CC);
+	do_COM_propput(NULL, obj, &overloaded_property->element, value TSRMLS_CC);
 	FREE_COM(obj_prop);

 	pval_destructor(&overloaded_property->element);
@@ -1423,6 +1890,20 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
 	return SUCCESS;
 }

+/* create an overloaded COM object from a dispatch pointer */
+PHPAPI zval *php_COM_object_from_dispatch(IDispatch *disp, zval *val TSRMLS_DC)
+{
+	comval *obj;
+	zval *zobj;
+	
+	ALLOC_COM(obj);
+	MAKE_STD_ZVAL(zobj);
+	php_COM_set(obj, &disp, FALSE TSRMLS_CC);
+	ZVAL_COM_EX(zobj, obj, val);
+	
+	return zobj;
+}
+

 PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference)
 {
@@ -1438,34 +1919,38 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
 		pval *object_handle;

 		PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-		if (!zend_is_true(return_value)) {
-			ZVAL_FALSE(object);
-			return;
+		if (zend_is_true(return_value)) {
+			ALLOC_ZVAL(object_handle);
+			*object_handle = *return_value;
+			pval_copy_constructor(object_handle);
+			INIT_PZVAL(object_handle);
+			zend_hash_index_update(Z_OBJPROP_P(object), 0, &object_handle, sizeof(pval *), NULL);
+			pval_destructor(&function_name->element);
+		} else {
+			ZVAL_NULL(object);
 		}
-		ALLOC_ZVAL(object_handle);
-		*object_handle = *return_value;
-		pval_copy_constructor(object_handle);
-		INIT_PZVAL(object_handle);
-		zend_hash_index_update(Z_OBJPROP_P(object), 0, &object_handle, sizeof(pval *), NULL);
-		pval_destructor(&function_name->element);

 		return;
 	}

+	RETVAL_NULL();
 	property = php_COM_get_property_handler(property_reference);
-	if (Z_TYPE(property) == IS_NULL) {
-		if (property.refcount == 1) {
-			pval_destructor(&property);
-		}
+
+	if (Z_TYPE(property) != IS_OBJECT) {
+		pval_destructor(&property);
 		pval_destructor(&function_name->element);
+
+		/* error message - function call on a non-object */
 		return;
 	}
+
 	zend_hash_index_find(Z_OBJPROP(property), 0, (void **) &handle);
 	obj = (comval *)zend_list_find(Z_LVAL_PP(handle), &type);

 	if (!obj || (type != IS_COM)) {
 		pval_destructor(&property);
 		pval_destructor(&function_name->element);
+
 		return;
 	}

@@ -1485,9 +1970,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
 		arguments = (pval **) emalloc(sizeof(pval *)*arg_count);
 		zend_get_parameters_array(ht, arg_count, arguments);

-		if (do_COM_invoke(obj , &function_name->element, var_result, arguments, arg_count TSRMLS_CC) == FAILURE) {
-			RETVAL_FALSE;
-		} else {
+		if (do_COM_invoke(obj , &function_name->element, var_result, arguments, arg_count TSRMLS_CC) == SUCCESS) {
 			php_variant_to_pval(var_result, return_value, codepage TSRMLS_CC);
 		}

@@ -1495,9 +1978,12 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
 		efree(arguments);
 	}

-	if (property.refcount == 1) {
+	if (zend_llist_count(property_reference->elements_list) > 1) {
+		/* destruct temporary object */
+		zend_list_delete(Z_LVAL_PP(handle));
 		pval_destructor(&property);
 	}
+	
 	pval_destructor(&function_name->element);
 }

@@ -1520,6 +2006,10 @@ static ITypeLib *php_COM_find_typelib(char *search_string, int mode TSRMLS_DC)
 	 */

 	search_string = php_strtok_r(search_string, ",", &strtok_buf);
+
+	if (search_string == NULL)
+		return NULL;
+	
 	major = php_strtok_r(NULL, ",", &strtok_buf);
 	minor = php_strtok_r(NULL, ",", &strtok_buf);

@@ -1666,7 +2156,7 @@ static ITypeLib *php_COM_find_typelib(char *search_string, int mode TSRMLS_DC)
 }


-static int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
+PHPAPI int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
 {
 	ITypeComp *TypeComp;
 	int i;
@@ -1748,7 +2238,6 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
 	return SUCCESS;
 }

-
 /* {{{ proto bool com_isenum(object com_module)
   Grabs an IEnumVariant */
 PHP_FUNCTION(com_isenum)
@@ -1794,11 +2283,18 @@ static void php_COM_init(int module_number TSRMLS_DC)
 	php_register_COM_class(TSRMLS_C);
 }

+PHPAPI ZEND_DECLARE_MODULE_GLOBALS(com)
+
+static void php_com_init_globals(zend_com_globals *com_globals)
+{
+}

 PHP_MINIT_FUNCTION(COM)
 {
+	ZEND_INIT_MODULE_GLOBALS(com, php_com_init_globals, NULL);
 	php_COM_init(module_number TSRMLS_CC);
 	php_VARIANT_init(module_number TSRMLS_CC);
+	php_COM_dispatch_init(module_number TSRMLS_CC);

 	REGISTER_LONG_CONSTANT("CLSCTX_INPROC_SERVER",  CLSCTX_INPROC_SERVER, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CLSCTX_INPROC_HANDLER", CLSCTX_INPROC_HANDLER, CONST_CS | CONST_PERSISTENT);
@@ -1812,7 +2308,6 @@ PHP_MINIT_FUNCTION(COM)
 	return SUCCESS;
 }

-
 PHP_MSHUTDOWN_FUNCTION(COM)
 {
 	UNREGISTER_INI_ENTRIES();
@@ -1829,7 +2324,7 @@ zend_module_entry COM_module_entry = {
    PHP_MSHUTDOWN(COM),
    NULL,
    NULL,
-    PHP_MINFO(COM),
+	PHP_MINFO(COM),
    NO_VERSION_YET,
    STANDARD_MODULE_PROPERTIES
 };
@@ -1,2 +1,2 @@
 Win32 COM
-Zeev Suraski, Harald Radi, Alan Brown
+Alan Brown, Wez Furlong, Harald Radi, Zeev Suraski
@@ -1,27 +1,28 @@
 1) Multi-dimenstional array support
-- done 2) IErrorInfo
-- done 13) export VARIANT through the COM module
-14) trap exceptions and errors
-3) WithEvents
 4) Documentation (internal and user) and howtos
 5) IEnumVariant::All() which would be like IEnumVariant::Next(IDispatch::Count)
-6) Look for memory leaks and AdRef/Release problems - I KNOW there are some...
 7) Test component (goes with the docs)
 8) Test suite (Needs test component)
-9) reduce the need for VARIANT()
 10) lets try if we are able to call non IDispatch - only Typelib components
-- done 11) IEnumVariant::Next() without parameter should only return an object, not an array with one element
-- done 12) VARIANT->value as lvalue

+-- delayed till PHP5: 3) WithEvents
+-- delayed till PHP5: 9) reduce the need for VARIANT()

 ad 6.) check vbsample.php (new VARIANT(*, *|VT_BYREF)) GPs
-ad 4.) faq (i've collected a few questions from various lists)
+
+-- done 2) IErrorInfo
+-- done 6) Look for memory leaks and AdRef/Release problems - I KNOW there are some...
+-- done 11) IEnumVariant::Next() without parameter should only return an object, not an array with one element
+-- done 12) VARIANT->value as lvalue
+-- done 13) export VARIANT through the COM module
+-- done 14) trap exceptions and errors
+
+-- donne ad 4.) faq (i've collected a few questions from various lists)
       variant attributes !!

 to be discussed:

- dcom inporc issue
 - mts support (getcontext)
 - adsi support (ads* functions)
- winapi interface
- try serialisation support (if component implements IPersist)
+
+-- delayed till PHP 5: try serialisation support (if component implements IPersist)
@@ -181,6 +181,7 @@ static pval php_VARIANT_get_property_handler(zend_property_reference *property_r

 			case OE_IS_OBJECT:
 				if (!strcmp(Z_STRVAL(overloaded_property->element), "value")) {
+					// var_arg can't be an idispatch, so we don't care for the implicit AddRef() call here
 					php_variant_to_pval(var_arg, &result, codepage TSRMLS_CC);
 				} else if (!strcmp(Z_STRVAL(overloaded_property->element), "type")) {
 					ZVAL_LONG(&result, V_VT(var_arg))
@@ -19,20 +19,28 @@ typedef struct comval_ {
 		ITypeInfo *typeinfo;
 		IEnumVARIANT *enumvariant;
 	} i;
+	IDispatch *sinkdispatch;
+	GUID sinkid;
+	DWORD sinkcookie;
 } comval;

 END_EXTERN_C()

 #define ZVAL_COM(z,o) {																\
-			zval *handle;															\
+			zval *handle = NULL;													\
+			ZVAL_COM_EX(z,o,handle)													\
+		}
+
+#define ZVAL_COM_EX(z,o,handle) {													\
 			HashTable *properties;													\
 																					\
 			ALLOC_HASHTABLE(properties);											\
 			zend_hash_init(properties, 0, NULL, ZVAL_PTR_DTOR, 0);					\
 																					\
-			ALLOC_ZVAL(handle);														\
-			INIT_PZVAL(handle);														\
-			ZVAL_LONG(handle, zend_list_insert((o), IS_COM));						\
+			if (handle == NULL) {													\
+				MAKE_STD_ZVAL(handle);												\
+			}																		\
+			ZVAL_RESOURCE(handle, zend_list_insert((o), IS_COM));						\
 																					\
 			zval_copy_ctor(handle);													\
 			zend_hash_index_update(properties, 0, &handle, sizeof(zval *), NULL);	\
@@ -43,10 +51,10 @@ END_EXTERN_C()
 #define RETURN_COM(o)	RETVAL_COM(o)												\
 						return;

-#define ALLOC_COM(z)	(z) = (comval *) emalloc(sizeof(comval));					\
+#define ALLOC_COM(z)	(z) = (comval *) ecalloc(1, sizeof(comval));					\
 						C_REFCOUNT(z) = 0;

-#define FREE_COM(z)		efree(z);
+#define FREE_COM(z)		php_COM_destruct(z TSRMLS_CC);

 #define IS_COM			php_COM_get_le_comval()