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

- Prepare for 4.0.6
- MFH
2026-11-09 10:10:50 +00:00 · 2001-06-20 20:13:00 +00:00 · 2001-06-20 20:12:59 +00:00 · 2001-06-20 17:15:37 +00:00 · 2001-06-20 15:54:46 +00:00 · 2001-06-20 14:50:17 +00:00
164 changed files with 2957 additions and 4683 deletions
@@ -1,7 +1,19 @@
 PHP 4.0                                                                    NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||

-?? ??? 200?, Version 4.0.6
+20 Jun 2001, Version 4.0.6
+- Fix memory fragmention problem which could lead to web server processes
+  growing much more than they should. (Andi, Zend Engine)
+- Made $HTTP_SESSION_VARS['foo'] and $foo be references to the same value
+  when register_globals is on. (Andrei)
+- Fix disk_free_space() and disk_total_space() under FreeBSD. (Jon)
+- Fixed readfile/passthru losing resources during connection abort (Sascha)
+- Fixed bug in the mcrypt extension that caused segfaults when using a key
+  that is too large for the used algorithm, and a bug that caused
+  mcrypt_generic() to segfault PHP (Derick)
+- Fixed getopt so that it accepts command line arguments in the form
+  -<opt><arg> and -<opt> <arg>. (Jmoore)
+- Fixed race in writing session files (Sascha)
 - Fixed a possible crash in the PHP CGI when no input file is
  specified (Zeev)
 - Added is_callable() function that can be used to find out whether
@@ -23,6 +35,9 @@ PHP 4.0                                                                    NEWS
 - Added connection error support to mysql_error() and mysql_errno(). (Jason)
 - Added support to getimagesize to return dimensions of BMP and PSD
  files. (Derick)
+- Added heuristic to kill stale IRC connections, message scanner caching, and
+  nickname escaping to IRCG, suppress option to ircg_msg(), and statistics to
+  IRCG phpinfo() output. (Sascha)
 - Added Japanese multibyte string functions support. (Rui)
 - Added Mac OS X "\r" line ending support. (Andi, Zend Engine)
 - Fixed a bug regarding the $PHP_SELF being incorrectly registered when
@@ -302,6 +302,9 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals)
 	zend_init_rsrc_plist(ELS_C);
 	EG(lambda_count)=0;
 	EG(user_error_handler) = NULL;
+#if SUPPORT_INTERACTIVE
+	EG(interactive) = 0;
+#endif
 }


@@ -467,6 +470,7 @@ ZEND_API void zend_bailout()
 	ELS_FETCH();

 	CG(unclean_shutdown) = 1;
+	CG(in_compilation) = EG(in_execution) = 0;
 	longjmp(EG(bailout), FAILURE);
 }
 END_EXTERN_C()
@@ -394,6 +394,7 @@ ZEND_API void start_memory_manager(ALS_D)
 	memset(AG(fast_cache_list_head), 0, sizeof(AG(fast_cache_list_head)));
 	memset(AG(cache_count), 0, sizeof(AG(cache_count)));

+#if 0
 #ifndef ZTS
 	/* Initialize cache, to prevent fragmentation */
 	/* We can't do this in ZTS mode, because calling emalloc() from within start_memory_manager()
@@ -410,6 +411,7 @@ ZEND_API void start_memory_manager(ALS_D)
 		}
 	}
 #endif
+#endif

 #if ZEND_DEBUG
 	memset(AG(cache_stats), 0, sizeof(AG(cache_stats)));
@@ -438,6 +440,19 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
 		AG(fast_cache_list_head)[fci] = NULL;
 	}

+	if (1 || clean_cache) {
+		zend_mem_header *ptr;
+
+		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];
+				REMOVE_POINTER_FROM_LIST(ptr);
+				free(ptr);
+			}
+			AG(cache_count)[i] = 0;
+		}
+	}
+
 	p = AG(head);
 	t = AG(head);
 	while (t) {
@@ -478,13 +493,6 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
 		}
 	}

-	if (clean_cache) {
-		for (i=1; i<MAX_CACHED_MEMORY; i++) {
-			for (j=0; j<AG(cache_count)[i]; j++) {
-				free(AG(cache)[i][j]);
-			}
-		}
-	}
 #if MEMORY_LIMIT
 	AG(memory_exhausted)=0;
 #endif
@@ -670,7 +670,7 @@ void zend_do_free(znode *op1 CLS_DC)
 	} else if (op1->op_type==IS_VAR) {
 		zend_op *opline = &CG(active_op_array)->opcodes[CG(active_op_array)->last-1];

-		if (opline->opcode == ZEND_END_SILENCE) {
+		while (opline->opcode == ZEND_END_SILENCE || opline->opcode == ZEND_EXT_FCALL_END) {
 			opline--;
 		}
 		if (opline->result.op_type == op1->op_type
@@ -35,7 +35,11 @@

 #define DEBUG_ZEND 0

-#define SUPPORT_INTERACTIVE 1
+#ifndef ZTS
+# define SUPPORT_INTERACTIVE 1
+#else
+# define SUPPORT_INTERACTIVE 0
+#endif

 #define FREE_PNODE(znode)	zval_dtor(&znode->u.constant);
 #define FREE_OP(op, should_free) if (should_free) zval_dtor(&Ts[(op)->u.var].tmp_var);
@@ -282,7 +282,7 @@ static inline void zend_assign_to_variable(znode *result, znode *op1, znode *op2
 						if (op2
 							&& op2->op_type == IS_VAR
 							&& value==&Ts[op2->u.var].tmp_var) {
-							efree(value->value.str.val);
+							STR_FREE(value->value.str.val);
 						}
 						if (final_value == &tmp) {
 							zval_dtor(final_value);
@@ -898,7 +898,7 @@ typedef struct _object_info {
 	zval *ptr;
 } object_info;

-void execute(zend_op_array *op_array ELS_DC)
+ZEND_API void execute(zend_op_array *op_array ELS_DC)
 {
 	zend_op *opline = op_array->opcodes;
 #if SUPPORT_INTERACTIVE
@@ -1532,7 +1532,7 @@ do_fcall_common:

 							zend_hash_update(function_state.function_symbol_table, "this", sizeof("this"), &null_ptr, sizeof(zval *), (void **) &this_ptr);
 							if (!PZVAL_IS_REF(object.ptr)) {
-								zend_error(E_WARNING,"Problem with method call. Report this bug\n");
+								zend_error(E_WARNING, "Problem with method call - please report this bug");
                			}
 							*this_ptr = object.ptr;
 							object.ptr = NULL;
@@ -52,7 +52,7 @@ ZEND_API extern void (*zend_execute)(zend_op_array *op_array ELS_DC);

 void init_executor(CLS_D ELS_DC);
 void shutdown_executor(ELS_D);
-void execute(zend_op_array *op_array ELS_DC);
+ZEND_API void execute(zend_op_array *op_array ELS_DC);
 ZEND_API int zend_is_true(zval *op);
 static inline void safe_free_zval_ptr(zval *p)
 {
@@ -274,7 +274,7 @@ static void zend_extension_op_array_handler(zend_extension *extension, zend_op_a

 int pass_two(zend_op_array *op_array)
 {
-	zend_op *opline=op_array->opcodes, *end=opline+op_array->last;
+	zend_op *opline, *end;
 	CLS_FETCH();

 	if (op_array->type!=ZEND_USER_FUNCTION && op_array->type!=ZEND_EVAL_CODE) {
@@ -286,12 +286,15 @@ int pass_two(zend_op_array *op_array)
 	if (CG(handle_op_arrays)) {
 		zend_llist_apply_with_argument(&zend_extensions, (void (*)(void *, void *)) zend_extension_op_array_handler, op_array);
 	}
-	while (opline<end) {
-		if (opline->op1.op_type==IS_CONST) {
+
+	opline = op_array->opcodes;
+	end = opline + op_array->last;
+	while (opline < end) {
+		if (opline->op1.op_type == IS_CONST) {
 			opline->op1.u.constant.is_ref = 1;
 			opline->op1.u.constant.refcount = 2; /* Make sure is_ref won't be reset */
 		}
-		if (opline->op2.op_type==IS_CONST) {
+		if (opline->op2.op_type == IS_CONST) {
 			opline->op2.u.constant.is_ref = 1;
 			opline->op2.u.constant.refcount = 2;
 		}
@@ -589,15 +589,19 @@ AC_DEFUN(PHP_BUILD_RPATH,[
 ])

 dnl
-dnl PHP_ADD_INCLUDE(path)
+dnl PHP_ADD_INCLUDE(path [,before])
 dnl
-dnl add a include path
+dnl add a include pat, if before is 1, add in front.
 dnl
 AC_DEFUN(PHP_ADD_INCLUDE,[
  if test "$1" != "/usr/include"; then
    PHP_EXPAND_PATH($1, ai_p)
    AC_PHP_ONCE(INCLUDEPATH, $ai_p, [
-      INCLUDES="$INCLUDES -I$ai_p"
+      if test "$2"; then
+        INCLUDES="-I$ai_p $INCLUDES"
+      else
+        INCLUDES="$INCLUDES -I$ai_p"
+      fi
    ])
  fi
 ])
@@ -950,6 +954,11 @@ int main(void) {
  fi
 ])

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

@@ -21,7 +21,7 @@ include generated_lists

 TOUCH_FILES = mkinstalldirs install-sh missing

-LT_TARGETS = ltconfig ltmain.sh config.guess config.sub
+LT_TARGETS = ltmain.sh config.guess config.sub

 makefile_in_files = $(makefile_am_files:.am=.in)
 makefile_files    = $(makefile_am_files:e.am=e)
@@ -58,9 +58,9 @@ $(makefile_in_files): $(makefile_am_files) aclocal.m4 configure.in $(config_m4_f
 	@for i in $(LT_TARGETS); do mv $$i.bak $$i; done

 aclocal.m4: configure.in acinclude.m4 dynlib.m4
-	aclocal
+	aclocal 2>&1 | $(SUPPRESS_WARNINGS)

-SUPPRESS_WARNINGS = (egrep -v '(warning: AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|.*AM_PROG_LEX.*)'||true)
+SUPPRESS_WARNINGS = (egrep -v '(warning: AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|.*AM_PROG_LEX.*|defined in acinclude.m4 but never used)'||true)

 $(config_h_in): configure acconfig.h
 # explicitly remove target since autoheader does not seem to work 
@@ -16,7 +16,7 @@
 #  |          Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
-# $Id: buildcheck.sh,v 1.8 2001-05-06 18:51:21 sas Exp $ 
+# $Id: buildcheck.sh,v 1.8.2.1 2001-05-12 09:03:58 andi Exp $ 
 #

 echo "buildconf: checking installation..."
@@ -70,7 +70,7 @@ fi
 lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
 IFS=.; set $lt_version; IFS=' '

-if test "$1" -gt "1" || test "$2" -ge "4";
+if test "$1" -gt "1" || test "$2" -gt "3" || (test "$2" = "3" && (test "$3" = "c" || test "$3" -ge "3"))
 then
 echo "buildconf: libtool version $lt_pversion (ok)"
 else
@@ -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.6-dev, nodefine)
+AM_INIT_AUTOMAKE(php, 4.0.6, nodefine)

 PHP_VERSION=$VERSION
 echo "/* automatically generated by configure */" > php_version.h.new
@@ -303,6 +303,7 @@ syslog.h \
 sysexits.h \
 sys/file.h \
 sys/mman.h \
+sys/mount.h \
 sys/resource.h \
 sys/select.h \
 sys/socket.h \
@@ -349,7 +350,8 @@ AC_TYPE_UID_T

 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
@@ -370,6 +372,8 @@ getlogin \
 gethostbyaddr \
 getprotobyname \
 getprotobynumber \
+getservbyname \
+getservbyport \
 getrusage \
 gettimeofday \
 gmtime_r \
@@ -18,6 +18,10 @@

 /* $Id$ */

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

 #ifdef COMPILE_DL_ASPELL
@@ -18,6 +18,10 @@

 /* $Id$ */

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

 #if WITH_BCMATH
@@ -19,6 +19,10 @@
 */
 /* $Id: */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "ext/standard/info.h"
 #include "php_calendar.h"
@@ -28,7 +28,7 @@

 #include "php.h"
 #include "php_ini.h"
-#include "php_typedef_VARIANT.h"
+#include "php_VARIANT.h"
 #include "conversion.h"
 #include "ext/standard/info.h"

@@ -38,6 +38,10 @@
 #undef THREAD_SAFE
 #endif

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_globals.h"
 #include "ext/standard/php_standard.h"
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
@@ -17,6 +17,10 @@
   +----------------------------------------------------------------------+
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "php_ctype.h"
@@ -23,17 +23,33 @@ if test "$PHP_CURL" != "no"; then
    easy.h should be in <curl-dir>/include/curl/)
  fi

-  PHP_ADD_INCLUDE($CURL_DIR/include)
+  CURL_CONFIG="curl-config"
+  AC_MSG_CHECKING(for cURL greater than or equal to 7.8)

-  PHP_SUBST(CURL_SHARED_LIBADD)
+  if ${CURL_DIR}/bin/curl-config --libs print > /dev/null 2>&1; then
+    CURL_CONFIG=${CURL_DIR}/bin/curl-config
+  fi
+
+  curl_version_full=`$CURL_CONFIG --version`
+  curl_version=`$CURL_CONFIG --vernum 2>/dev/null`
+  if test "$curl_version" -ge 70800; then
+    AC_MSG_RESULT($curl_version_full)
+    CURL_LIBS=`$CURL_CONFIG --libs`
+  else
+    AC_MSG_ERROR(cURL version 7.8 or later is required to compile php with cURL support)
+  fi
+
+  PHP_ADD_INCLUDE($CURL_DIR/include)
+  PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
  PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD)

  AC_CHECK_LIB(curl,curl_easy_perform, 
  [ 
    AC_DEFINE(HAVE_CURL,1,[ ])
  ],[
-    AC_MSG_ERROR(Try adding --with-openssl[=DIR] into your configure line.)
+    AC_MSG_ERROR(There is something wrong. Please check config.log for more information.)
  ])

  PHP_EXTENSION(curl, $ext_shared)
+  PHP_SUBST(CURL_SHARED_LIBADD)
 fi
@@ -18,6 +18,9 @@

 /* $Id$ */

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

 #include "php.h"

@@ -39,48 +42,12 @@
 #include "php_curl.h"

 static int  le_curl;
-static char le_curl_name[] = "cURL handle";
+#define le_curl_name "cURL handle"

 static void _php_curl_close(zend_rsrc_list_entry *rsrc);

 #define SAVE_CURL_ERROR(__handle, __err) (__handle)->err.no = (int) __err;

