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

Fix locking behaviour: On some systems read during write is permitted but
most libraries are not capable of that. GDBM is system dependant so there
we only test  that we do not deadlock.

CODING_STANDARDS

@@ -13,6 +13,8 @@ these rules.
 Code Implementation
 -------------------
 
+[0] Document your code in source files and the manual. [tm]
+
 [1] Functions that are given pointers to resources should not free them
 
 For instance, function int mail(char *to, char *from) should NOT free
@@ -46,23 +48,92 @@ Exceptions:
     doing so, should return that new length, so it doesn't have to be
     recalculated with strlen() (e.g. php_addslashes())
 
-[5] Use php_error() to report any errors/warnings during code execution.
-    Use descriptive error messages, and try to avoid using identical
-    error strings for different stages of an error.  For example,
-    if in order to obtain a URL you have to parse the URL, connect,
-    and retreive the text, assuming something can go wrong at each
-    of these stages, don't report an error "Unable to get URL"
-    on all of them, but instead, write something like "Unable
-    to parse URL", "Unable to connect to URL server" and "Unable
-    to fetch URL text", respectively.
+[5] Use php_error_docref() group of functions to report any errors/warnings 
+    during code execution. Use descriptive error messages, and try to avoid 
+    using identical error strings for different stages of an error. For 
+    example, if in order to obtain a URL you have to parse the URL, connect,
+    and retreive the text, assuming something can go wrong at each of these 
+    stages, don't report an error "Unable to get URL" on all of them, but 
+    instead, write something like "Unable to parse URL", "Unable to connect 
+    to URL server" and "Unable to fetch URL text", respectively.
+
+    It has been silently agreed to prefix every php_error() message with the
+    name of the current function if applicable:
+
+    php_error(E_WHATEVER, "%s(): Desc.", get_active_function_name(TSRMLS_C));
+
+    This can be done automatically using php_error_docref(). The first
+    parameter, docref, is either NULL or the URL of a page describing the 
+    error in detail. In most cases you will pass NULL, to generate the URL
+    from the name of the function being executed:
+
+    php_error_docref(NULL TSRMLS_CC, E_WHATEVER, "Desc.");
+
+    If you pass a URL, it can either be a full URL beginning with "http://":
+
+    php_error_docref("http://externalsite.tld/page.ext#error" 
+                     TSRMLS_CC, E_WHATEVER, "Desc.");
+
+    Or the name of a manual page without file extension, but with an optional 
+    target anchor. Or simply the anchor within the manual page of the current
+    function. When using function names you must replace '_' by '-':
+
+    php_error_docref("function.ext-func#error" TSRMLS_CC, E_WHATEVER, "Desc.");
+
+    To display one or two important parameters after the function name, use 
+    php_error_docref1() or php_error_docref2(). For example, file functions 
+    should display the name of the file opened:
+
+    php_error_docref1("function.fopen" TSRMLS_CC, filename, 
+                      E_WHATEVER, "Desc.");
+
+    php_error_docref2("function.fopen" TSRMLS_CC, filename, openmode, 
+                      E_WHATEVER, "Desc.");
+
+    Fixing ("unifying") existing php_error() message is a good thing [tm].
 
 [6] NEVER USE strncat().  If you're absolutely sure you know what you're doing,
     check its man page again, and only then, consider using it, and even then,
     try avoiding it.
 
-[7] Use ZEND_* macro instead of PHP_* macro. Use of PHP_* macros are
-    not recommended. Since most of PHP_* macros are ZEND_* macro alias, use of
-    PHP_* macro makes browsing source with tag search harder.
+[7] Use PHP_* macros in the PHP source, and ZEND_* macros in the Zend
+    part of the source. Although the PHP_* macro's are mostly aliased to the
+    ZEND_* macros it gives a better understanding on what kind of macro you're
+    calling.
+
+[8] Use assert(). assert.h is included in php.h if it is available.  Not only
+    does good assertion catch bugs, but it also helps with code readability.
+     - Do not use assert for error handling. Use assert only for the 
+       condition that must be always true.
+     - Do not use assignments in assert conditions.  If you assign inside an 
+       assert condition, you risk an elusive bug that would be very difficult 
+       to spot in a debug build, due to the side effect of the assignment.  
+       Function calls in assert conditions may also cause this problem, if 
+       they modify one of their arguments or global variables.
+
+[9] When commenting out code using a #if statement, do NOT use 0 only. Instead
+    use "<cvs username here>_0". For example, #if FOO_0, where FOO is your
+    cvs user foo.  This allows easier tracking of why code was commented out, 
+    especially in bundled libraries.  
+
+[10] Do not define functions that are not available.  For instance, if a
+     library is missing a function, do not define the PHP version of the
+     function, and do not raise a run-time error about the function not
+     existing.  End users should use function_exists() to test for the
+     existence of a function
+
+[11] Prefer emalloc(), efree(), estrdup(), etc. to their standard C library
+     counterparts.  These functions implement an internal "safety-net"
+     mechanism that ensures the deallocation of any unfreed memory at the
+     end of a request.  They also provide useful allocation and overflow
+     information while running in debug mode.
+
+     In almost all cases, memory returned to the engine must be allocated
+     using emalloc().
+
+     The use of malloc() should be limited to cases where a third-party
+     library may need to control or free the memory, or when the memory in
+     question needs to survive between multiple requests.
 
 Naming Conventions
 ------------------
@@ -142,13 +213,13 @@ Syntax and indentation
     
 [3] Be generous with whitespace and braces.  Always prefer:
 
-	if (foo) {
-		bar;
-	}
+    if (foo) {
+        bar;
+    }
 
-	to:
+    to:
 
-	if(foo)bar;
+    if(foo)bar;
 
     Keep one empty line between the variable declaration section and
     the statements in a block, as well as between logical statement

CREDITS

@@ -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

EXTENSIONS

@@ -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
@@ -142,7 +147,8 @@ STATUS:              Working
 COMMENT:             Tested on phpts and isapi versions
 -------------------------------------------------------------------------------
 EXTENSION:           mysql
-MAINTENANCE:         Unknown
+PRIMARY MAINTAINER:  Zak Greant <zak@mysql.com>, Georg Richter <georg@php.net>
+MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           pgsql
@@ -168,7 +174,7 @@ EXTENSION:           odbc
 PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
-COMMENT:             Working except for persistent connections
+COMMENT:             Working 
 -------------------------------------------------------------------------------
 EXTENSION:           oracle
 PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
@@ -191,11 +197,23 @@ MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           bz2
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hartmut@six.de>
+MAINTENANCE:         Odd Fixes
 STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
+EXTENSION:           dio
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANCE:         Orphaned
+STATUS:              Working
+SINCE:               4.0.6
+-------------------------------------------------------------------------------
+EXTENSION:           cyrus
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANCE:         Orphaned
+STATUS:              Working
+SINCE:               4.0.6
+-------------------------------------------------------------------------------
 EXTENSION:           calendar
 PRIMARY MAINTAINER:  Hartmut Holzgraefe <hartmut@six.de>
 MAINTENANCE:         Odd Fixes
@@ -216,6 +234,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
@@ -248,9 +271,15 @@ PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Unknown
 -------------------------------------------------------------------------------
+EXTENSION:           fribidi
+PRIMARY MAINTAINER:  Tal Peer <tal@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           ftp
-MAINTENANCE:         Unknown
-STATUS:              Unknown
+PRIMARY MAINTAINER:  Stefan Esser (sesser@php.net)
+MAINTENANCE:         Maintained
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gd
 PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
@@ -270,6 +299,11 @@ EXTENSION:           icap
 MAINTENANCE:         Unknown
 STATUS:              Obsolete
 -------------------------------------------------------------------------------
+EXTENSION:           iconv
+PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           imap
 PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>
 MAINTENANCE:         Odd Fixes
@@ -407,8 +441,8 @@ SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           swf
 PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Depreciated (Use the ming swf extension instead)
+MAINTENANCE:         Orphaned
+STATUS:              Deprecated (Use the ming swf extension instead)
 COMMENT:             Only for Unix (won't change)
 -------------------------------------------------------------------------------
 EXTENSION:           sysvsem
@@ -435,9 +469,9 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xslt
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANC:          Maintained
-STATUS:              Working
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hartmut@six.de>
+MAINTENANCE:         Odd Fixes
+STATUS:              Working (mostly)
 -------------------------------------------------------------------------------
 EXTENSION:           yaz
 PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
@@ -455,9 +489,9 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           zziplib
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hartmut@six.de>
+MAINTENANCE:         Odd Fixes
+STATUS:              Working
 SINCE:               4.0.5
 -------------------------------------------------------------------------------
 # iptc?

INSTALL

@@ -1,5 +1,5 @@
-Installation Instructions for PHP 4.1
--------------------------------------
+Installation Instructions for PHP 4
+-----------------------------------
 
 STOP!
 
@@ -62,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.1.x.tar.gz | tar xf -
-$ cd php-4.1.x
+$ gunzip -c php-4.x.y.tar.gz | tar xf -
+$ cd php-4.x.y
 $ ./configure --with-mysql --with-apxs
 $ make
 $ make install
@@ -72,6 +72,9 @@ If you get an error telling you that the apxs script could not be found,
 look for it on your system and if you find it, provide the full path to it
 as: --with-apxs=/path/to/apxs
 
+Make sure you specify the version of apxs that is actually installed on
+your system and NOT the one that is in the apache source tarball.
+
 Next you must copy php.ini-dist to the appropriate place (normally
 /usr/local/lib/php.ini) and edit it as necessary to set PHP options.
 
@@ -93,8 +96,8 @@ $ cd apache_1.3.x
 $ ./configure
 $ cd ..
 
-$ gunzip -c php-4.1.x.tar.gz | tar xf -
-$ cd php-4.1.x
+$ 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
@@ -106,7 +109,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.1.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:
@@ -125,12 +128,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.1.x.tar.gz.
-   Unzip this file with a command like: gunzip php-4.1.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.1.x.tar
+   Next you have to untar it with: tar -xvf php-4.x.y.tar
 
-   This will create a php-4.1.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
@@ -160,6 +163,9 @@ Installing PHP can be done in four simple steps:
    look for it on your system and if you find it, provide the full path to it
    as: --with-apxs=/path/to/apxs
 
+   Make sure you specify the version of apxs that is actually installed on
+   your system and NOT the one that is in the apache source tarball.
+   
    You might also want other flags on this configure line.  --with-mysql
    is just an example.  
 

LICENSE

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------- 
-                  The PHP License, version 2.02
+                  The PHP License, version 3.0
 Copyright (c) 1999 - 2002 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 
 
@@ -8,48 +8,38 @@ modification, is permitted provided that the following conditions
 are met:
 
   1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer. 
+     notice, this list of conditions and the following disclaimer.
  
-  2. Redistributions in binary form must reproduce the above 
-     copyright notice, this list of conditions and the following 
-     disclaimer in the documentation and/or other materials provided
-     with the distribution.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
  
-  3. The name "PHP" must not be used to endorse or promote products 
-     derived from this software without prior permission from the 
-     PHP Group.  This does not apply to add-on libraries or tools
-     that work in conjunction with PHP.  In such a case the PHP
-     name may be used to indicate that the product supports PHP.
+  3. The name "PHP" must not be used to endorse or promote products
+     derived from this software without prior written permission. For
+     written permission, please contact group@php.net.
+  
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from group@php.net.  You may indicate that your software works in
+     conjunction with PHP by saying "Foo for PHP" instead of calling
+     it "PHP Foo" or "phpfoo"
  
-  4. The PHP Group may publish revised and/or new versions of the
+  5. The PHP Group may publish revised and/or new versions of the
      license from time to time. Each version will be given a
      distinguishing version number.
      Once covered code has been published under a particular version
-     of the license, you may always continue to use it under the
-     terms of that version. You may also choose to use such covered
-     code under the terms of any subsequent version of the license
+     of the license, you may always continue to use it under the terms
+     of that version. You may also choose to use such covered code
+     under the terms of any subsequent version of the license
      published by the PHP Group. No one other than the PHP Group has
      the right to modify the terms applicable to covered code created
      under this License.
 
-  5. Redistributions of any form whatsoever must retain the following
+  6. Redistributions of any form whatsoever must retain the following
      acknowledgment:
      "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/. 
-
-
+     <http://www.php.net/>".
 
 THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
 ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -73,3 +63,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>.

Makefile.frag

@@ -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

Makefile.global

@@ -0,0 +1,68 @@
+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) $(PHP_FRAMEWORKPATH)
+
+
+all: $(all_targets) 
+
+build-modules: $(PHP_MODULES)
+
+libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+
+libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+	$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so
+
+install: $(install_targets)
+
+install-sapi: libphp4.la
+	@echo "Installing PHP SAPI module"
+	-@$(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: build-modules
+	@test -d modules && \
+	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) && \
+	echo "Installing shared extensions:     $(INSTALL_ROOT)$(EXTENSION_DIR)/" && \
+	rm -f modules/*.la && \
+	cp modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) >/dev/null 2>&1 || true
+
+install-tester:
+	@echo "Installing regression tester:     $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/"
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
+	@$(INSTALL) -m 755 $(top_srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
+
+install-su: install-pear install-tester
+
+test: $(SAPI_CLI_PATH)
+	@TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+	 TEST_PHP_SRCDIR=$(top_srcdir) \
+	 CC=$(CC) \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' $(top_srcdir)/run-tests.php $(TESTS)
+
+clean:
+	find . -name \*.lo -o -name \*.o | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f 
+	find . -name \*.so | xargs rm -f
+	find . -name .libs -a -type d|xargs rm -rf
+	rm -f libphp4.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
+
+distclean: clean
+	rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php4.spec sapi/apache/libphp4.module buildmk.stamp
+	egrep define'.*include/php' configure|sed 's/.*>//'|xargs rm -f
+	find . -name Makefile | xargs rm -f
+
+.PHONY: all clean install distclean test
+.NOEXPORT:

Makefile.in

@@ -1,66 +0,0 @@
-
-ZEND_DIR = $(srcdir)/Zend
-SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) $(CLI_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) $(ZEND_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
-
-clean-modules:
-	rm -f modules/*
-
-.NOEXPORT:

NEWS

@@ -1,13 +1,534 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2002, Version 4.2.0
+? ? ??? 2002, Version 4.3.0
+- ATTENTION! "make install" will *by default* install the CLI SAPI binary in 
+  {PREFIX}/bin/php. If you don't disable the CGI binary, it will be
+  installed as {PREFIX}/bin/php-cgi.
+- Removed extensions: (Jan, Jani)
+  . ext/aspell
+  . ext/ccvs
+  . ext/cybercash
+  . ext/icap
+  . sapi/fhttpd
+- Moved extensions to PECL (http://pear.php.net/): (James, Derick)
+  . ext/vpopmail
+  . ext/cybermut
+- Fixed bug #19689 (absolute paths like /test/dir/ not working correctly).
+  (Ilia)
+- Fixed bug #20424 (stream_get_meta_data craches on a normal file stream).
+  (Derick, Wez)
+- Added "neutral" language entry to mbstring spec. (Moriyoshi) 
+- Changed bundled gd library to consider php.ini option memory_limit. (Marcus)
+- Modified log() to accept multiple bases. (Jason)
+- Fixed bugs #16190/18746 (ext/db: flatfile support with windows). (Marcus)
+- Added gd_info() which returns an array of gd support information. (Marcus)
+- Implemented features/changes requested in Bug #16960 (Timm):
+  . Added a new function sybase_unbuffered_query()
+  . Added a new function sybase_fetch_assoc()
+  . Added sybase_set_message_handler() which enables users to handle
+    server messages in a callback function
+  . Added an ini entry for deadlock retries - retrying deadlocks can cause 
+    transaction state to break (sybct.deadlock_retry_count,
+    defaults to -1 "forever").
+  . Fixed sybase_fetch_object() not to return objects with numeric members
+  . Fixed issues with identical fieldnames
+  . Made sybase_fetch_*() functions return correct datatypes
+  . Made phpinfo() section more verbose
+  . Made sybase_query() error messages more verbose
+- Fixed bug #19935 (made OpenSSL file system operations abide by safe_mode
+  & open_basedir restrictions). (Ilia)
+- Fixed bug #18868 (improved the check for availability of realpath()). (Ilia)
+- Fixed width/height detection of bmp images using getimagesize() function on
+  big endian systems and added code to retrieve bmp bit depth. (Ilia)
+- Fixed bug #20035 (line counting error when script starts with #! in 
+  cgi/cli/fastcgi sapis). (Ilia)
+- Fixed bug #20235 (incorrect handling of symlinks on ZTS build). (Ilia)
+- Added sanity checks to headers_sent() & image_type_to_mime_type(). (Ilia)
+- Added an aditional parameter to the jdtojewish() function which makes
+  the function return the symbolic hebrew name. (Moshe Doron, Derick)
+- Fixed bug #20169 (implode() clobbers first argument). (Moriyoshi)
+- Improved dba extension (Marcus)
+  . Added dba_handlers() that returns an array of installed handlers and
+    dba_list() that returns an associative array of open database files. 
+  . Added bundled cdb support wich can be activated by --with-cdb without a
+    path. The bundled version supports cdb_make that allows writing cdb files.
+  . Added optional skip parameter to dba_fetch() to support multiple key-value
+    pairs with the same key for cdb handler.
+  . Added locking for those handlers that do not have their own locking.
+  . Added flatfile support what finally makes ext/db deprecated.
+- Added imagerotate() which is available only when bundled libgd is used.
+  (Pierre-Alain Joye, Ilia)
+- Fixed bug #17497 (mssql extension crashes if magic_quotes_runtime is on).
+  (Sterling)
+- Remove $_FILES from $_REQUEST (import_request_variables is not modified), 
+  this didn't work properly in the first place, and added confusion. (Sterling)
+- Fix the socket_read() function on win32 to work in normal mode (reading to
+  the end of a line), as well as binary mode. (Sterling)
+- Fixed bug #20110 (added sanity check to prevent include/require functions
+  from trying to include directories). (Ilia)
+- Fixed bug #20108 (segmentation fault on printf("%1.1s", "string")). (Ilia)
+- Added dbx_escape_string() function to dbx module. (Marc)
+- Added Oracle (oci8) support to dbx module. (Marc)
+- Updated FDF extension to work with Adode fdftk 5.0. (Hartmut)
+- Made raw POST data to be available also as "php://input" stream. (Hartmut)
+- Added mb_strtolower() and mb_strtoupper(). (Moriyoshi)
+- Fixed an infinite loop in setlocale() when only invalid locale names
+  were passed in the array. (patch by Pal Loberg, pallo@initio.no)
+- Fixed bugs #19156 and #19544 (COM extension leaks memory and keeps
+  components referenced). (Harald)
+- Added fribidi_get_charsets() and fribidi_charset_info() functions. (Tal)
+- Added Oracle TIMESTAMP type to oci8 extension. (Thies)
+- Fixed fgets($fp) to read until EOL when length parameter is not set. (Wez)
+- Changed registry entries under "HKLM\SOFTWARE\PHP\Per Directory Values" to
+  work also with administrative directives such as safe_mode, open_basedir,
+  etc. (Claudio Felber) 
+- Added str_word_count() function which counts words inside a string. (Ilia)
+- Added PGSQL_CONNECT_FORCE_NEW option to pg_connect() (Yasuo)
+- Added ICONV_IMPL and ICONV_VERSION constants to iconv extension to
+  indicate which iconv implementation is used. (Moriyoshi)
+- Fixed bug #4232 (Added %e & %E support to printf/sprintf). (Ilia)
+- Fixed bug #17580 (Allow ini parser to parse files >16K). (Ilia)
+- Fixed bug #19649 (Sanity checks for browscap.ini parser). (Ilia)
+- Added experimental patch to address problem with floats on various locales.
+  (Bug #17079). (Ilia)
+- Fixed bug #19280 (imap_header fails with many To: addresses). (Ilia)
+- Added mb_regex_set_options(). The Options parameters of various mbregex
+  functions are now deprecated. (Moriyoshi)
+- Fixed bug #19482 (Segfault with PCRE and locale). (Andrei)
+- Made ImageTruecolorToPalette() in bundled GD2 library actually work. (Rasmus)
+- Fixed ImageCopy() in bundled GD2 library to handle copying from truecolor to
+  palette-based. (Wez, Rasmus)
+- Added read-only GIF support for bundled GD2 library. (Rasmus)
+- Made several adjustments to xslt extension (David Viner, Lehnar, Melvyn)
+  . Added xslt_set_object and xslt_setopt function
+  . Changed backend interaction with Sablotron library
+  . Fixed leak with error_print
+  . Made xslt_make_array() always set NULL on last index to signal array end.
+- Changed the glue argument in implode() to be optional. If not specified,
+  defaults to "". (Sterling)
+- Fixed fields argument to contain correct info for xslt_set_error_handler().
+  (Patch by Lenar Lohmus)
+- Added --with-config-file-scan-dir compile-time switch which specifies a
+  directory which will be scanned for *.ini files. (Rasmus)
+- Added ob_get_clean() and ob_get_flush(). (Yasuo)
+- Added ftp_ssl_connect() to ext/ftp for FTP over SSL support. (Stefan Esser)
+- Made a few additions and changes to Apache 2 sapi. (Ilia)
+  . Added apache_response_headers(), apache_note(), apache_getenv() and 
+    apache_setenv() functions.
+  . Added more detailed error reporting to apache_lookup_uri() and virtual().
+  . Renamed getallheaders() to apache_request_headers() and made an alias for BC.
+  . Added php_apache_sapi_getenv() and php_apache_sapi_get_stat().
+  . Added syntax-highlighting handling (.phps)
+- Fixed strstr(), strchr() and strrchr() to be binary safe. (Andrey)
+- Added array_diff_assoc() and array_intersect_assoc(). (Andrey)
+- Fixed bug #17825 (ob_start() chunk size option didn't work well). (Yasuo)
+- Fixed output buffer infinite loop when buffer_size became 0. (Marcus, Wez)
+- Added getopt() for parsing command line options and arguments. (Jon)
+- Added pg_fetch_assoc(), pg_fetch_all(), pg_ping(), pg_meta_data(), pg_convert(), 
+  pg_insert(), pg_select(), pg_update(), pg_delete(), pg_result_seek(),
+  pg_unescape_bytea(), pg_get_notify() and pg_get_pid(). (Yasuo)
+- Fixed bug #17281 (Sanity checks for encoding sessions). (Ilia)
+- Fixed bug #16995 and #19392 (Prevent crash if $HTTP_SESSION_VARS != ARRAY).
+  (Ilia)
+- Fixed bug #19292 (open_basedir restriction problem). (Rasmus)
+- Fixed bug #19366 (gdImageFill crashes when x & y are outside of 
+  the image's boundries). (Ilia)
+- Fixed bug #13936 (__FILE__ constant didn't contain full path). (Ilia)
+- Renamed:
+    socket_set_timeout()  -> stream_set_timeout()
+    socket_set_blocking() -> stream_set_blocking()
+    set_file_buffer()     -> stream_set_write_buffer()
+    socket_get_status()   -> stream_get_meta_data()
+  As these functions can (in theory) work on any type of stream. (Wez)
+- Added stream_context_create(), stream_context_set_params() and
+  stream_context_set_option and added an optional fourth parameter to
+  fopen() which accepts a stream context.  Contexts allow sharing of
+  information between streams (a kind of "session") and setting notification
+  callbacks. (Wez)
+- Added stream_filter_prepend() and stream_filter_append() which apply
+  a filter to either the top or the bottom of the filter stack for a stream.
+  Implemented "string.rot13" filter as an example; more filters are expected
+  to follow in later releases and other extensions. (Wez)
+- Added stream_select() which works like socket_select but works on streams
+  returned by fopen(), fsockopen() and pfsockopen() instead. (Wez)
+- Fixed bug #19595 (Missing functions for GD2 format handling). (Edin)
+- Fixed bug #19633 (Wrong directories in ext/ldap/config.m4). (Derick)
+- Fixed bugs #17274 and #19627 (segfault in sem_remove). (Wez)
+- Fixed bug #18022 (fopen does not work with php://stdin anymore on Solaris).
+  (Wez)
+- Added mb_convert_case() function to the mbstring extension which can convert
+  strings between upper, lower and title case using Unicode mappings.
+  Fixed bug #19257 (strtolower & strtoupper does not work for UTF-8 strings).
+  (Wez)
+- Fixed bug #18521 (htmlentities didn't warn about unsupported charsets). (Wez)
+- Fixed bug #11643 (Session related, fix SID redefinition). (Ilia)
+- Fixed bug #18556 (Scripting Engine, problem with locales like tr_TR). (Ilia)
+- Changed y2k_compliance to default to 1 now. (Sascha)
+- Added platform independent socket error constants for better error handling. (Jason)
+- Fixed include(), require() and GD functions to work with remote files under
+  win32. Fixed bug #18609 (ImageCreateFromJPEG can't fetch from a URL. (Wez)
+- Update output of phpinfo() to use more CSS to reduce the file size, do
+  proper HTML escaping, and make it XHTML compliant. (Colin)
+- Added php.ini option "auto_detect_line_endings" which enables PHP to detect
+  Macintosh, Unix and Dos end-of-line characters in fgets() and file().
+  Fixes bugs #16521 and #16708. (Wez)
+- Fixed compile errors in the FriBidi extension (Bug #16414). (Tal)
+- Fixed bugs #7472, #12120 and #12989 as well as other potential problems
+  with strip_tags() function. (Ilia)
+- Fixed bugs #17570 and #17957 (Regexps related). (Andrei, Ilia)
+- Fixed bugs #18167 and #16859 (SEGV with session_decode). (Ilia)
+- Fixed bugs #19573 and #13472 (Session, XHTML compliance and trans_sid). 
+  (Sascha)
+- Fixed bug #19570 (last character was missing in get_html_translation_table). 
+  (Wez)
+- Upgraded PCRE to version 3.9. (Wez)
+- Fixed bug in OCIResult() which returned garbage when called on 
+  empty result-sets. (Thies)
+- Added ability to use Perl-style ${n} subpattern references in the
+  replacement string for preg_replace() (bug #18442). (Andrei)
+- Fixed array_merge_recursive() to avoid problems with merging cyclical
+  arrays (bug #16064). (Andrei)
+- Made function_exists() work properly with disabled functions. (Andrei)
+- Added ability to extract() variables as references via OR'able EXTR_REFS
+  flag. (Andrei)
+- Fixed a build failure with the OCI8 extension on Tru64.
+  (Patch by Michael Mauch, micahel.mauch@gmx.de)
+- Added support for fopen("ftps://...", ...) which allows to connect to FTP 
+  servers via SSL. (Stefan Esser)
+- Made the "User-Agent" header sent by the fopen wrappers to be configurable
+  in php.ini or via a stream context. (Sterling)
+- Added support for fopen("php://output", "wb") which returns a stream that
+  writes to the output buffer (like echo and print). (Wez)
+- Added --disable-all configure option. (Jani)
+- Backported debug_backtrace() from ZendEngine2. (Thies)
+- Added html-free phpinfo() output for CLI. (Jan)
+- Fixed socket_recvfrom() to be binary safe. (Jason)
+- Changed mail() to use escape_shell_cmd() to allow multiple extra parameters 
+  to the invocation of the mailer as used in the fifth parameter. (Derick)
+- Changed cURL extension to require cURL version 7.9.8 (Derick)
+- Added zend_execute_internal which is called like zend_execute but for
+  internal functions. (Thies)
+- Changed pg_connection_status(), pg_connection_reset(), pg_connection_busy(),
+  pg_result_status() and pg_result_error() to silently return FALSE when 
+  resource is not passed to them. (Yasuo)
+- Fixed some mysql compile failures on 64 bit-OS. (Georg)
+- Added warnings for deprecated mysql functions:
+  . mysql_create_db() 
+  . mysql_drop_db() 
+  . mysql_escape_string()
+- Added XsltObject->result_dump_mem($result) for returning xslt-result directly
+  into a string and XsltObject->result_dump_file($result,$file[,$compression]) 
+  for dumping into a file. (morus.walter@web.de, chregu)
+- Made mime_magic, FriBidi and ZIP extensions available on Windows. (Edin)
+- Added xslt_backend_version() and xslt_backend_name() for getting
+  information about the processor backend. (chregu)
+- Added php.ini option "allow_webdav_methods" to allow handling of
+  WebDAV http requests within PHP scripts. (chregu)
+- Added ImageColorMatch() and ImageLayerEffect() functions which are only 
+  available when using the bundled GD library. (ttoohey)
+- Made major improvents to the pcntl extension. (Jason)
+  . Greatly improved performance (signal callback mechanism uses ticks)
+  . Implemented object signal callback ability by using array($obj, $method)
+  . Added a restart parameter to pcntl_signal, which allows you to disable
+    the default of system call restarting
+- Changed DomNode->next_sibling() and DomNode->previous_sibling() to return
+  NULL instead of false (W3C specs). (chregu)
+- Changed DomNode->insert_before() and DomNode->append_child() to conform to
+  W3C specs (moving not copying nodes, accepting NULL as 2nd param). (chregu)
+- Added DomNode->set_namespace(uri[,prefix]) (chregu)
+- Fixed shuffle() to properly generate all possibilities. (Patch provided by
+  Adam <adam@trachtenberg.com>)
+- Fixed DomNode->insert_before() to behave according to W3C spec
+  ie. new_child is moved, not copied. (chregu)
+- Added some namespace support with DomNode->add_namespace(uri, prefix)
+  and DomDocument->create_element_ns(uri, nodename) (chregu)
+- Added optional parameter to DomElement->node_name() for retrieving fully 
+  qualified name (ie. namespace prefix). (chregu)
+- Changed DomNode->child_nodes() to return empty array instead of false if no
+  child nodes are found. (chregu)
+- Fixed a bug with handling the Expect header. (Patch by ilia@prohost.org)
+- Fixed a bug in ODBC where closing the module caused a crash in the Windows 
+  executable. (kalowsky)
+- Fixed memory leaks in pack() and unpack(). (Patch by ilia@prohost.org)
+- Added php.ini option "default_socket_timeout" to set the timeout limit for 
+  PHP streams. (kalowsky, ilia@prohost.org, Wez)
+- Added URLs to error messages which direct to a page describing the error or 
+  function in question. (Derick, Wez, Marcus)
+- Added odbc_data_source() functionality to identify DB ServerName, and a 
+  description of it gathered from the DSN. (kalowsky)
+- Fixed copy() to return TRUE with 0 byte files. (Patch by ilia@prohost.org)
+- Added ob_list_handlers() which returns an array of all active output
+  handlers. (Marcus)
+- Added mbstring encoding/decoding "HTML-ENTITIES". (Marcus)
+- Added parameter 'L' for mb_http_input() to retrieve input encoding as a
+  comma separated string. (Marcus)
+- Added the ability for declare() compiler modifications to occur globally
+  by using an empty statement. (Jason, Zend Engine)
+  i.e.  
+        //Globally enables the ticks modifier for the whole program
+        declare (ticks=1);
+
+        //Enables the ticks modifier for just the lexical block containing
+        //"statement".
+        declare (ticks=1) {
+           statement;
+        }
+- Brought strtotime() "next" keyword handling in line with documentation and
+  its glibc cousin. (Rasmus)
+- Fixed str_rot13() to not mangle source string. (Rasmus)
+- Fixed imap_get_quota() to work with multiple returned resources as per
+  the RFC 2087 and bug #14673. (kalowsky, Sander Steffann)
+- Added MarkerNote decoding to exif_read_data() for several Cameras. (Marcus)
+- Disabled zlib.output_compression for "image/" content-type
+  headers which can be changed during script execution. (Stefan)
+- Added new asynchronous FTP functions. (Stefan)
+- Added optional 5th parameter to FTP functions to support resuming. (Stefan)
+- Added optional 2nd parameter to print_r() to make it return the variable
+  representation instead of echoing it. (Derick)
+- Added mysql_ping(), mysql_real_escape_string(), mysql_character_set_name(), 
+  mysql_thread_id(), mysql_stat() and mysql_list_processes(). (Zak, Georg)
+- Added safe_mode & open_basedir checks for pg_lo_export(). (Yasuo)
+- Added open_basedir check for pg_lo_import(). (Yasuo)
+- Fixed infinite recursion crash bug in ticks. (Jason)
+- Added php.ini option "mysql.connect_timeout" to set the timeout limit for 
+  mysql_connect() and mysql_pconnect(). (Georg)
+- Added optional parameter "flags" to mysql_connect() and mysql_pconnect() 
+  which can be used to set usage of idle timeout and different protocols,
+  SSL and compressed. (Georg)
+- Added automatic rollback to ext/mysql for non committed transactions. (Georg)
+- Fixed cases where preg_split() incorrectly terminated final element if it 
+  contained null bytes. (Andrei)
+- Added persistent connections/pipelining to thttpd. (Sascha)
+- Fixed two potential blocking issues in thttpd. (Sascha)
+- Fixed broken header file detection on Solaris. (Sascha)
+- Improved nss/socket-related symbol/library detection. (Jani, Sascha)
+- Made iconv() work well with both libiconv and libgconv. (Moriyoshi, Yasuo)
+- Fixed socket_set_timeout() on win32. (Jason, Edin, Jani)
+- Added domxml_node_namespace_uri(). (Rui Lopes)
+- Fixed win32 memory leak in /ext/sockets that would occur on any error 
+  condition. Also fixed host resolution error messages on win32. (Jason)
+- Added optional 3rd parameter 'recursive' to ftp_rawlist() which will
+  do 'LIST -R' instead of 'LIST'. (Jani)
+- Disabled the fifth parameter in mail() when safe-mode is turned on. (Derick)
+- Changed getimagesize() to always set unknown fields to 0 and added support
+  for iff imagetype. (Marcus)
+- Added runtime Apache2 thread check to ensure we don't run a non-threaded
+  PHP inside a threaded Apache2 MPM.  (Rasmus)
+- Made getimagesize() and exif_read_data() to return also the mime-type and 
+  exif_thumbnail() to return also the image-type. (Marcus)
+- Added image_type_to_mime_type() which converts image-types to mime-types.
+  (Marcus)
+- Made GD functions to only exist if they are available in libgd. Now the 
+  availability can be tested with function_exists(). (Derick)
+- Added an optional parameter to the header() function which overrides the HTTP
+  response code. (Derick)
+- Changed the order of which modules are unloaded to the reverse order of
+  which they were loaded. (Derick, Zend Engine)
+- Added preliminary SAX-Input support. It's now possible to build a DomDocument
+  with SAX-Events. (chregu)
+- Bundled GD library 2.0.1 with php (ext/gd/libgd) (Rasmus, Jani, 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)
+- If zlib.output_compression is enabled and a page is compressed 
+  a "Vary: Accept-Encoding" header is now 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 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, fixed crash with Cc, fixed 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 large OID value (2^31 to 2^32) support for pg_lo_import(),
+  pg_lo_unlink(), pg_lo_open() and pg_lo_export(). (Yasuo)
+- Changed 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 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. (stream_register_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, Derick)
+- 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)
+
+06 Sep 2002, Version 4.2.3
+- Enable UTF8 modifier support for PCRE on win32. (Wez, Edin)
+- Enabled strcoll() on win32. (Markus)
+- Fixed possible ASCII control char injection in mail(). (Stefan Esser)
+- Fixed a potential crash bug in import_request_variables() (Zeev)
+- Fixed several problems with directory functions on Windows. (Steph)
+- Fixed xbithack bug in Apache module. (Rasmus)
+- Fixed a bug that prevented touch() from working on various platforms. (Steph)
+- Fixed ob_gzhandler()'s handling of requests that do have the Accept-Encoding
+  header, but do not allow compression. (Zeev)
+- Fixed several bugs in the multithreaded version that could cause random parse
+  errors, especially on machines with multiple CPUs. (Zeev, Zend Engine)
+- Fixed a build problem in bcmath. (Alan)
+- Fixed several bzip2 issues. (Andrei, kalowsky)
+- Fixed several COM issues. (Harald)
+- Various exif fixes. (Marcus)
+- Fixed domxml_xslt_process() and domxml_get_element_by_id() and several
+  other issues in DOMXML. (Christian)
+- Fixed DOMXML crash on removing previously created attributes. (Christian)
+- Fixed crash when converting $GLOBALS to an object. (Zeev, Zend Engine)
+- Fixed ImageCreateFromGD2Part() (Jani)
+- Fixed a build issue in the IMAP extension under IRIX. (kalowsky)
+- Fixed a bug in imap_last_error() (Jani)
+- Various mbstring fixes. (Yasuo, Rui)
+- Fixed a build problem in the mcal extension. (Jani)
+- Made MySQL rollback open transactions when the request ends. (Georg)
+- Fixed a crash in the shutdown order of the ODBC module. (kalowsky)
+- Fixed PCRE build problems. (troels@arvin.dk)
+- Fixed a crash in pg_lo_write() (Yasuo)
+- Fixed posix_isatty() and posix_ttyname(). (Markus)
+- Fixed accidental pg_lo_import() API change. (Yasuo)
+- Fixed ereg_replace() crash when the backreference number was greater than the 
+  number of captured subpatterns. (oliver@billix.franken.de)
+- Fixed array_rand() on thread-safe platforms such as Windows. (Edin)
+- Report the right exit code after a call to exit(). (Edin)
+
+22 Jul 2002, Version 4.2.2
+- Fixed serious security vulnerability. (Stefan Esser)
+
+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
+- 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.
+  (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.
@@ -28,7 +549,6 @@ PHP 4                                                                      NEWS
     ?>
 - Fixed segfault in ibase_close() if user does not free the resultset.
   Bugs #15419, #15992. (daniela)
-- Fixed pg_last_notice() crash. (Yasuo)
 - 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)
@@ -235,6 +755,7 @@ PHP 4                                                                      NEWS
   GMT +0100 and GMT -0100. (Derick)
 
 10 Dec 2001, Version 4.1.0
+- Fixed return values for strtok (Bug #13866) (jmoore)
 - Worked around a bug in the MySQL client library that could cause PHP to hang
   when using unbuffered queries. (Zeev)
 - Fixed a bug which caused set_time_limit() to affect all subsequent requests
@@ -299,9 +820,9 @@ PHP 4                                                                      NEWS
   there's no need to import them using the 'global' statement.  (Andi & Zeev)
 - Added vprintf() and vsprintf() functions that allow passing all arguments
   after format as an array. (Andrei)
-- Added support for GD2 image type for ImageCreateFromString() (Jani)
+- Added support for GD2 image type for ImageCreateFromString(). (Jani)
 - Added ImageCreateFromGD(), ImageCreateFromGD2(), ImageCreateFromGD2part(),
-  ImageGD() and ImageGD2() functions (Jani)
+  ImageGD() and ImageGD2() functions. (Jani)
 - addcslashes now warns when charlist is invalid. The returned string
   remained the same (Jeroen)
 - Added optional extra argument to gmp_init(). The extra argument

README.CVS-RULES

@@ -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
@@ -83,7 +84,7 @@ For datetime.c:
 For string.c:
 (php_trim) Fixed a memory leak resulting from improper use of zval_dtor().
 # Man, that thing was leaking all over the place!
-@- Memory leak in trim() function has finally been fixed. (Bob)
+@- Fixed memory leak in trim(). (Bob)
 
 The lines above marked with @ will go into NEWS file automagically, and the
 # lines will be omitted from the ChangeLog. Alternatively, you might want

README.EXT_SKEL

@@ -7,17 +7,22 @@ WHAT IT IS
 
 HOW TO USE IT
 
-  Very simple. First, cd do directory ext/ in PHP 4 sources. If you just need
-  the basic framework and will be writing all the code in your functions
-  yourself, you can now do
+  Very simple. First, change to the ext/ directory of the PHP 4 sources. If
+  you just need the basic framework and will be writing all the code in your
+  functions yourself, you can now do
 
    ./ext_skel --extname=module_name
 
-  and everything you need is placed in directory module_name. In fact, if you
-  don't need to test the existence of any external header files, libraries or
-  functions in them, the module is already almost ready to be compiled in PHP.
-  Just remove 3 comments in your_module_name/config.m4, cd back up to PHP
-  sources top directory, and do
+  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, 
+  change back up to PHP sources top directory, and do
 
     ./buildconf; ./configure --enable-module_name; make
 
@@ -33,7 +38,7 @@ HOW TO USE IT
 FORMAT OF FUNCTION DEFINITIONS FILE
 
   All the definitions must be on one line. In it's simplest form, it's just
-  the function name, ie.
+  the function name, e.g.
 
     my_function
 

README.PARAMETER_PARSING_API

@@ -26,7 +26,7 @@ and not output any error messages.
 Both functions return SUCCESS or FAILURE depending on the result.
 
 The auto-conversions are performed as necessary. Arrays, objects, and
-resources cannot be autoconverted.
+resources cannot be auto-converted.
 
 
 Type specifiers
@@ -105,11 +105,20 @@ if (zend_parse_parameters(3 TSRMLS_CC, "zbr!",
 /* Get either a set of 3 longs or a string. */
 long l1, l2, l3;
 char *s;
