Update ap-php and php to 4.0.6. Changes from version 4.0.5 include:

- Bug fixes (memory leaks and other errors)
- Made $HTTP_SESSION_VARS['foo'] and $foo be references to the same value
  when register_globals is on. (Andrei)
- Added is_callable() function that can be used to find out whether
  its argument is a valid callable construct. (Andrei)
- Added pg_last_notice() function. (Rasmus from suggestion by Dirk@rackspace.com)
- Added support to getimagesize to return dimensions of BMP and PSD
  files. (Derick)
- Added Japanese multibyte string functions support. (Rui)
- Added key_exists() to check if a given key or index exists in an
  array or object. (David Croft)
- Added -C command-line option to avoid chdir to the script's directory. (Stig)
- printf argnum (parameter swapping) support. (Morten Poulsen, Rasmus)
- Modified get_parent_class() and get_class_methods() to accept a class name as
  well as a class instance. (Andrei, Zend Engine)
- 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
  null callback to transpose arrays. (Andrei)
- Added array_filter(), which allows filtering of array elements via
  the specified callback. (Andrei)

10 files changed, 171 insertions, 151 deletions

diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa
index 07ed1518ba5..39eb7c9a362 100644
--- a/www/php4/patches/patch-aa
+++ b/www/php4/patches/patch-aa
@@ -1,25 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2001/05/14 14:12:28 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2001/10/16 04:54:24 jlam Exp $
 
---- configure.in.orig	Mon Apr 30 09:37:22 2001
-+++ configure.in
-@@ -353,7 +353,8 @@
+--- Makefile.in.orig	Sat Apr 21 21:09:12 2001
++++ Makefile.in
+@@ -19,7 +19,7 @@
+ PROGRAM_NAME         = php
+ PROGRAM_SOURCES      = stub.c
+ PROGRAM_LDADD        = libphp4.la $(EXT_PROGRAM_LDADD)
+-PROGRAM_LDFLAGS      = -export-dynamic	
++PROGRAM_LDFLAGS      = -static -export-dynamic $(LINK_LIBGCC_LDFLAGS)
+ PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
  
- dnl Check for IPv6 support
- AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support,
--[AC_TRY_COMPILE([#include <sys/socket.h>
-+[AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>], [struct sockaddr_in6 s; int i=AF_INET6; s],
-   ac_cv_ipv6_support=yes, ac_cv_ipv6_support=no)])
- if test "$ac_cv_ipv6_support" = yes; then
-@@ -820,10 +821,6 @@
-     PHP_CONFIGURE_PART(Configuring shared libtool)
-     $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
-     SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool'
--  else
--    PHP_COMPILE='$(COMPILE) -c $< && touch $@'
--    CXX_PHP_COMPILE='$(CXX_COMPILE) -c $< && touch $@'
--  fi
- fi
- 
- CC="$old_CC"
+ targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
index 5e20eefecfa..2fd1f72ef34 100644
--- a/www/php4/patches/patch-ab
+++ b/www/php4/patches/patch-ab
@@ -1,39 +1,14 @@
-$NetBSD: patch-ab,v 1.7 2001/05/14 14:12:29 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2001/10/16 04:54:24 jlam Exp $
 
