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

- Fix version
short is good
2026-11-11 03:00:49 +00:00 · 2002-05-12 21:23:58 +00:00 · 2002-05-12 21:23:57 +00:00 · 2002-05-12 21:07:40 +00:00 · 2002-05-12 20:54:29 +00:00 · 2002-05-12 20:36:05 +00:00
1016 changed files with 78878 additions and 58995 deletions
@@ -60,6 +60,9 @@ Exceptions:
    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.

 Naming Conventions
 ------------------
@@ -111,7 +114,7 @@ Naming Conventions
    avoided, except for places where the variable has no real meaning or
    a trivial meaning (e.g. for (i=0; i<100; i++) ...).

-[5] Variable names should be in lowercase;  Use underscores to seperate
+[5] Variable names should be in lowercase.  Use underscores to separate
    between words.


@@ -132,8 +135,10 @@ Syntax and indentation
    at the very least, when you write code that goes into the core
    of PHP or one of its standard modules, please maintain the K&R
    style.  This applies to just about everything, starting with
-    indentation and comment styles and up to function decleration
+    indentation and comment styles and up to function declaration
    syntax.
+
+    (see also http://www.tuxedo.org/~esr/jargon/html/entry/indent-style.html)
    
 [3] Be generous with whitespace and braces.  Always prefer:

@@ -145,7 +150,7 @@ Syntax and indentation

 	if(foo)bar;

-    Keep one empty line between the variable decleration section and
+    Keep one empty line between the variable declaration section and
    the statements in a block, as well as between logical statement
    groups in a block.  Maintain at least one empty line between
    two functions, preferably two.
@@ -163,7 +168,7 @@ prototype before it along with a brief one-line description of what the
 function does.  It would look like this:

 /* {{{ proto int abs(int number)
-   Return the absolute value of the number */
+   Returns the absolute value of the number */
 PHP_FUNCTION(abs)
 {
   ...
@@ -184,7 +189,7 @@ messing up the function summary.
 Optional arguments are written like this:

 /* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
-   Returns a header object with the defined parameters. */
+   Returns a header object with the defined parameters */

 And yes, please keep the prototype on a single line, even if that line
 is massive.
@@ -199,14 +204,14 @@ standard prefixing conventions during their initial implementation.

 The file labelled 'EXPERIMENTAL' should include the following
 information:
-   Any authoring infomration (known bugs, future directions of the module).
+   Any authoring information (known bugs, future directions of the module).
   Ongoing status notes which may not be appropriate for CVS comments.

 Aliases & Legacy Documentation
 -----------------------------------
 You may also have some deprecated aliases with close to duplicate
 names, for example, somedb_select_result and somedb_selectresult. For
-documentation puposes, these will only be documented by the most
+documentation purposes, these will only be documented by the most
 current name, with the aliases listed in the documentation for
 the parent function. For ease of reference, user-functions with
 completely different names, that alias to the same function (such as
@@ -215,4 +220,4 @@ proto should still be included, describing which function is aliased.

 Backwards compatible functions and names should be maintained as long
 as the code can be reasonably be kept as part of the codebase. See
-/phpdoc/README for me information on documentation.
+/phpdoc/README for more information on documentation.
@@ -73,6 +73,11 @@ EXTENSION:           thttpd
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
+EXTENSION:           webjames
+PRIMARY MAINTAINER:  Alex Waugh <alex@alexwaugh.com>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
+-------------------------------------------------------------------------------


 == Database extensions ==
@@ -88,6 +93,13 @@ PRIMARY MAINTAINER:  Jim Winstead <jimw@php.net>
 MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           dbx
+PRIMARY MAINTAINER:  Marc Boeren <M.Boeren@guidance.nl>
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               4.0.6
+COMMENT:             DB abstraction for odbc, mysql, pgsql, mssql, fbsql and more, see documentation
+-------------------------------------------------------------------------------
 EXTENSION:           filepro
 MAINTENANCE:         Unknown
 STATUS:              Unknown
@@ -117,6 +129,12 @@ EXTENSION:           msql
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           msession
+PRIMARY MAINTAINER   Mark L. Woodward mlwmohawk@mohawksoft.com
+MAINTENANCE:         Maintained
+STATUS:              Working/Experimental
+COMMENT:             Tested on Linux, should work on other UNIX platforms. Backend server code can compile under Windows.
+-------------------------------------------------------------------------------
 EXTENSION:           mssql
 PRIMARY MAINTAINER:  Frank M. Kromann <fmk@swwwing.com>
 MAINTENANCE:         Maintained
@@ -128,9 +146,10 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           pgsql
-PRIMARY MAINTAINER:  Jouni Ahto <jouni.ahto@exdec.fi>
-MAINTENANCE:         Odd fixes
+PRIMARY MAINTAINER:  Yasuo Ohgaki <yohgaki@php.net>
+MAINTENANCE:         Maintained
 STATUS:              Working
+COMMENT:             Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less have fatal bug.
 -------------------------------------------------------------------------------
 EXTENSION:           sybase
 MAINTENANCE:         Unknown
@@ -146,7 +165,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           odbc
-PRIMARY MAINTAINER:  Andreas Karajannis <Karajannis@gmd.de>
+PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             Working except for persistent connections
@@ -178,12 +197,14 @@ STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
 EXTENSION:           calendar
-MAINTENANCE:         Unknown
-STATUS:              Unknown
+PRIMARY MAINTAINER:  Hartmut Holzgraefe <hartmut@six.de>
+MAINTENANCE:         Odd Fixes
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           com
-MAINTENANCE:         Unknown
-STATUS:              Unknown
+PRIMARY MAINTAINER:  Harald Radi <h.radi@nme.at>
+MAINTENANCE:         Maintained
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           cpdf
 PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
@@ -217,9 +238,10 @@ MAINTENANCE:         Maintained
 STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           exif
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-SINCE:               4.0.1
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               4.2
 -------------------------------------------------------------------------------
 EXTENSION:           fdf
 PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
@@ -259,8 +281,13 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           ldap
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
-MAINTENANCE:         Odd Fixes
+PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
+EXTENSION:           mbstring
+PRIMARY MAINTAINER:  Rui Hirokawa <hirokawa@php.net>
+MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mcal
@@ -269,7 +296,7 @@ MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mcrypt
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
+PRIMARY MAINTAINER:  Derick Rethans <d.rethans@jdimedia.nl>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -291,8 +318,13 @@ MAINTENANCE:         Maintained
 STATUS:              Experimental
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
+EXTENSION:           overload
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
+-------------------------------------------------------------------------------
 EXTENSION:           pcre
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@ispi.net>
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -341,7 +373,7 @@ STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sablot
 PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Maintained
+MAINTENANCE:         Obsolete
 STATUS:              Experimental
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
@@ -357,8 +389,8 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           shmop
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Unknown
+PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
+MAINTENANCE:         Maintained
 STATUS:              Experimental
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
@@ -393,7 +425,7 @@ STATUS:              Experimental
 SINCE:               4.0.5
 -------------------------------------------------------------------------------
 EXTENSION:           wddx
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@ispi.net>
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -402,6 +434,11 @@ PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           xslt
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANC:          Maintained
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           yaz
 PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
 MAINTENANCE:         Maintained
@@ -1,9 +1,17 @@
-Installation Instructions for PHP 4.0
+Installation Instructions for PHP 4.1
 -------------------------------------

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

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

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

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

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

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

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

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

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

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

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

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

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

 1. Unpack your distribution file.  

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

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

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

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

 USING PHP 3 AND PHP 4 AS CONCURRENT APACHE MODULES

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

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

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

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

 Redistribution and use in source and binary forms, with or without
@@ -1,6 +1,6 @@

 ZEND_DIR = $(srcdir)/Zend
-SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
+SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) $(CLI_DIR) . $(PEAR_DIR)

 LTLIBRARY_NAME = libphp4.la
 LTLIBRARY_SOURCES = stub.c
@@ -14,7 +14,7 @@ LTLIBRARY_DEPENDENCIES = \
 		$(TSRM_LIB)

 LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
-LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
+LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS)

 PROGRAM_NAME         = php
 PROGRAM_SOURCES      = stub.c
@@ -51,12 +51,16 @@ install-modules:
 	cp modules/* $(INSTALL_ROOT)$(moduledir) >/dev/null 2>&1 || true

 install-tester:
-	-$(mkinstalldirs) $(datadir)
-	$(INSTALL) -m 755 $(srcdir)/run-tests.php $(INSTALL_ROOT)$(datadir)
+	@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:
@@ -1,8 +1,282 @@
-PHP 4.0                                                                    NEWS
+PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 200?, Version 4.1.0
- Fixed a bug which caused set_time_limit() to affect all requests to an
-  Apache child. (Zeev)
+13 May 2002, Version 4.2.1
+- Added safe-mode checks to show_source(), parse_ini_file() and rmdir(). Also
+  fixed security problems with safe_mode_include_dir directive. (Rasmus)
+- Changed HTTP upload code to accept 0 byte file uploads. (Zeev)
+- Major update of domxml. New functions, better DOM compliance and bug fixes:
+  * Changed the old $node->append_child() to $node->append_sibling() since
+    the new append_child() behaves correctly (= W3C standard).
+  * Added domxml functions:
+    . domxml_elem_get_elements_by_tagname() 
+    . domxml_doc_get_elements_by_tagname()
+    . domxml_doc_get_element_by_id()
+    . domxml_elem_remove_attribute()
+    . domxml_elem_get_attribute_node()
+  * Fixed a segfault in domxml_unlink(). 
+  * Added formatting option to domxml_dump_mem(). 
+  (Uwe, jtate, Chregu)
+- Fixed a bug in socket_select() that could cause unexpected behavior when
+  using a statement like $w = $e = array($sock); This change unfortunately
+  prevents the use of constant values (e.g. NULL) for the socket array
+  paramaters. Instead, use a temporary variable or an expression with the
+  leftmost member being a temporary variable. ex.:
+  socket_select($w, $r, $e = NULL, 10); (Jason)
+- Fixed crashes in the session serializer. (Stas)
+- Fixed malformed atime/mtime with touch(). (Yasuo)
+- Fixed a couple of bugs in array_sum() and array_merge(). (Andrei)
+- Fixed SJIS directory name handling under Windows. (Rui)
+- Fixed empty mb_output_handler() output when Content-Type is specified.
+  (Yasuo) 
+- Fixed the false logic in ext/session which made SID constant not to be
+  defined when cookies are disabled. (Sascha)
+- Fixed possible crash bug in HTTP uploads. (Patch: Lucas Schroeder)
+- Fixed possible NULL-pointer dereferencing in the COM extension which
+  caused 'Error in php_OLECHAR_to_char()' warnings on various places.
+  Also modified the API to consistently return NULL in case of an error.
+  (Alan, Harald)
+- Fixed a bug in the COM extension that caused outproc servers to 'hang'
+  because of a missing Release() call. (Alan, Harald)
+
+22 Apr 2002, Version 4.2.0
+- ATTENTION!! register_globals defaults to 'off' now !!!
+- Note: Apache2 support is EXPERIMENTAL.
+- PostgreSQL functions are renamed, but all old function names are available.
+  Old function names will be available long enough. User can safely use old 
+  function names. (Yasuo)
+- Moved ext/mailparse to PECL. See http://thebrainroom.com/opensource/php/
+  for more information and to download the extension. (Wez/Jim)
+- Fixed pg_last_notice() crash. (Yasuo)
+- Modified the mysql extension to disable 'LOAD LOCAL' when safe mode is
+  enabled. (Jason)
+- Fixed HTTP file upload support to handle big files better. (Jani)
+- Major modifications to the Sockets Extension and its API (Jason):
+  . Fixed numerous bugs.
+  . Added automatic host lookup capability to all functions that take addr's.
+    example: socket_connect($sock, 'www.yahoo.com', 80);
+  . Corrected and standardized host lookup errors
+  . Modified socket_recv() behavior. [$r=socket_recv($sock, $buf, $len, $flags)]
+  . Added socket_set_block() which changes a socket into blocking IO mode
+  . Modified socket_last_error() to not clear the last error
+  . Added socket_clear_error() which clears the last error on a socket
+  . Removed all code pertaining to fd_sets (socket_fd_*)
+  . Modified/Improved socket_select() to accept array of resources instead of 
+    fd_sets. example: 
+    <?php 
+          $wfds=$rfds=array($sock1, $sock2, $sock3, $sock7);
+          $r=socket_select($rfds, $wfds, NULL, 1);
+          print "Ready to read:\n"; var_dump($rfds);
+    ?>
+- Fixed segfault in ibase_close() if user does not free the resultset.
+  Bugs #15419, #15992. (daniela)
+- Added optional 3rd parameter "int encoding_mode" to gzencode() and fixed 
+  parameters to conform documentation. (Stefan)
+- Changed read_exif_data() to be an alias of exif_read_data(). (Marcus)
+- Added exif_tagname() function which returns the names of tags and
+  exif_thumbnail() function to extract embedded thumbnails. (Marcus)
+- Fixed iconv support with FreeBSD. (kalowsky)
+- Cleaned up the posix extension: (Markus)
+  . Removed unwanted warning messages
+  . Added posix_errno() and posix_strerror() for fetching error messages
+  . Changed the way posix_getgrnam() and posix_getgrgid() return their values 
+    (breaks BC but makes more sense)
+  . Does not include functions in symbol table which aren't supported on host 
+    system. 
+- Added TIFF support for getimagesize() and read_exif_data(). (Marcus)
+- Changed the Velocis extension namespace to Birdstep to reflect new product 
+  name. Added aliases for BC. (James)
+- Added safe_mode checks for opendir(). (jflemer)
+- Changed the 2nd parameter in pgsql_fetch_*() functions to support NULL if
+  all 3 parameters are supplied, but you do not want to provide a row number.
+  (Derick)
+- Improved iconv() when using libc's iconv. (Yasuo)
+- Added PHP_SAPI constant which contains the name of running SAPI. (Edin)
+- Added ob_get_status() which returns an array of buffers with their status.
+  (Yasuo)
+- Fixed a crash bug in ob_end_*() functions. ob_end_*() will not delete
+  buffers that may not be deleted. (Yasuo)
+- Added 3rd parameter "bool erase" to ob_start(). If FALSE, the buffer may not
+  be deleted until script finishes. (Yasuo)
+- Changed ob_*() functions to return TRUE for success, FALSE for failure.
+  (Yasuo)
+- Added sybase_ct support to dbx module. (Marc)
+- Fixed error message handling with PostgreSQL 7.2. (Rui)
+- Added object aggregation capability, see aggregation_*() functions. (Andrei)
+- Added debug_zval_dump() which works similarly to var_dump, but displays 
+  extra internal information such as refcounts and true type names. (Jason)
+- Added Andrei's tokenizer extension. (Stig)
+- Fixed a bug in the COM extension which caused php to crash in
+  php_COM_get_ids_of_names(). (Paul, Harald)
+- Removed ext/satellite. It is now part of PEAR. (eriksson)
+- Changed php.ini directive 'safe_mode_include_dir' to accept a (semi)colon 
+  separated path (like 'include_path') rather than a single directory.
+  (jflemer)
+- Added is_a() function that can be used to test whether object is of a certain
+  class or is derived from it. (Andrei, Zend Engine)
+- Added optional parameter to highlight_string() and highlight_file() which
+  makes these functions to return a highlighted string instead of dumping
+  it to standard output. (Derick)
+- Added EXTR_IF_EXISTS and EXTR_PREFIX_IF_EXISTS flags to extract(). (Rasmus)
+- Fixed a segfault in pg_pconnect(). If PostgreSQL server is restarted, broken 
+  connection is detected and reconnected. (Yasuo)
+- Fixed --enable-safe-mode configure option. (Yasuo)
+- Added function domxml_dump_node($doc,$node). Dumps a node plus all children 
+  into a string. (chregu)
+- Added function domxml_node_get_content(). (chregu)
+- Added function domxml_dump_file($filename,[$compression]). Dumps XML to
+  a file and uses compression, if specified. (chregu)
+- Added exslt integration to domxml extension (http://exslt.org for details).
+  Configure with --with-dom-exslt[=DIR] (and --with-dom-xslt). 
+  (chregu,jaroslaw)
+- Fixed session_unset() to not touch any globals if register_globals is off.
+  (Thies)
+- Added 3 new optional parameters to OCIFetchStatement(). They control
+  the number of rows to skip at the beginning of the cursor, the
+  maximun numer of rows that should be fetched and the format of the
+  returned array. (Thies)
+- Updated the XSLT extension to support Sablotron 0.8. (Petr Cimprich)
+- Fixed a bug in preg_match() and preg_match_all() when matching strings 
+  contain null bytes. (Andrei)
+- Added xpath_register_ns() function. This makes it possible to issue XPath 
+  queries with namespaces like for example: "//namespace:sampletag".
+  (Chris Jarecki)
+- Added multi-byte enabled regular expression functions. (Rui)
+- Added optional second parameter to count() which can be used to specify
+  either normal or recursive counting. (patch by Vlad Bosinceanu <glipy@fx.ro>)
+- Added mb_get_info() to get internal settings of mbstring. (Rui)
+- Added async query functions to PostgreSQL module. (Yasuo)
+- Added pg_copy_to()/pg_copy_from() for PostgreSQL module. (Youichi, Yasuo)
+- Added IPv6 support for FTP extension. (Stig Venaas)
+- Improved the speed of wordwrap() significantly. (Jim)
+- Fixed pow()'s incorrect behaviour when dealing with powers of 0. (Jim)
+- Added is_finite(), is_infinite() and is_nan(). (Jim)
+- Fixed segfault in wordwrap() when wrapping to zero width and using
+  multi-character break or trying to force cut (bug #12768). (Jim)
+- Fixed several bugs in dbase extension (dbase_pack() truncate file to right
+  size, fix 6852 #1 and 6852 #2). (Vlad)
+- Fixed bug in krsort() where an extra character was being compared. (Andi)
+- Fixed bug that made pspell include pspell.h from a wrong location. (Vlad)
+- Added function overload in mbstring to add multibyte support for 
+  string and mail functions. (Rui)
+- Added flags parameter to preg_grep(). The only flag currently is
+  PREG_GREP_INVERT that will make the function return entries that
+  did not match. (Andrei)
+- Fixed several crash bugs in the xslt extension. (Markus, Derick)
+- Fixed problem with dbase not returning very large (larger than long)
+  integers properly. (Vlad)
+- Added concepts to IRCG: bailout-on-trivial issue, write output to
+  files, fetch a resource upon connection end. (Sascha)
+- Fixed POST-related bugs in thttpd, added QUERY_STRING, HTTP_HOST,
+  HTTP_ACCEPT_LANGUAGE to the script environment, improved patch
+  to send correct MIME types, and added support for /nocache/. (Sascha)
+- Fixed several bugs and memleaks in the domxml extension. (Markus)
+- Added var_export() which outputs a representation of a variable as reusable 
+  PHP code. (Derick)
+- Added -w option to the CGI-version to strip all comments and whitespace
+  from the script. (Thies)
+- Added support for SO_RCVTIMEO and SO_SNDTIMEO to ext/sockets. (Jason)
+- Added ob_get_level() which returns the nesting level of the output buffering
+  mechanism. (Yasuo, Derick)
+- Added ob_flush() and ob_clean() functions which flush and clean an output 
+  buffer without destroying the buffer. (Derick)
+- Added new optional parameter to mysql_connect() which forces a new database 
+  link to be created. (Markus, Derick)
+- Added ldap_sort() function. (Stig Venaas)
+- Added md5_file() function which calculates the MD5 sum of a file.
+  Patch by Alessandro Astarita <aleast@capri.it> (Derick)
+- Added support for parsing recordsets contained in WDDX packets. (Andrei)
+- Renamed key_exists() to array_key_exists(). (Derick)
+- Fixed ImageColorsForIndex() and ImageColorAt() to work for TrueColor
+  images. (Rasmus)
+- Added support for bind_textdomain_codeset(). (rudib@email.si)
+- Added generic Win 32 API extension. (jmoore)
+- Removed warning message about NONEXISTENT character set from mysql_connect() 
+  when the server's default character set != latin1. (Mysql Team)
+- Added Direct I/O extension for lowlevel access to the POSIX layer. (Sterling)
+- Added SAPI module for the WebJames server on RISC OS. (Alex Waugh)
+- Fixed ldap_add() and ldap_modify() functions to throw a warning with illegal 
+  value arrays. Previously segfaulted or added wrong value. (Stig Venaas)
+- Added udm_check_charset() function into mnoGoSearch extension. (gluke)
+- Fixed mnoGoSearch extension to support mnogosearch-3.2.x. (gluke)
+- Made fbsql_num_rows() to return the correct value on all select statements.
+  (Frank)
+- Added array_chunk() function which splits an array into chunks of specified
+  size. (Andrei)
+- Fixed $HTTP_RAW_POST_DATA to be populated on a missing content-type when 
+  always_populate_raw_post_data is on. (Rasmus)
+- Added session_cache_expire() function. (patch by anuradha@gnu.org) (Andrei)
+- Added array_fill() function. (Rasmus)
+- Made Authorization header to be hidden from phpinfo() output in safe_mode. 
+  (Rasmus)
+- Re-instated safe-mode realm mangling. (Rasmus)
+- Fixed a bug in preg_replace() that would change the type of the replacement
+  array entries to string. (Andrei)
+- Added user-space object overloading extension. (Andrei)
+- Added ldap_start_tls() function. (Stig Venaas, patch by kuenne@rentec.com)
+- Changed rand() and mt_rand() to be seed automatically if srand() or
+  mt_srand() has not been called. (Sterling)
+- Changed the seed options to srand() and mt_srand() to be optional. If the 
+  seed is not specified the most random seed possible is generated. (Sterling)
+- Added array_change_key_case() function which returns an array with all 
+  string keys lowercased or uppercased. (Edin)
+- Added parameter to ircg_pconnect to suppress treating non-fatal errors
+  as fatal, and added conversion of Windows quotes to &quot;. (Sascha)
+- Added pcntl_exec() function which behaves similar to the system execve.
+  (Jason)
+- Fixed segfault and check for truecolor image in ImageColorAt(). (Rasmus)
+- Fixed nl2br() to handle all styles of line-endings in one string. 
+  (Boian, Derick)
+- Added mcrypt_generic_deinit() to replace mcrypt_generic_end(). (Derick)
+- Added apache_setenv() function for injecting variables into Apache's
+  subprocess_env table. (Rasmus)
+- Added support for 'int', 'bool', 'float' and 'null' in settype(). (Jeroen)
+- Added IPv6 support to gethostbyaddr().
+  (Patch by Matthias Wimmer <matthias@charente.de> and venaas)
+- Fixed LONG_VARCHAR type crashing in ODBC extension. Patch by Walter Franzini.
+  (kalowsky)
+- Changed in_array() and search_array() to allow the needle to be an array 
+  in itself. (Andrei)
+- Added ini_get_all() function which returns all registered ini entries
+  or entries for the specified extension. (Jani)
+- Added support for chinese encodings in htmlentities() and htmlspecialchars().
+  (Patch by Alan Knowles <alan_k@hklc.com> and Wez)
+- Improved support for autoconf-2.50+/libtool 1.4b+. (Jan Kneschke, Sascha)
+
+27 Feb 2002, Version 4.1.2
+- Fixed start up failure when mm save handler is used and there are multiple
+  SAPIs working at the same time. (Yasuo)
+- Fixed the Roxen SAPI. (Yasuo)
+- Fixed a buffer overflow in the RFC-1867 file upload code. (Stefan)
+- Fixed a crash bug in the session module. (Yasuo)
+- Fixed a crash bug in the pspell module. (Yasuo)
+- Changed the default output encoding of mbstring 'pass' to fix
+  initialization problem. (Rui)
+
+26 Dec 2001, Version 4.1.1
+- Fixed incompatibility with Windows .NET / IIS 6 - may improve stability
+  under other versions of IIS. (Zeev)
+- Fixed bug that caused crashes or error notices on shutdown on threaded
+  platforms. (Zeev)
+- Fixed several crash bugs in the xslt extension. (Markus, Derick)
+- Fixed problem with dbase not returning very large (larger than long)
+  integers properly. (Vlad)
+- Fixed several bugs and memleaks in the domxml extension. (Markus)
+- Fixed bug in gmmktime() which was one hour off during standard time -
+  bug #9878. Patch by bfoddy@mediaone.net. (jmoore)
+- Fixed bug in gmdate() timezone handling on Windows - bug #13885. (jmoore)
+- Fixed several crash bugs in the mcrypt extension. (Derick)
+- Made the mcrypt extension compile with the libmcrypt 2.2 series again.
+  (Sterling)
+- Fixed a bug where the is_file() family of functions would in-correctly give
+  an error when they were given filenames that didn't exist. (Sterling)
+- Fixed a bug in the strtotime() function where it was incorrectly recognizing
+  GMT +0100 and GMT -0100. (Derick)
+
+10 Dec 2001, Version 4.1.0
+- Worked around a bug in the MySQL client library that could cause PHP to hang
+  when using unbuffered queries. (Zeev)
+- Fixed a bug which caused set_time_limit() to affect all subsequent requests
+  to running Apache child process. (Zeev)
 - Removed the sablotron extension in favor of the new XSLT extension.
  (Sterling)
 - Fixed a bug in WDDX deserialization that would sometimes corrupt the root
@@ -33,7 +307,7 @@ PHP 4.0                                                                    NEWS
 - Fixed a crash in dbase_replace_record. (Patch by robin.marlow@dps-int.com)
 - Fixed a crash in msql_result(). (Zeev)
 - Added support for single dimensional SafeArrays and Enumerations.
-  Added an is_enum() function to check if a component implements an
+  Added com_isenum() function to check if a component implements an
  enumeration. (Alan, Harald)
 - Fixed a bug in dbase_get_record() and dbase_get_record_with_names().
  boolean fields are now returned correctly.
@@ -73,7 +347,7 @@ PHP 4.0                                                                    NEWS
  string to the gmp-number. (Troels)
 - Added the Cyrus-IMAP extension, which allows a direct interface to Cyrus' 
  more advanced capabilities. (Sterling)
- Enhance read_exif_data() to support multiple comment tags (Rasmus)
+- Enhanced read_exif_data() to support multiple comment tags. (Rasmus)
 - Fixed a crash bug in array_map() when NULL callback was passed in. (Andrei)
 - Change from E_ERROR to E_WARNING in the exif extension (Rasmus)
 - New pow() implementation, which returns an integer when possible,
@@ -292,7 +566,7 @@ PHP 4.0                                                                    NEWS
  All ini settings are now prefixed by 'com.'.
  Now you need not provide a path to the file containing the typelib, you can
  also provide the GUID of the TypeLib - entry or an IID for preloading
-  type - information. (phanto)
+  type - information. (Harald)
 - Rewrite of domxml. It's now mostly DOM Level 2 conform. (Uwe)
 - Added array_map() function that applies a callback to the elements
  of given arrays and returns the result. It can also be used with a
@@ -89,6 +89,15 @@ The lines above marked with @ will go into NEWS file automagically, and the
 # lines will be omitted from the ChangeLog. Alternatively, you might want
 to modify NEWS file directly and not use the @ lines.

+If you fix some bugs, you should note the bug ID numbers in your
+commit message. Bug ID should be prefixed by "#" for easier access to
+bug report when developers are browsing CVS via. LXR or Bonsai.
+
+Example:
+
+Fixed pgsql notice handler double free crash bug. Bug #14016
+@ Fixed pgsql notice handler double free crash bug. Bug #14016
+
 If you don't see your messages in ChangeLog and NEWS right away, don't worry!
 These files are updated once a day, so your stuff will not show up until
 somewhat later. Don't go adding stuff to NEWS by hand if you already put @
@@ -0,0 +1,118 @@
+New parameter parsing functions
+===============================
+
+It should be easier to parse input parameters to an extension function.
+Hence, borrowing from Python's example, there are now a set of functions
+that given the string of type specifiers, can parse the input parameters
+and store the results in the user specified variables. This avoids most
+of the IS_* checks and convert_to_* conversions. The functions also
+check for the appropriate number of parameters, and try to output
+meaningful error messages.
+
+
+Prototypes
+----------
+/* Implemented. */
+int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...);
+int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);
+
+The zend_parse_parameters() function takes the number of parameters
+passed to the extension function, the type specifier string, and the
+list of pointers to variables to store the results in. The _ex() version
+also takes 'flags' argument -- current only ZEND_PARSE_PARAMS_QUIET can
+be used as 'flags' to specify that the function should operate quietly
+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.
+
+
+Type specifiers
+---------------
+ l	- long
+ d	- double
+ s	- string (with possible null bytes) and its length
+ b	- boolean, stored in zend_bool
+ r	- resource (stored in zval)
+ a	- array
+ o	- object (of any type)
+ O	- object (of specific type, specified by class entry)
+ z	- the actual zval
+
+ The following characters also have a meaning in the specifier string:
+     | - indicates that the remaining parameters are optional, they
+		 should be initialized to default values by the extension since they
+		 will not be touched by the parsing function if they are not
+		 passed to it.
+	 / - use SEPARATE_ZVAL_IF_NOT_REF() on the parameter it follows
+	 ! - the parameter it follows can be of specified type or NULL (only applies
+	     to 'a', 'o', 'O', 'r', and 'z'). If NULL is passed, the results
+		 pointer is set to NULL as well.
+
+Examples
+--------
+/* Gets a long, a string and its length, and a zval */
+long l;
+char *s;
+int s_len;
+zval *param;
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
+						  &l, &s, &s_len, &param) == FAILURE) {
+	return;
+}
+
+
+/* Gets an object of class specified by my_ce, and an optional double. */
+zval *obj;
+double d = 0.5;
+zend_class_entry my_ce;
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
+						  &obj, my_ce, &d) == FAILURE) {
+	return;
+}
+
+
+/* Gets an object or null, and an array.
+   If null is passed for object, obj will be set to NULL. */
+zval *obj;
+zval *arr;
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a",
+						  &obj, &arr) == FAILURE) {
+	return;
+}
+
+
+/* Gets a separated array which can also be null. */
+zval *arr;
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
+						  &arr) == FAILURE) {
+	return;
+}
+
+
+/* Get only the first three parameters (useful for varargs functions). */
+zval *z;
+zend_bool b;
+zval *r;
+if (zend_parse_parameters(3 TSRMLS_CC, "zbr!",
+						  &z, &b, &r) == FAILURE) {
+	return;
+}
+
+
+/* Get either a set of 3 longs or a string. */
+long l1, l2, l3;
+char *s;
+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) {
+	/* manipulate string */
+} else {
+	/* output error */
+
+	return;
+}
@@ -3,99 +3,129 @@ parenthesis means that person has taken on this project.

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

 global
 ------