+/* 
+ * The function expects a pointer to a integer in this case, not a long
+ * or any other type.  If you specify a type which is larger
+ * than a 'int', the upper bits might not be initialized
+ * properly, leading to random crashes on platforms like
+ * Tru64 or Linux/Alpha.
+ */
+int length;
+
 if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
 							 "lll", &l1, &l2, &l3) == SUCCESS) {
 	/* manipulate longs */
 } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
-									"s", &s) == SUCCESS) {
+									"s", &s, &length) == SUCCESS) {
 	/* manipulate string */
 } else {
 	/* output error */

README.SELF-CONTAINED-EXTENSIONS

@@ -4,10 +4,9 @@ $Id$
 HOW TO CREATE A SELF-CONTAINED PHP EXTENSION
 
   A self-contained extension can be distributed independently of
-  the PHP source. To create such an extension, three things are
+  the PHP source. To create such an extension, two 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,9 @@ 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. Then, run phpize
+  (this is installed during make install by PHP 4.0).
+
   For example, if you configured PHP with --prefix=/php, you would run
 
      $ /php/bin/phpize
@@ -157,17 +142,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)

README.STREAMS

@@ -2,16 +2,17 @@ An Overview of the PHP Streams abstraction
 ==========================================
 $Id$
 
-Please send comments to: Wez Furlong <wez@thebrainroom.com>
+WARNING: some prototypes in this file are out of date.
+The information contained here is being integrated into
+the PHP manual - stay tuned...
 
-Note: this doc is preliminary and is intended to give the reader an idea of
-how streams work and should be used.
+Please send comments to: Wez Furlong <wez@thebrainroom.com>
 
 Why Streams?
 ============
 You may have noticed a shed-load of issock parameters flying around the PHP
 code; we don't want them - they are ugly and cumbersome and force you to
-special case sockets and files everytime you need to work with a "user-level"
+special case sockets and files every time you need to work with a "user-level"
 PHP file pointer.
 Streams take care of that and present the PHP extension coder with an ANSI
 stdio-alike API that looks much nicer and can be extended to support non file
@@ -26,7 +27,9 @@ 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 size_t php_stream_printf(php_stream * stream TSRMLS_DC, 
+        const char * fmt, ...);
 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);
@@ -36,20 +39,123 @@ PHPAPI int php_stream_seek(php_stream * stream, off_t offset, int whence);
 PHPAPI off_t php_stream_tell(php_stream * stream);
 
 These (should) behave in the same way as the ANSI stdio functions with similar
-names: fread, fwrite, feof, fgetc, fgets, fclose, fflush, fseek, ftell.
+names: fread, fwrite, fprintf, 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 forward, 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 +165,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 +189,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 desirable, 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 +205,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 +226,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 +238,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 +260,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,10 +281,23 @@ 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
-mysql, you might want to store the connection and rowset handles.
+MySQL, you might want to store the connection and rowset handles.
 
 The stream has a field called abstract that you can use to hold this data.
 If you need to store more than a single field of data, define a structure to
@@ -176,9 +306,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);
@@ -197,36 +327,36 @@ Once you have that part figured out, you can write your implementation and
 define the your own php_stream_ops struct (we called it my_ops in the above
 example).
 
-For example, for reading from this wierd mysql stream:
+For example, for reading from this weird 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 +370,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

README.SUBMITTING_PATCH

@@ -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 the PHP and
+   web server 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!

README.TESTING

@@ -1,151 +1,285 @@
 [IMPORTANT NOTICE]
 ------------------
-Do _not_ ask to developers why some or all tests are failed under
+ 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]
---------
-You must build CGI SAPI, then you can do "make test" to
-execute all or some test scripts saved under
+[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
-like
-
-./php -c php.ini-dist run-tests.php [ext/some_extension_name]
+under the source root (parallel builds will not work). Therefore you
+can execute the script as follows:
 
+TEST_PHP_EXECUTABLE=sapi/cli/php \
+sapi/cli/php [-c /path/to/php.ini] run-tests.php [ext/foo/tests/GLOB]
 
 
 [Which "php" executable "make test" look for]
 ---------------------------------------------
- "make test" executes "run-tests.php" script with "./php".
-Test scripts must be executed by CGI SAPI. Therefore, you 
-must build PHP with CGI SAPI to perform tests.
+ You must use TEST_PHP_EXECUTABLE environment variable to explicitly
+select the php executable to be used to run the tests. That can either
+be the CLI or CGI executable.
 
- "run-tests.php" look for "php" executable in build top directory,
-then look for search path. Therefore, if you have "php" executable
-other than CGI SAPI in your search path or source root, tests may fail.
+ "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.
 
+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:
-./php -c ./your_php.ini ext/standard
-
-If you use php.ini other than php.ini-dist, you may see more
-failed.
+ "make test" uses the same php.ini file as it would once installed.
+The tests have been written to be independent of that php.ini file,
+so if you find a test that is affected by a setting, please report
+this, so we can address the issue.
 
 
 [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.
+ "run-tests.php" ("make test"), without any arguments executes all
+test scripts by extracting all directories named "tests"
+from the source root and any subdirectories below. If there are files,
+which have a "phpt" extension, "run-tests.php" looks at the sections
+in these files, determines whether it should run it, by evaluating
+the 'SKIP' section. If the test is eligible for execution, the 'FILE'
+section is extracted into a ".php" file (with the same name besides 
+the extension) and gets executed.
+When an argument is given or TESTS environment variable is set, the
+GLOB is expanded by the shell and any file with extension "*.phpt" is
+regarded as a test file.
 
- Tester can easily executes tests selectively with as follows.
+ Tester can easily execute tests selectively with as follows.
 
-Example:
-./php -c php.ini-dist run-tests.php ext/mbstring
+Examples:
+./sapi/cli/php run-tests.php ext/mbstring/*
+./sapi/cli/php run-tests.php ext/mbstring/020.phpt
 
 
 [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:
+the "run-tests.php" script saves the result, the expected result and the
+code executed to the test script directory. For example, if 
+ext/myext/tests/myext.phpt fails to pass, the 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
+ext/myext/tests/myext.php   - actual test file executed
+ext/myext/tests/myext.log   - log of test execution (L)
+ext/myext/tests/myext.exp   - expected output (E)
+ext/myext/tests/myext.out   - output from test script (O)
+ext/myext/tests/myext.diff  - diff of .out and .exp (D)
 
- Tester can verify these files, if failed test is actually a bug
-or not. 
+ Failed tests are always bugs. Either the test is bugged or not considering
+factors applying to the tester's environment, or there is a bug in PHP.
+If this is a known bug, we strive to provide bug numbers, in either the
+test name or the file name. You can check the status of such a bug, by
+going to: http://bugs.php.net/12345 where 12345 is the bug number.
+For clarity and automated processing, bug numbers are prefixed by a hash
+sign '#' in test names and/or test cases are named bug12345.phpt.
+
+NOTE: The files generated by tests can be selected by setting the
+environment variable TEST_PHP_LOG_FORMAT. For each file you want to be
+generated use the character in brackets as shown above (default is LEOD).
+The php file will be generated always.
+
+NOTE: You can set environment variable TEST_PHP_DETAILED to enable
+detailed test information.
+
+[Automated testing]
+ If you like to keep up to speed, with latest developments and quality
+assurance, setting the environment variable NO_INTERACTION to 1, will not
+prompt the tester for any user input.
+
+Normally, the exit status of "make test" is zero, regardless of the results
+of independent tests. Set the environment variable REPORT_EXIT_STATUS to 1,
+and "make test" will set the exit status ("$?") to non-zero, when an
+individual test has failed.
+
+Example script to be run by cron(1):
+========== qa-test.sh =============
+#!/bin/sh
+
+CO_DIR=$HOME/cvs/php4
+MYMAIL=qa-test@domain.com
+TMPDIR=/var/tmp
+TODAY=`date +"%Y%m%d"`
+
+# Make sure compilation enviroment is correct
+CONFIGURE_OPTS='--disable-all --enable-cli --with-pcre'
+export MAKE=gmake
+export CC=gcc
+
+# Set test environment
+export NO_INTERACTIVITY=1
+export REPORT_EXIT_STATUS=1
+
+cd $CO_DIR
+cvs update . >>$TMPDIR/phpqatest.$TODAY
+./cvsclean ; ./buildconf ; ./configure $CONFIGURE_OPTS ; $MAKE
+$MAKE test >>$TMPDIR/phpqatest.$TODAY 2>&1
+if test $? -gt 0
+then
+        cat $TMPDIR/phpqatest.$TODAY | mail -s"PHP-QA Test Failed for $TODAY" $MYMAIL
+fi
+========== end of qa-test.sh =============
+
+NOTE: the exit status of run-tests.php will be 1 when
+REPORT_EXIT_STATUS is set. The result of "make test" may be higher
+than that. At present, gmake 3.79.1 returns 2, so it is
+advised to test for non-zero, rather then a specific value.
 
 
 [Creating new test files]
 -------------------------
- Writing test file is very easy if you are used to PHP. Test file
-has following format. Here is a actual test file from iconv module.
+ Writing test file is very easy if you are used to PHP. 
 
-===== ext/iconv/002.phpt =======
+Here is an actual test file from standard module.
+
+===== ext/standard/tests/strings/strtr.phpt =======
 --TEST--
-UCS4BE to ASCII
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+strtr() function
 --FILE--
-<?php include('002.inc'); ?>
+<?php
+/* Do not change this test it is a REATME.TESTING example. */
+$trans = array("hello"=>"hi", "hi"=>"hello", "a"=>"A", "world"=>"planet");
+var_dump(strtr("# hi all, I said hello world! #", $trans));
+?>
 --EXPECT--
-&#97;&#98;&#99;&#100;
-abcd
-===== end of ext/iconv/002.phpt =======
+string(32) "# hello All, I sAid hi planet! #"
+===== ext/standard/tests/strings/strtr.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.
+As you can see the file is devided into several sections. Below is a
+list of all possible sections:
 
-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. 
+"--TEST--"        is title of the test (required).
+"--SKIPIF--"      is condition when to skip this test (optional).
+"--POST--"        is POST variable passed to test script (optional).
+"--GET--"         is GET variable passed to test script (optional).
+"--INI--"         each line contains an ini setting e.g. foo=bar (optional).
+"--FILE--"        is the test script (required).
+"--EXPECT--"      is the expected output from the test script (required).
+"--EXPECTF--"     is an alternative of --EXPECT--. The difference is that
+                  this form uses sscanf for output validation (alternative).
+"--EXPECTREGEX--" is an alternative of --EXPECT--. This form allows the tester
+                  to specify the result in a regular expression (alternative).
 
-==== ext/iconv/skipif.inc ====
+A test must at least contain the sections TEST, FILE and either EXPECT
+or EXPECTF. When a test is called run-test.php takes the name from the
+TEST section and writes the FILE section into a ".php" file with the 
+same name as the ".phpt" file. This ".php" file will then be executed
+and its output compared to the contents of the EXPECT section. It is a
+good idea to generate output with var_dump() calls.
+
+/ext/standard/tests/strings/str_shuffle.phpt is a good example for using 
+EXPECTF instead of EXPECT. From time to time the algorithm used for shuffle 
+changed and sometimes the machine used to execute the code has influence 
+on the result of shuffle. But it always returns a three character string 
+detectable by %s. Other scan-able forms are %i for integers, %d for numbers
+only, %f for floating point values, %c for single characters and %x for 
+hexadecimal values.
+
+==== /ext/standard/tests/strings/str_shuffle.phpt ===
+--TEST--
+Testing str_shuffle.
+--FILE--
 <?php
-// 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");
-}
+/* Do not change this test it is a REATME.TESTING example. */
+$s = '123';
+var_dump(str_shuffle($s));
+var_dump($s);
 ?>
-==== end of ext/iconv/skipif.inc ====
+--EXPECTF--
+string(3) %s
+string(3) "123"
+==== end of /ext/standard/tests/strings/str_shuffle.phpt ===
 
-ext/inconv/002.inc is the test script. "run-tests.php" script
-executes test script with CGI executable.
+/ext/standard/tests/strings/strings001.phpt is a good example for using 
+EXPECTREGEX instead of EXPECT. This test also shows that in EXPECTREGEX 
+some characters need to be escaped since otherwise they would be 
+interpreted as a regular expression.
 
-==== ext/iconv/002.inc ===
+==== /ext/standard/tests/strings/strings001.phpt ===
+--TEST--
+Test whether strstr() and strrchr() are binary safe.
+--FILE--
 <?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";
+/* Do not change this test it is a REATME.TESTING example. */
+$s = "alabala nica".chr(0)."turska panica";
+var_dump(strstr($s, "nic"));
+var_dump(strrchr($s," nic"));
 ?>
-=== end of ext/iconv/002.inc ===
+--EXPECTREGEX--
+string\(18\) \"nica\x00turska panica\"
+string\(19\) \" nica\x00turska panica\"
+==== end of /ext/standard/tests/strings/strings001.phpt ===
 
-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:
+Some tests depend on modules or functions available only in certain versions 
+or they even require minimum version of php or zend. These tests should be 
+skipped when the requirement cannot be fullfilled. To achieve this you can
+use the SKIPIF section. To tell run-test.php that your test should be skipped
+the SKIPIF section must print out the word "skip" followed by a reason why
+the test should skip.
 
-./php -c /etc/php.ini-dist ext/iconv
+==== /ext/exif/tests/exif005.phpt ===
+--TEST--
+Check for exif_read_data, unusual IFD start
+--SKIPIF--
+<?php 
+	if (!extension_loaded('exif')) print 'skip exif extension not available';
+?>
+--FILE--
+<?php
+/* Do not change this test it is a REATME.TESTING example.
+ * test5.jpg is a 1*1 image that contains an Exif section with ifd = 00000009h
+ */
+$image  = exif_read_data('./ext/exif/tests/test5.jpg','',true,false);
+var_dump($image['IFD0']);
+?>
+--EXPECT--
+array(2) {
+  ["ImageDescription"]=>
+  string(11) "Ifd00000009"
+  ["DateTime"]=>
+  string(19) "2002:10:18 20:06:00"
+}
+==== end of /ext/exif/tests/exif005.phpt ===
 
+Test script and SKIPIF code should be directly written into *.phpt. However, 
+it is recommended to use include files when more test scripts depend on the 
+same SKIPIF code or when certain test files need the same values for some 
+input. But no file used by any test should have one of the following 
+extensions: ".php", ".log", ".exp", ".out" or ".diff".
+
+Tests should be named according to the following list:
+
+Class:                       Name:                  Example:
+Tests for bugs               bug<bugid>.phpt        bug17123.phpt
+Tests for functions          <functionname>.phpt    dba_open.phpt
+General tests for extensions <extname><no>.phpt     dba3.phpt
+
+When you use an include file for the SKIPIF section it should be named
+"skipif.inc" and an include file used in the FILE section of many tests
+should be named "test.inc".
+
+NOTE: All tests should run correctly with error_reporting(E_ALL) and
+display_errors=1. This is the default when called from run-test.php.
+If you have a good reason for lowering the error reporting, use --INI--
+section and comment this in your testcode.
+
+NOTE: If your test intentionally generates a PHP warning message use 
+$php_errormsg variable, which you can then output. This will result 
+in a consistent error message output across all platforms and PHP 
+configurations, preventing your test from failing due inconsistencies 
+in the error message content.
 
 [How to help us]
 ----------------

README.UNIX-BUILD-SYSTEM

@@ -0,0 +1,123 @@
+PHP Build System V5 Overview
+
+- supports Makefile.ins during transition phase
+- not-really-portable Makefile includes have been eliminated
+- supports separate 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, depending 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.

RELEASE_PROCESS

@@ -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
-

TODO

@@ -22,8 +22,6 @@ Zend
     * 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.
-    * Fix Zend shallow copy issues with objects and arrays.
 
 
 global
@@ -43,15 +41,8 @@ global
     * on some platforms unimplemented function will just do nothing 
       (e.g. symlink) they should print a warning or not even be defined!
       (DONE ?)
-    * 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.
     * 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
@@ -87,10 +78,16 @@ documentation
     * 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/oci8
@@ -101,10 +98,26 @@ ext/oci8
     * Make allow_call_time_pass_reference=Off working.
     * For additional todo information, see oci8.c, in ext/oci8
 
+ext/odbc
+--------
+    For PHP 4.3.0:
+    * update all php_error calls to php_error_docref where valid
+    * integrate EXPERIMENTAL ODBC update for use in PHP 5.0, use for
+      testing purposes only.
+
+    For PHP 5.0.0
+    * Activate EXPERIMENTAL ODBC codebase update
+
 ext/pcre
 --------
     * Allow user to set PCRE_NOTEMPTY, PCRE_ANCHORED at execution time, maybe
 
+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:
@@ -129,8 +142,8 @@ ext/session
 
 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
 ------------
@@ -145,14 +158,7 @@ ext/standard
         basename()
         dirname()
         strrpos()
-        strrchr()
         strip_tags()
-    * Rewrite win32 SMTP code to be usable for *ix to, maybe as a (default)
-      module of its own (Hartmut)
-
-ext/zziplib
-------------
-    * More fully support the zziplib API
 
 ext/wddx
 --------

TODO.BUILDv5

@@ -0,0 +1,3 @@
+- clean up .cvsignores
+- purge Makefile.ins and replace PHP_EXTENSION in config.m4s
+  with appropiate calls to PHP_NEW_EXTENSION

TSRM/TSRM.c

@@ -15,7 +15,6 @@
 #ifdef ZTS
 
 #include <stdio.h>
-#include <stdlib.h>
 
 #if HAVE_STDARG_H
 #include <stdarg.h>
@@ -80,7 +79,7 @@ static FILE *tsrm_error_file;
 		}																												\
 	}
 #else
-#define TSRM_ERROR
+#define TSRM_ERROR(args)
 #define TSRM_SAFE_RETURN_RSRC(array, offset, range)		\
 	if (offset==0) {									\
 		return &array;									\
@@ -96,9 +95,10 @@ static pthread_key_t tls_key;
 static int tls_key;
 #elif defined(TSRM_WIN32)
 static DWORD tls_key;
+#elif defined(BETHREADS)
+static int32 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)
 {
@@ -111,6 +111,8 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu
 	st_key_create(&tls_key, 0);
 #elif defined(TSRM_WIN32)
 	tls_key = TlsAlloc();
+#elif defined(BETHREADS)
+	tls_key = tls_allocate();
 #endif
 
 	tsrm_error_file = stderr;
@@ -259,6 +261,8 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 	st_thread_setspecific(tls_key, (void *) *thread_resources_ptr);
 #elif defined(TSRM_WIN32)
 	TlsSetValue(tls_key, (void *) *thread_resources_ptr);
+#elif defined(BETHREADS)
+	tls_set(tls_key, (void*) *thread_resources_ptr);
 #endif
 
 	if (tsrm_new_thread_begin_handler) {
@@ -298,6 +302,8 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 		thread_resources = st_thread_getspecific(tls_key);
 #elif defined(TSRM_WIN32)
 		thread_resources = TlsGetValue(tls_key);
+#elif defined(BETHREADS)
+		thread_resources = (tsrm_tls_entry*)tls_get(tls_key);
 #else
 		thread_resources = NULL;
 #endif
@@ -412,6 +418,8 @@ 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)
@@ -422,6 +430,8 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 	return PIThread_getCurrent();
 #elif defined(TSRM_ST)
 	return st_thread_self();
+#elif defined(BETHREADS)
+	return find_thread(NULL);
 #endif
 }
 
@@ -429,11 +439,18 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 /* Allocate a mutex */
 TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 {
-    MUTEX_T mutexp;
+	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));
+	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);
@@ -446,20 +463,26 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 	mutexp = PIPlatform_allocLocalMutex();
 #elif defined(TSRM_ST)
 	mutexp = st_mutex_new();
+#elif defined(BETHREADS)
+	mutexp = (beos_ben*)malloc(sizeof(beos_ben));
+	mutexp->ben = 0;
+	mutexp->sem = create_sem(1, "PHP sempahore"); 
 #endif
 #ifdef THR_DEBUG
