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

- within a class scope.
- Fix the Zend.dsp project a bit. It seems someone pretty much killed it
- when commiting their own personal configuration. Please be careful in
- future.

CODING_STANDARDS

@@ -111,7 +111,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,7 +132,7 @@ 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.
     
 [3] Be generous with whitespace and braces.  Always prefer:
@@ -145,7 +145,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 +163,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 +184,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 +199,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 +215,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.

EXTENSIONS

@@ -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 ==
@@ -135,8 +140,8 @@ 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
 -------------------------------------------------------------------------------
 EXTENSION:           sybase
@@ -299,8 +304,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
 -------------------------------------------------------------------------------
@@ -401,7 +411,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
 -------------------------------------------------------------------------------

NEWS

@@ -1,62 +1,139 @@
-PHP 4.0                                                                    NEWS
+PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 200?, Version 4.0.8-dev
-- Added new function pcntl_exec, which behaves similar to execve.
-- initial support of mnogosearch-3.2.x has been added. Not all features
-  are implemented currently.
-- Fix segfault and check for truecolor image in ImageColorAt (Rasmus)
-- nl2br now handles all styles of line-endings in one string. (Boian,
-  Derick)
-- Added mcrypt_generic_deinit to replace mcrypt_generic_end. (Derick)
+?? ??? 200?, Version 4.2.0-dev
+- Added concepts to IRCG: bailout-on-trivial issue, write output to
+  files, fetch a ressource upon connection end. (Sascha)
+- Fixed POST-related bugs in thttpd, added QUERY_STRING, HTTP_HOST,
+  HTTP_ACCEPT_LANGUAGE to the script environment, improved patch
+  to send correct MIME types, and added support for /nocache/. (Sascha)
+- Fixed several bugs and memleaks in the domxml extension. (Markus)
+- Added var_export() which outputs a representation of a variable as reusable 
+  PHP code. (Derick)
+- Added -w option to the cgi-version which strips all comments and whitespace
+  from the script. (Thies)
+- Added support for SO_RCVTIMEO and SO_SNDTIMEO to ext/sockets. (Jason)
+- Added ob_get_level() which returns the nesting level of the output buffering
+  mechanism. (Yasuo, Derick)
+- Added ob_flush() and ob_clean() functions which flush and clean an output 
+  buffer without destroying the buffer. (Derick)
+- Added a parameter to mysql_connect() to force a new database link to be
+  created. (Markus, Derick)
+- Added ldap_sort() function. (Stig Venaas)
+- Added md5_file(), which calculaties 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)
+- Fixed Bug #9878. Patch by bfoddy@mediaone.net. (jmoore)
+- Removed warning message about NONEXISTENT character set from mysql_connect() 
+  when the server's default character set != latin1. (Mysql Team)
+- Added Direct I/O extension for lowlevel access to the POSIX layer. (sterling)
+- New SAPI module for the WebJames server on RISC OS. (Alex Waugh)
+- Made ldap_add (and modify) functions to throw a warning with illegal value 
+  arrays. Previously segfaulted or added wrong value. (Stig Venaas)
+- Added Udm_Check_Charset() function into mnoGoSearch extension. (gluke)
+- Fixed mnoGoSearch extension to support mnogosearch-3.2.x. (gluke)
+- Fixed bug #13885 (gmdate() timezone handling on windows). (jmoore)
+- Fixed behaviour of strtok(). Bug #13866. (jmoore)
+- Made fbsql_num_rows() to return the correct value on all select statements.
+  (Frank)
+- Fixed HTTP file upload support to handle big files better. (Jani)
+- Added array_chunk() function that splits an array into chunks of specified
+  size. (Andrei)
+- Fixed a bug which caused $HTTP_RAW_POST_DATA not to be populated on a missing
+  content-type even when always_populate_raw_post_data was On - fixed. (Rasmus)
+- Added session_cache_expire() function. Patch by anuradha@gnu.org (Andrei)
+- 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)
+- Have rand() and mt_rand() seed automatically if srand() or mt_srand() has
+  not been called. (Sterling)
+- Fixed is_dir(), is_writeable(), is_readable(), is_executable(), is_link() and
+  is_file() functions to not throw a 'file does not exist' warning. (Sterling)
+- Added array_change_key_case() function that returns array with
+  with all string keys lowercased or uppercased. (EdinK)
+- 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)
-- Let settype also accept 'int', 'bool', 'float' and 'null'. (Jeroen)
-- Added IPv6 support to gethostbyaddr()
+- Added support for 'int', 'bool', 'float' and 'null' for settype(). (Jeroen)
+- Added IPv6 support to gethostbyaddr().
   (Patch by Matthias Wimmer <matthias@charente.de> and venaas)
-- Make the seed options to srand() and mt_srand() optional, if the seed is
-  not specified, the generate the most random seed possible. (Sterling)
-- A bug fixed when tryint to return NULL strings.
-  Added a new example of building search frontend based on mnoGoSearch
-  extension.
-- Fix for LONG_VARCHAR type crashing submitted by Walter Franzini.
-  (walter@sys-net.it)
-- Made in_array() and search_array() allow the needle to be an array in
-  itself. (Andrei)
+- Made the seed options to srand() and mt_srand() optional. If the seed is
+  not specified generate the most random seed possible. (Sterling)
+- Fixed LONG_VARCHAR type crashing in ODBC extension. Patch by Walter Franzini.
+  (kalowsky)
+- Made in_array() and search_array() allow the needle to be an array in itself.
+  (Andrei)
 - Added ini_get_all() function which returns all registered ini entries
   or entries for the specified extension. (Jani)
 - Added mailparse_uudecode_all() which extracts all uuencoded attachments
-- Add support for chinese encodings to htmlentities() and htmlspecialchars().
+- Added support for chinese encodings to 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)
 