-    * when used in standalone (skell-script like) mode don't urldecode
-      arguments passed to php. right now it's not possible to say
-        /usr/local/bin/php somescript.php dog+cat.txt
-      as "dog+cat.txt" will arrive in php as "dog cat.txt". 
-    * make everything on the language-level independent of your locale setings.
-    * always build the standalone executable as well as the chosen SAPI 
-      target.
-    * make sure all source files have the "right" copyright.
-    * the following modules still use PHP3_TLS_*() macros (and thereby don't 
-      work in ZTS mode): ext/db/db.c, ext/gd/gd.c
-    * make sure that all ZTS globals get destructed. Most ts_allocate_id()
+    For PHP 4.3.0:
+    * Add aliases to functions to conform to new naming conventions, e.g.
+      str_to_upper().
+    * Make all extensions thread-safe.
+    * Make everything on the language-level independent of your locale 
+      settings.
+    * Change PHP error messages, so that they point to pages or sections 
+      in the PHP Manual.
+    * Make sure that all ZTS globals get destructed. Most ts_allocate_id()
      calls should have a dtor entry.
-    * activate all extensions by default that don't rely on external
-      dependices. (eg ftp)
+    * Activate all extensions by default that don't rely on external
+      dependencies. (eg ftp) (DONE?)
+    * on some platforms unimplemented function will just do nothing 
+      (e.g. symlink) they should print a warning or not even be defined!
+      (DONE ?)
+    * 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
+    * bundle and use curl lib for fopen wrapper.
    * --enable-all in configure. (--enable-shared=max ...)
    * make configure print out a summary when it's done (like XEmacs)
    * replace standard functions which work on static data with 
      reentrancy-safe functions (DONE?).
-    * on some platforms unimplemented function will just do nothing (e.g. symlink)
-      they should print a warning or not even be defined!
-    * implement javadoc based function docs template system.
-    * use thread-safe resolver functions (either require BIND 8 or adns).
-    * provide optional IPv6 support.
    * make SAPI conform to CGI/1.1. Currently, all SAPI modules
      define REMOTE_ADDR etc. themselves and reach only various level
      of compliance.
+    * see what functions might need to be changed to use HashPosition, so
+      that the internal array pointer is not affected.
+    * Move most extensions and PEAR packages out of the PHP CVS tree,
+      include them again during release packaging.
+
+
+    Other
+    * use thread-safe resolver functions (either require BIND 8 or adns).
+    * implement javadoc based function docs template system.
+    * provide optional IPv6 support.
    * find a better way to implement script timeouts. SIGVTALRM is used
      by some POSIX threads implementations (i.e. OpenBSD) and is not
      available in ZTS mode.
-    * add aliases to functions to conform to new naming conventions, e.g.
-      str_to_upper().
-    * see what functions might need to be changed to use HashPosition, so
-      that the internal array pointer is not affected.
+

 documentation
 -------------
-    * add remarks in the documentation which functions are not implemented on win32.
-    * add remarks in the documentation which functions are not binary-safe.
-    * improve documentation for the sablotron extension
-    * update curl documentation
-    * write documentation for the bzip2 extension
-    * write documentation for the zziplib extension
+    * Add remarks in the documentation which functions are not implemented 
+      on win32. 
+    * Add remarks in the documentation which functions are not binary-safe.
+    * Update curl documentation (DONE?)
+    * Add developer documentation.
+    * Add detailed documentation for Java extension.

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

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

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

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

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

 ext/sockets
 -----------
@@ -104,13 +134,12 @@ ext/sockets

 ext/standard
 ------------
-    * add a version number to data serialized via serialize().
-    * array_add(). (Andrei)
-    * possibly modify parsing of GPC data to automatically create arrays if
+    * Add a version number to data serialized via serialize().
+    * Possibly modify parsing of GPC data to automatically create arrays if
      variable name is seen more than once.
-    * implement regex-cache for url-functions.
+    * Implement regex-cache for url-functions.
    * stri_replace(). (Andrei)
-    * move socket related functions to fsock.c.
+    * Move socket related functions to fsock.c.
    * NOT binary safe:
        strtok()
        basename()
@@ -118,19 +147,18 @@ ext/standard
        strrpos()
        strrchr()
        strip_tags()
-    * rewrite win32 SMTP code to be useable for *ix to, maybe as a (default)
+    * 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
+    * More fully support the zziplib API

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

        http://www.wddx.org/WDDX_SDK_10a/7__References/WDDX_DTD.htm
        (Andrei)
@@ -1,35 +0,0 @@
-* Change the odbc_fetch_into() function to require ALWAYS the first two
-  parameters ($conn_id and $array), and make the third (row) be optional.
-
-* Remove --with-openlink configure option (--with-iodbc replaces it).
-
-* Always build CGI (--disable-cgi option to disable).
-
-* Move most extensions and PEAR packages out of the PHP CVS tree,
-  include them again during release packaging.
-
-* Renaming functions, so that they all are conform to one standard form.
-
-* Allow foreach($array as $key => &$value).
-
-* Allow foreach($array as list($var1, $var2)).
-
-* Clean up "$instance = &new object" syntax (default to the =& behaviour?).
-
-* Allow to set a default value for call-by-reference-parameters. eg:
-  function hallo (&$pallo = NULL) {}
-
-* Change PHP error messages, so that they point to pages or sections in the
-  PHP Manual.
-
-* Fix Zend shallow copy issues with objects and arrays.
-
-* Make all extensions thread-safe.
-
-* Finish PHP streams abstraction, nuke all that issock stuff, implement SSL
-  socket support. (wez)
-  - ext/ftp/ -> all FILEs to streams
-  - ext/bz2/ -> convert to stream impl.
-
-* Using arg_separator.input to implode args in the CGI sapi extension
-  and arg_separator.input to explode in php_build_argv().
@@ -31,24 +31,27 @@ dnl
 dnl Set some magic defines to achieve POSIX threads conformance
 dnl
 AC_DEFUN(PTHREADS_FLAGS,[
+  if test -z "$host_alias" && test -n "$host"; then
+    host_alias=$host
+  fi
  if test -z "$host_alias"; then
    AC_MSG_ERROR(host_alias is not set. Make sure to run config.guess)
  fi
-  case "$host_alias" in
+  case $host_alias in
  *solaris*)
    PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";;
  *freebsd*)
    PTHREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE";;
  *linux*)
-    PTHREAD_FLAGS="-D_REENTRANT";;
+    PTHREAD_FLAGS=-D_REENTRANT;;
  *aix*)
-    PTHREAD_FLAGS="-D_THREAD_SAFE";;
+    PTHREAD_FLAGS=-D_THREAD_SAFE;;
  *irix*)
-    PTHREAD_FLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS";;
+    PTHREAD_FLAGS=-D_POSIX_THREAD_SAFE_FUNCTIONS;;
  *hpux*)
-    PTHREAD_FLAGS="-D_REENTRANT";;
+    PTHREAD_FLAGS=-D_REENTRANT;;
  *sco*)
-    PTHREAD_FLAGS="-D_REENTRANT";;
+    PTHREAD_FLAGS=-D_REENTRANT;;
 dnl Solves sigwait() problem, creates problems with u_long etc.
 dnl    PTHREAD_FLAGS="-D_REENTRANT -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE_EXTENDED=1";;
  esac
@@ -77,11 +80,11 @@ int main() {
    int data = 1;
    pthread_mutexattr_init(&mattr);
    return pthread_create(&thd, NULL, thread_routine, &data);
-} ], [ 
-  pthreads_working="yes"
+} ], [
+  pthreads_working=yes
  ], [
-  pthreads_working="no"
-  ], pthreads_working="no" ) ] )dnl
+  pthreads_working=no
+  ], pthreads_working=no ) ] )dnl
 dnl
 dnl PTHREADS_CHECK()
 dnl
@@ -99,23 +102,23 @@ dnl  -threads          gcc (HP-UX)
 dnl
 AC_DEFUN(PTHREADS_CHECK,[

-save_CFLAGS="$CFLAGS"
-save_LIBS="$LIBS"
+save_CFLAGS=$CFLAGS
+save_LIBS=$LIBS
 PTHREADS_ASSIGN_VARS
 PTHREADS_CHECK_COMPILE
-LIBS="$save_LIBS"
-CFLAGS="$save_CFLAGS"
+LIBS=$save_LIBS
+CFLAGS=$save_CFLAGS

 AC_CACHE_CHECK(for pthreads_cflags,ac_cv_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"
+    ac_save=$CFLAGS
    CFLAGS="$CFLAGS $flag"
    PTHREADS_CHECK_COMPILE
-    CFLAGS="$ac_save"
+    CFLAGS=$ac_save
    if test "$pthreads_working" = "yes"; then
-      ac_cv_pthreads_cflags="$flag"
+      ac_cv_pthreads_cflags=$flag
      break
    fi
  done
@@ -123,15 +126,15 @@ fi
 ])

 AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
-ac_cv_pthreads_lib=""
+ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
  for lib in pthread pthreads c_r; do
-    ac_save="$LIBS"
+    ac_save=$LIBS
    LIBS="$LIBS -l$lib"
    PTHREADS_CHECK_COMPILE
-    LIBS="$ac_save"
+    LIBS=$ac_save
    if test "$pthreads_working" = "yes"; then
-      ac_cv_pthreads_lib="$lib"
+      ac_cv_pthreads_lib=$lib
      break
    fi
  done
@@ -139,9 +142,9 @@ fi
 ])

 if test "$pthreads_working" = "yes"; then
-  threads_result="POSIX Threads found"
+  threads_result="POSIX-Threads found"
 else
-  threads_result="POSIX Threads not found"
+  threads_result="POSIX-Threads not found"
 fi
 ])dnl
 dnl
@@ -58,7 +58,7 @@ AC_DEFUN(TSRM_CHECK_ST,[
    CPPFLAGS="$CPPFLAGS -I$1"
    LDFLAGS="$LDFLAGS -L$1"
  fi
-  AC_CHECK_HEADERS(st.h,[ ],[
+  AC_CHECK_HEADERS(st.h,[],[
    AC_MSG_ERROR([Sorry[,] I was unable to locate the State Threads header file.  Please specify the prefix using --with-tsrm-st=/prefix])
  ])
  LIBS="$LIBS -lst"
@@ -16,8 +16,19 @@
 #include <malloc.h>
 #endif

-#if HAVE_ALLOCA_H
-#include <alloca.h>
+/* AIX requires this to be the first thing in the file.  */
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#   endif
+#  endif
+# endif
 #endif

 #if HAVE_UNISTD_H
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+   | 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        |
@@ -68,7 +68,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) 
@@ -363,7 +364,8 @@ 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;
 			}
 #else
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+   | 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        |
@@ -50,6 +50,8 @@ typedef unsigned short mode_t;
 #define DEFAULT_SLASH '\\'
 #define DEFAULT_DIR_SEPARATOR	';'
 #define IS_SLASH(c)	((c) == '/' || (c) == '\\')
+#define IS_SLASH_P(c)	(*(c) == '/' || \
+        (*(c) == '\\' && !IsDBCSLeadByte(*(c-1))))
 #define COPY_WHEN_ABSOLUTE 2
 #define IS_ABSOLUTE_PATH(path, len) \
 	(len >= 2 && isalpha(path[0]) && path[1] == ':')
@@ -62,8 +64,15 @@ typedef unsigned short mode_t;
 #endif

 #define DEFAULT_SLASH '/'
-#define DEFAULT_DIR_SEPARATOR	':'
+
+#ifdef __riscos__
+#define DEFAULT_DIR_SEPARATOR  ';'
+#else
+#define DEFAULT_DIR_SEPARATOR  ':'
+#endif
+
 #define IS_SLASH(c)	((c) == '/')
+#define IS_SLASH_P(c)	(*(c) == '/')

 #endif

@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+   | 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        |
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+   | 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        |
@@ -4,6 +4,22 @@ dnl This file contains local autoconf functions.

 sinclude(dynlib.m4)

+dnl
+dnl Disable building CLI
+dnl
+AC_DEFUN(PHP_DISABLE_CLI,[
+  disable_cli=1
+])
+	
+dnl
+dnl Separator into the configure --help display.
+dnl 
+AC_DEFUN(PHP_HELP_SEPARATOR,[
+AC_ARG_ENABLE([],[
+$1
+],[])
+])
+
 dnl
 dnl PHP_TARGET_RDYNAMIC
 dnl
@@ -34,7 +50,7 @@ AC_DEFUN(PHP_REMOVE_USR_LIB,[
  done
  $1=[$]ac_new_flags
 ])
-    
+
 AC_DEFUN(PHP_SETUP_OPENSSL,[
  if test "$PHP_OPENSSL" = "no"; then
    PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
@@ -48,21 +64,21 @@ AC_DEFUN(PHP_SETUP_OPENSSL,[
  done

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

  old_CPPFLAGS=$CPPFLAGS
  CPPFLAGS=-I$OPENSSL_INC
-  AC_MSG_CHECKING(for OpenSSL version)
+  AC_MSG_CHECKING([for OpenSSL version])
  AC_EGREP_CPP(yes,[
  #include <openssl/opensslv.h>
  #if OPENSSL_VERSION_NUMBER >= 0x0090500fL
  yes
  #endif
  ],[
-    AC_MSG_RESULT(>= 0.9.5)
+    AC_MSG_RESULT([>= 0.9.5])
  ],[
-    AC_MSG_ERROR(OpenSSL version 0.9.5 or greater required.)
+    AC_MSG_ERROR([OpenSSL version 0.9.5 or greater required.])
  ])
  CPPFLAGS=$old_CPPFLAGS

@@ -71,13 +87,13 @@ AC_DEFUN(PHP_SETUP_OPENSSL,[
  AC_CHECK_LIB(crypto, CRYPTO_free, [
    PHP_ADD_LIBRARY(crypto)
  ],[
-    AC_MSG_ERROR(libcrypto not found!)
+    AC_MSG_ERROR([libcrypto not found!])
  ])

  AC_CHECK_LIB(ssl, SSL_CTX_set_ssl_version, [
    PHP_ADD_LIBRARY(ssl)
  ],[
-    AC_MSG_ERROR(libssl not found!)
+    AC_MSG_ERROR([libssl not found!])
  ])
  PHP_ADD_INCLUDE($OPENSSL_INC)
 ])
@@ -178,6 +194,9 @@ AC_DEFUN(PHP_SHLIB_SUFFIX_NAME,[
  *hpux*)
 	SHLIB_SUFFIX_NAME=sl
 	;;
+  *darwin*)
+	SHLIB_SUFFIX_NAME=dylib
+	;;
  esac
 ])

@@ -236,6 +255,8 @@ AC_DEFUN(PHP_MISSING_PREAD_DECL,[
      ],[
        ac_cv_pread=no
      ])
+    ],[
+      ac_cv_pread=no
    ])
  ])
  ])
@@ -270,6 +291,8 @@ AC_DEFUN(PHP_MISSING_PWRITE_DECL,[
      ],[
        ac_cv_pwrite=no
      ])
+    ],[
+      ac_cv_pwrite=no
    ])
  ])
  ])