-		printf("Mutex created thread: %d\n",mythreadid());
+	printf("Mutex created thread: %d\n",mythreadid());
 #endif
-    return( mutexp );
+	return( mutexp );
 }
 
 
 /* Free a mutex */
 TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 {
-    if (mutexp) {
+	if (mutexp) {
 #ifdef TSRM_WIN32
 		DeleteCriticalSection(mutexp);
+#elif defined(NETWARE)
+		NXMutexFree(mutexp);
 #elif defined(GNUPTH)
 		free(mutexp);
 #elif defined(PTHREADS)
@@ -471,10 +494,13 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 		PISync_delete(mutexp);
 #elif defined(TSRM_ST)
 		st_mutex_destroy(mutexp);
+#elif defined(BETHREADS)
+		delete_sem(mutexp->sem);
+		free(mutexp);  
 #endif
-    }
+	}
 #ifdef THR_DEBUG
-		printf("Mutex freed thread: %d\n",mythreadid());
+	printf("Mutex freed thread: %d\n",mythreadid());
 #endif
 }
 
@@ -486,6 +512,8 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 #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)
@@ -496,6 +524,10 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 	return PISync_lock(mutexp);
 #elif defined(TSRM_ST)
 	return st_mutex_lock(mutexp);
+#elif defined(BETHREADS)
+	if (atomic_add(&mutexp->ben, 1) != 0)  
+		return acquire_sem(mutexp->sem);   
+	return 0;
 #endif
 }
 
@@ -507,6 +539,8 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
 	LeaveCriticalSection(mutexp);
 	return 1;
+#elif defined(NETWARE)
+	return NXUnlock(mutexp);
 #elif defined(GNUPTH)
 	return pth_mutex_release(mutexp);
 #elif defined(PTHREADS)
@@ -517,6 +551,10 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 	return PISync_unlock(mutexp);
 #elif defined(TSRM_ST)
 	return st_mutex_unlock(mutexp);
+#elif defined(BETHREADS)
+	if (atomic_add(&mutexp->ben, -1) != 1) 
+		return release_sem(mutexp->sem);
+	return 0;   
 #endif
 }
 

TSRM/TSRM.h

@@ -13,12 +13,14 @@
 #ifndef TSRM_H
 #define TSRM_H
 
-#ifdef HAVE_CONFIG_H
+/* #ifndef WIN32 */
+#if !defined(WIN32) && !defined(NETWARE)
 # include "tsrm_config.h"
 #endif
 
 #ifdef WIN32
 # define TSRM_WIN32
+# include "tsrm_config.w32.h"
 #endif
 
 #ifdef TSRM_WIN32
@@ -36,12 +38,18 @@
 
 #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>
+#elif defined(BETHREADS)
+#include <kernel/OS.h> 
+#include <TLS.h>
 #endif
 
 typedef int ts_rsrc_id;
@@ -50,6 +58,9 @@ typedef int ts_rsrc_id;
 #ifdef TSRM_WIN32
 # define THREAD_T DWORD
 # define MUTEX_T CRITICAL_SECTION *
+#elif defined(NETWARE)
+# define THREAD_T NXThreadId_t
+# define MUTEX_T NXMutex_t *
 #elif defined(GNUPTH)
 # define THREAD_T pth_t
 # define MUTEX_T pth_mutex_t *
@@ -65,6 +76,13 @@ typedef int ts_rsrc_id;
 #elif defined(TSRM_ST)
 # define THREAD_T st_thread_t
 # define MUTEX_T st_mutex_t
+#elif defined(BETHREADS)
+# define THREAD_T thread_id
+typedef struct {
+  sem_id sem;
+  int32 ben;
+} beos_ben;
+# define MUTEX_T beos_ben * 
 #endif
 
 typedef void (*ts_allocate_ctor)(void *, void ***);

TSRM/threads.m4

@@ -102,26 +102,31 @@ 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
+if test "$beos_threads" = "1"; then
+  pthreads_working="yes"
+  ac_cv_pthreads_cflags=""
+else
+  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
+  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
 fi
 ])
 

TSRM/tsrm.m4

@@ -73,15 +73,19 @@ 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)
+if test "$beos_threads" = "1"; then 
+  AC_DEFINE(BETHREADS, 1, Whether to use native BeOS threads)
+else		
+  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)
+fi
 ])
 
 

TSRM/tsrm_config.nw.h

@@ -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

TSRM/tsrm_config.w32.h

@@ -4,6 +4,10 @@
 #define HAVE_UTIME 1
 #define HAVE_ALLOCA 1
 
+#include <malloc.h>
+#include <stdlib.h>
+#include <crtdbg.h>
+
 #undef inline
 #ifdef ZEND_WIN32_FORCE_INLINE
 # define inline __forceinline

TSRM/tsrm_config_common.h

@@ -5,22 +5,22 @@
 # define TSRM_WIN32
 #endif
 
-#ifndef TSRM_WIN32
+#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>
-#else
-# include "tsrm_config.w32.h"
 #endif
 
-#ifdef TSRM_WIN32
-#include <malloc.h>
+#if HAVE_ALLOCA_H && !defined(_ALLOCA_H)
+#  include <alloca.h>
 #endif
 
 /* AIX requires this to be the first thing in the file.  */
 #ifndef __GNUC__
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
+# ifndef HAVE_ALLOCA_H
 #  ifdef _AIX
  #pragma alloca
 #  else

TSRM/tsrm_nw.c

@@ -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

TSRM/tsrm_nw.h

@@ -12,20 +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: James Moore <jmoore@php.net>                                 |
+   | Authors: Venkat Raghavan S <rvenkat@novell.com>                      |
    +----------------------------------------------------------------------+
 */
 
-#ifndef _TEST_DLL_H
-#define _TEST_DLL_H
 
-#define TEST_DLL_API __declspec(dllexport)
+#ifndef TSRM_NW_H
+#define TSRM_NW_H
 
-typedef struct _name {
-	char *fname;
-	char *lname;
-} name;
+#include "TSRM.h"
 
-TEST_DLL_API void print_names(name *n);
+TSRM_API FILE* popen(const char *command, const char *type);
+TSRM_API int pclose(FILE* stream);
 
-#endif _TEST_DLL_H
+#endif

TSRM/tsrm_virtual_cwd.c

@@ -36,12 +36,21 @@
 #include "tsrm_win32.h"
 #endif
 
+#ifdef NETWARE
+/*#include "pipe.h"*/
+#include "tsrm_nw.h"
+#endif
+
+#ifndef HAVE_REALPATH
+#define realpath(x,y) strcpy(y,x)
+#endif
+
 #define VIRTUAL_CWD_DEBUG 0
 
 #include "TSRM.h"
 
-/* Only need mutex for popen() in Windows because it doesn't chdir() on UNIX */
-#if defined(TSRM_WIN32) && defined(ZTS)
+/* 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
 
@@ -68,7 +77,8 @@ cwd_state main_cwd_state; /* True global */
 #endif
 
 #ifdef TSRM_WIN32
-#define tsrm_strtok_r(a,b,c) strtok((a),(b))
+#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) 
@@ -84,6 +94,13 @@ static int php_check_dots(const char *element, int n)
 #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 "/"
@@ -120,9 +137,15 @@ static int php_check_dots(const char *element, int n)
 	
 static int php_is_dir_ok(const cwd_state *state) 
 {
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 	struct stat buf;
 
 	if (stat(state->cwd, &buf) == 0 && S_ISDIR(buf.st_mode))
+#else
+    struct stat_libc buf;
+
+    if (stat(state->cwd, (struct stat*)(&buf)) == 0 && S_ISDIR(buf.st_mode))
+#endif
 		return (0);
 
 	return (1);
@@ -130,9 +153,15 @@ static int php_is_dir_ok(const cwd_state *state)
 
 static int php_is_file_ok(const cwd_state *state) 
 {
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 	struct stat buf;
 
 	if (stat(state->cwd, &buf) == 0 && S_ISREG(buf.st_mode))
+#else
+    struct stat_libc buf;
+
+    if (stat(state->cwd, (struct stat*)(&buf)) == 0 && S_ISREG(buf.st_mode))
+#endif
 		return (0);
 
 	return (1);
@@ -255,7 +284,7 @@ CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC)
 
 /* 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)
+CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath)
 {
 	int path_length = strlen(path);
 	char *ptr, *path_copy;
@@ -273,9 +302,9 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	if (path_length == 0) 
 		return (0);
 
-#if !defined(TSRM_WIN32) && !defined(__BEOS__)
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 	if (IS_ABSOLUTE_PATH(path, path_length)) {
-		if (realpath(path, resolved_path)) {
+		if (use_realpath && realpath(path, resolved_path)) {
 			path = resolved_path;
 			path_length = strlen(path);
 		}
@@ -293,7 +322,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 		memcpy(ptr, path, path_length);
 		ptr += path_length;
 		*ptr = '\0';
-		if (realpath(tmp, resolved_path)) {
+		if (use_realpath && realpath(tmp, resolved_path)) {
 			path = resolved_path;
 			path_length = strlen(path);
 		}
@@ -308,7 +337,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	fprintf(stderr,"cwd = %s path = %s\n", state->cwd, path);
 #endif
 	if (IS_ABSOLUTE_PATH(path_copy, path_length)) {
-		copy_amount = COPY_WHEN_ABSOLUTE;
+        copy_amount = COPY_WHEN_ABSOLUTE(path_copy);
 		is_absolute = 1;
 #ifdef TSRM_WIN32
 	} else if (IS_UNC_PATH(path_copy, path_length)) {
@@ -363,7 +392,13 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 			state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1+1);
 #ifdef TSRM_WIN32
 			/* Windows 9x will consider C:\\Foo as a network path. Avoid it. */
-			if (state->cwd[state->cwd_length-1]!='\\' && state->cwd[state->cwd_length-1]!='/') {
+			if ((state->cwd[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
@@ -375,7 +410,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 		ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok);
 	}
 
-	if (state->cwd_length == COPY_WHEN_ABSOLUTE) {
+	if (state->cwd_length == COPY_WHEN_ABSOLUTE(state->cwd)) {
 		state->cwd = (char *) realloc(state->cwd, state->cwd_length+1+1);
 		state->cwd[state->cwd_length] = DEFAULT_SLASH;
 		state->cwd[state->cwd_length+1] = '\0';
@@ -404,7 +439,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 
 CWD_API int virtual_chdir(const char *path TSRMLS_DC)
 {
-	return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok)?-1:0;
+	return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok, 1)?-1:0;
 }
 
 CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path TSRMLS_DC) TSRMLS_DC)
@@ -425,7 +460,7 @@ CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path
 		return -1;
 	}
 
-	if (length == COPY_WHEN_ABSOLUTE && IS_ABSOLUTE_PATH(path, length+1)) { /* Also use trailing slash if this is absolute */
+	if (length == COPY_WHEN_ABSOLUTE(path) && IS_ABSOLUTE_PATH(path, length+1)) { /* Also use trailing slash if this is absolute */
 		length++;
 	}
 	temp = (char *) tsrm_do_alloca(length+1);
@@ -445,7 +480,7 @@ CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	retval = virtual_file_ex(&new_state, path, NULL);
+	retval = virtual_file_ex(&new_state, path, NULL, 1);
 	
 	if (!retval) {
 		int len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;
@@ -463,7 +498,7 @@ CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_f
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	retval = virtual_file_ex(&new_state, path, verify_path);
+	retval = virtual_file_ex(&new_state, path, verify_path, 1);
 
 	*filepath = new_state.cwd;
 
@@ -486,7 +521,7 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC)
 	}
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL);
+	virtual_file_ex(&new_state, path, NULL, 1);
 
 	f = fopen(new_state.cwd, mode);
 
@@ -494,6 +529,24 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC)
 	return f;
 }
 
+#if !defined(TSRM_WIN32)
+CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC)
+{
+	cwd_state new_state;
+	int ret;
+	
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, pathname, NULL, 1);
+
+	ret = access(new_state.cwd, mode);
+	
+	CWD_STATE_FREE(&new_state);
+	
+	return ret;
+}
+#endif
+
+
 #if HAVE_UTIME
 CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC)
 {
@@ -501,7 +554,7 @@ CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC)
 	int ret;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL);
+	virtual_file_ex(&new_state, filename, NULL, 0);
 
 	ret = utime(new_state.cwd, buf);
 
@@ -516,7 +569,7 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC)
 	int ret;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL);
+	virtual_file_ex(&new_state, filename, NULL, 1);
 
 	ret = chmod(new_state.cwd, mode);
 
@@ -524,14 +577,14 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC)
 	return ret;
 }
 
-#ifndef TSRM_WIN32
+#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);
+	virtual_file_ex(&new_state, filename, NULL, 0);
 
 	ret = chown(new_state.cwd, owner, group);
 
@@ -546,7 +599,7 @@ CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...)
 	int f;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL);
+	virtual_file_ex(&new_state, path, NULL, 1);
 
 	if (flags & O_CREAT) {
 		mode_t mode;
@@ -570,7 +623,7 @@ CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC)
 	int f;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL);
+	virtual_file_ex(&new_state, path, NULL, 1);
 
 	f = creat(new_state.cwd,  mode);
 
@@ -585,11 +638,11 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&old_state, &CWDG(cwd));
-	virtual_file_ex(&old_state, oldname, NULL);
+	virtual_file_ex(&old_state, oldname, NULL, 0);
 	oldname = old_state.cwd;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, newname, NULL);
+	virtual_file_ex(&new_state, newname, NULL, 0);
 	newname = new_state.cwd;
  
 	retval = rename(oldname, newname);
@@ -600,36 +653,50 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC)
 	return retval;
 }
 
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC)
 {
 	cwd_state new_state;
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL);
+	virtual_file_ex(&new_state, path, NULL, 1);
 
 	retval = stat(new_state.cwd, buf);
 
 	CWD_STATE_FREE(&new_state);
 	return retval;
 }
+#else
+CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC)
+{
+	cwd_state new_state;
+	int retval;
 
-#ifndef TSRM_WIN32
+	CWD_STATE_COPY(&new_state, &CWDG(cwd));
+	virtual_file_ex(&new_state, path, NULL, 1);
 
+	retval = stat(new_state.cwd, (struct stat*)buf);
+
+	CWD_STATE_FREE(&new_state);
+	return retval;
+}
+#endif
+
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC)
 {
 	cwd_state new_state;
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL);
+	virtual_file_ex(&new_state, path, NULL, 0);
 
 	retval = lstat(new_state.cwd, buf);
 
 	CWD_STATE_FREE(&new_state);
 	return retval;
 }
-
 #endif
 
 CWD_API int virtual_unlink(const char *path TSRMLS_DC)
@@ -638,7 +705,7 @@ CWD_API int virtual_unlink(const char *path TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL);
+	virtual_file_ex(&new_state, path, NULL, 0);
 
 	retval = unlink(new_state.cwd);
 
@@ -652,7 +719,7 @@ CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL);
+	virtual_file_ex(&new_state, pathname, NULL, 1);
 
 #ifdef TSRM_WIN32
 	retval = mkdir(new_state.cwd);
@@ -669,7 +736,7 @@ CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL);
+	virtual_file_ex(&new_state, pathname, NULL, 0);
 
 	retval = rmdir(new_state.cwd);
 
@@ -687,7 +754,7 @@ CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC)
 	DIR *retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL);
+	virtual_file_ex(&new_state, pathname, NULL, 1);
 
 	retval = opendir(new_state.cwd);
 
@@ -695,7 +762,45 @@ CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC)
 	return retval;
 }
 
-#ifndef TSRM_WIN32
+#ifdef TSRM_WIN32
+
+CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
+{
+	return popen_ex(command, type, CWDG(cwd).cwd, NULL);
+}
+
+#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)
 {
@@ -731,37 +836,6 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 	return retval;
 }
 
-#else
-
-/* 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;
-}
-
 #endif
 
 

TSRM/tsrm_virtual_cwd.h

@@ -50,12 +50,31 @@ typedef unsigned short mode_t;
 #define DEFAULT_SLASH '\\'
 #define DEFAULT_DIR_SEPARATOR	';'
 #define IS_SLASH(c)	((c) == '/' || (c) == '\\')
-#define COPY_WHEN_ABSOLUTE 2
+#define IS_SLASH_P(c)	(*(c) == '/' || \
+        (*(c) == '\\' && !IsDBCSLeadByte(*(c-1))))
+
+/* COPY_WHEN_ABSOLUTE also takes path as argument because netware needs it
+ * to account for volume name that is unique to NetWare absolute paths
+ */
+#define COPY_WHEN_ABSOLUTE(path) 2
 #define IS_ABSOLUTE_PATH(path, len) \
-	(len >= 2 && isalpha(path[0]) && path[1] == ':')
+	((len >= 2 && isalpha(path[0]) && path[1] == ':') || (len >= 1 && IS_SLASH(path[0])))
 #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>
@@ -70,12 +89,13 @@ typedef unsigned short mode_t;
 #endif
 
 #define IS_SLASH(c)	((c) == '/')
+#define IS_SLASH_P(c)	(*(c) == '/')
 
 #endif
 
 
 #ifndef COPY_WHEN_ABSOLUTE
-#define COPY_WHEN_ABSOLUTE 0
+#define COPY_WHEN_ABSOLUTE(path) 0
 #endif
 
 #ifndef IS_ABSOLUTE_PATH	
@@ -117,8 +137,12 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC);
 CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...);
 CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC);
+#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC);
-#ifndef TSRM_WIN32
+#else
+CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC);
+#endif
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC);
 #endif
 CWD_API int virtual_unlink(const char *path TSRMLS_DC);
@@ -126,15 +150,20 @@ CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC);
 CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC);
 CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC);
+
+#if !defined(TSRM_WIN32)
+CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC);
+#endif
+
 #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);