-?? ??? 200?, Version 4.0.7
-- Fixed pg_last_notice() (could cause random crashes in PostgreSQL applications,
-  even if they didn't use pg_last_notice()) (Zeev)
-- Fixed DOM-XML's error reporting, so E_WARNING errors are given instead of 
+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
+  element if it was a scalar one. (Andrei)
+- Make ImageColorAt() and ImageColorsForIndex() work with TrueColor images.
+  (Rasmus)
+- Fixed a bug in preg_match_all() that would return results under improper 
+  indices in certain cases. (Andrei)
+- Fixed a crash in str_replace() that would happen if search parameter was an
+  array and one of the replacements resulted in subject string being empty.
+  (Andrei)
+- Fixed MySQL extension to work with MySQL 4.0. (Jani)
+- Fixed a crash bug within Cobalt systems. Patch by tomc@tripac.com. (Jani)
+- Bundled Dan Libby's xmlrpc-epi extension.
+- Introduced extension version numbers. (Stig)
+- Added version_compare() function. (Stig)
+- Fixed pg_last_notice() (could cause random crashes in PostgreSQL
+  applications, even if they didn't use pg_last_notice()). (Zeev)
+- Fixed DOM-XML's error reporting, so E_WARNING errors are given instead of
   E_ERROR error's, this allows you to trap errors thrown by DOMXML functions.
   (Sterling)
 - Fixed a bug in the mcrypt extension, where list destructors were not
   properly being allocated. (Sterling)
-- Better Interbase blob, null and error handling (Patch by Jeremy Bettis)
+- Better Interbase blob, null and error handling. (Patch by Jeremy Bettis)
 - Fixed a crash bug in array_map() if the input arrays had string or
   non-sequential keys. Also modified it so that if a single array is passed,
   its keys are preserved in the resulting array. (Andrei)
-- Fixed a crash in dbase_replace_record (Patch by robin.marlow@dps-int.com)
-- Fixed a crash in msql_result() (Zeev)
+- 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
   enumeration. (Alan, Harald)
 - Fixed a bug in dbase_get_record() and dbase_get_record_with_names().
   boolean fields are now returned correctly.
   Patch by Lawrence E. Widman <widman@cardiothink.com> (Jani)
-- Added --version option to php-config (Stig)
+- Added --version option to php-config. (Stig)
 - Improved support for thttpd-2.21b by incorporating patches for all known
-  bugs (Sascha)
+  bugs. (Sascha)
 - Added ircg_get_username, a roomkey argument to ircg_join, error fetching
   infrastructure, a tokenizer to speed up message processing, and fixed
-  a lot of bugs in the IRCG extension (Sascha)
-- Improved speed of the serializer/deserializer (Thies, Sascha)
-- Floating point numbers are better detected when converting from strings
+  a lot of bugs in the IRCG extension. (Sascha)
+- Improved speed of the serializer/deserializer. (Thies, Sascha)
+- Floating point numbers are better detected when converting from strings.
   (Zeev, Zend Engine)
 - Replaced php.ini-optimized with php.ini-recommended.  As the name implies,
   it's warmly recommended to use this file as the basis for your PHP
@@ -303,7 +380,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

README.EXTENSIONS

@@ -0,0 +1,39 @@
+Between PHP 4.0.6 and 4.1.0, the Zend module struct changed in a way
+that broke both source and binary compatibility.  If you are
+maintaining a third party extension, here's how to update it:
+
+If this was your old module entry:
+
+zend_module_entry foo_module_entry = {
+    "foo",                /* extension name */
+    foo_functions,        /* extension function list */
+    NULL,                 /* extension-wide startup function */
+    NULL,                 /* extension-wide shutdown function */
+    PHP_RINIT(foo),       /* per-request startup function */
+    PHP_RSHUTDOWN(foo),   /* per-request shutdown function */
+    PHP_MINFO(foo),       /* information function */
+    STANDARD_MODULE_PROPERTIES
+};
+
+Here's how it should look if you want your code to build with PHP
+4.1.0 and up:
+
+zend_module_entry foo_module_entry = {
+#if ZEND_MODULE_API_NO >= 20010901
+    STANDARD_MODULE_HEADER,
+#endif
+    "foo",                /* extension name */
+    foo_functions,        /* extension function list */
+    NULL,                 /* extension-wide startup function */
+    NULL,                 /* extension-wide shutdown function */
+    PHP_RINIT(foo),       /* per-request startup function */
+    PHP_RSHUTDOWN(foo),   /* per-request shutdown function */
+    PHP_MINFO(foo),       /* information function */
+#if ZEND_MODULE_API_NO >= 20010901
+    FOO_VERSION,          /* extension version number (string) */
+#endif
+    STANDARD_MODULE_PROPERTIES
+};
+
+If you don't care about source compatibility with earlier PHP releases
+than 4.1.0, you can drop the #if/#endif lines.

README.PARAMETER_PARSING_API

@@ -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;
+}

acinclude.m4

@@ -4,6 +4,15 @@ dnl This file contains local autoconf functions.
 
 sinclude(dynlib.m4)
 
+dnl
+dnl Separator into the configure --help display.
+dnl 
+AC_DEFUN(PHP_HELP_SEPARATOR,[
+AC_ARG_ENABLE([],[
+$1
+],[])
+])
+
 dnl
 dnl PHP_TARGET_RDYNAMIC
 dnl

build/bsd_makefile

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

build/build.mk

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

build/build2.mk

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

build/buildcheck.sh

@@ -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.13 2001-12-11 15:28:53 sebastian Exp $ 
 #
 
 echo "buildconf: checking installation..."

build/dynlib.mk

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

build/fastgen.sh

@@ -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        |
@@ -16,7 +16,7 @@
 #  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
-# $Id: fastgen.sh,v 1.12 2001-09-11 07:50:53 sas Exp $ 
+# $Id: fastgen.sh,v 1.13 2001-12-11 15:28:53 sebastian Exp $ 
 #
 
 if test "$#" = "0"; then

build/library.mk

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

build/ltlib.mk

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

build/mkdep.awk

@@ -1,5 +1,5 @@
 #  +----------------------------------------------------------------------+
-#  | PHP version 4.0                                                      |
+#  | PHP Version 4                                                        |
 #  +----------------------------------------------------------------------+
 #  | Copyright (c) 2000 The PHP Group                                     |
 #  +----------------------------------------------------------------------+

build/program.mk

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

build/rules.mk

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

build/rules_common.mk

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

build/rules_pear.mk

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

build/sysv_makefile

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

config.guess

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-04-20'
+timestamp='2001-11-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,8 +24,9 @@ timestamp='2001-04-20'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Originally written by Per Bothner <bothner@cygnus.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -52,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -95,25 +96,25 @@ trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c ;
 	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
 	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break
-	  fi
-	done
-	rm -f $dummy.c $dummy.o $dummy.rel
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	rm -f $dummy.c $dummy.o $dummy.rel ;
 	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found
+	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac
+esac'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
@@ -127,7 +128,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-	# Netbsd (nbsd) targets should (where applicable) match one or
+	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
@@ -144,12 +145,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    macppc) machine=powerpc-apple ;;
 	    hp3[0-9][05]) machine=m68k-hp ;;
 	    ibmrt|romp-ibm) machine=romp-ibm ;;
+	    sparc*) machine=`uname -p`-unknown ;;
 	    *) machine=${UNAME_MACHINE}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
 	case "${UNAME_MACHINE}" in
 	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
 		then
@@ -171,6 +174,45 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -204,6 +246,7 @@ main:
 	jsr \$26,exit
 	.end main
 EOF
+	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
 		case `./$dummy` in
@@ -225,6 +268,9 @@ EOF
 			2-307)
 				UNAME_MACHINE="alphaev67"
 				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
 		esac
 	fi
 	rm -f $dummy.s $dummy
@@ -242,30 +288,9 @@ EOF
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
 	exit 0;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
@@ -328,9 +353,6 @@ EOF
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -357,18 +379,6 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -385,6 +395,7 @@ EOF
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -475,6 +486,7 @@ EOF
 	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
 		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>
 
@@ -536,10 +548,8 @@ EOF
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                     case "${sc_cpu_version}" in
                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -548,12 +558,13 @@ EOF
                         case "${sc_kernel_bits}" in
                           32) HP_ARCH="hppa2.0n" ;;
                           64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                         esac ;;
                     esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-              sed 's/^              //' << EOF >$dummy.c
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
               #include <stdlib.h>
@@ -586,10 +597,10 @@ EOF
                   exit (0);
               }
 EOF
-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	rm -f $dummy.c $dummy
-	fi ;;
+		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+		    rm -f $dummy.c $dummy
+		fi ;;
 	esac
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
@@ -598,6 +609,7 @@ EOF
 	echo ia64-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
@@ -633,7 +645,7 @@ EOF
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE/iX:*:*)
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -652,9 +664,6 @@ EOF
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
         exit 0 ;;
@@ -677,12 +686,13 @@ EOF
 	echo xmp-cray-unicos
         exit 0 ;;
     CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
@@ -705,9 +715,6 @@ EOF
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -720,9 +727,6 @@ EOF
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit 0 ;;
@@ -763,97 +767,29 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     mips:Linux:*:*)
-	cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-int main (int argc, char *argv[]) {
-#else
-int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
+	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
+	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
+	esac
 	;;
     ppc:Linux:*:*)
-	# Determine Lib Version
-	cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#if defined(__GLIBC__)
-  printf("%s %s\n", __libc_version, __libc_release);
-#else
-  printf("unknown\n");
-#endif
-  return 0;
-}
-EOF
-	LIBC=""
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		./$dummy | grep 1\.99 > /dev/null
-		if test "$?" = 0 ; then LIBC="libc1" ; fi
-	fi
-	rm -f $dummy.c $dummy
-	echo powerpc-unknown-linux-gnu${LIBC}
+	echo powerpc-unknown-linux-gnu
+	exit 0 ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
 	exit 0 ;;
     alpha:Linux:*:*)
-	cat <<EOF >$dummy.s
-	  .data
-	  \$Lformat:
-		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-	   .text
-		.globl main
-		.align 4
-		.ent main
-	    main:
-		.frame \$30,16,\$26,0
-		ldgp \$29,0(\$27)
-		.prologue 1
-		.long 0x47e03d80 # implver \$0
-		lda \$2,-1
-		.long 0x47e20c21 # amask \$2,\$1
-		lda \$16,\$Lformat
-		mov \$0,\$17
-		not \$1,\$18
-		jsr \$26,printf
-		ldgp \$29,0(\$26)
-		mov 0,\$16
-		jsr \$26,exit
-		.end main
-EOF
-	LIBC=""
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-		0-0)	UNAME_MACHINE="alpha" ;;
-		1-0)	UNAME_MACHINE="alphaev5" ;;
-		1-1)    UNAME_MACHINE="alphaev56" ;;
-		1-101)	UNAME_MACHINE="alphapca56" ;;
-		2-303)	UNAME_MACHINE="alphaev6" ;;
-		2-307)	UNAME_MACHINE="alphaev67" ;;
-		esac
-		objdump --private-headers $dummy | \
-		  grep ld.so.1 > /dev/null
-		if test "$?" = 0 ; then
-			LIBC="libc1"
-		fi
-	fi
-	rm -f $dummy.s $dummy
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
@@ -883,40 +819,30 @@ EOF
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	ld_supported_emulations=`cd /; ld --help 2>&1 \
-			 | sed -ne '/supported emulations:/!d
+	ld_supported_targets=`cd /; ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
-				    s/.*supported emulations: *//
+				    s/.*supported targets: *//
 				    s/ .*//
 				    p'`