@@ -280,7 +303,7 @@ AC_DEFUN(PHP_MISSING_PWRITE_DECL,[
 ])

 AC_DEFUN(PHP_MISSING_TIME_R_DECL,[
-  AC_MSG_CHECKING(for missing declarations of reentrant functions)
+  AC_MSG_CHECKING([for missing declarations of reentrant functions])
  AC_TRY_COMPILE([#include <time.h>],[struct tm *(*func)() = localtime_r],[
    :
  ],[
@@ -306,7 +329,7 @@ AC_DEFUN(PHP_MISSING_TIME_R_DECL,[
  ],[
    AC_DEFINE(MISSING_STRTOK_R_DECL,1,[Whether strtok_r is declared])
  ])
-  AC_MSG_RESULT(done)
+  AC_MSG_RESULT([done])
 ])

 dnl
@@ -347,7 +370,9 @@ if test "$php_always_shared" = "yes"; then
  test "[$]$1" = "no" && $1=yes
 fi

-AC_MSG_RESULT($ext_output)
+if test -n "$2"; then
+  AC_MSG_RESULT([$ext_output])
+fi
 ])

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

 AC_DEFUN(PHP_REAL_ARG_WITH,[
-AC_MSG_CHECKING($2)
+if test -n "$2"; then
+  AC_MSG_CHECKING([$2])
+fi
 AC_ARG_WITH($1,[$3],$5=[$]withval,$5=ifelse($4,,no,$4))
-PHP_ARG_ANALYZE($5)
+PHP_ARG_ANALYZE($5,[$2])
 ])

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

 AC_DEFUN(PHP_REAL_ARG_ENABLE,[
-AC_MSG_CHECKING($2)
+if test -n "$2"; then
+  AC_MSG_CHECKING([$2])
+fi
 AC_ARG_ENABLE($1,[$3],$5=[$]enableval,$5=ifelse($4,,no,$4))
-PHP_ARG_ANALYZE($5)
+PHP_ARG_ANALYZE($5,[$2])
 ])

 AC_DEFUN(PHP_MODULE_PTR,[
@@ -488,7 +517,7 @@ AC_DEFUN(PHP_GEN_CONFIG_VARS,[
  echo creating config_vars.mk
  > config_vars.mk
  for i in $PHP_VAR_SUBST; do
-    eval echo "$i = \$$i" >> config_vars.mk
+    eval echo "$i = \$$i" | sed 's%#%\\#%g' >> config_vars.mk
  done
 ])

@@ -511,7 +540,7 @@ dnl PHP_CONFIGURE_PART(MESSAGE)
 dnl Idea borrowed from mm
 AC_DEFUN(PHP_CONFIGURE_PART,[
  AC_MSG_RESULT()
-  AC_MSG_RESULT(${T_MD}$1${T_ME})
+  AC_MSG_RESULT([${T_MD}$1${T_ME}])
 ])

 AC_DEFUN(PHP_PROG_SENDMAIL,[
@@ -523,13 +552,13 @@ fi

 AC_DEFUN(PHP_RUNPATH_SWITCH,[
 dnl check for -R, etc. switch
-AC_MSG_CHECKING(if compiler supports -R)
+AC_MSG_CHECKING([if compiler supports -R])
 AC_CACHE_VAL(php_cv_cc_dashr,[
 	SAVE_LIBS=$LIBS
 	LIBS="-R /usr/lib $LIBS"
 	AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
 	LIBS=$SAVE_LIBS])
-AC_MSG_RESULT($php_cv_cc_dashr)
+AC_MSG_RESULT([$php_cv_cc_dashr])
 if test $php_cv_cc_dashr = "yes"; then
 	ld_runpath_switch=-R
 else
@@ -539,7 +568,7 @@ else
 		LIBS="-Wl,-rpath,/usr/lib $LIBS"
 		AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
 		LIBS=$SAVE_LIBS])
-	AC_MSG_RESULT($php_cv_cc_rpath)
+	AC_MSG_RESULT([$php_cv_cc_rpath])
 	if test $php_cv_cc_rpath = "yes"; then
 		ld_runpath_switch=-Wl,-rpath,
 	else
@@ -600,7 +629,7 @@ dnl
 AC_DEFUN(PHP_BUILD_THREAD_SAFE,[
  enable_experimental_zts=yes
  if test "$pthreads_working" != "yes"; then
-    AC_MSG_ERROR(ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads.)
+    AC_MSG_ERROR([ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads.])
  fi
 ])

@@ -826,14 +855,14 @@ AC_DEFUN(PHP_CHECK_CC_OPTION,[
  ac_php_compile="${CC-cc} -$opt -o conftest $CFLAGS $CPPFLAGS conftest.$ac_ext 2>&1"
  if eval $ac_php_compile 2>&1 | egrep "$opt" > /dev/null 2>&1 ; then
    eval php_cc_$var=no
-	AC_MSG_RESULT(no)
+	AC_MSG_RESULT([no])
  else
    if eval ./conftest 2>/dev/null ; then
      eval php_cc_$var=yes
-	  AC_MSG_RESULT(yes)
+	  AC_MSG_RESULT([yes])
    else
      eval php_cc_$var=no
-	  AC_MSG_RESULT(no)
+	  AC_MSG_RESULT([no])
    fi
  fi
 ])
@@ -850,8 +879,8 @@ elif test "$REGEX_TYPE" = "system"; then
  AC_DEFINE(REGEX,0,[ ])
 fi

-AC_MSG_CHECKING(which regex library to use)
-AC_MSG_RESULT($REGEX_TYPE)
+AC_MSG_CHECKING([which regex library to use])
+AC_MSG_RESULT([$REGEX_TYPE])

 PHP_SUBST(REGEX_DIR)
 PHP_SUBST(REGEX_LIB)
@@ -865,10 +894,10 @@ AC_DEFUN(PHP_MISSING_FCLOSE_DECL,[
  AC_MSG_CHECKING([for fclose declaration])
  AC_TRY_COMPILE([#include <stdio.h>],[int (*func)() = fclose],[
    AC_DEFINE(MISSING_FCLOSE_DECL,0,[ ])
-    AC_MSG_RESULT(ok)
+    AC_MSG_RESULT([ok])
  ],[
    AC_DEFINE(MISSING_FCLOSE_DECL,1,[ ])
-    AC_MSG_RESULT(missing)
+    AC_MSG_RESULT([missing])
  ])
 ])

@@ -893,13 +922,16 @@ AC_DEFUN(PHP_AC_BROKEN_SPRINTF,[
 ])

 dnl
-dnl PHP_EXTENSION(extname [, shared])
+dnl PHP_EXTENSION(extname [, shared [,sapi_class]])
 dnl
 dnl Includes an extension in the build.
 dnl
 dnl "extname" is the name of the ext/ subdir where the extension resides
 dnl "shared" can be set to "shared" or "yes" to build the extension as
-dnl a dynamically loadable library.
+dnl a dynamically loadable library. Optional parameter "sapi_class" can
+dnl be set to "cli" to mark extension build only with CLI or CGI sapi's.
+dnl If "nocli" is passed the extension will be built only with a non-cli
+dnl sapi.
 dnl
 AC_DEFUN(PHP_EXTENSION,[
  EXT_SUBDIRS="$EXT_SUBDIRS $1"
@@ -914,15 +946,32 @@ dnl ---------------------------------------------- External Module
    ext_srcdir=$abs_srcdir
  fi

-  if test "$2" != "shared" && test "$2" != "yes"; then
+  if test "$2" != "shared" && test "$2" != "yes" && test "$3" != "cli"; then
 dnl ---------------------------------------------- Static module
    LIB_BUILD($ext_builddir)
-    EXT_LTLIBS="$EXT_LTLIBS $ext_builddir/lib$1.la"
+    EXT_LTLIBS="$EXT_LTLIBS $abs_builddir/$ext_builddir/lib$1.la"
    EXT_STATIC="$EXT_STATIC $1"
-  else 
+    if test "$3" != "nocli"; then
+      EXT_CLI_LTLIBS="$EXT_CLI_LTLIBS $abs_builddir/$ext_builddir/lib$1.la"
+      EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
+    fi
+  else
+    if test "$2" = "shared" || test "$2" = "yes"; then
 dnl ---------------------------------------------- Shared module
-    LIB_BUILD($ext_builddir,yes)
-    AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z-,A-Z_), 1, Whether to build $1 as dynamic module)
+      LIB_BUILD($ext_builddir,yes)
+      AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z-,A-Z_), 1, Whether to build $1 as dynamic module)
+    fi
+  fi
+
+  if test "$2" != "shared" && test "$2" != "yes" && test "$3" = "cli"; then
+dnl ---------------------------------------------- CLI only static module
+    LIB_BUILD($ext_builddir)
+    if test "$PHP_SAPI" = "cgi"; then
+      EXT_LTLIBS="$EXT_LTLIBS $abs_builddir/$ext_builddir/lib$1.la"
+      EXT_STATIC="$EXT_STATIC $1"
+    fi
+    EXT_CLI_LTLIBS="$EXT_CLI_LTLIBS $abs_builddir/$ext_builddir/lib$1.la"
+    EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
  fi

  PHP_FAST_OUTPUT($ext_builddir/Makefile)
@@ -936,7 +985,7 @@ dnl Must be run after all --with-NN options that let the user
 dnl choose dynamic extensions, and after the gcc test.
 dnl
 AC_DEFUN(PHP_SOLARIS_PIC_WEIRDNESS,[
-  AC_MSG_CHECKING(whether -fPIC is required)
+  AC_MSG_CHECKING([whether -fPIC is required])
  if test -n "$EXT_SHARED"; then
    os=`uname -sr 2>/dev/null`
    case $os in
@@ -945,12 +994,12 @@ AC_DEFUN(PHP_SOLARIS_PIC_WEIRDNESS,[
 	    gcc*|egcs*) CFLAGS="$CFLAGS -fPIC";;
 	    *) CFLAGS="$CFLAGS -fpic";;
 	  esac
-	  AC_MSG_RESULT(yes);;
+	  AC_MSG_RESULT([yes]);;
 	*)
-	  AC_MSG_RESULT(no);;
+	  AC_MSG_RESULT([no]);;
    esac
  else
-    AC_MSG_RESULT(no)
+    AC_MSG_RESULT([no])
  fi
 ])

@@ -990,7 +1039,7 @@ AC_DEFUN(PHP_SYS_LFS,
 [dnl
  # If available, prefer support for large files unless the user specified
  # one of the CPPFLAGS, LDFLAGS, or LIBS variables.
-  AC_MSG_CHECKING(whether large file support needs explicit enabling)
+  AC_MSG_CHECKING([whether large file support needs explicit enabling])
  ac_getconfs=''
  ac_result=yes
  ac_set=''
@@ -1012,7 +1061,7 @@ AC_DEFUN(PHP_SYS_LFS,
  case "$ac_result$ac_set" in
    yes?*) ac_result="yes, but $ac_set is already set, so use its settings"
  esac
-  AC_MSG_RESULT($ac_result)
+  AC_MSG_RESULT([$ac_result])
  case $ac_result in
    yes)
      for ac_shellvar in $ac_shellvars; do
@@ -1095,7 +1144,7 @@ AC_DEFUN(PHP_FOPENCOOKIE,[
 									   ],
 	                   [ cookie_io_functions_t cookie; ],
                     [ have_cookie_io_functions_t=yes ],
-										 [ ] )
+										 [] )

 		  if test "$have_cookie_io_functions_t" = "yes" ; then
        cookie_io_functions_t=cookie_io_functions_t
@@ -1122,3 +1171,96 @@ AC_DEFUN(PHP_FOPENCOOKIE,[

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

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

@@ -1,8 +1,8 @@
 #! /bin/sh
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -12,7 +12,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -1,7 +1,7 @@
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -33,7 +33,7 @@ generated_lists:
 	@echo makefile_am_files = Zend/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 \
+	@echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
 		Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@

 $(STAMP): build/buildcheck.sh
@@ -1,7 +1,7 @@
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -60,7 +60,7 @@ $(makefile_in_files): $(makefile_am_files) aclocal.m4 configure.in $(config_m4_f
 aclocal.m4: configure.in acinclude.m4 dynlib.m4
 	aclocal 2>&1 | $(SUPPRESS_WARNINGS)

-SUPPRESS_WARNINGS = (egrep -v '(warning: 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)'||true)
+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)

 $(config_h_in): configure acconfig.h
 # explicitly remove target since autoheader does not seem to work 
@@ -1,8 +1,8 @@
 #! /bin/sh
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -16,7 +16,7 @@
 #  |          Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
-# $Id: buildcheck.sh,v 1.12 2001-06-20 18:21:03 david Exp $ 
+# $Id: buildcheck.sh,v 1.16 2002-03-04 08:28:57 sas Exp $ 
 #

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

+
 # automake 1.4 or newer
 am_version=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 am_version_clean=`echo $am_version|sed -e 's/-p[0-9]*$//'`
@@ -61,7 +62,7 @@ fi
 # libtool 1.4 or newer
 libtool=`which libtool`
 if test ! -f "$libtool"; then libtool=`which glibtool`; fi
-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/^[^0-9]*//' -e 's/[- ].*//'`
+lt_pversion=`$libtool --version 2>/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- ].*//p'`
 if test "$lt_pversion" = ""; then
 echo "buildconf: libtool not found."
 echo "           You need libtool version 1.4 or newer installed"
@@ -1,7 +1,7 @@
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -1,9 +1,9 @@
 #! /bin/sh
 #
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -13,12 +13,16 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
-# $Id: fastgen.sh,v 1.10 2001-05-20 22:04:23 sas Exp $ 
+# $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

@@ -41,7 +45,7 @@ if test "$bsd_makefile" = "yes"; then
  (cd $top_srcdir; ./build/bsd_makefile)

  for makefile in $@; do
-    echo "creating $makefile"
+    echo "fastgen.sh: creating $makefile"
    dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
    $mkdir_p "$dir/"

@@ -58,7 +62,7 @@ EOF
  done
 else  
  for makefile in $@; do
-    echo "creating $makefile"
+    echo "fastgen.sh: creating $makefile"
    dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
    $mkdir_p "$dir/"

@@ -1,7 +1,7 @@
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -1,7 +1,7 @@
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -1,5 +1,5 @@
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
 #  | Copyright (c) 2000 The PHP Group                                     |
 #  +----------------------------------------------------------------------+
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$
@@ -1,7 +1,7 @@
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -1,7 +1,7 @@
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -43,21 +43,23 @@ 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: clean-modules clean-recursive clean-x
+
+clean-modules: 

 clean-x:
 	rm -f $(targets) *.lo *.slo *.la *.o $(CLEANFILES)
-	rm -rf .libs
+	rm -rf .libs libs

 distclean: distclean-recursive clean-x
 	rm -f config.cache config.log config.status config_vars.mk libtool \
 	php_config.h stamp-h Makefile build-defs.h php4.spec libphp4.module

-test: $(top_builddir)/php
+test: $(top_builddir)/sapi/cli/php
 	@if test "$(TESTS)" = ""; then \
-		TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -C -q $(top_srcdir)/run-tests.php $(srcdir); \
+		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)/php -C -q $(top_srcdir)/run-tests.php $(TESTS); \
+		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
@@ -1,7 +1,7 @@
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -1,7 +1,7 @@
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -1,8 +1,8 @@
 #! /bin/sh
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  | 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        |
@@ -12,7 +12,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -3,37 +3,9 @@ dnl ## Process this file with autoconf to produce a configure script.

 divert(1)

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

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

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

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

-dnl ## This is where the version number is changed from now on!
-AM_INIT_AUTOMAKE(php, 4.1.0RC3, nodefine)
+
+
+dnl Basic autoconf + automake initialization, generation of config.nice.
+dnl -------------------------------------------------------------------------
+
+AC_INIT(README.CVS-RULES)
+
+PHP_CONFIG_NICE(config.nice)
+for arg in $0 "$@"; do
+  CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
+done
+
+AC_CANONICAL_HOST
+AM_INIT_AUTOMAKE(php, 4.2.1, nodefine)
+AM_CONFIG_HEADER(main/php_config.h)
+AM_MAINTAINER_MODE
+
+
+
+dnl Setting up the PHP version based on the information above.
+dnl -------------------------------------------------------------------------

 PHP_VERSION=$VERSION
 echo "/* automatically generated by configure */" > php_version.h.new
@@ -65,31 +57,28 @@ else
 	rm -f php_version.h.new
 fi

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

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

-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_YACC
-if test "$YACC" != "bison -y"; then
-    AC_MSG_WARN(You will need bison if you want to regenerate the PHP parsers.)
-else
-    AC_MSG_CHECKING(bison version)
-    oldIFS=$IFS; IFS=.
-    set `bison -V | sed -e 's/^GNU Bison version //'`
-    IFS=$oldIFS
-    if test "$1" = "1" -a "$2" -lt "25"; then
-        AC_MSG_WARN(Bison 1.25 or newer needed to regenerate parsers (found $1.$2).)
-    fi
-    AC_MSG_RESULT($1.$2 (ok))
+dnl Catch common errors here to save a few seconds of our users' time
+dnl -------------------------------------------------------------------------
+
+if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then
+  AC_MSG_ERROR([--with-shared-apache is not supported. Please refer to the documentation for using APXS])
 fi

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

 BSD_MAKEFILE=no

@@ -107,23 +96,97 @@ case $host_alias in
 *bsdi*)
    BSD_MAKEFILE=yes;;
 *beos*)
-	beos_threads=1
-	LIBS="$LIBS -lbe -lroot";;
+    beos_threads=1
+    LIBS="$LIBS -lbe -lroot";;
 *mips*)
-	CPPFLAGS="$CPPFLAGS -D_XPG_IV";;
+    CPPFLAGS="$CPPFLAGS -D_XPG_IV";;
 esac

-AM_PROG_CC_STDC

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

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

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

+
+
 divert(2)

+dnl ## Diversion 2 is where we set PHP-specific options and come up
+dnl ## with reasonable default values for them. We check for pthreads here
+dnl ## because the information is needed by the SAPI configuration.
+dnl ## This is also where an SAPI interface is selected (choosing between
+dnl ## Apache module, CGI etc.)
+
+dnl .
+dnl -------------------------------------------------------------------------
+
 PTHREADS_CHECK
-
+PHP_HELP_SEPARATOR([SAPI modules:])
 PHP_SHLIB_SUFFIX_NAME
-
 PHP_SAPI=cgi
 PHP_BUILD_PROGRAM
+
+
+
+dnl SAPI configuration.
+dnl -------------------------------------------------------------------------
+
 dnl paths to the targets are relative to the build directory
 SAPI_PROGRAM=php
 SAPI_SHARED=libs/libphp4.$SHLIB_SUFFIX_NAME
@@ -157,63 +238,47 @@ PHP_CONFIGURE_PART(Configuring SAPI modules)

 esyscmd(./scripts/config-stubs sapi)

-AC_MSG_CHECKING(for chosen SAPI module)
-AC_MSG_RESULT($PHP_SAPI)
+AC_MSG_CHECKING([for chosen SAPI module])
+AC_MSG_RESULT([$PHP_SAPI])

 if test "$enable_experimental_zts" = "yes"; then
  PTHREADS_ASSIGN_VARS
  PTHREADS_FLAGS
 fi

+
+
 divert(3)

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

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


+dnl First, library checks.
+dnl -------------------------------------------------------------------------
+
 AC_CHECK_LIB(socket, socket, [
 PHP_ADD_LIBRARY(socket)
 AC_DEFINE(HAVE_LIBSOCKET,1,[ ]) ], [
@@ -227,7 +292,7 @@ dnl are usually in libnsl

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

 if test "$php_no_nsl_checks" != "yes"; then
@@ -273,6 +338,11 @@ AC_CHECK_LIB(socket, res_search, [
 ]) 
 ])

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

@@ -285,6 +355,7 @@ fi
 PHP_MISSING_FCLOSE_DECL
 dnl QNX requires unix.h to allow functions in libunix to work properly
 AC_CHECK_HEADERS(
+ApplicationServices/ApplicationServices.h \
 alloca.h \
 arpa/inet.h \
 arpa/nameser.h \
@@ -323,7 +394,11 @@ unix.h \
 utime.h \
 )

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

@@ -334,8 +409,6 @@ PHP_SOCKLEN_T
 AC_CHECK_SIZEOF(long, 8)
 AC_CHECK_SIZEOF(int, 4)

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

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

+
+
 dnl Checks for library functions.