-#ifdef PHP_WIN32
-/* {{{ win32_cleanup()
-   Clean-up allocated socket data on win32 systems */
-static void win32_cleanup()
-{
-	WSACleanup();
-}
-/* }}} */
-
-/* {{{ win32_init()
-   Initialize WSA stuff on Win32 systems */
-static CURLcode win32_init()
-{
-	WSADATA wsa_data;
-	WORD    requested_version = MAKEWORD(1, 1);
-	int     error;
-	
-	error = WSAStartup(requested_version, &wsa_data);
-	if (error != 0) {
-		return CURLE_FAILED_INIT;
-	}
-	
-	if (LOBYTE(wsa_data.wVersion) != 1 || HIBYTE(wsa_data.wVersion) != 1) {
-		WSACleanup();
-		return CURLE_FAILED_INIT;
-	}
-	
-	return CURLE_OK;
-}
-/* }}} */
-#else
-static CURLcode win32_init(void) { return CURLE_OK; }
-#define win32_cleanup()
-#endif
-
-
 function_entry curl_functions[] = {
 	PHP_FE(curl_init,     NULL)
 	PHP_FE(curl_version,  NULL)
@@ -187,7 +154,8 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT("CURLOPT_CONNECTTIMEOUT",  CURLOPT_CONNECTTIMEOUT);
 	REGISTER_CURL_CONSTANT("CURLOPT_SSL_VERIFYPEER",  CURLOPT_SSL_VERIFYPEER);
 	REGISTER_CURL_CONSTANT("CURLOPT_CAINFO",          CURLOPT_CAINFO);
-
+	REGISTER_CURL_CONSTANT("CURLOPT_BINARYTRANSER",   CURLOPT_BINARYTRANSFER);
+	
 	/* Constants effecting the way CURLOPT_CLOSEPOLICY works */
 	REGISTER_CURL_CONSTANT("CURLCLOSEPOLICY_LEAST_RECENTLY_USED", CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
 	REGISTER_CURL_CONSTANT("CURLCLOSEPOLICY_OLDEST",              CURLCLOSEPOLICY_OLDEST);
@@ -260,24 +228,28 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT("CURLE_TELNET_OPTION_SYNTAX",        CURLE_TELNET_OPTION_SYNTAX);
 	REGISTER_CURL_CONSTANT("CURLE_ALREADY_COMPLETE",            CURLE_ALREADY_COMPLETE);

-	if (win32_init() != CURLE_OK) {
+	if (curl_global_init(0) != CURLE_OK) {
 		return FAILURE;
 	}
-
+	
 	return SUCCESS;
 }

 PHP_MSHUTDOWN_FUNCTION(curl)
 {
-	win32_cleanup();
+	curl_global_cleanup();
+
 	return SUCCESS;
 }

+
 #define PHP_CURL_STDOUT 0
 #define PHP_CURL_FILE   1
 #define PHP_CURL_USER   2
 #define PHP_CURL_DIRECT 3
 #define PHP_CURL_RETURN 4
+#define PHP_CURL_ASCII  5
+#define PHP_CURL_BINARY 6

 static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
 {
@@ -287,10 +259,12 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
 	ELS_FETCH();

 	switch (t->method) {
+	case PHP_CURL_STDOUT:
+		PUTS(data);
+		break;
 	case PHP_CURL_FILE:
 		return fwrite(data, size, nmemb, t->fp);
 	case PHP_CURL_RETURN:
-	case PHP_CURL_STDOUT:
 		smart_str_appendl(&t->buf, data, (int) length);
 		break;
 	case PHP_CURL_USER: {
@@ -483,7 +457,7 @@ PHP_FUNCTION(curl_version)
 }
 /* }}} */

-static void init_curl_handle(php_curl **ch)
+static void alloc_curl_handle(php_curl **ch)
 {
 	*ch                    = emalloc(sizeof(php_curl));
 	(*ch)->handlers        = ecalloc(1, sizeof(php_curl_handlers));
@@ -511,7 +485,7 @@ PHP_FUNCTION(curl_init)
 		WRONG_PARAM_COUNT;
 	}

-	init_curl_handle(&ch);
+	alloc_curl_handle(&ch);

 	ch->cp = curl_easy_init();
 	if (! ch->cp) {
@@ -520,6 +494,7 @@ PHP_FUNCTION(curl_init)
 	}

 	ch->handlers->write->method = PHP_CURL_STDOUT;
+	ch->handlers->write->type   = PHP_CURL_ASCII;
 	ch->handlers->read->method  = PHP_CURL_DIRECT;

 	curl_easy_setopt(ch->cp, CURLOPT_NOPROGRESS,        1);
@@ -654,6 +629,10 @@ PHP_FUNCTION(curl_setopt)
 			ch->handlers->write->method = PHP_CURL_RETURN;
 		}
 		break;
+	case CURLOPT_BINARYTRANSFER:
+		convert_to_long_ex(zvalue);
+		
+		ch->handlers->write->type = PHP_CURL_BINARY;
 	case CURLOPT_WRITEFUNCTION:
 		zval_add_ref(zvalue);
 		ch->handlers->write->func = *zvalue;
@@ -749,7 +728,8 @@ PHP_FUNCTION(curl_setopt)
 			SEPARATE_ZVAL(current);
 			convert_to_string_ex(current);

-			indiv = estrndup(Z_STRVAL_PP(current), Z_STRLEN_PP(current));
+			indiv = estrndup(Z_STRVAL_PP(current), Z_STRLEN_PP(current) + 1);
+			indiv[Z_STRLEN_PP(current)] = '\0';
 			slist = curl_slist_append(slist, indiv);
 			if (! slist) {
 				efree(indiv);
@@ -796,15 +776,11 @@ PHP_FUNCTION(curl_exec)
 	}

 	if (ch->handlers->write->method == PHP_CURL_RETURN) {
-		smart_str_0(&ch->handlers->write->buf);
+		if (ch->handlers->write->type != PHP_CURL_BINARY) 
+			smart_str_0(&ch->handlers->write->buf);
 		RETURN_STRINGL(ch->handlers->write->buf.c, ch->handlers->write->buf.len, 1);
 		smart_str_free(&ch->handlers->write->buf);
 	}
-	else if (ch->handlers->write->method == PHP_CURL_STDOUT) {
-		smart_str_0(&ch->handlers->write->buf);
-		PUTS(ch->handlers->write->buf.c);
-		smart_str_free(&ch->handlers->write->buf);
-	}

 	RETURN_TRUE;
 }
@@ -38,6 +38,7 @@ extern zend_module_entry curl_module_entry;
 #define curl_module_ptr &curl_module_entry

 #define CURLOPT_RETURNTRANSFER 19913
+#define CURLOPT_BINARYTRANSFER 19914

 PHP_MINIT_FUNCTION(curl);
 PHP_MSHUTDOWN_FUNCTION(curl);
@@ -56,6 +57,7 @@ typedef struct {
 	FILE         *fp;
 	smart_str     buf;
 	int           method;
+	int           type;
 } php_curl_write;

 typedef struct {
@@ -28,6 +28,10 @@
   +----------------------------------------------------------------------+
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "ext/standard/info.h"
 #include "cybercash.h"
@@ -17,6 +17,10 @@
   +----------------------------------------------------------------------+
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "php_cybermut.h"
@@ -7,10 +7,13 @@ dnl don't forget to call PHP_EXTENSION(db)
 # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order
 AC_DEFUN(AC_PREFERRED_DB_LIB,[
  AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,1, [Whether you have GDBM]) DBM_TYPE=gdbm; DBM_LIB=-lgdbm],
-  [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM,1, [Whether you have NDBM]) DBM_TYPE=ndbm; DBM_LIB=-ldb],
-   [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=],
-    [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=-ldbm],
-     [DBM_TYPE=""])])])])
+  [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=],
+   [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=-ldbm],
+    [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM,1, [Whether you have NDBM]) DBM_TYPE=ndbm; DBM_LIB=-ldb],
+     [DBM_TYPE=""])
+    ])
+   ])
+  ])
  AC_MSG_CHECKING([preferred dbm library])
  if test "a$DBM_TYPE" = a; then
    AC_MSG_RESULT(none found)