-#ifndef TSRM_WIN32
+#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);
+CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath);
 
 typedef struct _virtual_cwd_globals {
 	cwd_state cwd;
@@ -165,8 +194,8 @@ typedef struct _virtual_cwd_globals {
 #define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path TSRMLS_CC)
 #define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
 #define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
-#ifdef TSRM_WIN32
-#define VCWD_LSTAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
+#define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
 #else
 #define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
 #endif
@@ -175,11 +204,12 @@ typedef struct _virtual_cwd_globals {
 #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)
+#define VCWD_ACCESS(pathname, mode) virtual_access(pathname, mode 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)
-#ifndef TSRM_WIN32
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 #define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group TSRMLS_CC)
 #endif
 
@@ -201,8 +231,9 @@ typedef struct _virtual_cwd_globals {
 #define VCWD_RMDIR(pathname) rmdir(pathname)
 #define VCWD_OPENDIR(pathname) opendir(pathname)
 #define VCWD_POPEN(command, type) popen(command, type)
+#define VCWD_ACCESS(pathname, mode) access(pathname, mode)
 
-#ifndef TSRM_WIN32
+#ifdef HAVE_REALPATH
 #define VCWD_REALPATH(path, real_path) realpath(path, real_path)
 #else
 #define VCWD_REALPATH(path, real_path) strcpy(real_path, path)
@@ -212,7 +243,7 @@ typedef struct _virtual_cwd_globals {
 #define VCWD_UTIME(path, time) utime(path, time)
 #endif
 #define VCWD_CHMOD(path, mode) chmod(path, mode)
-#ifndef TSRM_WIN32
+#if !defined(TSRM_WIN32) && !defined(NETWARE)
 #define VCWD_CHOWN(path, owner, group) chown(path, owner, group)
 #endif
 

TSRM/tsrm_win32.c

@@ -18,7 +18,6 @@
 
 /* $Id$ */
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <io.h>
@@ -28,7 +27,6 @@
 #include "TSRM.h"
 
 #ifdef TSRM_WIN32
-#include <windows.h>
 #include "tsrm_win32.h"
 
 #ifdef ZTS
@@ -150,6 +148,11 @@ static HANDLE dupHandle(HANDLE fh, BOOL inherit) {
 }
 
 TSRM_API FILE *popen(const char *command, const char *type)
+{
+	return popen_ex(command, type, NULL, NULL);
+}
+
+TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env)
 {
 	FILE *stream = NULL;
 	int fno, str_len = strlen(type), read, mode;
@@ -192,7 +195,7 @@ TSRM_API FILE *popen(const char *command, const char *type)
 
 	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)) {
+	if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS, env, cwd, &startup, &process)) {
 		return NULL;
 	}
 	free(cmd);

TSRM/tsrm_win32.h

@@ -22,8 +22,6 @@
 #define TSRM_WIN32_H
 
 #include "TSRM.h"
-
-#ifdef TSRM_WIN32
 #include <windows.h>
 
 struct ipc_perm {
@@ -73,8 +71,6 @@ typedef struct {
 # define TWG(v) (win32_globals.v)
 #endif
 
-#endif
-
 #define IPC_PRIVATE	0
 #define IPC_CREAT	00001000
 #define IPC_EXCL	00002000
@@ -96,6 +92,7 @@ typedef struct {
 TSRM_API void tsrm_win32_startup(void);
 TSRM_API void tsrm_win32_shutdown(void);
 
+TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env);
 TSRM_API FILE *popen(const char *command, const char *type);
 TSRM_API int pclose(FILE *stream);
 

apidoc-zend.txt

@@ -1,280 +0,0 @@
-Following is a merge of two letters I sent to php4beta@lists.php.net,
-describing the changes in API between PHP 3.0 and PHP 4.0 (Zend).
-This file is by no means thorough documentation of the PHP API,
-and is intended for developers who are familiar with the PHP 3.0 API,
-and want to port their code to PHP 4.0, or take advantage of its new
-features.  For highlights about the PHP 3.0 API, consult apidoc.txt.
-
-Zeev
-
---------------------------------------------------------------------------
-
-I'm going to try to list the important changes in API and programming
-techniques that are involved in developing modules for PHP4/Zend, as
-opposed to PHP3.  Listing the whole PHP4 API is way beyond my scope here,
-it's mostly a 'diff' from the apidoc.txt, which you're all pretty familiar
-with.
-An important note that I neglected to mention yesterday - the php4 tree is
-based on the php 3.0.5 tree, plus all 3.0.6 patches hand-patched into it.
-Notably, it does NOT include any 3.0.7 patches.  All of those have to be
-reapplied, with extreme care - modules should be safe to patch (mostly),
-but anything that touches the core or main.c will almost definitely require
-changes in order to work properly.
-
-[1]  Symbol Tables
-
-One of the major changes in Zend involves changing the way symbols tables
-work.  Zend enforces reference counting on all values and resources.  This
-required changes in the semantics of the hash tables that implement symbol
-tables.  Instead of storing pval in the hashes, we now store pval *.  All
-of the API functions in Zend were changed in a way that this change is
-completely transparent.  However, if you've used 'low level' hash functions
-to access or update elements in symbol tables, your code will require
-changes.  Following are two simple examples, one demonstrates the
-difference between PHP3 and Zend when reading a symbol's value, and the
-other demonstrates the difference when writing a value.
-
-php3_read()
-{
-	pval *foo;
-
-	_php3_hash_find(ht, "foo", sizeof("foo"), &foo);
-	/* foo->type is the type and foo->value is the value */
-}
-
-
-php4_read()
-{
-	pval **foo;
-
-	_php3_hash_find(ht, "foo", sizeof("foo"), &foo);
-	/* (*foo)->type is the type and (*foo)->value is the value */
-}
-
----
-
-php3_write()
-{
-	pval newval;
-
-	newval.type = ...;
-	newval.value = ...;
-	_php3_hash_update(ht, "bar", sizeof("bar"), &newval, sizeof(pval), NULL);
-}
-
-php4_write()
-{
-	pval *newval = ALLOC_ZVAL();
-
-	newval->refcount=1;
-	newval->is_ref=0;
-	newval->type = ...;
-	newval->value = ...;
-	_php3_hash_update(ht, "bar", sizeof("bar"), &newval, sizeof(pval *), NULL);
-}
-
-
-[2]  Resources
-
-One of the 'cute' things about the reference counting support is that it
-completely eliminates the problem of resource leaking.  A simple loop that
-included '$result = mysql_query(...)' in PHP leaked unless the user
-remembered to run mysql_free($result) at the end of the loop body, and
-nobody really did.  In order to take advantage of the automatic resource
-deallocation upon destruction, there's virtually one small change you need
-to conduct.  Change the result type of a resource that you want to destroy
-itself as soon as its no longer referenced (just about any resource I can
-think of) as IS_RESOURCE, instead of as IS_LONG.  The rest is magic.
-
-A special treatment is required for SQL modules that follow MySQL's
-approach for having the link handle as an optional argument.  Modules that
-follow the MySQL module model, store the last opened link in a global
-variable, that they use in case the user neglects to explicitly specify a
-link handle.  Due to the way referenec counting works, this global
-reference is just like any other reference, and must increase that SQL link
-resource's reference count (otherwise, it will be closed prematurely).
-Simply, when you set the default link to a certain link, increase that
-link's reference count by calling zend_list_addref().
-As always, the MySQL module is the one used to demonstrate 'new
-technology'.  You can look around it and look for IS_RESOURCE, as well as
-zend_list_addref(), to see a clear example of how the new API should be used.
-
-
-[3]  Thread safety issues
-
-I'm not going to say that Zend was designed with thread safety in mind, but
-from some point, we've decided upon several guidelines that would make the
-move to thread safety much, much easier.  Generally, we've followed the PHP
-3.1 approach of moving global variables to a structure, and encapsulating
-all global variable references within macros.  There are three main
-differences:
-1.  We grouped related globals in a single structure, instead of grouping
-all globals in one structure.
-2.  We've used much, much shorter macro names to increase the readability
-of the source code.
-3.  Regardless of whether we're compiling in thread safe mode or not, all
-global variables are *always* stored in a structure.  For example, you
-would never have a global variable 'foo', instead, it'll be a property of a
-global structure, for example, compiler_globals.foo.  That makes
-development much, much easier, since your code will simply not compile
-unless you remember to put the necessary macro around foo.
-
-To write code that'll be thread safe in the future (when we release our
-thread safe memory manager and work on integrating it), you can take a look
-at zend_globals.h.  Essentially, two sets of macros are defined, one for
-thread safe mode, and one for thread unsafe mode.  All global references
-are encapsulated within ???G(varname), where ??? is the appropriate prefix
-for your structure (for example, so far we have CG(), EG() and AG(), which
-stand for the compiler, executor and memory allocator, respectively).
-When compiling with thread safety enabled, each function that makes use of
-a ???G() macro, must obtain the pointer to its copy of the structure.  It
-can do so in one of two forms:
-1.  It can receive it as an argument.
-2.  It can fetch it.
-
-Obviously, the first method is preferable since it's much quicker.
-However, it's not always possible to send the structure all the way to a
-particular function, or it may simply bloat the code too much in some
-cases.  Functions that receive the globals as an argument, should look like
-this:
-
-rettype functioname(???LS_D)			<-- a function with no arguments
-rettype functioname(type arg1, ..., type argn ???LS_DC)	<-- a funciton with
-arguments
-
-Calls to such functions should look like this:
-functionname(???LS_C)				<-- a function with no arguments
-functionname(arg1, ..., argn ???LS_CC)		<-- a function with arguments
-
-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.
-
-
-[4]  Generalized INI support
-
-The code comes to solve several issues:
-
-a.  The ugly long block of code in main.c that reads values from the
-cfg_hash into php3_ini.
-b.  Get rid of php3_ini.  The performance penalty of copying it around all
-the time in the Apache module probably wasn't too high, but
-psychologically, it annoyed me :)
-c.  Get rid of the ugly code in mod_php4.c, that also reads values from
-Apache directives and puts them into the php3_ini structure.
-d.  Generalize all the code so that you only have to add an entry in one
-single place and get it automatically supported in php3.ini, Apache, Win32
-registry, runtime function ini_get() and ini_alter() and any future method
-we might have.
-e.  Allow users to easily override *ANY* php3.ini value, except for ones
-they're not supposed to, of course.
-
-I'm happy to say that I think I pretty much reached all goals.  php_ini.c
-implements a mechanism that lets you add your INI entry in a single place,
-with a default value in case there's no php3.ini value.  What you get by
-using this mechanism:
-
-1.  Automatic initialization from php3.ini if available, or from the
-default value if not.
-2.  Automatic support in ini_alter().  That means a user can change the
-value for this INI entry at runtime, without you having to add in a single
-line of code, and definitely no additional function (for example, in PHP3,
-we had to add in special dedicated functions, like
-set_magic_quotes_runtime() or the likes - no need for that anymore).
-3.  Automatic support in Apache .conf files.
-4.  No need for a global php3_ini-like variable that'll store all that
-info.  You can directly access each INI entry by name, in runtime.  'Sure,
-that's not revolutionary, it's just slow' is probably what some of you
-think - which is true, but, you can also register a callback function that
-is called each time your INI entry is changed, if you wish to store it in a
-cached location for intensive use.
-5.  Ability to access the current active value for a given INI entry, and
-the 'master' value.
-
-Of course, (2) and (3) are only applicable in some cases.  Some entries
-shouldn't be overriden by users in runtime or through Apache .conf files -
-you can, of course, mark them as such.
-
-
-So, enough hype, how does it work.
-
-Essentially:
-
-static PHP_INI_MH(OnChangeBar);	/* declare a message handler for a change
-in "bar" */
-
-PHP_INI_BEGIN()
-	PHP_INI_ENTRY("foo",	"1",	PHP_INI_ALL,		NULL,		NULL)
-	PHP_INI_ENTRY("bar",	"bah",	PHP_INI_SYSTEM,	OnChangeBar,	NULL)
-PHP_INI_END()
-
-static PHP_INI_MH(OnChangeBar)
-{
-	a_global_var_for_bar = new_value;
-	return SUCCESS;
-}
-
-int whatever_minit(INIT_FUNC_ARGS)
-{	
-	...
-	REGISTER_INI_ENTRIES();
-	...
-}	
-
-
-int whatever_mshutdown(SHUTDOWN_FUNC_ARGS)
-{
-	...
-	UNREGISTER_INI_ENTRIES();
-	...
-}
-
-
-and that's it.  Here's what it does.  As you can probably guess, this code
-registers two INI entries - "foo" and "bar".  They're given defaults "1"
-and "bah" respectively - note that all defaults are always given as
-strings.  That doesn't reduce your ability to use integer values, simply
-specify them as strings.  "foo" is marked so that it can be changed by
-anyone at any time (PHP_INI_ALL), whereas "bar" is marked so it can be
-changed only at startup in the php3.ini only, presumably, by the system
-administrator (PHP_INI_SYSTEM).
-When "foo" changes, no function is called.  Access to it is done using the
-macros INI_INT("foo"), INI_FLT("foo") or INI_STR("foo"), which return a
-long, double or char * respectively (strings that are returned aren't
-duplicated - if they're manipulated, you must duplicate them first).  You
-can also access the original value (the 'master' value, in case one of them
-was overriden by a user) using another pair of macros:
-INI_ORIG_INT("foo"), INI_ORIG_FLT("foo") and INI_ORIG_STR("foo").
-
-When "bar" changes, a special message handler is called, OnBarChange().
-Always declare those message handlers using PHP_INI_MH(), as they might
-change in the future.  Message handlers are called as soon as an ini entry
-initializes or changes, and allow you to cache a certain INI value in a
-quick C structure.  In this example, whenever "bar" changes, the new value
-is stored in a_global_var_for_bar, which is a global char * pointer,
-quickly accessible from other functions.  Things get a bit more complicated
-when you want to implement a thread-safe module, but it's doable as well.
-Message handlers may return SUCCESS to acknowledge the new value, or
-FAILURE to reject it.  That enables you to reject invalid values for some
-INI entries if you want.  Finally, you can have a pointer passed to your
-message handler - that's the fifth argument to PHP_INI_ENTRY().  It is
-passed as mh_arg to the message handler.
-
-Remember that for certain values, there's really no reason to mess with a
-callback function.  A perfect example for this are the syntax highlight
-colors, which no longer have a dedicated global C slot that stores them,
-but instead, are fetched from the php_ini hash on demand.
-
-"As always", for a perfect working example of this mechanism, consult
-functions/mysql.c.  This module uses the new INI entry mechanism, and was
-also converted to be thread safe in general, and in its php_ini support in
-particular.  Converting your modules to look like this for thread safety
-isn't a bad idea (not necessarily now, but in the long run).
-

apidoc.txt

@@ -1,492 +0,0 @@
-PHP Version 3.0 API Documentation
-
-Table of Contents
------------------
- 1. Function Prototype
- 2. Function Arguments
- 3. Variable number of function arguments
- 4. Using the function arguments
- 5. Memory management in functions
- 6. Setting variables in the symbol table
- 7. Returning values from functions
- 8. Returning 'complex' values from functions (arrays or objects)
- 9. Using the resource list
-10. Using the persistent resource table
-11. Adding runtime configuration directives
------------------ 
-
-1. Function Prototype
-
-   All functions look like this:
-
-       PHP_FUNCTION(foo) {
-
-       }
-
-   Even if your function doesn't take any arguments, this is how it is
-   called.
-
------------------
-
-2. Function Arguments
-
-   Arguments are always of type pval.  This type contains a union which
-   has the actual type of the argument.  So, if your function takes two
-   arguments, you would do something like the following at the top of your
-   function:
-
-       pval *arg1, *arg2;
-       if (ARG_COUNT(ht) != 2 || getParameters(ht,2,&arg1,&arg2)==FAILURE) {
-           WRONG_PARAM_COUNT;
-       }
-
-   NOTE: Arguments can be passed either by value or by reference. In both
-   cases you will need to pass &(pval *) to getParameters. If you want to
-   check if the n'th parameter was sent to you by reference or not, you can
-   use the function, ParameterPassedByReference(ht,n). It will return either
-   1 or 0.
-
-   When you change any of the passed parameters, whether they are sent by
-   reference or by value, you can either start over with the parameter by
-   calling pval_destructor on it, or if it's an ARRAY you want to add to,
-   you can use functions similar to the ones in internal_functions.h which
-   manipulate return_value as an ARRAY.
-
-   Also if you change a parameter to IS_STRING make sure you first assign
-   the new estrdup'ed string and the string length, and only later change the
-   type to IS_STRING. If you change the string of a parameter which already
-   IS_STRING or IS_ARRAY you should run pval_destructor on it first.
-   
------------------
-
-3. Variable number of function arguments
-
-   A function can take a variable number of arguments.  If your function can
-   take either 2 or 3 arguments, use the following:
-
-       pval *arg1, *arg2, *arg3;
-       int arg_count = ARG_COUNT(ht);
-
-       if (arg_count<2 || arg_count>3 ||
-           getParameters(ht,arg_count,&arg1,&arg2,&arg3)==FAILURE) {
-           WRONG_PARAM_COUNT;
-       }
-
-------------------
-
-4. Using the function arguments
-
-   The type of each argument is stored in the pval type field:
-
-
-   This type can be any of the following:
-
-       IS_STRING             String
-       IS_DOUBLE             Double-precision floating point
-       IS_LONG               Long
-       IS_ARRAY              Array
-
-       IS_EMPTY              ??
-       IS_USER_FUNCTION      ??
-       IS_INTERNAL_FUNCTION  ?? (if some of these cannot be passed to a
-                                 function - delete)
-       IS_CLASS              ??
-       IS_OBJECT             ??
-       
-   If you get an argument of one type and would like to use it as another,
-   or if you just want to force the argument to be of a certain type, you
-   can use one of the following conversion functions:
-
-       convert_to_long(arg1);
-       convert_to_double(arg1);
-       convert_to_string(arg1); 
-       convert_to_boolean_long(arg1);    If the string is "" or "0" it
-                                         becomes 0, 1 otherwise
-       convert_string_to_number(arg1);   Converts string to either LONG or
-                                         DOUBLE depending on string
-
-   These function all do in-place conversion.  They do not return anything.
-
-   The actual argument is stored in a union.  
-
-   For type IS_STRING, use arg1->value.str.val
-            IS_LONG        arg1->value.lval
-            IS_DOUBLE      arg1->value.dval
- 
--------------------
-
-5. Memory management in functions
-
-   Any memory needed by a function should be allocated with either emalloc()
-   or estrdup().  These are memory handling abstraction functions that look
-   and smell like the normal malloc() and strdup() functions.  Memory should
-   be freed with efree().
-
-   There are two kinds of memory in this program. Memory which is returned
-   to the parser in a variable and memory which you need for temporary
-   storage in your internal function.  When you assign a string to a
-   variable which is returned to the parser you need to make sure you first
-   allocate the memory with either emalloc or estrdup.  This memory
-   should NEVER be freed by you, unless you later, in the same function
-   overwrite your original assignment (this kind of programming practice is
-   not good though).
-
-   For any temporary/permanent memory you need in your functions/library you
-   should use the three emalloc(), estrdup(), and efree() functions. They
-   behave EXACTLY like their counterpart functions. Anything you emalloc()
-   or estrdup() you have to efree() at some point or another, unless it's
-   supposed to stick around until the end of the program, otherwise there
-   will be a memory leak. The meaning of "the functions behave exactly like
-   their counterparts" is if you efree() something which was not
-   emalloc()'ed nor estrdup()'ed you might get a segmentation fault. So
-   please take care and free all of your wasted memory. One of the biggest
-   improvements in PHP 3.0 will hopefully be the memory management.
-
-   If you compile with "-DDEBUG", PHP3 will print out a list of all
-   memory that was allocated using emalloc() and estrdup() but never
-   freed with efree() when it is done running the specified script.
-
--------------------
-
-6. Setting variables in the symbol table
-
-   A number of macros are available which make it easier to set a variable
-   in the symbol table:
-
-       SET_VAR_STRING(name,value) **
-       SET_VAR_DOUBLE(name,value)
-       SET_VAR_LONG(name,value)
-
-   ** Be careful here.  The value part must be malloc'ed manually because
-      the memory management code will try to free this pointer later.  Do
-      not pass statically allocated memory into a SET_VAR_STRING
-
-  Symbol tables in PHP 3.0 are implemented as hash tables.  At any given time,
-  &symbol_table is a pointer to the 'main' symbol table, and active_symbol_table
-  points to the currently active symbol table (these may be identical like in
-  startup, or different, if you're inside a function).
-  
-  The following examples use 'active_symbol_table'.  You should replace it with
-  &symbol_table if you specifically want to work with the 'main' symbol table.
-  Also, the same funcions may be applied to arrays, as explained below.
-  
-  * To check whether a variable named $foo already exists in a symbol table:
-    if (hash_exists(active_symbol_table,"foo",sizeof("foo"))) { exists... }
-    else { doesn't exist }
-  
-  * If you also need to get the type of the variable, you can use:
-    hash_find(active_symbol_table,"foo",sizeof("foo"),&pvalue);
-    check(pvalue.type);
-  
-  Arrays in PHP 3.0 are implemented using the same hashtables as symbol tables.
-  This means the two above functions can also be used to check variables
-  inside arrays.
-
-  If you want to define a new array in a symbol table, you should do this:
-
-      1.  Possibly check it exists and abort, using hash_exists()
-          or hash_find().
-      2.  Code:
-  
-      pval arr;
-  
-      if (array_init(&arr) == FAILURE) { failed... };
-      hash_update(active_symbol_table,"foo",sizeof("foo"),&arr,sizeof(pval),NULL);
-  
-  This code declares a new array, named $foo, in the active symbol table.
-  This array is empty.
-  
-  Here's how to add new entries to it:
-  
-      pval entry;
-  
-      entry.type = IS_LONG;
-      entry.value.lval = 5;
-  
-      hash_update(arr.value.ht,"bar",sizeof("bar"),&entry,sizeof(pval),NULL); /* defines $foo["bar"] = 5 */
-      hash_index_update(arr.value.ht,7,&entry,sizeof(pval),NULL); /* defines $foo[7] = 5 */
-      hash_next_index_insert(arr.value.ht,&entry,sizeof(pval),NULL); /* defines the next free place in $foo[],
-                                                                         * $foo[8], to be 5 (works like php2)
-                                                                         */
-  
-  If you'd like to modify a value that you inserted to a hash, you must first retreive it from the hash.  To
-  prevent that overhead, you can supply a pval ** to the hash add function, and it'll be updated with the
-  pval * address of the inserted element inside the hash.  If that value is NULL (like in all of the
-  above examples) - that parameter is ignored.
-
-  hash_next_index_insert() works more or less using the same logic
-  "$foo[] = bar;" works in PHP 2.0.
-
-  If you are building an array to return from a function, you can initialize
-  the array just like above by doing:
-
-    if (array_init(return_value) == FAILURE) { failed...; }
-
-  and then adding values with the helper functions:
-
-    add_next_index_long(return_value,long_value);
-    add_next_index_double(return_value,double_value);
-    add_next_index_string(return_value,estrdup(string_value));
-  
-  Of course, if the adding isn't done right after the array
-  initialization, you'd probably have to look for the array first:
-  
-    pval *arr;
-  
-    if (hash_find(active_symbol_table,"foo",sizeof("foo"),(void **)&arr)==FAILURE) { can't find... }
-    else { use arr->value.ht... }
-  
-  Note that hash_find receives a pointer to a pval pointer, and
-  not a pval pointer.
-  
-  Just about any hash function returns SUCCESS or FAILURE (except for
-  hash_exists() that returns a boolean truth value).
-    
--------------------
-
-7. Returning 'simple' values from functions (integers, floats or strings)
-
-   A number of macros are available to make it easier to return things from
-   functions:
-
-   These set the return value and return from the function:
-
-   RETURN_FALSE
-   RETURN_TRUE
-   RETURN_LONG(l)
-   RETURN_STRING(s,dup)        If dup is true, duplicates the string
-   RETURN_STRINGL(s,l,dup)     Return string (s) specifying length (l).
-   RETURN_DOUBLE(d)
-
-   These only set the return value:
-
-   RETVAL_FALSE
-   RETVAL_TRUE
-   RETVAL_LONG(l)
-   RETVAL_STRING(s,dup)       If dup is true, duplicates the string
-   RETVAL_STRINGL(s,l,dup)    Return string (s) specifying length (l).
-   RETVAL_DOUBLE(d)
-
-   The string macros above will all estrdup() the passed 's' argument,
-   so you can safely free the argument after calling the macro, or
-   alternatively use statically allocated memory.
-
-   If your function returns boolean success/error responses, always use
-   RETURN_TRUE and RETURN_FALSE respectively.
-
--------------------
-
-8. Returning 'complex' values from functions (arrays or objects)
-
-   Your function can also return a complex data type such as an object
-   or an array.
-
-   Returning an object:
-
-   1. Call object_init(return_value).
-   2. Fill it up with values:
-
-   add_property_long(return_value,property_name,l)			Add a property named 'property_name', of type long, equals to 'l'
-   add_property_double(return_value,property_name,d)		Same, only a double
-   add_property_string(return_value,property_name,str)		Same, only a string
-   add_property_stringl(return_value,property_name,str,l)	Add a property named 'property_name', of type string, string is 'str' with length 'l'
-
-   3. Possibly, register functions for this object.  In order to
-      obtain values from the object, the function would have to fetch
-      "this" from the active_symbol_table.  Its type should be IS_OBJECT,
-      and it's basically a regular hash table (i.e., you can use regular
-      hash functions on .value.ht).  The actual registration of the
-      function can be done using:
-   
-   add_method(return_value,function_name,function_ptr)
-   
-   
-   Returning an array:
-
-   1.  Call array_init(return_value).
-   2.  Fill it up with values:
-
-   add_assoc_long(return_value,key,l)				add associative entry with key 'key' and long value 'l'
-   add_assoc_double(return_value,key,d)		
-   add_assoc_string(return_value,key,str)
-   add_assoc_stringl(return_value,key,str,length)	specify the string length
-
-   add_index_long(return_value,index,l)				add entry in index 'index' with long value 'l'
-   add_index_double(return_value,index,d)
-   add_index_string(return_value,index,str)
-   add_index_stringl(return_value,index,str,length)  specify the string length
-
-   add_next_index_long(return_value,l)				add an array entry in the next free offset with long value 'l'
-   add_next_index_double(return_value,d)
-   add_next_index_string(return_value,str)
-   add_next_index_stringl(return_value,str,length)	specify the string length
-
--------------------
-
-9. Using the resource list
-
-   PHP 3.0 has a standard way of dealing with various types of resources,
-   that replaces all of the local linked lists in PHP 2.0.
-
-   Available functions:
-
-   php3_list_insert(ptr, type)      returns the 'id' of the newly inserted resource
-   php3_list_delete(id)             delete the resource with the specified id
-   php3_list_find(id,*type)         returns the pointer of the resource with the specified id, updates 'type' to the resource's type
-
-   Typically, these functions are used for SQL drivers but they can be
-   used for anything else, and are used, for instance, for maintaining
-   file descriptors.
-
-   Typical list code would look like this:
-
-	Adding a new resource:
-
-		RESOURCE *resource;
-
-		...allocate memory for resource and acquire resource...
-		/* add a new resource to the list */
-		return_value->value.lval = php3_list_insert((void *) resource, LE_RESOURCE_TYPE);
-		return_value->type = IS_LONG;
-
-	Using an existing resource:
-
-		pval *resource_id;
-		RESOURCE *resource;
-		int type;
-
-		convert_to_long(resource_id);
-		resource = php3_list_find(resource_id->value.lval, &type);
-		if (type != LE_RESOURCE_TYPE) {
-			php3_error(E_WARNING,"resource index %d has the wrong type",resource_id->value.lval);
-			RETURN_FALSE;
-		}
-		...use resource...
-
-	Deleting an existing resource:
-
-		pval *resource_id;
-		RESOURCE *resource;
-		int type;
-
-		convert_to_long(resource_id);
-		php3_list_delete(resource_id->value.lval);
-   
-
-   The resource types should be registered in php3_list.h, in enum
-   list_entry_type.  In addition, one should add shutdown code for any
-   new resource type defined, in list.c's list_entry_destructor() (even if
-   you don't have anything to do on shutdown, you must add an empty case).
-
--------------------
-
-10. Using the persistent resource table
-
-   PHP 3.0 has a standard way of storing persistent resources (i.e.,
-   resources that are kept in between hits).  The first module to use
-   this feature was the MySQL module, and mSQL followed it, so one can
-   get the general impression of how a persistent resource should be
-   used by reading mysql.c.  The functions you should look at are:
-   php3_mysql_do_connect()
-   php3_mysql_connect()
-   php3_mysql_pconnect()
-
-   The general idea of persistence modules is this:
-   1.  Code all of your module to work with the regular resource list
-       mentioned in section (9).
-   2.  Code extra connect functions that check if the resource already
-       exists in the persistent resource list.  If it does, register it
-       as in the regular resource list as a pointer to the persistent
-       resource list (because of 1., the rest of the code
-       should work immediately).  If it doesn't, then create it, add it
-       to the persistent resource list AND add a pointer to it from the
-       regular resource list, so all of the code would work since it's
-       in the regular resource list, but on the next connect, the
-       resource would be found in the persistent resource list and be
-       used without having to recreate it.
-       You should register these resources with a different type (e.g.
-       LE_MYSQL_LINK for non-persistent link and LE_MYSQL_PLINK for
-       a persistent link).
-
-   If you read mysql.c, you'll notice that except for the more complex
-   connect function, nothing in the rest of the module has to be changed.
-   
-   The very same interface exists for the regular resource list and the
-   persistent resource list, only 'list' is replaced with 'plist':
-
-   php3_plist_insert(ptr, type)      returns the 'id' of the newly inserted resource
-   php3_plist_delete(id)             delete the resource with the specified id
-   php3_plist_find(id,*type)         returns the pointer of the resource with the specified id, updates 'type' to the resource's type
-
-   However, it's more than likely that these functions would prove
-   to be useless for you when trying to implement a persistent module.
-   Typically, one would want to use the fact that the persistent resource
-   list is really a hash table.  For instance, in the MySQL/mSQL modules,
-   when there's a pconnect() call (persistent connect), the function
-   builds a string out of the host/user/passwd that were passed to the
-   function, and hashes the SQL link with this string as a key.  The next
-   time someone calls a pconnect() with the same host/user/passwd, the
-   same key would be generated, and the function would find the SQL link
-   in the persistent list.
-
-   Until further documented, you should look at mysql.c or msql.c to
-   see how one should use the plist's hash table abilities.
-
-   One important thing to note:  resources going into the persistent
-   resource list must *NOT* be allocated with PHP's memory manager, i.e.,
-   they should NOT be created with emalloc(), estrdup(), etc.  Rather,
-   one should use the regular malloc(), strdup(), etc.  The reason for
-   this is simple - at the end of the request (end of the hit), every
-   memory chunk that was allocated using PHP's memory manager is deleted.
-   Since the persistent list isn't supposed to be erased at the end
-   of a request, one mustn't use PHP's memory manager for allocating
-   resources that go to it.
-
-   Shutting down persistent resources:  
-   
-   When you register resource that's going to be in the persistent list,
-   you should add destructors to it both in the non-persistent list
-   and in the persistent list.
-   The destructor in the non-persistent list destructor shouldn't do anything.
-   The one in the persistent list destructor should properly free any
-   resources obtained by that type (e.g. memory, SQL links, etc).  Just like
-   with the non-persistent resources, you *MUST* add destructors for every
-   resource, even it requires no destructotion and the destructor would
-   be empty.
-   Remember, since emalloc() and friends aren't to be used in conjunction
-   with the persistent list, you mustn't use efree() here either.
-
--------------------
-
-11. Adding runtime configuration directives
-
-Many of the features of PHP3 can be configured at runtime.  These
-configuration directives can appear in either the designated php3.ini
-file, or in the case of the Apache module version in the Apache .conf
-files.  The advantage of having them in the Apache .conf files is that
-they can be configured on a per-directory basis.  This means that one
-directory may have a certain safemodeexecdir for example, while another
-directory may have another.  This configuration granularity is especially
-handy when a server supports multiple virtual hosts.
-
-The steps required to add a new directive:
-
- 1. Add directive to php3_ini_structure struct in mod_php4.h. 
-    
- 2. In main.c, edit the php3_module_startup function and add the
-    appropriate cfg_get_string() or cfg_get_long() call.
-
- 3. Add the directive, restrictions and a comment to the php3_commands
-    structure in mod_php4.c.  Note the restrictions part.  RSRC_CONF are
-    directives that can only be present in the actual Apache .conf files.
-    Any OR_OPTIONS directives can be present anywhere, include normal
-    .htaccess files.
-
- 4. In either php3take1handler() or php3flaghandler() add the appropriate
-    entry for your directive.
-
- 5. In the configuration section of the _php3_info() function in
-    functions/info.c you need to add your new directive.
-
- 6. And last, you of course have to use your new directive somewhere.
-    It will be addressable as php3_ini.directive

build/bsd_makefile

@@ -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.               |
-#  +----------------------------------------------------------------------+
-#  | Author: 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

build/build.mk

@@ -20,24 +20,27 @@
 # Makefile to generate build tools
 #
 
-SUBDIRS = Zend TSRM
+ZENDDIR = Zend
+
+SUBDIRS = $(ZENDDIR) TSRM
 
 STAMP = buildmk.stamp
 
 ALWAYS = generated_lists
 
+
 all: $(STAMP) $(ALWAYS)
 	@$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk
 
 generated_lists:
-	@echo makefile_am_files = Zend/Makefile.am \
+	@echo makefile_am_files = $(ZENDDIR)/Makefile.am \
 		TSRM/Makefile.am > $@
-	@echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@
-	@echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
-		Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
+	@echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h >> $@
+	@echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
+		$(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
 
 $(STAMP): build/buildcheck.sh
-	@build/buildcheck.sh && touch $(STAMP)
+	@build/buildcheck.sh $(STAMP)
 
 snapshot:
 	distname='$(DISTNAME)'; \
@@ -64,8 +67,7 @@ snapshot:
 
 cvsclean:
 	@for i in `find . -name .cvsignore`; do \
-		(cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore` *.o *.a || true); \
+		(cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore | grep -v config.nice` *.o *.a .libs || true); \
 	done
-	@rm -f $(SUBDIRS) 2>/dev/null || true
 
 .PHONY: $(ALWAYS) snapshot cvsclean

build/build2.mk

@@ -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|AC_PROG_CPP was called before)'||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)'||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)

build/buildcheck.sh

@@ -16,11 +16,13 @@
 #  |          Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
-# $Id: buildcheck.sh,v 1.16 2002-03-04 08:28:57 sas Exp $ 
+# $Id: buildcheck.sh,v 1.21 2002-10-30 11:42:22 sas Exp $ 
 #
 
 echo "buildconf: checking installation..."
 
+stamp=$1
+
 # autoconf 2.13 or newer
 ac_version=`autoconf --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 if test -z "$ac_version"; then
@@ -40,6 +42,15 @@ echo "buildconf: autoconf version $ac_version (ok)"
 fi
 
 
+if test "$1" = "2" && test "$2" -ge "50"; then
+  echo "buildconf: Your version of autoconf likely contains buggy cache code."
+  echo "           Running cvsclean for you."
+  echo "           To avoid this, install autoconf-2.13 and automake-1.5."
+  ./cvsclean
+  stamp=
+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]*$//'`
@@ -60,8 +71,9 @@ echo "buildconf: automake version $am_version (ok)"
 fi
 
 # libtool 1.4 or newer
-libtool=`which libtool`
-if test ! -f "$libtool"; then libtool=`which glibtool`; fi
+# Prefer glibtool over libtool for Mac OS X compatibility
+libtool=`which glibtool 2> /dev/null`
+if test ! -f "$libtool"; then libtool=`which libtool`; fi
 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."
@@ -90,4 +102,6 @@ if test "$am_prefix" != "$lt_prefix"; then
     echo "         continuing anyway"
 fi
 
+test -n "$stamp" && touch $stamp
+
 exit 0

build/dynlib.mk

@@ -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.               |
-#  +----------------------------------------------------------------------+
-#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
-#  +----------------------------------------------------------------------+
-#
-# $Id$ 
-#
-
-all: all-recursive
-
-include $(builddir)/libs.mk
-
-include $(top_srcdir)/build/rules.mk

build/fastgen.sh

@@ -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.               |
-#  +----------------------------------------------------------------------+
-#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
-#  +----------------------------------------------------------------------+
-#
-# $Id: fastgen.sh,v 1.14 2002-02-28 08:25:33 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

build/genif.sh

@@ -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
 

build/library.mk

@@ -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.               |
-#  +----------------------------------------------------------------------+
-#  | Author: 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)

build/ltlib.mk

@@ -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.               |
-#  +----------------------------------------------------------------------+
-#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
-#  +----------------------------------------------------------------------+
-#
-# $Id$ 
-#
-
-targets = $(LTLIBRARY_NAME)
-
-include $(top_srcdir)/build/rules.mk
-include $(top_srcdir)/build/library.mk
-

build/program.mk

@@ -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.               |
-#  +----------------------------------------------------------------------+
-#  | Author: 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)

build/rules.mk

@@ -1,70 +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.               |
-#  +----------------------------------------------------------------------+
-#  | Author: 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-modules clean-recursive clean-x
-
-clean-modules: 
-
-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)/sapi/cli/php
-	@if test "$(TESTS)" = ""; then \
-		TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/sapi/cli/php -c $(top_srcdir)/php.ini-dist $(top_srcdir)/run-tests.php $(srcdir); \
-	else \
-		TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/sapi/cli/php -c $(top_srcdir)/php.ini-dist $(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

build/rules_common.mk

@@ -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.               |
-#  +----------------------------------------------------------------------+
-#  | Author: 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 $@
-

build/rules_pear.mk

@@ -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.               |
-#  +----------------------------------------------------------------------+
-#  | Author: 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

build/shtool

@@ -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-2002 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.6.2 (02-Nov-2002)
+##  Contents: 4/19 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
@@ -41,6 +41,7 @@
 ##    echo       Print string with optional construct expansion
 ##    install    Install a program, script or datafile
 ##    mkdir      Make one or more directories
+##    path       Deal with program paths
 ##
 ##  Not available commands (because module was not built-in):
 ##    mdate      Pretty-print modification time of a file or dir
@@ -50,13 +51,14 @@
 ##    mkln       Make link with calculation of relative paths
 ##    mkshadow   Make a shadow tree through symbolic links
 ##    fixperm    Fix file permissions inside a source tree
+##    rotate     Logfile rotation
 ##    tarball    Roll distribution tarballs
+##    subst      Apply sed(1) substitution operations
 ##    guessos    Simple operating system guesser
 ##    arx        Extended archive command
 ##    slo        Separate linker options by library class
 ##    scpp       Sharing C Pre-Processor
-##    version    Generate and maintain a version information file
-##    path       Deal with program paths
+##    version    Maintain a version information file
 ##
 
 if [ $# -eq 0 ]; then
@@ -65,46 +67,76 @@ 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.6.2 (02-Nov-2002)"
+    echo "Copyright (c) 1994-2002 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 '  mkdir    [-t] [-f] [-p] [-m<mode>] <dir> [<dir> ...]'
+    echo '  echo     [-n|--newline] [-e|--expand] [<str> ...]'
+    echo '  install  [-v|--verbose] [-t|--trace] [-d|--mkdir] [-c|--copy]'
+    echo '           [-C|--compare-copy] [-s|--strip] [-m|--mode <mode>]'
+    echo '           [-o|--owner <owner>] [-g|--group <group>] [-e|--exec'
+    echo '           <sed-cmd>] <file> [<file> ...] <path>'
+    echo '  mkdir    [-t|--trace] [-f|--force] [-p|--parents] [-m|--mode'
+    echo '           <mode>] [-o|--owner <owner>] [-g|--group <group>] <dir>'
+    echo '           [<dir> ...]'
+    echo '  path     [-s|--suppress] [-r|--reverse] [-d|--dirname] [-b|--basename]'
+    echo '           [-m|--magic] [-p|--path <path>] <str> [<str> ...]'
     echo ''
     echo 'Not available <cmd-name> (because module was not built-in):'
-    echo '  mdate    [-n] [-z] [-s] [-d] [-f<str>] [-o<spec>] <path>'
-    echo '  table    [-F<sep>] [-w<width>] [-c<cols>] [-s<strip>] <str><sep><str>...'
-    echo '  prop     [-p<str>]'
-    echo '  move     [-v] [-t] [-e] [-p] <src-file> <dst-file>'
-    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 '  mdate    [-n|--newline] [-z|--zero] [-s|--shorten] [-d|--digits]'
+    echo '           [-f|--field-sep <str>] [-o|--order <spec>] <path>'
+    echo '  table    [-F|--field-sep <sep>] [-w|--width <width>] [-c|--columns'
+    echo '           <cols>] [-s|--strip <strip>] <str><sep><str>...'
+    echo '  prop     [-p|--prefix <str>]'
+    echo '  move     [-v|--verbose] [-t|--trace] [-e|--expand] [-p|--preserve]'
+    echo '           <src-file> <dst-file>'
+    echo '  mkln     [-t|--trace] [-f|--force] [-s|--symbolic] <src-path>'
+    echo '           [<src-path> ...] <dst-path>'
+    echo '  mkshadow [-v|--verbose] [-t|--trace] [-a|--all] <src-dir> <dst-dir>'
+    echo '  fixperm  [-v|--verbose] [-t|--trace] <path> [<path> ...]'
+    echo '  rotate   [-v|--verbose] [-t|--trace] [-f|--force] [-n|--num-files'
+    echo '           <count>] [-s|--size <size>] [-c|--copy] [-r|--remove]'
+    echo '           [-a|--archive-dir <dir>] [-z|--compress [<tool>:]<level>]'
+    echo '           [-b|--background] [-d|--delay] [-p|--pad <len>] [-o|--owner'
+    echo '           <owner>] [-g|--group <group>] [-m|--mode <mode>] [-M|--migrate'
+    echo '           <cmd>] [-P|--prolog <cmd>] [-E|--epilog <cmd>] <file> [...]'
+    echo '  tarball  [-t|--trace] [-v|--verbose] [-o|--output <tarball>]'
+    echo '           [-c|--compress <prog>] [-d|--directory <dir>] [-u|--user'
+    echo '           <user>] [-g|--group <group>] [-e|--exclude <pattern>]'
+    echo '           <path> [<path> ...]'
+    echo '  subst    [-v|--verbose] [-t|--trace] [-n|--nop] [-s|--stealth]'
+    echo '           [-i|--interactive] [-b|--backup <ext>] [-e|--exec <cmd>]'
+    echo '           [-f|--file <cmd-file>] [<file>] [...]'
     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 '  path     [-s] [-r] [-d] [-b] [-m] [-p<path>] <str> [<str> ...]'
+    echo '  arx      [-t|--trace] [-C|--command <cmd>] <op> <archive> [<file>'
+    echo '           ...]'
+    echo '  slo      [-p|--prefix <str>] -- -L<dir> -l<lib> [-L<dir> -l<lib>'
+    echo '           ...]'
+    echo '  scpp     [-v|--verbose] [-p|--preserve] [-f|--filter <filter>]'
+    echo '           [-o|--output <ofile>] [-t|--template <tfile>] [-M|--mark'
+    echo '           <mark>] [-D|--define <dname>] [-C|--class <cname>]'
+    echo '           <file> [<file> ...]'
+    echo '  version  [-l|--language <lang>] [-n|--name <name>] [-p|--prefix'
+    echo '           <prefix>] [-s|--set <version>] [-e|--edit] [-i|--increase'
+    echo '           <knob>] [-d|--display <type>] <file>'
     echo ''
     exit 0
 fi
 if [ ".$1" = ".-v" -o ".$1" = ."--version" ]; then
-    echo "GNU shtool 1.4.9 (16-Apr-2000)"
+    echo "GNU shtool 1.6.2 (02-Nov-2002)"
+    exit 0
+fi
+if [ ".$1" = ".-r" -o ".$1" = ."--recreate" ]; then
+    shtoolize -oshtool echo install mkdir path
     exit 0
 fi
 if [ ".$1" = ".-d" -o ".$1" = ."--debug" ]; then
@@ -113,7 +145,7 @@ if [ ".$1" = ".-d" -o ".$1" = ."--debug" ]; then
 fi
 name=`echo "$0" | sed -e 's;.*/\([^/]*\)$;\1;' -e 's;-sh$;;' -e 's;\.sh$;;'`
 case "$name" in
-    echo|install|mkdir )
+    echo|install|mkdir|path )
         #   implicit tool command selection
         tool="$name"
         ;;
@@ -134,36 +166,56 @@ gen_tmpfile=no
 case $tool in
     echo )
         str_tool="echo"
-        str_usage="[-n] [-e] [<str> ...]"
+        str_usage="[-n|--newline] [-e|--expand] [<str> ...]"
         arg_spec="0+"
         opt_spec="n.e."
+        opt_alias="n:newline,e:expand"
         opt_n=no
         opt_e=no
         ;;
     install )
         str_tool="install"
-        str_usage="[-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<ext>] <file> <path>"
-        arg_spec="2="
-        opt_spec="v.t.c.C.s.m:o:g:e:"
+        str_usage="[-v|--verbose] [-t|--trace] [-d|--mkdir] [-c|--copy] [-C|--compare-copy] [-s|--strip] [-m|--mode <mode>] [-o|--owner <owner>] [-g|--group <group>] [-e|--exec <sed-cmd>] <file> [<file> ...] <path>"
+        arg_spec="1+"
+        opt_spec="v.t.d.c.C.s.m:o:g:e+"
+        opt_alias="v:verbose,t:trace,d:mkdir,c:copy,C:compare-copy,s:strip,m:mode,o:owner,g:group,e:exec"
         opt_v=no
         opt_t=no
+        opt_d=no
         opt_c=no
         opt_C=no
         opt_s=no
-        opt_m=""
+        opt_m="0755"
         opt_o=""
         opt_g=""
         opt_e=""
         ;;
     mkdir )
         str_tool="mkdir"