-        case "$ld_supported_emulations" in
-	  i*86linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0
-		;;
-	  elf_i*86)
+        case "$ld_supported_targets" in
+	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  i*86coff)
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;		
+	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0
-		;;
-	esac
-	# Either a pre-BFD a.out linker (linux-gnuoldld)
-	# or one that does not give us useful --help.
-	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	# If ld does not provide *any* "supported emulations:"
-	# that means it is gnuoldld.
-	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-	case "${UNAME_MACHINE}" in
-	i*86)
-	  VENDOR=pc;
-	  ;;
-	*)
-	  VENDOR=unknown;
-	  ;;
+		exit 0 ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
 	cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
@@ -928,15 +854,15 @@ EOF
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+    printf ("%s-pc-linux-gnu\n", argv[1]);
 #  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
 #  endif
 # else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
 # endif
 #else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+  printf ("%s-pc-linux-gnuaout\n", argv[1]);
 #endif
   return 0;
 }
@@ -945,9 +871,10 @@ EOF
 	rm -f $dummy.c $dummy
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
     i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
 	echo i386-sequent-sysv4
 	exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
@@ -966,14 +893,13 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
-    i*86:*:5:7*)
-        # Fixed at (any) Pentium or better
-        UNAME_MACHINE=i586
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
-	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
-	else
-	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-	fi
+    i*86:*:5:[78]*)
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 	exit 0 ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
@@ -1021,7 +947,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1067,8 +993,8 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
         exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
@@ -1080,6 +1006,10 @@ EOF
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
 	exit 0 ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
@@ -1172,11 +1102,18 @@ EOF
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
+eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>

config.sub

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-04-20'
+timestamp='2001-11-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-04-20'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -117,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -157,6 +158,14 @@ case $os in
 		os=-vxworks
 		basic_machine=$1
 		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -215,26 +224,35 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
-	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
-		| pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| hppa64 \
-		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-		| alphaev6[78] \
-		| we32k | ns16k | clipper | i370 | sh | sh[34] \
-		| powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp10 | pdp11 \
-		| mips16 | mips64 | mipsel | mips64el \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
-		| v850 | c4x \
-		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
-		| pj | pjl | h8500)
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| c4x | clipper \
+	| d10v | d30v | dsp16xx \
+	| fr30 \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 \
+	| mn10200 | mn10300 \
+	| ns16k | ns32k \
+	| openrisc \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| sh | sh[34] | sh[34]eb | shbe | shle \
+	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic80 | tron \
+	| v850 \
+	| we32k \
+	| x86 | xscale | xstormy16 \
+	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -242,7 +260,7 @@ case $basic_machine in
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 
 	# We use `pc' rather than `unknown'
@@ -257,31 +275,43 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	# FIXME: clean up the formatting here.
-	vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
-	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-	      | hppa2.0n-* | hppa64-* \
-	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-	      | alphaev6[78]-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-	      | clipper-* | orion-* \
-	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
-	      | mips16-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
-	      | [cjt]90-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
-	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alphapca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| clipper-* | cray2-* | cydra-* \
+	| d10v-* | d30v-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| m32r-* \
+	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
+	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
+	| ymp-* \
+	| z8k-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -694,7 +724,7 @@ case $basic_machine in
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
 	pentiumpro | p6 | 6x86 | athlon)
@@ -703,7 +733,7 @@ case $basic_machine in
 	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -727,6 +757,16 @@ case $basic_machine in
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	ppc64)	basic_machine=powerpc64-unknown
+	        ;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+	        ;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
@@ -744,6 +784,12 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
@@ -755,7 +801,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -881,6 +927,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
+		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -934,7 +984,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4)
+	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv9 | sparcv9b)
@@ -1018,11 +1068,13 @@ case $os in
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1346,6 +1398,9 @@ case $basic_machine in
 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
+			-vos*)
+				vendor=stratus
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;

configure.in

@@ -51,7 +51,7 @@ 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.0.8-dev, nodefine)
+AM_INIT_AUTOMAKE(php, 4.2.0-dev, nodefine)
 
 PHP_VERSION=$VERSION
 echo "/* automatically generated by configure */" > php_version.h.new
@@ -79,13 +79,11 @@ 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).])
+    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)])
+    AC_MSG_RESULT(${1}.${2} (ok))
 fi
 
 AC_PROG_CC
@@ -107,10 +105,10 @@ 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
@@ -141,6 +139,7 @@ sinclude(Zend/Zend.m4)
 sinclude(TSRM/tsrm.m4)
 
 divert(2)
+PHP_HELP_SEPARATOR([SAPI modules:])
 
 PTHREADS_CHECK
 
@@ -395,6 +394,7 @@ mkstemp \
 mmap \
 nl_langinfo \
 putenv \
+realpath \
 random \
 rand_r \
 regcomp \
@@ -466,6 +466,7 @@ if test $ac_cv_type_in_addr_t = no; then
 fi
 
 divert(4)
+PHP_HELP_SEPARATOR([General settings:])
 
 PHP_ARG_ENABLE(debug, whether to include debugging symbols,
 [  --enable-debug          Compile with debugging symbols.], no)
@@ -636,6 +637,17 @@ AC_CHECK_LIB(crypt, crypt, [
 ])
 
 divert(5)
+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)
 
@@ -644,6 +656,9 @@ esyscmd(./scripts/config-stubs ext)
 
 PHP_FAST_OUTPUT(sapi/$PHP_SAPI/Makefile)
 