@@ -33,9 +36,9 @@ if test "$PHP_DB" != "no"; then
  if test "$DBM_LIB" = "-lgdbm"; then
    AC_CHECK_HEADER(gdbm.h, [ GDBM_INCLUDE="" ], [ 
      AC_MSG_RESULT("Try /usr/local/include/gdbm.h"); 
-      AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE="-I/usr/local/include" ],[
+      AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE=-I/usr/local/include ],[
        AC_MSG_RESULT("Try /opt/local/include/gdbm.h");
-        AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE="-I/opt/local/include" ],[
+        AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE=-I/opt/local/include ],[
          dnl if in /usr/pkg/include, do not add anything.  See above.
          AC_MSG_RESULT("Try /usr/pkg/include/gdbm.h");
          AC_CHECK_HEADER(/usr/pkg/include/gdbm.h, [ GDBM_INCLUDE="" ],[
@@ -22,6 +22,10 @@

 #if 1

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_globals.h"
 #include "safe_mode.h"
@@ -29,6 +29,10 @@

 /* $Id$ */

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

 #if HAVE_DBA
@@ -16,10 +16,8 @@
   +----------------------------------------------------------------------+
 */

-#include <stdlib.h>
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif

 #include "php.h"
@@ -27,6 +25,12 @@
 #include "fopen_wrappers.h"
 #include "php_globals.h"

+#include <stdlib.h>
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
 #if DBASE
 #include "php_dbase.h"
 #include "dbf.h"
@@ -20,6 +20,10 @@
   +----------------------------------------------------------------------+
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+ 
 #include "php.h"
 #include "php_ini.h"
 #include "php_dbx.h"
@@ -3,7 +3,7 @@ dnl config.m4 for extension domxml

 AC_DEFUN(PHP_DOM_CHECK_VERSION,[
  old_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="-I$DOMXML_DIR/include"
+  CPPFLAGS=-I$DOMXML_DIR/include
  AC_MSG_CHECKING(for libxml version)
  AC_EGREP_CPP(yes,[
  #include <libxml/xmlversion.h>
@@ -47,30 +47,20 @@ if test "$PHP_DOM" != "no"; then
  PHP_ADD_INCLUDE($DOMXML_DIR/include)

  if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then
-    DOM_LIBNAME="xml2"
+    DOM_LIBNAME=xml2
  else
-    DOM_LIBNAME="xml"
+    DOM_LIBNAME=xml
  fi

  PHP_SUBST(DOMXML_SHARED_LIBADD)
  PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)

-  if test "$PHP_ZLIB" = "no"; then
-    AC_MSG_CHECKING([for zlib (needed by DOM support)])
-
-    AC_CHECK_LIB(z,deflate, [
-      PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, DOMXML_SHARED_LIBADD)
-    ],[
-      AC_MSG_ERROR(libz.(a|so) not found! Try with --with-zlib-dir=<DIR>)
-    ],[
-      -L$PHP_ZLIB_DIR/lib
-    ])
-
-  else
-    echo "checking for libz needed by libxml ... already zlib support"
-    PHP_ADD_LIBRARY(z,, DOMXML_SHARED_LIBADD)
+  if test "$PHP_ZLIB_DIR" = "no"; then
+    AC_MSG_ERROR(DOMXML requires ZLIB. Use --with-zlib-dir=<DIR>)
  fi

+  PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, DOMXML_SHARED_LIBADD)
+
  AC_DEFINE(HAVE_DOMXML,1,[ ])
  PHP_EXTENSION(domxml, $ext_shared)
 fi
@@ -54,7 +54,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 libxml2.lib wsock32.lib php4ts.lib resolv.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 /out:"..\..\Release_TS/php_domxml.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 libxml.lib wsock32.lib php4ts.lib resolv.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 /out:"..\..\Release_TS/php_domxml.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
 # SUBTRACT LINK32 /pdb:none

 !ELSEIF  "$(CFG)" == "domxml - Win32 Debug_TS"
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 libxml2.lib php4ts_debug.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_domxml.dll" /libpath:"..\..\Debug_TS"
+# ADD LINK32 libxml.lib php4ts_debug.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_domxml.dll" /libpath:"..\..\Debug_TS"

 !ENDIF 

@@ -35,94 +35,32 @@ extern zend_module_entry domxml_module_entry;

 /* directory functions */
 extern PHP_MINIT_FUNCTION(domxml);
-extern PHP_RINIT_FUNCTION(domxml);
 extern PHP_MINFO_FUNCTION(domxml);
-PHP_FUNCTION(domxml_version);
 PHP_FUNCTION(xmldoc);
 PHP_FUNCTION(xmldocfile);
 PHP_FUNCTION(xmltree);
 PHP_FUNCTION(domxml_new_xmldoc);

 /* Class Document methods */
-PHP_FUNCTION(domxml_doc_doctype);
-PHP_FUNCTION(domxml_doc_implementation);
-PHP_FUNCTION(domxml_doc_document_element);
-PHP_FUNCTION(domxml_doc_create_element);
-PHP_FUNCTION(domxml_doc_create_text_node);
-PHP_FUNCTION(domxml_doc_create_comment);
-PHP_FUNCTION(domxml_doc_create_processing_instruction);
-PHP_FUNCTION(domxml_doc_create_attribute);
-PHP_FUNCTION(domxml_doc_imported_node);
+PHP_FUNCTION(domxml_root);
 PHP_FUNCTION(domxml_add_root);
 PHP_FUNCTION(domxml_intdtd);
 PHP_FUNCTION(domxml_dumpmem);

-/* Class DocumentType methods */
-PHP_FUNCTION(domxml_doctype_name);
-PHP_FUNCTION(domxml_doctype_entities);
-PHP_FUNCTION(domxml_doctype_notations);
-PHP_FUNCTION(domxml_doctype_public_id);
-PHP_FUNCTION(domxml_doctype_system_id);
-PHP_FUNCTION(domxml_doctype_internal_subset);
-
-/* Class Notation methods */
-PHP_FUNCTION(domxml_notation_public_id);
-PHP_FUNCTION(domxml_notation_system_id);
-
 /* Class Node methods */
-PHP_FUNCTION(domxml_node_attributes);
-PHP_FUNCTION(domxml_node_children);
-PHP_FUNCTION(domxml_node_first_child);
-PHP_FUNCTION(domxml_node_last_child);
-PHP_FUNCTION(domxml_node_next_sibling);
-PHP_FUNCTION(domxml_node_previous_sibling);
-PHP_FUNCTION(domxml_node_owner_document);
-PHP_FUNCTION(domxml_node_insert_before);
-PHP_FUNCTION(domxml_node_append_child);
-PHP_FUNCTION(domxml_node_add_child);
-PHP_FUNCTION(domxml_node_has_attributes);
-PHP_FUNCTION(domxml_node_has_child_nodes);
-PHP_FUNCTION(domxml_node_parent);
-PHP_FUNCTION(domxml_node_prefix);
+PHP_FUNCTION(domxml_attributes);
+PHP_FUNCTION(domxml_get_attribute);
+PHP_FUNCTION(domxml_set_attribute);
+PHP_FUNCTION(domxml_children);
+PHP_FUNCTION(domxml_last_child);
+PHP_FUNCTION(domxml_parent);
 PHP_FUNCTION(domxml_node);
-PHP_FUNCTION(domxml_node_unlink_node);
-PHP_FUNCTION(domxml_node_new_child);
-PHP_FUNCTION(domxml_node_set_content);
-PHP_FUNCTION(domxml_node_text_concat);
-PHP_FUNCTION(domxml_node_set_name);
-PHP_FUNCTION(domxml_node_name);
-PHP_FUNCTION(domxml_node_value);
+PHP_FUNCTION(domxml_unlink_node);
+PHP_FUNCTION(domxml_new_child);
+PHP_FUNCTION(domxml_set_content);

 /* Class Attribute methods */
-PHP_FUNCTION(domxml_attr_name);
-PHP_FUNCTION(domxml_attr_value);
-PHP_FUNCTION(domxml_attr_specified);
-
-/* Class Element methods */
-PHP_FUNCTION(domxml_element);
-PHP_FUNCTION(domxml_elem_tagname);
-PHP_FUNCTION(domxml_elem_get_attribute);
-PHP_FUNCTION(domxml_elem_set_attribute);
-PHP_FUNCTION(domxml_elem_remove_attribute);
-PHP_FUNCTION(domxml_elem_get_attribute_node);
-PHP_FUNCTION(domxml_elem_set_attribute_node);
-PHP_FUNCTION(domxml_elem_get_element_by_tagname);
-
-/* Class CData methods */
-PHP_FUNCTION(domxml_cdata_length);
-
-/* Class Notation methods */
-PHP_FUNCTION(domxml_notation_public_id);
-PHP_FUNCTION(domxml_notation_system_id);
-
-/* Class Entity methods */
-PHP_FUNCTION(domxml_entity_public_id);
-PHP_FUNCTION(domxml_entity_system_id);
-PHP_FUNCTION(domxml_entity_notation_name);
-
-/* Class ProcessingInstructions */
-PHP_FUNCTION(domxml_pi_target);
-PHP_FUNCTION(domxml_pi_data);
+PHP_FUNCTION(domxml_attrname);

 /* Class XPathContext methods */
 #if defined(LIBXML_XPATH_ENABLED)
@@ -36,6 +36,10 @@
   Matthias Wandel,  Dec 1999 - April 2000
  --------------------------------------------------------------------------
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"

 #if HAVE_EXIF
@@ -37,6 +37,10 @@
 	- Select db with no arguments
 	 - Query with everything defaulted
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_globals.h"
 #include "php_globals.h"
@@ -24,6 +24,10 @@

 /* Note that there is no code from the FdfTk lib in this file */

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

 #if HAVE_FDFLIB
@@ -26,6 +26,10 @@
  web site at http://www.fileproplus.com/
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "safe_mode.h"
 #include "fopen_wrappers.h"
@@ -17,6 +17,10 @@
   +----------------------------------------------------------------------+
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "php_fribidi.h"
@@ -44,7 +44,7 @@

 typedef enum ftptype {
 	FTPTYPE_ASCII,
-	FTPTYPE_IMAGE,
+	FTPTYPE_IMAGE
 } ftptype_t;

 typedef struct ftpbuf
@@ -30,6 +30,10 @@

 /* $Id$ */

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

 #if HAVE_FTP
@@ -2,6 +2,6 @@
 LTLIBRARY_NAME    = libgd.la
 LTLIBRARY_SOURCES = gd.c gdcache.c gdttf.c gdt1.c
 LTLIBRARY_SHARED_NAME   = gd.la
-LTLIBRARY_SHARED_LIBADD = $(GD_LFLAGS) $(GD_LIBS)
+LTLIBRARY_SHARED_LIBADD = $(GD_SHARED_LIBADD)

 include $(top_srcdir)/build/dynlib.mk
@@ -6,12 +6,14 @@ AC_DEFUN(PHP_GD_JPEG,[
  PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
  [  --with-jpeg-dir=DIR       GD: Set the path to libjpeg install prefix.])

-  if test "$PHP_JPEG_DIR" != "no" -a "$PHP_JPEG_DIR"; then
+  if test "$PHP_JPEG_DIR" != "no"; then
+
    if test "$PHP_JPEG_DIR" = "yes"; then
-      $PHP_JPEG_DIR=/usr/local
+      PHP_JPEG_DIR=/usr/local
    fi

-    AC_CHECK_LIB(jpeg,jpeg_read_header,[
+    AC_CHECK_LIB(jpeg,jpeg_read_header,
+    [
      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, GD_SHARED_LIBADD)
    ],[
      AC_MSG_ERROR(libjpeg not found!)
@@ -27,12 +29,18 @@ AC_DEFUN(PHP_GD_PNG,[
  PHP_ARG_WITH(png-dir, for the location of libpng,
  [  --with-png-dir=DIR        GD: Set the path to libpng install prefix.])

-  if test "$PHP_PNG_DIR" != "no" -a "$PHP_PNG_DIR"; then
+  if test "$PHP_PNG_DIR" != "no"; then
+
    if test "$PHP_PNG_DIR" = "yes"; then
-      $PHP_PNG_DIR=/usr/local
+      PHP_PNG_DIR=/usr/local
    fi

-    AC_CHECK_LIB(png,png_info_init,[
+    if test "$PHP_ZLIB_DIR" = "no"; then
+      AC_MSG_ERROR(PNG support requires ZLIB. Use --with-zlib-dir=<DIR>)
+    fi
+    
+    AC_CHECK_LIB(png,png_info_init,
+    [
      PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD)
      PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, GD_SHARED_LIBADD)
    ],[
@@ -41,7 +49,7 @@ AC_DEFUN(PHP_GD_PNG,[
      -L$PHP_ZLIB_DIR/lib -lz -L$PHP_PNG_DIR/lib
    ])
  else 
-    AC_MSG_RESULT(If configure fails try --with-png-dir=<DIR>)
+    AC_MSG_RESULT(If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>)
  fi
 ])

@@ -49,12 +57,13 @@ AC_DEFUN(PHP_GD_XPM,[
  PHP_ARG_WITH(xpm-dir, for the location of libXpm,
  [  --with-xpm-dir=DIR        GD: Set the path to libXpm install prefix.])

-  if test "$PHP_XPM_DIR" != "no" -a "$PHP_XPM_DIR"; then
+  if test "$PHP_XPM_DIR" != "no"; then
    if test "$PHP_XPM_DIR" = "yes"; then
-      $PHP_XPM_DIR=/usr/local
+      PHP_XPM_DIR=/usr/local
    fi

-    AC_CHECK_LIB(Xpm,XpmFreeXpmImage, [
+    AC_CHECK_LIB(Xpm,XpmFreeXpmImage, 
+    [
      PHP_ADD_LIBRARY_WITH_PATH(Xpm, $PHP_XPM_DIR/lib, GD_SHARED_LIBADD)
      PHP_ADD_LIBRARY_WITH_PATH(X11, $PHP_XPM_DIR/lib, GD_SHARED_LIBADD)
    ],[
@@ -129,20 +138,25 @@ AC_DEFUN(PHP_GD_T1LIB,[
  [  --with-t1lib[=DIR]        GD: Include T1lib support.])

  if test "$PHP_T1LIB" != "no"; then
-    for i in /usr/local /usr $PHP_T1LIB; do
+    for i in /usr /usr/local $PHP_T1LIB; do
      if test -f "$i/include/t1lib.h"; then
-        T1_DIR="$i"
+        T1_DIR=$i
      fi
    done

-    if test "$T1_DIR" != "no"; then
-      AC_CHECK_LIB(t1, T1_GetExtend, [
+    if test -n "$T1_DIR"; then
+      AC_CHECK_LIB(t1, T1_GetExtend, 
+      [
        AC_DEFINE(HAVE_LIBT1,1,[ ])
        PHP_ADD_INCLUDE("$T1_DIR/include")
        PHP_ADD_LIBRARY_WITH_PATH(t1, "$T1_DIR/lib", GD_SHARED_LIBADD)
      ],[
        AC_MSG_ERROR(Problem with libt1.(a|so). Please check config.log for more information.) 
+      ],[
+        -L$T1_DIR/lib
      ])
+    else
+      AC_MSG_ERROR(Your T1lib distribution is not installed correctly. Please reinstall it.) 
    fi
  fi
 ])
@@ -170,6 +184,7 @@ AC_DEFUN(PHP_GD_CHECK_VERSION,[
  AC_CHECK_LIB(gd, gdImageStringFTEx,      [AC_DEFINE(HAVE_GD_STRINGFTEX,    1, [ ])])
  AC_CHECK_LIB(gd, gdImageColorClosestHWB, [AC_DEFINE(HAVE_COLORCLOSESTHWB,     1, [ ])])
  AC_CHECK_LIB(gd, gdImageColorResolve,    [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])])
+  AC_CHECK_LIB(gd, gdImageGifCtx,          [AC_DEFINE(HAVE_GD_GIF_CTX,  1, [ ])])
 ])


@@ -205,7 +220,7 @@ dnl A whole whack of possible places where these might be
      done

      for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do
-        test -f $PHP_GD/$i/libgd.so -o -f $PHP_GD/$i/libgd.a && GD_LIB="$PHP_GD/$i"
+        test -f $PHP_GD/$i/libgd.s? -o -f $PHP_GD/$i/libgd.a && GD_LIB="$PHP_GD/$i"
      done

      if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then
@@ -25,6 +25,10 @@

 /* Note that there is no code from the gd package in this file */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+ 
 #include "php.h"
 #include "ext/standard/head.h"
 #include <math.h>
@@ -528,7 +532,7 @@ PHP_FUNCTION(imagesetstyle)
 	}

 	ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, "Image", le_gd);
-	convert_to_array_ex(dither);
+	convert_to_array_ex(styles);

 	/* copy the style values in the stylearr */
 	stylearr = emalloc(sizeof(int) * zend_hash_num_elements(HASH_OF(*styles)));
@@ -622,7 +626,7 @@ PHP_FUNCTION(imagesetthickness)
 	}

 	ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, "Image", le_gd);
-	convert_to_boolean_ex(thick);
+	convert_to_long_ex(thick);
 		
 	gdImageSetThickness(im, Z_LVAL_PP(thick));

@@ -1394,7 +1398,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
 PHP_FUNCTION(imagegif)
 {
 #ifdef HAVE_GD_GIF
-#ifdef USE_GD_IOCTX
+#ifdef HAVE_GD_GIF_CTX
 	_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGifCtx);
 #else
 	_php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGif);
@@ -19,6 +19,10 @@
 /* $Id$ */

 #include <stdio.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_gettext.h"

@@ -16,6 +16,10 @@
   +----------------------------------------------------------------------+
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "php_gmp.h"
@@ -21,6 +21,10 @@
 #include <stdlib.h>
 #include <errno.h>

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+ 
 #include "php.h"
 #include "php_globals.h"
 #include "ext/standard/php_standard.h"
@@ -34,6 +34,10 @@
 #undef ERROR
 #endif

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

 #if HAVE_ICAP
@@ -28,8 +28,8 @@ if test "$PHP_ICONV" != "no"; then
  PHP_SUBST(ICONV_SHARED_LIBADD)

  if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.so ; then
-    AC_CHECK_LIB(iconv, iconv_open, AC_DEFINE(HAVE_ICONV, 1, [ ]))
    PHP_ADD_LIBRARY_WITH_PATH(iconv, $ICONV_DIR/lib, ICONV_SHARED_LIBADD)
+    AC_CHECK_LIB(iconv, iconv_open, AC_DEFINE(HAVE_ICONV, 1, [ ]))
  else
    AC_CHECK_LIB(c, iconv_open, AC_DEFINE(HAVE_ICONV, 1, [ ]))
  fi
@@ -17,16 +17,23 @@
   +----------------------------------------------------------------------+
 */

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

 #if HAVE_ICONV

+#include <iconv.h>
+
+#include "php_globals.h"
 #include "php_iconv.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_output.h"
+#include "SAPI.h"
+#include "php_ini.h"

-ZEND_DECLARE_MODULE_GLOBALS(iconv)

 #if HAVE_LIBICONV
 #define icv_open(a,b) libiconv_open(a,b)
@@ -39,9 +46,6 @@ ZEND_DECLARE_MODULE_GLOBALS(iconv)
 #endif


-/* True global resources - no need for thread safety here */
-static int le_iconv;
-
 /* Every user visible function must have an entry in iconv_functions[].
 */
 function_entry iconv_functions[] = {
@@ -55,28 +59,29 @@ function_entry iconv_functions[] = {
 zend_module_entry iconv_module_entry = {
 	"iconv",
 	iconv_functions,
-	PHP_MINIT(iconv),
-	PHP_MSHUTDOWN(iconv),
+	PHP_MINIT(miconv),
+	PHP_MSHUTDOWN(miconv),
 	NULL,
 	NULL,
-	PHP_MINFO(iconv),
+	PHP_MINFO(miconv),
 	STANDARD_MODULE_PROPERTIES
 };

+ZEND_DECLARE_MODULE_GLOBALS(iconv)
+
 #ifdef COMPILE_DL_ICONV
 ZEND_GET_MODULE(iconv)
 #endif

 int php_iconv_string(char *, char **, char *, char *);

-
 PHP_INI_BEGIN()
-	 STD_PHP_INI_ENTRY("iconv.input_encoding",		ICONV_INPUT_ENCODING,		PHP_INI_ALL,		OnUpdateString,  input_encoding,		zend_iconv_globals,  iconv_globals)
-	 STD_PHP_INI_ENTRY("iconv.output_encoding",		ICONV_OUTPUT_ENCODING,		PHP_INI_ALL,		OnUpdateString,  output_encoding,		zend_iconv_globals,  iconv_globals)
-	 STD_PHP_INI_ENTRY("iconv.internal_encoding",		ICONV_INTERNAL_ENCODING,		PHP_INI_ALL,		OnUpdateString,  internal_encoding,		zend_iconv_globals,  iconv_globals)
+	 STD_PHP_INI_ENTRY("iconv.input_encoding",	  ICONV_INPUT_ENCODING,    PHP_INI_ALL, OnUpdateString,  input_encoding,	zend_iconv_globals,  iconv_globals)
+	 STD_PHP_INI_ENTRY("iconv.output_encoding",	  ICONV_OUTPUT_ENCODING,   PHP_INI_ALL, OnUpdateString,  output_encoding,	zend_iconv_globals,  iconv_globals)
+	 STD_PHP_INI_ENTRY("iconv.internal_encoding", ICONV_INTERNAL_ENCODING, PHP_INI_ALL, OnUpdateString,  internal_encoding,	zend_iconv_globals,  iconv_globals)
 PHP_INI_END()

-static void
+static void 
 php_iconv_init_globals(zend_iconv_globals *iconv_globals)
 {
 	iconv_globals->input_encoding = NULL;
@@ -84,20 +89,20 @@ php_iconv_init_globals(zend_iconv_globals *iconv_globals)
 	iconv_globals->internal_encoding = NULL;
 }

-PHP_MINIT_FUNCTION(iconv)
+PHP_MINIT_FUNCTION(miconv)
 {
 	ZEND_INIT_MODULE_GLOBALS(iconv, php_iconv_init_globals, NULL);
 	REGISTER_INI_ENTRIES();
 	return SUCCESS;
 }

-PHP_MSHUTDOWN_FUNCTION(iconv)
+PHP_MSHUTDOWN_FUNCTION(miconv)
 {
 	UNREGISTER_INI_ENTRIES();
 	return SUCCESS;
 }

-PHP_MINFO_FUNCTION(iconv)
+PHP_MINFO_FUNCTION(miconv)
 {
 	php_info_print_table_start();
 	php_info_print_table_header(2, "iconv support", "enabled");
@@ -149,11 +154,8 @@ int php_iconv_string(char *in_p, char **out, char *in_charset, char *out_charset
 PHP_FUNCTION(iconv)
 {
    zval **in_charset, **out_charset, **in_buffer;
-    unsigned int in_size, out_size;
-    char *out_buffer, *in_p, *out_p;
-    size_t result;
-    typedef unsigned int ucs4_t;
-
+	char *out_buffer;
+	
    if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &in_charset, &out_charset, &in_buffer) == FAILURE) {
        WRONG_PARAM_COUNT;
    }
@@ -162,8 +164,7 @@ PHP_FUNCTION(iconv)
    convert_to_string_ex(out_charset);
    convert_to_string_ex(in_buffer);

-	if (php_iconv_string(Z_STRVAL_PP(in_buffer), &out_buffer, 
-						 Z_STRVAL_PP(in_charset), Z_STRVAL_PP(out_charset)) == SUCCESS) {
+	if (php_iconv_string(Z_STRVAL_PP(in_buffer), &out_buffer, Z_STRVAL_PP(in_charset), Z_STRVAL_PP(out_charset)) == SUCCESS) {
 		RETVAL_STRING(out_buffer, 0);
 	} else {
 		RETURN_FALSE;
@@ -175,7 +176,6 @@ PHP_FUNCTION(iconv)
   Returns str in output buffer converted to the iconv.output_encoding character set */
 PHP_FUNCTION(ob_iconv_handler)
 {
-	int coding;
 	char *out_buffer;
 	zval **zv_string, **zv_status;
 	SLS_FETCH();
@@ -20,24 +20,18 @@
 #ifndef PHP_ICONV_H
 #define PHP_ICONV_H

-#include <iconv.h>
-#include "php.h"
-#include "SAPI.h"
-
-extern zend_module_entry iconv_module_entry;
-#define phpext_iconv_ptr &iconv_module_entry
-
 #ifdef PHP_WIN32
 #define PHP_ICONV_API __declspec(dllexport)
 #else
 #define PHP_ICONV_API
 #endif

-PHP_MINIT_FUNCTION(iconv);
-PHP_MSHUTDOWN_FUNCTION(iconv);
-PHP_RINIT_FUNCTION(iconv);
-PHP_RSHUTDOWN_FUNCTION(iconv);
-PHP_MINFO_FUNCTION(iconv);
+extern zend_module_entry iconv_module_entry;
+#define phpext_iconv_ptr &iconv_module_entry
+
+PHP_MINIT_FUNCTION(miconv);
+PHP_MSHUTDOWN_FUNCTION(miconv);
+PHP_MINFO_FUNCTION(miconv);

 PHP_FUNCTION(iconv);
 PHP_FUNCTION(ob_iconv_handler);
@@ -49,8 +49,8 @@ AC_DEFUN(PHP_IMAP_SSL_CHK, [

  if test "$PHP_IMAP_SSL" != "no"; then
    PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
-    PHP_ADD_LIBRARY(ssl,, IMAP_SHARED_LIBADD)
-    PHP_ADD_LIBRARY(crypto,, IMAP_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_DEFER(crypto)
+    PHP_ADD_LIBRARY_DEFER(ssl)

    old_LIBS=$LIBS
    LIBS="$LIBS -lc-client"
@@ -1,103 +0,0 @@
-#ifndef _INCLUDED_IMAP_H
-#define _INCLUDED_IMAP_H
-
-#if COMPILE_DL
-#undef HAVE_IMAP
-#define HAVE_IMAP 1
-#endif
-
-#if HAVE_IMAP
-
-#ifndef PHP_WIN32
-#include "build-defs.h"
-#endif
-
-/* Functions accessable to PHP */
-extern zend_module_entry imap_module_entry;
-#define imap_module_ptr &imap_module_entry
-
-extern PHP_MINIT_FUNCTION(imap);
-extern PHP_RINIT_FUNCTION(imap);
-extern PHP_RSHUTDOWN_FUNCTION(imap);
-PHP_MINFO_FUNCTION(imap);
-PHP_FUNCTION(imap_open);
-PHP_FUNCTION(imap_popen);
-PHP_FUNCTION(imap_reopen);
-PHP_FUNCTION(imap_num_msg);
-PHP_FUNCTION(imap_num_recent);
-PHP_FUNCTION(imap_headers);
-PHP_FUNCTION(imap_headerinfo);
-PHP_FUNCTION(imap_rfc822_parse_headers);
-PHP_FUNCTION(imap_body);
-PHP_FUNCTION(imap_fetchstructure);
-PHP_FUNCTION(imap_fetchbody);
-PHP_FUNCTION(imap_expunge);
-PHP_FUNCTION(imap_delete);
-PHP_FUNCTION(imap_undelete);
-PHP_FUNCTION(imap_check);
-PHP_FUNCTION(imap_close);
-PHP_FUNCTION(imap_mail_copy);
-PHP_FUNCTION(imap_mail_move);
-PHP_FUNCTION(imap_createmailbox);
-PHP_FUNCTION(imap_renamemailbox);
-PHP_FUNCTION(imap_deletemailbox);
-PHP_FUNCTION(imap_listmailbox);
-PHP_FUNCTION(imap_scanmailbox);
-PHP_FUNCTION(imap_subscribe);
-PHP_FUNCTION(imap_unsubscribe);
-PHP_FUNCTION(imap_append);
-PHP_FUNCTION(imap_ping);
-PHP_FUNCTION(imap_base64);
-PHP_FUNCTION(imap_qprint);
-PHP_FUNCTION(imap_8bit);
-PHP_FUNCTION(imap_binary);
-PHP_FUNCTION(imap_mailboxmsginfo);
-PHP_FUNCTION(imap_rfc822_write_address);
-PHP_FUNCTION(imap_rfc822_parse_adrlist);
-PHP_FUNCTION(imap_setflag_full);
-PHP_FUNCTION(imap_clearflag_full);
-PHP_FUNCTION(imap_sort);
-PHP_FUNCTION(imap_fetchheader);
-PHP_FUNCTION(imap_fetchtext);
-PHP_FUNCTION(imap_uid);
-PHP_FUNCTION(imap_msgno);
-PHP_FUNCTION(imap_list);
-PHP_FUNCTION(imap_list_full);
-PHP_FUNCTION(imap_listscan);
-PHP_FUNCTION(imap_lsub);
-PHP_FUNCTION(imap_lsub_full);
-PHP_FUNCTION(imap_create);
-PHP_FUNCTION(imap_rename);
-PHP_FUNCTION(imap_status);
-PHP_FUNCTION(imap_bodystruct);
-PHP_FUNCTION(imap_fetch_overview);
-PHP_FUNCTION(imap_mail_compose);
-PHP_FUNCTION(imap_alerts);
-PHP_FUNCTION(imap_errors);
-PHP_FUNCTION(imap_last_error);
-PHP_FUNCTION(imap_mail);
-PHP_FUNCTION(imap_search);
-PHP_FUNCTION(imap_utf8);
-PHP_FUNCTION(imap_utf7_decode);
-PHP_FUNCTION(imap_utf7_encode);
-PHP_FUNCTION(imap_mime_header_decode);
-#else
-#define imap_module_ptr NULL
-#endif /* HAVE_IMAP */
-
-#endif
-
-
-
-
-
-
-#define phpext_imap_ptr imap_module_ptr
-
-
-
-
-
-
-
-
@@ -31,6 +31,10 @@

 #undef OP_RELOGIN

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+ 
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/php_string.h"
@@ -447,10 +451,9 @@ PHP_MINIT_FUNCTION(imap)
 	mail_link(&newsdriver);		/* link in the news driver */
 	mail_link(&philedriver);	/* link in the phile driver */
 	auth_link(&auth_log);		/* link in the log authenticator */
-	auth_link(&auth_md5);           /* link in the cram-md5 authenticator */ 
+	auth_link(&auth_md5);       /* link in the cram-md5 authenticator */ 
 #ifdef  HAVE_IMAP_SSL
 	ssl_onceonlyinit ();
-	auth_link (&auth_ssl);		/* link in the ssl authenticator */
 #endif
 #endif
 	mail_link(&dummydriver);	/* link in the dummy driver */
@@ -3133,6 +3136,12 @@ PHP_FUNCTION(imap_fetch_overview)
 					rfc822_write_address(address, env->from);
 					add_property_string(myoverview, "from", address, 1);
 				}
+			        if (env->to) {
+					env->to->next = NULL;
+				    	address[0] = '\0';
+					rfc822_write_address(address, env->to);
+					add_property_string(myoverview, "to", address, 1);
+				}
 				if (env->date) {
 					add_property_string(myoverview, "date", env->date, 1);
 				}
@@ -1,16 +1,20 @@

 LTLIBRARY_NAME    = libinformix.la
 LTLIBRARY_SOURCES = ifx.c
-LTLIBRARY_LIBADD  = $(IFX_LIBS)
 LTLIBRARY_SHARED_NAME   = informix.la
-LTLIBRARY_SHARED_LIBADD = $(IFX_LIBS) $(INFORMIX_SHARED_LIBADD)
-CLEANFILES        = ifx.c
+LTLIBRARY_SHARED_LIBADD = $(INFORMIX_SHARED_LIBADD)
+CLEANFILES        = ifx.c libphpifx.a

 include $(top_srcdir)/build/dynlib.mk

 ifx.c: $(srcdir)/ifx.ec
 	(if test -d $(INFORMIXDIR); then \
-	   esql -e $(IFX_ESQL_FLAGS) $(srcdir)/ifx.ec; \
+	   $(INFORMIXDIR)/bin/esql -e $(IFX_ESQL_FLAGS) $(srcdir)/ifx.ec; \
 	 else \
 	   touch ifx.c; \
 	 fi)
+
+libphpifx.a: 
+	$(LINK) $(IFX_LIBOBJS)
+
+all: libphpifx.a
@@ -1,102 +1,74 @@
 dnl $Id$

-PHPIFXLIB=ext/informix/libphp_ifx.a
-	
 PHP_ARG_WITH(informix,for Informix support,
 [  --with-informix[=DIR]   Include Informix support.  DIR is the Informix base
                          install directory, defaults to ${INFORMIXDIR:-nothing}.])

-  if test "$PHP_INFORMIX" != "no"; then
-    if test "$INFORMIXDIR" = ""; then
-      INFORMIX_WARNING="
-WARNING: You asked for Informix support, but don't have \\\$INFORMIXDIR
-   environment value set up. Configuring and compiling Informix
-   support to PHP is impossible and has been turned off. Please
-   try again after setting up your environment."
-    else
-      if test "$PHP_INFORMIX" = "yes"; then
-        IFX_INCDIR=$INFORMIXDIR/incl/esql
-        if test -z "$IFX_LIBDIR"; then
-          PHP_ADD_LIBPATH($INFORMIXDIR/lib, INFORMIX_SHARED_LIBADD)
-          PHP_ADD_LIBPATH($INFORMIXDIR/lib/esql, INFORMIX_SHARED_LIBADD)
-        else
-          IFX_LIBDIR="$IFX_LIBDIR"
-        fi
-      else
-        IFX_INCDIR=$PHP_INFORMIX/incl/esql
-        if test -z "$IFX_LIBDIR"; then
-          PHP_ADD_LIBPATH($PHP_INFORMIX/lib, INFORMIX_SHARED_LIBADD)
-          PHP_ADD_LIBPATH($PHP_INFORMIX/lib/esql, INFORMIX_SHARED_LIBADD)
-        else
-          IFX_LIBDIR="$IFX_LIBDIR"
-        fi
-        if test "$PHP_INFORMIX" != "$INFORMIXDIR"; then
-          INFORMIX_WARNING="
-WARNING: You specified Informix base install directory that is different
-   than your \\\$INFORMIXDIR environment variable. You'd better know
-   exactly what you are doing."
-        fi
-        fi
-      IFX_INCLUDE=-I$IFX_INCDIR
-      IFX_LFLAGS=$IFX_LIBDIR
-      if test -z "$IFX_LIBS"; then
-        IFX_LIBS=`esql -libs | sed -e 's/-lm$//'`
-        dnl  -lm twice otherwise?
-        IFX_LIBS=`echo $IFX_LIBS | sed -e 's/Libraries to be used://g' -e 's/esql: error -55923: No source or object file\.//g'`
-        dnl Seems to get rid of newlines.
-        dnl According to Perls DBD-Informix, might contain these strings.
-      else
-        dnl Allow override to use static and/or threaded libs
-        :
-      fi
-      CPPFLAGS="$CPPFLAGS $IFX_INCLUDE"
-      LDFLAGS="$LDFLAGS $IFX_LFLAGS"
+if test "$PHP_INFORMIX" != "no"; then

-      case "$host_alias" in
-	  *aix*)
-        CPPFLAGS="$CPPFLAGS -D__H_LOCALEDEF";;
-      esac
+  PHP_EXTENSION(informix, $ext_shared)
+  PHP_SUBST(INFORMIX_SHARED_LIBADD)

-      AC_DEFINE(HAVE_IFX,1,[ ])
-      AC_MSG_CHECKING([Informix version])
-      IFX_VERSION=[`esql -V | sed -ne '1 s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p'`]
-      if test $IFX_VERSION -ge "900"; then
-        AC_DEFINE(HAVE_IFX_IUS,1,[ ])
-        IFX_ESQL_FLAGS="-EDHAVE_IFX_IUS"
-      else
-        IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS"
-      fi
-      PHP_SUBST(IFX_ESQL_FLAGS)
-	  PHP_SUBST(INFORMIX_SHARED_LIBADD)
-      AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION, [ ])
-      PHP_EXTENSION(informix, $ext_shared)
-      for i in $IFX_LIBS; do
-        case "$i" in
-        *.o)
-            PHP_ADD_LIBPATH($abs_builddir/ext/informix, INFORMIX_SHARED_LIBADD)
-            PHP_ADD_LIBRARY(php_ifx, 1, INFORMIX_SHARED_LIBADD)
-            $srcdir/build/shtool mkdir -p ext/informix
-            cd ext/informix
-            ar r libphp_ifx.a $i
-            ranlib libphp_ifx.a
-            cd ../..;;
-        -l*)
-            lib=`echo $i|sed 's/^-l//'`
-            PHP_ADD_LIBRARY($lib, 1, INFORMIX_SHARED_LIBADD);;
-        *)
-            IFX_LIBADD="$IFX_LIBADD $i";;
-        esac
-      done
-      IFX_LIBS="$IFX_LFLAGS $IFX_LIBADD"
-      INCLUDES="$INCLUDES $IFX_INCLUDE"
-    fi
+  if test "$INFORMIXDIR" = ""; then
+    AC_MSG_ERROR([INFORMIXDIR environment variable is not set.])
  fi
-PHP_SUBST(INFORMIXDIR)
-PHP_SUBST(IFX_LIBS)
-	
-divert(7)dnl

-dnl Warn if Informix support was requested but environment is not set up correctly.
-if test "$INFORMIX_WARNING" != ""; then
-  echo "$INFORMIX_WARNING"
+  if test "$PHP_INFORMIX" = "yes"; then
+    PHP_ADD_INCLUDE($INFORMIXDIR/incl/esql)
+    PHP_ADD_LIBPATH($INFORMIXDIR/lib, INFORMIX_SHARED_LIBADD)
+    PHP_ADD_LIBPATH($INFORMIXDIR/lib/esql, INFORMIX_SHARED_LIBADD)
+  else
+    if test "$PHP_INFORMIX" != "$INFORMIXDIR"; then
+      AC_MSG_ERROR([Specified Informix base install directory is different than your INFORMIXDIR environment variable.])
+    fi
+    PHP_ADD_INCLUDE($PHP_INFORMIX/incl/esql)
+    PHP_ADD_LIBPATH($PHP_INFORMIX/lib, INFORMIX_SHARED_LIBADD)
+    PHP_ADD_LIBPATH($PHP_INFORMIX/lib/esql, INFORMIX_SHARED_LIBADD)
+  fi
+
+  IFX_LIBS=`$INFORMIXDIR/bin/esql -libs -shared | sed -e 's/-lm$//'`
+  dnl  -lm twice otherwise?
+  IFX_LIBS=`echo $IFX_LIBS | sed -e 's/Libraries to be used://g' -e 's/esql: error -55923: No source or object file\.//g'`
+  dnl Seems to get rid of newlines.
+  dnl According to Perls DBD-Informix, might contain these strings.
+
+  case "$host_alias" in
+    *aix*)
+      CPPFLAGS="$CPPFLAGS -D__H_LOCALEDEF";;
+  esac
+
+  AC_MSG_CHECKING([Informix version])
+  IFX_VERSION=[`$INFORMIXDIR/bin/esql -V | sed -ne '1 s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p'`]
+  AC_MSG_RESULT($IFX_VERSION)
+  AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION, [ ])
+
+  if test $IFX_VERSION -ge "900"; then
+    AC_DEFINE(HAVE_IFX_IUS,1,[ ])
+    IFX_ESQL_FLAGS="-EDHAVE_IFX_IUS"
+  else
+    IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS"
+  fi
+  PHP_SUBST(IFX_ESQL_FLAGS)
+
+  for i in $IFX_LIBS; do
+    case "$i" in
+      *.o)
+        IFX_LIBOBJS="$IFX_LIBOBJS $i"
+        PHP_ADD_LIBPATH($ext_builddir, INFORMIX_SHARED_LIBADD)
+        PHP_ADD_LIBRARY_DEFER(phpifx, 1, INFORMIX_SHARED_LIBADD)
+        ;;
+      -l*)
+        lib=`echo $i|sed -e "s/^-l//"`
+        PHP_ADD_LIBRARY_DEFER($lib, 1, INFORMIX_SHARED_LIBADD)
+        ;;
+      *.a)
+        lib=`echo $i|sed -e "s#^/.*/lib##g;s#\.a##g"`
+        PHP_ADD_LIBRARY_DEFER($lib, 1, INFORMIX_SHARED_LIBADD)
+        ;;
+    esac
+  done
+  
+  AC_DEFINE(HAVE_IFX,1,[ ])
+  PHP_SUBST(INFORMIXDIR)
+  PHP_SUBST(IFX_LIBOBJS)
 fi
@@ -54,6 +54,8 @@
 extern zend_module_entry ifx_module_entry;
 #define ifx_module_ptr &ifx_module_entry

+#undef TYPEMAX
+#undef CHAR

 #include "locator.h"
 #include "sqltypes.h"
@@ -3,12 +3,12 @@ dnl config.m4 for extension ingres_ii

 PHP_ARG_WITH(ingres, for Ingres II support,
 [  --with-ingres[=DIR]     Include Ingres II support. DIR is the Ingres
-                          base directory (default $II_SYSTEM/II/ingres)],
-no)
+                          base directory (default $II_SYSTEM/II/ingres)])

 if test "$PHP_INGRES" != "no"; then
  AC_DEFINE(HAVE_II, 1, [Whether you have Ingres II])
  PHP_EXTENSION(ingres_ii, $ext_shared)
+  PHP_SUBST(II_SHARED_LIBADD)

  if test "$PHP_INGRES" = "yes"; then
    II_DIR=$II_SYSTEM/ingres
@@ -30,7 +30,5 @@ if test "$PHP_INGRES" != "no"; then

  PHP_ADD_LIBRARY_WITH_PATH(iiapi, $II_LIB_DIR, II_SHARED_LIBADD)
  PHP_ADD_LIBRARY_WITH_PATH(ingres, $II_LIB_DIR, II_SHARED_LIBADD)
-
  PHP_ADD_INCLUDE($II_INC_DIR)
 fi
-PHP_SUBST(II_SHARED_LIBADD)
@@ -21,6 +21,10 @@

 /* $Id$ */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_globals.h"
 #include "php_ini.h"
@@ -139,7 +143,7 @@ static int _rollback_transaction(II_LINK *link)
  return 0;
 }

-static void close_ii_link(II_LINK *link)
+static void _close_ii_link(II_LINK *link)
 {
  IIAPI_DISCONNPARM disconnParm;
  IILS_FETCH();
@@ -166,7 +170,7 @@ static void close_ii_link(II_LINK *link)
 static void php_close_ii_link(zend_rsrc_list_entry *rsrc)
 {
 	II_LINK *link = (II_LINK *)rsrc->ptr;
-	close_ii_link(link);
+	_close_ii_link(link);
 }


@@ -177,7 +181,7 @@ static void _close_ii_plink(zend_rsrc_list_entry *rsrc)
 	II_LINK *link = (II_LINK *)rsrc->ptr;
 	IILS_FETCH();
 	
-	close_ii_link(link);
+	_close_ii_link(link);
 	IIG(num_persistent)--;
 }

@@ -248,12 +252,7 @@ static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS IILS_DC)
 */
 PHP_MINIT_FUNCTION(ii)
 {
-  IIAPI_INITPARM initParm = {
-    -1,                /* timeout in ms, -1 = no timeout */
-    IIAPI_VERSION_1,   /* api version used */
-    0                  /* status (output) */
-  };
-  IILS_FETCH();
+  IIAPI_INITPARM initParm;
  
  REGISTER_INI_ENTRIES();
  
@@ -267,8 +266,10 @@ PHP_MINIT_FUNCTION(ii)
  REGISTER_LONG_CONSTANT("INGRES_NUM", II_NUM, CONST_CS | CONST_PERSISTENT);
  REGISTER_LONG_CONSTANT("INGRES_BOTH", II_BOTH, CONST_CS | CONST_PERSISTENT);

-
  /* Ingres api initialization */
+  initParm.in_timeout = -1;					/* timeout in ms, -1 = no timeout */
+  initParm.in_version = IIAPI_VERSION_1;	/* api version used */
+
  IIapi_initialize(&initParm);
  if (initParm.in_status==IIAPI_ST_SUCCESS) {
    return SUCCESS;
@@ -46,7 +46,6 @@ static int _close_statement(II_LINK *link);
 static int _rollback_transaction(II_LINK *link);
 static void _close_ii_link(II_LINK *link);
 static void _close_ii_plink(zend_rsrc_list_entry *link);
-static void _clean_ii_plink(zend_rsrc_list_entry *link);
 static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS IILS_DC);
 static void php_ii_set_default_link(int id);
 static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);
@@ -35,6 +35,10 @@ A lot... */
 			  emalloc & co. replaced with malloc & co.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/php_standard.h"
@@ -17,7 +17,8 @@ AC_DEFUN(PHP_LDAP_CHECKS, [
 ])
                          
 PHP_ARG_WITH(ldap,whether to include LDAP support,
-[  --with-ldap[=DIR]       Include LDAP support.  DIR is the LDAP base install directory.])
+[  --with-ldap[=DIR]       Include LDAP support.  DIR is the LDAP base 
+                          install directory.])

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

@@ -57,6 +58,9 @@ if test "$PHP_LDAP" != "no"; then
    if test -n "$LDAP_PTHREAD"; then 
      PHP_ADD_LIBRARY($LDAP_PTHREAD)
    fi
+    PHP_ADD_LIBRARY_WITH_PATH(nspr3, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH(plc3, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH(plds3, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
    PHP_ADD_LIBRARY_WITH_PATH(ldapssl41, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
    AC_DEFINE(HAVE_NSLDAP,1,[ ])

@@ -26,6 +26,10 @@
 /* $Id$ */
 #define IS_EXT_MODULE

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

@@ -194,6 +198,7 @@ PHP_MINIT_FUNCTION(ldap)

 	le_result = zend_register_list_destructors_ex(_free_ldap_result, NULL, "ldap result", module_number);
 	le_link = zend_register_list_destructors_ex(_close_ldap_link, NULL, "ldap link", module_number);
+	le_result_entry = zend_register_list_destructors_ex(NULL , NULL, "ldap result entry", module_number);

 	ldap_module_entry.type = type;

@@ -2,7 +2,7 @@ dnl $Id$
 dnl config.m4 for extension mbstring

 PHP_ARG_ENABLE(mbstring, whether to enable multibyte string support,
-[  --enable-mbstring        Enable multibyte string support])
+[  --enable-mbstring       Enable multibyte string support])

 if test "$PHP_MBSTRING" != "no"; then
  AC_DEFINE(HAVE_MBSTRING,1,[ ])
@@ -6854,6 +6854,9 @@ mbfl_strimwidth(
 				}
 				mbfl_convert_filter_flush(encoder);
 			}
+ 		} else if (pc.status != 0) {
+ 			pc.device.pos = pc.endpos;
+ 			mbfl_convert_filter_copy(pc.decoder_backup, pc.decoder);
 		}
 		mbfl_convert_filter_flush(pc.decoder);
 	}
@@ -43,6 +43,10 @@
 */


+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "php_config.h"
@@ -1160,7 +1164,7 @@ PHP_FUNCTION(mb_parse_str)
 			len_list[n] = 0;
 		}
 		n++;
-		var = php_strtok_r(NULL, "&", &strtok_buf);
+		var = php_strtok_r(NULL, separator, &strtok_buf);
 	}
 	num = n;

@@ -1263,6 +1267,8 @@ PHP_FUNCTION(mb_output_handler)
 {
 	pval **arg_string, **arg_status;
 	mbfl_string string, result, *ret;
+ 	const char *mimetype, *charset;
+ 	mbfl_memory_device device;
 	SLS_FETCH();
 	MBSTRLS_FETCH();

@@ -1273,13 +1279,35 @@ PHP_FUNCTION(mb_output_handler)
 	convert_to_string_ex(arg_string);
 	convert_to_long_ex(arg_status);

+ 	if ( SG(sapi_headers).send_default_content_type && ! SG(headers_sent) &&
+ 	     MBSTRG(current_http_output_encoding) != mbfl_no_encoding_pass &&
+ 	     (Z_LVAL_PP(arg_status) & PHP_OUTPUT_HANDLER_START) != 0) {
+ 		mimetype = SG(default_mimetype) ? SG(default_mimetype) : SAPI_DEFAULT_MIMETYPE;
+ 		charset = mbfl_no2preferred_mime_name(MBSTRG(current_http_output_encoding));
+ 		if ( charset != NULL && (*mimetype == '\0' || strncasecmp(mimetype, "text/", 5) == 0) ) {
+ 			mbfl_memory_device_init(&device, 0, 0);
+ 			mbfl_memory_device_strcat(&device, "Content-Type: ");
+ 			if (*mimetype == '\0') {
+ 				mbfl_memory_device_strcat(&device, "text/html");
+ 			} else {
+ 				mbfl_memory_device_strcat(&device, mimetype);
+ 			}
+ 			mbfl_memory_device_strcat(&device, ";charset=");
+ 			mbfl_memory_device_strcat(&device, charset);
+ 			ret = mbfl_memory_device_result(&device, &result);
+ 			if (ret != NULL) {
+ 				if (sapi_add_header(ret->val, ret->len, 0) != FAILURE) {
+ 					SG(sapi_headers).send_default_content_type = 0;
+ 				}
+ 			}
+ 		}
+ 	}
+ 
 	ret = NULL;
-	if (SG(sapi_headers).send_default_content_type && 
-		MBSTRG(current_http_output_encoding) != mbfl_no_encoding_pass && 
-		MBSTRG(outconv) == NULL) {
+ 	if (MBSTRG(current_http_output_encoding) != mbfl_no_encoding_pass && MBSTRG(outconv) == NULL) {
 		MBSTRG(outconv) = mbfl_buffer_converter_new(MBSTRG(current_internal_encoding), MBSTRG(current_http_output_encoding), 0);
 	}
-	if (SG(sapi_headers).send_default_content_type && MBSTRG(outconv) != NULL) {
+ 	if (MBSTRG(current_http_output_encoding) != mbfl_no_encoding_pass && MBSTRG(outconv) != NULL) {
 		mbfl_buffer_converter_illegal_mode(MBSTRG(outconv), MBSTRG(current_filter_illegal_mode));
 		mbfl_buffer_converter_illegal_substchar(MBSTRG(outconv), MBSTRG(current_filter_illegal_substchar));
 		mbfl_string_init(&string);
@@ -2252,7 +2280,7 @@ PHP_FUNCTION(mb_convert_variables)
 								if (Z_TYPE_PP(hash_entry) == IS_ARRAY || Z_TYPE_PP(hash_entry) == IS_OBJECT) {
 									if (stack_level >= stack_max) {
 										stack_max += PHP_MBSTR_STACK_BLOCK_SIZE;
-										ptmp = erealloc(stack, stack_max);
+										ptmp = erealloc(stack, sizeof(pval **)*stack_max);
 										if (ptmp == NULL) {
 											php_error(E_WARNING, "stack err at %s:(%d)", __FILE__, __LINE__);
 											continue;
@@ -2343,7 +2371,7 @@ detect_end:
 							if (Z_TYPE_PP(hash_entry) == IS_ARRAY || Z_TYPE_PP(hash_entry) == IS_OBJECT) {
 								if (stack_level >= stack_max) {
 									stack_max += PHP_MBSTR_STACK_BLOCK_SIZE;
-									ptmp = erealloc(stack, stack_max);
+									ptmp = erealloc(stack, sizeof(pval **)*stack_max);
 									if (ptmp == NULL) {
 										php_error(E_WARNING, "stack err at %s:(%d)", __FILE__, __LINE__);
 										continue;
@@ -2493,13 +2521,13 @@ PHP_FUNCTION(mb_decode_numericentity)


 #if HAVE_SENDMAIL
-/* {{{ proto int mb_send_mail(string to, string subject, string message [, string additional_headers])
+/* {{{ proto int mb_send_mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
   Sends an email message with MIME scheme */
 PHP_FUNCTION(mb_send_mail)
 {
 	int argc, n;
 	pval **argv[4];
-	char *to=NULL, *message=NULL, *headers=NULL, *subject=NULL;
+	char *to=NULL, *message=NULL, *headers=NULL, *subject=NULL, *extra_cmd=NULL;
 	char *message_buf=NULL, *subject_buf=NULL, *p;
 	mbfl_string orig_str, conv_str;
 	mbfl_string *pstr;	/* pointer to mbfl string for return value */
@@ -2533,7 +2561,7 @@ PHP_FUNCTION(mb_send_mail)
 	}

 	argc = ZEND_NUM_ARGS();
-	if (argc < 3 || argc > 4 || zend_get_parameters_array_ex(argc, argv) == FAILURE) {
+	if (argc < 3 || argc > 5 || zend_get_parameters_array_ex(argc, argv) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}

@@ -2617,7 +2645,12 @@ PHP_FUNCTION(mb_send_mail)
 	mbfl_memory_device_output('\0', &device);
 	headers = device.buffer;

-	if (!err && php_mail(to, subject, message, headers, NULL)){
+ 	if (argc == 5) {	/* extra options that get passed to the mailer */
+ 		convert_to_string_ex(argv[4]);
+ 		extra_cmd = (*argv[4])->value.str.val;
+ 	}
+ 
+ 	if (!err && php_mail(to, subject, message, headers, extra_cmd)){
 		RETVAL_TRUE;
 	} else {
 		RETVAL_FALSE;
@@ -23,6 +23,10 @@
 #undef ERROR
 #endif

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

 #if HAVE_MCAL
@@ -3,7 +3,8 @@ dnl $Id$
 dnl 

 PHP_ARG_WITH(mcrypt, for mcrypt support,
-[  --with-mcrypt[=DIR]     Include mcrypt support. DIR is the mcrypt install directory.])
+[  --with-mcrypt[=DIR]     Include mcrypt support. DIR is the mcrypt install 
+                          directory.])

 if test "$PHP_MCRYPT" != "no"; then
  for i in /usr/local /usr $PHP_MCRYPT; do
@@ -17,6 +17,10 @@
   +----------------------------------------------------------------------+
 */

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

 #if HAVE_LIBMCRYPT
@@ -439,7 +443,7 @@ PHP_FUNCTION(mcrypt_generic_init)
 	zval **mcryptind;
 	unsigned char *key_s, *iv_s;
 	char dummy[256];
-	int max_key_size, iv_size;
+	int max_key_size, key_size, iv_size;
 	MCRYPT td;
 	int argc;
    MCLS_FETCH();
@@ -464,7 +468,10 @@ PHP_FUNCTION(mcrypt_generic_init)
 	if (Z_STRLEN_PP(key) > max_key_size) {
 		sprintf (dummy, "key size too large; supplied length: %d, max: %d", 
 			Z_STRLEN_PP(key), max_key_size);
-		php_error (E_NOTICE, dummy);
+		php_error (E_WARNING, dummy);
+		key_size = max_key_size;
+	} else {
+		key_size = Z_STRLEN_PP(key);
 	}
 	memcpy (key_s, Z_STRVAL_PP(key), Z_STRLEN_PP(key));

@@ -475,7 +482,7 @@ PHP_FUNCTION(mcrypt_generic_init)
 	}
 	memcpy (iv_s, Z_STRVAL_PP(iv), iv_size);

-	RETVAL_LONG (mcrypt_generic_init (td, key_s, Z_STRLEN_PP(key), iv_s));
+	RETVAL_LONG (mcrypt_generic_init (td, key_s, key_size, iv_s));
 	efree (iv_s);
 	efree (key_s);
 }
@@ -1316,7 +1323,6 @@ static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mo
 	if (iv_s != NULL)
 		efree (iv_s);
 	efree (data_s);
-	mcrypt_module_close (td);
 }

 /* {{{ proto string mcrypt_encrypt(string cipher, string key, string data, string mode, string iv)
@@ -19,6 +19,10 @@
   +----------------------------------------------------------------------+
 */

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

 #if HAVE_LIBMHASH
@@ -2,7 +2,7 @@ dnl $Id$
 dnl config.m4 for extension libming

 PHP_ARG_WITH(ming, whether to include ming support,
-[  --with-ming[=DIR]        Include ming support])
+[  --with-ming[=DIR]       Include ming support])

 if test "$PHP_MING" != "no"; then
  for i in $PHP_MING /usr/local /usr; do
@@ -19,6 +19,10 @@
 #include <stdio.h>
 #include <math.h>

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

 #if HAVE_MING
@@ -33,6 +37,20 @@ static zend_function_entry ming_functions[] = {
  { NULL, NULL, NULL }
 };

+static inline SWFMovie getMovie(zval *id);
+static inline SWFFill getFill(zval *id);
+static inline SWFGradient getGradient(zval *id);
+static inline SWFBitmap getBitmap(zval *id);
+static inline SWFShape getShape(zval *id);
+static inline SWFFont getFont(zval *id);
+static inline SWFText getText(zval *id);
+static inline SWFTextField getTextField(zval *id);
+static inline SWFDisplayItem getDisplayItem(zval *id);
+static inline SWFButton getButton(zval *id);
+static inline SWFAction getAction(zval *id);
+static inline SWFMorph getMorph(zval *id);
+static inline SWFMovieClip getSprite(zval *id);
+
 PHP_FUNCTION(ming_setCubicThreshold)
 {
  zval **num;
@@ -36,20 +36,6 @@ extern zend_module_entry ming_module_entry;
 PHP_MINIT_FUNCTION(ming);
 PHP_MINFO_FUNCTION(ming);

-static inline SWFMovie getMovie(zval *id);
-static inline SWFFill getFill(zval *id);
-static inline SWFGradient getGradient(zval *id);
-static inline SWFBitmap getBitmap(zval *id);
-static inline SWFShape getShape(zval *id);
-static inline SWFFont getFont(zval *id);
-static inline SWFText getText(zval *id);
-static inline SWFTextField getTextField(zval *id);
-static inline SWFDisplayItem getDisplayItem(zval *id);
-static inline SWFButton getButton(zval *id);
-static inline SWFAction getAction(zval *id);
-static inline SWFMorph getMorph(zval *id);
-static inline SWFMovieClip getSprite(zval *id);
-
 PHP_FUNCTION(swfbitmap_init);
 PHP_FUNCTION(swfbitmap_getWidth);
 PHP_FUNCTION(swfbitmap_getHeight);
@@ -2,8 +2,10 @@ dnl $Source$
 dnl $Id$

 PHP_ARG_WITH(mnogosearch,for mnoGoSearch support,
-[  --with-mnogosearch[=DIR]       Include mnoGoSearch support.  DIR is the mnoGoSearch base
-                          install directory, defaults to /usr/local/mnogosearch.])
+[  --with-mnogosearch[=DIR]
+                          Include mnoGoSearch support.  DIR is the mnoGoSearch 
+                          base install directory, defaults to 
+                          /usr/local/mnogosearch.])

  if test "$PHP_MNOGOSEARCH" != "no"; then
  
@@ -22,6 +22,10 @@
   +----------------------------------------------------------------------+
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_mnogo.h"
 #include "ext/standard/php_standard.h"
@@ -18,6 +18,10 @@
 
 /* $Id$ */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_msql.h"
 #include "ext/standard/php_standard.h"
@@ -22,6 +22,10 @@
 #define HAVE_MSSQL 1
 #endif

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_globals.h"
 #include "ext/standard/php_standard.h"
@@ -28,10 +28,13 @@
 */


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

-#include <php.h>
-#include <php_ini.h>
-#include <php_muscat.h>
+#include "php.h"
+#include "php_ini.h"
+#include "php_muscat.h"

 /* You should tweak config.m4 so this symbol (or some else suitable)
   gets defined.
@@ -78,19 +78,17 @@ elif test "$PHP_MYSQL" != "no"; then
    AC_MSG_ERROR(Cannot find mysqlclient library under $MYSQL_DIR)
  fi

-  dnl Check if mysql_config is found. If yes, use the LIBS provided by it..
-  if test -x "$MYSQL_DIR/bin/mysql_config"; then
-    MYSQL_LIBS=`$MYSQL_DIR/bin/mysql_config --libs   | sed -e "s/'//g"`
-    MYSQL_INCLUDE=`$MYSQL_DIR/bin/mysql_config --cflags | sed -e "s/'//g"`
-    AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "`$MYSQL_DIR/bin/mysql_config --socket`", [Default mysql unix socket])
-  else
-    MYSQL_LIBS="-L$MYSQL_LIB_DIR -lmysqlclient"
-    MYSQL_INCLUDE="-I$MYSQL_INC_DIR"
-    PHP_MYSQL_SOCK
+  if test "$PHP_ZLIB_DIR" != "no"; then
+    PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD)
+    MYSQL_LIBS="-L$PHP_ZLIB_DIR -z"
  fi

-  PHP_EVAL_LIBLINE($MYSQL_LIBS, MYSQL_SHARED_LIBADD)
-  PHP_EVAL_INCLINE($MYSQL_INCLUDE)
+  PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD)
+  MYSQL_LIBS="-L$MYSQL_LIB_DIR -lmysqlclient $MYSQL_LIBS"
+
+  PHP_ADD_INCLUDE($MYSQL_INC_DIR)
+  MYSQL_INCLUDE="-I$MYSQL_INC_DIR"
+  PHP_MYSQL_SOCK

 else
  MYSQL_MODULE_TYPE="none"
@@ -295,6 +295,30 @@ then
 fi
 ])

+AC_DEFUN(MYSQL_CHECK_INT_8_16_32,
+[AC_MSG_CHECKING([for int8])
+AC_TRY_RUN([
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+int main()
+{
+    int8 i;
+    return 0;
+}
+], AC_DEFINE(HAVE_INT_8_16_32, , [ ]) AC_MSG_RESULT([yes]), AC_MSG_RESULT([no])
+)
+])
+
 AC_DEFUN(MYSQL_HEADER_CHECKS,[
 AC_HEADER_STDC
 AC_CHECK_HEADERS(sgtty.h sys/ioctl.h \
@@ -322,6 +346,7 @@ AC_TYPE_UID_T
 MYSQL_CHECK_ULONG
 MYSQL_CHECK_UCHAR
 MYSQL_CHECK_UINT
+MYSQL_CHECK_INT_8_16_32

 MYSQL_TYPE_ACCEPT
 MYSQL_TYPE_QSORT
@@ -13,8 +13,9 @@ This file is public domain and comes with NO WARRANTY of any kind */
 #define MYSQL_VERSION_ID		32332
 #define MYSQL_PORT			3306

-/* This is defined at configure time and found in main/php_config.h */
-/* #define MYSQL_UNIX_ADDR			"/tmp/mysql.sock" */
+#ifndef MYSQL_UNIX_ADDR
+#define MYSQL_UNIX_ADDR	"/tmp/mysql.sock"
+#endif

 /* mysqld compile time options */
 #ifndef MYSQL_CHARSET
@@ -24,6 +24,10 @@
 * ? Safe mode implementation
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_globals.h"
 #include "php_mysql.h"
@@ -22,6 +22,10 @@
 #define HAVE_NOTES 1
 #endif

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_globals.h"
 #include "php_notes.h"
@@ -22,7 +22,8 @@ AC_DEFUN(AC_OCI8_VERSION,[
 ])                                                                                                                                                                

 PHP_ARG_WITH(oci8, for Oracle-OCI8 support,
-[  --with-oci8[=DIR]       Include Oracle-oci8 support. Default DIR is ORACLE_HOME.])
+[  --with-oci8[=DIR]       Include Oracle-oci8 support. Default DIR is 
+                          ORACLE_HOME.])

 if test "$PHP_OCI8" != "no"; then
  AC_MSG_CHECKING([Oracle Install-Dir])
@@ -53,6 +53,10 @@

 /* {{{ includes & stuff */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "ext/standard/info.h"

@@ -42,6 +42,13 @@
 #define PHP_OCI_API
 #endif                                   

+#if defined(min)
+#undef min
+#endif
+#if defined(max)
+#undef max
+#endif
+
 #include <oci.h>

 typedef struct {
@@ -1,3 +1,5 @@
+dnl $Id$
+
 dnl
 dnl Figure out which library file to link with for the Solid support.
 dnl
@@ -210,9 +212,9 @@ if test -z "$ODBC_TYPE"; then
 AC_MSG_CHECKING(for Empress support)
 AC_ARG_WITH(empress,
 [  --with-empress[=DIR]    Include Empress support.  DIR is the Empress base
-                           install directory, defaults to \$EMPRESSPATH.
-                           From PHP4, this option only supports Empress Version
-                           8.60 and above],
+                          install directory, defaults to \$EMPRESSPATH.
+                          From PHP4, this option only supports Empress Version
+                          8.60 and above],
 [
  PHP_WITH_SHARED
  if test "$withval" != "no"; then
@@ -240,10 +242,11 @@ fi
 if test -z "$ODBC_TYPE"; then
 AC_MSG_CHECKING(for Empress local access support)
 AC_ARG_WITH(empress-bcs,
-[  --with-empress-bcs[=DIR]Include Empress Local Access support.  DIR is the 
-                           Empress base install directory, defaults to \$EMPRESSPATH.
-                           From PHP4, this option only supports Empress Version
-                           8.60 and above],
+[  --with-empress-bcs[=DIR]
+                          Include Empress Local Access support.  DIR is the 
+                          Empress base install directory, defaults to 
+                          \$EMPRESSPATH.  From PHP4, this option only supports
+                          Empress Version 8.60 and above.],
 [
  PHP_WITH_SHARED
  if test "$withval" != "no"; then
@@ -363,8 +366,11 @@ AC_ARG_WITH(iodbc,
  fi
  if test "$withval" != "no"; then
    PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib)
-    PHP_ADD_INCLUDE($withval/include)
+    PHP_ADD_INCLUDE($withval/include, 1)
    ODBC_TYPE=iodbc
+    ODBC_INCLUDE=-I$withval/include
+    ODBC_LFLAGS=-L$withval/lib
+    ODBC_LIBS=-liodbc
    AC_DEFINE(HAVE_IODBC,1,[ ])
    AC_MSG_RESULT(yes)
  else
@@ -532,10 +538,10 @@ if test -n "$ODBC_TYPE"; then
  fi
  AC_DEFINE(HAVE_UODBC,1,[ ])
  PHP_SUBST(ODBC_INCDIR)
-  PHP_SUBST(ODBC_INCLUDE)
  PHP_SUBST(ODBC_LIBDIR)
-  PHP_SUBST(ODBC_LIBS)
-  PHP_SUBST(ODBC_LFLAGS)
+  PHP_SUBST_OLD(ODBC_INCLUDE)
+  PHP_SUBST_OLD(ODBC_LIBS)
+  PHP_SUBST_OLD(ODBC_LFLAGS)
  PHP_SUBST_OLD(ODBC_TYPE)
  PHP_EXTENSION(odbc, $shared)
 fi
@@ -22,6 +22,10 @@

 /* $Id$ */

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

@@ -93,7 +97,9 @@ function_entry odbc_functions[] = {
 	PHP_FE(odbc_field_type, NULL)
 	PHP_FE(odbc_field_num, NULL)
 	PHP_FE(odbc_free_result, NULL)
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
 	PHP_FE(odbc_next_result, NULL)
+#endif
 	PHP_FE(odbc_num_fields, NULL)
 	PHP_FE(odbc_num_rows, NULL)
 	PHP_FE(odbc_result, NULL)
@@ -255,6 +261,8 @@ static PHP_INI_DISP(display_defPW)
 #else
 		PUTS("********");
 #endif
+	} else {
+		PUTS("<i>no value</i>");
 	}
 }

@@ -2225,6 +2233,7 @@ PHP_FUNCTION(odbc_num_rows)
 }
 /* }}} */

+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
 /* {{{ proto bool next_result(int result_id)
   Checks if multiple results are avaiable */
 PHP_FUNCTION(odbc_next_result)
@@ -2272,6 +2281,7 @@ PHP_FUNCTION(odbc_next_result)
 	}
 }
 /* }}} */
+#endif

 /* {{{ proto int odbc_num_fields(int result_id)
   Get number of columns in a result */
@@ -79,7 +79,7 @@ PHP_FUNCTION(solid_fetch_prev);
 #define HAVE_SQL_EXTENDED_FETCH 1
 #define SQL_SUCCEEDED(rc) (((rc)&(~1))==0)
 #define SQLINTEGER ULONG
-#define SQLUMSALLINT USHORT
+#define SQLUSMALLINT USHORT

 #elif defined(HAVE_SAPDB) /* SAP DB */

@@ -217,7 +217,9 @@ PHP_FUNCTION(odbc_field_name);
 PHP_FUNCTION(odbc_field_type);
 PHP_FUNCTION(odbc_field_num);
 PHP_FUNCTION(odbc_free_result);
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
 PHP_FUNCTION(odbc_next_result);
+#endif
 PHP_FUNCTION(odbc_num_fields);
 PHP_FUNCTION(odbc_num_rows);
 PHP_FUNCTION(odbc_prepare);
@@ -24,6 +24,10 @@
 * Check all on real life apps.
 */

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

 #if WIN32
@@ -20,6 +20,10 @@

 /* $Id$ */

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

@@ -22,7 +22,8 @@ AC_DEFUN(AC_ORACLE_VERSION,[
 ])

 PHP_ARG_WITH(oracle, for Oracle-ORACLE support,
-[  --with-oracle[=DIR]     Include Oracle-oci7 support. Default DIR is ORACLE_HOME.])
+[  --with-oracle[=DIR]     Include Oracle-oci7 support.  Default DIR is 
+                          ORACLE_HOME.])

 if test "$PHP_ORACLE" != "no"; then
  AC_MSG_CHECKING([Oracle Install-Dir])
@@ -25,6 +25,10 @@
 
 #define HAS_OLOG 1

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

 #include "zend_globals.h"
@@ -1,62 +0,0 @@
-dnl $Id$
-dnl config.m4 for extension pcre
-
-dnl By default we'll compile and link against the bundled PCRE library
-dnl if DIR is supplied, we'll use that for linking
-
-PHP_ARG_WITH(pcre-regex,whether to include PCRE support,
-[  --without-pcre-regex    Do not include Perl Compatible Regular Expressions 
-                          support. Use --with-pcre-regex=DIR to specify DIR
-                          where PCRE's include and library files are located,
-                          if not using bundled library.],yes)
-
-if test "$PHP_PCRE_REGEX" != "no"; then
-  PHP_EXTENSION(pcre, $ext_shared)
-  if test "$PHP_PCRE_REGEX" = "yes"; then
-    PCRE_LIBADD=pcrelib/libpcre.la
-    PCRE_SHARED_LIBADD=pcrelib/libpcre.la
-    PCRE_SUBDIRS=pcrelib
-    CPPFLAGS="$CPPFLAGS -DSUPPORT_UTF8"
-    PHP_SUBST(PCRE_LIBADD)
-    PHP_SUBST(PCRE_SUBDIRS)
-    AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
-    PHP_FAST_OUTPUT($ext_builddir/pcrelib/Makefile)
-    LIB_BUILD($ext_builddir/pcrelib,$ext_shared,yes)
-  else
-    test -f $PHP_PCRE_REGEX/pcre.h && PCRE_INCDIR=$PHP_PCRE_REGEX
-    test -f $PHP_PCRE_REGEX/include/pcre.h && PCRE_INCDIR=$PHP_PCRE_REGEX/include
-    
-    if test -z "$PCRE_INCDIR"; then
-      AC_MSG_RESULT(Could not find pcre.h in $PHP_PCRE_REGEX)
-    fi
-
-    changequote({,})
-    pcre_major=`grep PCRE_MAJOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g'`
-    pcre_minor=`grep PCRE_MINOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g'`
-    changequote([,])
-    pcre_minor_length=`echo "$pcre_minor" | wc -c | sed -e 's/[^0-9]//g'`
-    if test "$pcre_minor_length" -eq 2 ; then
-      pcre_minor="$pcre_minor"0
-    fi
-    pcre_version=$pcre_major$pcre_minor
-    if test "$pcre_version" -lt 208; then
-      AC_MSG_ERROR(The PCRE extension requires PCRE library version >= 2.08)
-    fi
-
-    test -f $PHP_PCRE_REGEX/libpcre.a && PCRE_LIBDIR="$PHP_PCRE_REGEX"
-    test -f $PHP_PCRE_REGEX/lib/libpcre.a && PCRE_LIBDIR="$PHP_PCRE_REGEX/lib"
-
-    if test -z "$PCRE_LIBDIR" ; then
-      AC_MSG_ERROR(Could not find libpcre.a in $PHP_PCRE_REGEX)
-    fi
-
-    PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD)
-    
-    PHP_ADD_INCLUDE($PCRE_INCDIR)
-    AC_DEFINE(HAVE_PCRE, 1, [ ])
-  fi
-fi
-PHP_SUBST(PCRE_SHARED_LIBADD)
-
-
-AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1, [ ])])
@@ -18,6 +18,10 @@

 /* $Id$ */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+ 
 #include "php.h"
 #include "php_globals.h"
 #include "php_pcre.h"
@@ -3,7 +3,7 @@ dnl $Id$
 dnl

 PHP_ARG_WITH(pdflib,whether to include PDFlib support,
-[  --with-pdflib[=DIR]     Include pdflib 3.x support. DIR is the pdflib
+[  --with-pdflib[=DIR]     Include PDFlib support. DIR is the pdflib
                          base install directory, defaults to /usr/local
                          Set DIR to "shared" to build as dl, or "shared,DIR"
                          to build as dl and still specify DIR.])
@@ -33,26 +33,16 @@ if test "$PHP_PDFLIB" != "no"; then
      test -f $PHP_PDFLIB/include/pdflib.h && PDFLIB_INCLUDE="$PHP_PDFLIB/include"
      if test -n "$PDFLIB_INCLUDE" ; then

-        if test "$PHP_ZLIB" = "no"; then
-          AC_MSG_CHECKING([for zlib (needed by pdflib)])
-
-          AC_CHECK_LIB(z,deflate, 
-          [
-            PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD)
-          ],[
-            AC_MSG_ERROR(libz.(a|so) not found! Try with --with-zlib-dir=<DIR>)
-          ],[
-            -L$PHP_ZLIB_DIR/lib
-          ])
-        else
-          echo "checking for libz needed by pdflib... already zlib support"
+        if test "$PHP_ZLIB_DIR" = "no"; then
+          AC_MSG_ERROR(PDF extension requires ZLIB. Use --with-zlib-dir=<DIR>)
        fi
-
+        
+        PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD)
 
        PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, 
        [  --with-jpeg-dir[=DIR]     PDFLIB: define libjpeg install directory])

-        if test "$PHP_JPEG_DIR" != "no" -a "$PHP_JPEG_DIR"; then
+        if test "$PHP_JPEG_DIR" != "no"; then
          AC_CHECK_LIB(jpeg,jpeg_read_header, 
          [
            PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB_SHARED_LIBADD)
@@ -62,15 +52,19 @@ if test "$PHP_PDFLIB" != "no"; then
            -L$PHP_JPEG_DIR/lib
          ])
        else
-          AC_CHECK_LIB(jpeg,jpeg_read_header,[ ],[AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>)])
-          PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD)
+          AC_CHECK_LIB(jpeg,jpeg_read_header,
+          [ 
+            PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD)
+          ],[
+            AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>)
+          ])
        fi

 
        PHP_ARG_WITH(png-dir, for the location of libpng, 
        [  --with-png-dir[=DIR]      PDFLIB: define libpng install directory])
        