-        str_usage="[-t] [-f] [-p] [-m<mode>] <dir> [<dir> ...]"
+        str_usage="[-t|--trace] [-f|--force] [-p|--parents] [-m|--mode <mode>] [-o|--owner <owner>] [-g|--group <group>] <dir> [<dir> ...]"
         arg_spec="1+"
-        opt_spec="t.f.p.m:"
+        opt_spec="t.f.p.m:o:g:"
+        opt_alias="t:trace,f:force,p:parents,m:mode,o:owner,g:group"
         opt_t=no
         opt_f=no
         opt_p=no
         opt_m=""
+        opt_o=""
+        opt_g=""
+        ;;
+    path )
+        str_tool="path"
+        str_usage="[-s|--suppress] [-r|--reverse] [-d|--dirname] [-b|--basename] [-m|--magic] [-p|--path <path>] <str> [<str> ...]"
+        gen_tmpfile=yes
+        arg_spec="1+"
+        opt_spec="s.r.d.b.m.p:"
+        opt_alias="s:suppress,r:reverse,d:dirname,b:basename,m:magic,p:path"
+        opt_s=no
+        opt_r=no
+        opt_d=no
+        opt_b=no
+        opt_m=no
+        opt_p="$PATH"
         ;;
     -* )
         echo "$0:Error: unknown option \`$tool'" 2>&1
@@ -181,6 +233,11 @@ esac
 ##  COMMON UTILITY CODE
 ##
 
+#   commonly used ASCII values
+ASC_TAB="	"
+ASC_NL="
+"
+
 #   determine name of tool
 if [ ".$tool" != . ]; then
     #   used inside shtool script
@@ -202,6 +259,10 @@ eval `echo $arg_spec |\
 eval `echo h.$opt_spec |\
       sed -e 's/\([a-zA-Z0-9]\)\([.:+]\)/opt_MODE_\1=\2;/g'`
 
+#   parse option alias string
+eval `echo h:help,$opt_alias |\
+      tr 'x-' 'x_' | sed -e 's/\([a-zA-Z0-9]\):\([^,]*\),*/opt_ALIAS_\2=\1;/g'`
+
 #   interate over argument line
 opt_PREV=''
 while [ $# -gt 0 ]; do
@@ -222,6 +283,18 @@ while [ $# -gt 0 ]; do
     else
         #   split argument into option and argument
         case "$1" in
+            --[a-zA-Z0-9]*=*)
+                eval `echo "x$1" |\
+                      sed -e 's/^x--\([a-zA-Z0-9-]*\)=\(.*\)$/opt_OPT="\1";opt_ARG="\2"/'`
+                opt_STR=`echo $opt_OPT | tr 'x-' 'x_'`
+                eval "opt_OPT=\${opt_ALIAS_${opt_STR}-${opt_OPT}}"
+                ;;
+            --[a-zA-Z0-9]*)
+                opt_OPT=`echo "x$1" | cut -c4-`
+                opt_STR=`echo $opt_OPT | tr 'x-' 'x_'`
+                eval "opt_OPT=\${opt_ALIAS_${opt_STR}-${opt_OPT}}"
+                opt_ARG=''
+                ;;
             -[a-zA-Z0-9]*)
                 eval `echo "x$1" |\
                       sed -e 's/^x-\([a-zA-Z0-9]\)/opt_OPT="\1";/' \
@@ -261,17 +334,17 @@ while [ $# -gt 0 ]; do
             ;;
         '+' )
             #   option with argument (multiple occurances append)
-            eval "opt_${opt_OPT}=\"\$opt_${opt_OPT} \$opt_ARG\""
+            eval "opt_${opt_OPT}=\"\$opt_${opt_OPT}\${ASC_NL}\$opt_ARG\""
             ;;
         * )
-            echo "$msgprefix:Error: unknown option: \`-$opt_OPT'" 1>&2
+            echo "$msgprefix:Error: unknown option: \`$opt_OPT'" 1>&2
             echo "$msgprefix:Hint:  run \`$toolcmdhelp -h' or \`man shtool' for details" 1>&2
             exit 1
             ;;
     esac
 done
 if [ ".$opt_PREV" != . ]; then
-    echo "$msgprefix:Error: missing argument to option \`-$opt_PREV'" 1>&2
+    echo "$msgprefix:Error: missing argument to option \`$opt_PREV'" 1>&2
     echo "$msgprefix:Hint:  run \`$toolcmdhelp -h' or \`man shtool' for details" 1>&2
     exit 1
 fi
@@ -312,6 +385,7 @@ if [ ".$gen_tmpfile" = .yes ]; then
     tmpfile="$tmpdir/.shtool.$$"
     rm -f $tmpfile >/dev/null 2>&1
     touch $tmpfile
+    chmod 600 $tmpfile
 fi
 
 ##
@@ -323,7 +397,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-2002 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for WML as buildinfo
     ##
     
@@ -347,7 +421,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
@@ -356,7 +430,7 @@ echo )
                 term_bold=`awk 'BEGIN { printf("%c%c%c%c", 27, 91, 49, 109); }' </dev/null 2>/dev/null`
                 term_norm=`awk 'BEGIN { printf("%c%c%c", 27, 91, 109); }' </dev/null 2>/dev/null`
                 ;;
-            vt100|vt100*)
+            vt100|vt100*|cygwin)
                 term_bold=`awk 'BEGIN { printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }' </dev/null 2>/dev/null`
                 term_norm=`awk 'BEGIN { printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }' </dev/null 2>/dev/null`
                 ;;
@@ -374,7 +448,7 @@ echo )
                                 fi
                             done
                             if [ ".$term_bold" != . ]; then
-                                for seq in sgr0 me rmso reset; do # 'reset' is last
+                                for seq in sgr0 me rmso init reset; do # 'reset' is last
                                     norm="`$dir/$tool $seq 2>/dev/null`"
                                     if [ ".$norm" != . ]; then
                                         term_norm="$norm"
@@ -393,12 +467,14 @@ echo )
         esac
         if [ ".$term_bold" = . -o ".$term_norm" = . ]; then
             echo "$msgprefix:Warning: unable to determine terminal sequence for bold mode" 1>&2
+            term_bold=''
+            term_norm=''
         fi
     fi
     
     #   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 +516,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,19 +565,16 @@ 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
-                domainname="`egrep '^[ 	]*domain' /etc/resolv.conf | head -1 |\
+                domainname="`egrep '^[ 	]*domain' /etc/resolv.conf | sed -e 'q' |\
                              sed -e 's/.*domain//' \
                                  -e 's/^[ 	]*//' -e 's/^ *//' -e 's/^	*//' \
                                  -e 's/^\.//' -e 's/^/./' |\
                              awk '{ printf("%s", $1); }'`"
                 if [ ".$domainname" = . ]; then
-                    domainname="`egrep '^[ 	]*search' /etc/resolv.conf | head -1 |\
+                    domainname="`egrep '^[ 	]*search' /etc/resolv.conf | sed -e 'q' |\
                                  sed -e 's/.*search//' \
                                      -e 's/^[ 	]*//' -e 's/^ *//' -e 's/^	*//' \
                                      -e 's/ .*//' -e 's/	.*//' \
@@ -521,6 +624,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 +651,168 @@ echo )
 install )
     ##
     ##  install -- Install a program, script or datafile
-    ##  Copyright (c) 1997-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1997-2002 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
-    src="$1"
-    dst="$2"
-    
-    #  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"
+    #   special case: "shtool install -d <dir> [...]" internally
+    #   maps to "shtool mkdir -f -p -m 755 <dir> [...]"
+    if [ "$opt_d" = yes ]; then
+        cmd="$0 mkdir -f -p -m 755"
+        if [ ".$opt_o" != . ]; then
+            cmd="$cmd -o '$opt_o'"
+        fi
+        if [ ".$opt_g" != . ]; then
+            cmd="$cmd -g '$opt_g'"
+        fi
+        if [ ".$opt_v" = .yes ]; then
+            cmd="$cmd -v"
+        fi
+        if [ ".$opt_t" = .yes ]; then
+            cmd="$cmd -t"
+        fi
+        for dir in "$@"; do
+            eval "$cmd $dir" || exit $?
+        done
+        exit 0
     fi
     
-    #  Add a possible extension to src and dst
-    if [ ".$opt_e" != . ]; then
-        src="$src$opt_e"
-        dst="$dst$opt_e"
+    #   determine source(s) and destination
+    argc=$#
+    srcs=""
+    while [ $# -gt 1 ]; do
+        srcs="$srcs $1"
+        shift
+    done
+    dstpath="$1"
+    
+    #   type check for destination
+    dstisdir=0
+    if [ -d $dstpath ]; then
+        dstpath=`echo "$dstpath" | sed -e 's:/$::'`
+        dstisdir=1
     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'
+            OIFS="$IFS"; IFS="$ASC_NL"; set -- $opt_e; IFS="$OIFS"
+            for 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-2002 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 +821,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 +835,24 @@ mkdir )
                 echo "mkdir $p" 1>&2
             fi
             mkdir $p || errstatus=$?
+            if [ ".$opt_o" != . ]; then
+                if [ ".$opt_t" = .yes ]; then
+                    echo "chown $opt_o $p" 1>&2
+                fi
+                chown $opt_o $p || errstatus=$?
+            fi
+            if [ ".$opt_g" != . ]; then
+                if [ ".$opt_t" = .yes ]; then
+                    echo "chgrp $opt_g $p" 1>&2
+                fi
+                chgrp $opt_g $p || errstatus=$?
+            fi
+            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" |\
@@ -695,6 +872,18 @@ mkdir )
                         echo "mkdir $pathcomp" 1>&2
                     fi
                     mkdir $pathcomp || errstatus=$?
+                    if [ ".$opt_o" != . ]; then
+                        if [ ".$opt_t" = .yes ]; then
+                            echo "chown $opt_o $pathcomp" 1>&2
+                        fi
+                        chown $opt_o $pathcomp || errstatus=$?
+                    fi
+                    if [ ".$opt_g" != . ]; then
+                        if [ ".$opt_t" = .yes ]; then
+                            echo "chgrp $opt_g $pathcomp" 1>&2
+                        fi
+                        chgrp $opt_g $pathcomp || errstatus=$?
+                    fi
                     if [ ".$opt_m" != . ]; then
                         if [ ".$opt_t" = .yes ]; then
                             echo "chmod $opt_m $pathcomp" 1>&2
@@ -709,6 +898,147 @@ mkdir )
     exit $errstatus
     ;;
 
+path )
+    ##
+    ##  path -- Deal with program paths
+    ##  Copyright (c) 1998-2002 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Originally written for Apache
+    ##
+    
+    namelist="$*"
+    
+    #   check whether the test command supports the -x option
+    if [ -x /bin/sh ] 2>/dev/null; then
+        minusx="-x"
+    else
+        minusx="-r"
+    fi
+    
+    #   split path string
+    paths="`echo $opt_p |\
+            sed -e 's/^:/.:/' \
+                -e 's/::/:.:/g' \
+                -e 's/:$/:./' \
+                -e 's/:/ /g'`"
+    
+    #   SPECIAL REQUEST
+    #   translate forward to reverse path
+    if [ ".$opt_r" = .yes ]; then
+        if [ "x$namelist" = "x." ]; then
+            rp='.'
+        else
+            rp=''
+            for pe in `IFS="$IFS/"; echo $namelist`; do
+                rp="../$rp"
+            done
+        fi
+        echo $rp | sed -e 's:/$::'
+        exit 0
+    fi
+    
+    #   SPECIAL REQUEST
+    #   strip out directory or base name
+    if [ ".$opt_d" = .yes ]; then
+        echo "$namelist" |\
+        sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'
+        exit 0
+    fi
+    if [ ".$opt_b" = .yes ]; then
+        echo "$namelist" |\
+        sed -e 's;.*/\([^/]*\)$;\1;'
+        exit 0
+    fi
+    
+    #   MAGIC SITUATION
+    #   Perl Interpreter (perl)
+    if [ ".$opt_m" = .yes  -a ".$namelist" = .perl ]; then
+        rm -f $tmpfile >/dev/null 2>&1
+        touch $tmpfile
+        found=0
+        pc=99
+        for dir in $paths; do
+            dir=`echo $dir | sed -e 's;/*$;;'`
+            nc=99
+            for name in perl perl5 miniperl; do
+                 if [ $minusx "$dir/$name" -a ! -d "$dir/$name" ]; then
+                     perl="$dir/$name"
+                     pv=`$perl -e 'printf("%.3f", $]);'`
+                     echo "$pv:$pc:$nc:$perl" >>$tmpfile
+                     found=1
+                 fi
+                 nc=`expr $nc - 1`
+            done
+            pc=`expr $pc - 1`
+        done
+        if [ $found = 1 ]; then
+            perl="`cat $tmpfile | sort -r -u | sed -e 'q' | cut -d: -f4`"
+            rm -f $tmpfile >/dev/null 2>&1
+            echo "$perl"
+            exit 0
+        fi
+        rm -f $tmpfile >/dev/null 2>&1
+        exit 1
+    fi
+    
+    #   MAGIC SITUATION
+    #   C pre-processor (cpp)
+    if [ ".$opt_m" = .yes -a ".$namelist" = .cpp ]; then
+        echo >$tmpfile.c "#include <assert.h>"
+        echo >>$tmpfile.c "Syntax Error"
+        #   1. try the standard cc -E approach
+        cpp="${CC-cc} -E"
+        (eval "$cpp $tmpfile.c >/dev/null") 2>$tmpfile.out
+        my_error=`grep -v '^ *+' $tmpfile.out`
+        if [ ".$my_error" != . ]; then
+            #   2. try the cc -E approach and GCC's -traditional-ccp option
+            cpp="${CC-cc} -E -traditional-cpp"
+            (eval "$cpp $tmpfile.c >/dev/null") 2>$tmpfile.out
+            my_error=`grep -v '^ *+' $tmpfile.out`
+            if [ ".$my_error" != . ]; then
+                #   3. try a standalone cpp command in path and lib dirs
+                for path in $paths /lib /usr/lib /usr/local/lib; do
+                    path=`echo $path | sed -e 's;/*$;;'`
+                    if [ $minusx "$path/cpp" -a ! -d "$path/cpp" ]; then
+                        cpp="$path/cpp"
+                        break
+                    fi
+                done
+                if [ ".$cpp" != . ]; then
+                    (eval "$cpp $tmpfile.c >/dev/null") 2>$tmpfile.out
+                    my_error=`grep -v '^ *+' $tmpfile.out`
+                    if [ ".$my_error" != . ]; then
+                        #   ok, we gave up...
+                        cpp=''
+                    fi
+                fi
+            fi
+        fi
+        rm -f $tmpfile >/dev/null 2>&1
+        rm -f $tmpfile.c $tmpfile.out >/dev/null 2>&1
+        if [ ".$cpp" != . ]; then
+            echo "$cpp"
+            exit 0
+        fi
+        exit 1
+    fi
+    
+    #   STANDARD SITUATION
+    #   iterate over names
+    for name in $namelist; do
+        #   iterate over paths
+        for path in $paths; do
+            path=`echo $path | sed -e 's;/*$;;'`
+            if [ $minusx "$path/$name" -a ! -d "$path/$name" ]; then
+                if [ ".$opt_s" != .yes ]; then
+                    echo "$path/$name"
+                fi
+                exit 0
+            fi
+        done
+    done
+    exit 1
+    ;;
+
 esac
 
 exit 0

build/sysv_makefile

@@ -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.               |
-#  +----------------------------------------------------------------------+
-#  | Author: 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

buildconf

@@ -1,36 +1,24 @@
 #!/bin/sh
 # $Id$
 
-supplied_flag=$1
+while test $# -gt 0; do
+    if test "$1" = "--copy"; then
+        automake_flags=--copy
+    fi
 
-if test "$supplied_flag" = "--copy"; then
-    automake_flags=--copy
+    if test "$1" = "--ZendEngine2"; then
+        ZENDDIR=ZendEngine2
+        echo "Using Zend Engine 2 code"
+    fi
+
+    shift
+done
+
+if test -z "$ZENDDIR"; then
+    ZENDDIR=Zend
+    echo "using default Zend directory"
 fi
-
-## build.mk does not check aclocal exit status yet
-##
-#mv aclocal.m4 aclocal.m4.old 2>/dev/null
-#aclocal
-#if test "$?" != "0" -a "$am_prefix" != "$lt_prefix"; then
-#    echo "buildconf: ERROR: aclocal failed, probably because automake and"
-#    echo "           libtool are installed with different prefixes;"
-#    echo "           automake is installed in $am_prefix, but libtool in $lt_prefix."
-#    echo "           Please re-install automake and/or libtool with a common prefix"
-#    echo "           and try again."
-#    exit 1
-#fi
-
-if test "$supplied_flag" = "--local"; then
-  subdirs='SUBDIRS='
-else
-  subdirs=''
-fi
-
+ 
 rm -f generated_lists
 
-case "`uname`" in
-*BSD/OS*)
-    ./build/bsd_makefile;;
-esac
-
-${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags"
+${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR"

config.guess

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2001-11-08'
+timestamp='2002-05-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ timestamp='2001-11-08'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Originally written by Per Bothner <bothner@cygnus.com>.
+# Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -98,7 +98,7 @@ trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 
 set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
  ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
+	for c in cc gcc c89 c99 ; do
 	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
 	  if test $? = 0 ; then
 	     CC_FOR_BUILD="$c"; break ;
@@ -135,23 +135,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# object file format.  This provides both forward
 	# compatibility and a consistent mechanism for selecting the
 	# object file format.
-	# Determine the machine/vendor (is the vendor relevant).
-	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
-	    arm32) machine=arm-unknown ;;
-	    atari*) machine=m68k-atari ;;
-	    sun3*) machine=m68k-sun ;;
-	    mac68k) machine=m68k-apple ;;
-	    macppc) machine=powerpc-apple ;;
-	    hp3[0-9][05]) machine=m68k-hp ;;
-	    ibmrt|romp-ibm) machine=romp-ibm ;;
-	    sparc*) machine=`uname -p`-unknown ;;
-	    *) machine=${UNAME_MACHINE}-unknown ;;
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
@@ -291,6 +291,9 @@ EOF
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit 0 ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
@@ -339,7 +342,7 @@ EOF
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
     sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
@@ -426,6 +429,9 @@ EOF
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
 	exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS)
+	echo powerpc-harris-powermax
+	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -508,7 +514,7 @@ EOF
 	fi
 	exit 0 ;;
     *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
@@ -682,9 +688,6 @@ EOF
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
         exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
@@ -706,9 +709,6 @@ EOF
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
@@ -736,6 +736,9 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
+    x86:Interix*:3*)
+	echo i386-pc-interix3
+	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -761,16 +764,30 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     mips:Linux:*:*)
-	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
-	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
-	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
-	esac
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	rm -f $dummy.c
+	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
@@ -819,7 +836,8 @@ EOF
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	ld_supported_targets=`cd /; ld --help 2>&1 \
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
 			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
 				    s/.*supported targets: *//
@@ -843,32 +861,29 @@ EOF
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
-	cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-pc-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#ifdef __INTEL_COMPILER
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	rm -f $dummy.c
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)
@@ -906,13 +921,13 @@ EOF
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
@@ -947,7 +962,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1048,15 +1063,17 @@ EOF
 	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
+    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)

config.sub

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2001-11-08'
+timestamp='2002-05-28'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -227,31 +227,32 @@ case $basic_machine in
 	1750a | 580 \
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
+	| d10v | d30v | dlx | dsp16xx \
 	| fr30 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| m32r | m68000 | m68k | m88k | mcore \
-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
 	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
 	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
 	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 \
+	| mipsisa32 | mipsisa64 \
 	| mn10200 | mn10300 \
 	| ns16k | ns32k \
-	| openrisc \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[34] | sh[34]eb | shbe | shle \
-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic80 | tron \
-	| v850 \
+	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 \
+	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -278,20 +279,21 @@ case $basic_machine in
 	580-* \
 	| a29k-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alphapca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cray2-* | cydra-* \
-	| d10v-* | d30v-* \
+	| clipper-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| m32r-* \
-	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
 	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
@@ -303,13 +305,14 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
-	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | vax-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -374,6 +377,10 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -394,16 +401,8 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
+	cray | j90)
+		basic_machine=j90-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -418,6 +417,14 @@ case $basic_machine in
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -598,14 +605,6 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -620,6 +619,10 @@ case $basic_machine in
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -699,6 +702,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -859,7 +866,7 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
-	sv1)
+        sv1)
 		basic_machine=sv1-cray
 		os=-unicos
 		;;
@@ -867,8 +874,16 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	t3d)
+		basic_machine=alpha-cray
+		os=-unicos
+		;;
 	t3e)
-		basic_machine=t3e-cray
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
@@ -881,6 +896,10 @@ case $basic_machine in
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -931,13 +950,13 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-windows32-msvcrt
 		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
         xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -958,13 +977,6 @@ case $basic_machine in
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
@@ -987,6 +999,9 @@ case $basic_machine in
 	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1074,7 +1089,8 @@ case $os in
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux*)
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1126,12 +1142,18 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
+	-atheos*)
+		os=-atheos
+		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
 	-ns2 )
 	        os=-nextstep2
 		;;
@@ -1206,6 +1228,7 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
+	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
@@ -1236,6 +1259,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or32-*)
+		os=-coff
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1383,7 +1409,7 @@ case $basic_machine in
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks*)
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)

dynlib.m4

@@ -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.               |
-#  +----------------------------------------------------------------------+
-#  | Author: 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
-])

ext/Makefile.in

@@ -1,4 +0,0 @@
-
-SUBDIRS = $(EXT_SUBDIRS)
-
-include $(top_srcdir)/build/rules.mk

ext/aspell/CREDITS

@@ -1,2 +0,0 @@
-aspell
-Rasmus Lerdorf

ext/aspell/Makefile.in

@@ -1,5 +0,0 @@
-
-LTLIBRARY_NAME    = libaspell.la
-LTLIBRARY_SOURCES = aspell.c
-
-include $(top_srcdir)/build/dynlib.mk

ext/aspell/aspell.c

@@ -1,228 +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.               |
-   +----------------------------------------------------------------------+
-   | Author: Rasmus Lerdorf <rasmus@php.net>                              |
-   +----------------------------------------------------------------------+
- */
-
-/* $Id$ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-
-#ifdef COMPILE_DL_ASPELL
-#include "phpdl.h"
-#endif
-#include <stdlib.h>
-#include <ctype.h>
-#include <stdio.h>
-
-#if HAVE_ASPELL
-
-#include "php_aspell.h"
-#include <aspell-c.h>
-#include "ext/standard/info.h"
-
-/* {{{ aspell_functions[]
- */
-function_entry aspell_functions[] = {
-	PHP_FE(aspell_new,								NULL)
-	PHP_FE(aspell_check,							NULL)
-	PHP_FE(aspell_check_raw,						NULL)
-	PHP_FE(aspell_suggest,							NULL)
-	{NULL, NULL, NULL}
-};
-/* }}} */
-
-static int le_aspell;
-
-zend_module_entry aspell_module_entry = {
-    STANDARD_MODULE_HEADER,
-	"aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
-};
-
-#ifdef COMPILE_DL_ASPELL
-ZEND_GET_MODULE(aspell)
-#endif
-
-/* {{{ php_aspell_close
- */
-static void php_aspell_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
-	aspell *sc = (aspell *)rsrc->ptr;
-
-	aspell_free(sc);
-}
-/* }}} */
-
-/* {{{ PHP_MINIT_FUNCTION
- */
-PHP_MINIT_FUNCTION(aspell)
-{
-    le_aspell = zend_register_list_destructors_ex(php_aspell_close, NULL, "aspell", module_number);
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ proto int aspell_new(string master [, string personal])
-   Load a dictionary */
-PHP_FUNCTION(aspell_new)
-{
-	pval **master, **personal;
-	int argc;
-	aspell *sc;
-	int ind;
-	
-	argc = ZEND_NUM_ARGS();
-	if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &master, &personal) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_string_ex(master);
-	if(argc==2)
-	  {
-		convert_to_string_ex(personal) ;
-		sc=aspell_new(Z_STRVAL_PP(master), Z_STRVAL_PP(personal));
-	  }
-	else
-	  sc=aspell_new(Z_STRVAL_PP(master), "");
-
-	ind = zend_list_insert(sc, le_aspell);
-	RETURN_LONG(ind);
-}
-/* }}} */
-
-/* {{{ proto array aspell_suggest(aspell int, string word)
-   Return array of Suggestions */
-PHP_FUNCTION(aspell_suggest)
-{
-	pval **scin, **word;
-	int argc;
-	aspell *sc;
-	int ind, type;
-	aspellSuggestions *sug;
-	size_t i;
-
-	
-	argc = ZEND_NUM_ARGS();
-	if (argc != 2 || zend_get_parameters_ex(argc, &scin, &word) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_long_ex(scin);
-	convert_to_string_ex(word);
-	sc = (aspell *)zend_list_find(Z_LVAL_PP(scin), &type);
-	if(!sc)
-	  {
-		php_error(E_WARNING, "%d is not an ASPELL result index", Z_LVAL_PP(scin));
-		RETURN_FALSE;
-	  }
-
-	if (array_init(return_value) == FAILURE) {
-                RETURN_FALSE;
-	}
-
-	sug = aspell_suggest(sc, Z_STRVAL_PP(word));
-	  for (i = 0; i != sug->size; ++i) {
-                add_next_index_string(return_value, (char *)sug->data[i], 1);
-	  }
-	  aspell_free_suggestions(sug);
-}
-/* }}} */
-
-/* {{{ proto int aspell_check(aspell int, string word)
-   Return if word is valid */
-PHP_FUNCTION(aspell_check)
-{
-   int type;
-   pval **scin, **word;
-   aspell *sc;
-
-   int argc;
-    argc = ZEND_NUM_ARGS();
-    if (argc != 2 || zend_get_parameters_ex(argc, &scin, &word) == FAILURE) {
-        WRONG_PARAM_COUNT;
-    }
-    convert_to_long_ex(scin);
-    convert_to_string_ex(word);
-    sc= (aspell *) zend_list_find(Z_LVAL_PP(scin), &type);
-    if(!sc)
-      {
-        php_error(E_WARNING, "%d is not an ASPELL result index", Z_LVAL_PP(scin));
-        RETURN_FALSE;
-      }
-    if (aspell_check(sc, Z_STRVAL_PP(word))) 
-      {
-	RETURN_TRUE;
-      }
-    else 
-      {
-  RETURN_FALSE;
-      }
-}
-/* }}} */
-
-/* {{{ proto int aspell_check_raw(aspell int, string word)
-   Return if word is valid, ignoring case or trying to trim it in any way */
-PHP_FUNCTION(aspell_check_raw)
-{
-  pval **scin, **word;
-  int type;
-  int argc;
-  aspell *sc;
-
-    argc = ZEND_NUM_ARGS();
-    if (argc != 2 || zend_get_parameters_ex(argc, &scin, &word) == FAILURE) {
-        WRONG_PARAM_COUNT;
-    }
-    convert_to_long_ex(scin);
-    convert_to_string_ex(word);
-    sc = (aspell *)zend_list_find(Z_LVAL_PP(scin), &type);
-    if(!sc)
-      {
-        php_error(E_WARNING, "%d is not an ASPELL result index", Z_LVAL_PP(scin));
-        RETURN_FALSE;
-      }
-	if (aspell_check_raw(sc, Z_STRVAL_PP(word))) 
-	  {
-	    RETURN_TRUE;
-	  }
-	else
-	  {
-	    RETURN_FALSE;
-	      }
-}
-/* }}} */
-
-/* {{{ PHP_MINFO_FUNCTION
- */
-PHP_MINFO_FUNCTION(aspell)
-{
-	php_info_print_table_start();
-	php_info_print_table_row(2, "ASpell Support", "enabled");
-	php_info_print_table_end();
-}
-/* }}} */
-
-#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

ext/aspell/config.m4

@@ -1,30 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-AC_MSG_CHECKING(for ASPELL support)
-AC_ARG_WITH(aspell,
-[  --with-aspell[=DIR]     Include ASPELL support.],
-[
-  if test "$withval" != "no"; then
-    if test "$withval" = "yes"; then
-      ASPELL_DIR=/usr/local
-    else
-      ASPELL_DIR=$withval
-    fi
-
-    PHP_ADD_INCLUDE($ASPELL_DIR/include)
-    PHP_ADD_LIBRARY_WITH_PATH(aspell, $ASPELL_DIR/lib)
-
-    if test ! -f "$ASPELL_DIR/include/aspell-c.h"; then
-      AC_MSG_ERROR(Could not find aspell-c.h in $ASPELL_DIR/include - please copy it manually from the aspell sources to $ASPELL_DIR/include)
-    fi
-    AC_DEFINE(HAVE_ASPELL,1,[Whether you have aspell])
-    AC_MSG_RESULT(yes)
-    PHP_EXTENSION(aspell)
-  else
-    AC_MSG_RESULT(no)
-  fi
-],[
-  AC_MSG_RESULT(no)
-])

ext/bcmath/Makefile.in

@@ -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

ext/bcmath/bcmath.c

@@ -28,7 +28,7 @@
 
 #include "ext/standard/info.h"
 #include "php_bcmath.h"
-#include "ext/bcmath/libbcmath/src/bcmath.h"
+#include "libbcmath/src/bcmath.h"
 
 function_entry bcmath_functions[] = {
 	PHP_FE(bcadd,									NULL)
@@ -47,10 +47,10 @@ zend_module_entry bcmath_module_entry = {
 	STANDARD_MODULE_HEADER,
 	"bcmath",
 	bcmath_functions,
-	PHP_MINIT(bcmath),
-	PHP_MSHUTDOWN(bcmath),
-	PHP_RINIT(bcmath),
 	NULL,
+	NULL,
+	PHP_RINIT(bcmath),
+	PHP_RSHUTDOWN(bcmath),
 	PHP_MINFO(bcmath),
 	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
@@ -65,9 +65,9 @@ static long bc_precision;
 #endif
 
 /* Storage used for special numbers. */
-bc_num _zero_;
-bc_num _one_;
-bc_num _two_;
+extern bc_num _zero_;
+extern bc_num _one_;
+extern bc_num _two_;
 
 
 /* Make a copy of a number!  Just increments the reference count! */
@@ -85,34 +85,12 @@ void init_num (bc_num *num)
 }
 
 
-PHP_MINIT_FUNCTION(bcmath)
-{
-	extern bc_num _zero_;
-	extern bc_num _one_;
-	extern bc_num _two_;
-
-	_zero_ = bc_new_num (1, 0);
-	_one_  = bc_new_num (1, 0);
-	_one_->n_value[0] = 1;
-	_two_  = bc_new_num (1, 0);
-	_two_->n_value[0] = 2;
-	persist_alloc(_zero_);
-	persist_alloc(_one_);
-	persist_alloc(_two_);
-	persist_alloc(_zero_->n_ptr);
-	persist_alloc(_one_->n_ptr);
-	persist_alloc(_two_->n_ptr);
-
-	return SUCCESS;
-}
-
-
-
-PHP_MSHUTDOWN_FUNCTION(bcmath)
+PHP_RSHUTDOWN_FUNCTION(bcmath)
 {
 	bc_free_num(&_zero_);
 	bc_free_num(&_one_);
 	bc_free_num(&_two_);
+
 	return SUCCESS;
 }
 
@@ -122,6 +100,9 @@ PHP_RINIT_FUNCTION(bcmath)
 	if (cfg_get_long("bcmath.scale", &bc_precision)==FAILURE) {
 		bc_precision=0;
 	}
+	
+	bc_init_numbers();
+	
 	return SUCCESS;
 }
 
@@ -301,7 +282,7 @@ PHP_FUNCTION(bcdiv)
 			Z_TYPE_P(return_value) = IS_STRING;
 			break;
 		case -1: /* division by zero */
-			php_error(E_WARNING, "Division by zero");
+			php_error(E_WARNING, "%s(): Division by zero", get_active_function_name(TSRMLS_C));
 			break;
 	}
 	bc_free_num(&first);