+dnl -------------------------------------------------------------------------
+
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(
 asctime_r \
@@ -446,7 +532,7 @@ PHP_TIME_R_TYPE
 PHP_READDIR_R_TYPE

 dnl AIX keeps in_addr_t in /usr/include/netinet/in.h
-dnl AC_MSG_CHECKING(for in_addr_t)
+dnl AC_MSG_CHECKING([for in_addr_t])
 AC_CACHE_VAL(ac_cv_type_$1,
 [AC_EGREP_CPP(dnl
 changequote(<<,>>)dnl
@@ -460,13 +546,23 @@ changequote([,]), [#include <sys/types.h>
 #include <netinet/in.h>
 #endif], ac_cv_type_in_addr_t=yes, ac_cv_type_in_addr_t=no)])dnl

-dnl AC_MSG_RESULT($ac_cv_type_in_addr_t)
+dnl AC_MSG_RESULT([$ac_cv_type_in_addr_t])
 if test $ac_cv_type_in_addr_t = no; then
  AC_DEFINE(in_addr_t, u_int, [ ])
 fi

+
+
 divert(4)

+dnl ## In diversion 4 we check user-configurable general settings.
+
+dnl General settings.
+dnl -------------------------------------------------------------------------
+
+
+PHP_HELP_SEPARATOR([General settings:])
+
 PHP_ARG_ENABLE(debug, whether to include debugging symbols,
 [  --enable-debug          Compile with debugging symbols.], no)

@@ -482,6 +578,15 @@ PHP_ARG_WITH(layout,[layout of installed files],
 [  --with-layout=TYPE      Sets how installed files will be laid out.  Type is
                          one of "PHP" (default) or "GNU"], PHP)

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

@@ -530,7 +635,7 @@ else
  AC_DEFINE(PHP_SAFE_MODE,0,[ ])
 fi

-AC_MSG_CHECKING(for safe mode exec dir)
+AC_MSG_CHECKING([for safe mode exec dir])
 AC_ARG_WITH(exec-dir,
 [  --with-exec-dir[=DIR]   Only allow executables in DIR when in safe mode
                          defaults to /usr/local/php/bin],
@@ -538,18 +643,18 @@ AC_ARG_WITH(exec-dir,
  if test "$withval" != "no"; then
  	if test "$withval" = "yes"; then
 		AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
-    	AC_MSG_RESULT(/usr/local/php/bin)
+    	AC_MSG_RESULT([/usr/local/php/bin])
   	else
 		AC_DEFINE_UNQUOTED(PHP_SAFE_MODE_EXEC_DIR,"$withval", [ ])
-    	AC_MSG_RESULT($withval)
+    	AC_MSG_RESULT([$withval])
   	fi
  else
 	AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
-   	AC_MSG_RESULT(/usr/local/php/bin)
+   	AC_MSG_RESULT([/usr/local/php/bin])
  fi
 ],[
 	AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
-   	AC_MSG_RESULT(/usr/local/php/bin)
+   	AC_MSG_RESULT([/usr/local/php/bin])
 ])

 PHP_ARG_WITH(openssl,for OpenSSL support,
@@ -590,7 +695,7 @@ PHP_ARG_ENABLE(libgcc, whether to explicitly link against libgcc,
 if test "$PHP_LIBGCC" = "yes"; then
  PHP_LIBGCC_LIBPATH(gcc)
  if test -z "$libgcc_libpath"; then
-    AC_MSG_ERROR(Cannot locate libgcc. Make sure that gcc is in your path)
+    AC_MSG_ERROR([Cannot locate libgcc. Make sure that gcc is in your path])
  fi
  PHP_ADD_LIBPATH($libgcc_libpath)
  PHP_ADD_LIBRARY(gcc, yes)
@@ -616,27 +721,40 @@ if test "$PHP_DMALLOC" = "yes"; then
    AC_DEFINE(HAVE_DMALLOC,1,[Whether you have dmalloc])
    CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK"
  ], [
-    AC_MSG_ERROR(Problem with enabling dmalloc. Please check config.log for details.)
+    AC_MSG_ERROR([Problem with enabling dmalloc. Please check config.log for details.])
  ])
 fi

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

+
+
 divert(5)

+dnl ## In diversion 5 we check which extensions should be compiled.
+dnl ## All of these are normally in the extension directories.
+
+
+
+dnl Extension configuration.
+dnl -------------------------------------------------------------------------
+
+PHP_HELP_SEPARATOR([Extensions:
+
+  --with-EXTENSION=[shared[,PATH]]
+  
+    NOTE: Not all extensions can be build as 'shared'.
+
+    Example: --with-foobar=shared,/usr/local/foobar/
+
+      o Builds the foobar extension as shared extension.
+      o foobar package install prefix is /usr/local/foobar/
+])
+
 PHP_CONFIGURE_PART(Configuring extensions)

 # reading config stubs
@@ -644,7 +762,14 @@ esyscmd(./scripts/config-stubs ext)

 PHP_FAST_OUTPUT(sapi/$PHP_SAPI/Makefile)

-AC_MSG_CHECKING(whether to enable versioning)
+
+
+dnl Other settings.
+dnl -------------------------------------------------------------------------
+
+PHP_HELP_SEPARATOR([Other settings:])
+
+AC_MSG_CHECKING([whether to enable versioning])
 AC_ARG_ENABLE(versioning,
 [  --enable-versioning     Export only required symbols.
                          See INSTALL for more information],[
@@ -652,7 +777,7 @@ AC_ARG_ENABLE(versioning,
 ],[
  PHP_VERSIONING=no
 ])
-AC_MSG_RESULT($PHP_VERSIONING)
+AC_MSG_RESULT([$PHP_VERSIONING])

 if test "$PHP_VERSIONING" = "yes"; then
  test -z "$PHP_SYM_FILE" && PHP_SYM_FILE="$abs_srcdir/sapi/$PHP_SAPI/php.sym"
@@ -661,8 +786,6 @@ if test "$PHP_VERSIONING" = "yes"; then
  fi
 fi

-divert(6)
-
 enable_shared=yes
 enable_static=yes
 unset with_pic
@@ -694,6 +817,12 @@ fi

 PHP_REGEX

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

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

 PHP_CONFIGURE_PART(Configuring TSRM)
@@ -822,12 +951,20 @@ AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
 PHP_OS=`uname`
 AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])

+if test "$disable_cli" = "1"; then
+  CLI_DIR=
+else
+  CLI_DIR=sapi/cli
+fi
+
+PHP_SUBST(CLI_DIR)

 PHP_SUBST(EXT_SUBDIRS)
 PHP_SUBST(EXT_STATIC)
 PHP_SUBST(EXT_SHARED)
 PHP_SUBST(EXT_LIBS)
 PHP_SUBST(EXT_LTLIBS)
+PHP_SUBST(EXT_CLI_LTLIBS)

 PHP_SUBST_OLD(abs_builddir)
 PHP_SUBST_OLD(abs_srcdir)
@@ -858,6 +995,7 @@ PHP_SUBST(DEFS)
 PHP_SUBST_OLD(EXTENSION_DIR)
 PHP_SUBST(EXTRA_LDFLAGS)
 PHP_SUBST_OLD(EXTRA_LIBS)
+PHP_SUBST_OLD(ZEND_EXTRA_LIBS)
 PHP_SUBST(INCLUDES)
 PHP_SUBST_OLD(INCLUDE_PATH)
 PHP_SUBST_OLD(INSTALL_IT)
@@ -885,8 +1023,6 @@ PHP_SUBST(TSRM_LIB)
 PHP_SUBST(WARNING_LEVEL)
 PHP_SUBST_OLD(YACC)

-PHP_CONFIGURE_PART(Configuring libtool)
-
 old_CC=$CC

 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
@@ -931,11 +1067,12 @@ PHP_GEN_CONFIG_VARS
 $php_shtool mkdir -p pear/scripts
 ALL_OUTPUT_FILES="php4.spec Zend/Makefile main/build-defs.h \
 pear/scripts/pear pear/scripts/phpize pear/scripts/php-config \
-pear/scripts/pearize pear/scripts/phptar TSRM/Makefile $PHP_OUTPUT_FILES"
+pear/scripts/pearize pear/scripts/phptar \
+TSRM/Makefile $PHP_OUTPUT_FILES"

 AC_OUTPUT($ALL_OUTPUT_FILES, [], [

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

@@ -954,9 +1091,10 @@ fi
 # Create configuration headers
 #

-if test -d TSRM; then
-  echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h
-fi
+test -d TSRM || mkdir TSRM
+echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h
+
+test -d Zend || mkdir Zend

 cat >Zend/zend_config.h <<FEO
 #include "../main/php_config.h"
@@ -973,6 +1111,11 @@ if test -n "\$REDO_ALL"; then
  extensions="$EXT_STATIC"
 dnl mv -f main/internal_functions.c main/internal_functions.c.old 2>/dev/null
  sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$extensions > main/internal_functions.c
+
+  echo "creating main/internal_functions_cli.c"
+  cli_extensions="$EXT_CLI_STATIC"
+  sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$cli_extensions > main/internal_functions_cli.c
+
 dnl  if cmp main/internal_functions.c.old main/internal_functions.c > /dev/null 2>&1; then
 dnl      echo "main/internal_functions.c is unchanged"
 dnl      mv main/internal_functions.c.old main/internal_functions.c
@@ -980,11 +1123,47 @@ dnl  else
 dnl      rm -f main/internal_functions.c.old
 dnl  fi

+
+  # experimental things
+  if test $PHP_SAPI = "apache2filter" ; then
+    echo "+--------------------------------------------------------------------+"
+    echo "|                        *** WARNING ***                             |"
+    echo "|                                                                    |"
+    echo "| Apache 2 Support is EXPERIMENTAL and should NOT be used in         |"
+    echo "| production environment. Before submitting bug reports, try the     |"
+    echo "| latest CVS snapshot from http://snaps.php.net                      |"
+  fi
+
+  if test "$PHP_OVERLOAD" != "no"; then
+    echo "+--------------------------------------------------------------------+"
+    echo "|                        *** WARNING ***                             |"
+    echo "|                                                                    |"
+    echo "| The overload extension is highly EXPERIMENTAL and will most        |"
+    echo "| certainly change in newer versions. You have been warned!          |"
+  fi
+
+  if test "$PHP_AGGREGATE" != "no"; then
+    echo "+--------------------------------------------------------------------+"
+    echo "|                        *** WARNING ***                             |"
+    echo "|                                                                    |"
+    echo "| The aggregate functions are highly EXPERIMENTAL and will most      |"
+    echo "| certainly change in newer versions. You have been warned!          |"
+  fi
+
+  if test $UNAME = "FreeBSD" && test $PHP_SAPI = "apache2filter" && test $TSRM_PTH != "pth-config" ; then
+    echo "+--------------------------------------------------------------------+"
+    echo "|                        *** WARNING ***                             |"
+    echo "|                                                                    |"
+    echo "| In order to build PHP as a Apache2 module on FreeBSD, you have to  |"
+    echo "| add  --with-tsrm-pth to your ./configure line. Therefore you need  |"
+    echo "| to install gnu-pth from /usr/ports/devel/pth.                      |"
+  fi
+
  if test -n "$PHP_APXS_BROKEN"; then
    echo "+--------------------------------------------------------------------+"
    echo "| WARNING: Your $APXS script is most likely broken."
    echo "|                                                                    |"
-    echo "| Please go read http://www.php.net/manual/en/faq.build.php#AEN61338 |"
+    echo "| Please go read http://www.php.net/faq.build#faq.build.apxs         |"
    echo "| and make the changes described there and try again.                |"
  fi

@@ -1071,6 +1250,18 @@ cat<<X
 | If you do not agree with the terms of this license, you must abort |
 | the installation process at this point.                            |
 +--------------------------------------------------------------------+
+|                          *** NOTE ***                              |
+|            The default for register_globals is now OFF!            |
+|                                                                    |
+| If your application relies on register_globals being ON, you       |
+| should explicitly set it to on in your php.ini file.               |
+| Note that you are strongly encouraged to read                      |
+| http://www.php.net/manual/en/security.registerglobals.php          |
+| about the implications of having register_globals set to on, and   |
+| avoid using it if possible.                                        |
+--------------------------------------------------------------------+
+
+

 Thank you for using PHP.

@@ -1,7 +1,7 @@
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2001 The PHP Group                                |
+#  | 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        |
@@ -11,7 +11,7 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -32,7 +32,7 @@ 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 \$(COMPILE) \$(LDFLAGS) -o \[$]@ -avoid-version -module -rpath \$(phplibdir) \$(LTLIBRARY_LDFLAGS) \$(LTLIBRARY_OBJECTS) \$(LTLIBRARY_SHARED_LIBADD)
+	\$(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
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors:                                                             |
+   | Author: Rasmus Lerdorf <rasmus@php.net>                              |
   +----------------------------------------------------------------------+
 */

@@ -95,10 +95,10 @@ PHP_FUNCTION(aspell_new)
 	if(argc==2)
 	  {
 		convert_to_string_ex(personal) ;
-		sc=aspell_new((*master)->value.str.val, (*personal)->value.str.val);
+		sc=aspell_new(Z_STRVAL_PP(master), Z_STRVAL_PP(personal));
 	  }
 	else
-	  sc=aspell_new((*master)->value.str.val, "");
+	  sc=aspell_new(Z_STRVAL_PP(master), "");

 	ind = zend_list_insert(sc, le_aspell);
 	RETURN_LONG(ind);
@@ -123,10 +123,10 @@ PHP_FUNCTION(aspell_suggest)
 	}
 	convert_to_long_ex(scin);
 	convert_to_string_ex(word);
-	sc = (aspell *)zend_list_find((*scin)->value.lval, &type);
+	sc = (aspell *)zend_list_find(Z_LVAL_PP(scin), &type);
 	if(!sc)
 	  {
-		php_error(E_WARNING, "%d is not an ASPELL result index", (*scin)->value.lval);
+		php_error(E_WARNING, "%d is not an ASPELL result index", Z_LVAL_PP(scin));
 		RETURN_FALSE;
 	  }

@@ -134,7 +134,7 @@ PHP_FUNCTION(aspell_suggest)
                RETURN_FALSE;
 	}

-	sug = aspell_suggest(sc, (*word)->value.str.val);
+	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);
 	  }
@@ -157,13 +157,13 @@ PHP_FUNCTION(aspell_check)
    }
    convert_to_long_ex(scin);
    convert_to_string_ex(word);
-    sc= (aspell *) zend_list_find((*scin)->value.lval, &type);
+    sc= (aspell *) zend_list_find(Z_LVAL_PP(scin), &type);
    if(!sc)
      {
-        php_error(E_WARNING, "%d is not an ASPELL result index", (*scin)->value.lval);
+        php_error(E_WARNING, "%d is not an ASPELL result index", Z_LVAL_PP(scin));
        RETURN_FALSE;
      }
-    if (aspell_check(sc, (*word)->value.str.val)) 
+    if (aspell_check(sc, Z_STRVAL_PP(word))) 
      {
 	RETURN_TRUE;
      }
@@ -189,13 +189,13 @@ PHP_FUNCTION(aspell_check_raw)
    }
    convert_to_long_ex(scin);
    convert_to_string_ex(word);
-    sc = (aspell *)zend_list_find((*scin)->value.lval, &type);
+    sc = (aspell *)zend_list_find(Z_LVAL_PP(scin), &type);
    if(!sc)
      {
-        php_error(E_WARNING, "%d is not an ASPELL result index", (*scin)->value.lval);
+        php_error(E_WARNING, "%d is not an ASPELL result index", Z_LVAL_PP(scin));
        RETURN_FALSE;
      }
-	if (aspell_check_raw(sc, (*word)->value.str.val)) 
+	if (aspell_check_raw(sc, Z_STRVAL_PP(word))) 
 	  {
 	    RETURN_TRUE;
 	  }
@@ -223,6 +223,6 @@ PHP_MINFO_FUNCTION(aspell)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,4 +1,6 @@
+dnl
 dnl $Id$
+dnl

 AC_MSG_CHECKING(for ASPELL support)
 AC_ARG_WITH(aspell,
@@ -1,8 +1,8 @@
 /* 
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
+   | Author: Rasmus Lerdorf <rasmus@php.net>                              |
   +----------------------------------------------------------------------+
 */

@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
+   | Author: Andi Gutmans <andi@zend.com>                                 |
   +----------------------------------------------------------------------+
 */

@@ -46,7 +46,7 @@ function_entry bcmath_functions[] = {
 zend_module_entry bcmath_module_entry = {
 	STANDARD_MODULE_HEADER,
 	"bcmath",
-    bcmath_functions,
+	bcmath_functions,
 	PHP_MINIT(bcmath),
 	PHP_MSHUTDOWN(bcmath),
 	PHP_RINIT(bcmath),
@@ -152,7 +152,7 @@ PHP_FUNCTION(bcadd)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (*scale_param)->value.lval;
+				scale = (int) Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -163,12 +163,12 @@ PHP_FUNCTION(bcadd)
 	bc_init_num(&first);
 	bc_init_num(&second);
 	bc_init_num(&result);
-	bc_str2num(&first, (*left)->value.str.val, scale);
-	bc_str2num(&second, (*right)->value.str.val, scale);
+	bc_str2num(&first, Z_STRVAL_PP(left), scale);
+	bc_str2num(&second, Z_STRVAL_PP(right), scale);
 	bc_add (first, second, &result, scale);
-	return_value->value.str.val = bc_num2str(result);
-	return_value->value.str.len = strlen(return_value->value.str.val);
-	return_value->type = IS_STRING;
+	Z_STRVAL_P(return_value) = bc_num2str(result);
+	Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
+	Z_TYPE_P(return_value) = IS_STRING;
 	bc_free_num(&first);
 	bc_free_num(&second);
 	bc_free_num(&result);
@@ -195,7 +195,7 @@ PHP_FUNCTION(bcsub)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (*scale_param)->value.lval;
+				scale = (int) Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -206,12 +206,12 @@ PHP_FUNCTION(bcsub)
 	bc_init_num(&first);
 	bc_init_num(&second);
 	bc_init_num(&result);
-	bc_str2num(&first, (*left)->value.str.val, scale);
-	bc_str2num(&second, (*right)->value.str.val, scale);
+	bc_str2num(&first, Z_STRVAL_PP(left), scale);
+	bc_str2num(&second, Z_STRVAL_PP(right), scale);
 	bc_sub (first, second, &result, scale);
-	return_value->value.str.val = bc_num2str(result);
-	return_value->value.str.len = strlen(return_value->value.str.val);
-	return_value->type = IS_STRING;
+	Z_STRVAL_P(return_value) = bc_num2str(result);
+	Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
+	Z_TYPE_P(return_value) = IS_STRING;
 	bc_free_num(&first);
 	bc_free_num(&second);
 	bc_free_num(&result);
@@ -238,7 +238,7 @@ PHP_FUNCTION(bcmul)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (*scale_param)->value.lval;
+				scale = (int) Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -249,12 +249,12 @@ PHP_FUNCTION(bcmul)
 	bc_init_num(&first);
 	bc_init_num(&second);
 	bc_init_num(&result);
-	bc_str2num(&first, (*left)->value.str.val, scale);
-	bc_str2num(&second, (*right)->value.str.val, scale);
+	bc_str2num(&first, Z_STRVAL_PP(left), scale);
+	bc_str2num(&second, Z_STRVAL_PP(right), scale);
 	bc_multiply (first, second, &result, scale);
-	return_value->value.str.val = bc_num2str(result);
-	return_value->value.str.len = strlen(return_value->value.str.val);
-	return_value->type = IS_STRING;
+	Z_STRVAL_P(return_value) = bc_num2str(result);
+	Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
+	Z_TYPE_P(return_value) = IS_STRING;
 	bc_free_num(&first);
 	bc_free_num(&second);
 	bc_free_num(&result);
@@ -281,7 +281,7 @@ PHP_FUNCTION(bcdiv)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (*scale_param)->value.lval;
+				scale = (int) Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -292,13 +292,13 @@ PHP_FUNCTION(bcdiv)
 	bc_init_num(&first);
 	bc_init_num(&second);
 	bc_init_num(&result);
-	bc_str2num(&first, (*left)->value.str.val, scale);
-	bc_str2num(&second, (*right)->value.str.val, scale);
+	bc_str2num(&first, Z_STRVAL_PP(left), scale);
+	bc_str2num(&second, Z_STRVAL_PP(right), scale);
 	switch (bc_divide (first, second, &result, scale)) {
 		case 0: /* OK */
-			return_value->value.str.val = bc_num2str(result);
-			return_value->value.str.len = strlen(return_value->value.str.val);
-			return_value->type = IS_STRING;
+			Z_STRVAL_P(return_value) = bc_num2str(result);
+			Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
+			Z_TYPE_P(return_value) = IS_STRING;
 			break;
 		case -1: /* division by zero */
 			php_error(E_WARNING, "Division by zero");
@@ -333,13 +333,13 @@ PHP_FUNCTION(bcmod)
 	bc_init_num(&first);
 	bc_init_num(&second);
 	bc_init_num(&result);
-	bc_str2num(&first, (*left)->value.str.val, 0);
-	bc_str2num(&second, (*right)->value.str.val, 0);
+	bc_str2num(&first, Z_STRVAL_PP(left), 0);
+	bc_str2num(&second, Z_STRVAL_PP(right), 0);
 	switch (bc_modulo(first, second, &result, 0)) {
 		case 0:
-			return_value->value.str.val = bc_num2str(result);
-			return_value->value.str.len = strlen(return_value->value.str.val);
-			return_value->type = IS_STRING;
+			Z_STRVAL_P(return_value) = bc_num2str(result);
+			Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
+			Z_TYPE_P(return_value) = IS_STRING;
 			break;
 		case -1:
 			php_error(E_WARNING, "Division by zero");
@@ -371,7 +371,7 @@ PHP_FUNCTION(bcpow)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (*scale_param)->value.lval;
+				scale = (int) Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -382,12 +382,12 @@ PHP_FUNCTION(bcpow)
 	bc_init_num(&first);
 	bc_init_num(&second);
 	bc_init_num(&result);
-	bc_str2num(&first, (*left)->value.str.val, scale);
-	bc_str2num(&second, (*right)->value.str.val, scale);
+	bc_str2num(&first, Z_STRVAL_PP(left), scale);
+	bc_str2num(&second, Z_STRVAL_PP(right), scale);
 	bc_raise (first, second, &result, scale); 
-	return_value->value.str.val = bc_num2str(result);
-	return_value->value.str.len = strlen(return_value->value.str.val);
-	return_value->type = IS_STRING;
+	Z_STRVAL_P(return_value) = bc_num2str(result);
+	Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
+	Z_TYPE_P(return_value) = IS_STRING;
 	bc_free_num(&first);
 	bc_free_num(&second);
 	bc_free_num(&result);
@@ -414,7 +414,7 @@ PHP_FUNCTION(bcsqrt)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (*scale_param)->value.lval;
+				scale = (int) Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -422,11 +422,11 @@ PHP_FUNCTION(bcsqrt)
 	}
 	convert_to_string_ex(left);
 	bc_init_num(&result);
-	bc_str2num(&result, (*left)->value.str.val, scale);
+	bc_str2num(&result, Z_STRVAL_PP(left), scale);
 	if (bc_sqrt (&result, scale) != 0) {
-		return_value->value.str.val = bc_num2str(result);
-		return_value->value.str.len = strlen(return_value->value.str.val);
-		return_value->type = IS_STRING;
+		Z_STRVAL_P(return_value) = bc_num2str(result);
+		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");
 	}
@@ -454,7 +454,7 @@ PHP_FUNCTION(bccomp)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (*scale_param)->value.lval;
+				scale = (int) Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -466,10 +466,10 @@ PHP_FUNCTION(bccomp)
 	bc_init_num(&first);
 	bc_init_num(&second);

-	bc_str2num(&first, (*left)->value.str.val, scale);
-	bc_str2num(&second, (*right)->value.str.val, scale);
-	return_value->value.lval = bc_compare(first, second);
-	return_value->type = IS_LONG;
+	bc_str2num(&first, Z_STRVAL_PP(left), scale);
+	bc_str2num(&second, Z_STRVAL_PP(right), scale);
+	Z_LVAL_P(return_value) = bc_compare(first, second);
+	Z_TYPE_P(return_value) = IS_LONG;

 	bc_free_num(&first);
 	bc_free_num(&second);
@@ -488,7 +488,7 @@ PHP_FUNCTION(bcscale)
 	}
 	
 	convert_to_long_ex(new_scale);
-	bc_precision = (*new_scale)->value.lval;
+	bc_precision = Z_LVAL_PP(new_scale);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -501,6 +501,6 @@ PHP_FUNCTION(bcscale)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,6 +1,8 @@
+dnl
 dnl $Id$
+dnl

-PHP_ARG_ENABLE(bcmath, for bc style precision math functions,
+PHP_ARG_ENABLE(bcmath, whether to enable bc style precision math functions,
 [  --enable-bcmath         Enable bc style precision math functions.])

 if test "$PHP_BCMATH" != "no"; then
@@ -10,7 +12,3 @@ if test "$PHP_BCMATH" != "no"; then
  LIB_BUILD($ext_builddir/libbcmath,$ext_shared,yes)
  LIB_BUILD($ext_builddir/libbcmath/src,$ext_shared,yes)
 fi
-
-dnl ## Local Variables:
-dnl ## tab-width: 4
-dnl ## End:
@@ -1,8 +1,8 @@
 /* 
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
+   | Author: Andi Gutmans <andi@zend.com>                                 |
   +----------------------------------------------------------------------+
 */

@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -40,7 +40,7 @@ PHP_FUNCTION(unixtojd)

  if(myargc==1) {
    convert_to_long(timestamp);
-    t = timestamp->value.lval;
+    t = Z_LVAL_P(timestamp);
  } else {
    t = time(NULL);
  }
@@ -69,7 +69,7 @@ PHP_FUNCTION(jdtounix)
  
  convert_to_long(jday);

-  uday = jday->value.lval - 2440588 /* J.D. of 1.1.1970 */;
+  uday = Z_LVAL_P(jday) - 2440588 /* J.D. of 1.1.1970 */;
  
  if(uday<0)     RETURN_FALSE; /* before beginning of unix epoch */ 
  if(uday>24755) RETURN_FALSE; /* behind end of unix epoch */
@@ -83,6 +83,6 @@ PHP_FUNCTION(jdtounix)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -139,7 +139,7 @@ PHP_MINFO_FUNCTION(calendar)
 }

 /* {{{ proto array cal_info(int calendar)
- * Return information about a particular calendar */
+   Returns information about a particular calendar */
 PHP_FUNCTION(cal_info)
 {
 	zval ** cal;
@@ -178,7 +178,7 @@ PHP_FUNCTION(cal_info)
 /* }}} */

 /* {{{ proto int cal_days_in_month(int calendar, int month, int year)
- * Returns the number of days in a month for a given year and calendar */
+   Returns the number of days in a month for a given year and calendar */
 PHP_FUNCTION(cal_days_in_month)
 {
 	zval ** cal, **month, **year;
@@ -214,7 +214,7 @@ PHP_FUNCTION(cal_days_in_month)
 /* }}} */

 /* {{{ proto int cal_to_jd(int calendar, int month, int day, int year)
- * Convert from a supported calendar to Julian Day Count */
+   Converts from a supported calendar to Julian Day Count */
 PHP_FUNCTION(cal_to_jd)
 {
 	zval ** cal, **month, **day, **year;
@@ -241,7 +241,7 @@ PHP_FUNCTION(cal_to_jd)
 /* }}} */

 /* {{{ proto array cal_from_jd(int jd, int calendar)
- * Convert from Julian Day Count to a supported calendar and return extended information */
+   Converts from Julian Day Count to a supported calendar and return extended information */
 PHP_FUNCTION(cal_from_jd)
 {
 	zval ** jd, ** cal;
@@ -286,7 +286,7 @@ PHP_FUNCTION(cal_from_jd)
 /* }}} */

 /* {{{ proto string jdtogregorian(int juliandaycount)
-   Convert a julian day count to a gregorian calendar date */
+   Converts a julian day count to a gregorian calendar date */
 PHP_FUNCTION(jdtogregorian)
 {
 	pval **julday;
@@ -298,7 +298,7 @@ PHP_FUNCTION(jdtogregorian)
 	}

 	convert_to_long_ex(julday);
-	SdnToGregorian((*julday)->value.lval, &year, &month, &day);
+	SdnToGregorian(Z_LVAL_PP(julday), &year, &month, &day);
 	sprintf(date, "%i/%i/%i", month, day, year);

 	RETURN_STRING(date, 1);
@@ -306,7 +306,7 @@ PHP_FUNCTION(jdtogregorian)
 /* }}} */

 /* {{{ proto int gregoriantojd(int month, int day, int year)
-   Convert a gregorian calendar date to julian day count */
+   Converts a gregorian calendar date to julian day count */
 PHP_FUNCTION(gregoriantojd)
 {
 	pval **year, **month, **day;
@@ -320,7 +320,7 @@ PHP_FUNCTION(jdtogregorian)
 	convert_to_long_ex(day);
 	convert_to_long_ex(year);

-	jdate = GregorianToSdn((*year)->value.lval, (*month)->value.lval, (*day)->value.lval);
+	jdate = GregorianToSdn(Z_LVAL_PP(year), Z_LVAL_PP(month), Z_LVAL_PP(day));

 	RETURN_LONG(jdate);
 }
@@ -339,7 +339,7 @@ PHP_FUNCTION(jdtogregorian)
 	}

 	convert_to_long_ex(julday);
-	SdnToJulian((*julday)->value.lval, &year, &month, &day);
+	SdnToJulian(Z_LVAL_PP(julday), &year, &month, &day);
 	sprintf(date, "%i/%i/%i", month, day, year);

 	RETURN_STRING(date, 1);
@@ -347,7 +347,7 @@ PHP_FUNCTION(jdtogregorian)
 /* }}} */

 /* {{{ proto int juliantojd(int month, int day, int year)
-   Convert a julian calendar date to julian day count */
+   Converts a julian calendar date to julian day count */
 PHP_FUNCTION(juliantojd)
 {
 	pval **year, **month, **day;
@@ -361,14 +361,14 @@ PHP_FUNCTION(jdtogregorian)
 	convert_to_long_ex(day);
 	convert_to_long_ex(year);

-	jdate = JulianToSdn((*year)->value.lval, (*month)->value.lval, (*day)->value.lval);
+	jdate = JulianToSdn(Z_LVAL_PP(year), Z_LVAL_PP(month), Z_LVAL_PP(day));

 	RETURN_LONG(jdate);
 }
 /* }}} */

 /* {{{ proto string jdtojewish(int juliandaycount)
-   Convert a julian day count to a jewish calendar date */
+   Converts a julian day count to a jewish calendar date */
 PHP_FUNCTION(jdtojewish) 
 {
 	pval **julday;
@@ -381,7 +381,7 @@ PHP_FUNCTION(jdtogregorian)
 	
 	convert_to_long_ex(julday);
 	
-	SdnToJewish((*julday)->value.lval, &year, &month, &day);
+	SdnToJewish(Z_LVAL_PP(julday), &year, &month, &day);
 	sprintf(date, "%i/%i/%i", month, day, year);

 	RETURN_STRING(date, 1);
@@ -389,7 +389,7 @@ PHP_FUNCTION(jdtogregorian)
 /* }}} */

 /* {{{ proto int jewishtojd(int month, int day, int year)
-   Convert a jewish calendar date to a julian day count */
+   Converts a jewish calendar date to a julian day count */
 PHP_FUNCTION(jewishtojd)
 {
 	pval **year, **month, **day;
@@ -403,14 +403,14 @@ PHP_FUNCTION(jdtogregorian)
 	convert_to_long_ex(day);
 	convert_to_long_ex(year);

-	jdate = JewishToSdn((*year)->value.lval, (*month)->value.lval, (*day)->value.lval);
+	jdate = JewishToSdn(Z_LVAL_PP(year), Z_LVAL_PP(month), Z_LVAL_PP(day));

 	RETURN_LONG(jdate);
 }
 /* }}} */

 /* {{{ proto string jdtofrench(int juliandaycount)
-   Convert a julian day count to a french republic calendar date */
+   Converts a julian day count to a french republic calendar date */
 PHP_FUNCTION(jdtofrench)
 {
 	pval **julday;
@@ -423,7 +423,7 @@ PHP_FUNCTION(jdtogregorian)

 	convert_to_long_ex(julday);
 	
-	SdnToFrench((*julday)->value.lval, &year, &month, &day);
+	SdnToFrench(Z_LVAL_PP(julday), &year, &month, &day);
 	sprintf(date, "%i/%i/%i", month, day, year);

 	RETURN_STRING(date, 1);
@@ -431,7 +431,7 @@ PHP_FUNCTION(jdtogregorian)
 /* }}} */

 /* {{{ proto int frenchtojd(int month, int day, int year)
-   Convert a french republic calendar date to julian day count */
+   Converts a french republic calendar date to julian day count */
 PHP_FUNCTION(frenchtojd)
 {
 	pval **year, **month, **day;
@@ -445,7 +445,7 @@ PHP_FUNCTION(jdtogregorian)
 	convert_to_long_ex(day);
 	convert_to_long_ex(year);

-	jdate = FrenchToSdn((*year)->value.lval, (*month)->value.lval, (*day)->value.lval);
+	jdate = FrenchToSdn(Z_LVAL_PP(year), Z_LVAL_PP(month), Z_LVAL_PP(day));

 	RETURN_LONG(jdate);
 }
@@ -467,10 +467,10 @@ PHP_FUNCTION(jdtogregorian)
 	convert_to_long(julday);
 	if(myargc==2) {
 	  convert_to_long(mode);
-	  mymode = mode->value.lval;
+	  mymode = Z_LVAL_P(mode);
 	} 

-	day = DayOfWeek(julday->value.lval);
+	day = DayOfWeek(Z_LVAL_P(julday));
 	daynamel = DayNameLong[day];
 	daynames = DayNameShort[day];

@@ -504,30 +504,30 @@ PHP_FUNCTION(jdtogregorian)
 	convert_to_long_ex(julday);
 	convert_to_long_ex(mode);

-	switch((*mode)->value.lval) {
+	switch(Z_LVAL_PP(mode)) {
 		case CAL_MONTH_GREGORIAN_LONG:			/* gregorian or julian month */
-			SdnToGregorian((*julday)->value.lval, &year, &month, &day);
+			SdnToGregorian(Z_LVAL_PP(julday), &year, &month, &day);
 			monthname = MonthNameLong[month];
 			break;
 		case CAL_MONTH_JULIAN_SHORT:			/* gregorian or julian month */
-			SdnToJulian((*julday)->value.lval, &year, &month, &day);
+			SdnToJulian(Z_LVAL_PP(julday), &year, &month, &day);
 			monthname = MonthNameShort[month];
 			break;
 		case CAL_MONTH_JULIAN_LONG:			/* gregorian or julian month */
-			SdnToJulian((*julday)->value.lval, &year, &month, &day);
+			SdnToJulian(Z_LVAL_PP(julday), &year, &month, &day);
 			monthname = MonthNameLong[month];
 			break;
 		case CAL_MONTH_JEWISH:			/* jewish month */
-			SdnToJewish((*julday)->value.lval, &year, &month, &day);
+			SdnToJewish(Z_LVAL_PP(julday), &year, &month, &day);
 			monthname = JewishMonthName[month];
 			break;
 		case CAL_MONTH_FRENCH:			/* french month */
-			SdnToFrench((*julday)->value.lval, &year, &month, &day);
+			SdnToFrench(Z_LVAL_PP(julday), &year, &month, &day);
 			monthname = FrenchMonthName[month];
 			break;
 		default:			/* default gregorian */
 		case CAL_MONTH_GREGORIAN_SHORT:			/* gregorian or julian month */
-			SdnToGregorian((*julday)->value.lval, &year, &month, &day);
+			SdnToGregorian(Z_LVAL_PP(julday), &year, &month, &day);
 			monthname = MonthNameShort[month];
 			break;
 	}
@@ -541,6 +541,6 @@ PHP_FUNCTION(jdtogregorian)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,4 +1,6 @@
+dnl
 dnl $Id$
+dnl

 PHP_ARG_ENABLE(calendar,whether to enable calendar conversion support,
 [  --enable-calendar       Enable support for calendar conversion])
@@ -71,6 +71,6 @@ char *DayNameLong[7] =
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -45,7 +45,7 @@ static void _cal_easter(INTERNAL_FUNCTION_PARAMETERS, int gm)
 			WRONG_PARAM_COUNT;
 		}
 		convert_to_long(year_arg);
-		year = year_arg->value.lval;
+		year = Z_LVAL_P(year_arg);
 		break;
 	default:
 		WRONG_PARAM_COUNT;
@@ -109,12 +109,12 @@ static void _cal_easter(INTERNAL_FUNCTION_PARAMETERS, int gm)
 			te.tm_mday = easter-10;
 		}

-	        return_value->value.lval = mktime(&te);
+	        Z_LVAL_P(return_value) = mktime(&te);
 	} else {							/* return the days after March 21 */	
-	        return_value->value.lval = easter;
+	        Z_LVAL_P(return_value) = easter;
 	}

-        return_value->type = IS_LONG;
+        Z_TYPE_P(return_value) = IS_LONG;

 }

@@ -86,7 +86,7 @@

 #include "sdncal.h"

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

 char *FrenchMonthName[14] =
@@ -155,6 +155,6 @@ char *FrenchMonthName[14] =
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -128,7 +128,7 @@

 #include "sdncal.h"

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

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

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

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

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

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

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

 /*
@@ -736,6 +736,6 @@ long int JewishToSdn(
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -147,7 +147,7 @@

 #include "sdncal.h"

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

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

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

 /*
@@ -244,6 +244,6 @@ long int JulianToSdn(
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,8 +12,8 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Brendan W. McAdams <bmcadams@php.net>             |
-   |              Doug DeJulio <ddj@redhat.com>                           |
+   | Authors: Brendan W. McAdams <bmcadams@php.net>                       |
+   |          Doug DeJulio <ddj@redhat.com>                               |
   +----------------------------------------------------------------------+
 */
 /*
@@ -113,7 +113,7 @@ ZEND_GET_MODULE(ccvs)
 /* Full Functions (The actual CCVS functions and any internal php hooked functions such as MINFO) */

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

  convert_to_string_ex(name);

-  vsess = cv_init((*name)->value.str.val);
+  vsess = cv_init(Z_STRVAL_PP(name));

  /*
  *		-- In the case that we don't run error checking on the return value... --
@@ -161,7 +161,7 @@ PHP_FUNCTION(ccvs_init) /* cv_init() */
 /* }}} */

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

  /* Convert from the string representation back to a (void*) */
-  vsess = hks_ptr_stringtoptr((*sess)->value.str.val);
+  vsess = hks_ptr_stringtoptr(Z_STRVAL_PP(sess));
  cv_done(vsess);

  RETURN_STRING("OK", 1);
@@ -183,7 +183,7 @@ PHP_FUNCTION(ccvs_done) /* cv_done() */
 /* }}} */

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

-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));

  convert_to_string_ex(pinvoice);
-  invoice = (*pinvoice)->value.str.val;
+  invoice = Z_STRVAL_PP(pinvoice);

  r = cv_new(sess, invoice);

@@ -215,7 +215,7 @@ PHP_FUNCTION(ccvs_new) /* cv_new() */
 /* }}} */

 /* {{{ proto string ccvs_add(string session, string invoice, string argtype, string argval)
- ??? */
+   Add data to a transaction */
 PHP_FUNCTION(ccvs_add) /* cv_add() */
 {
  zval **psess;
@@ -238,10 +238,10 @@ PHP_FUNCTION(ccvs_add) /* cv_add() */
  convert_to_string_ex(pinvoice);
  convert_to_string_ex(pargtype);
  convert_to_string_ex(pargval);
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
-  invoice = (*pinvoice)->value.str.val;
-  argtype = cv_str2arg((*pargtype)->value.str.val);
-  argval = (*pargval)->value.str.val;
+  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);

@@ -260,7 +260,7 @@ PHP_FUNCTION(ccvs_add) /* cv_add() */
 */

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

  convert_to_string_ex(psess);
  convert_to_string_ex(pinvoice);
-  invoice = (*pinvoice)->value.str.val;
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  invoice = Z_STRVAL_PP(pinvoice);
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));

  r = cv_delete(sess, invoice);

@@ -286,7 +286,7 @@ PHP_FUNCTION(ccvs_delete) /* cv_delete() */
 /* }}} */

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

  convert_to_string_ex(psess);
  convert_to_string_ex(pinvoice);
-  invoice = (*pinvoice)->value.str.val;
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  invoice = Z_STRVAL_PP(pinvoice);
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));

  r = cv_auth(sess, invoice);