-        if test "$PHP_PNG_DIR" != "no" -a "$PHP_PNG_DIR"; then
+        if test "$PHP_PNG_DIR" != "no"; then
          AC_CHECK_LIB(png,png_create_info_struct, 
          [
            PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB_SHARED_LIBADD)
@@ -80,15 +74,19 @@ if test "$PHP_PDFLIB" != "no"; then
            -L$PHP_PNG_DIR/lib
          ])
        else
-          AC_CHECK_LIB(png,png_create_info_struct,[ ],[AC_MSG_RESULT(no, try --with-png-dir=<DIR>)])
-          PHP_ADD_LIBRARY(png,, PDFLIB_SHARED_LIBADD)
+          AC_CHECK_LIB(png,png_create_info_struct,
+          [ 
+            PHP_ADD_LIBRARY(png,, PDFLIB_SHARED_LIBADD)
+          ],[
+            AC_MSG_RESULT(no, try --with-png-dir=<DIR>)
+          ])
        fi
        

        PHP_ARG_WITH(tiff-dir, for the location of libtiff,
        [  --with-tiff-dir[=DIR]     PDFLIB: define libtiff install directory])

-        if test "$PHP_TIFF_DIR" != "no" -a "$PHP_TIFF_DIR"; then
+        if test "$PHP_TIFF_DIR" != "no"; then
          AC_CHECK_LIB(tiff,TIFFOpen, 
          [
            PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB_SHARED_LIBADD)
@@ -98,8 +96,12 @@ if test "$PHP_PDFLIB" != "no"; then
            -L$PHP_TIFF_DIR/lib
          ])
        else