@@ -342,7 +323,7 @@ PHP_FUNCTION(bcmod)
 			Z_TYPE_P(return_value) = IS_STRING;
 			break;
 		case -1:
-			php_error(E_WARNING, "Division by zero");
+			php_error(E_WARNING, "%s(): Division by zero", get_active_function_name(TSRMLS_C));
 			break;
 	}
 	bc_free_num(&first);
@@ -428,7 +409,7 @@ PHP_FUNCTION(bcsqrt)
 		Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
 		Z_TYPE_P(return_value) = IS_STRING;
 	} else {
-		php_error(E_WARNING, "Square root of negative number");
+		php_error(E_WARNING, "%s(): Square root of negative number", get_active_function_name(TSRMLS_C));
 	}
 	bc_free_num(&result);
 	return;

ext/bcmath/config.m4

@@ -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

ext/bcmath/libbcmath/Makefile.in

@@ -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

ext/bcmath/libbcmath/doc/Makefile.am

@@ -1,3 +0,0 @@
-# Documentation makefile
-
-MAINTAINERCLEANFILES= Makefile.in

ext/bcmath/libbcmath/doc/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:

ext/bcmath/libbcmath/doc/bcmath.1

@@ -1 +0,0 @@
-./" bcmath library documentation

ext/bcmath/libbcmath/src/Makefile.in

@@ -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

ext/bcmath/libbcmath/src/config.h

@@ -1,5 +1,7 @@
 #if PHP_WIN32
 #include "../../../../main/config.w32.h"
+#elif defined(NETWARE)
+#include "config.nw.h"
 #else
 #include "php_config.h"
 #endif

ext/bcmath/php_bcmath.h

@@ -26,9 +26,8 @@
 extern zend_module_entry bcmath_module_entry;
 #define phpext_bcmath_ptr &bcmath_module_entry
 
-PHP_MINIT_FUNCTION(bcmath);
-PHP_MSHUTDOWN_FUNCTION(bcmath);
 PHP_RINIT_FUNCTION(bcmath);
+PHP_RSHUTDOWN_FUNCTION(bcmath);
 PHP_MINFO_FUNCTION(bcmath);
 
 PHP_FUNCTION(bcadd);

ext/bcmath/setup.stub

@@ -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.'

ext/calendar/Makefile.in

@@ -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

ext/calendar/cal_unix.c

@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
    | Authors: Shane Caraveo             <shane@caraveo.com>               | 
-   |          Colin Viebrock            <cmv@easydns.com>                 |
+   |          Colin Viebrock            <colin@easydns.com>               |
    |          Hartmut Holzgraefe        <hartmut@six.de>                  |
    +----------------------------------------------------------------------+
  */

ext/calendar/calendar.c

@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
    | Authors: Shane Caraveo             <shane@caraveo.com>               | 
-   |          Colin Viebrock            <cmv@easydns.com>                 |
+   |          Colin Viebrock            <colin@easydns.com>               |
    |          Hartmut Holzgraefe        <hartmut@six.de>                  |
    |          Wez Furlong               <wez@thebrainroom.com>            |
    +----------------------------------------------------------------------+
@@ -33,6 +33,8 @@
 #include "php_calendar.h"
 #include "sdncal.h"
 
+#include <stdio.h>
+ 
 function_entry calendar_functions[] = {
 	PHP_FE(jdtogregorian, NULL)
 	PHP_FE(gregoriantojd, NULL)
@@ -85,15 +87,15 @@ typedef long int (*cal_to_jd_func_t)(int month, int day, int year);
 typedef void (*cal_from_jd_func_t)(long int jd, int* year, int* month, int* day);
 typedef char* (*cal_as_string_func_t)(int year, int month, int day);
 
-struct cal_entry_t	{
-	char * name;
-	char * symbol;
-	cal_to_jd_func_t			to_jd;
-	cal_from_jd_func_t			from_jd;
-	int num_months;
-	int max_days_in_month;
-	char **					month_name_short;
-	char **					month_name_long;
+struct cal_entry_t {
+	char 					*name;
+	char 					*symbol;
+	cal_to_jd_func_t		to_jd;
+	cal_from_jd_func_t		from_jd;
+	int 					num_months;
+	int 					max_days_in_month;
+	char					**month_name_short;
+	char					**month_name_long;
 };
 static struct cal_entry_t cal_conversion_table[CAL_NUM_CALS] = {
 	{ "Gregorian", "CAL_GREGORIAN", GregorianToSdn, SdnToGregorian, 12, 31, MonthNameShort, MonthNameLong },
@@ -108,6 +110,9 @@ enum	{ CAL_DOW_DAYNO, CAL_DOW_SHORT, CAL_DOW_LONG };
 enum	{ CAL_MONTH_GREGORIAN_SHORT, CAL_MONTH_GREGORIAN_LONG,
 	CAL_MONTH_JULIAN_SHORT, CAL_MONTH_JULIAN_LONG, CAL_MONTH_JEWISH,
 	CAL_MONTH_FRENCH };
+
+/* for heb_number_to_chars */
+static char alef_bet[25] = "0àáâãäåæçèéëìîðñòôö÷øùú";
 	
 PHP_MINIT_FUNCTION(calendar)
 {
@@ -127,15 +132,19 @@ 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;
 }
 
 PHP_MINFO_FUNCTION(calendar)
 {
-  php_info_print_table_start();
-  php_info_print_table_row(2, "Calendar support", "enabled");
-  php_info_print_table_end();
+	php_info_print_table_start();
+	php_info_print_table_row(2, "Calendar support", "enabled");
+	php_info_print_table_end();
 }
 
 /* {{{ proto array cal_info(int calendar)
@@ -147,11 +156,11 @@ PHP_FUNCTION(cal_info)
 	int i;
 	struct cal_entry_t * calendar;
 	
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &cal) != SUCCESS)	{
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &cal) != SUCCESS) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(cal);
-	if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS)	{
+	if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) {
 		zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal));
 		RETURN_FALSE;
 	}
@@ -164,7 +173,7 @@ PHP_FUNCTION(cal_info)
 	array_init(months);
 	array_init(smonths);
 	
-	for (i=1; i<= calendar->num_months; i++)	{
+	for (i=1; i<= calendar->num_months; i++) {
 		add_index_string(months, i, calendar->month_name_long[i], 1);
 		add_index_string(smonths, i, calendar->month_name_short[i], 1);
 	}
@@ -185,7 +194,7 @@ PHP_FUNCTION(cal_days_in_month)
 	struct cal_entry_t * calendar;
 	long sdn_start, sdn_next;
 	
-	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &cal, &month, &year) != SUCCESS)	{
+	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &cal, &month, &year) != SUCCESS) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -193,7 +202,7 @@ PHP_FUNCTION(cal_days_in_month)
 	convert_to_long_ex(month);
 	convert_to_long_ex(year);
 
-	if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS)	{
+	if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) {
 		zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal));
 		RETURN_FALSE;
 	}
@@ -220,7 +229,7 @@ PHP_FUNCTION(cal_to_jd)
 	zval ** cal, **month, **day, **year;
 	long jdate;
 
-	if (ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &cal, &month, &day, &year) != SUCCESS)	{
+	if (ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &cal, &month, &day, &year) != SUCCESS) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -229,7 +238,7 @@ PHP_FUNCTION(cal_to_jd)
 	convert_to_long_ex(day);
 	convert_to_long_ex(year);
 
-	if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS)	{
+	if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) {
 		zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal));
 		RETURN_FALSE;
 	}
@@ -249,13 +258,13 @@ PHP_FUNCTION(cal_from_jd)
 	char date[16];
 	struct cal_entry_t * calendar;
 	
-	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &jd, &cal) != SUCCESS)	{
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &jd, &cal) != SUCCESS) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(jd);
 	convert_to_long_ex(cal);
 
-	if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS)	{
+	if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) {
 		zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal));
 		RETURN_FALSE;
 	}
@@ -307,7 +316,7 @@ PHP_FUNCTION(jdtogregorian)
 
 /* {{{ proto int gregoriantojd(int month, int day, int year)
    Converts a gregorian calendar date to julian day count */
- PHP_FUNCTION(gregoriantojd)
+PHP_FUNCTION(gregoriantojd)
 {
 	pval **year, **month, **day;
 	int jdate;
@@ -328,7 +337,7 @@ PHP_FUNCTION(jdtogregorian)
 
 /* {{{ proto string jdtojulian(int juliandaycount)
    Convert a julian day count to a julian calendar date */
- PHP_FUNCTION(jdtojulian) 
+PHP_FUNCTION(jdtojulian) 
 {
 	pval **julday;
 	int year, month, day;
@@ -348,7 +357,7 @@ PHP_FUNCTION(jdtogregorian)
 
 /* {{{ proto int juliantojd(int month, int day, int year)
    Converts a julian calendar date to julian day count */
- PHP_FUNCTION(juliantojd)
+PHP_FUNCTION(juliantojd)
 {
 	pval **year, **month, **day;
 	int jdate;
@@ -367,30 +376,119 @@ PHP_FUNCTION(jdtogregorian)
 }
 /* }}} */
 
+/*	
+	caution: the hebrew format product non unique result.
+	for example both: year '5' and year '5000' product 'ä'.
+	use the numeric one for calculations. 
+ */
+static char* heb_number_to_chars(int n)
+{
+	char *p, *old, *ret;
+
+	p = emalloc(10);
+	old = p;
+
+	/* 
+	   prevents the option breaking the jewish beliefs, and some other 
+	   critical resources ;)
+	   */
+	if (n > 9999 || n < 1)
+		return NULL;
+
+	/* alafim case */
+	if (n / 1000) {
+		*p = alef_bet[n / 1000];
+		p++;
+		n = n % 1000;
+	}
+
+	/* taf-taf case */
+	while (n >= 400) {
+		*p = alef_bet[22];
+		p++;
+		n-=400;
+	}
+
+	/* meot case */
+	if (n >= 100) { 
+		*p = alef_bet[18+n/100];
+		p++;
+		n = n % 100;
+	}
+
+	/* tet-vav tet-zain case */
+	if (n == 15 || n == 16) {
+		*p = alef_bet[9];
+		p++;
+		*p = alef_bet[n-9];
+		p++;
+	} else {
+		/* asarot case */
+		if (n >= 10) {       
+			*p = alef_bet[9+n/10];
+			p++;
+			n = n % 10;
+		}
+
+		/* yeihot case */
+		if (n > 0) {
+			*p = alef_bet[n];
+			p++;
+		}
+	}
+
+	*p = '\0';
+	ret = emalloc((int) (p - old) + 1);
+	strncpy(ret, old, (int) (p - old) + 1);
+	return ret;
+}
+
 /* {{{ proto string jdtojewish(int juliandaycount)
    Converts a julian day count to a jewish calendar date */
- PHP_FUNCTION(jdtojewish) 
+PHP_FUNCTION(jdtojewish) 
 {
-	pval **julday;
+	long julday, fl;
 	int year, month, day;
-	char date[10];
-
-	if (zend_get_parameters_ex(1, &julday) != SUCCESS) {
+	char date[10], hebdate[25];
+	
+	if (ZEND_NUM_ARGS() == 1) {
+		if (zend_parse_parameters(1 TSRMLS_CC,"l", &julday) != SUCCESS) {
+			RETURN_FALSE;
+		}
+		fl=0;
+	} else if (ZEND_NUM_ARGS() == 2) {
+		if (zend_parse_parameters(2 TSRMLS_CC,"ll", &julday, &fl) != SUCCESS) {
+			RETURN_FALSE;
+		}
+	} else {
 		WRONG_PARAM_COUNT;
 	}
 	
-	convert_to_long_ex(julday);
 	
-	SdnToJewish(Z_LVAL_PP(julday), &year, &month, &day);
-	sprintf(date, "%i/%i/%i", month, day, year);
-
-	RETURN_STRING(date, 1);
+	SdnToJewish(julday, &year, &month, &day);
+	if(!fl) {
+		sprintf(date, "%i/%i/%i", month, day, year);
+		RETURN_STRING(date, 1);
+	} else {
+		if (year <= 0 || year > 9999) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Out of range year.");
+			RETURN_FALSE;
+		}
+		
+		sprintf(hebdate, "%s %s %s", \
+				heb_number_to_chars(day), \
+				JewishMonthHebName[month], \
+				heb_number_to_chars(year));
+		
+		RETURN_STRING(hebdate, 1);
+		
+	}
 }
 /* }}} */
 
 /* {{{ proto int jewishtojd(int month, int day, int year)
    Converts a jewish calendar date to a julian day count */
- PHP_FUNCTION(jewishtojd)
+PHP_FUNCTION(jewishtojd)
 {
 	pval **year, **month, **day;
 	int jdate;
@@ -411,7 +509,7 @@ PHP_FUNCTION(jdtogregorian)
 
 /* {{{ proto string jdtofrench(int juliandaycount)
    Converts a julian day count to a french republic calendar date */
- PHP_FUNCTION(jdtofrench)
+PHP_FUNCTION(jdtofrench)
 {
 	pval **julday;
 	int year, month, day;
@@ -432,7 +530,7 @@ PHP_FUNCTION(jdtogregorian)
 
 /* {{{ proto int frenchtojd(int month, int day, int year)
    Converts a french republic calendar date to julian day count */
- PHP_FUNCTION(frenchtojd)
+PHP_FUNCTION(frenchtojd)
 {
 	pval **year, **month, **day;
 	int jdate;
@@ -453,7 +551,7 @@ PHP_FUNCTION(jdtogregorian)
 
 /* {{{ proto mixed jddayofweek(int juliandaycount [, int mode])
    Returns name or number of day of week from julian day count */
- PHP_FUNCTION(jddayofweek)
+PHP_FUNCTION(jddayofweek)
 {
 	pval *julday, *mode;
 	int day;
@@ -491,7 +589,7 @@ PHP_FUNCTION(jdtogregorian)
 
 /* {{{ proto string jdmonthname(int juliandaycount, int mode)
    Returns name of month for julian day count */
- PHP_FUNCTION(jdmonthname)
+PHP_FUNCTION(jdmonthname)
 {
 	pval **julday, **mode;
 	char *monthname = NULL;

ext/calendar/config.m4

@@ -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

ext/calendar/easter.c

@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
    | Authors: Shane Caraveo             <shane@caraveo.com>               | 
-   |          Colin Viebrock            <cmv@easydns.com>                 |
+   |          Colin Viebrock            <colin@easydns.com>               |
    |          Hartmut Holzgraefe        <hartmut@six.de>                  |
    +----------------------------------------------------------------------+
  */
@@ -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, "%s(): This function is only valid for years between 1970 and 2037 inclusive", get_active_function_name(TSRMLS_C));
 		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)
 {

ext/calendar/jewish.c

@@ -311,6 +311,24 @@ char *JewishMonthName[14] =
 	"Elul"
 };
 
+char *JewishMonthHebName[14] =
+{
+	"",
+	"úùøé",
+	"çùåï",
+	"ëñìå",
+	"èáú",
+	"ùáè",
+	"àãø",
+	"'àãø á",
+	"ðéñï",
+	"àééø",
+	"ñéåï",
+	"úîåæ",
+	"àá",
+	"àìåì"
+};
+
 /************************************************************************
  * Given the year within the 19 year metonic cycle and the time of a molad
  * (new moon) which starts that year, this routine will calculate what day

ext/calendar/php_calendar.h

@@ -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

ext/calendar/sdncal.h

@@ -79,6 +79,7 @@ long int JulianToSdn(int year, int month, int day);
 void SdnToJewish(long int sdn, int *pYear, int *pMonth, int *pDay);
 long int JewishToSdn(int year, int month, int day);
 extern char *JewishMonthName[14];
+extern char *JewishMonthHebName[14];
 
 /* French republic calendar conversions. */
 void SdnToFrench(long int sdn, int *pYear, int *pMonth, int *pDay);
@@ -93,4 +94,4 @@ int DayOfWeek(long int sdn);
 extern char *DayNameShort[7];
 extern char *DayNameLong[7];
 
-#endif							/* SDNCAL_H */
+#endif /* SDNCAL_H */

ext/ccvs/CREDITS

@@ -1,2 +0,0 @@
-ccvs
-Brendan W. McAdams, Doug DeJulio

ext/ccvs/Makefile.in

@@ -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

ext/ccvs/TODO

@@ -1,7 +0,0 @@
-CCVS Module ToDo List
-08/14/2000
-Brendan W. McAdams <bmcadams@php.net>
--------------------------------------
-- Return value of the final stats of an authorization should already be split out into a php aware associative
-  array, instead of having to do this at the PHP level. Right now we are splitting stuff out using text_value;
-  I'm evaluating the merits of having a seperate function for the 'finishing' of a sale....

ext/ccvs/ccvs.c

@@ -1,607 +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: Brendan W. McAdams <bmcadams@php.net>                       |
-   |          Doug DeJulio <ddj@redhat.com>                               |
-   +----------------------------------------------------------------------+
- */
-/*
-*	cvvs.c $Revision$ - PHP4 Interface to the RedHat CCVS API
-*	 -------
-*	 Interfaces RedHat's CCVS [Credit Card Verification System] <http://www.redhat.com/products/ccvs/>
-*	 This code is ported from an original php3 interface written by RedHat's Doug DeJulio <ddj@redhat.com>
-*	 The code was subsequently ported to the Zend API by Brendan W. McAdams <bmcadams@php.net>
-*	 -------
-*/
-
-/*
-*	Code started on 2000.07.24@09.04.EST by Brendan W. McAdams <bmcadams@php.net>
-*	$Revision$
-*/
-
-static char const cvsid[] = "$Id$";
-
-#include <php.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ccvs.h>
-
-
-	/*
-	*	Create the Zend Internal hash construct to track this modules functions
-	*
-	*	In case anyone is wondering why we use ccvs_<action> instead of cv_<action>,
-	*	it's because we are directly importing functions of the actual CCVS, which uses functions that are
-	*	cv_<action>, and we had problems implementing ZEND_NAMED_FE calls (bug in NAMED_FE? investigate
-	* 	later).  We don't want our PHP calls to conflict with the C calls in the CCVS API.
-	*
-	*	BWM - 2000.07.27@16.41.EST - Added FALIAS Calls.  While I'm of the opinion that naming the
-	* 	functions in PHP ccvs_<action> is much more readable and clear to anyone reading the code than
-	*	cv_<action>, It strikes me that many people coming from php3 -> php4 will need backwards
-	*  compatibility.  It was kind of careless to simply change the function calls (There were reasons other
-	*  than readability behind this; the ZEND_NAMED_FE macro was misbehaving) and not provide for
-	*  backwards compatibility - this *IS* an API and should scale with compatibility.
-	*
-	*/
-
-	function_entry ccvs_functions[] = {
-		PHP_FE(ccvs_init, NULL)
-		PHP_FALIAS(cv_init, ccvs_init, NULL)
-		PHP_FE(ccvs_done, NULL)
-		PHP_FALIAS(cv_done, ccvs_done, NULL)
-		PHP_FE(ccvs_new, NULL)
-		PHP_FALIAS(cv_new, ccvs_new, NULL)
-		PHP_FE(ccvs_add, NULL)
-		PHP_FALIAS(cv_add, ccvs_add, NULL)
-		PHP_FE(ccvs_delete, NULL)
-		PHP_FALIAS(cv_delete, ccvs_delete, NULL)
-		PHP_FE(ccvs_auth, NULL)
-		PHP_FALIAS(cv_auth, ccvs_auth, NULL)
-		PHP_FE(ccvs_return, NULL)
-		PHP_FALIAS(cv_return, ccvs_return, NULL)
-		PHP_FE(ccvs_reverse, NULL)
-		PHP_FALIAS(cv_reverse, ccvs_reverse, NULL)
-		PHP_FE(ccvs_sale, NULL)
-		PHP_FALIAS(cv_sale, ccvs_sale, NULL)
-		PHP_FE(ccvs_void, NULL)
-		PHP_FALIAS(cv_void, ccvs_void, NULL)
-		PHP_FE(ccvs_status, NULL)
-		PHP_FALIAS(cv_status, ccvs_status, NULL)
-		PHP_FE(ccvs_count, NULL)
-		PHP_FALIAS(cv_count, ccvs_count, NULL)
-		PHP_FE(ccvs_lookup, NULL)
-		PHP_FALIAS(cv_lookup, ccvs_lookup, NULL)
-		PHP_FE(ccvs_report, NULL)
-		PHP_FALIAS(cv_report, ccvs_report, NULL)
-		PHP_FE(ccvs_command, NULL)
-		PHP_FALIAS(cv_command, ccvs_command, NULL)
-		PHP_FE(ccvs_textvalue, NULL)
-		PHP_FALIAS(cv_textvalue, ccvs_textvalue, NULL)
-		{NULL, NULL, NULL}
-	};
-
-/* End function declarations */
-
-/* Zend Engine Exports - module information */
-
-	/* Declare our module to the Zend engine */
-	zend_module_entry ccvs_module_entry = {
-        STANDARD_MODULE_HEADER,
-		"CCVS",
-		ccvs_functions,
-		NULL, NULL, NULL, NULL,
-		PHP_MINFO(ccvs),
-        NO_VERSION_YET,
-		STANDARD_MODULE_PROPERTIES
-	};
-
-#ifdef COMPILE_DL_CCVS
-ZEND_GET_MODULE(ccvs)
-#endif
-
-/* 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;
-  void *vsess;
-  char *p;
-
-  if ((ZEND_NUM_ARGS() != 1) || (zend_get_parameters_ex(1, &name) != SUCCESS))
-  /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-    {
-      WRONG_PARAM_COUNT;
-    }
-
-  convert_to_string_ex(name);
-
-  vsess = cv_init(Z_STRVAL_PP(name));
-
-  /*
-  *		-- In the case that we don't run error checking on the return value... --
-  *		On 32 bit systems a failure of the cv_init call returns 0,0,0,0 ; on 64 bit systems its 0,0,0,0,0,0,0,0
-  *		This unconsistent error (not to mention a string of comma seperated zeros in and of itself) is hard to
-  * 	Trap for in PHP (or any language).  However, we can also grab cv_init to return CV_SESS_BAD on
-  *		failure at the C API level, and return a set, fixed error code to the user which the user then knows to
-  *		trap for... e.g. a NULL Value which PHP can then trap by:
-  *		if (!($string = cv_init($config)) { or some such...
-  */
-
-  if (vsess == CV_SESS_BAD) /* if the cv_init() call failed... */
-  {
-
-  		p = ""; /* set p, the value we will return, to NULL */
-
-  }
-  else /* we got a valid session returned, which means it worked */
-  {
-
-  p = hks_ptr_ptrtostring(vsess);   /* Convert the (void*) into a string representation. */
-
-  }
-
-  RETVAL_STRING(p, 1);
-
-  free(p);
-  return;
-}
-/* }}} */
-
-/* {{{ proto string ccvs_done(string sess)
-   Terminate CCVS engine and do cleanup work */
-PHP_FUNCTION(ccvs_done) /* cv_done() */
-{
-  zval **sess;
-  void *vsess;
-
-  if ((ZEND_NUM_ARGS() != 1) || (zend_get_parameters_ex(1, &sess) != SUCCESS)) /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-    {
-      WRONG_PARAM_COUNT;
-    }
-
-  convert_to_string_ex(sess);
-
-  /* Convert from the string representation back to a (void*) */
-  vsess = hks_ptr_stringtoptr(Z_STRVAL_PP(sess));
-  cv_done(vsess);
-
-  RETURN_STRING("OK", 1);
-}
-/* }}} */
-
-/* {{{ proto string ccvs_new(string session, string invoice)
-   Create a new, blank transaction */
-PHP_FUNCTION(ccvs_new) /* cv_new() */
-{
-  zval **psess;
-  zval **pinvoice;
-  void *sess;
-  char *invoice;
-  int r;
-
-  if ((ZEND_NUM_ARGS() != 2) || (zend_get_parameters_ex(2, &psess, &pinvoice) != SUCCESS)) /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  if (!Z_STRVAL_PP(psess)) {
-    php_error(E_WARNING, "Invalid session to ccvs_new()");
-    RETURN_FALSE;
-  }
-
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-
-  convert_to_string_ex(pinvoice);
-  invoice = Z_STRVAL_PP(pinvoice);
-
-  r = cv_new(sess, invoice);
-
-  RETURN_STRING(cv_ret2str(r), 1);
-}
-/* }}} */
-
-/* {{{ 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;
-  zval **pinvoice;
-  zval **pargtype;
-  zval **pargval;
-  void *sess;
-  char *invoice;
-  int argtype;
-  char *argval;
-  register int r;
-
-  if ((ZEND_NUM_ARGS() != 4) || (zend_get_parameters_ex(4, &psess, &pinvoice, &pargtype, &pargval) != SUCCESS)) /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  /* Get meaningful arguments. */
-  convert_to_string_ex(psess);
-  convert_to_string_ex(pinvoice);
-  convert_to_string_ex(pargtype);
-  convert_to_string_ex(pargval);
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-  invoice = Z_STRVAL_PP(pinvoice);
-  argtype = cv_str2arg(Z_STRVAL_PP(pargtype));
-  argval = Z_STRVAL_PP(pargval);
-
-  r = cv_add(sess, invoice, argtype, argval);
-
-  RETURN_STRING(cv_ret2str(r), 1);
-}
-/* }}} */
-
-/*
-*	cv_create can't be implemented because of vararg limits in PHP3's C API.
-*	(COMMENT BY DDJ [from original code])
-*
-*	BWM: I looked into this, checking in on what cv_create was; it is a deprecated function left in for
-*	backwards compatibility according
-*  to the CCVS C API ref.  I didn't try to implement it for that reason.  If anyone needs it, they can add it in
-*	themselves I'm sure.
-*/
-
-/* {{{ proto string ccvs_delete(string session, string invoice)
-   Delete a transaction */
-PHP_FUNCTION(ccvs_delete) /* cv_delete() */
-{
-  zval **psess;
-  zval **pinvoice;
-  void *sess;
-  char *invoice;
-  register int r;
-
-  if ((ZEND_NUM_ARGS() != 2) || (zend_get_parameters_ex(2, &psess, &pinvoice) != SUCCESS)) /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  convert_to_string_ex(pinvoice);
-  invoice = Z_STRVAL_PP(pinvoice);
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-
-  r = cv_delete(sess, invoice);
-
-  RETURN_STRING(cv_ret2str(r), 1);
-}
-/* }}} */
-
-/* {{{ proto string ccvs_auth(string session, string invoice)
-   Perform credit authorization test on a transaction */
-PHP_FUNCTION(ccvs_auth) /* cv_auth() */
-{
-  zval **psess;
-  zval **pinvoice;
-  void *sess;
-  char *invoice;
-  register int r;
-
-  if ((ZEND_NUM_ARGS() != 2) || (zend_get_parameters_ex(2, &psess, &pinvoice) != SUCCESS))  /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  convert_to_string_ex(pinvoice);
-  invoice = Z_STRVAL_PP(pinvoice);
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-
-  r = cv_auth(sess, invoice);
-
-  RETURN_STRING(cv_ret2str(r), 1);
-}
-/* }}} */
-
-/* {{{ 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;
-  zval **pinvoice;
-  void *sess;
-  char *invoice;
-  register int r;
-
-  if ((ZEND_NUM_ARGS() != 2) || (zend_get_parameters_ex(2, &psess, &pinvoice) != SUCCESS))  /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  convert_to_string_ex(pinvoice);
-  invoice = Z_STRVAL_PP(pinvoice);
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-
-  r = cv_return(sess, invoice);
-
-  RETURN_STRING(cv_ret2str(r), 1);
-}
-/* }}} */
-
-/* {{{ 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;
-  zval **pinvoice;
-  void *sess;
-  char *invoice;
-  register int r;
-
-  if ((ZEND_NUM_ARGS() != 2) || (zend_get_parameters_ex(2, &psess, &pinvoice)  != SUCCESS))  /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  convert_to_string_ex(pinvoice);
-  invoice = Z_STRVAL_PP(pinvoice);
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-
-  r = cv_reverse(sess, invoice);
-
-  RETURN_STRING(cv_ret2str(r), 1);
-}
-/* }}} */
-
-/* {{{ 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;
-  zval **pinvoice;
-  void *sess;
-  char *invoice;
-  register int r;
-
-  if ((ZEND_NUM_ARGS() != 2) || (zend_get_parameters_ex(2, &psess, &pinvoice) != SUCCESS))  /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  convert_to_string_ex(pinvoice);
-  invoice = Z_STRVAL_PP(pinvoice);
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-
-  r = cv_sale(sess, invoice);
-
-  RETURN_STRING(cv_ret2str(r), 1);
-}
-/* }}} */
-
-/* {{{ proto string ccvs_void(string session, string invoice)
-   Perform a full reversal on a completed transaction */
-PHP_FUNCTION(ccvs_void) /* cv_void() */
-{
-  zval **psess;
-  zval **pinvoice;
-  void *sess;
-  char *invoice;
-  register int r;
-
-  if ((ZEND_NUM_ARGS() != 2) || (zend_get_parameters_ex(2, &psess, &pinvoice) != SUCCESS))  /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  convert_to_string_ex(pinvoice);
-  invoice = Z_STRVAL_PP(pinvoice);
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-
-  r = cv_void(sess, invoice);
-
-  RETURN_STRING(cv_ret2str(r), 1);
-}
-/* }}} */
-
-/* {{{ proto string ccvs_status(string session, string invoice)
-   Check the status of an invoice */
-PHP_FUNCTION(ccvs_status) /* cv_status() */
-{
-  zval **psess;
-  zval **pinvoice;
-  void *sess;
-  char *invoice;
-  register int r;
-
-  if ((ZEND_NUM_ARGS() != 2) || (zend_get_parameters_ex(2, &psess, &pinvoice) != SUCCESS))  /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  convert_to_string_ex(pinvoice);
-  invoice = Z_STRVAL_PP(pinvoice);
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-
-  r = cv_status(sess, invoice);
-
-  RETURN_STRING(cv_stat2str(r), 1);
-}
-/* }}} */
-
-/* {{{ 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;
-  zval **ptype;
-  void *sess;
-  int type;
-  register int r;
-
-  if ((ZEND_NUM_ARGS() != 2) || (zend_get_parameters_ex(2, &psess, &ptype) != SUCCESS))  /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  convert_to_string_ex(ptype);
-  type = cv_str2stat(Z_STRVAL_PP(ptype));
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-
-  r = cv_count(sess, type);
-
-  RETURN_LONG(r);
-}
-/* }}} */
-
-/* {{{ 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;
-  zval **ptype;
-  zval **pinum;
-  void *sess;
-  int type;
-  long inum;
-  register int r;
-
-  if ((ZEND_NUM_ARGS() != 3) || (zend_get_parameters_ex(3, &psess, &ptype, &pinum) != SUCCESS))  /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-  convert_to_string_ex(ptype);
-  type = cv_str2stat(Z_STRVAL_PP(ptype));
-  convert_to_long_ex(pinum);
-  inum = Z_LVAL_PP(pinum);
-
-  r = cv_lookup(sess, type, inum);
-
-  RETURN_STRING(cv_textvalue(sess), 1);
-}
-/* }}} */
-
-/* {{{ proto string ccvs_report(string session, string type)
-   Return the status of the background communication process */
-PHP_FUNCTION(ccvs_report) /* cv_report() */
-{
-  zval **psess;
-  zval **ptype;
-  void *sess;
-  int type;
-  long inum;
-  register int r;
-
-  if ((ZEND_NUM_ARGS() != 2) || (zend_get_parameters_ex(2, &psess, &ptype) != SUCCESS))  /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-  convert_to_string_ex(ptype);
-  type = cv_str2rep(Z_STRVAL_PP(ptype));
-
-  r = cv_report(sess, type);
-
-  RETURN_STRING(cv_stat2str(r), 1);
-}
-/* }}} */
-
-/* {{{ 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;
-  zval **ptype;
-  zval **pargval;
-  void *sess;
-  int type;
-  register int r;
-  char *argval;
-
-  if ((ZEND_NUM_ARGS() != 3) || (zend_get_parameters_ex(3, &psess, &ptype, &pargval) != SUCCESS))  /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-  convert_to_string_ex(ptype);
-  type = cv_str2cmd(Z_STRVAL_PP(ptype));
-  convert_to_string_ex(pargval);
-  argval = Z_STRVAL_PP(pargval);
-
-  r = cv_command(sess, type, argval);
-
-  RETURN_STRING(cv_stat2str(r), 1);
-}
-/* }}} */
-
-/* {{{ proto string ccvs_textvalue(string session)
-   Get text return value for previous function call */
-PHP_FUNCTION(ccvs_textvalue) /* cv_textvalue() */
-{
-  zval **psess;
-  void *sess;
-
-  if ((ZEND_NUM_ARGS() != 1) || (zend_get_parameters_ex(1, &psess) != SUCCESS))  /* accept only SUCCESS in case something weird gets returned instead of 'FAILURE' on fail */
-  {
-    WRONG_PARAM_COUNT;
-  }
-
-  convert_to_string_ex(psess);
-  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
-
-  RETURN_STRING(cv_textvalue(sess), 1);
-}
-/* }}} */
-
-/*
-*	Our Info Function which reports info on this module out to PHP's phpinfo() function
-*	Brendan W. McAdams <bmcadams@php.net> on 2000.07.26@16:22.EST
-*/
-
-PHP_MINFO_FUNCTION(ccvs)
-{
-    php_info_print_table_start();
-    php_info_print_table_header(2, "RedHat CCVS support", "enabled");
-    php_info_print_table_row(2, "CCVS Support by", "Brendan W. McAdams &lt;bmcadams@php.net&gt;<br />&amp; Doug DeJulio &lt;ddj@redhat.com&gt;");
-    php_info_print_table_row(2, "Release ID", cvsid);
-    php_info_print_table_row(2, "This Release Certified For CCVS Versions", "3.0 and greater");
-    php_info_print_table_end();
-
-    /*  DISPLAY_INI_ENTRIES(); */
-
-    /*
-    *	In the future, we will probably have entries in php.ini for runtime config, in which case we will
-    *  Uncomment the DISPLAY_INI_ENTRIES call...
-    */
-
-}
-
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

ext/ccvs/ccvs.h

@@ -1,59 +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: Brendan W. McAdams <bmcadams@php.net>                       |
-   |          Doug DeJulio <ddj@redhat.com>                               |
-   +----------------------------------------------------------------------+
-*/
-
-	#include <cv_api.h>
-
-	extern zend_module_entry ccvs_module_entry;
-
-	#define ccvs_module_ptr &ccvs_module_entry
-	#define phpext_ccvs_ptr ccvs_module_ptr
-
-	/* Declare functions not in cv_api.h but in libccvs.a. */
-	char *hks_ptr_ptrtostring(void *vptr);
-	void *hks_ptr_stringtoptr(char *str);
-
-	/* Declare the Functions this Module Makes Available to Zend */
-
-
-		/* Pre-declarations of functions */
-		PHP_FUNCTION(ccvs_init);
-		PHP_FUNCTION(ccvs_done);
-		PHP_FUNCTION(ccvs_new);
-		PHP_FUNCTION(ccvs_add);
-		PHP_FUNCTION(ccvs_delete);
-		PHP_FUNCTION(ccvs_auth);
-		PHP_FUNCTION(ccvs_return);
-		PHP_FUNCTION(ccvs_reverse);
-		PHP_FUNCTION(ccvs_sale);
-		PHP_FUNCTION(ccvs_void);
-		PHP_FUNCTION(ccvs_status);
-		PHP_FUNCTION(ccvs_count);
-		PHP_FUNCTION(ccvs_lookup);
-		PHP_FUNCTION(ccvs_report);
-		PHP_FUNCTION(ccvs_command);
-		PHP_FUNCTION(ccvs_textvalue);
-		PHP_MINFO_FUNCTION(ccvs);
-
-		/* Declare the information we need to dynamically link this module later */
-		#if COMPILE_DL
-		DLEXPORT zend_module_entry *get_module(void) { return &ccvs_module_entry; }
-		#endif
-
-	/* End exports */
-

ext/ccvs/config.m4

@@ -1,27 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-PHP_ARG_WITH(ccvs, for CCVS support,
-[  --with-ccvs[=DIR]       Include CCVS support])
-
-if test "$PHP_CCVS" != "no"; then
-  if test -r $PHP_CCVS/include/cv_api.h; then
-     CCVS_DIR=$PHP_CCVS
-  else 
-    for i in /usr /usr/local /usr/local/ccvs ; do
-      if test -r $i/include/cv_api.h; then
-        CCVS_DIR=$i
-      fi
-    done
-  fi
-
-  if test -z "$CCVS_DIR"; then
-    AC_MSG_ERROR(not found. Please check your CCVS installation; cv_api.h should be in <ccvs_dir>/include/)
-  fi
-  
-  PHP_ADD_INCLUDE($CCVS_DIR/include)
-  PHP_ADD_LIBRARY_WITH_PATH(ccvs, $CCVS_DIR/lib, CCVS_SHARED_LIBADD)
-  PHP_EXTENSION(ccvs, $ext_shared)
-  PHP_SUBST(CCVS_SHARED_LIBADD)
-fi

ext/com/CREDITS

@@ -1,2 +1,2 @@
 Win32 COM
-Zeev Suraski, Harald Radi, Alan Brown
+Alan Brown, Wez Furlong, Harald Radi, Zeev Suraski

ext/com/TODO

@@ -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)

ext/com/VARIANT.c

@@ -149,7 +149,7 @@ static void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend
 
 		ALLOC_ZVAL(object_handle);
 		*object_handle = *return_value;
-		pval_copy_constructor(object_handle);
+		zval_copy_ctor(object_handle);
 		INIT_PZVAL(object_handle);
 		zend_hash_index_update(Z_OBJPROP_P(object), 0, &object_handle, sizeof(pval *), NULL);
 		zval_dtor(&function_name->element);
@@ -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))
@@ -194,10 +195,11 @@ static pval php_VARIANT_get_property_handler(zend_property_reference *property_r
 				php_error(E_WARNING, "Unknown method.");
 				break;
 
-				zval_dtor(&overloaded_property->element);
 		}
 	}
 
+	zval_dtor(&overloaded_property->element);
+
 	return result;
 }
 
@@ -228,7 +230,7 @@ static int php_VARIANT_set_property_handler(zend_property_reference *property_re
 
 static int do_VARIANT_propset(VARIANT *var_arg, pval *arg_property, pval *value TSRMLS_DC)
 {
-	int type;
+	VARTYPE type;
 
 	if (!strcmp(Z_STRVAL_P(arg_property), "value")) {
 		php_pval_to_variant(value, var_arg, codepage TSRMLS_CC);

ext/com/com.h

@@ -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()
 

ext/com/conversion.c

@@ -42,7 +42,7 @@ static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC);
 /* implementations */
 PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC)
 {
-	int type = VT_EMPTY;	/* default variant type */
+	VARTYPE type = VT_EMPTY;	/* default variant type */
 
 	switch (Z_TYPE_P(pval_arg)) {
 		case IS_NULL:
@@ -56,7 +56,7 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage T
 		case IS_OBJECT:
 			if (!strcmp(Z_OBJCE_P(pval_arg)->name, "VARIANT")) {
 				type = VT_VARIANT|VT_BYREF;
-			} else if (!strcmp(Z_OBJCE_P(pval_arg)->name, "COM")) {
+			} else {
 				type = VT_DISPATCH;
 			}
 			break;
@@ -90,11 +90,11 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage T
 
 PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC)
 {
-	php_pval_to_variant_ex2(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage TSRMLS_CC);
+	php_pval_to_variant_ex2(pval_arg, var_arg, (unsigned short) Z_LVAL_P(pval_type), codepage TSRMLS_CC);
 }
 
 
-PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC)
+PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, VARTYPE type, int codepage TSRMLS_DC)
 {
 	OLECHAR *unicode_str;
 
@@ -108,7 +108,7 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
 		int numberOfElements = zend_hash_num_elements(ht);
 		SAFEARRAY *safeArray;
 		SAFEARRAYBOUND bounds[1];
-		VARIANT *v;
+		VARIANT *v, var;
 		zval **entry;        /* An entry in the input array */
 		
 		type &= ~VT_ARRAY;
@@ -118,29 +118,35 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
 			ALLOC_VARIANT(V_VARIANTREF(var_arg));
 			var_arg = V_VARIANTREF(var_arg);		/* put the array in that VARIANT */
 		}
+		if (!type) {
+			// if no type is given we take the variant type
+			type = VT_VARIANT;
+		}
 
 		bounds[0].lLbound = 0;
 		bounds[0].cElements = numberOfElements;
-		safeArray = SafeArrayCreate(VT_VARIANT, 1, bounds);
+		safeArray = SafeArrayCreate(type, 1, bounds);
 		
 		if (NULL == safeArray) {
 			php_error( E_WARNING,"Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)");
 			ZVAL_FALSE(pval_arg);
 		} else {
 			V_ARRAY(var_arg) = safeArray;
-			V_VT(var_arg) = VT_ARRAY|VT_VARIANT;                /* Now have a valid safe array allocated */
+			V_VT(var_arg) = VT_ARRAY|type;                /* Now have a valid safe array allocated */
 			if (SUCCEEDED(SafeArrayLock(safeArray))) {
 				ulong i;
+				UINT size = SafeArrayGetElemsize(safeArray);
 
 				zend_hash_internal_pointer_reset(ht);
 				for (i = 0; i < (ulong)numberOfElements; ++i) {
 					if ((zend_hash_get_current_data(ht, (void **)&entry) == SUCCESS) && (entry != NULL)) { /* Get a pointer to the php array element */
 						/* Add another value to the safe array */
-						if (SUCCEEDED(SafeArrayPtrOfIndex( safeArray, &i, &v))) {		/* Pointer to output element entry retrieved successfully */
-							if (type) {	/* explicit type */
-							   php_pval_to_variant_ex2(*entry, v, type, codepage TSRMLS_CC);		/* Do the required conversion */
+						if (SUCCEEDED(SafeArrayPtrOfIndex(safeArray, &i, &v))) {			/* Pointer to output element entry retrieved successfully */
+							if (type == VT_VARIANT) {
+								php_pval_to_variant(*entry, v, codepage TSRMLS_CC);				/* Do the required conversion */
 							} else {
-								php_pval_to_variant(*entry, v, codepage TSRMLS_CC);                    /* Do the required conversion */
+								php_pval_to_variant_ex2(*entry, &var, type, codepage TSRMLS_CC);	/* Do the required conversion */
+								memcpy(v, &(var.byref), size);
 							}
 						} else {
 							php_error( E_WARNING,"phpArrayToSafeArray() - Unable to retrieve pointer to output element number (%d)", i);
@@ -155,6 +161,12 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
 		}
 	} else {
 		switch (V_VT(var_arg)) {
+
+			case VT_NULL:
+			case VT_VOID:
+				ZVAL_NULL(pval_arg);
+				break; 
+			
 			case VT_UI1:
 				convert_to_long_ex(&pval_arg);
 				V_UI1(var_arg) = (unsigned char) Z_LVAL_P(pval_arg);
@@ -211,6 +223,7 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
 
 						/** @todo
 						case IS_STRING:
+						*/
 							/* string representation of a time value */
 
 						default:
@@ -262,7 +275,14 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
 				break;
 
 			case VT_DISPATCH:
-				comval_to_variant(pval_arg, var_arg TSRMLS_CC);
+				if (!strcmp(Z_OBJCE_P(pval_arg)->name, "COM")) {
+					comval_to_variant(pval_arg, var_arg TSRMLS_CC);
+				} else {
+					V_DISPATCH(var_arg) = php_COM_export_object(pval_arg TSRMLS_CC);
+					if (V_DISPATCH(var_arg)) {
+						V_VT(var_arg) = VT_DISPATCH;
+					}
+				}
 				if (V_VT(var_arg) != VT_DISPATCH) {
 					VariantInit(var_arg);
 				}
@@ -380,8 +400,7 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
 			/*
 				should be, but isn't :)
 
-				if (V_VT(var_arg) != (VT_VARIANT|VT_BYREF))
-				{
+				if (V_VT(var_arg) != (VT_VARIANT|VT_BYREF)) {
 					VariantInit(var_arg);
 				}
 			*/
@@ -438,7 +457,7 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
 				break;
 
 			default:
-				php_error(E_WARNING, "Type not supported or not yet implemented.");
+				php_error(E_WARNING,"Unsupported variant type: %d (0x%X)", V_VT(var_arg), V_VT(var_arg));
 		}
 	}
 }
@@ -631,14 +650,23 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int codepage TS
 			break;
 
 		case VT_BSTR:
+			Z_TYPE_P(pval_arg) = IS_STRING;
+
 			if (V_ISBYREF(var_arg)) {
-				Z_STRVAL_P(pval_arg) = php_OLECHAR_to_char(*V_BSTRREF(var_arg), &Z_STRLEN_P(pval_arg), codepage TSRMLS_CC);
+				if (*V_BSTR(var_arg)) {
+					Z_STRVAL_P(pval_arg) = php_OLECHAR_to_char(*V_BSTRREF(var_arg), &Z_STRLEN_P(pval_arg), codepage TSRMLS_CC);
+				} else {
+					ZVAL_NULL(pval_arg);
+				}
 				efree(V_BSTRREF(var_arg));
 			} else {
-				Z_STRVAL_P(pval_arg) = php_OLECHAR_to_char(V_BSTR(var_arg), &Z_STRLEN_P(pval_arg), codepage TSRMLS_CC);
+				if (V_BSTR(var_arg)) {
+					Z_STRVAL_P(pval_arg) = php_OLECHAR_to_char(V_BSTR(var_arg), &Z_STRLEN_P(pval_arg), codepage TSRMLS_CC);
+				} else {
+					ZVAL_NULL(pval_arg);
+				}
 			}
 
-			Z_TYPE_P(pval_arg) = IS_STRING;
 			break;
 
 		case VT_DATE: {
@@ -679,8 +707,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int codepage TS
 
 				hr = V_UNKNOWN(var_arg)->lpVtbl->QueryInterface(var_arg->punkVal, &IID_IDispatch, &V_DISPATCH(var_arg));
 
-				if (FAILED(hr))
-				{
+				if (FAILED(hr)) {
 					char *error_message;
 
 					error_message = php_COM_error_message(hr TSRMLS_CC);
@@ -699,9 +726,10 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int codepage TS
 					ZVAL_NULL(pval_arg);
 				} else {
 					ALLOC_COM(obj);
-					php_COM_set(obj, &V_DISPATCH(var_arg), TRUE TSRMLS_CC);
+					php_COM_set(obj, &V_DISPATCH(var_arg), FALSE TSRMLS_CC);
 					
 					ZVAL_COM(pval_arg, obj);
+					VariantInit(var_arg);	// to protect C_DISPATCH(obj) from being freed when var_result is destructed
 				}
 			}
 			break;
@@ -763,7 +791,7 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage TSRML
 
 	if (strlen == -1) {
 		/* request needed buffersize */
-		strlen = MultiByteToWideChar(codepage, MB_PRECOMPOSED | MB_ERR_INVALID_CHARS, C_str, -1, NULL, 0);
+		strlen = MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS), C_str, -1, NULL, 0);
 	} else {
 		/* \0 terminator */
 		strlen++;
@@ -773,7 +801,7 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage TSRML
 		unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR) * strlen);
 
 		/* convert string */
-		error = !MultiByteToWideChar(codepage, MB_PRECOMPOSED | MB_ERR_INVALID_CHARS, C_str, strlen, unicode_str, strlen);
+		error = !MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS), C_str, strlen, unicode_str, strlen);
 	} else {
 		/* return a zero-length string */
 		unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR));