@@ -312,7 +312,7 @@ PHP_FUNCTION(ccvs_auth) /* cv_auth() */
 /* }}} */

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

  convert_to_string_ex(psess);
  convert_to_string_ex(pinvoice);
-  invoice = (*pinvoice)->value.str.val;
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  invoice = Z_STRVAL_PP(pinvoice);
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));

  r = cv_return(sess, invoice);

@@ -338,7 +338,7 @@ PHP_FUNCTION(ccvs_return) /* cv_return() */
 /* }}} */

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

  convert_to_string_ex(psess);
  convert_to_string_ex(pinvoice);
-  invoice = (*pinvoice)->value.str.val;
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  invoice = Z_STRVAL_PP(pinvoice);
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));

  r = cv_reverse(sess, invoice);

@@ -364,7 +364,7 @@ PHP_FUNCTION(ccvs_reverse) /* cv_reverse() */
 /* }}} */

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

  convert_to_string_ex(psess);
  convert_to_string_ex(pinvoice);
-  invoice = (*pinvoice)->value.str.val;
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  invoice = Z_STRVAL_PP(pinvoice);
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));

  r = cv_sale(sess, invoice);

@@ -390,7 +390,7 @@ PHP_FUNCTION(ccvs_sale) /* cv_sale() */
 /* }}} */

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

  convert_to_string_ex(psess);
  convert_to_string_ex(pinvoice);
-  invoice = (*pinvoice)->value.str.val;
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  invoice = Z_STRVAL_PP(pinvoice);
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));

  r = cv_void(sess, invoice);

@@ -416,7 +416,7 @@ PHP_FUNCTION(ccvs_void) /* cv_void() */
 /* }}} */

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

  convert_to_string_ex(psess);
  convert_to_string_ex(pinvoice);
-  invoice = (*pinvoice)->value.str.val;
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  invoice = Z_STRVAL_PP(pinvoice);
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));

  r = cv_status(sess, invoice);

@@ -442,7 +442,7 @@ PHP_FUNCTION(ccvs_status) /* cv_status() */
 /* }}} */

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

  convert_to_string_ex(psess);
  convert_to_string_ex(ptype);
-  type = cv_str2stat((*ptype)->value.str.val);
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  type = cv_str2stat(Z_STRVAL_PP(ptype));
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));

  r = cv_count(sess, type);

@@ -468,7 +468,7 @@ PHP_FUNCTION(ccvs_count) /* cv_count() */
 /* }}} */

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

  convert_to_string_ex(psess);
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
  convert_to_string_ex(ptype);
-  type = cv_str2stat((*ptype)->value.str.val);
+  type = cv_str2stat(Z_STRVAL_PP(ptype));
  convert_to_long_ex(pinum);
-  inum = (*pinum)->value.lval;
+  inum = Z_LVAL_PP(pinum);

  r = cv_lookup(sess, type, inum);

@@ -498,7 +498,7 @@ PHP_FUNCTION(ccvs_lookup) /* cv_lookup() */
 /* }}} */

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

  convert_to_string_ex(psess);
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
  convert_to_string_ex(ptype);
-  type = cv_str2rep((*ptype)->value.str.val);
+  type = cv_str2rep(Z_STRVAL_PP(ptype));

  r = cv_report(sess, type);

@@ -525,7 +525,7 @@ PHP_FUNCTION(ccvs_report) /* cv_report() */
 /* }}} */

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

  convert_to_string_ex(psess);
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));
  convert_to_string_ex(ptype);
-  type = cv_str2cmd((*ptype)->value.str.val);
+  type = cv_str2cmd(Z_STRVAL_PP(ptype));
  convert_to_string_ex(pargval);
-  argval = (*pargval)->value.str.val;
+  argval = Z_STRVAL_PP(pargval);

  r = cv_command(sess, type, argval);

@@ -555,7 +555,7 @@ PHP_FUNCTION(ccvs_command) /* cv_command() */
 /* }}} */

 /* {{{ proto string ccvs_textvalue(string session)
- ??? */
+   Get text return value for previous function call */
 PHP_FUNCTION(ccvs_textvalue) /* cv_textvalue() */
 {
  zval **psess;
@@ -567,7 +567,7 @@ PHP_FUNCTION(ccvs_textvalue) /* cv_textvalue() */
  }

  convert_to_string_ex(psess);
-  sess = hks_ptr_stringtoptr((*psess)->value.str.val);
+  sess = hks_ptr_stringtoptr(Z_STRVAL_PP(psess));

  RETURN_STRING(cv_textvalue(sess), 1);
 }
@@ -582,7 +582,7 @@ 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, "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();
@@ -602,6 +602,6 @@ PHP_MINFO_FUNCTION(ccvs)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,8 +12,8 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Brendan W. McAdams <bmcadams@php.net>                  |
-   |              Doug DeJulio <ddj@redhat.com>                           |
+   | Authors: Brendan W. McAdams <bmcadams@php.net>                       |
+   |          Doug DeJulio <ddj@redhat.com>                               |
   +----------------------------------------------------------------------+
 */

@@ -1,5 +1,6 @@
+dnl
 dnl $Id$
-dnl config.m4 for PHP4 CCVS Extension
+dnl

 PHP_ARG_WITH(ccvs, for CCVS support,
 [  --with-ccvs[=DIR]       Include CCVS support])
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -69,6 +69,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC);
 static int do_COM_offget(VARIANT *result, comval *array, pval *property, int cleanup TSRMLS_DC);
 static int do_COM_propget(VARIANT *var_result, comval *obj, pval *arg_property, int cleanup TSRMLS_DC);
 static void php_register_COM_class(TSRMLS_D);
+static void php_COM_init(int module_number TSRMLS_DC);

 static int le_comval;
 static int codepage;