-          AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no, Try --with-tiff-dir=<DIR>)],)
-          PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD)
+          AC_CHECK_LIB(tiff,TIFFOpen,
+          [
+            PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD)
+          ],[
+            AC_MSG_RESULT(no, Try --with-tiff-dir=<DIR>)
+          ])
        fi


@@ -109,7 +111,7 @@ if test "$PHP_PDFLIB" != "no"; then
          PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDFLIB_SHARED_LIBADD)
          PHP_ADD_INCLUDE($PDFLIB_INCLUDE)
        ],[
-          AC_MSG_ERROR(pdflib extension requires pdflib 3.x.)
+          AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x.)
        ],[
          -L$PHP_PDFLIB/lib
        ])
@@ -24,6 +24,10 @@
   Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
 /* Note that there is no code from the pdflib package in this file */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+ 
 #include "php.h"
 #include "php_ini.h"
 #include "php_globals.h"
@@ -20,6 +20,11 @@
 /* $Id$ */

 /* {{{ includes */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "php_pfpro.h"
@@ -23,6 +23,10 @@

 #define PHP_PGSQL_PRIVATE 1

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/php_standard.h"
@@ -118,13 +122,13 @@ static void php_pgsql_set_default_link(int id)
 {   
 	PGLS_FETCH();

-        zend_list_addref(id);
+	zend_list_addref(id);

-    if (PGG(default_link) != -1) {
-        zend_list_delete(PGG(default_link));
-    }
+	if (PGG(default_link) != -1) {
+		zend_list_delete(PGG(default_link));
+	}

-        PGG(default_link) = id;
+	PGG(default_link) = id;
 }