@@ -805,13 +833,13 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int cod
 	uint length = 0;
 
 	/* request needed buffersize */
-	uint reqSize = WideCharToMultiByte(codepage, WC_COMPOSITECHECK, unicode_str, -1, NULL, 0, NULL, NULL);
+	uint reqSize = WideCharToMultiByte(codepage, codepage == CP_UTF8 ? 0 : WC_COMPOSITECHECK, unicode_str, -1, NULL, 0, NULL, NULL);
 
 	if (reqSize) {
 		C_str = (char *) emalloc(sizeof(char) * reqSize);
 
 		/* convert string */
-		length = WideCharToMultiByte(codepage, WC_COMPOSITECHECK, unicode_str, -1, C_str, reqSize, NULL, NULL) - 1;
+		length = WideCharToMultiByte(codepage, codepage == CP_UTF8 ? 0 : WC_COMPOSITECHECK, unicode_str, -1, C_str, reqSize, NULL, NULL) - 1;
 	} else {
 		C_str = (char *) emalloc(sizeof(char));
 		*C_str = 0;
@@ -844,4 +872,4 @@ static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC)
 	}
 }
 
-#endif /* PHP_WIN32 */
+#endif /* PHP_WIN32 */

ext/com/conversion.h

@@ -13,7 +13,7 @@ BEGIN_EXTERN_C()
 
 PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC);
 PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC);
-PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC);
+PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, VARTYPE type, int codepage TSRMLS_DC);
 PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int codepage TSRMLS_DC);
 PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage TSRMLS_DC);
 PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int codepage TSRMLS_DC);

ext/com/dispatch.c