@@ -130,20 +131,36 @@ PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DIS
 		}

 		if (FAILED(hr)) {
-			switch (hr)	{
+			switch (hr) {
 				case DISP_E_EXCEPTION: {
-						int srclen;
-						char *src = php_OLECHAR_to_char(ExceptInfo.bstrSource, &srclen, codepage TSRMLS_CC);
-						int desclen;
-						char *desc = php_OLECHAR_to_char(ExceptInfo.bstrDescription, &desclen, codepage TSRMLS_CC);
+						
+						char *src=estrdup("Unavailable");
+						int srclen=strlen(src);
+						char *desc=estrdup("Unavailable");
+						int desclen=strlen(desc);

+						if (ExceptInfo.bstrSource)
+						{
+							efree(src);
+							src = php_OLECHAR_to_char(ExceptInfo.bstrSource, &srclen, codepage TSRMLS_CC);
+							SysFreeString(ExceptInfo.bstrSource);
+						}
+						if (ExceptInfo.bstrDescription)
+						{
+							efree(desc);
+							desc = php_OLECHAR_to_char(ExceptInfo.bstrDescription, &desclen, codepage TSRMLS_CC);
+							SysFreeString(ExceptInfo.bstrDescription);
+						}
+						
 						*ErrString = pemalloc(srclen+desclen+50, 1);
 						sprintf(*ErrString, "<b>Source</b>: %s <b>Description</b>: %s", src, desc);
 						efree(src);
 						efree(desc);
-						SysFreeString(ExceptInfo.bstrSource);
-						SysFreeString(ExceptInfo.bstrDescription);
-						SysFreeString(ExceptInfo.bstrHelpFile);
+						
+						if (ExceptInfo.bstrHelpFile)
+						{
+							SysFreeString(ExceptInfo.bstrHelpFile);
+						}
 					}
 					break;
 				case DISP_E_PARAMNOTFOUND:
@@ -201,7 +218,7 @@ PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames
 PHPAPI HRESULT php_COM_release(comval *obj TSRMLS_DC)
 {
 	HRESULT hr;
-	
+
 	if (obj->refcount > 1) {
 		C_RELEASE(obj);
 	} else if (obj->refcount == 1) {
@@ -240,7 +257,7 @@ PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* ppDisp, int cleanup
 	if (cleanup) {
 		*ppDisp = NULL;
 	}
-	
+
 	C_REFCOUNT(obj) = 1;
 	C_DISPATCH(obj) = pDisp;
 	C_HASTLIB(obj) = SUCCEEDED(C_DISPATCH_VT(obj)->GetTypeInfo(C_DISPATCH(obj), 0, LANG_NEUTRAL, &C_TYPEINFO(obj)));
@@ -253,13 +270,13 @@ PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* ppDisp, int cleanup
 	ALLOC_VARIANT(var_result);

 	if (C_HASENUM(obj) = SUCCEEDED(C_DISPATCH_VT(obj)->Invoke(C_DISPATCH(obj), DISPID_NEWENUM, &IID_NULL, LOCALE_SYSTEM_DEFAULT,
-									DISPATCH_METHOD|DISPATCH_PROPERTYGET, &dispparams, var_result, NULL, NULL))) {
+															  DISPATCH_METHOD|DISPATCH_PROPERTYGET, &dispparams, var_result, NULL, NULL))) {
 		if (V_VT(var_result) == VT_UNKNOWN) {
-		    C_HASENUM(obj) = SUCCEEDED(V_UNKNOWN(var_result)->lpVtbl->QueryInterface(V_UNKNOWN(var_result), &IID_IEnumVARIANT,
-									(void**)&C_ENUMVARIANT(obj)));
+			C_HASENUM(obj) = SUCCEEDED(V_UNKNOWN(var_result)->lpVtbl->QueryInterface(V_UNKNOWN(var_result), &IID_IEnumVARIANT,
+																					 (void**)&C_ENUMVARIANT(obj)));
 		} else if (V_VT(var_result) == VT_DISPATCH) {
-		    C_HASENUM(obj) = SUCCEEDED(V_DISPATCH(var_result)->lpVtbl->QueryInterface(V_DISPATCH(var_result), &IID_IEnumVARIANT,
-									(void**)&C_ENUMVARIANT(obj)));
+			C_HASENUM(obj) = SUCCEEDED(V_DISPATCH(var_result)->lpVtbl->QueryInterface(V_DISPATCH(var_result), &IID_IEnumVARIANT,
+																					  (void**)&C_ENUMVARIANT(obj)));
 		}
 	}

@@ -313,7 +330,7 @@ PHPAPI char *php_COM_error_message(HRESULT hr TSRMLS_DC)
 	void *pMsgBuf;

 	if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,
-					  hr, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &pMsgBuf, 0, NULL)) {
+					   hr, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &pMsgBuf, 0, NULL)) {
 		char error_string[] = "No description available";

 		pMsgBuf = LocalAlloc(LMEM_FIXED, sizeof(error_string));
@@ -376,7 +393,7 @@ static PHP_INI_MH(OnTypelibFileChange)

 	typelib_name_buffer = (char *) emalloc(sizeof(char)*1024);

-	while(fgets(typelib_name_buffer, 1024, typelib_file)) {
+	while (fgets(typelib_name_buffer, 1024, typelib_file)) {
 		ITypeLib *pTL;
 		char *typelib_name;
 		char *modifier, *ptr;
@@ -398,11 +415,11 @@ static PHP_INI_MH(OnTypelibFileChange)
 		}

 		/* Remove leading/training white spaces on search_string */
-		while(isspace(*typelib_name)) {/* Ends on '\0' in worst case */
+		while (isspace(*typelib_name)) {/* Ends on '\0' in worst case */
 			typelib_name ++;
 		}
 		ptr = typelib_name + strlen(typelib_name) - 1;
-		while((ptr != typelib_name) && isspace(*ptr)) {
+		while ((ptr != typelib_name) && isspace(*ptr)) {
 			*ptr = '\0';
 			ptr--;
 		}
@@ -410,7 +427,7 @@ static PHP_INI_MH(OnTypelibFileChange)
 		if (interactive) {
 			printf("\rLoading %-60s\r", typelib_name);
 		}
-		
+
 		if ((pTL = php_COM_find_typelib(typelib_name, mode TSRMLS_CC)) != NULL) {
 			php_COM_load_typelib(pTL, mode TSRMLS_CC);
 			pTL->lpVtbl->Release(pTL);
@@ -441,7 +458,7 @@ PHP_INI_END()
   Loads a COM module */
 PHP_FUNCTION(com_load)
 {
-	pval *module_name, *code_page, *typelib = NULL, *server_name = NULL;
+	pval *module_name, *code_page, *typelib = NULL, *server_name = NULL, *user_name=NULL, *password=NULL, *domain=NULL;
 	CLSID clsid;
 	HRESULT hr;
 	OLECHAR *ProgID;
@@ -450,7 +467,7 @@ PHP_FUNCTION(com_load)
 	char *clsid_str;
 	int mode = 0;
 	ITypeLib *pTL;
-
+	CLSCTX flags = CLSCTX_SERVER;

 	codepage = CP_ACP;

@@ -467,7 +484,7 @@ PHP_FUNCTION(com_load)
 			zend_get_parameters(ht, 3, &module_name, &server_name, &code_page);

 			convert_to_long_ex(&code_page);
-			codepage = code_page->value.lval;
+			codepage = Z_LVAL_P(code_page);
 			break;

 		case 4:
@@ -483,15 +500,77 @@ PHP_FUNCTION(com_load)
 			ZEND_WRONG_PARAM_COUNT();
 	}

-	if (server_name != NULL)
-	{
+	if (server_name != NULL) {
+		/* What is server name? A String or an array? */
+
 		if (Z_TYPE_P(server_name) == IS_NULL) {
 			server_name = NULL;
+		} else if (Z_TYPE_P(server_name) == IS_ARRAY) {
+			pval **tmp;
+			/* DAB: 22 Sept 2001 */
+			/* Aha - we have a number of possible */
+			/* arguments. They are in the hash */
+			/* By name: Server, Domain, Username, Password */
+			/* Flags. */
+			/* This has been crafted to maintian maximum backward */
+			/* compatability, If the server name is specified as a */
+			/* string, then the function shoule behave as before */
+			/* by defaulting username and password and using the */
+			/* (I believe) incorrect CLSCTX_SERVER instantiation */
+			/* paramter. However if server is specified in this array */
+			/* then we use either CLSCTX_REMOTE_SERVER or whatever */
+			/* flags are specified in the array */
+			HashTable *ht = Z_ARRVAL(*server_name);
+			if (FAILURE == zend_hash_find(ht, "Server", 7, (void **) &tmp)) {
+				server_name = NULL;
+			} else {
+				server_name = *tmp;
+				convert_to_string_ex(&server_name);
+				/* CLSCTX_SERVER includes INPROC and LOCAL */
+				/* SERVER. This means that any local server */
+				/* will be instantiated BEFORE even looking */
+				/* on a remote server. Thus if we have a */
+				/* server name, probably we want to access */
+				/* a remote machine or we would not have */
+				/* bothered specifying it. So it would be */
+				/* wrong to to connect locally. Futher, */
+				/* unless the name passed is a GUID, there has */
+				/* to be something to map the Prog.Id to GUID */
+				/* and unless that has been modified to remove */
+				/* the information about local instantiation */
+				/* CLSCTX_SERVER would force a local instantiation */
+				/* This setting can be overridden below if the user */
+				/* specifies a flags element */
+				flags = CLSCTX_REMOTE_SERVER;
+			}
+			if (FAILURE == zend_hash_find(ht, "Username", 9, (void **) &tmp)) {
+				user_name = NULL;
+			} else {
+				user_name = *tmp;
+				convert_to_string_ex(&user_name);
+			}
+			if (FAILURE == zend_hash_find(ht, "Domain", 7, (void **) &tmp)) {
+				domain = NULL;
+			} else {
+				domain = *tmp;
+				convert_to_string_ex(&domain);
+			}
+			if (FAILURE == zend_hash_find(ht, "Password", 9, (void **) &tmp)) {
+				password=NULL;
+			} else {
+				password = *tmp;
+				convert_to_string_ex(&password);
+			}
+			if (SUCCESS == zend_hash_find(ht, "Flags", 6, (void **) &tmp)) {
+				convert_to_long_ex(tmp);
+				flags = (CLSCTX) Z_LVAL_PP(tmp);
+			}
 		} else {
 			if (!INI_INT("com.allow_dcom")) {
 				php_error(E_WARNING, "DCOM is disabled");
-				RETURN_FALSE;
+				RETURN_NULL();
 			} else {
+				flags = CLSCTX_REMOTE_SERVER;
 				convert_to_string_ex(&server_name);
 			}
 		}
@@ -527,34 +606,60 @@ PHP_FUNCTION(com_load)
 		} else {
 			hr = MK_E_SYNTAX;
 		}
-		
+
 		efree(ProgID);
-		
+
 		if (FAILED(hr)) {
 			php_COM_destruct(obj TSRMLS_CC);
 			error_message = php_COM_error_message(hr TSRMLS_CC);  
 			php_error(E_WARNING,"Invalid ProgID, GUID string, or Moniker: %s", error_message);
 			LocalFree(error_message);
-			RETURN_FALSE;
+			RETURN_NULL();
 		}
 	} else {
 		efree(ProgID);
 		/* obtain IDispatch */
 		if (!server_name) {
-			hr = CoCreateInstance(&clsid, NULL, CLSCTX_SERVER, &IID_IDispatch, (LPVOID *) &C_DISPATCH(obj));
+			hr = CoCreateInstance(&clsid, NULL, flags, &IID_IDispatch, (LPVOID *) &C_DISPATCH(obj));
 		} else {
 			COSERVERINFO server_info;
 			MULTI_QI pResults;
+			COAUTHIDENTITY authid;
+			COAUTHINFO authinfo = {RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, RPC_C_IMP_LEVEL_IMPERSONATE, &authid, EOAC_NONE};

 			server_info.dwReserved1=0;
 			server_info.dwReserved2=0;
 			server_info.pwszName = php_char_to_OLECHAR(Z_STRVAL_P(server_name), Z_STRLEN_P(server_name), codepage TSRMLS_CC);
-			server_info.pAuthInfo=NULL;
+			if (user_name) {
+				/* Z_STRVAL_P(user_name); */
+				/* Parse Username into domain\username */
+				authid.User = (WCHAR *) Z_STRVAL_P(user_name);
+				authid.UserLength = Z_STRLEN_P(user_name);
+				if (password) {
+					authid.Password = (USHORT *) Z_STRVAL_P(password);
+					authid.PasswordLength = Z_STRLEN_P(password);
+				} else {
+					authid.Password = (USHORT *) "";
+					authid.PasswordLength = 0;
+				}
+				if (domain) {
+					authid.Domain = (USHORT *) Z_STRVAL_P(domain);
+					authid.DomainLength = Z_STRLEN_P(domain);
+				} else {
+					authid.Domain = (USHORT *) "";
+					authid.DomainLength = 0;
+				}
+				authid.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI;
+
+				server_info.pAuthInfo=&authinfo;
+			} else {
+				server_info.pAuthInfo=NULL;
+			}

 			pResults.pIID = &IID_IDispatch;
 			pResults.pItf = NULL;
 			pResults.hr = S_OK;
-			hr=CoCreateInstanceEx(&clsid, NULL, CLSCTX_REMOTE_SERVER, &server_info, 1, &pResults);
+			hr=CoCreateInstanceEx(&clsid, NULL, flags, &server_info, 1, &pResults);
 			if (SUCCEEDED(hr)) {
 				hr = pResults.hr;
 				C_DISPATCH(obj) = (IDispatch *) pResults.pItf;
@@ -569,7 +674,7 @@ PHP_FUNCTION(com_load)
 			LocalFree(error_message);
 			efree(clsid_str);
 			php_COM_destruct(obj TSRMLS_CC);
-			RETURN_FALSE;
+			RETURN_NULL();
 		}
 	}

@@ -612,21 +717,21 @@ PHP_FUNCTION(com_load)
 int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **arguments, int arg_count TSRMLS_DC)
 {
 	DISPID dispid;
+	DISPPARAMS dispparams;
 	HRESULT hr;
 	OLECHAR *funcname;
-	char *error_message;
-	VARIANT *variant_args;
-	int current_arg, current_variant;
-	DISPPARAMS dispparams;
 	SAFEARRAY *pSA;
+	SAFEARRAYBOUND rgsabound[1];
+	VARIANT *variant_args;
+	char *error_message;
+	int current_arg, current_variant;
+	unsigned long count;

 	if (C_HASENUM(obj) && strstr(Z_STRVAL_P(function_name), "next")) {
 		/* Grab one argument off the stack, allocate enough
 		 * VARIANTs
 		 * Get the IEnumVariant interface and call ->Next();
 		 */
-		SAFEARRAYBOUND rgsabound[1];
-		unsigned long count;

 		switch (arg_count) {
 			case 0:
@@ -649,7 +754,6 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **

 		if ((pSA = SafeArrayCreate(VT_VARIANT, 1, rgsabound)) == NULL) {
 			VariantInit(var_result);
-
 			return FAILURE;
 		} else {
 			V_ARRAY(var_result) = pSA;
@@ -684,6 +788,25 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **
 		}

 		return SUCCESS;
+	} else if (C_HASENUM(obj) && strstr(Z_STRVAL_P(function_name), "all")) {
+#define FETCH_BLOCKSIZE 10 /* fetch blocks of 10 elements */
+
+		count = FETCH_BLOCKSIZE;
+
+		rgsabound[0].lLbound = 0;
+		rgsabound[0].cElements = count;
+
+		if ((pSA = SafeArrayCreate(VT_VARIANT, 1, rgsabound)) == NULL) {
+			VariantInit(var_result);
+			return FAILURE;
+		} else {
+			V_ARRAY(var_result) = pSA;
+			V_VT(var_result) = VT_VARIANT|VT_ARRAY;
+		}
+
+		/* blah*/
+
+
 	} else if (C_HASENUM(obj) && strstr(Z_STRVAL_P(function_name), "reset")) {
 		if (FAILED(hr = C_ENUMVARIANT_VT(obj)->Reset(C_ENUMVARIANT(obj)))) {
 			char *error_message = php_COM_error_message(hr TSRMLS_CC);
@@ -772,7 +895,7 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **
 }


-/* {{{ proto mixed com_invoke(int module, string handler_name [, mixed arg [, ...]])
+/* {{{ proto mixed com_invoke(int module, string handler_name [, mixed arg [, mixed ...]])
   Invokes a COM module */
 PHP_FUNCTION(com_invoke)
 {
@@ -788,7 +911,7 @@ PHP_FUNCTION(com_invoke)
 	}
 	arguments = (pval **) emalloc(sizeof(pval *)*arg_count);
 	if (zend_get_parameters_array(ht, arg_count, arguments) == FAILURE) {
-		RETURN_FALSE;
+		RETURN_NULL();
 	}

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

 	/* obtain property/method handler */
@@ -810,8 +933,8 @@ PHP_FUNCTION(com_invoke)
 	if (do_COM_invoke(obj, function_name, var_result, arguments+2, arg_count-2 TSRMLS_CC)==FAILURE) {
 		FREE_VARIANT(var_result);
 		efree(arguments);
-	
-		RETURN_FALSE;
+
+		RETURN_NULL();
 	}

 	RETVAL_VARIANT(var_result);
@@ -821,7 +944,7 @@ PHP_FUNCTION(com_invoke)
 /* }}} */


-/* {{{ proto mixed com_invoke(int module)
+/* {{{ proto mixed com_release(int module)
   Releases a COM object */
 PHP_FUNCTION(com_release)
 {
@@ -979,7 +1102,7 @@ static void do_COM_propput(pval *return_value, comval *obj, pval *arg_property,
 		FREE_VARIANT(var_result);
 		FREE_VARIANT(new_value);

-		RETURN_FALSE;
+		RETURN_NULL();
 	}

 	php_pval_to_variant(value, new_value, codepage TSRMLS_CC);
@@ -1004,7 +1127,7 @@ static void do_COM_propput(pval *return_value, comval *obj, pval *arg_property,
 		FREE_VARIANT(var_result);
 		FREE_VARIANT(new_value);

-		RETURN_FALSE;
+		RETURN_NULL();
 	}

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

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

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

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

@@ -1089,7 +1214,7 @@ PHP_FUNCTION(com_propput)
 /* }}} */


-/* {{{ proto bool com_load_typelib(string typelib_name [, int case_insensitiv]) 
+/* {{{ proto bool com_load_typelib(string typelib_name [, int case_insensitive]) 
   Loads a Typelib */
 PHP_FUNCTION(com_load_typelib)
 {
@@ -1105,7 +1230,7 @@ PHP_FUNCTION(com_load_typelib)
 		case 2:
 			zend_get_parameters(ht, 2, &arg_typelib, &arg_cis);
 			convert_to_boolean_ex(&arg_cis);
-			if (arg_cis->value.lval) {
+			if (Z_LVAL_P(arg_cis)) {
 				mode &= ~CONST_CS;
 			}
 			break;
@@ -1153,7 +1278,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer

 	for (element=property_reference->elements_list->head; element; element=element->next) {
 		overloaded_property = (zend_overloaded_element *) element->data;
-		switch (overloaded_property->type) {
+		switch (Z_TYPE_P(overloaded_property)) {
 			case OE_IS_ARRAY:
 				if (do_COM_offget(var_result, obj, &overloaded_property->element, FALSE TSRMLS_CC) == FAILURE) {
 					FREE_VARIANT(var_result);
@@ -1176,7 +1301,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
 					FREE_VARIANT(var_result);
 					if (obj != obj_prop) {
 						FREE_COM(obj_prop);
-	
+
 						return_value = *object;
 						ZVAL_ADDREF(&return_value);
 					} else {
@@ -1191,7 +1316,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
 			if (V_DISPATCH(var_result) == NULL) {
 				FREE_VARIANT(var_result);
 				FREE_COM(obj_prop);
-				
+
 				return return_value;
 			}

@@ -1212,6 +1337,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
 		RETVAL_COM(obj);
 	}

+
 	FREE_VARIANT(var_result);              

 	return return_value;
@@ -1236,13 +1362,13 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
 	if (!obj || (type != IS_COM)) {
 		return FAILURE;
 	}
-	
+
 	ALLOC_COM(obj_prop);
 	ALLOC_VARIANT(var_result);

 	for (element=property_reference->elements_list->head; element != property_reference->elements_list->tail; element=element->next) {
 		overloaded_property = (zend_overloaded_element *) element->data;
-		switch (overloaded_property->type) {
+		switch (Z_TYPE_P(overloaded_property)) {
 			case OE_IS_ARRAY:
 				if (do_COM_offget(var_result, obj, &overloaded_property->element, FALSE TSRMLS_CC) == FAILURE) {
 					FREE_VARIANT(var_result);
@@ -1288,7 +1414,7 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
 		pval_destructor(&overloaded_property->element);
 	}
 	FREE_VARIANT(var_result);
-	
+
 	overloaded_property = (zend_overloaded_element *) element->data;
 	do_COM_propput(&result, obj, &overloaded_property->element, value TSRMLS_CC);
 	FREE_COM(obj_prop);
@@ -1313,34 +1439,38 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
 		pval *object_handle;

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

 		return;
 	}

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

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

@@ -1348,7 +1478,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
 		&& !strcmp(Z_STRVAL_P(&function_name->element), "release")) {
 		RETVAL_LONG(php_COM_release(obj TSRMLS_CC));
 	} else if (zend_llist_count(property_reference->elements_list)==1
-		&& !strcmp(Z_STRVAL_P(&function_name->element), "addref")) {
+			   && !strcmp(Z_STRVAL_P(&function_name->element), "addref")) {
 		RETVAL_LONG(php_COM_addref(obj TSRMLS_CC));
 	} else {
 		pval **arguments;
@@ -1360,9 +1490,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
 		arguments = (pval **) emalloc(sizeof(pval *)*arg_count);
 		zend_get_parameters_array(ht, arg_count, arguments);

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

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

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

@@ -1576,7 +1707,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
 			TypeLib->lpVtbl->GetTypeInfo(TypeLib, i, &TypeInfo);

 			j=0;
-			while(SUCCEEDED(TypeInfo->lpVtbl->GetVarDesc(TypeInfo, j, &pVarDesc))) {
+			while (SUCCEEDED(TypeInfo->lpVtbl->GetVarDesc(TypeInfo, j, &pVarDesc))) {
 				BSTR bstr_ids;
 				zend_constant c;
 				zval exists, results;
@@ -1592,7 +1723,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
 				efree(const_name);
 				c.name_len++; /* length should include the NULL */
 				SysFreeString(bstr_ids);
-				
+
 				/* Before registering the contsnt, let's see if we can find it */
 				if (zend_get_constant(c.name, c.name_len-1, &exists TSRMLS_CC)) {
 					/* Oops, it already exists. No problem if it is defined as the same value */
@@ -1624,7 +1755,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
 }


-/* {{{ proto bool com_isenum(com_module obj)
+/* {{{ proto bool com_isenum(object com_module)
   Grabs an IEnumVariant */
 PHP_FUNCTION(com_isenum)
 {
@@ -1663,11 +1794,27 @@ static void php_register_COM_class(TSRMLS_D)
 }


-PHP_MINIT_FUNCTION(COM)
+static void php_COM_init(int module_number TSRMLS_DC)
 {
 	le_comval = zend_register_list_destructors_ex(php_comval_destructor, NULL, "COM", module_number);
 	php_register_COM_class(TSRMLS_C);
+}
+
+
+PHP_MINIT_FUNCTION(COM)
+{
+	php_COM_init(module_number TSRMLS_CC);
+	php_VARIANT_init(module_number TSRMLS_CC);
+
+	REGISTER_LONG_CONSTANT("CLSCTX_INPROC_SERVER",  CLSCTX_INPROC_SERVER, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CLSCTX_INPROC_HANDLER", CLSCTX_INPROC_HANDLER, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CLSCTX_LOCAL_SERVER",   CLSCTX_LOCAL_SERVER, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CLSCTX_REMOTE_SERVER",  CLSCTX_REMOTE_SERVER, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CLSCTX_SERVER",         CLSCTX_SERVER, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CLSCTX_ALL",            CLSCTX_ALL, CONST_CS | CONST_PERSISTENT);
+
 	REGISTER_INI_ENTRIES();
+
 	return SUCCESS;
 }

@@ -0,0 +1,27 @@
+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
+
+
+ad 6.) check vbsample.php (new VARIANT(*, *|VT_BYREF)) GPs
+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)
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -45,33 +45,7 @@ static int codepage;
 static zend_class_entry VARIANT_class_entry;


-function_entry VARIANT_functions[] = {
-	{NULL, NULL, NULL}
-};
-
-
-static PHP_MINFO_FUNCTION(VARIANT)
-{
-	php_info_print_table_start();
-	php_info_print_table_row(2, "VARIANT support", "enabled");
-	php_info_print_table_end();
-}
-
-
-zend_module_entry VARIANT_module_entry = {
-	STANDARD_MODULE_HEADER,
-	"variant",
-	VARIANT_functions,
-	PHP_MINIT(VARIANT),
-	PHP_MSHUTDOWN(VARIANT),
-	NULL, NULL,
-	PHP_MINFO(VARIANT),
-	NO_VERSION_YET,
-	STANDARD_MODULE_PROPERTIES
-};
-
-
-PHP_MINIT_FUNCTION(VARIANT)
+void php_VARIANT_init(int module_number TSRMLS_DC)
 {
 	le_variant = zend_register_list_destructors_ex(php_VARIANT_destructor, NULL, "VARIANT", module_number);

@@ -106,6 +80,7 @@ PHP_MINIT_FUNCTION(VARIANT)
 	REGISTER_LONG_CONSTANT("CP_OEMCP", CP_OEMCP, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CP_UTF7", CP_UTF7, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CP_UTF8", CP_UTF8, CONST_CS | CONST_PERSISTENT);
+
 #ifdef CP_SYMBOL
 	REGISTER_LONG_CONSTANT("CP_SYMBOL", CP_SYMBOL, CONST_CS | CONST_PERSISTENT);
 #else
@@ -118,13 +93,6 @@ PHP_MINIT_FUNCTION(VARIANT)
 #endif

 	php_register_VARIANT_class(TSRMLS_C);
-	return SUCCESS;
-}
-
-
-PHP_MSHUTDOWN_FUNCTION(VARIANT)
-{
-	return SUCCESS;
 }


@@ -165,7 +133,7 @@ static void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend
 				zend_get_parameters(ht, 3, &data, &type, &code_page);
 				php_pval_to_variant_ex(data, pVar, type, codepage TSRMLS_CC);
 				convert_to_long(code_page);
-				codepage = code_page->value.lval;
+				codepage = Z_LVAL_P(code_page);
 				break;
 			default:
 				ZEND_WRONG_PARAM_COUNT();
@@ -206,13 +174,13 @@ static pval php_VARIANT_get_property_handler(zend_property_reference *property_r
 		ZVAL_FALSE(&result);
 	} else {
 		overloaded_property = (zend_overloaded_element *) property_reference->elements_list->head->data;
-		switch (overloaded_property->type) {
+		switch (Z_TYPE_P(overloaded_property)) {
 			case OE_IS_ARRAY:
 				ZVAL_FALSE(&result);
 				break;

 			case OE_IS_OBJECT:
-				if (!strcmp(overloaded_property->element.value.str.val, "value")) {
+				if (!strcmp(Z_STRVAL(overloaded_property->element), "value")) {
 					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))
@@ -260,94 +228,96 @@ 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)
 {
-	pval type;
+	int type;

-	Z_TYPE(type) = IS_STRING;
+	if (!strcmp(Z_STRVAL_P(arg_property), "value")) {
+		php_pval_to_variant(value, var_arg, codepage TSRMLS_CC);

-	if (!strcmp(Z_STRVAL_P(arg_property), "bVal")) {
-		Z_LVAL(type) = VT_UI1;
+		return SUCCESS;
+	} else if (!strcmp(Z_STRVAL_P(arg_property), "bVal")) {
+		type = VT_UI1;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "iVal")) { 
-		Z_LVAL(type) = VT_I2;
+		type = VT_I2;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "lVal")) {
-		Z_LVAL(type) = VT_I4;
+		type = VT_I4;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "fltVal")) {
-		Z_LVAL(type) = VT_R4;
+		type = VT_R4;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "dblVal")) {
-		Z_LVAL(type) = VT_R8;
+		type = VT_R8;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "boolVal")) {
-		Z_LVAL(type) = VT_BOOL;
+		type = VT_BOOL;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "scode")) {
-		Z_LVAL(type) = VT_ERROR;
+		type = VT_ERROR;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "cyVal")) {
-		Z_LVAL(type) = VT_CY;
+		type = VT_CY;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "date")) {
-		Z_LVAL(type) = VT_DATE;
+		type = VT_DATE;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "bstrVal")) {
-		Z_LVAL(type) = VT_BSTR;
+		type = VT_BSTR;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pdecVal")) {
-		Z_LVAL(type) = VT_DECIMAL|VT_BYREF;
+		type = VT_DECIMAL|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "punkVal")) {
-		Z_LVAL(type) = VT_UNKNOWN;
+		type = VT_UNKNOWN;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pdispVal")) {
-		Z_LVAL(type) = VT_DISPATCH;
+		type = VT_DISPATCH;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "parray")) {
-		Z_LVAL(type) = VT_ARRAY;
+		type = VT_ARRAY;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pbVal")) {
-		Z_LVAL(type) = VT_UI1|VT_BYREF;
+		type = VT_UI1|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "piVal")) {
-		Z_LVAL(type) = VT_I2|VT_BYREF;
+		type = VT_I2|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "plVal")) {
-		Z_LVAL(type) = VT_I4|VT_BYREF;
+		type = VT_I4|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pfltVal")) {
-		Z_LVAL(type) = VT_R4|VT_BYREF;
+		type = VT_R4|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pdblVal")) {
-		Z_LVAL(type) = VT_R8|VT_BYREF;
+		type = VT_R8|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pboolVal")) {
-		Z_LVAL(type) = VT_BOOL|VT_BYREF;
+		type = VT_BOOL|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pscode")) {
-		Z_LVAL(type) = VT_ERROR|VT_BYREF;
+		type = VT_ERROR|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pcyVal")) {
-		Z_LVAL(type) = VT_CY|VT_BYREF;
+		type = VT_CY|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pdate")) {
-		Z_LVAL(type) = VT_DATE|VT_BYREF;
+		type = VT_DATE|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pbstrVal")) {
-		Z_LVAL(type) = VT_BSTR|VT_BYREF;
+		type = VT_BSTR|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "ppunkVal")) {
-		Z_LVAL(type) = VT_UNKNOWN|VT_BYREF;
+		type = VT_UNKNOWN|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "ppdispVal")) {
-		Z_LVAL(type) = VT_DISPATCH|VT_BYREF;
+		type = VT_DISPATCH|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pparray")) {
-		Z_LVAL(type) = VT_ARRAY|VT_BYREF;
+		type = VT_ARRAY|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pvarVal")) {
-		Z_LVAL(type) = VT_VARIANT|VT_BYREF;
+		type = VT_VARIANT|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "byref")) {
-		Z_LVAL(type) = VT_BYREF;
+		type = VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "cVal")) {
-		Z_LVAL(type) = VT_I1;
+		type = VT_I1;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "uiVal")) {
-		Z_LVAL(type) = VT_UI2;
+		type = VT_UI2;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "ulVal")) {
-		Z_LVAL(type) = VT_UI4;
+		type = VT_UI4;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "intVal")) {
-		Z_LVAL(type) = VT_INT;
+		type = VT_INT;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "uintVal")) {
-		Z_LVAL(type) = VT_UINT|VT_BYREF;
+		type = VT_UINT|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pcVal")) {
-		Z_LVAL(type) = VT_I1|VT_BYREF;
+		type = VT_I1|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "puiVal")) {
-		Z_LVAL(type) = VT_UI2|VT_BYREF;
+		type = VT_UI2|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pulVal")) {
-		Z_LVAL(type) = VT_UI4|VT_BYREF;
+		type = VT_UI4|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "pintVal")) {
-		Z_LVAL(type) = VT_INT|VT_BYREF;
+		type = VT_INT|VT_BYREF;
 	} else if (!strcmp(Z_STRVAL_P(arg_property), "puintVal")) {
-		Z_LVAL(type) = VT_UINT|VT_BYREF;
+		type = VT_UINT|VT_BYREF;
 	} else {
 		php_error(E_WARNING, "Unknown member.");
 		return FAILURE;
 	}

-	php_pval_to_variant_ex(value, var_arg, &type, codepage TSRMLS_CC);
+	php_pval_to_variant_ex2(value, var_arg, type, codepage TSRMLS_CC);

 	return SUCCESS;
 }
@@ -30,8 +30,7 @@ END_EXTERN_C()
 			ALLOC_HASHTABLE(properties);											\
 			zend_hash_init(properties, 0, NULL, ZVAL_PTR_DTOR, 0);					\
 																					\
-			ALLOC_ZVAL(handle);														\
-			INIT_PZVAL(handle);														\
+			MAKE_STD_ZVAL(handle);													\
 			ZVAL_LONG(handle, zend_list_insert((o), IS_COM));						\
 																					\
 			zval_copy_ctor(handle);													\
@@ -46,7 +45,7 @@ END_EXTERN_C()
 #define ALLOC_COM(z)	(z) = (comval *) emalloc(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()

@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -37,7 +37,6 @@

 /* prototypes */

-static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC);
 static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC);

 /* implementations */
@@ -85,21 +84,17 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage T
 			break;
 	}

-	if (pval_arg->is_ref) {	/* deprecated, implemented for downwards compatiblity */
-//		type |= VT_BYREF;
-	}
-
-	pval_to_variant_ex(pval_arg, var_arg, type, codepage TSRMLS_CC);
+	php_pval_to_variant_ex2(pval_arg, var_arg, type, codepage TSRMLS_CC);
 }


 PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC)
 {
-	pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage TSRMLS_CC);
+	php_pval_to_variant_ex2(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage TSRMLS_CC);
 }


-static void pval_to_variant_ex(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, int type, int codepage TSRMLS_DC)
 {
 	OLECHAR *unicode_str;

@@ -143,7 +138,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 						/* Add another value to the safe array */
 						if (SUCCEEDED(SafeArrayPtrOfIndex( safeArray, &i, &v))) {		/* Pointer to output element entry retrieved successfully */
 							if (type) {	/* explicit type */
-							   pval_to_variant_ex(*entry, v, type, codepage TSRMLS_CC);		/* Do the required conversion */
+							   php_pval_to_variant_ex2(*entry, v, type, codepage TSRMLS_CC);		/* Do the required conversion */
 							} else {
 								php_pval_to_variant(*entry, v, codepage TSRMLS_CC);                    /* Do the required conversion */
 							}
@@ -162,12 +157,12 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 		switch (V_VT(var_arg)) {
 			case VT_UI1:
 				convert_to_long_ex(&pval_arg);
-				V_UI1(var_arg) = (unsigned char)Z_LVAL_P(pval_arg);
+				V_UI1(var_arg) = (unsigned char) Z_LVAL_P(pval_arg);
 				break;

 			case VT_I2:
 				convert_to_long_ex(&pval_arg);
-				V_I2(var_arg) = (short)Z_LVAL_P(pval_arg);
+				V_I2(var_arg) = (short) Z_LVAL_P(pval_arg);
 				break;

 			case VT_I4:
@@ -177,7 +172,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c

 			case VT_R4:
 				convert_to_double_ex(&pval_arg);
-				V_R4(var_arg) = (float)Z_DVAL_P(pval_arg);
+				V_R4(var_arg) = (float) Z_DVAL_P(pval_arg);
 				break;

 			case VT_R8:
@@ -188,9 +183,9 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 			case VT_BOOL:
 				convert_to_boolean_ex(&pval_arg);
 				if (Z_LVAL_P(pval_arg)) {
-					V_BOOL(var_arg) = TRUE;
+					V_BOOL(var_arg) = VT_TRUE;
 				} else {
-					V_BOOL(var_arg) = FALSE;
+					V_BOOL(var_arg) = VT_FALSE;
 				}
 				break;

@@ -208,24 +203,39 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 					SYSTEMTIME wintime;
 					struct tm *phptime;

-					phptime = gmtime(&(pval_arg->value.lval));
-					memset(&wintime, 0, sizeof(wintime));
+					switch (Z_TYPE_P(pval_arg)) {
+						case IS_DOUBLE:
+							/* already a VariantTime value */
+							V_DATE(var_arg) = Z_DVAL_P(pval_arg);
+							break;

-					wintime.wYear = phptime->tm_year + 1900;
-					wintime.wMonth = phptime->tm_mon + 1;
-					wintime.wDay = phptime->tm_mday;
-					wintime.wHour = phptime->tm_hour;
-					wintime.wMinute = phptime->tm_min;
-					wintime.wSecond = phptime->tm_sec;
+						/** @todo
+						case IS_STRING:
+							/* string representation of a time value */

-					SystemTimeToVariantTime(&wintime, &V_DATE(var_arg));
+						default:
+							/* a PHP time value ? */
+							convert_to_long_ex(&pval_arg);
+							phptime = gmtime(&(Z_LVAL_P(pval_arg)));
+							memset(&wintime, 0, sizeof(wintime));
+
+							wintime.wYear = phptime->tm_year + 1900;
+							wintime.wMonth = phptime->tm_mon + 1;
+							wintime.wDay = phptime->tm_mday;
+							wintime.wHour = phptime->tm_hour;
+							wintime.wMinute = phptime->tm_min;
+							wintime.wSecond = phptime->tm_sec;
+
+							SystemTimeToVariantTime(&wintime, &V_DATE(var_arg));
+							break;
+					}
 				}
 				break;

 			case VT_BSTR:
 				convert_to_string_ex(&pval_arg);
 				unicode_str = php_char_to_OLECHAR(Z_STRVAL_P(pval_arg), Z_STRLEN_P(pval_arg), codepage TSRMLS_CC);
-				V_BSTR(var_arg) = SysAllocString(unicode_str);
+				V_BSTR(var_arg) = SysAllocStringByteLen((char *) unicode_str, Z_STRLEN_P(pval_arg) * sizeof(OLECHAR));
 				efree(unicode_str);
 				break;

@@ -288,9 +298,9 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 				/* emalloc or malloc ? */
 				V_BOOLREF(var_arg) = (short FAR*) pemalloc(sizeof(short), 1);
 				if (Z_LVAL_P(pval_arg)) {
-					*V_BOOLREF(var_arg) = TRUE;
+					*V_BOOLREF(var_arg) = VT_TRUE;
 				} else {
-					*V_BOOLREF(var_arg) = FALSE;
+					*V_BOOLREF(var_arg) = VT_TRUE;
 				}
 				break;

@@ -301,14 +311,14 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c

 			case VT_CY|VT_BYREF:
 				convert_to_double_ex(&pval_arg);
-				VarCyFromR8(pval_arg->value.dval, var_arg->pcyVal);
+				VarCyFromR8(Z_DVAL_P(pval_arg), var_arg->pcyVal);
 				break;

 			case VT_DATE|VT_BYREF: {
 					SYSTEMTIME wintime;
 					struct tm *phptime;

-					phptime = gmtime(&(pval_arg->value.lval));
+					phptime = gmtime(&(Z_LVAL_P(pval_arg)));
 					memset(&wintime, 0, sizeof(wintime));

 					wintime.wYear   = phptime->tm_year + 1900;
@@ -370,8 +380,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 			/*
 				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);
 				}
 			*/
@@ -621,14 +630,22 @@ 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: {
@@ -669,8 +686,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);
@@ -748,26 +764,40 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int codepage TS

 PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage TSRMLS_DC)
 {
+	BOOL error = FALSE;
 	OLECHAR *unicode_str;

-	/* request needed buffersize */
-	uint reqSize = MultiByteToWideChar(codepage, MB_PRECOMPOSED | MB_ERR_INVALID_CHARS, C_str, -1, NULL, 0);
+	if (strlen == -1) {
+		/* request needed buffersize */
+		strlen = MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED) | MB_ERR_INVALID_CHARS, C_str, -1, NULL, 0);
+	} else {
+		/* \0 terminator */
+		strlen++;
+	}

-	if (reqSize) {
-		unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR) * reqSize);
+	if (strlen >= 0) {
+		unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR) * strlen);

 		/* convert string */
-		MultiByteToWideChar(codepage, MB_PRECOMPOSED | MB_ERR_INVALID_CHARS, C_str, -1, unicode_str, reqSize);
+		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));
 		*unicode_str = 0;

+		error = TRUE;
+	}
+
+	if (error) {
 		switch (GetLastError()) {
 			case ERROR_NO_UNICODE_TRANSLATION:
-				php_error(E_WARNING,"No unicode translation available for the specified string");
+				php_error(E_WARNING, "No unicode translation available for the specified string");
+				break;
+			case ERROR_INSUFFICIENT_BUFFER:
+				php_error(E_WARNING, "Internal Error: Insufficient Buffer");
 				break;
 			default:
-				php_error(E_WARNING,"Error in php_char_to_OLECHAR()");
+				php_error(E_WARNING, "Unknown error in php_char_to_OLECHAR()");
 		}
 	}

@@ -781,13 +811,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;
@@ -820,4 +850,4 @@ static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC)
 	}
 }

-#endif /* PHP_WIN32 */
+#endif /* PHP_WIN32 */
@@ -2,13 +2,18 @@
 #define CONVERSION_H

 /* isn't this defined somewhere else ? */
+
 #define Z_TRUE 1
 #define Z_FALSE 0

+#define VT_TRUE -1
+#define VT_FALSE 0
+
 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 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);
@@ -41,11 +41,11 @@ zend_class_entry COM_class_entry;

 END_EXTERN_C()

-#define COM_module_ptr &COM_module_entry
+#define phpext_com_ptr &COM_module_entry

 #else