+
+PHP_HELP_SEPARATOR([Other settings:])
+
 AC_MSG_CHECKING([whether to enable versioning])
 AC_ARG_ENABLE(versioning,
 [  --enable-versioning     Export only required symbols.

dynlib.m4

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

ext/aspell/aspell.c

@@ -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        |
@@ -51,7 +51,8 @@ function_entry aspell_functions[] = {
 static int le_aspell;
 
 zend_module_entry aspell_module_entry = {
-	"aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_ASPELL

ext/aspell/config.m4

@@ -1,4 +1,6 @@
+dnl
 dnl $Id$
+dnl
 
 AC_MSG_CHECKING(for ASPELL support)
 AC_ARG_WITH(aspell,

ext/aspell/php_aspell.h

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

ext/bcmath/bcmath.c

@@ -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        |
@@ -44,13 +44,15 @@ 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),
 	NULL,
 	PHP_MINFO(bcmath),
+	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 

ext/bcmath/config.m4

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

ext/bcmath/php_bcmath.h

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

ext/calendar/cal_unix.c

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

ext/calendar/calendar.c

@@ -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        |
@@ -57,6 +57,7 @@ function_entry calendar_functions[] = {
 
 
 zend_module_entry calendar_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"calendar", 
 	calendar_functions, 
 	PHP_MINIT(calendar),
@@ -64,6 +65,7 @@ zend_module_entry calendar_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(calendar),
+	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES,
 };
 

ext/calendar/config.m4

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

ext/calendar/easter.c

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

ext/ccvs/ccvs.c

@@ -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        |
@@ -97,15 +97,17 @@ static char const cvsid[] = "$Id$";
 
 	/* Declare our module to the Zend engine */
 	zend_module_entry ccvs_module_entry = {
+        STANDARD_MODULE_HEADER,
 		"CCVS",
 		ccvs_functions,
 		NULL, NULL, NULL, NULL,
 		PHP_MINFO(ccvs),
+        NO_VERSION_YET,
 		STANDARD_MODULE_PROPERTIES
 	};
 
-#ifdef COMPILE_DL_LDAP
-ZEND_GET_MODULE(ldap)
+#ifdef COMPILE_DL_CCVS
+ZEND_GET_MODULE(ccvs)
 #endif
 
 /* Full Functions (The actual CCVS functions and any internal php hooked functions such as MINFO) */
@@ -580,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();

ext/ccvs/ccvs.h

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

ext/ccvs/config.m4

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

ext/com/COM.c

@@ -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        |
@@ -133,20 +133,32 @@ PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DIS
 		if (FAILED(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);
+						int srclen=0;
+						char *src=estrdup("");
+						int desclen=0;
+						char *desc=estrdup("");
 
+						if (ExceptInfo.bstrSource)
+						{
+							src = php_OLECHAR_to_char(ExceptInfo.bstrSource, &srclen, codepage TSRMLS_CC);
+							SysFreeString(ExceptInfo.bstrSource);
+						}
+						if (ExceptInfo.bstrDescription)
+						{
+							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:
 				case DISP_E_TYPEMISMATCH:
 					*ErrString = pemalloc(25, 1);
@@ -884,7 +896,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)
 {
@@ -933,7 +945,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)
 {
@@ -1201,7 +1213,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)
 {
@@ -1737,7 +1749,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)
 {
@@ -1810,7 +1822,16 @@ PHP_MSHUTDOWN_FUNCTION(COM)
 /* exports for external object creation */
 
 zend_module_entry COM_module_entry = {
-	"com", COM_functions, PHP_MINIT(COM), PHP_MSHUTDOWN(COM), NULL, NULL, PHP_MINFO(COM), STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"com",
+    COM_functions,
+    PHP_MINIT(COM),
+    PHP_MSHUTDOWN(COM),
+    NULL,
+    NULL,
+    PHP_MINFO(COM),
+    NO_VERSION_YET,
+    STANDARD_MODULE_PROPERTIES
 };
 
 PHPAPI int php_COM_get_le_comval()
@@ -1819,3 +1840,11 @@ PHPAPI int php_COM_get_le_comval()
 }
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */

ext/com/TODO

@@ -1,6 +1,7 @@
 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)

ext/com/VARIANT.c

@@ -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 int codepage;
 static zend_class_entry VARIANT_class_entry;
 
 
-void php_VARIANT_init(int module_number, TSRMLS_D)
+void php_VARIANT_init(int module_number TSRMLS_DC)
 {
 	le_variant = zend_register_list_destructors_ex(php_VARIANT_destructor, NULL, "VARIANT", module_number);
 
@@ -60,7 +60,7 @@ void php_VARIANT_init(int module_number, TSRMLS_D)
 	REGISTER_LONG_CONSTANT("VT_BOOL", VT_BOOL, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("VT_ERROR", VT_ERROR, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("VT_CY", VT_CY, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("VT_DATE", VT_CY, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("VT_DATE", VT_DATE, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("VT_BSTR", VT_BSTR, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("VT_DECIMAL", VT_DECIMAL, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("VT_UNKNOWN", VT_UNKNOWN, CONST_CS | CONST_PERSISTENT);

ext/com/conversion.c

@@ -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        |
@@ -157,12 +157,12 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
 		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:
@@ -172,7 +172,7 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
 
 			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:
@@ -182,7 +182,11 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
 
 			case VT_BOOL:
 				convert_to_boolean_ex(&pval_arg);
-				V_BOOL(var_arg) = (short)Z_LVAL_P(pval_arg);
+				if (Z_LVAL_P(pval_arg)) {
+					V_BOOL(var_arg) = VT_TRUE;
+				} else {
+					V_BOOL(var_arg) = VT_FALSE;
+				}
 				break;
 
 			case VT_ERROR:
@@ -199,26 +203,39 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
 					SYSTEMTIME wintime;
 					struct tm *phptime;
 
-					phptime = gmtime(&(Z_LVAL_P(pval_arg)));
-					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) = SysAllocStringByteLen((char *) unicode_str, Z_STRLEN_P(pval_arg));
-/*				@todo test
-				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;
 
@@ -278,7 +295,13 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
 
 			case VT_BOOL|VT_BYREF:
 				convert_to_boolean(pval_arg);
-				V_BOOLREF(var_arg) = (short FAR*) &Z_LVAL_P(pval_arg);
+				/* emalloc or malloc ? */
+				V_BOOLREF(var_arg) = (short FAR*) pemalloc(sizeof(short), 1);
+				if (Z_LVAL_P(pval_arg)) {
+					*V_BOOLREF(var_arg) = VT_TRUE;
+				} else {
+					*V_BOOLREF(var_arg) = VT_TRUE;
+				}
 				break;
 
 			case VT_ERROR|VT_BYREF:
@@ -584,9 +607,17 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int codepage TS
 
 		case VT_BOOL:
 			if (V_ISBYREF(var_arg)) {
-				ZVAL_BOOL(pval_arg, *V_BOOLREF(var_arg));
+				if (*V_BOOLREF(var_arg)) {
+					ZVAL_BOOL(pval_arg, Z_TRUE);
+				} else {
+					ZVAL_BOOL(pval_arg, Z_FALSE);
+				}
 			} else {
-				ZVAL_BOOL(pval_arg, V_BOOL(var_arg));
+				if (V_BOOL(var_arg)) {
+					ZVAL_BOOL(pval_arg, Z_TRUE);
+				} else {
+					ZVAL_BOOL(pval_arg, Z_FALSE);
+				}
 			}
 			break;
 
@@ -727,26 +758,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, 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, 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()");
 		}
 	}
 

ext/com/conversion.h

@@ -1,6 +1,14 @@
 #ifndef CONVERSION_H
 #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);

ext/com/php_COM.h

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

ext/com/php_VARIANT.h

@@ -8,7 +8,7 @@ BEGIN_EXTERN_C()
 #include "conversion.h"
 #include "variant.h"
 
-void php_VARIANT_init(int module_number, TSRMLS_D);
+void php_VARIANT_init(int module_number TSRMLS_DC);
 
 PHPAPI int php_VARIANT_get_le_variant();
 

ext/cpdf/config.m4

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

ext/cpdf/cpdf.c

@@ -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        |
@@ -155,7 +155,16 @@ function_entry cpdf_functions[] = {
 };
 
 zend_module_entry cpdf_module_entry = {
-	"cpdf", cpdf_functions, PHP_MINIT(cpdf), PHP_MSHUTDOWN(cpdf), PHP_RINIT(cpdf), NULL, PHP_MINFO(cpdf), STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"cpdf",
+    cpdf_functions,
+    PHP_MINIT(cpdf),
+    PHP_MSHUTDOWN(cpdf),
+    PHP_RINIT(cpdf),
+    NULL,
+    PHP_MINFO(cpdf),
+    NO_VERSION_YET,
+    STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_CPDF
@@ -718,7 +727,7 @@ PHP_FUNCTION(cpdf_show_xy)
 /* }}} */
 
 /* {{{ proto void cpdf_continue_text(int pdfdoc, string text)
-   Output text in next line */
+   Outputs text in next line */
 PHP_FUNCTION(cpdf_continue_text)
 {
 	pval *arg1, *arg2;
@@ -745,7 +754,7 @@ PHP_FUNCTION(cpdf_continue_text)
 /* }}} */
 
 /* {{{ proto void cpdf_text(int pdfdoc, string text [, float x-koor, float y-koor [, int mode [, float orientation [, int alignmode]]]])
-   Output text */
+   Outputs text */
 PHP_FUNCTION(cpdf_text)
 {
 	pval *argv[7];
@@ -835,7 +844,7 @@ PHP_FUNCTION(cpdf_text)
 /* }}} */
 
 /* {{{ proto void cpdf_set_font(int pdfdoc, string font, float size, string encoding)
-   Select the current font face, size and encoding */
+   Selects the current font face, size and encoding */
 PHP_FUNCTION(cpdf_set_font)
 {
 	pval *arg1, *arg2, *arg3, *arg4;
@@ -869,7 +878,7 @@ PHP_FUNCTION(cpdf_set_font)
 /* }}} */
 
 /* {{{ proto void cpdf_set_font_directories(int pdfdoc, string pfmdir, string pfbdir)
-   Set directories to search when using external fonts. */
+   Sets directories to search when using external fonts */
 PHP_FUNCTION(cpdf_set_font_directories)
 {
 	pval *arg1, *arg2, *arg3;
@@ -897,7 +906,7 @@ PHP_FUNCTION(cpdf_set_font_directories)
 /* }}} */
 
 /* {{{ proto void cpdf_set_font_map_file(int pdfdoc, string filename)
-   Set fontname to filename translation map when using external fonts. */
+   Sets fontname to filename translation map when using external fonts */
 PHP_FUNCTION(cpdf_set_font_map_file)
 {
 	pval *arg1, *arg2;
@@ -1085,7 +1094,7 @@ PHP_FUNCTION(cpdf_set_text_matrix)
 /* }}} */
 
 /* {{{ proto void cpdf_set_text_pos(int pdfdoc, float x, float y [, int mode])
-   Set the position of text for the next cpdf_show call */
+   Sets the position of text for the next cpdf_show call */
 PHP_FUNCTION(cpdf_set_text_pos)
 {
 	pval *argv[4];
@@ -1954,7 +1963,7 @@ PHP_FUNCTION(cpdf_closepath_stroke)
 /* }}} */
 
 /* {{{ proto void cpdf_stroke(int pdfdoc)
-   Draw line along path path */
+   Draws line along path path */
 PHP_FUNCTION(cpdf_stroke)
 {
 	pval *arg1;
@@ -1980,7 +1989,7 @@ PHP_FUNCTION(cpdf_stroke)
 /* }}} */
 
 /* {{{ proto void cpdf_fill(int pdfdoc)
-   Fill current path */
+   Fills current path */
 PHP_FUNCTION(cpdf_fill)
 {
 	pval *arg1;
@@ -2006,7 +2015,7 @@ PHP_FUNCTION(cpdf_fill)
 /* }}} */
 
 /* {{{ proto void cpdf_fill_stroke(int pdfdoc)
-   Fill and stroke current path */
+   Fills and stroke current path */
 PHP_FUNCTION(cpdf_fill_stroke)
 {
 	pval *arg1;
@@ -2197,7 +2206,7 @@ PHP_FUNCTION(cpdf_setrgbcolor_fill)
 /* }}} */
 
 /* {{{ proto void cpdf_setrgbcolor_stroke(int pdfdoc, float red, float green, float blue)
-   Sets drawing color to rgb color value */
+   Sets drawing color to RGB color value */
 PHP_FUNCTION(cpdf_setrgbcolor_stroke)
 {
 	pval *arg1, *arg2, *arg3, *arg4;
@@ -2226,7 +2235,7 @@ PHP_FUNCTION(cpdf_setrgbcolor_stroke)
 /* }}} */
 
 /* {{{ proto void cpdf_setrgbcolor(int pdfdoc, float red, float green, float blue)
-   Sets drawing and filling color to rgb color value */
+   Sets drawing and filling color to RGB color value */
 PHP_FUNCTION(cpdf_setrgbcolor)
 {
 	pval *arg1, *arg2, *arg3, *arg4;
@@ -2287,7 +2296,7 @@ PHP_FUNCTION(cpdf_set_page_animation)
 /* }}} */
 
 /* {{{ proto array cpdf_finalize(int pdfdoc)
-   Creates pdf doc in memory */
+   Creates PDF doc in memory */
 PHP_FUNCTION(cpdf_finalize)
 {
 	pval *arg1;
@@ -2374,7 +2383,7 @@ PHP_FUNCTION(cpdf_save_to_file)
 /* }}} */
 
 /* {{{ proto void cpdf_import_jpeg(int pdfdoc, string filename, float x, float y, float angle, float width, float height, float x_scale, float y_scale, int gsave [, int mode])
-   Includes jpeg image */
+   Includes JPEG image */
 PHP_FUNCTION(cpdf_import_jpeg)
 {
 	pval *argv[11];
@@ -2594,7 +2603,7 @@ PHP_FUNCTION(cpdf_add_annotation)
 /* }}} */
 
 /* {{{ proto void cpdf_set_action_url(int pdfdoc, float xll, float yll, float xur, float xur, string url [, int mode])
-   Sets Hyperlink */
+   Sets hyperlink */
 PHP_FUNCTION(cpdf_set_action_url)
 {
 	pval *argv[11];
@@ -2651,7 +2660,7 @@ PHP_FUNCTION(cpdf_set_action_url)
 /* }}} */
 
 /* {{{ proto int cpdf_add_outline(int pdfdoc, int lastoutline, int sublevel, int open, int pagenr, string title)
-   Add outline */
+   Adds outline */
 PHP_FUNCTION(cpdf_add_outline)
 {
 	pval *argv[11];

ext/cpdf/php_cpdf.h

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

ext/crack/config.m4

@@ -1,23 +1,24 @@
+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 $PHP_CRACK/cracklib; do
-		if test -f $i/libcrack.a; then
-			CRACK_LIBDIR=$i
-		fi
+
+	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
 	done
-	for i in /usr/local/include /usr/include $PHP_CRACK $PHP_CRACK/cracklib; do
-		if test -f $i/packer.h; then
-			CRACK_INCLUDEDIR=$i
-		fi
+
+	for i in /usr/local/include /usr/include $PHP_CRACK/include $PHP_CRACK/cracklib; do
+		test -f $i/packer.h && CRACK_INCLUDEDIR=$i
 	done
   
 	if test -z "$CRACK_LIBDIR"; then
 		AC_MSG_ERROR(Cannot find the cracklib library file)
 	fi
+
 	if test -z "$CRACK_INCLUDEDIR"; then
 		AC_MSG_ERROR(Cannot find a cracklib header file)
 	fi
@@ -26,8 +27,7 @@ if test "$PHP_CRACK" != "no"; then
 	PHP_ADD_LIBRARY_WITH_PATH(crack, $CRACK_LIBDIR, CRACK_SHARED_LIBADD)
 
 	PHP_EXTENSION(crack, $ext_shared)
-
+	PHP_SUBST(CRACK_SHARED_LIBADD)
 	AC_DEFINE(HAVE_CRACK, 1, [ ])
 fi
 
-PHP_SUBST(CRACK_SHARED_LIBADD)

ext/crack/crack.c

@@ -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        |
@@ -43,6 +43,7 @@ function_entry crack_functions[] = {
 };
 
 zend_module_entry crack_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"crack",
 	crack_functions,
 	ZEND_MODULE_STARTUP_N(crack),
@@ -50,6 +51,7 @@ zend_module_entry crack_module_entry = {
 	ZEND_MODULE_ACTIVATE_N(crack),
 	ZEND_MODULE_DEACTIVATE_N(crack),
 	ZEND_MODULE_INFO_N(crack),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
@@ -153,7 +155,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;
@@ -185,7 +187,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)
 {
@@ -238,8 +240,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) {

ext/crack/php_crack.h

@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group             |
    +----------------------------------------------------------------------+

ext/ctype/config.m4

@@ -1,18 +1,6 @@
+dnl
 dnl $Id$
-dnl config.m4 for extension ctype
-dnl don't forget to call PHP_EXTENSION(ctype)
-
-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:
+dnl
 
 PHP_ARG_ENABLE(ctype, whether to enable ctype support,
 [  --enable-ctype          Enable ctype support])

ext/ctype/ctype.c

@@ -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        |
@@ -62,6 +62,7 @@ function_entry ctype_functions[] = {
 /* {{{ ctype_mpodule_entry
  */
 zend_module_entry ctype_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"ctype",
 	ctype_functions,
 	NULL,
@@ -69,6 +70,7 @@ zend_module_entry ctype_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(ctype),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
@@ -77,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)
@@ -102,7 +100,6 @@ static int ctype(int (*iswhat)(int), zval **c)
 		{
 			char *p;
 			int n, len;
-			convert_to_string_ex(c);
 			p=Z_STRVAL_PP(c);
 			len = Z_STRLEN_PP(c);
 			for(n=0;n<len;n++) {
@@ -117,17 +114,16 @@ static int ctype(int (*iswhat)(int), zval **c)
 }
 /* }}} */
 
-/* {{{ proto bool isalnum(mixed c)
+/* {{{ 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;
-	}
+	zval *c;
 	
-	if(ctype(isalnum, c)) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &c) == FAILURE)
+		return;
+	
+	if(ctype(isalnum, &c)) {
 	   RETURN_TRUE;
 	}
 
@@ -135,17 +131,16 @@ PHP_FUNCTION(ctype_alnum)
 }
 /* }}} */
 
-/* {{{ proto bool isalpha(mixed c)
+/* {{{ 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;
-	}
+	zval *c;
 
-	if(ctype(isalpha, c)) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &c) == FAILURE)
+		return;
+	
+	if(ctype(isalpha, &c)) {
 	   RETURN_TRUE;
 	}
 
@@ -153,17 +148,16 @@ PHP_FUNCTION(ctype_alpha)
 }
 /* }}} */
 
-/* {{{ proto bool iscntrl(mixed c)
+/* {{{ 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;
-	}
+	zval *c;
 
-	if(ctype(iscntrl, c)) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &c) == FAILURE)
+		return;
+	
+	if(ctype(iscntrl, &c)) {
 	   RETURN_TRUE;
 	}
 
@@ -171,17 +165,16 @@ PHP_FUNCTION(ctype_cntrl)
 }
 /* }}} */
 
-/* {{{ proto bool isdigit(mixed c)
+/* {{{ 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;
-	}
+	zval *c;
 
-	if(ctype(isdigit, c)) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &c) == FAILURE)
+		return;
+	
+	if(ctype(isdigit, &c)) {
 	   RETURN_TRUE;
 	}
 
@@ -189,17 +182,16 @@ PHP_FUNCTION(ctype_digit)
 }
 /* }}} */
 
-/* {{{ proto bool islower(mixed c)
+/* {{{ 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;
-	}
+	zval *c;
 
-	if(ctype(islower, c)) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &c) == FAILURE)
+		return;
+	
+	if(ctype(islower, &c)) {
 	   RETURN_TRUE;
 	}
 
@@ -207,17 +199,16 @@ PHP_FUNCTION(ctype_lower)
 }
 /* }}} */
 
-/* {{{ proto bool isgraph(mixed c)
+/* {{{ 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;
-	}
+	zval *c;
 
-	if(ctype(isgraph, c)) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &c) == FAILURE)
+		return;
+	
+	if(ctype(isgraph, &c)) {
 	   RETURN_TRUE;
 	}
 
@@ -225,17 +216,16 @@ PHP_FUNCTION(ctype_graph)
 }
 /* }}} */
 
-/* {{{ proto bool isprint(mixed c)
+/* {{{ 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;
-	}
+	zval *c;
 
-	if(ctype(isprint, c)) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &c) == FAILURE)
+		return;
+	
+	if(ctype(isprint, &c)) {
 	   RETURN_TRUE;
 	}
 
@@ -243,17 +233,16 @@ PHP_FUNCTION(ctype_print)
 }
 /* }}} */
 
-/* {{{ proto bool ispunct(mixed c)
+/* {{{ 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;
-	}
+	zval *c;
 
-	if(ctype(ispunct, c)) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &c) == FAILURE)
+		return;
+	
+	if(ctype(ispunct, &c)) {
 	   RETURN_TRUE;
 	}
 
@@ -261,17 +250,16 @@ PHP_FUNCTION(ctype_punct)
 }
 /* }}} */
 
-/* {{{ proto bool isspace(mixed c)
+/* {{{ 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;
-	}
+	zval *c;
 
-	if(ctype(isspace, c)) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &c) == FAILURE)
+		return;
+	
+	if(ctype(isspace, &c)) {
 	   RETURN_TRUE;
 	}
 
@@ -279,17 +267,16 @@ PHP_FUNCTION(ctype_space)
 }
 /* }}} */
 
-/* {{{ proto bool isupper(mixed c)
+/* {{{ 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;
-	}
+	zval *c;
 
-	if(ctype(isupper, c)) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &c) == FAILURE)
+		return;
+	
+	if(ctype(isupper, &c)) {
 	   RETURN_TRUE;
 	}
 
@@ -297,17 +284,16 @@ PHP_FUNCTION(ctype_upper)
 }
 /* }}} */
 
-/* {{{ proto bool isxdigit(mixed c)
+/* {{{ 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;
-	}
+	zval *c;
 
-	if(ctype(isxdigit, c)) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &c) == FAILURE)
+		return;
+	
+	if(ctype(isxdigit, &c)) {
 	   RETURN_TRUE;
 	}
 

ext/ctype/php_ctype.h

@@ -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:                                                             |
-   |                                                                      |
+   | Authors: Hartmut Holzgraefe <hartmut@six.de>                         |
    +----------------------------------------------------------------------+
  */
 

ext/ctype/tests/001.phpt

@@ -6,7 +6,7 @@ ctype on integers
 --GET--
 --FILE--
 <?php 
-  setlocale("LC_ALL","C"); 
+  setlocale(LC_ALL,"C"); 
 
   function ctype_test_001($function) {
     $n=0; 	

ext/ctype/tests/002.phpt

@@ -6,7 +6,7 @@ ctype on strings
 --GET--
 --FILE--
 <?php 
-  setlocale("LC_ALL","C"); 
+  setlocale(LC_ALL,"C"); 
 
   function ctype_test_002($function) {
     $n=0; $m=0;

ext/curl/config.m4

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

ext/curl/curl.c

@@ -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 @@ function_entry curl_functions[] = {
 /* {{{ curl_module_entry
  */
 zend_module_entry curl_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"curl",
 	curl_functions,
 	PHP_MINIT(curl),
@@ -76,6 +77,7 @@ zend_module_entry curl_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(curl),
+	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
@@ -101,6 +103,8 @@ 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() */
@@ -140,6 +144,7 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLOPT_SSLCERT);
 	REGISTER_CURL_CONSTANT(CURLOPT_SSLCERTPASSWD);
 	REGISTER_CURL_CONSTANT(CURLOPT_WRITEHEADER);
+	REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYHOST);
 	REGISTER_CURL_CONSTANT(CURLOPT_COOKIEFILE);
 	REGISTER_CURL_CONSTANT(CURLOPT_SSLVERSION);
 	REGISTER_CURL_CONSTANT(CURLOPT_TIMECONDITION);
@@ -251,7 +256,13 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLE_OBSOLETE);
 	REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE);
 	
-	if (curl_global_init(CURL_GLOBAL_NOTHING) != CURLE_OK) {
+#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) {
 		return FAILURE;
 	}
 
@@ -285,6 +296,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
 	php_curl       *ch     = (php_curl *) ctx;
 	php_curl_write *t      = ch->handlers->write;
 	size_t          length = size * nmemb;
+	TSRMLS_FETCH();
 
 	switch (t->method) {
 	case PHP_CURL_STDOUT:
@@ -396,6 +408,7 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
 	php_curl_write *t   = ch->handlers->write_header;
 	int             error;
 	int             length;
+	TSRMLS_FETCH();
 	
 	switch (t->method) {
 	case PHP_CURL_STDOUT:
@@ -458,7 +471,7 @@ static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
 	php_curl    *ch   = (php_curl *) ctx;
 	zval        *func = ch->handlers->passwd;
 	zval        *argv[3];
-	zval        *retval;
+	zval        *retval = NULL;
 	int          error;
 	int          ret = 0;
 	TSRMLS_FETCH();
@@ -654,6 +667,7 @@ PHP_FUNCTION(curl_setopt)
 	case CURLOPT_FRESH_CONNECT:
 	case CURLOPT_FORBID_REUSE:
 	case CURLOPT_CONNECTTIMEOUT:
+	case CURLOPT_SSL_VERIFYHOST:
 	case CURLOPT_SSL_VERIFYPEER:
 		convert_to_long_ex(zvalue);
 		error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
@@ -692,8 +706,11 @@ PHP_FUNCTION(curl_setopt)
 	case CURLOPT_INFILE: 
 	case CURLOPT_WRITEHEADER:
 	case CURLOPT_STDERR: {
-		FILE *fp;
+		FILE *fp = NULL;
 		ZEND_FETCH_RESOURCE(fp, FILE *, zvalue, -1, "File-Handle", php_file_le_fopen());
+		if (!fp) {
+			RETURN_FALSE;
+		}
 
 		error = CURLE_OK;
 		switch (option) {
@@ -774,12 +791,18 @@ 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);
-
-				postval = emalloc((string_key_len - 1) + Z_STRLEN_PP(current) + 1);
-				snprintf(postval, (sizeof("%s=%s") - 1) + (string_key_len - 1) + Z_STRLEN_PP(current), 
-				         "%s=%s", string_key, Z_STRVAL_PP(current));
-
-				error = curl_formparse(postval, &first, &last);
+				
+				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);
+				}
 			}
 
 			if (error != CURLE_OK) {

ext/curl/curl.dsp

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

ext/curl/php_curl.h

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

ext/cybercash/config.m4

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

ext/cybercash/cybercash.c

@@ -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,6 +45,7 @@ function_entry cybercash_functions[] = {
 /* {{{ cybercash_module_entry
  */
 zend_module_entry cybercash_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"cybercash",
 	cybercash_functions,
 	NULL,
@@ -52,6 +53,7 @@ zend_module_entry cybercash_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(cybercash),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES,
 };
 /* }}} */
@@ -70,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)
 {

ext/cybercash/cybercash.h

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

ext/cybermut/config.m4

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

ext/cybermut/cybermut.c

@@ -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        |
@@ -48,6 +48,7 @@ function_entry cybermut_functions[] = {
 /* {{{ cybermut_module_entry
  */
 zend_module_entry cybermut_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"cybermut",
 	cybermut_functions,
 	PHP_MINIT(cybermut),
@@ -55,6 +56,7 @@ zend_module_entry cybermut_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(cybermut),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

ext/cybermut/php_cybermut.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        |

ext/cyrus/config.m4

@@ -1,4 +1,6 @@
-dnl config.m4 for extension cyrus
+dnl
+dnl $Id$
+dnl
 
 PHP_ARG_WITH(cyrus, for cyrus imap support,
 [  --with-cyrus            Include cyrus imap support])

ext/cyrus/cyrus.c

@@ -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        |
@@ -48,6 +48,7 @@ function_entry cyrus_functions[] = {
 };
 
 zend_module_entry cyrus_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"cyrus",
 	cyrus_functions,
 	PHP_MINIT(cyrus),
@@ -55,6 +56,7 @@ zend_module_entry cyrus_module_entry = {
 	NULL,	
 	NULL,
 	PHP_MINFO(cyrus),
+	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
@@ -109,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;
@@ -174,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)
@@ -195,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;
@@ -312,6 +321,8 @@ PHP_FUNCTION(cyrus_authenticate)
 	efree(service);
 	efree(user);
 }
+/* }}} */
+
 
 static void cyrus_generic_callback(struct imclient *client, 
                                    void *rock, 
@@ -364,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;
@@ -376,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;
 	}
 
@@ -429,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;
@@ -448,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;
@@ -466,8 +484,10 @@ PHP_FUNCTION(cyrus_query)
 
 	RETURN_TRUE;
 }
+/* }}} */
 
-
+/* {{{ proto bool cyrus_close( resource connection)
+   Close connection to a cyrus server */
 PHP_FUNCTION(cyrus_close)
 {
 	zval      **z_conn;
@@ -483,7 +503,7 @@ PHP_FUNCTION(cyrus_close)
 
 	RETURN_TRUE;
 }
-
+/* }}} */
 #endif
 
 

ext/cyrus/php_cyrus.h

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

ext/db/config.m4

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

ext/db/db.c

@@ -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        |
@@ -1234,7 +1234,16 @@ function_entry dbm_functions[] = {
 /* }}} */
 
 zend_module_entry dbm_module_entry = {
-	"db", dbm_functions, PHP_MINIT(db), PHP_MSHUTDOWN(db), PHP_RINIT(db), NULL, PHP_MINFO(db), STANDARD_MODULE_PROPERTIES
+    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
 };
 
 #ifdef COMPILE_DL_DB

ext/db/php_db.h

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

ext/dba/config.m4

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

ext/dba/dba.c

@@ -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        |
@@ -60,11 +60,15 @@ static PHP_MSHUTDOWN_FUNCTION(dba);
 static PHP_MINFO_FUNCTION(dba);
 
 zend_module_entry dba_module_entry = {
-	"dba", dba_functions, 
+    STANDARD_MODULE_HEADER,
+	"dba",
+    dba_functions, 
 	PHP_MINIT(dba), 
 	PHP_MSHUTDOWN(dba), 
-	NULL, NULL,
+	NULL,
+    NULL,
 	PHP_MINFO(dba),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 

ext/dba/dba_cdb.c

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

ext/dba/dba_db2.c

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

ext/dba/dba_db3.c

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

ext/dba/dba_dbm.c

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

ext/dba/dba_gdbm.c

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

ext/dba/dba_ndbm.c

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

ext/dba/php_dba.h

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

ext/dbase/config.m4

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

ext/dbase/dbase.c

@@ -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        |
@@ -473,6 +473,7 @@ PHP_FUNCTION(dbase_get_record)
 		case 'D':
 			add_next_index_string(return_value, str_value, 1);
 			break;
+		case 'I':	/* FALLS THROUGH */
 		case 'N':
 			if (cur_f->db_fdc == 0) {
 				add_next_index_long(return_value, strtol(str_value, NULL, 10));
@@ -564,6 +565,7 @@ PHP_FUNCTION(dbase_get_record_with_names)
 			case 'D':
 				add_assoc_string(return_value, cur_f->db_fname, str_value, 1);
 				break;
+			case 'I':	/* FALLS THROUGH */
 			case 'N':
 				if (cur_f->db_fdc == 0) {
 					add_assoc_long(return_value, cur_f->db_fname, strtol(str_value, NULL, 10));
@@ -785,7 +787,8 @@ function_entry dbase_functions[] = {
 /* }}} */
 
 zend_module_entry dbase_module_entry = {
-	"dbase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+	"dbase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 
 

ext/dbase/dbf_head.c

@@ -21,8 +21,8 @@ dbhead_t *get_dbf_head(int fd)
 {
 	dbhead_t *dbh;
 	struct dbf_dhead  dbhead;
-	dbfield_t *dbf, *cur_f;
-	int ret, nfields, offset;
+	dbfield_t *dbf, *cur_f, *tdbf;
+	int ret, nfields, offset, gf_retval;
 
 	if ((dbh = (dbhead_t *)malloc(sizeof(dbhead_t))) == NULL)
 		return NULL;
@@ -42,21 +42,33 @@ dbhead_t *get_dbf_head(int fd)
 		dbhead.dbh_date[DBH_DATE_MONTH],
 		dbhead.dbh_date[DBH_DATE_DAY]);
 
-	dbh->db_nfields = nfields = (dbh->db_hlen - sizeof(struct dbf_dhead)) /
-				sizeof(struct dbf_dfield);
-
-	/* get all the field info */
-	dbf = (dbfield_t *)malloc(sizeof(dbfield_t) * nfields);
-
+	/* malloc enough memory for the maximum number of fields:
+	   32 * 254 = 8128 bytes */
+	tdbf = (dbfield_t *)malloc(sizeof(dbfield_t)*254);
+	
 	offset = 1;
-	for (cur_f = dbf; cur_f < &dbf[nfields] ; cur_f++) {
-		if (get_dbf_field(dbh, cur_f) < 0) {
+	nfields = 0;
+	gf_retval = 0;
+	for (cur_f = tdbf; gf_retval < 2 && nfields < 254; cur_f++) {
+		gf_retval = get_dbf_field(dbh, cur_f);
+
+		if (gf_retval < 0) {
 			free_dbf_head(dbh);
 			return NULL;
 		}
-		cur_f->db_foffset = offset;
-		offset += cur_f->db_flen;
+		if (gf_retval != 2 ) {
+			cur_f->db_foffset = offset;
+			offset += cur_f->db_flen;
+			nfields++;
+		}
 	}
+	dbh->db_nfields = nfields;
+	
+	/* malloc the right amount of space for records, copy and destroy old */
+	dbf = (dbfield_t *)malloc(sizeof(dbfield_t)*nfields);
+	memcpy(dbf, tdbf, sizeof(dbfield_t)*nfields);
+	free(tdbf);
+
 	dbh->db_fields = dbf;
 
 	return dbh;
@@ -124,6 +136,12 @@ int get_dbf_field(dbhead_t *dbh, dbfield_t *dbf)
 		return ret;
 	}
 
+	/* Check for the '0Dh' field terminator , if found return '2'
+	   which will tell the loop we are at the end of fields */
+	if (dbfield.dbf_name[0]==0x0d) {
+		return 2;
+	}
+
 	/* build the field name */
 	copy_crimp(dbf->db_fname, dbfield.dbf_name, DBF_NAMELEN);
 
@@ -135,6 +153,7 @@ int get_dbf_field(dbhead_t *dbh, dbfield_t *dbf)
 		break;
 	    default:
 	    	dbf->db_flen = get_short(dbfield.dbf_flen);
+		break;
 	}
 
 	if ((dbf->db_format = get_dbf_f_fmt(dbf)) == NULL) {

ext/dbase/php_dbase.h

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

ext/dbplus/config.m4

@@ -1,6 +1,6 @@
+dnl
 dnl $Id$
-dnl config.m4 for extension dbplus
-
+dnl
 
 PHP_ARG_WITH(dbplus, for dbplus support,
 [  --with-dbplus           Include dbplus support])

ext/dbplus/dbplus.c

@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group             |
    +----------------------------------------------------------------------+
@@ -13,7 +13,6 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
    | Authors: Hartmut Holzgraefe <hartmut@six.de>                         |
-   |                                                                      |
    +----------------------------------------------------------------------+
  */
 
@@ -118,6 +117,7 @@ function_entry dbplus_functions[] = {
 /* {{{ module entry */
 
 zend_module_entry dbplus_module_entry = {
+    STANDARD_MODULE_HEADER,
     "dbplus",
     dbplus_functions,
     PHP_MINIT(dbplus),
@@ -125,6 +125,7 @@ zend_module_entry dbplus_module_entry = {
     PHP_RINIT(dbplus),      /* Replace with NULL if there's nothing to do at request start */
     PHP_RSHUTDOWN(dbplus),  /* Replace with NULL if there's nothing to do at request end */
     PHP_MINFO(dbplus),
+    NO_VERSION_YET,
     STANDARD_MODULE_PROPERTIES
 };
 
@@ -237,51 +238,6 @@ PHP_MINFO_FUNCTION(dbplus)
 
 /* }}} */
 
-#if 0
-/* {{{ proto int dbplus_open(string name, int writing, int searchpath)
-
-    */
-PHP_FUNCTION(dbplus_open)
-{
-    relf *conn;
-
-    zval **name, **writing, **searchpath;
-    if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &name, &writing, &searchpath) == FAILURE){
-        WRONG_PARAM_COUNT;
-    }
-
-    convert_to_string_ex(name);
-    convert_to_long_ex(writing);
-    convert_to_long_ex(searchpath);
-
-    conn = cdb_open(Z_STRVAL_PP(name), Z_LVAL_PP(writing), Z_LVAL_PP(searchpath));
-    if(conn == NULL) {
-        /* TODO error handling */
-        RETURN_FALSE;
-    }
-
-    ZEND_REGISTER_RESOURCE(return_value, conn, le_dbplus);
-}
-
-/* }}} */
-
-/* {{{ proto void dbplus_close(int conn)
-    */
-PHP_FUNCTION(dbplus_close)
-{
-    zval **conn;
-    if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &conn) == FAILURE){
-        WRONG_PARAM_COUNT;
-    }
-
-    convert_to_long_ex(conn);
-
-    /* TODO resource type check */
-
-    zend_list_delete(Z_LVAL_PP(conn));  
-}
-/* }}} */
-#endif
 
 /*
  * Local variables:

ext/dbplus/php_dbplus.c

@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group             |
    +----------------------------------------------------------------------+

ext/dbplus/php_dbplus.h

@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
+   | PHP Version 4                                                        |
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group             |
    +----------------------------------------------------------------------+
@@ -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:                                                             |
-   |                                                                      |
+   | Authors: Hartmut Holzgraefe <hartmut@six.de>                         |
    +----------------------------------------------------------------------+
  */
 

ext/dbx/config.m4

@@ -1,3 +1,6 @@
+dnl
+dnl $Id$
+dnl
 
 PHP_ARG_ENABLE(dbx,whether to enable dbx support,
 [  --enable-dbx            Enable dbx])

ext/dbx/dbx.c

@@ -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                                |
    +----------------------------------------------------------------------+
    | dbx module version 1.0                                               |
    +----------------------------------------------------------------------+
@@ -148,6 +148,7 @@ function_entry dbx_functions[] = {
 };
 
 zend_module_entry dbx_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"dbx",
 	dbx_functions,
 	ZEND_MINIT(dbx),
@@ -155,6 +156,7 @@ zend_module_entry dbx_module_entry = {
 	NULL, /*ZEND_RINIT(dbx),        /* Replace with NULL if there's nothing to do at request start */
 	NULL, /*ZEND_RSHUTDOWN(dbx),    /* Replace with NULL if there's nothing to do at request end */
 	ZEND_MINFO(dbx),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
@@ -217,9 +219,7 @@ ZEND_MINFO_FUNCTION(dbx)
 */
 
 /* {{{ proto dbx_link_object dbx_connect(string module_name, string host, string db, string username, string password [, bool persistent])
-   returns a dbx_link_object on success
-   returns 0 on failure
-*/
+   Returns a dbx_link_object on success and returns 0 on failure */
 ZEND_FUNCTION(dbx_connect)
 {
 	int number_of_arguments=5;
@@ -332,9 +332,7 @@ ZEND_FUNCTION(dbx_close)
 /* }}} */
 
 /* {{{ proto dbx_result_object dbx_query(dbx_link_object dbx_link, string sql_statement [, long flags])
-   returns a dbx_link_object on success
-   returns 0 on failure
-*/
+   Returns a dbx_link_object on success and returns 0 on failure */
 ZEND_FUNCTION(dbx_query)
 {
 	int min_number_of_arguments=2;
@@ -533,9 +531,8 @@ ZEND_FUNCTION(dbx_error)
  *      dbx functions that are database independent... like sorting result_objects!
  */
 
-/* {{{ proto long dbx_compare(array row_x, array row_y, string columnname [, flags])
-   returns row_y[columnname] - row_x[columnname], converted to -1, 0 or 1
-*/
+/* {{{ proto int dbx_compare(array row_x, array row_y, string columnname [, int flags])
+   Returns row_y[columnname] - row_x[columnname], converted to -1, 0 or 1 */
 ZEND_FUNCTION(dbx_compare)
 {
 	int min_number_of_arguments=3;
@@ -625,9 +622,8 @@ ZEND_FUNCTION(dbx_compare)
 }
 /* }}} */
 
-/* {{{ proto long dbx_sort(dbx_result_object dbx_result, string compare_function_name)
-   returns 0 on failure, 1 on success
-*/
+/* {{{ proto int dbx_sort(object dbx_result, string compare_function_name)
+   Returns 0 on failure, 1 on success */
 ZEND_FUNCTION(dbx_sort)
 {
 	int number_of_arguments=2;

ext/dbx/dbx.h

@@ -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                                |
    +----------------------------------------------------------------------+
    | dbx module version 1.0                                               |
    +----------------------------------------------------------------------+

ext/dbx/dbx_fbsql.c

@@ -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                                |
    +----------------------------------------------------------------------+
    | dbx module version 1.0                                               |
    +----------------------------------------------------------------------+

ext/dbx/dbx_fbsql.h

@@ -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                                |
    +----------------------------------------------------------------------+
    | dbx module version 1.0                                               |
    +----------------------------------------------------------------------+

ext/dbx/dbx_mssql.c

@@ -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                                |
    +----------------------------------------------------------------------+
    | dbx module version 1.0                                               |
    +----------------------------------------------------------------------+

ext/dbx/dbx_mssql.h

@@ -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                                |
    +----------------------------------------------------------------------+
    | dbx module version 1.0                                               |
    +----------------------------------------------------------------------+

ext/dbx/dbx_mysql.c

@@ -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                                |
    +----------------------------------------------------------------------+
    | dbx module version 1.0                                               |
    +----------------------------------------------------------------------+

ext/dbx/dbx_mysql.h

@@ -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                                |
    +----------------------------------------------------------------------+
    | dbx module version 1.0                                               |
    +----------------------------------------------------------------------+

ext/dbx/dbx_oci8.c

@@ -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                                |
    +----------------------------------------------------------------------+
    | dbx module version 1.0                                               |
    +----------------------------------------------------------------------+

ext/dbx/dbx_oci8.h

@@ -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                                |
    +----------------------------------------------------------------------+
    | dbx module version 1.0                                               |
    +----------------------------------------------------------------------+