@@ -0,0 +1,627 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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.               |
+   +----------------------------------------------------------------------+
+   | Author: Wez Furlong <wez@thebrainroom.com>                           |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+/* 
+ * This module is used to export PHP objects to COM and DOTNET by exposing
+ * them as objects implementing IDispatch.
+ * */
+
+#include "php.h"
+#include "php_COM.h"
+#include "php_VARIANT.h"
+#include "conversion.h"
+#include "variant.h"
+
+#define COBJMACROS
+#include <unknwn.h> /* IDispatch */
+#include <dispex.h> /* IDispatchEx */
+
+
+typedef struct {
+	/* This first part MUST match the declaration
+	 * of interface IDispatchEx */
+	CONST_VTBL struct IDispatchExVtbl *lpVtbl;
+
+	/* now the PHP stuff */
+	
+	THREAD_T engine_thread; /* for sanity checking */
+	zval *object;			/* the object exported */
+	LONG refcount;			/* COM reference count */
+
+	HashTable *dispid_to_name;	/* keep track of dispid -> name mappings */
+	HashTable *name_to_dispid;	/* keep track of name -> dispid mappings */
+
+	GUID sinkid;	/* iid that we "implement" for event sinking */
+	
+	int id;
+} php_dispatchex;
+
+static void disp_destructor(php_dispatchex *disp);
+
+static void dispatch_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+	php_dispatchex *disp = (php_dispatchex *)rsrc->ptr;
+	disp_destructor(disp);
+}
+
+static int le_dispatch;
+int php_COM_dispatch_init(int module_number TSRMLS_DC)
+{
+	le_dispatch = zend_register_list_destructors_ex(dispatch_dtor, NULL, "COM:Dispatch", module_number);
+	return le_dispatch;
+}
+
+
+/* {{{ trace */
+static inline void trace(char *fmt, ...)
+{
+	va_list ap;
+	char buf[4096];
+
+	sprintf(buf, "T=%08x ", tsrm_thread_id());
+	OutputDebugString(buf);
+	
+	va_start(ap, fmt);
+	vsnprintf(buf, sizeof(buf), fmt, ap);
+
+	OutputDebugString(buf);
+	
+	va_end(ap);
+}
+/* }}} */
+
+#define FETCH_DISP(methname)	\
+	php_dispatchex *disp = (php_dispatchex*)This; \
+	trace(" PHP:%s %s\n", Z_OBJCE_P(disp->object)->name, methname); \
+	if (tsrm_thread_id() != disp->engine_thread) \
+		return E_UNEXPECTED;
+
+
+static HRESULT STDMETHODCALLTYPE disp_queryinterface( 
+	IDispatchEx *This,
+	/* [in] */ REFIID riid,
+	/* [iid_is][out] */ void **ppvObject)
+{
+	FETCH_DISP("QueryInterface");
+
+	if (IsEqualGUID(&IID_IUnknown, riid) ||
+			IsEqualGUID(&IID_IDispatch, riid) ||
+			IsEqualGUID(&IID_IDispatchEx, riid) ||
+			IsEqualGUID(&disp->sinkid, riid)) {
+		*ppvObject = This;
+		InterlockedIncrement(&disp->refcount);
+		return S_OK;
+	}
+
+	*ppvObject = NULL;
+	return E_NOINTERFACE;
+}
+        
+static ULONG STDMETHODCALLTYPE disp_addref(IDispatchEx *This)
+{
+	FETCH_DISP("AddRef");
+
+	return InterlockedIncrement(&disp->refcount);
+}
+        
+static ULONG STDMETHODCALLTYPE disp_release(IDispatchEx *This)
+{
+	ULONG ret;
+	TSRMLS_FETCH();
+	FETCH_DISP("Release");
+
+	ret = InterlockedDecrement(&disp->refcount);
+	trace("-- refcount now %d\n", ret);
+	if (ret == 0) {
+		/* destroy it */
+		if (disp->id)
+			zend_list_delete(disp->id);
+	}
+	return ret;
+}
+
+static HRESULT STDMETHODCALLTYPE disp_gettypeinfocount( 
+	IDispatchEx *This,
+	/* [out] */ UINT *pctinfo)
+{
+	FETCH_DISP("GetTypeInfoCount");
+
+	*pctinfo = 0;
+	return S_OK;
+}
+        
+static HRESULT STDMETHODCALLTYPE disp_gettypeinfo( 
+	IDispatchEx *This,
+	/* [in] */ UINT iTInfo,
+	/* [in] */ LCID lcid,
+	/* [out] */ ITypeInfo **ppTInfo)
+{
+	FETCH_DISP("GetTypeInfo");
+	
+	*ppTInfo = NULL;
+	return DISP_E_BADINDEX;
+}
+
+static HRESULT STDMETHODCALLTYPE disp_getidsofnames( 
+	IDispatchEx *This,
+	/* [in] */ REFIID riid,
+	/* [size_is][in] */ LPOLESTR *rgszNames,
+	/* [in] */ UINT cNames,
+	/* [in] */ LCID lcid,
+	/* [size_is][out] */ DISPID *rgDispId)
+{
+	UINT i;
+	HRESULT ret = S_OK;
+	TSRMLS_FETCH();
+	FETCH_DISP("GetIDsOfNames");
+
+	for (i = 0; i < cNames; i++) {
+		char *name;
+		unsigned int namelen;
+		zval **tmp;
+		
+		name = php_OLECHAR_to_char(rgszNames[i], &namelen, CP_ACP TSRMLS_CC);
+		
+		/* Lookup the name in the hash */
+		if (zend_hash_find(disp->name_to_dispid, name, namelen+1, (void**)&tmp) == FAILURE) {
+			ret = DISP_E_UNKNOWNNAME;
+			rgDispId[i] = 0;
+		} else {
+			rgDispId[i] = Z_LVAL_PP(tmp);
+		}
+
+		efree(name);
+
+	}
+	
+	return ret;
+}
+
+static HRESULT STDMETHODCALLTYPE disp_invoke( 
+	IDispatchEx *This,
+	/* [in] */ DISPID dispIdMember,
+	/* [in] */ REFIID riid,
+	/* [in] */ LCID lcid,
+	/* [in] */ WORD wFlags,
+	/* [out][in] */ DISPPARAMS *pDispParams,
+	/* [out] */ VARIANT *pVarResult,
+	/* [out] */ EXCEPINFO *pExcepInfo,
+	/* [out] */ UINT *puArgErr)
+{
+	return This->lpVtbl->InvokeEx(This, dispIdMember,
+			lcid, wFlags, pDispParams,
+			pVarResult, pExcepInfo, NULL);
+}
+
+static HRESULT STDMETHODCALLTYPE disp_getdispid( 
+	IDispatchEx *This,
+	/* [in] */ BSTR bstrName,
+	/* [in] */ DWORD grfdex,
+	/* [out] */ DISPID *pid)
+{
+	HRESULT ret = DISP_E_UNKNOWNNAME;
+	char *name;
+	unsigned int namelen;
+	zval **tmp;
+	TSRMLS_FETCH();
+	FETCH_DISP("GetDispID");
+
+	name = php_OLECHAR_to_char(bstrName, &namelen, CP_ACP TSRMLS_CC);
+
+	/* Lookup the name in the hash */
+	if (zend_hash_find(disp->name_to_dispid, name, namelen+1, (void**)&tmp) == SUCCESS) {
+		*pid = Z_LVAL_PP(tmp);
+		ret = S_OK;
+	}
+
+	efree(name);
+	
+	return ret;
+}
+
+static HRESULT STDMETHODCALLTYPE disp_invokeex( 
+	IDispatchEx *This,
+	/* [in] */ DISPID id,
+	/* [in] */ LCID lcid,
+	/* [in] */ WORD wFlags,
+	/* [in] */ DISPPARAMS *pdp,
+	/* [out] */ VARIANT *pvarRes,
+	/* [out] */ EXCEPINFO *pei,
+	/* [unique][in] */ IServiceProvider *pspCaller)
+{
+	zval **name;
+	UINT i;
+	int codepage = CP_ACP;
+	zval *retval = NULL;
+	zval ***params = NULL;
+	HRESULT ret = DISP_E_MEMBERNOTFOUND;
+	TSRMLS_FETCH();
+	FETCH_DISP("InvokeEx");
+
+	if (SUCCESS == zend_hash_index_find(disp->dispid_to_name, id, (void**)&name)) {
+		/* TODO: add support for overloaded objects */
+
+		trace("-- Invoke: %d %20s flags=%08x args=%d\n", id, Z_STRVAL_PP(name), wFlags, pdp->cArgs);
+		
+		/* convert args into zvals.
+		 * Args are in reverse order */
+		params = (zval ***)emalloc(sizeof(zval **) * pdp->cArgs);
+		for (i = 0; i < pdp->cArgs; i++) {
+			VARIANT *arg;
+			zval *zarg;
+			
+			arg = &pdp->rgvarg[ pdp->cArgs - 1 - i];
+
+			trace("alloc zval for arg %d VT=%08x\n", i, V_VT(arg));
+
+			ALLOC_INIT_ZVAL(zarg);
+			
+			if (V_VT(arg) == VT_DISPATCH) {
+				trace("arg %d is dispatchable\n", i);
+				if (NULL == php_COM_object_from_dispatch(V_DISPATCH(arg), zarg TSRMLS_CC)) {
+					trace("failed to convert arg %d to zval\n", i);
+					ZVAL_NULL(zarg);
+				}
+			} else {
+				// arg can't be an idispatch, so we don't care for the implicit AddRef() call here
+				if (FAILURE == php_variant_to_pval(arg, zarg, codepage TSRMLS_CC)) {
+					trace("failed to convert arg %d to zval\n", i);
+					ZVAL_NULL(zarg);
+				}
+			}
+			
+			params[i] = &zarg;
+		}
+
+		trace("arguments processed, prepare to do some work\n");	
+		
+		if (wFlags & DISPATCH_PROPERTYGET) {
+			trace("trying to get a property\n");
+			zend_hash_find(Z_OBJPROP_P(disp->object), Z_STRVAL_PP(name), Z_STRLEN_PP(name)+1, (void**)&retval);
+		} else if (wFlags & DISPATCH_PROPERTYPUT) {
+			trace("trying to set a property\n");
+			add_property_zval(disp->object, Z_STRVAL_PP(name), *params[0]);
+		} else if (wFlags & DISPATCH_METHOD) {
+			trace("Trying to call user function\n");
+			if (SUCCESS == call_user_function_ex(EG(function_table), &disp->object, *name,
+					&retval, pdp->cArgs, params, 1, NULL TSRMLS_CC)) {
+				ret = S_OK;
+			} else {
+				ret = DISP_E_EXCEPTION;
+			}
+		} else {
+			trace("Don't know how to handle this invocation %08x\n", wFlags);
+		}
+	
+		/* release arguments */
+		for (i = 0; i < pdp->cArgs; i++)
+			zval_ptr_dtor(params[i]);
+		efree(params);
+		
+		/* return value */
+		if (retval) {
+			if (pvarRes) {
+				if (Z_TYPE_P(retval) == IS_OBJECT) {
+					/* export the object using a dispatch like ourselves */
+					VariantInit(pvarRes);
+					V_VT(pvarRes) = VT_DISPATCH;
+					V_DISPATCH(pvarRes) = php_COM_export_object(retval TSRMLS_CC);
+				} else {
+					php_pval_to_variant(retval, pvarRes, codepage TSRMLS_CC);
+				}
+			}
+			zval_ptr_dtor(&retval);
+		} else if (pvarRes) {
+			VariantInit(pvarRes);
+		}
+		
+	} else {
+		trace("InvokeEx: I don't support DISPID=%d\n", id);
+	}
+
+	return ret;
+}
+
+static HRESULT STDMETHODCALLTYPE disp_deletememberbyname( 
+	IDispatchEx *This,
+	/* [in] */ BSTR bstrName,
+	/* [in] */ DWORD grfdex)
+{
+	FETCH_DISP("DeleteMemberByName");
+
+	return S_FALSE;
+}
+
+static HRESULT STDMETHODCALLTYPE disp_deletememberbydispid( 
+	IDispatchEx *This,
+	/* [in] */ DISPID id)
+{
+	FETCH_DISP("DeleteMemberByDispID");
+	
+	return S_FALSE;
+}
+
+static HRESULT STDMETHODCALLTYPE disp_getmemberproperties( 
+	IDispatchEx *This,
+	/* [in] */ DISPID id,
+	/* [in] */ DWORD grfdexFetch,
+	/* [out] */ DWORD *pgrfdex)
+{
+	FETCH_DISP("GetMemberProperties");
+
+	return DISP_E_UNKNOWNNAME;
+}
+
+static HRESULT STDMETHODCALLTYPE disp_getmembername( 
+	IDispatchEx *This,
+	/* [in] */ DISPID id,
+	/* [out] */ BSTR *pbstrName)
+{
+	zval *name;
+	TSRMLS_FETCH();
+	FETCH_DISP("GetMemberName");
+
+	if (SUCCESS == zend_hash_index_find(disp->dispid_to_name, id, (void**)&name)) {
+		OLECHAR *olestr = php_char_to_OLECHAR(Z_STRVAL_P(name), Z_STRLEN_P(name), CP_ACP TSRMLS_CC);
+		*pbstrName = SysAllocString(olestr);
+		efree(olestr);
+		return S_OK;
+	} else {
+		return DISP_E_UNKNOWNNAME;
+	}
+}
+
+static HRESULT STDMETHODCALLTYPE disp_getnextdispid( 
+	IDispatchEx *This,
+	/* [in] */ DWORD grfdex,
+	/* [in] */ DISPID id,
+	/* [out] */ DISPID *pid)
+{
+	ulong next = id+1;
+	FETCH_DISP("GetNextDispID");
+
+	while(!zend_hash_index_exists(disp->dispid_to_name, next))
+		next++;
+
+	if (zend_hash_index_exists(disp->dispid_to_name, next)) {
+		*pid = next;
+		return S_OK;
+	}
+	return S_FALSE;
+}
+
+static HRESULT STDMETHODCALLTYPE disp_getnamespaceparent( 
+	IDispatchEx *This,
+	/* [out] */ IUnknown **ppunk)
+{
+	FETCH_DISP("GetNameSpaceParent");
+
+	*ppunk = NULL;
+	return E_NOTIMPL;
+}
+        
+static struct IDispatchExVtbl php_dispatch_vtbl = {
+	disp_queryinterface,
+	disp_addref,
+	disp_release,
+	disp_gettypeinfocount,
+	disp_gettypeinfo,
+	disp_getidsofnames,
+	disp_invoke,
+	disp_getdispid,
+	disp_invokeex,
+	disp_deletememberbyname,
+	disp_deletememberbydispid,
+	disp_getmemberproperties,
+	disp_getmembername,
+	disp_getnextdispid,
+	disp_getnamespaceparent
+};
+
+
+/* enumerate functions and properties of the object and assign
+ * dispatch ids */
+static void generate_dispids(php_dispatchex *disp TSRMLS_DC)
+{
+	HashPosition pos;
+	char *name = NULL;
+	zval *tmp;
+	int namelen;
+	int keytype;
+	ulong pid;
+
+	if (disp->dispid_to_name == NULL) {
+		ALLOC_HASHTABLE(disp->dispid_to_name);
+		ALLOC_HASHTABLE(disp->name_to_dispid);
+		zend_hash_init(disp->name_to_dispid, 0, NULL, ZVAL_PTR_DTOR, 0);
+		zend_hash_init(disp->dispid_to_name, 0, NULL, ZVAL_PTR_DTOR, 0);
+	}
+
+	/* properties */
+	zend_hash_internal_pointer_reset_ex(Z_OBJPROP_PP(&disp->object), &pos);
+	while (HASH_KEY_NON_EXISTANT != (keytype =
+				zend_hash_get_current_key_ex(Z_OBJPROP_PP(&disp->object), &name, &namelen, &pid, 0, &pos))) {
+		char namebuf[32];
+		if (keytype == HASH_KEY_IS_LONG) {
+			sprintf(namebuf, "%d", pid);
+			name = namebuf;
+			namelen = strlen(namebuf);
+		}
+
+		zend_hash_move_forward_ex(Z_OBJPROP_PP(&disp->object), &pos);
+		
+		/* Find the existing id */
+		if (zend_hash_find(disp->name_to_dispid, name, namelen+1, (void**)&tmp) == SUCCESS)
+			continue;
+		
+		/* add the mappings */
+		MAKE_STD_ZVAL(tmp);
+		ZVAL_STRINGL(tmp, name, namelen, 1);
+		zend_hash_index_update(disp->dispid_to_name, pid, (void*)&tmp, sizeof(zval *), NULL);
+
+		MAKE_STD_ZVAL(tmp);
+		ZVAL_LONG(tmp, pid);
+		zend_hash_update(disp->name_to_dispid, name, namelen+1, (void*)&tmp, sizeof(zval *), NULL);
+
+	}
+	
+	/* functions */
+	zend_hash_internal_pointer_reset_ex(&Z_OBJCE_PP(&disp->object)->function_table, &pos);
+	while (HASH_KEY_NON_EXISTANT != (keytype =
+				zend_hash_get_current_key_ex(&Z_OBJCE_PP(&disp->object)->function_table, &name, &namelen, &pid, 0, &pos))) {
+
+		char namebuf[32];
+		if (keytype == HASH_KEY_IS_LONG) {
+			sprintf(namebuf, "%d", pid);
+			name = namebuf;
+			namelen = strlen(namebuf);
+		}
+
+		zend_hash_move_forward_ex(Z_OBJPROP_PP(&disp->object), &pos);
+		
+		/* Find the existing id */
+		if (zend_hash_find(disp->name_to_dispid, name, namelen+1, (void**)&tmp) == SUCCESS)
+			continue;
+		
+		/* add the mappings */
+		MAKE_STD_ZVAL(tmp);
+		ZVAL_STRINGL(tmp, name, namelen, 1);
+		zend_hash_index_update(disp->dispid_to_name, pid, (void*)&tmp, sizeof(zval *), NULL);
+
+		MAKE_STD_ZVAL(tmp);
+		ZVAL_LONG(tmp, pid);
+		zend_hash_update(disp->name_to_dispid, name, namelen+1, (void*)&tmp, sizeof(zval *), NULL);
+	}
+}
+
+static php_dispatchex *disp_constructor(zval *object TSRMLS_DC)
+{
+	php_dispatchex *disp = (php_dispatchex*)CoTaskMemAlloc(sizeof(php_dispatchex));
+
+	trace("constructing a COM proxy\n");
+	
+	if (disp == NULL)
+		return NULL;
+
+	memset(disp, 0, sizeof(php_dispatchex));
+
+	disp->engine_thread = tsrm_thread_id();
+	disp->lpVtbl = &php_dispatch_vtbl;
+	disp->refcount = 1;
+
+
+	if (object)
+		ZVAL_ADDREF(object);
+	disp->object = object;
+
+	disp->id = zend_list_insert(disp, le_dispatch);
+	
+	return disp;
+}
+
+static void disp_destructor(php_dispatchex *disp)
+{
+	TSRMLS_FETCH();
+	
+	trace("destroying COM wrapper for PHP object %s\n", Z_OBJCE_P(disp->object)->name);
+
+	disp->id = 0;
+	
+	if (disp->refcount > 0)
+		CoDisconnectObject((IUnknown*)disp, 0);
+
+	zend_hash_destroy(disp->dispid_to_name);
+	zend_hash_destroy(disp->name_to_dispid);
+	FREE_HASHTABLE(disp->dispid_to_name);
+	FREE_HASHTABLE(disp->name_to_dispid);
+			
+	if (disp->object)
+		zval_ptr_dtor(&disp->object);
+
+
+	CoTaskMemFree(disp);
+}
+
+PHPAPI IDispatch *php_COM_export_as_sink(zval *val, GUID *sinkid, HashTable *id_to_name TSRMLS_DC)
+{
+	php_dispatchex *disp = disp_constructor(val TSRMLS_CC);
+	HashPosition pos;
+	char *name = NULL;
+	zval *tmp, **ntmp;
+	int namelen;
+	int keytype;
+	ulong pid;
+
+	disp->dispid_to_name = id_to_name;
+
+	memcpy(&disp->sinkid, sinkid, sizeof(disp->sinkid));
+	
+	/* build up the reverse mapping */
+	ALLOC_HASHTABLE(disp->name_to_dispid);
+	zend_hash_init(disp->name_to_dispid, 0, NULL, ZVAL_PTR_DTOR, 0);
+	
+	zend_hash_internal_pointer_reset_ex(id_to_name, &pos);
+	while (HASH_KEY_NON_EXISTANT != (keytype =
+				zend_hash_get_current_key_ex(id_to_name, &name, &namelen, &pid, 0, &pos))) {
+
+		if (keytype == HASH_KEY_IS_LONG) {
+
+			zend_hash_get_current_data_ex(id_to_name, (void**)&ntmp, &pos);
+			
+			MAKE_STD_ZVAL(tmp);
+			ZVAL_LONG(tmp, pid);
+			zend_hash_update(disp->name_to_dispid, Z_STRVAL_PP(ntmp), Z_STRLEN_PP(ntmp)+1, (void*)&tmp, sizeof(zval *), NULL);
+		}
+
+		zend_hash_move_forward_ex(id_to_name, &pos);
+	}
+
+	return (IDispatch*)disp;
+}
+
+PHPAPI IDispatch *php_COM_export_object(zval *val TSRMLS_DC)
+{
+	php_dispatchex *disp = NULL;
+
+	if (Z_TYPE_P(val) != IS_OBJECT)
+		return NULL;
+
+	if (Z_OBJCE_P(val) == &COM_class_entry || !strcmp(Z_OBJCE_P(val)->name, "COM")) {
+		/* pass back it's IDispatch directly */
+		zval **tmp;
+		comval *obj;
+		int type;
+		
+		zend_hash_index_find(Z_OBJPROP_P(val), 0, (void**)&tmp);
+		obj = (comval *)zend_list_find(Z_LVAL_PP(tmp), &type);
+		if (type != IS_COM)
+			return NULL;
+
+		C_DISPATCH(obj)->lpVtbl->AddRef(C_DISPATCH(obj));
+		return C_DISPATCH(obj);
+	}
+
+	disp = disp_constructor(val TSRMLS_CC);
+	generate_dispids(disp TSRMLS_CC);
+
+	return (IDispatch*)disp;
+}
+
+

ext/com/php_COM.h

@@ -12,12 +12,16 @@ PHP_MSHUTDOWN_FUNCTION(COM);
 
 PHP_FUNCTION(com_load);
 PHP_FUNCTION(com_invoke);
+PHP_FUNCTION(com_invoke_ex);
 PHP_FUNCTION(com_addref);
 PHP_FUNCTION(com_release);
 PHP_FUNCTION(com_propget);
 PHP_FUNCTION(com_propput);
 PHP_FUNCTION(com_load_typelib);
 PHP_FUNCTION(com_isenum);
+PHP_FUNCTION(com_event_sink);
+PHP_FUNCTION(com_message_pump);
+PHP_FUNCTION(com_print_typeinfo);
 
 PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR*  pDispParams, VARIANT FAR* pVarResult, char **ErrString TSRMLS_DC);
 PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId TSRMLS_DC);
@@ -31,6 +35,13 @@ PHPAPI int php_COM_get_le_comval();
 PHPAPI int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value);
 PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_reference);
 PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
+PHPAPI zval *php_COM_object_from_dispatch(IDispatch *disp, zval *val TSRMLS_DC);
+PHPAPI int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC);
+
+/* dispatch.c */
+PHPAPI IDispatch *php_COM_export_object(zval *val TSRMLS_DC);
+PHPAPI IDispatch *php_COM_export_as_sink(zval *val, GUID *sinkid, HashTable *id_to_name TSRMLS_DC);
+int php_COM_dispatch_init(int module_number TSRMLS_DC);
 
 zend_module_entry COM_module_entry;
 zend_class_entry COM_class_entry;
@@ -43,6 +54,18 @@ END_EXTERN_C()
 
 #define phpext_com_ptr &COM_module_entry
 
+ZEND_BEGIN_MODULE_GLOBALS(com)
+	int nothing;
+ZEND_END_MODULE_GLOBALS(com)
+
+PHPAPI ZEND_EXTERN_MODULE_GLOBALS(com);
+	
+#ifdef ZTS
+#define COMG(v)	TSRMG(com_globals_id, zend_com_globals *, v)
+#else
+#define COMG(v)	(com_globals.v)
+#endif
+	
 #else
 
 #define phpext_com_ptr NULL

ext/com/variant.h

@@ -16,7 +16,7 @@
 									comval *obj;										\
 									ALLOC_COM(obj);										\
 									php_COM_set(obj, &V_DISPATCH(v), TRUE TSRMLS_CC);	\
-									ZVAL_LONG((z), zend_list_insert(obj, IS_COM));		\
+									ZVAL_RESOURCE((z), zend_list_insert(obj, IS_COM));		\
 								} else {												\
 									php_variant_to_pval((v), (z), codepage TSRMLS_CC);	\
 									FREE_VARIANT(v);									\

ext/cpdf/Makefile.in

@@ -1,5 +0,0 @@
-
-LTLIBRARY_NAME    = libcpdf.la
-LTLIBRARY_SOURCES = cpdf.c
-
-include $(top_srcdir)/build/dynlib.mk

ext/cpdf/config.m4

@@ -9,7 +9,7 @@ AC_ARG_WITH(cpdflib,
       AC_MSG_RESULT(no) ;;
     yes)
       AC_MSG_RESULT(yes)
-      PHP_EXTENSION(cpdf)
+      PHP_NEW_EXTENSION(cpdf, cpdf.c)
       AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
         [AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])])
       PHP_ADD_LIBRARY(cpdf)
@@ -20,7 +20,7 @@ AC_ARG_WITH(cpdflib,
       test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE=$withval/include
       if test -n "$CPDFLIB_INCLUDE" ; then
         AC_MSG_RESULT(yes)
-        PHP_EXTENSION(cpdf)
+        PHP_NEW_EXTENSION(cpdf, cpdf.c)
         old_LIBS=$LIBS
         old_withval=$withval
 

ext/cpdf/cpdf.c

@@ -23,7 +23,7 @@
 
 /* Note that there is no code from the cpdflib package in this file */
 
-#if !PHP_31 && defined(THREAD_SAFE)
+#if defined(THREAD_SAFE)
 #undef THREAD_SAFE
 #endif
 
@@ -262,7 +262,7 @@ PHP_FUNCTION(cpdf_set_creator)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d (type=%d)", id, type);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d (type=%d)", get_active_function_name(TSRMLS_C), id, type);
 		RETURN_FALSE;
 	}
 
@@ -289,7 +289,7 @@ PHP_FUNCTION(cpdf_set_title)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d (type=%d)", id, type);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d (type=%d)", get_active_function_name(TSRMLS_C), id, type);
 		RETURN_FALSE;
 	}
 
@@ -317,7 +317,7 @@ PHP_FUNCTION(cpdf_set_subject)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d (type=%d)", id, type);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d (type=%d)", get_active_function_name(TSRMLS_C), id, type);
 		RETURN_FALSE;
 	}
 
@@ -344,7 +344,7 @@ PHP_FUNCTION(cpdf_set_keywords)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d (type=%d)", id, type);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d (type=%d)", get_active_function_name(TSRMLS_C), id, type);
 		RETURN_FALSE;
 	}
 
@@ -377,7 +377,7 @@ PHP_FUNCTION(cpdf_set_viewer_preferences)
 
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -471,7 +471,7 @@ PHP_FUNCTION(cpdf_open)
 		convert_to_string(arg2);
 #if APACHE
 		if(strcmp(Z_STRVAL_P(arg2), "-") == 0)
-			php_error(E_WARNING, "Writing to stdout as described in the ClibPDF manual is not possible if php is used as an Apache module. Write to a memory stream and use cpdf_output_buffer() instead.");
+			php_error(E_WARNING, "%s(): Writing to stdout as described in the ClibPDF manual is not possible if php is used as an Apache module. Write to a memory stream and use cpdf_output_buffer() instead.", get_active_function_name(TSRMLS_C));
 #endif
 		cpdf_setOutputFilename(cpdf, Z_STRVAL_P(arg2));
 	}
@@ -498,7 +498,7 @@ PHP_FUNCTION(cpdf_close)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 	zend_list_delete(id);
@@ -536,7 +536,7 @@ PHP_FUNCTION(cpdf_page_init)
 	width = Z_LVAL_P(argv[4]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -571,7 +571,7 @@ PHP_FUNCTION(cpdf_finalize_page)
 	pagenr=Z_LVAL_P(arg2);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -599,7 +599,7 @@ PHP_FUNCTION(cpdf_set_current_page)
 	pagenr=Z_LVAL_P(arg2);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -625,7 +625,7 @@ PHP_FUNCTION(cpdf_begin_text)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -651,7 +651,7 @@ PHP_FUNCTION(cpdf_end_text)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -678,7 +678,7 @@ PHP_FUNCTION(cpdf_show)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -709,7 +709,7 @@ PHP_FUNCTION(cpdf_show_xy)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -743,7 +743,7 @@ PHP_FUNCTION(cpdf_continue_text)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -770,7 +770,7 @@ PHP_FUNCTION(cpdf_text)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -862,12 +862,12 @@ PHP_FUNCTION(cpdf_set_font)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 	
 /*	if(Z_LVAL_P(arg4) > 6) {
-		php_error(E_WARNING, "Font encoding set to 5");
+		php_error(E_WARNING, "%s(): Font encoding set to 5", get_active_function_name(TSRMLS_C));
 		Z_LVAL_P(arg4) = 5;
 	}
 */
@@ -895,7 +895,7 @@ PHP_FUNCTION(cpdf_set_font_directories)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -922,7 +922,7 @@ PHP_FUNCTION(cpdf_set_font_map_file)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -949,7 +949,7 @@ PHP_FUNCTION(cpdf_set_leading)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 	
@@ -976,7 +976,7 @@ PHP_FUNCTION(cpdf_set_text_rendering)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 	
@@ -1003,7 +1003,7 @@ PHP_FUNCTION(cpdf_set_horiz_scaling)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 	
@@ -1030,7 +1030,7 @@ PHP_FUNCTION(cpdf_set_text_rise)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 	
@@ -1061,12 +1061,12 @@ PHP_FUNCTION(cpdf_set_text_matrix)
 	matrix=Z_ARRVAL_P(arg2);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 	
 	if(zend_hash_num_elements(matrix) != 6) {
-		 php_error(E_WARNING, "Text matrix must have 6 elements");
+		php_error(E_WARNING, "%s(): Text matrix must have 6 elements", get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
 	}
 
@@ -1113,7 +1113,7 @@ PHP_FUNCTION(cpdf_set_text_pos)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 	
@@ -1147,7 +1147,7 @@ PHP_FUNCTION(cpdf_rotate_text)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1174,7 +1174,7 @@ PHP_FUNCTION(cpdf_set_char_spacing)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1201,7 +1201,7 @@ PHP_FUNCTION(cpdf_set_word_spacing)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1229,7 +1229,7 @@ PHP_FUNCTION(cpdf_stringwidth)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1255,7 +1255,7 @@ PHP_FUNCTION(cpdf_save)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1281,7 +1281,7 @@ PHP_FUNCTION(cpdf_restore)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1309,7 +1309,7 @@ PHP_FUNCTION(cpdf_translate)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1337,7 +1337,7 @@ PHP_FUNCTION(cpdf_scale)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1364,7 +1364,7 @@ PHP_FUNCTION(cpdf_rotate)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1391,12 +1391,12 @@ PHP_FUNCTION(cpdf_setflat)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
 	if((Z_LVAL_P(arg2) > 100) && (Z_LVAL_P(arg2) < 0)) {
-		php_error(E_WARNING, "Parameter of pdf_setflat() has to between 0 and 100");
+		php_error(E_WARNING, "%s(): Parameter has to between 0 and 100", get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
 	}
 
@@ -1423,12 +1423,12 @@ PHP_FUNCTION(cpdf_setlinejoin)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
 	if((Z_LVAL_P(arg2) > 2) && (Z_LVAL_P(arg2) < 0)) {
-		php_error(E_WARNING, "Parameter of pdf_setlinejoin() has to between 0 and 2");
+		php_error(E_WARNING, "%s(): Parameter has to between 0 and 2", get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
 	}
 
@@ -1455,12 +1455,12 @@ PHP_FUNCTION(cpdf_setlinecap)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
 	if((Z_LVAL_P(arg2) > 2) && (Z_LVAL_P(arg2) < 0)) {
-		php_error(E_WARNING, "Parameter of pdf_setlinecap() has to be > 0 and =< 2");
+		php_error(E_WARNING, "%s(): Parameter has to be > 0 and =< 2", get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
 	}
 
@@ -1487,12 +1487,12 @@ PHP_FUNCTION(cpdf_setmiterlimit)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
 	if(Z_DVAL_P(arg2) < 1) {
-		php_error(E_WARNING, "Parameter of pdf_setmiterlimit() has to be >= 1");
+		php_error(E_WARNING, "%s(): Parameter has to be >= 1", get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
 	}
 
@@ -1519,7 +1519,7 @@ PHP_FUNCTION(cpdf_setlinewidth)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1549,7 +1549,7 @@ PHP_FUNCTION(cpdf_setdash)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1581,7 +1581,7 @@ PHP_FUNCTION(cpdf_moveto)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1618,7 +1618,7 @@ PHP_FUNCTION(cpdf_rmoveto)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1659,7 +1659,7 @@ PHP_FUNCTION(cpdf_curveto)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1706,7 +1706,7 @@ PHP_FUNCTION(cpdf_lineto)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1743,7 +1743,7 @@ PHP_FUNCTION(cpdf_rlineto)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1781,7 +1781,7 @@ PHP_FUNCTION(cpdf_circle)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1821,7 +1821,7 @@ PHP_FUNCTION(cpdf_arc)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1860,7 +1860,7 @@ PHP_FUNCTION(cpdf_rect)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1899,7 +1899,7 @@ PHP_FUNCTION(cpdf_newpath)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1925,7 +1925,7 @@ PHP_FUNCTION(cpdf_closepath)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1951,7 +1951,7 @@ PHP_FUNCTION(cpdf_closepath_stroke)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -1978,7 +1978,7 @@ PHP_FUNCTION(cpdf_stroke)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2004,7 +2004,7 @@ PHP_FUNCTION(cpdf_fill)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2030,7 +2030,7 @@ PHP_FUNCTION(cpdf_fill_stroke)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2057,7 +2057,7 @@ PHP_FUNCTION(cpdf_closepath_fill_stroke)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2085,7 +2085,7 @@ PHP_FUNCTION(cpdf_clip)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2112,7 +2112,7 @@ PHP_FUNCTION(cpdf_setgray_fill)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2139,7 +2139,7 @@ PHP_FUNCTION(cpdf_setgray_stroke)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2166,7 +2166,7 @@ PHP_FUNCTION(cpdf_setgray)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2195,7 +2195,7 @@ PHP_FUNCTION(cpdf_setrgbcolor_fill)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2224,7 +2224,7 @@ PHP_FUNCTION(cpdf_setrgbcolor_stroke)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2253,7 +2253,7 @@ PHP_FUNCTION(cpdf_setrgbcolor)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2284,7 +2284,7 @@ PHP_FUNCTION(cpdf_set_page_animation)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2311,7 +2311,7 @@ PHP_FUNCTION(cpdf_finalize)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2338,7 +2338,7 @@ PHP_FUNCTION(cpdf_output_buffer)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2367,13 +2367,13 @@ PHP_FUNCTION(cpdf_save_to_file)
 	id=Z_LVAL_P(arg1);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
 #if APACHE
 	if(strcmp(Z_STRVAL_P(arg2), "-") == 0)
-		php_error(E_WARNING, "Writing to stdout as described in the ClibPDF manual is not possible if php is used as an Apache module. Use cpdf_output_buffer() instead.");
+		php_error(E_WARNING, "%s(): Writing to stdout as described in the ClibPDF manual is not possible if php is used as an Apache module. Use cpdf_output_buffer() instead.", get_active_function_name(TSRMLS_C));
 #endif
 
 	cpdf_savePDFmemoryStreamToFile(pdf, Z_STRVAL_P(arg2));
@@ -2414,7 +2414,7 @@ PHP_FUNCTION(cpdf_import_jpeg)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2478,7 +2478,7 @@ PHP_FUNCTION(cpdf_place_inline_image)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2488,11 +2488,11 @@ PHP_FUNCTION(cpdf_place_inline_image)
 	ZEND_GET_RESOURCE_TYPE_ID(CPDF_GLOBAL(le_gd), "gd");
 	if(!CPDF_GLOBAL(le_gd))
 	{
-		php_error(E_ERROR, "Unable to find handle for GD image stream. Please check the GD extension is loaded.");
+		php_error(E_ERROR, "%s(): Unable to find handle for GD image stream. Please check the GD extension is loaded.", get_active_function_name(TSRMLS_C));
 	}
 
 	if (!im || type != CPDF_GLOBAL(le_gd)) {
-		php_error(E_WARNING, "cpdf: Unable to find image pointer");
+		php_error(E_WARNING, "%s(): Unable to find image pointer", get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
 	}
 
@@ -2567,7 +2567,7 @@ PHP_FUNCTION(cpdf_add_annotation)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2626,7 +2626,7 @@ PHP_FUNCTION(cpdf_set_action_url)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2683,7 +2683,7 @@ PHP_FUNCTION(cpdf_add_outline)
 	id=Z_LVAL_P(argv[0]);
 	pdf = zend_list_find(id, &type);
 	if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
-		php_error(E_WARNING, "Unable to find identifier %d", id);
+		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
 
@@ -2691,7 +2691,7 @@ PHP_FUNCTION(cpdf_add_outline)
 	lastoutline = zend_list_find(oid, &type);
 	if(!lastoutline || type!=CPDF_GLOBAL(le_outline)) {
 		lastoutline = NULL;
-/*		php_error(E_WARNING, "Unable to find last outline entry %d", id);
+/*		php_error(E_WARNING, "%s(): Unable to find last outline entry %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE; */
 	}