-#define COM_module_ptr NULL
+#define phpext_com_ptr NULL

 #endif  /* PHP_WIN32 */

@@ -8,23 +8,12 @@ BEGIN_EXTERN_C()
 #include "conversion.h"
 #include "variant.h"

-PHP_MINIT_FUNCTION(VARIANT);
-PHP_MSHUTDOWN_FUNCTION(VARIANT);
+void php_VARIANT_init(int module_number TSRMLS_DC);

 PHPAPI int php_VARIANT_get_le_variant();

-zend_module_entry VARIANT_module_entry;
-
 END_EXTERN_C()

-#define VARIANT_module_ptr &VARIANT_module_entry
-
-#else
-
-#define VARIANT_module_ptr NULL
-
 #endif  /* PHP_WIN32 */

-#define phpext_VARIANT_ptr VARIANT_module_ptr
-
 #endif  /* PHP_TYPEDEF_VARIANT_H */
@@ -1,10 +1,8 @@
 dnl $Id$

-AC_MSG_CHECKING(whether to include cpdflib support)
+AC_MSG_CHECKING(for cpdflib support)
 AC_ARG_WITH(cpdflib,
-[  --with-cpdflib[=DIR]    Include cpdflib support (requires cpdflib >= 2).
-                          DIR is the cpdfllib install directory,
-                          defaults to /usr.],
+[  --with-cpdflib[=DIR]    Include cpdflib support (requires cpdflib >= 2).],
 [
  case $withval in
    no)
@@ -13,7 +11,7 @@ AC_ARG_WITH(cpdflib,
      AC_MSG_RESULT(yes)
      PHP_EXTENSION(cpdf)
      AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
-        [AC_MSG_ERROR(Cpdf module requires cpdflib >= 2.)])
+        [AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])])
      PHP_ADD_LIBRARY(cpdf)
      PHP_ADD_LIBRARY(tiff)
      PHP_ADD_LIBRARY(jpeg)
@@ -59,7 +57,7 @@ AC_ARG_WITH(cpdflib,

          LIBS="$LIBS -L$withval/lib"
        AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
-          [AC_MSG_ERROR(Cpdflib module requires cpdflib >= 2.)])
+          [AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])])
        LIBS=$old_LIBS
        PHP_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib)
        PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Uwe Steinmann                                               |
+   | Author: Uwe Steinmann <Uwe.Steinmann@fernuni-hagen.de>               |
   +----------------------------------------------------------------------+
 */
 /* $Id$ */
@@ -1,12 +1,14 @@
+dnl
 dnl $Id$
+dnl

-PHP_ARG_WITH(crack, whether to include crack support,
+PHP_ARG_WITH(crack, for CRACKlib support,
 [  --with-crack[=DIR]      Include crack support.])

 if test "$PHP_CRACK" != "no"; then

 	for i in /usr/local/lib /usr/lib $PHP_CRACK/lib $PHP_CRACK/cracklib; do
-		test -f $i/lib/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/libcrack.a && CRACK_LIBDIR=$i
+		test -f $i/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/libcrack.a && CRACK_LIBDIR=$i
 	done

 	for i in /usr/local/include /usr/include $PHP_CRACK/include $PHP_CRACK/cracklib; do
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors:                                                             |
+   | Authors: Alexander Feldman                                           |
   +----------------------------------------------------------------------+
 */
 /* $Id$ */
@@ -95,6 +95,13 @@ void _close_crack_dict(PWDICT *pwdict)

 ZEND_MODULE_STARTUP_D(crack)
 {
+#ifdef ZTS
+	zend_crack_globals *crack_globals;
+
+	ts_allocate_id(&crack_globals_id, sizeof(zend_crack_globals), NULL, NULL);
+	crack_globals = ts_resource(crack_globals_id);
+#endif
+	
 	REGISTER_INI_ENTRIES();

 	le_crack = register_list_destructors(_close_crack_dict, NULL);
@@ -155,7 +162,7 @@ ZEND_FUNCTION(crack_opendict)
 /* }}} */

 /* {{{ proto string crack_closedict([int link_identifier])
-   Closes an open cracklib dictionary. */
+   Closes an open cracklib dictionary */
 ZEND_FUNCTION(crack_closedict)
 {
 	PWDICT *pwdict;
@@ -170,7 +177,7 @@ ZEND_FUNCTION(crack_closedict)
 			if (zend_get_parameters_ex(1, &dictionary) == FAILURE) {
 				WRONG_PARAM_COUNT;
 			}
-			id = (*dictionary)->value.lval;
+			id = Z_LVAL_PP(dictionary);
 			break;
 		default:
 			WRONG_PARAM_COUNT;
@@ -187,7 +194,7 @@ ZEND_FUNCTION(crack_closedict)
 }
 /* }}} */

-/* {{{ proto string crack_check([int dictionary, ] string password)
+/* {{{ proto string crack_check([int dictionary,] string password)
   Performs an obscure check with the given password */
 ZEND_FUNCTION(crack_check)
 {
@@ -240,8 +247,8 @@ ZEND_FUNCTION(crack_check)
 }
 /* }}} */

-/* {{{ proto string crack_getlastmessage()
-   Returns the message from the last obscure check. */
+/* {{{ proto string crack_getlastmessage(void)
+   Returns the message from the last obscure check */
 ZEND_FUNCTION(crack_getlastmessage)
 {
 	if (ZEND_NUM_ARGS() != 0) {
@@ -265,6 +272,6 @@ ZEND_FUNCTION(crack_getlastmessage)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,6 +1,6 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
   | Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group             |
   +----------------------------------------------------------------------+
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors:                                                             |
+   | Authors: Alexander Feldman                                           |
   +----------------------------------------------------------------------+
 */

@@ -1,27 +1,11 @@
+dnl
 dnl $Id$
-dnl config.m4 for extension ctype
-dnl don't forget to call PHP_EXTENSION(ctype)
+dnl

-dnl Comments in this file start with the string 'dnl'.
-dnl Remove where necessary. This file will not work
-dnl without editing.
-
-dnl If your extension references something external, use with:
-
-dnl PHP_ARG_WITH(ctype, for ctype support,
-dnl Make sure that the comment is aligned:
-dnl [  --with-ctype             Include ctype support])
-
-dnl Otherwise use enable:
-
-PHP_ARG_ENABLE(ctype, whether to enable ctype support,
-[  --enable-ctype          Enable ctype support])
+PHP_ARG_ENABLE(ctype, whether to enable ctype functions,
+[  --disable-ctype         Disable ctype functions], yes)

 if test "$PHP_CTYPE" != "no"; then
-  dnl If you will not be testing anything external, like existence of
-  dnl headers, libraries or functions in them, just uncomment the 
-  dnl following line and you are ready to go.
  AC_DEFINE(HAVE_CTYPE, 1, [ ])
-  dnl Write more examples of tests here...
  PHP_EXTENSION(ctype, $ext_shared)
 fi
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Hartmut Holzgraefe <hartmut@six.de>                         |
+   | Author: Hartmut Holzgraefe <hartmut@six.de>                          |
   +----------------------------------------------------------------------+
 */

@@ -38,7 +38,7 @@ ZEND_DECLARE_MODULE_GLOBALS(ctype)
 */

 /* True global resources - no need for thread safety here */
-static int le_ctype;
+/* static int le_ctype; */

 /* {{{ ctype_functions[]
 * Every user visible function must have an entry in ctype_functions[].
@@ -79,10 +79,6 @@ zend_module_entry ctype_module_entry = {
 ZEND_GET_MODULE(ctype)
 #endif

-#ifndef PHP_EXPERIMENTAL
-#define PHP_EXPERIMENTAL(x, y)
-#endif 
-
 /* {{{ PHP_MINFO_FUNCTION
 */
 PHP_MINFO_FUNCTION(ctype)
@@ -95,225 +91,116 @@ PHP_MINFO_FUNCTION(ctype)

 /* {{{ ctype
 */
-static int ctype(int (*iswhat)(int), zval **c) 
-{
-	switch ((*c)->type) {
-	case IS_LONG:
-		return iswhat((*c)->value.lval);
-	case IS_STRING:
-		{
-			char *p;
-			int n, len;
-			convert_to_string_ex(c);
-			p=(*c)->value.str.val;
-			len = (*c)->value.str.len;
-			for(n=0;n<len;n++) {
-				if(!iswhat(*p++)) return 0;
-			}
-			return 1;
-		}
-	default:
-		break;
-	}
-	return 0;
-}
+#define CTYPE(iswhat) \
+	zval *c; \
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &c) == FAILURE) \
+		return; \
+ 	switch (Z_TYPE_P(c)) { \
+	case IS_LONG: \
+		RETURN_BOOL(iswhat(Z_LVAL_P(c))); \
+	case IS_STRING: \
+		{ \
+			char *p; \
+			int n, len; \
+			p=Z_STRVAL_P(c); \
+			len = Z_STRLEN_P(c); \
+			for(n=0;n<len;n++) { \
+				if(!iswhat(*p++)) RETURN_FALSE; \
+			} \
+			RETURN_TRUE; \
+		} \
+	default: \
+		break; \
+	} \
+	RETURN_FALSE; 
+ 
 /* }}} */

-/* {{{ proto bool isalnum(mixed c)
-    Check for alphanumeric character(s) */
+/* {{{ proto bool ctype_alnum(mixed c)
+   Checks for alphanumeric character(s) */
 PHP_FUNCTION(ctype_alnum)
 {
-	PHP_EXPERIMENTAL("4.0.4dev", NULL)
-	zval **c;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &c) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-	
-	if(ctype(isalnum, c)) {
-	   RETURN_TRUE;
-	}
-
-	RETURN_FALSE;		
+	CTYPE(isalnum);
 }
 /* }}} */

-/* {{{ proto bool isalpha(mixed c)
-    Check for alphabetic character(s) */
+/* {{{ proto bool ctype_alpha(mixed c)
+   Checks for alphabetic character(s) */
 PHP_FUNCTION(ctype_alpha)
 {
-	PHP_EXPERIMENTAL("4.0.4dev", NULL)
-	zval **c;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &c) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	if(ctype(isalpha, c)) {
-	   RETURN_TRUE;
-	}
-
-	RETURN_FALSE;		
+	CTYPE(isalpha);
 }
 /* }}} */

-/* {{{ proto bool iscntrl(mixed c)
-    Check for control character(s) */
+/* {{{ proto bool ctype_cntrl(mixed c)
+   Checks for control character(s) */
 PHP_FUNCTION(ctype_cntrl)
 {
-	PHP_EXPERIMENTAL("4.0.4dev", NULL)
-	zval **c;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &c) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	if(ctype(iscntrl, c)) {
-	   RETURN_TRUE;
-	}
-
-	RETURN_FALSE;		
+	CTYPE(iscntrl);
 }
 /* }}} */

-/* {{{ proto bool isdigit(mixed c)
-   Check for numeric character(s) */
+/* {{{ proto bool ctype_digit(mixed c)
+   Checks for numeric character(s) */
 PHP_FUNCTION(ctype_digit)
 {
-	PHP_EXPERIMENTAL("4.0.4dev", NULL)
-	zval **c;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &c) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	if(ctype(isdigit, c)) {
-	   RETURN_TRUE;
-	}
-
-	RETURN_FALSE;		
+	CTYPE(isdigit);
 }
 /* }}} */

-/* {{{ proto bool islower(mixed c)
-   Check for lowercase character(s)  */
+/* {{{ proto bool ctype_lower(mixed c)
+   Checks for lowercase character(s)  */
 PHP_FUNCTION(ctype_lower)
 {
-	PHP_EXPERIMENTAL("4.0.4dev", NULL)
-	zval **c;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &c) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	if(ctype(islower, c)) {
-	   RETURN_TRUE;
-	}
-
-	RETURN_FALSE;		
+	CTYPE(islower);
 }
 /* }}} */

-/* {{{ proto bool isgraph(mixed c)
-    Check for any printable character(s) except space */
+/* {{{ proto bool ctype_graph(mixed c)
+   Checks for any printable character(s) except space */
 PHP_FUNCTION(ctype_graph)
 {
-	PHP_EXPERIMENTAL("4.0.4dev", NULL)
-	zval **c;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &c) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	if(ctype(isgraph, c)) {
-	   RETURN_TRUE;
-	}
-
-	RETURN_FALSE;		
+	CTYPE(isgraph);
 }
 /* }}} */

-/* {{{ proto bool isprint(mixed c)
-    Check for printable character(s) */
+/* {{{ proto bool ctype_print(mixed c)
+   Checks for printable character(s) */
 PHP_FUNCTION(ctype_print)
 {
-	PHP_EXPERIMENTAL("4.0.4dev", NULL)
-	zval **c;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &c) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	if(ctype(isprint, c)) {
-	   RETURN_TRUE;
-	}
-
-	RETURN_FALSE;		
+	CTYPE(isprint);
 }
 /* }}} */

-/* {{{ proto bool ispunct(mixed c)
-    Check for any printable character which is not whitespace or an alphanumeric character */
+/* {{{ proto bool ctype_punct(mixed c)
+   Checks for any printable character which is not whitespace or an alphanumeric character */
 PHP_FUNCTION(ctype_punct)
 {
-	PHP_EXPERIMENTAL("4.0.4dev", NULL)
-	zval **c;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &c) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	if(ctype(ispunct, c)) {
-	   RETURN_TRUE;
-	}
-
-	RETURN_FALSE;		
+	CTYPE(ispunct);
 }
 /* }}} */

-/* {{{ proto bool isspace(mixed c)
-    Check for whitespace character(s)*/
+/* {{{ proto bool ctype_space(mixed c)
+   Checks for whitespace character(s)*/
 PHP_FUNCTION(ctype_space)
 {
-	PHP_EXPERIMENTAL("4.0.4dev", NULL)
-	zval **c;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &c) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	if(ctype(isspace, c)) {
-	   RETURN_TRUE;
-	}
-
-	RETURN_FALSE;		
+	CTYPE(isspace);
 }
 /* }}} */

-/* {{{ proto bool isupper(mixed c)
-    Check for uppercase character(s) */
+/* {{{ proto bool ctype_upper(mixed c)
+   Checks for uppercase character(s) */
 PHP_FUNCTION(ctype_upper)
 {
-	PHP_EXPERIMENTAL("4.0.4dev", NULL)
-	zval **c;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &c) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	if(ctype(isupper, c)) {
-	   RETURN_TRUE;
-	}
-
-	RETURN_FALSE;		
+	CTYPE(isupper);
 }
 /* }}} */

-/* {{{ proto bool isxdigit(mixed c)
-    Check for character(s) representing a hexadecimal digit */
+/* {{{ proto bool ctype_xdigit(mixed c)
+   Checks for character(s) representing a hexadecimal digit */
 PHP_FUNCTION(ctype_xdigit)
 {
-	PHP_EXPERIMENTAL("4.0.4dev", NULL)
-	zval **c;
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &c) == FAILURE){
-		WRONG_PARAM_COUNT;
-	}
-
-	if(ctype(isxdigit, c)) {
-	   RETURN_TRUE;
-	}
-
-	RETURN_FALSE;		
+	CTYPE(isxdigit);
 }
 /* }}} */

@@ -324,6 +211,6 @@ PHP_FUNCTION(ctype_xdigit)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,8 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors:                                                             |
-   |                                                                      |
+   | Author: Hartmut Holzgraefe <hartmut@six.de>                          |
   +----------------------------------------------------------------------+
 */

@@ -1,5 +1,6 @@
+dnl
 dnl $Id$
-dnl config.m4 for extension CURL
+dnl

 PHP_ARG_WITH(curl, for CURL support,
 [  --with-curl[=DIR]       Include CURL support])
@@ -24,26 +25,30 @@ if test "$PHP_CURL" != "no"; then
  fi

  CURL_CONFIG="curl-config"
-  AC_MSG_CHECKING(for cURL greater than 7.8.1)
+  AC_MSG_CHECKING(for cURL 7.9 or greater)

  if ${CURL_DIR}/bin/curl-config --libs print > /dev/null 2>&1; then
    CURL_CONFIG=${CURL_DIR}/bin/curl-config
+  else
+    if ${CURL_DIR}/curl-config --libs print > /dev/null 2>&1; then
+       CURL_CONFIG=${CURL_DIR}/curl-config
+    fi
  fi

  curl_version_full=`$CURL_CONFIG --version`
  curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-  if test "$curl_version" -ge 7008001; then
+  if test "$curl_version" -ge 7009000; then
    AC_MSG_RESULT($curl_version_full)
    CURL_LIBS=`$CURL_CONFIG --libs`
  else
-    AC_MSG_ERROR(cURL version 7.8.1 or later is required to compile php with cURL support)
+    AC_MSG_ERROR(cURL version 7.9 or later is required to compile php with cURL support)
  fi

  PHP_ADD_INCLUDE($CURL_DIR/include)
  PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
  PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD)