---- configure.orig	Mon Apr 30 09:47:59 2001
-+++ configure
-@@ -6392,6 +6392,7 @@
-   cat > conftest.$ac_ext <<EOF
- #line 6394 "configure"
- #include "confdefs.h"
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- int main() {
-@@ -43649,6 +43650,7 @@
- fi
- 
- 
-+if false; then
- echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
- echo "configure:43654: checking for pam_start in -lpam" >&5
- ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
-@@ -43693,6 +43695,8 @@
- else
-   echo "$ac_t""no" 1>&6
- fi
-+
-+fi # if false
-  
- 
- for ac_func in getcwd getwd
-@@ -51503,9 +51507,6 @@
- 
-     $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
-     SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool'
--  else
--    PHP_COMPILE='$(COMPILE) -c $< && touch $@'
--    CXX_PHP_COMPILE='$(CXX_COMPILE) -c $< && touch $@'
-   fi
- fi
- 
+--- Zend/zend_alloc.c.orig	Tue Jun 19 14:04:53 2001
++++ Zend/zend_alloc.c
+@@ -446,6 +446,9 @@
+ 		for (i=1; i<MAX_CACHED_MEMORY; i++) {
+ 			for (j=0; j<AG(cache_count)[i]; j++) {
+ 				ptr = (zend_mem_header *) AG(cache)[i][j];
++#if MEMORY_LIMIT
++				AG(allocated_memory) -= REAL_SIZE(ptr->size);
++#endif
+ 				REMOVE_POINTER_FROM_LIST(ptr);
+ 				free(ptr);
+ 			}
diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac
new file mode 100644
index 00000000000..ee38f37c012
--- /dev/null
+++ b/www/php4/patches/patch-ac
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.4 2001/10/16 04:54:24 jlam Exp $
+
+--- acinclude.m4.orig	Sun Jun 10 15:52:56 2001
++++ acinclude.m4
+@@ -251,10 +251,19 @@
+   ;;
+ esac
+ 
++dnl Having php_always_shared=yes override the configure options breaks
++dnl because it's assumed that the answer to every question is yes.  We
++dnl really only want just the ext_shared=yes to denote that we'll be
++dnl using outside shared libraries.
++dnl
++dnl if test "$php_always_shared" = "yes"; then
++dnl   ext_output="yes, shared"
++dnl   ext_shared=yes
++dnl   test "[$]$1" = "no" && $1=yes
++dnl fi
++
+ if test "$php_always_shared" = "yes"; then
+-  ext_output="yes, shared"
+   ext_shared=yes
+-  test "[$]$1" = "no" && $1=yes
+ fi
+ 
+ AC_MSG_RESULT($ext_output)
diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad
index 8ecc31550f4..964189e449d 100644
--- a/www/php4/patches/patch-ad
+++ b/www/php4/patches/patch-ad
@@ -1,17 +1,55 @@
-$NetBSD: patch-ad,v 1.4 2001/05/14 14:12:29 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2001/10/16 04:54:24 jlam Exp $
 
---- ext/imap/php_imap.c.orig	Tue Apr 24 10:17:41 2001
-+++ ext/imap/php_imap.c
-@@ -427,7 +427,11 @@
- 	ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
- 
- 
--#if 1
-+/*
-+ * Use the installed c-client linkage.c to determine which drivers and
-+ * authenticators are linked in.
-+ */
-+#if 0
- #ifndef PHP_WIN32
- 	mail_link(&unixdriver);   /* link in the unix driver */
- #endif
+--- configure.orig	Thu Jun 21 02:28:57 2001
++++ configure
+@@ -14903,10 +14903,6 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+-  cat >> confdefs.h <<\EOF
+-#define HAVE_DBA 0
+-EOF
+-
+ fi
+ 
+ 
+@@ -21394,19 +21390,10 @@
+ 
+ 
+   else
+-    cat >> confdefs.h <<\EOF
+-#define HYPERWAVE 0
+-EOF
+-
+     echo "$ac_t""no" 1>&6
+   fi
+ 
+ else
+-  
+-  cat >> confdefs.h <<\EOF
+-#define HYPERWAVE 0
+-EOF
+-
+   echo "$ac_t""no" 1>&6
+ 
+ fi
+@@ -55797,7 +55784,7 @@
+ 
+ if test "$enable_debug" != "yes"; then
+   
+-  LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ fi
+ 
+@@ -55815,8 +55802,8 @@
+     $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
+     SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool'
+   else
+-    PHP_COMPILE='$(COMPILE) -c $< && touch $@'
+-    CXX_PHP_COMPILE='$(CXX_COMPILE) -c $< && touch $@'
++    PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<'
++    CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<'
+   fi
+ fi
+ 
diff --git a/www/php4/patches/patch-ae b/www/php4/patches/patch-ae
index 52bb5830642..f603980eec2 100644
--- a/www/php4/patches/patch-ae
+++ b/www/php4/patches/patch-ae
@@ -1,16 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2001/05/14 14:12:29 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2001/10/16 04:54:24 jlam Exp $
 
---- ext/standard/config.m4.orig	Sun Mar 11 05:08:27 2001
-+++ ext/standard/config.m4
-@@ -187,9 +187,11 @@
+--- main/php_open_temporary_file.c.orig	Mon Apr 30 08:43:40 2001
++++ main/php_open_temporary_file.c
+@@ -110,7 +110,7 @@
+ 		trailing_slash = "/";
+ 	}
  
- AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL,1,[ ])])
- 
-+if false; then
- AC_CHECK_LIB(pam, pam_start, [
-   EXTRA_LIBS="$EXTRA_LIBS -lpam"
-   AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], []) 
-+fi # if false
- 
- AC_CHECK_FUNCS(getcwd getwd)
+-	(void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", path, trailing_slash, pfx);
++	(void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXXXXXX", path, trailing_slash, pfx);
  
+ #ifdef PHP_WIN32
+ 	if (GetTempFileName(path, pfx, 0, opened_path)) {
diff --git a/www/php4/patches/patch-af b/www/php4/patches/patch-af
index ee2a5a884d0..332aaf28285 100644
--- a/www/php4/patches/patch-af
+++ b/www/php4/patches/patch-af
@@ -1,13 +1,12 @@
-$NetBSD: patch-af,v 1.2 2001/05/14 14:12:30 jlam Exp $
+$NetBSD: patch-af,v 1.3 2001/10/16 04:54:24 jlam Exp $
 
---- Makefile.in.orig	Tue Mar 20 13:15:10 2001
-+++ Makefile.in
-@@ -19,7 +19,7 @@
- PROGRAM_NAME         = php
- PROGRAM_SOURCES      = stub.c
- PROGRAM_LDADD        = libphp4.la $(EXT_PROGRAM_LDADD)
--PROGRAM_LDFLAGS      = -export-dynamic	
-+PROGRAM_LDFLAGS      = -static -export-dynamic	
- PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
- 
- targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
+--- pear/Makefile.in.orig	Tue May 15 06:17:21 2001
++++ pear/Makefile.in
+@@ -157,6 +157,7 @@
+ 	/ \
+ 	Zend \
+ 	TSRM \
++	ext/session \
+ 	ext/standard \
+ 	ext/xml \
+ 	ext/xml/expat/xmlparse \
diff --git a/www/php4/patches/patch-ag b/www/php4/patches/patch-ag
index 30c4274b09c..a71349ae109 100644
--- a/www/php4/patches/patch-ag
+++ b/www/php4/patches/patch-ag
@@ -1,12 +1,25 @@
-$NetBSD: patch-ag,v 1.1 2001/02/12 04:14:29 jlam Exp $
+$NetBSD: patch-ag,v 1.2 2001/10/16 04:54:24 jlam Exp $
 
---- ext/imap/Makefile.in.orig	Tue May 23 19:36:44 2000
-+++ ext/imap/Makefile.in
-@@ -2,6 +2,6 @@
- LTLIBRARY_NAME    = libimap.la
- LTLIBRARY_SOURCES = php_imap.c
- LTLIBRARY_SHARED_NAME = imap.la
--LTLIBRARY_SHARED_LIBADD = $(IMAP_SHARED_LIBADD)
-+LTLIBRARY_SHARED_LIBADD =
- 
- include $(top_srcdir)/build/dynlib.mk
+--- php.ini-dist.orig	Thu May 31 23:20:49 2001
++++ php.ini-dist
+@@ -320,8 +320,9 @@
+ ; if nonempty.
+ user_dir =
+ 
+-; Directory in which the loadable extensions (modules) reside.
+-extension_dir = ./
++; Directory in which the loadable extensions (modules) reside.  If not
++; defined, then use the extension directory specified at compile-time.
++;extension_dir = ./
+ 
+ ; Whether or not to enable the dl() function.  The dl() function does NOT work
+ ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
+@@ -338,7 +339,7 @@
+ 
+ ; Temporary directory for HTTP uploaded files (will use system default if not
+ ; specified).
+-;upload_tmp_dir =
++upload_tmp_dir = /tmp
+ 
+ ; Maximum allowed size for uploaded files.
+ upload_max_filesize = 2M
diff --git a/www/php4/patches/patch-ah b/www/php4/patches/patch-ah
new file mode 100644
index 00000000000..abca36dacb6
--- /dev/null
+++ b/www/php4/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.3 2001/10/16 04:54:24 jlam Exp $
+
+--- php.ini-optimized.orig	Thu May 31 23:20:49 2001
++++ php.ini-optimized
+@@ -231,7 +231,7 @@
+ include_path	=                   ; UNIX: "/path1:/path2"  Windows: "\path1;\path2"
+ doc_root		=					; the root of the php pages, used only if nonempty
+ user_dir		=					; the directory under which php opens the script using /~username, used only if nonempty
+-extension_dir	=	./				; directory in which the loadable extensions (modules) reside
++;extension_dir	=	./				; directory in which the loadable extensions (modules) reside
+ enable_dl		= On				; Whether or not to enable the dl() function.
+ 									; The dl() function does NOT properly work in multithreaded
+ 									; servers, such as IIS or Zeus, and is automatically disabled
+@@ -242,7 +242,7 @@
+ ; File Uploads ;
+ ;;;;;;;;;;;;;;;;
+ file_uploads	= On				; Whether to allow HTTP file uploads
+-;upload_tmp_dir	=	                ; temporary directory for HTTP uploaded files (will use system default if not specified)
++upload_tmp_dir	= /tmp	                ; temporary directory for HTTP uploaded files (will use system default if not specified)
+ upload_max_filesize = 2M		    ; Maximum allowed size for uploaded files
+ 
+ 
diff --git a/www/php4/patches/patch-ai b/www/php4/patches/patch-ai
deleted file mode 100644
index 80857e5abbb..00000000000
--- a/www/php4/patches/patch-ai
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2001/05/14 14:12:30 jlam Exp $
-
---- php.ini-dist.orig	Sun Apr 22 07:58:49 2001
-+++ php.ini-dist
-@@ -318,8 +318,9 @@
- ; if nonempty.
- user_dir =
- 
--; Directory in which the loadable extensions (modules) reside.
--extension_dir = ./
-+; Directory in which the loadable extensions (modules) reside.  If not
-+; defined, then use the extension directory specified at compile-time.
-+;extension_dir = ./
- 
- ; Whether or not to enable the dl() function.  The dl() function does NOT work
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -336,7 +337,7 @@
- 
- ; Temporary directory for HTTP uploaded files (will use system default if not
- ; specified).
--;upload_tmp_dir =
-+upload_tmp_dir = /tmp
- 
- ; Maximum allowed size for uploaded files.
- upload_max_filesize = 2M
diff --git a/www/php4/patches/patch-aj b/www/php4/patches/patch-aj
deleted file mode 100644
index 804e051cccd..00000000000
--- a/www/php4/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2001/05/14 14:12:30 jlam Exp $
-
---- main/php_open_temporary_file.c.orig	Mon Feb 26 01:07:31 2001
-+++ main/php_open_temporary_file.c
-@@ -110,7 +110,7 @@
- 		trailing_slash = "/";
- 	}
- 
--	(void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", path, trailing_slash, pfx);
-+	(void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXXXXXX", path, trailing_slash, pfx);
- 
- #ifdef PHP_WIN32
- 	if (GetTempFileName(path, pfx, 0, opened_path)) {