@@ -158,7 +162,7 @@ _notice_handler(void *arg, const char *message)
 	PGLS_FETCH();

 	if (! PGG(ignore_notices)) {
-		php_log_err(message);
+		php_log_err((char *) message);
 		if (PGG(last_notice) != NULL) {
 			efree(PGG(last_notice));
 		}
@@ -166,10 +170,15 @@ _notice_handler(void *arg, const char *message)
 	}
 }

+
 static int _rollback_transactions(zend_rsrc_list_entry *rsrc)
 {
-	PGconn *link = (PGconn *)rsrc->ptr;
+	PGconn *link;
 	PGLS_FETCH();
+	
+	if (rsrc->type != le_plink) return 0;
+
+	link = (PGconn *) rsrc->ptr;

 	PGG(ignore_notices) = 1;
 	PQexec(link,"BEGIN;ROLLBACK;");
@@ -876,7 +885,10 @@ PHP_FUNCTION(pg_cmdtuples)

 /* {{{ proto int pg_last_notice(int connection)
   Returns the last notice set by the backend */
-PHP_FUNCTION(pg_last_notice) {
+PHP_FUNCTION(pg_last_notice) 
+{
+	PGLS_FETCH();
+
 	if (PGG(last_notice) == NULL) {
 		RETURN_FALSE;
 	} else {       
@@ -30,6 +30,10 @@
 /* $Id$ */


+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "ext/standard/info.h"
 #if !defined(PHP_API_VERSION) || PHP_API_VERSION < 19990421
@@ -20,6 +20,10 @@

 #define IS_EXT_MODULE

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

 #include <stdlib.h>
Author	SHA1	Message	Date
SVN Migration	12fb115c41	This commit was manufactured by cvs2svn to create tag 'php_4_0_6'.	2001-06-20 20:13:00 +00:00
Andi Gutmans	77708c5592	- Prepare for 4.0.6	2001-06-20 20:12:59 +00:00
Andi Gutmans	f89fbde8b7	- MFH	2001-06-20 17:15:37 +00:00
Rasmus Lerdorf	132e7dd9f9	MFH: PLS_FETCH fix	2001-06-20 15:54:46 +00:00
Rasmus Lerdorf	530833eb7c	MFH of chdir safe_mode bug fix - in case another RC is rolled then this fix needs to be in there.	2001-06-20 14:50:17 +00:00
Rui Hirokawa	7ed65536c6	fixed bugs: memory related, strtok separator, lack of mail() parameter.	2001-06-20 13:01:49 +00:00
Andi Gutmans	0d5555e812	- RC4	2001-06-19 18:13:33 +00:00
Andi Gutmans	31ef9e8faf	- Real MFH of memory fragmentation patch	2001-06-19 18:04:53 +00:00
Andi Gutmans	8ef5510aa9	- Bad merge. Revert the previous patch (damn CVS).	2001-06-19 18:03:21 +00:00
Andi Gutmans	9794acb211	- Memory fragmentation fix.	2001-06-19 18:00:25 +00:00
Andi Gutmans	31d4b82bf4	- MFH	2001-06-19 17:59:29 +00:00
Dan Kalowsky	a715a08dc8	Ends memory leak in PHP when using Solid DB systems. Thanks to Eric Veldhuyzen.	2001-06-19 17:55:01 +00:00
Andi Gutmans	9c9a313929	- MFH	2001-06-19 17:50:31 +00:00
foobar	530de64ac1	MFH	2001-06-19 16:54:44 +00:00
foobar	66950f97a6	MFH	2001-06-19 16:49:31 +00:00
foobar	91728cfcf4	MFH	2001-06-14 19:05:21 +00:00
foobar	f5a8e151c9	MFH	2001-06-14 04:35:47 +00:00
Zeev Suraski	8f49ab2f9a	MFH	2001-06-13 17:18:50 +00:00
Stig Bakken	415fcc2a15	MFH	2001-06-12 20:25:15 +00:00
foobar	c1135849cc	MFH	2001-06-12 18:25:24 +00:00
foobar	b52d710e36	MFH (this caused segfault)	2001-06-11 15:22:10 +00:00
foobar	e28b6a13fd	MFH	2001-06-11 14:02:36 +00:00
Rasmus Lerdorf	55fc773c5d	MFH of the Blowfish check and some innocent tweaks	2001-06-10 22:54:29 +00:00
Rasmus Lerdorf	c7aa37f52a	Re-add Sascha's PHP_ADD_INCLUDE() second parameter patch - not sure how that got yanked in my fix.	2001-06-10 19:52:56 +00:00
Rasmus Lerdorf	cf7259299c	Fix backward compatibility MFH to only add backward compatible macros	2001-06-10 19:42:32 +00:00
Rasmus Lerdorf	72c703e1fc	MFH of backward-compatible AC_ADD_* macros	2001-06-10 19:27:06 +00:00
Zeev Suraski	6903ed02f6	Fix ZTS build problem	2001-06-10 00:40:42 +00:00
Andi Gutmans	82f9aa80b3	- RC3 with critical fixes by Jani.	2001-06-07 18:40:00 +00:00
Andi Gutmans	380af9a911	- Avoid breaking op_array compatibility for 4.0.6	2001-06-07 18:35:14 +00:00
foobar	28da411d23	MFH	2001-06-04 08:06:30 +00:00
foobar	1577206f4e	MFH	2001-06-04 02:05:06 +00:00
foobar	8962f1506c	MFH	2001-06-04 01:36:47 +00:00
foobar	b1534ddc7d	MFH	2001-06-03 21:36:10 +00:00
foobar	edf3a56a22	MFH. This really needs to be in the release!	2001-06-03 21:33:20 +00:00
Andi Gutmans	70936ba1cb	- Prepare for RC2	2001-06-02 09:39:47 +00:00
Andi Gutmans	ac2cd94caa	- Merge two important fixes from HEAD.	2001-06-02 00:38:55 +00:00
Sascha Schumann	c4627466b9	Fix logic. If I disable WDDX, I don't want to use an external expat library.	2001-06-01 21:09:52 +00:00
foobar	63b8a2b797	MFH	2001-06-01 12:50:08 +00:00
foobar	92b3cc7954	MFH	2001-06-01 06:43:09 +00:00
foobar	f56b195314	MFH	2001-06-01 06:26:34 +00:00
foobar	8fd4280b4a	MFH	2001-06-01 05:02:32 +00:00
foobar	82bf518039	MFH	2001-06-01 03:20:49 +00:00
foobar	4825618fe5	MFH	2001-05-31 21:03:23 +00:00
Sterling Hughes	cd10249538	>=	2001-05-31 03:58:47 +00:00
Rasmus Lerdorf	1c1c88513c	MFH - Initialize le_result_entry to use a NULL destructor	2001-05-30 21:18:17 +00:00
Sterling Hughes	dd1e064337	quoth the raven, nevermore.	2001-05-30 20:36:44 +00:00
Sterling Hughes	f3a02d9a6b	Fix message, and make sure silly stderr messages don't get outputted.	2001-05-30 20:26:30 +00:00
Chuck Hagenbuch	9226793642	MFH: include To: in overview information. small and harmless but extremely useful.	2001-05-30 17:27:49 +00:00
Sterling Hughes	ff24feec81	curl-config gives a new tool, how cool. # I'm a poet and I didn't even no it :)	2001-05-29 23:41:20 +00:00
foobar	ab766fbd37	Fixed bug: #11167	2001-05-29 15:57:54 +00:00
foobar	e268a7acf9	This should finally get rid of those zlib problems. And this is safe too.	2001-05-29 11:58:09 +00:00
foobar	6dba0b2ac2	Get this to compile again.. # Sterling: Please complete the updates.	2001-05-29 07:50:48 +00:00
Sterling Hughes	6a63743f7f	Upgrade me.	2001-05-29 07:25:10 +00:00
Sterling Hughes	baea39b85a	Bump the required version to 7.8, if we're going to break compat, we might as well force them to upgrade to the latest and greatest (which has some important fixes as well).	2001-05-29 07:24:43 +00:00
foobar	22ca7d3c8c	MFH	2001-05-28 00:16:43 +00:00
foobar	6cbecc7d9e	Adding libnsl here causes problems on some systems.	2001-05-28 00:11:49 +00:00
foobar	a113193655	MFH	2001-05-28 00:10:02 +00:00
foobar	228ead2fce	MFH	2001-05-27 23:57:51 +00:00
foobar	0d7c6b4926	MFH	2001-05-27 23:52:07 +00:00
foobar	1f12f7a012	killed some compile warnings. the informix header files redefine these.	2001-05-27 23:47:06 +00:00
foobar	005bb265c9	MFH	2001-05-27 23:27:10 +00:00
foobar	8d6e461c13	MFH	2001-05-27 22:42:10 +00:00
Sterling Hughes	ecd4204ecb	MFH	2001-05-27 19:17:38 +00:00
foobar	3b82ed9055	MFH	2001-05-27 19:12:31 +00:00
foobar	9bc2e95890	MFH	2001-05-27 18:52:53 +00:00
foobar	7bca1bab16	MFH	2001-05-27 18:39:18 +00:00
foobar	002cc4269d	MFH :)	2001-05-27 18:27:10 +00:00
Andi Gutmans	8fd15a3834	- Revert to HEAD config.m4. Someone please check DOM/XML	2001-05-27 09:37:40 +00:00
Andi Gutmans	443d668a2b	- MFH	2001-05-25 09:46:16 +00:00
Andi Gutmans	2054d66df8	- MFH	2001-05-25 07:27:18 +00:00
Stig Bakken	242fae44ff	MFH	2001-05-24 12:43:43 +00:00
Andi Gutmans	c9072180bc	- Rollback to PHP 4.0.5 version of DOM/XML	2001-05-24 12:33:43 +00:00
Jon Parise	78baa6181b	Merge from HEAD.	2001-05-23 17:04:46 +00:00
Andrei Zmievski	26fa25fad1	MFH	2001-05-23 13:05:27 +00:00
Andi Gutmans	12578a3349	- MFH	2001-05-23 04:18:41 +00:00
foobar	cd50664a24	MFH (oops)	2001-05-23 03:41:22 +00:00
foobar	e4010dd888	MFH	2001-05-23 00:34:00 +00:00
Andrei Zmievski	1e462b68e4	MFH	2001-05-22 18:47:30 +00:00
Jon Parise	d0e8794f06	FreeBSD defines statfs(2) in <sys/mount.h>. Teach PHP to look for it there.	2001-05-22 03:00:26 +00:00
foobar	1a39219eef	This fixes a few apache can not start bugs.	2001-05-22 00:38:46 +00:00
Sterling Hughes	de53006fe5	MFH	2001-05-21 20:12:35 +00:00
foobar	1849aa7be6	MFH	2001-05-21 19:47:43 +00:00
foobar	031e332288	MFH	2001-05-21 19:28:45 +00:00
Andi Gutmans	19f5560a11	- MFH so that no one starts using the wrongly called function name,	2001-05-21 17:49:33 +00:00
foobar	a178234ab8	MFH	2001-05-21 16:19:34 +00:00
foobar	42895f6eee	MFH	2001-05-20 23:17:50 +00:00
Rasmus Lerdorf	9887c6078c	MFH of patch that fixes copy() ignoring safe_mode open_basedir setting.	2001-05-20 13:28:57 +00:00
Stig Bakken	ab64a5e682	MFH	2001-05-20 05:41:34 +00:00
foobar	7ecd1ba70b	MFH	2001-05-20 01:32:06 +00:00
Derick Rethans	d0611ce6a1	- Fix for bug #9698/#10681 (patch by kettler@gmx.net) @- Added the 'u' modifier to printf/sprintf which prints unsigned longs. @ (Derick)	2001-05-20 00:31:45 +00:00
foobar	48e17d8d92	MFH	2001-05-19 22:23:13 +00:00
James Moore	9298139bf7	MFH	2001-05-19 17:43:33 +00:00
Derick Rethans	757820699b	- MFH	2001-05-19 10:43:34 +00:00
Sascha Schumann	f9c7f4ed8b	merge	2001-05-19 07:47:37 +00:00
Sascha Schumann	65d8ac0830	MFH munmap() file in RSHUTDOWN, if PHPWRITE fails. Files should be shared among processes.	2001-05-19 07:43:25 +00:00
Derick Rethans	2991eac1db	- Fix for bug #10890 (MFH) @- Fixed bugs in the mcrypt extension that caused crashes (Derick)	2001-05-18 20:55:45 +00:00
James Moore	dd62b83ff3	# Whoops	2001-05-17 23:24:58 +00:00
James Moore	e385536966	MFH # Cleaned this up. WIll commit back to head in a second.	2001-05-17 23:21:07 +00:00
Derick Rethans	54f37c24dd	MFH (bug 8901)	2001-05-17 21:48:10 +00:00
Zeev Suraski	2d09bf68c7	MFH	2001-05-17 09:59:44 +00:00
Sterling Hughes	bbf3419a04	MFH # slightly modified	2001-05-16 18:26:08 +00:00
Sascha Schumann	4daf635611	MFH r1.9	2001-05-16 12:02:11 +00:00
Daniel Beulshausen	15df086783	MFH	2001-05-16 09:01:55 +00:00
foobar	da2daad461	MFH	2001-05-16 04:51:08 +00:00
Andi Gutmans	8bb1bc55a2	- Get ready for 4.0.6RC1	2001-05-15 17:50:32 +00:00
Daniel Beulshausen	0d14f16727	MFH	2001-05-15 15:58:59 +00:00
Jon Parise	98b62b9c93	(Merge from head branch) - Renaming $no_cache to $caching and inverting it's meaning - Adding accessors for private $caching flag: getCaching() and setCaching()	2001-05-15 15:39:45 +00:00
Zeev Suraski	52006e0d05	MFH	2001-05-15 14:56:28 +00:00
Christian Stocker	59969e476f	2 files from Cache/ were missing.	2001-05-15 10:17:21 +00:00
foobar	e144aa3701	Fix bug: #1249	2001-05-15 02:04:38 +00:00
foobar	098a1c5fc2	MFH	2001-05-15 01:52:08 +00:00
Zeev Suraski	decfea4729	Fix Win32 build (MFH)	2001-05-14 22:04:17 +00:00
Zeev Suraski	a522511289	MFH	2001-05-13 09:07:02 +00:00
Andi Gutmans	06c41c0a0f	- MFH	2001-05-12 20:11:30 +00:00
Anil Madhavapeddy	fe68557b19	sync OpenBSD libtool 1.3.5 patches on the release branch	2001-05-12 10:03:34 +00:00
Sascha Schumann	967a3c99e7	Put this already in 4.0.6	2001-05-12 09:43:35 +00:00
Sascha Schumann	3e91a688d8	MFH fix for new-session-files-were-not-locked	2001-05-12 09:42:46 +00:00
Sascha Schumann	bb50366735	Revert libtool changes, so we are back to 1.3.5 now.	2001-05-12 09:39:32 +00:00
Sascha Schumann	71951285e1	MFH indentation patch	2001-05-12 09:29:12 +00:00
Andi Gutmans	e400cf0582	- Revert libtool 1.4 check and allow 1.3.x. - I hope there is nothing else which needs changing!	2001-05-12 09:03:58 +00:00
foobar	938a4009cb	MFH	2001-05-12 00:21:43 +00:00
Andrei Zmievski	36ba61d731	MFH	2001-05-11 19:53:27 +00:00
Sascha Schumann	316f3f23ad	merge news	2001-05-11 19:46:09 +00:00
Andi Gutmans	e7bd4ae835	- MFH	2001-05-11 14:32:16 +00:00
SVN Migration	716d605938	This commit was manufactured by cvs2svn to create branch 'PHP_4_0_6'.	2001-05-11 13:34:50 +00:00