-  AC_CHECK_LIB(curl,curl_easy_perform, 
+  PHP_CHECK_LIBRARY(curl,curl_easy_perform, 
  [ 
    AC_DEFINE(HAVE_CURL,1,[ ])
  ],[
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -77,7 +77,7 @@ zend_module_entry curl_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(curl),
-    NO_VERSION_YET,
+	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
@@ -103,8 +103,6 @@ PHP_MINFO_FUNCTION(curl)
 */
 PHP_MINIT_FUNCTION(curl)
 {
-	int startup_options;
-
 	le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, "curl", module_number);
 	
 	/* Constants for curl_setopt() */
@@ -255,14 +253,8 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
 	REGISTER_CURL_CONSTANT(CURLE_OBSOLETE);
 	REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE);
-	
-#if HAVE_OPENSSL_EXT    /* OpenSSL already takes care of initialization */
-	startup_options = CURL_GLOBAL_NOTHING;
-#else
-	startup_options = CURL_GLOBAL_ALL;
-#endif

-	if (curl_global_init(startup_options) != CURLE_OK) {
+	if (curl_global_init(CURL_GLOBAL_SSL) != CURLE_OK) {
 		return FAILURE;
 	}

@@ -319,7 +311,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)

 		ZVAL_RESOURCE(argv[0], ch->id);
 		zend_list_addref(ch->id);
-		ZVAL_STRINGL(argv[1], data, (int) length, 1);
+		ZVAL_STRINGL(argv[1], data, length, 1);

 		error = call_user_function(EG(function_table),
 		                           NULL,
@@ -373,7 +365,7 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
 		zend_list_addref(ch->id);
 		ZVAL_RESOURCE(argv[1], t->fd);
 		zend_list_addref(t->fd);
-		ZVAL_LONG(argv[2], size * nmemb);
+		ZVAL_LONG(argv[2], (int) size * nmemb);

 		error = call_user_function(EG(function_table),
 		                           NULL,
@@ -406,8 +398,7 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
 {
 	php_curl       *ch  = (php_curl *) ctx;
 	php_curl_write *t   = ch->handlers->write_header;
-	int             error;
-	int             length;
+	size_t          length = size * nmemb;
 	TSRMLS_FETCH();
 	
 	switch (t->method) {
@@ -415,33 +406,30 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
 		/* Handle special case write when we're returning the entire transfer
 		 */
 		if (ch->handlers->write->method == PHP_CURL_RETURN)
-			smart_str_appendl(&ch->handlers->write->buf, data, size * nmemb);
+			smart_str_appendl(&ch->handlers->write->buf, data, (int) length);
 		else
 			PUTS(data);
-
-		length = size * nmemb;
-
 		break;
 	case PHP_CURL_FILE:
-		length = fwrite(data, size, nmemb, t->fp);
-		break;
+		return fwrite(data, size, nmemb, t->fp);
 	case PHP_CURL_USER: {
 		zval *argv[2];
 		zval *retval;
+		int   error;
 		TSRMLS_FETCH();
-	
+
 		MAKE_STD_ZVAL(argv[0]);
 		MAKE_STD_ZVAL(argv[1]);
 		MAKE_STD_ZVAL(retval);

 		ZVAL_RESOURCE(argv[0], ch->id);
 		zend_list_addref(ch->id);
-		ZVAL_STRINGL(argv[0], data, size * nmemb, 1);
+		ZVAL_STRINGL(argv[1], data, length, 1);

-		error = call_user_function(EG(function_table), 
-	    	                       NULL,
+		error = call_user_function(EG(function_table),
+		                           NULL,
 		                           t->func,
-	        	                   retval, 2, argv TSRMLS_CC);
+		                           retval, 2, argv TSRMLS_CC);
 		if (error == FAILURE) {
 			php_error(E_WARNING, "Couldn't call the CURLOPT_HEADERFUNCTION");
 			length = -1;
@@ -449,17 +437,14 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
 		else {
 			length = Z_LVAL_P(retval);
 		}
-
 		zval_ptr_dtor(&argv[0]);
 		zval_ptr_dtor(&argv[1]);
 		zval_ptr_dtor(&retval);
 		break;
 	}
 	case PHP_CURL_IGNORE:
-		length = size * nmemb;
-		break;
-	}
-	
+		return length;
+    	}
 	return length;
 }
 /* }}} */
@@ -557,7 +542,6 @@ static void alloc_curl_handle(php_curl **ch)
 	(*ch)->handlers->write = ecalloc(1, sizeof(php_curl_write));
 	(*ch)->handlers->write_header = ecalloc(1, sizeof(php_curl_write));
 	(*ch)->handlers->read  = ecalloc(1, sizeof(php_curl_read));
-	(*ch)->performed = 0;
 	memset(&(*ch)->err, 0, sizeof((*ch)->err));
 	
 	zend_llist_init(&(*ch)->to_free.str, sizeof(char *), 
@@ -773,6 +757,7 @@ PHP_FUNCTION(curl_setopt)
 			HashTable        *postfields;
 			struct HttpPost  *first = NULL;
 			struct HttpPost  *last  = NULL;
+			char             *postval;
 			char             *string_key = NULL;
 			ulong             num_key;
 			uint              string_key_len;
@@ -791,13 +776,22 @@ PHP_FUNCTION(curl_setopt)
 				convert_to_string_ex(current);

 				zend_hash_get_current_key_ex(postfields, &string_key, &string_key_len, &num_key, 0, NULL);
-
-				error = curl_formadd(&first, &last, CURLFORM_COPYNAME, string_key, 
-									 CURLFORM_PTRCONTENTS, Z_STRVAL_PP(current), CURLFORM_END);
+				
+				postval = Z_STRVAL_PP(current);
+				if (*postval == '@') {
+					error = curl_formadd(&first, &last, CURLFORM_COPYNAME, string_key, 
+					                     CURLFORM_FILE, ++postval, CURLFORM_END);
+				}
+				else {
+					error = curl_formadd(&first, &last, CURLFORM_COPYNAME, string_key, 
+										 CURLFORM_PTRCONTENTS, postval, 
+										 CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(current),
+										 CURLFORM_END);
+				}
 			}

+			SAVE_CURL_ERROR(ch, error);
 			if (error != CURLE_OK) {
-				SAVE_CURL_ERROR(ch, error);
 				RETURN_FALSE;
 			}

@@ -855,9 +849,9 @@ PHP_FUNCTION(curl_setopt)
 		break;
 	}
 	}
-	
+
+	SAVE_CURL_ERROR(ch, error);
 	if (error != CURLE_OK) {
-		SAVE_CURL_ERROR(ch, error);
 		RETURN_FALSE;
 	} else {
 		RETURN_TRUE;
@@ -879,22 +873,15 @@ PHP_FUNCTION(curl_exec)
 	}
 	ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);

-	if (ch->performed) {
-		php_error(E_WARNING, "Multiple executions on the same handle are not currently supported, please upgrade to the next version of PHP");
-		RETURN_FALSE;
-	}
-
 	error = curl_easy_perform(ch->cp);
+	SAVE_CURL_ERROR(ch, error);
 	if (error != CURLE_OK) {
-		if (ch->handlers->write->buf.c)
+		if (ch->handlers->write->buf.len > 0)
 			smart_str_free(&ch->handlers->write->buf);
-		SAVE_CURL_ERROR(ch, error);
 		RETURN_FALSE;
 	}

-	ch->performed = 1;
-
-	if (ch->handlers->write->method == PHP_CURL_RETURN) {
+	if (ch->handlers->write->method == PHP_CURL_RETURN && ch->handlers->write->buf.len > 0) {
 		if (ch->handlers->write->type != PHP_CURL_BINARY) 
 			smart_str_0(&ch->handlers->write->buf);
 		RETURN_STRINGL(ch->handlers->write->buf.c, ch->handlers->write->buf.len, 0);
@@ -46,7 +46,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_CURL" /D ZTS=1 /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /D "WIN32" /D "CURL_EXPORTS" /D "COMPILE_DL_CURL" /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /I "..\..\..\php_build\curl\include" /D "WIN32" /D "CURL_EXPORTS" /D "COMPILE_DL_CURL" /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x406 /d "NDEBUG"
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php4ts.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
 # SUBTRACT LINK32 /pdb:none

 !ELSEIF  "$(CFG)" == "curl - Win32 Debug_TS"
@@ -74,7 +74,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_CURL" /D ZTS=1 /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURL_EXPORTS" /D "COMPILE_DL_CURL" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_CURL=1 /FR /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /I "..\..\..\php_build\curl\include" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURL_EXPORTS" /D "COMPILE_DL_CURL" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_CURL=1 /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x406 /d "NDEBUG"
@@ -84,7 +84,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS"
+# ADD LINK32 php4ts_debug.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib"
 # SUBTRACT LINK32 /pdb:none

 !ELSEIF  "$(CFG)" == "curl - Win32 Debug_TS_SSL"
@@ -102,7 +102,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURL_EXPORTS" /D "COMPILE_DL_CURL" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_CURL=1 /FR /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURL_EXPORTS" /D "COMPILE_DL_CURL" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_CURL=1 /FR /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /I "..\..\..\php_build\curl\include" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURL_EXPORTS" /D "COMPILE_DL_CURL" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_CURL=1 /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x406 /d "NDEBUG"
@@ -113,7 +113,7 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 php4ts_debug.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS"
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 php4ts_debug.lib libcurl.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS"
+# ADD LINK32 php4ts_debug.lib libcurl.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 !ELSEIF  "$(CFG)" == "curl - Win32 Release_TS_SSL"
@@ -131,7 +131,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /D "WIN32" /D "CURL_EXPORTS" /D "COMPILE_DL_CURL" /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /D "WIN32" /D "CURL_EXPORTS" /D "COMPILE_DL_CURL" /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /I "..\..\..\php_build\curl\include" /D "WIN32" /D "CURL_EXPORTS" /D "COMPILE_DL_CURL" /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x406 /d "NDEBUG"
@@ -142,7 +142,7 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 php4ts.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 php4ts.lib libcurl.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php4ts.lib libcurl.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
 # SUBTRACT LINK32 /pdb:none

 !ENDIF 
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -91,7 +91,6 @@ typedef struct {
 	struct _php_curl_error   err;
 	struct _php_curl_free    to_free;
 	long                     id;
-    int                      performed;
 } php_curl;


@@ -1,5 +1,6 @@
-dnl config.m4 for extension CyberCash
-dnl don't forget to call PHP_EXTENSION(cybercash)
+dnl
+dnl $Id$
+dnl

 AC_MSG_CHECKING(for CyberCash support)
 AC_ARG_WITH(cybercash,
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -72,7 +72,7 @@ PHP_MINFO_FUNCTION(cybercash)
 }
 /* }}} */

-/* {{{ proto cybercash_encr(string wmk, string sk, string data)
+/* {{{ proto array cybercash_encr(string wmk, string sk, string data)
   Cybercash encrypt */
 PHP_FUNCTION(cybercash_encr)
 {
@@ -225,6 +225,6 @@ PHP_FUNCTION(cybercash_base64_decode)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Evan Klinger <evan715@sirius.com>                           |
+   | Author: Evan Klinger <evan715@sirius.com>                            |
   +----------------------------------------------------------------------+
 */

@@ -36,7 +36,7 @@
   $more=list($key,$val)=each($CCNVList);
   while(!$done)
   {
-     $pairs.=chop($key)."=".urlencode(chop($val));
+     $pairs.=rtrim($key)."=".urlencode(rtrim($val));
     
     $more=list($key,$val)=each($CCNVList);
     if($more)
@@ -1,11 +1,10 @@
+dnl
 dnl $Id$
-dnl config.m4 for extension cybermut
-
+dnl

 PHP_ARG_WITH(cybermut, for cybermut support,
 [  --with-cybermut[=DIR]   Include CyberMut (french Credit Mutuel telepaiement)])

-
 if test "$PHP_CYBERMUT" != "no"; then
  for i in /usr/local /usr $PHP_CYBERMUT; do
    if test -r $i/cm-mac.h; then
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Sylvain PAGES <spages@free.fr>                              |
+   | Author: Sylvain PAGES <spages@free.fr>                               |
   +----------------------------------------------------------------------+
 */

@@ -86,9 +86,7 @@ PHP_MINFO_FUNCTION(cybermut)
 /* }}} */

 /* {{{ proto string cybermut_creerformulairecm(string url_CM, string version, string TPE, string montant, string ref_commande, string texte_libre, string url_retour, string url_retour_ok, string url_retour_err, string langue, string code_societe, string texte_bouton)
-   Return a string containing source HTML of the form of request for payment.
-   This result corresponds to the last parameter "formulaire" of the original function 
-   which was removed */
+   Returns a string containing source HTML of the form of request for payment. This result corresponds to the last parameter "formulaire" of the original function which was removed */
 PHP_FUNCTION(cybermut_creerformulairecm)
 {
 	zval **url_CM, **version, **TPE, **montant, **ref_commande, **texte_libre, **url_retour, **url_retour_ok, **url_retour_err, **langue, **code_societe, **texte_bouton;
@@ -121,9 +119,7 @@ PHP_FUNCTION(cybermut_creerformulairecm)
 /* }}} */

 /* {{{ proto bool cybermut_testmac(string code_MAC, string version, string TPE, string cdate, string montant, string ref_commande, string texte_libre, string code_retour)
-   Return a boolean attesting that the authentification proceeded well 
-   true : the received message is authenticated 
-   false: if not */
+   Returns a boolean attesting that the authentification proceeded well. TRUE if the received message is authenticated and FALSE if not */ 
 PHP_FUNCTION(cybermut_testmac)
 {
 	zval **code_MAC, **version, **TPE, **cdate, **montant, **ref_commande, **texte_libre, **code_retour;
@@ -154,10 +150,7 @@ PHP_FUNCTION(cybermut_testmac)
 /* }}} */

 /* {{{ proto string cybermut_creerreponsecm(string phrase)
-   Return a string containing the message of acknowledgement of delivery 
-	(headers and body of the message).
-   This result corresponds to the last parameter "reponse" of the original function
-   which was removed. */
+   Returns a string containing the message of acknowledgement of delivery (headers and body of the message). This result corresponds to the last parameter "reponse" of the original function which was removed */
 PHP_FUNCTION(cybermut_creerreponsecm)
 {
 	zval **phrase;
@@ -180,6 +173,6 @@ PHP_FUNCTION(cybermut_creerreponsecm)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+   | 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        |
@@ -12,8 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Sylvain PAGES <spages@free.fr>                              |
-   |                                                                      |
+   | Author: Sylvain PAGES <spages@free.fr>                               |
   +----------------------------------------------------------------------+
 */

@@ -1,7 +1,9 @@
-dnl config.m4 for extension cyrus
+dnl
+dnl $Id$
+dnl

 PHP_ARG_WITH(cyrus, for cyrus imap support,
-[  --with-cyrus             Include cyrus imap support])
+[  --with-cyrus            Include cyrus imap support])

 if test "$PHP_CYRUS" != "no"; then
 	found_cyrus=no
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Sterling Hughes <sterling@php.net>                          |
+   | Author: Sterling Hughes <sterling@php.net>                           |
   +----------------------------------------------------------------------+
 */

@@ -85,9 +85,9 @@ PHP_MINIT_FUNCTION(cyrus)
 	le_cyrus = zend_register_list_destructors_ex(cyrus_free, NULL, 
 	                                             le_cyrus_name, module_number);

-	REGISTER_LONG_CONSTANT("CYRUS_CONN_NOSYNCLITERAL", 
-	                       IMCLIENT_CONN_NOSYNCLITERAL,
-	                       CONST_CS_ | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CYRUS_CONN_NONSYNCLITERAL", 
+	                       IMCLIENT_CONN_NONSYNCLITERAL,
+	                       CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CYRUS_CONN_INITIALRESPONSE", 
 	                       IMCLIENT_CONN_INITIALRESPONSE,
 	                       CONST_CS | CONST_PERSISTENT);
@@ -111,6 +111,8 @@ extern void fatal(char *s, int exit)
 	php_error(E_ERROR, s);
 }

+/* {{{ proto resource cyrus_connect([ string host [, string port [, int flags]]])
+   Connect to a Cyrus IMAP server */
 PHP_FUNCTION(cyrus_connect)
 {
 	zval            **z_host;
@@ -176,6 +178,8 @@ PHP_FUNCTION(cyrus_connect)
 	ZEND_REGISTER_RESOURCE(return_value, conn, le_cyrus);
 	conn->id = Z_LVAL_P(return_value);
 }
+/* }}} */
+

 static void cyrus_capable_callback(struct imclient *client, void *rock, 
                                   struct imclient_reply *reply)
@@ -197,6 +201,9 @@ static void cyrus_capable_callback(struct imclient *client, void *rock,
 	}
 }

+
+/* {{{ proto bool cyrus_authenticate( resource connection [, string mechlist [, string service [, string user [, int minssf [, int maxssf]]]]])
+   Authenticate agaings a Cyrus IMAP server */
 PHP_FUNCTION(cyrus_authenticate)
 {
 	zval        **z_conn;
@@ -268,13 +275,13 @@ PHP_FUNCTION(cyrus_authenticate)
 	}
 	else {
 		/* XXX: UGLY, but works, determines the username to use */
-		user = sapi_getenv("USER", 4);
+		user = (char *) sapi_getenv("USER", 4);
 		if (! user) {
-		user = getenv("USER");
+		user = (char *) getenv("USER");
 		if (! user) {
-			user = sapi_getenv("LOGNAME", 7);
+			user = (char *) sapi_getenv("LOGNAME", 7);
 			if (! user) {
-			user = getenv("LOGNAME");
+			user = (char *) getenv("LOGNAME");
 			if (! user) {
 				struct passwd *pwd = getpwuid(getuid());
 				if (! pwd) {
@@ -314,6 +321,8 @@ PHP_FUNCTION(cyrus_authenticate)
 	efree(service);
 	efree(user);
 }
+/* }}} */
+

 static void cyrus_generic_callback(struct imclient *client, 
                                   void *rock, 
@@ -348,7 +357,7 @@ static void cyrus_generic_callback(struct imclient *client,
 		argv[3] = &msgno;

 		if (call_user_function_ex(EG(function_table), NULL, callback->function, 
-                                  &retval, 4, argv, 0, NULL) == FAILURE) {
+                                  &retval, 4, argv, 0, NULL TSRMLS_CC) == FAILURE) {
 			php_error(E_WARNING, "Couldn't call the %s handler", 
 			          callback->trigger);
 		}
@@ -366,7 +375,8 @@ static void cyrus_generic_callback(struct imclient *client,
 }

 	
-
+/* {{{ proto bool cyrus_bind( resource connection, array callbacks) 
+ Bind callbacks to a Cyrus IMAP connection */
 PHP_FUNCTION(cyrus_bind)
 {
 	zval                  **z_conn;
@@ -378,8 +388,8 @@ PHP_FUNCTION(cyrus_bind)
 	char                  *string_key;
 	ulong                  num_key;

-	if (ZEND_NUM_ARGS() != 3 ||
-	    zend_get_parameters_ex(3, &z_conn, &z_callback) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 ||
+	    zend_get_parameters_ex(2, &z_conn, &z_callback) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}

@@ -431,7 +441,10 @@ PHP_FUNCTION(cyrus_bind)

 	RETURN_TRUE;
 }
+/* }}} */

+/* {{{ proto bool cyrus_unbind( resource connection, string trigger_name)
+   Unbind ... */
 PHP_FUNCTION(cyrus_unbind)
 {
 	zval        **z_conn;
@@ -450,7 +463,10 @@ PHP_FUNCTION(cyrus_unbind)

 	RETURN_TRUE;
 }
+/* }}} */

+/* {{{ proto bool cyrus_query( resource connection, string query) 
+   Send a query to a Cyrus IMAP server */
 PHP_FUNCTION(cyrus_query)
 {
 	zval               **z_conn;
@@ -464,13 +480,14 @@ PHP_FUNCTION(cyrus_query)
 	ZEND_FETCH_RESOURCE(conn, php_cyrus *, z_conn, -1, le_cyrus_name, le_cyrus);
 	convert_to_string_ex(query);

-	if (imclient_send(conn->client, NULL, NULL, Z_STRVAL_PP(query)) != 0) 
-		RETURN_FALSE;
+	imclient_send(conn->client, NULL, NULL, Z_STRVAL_PP(query)); 

 	RETURN_TRUE;
 }
+/* }}} */

-
+/* {{{ proto bool cyrus_close( resource connection)
+   Close connection to a cyrus server */
 PHP_FUNCTION(cyrus_close)
 {
 	zval      **z_conn;
@@ -486,7 +503,7 @@ PHP_FUNCTION(cyrus_close)

 	RETURN_TRUE;
 }
-
+/* }}} */
 #endif


@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Sterling Hughes <sterling@php.net>                          |
+   | Author: Sterling Hughes <sterling@php.net>                           |
   +----------------------------------------------------------------------+
 */

@@ -1,7 +1,6 @@
+dnl
 dnl $Id$
-dnl config.m4 for extension db
-dnl don't forget to call PHP_EXTENSION(db)
-
+dnl 

 # Checks for libraries.
 # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order
@@ -26,7 +25,7 @@ AC_DEFUN(AC_PREFERRED_DB_LIB,[
 ])


-PHP_ARG_WITH(db, whether to include old xDBM support,
+PHP_ARG_WITH(db, for xDBM support,
 [  --with-db               Include old xDBM support (deprecated)])

 if test "$PHP_DB" != "no"; then
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
+   | Authors: Rasmus Lerdorf <rasmus@php.net>                             |
   |          Jim Winstead <jimw@php.net>                                 |
   +----------------------------------------------------------------------+
 */
@@ -20,8 +20,6 @@
 /* $Id$ */
 #define IS_EXT_MODULE

-#if 1
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -158,14 +156,6 @@ datum flatfile_nextkey(FILE *dbf);

 static int le_db;

-#if THREAD_SAFE
-DWORD DbmTls;
-static int numthreads=0;
-#endif
-
-/*needed for blocking calls in windows*/
-void *dbm_mutex;
-
 /* {{{ php_find_dbm
 */
 dbm_info *php_find_dbm(pval *id TSRMLS_DC)
@@ -447,7 +437,7 @@ PHP_FUNCTION(dbmclose)

 /* {{{ php_dbm_close
 */
-int php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+void php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 {
 	int ret = 0;
 	dbm_info *info = (dbm_info *)rsrc->ptr;
@@ -473,8 +463,6 @@ int php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 	if (info->filename) efree(info->filename);
 	if (info->lockfn) efree(info->lockfn);
 	efree(info);
-
-	return(ret);
 }
 /* }}} */

@@ -1161,50 +1149,11 @@ datum flatfile_nextkey(FILE *dbf) {
 */
 PHP_MINIT_FUNCTION(db)
 {
-#if defined(THREAD_SAFE)
-	dbm_global_struct *dbm_globals;
-	PHP_MUTEX_ALLOC(dbm_mutex);
-	PHP_MUTEX_LOCK(dbm_mutex);
-	numthreads++;
-	if (numthreads==1){
-		if (!PHP3_TLS_PROC_STARTUP(DbmTls)){
-			PHP_MUTEX_UNLOCK(dbm_mutex);
-			PHP_MUTEX_FREE(dbm_mutex);
-			return FAILURE;
-		}
-	}
-	PHP_MUTEX_UNLOCK(dbm_mutex);
-	if(!PHP3_TLS_THREAD_INIT(DbmTls, dbm_globals, dbm_global_struct)){
-		PHP_MUTEX_FREE(dbm_mutex);
-		return FAILURE;
-	}
-#endif
-
 	le_db = zend_register_list_destructors_ex(php_dbm_close, NULL, "dbm", module_number);
 	return SUCCESS;
 }
 /* }}} */

-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
-static PHP_MSHUTDOWN_FUNCTION(db)
-{
-#ifdef THREAD_SAFE
-	PHP3_TLS_THREAD_FREE(dbm_globals);
-	PHP_MUTEX_LOCK(dbm_mutex);
-	numthreads--;
-	if (numthreads<1) {
-		PHP3_TLS_PROC_SHUTDOWN(DbmTls);
-		PHP_MUTEX_UNLOCK(dbm_mutex);
-		PHP_MUTEX_FREE(dbm_mutex);
-		return SUCCESS;
-	}
-	PHP_MUTEX_UNLOCK(dbm_mutex);
-#endif
-	return SUCCESS;
-}
-/* }}} */
-
 /* {{{ PHP_RINIT_FUNCTION
 */
 PHP_RINIT_FUNCTION(db)
@@ -1234,29 +1183,27 @@ function_entry dbm_functions[] = {
 /* }}} */

 zend_module_entry dbm_module_entry = {
-    STANDARD_MODULE_HEADER,
+	STANDARD_MODULE_HEADER,
 	"db",
-    dbm_functions,
-    PHP_MINIT(db),
-    PHP_MSHUTDOWN(db),
-    PHP_RINIT(db),
-    NULL,
-    PHP_MINFO(db),
-    NO_VERSION_YET,
-    STANDARD_MODULE_PROPERTIES
+	dbm_functions,
+	PHP_MINIT(db),
+	NULL,
+	PHP_RINIT(db),
+	NULL,
+	PHP_MINFO(db),
+	NO_VERSION_YET,
+	STANDARD_MODULE_PROPERTIES
 };

 #ifdef COMPILE_DL_DB
 ZEND_GET_MODULE(dbm)
 #endif

-#endif
-
 /*
 * Local variables:
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /machine:I386
-# ADD LINK32 libdb31s.lib php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_db.dll" /libpath:"..\..\Debug_TS"
+# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_db.dll" /libpath:"..\..\Debug_TS"

 !ENDIF 

@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
+   | Authors: Rasmus Lerdorf <rasmus@php.net>                             |
   |          Jim Winstead <jimw@php.net>                                 |
   +----------------------------------------------------------------------+
 */
@@ -52,7 +52,7 @@ typedef struct dbm_info {
 #endif

 dbm_info *php_find_dbm(pval *id TSRMLS_DC);
-int php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
+void php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 dbm_info *php_dbm_open(char *filename, char *mode TSRMLS_DC);
 int php_dbm_insert(dbm_info *info, char *key, char *value TSRMLS_DC);
 char *php_dbm_fetch(dbm_info *info, char *key TSRMLS_DC);
@@ -1,6 +1,6 @@
+dnl
 dnl $Id$
-dnl config.m4 for extension dba
-dnl don't forget to call PHP_EXTENSION(dba)
+dnl

 AC_DEFUN(PHP_TEMP_LDFLAGS,[
  old_LDFLAGS=$LDFLAGS
@@ -230,6 +230,5 @@ if test "$HAVE_DBA" = "1"; then
  PHP_SUBST(DBA_SHARED_LIBADD)
 else
  AC_MSG_RESULT(no)
-  AC_DEFINE(HAVE_DBA, 0, [ ])
 fi

@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+   | Author: Sascha Schumann <sascha@schumann.cx>                         |
   +----------------------------------------------------------------------+
 */

@@ -314,15 +314,15 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 	}
 	
 	for(hptr = handler; hptr->name &&
-			strcasecmp(hptr->name, (*args[2])->value.str.val); hptr++);
+			strcasecmp(hptr->name, Z_STRVAL_PP(args[2])); hptr++);

 	if(!hptr->name) {
-		php_error(E_WARNING, "no such handler: %s", (*args[2])->value.str.val);
+		php_error(E_WARNING, "no such handler: %s", Z_STRVAL_PP(args[2]));
 		FREENOW;
 		RETURN_FALSE;
 	}

-	switch((*args[1])->value.str.val[0]) {
+	switch(Z_STRVAL_PP(args[1])[0]) {
 		case 'c': 
 			modenr = DBA_CREAT; 
 			break;
@@ -336,14 +336,14 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			modenr = DBA_TRUNC;
 			break;
 		default:
-			php_error(E_WARNING, "illegal DBA mode: %s", (*args[1])->value.str.val);
+			php_error(E_WARNING, "illegal DBA mode: %s", Z_STRVAL_PP(args[1]));
 			FREENOW;
 			RETURN_FALSE;
 	}
 			
 	info = malloc(sizeof(*info));
 	memset(info, 0, sizeof(info));
-	info->path = strdup((*args[0])->value.str.val);
+	info->path = strdup(Z_STRVAL_PP(args[0]));
 	info->mode = modenr;
 	info->argc = ac - 3;
 	info->argv = args + 3;
@@ -518,6 +518,6 @@ PHP_FUNCTION(dba_sync)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,12 +12,16 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+   | Author: Sascha Schumann <sascha@schumann.cx>                         |
   +----------------------------------------------------------------------+
 */

 /* $Id$ */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"

 #if DBA_CDB
@@ -213,6 +217,6 @@ DBA_SYNC_FUNC(cdb)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,12 +12,16 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+   | Author: Sascha Schumann <sascha@schumann.cx>                         |
   +----------------------------------------------------------------------+
 */

 /* $Id$ */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"

 #if DBA_DB2
@@ -47,13 +51,15 @@ DBA_OPEN_FUNC(db2)
 	int gmode = 0;
 	int filemode = 0644;
 	struct stat check_stat;
-	
+	int s = VCWD_STAT(info->path, &check_stat);
+
 	type =  info->mode == DBA_READER ? DB_UNKNOWN :
 		info->mode == DBA_TRUNC ? DB_BTREE :
-		VCWD_STAT(info->path, &check_stat) ? DB_BTREE : DB_UNKNOWN;
+		s ? DB_BTREE : DB_UNKNOWN;
 	  
 	gmode = info->mode == DBA_READER ? DB_RDONLY :
-		info->mode == DBA_CREAT  ? DB_CREATE : 
+		(info->mode == DBA_CREAT && s) ? DB_CREATE : 
+		(info->mode == DBA_CREAT && !s) ? 0 :
 		info->mode == DBA_WRITER ? 0         : 
 		info->mode == DBA_TRUNC ? DB_CREATE | DB_TRUNCATE : -1;

@@ -62,7 +68,7 @@ DBA_OPEN_FUNC(db2)

 	if(info->argc > 0) {
 		convert_to_long_ex(info->argv[0]);
-		filemode = (*info->argv[0])->value.lval;
+		filemode = Z_LVAL_PP(info->argv[0]);
 	}

 	if(!db_open(info->path, type, gmode, filemode, NULL, NULL, &dbp)) {
@@ -194,6 +200,6 @@ DBA_SYNC_FUNC(db2)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,12 +12,16 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+   | Author: Sascha Schumann <sascha@schumann.cx>                         |
   +----------------------------------------------------------------------+
 */

 /* $Id$ */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"

 #if DBA_DB3
@@ -49,13 +53,15 @@ DBA_OPEN_FUNC(db3)
 	int gmode = 0;
 	int filemode = 0644;
 	struct stat check_stat;
+	int s = VCWD_STAT(info->path, &check_stat);

 	type =  info->mode == DBA_READER ? DB_UNKNOWN :
 		info->mode == DBA_TRUNC ? DB_BTREE :
-		VCWD_STAT(info->path, &check_stat) ? DB_BTREE : DB_UNKNOWN;
+		s? DB_BTREE : DB_UNKNOWN;
 	  
 	gmode = info->mode == DBA_READER ? DB_RDONLY :
-		info->mode == DBA_CREAT  ? DB_CREATE : 
+		(info->mode == DBA_CREAT && s) ? DB_CREATE : 
+		(info->mode == DBA_CREAT && !s) ? 0 :
 		info->mode == DBA_WRITER ? 0         : 
 		info->mode == DBA_TRUNC ? DB_CREATE | DB_TRUNCATE : -1;

@@ -64,7 +70,7 @@ DBA_OPEN_FUNC(db3)

 	if (info->argc > 0) {
 		convert_to_long_ex(info->argv[0]);
-		filemode = (*info->argv[0])->value.lval;
+		filemode = Z_LVAL_PP(info->argv[0]);
 	}

 	if (db_create(&dbp, NULL, 0) == 0 &&
@@ -201,6 +207,6 @@ DBA_SYNC_FUNC(db3)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,12 +12,16 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+   | Author: Sascha Schumann <sascha@schumann.cx>                         |
   +----------------------------------------------------------------------+
 */

 /* $Id$ */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"

 #if DBA_DBM
@@ -52,7 +56,7 @@ DBA_OPEN_FUNC(dbm)

 	if(info->argc > 0) {
 		convert_to_long_ex(info->argv[0]);
-		filemode = (*info->argv[0])->value.lval;
+		filemode = Z_LVAL_PP(info->argv[0]);
 	}
 	
 	if(info->mode == DBA_TRUNC) {
@@ -179,6 +183,6 @@ DBA_SYNC_FUNC(dbm)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,12 +12,16 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+   | Author: Sascha Schumann <sascha@schumann.cx>                         |
   +----------------------------------------------------------------------+
 */

 /* $Id$ */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"

 #if DBA_GDBM
@@ -49,7 +53,7 @@ DBA_OPEN_FUNC(gdbm)

 	if(info->argc > 0) {
 		convert_to_long_ex(info->argv[0]);
-		filemode = (*info->argv[0])->value.lval;
+		filemode = Z_LVAL_PP(info->argv[0]);
 	}

 	dbf = gdbm_open(info->path, 0, gmode, filemode, NULL);
@@ -182,6 +186,6 @@ DBA_SYNC_FUNC(gdbm)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,12 +12,16 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+   | Author: Sascha Schumann <sascha@schumann.cx>                         |
   +----------------------------------------------------------------------+
 */

 /* $Id$ */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"

 #if DBA_NDBM
@@ -56,7 +60,7 @@ DBA_OPEN_FUNC(ndbm)

 	if(info->argc > 0) {
 		convert_to_long_ex(info->argv[0]);
-		filemode = (*info->argv[0])->value.lval;
+		filemode = Z_LVAL_PP(info->argv[0]);
 	}

 	dbf = dbm_open(info->path, gmode, filemode);
@@ -159,6 +163,6 @@ DBA_SYNC_FUNC(ndbm)
 * tab-width: 4
 * c-basic-offset: 4
 * End:
- * vim600: sw=4 ts=4 tw=78 fdm=marker
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
 */
@@ -1,8 +1,8 @@
 /*
   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2001 The PHP Group                                |
+   | 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        |
@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-   | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+   | Author: Sascha Schumann <sascha@schumann.cx>                         |
   +----------------------------------------------------------------------+
 */

@@ -1,8 +1,10 @@
+dnl
 dnl $Id$
+dnl

 AC_ARG_WITH(dbase,[],[enable_dbase=$withval])

-PHP_ARG_ENABLE(dbase,whether to enable the bundled dbase library,
+PHP_ARG_ENABLE(dbase,whether to enable dbase support,
 [  --enable-dbase          Enable the bundled dbase library])

 if test "$PHP_DBASE" = "yes"; then