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

4.3.10RC2
MFH: fix leak
2026-11-11 03:00:49 +00:00 · 2004-12-08 01:09:54 +00:00 · 2004-12-08 01:09:53 +00:00 · 2004-12-07 17:04:42 +00:00 · 2004-12-07 14:01:56 +00:00 · 2004-12-07 08:42:50 +00:00
1199 changed files with 92231 additions and 54768 deletions
@@ -0,0 +1,285 @@
+define dump_bt
+    set $t = $arg0
+    while $t
+		printf "[0x%08x] ", $t
+		if $t->function_state.function->common.function_name
+			printf "%s() ", $t->function_state.function->common.function_name
+		else
+			printf "??? "
+		end
+		if $t->op_array != 0
+			printf "%s:%d ", $t->op_array->filename, $t->opline->lineno
+		end
+		set $t = $t->prev_execute_data
+		printf "\n"
+    end
+end
+
+document dump_bt
+	dumps the current execution stack. usage: dump_bt executor_globals.current_execute_data
+end
+
+define printzv
+	set $ind = 0
+	____printzv $arg0 0 
+end
+
+document printzv
+	prints content of zval 
+end
+
+define ____printzv
+	set $zvalue = $arg0
+
+	if $zvalue->type == 0
+		set $typename = "NULL"
+	end
+	if $zvalue->type == 1
+		set $typename = "long"
+	end
+	if $zvalue->type == 2
+		set $typename = "double"
+	end
+	if $zvalue->type == 3
+		set $typename = "string"
+	end
+	if $zvalue->type == 4
+		set $typename = "array"
+	end
+	if $zvalue->type == 5
+		set $typename = "object"
+	end
+	if $zvalue->type == 6
+		set $typename = "bool"
+	end
+	if $zvalue->type == 7
+		set $typename = "resource"
+	end
+	if $zvalue->type == 8 
+		set $typename = "constant"
+	end
+	if $zvalue->type == 9
+		set $typename = "const_array"
+	end
+
+	printf "[0x%08x] ", $zvalue
+
+	if $zvalue == executor_globals.uninitialized_zval_ptr
+		printf "*uninitialized* "
+	end
+	printf "(refcount=%d) %s: ", $zvalue->refcount, $typename
+	if $zvalue->type == 1
+		printf "%ld", $zvalue->value.lval
+	end
+	if $zvalue->type == 2
+		printf "%lf", $zvalue->value.dval
+	end
+	if $zvalue->type == 3
+		printf "\"%s\"(%d)", $zvalue->value.str.val, $zvalue->value.str.len
+	end
+	if $zvalue->type == 4
+		if ! $arg1
+			printf "{\n"
+			set $ind = $ind + 1
+			____print_ht $zvalue->value.ht
+			set $ind = $ind - 1
+			set $i = $ind
+			while $i > 0
+				printf "  "
+				set $i = $i - 1
+			end
+			printf "}"
+		end
+	end
+	if $zvalue->type == 5
+		if ! $arg1
+			printf "(prop examination disabled due to a gdb bug)"
+#			set $ht = $zvalue->value.obj.handlers->get_properties($zvalue)
+#			printf "{\n"
+#			set $ind = $ind + 1
+#			____print_ht $ht
+#			set $ind = $ind - 1
+#			set $i = $ind
+#			while $i > 0
+#				printf "  "
+#				set $i = $i - 1
+#			end
+#			printf "}"
+		end
+	end
+	if $zvalue->type == 6
+		if $zvalue->lval
+			printf "true"
+		else
+			printf "false"
+		end
+	end
+	if $zvalue->type == 7
+		printf "#%d", $zvalue->value.lval
+	end
+	printf "\n"
+end
+
+define ____print_ht
+	set $ht = $arg0
+	set $p = $ht->pListHead
+
+	while $p != 0
+		set $zval = *(struct _zval_struct **)$p->pData
+
+		set $i = $ind
+		while $i > 0
+			printf "  "
+			set $i = $i - 1
+		end
+
+		if $p->nKeyLength > 0 
+			printf "\"%s\" => ", $p->arKey
+		else
+			printf "%d => ", $p->h
+		end
+
+		____printzv $zval 1
+		set $p = $p->pListNext
+	end
+end
+
+define print_ht
+	set $ind = 1
+	printf "[0x%08x] {\n", $arg0
+	____print_ht $arg0
+	printf "}\n"
+end
+
+document print_ht
+	dumps elements of HashTable made of zval
+end
+
+define printzn
+	set $ind = 0
+	set $znode = $arg0
+	if $znode->op_type == 1
+		set $optype = "IS_CONST"
+	end
+	if $znode->op_type == 2 
+		set $optype = "IS_TMP_VAR"
+	end
+	if $znode->op_type == 4 
+		set $optype = "IS_VAR"
+	end
+	if $znode->op_type == 8
+		set $optype = "IS_UNUSED"
+	end
+
+	printf "[0x%08x] %s", $znode, $optype
+
+	if $znode->op_type == 1
+		printf ": "
+		____printzv &$znode->u.constant
+	end
+	if $znode->op_type == 2
+		printf ": "
+		set $tvar = (union _temp_variable *)((char *)executor_globals.current_execute_data->Ts + $znode->u.var)
+		____printzv ((union _temp_variable *)$tvar)->tmp_var
+	end
+	if $znode->op_type == 4
+		printf ": "
+		set $tvar = (union _temp_variable *)((char *)executor_globals.current_execute_data->Ts + $znode->u.var)
+		____printzv *$tvar->var.ptr_ptr
+	end
+	if $znode->op_type == 8
+		printf "\n"
+	end
+end
+
+document printzn
+	print type and content of znode.
+	usage: printzn &opline->op1 
+end
+
+define printzops
+	printf "op1 => " 
+	printzn &execute_data->opline.op1
+	printf "op2 => "
+	printzn &execute_data->opline.op2
+	printf "result => "
+	printzn &execute_data->opline.result
+end
+
+document printzops
+	dump operands of the current opline
+end
+
+define zmemcheck
+	set $p = alloc_globals.head
+	set $stat = "?"
+	set $total_size = 0
+	if $arg0 != 0
+		set $not_found = 1
+	else
+		set $not_found = 0
+	end
+	printf " block      size      status file:line\n"
+	printf "-------------------------------------------------------------------------------\n"
+	while $p
+		set $aptr = $p + sizeof(struct _zend_mem_header) + sizeof(align_test)
+		if $arg0 == 0 || (void *)$aptr == (void *)$arg0
+			if $p->magic == 0x7312f8dc 
+				set $stat = "OK"
+			end
+			if $p->magic == 0x99954317
+				set $stat = "FREED"
+			end
+			if $p->magic == 0xfb8277dc
+				set $stat = "CACHED"
+			end
+			set $filename = strrchr($p->filename, '/')
+			if !$filename
+				set $filename = $p->filename
+			else
+				set $filename = $filename + 1
+			end
+			printf " 0x%08x ", $aptr
+			if $p->size == sizeof(struct _zval_struct) && ((struct _zval_struct *)$aptr)->type >= 0 && ((struct _zval_struct *)$aptr)->type < 10
+				printf "ZVAL?(%-2d) ", $p->size
+			else
+				printf "%-9d ", $p->size
+			end
+			set $total_size = $total_size + $p->size
+			printf "%-06s %s:%d", $stat, $filename, $p->lineno
+			if $p->orig_filename
+				set $orig_filename = strrchr($p->orig_filename, '/')
+				if !$orig_filename
+					set $orig_filename = $p->orig_filename
+				else
+					set $orig_filename = $orig_filename + 1
+				end
+				printf " <= %s:%d\n", $orig_filename, $p->orig_lineno
+			else
+				printf "\n"
+			end
+			if $arg0 != 0
+				set $p = 0
+				set $not_found = 0
+			else
+				set $p = $p->pNext
+			end
+		else
+			set $p = $p->pNext
+		end
+	end
+	if $not_found
+		printf "no such block that begins at 0x%08x.\n", $aptr 
+	end
+	if $arg0 == 0
+		printf "-------------------------------------------------------------------------------\n"
+		printf "     total: %d bytes\n", $total_size
+	end
+end
+
+document zmemcheck
+	show status of a memory block.
+	usage: zmemcheck [ptr].
+	if ptr is 0, all blocks will be listed.
+end
+
@@ -31,6 +31,11 @@ EXTENSION:           aolserver
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
+EXTENSION:           activescript
+PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>
+MAINTENANCE:         Odd Fixes
+STATUS:              Experimental
+-------------------------------------------------------------------------------
 EXTENSION:           apache
 PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
 MAINTENANCE:         Maintained
@@ -45,6 +50,10 @@ EXTENSION:           cgi
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           cli
+MAINTENANCE:         Unknown
+STATUS:              Working
+-------------------------------------------------------------------------------
 EXTENSION:           fhttpd
 MAINTENANCE:         Unknown
 STATUS:              Unknown
@@ -54,8 +63,9 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           nsapi
-MAINTENANCE:         Unknown
-STATUS:              Unknown
+PRIMARY MAINTAINER:  Uwe Schindler <thetaphi@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           phttpd
 MAINTENANCE:         Unknown
@@ -89,7 +99,7 @@ STATUS:              Experimental

 -------------------------------------------------------------------------------
 EXTENSION:           dba
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -126,7 +136,7 @@ STATUS:              Experimental
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           interbase
-PRIMARY MAINTAINER:  Jouni Ahto <jouni.ahto@exdec.fi>
+PRIMARY MAINTAINER:  Jouni Ahto <jouni.ahto@exdec.fi>, Ard Biesheuvel <ard@ard.nu>
 MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -166,7 +176,7 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           oci8
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
+PRIMARY MAINTAINER:  Antony Dovgal <tony2001@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -177,8 +187,7 @@ STATUS:              Working
 COMMENT:             Working 
 -------------------------------------------------------------------------------
 EXTENSION:           oracle
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
-MAINTENANCE:         Maintained
+MAINTENANCE:         Orphaned
 STATUS:              Working
 COMMENT:             Using the new OCI8 driver is encouraged where possible.
 -------------------------------------------------------------------------------
@@ -253,7 +262,7 @@ STATUS:              Unknown
 EXTENSION:           domxml
 PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Experimental
+STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           dotnet
 PRIMARY MAINTAINER:  Sam Ruby <rubys@us.ibm.com>
@@ -330,7 +339,7 @@ MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mcrypt
-PRIMARY MAINTAINER:  Derick Rethans <d.rethans@jdimedia.nl>
+PRIMARY MAINTAINER:  Derick Rethans <derick@derickrethans.nl>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -7,20 +7,24 @@ COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORK


 all: $(all_targets) 
-
+	@echo
+	@echo "Build complete."
+	@echo "(It is safe to ignore warnings about tempnam and tmpnam)."
+	@echo
+	
 build-modules: $(PHP_MODULES)

 libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+	-@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1

 libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
 	$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so

-install: $(install_targets)
+install: $(all_targets) $(install_targets)

-install-sapi: libphp4.la
-	@echo "Installing PHP SAPI module"
-	-@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
+install-sapi: $(OVERALL_TARGET)
+	@echo "Installing PHP SAPI module:       $(PHP_SAPI)"
 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
 	-@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
 		for i in 0.0.0 0.0 0; do \
@@ -34,10 +38,10 @@ install-sapi: libphp4.la

 install-modules: build-modules
 	@test -d modules && \
-	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) && \
-	echo "Installing shared extensions:     $(INSTALL_ROOT)$(EXTENSION_DIR)/" && \
-	rm -f modules/*.la && \
-	$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) >/dev/null 2>&1 || true
+	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
+	@echo "Installing shared extensions:     $(INSTALL_ROOT)$(EXTENSION_DIR)/"
+	@rm -f modules/*.la >/dev/null 2>&1
+	@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)

 install-tester:
 	@echo "Installing regression tester:     $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/"
@@ -46,15 +50,21 @@ install-tester:

 install-su: install-pear install-tester

-test: $(SAPI_CLI_PATH)
-	@TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
-	 TEST_PHP_SRCDIR=$(top_srcdir) \
-	 CC="$(CC)" \
-			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS)
+test: 
+	-@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \
+		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+		TEST_PHP_SRCDIR=$(top_srcdir) \
+		CC="$(CC)" \
+			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \
+	else \
+		echo "ERROR: Cannot run tests without CLI sapi."; \
+	fi

 clean:
-	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f 
+	find . -name \*.lo | xargs rm -f
+	find . -name \*.o | xargs rm -f
+	find . -name \*.la | xargs rm -f
+	find . -name \*.a | xargs rm -f
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
 	rm -f libphp4.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
@@ -37,8 +37,11 @@ The next few rules are more of a technical nature.
      messages every day. Woe be to those who attempt to mess with it.

   2. All news updates intended for public viewing, such as new features,
-      bug fixes, improvements, etc., should go into the NEWS file. Also see
-      the note below about automatically updating NEWS in your commit message.
+      bug fixes, improvements, etc., should go into the NEWS file. 
+	  
+      NB! Lines, starting with @ will go automagically into NEWS file, but
+      this is NOT recommended, though. Please, add news entries directly to 
+      NEWS file and don't forget to keep them adjusted and sorted.

   3. Do not commit multiple file and dump all messages in one commit. If you
      modified several unrelated files, commit each group separately and
@@ -59,14 +62,10 @@ The next few rules are more of a technical nature.
 The format of the commit messages is pretty simple.

 If a line begins with #, it is taken to be a comment and will not appear
-in the ChangeLog.  If the line begins with @, it will be redirected to the
-NEWS file. Everything else goes into the ChangeLog.
+in the ChangeLog. Everything else goes into the ChangeLog.

 It is important to note that if your comment or news logline spans multiple
-lines, you have to put # or @ at the beginning of _every_ such line. Every 
-entry in NEWS has to have a name after it, so if you did it with someone's 
-help, put both your names there. Your name WILL NOT be automatically put
-at the end of the NEWS entry - so, please provide it yourself.
+lines, you have to put # at the beginning of _every_ such line. 

 Example. Say you modified two files, datetime.c and string.c. In datetime.c
 you added a new format option for date() function, and in string.c you fixed
@@ -78,17 +77,12 @@ For datetime.c:

 (PHP date) Added new 'K' format modifier for printing out number of
           days until New Year's Eve.
-@- Added new 'K' format modifier that will output the number of days
-@  until New Year's Eve. (Bob)

 For string.c:
 (php_trim) Fixed a memory leak resulting from improper use of zval_dtor().
 # Man, that thing was leaking all over the place!
-@- Fixed memory leak in trim(). (Bob)

-The lines above marked with @ will go into NEWS file automagically, and the
-# lines will be omitted from the ChangeLog. Alternatively, you might want
-to modify NEWS file directly and not use the @ lines.
+The # lines will be omitted from the ChangeLog automagically.

 If you fix some bugs, you should note the bug ID numbers in your
 commit message. Bug ID should be prefixed by "#" for easier access to
@@ -97,12 +91,10 @@ bug report when developers are browsing CVS via. LXR or Bonsai.
 Example:

 Fixed pgsql notice handler double free crash bug. Bug #14016
-@ Fixed pgsql notice handler double free crash bug. Bug #14016

-If you don't see your messages in ChangeLog and NEWS right away, don't worry!
+If you don't see your messages in ChangeLog right away, don't worry!
 These files are updated once a day, so your stuff will not show up until
-somewhat later. Don't go adding stuff to NEWS by hand if you already put @
-lines in the commit message.
+somewhat later. 

 You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
 to look at PHP CVS repository in various ways.
@@ -37,7 +37,7 @@ Note though that you might get little response, if your patch is
 too hard to review.

 If you would like change/add many lines, it is better to ask module
-maintainer and/or php-dev@lists.php.net, or pear-dev@lists.php.net if
+maintainer and/or internals@lists.php.net, or pear-dev@lists.php.net if
 you are patching PEAR. Official module maintainers can be found in
 EXTENSIONS file in PHP source.

@@ -79,7 +79,7 @@ Check list for submitting patch

 Where to send your patch?
 -------------------------
-If you are patching C source, send the patch to php-dev@lists.php.net. 
+If you are patching C source, send the patch to internals@lists.php.net. 
 If you are patching a module, you should also send the patch to the 
 maintainer. Official module maintainers are listed in EXTENSION file 
 in source.
@@ -123,4 +123,5 @@ commit log. If your patch affects end-users, a brief description
 and your name might be added to the NEWS file.


+
 Thank you for submitting patch for PHP!
@@ -43,7 +43,6 @@ global
      (DONE ?)
    * Use arg_separator.input to implode args in the CGI sapi extension
      and arg_separator.input to explode in php_build_argv(). (DONE?)
-    * Implement flush feature suitable for nested output buffers.

    For PHP 5.0.0
    * bundle and use curl lib for fopen wrapper.
@@ -67,6 +66,7 @@ global
    * find a better way to implement script timeouts. SIGVTALRM is used
      by some POSIX threads implementations (i.e. OpenBSD) and is not
      available in ZTS mode.
+    * Implement flush feature suitable for nested output buffers.


 documentation
@@ -80,11 +80,11 @@ documentation

 ext/bz2
 -------
-    * Add ini setting for decompression buffer size. The default 4k is to small
-      for big files and takes ages to decompress. However, 40k which perform
-      quite good with big files may be to much under certain environments as
-      default setting. There should be consideren different default sizes for
-      different SAPIS (e.g. apache and cli).
+    * Add an ini directive to specify the size of decompression buffer.
+      The default 4k is too small for large files and also requires much time
+      for decompression. 40k is suitable for such files, however it may be too
+      much under certain environments. There should be appropriate default
+      settings for the various SAPI modules (e.g. apache and cli).

 ext/curl
 --------
@@ -158,7 +158,6 @@ ext/standard
        basename()
        dirname()
        strrpos()
-        strip_tags()

 ext/wddx
 --------
@@ -1,3 +0,0 @@
- clean up .cvsignores
- purge Makefile.ins and replace PHP_EXTENSION in config.m4s
-  with appropiate calls to PHP_NEW_EXTENSION
@@ -0,0 +1,114 @@
+    This is an overview over existing segfaults in the current PHP source
+    tree.
+
+
+Fixed:
+
+    mb_convert_encoding (Moriyoshi)
+    socket_iovec_alloc (Rasmus)
+    exif_imagetype,exif_thumbnail (Rasmus)
+    dbase_open (Rasmus)
+    array_pad (Rasmus)
+    setlocale (Rasmus)
+    unregister_tick_function (Rasmus)
+    bcsub (Rasmus)
+    str_repeat (Ilia)
+    imagecopyresized (Ilia)
+    mhash_keygen_s2k (Ilia)
+    bundled gd (Ilia)
+    mb_ereg, mb_ereg_match, mb_eregi, mb_split (Moriyoshi)
+    xml_parser_create (Moriyoshi)
+    ob_start (Sascha)
+    imagecreate/-truecolor (Sascha)
+    flock (Sascha)
+    register_shutdown_function (Sascha)
+    mb_strcut('', [number greater than the length of first arg]) (Moriyoshi)
+    ext/exif, ext/dba (Marcus)
+    php_base64_encode (Moriyoshi)
+	
+Open:
+
+    the dbase extension         (1)
+    socket_select               (2)
+    pack                        (3)
+	
+(1) heap corruption, mostly visible in malloc-related calls.  Whether you see 
+    this or not might depend on your libc/compiler.  Hard to track down,
+    because the result of the corruption might be quite delayed.
+
+    Reproducable with glibc-2.3/gcc 3.2.2 by:
+	
+cat <<X | php do_crash
+dbase_add_record
+dbase_close
+dbase_create
+dbase_delete_record
+dbase_get_record
+dbase_get_record_with_names
+dbase_numfields
+dbase_numrecords
+dbase_open
+X 
+
+(2) heap corruption, dies in efree()/execute()
+
+Methodology
+
+    1. Use a plain PHP_4_3 tree
+    2. Use the config.nice from ammendment 1.
+    3. Download the test script from:
+
+        <URL:http://schumann.cx/do_crash.txt>
+
+    4a. Use the scripts funcparse.awk/genfunclist.sh from phpdoc/scripts
+        for creating a plain text function list.  Feed that list to
+        the script.  Avoid calls like pcntl_fork.  Manually remove functions
+        which take too long to finish/eat up all memory.
+    
+    4b. For testing a single function, echo the name of the function to
+        the script like this:
+
+        echo dbase_open | php do_crash.txt
+
+(3) multiple integer overflows, ex. pack("d4294967297", 2);
+
+Amendment 1.
+
+CFLAGS='-O0 -g' \
+'../src/php4/configure' \
+'--enable-pcntl' \
+'--enable-shmop' \
+'--enable-sysvsem' \
+'--enable-sysvshm' \
+'--enable-wddx' \
+'--enable-yp' \
+'--enable-filepro' \
+'--enable-ftp' \
+'--enable-dba' \
+'--enable-dbase' \
+'--enable-dio' \
+'--enable-exif' \
+'--enable-mbstring' \
+'--enable-mbregex' \
+'--enable-sockets' \
+'--enable-bcmath' \
+'--enable-calendar' \
+'--enable-pcntl' \
+'--enable-shmop' \
+'--enable-sysvsem' \
+'--enable-sysvshm' \
+'--enable-wddx' \
+'--enable-yp' \
+'--enable-filepro' \
+'--enable-ftp' \
+'--enable-dba' \
+'--enable-dbase' \
+'--enable-dio' \
+'--enable-exif' \
+'--enable-mbstring' \
+'--enable-mbregex' \
+'--enable-sockets' \
+'--enable-bcmath' \
+'--enable-calendar' \
+"$@"
+
@@ -157,7 +157,16 @@ TSRM_API void tsrm_shutdown(void)
 				int j;

 				next_p = p->next;
-				for (j=0; j<id_count; j++) {
+				for (j=0; j<p->count; j++) {
+				/* Disabled - calling dtors in tsrm_shutdown makes
+					modules registering TSRM ids to crash, if they have
+					dtors, since the module is unloaded before tsrm_shutdown 
+					is called. Can be re-enabled after tsrm_free_id is 
+					implemented.
+					if (resource_types_table && resource_types_table[j].dtor) {
+						resource_types_table[j].dtor(p->storage[j], &p->storage);
+					}
+				*/
 					free(p->storage[j]);
 				}
 				free(p->storage);
@@ -181,6 +190,7 @@ TSRM_API void tsrm_shutdown(void)
 #if defined(GNUPTH)
 	pth_kill();
 #elif defined(PTHREADS)
+	pthread_setspecific(tls_key, 0);
 	pthread_key_delete(tls_key);
 #elif defined(TSRM_WIN32)
 	TlsFree(tls_key);
@@ -481,6 +491,7 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 	if (mutexp) {
 #ifdef TSRM_WIN32
 		DeleteCriticalSection(mutexp);
+		free(mutexp);
 #elif defined(NETWARE)
 		NXMutexFree(mutexp);
 #elif defined(GNUPTH)
@@ -95,14 +95,15 @@ dnl For the thread implementations, we always use --with-*
 dnl to maintain consistency

 AC_ARG_WITH(tsrm-pth,
-[  --with-tsrm-pth[=pth-config]    Use GNU Pth.],[
+[  --with-tsrm-pth[=pth-config]
+                          Use GNU Pth.],[
  TSRM_PTH=$withval
 ],[
  TSRM_PTH=no
 ])

 AC_ARG_WITH(tsrm-st,
-[  --with-tsrm-st],[
+[  --with-tsrm-st          Use SGI's State Threads],[
  TSRM_ST=$withval
 ],[
  TSRM_ST=no
@@ -3,6 +3,7 @@

 #define HAVE_UTIME 1
 #define HAVE_ALLOCA 1
+#define HAVE_REALPATH 1

 #include <malloc.h>
 #include <stdlib.h>
@@ -22,7 +22,7 @@
 #ifndef __GNUC__
 # ifndef HAVE_ALLOCA_H
 #  ifdef _AIX
- #pragma alloca
+#pragma alloca
 #  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
@@ -92,7 +92,7 @@ static int php_check_dots(const char *element, int n)
 	(len >= 2 && !php_check_dots(element, len))

 #define IS_DIRECTORY_CURRENT(element, len) \
-	(len == 1 && ptr[0] == '.')
+	(len == 1 && element[0] == '.')

 #elif defined(NETWARE)
 /* NetWare has strtok() (in LibC) and allows both slashes in paths, like Windows --
@@ -111,12 +111,12 @@ static int php_check_dots(const char *element, int n)

 #ifndef IS_DIRECTORY_UP
 #define IS_DIRECTORY_UP(element, len) \
-	(len == 2 && memcmp(element, "..", 2) == 0)
+	(len == 2 && element[0] == '.' && element[1] == '.')
 #endif

 #ifndef IS_DIRECTORY_CURRENT
 #define IS_DIRECTORY_CURRENT(element, len) \
-	(len == 1 && ptr[0] == '.')
+	(len == 1 && element[0] == '.')
 #endif

 /* define this to check semantics */
@@ -301,12 +301,22 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func

 	if (path_length == 0) 
 		return (0);
+	if (path_length >= MAXPATHLEN)
+		return (1);

 #if !defined(TSRM_WIN32) && !defined(NETWARE)
-	if (IS_ABSOLUTE_PATH(path, path_length)) {
-		if (use_realpath && realpath(path, resolved_path)) {
-			path = resolved_path;
-			path_length = strlen(path);
+	/* cwd_length can be 0 when getcwd() fails.
+	 * This can happen under solaris when a dir does not have read permissions
+	 * but *does* have execute permissions */
+	if (IS_ABSOLUTE_PATH(path, path_length) || (state->cwd_length < 1)) {
+		if (use_realpath) {
+			if (realpath(path, resolved_path)) {
+				path = resolved_path;
+				path_length = strlen(path);
+			} else {
+				/* disable for now
+				return 1; */
+			}
 		}
 	} else { /* Concat current directory with relative path and then run realpath() on it */
 		char *tmp;
@@ -322,9 +332,19 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 		memcpy(ptr, path, path_length);
 		ptr += path_length;
 		*ptr = '\0';
-		if (use_realpath && realpath(tmp, resolved_path)) {
-			path = resolved_path;
-			path_length = strlen(path);
+		if (strlen(tmp) >= MAXPATHLEN) {
+			free(tmp);
+			return 1;
+		}
+		if (use_realpath) {
+			if (realpath(tmp, resolved_path)) {
+				path = resolved_path;
+				path_length = strlen(path);
+			} else {
+				/* disable for now
+				free(tmp);
+				return 1; */
+			}
 		}
 		free(tmp);
 	}
@@ -363,58 +383,64 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	}


-	ptr = tsrm_strtok_r(path_copy, TOKENIZER_STRING, &tok);
-	while (ptr) {
-		ptr_length = strlen(ptr);
+	if (state->cwd_length > 0 || IS_ABSOLUTE_PATH(path, path_length)) {
+		ptr = tsrm_strtok_r(path_copy, TOKENIZER_STRING, &tok);
+		while (ptr) {
+			ptr_length = strlen(ptr);

-		if (IS_DIRECTORY_UP(ptr, ptr_length)) {
-			char save;
+			if (IS_DIRECTORY_UP(ptr, ptr_length)) {
+				char save;

-			save = DEFAULT_SLASH;
+				save = DEFAULT_SLASH;

 #define PREVIOUS state->cwd[state->cwd_length - 1]

-			while (IS_ABSOLUTE_PATH(state->cwd, state->cwd_length) &&
-					!IS_SLASH(PREVIOUS)) {
-				save = PREVIOUS;
-				PREVIOUS = '\0';
-				state->cwd_length--;
-			}
+				while (IS_ABSOLUTE_PATH(state->cwd, state->cwd_length) &&
+						!IS_SLASH(PREVIOUS)) {
+					save = PREVIOUS;
+					PREVIOUS = '\0';
+					state->cwd_length--;
+				}

-			if (!IS_ABSOLUTE_PATH(state->cwd, state->cwd_length)) {
-				state->cwd[state->cwd_length++] = save;
-				state->cwd[state->cwd_length] = '\0';
-			} else {
-				PREVIOUS = '\0';
-				state->cwd_length--;
-			}
-		} else if (!IS_DIRECTORY_CURRENT(ptr, ptr_length)) {
-			state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1+1);
+				if (!IS_ABSOLUTE_PATH(state->cwd, state->cwd_length)) {
+					state->cwd[state->cwd_length++] = save;
+					state->cwd[state->cwd_length] = '\0';
+				} else {
+					PREVIOUS = '\0';
+					state->cwd_length--;
+				}
+			} else if (!IS_DIRECTORY_CURRENT(ptr, ptr_length)) {
+				state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1+1);
 #ifdef TSRM_WIN32
-			/* Windows 9x will consider C:\\Foo as a network path. Avoid it. */
-			if ((state->cwd[state->cwd_length-1]!='\\' && state->cwd[state->cwd_length-1]!='/') || 
-				IsDBCSLeadByte(state->cwd[state->cwd_length-2])) {
-				state->cwd[state->cwd_length++] = DEFAULT_SLASH;
-			}
+				/* Windows 9x will consider C:\\Foo as a network path. Avoid it. */
+				if ((state->cwd[state->cwd_length-1]!='\\' && state->cwd[state->cwd_length-1]!='/') || 
+						IsDBCSLeadByte(state->cwd[state->cwd_length-2])) {
+					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
+				}
 #elif defined(NETWARE)
-            /* If the token is a volume name, it will have colon at the end -- so, no slash before it */
-            if (ptr[ptr_length-1] != ':') {
-				state->cwd[state->cwd_length++] = DEFAULT_SLASH;
-			}
+				/* If the token is a volume name, it will have colon at the end -- so, no slash before it */
+				if (ptr[ptr_length-1] != ':') {
+					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
+				}
 #else
-			state->cwd[state->cwd_length++] = DEFAULT_SLASH;
+				state->cwd[state->cwd_length++] = DEFAULT_SLASH;
 #endif
-			memcpy(&state->cwd[state->cwd_length], ptr, ptr_length+1);
-			state->cwd_length += ptr_length;
+				memcpy(&state->cwd[state->cwd_length], ptr, ptr_length+1);
+				state->cwd_length += ptr_length;
+			}
+			ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok);
 		}
-		ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok);
-	}

-	if (state->cwd_length == COPY_WHEN_ABSOLUTE(state->cwd)) {
-		state->cwd = (char *) realloc(state->cwd, state->cwd_length+1+1);
-		state->cwd[state->cwd_length] = DEFAULT_SLASH;
-		state->cwd[state->cwd_length+1] = '\0';
-		state->cwd_length++;
+		if (state->cwd_length == COPY_WHEN_ABSOLUTE(state->cwd)) {
+			state->cwd = (char *) realloc(state->cwd, state->cwd_length+1+1);
+			state->cwd[state->cwd_length] = DEFAULT_SLASH;
+			state->cwd[state->cwd_length+1] = '\0';
+			state->cwd_length++;
+		}
+	} else {
+		state->cwd = (char *) realloc(state->cwd, path_length+1);
+		memcpy(state->cwd, path, path_length+1);
+		state->cwd_length = path_length;
 	}

 	if (verify_path && verify_path(state)) {
@@ -477,19 +503,23 @@ CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path
 CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC)
 {
 	cwd_state new_state;
-	int retval;
+	char *retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	retval = virtual_file_ex(&new_state, path, NULL, 1);
 	
-	if (!retval) {
+	if (virtual_file_ex(&new_state, path, NULL, 1)==0) {
 		int len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;
+
 		memcpy(real_path, new_state.cwd, len);
 		real_path[len] = '\0';
-		return real_path;
+		retval = real_path;
+	} else {
+		retval = NULL;
 	}

-	return NULL;
+	CWD_STATE_FREE(&new_state);
+
+	return retval;
 }

 CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_func verify_path TSRMLS_DC)
@@ -805,13 +835,24 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 {
 	int command_length;
+	int dir_length, extra = 0;
 	char *command_line;
-	char *ptr;
+	char *ptr, *dir;
 	FILE *retval;

 	command_length = strlen(command);

-	ptr = command_line = (char *) malloc(command_length + sizeof("cd  ; ") + CWDG(cwd).cwd_length+1);
+	dir_length = CWDG(cwd).cwd_length;
+	dir = CWDG(cwd).cwd;
+	while (dir_length > 0) {
+		if (*dir == '\'') extra+=3;
+		dir++;
+		dir_length--;
+	}
+	dir_length = CWDG(cwd).cwd_length;
+	dir = CWDG(cwd).cwd;
+
+	ptr = command_line = (char *) malloc(command_length + sizeof("cd '' ; ") + dir_length +1+1);
 	if (!command_line) {
 		return NULL;
 	}
@@ -821,8 +862,21 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 	if (CWDG(cwd).cwd_length == 0) {
 		*ptr++ = DEFAULT_SLASH;
 	} else {
-		memcpy(ptr, CWDG(cwd).cwd, CWDG(cwd).cwd_length);
-		ptr += CWDG(cwd).cwd_length;
+		*ptr++ = '\'';
+		while (dir_length > 0) {
+			switch (*dir) {
+			case '\'':
+				*ptr++ = '\'';
+				*ptr++ = '\\';
+				*ptr++ = '\'';
+				/* fall-through */
+			default:
+				*ptr++ = *dir;
+			}
+			dir++;
+			dir_length--;
+		}
+		*ptr++ = '\'';
 	}
 	
 	*ptr++ = ' ';
@@ -41,6 +41,10 @@
 #include <unistd.h>
 #endif

+#if defined(__osf__) || defined(_AIX)
+#include <errno.h>
+#endif
+
 #ifdef TSRM_WIN32
 #include "readdir.h"
 #include <sys/utime.h>
@@ -57,10 +61,10 @@ typedef unsigned short mode_t;
 * to account for volume name that is unique to NetWare absolute paths
 */
 #define COPY_WHEN_ABSOLUTE(path) 2
-#define IS_ABSOLUTE_PATH(path, len) \
-	(len >= 2 && ((isalpha(path[0]) && path[1] == ':') || (IS_SLASH(path[0]) && IS_SLASH(path[1]))))
 #define IS_UNC_PATH(path, len) \
 	(len >= 2 && IS_SLASH(path[0]) && IS_SLASH(path[1]))
+#define IS_ABSOLUTE_PATH(path, len) \
+	(len >= 2 && ((isalpha(path[0]) && path[1] == ':') || IS_UNC_PATH(path, len)))

 #elif defined(NETWARE)
 #ifdef HAVE_DIRENT_H
@@ -155,6 +159,25 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC);
 CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC);
 #endif

+/* On AIX & Tru64 when a file does not exist realpath() returns
+ * NULL, and sets errno to ENOENT. Unlike in other libc implementations
+ * the destination is not filled and remains undefined. Therefor, we
+ * must populate it manually using strcpy as done on systems with no
+ * realpath() function.
+ */
+#if defined(__osf__) || defined(_AIX)
+static char *php_realpath_hack(char *src, char *dest)
+{
+	char *ret;
+
+	if ((ret = realpath(src, dest)) == NULL && errno == ENOENT) {
+		return strcpy(dest, src);
+	} else {
+		return ret;
+	}
+}
+#endif
+
 #if HAVE_UTIME
 CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC);
 #endif
@@ -232,7 +255,11 @@ typedef struct _virtual_cwd_globals {
 #define VCWD_ACCESS(pathname, mode) access(pathname, mode)

 #ifdef HAVE_REALPATH
+#if defined(__osf__) || defined(_AIX)
+#define VCWD_REALPATH(path, real_path) php_realpath_hack(path, real_path)
+#else
 #define VCWD_REALPATH(path, real_path) realpath(path, real_path)
+#endif
 #else
 #define VCWD_REALPATH(path, real_path) strcpy(real_path, path)
 #endif
@@ -359,4 +359,13 @@ TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf) {
 			return -1;
 	}
 }
+
+TSRM_API char *realpath(char *orig_path, char *buffer)
+{
+	int ret = GetFullPathName(orig_path, _MAX_PATH, buffer, NULL);
+	if(!ret || ret > _MAX_PATH) {
+		return NULL;
+	}
+	return buffer;
+}
 #endif
@@ -101,4 +101,5 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags);
 TSRM_API int shmdt(const void *shmaddr);
 TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf);

+TSRM_API char *realpath(char *orig_path, char *buffer);
 #endif
@@ -16,19 +16,22 @@ AC_DEFUN([PHP_ADD_MAKEFILE_FRAGMENT],[
  sed -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
 ])

+AC_DEFUN(PHP_PROG_RE2C,[
+  AC_CHECK_PROG(RE2C, re2c, re2c, [exit 0;])
+])

-dnl PHP_DEFINE(WHAT[, value])
+dnl PHP_DEFINE(WHAT[, value[, directory]])
 dnl
 dnl Creates builddir/include/what.h and in there #define WHAT value
 dnl
 AC_DEFUN([PHP_DEFINE],[
-  [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" > include/php_]translit($1,A-Z,a-z)[.h]
+  [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" > ]ifelse([$3],,[include],[$3])[/php_]translit($1,A-Z,a-z)[.h]
 ])

 dnl PHP_INIT_BUILD_SYSTEM
 dnl
 AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[
-test -d include || $php_shtool mkdir include
+test -d include || mkdir include
 > Makefile.objects
 > Makefile.fragments
 dnl We need to play tricks here to avoid matching the egrep line itself
@@ -177,73 +180,13 @@ AC_DEFUN([PHP_REMOVE_USR_LIB],[
  unset ac_new_flags
  for i in [$]$1; do
    case [$]i in
-    -L/usr/lib|-L/usr/lib/) ;;
-    *) ac_new_flags="[$]ac_new_flags [$]i" ;;
+    -L/usr/lib|-L/usr/lib/[)] ;;
+    *[)] ac_new_flags="[$]ac_new_flags [$]i" ;;
    esac
  done
  $1=[$]ac_new_flags
 ])

-AC_DEFUN([PHP_SETUP_OPENSSL],[
-  if test "$PHP_OPENSSL" = "yes"; then
-    PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
-  fi
-
-  for i in $PHP_OPENSSL; do
-    if test -r $i/include/openssl/evp.h; then
-      OPENSSL_INCDIR=$i/include
-    fi
-    if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
-      OPENSSL_LIBDIR=$i/lib
-    fi
-  done
-
-  if test -z "$OPENSSL_INCDIR"; then
-    AC_MSG_ERROR([Cannot find OpenSSL's <evp.h>])
-  fi
-
-  if test -z "$OPENSSL_LIBDIR"; then
-    AC_MSG_ERROR([Cannot find OpenSSL's libraries])
-  fi
-
-  old_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS=-I$OPENSSL_INCDIR
-  AC_MSG_CHECKING([for OpenSSL version])
-  AC_EGREP_CPP(yes,[
-#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER >= 0x0090600fL
-  yes
-#endif
-  ],[
-    AC_MSG_RESULT([>= 0.9.6])
-  ],[
-    AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
-  ])
-  CPPFLAGS=$old_CPPFLAGS
-
-  PHP_ADD_INCLUDE($OPENSSL_INCDIR)
-  PHP_ADD_LIBPATH($OPENSSL_LIBDIR)
-
-  PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
-    PHP_ADD_LIBRARY(crypto)
-  ],[
-    AC_MSG_ERROR([libcrypto not found!])
-  ],[
-    -L$OPENSSL_LIBDIR
-  ])
-
-  PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [
-    PHP_ADD_LIBRARY(ssl)
-  ],[
-    AC_MSG_ERROR([libssl not found!])
-  ],[
-    -L$OPENSSL_LIBDIR
-  ])
-
-  OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
-  AC_SUBST(OPENSSL_INCDIR_OPT)
-])
-
 dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD)
 dnl
 dnl Use this macro, if you need to add libraries and or library search
@@ -253,11 +196,11 @@ dnl
 AC_DEFUN([PHP_EVAL_LIBLINE],[
  for ac_i in $1; do
    case $ac_i in
-    -l*)
+    -l*[)]
      ac_ii=`echo $ac_i|cut -c 3-`
      PHP_ADD_LIBRARY($ac_ii,1,$2)
    ;;
-    -L*)
+    -L*[)]
      ac_ii=`echo $ac_i|cut -c 3-`
      PHP_ADD_LIBPATH($ac_ii,$2)
    ;;
@@ -273,7 +216,7 @@ dnl
 AC_DEFUN([PHP_EVAL_INCLINE],[
  for ac_i in $1; do
    case $ac_i in
-    -I*)
+    -I*[)]
      ac_ii=`echo $ac_i|cut -c 3-`
      PHP_ADD_INCLUDE($ac_ii)
    ;;
@@ -337,10 +280,10 @@ AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[
  PHP_SUBST(SHLIB_SUFFIX_NAME)
  SHLIB_SUFFIX_NAME=so
  case $host_alias in
-  *hpux*)
+  *hpux*[)]
 	SHLIB_SUFFIX_NAME=sl
 	;;
-  *darwin*)
+  *darwin*[)]
 	SHLIB_SUFFIX_NAME=dylib
 	;;
  esac
@@ -511,17 +454,17 @@ AC_DEFUN([PHP_ARG_ANALYZE_EX],[
 ext_output="yes, shared"
 ext_shared=yes
 case [$]$1 in
-shared,*)
+shared,*[)]
  $1=`echo "[$]$1"|sed 's/^shared,//'`
  ;;
-shared)
+shared[)]
  $1=yes
  ;;
-no)
+no[)]
  ext_output=no
  ext_shared=no
  ;;
-*)
+*[)]
  ext_output=yes
  ext_shared=no
  ;;
@@ -531,7 +474,7 @@ PHP_ALWAYS_SHARED([$1])
 ])

 AC_DEFUN([PHP_ARG_ANALYZE],[
-ifelse([$3],yes,[PHP_ARG_ANALYZE_EX([$1])])
+ifelse([$3],yes,[PHP_ARG_ANALYZE_EX([$1])],[ext_output=ifelse([$]$1,,no,[$]$1)])
 ifelse([$2],,,[AC_MSG_RESULT([$ext_output])])
 ])

@@ -590,7 +533,8 @@ AC_DEFUN([PHP_MODULE_PTR],[
 ])
 
 AC_DEFUN([PHP_CONFIG_NICE],[
-  rm -f $1
+  test -f $1 && mv $1 $1.old
+  rm -f $1.old
  cat >$1<<EOF
 #! /bin/sh
 #
@@ -653,8 +597,8 @@ main() {
 ])
 ])
  case $ac_cv_time_r_type in
-  hpux) AC_DEFINE(PHP_HPUX_TIME_R,1,[Whether you have HP-UX 10.x]) ;;
-  irix) AC_DEFINE(PHP_IRIX_TIME_R,1,[Whether you have IRIX-style functions]) ;;
+  hpux[)] AC_DEFINE(PHP_HPUX_TIME_R,1,[Whether you have HP-UX 10.x]) ;;
+  irix[)] AC_DEFINE(PHP_IRIX_TIME_R,1,[Whether you have IRIX-style functions]) ;;
  esac
 ])

@@ -686,7 +630,8 @@ AC_DEFUN([PHP_CONFIGURE_PART],[
 ])

 AC_DEFUN([PHP_PROG_SENDMAIL],[
-AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib)
+PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
+AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
 if test -n "$PROG_SENDMAIL"; then
  AC_DEFINE(HAVE_SENDMAIL,1,[whether you have sendmail])
 fi
@@ -1122,6 +1067,7 @@ AC_DEFUN([PHP_CHECK_CC_OPTION],[
 	  AC_MSG_RESULT([no])
    fi
  fi
+  rm -rf conftest*
 ])

 AC_DEFUN([PHP_REGEX],[
@@ -1184,7 +1130,9 @@ main() {
 	int res = 0;
 	res = res || (snprintf(buf, 2, "marcus") != 6); 
 	res = res || (buf[1] != '\0');
-	res = res || (snprintf(buf, 0, "boerger") != 7);
+	/* Implementations may consider this as an encoding error */
+	snprintf(buf, 0, "boerger");
+	/* However, they MUST ignore the pointer */
 	res = res || (buf[0] != 'm');
 	res = res || (snprintf(NULL, 0, "boerger") != 7);
 	res = res || (snprintf(buf, sizeof(buf), "%f", 0.12345678) != 8);
@@ -1205,20 +1153,21 @@ main() {
  fi
 ])

-dnl PHP_SHARED_MODULE(module-name, object-var, build-dir)
+dnl PHP_SHARED_MODULE(module-name, object-var, build-dir, cxx)
 dnl
 dnl Basically sets up the link-stage for building module-name
 dnl from object_var in build-dir.
 dnl
 AC_DEFUN([PHP_SHARED_MODULE],[
+  install_modules="install-modules"
  PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.la"
  PHP_SUBST($2)
  cat >>Makefile.objects<<EOF
 \$(phplibdir)/$1.la: $3/$1.la
 	\$(LIBTOOL) --mode=install cp $3/$1.la \$(phplibdir)

-$3/$1.la: \$($2) \$(translit($1,a-z-,A-Z_)_SHARED_DEPENDENCIES)
-	\$(LIBTOOL) --mode=link \$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) -o \[$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z-,A-Z_)_SHARED_LIBADD)
+$3/$1.la: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
+	\$(LIBTOOL) --mode=link ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) -o \[$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)

 EOF
 ])
@@ -1234,10 +1183,10 @@ AC_DEFUN([PHP_SELECT_SAPI],[
  PHP_SAPI=$1
  
  case "$2" in
-  static) PHP_BUILD_STATIC;;
-  shared) PHP_BUILD_SHARED;;
-  bundle) PHP_BUILD_BUNDLE;;
-  program) PHP_BUILD_PROGRAM($5);;
+  static[)] PHP_BUILD_STATIC;;
+  shared[)] PHP_BUILD_SHARED;;
+  bundle[)] PHP_BUILD_BUNDLE;;
+  program[)] PHP_BUILD_PROGRAM($5);;
  esac
    
  ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
@@ -1245,7 +1194,7 @@ AC_DEFUN([PHP_SELECT_SAPI],[

 dnl deprecated
 AC_DEFUN([PHP_EXTENSION],[
-  sources=`awk -f $abs_srcdir/scan_makefile_in.awk < []PHP_EXT_SRCDIR($1)[]/Makefile.in`
+  sources=`$AWK -f $abs_srcdir/build/scan_makefile_in.awk < []PHP_EXT_SRCDIR($1)[]/Makefile.in`

  PHP_NEW_EXTENSION($1, $sources, $2, $3)

@@ -1263,7 +1212,7 @@ AC_DEFUN([PHP_GEN_BUILD_DIRS],[
 ])

 dnl
-dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags]]])
+dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx]]]])
 dnl
 dnl Includes an extension in the build.
 dnl
@@ -1293,7 +1242,7 @@ dnl ---------------------------------------------- Static module
    if test "$3" = "shared" || test "$3" = "yes"; then
 dnl ---------------------------------------------- Shared module
      PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes)
-      PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir)
+      PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6)
      AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to build $1 as dynamic module)
    fi
  fi
@@ -1323,13 +1272,13 @@ AC_DEFUN([PHP_SOLARIS_PIC_WEIRDNESS],[
  if test -n "$EXT_SHARED"; then
    os=`uname -sr 2>/dev/null`
    case $os in
-        "SunOS 5.6"|"SunOS 5.7")
+        "SunOS 5.6"|"SunOS 5.7"[)]
          case $CC in
 	    gcc*|egcs*) CFLAGS="$CFLAGS -fPIC";;
-	    *) CFLAGS="$CFLAGS -fpic";;
+	    *[)] CFLAGS="$CFLAGS -fpic";;
 	  esac
 	  AC_MSG_RESULT([yes]);;
-	*)
+	*[)]
 	  AC_MSG_RESULT([no]);;
    esac
  else
@@ -1367,8 +1316,8 @@ AC_DEFUN([PHP_SYS_LFS],
  ac_shellvars='CPPFLAGS LDFLAGS LIBS'
  for ac_shellvar in $ac_shellvars; do
    case $ac_shellvar in
-      CPPFLAGS) ac_lfsvar=LFS_CFLAGS ;;
-      *) ac_lfsvar=LFS_$ac_shellvar ;;
+      CPPFLAGS[)] ac_lfsvar=LFS_CFLAGS ;;
+      *[)] ac_lfsvar=LFS_$ac_shellvar ;;
    esac
    eval test '"${'$ac_shellvar'+set}"' = set && ac_set=$ac_shellvar
    (getconf $ac_lfsvar) >/dev/null 2>&1 || { ac_result=no; break; }
@@ -1377,14 +1326,14 @@ AC_DEFUN([PHP_SYS_LFS],
    eval ac_test_$ac_shellvar=\$ac_getconf
  done
  case "$ac_result$ac_getconfs" in
-    yes) ac_result=no ;;
+    yes[)] ac_result=no ;;
  esac
  case "$ac_result$ac_set" in
-    yes?*) ac_result="yes, but $ac_set is already set, so use its settings"
+    yes?*[)] ac_result="yes, but $ac_set is already set, so use its settings"
  esac
  AC_MSG_RESULT([$ac_result])
  case $ac_result in
-    yes)
+    yes[)]
      for ac_shellvar in $ac_shellvars; do
        eval $ac_shellvar=\$ac_test_$ac_shellvar
      done ;;
@@ -1448,6 +1397,20 @@ int main(void) {
  fi
 ])

+dnl Some systems, notably Solaris, cause getcwd() or realpath to fail if a
+dnl component of the path has execute but not read permissions
+AC_DEFUN([PHP_BROKEN_GETCWD],[
+  AC_MSG_CHECKING([for broken getcwd])
+  os=`uname -sr 2>/dev/null`
+  case $os in
+    SunOS*[)]
+	  AC_DEFINE(HAVE_BROKEN_GETCWD,1, [Define if system has broken getcwd])
+	  AC_MSG_RESULT([yes]);;
+	*[)]
+	  AC_MSG_RESULT([no]);;
+  esac
+])
+
 AC_DEFUN([PHP_BROKEN_GLIBC_FOPEN_APPEND],[
  AC_MSG_CHECKING([for broken libc stdio])
  AC_CACHE_VAL(have_broken_glibc_fopen_append,[
@@ -1584,12 +1547,19 @@ dnl Wrapper for AC_CHECK_LIB
 dnl
 AC_DEFUN([PHP_CHECK_LIBRARY], [
  save_old_LDFLAGS=$LDFLAGS
-  LDFLAGS="$5 $LDFLAGS"
+  ac_stuff="$5"
+  
+  save_ext_shared=$ext_shared
+  ext_shared=yes
+  PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)
  AC_CHECK_LIB([$1],[$2],[
    LDFLAGS=$save_old_LDFLAGS
+    ext_shared=$save_ext_shared
    $3
  ],[
    LDFLAGS=$save_old_LDFLAGS
+    ext_shared=$save_ext_shared
+    unset ac_cv_func_$1
    $4
  ])dnl
 ])
@@ -1614,6 +1584,112 @@ AC_DEFUN([PHP_CHECK_FRAMEWORK], [
  ])
 ])

+dnl 
+dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]])
+dnl
+dnl Common setup macro for openssl
+dnl
+AC_DEFUN([PHP_SETUP_OPENSSL],[
+  found_openssl=no
+  unset OPENSSL_INCDIR
+  unset OPENSSL_LIBDIR
+
+  dnl First try to find pkg-config
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+
+  dnl If pkg-config is found try using it
+  if test "$PHP_OPENSSL" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
+    if $PKG_CONFIG --atleast-version=0.9.6 openssl; then
+      found_openssl=yes
+      OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
+      OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
+      OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
+    else
+      AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
+    fi
+
+    if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
+      PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
+      PHP_EVAL_INCLINE($OPENSSL_INCS)
+    fi
+
+  else 
+
+    dnl If pkg-config fails for some reason, revert to the old method
+    if test "$PHP_OPENSSL" = "yes"; then
+      PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+    fi
+
+    for i in $PHP_OPENSSL; do
+      if test -r $i/include/openssl/evp.h; then
+        OPENSSL_INCDIR=$i/include
+      fi
+      if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
+        OPENSSL_LIBDIR=$i/lib
+      fi
+      test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
+    done
+
+    if test -z "$OPENSSL_INCDIR"; then
+      AC_MSG_ERROR([Cannot find OpenSSL's <evp.h>])
+    fi
+
+    if test -z "$OPENSSL_LIBDIR"; then
+      AC_MSG_ERROR([Cannot find OpenSSL's libraries])
+    fi
+
+    old_CPPFLAGS=$CPPFLAGS
+    CPPFLAGS=-I$OPENSSL_INCDIR
+    AC_MSG_CHECKING([for OpenSSL version])
+    AC_EGREP_CPP(yes,[
+#include <openssl/opensslv.h>
+#if OPENSSL_VERSION_NUMBER >= 0x0090600fL
+  yes
+#endif
+    ],[
+      AC_MSG_RESULT([>= 0.9.6])
+    ],[
+      AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
+    ])
+    CPPFLAGS=$old_CPPFLAGS
+
+    PHP_ADD_INCLUDE($OPENSSL_INCDIR)
+  
+    PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
+      PHP_ADD_LIBRARY(crypto,,$1)
+    ],[
+      AC_MSG_ERROR([libcrypto not found!])
+    ],[
+      -L$OPENSSL_LIBDIR
+    ])
+
+    old_LIBS=$LIBS
+    LIBS="$LIBS -lcrypto"
+    PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [
+      found_openssl=yes
+    ],[
+      AC_MSG_ERROR([libssl not found!])
+    ],[
+      -L$OPENSSL_LIBDIR
+    ])
+    LIBS=$old_LIBS
+    PHP_ADD_LIBRARY(ssl,,$1)
+
+    PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
+  fi
+
+  dnl For apache 1.3.x static build
+  OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
+  AC_SUBST(OPENSSL_INCDIR_OPT)
+
+  if test "$found_openssl" = "yes"; then
+ifelse([$2],[],:,[$2])
+ifelse([$3],[],,[else $3])
+  fi
+])
+
 dnl 
 dnl PHP_SETUP_ICONV(shared-add [, action-found [, action-not-found]])
 dnl
@@ -1623,16 +1699,19 @@ AC_DEFUN([PHP_SETUP_ICONV], [
  found_iconv=no
  unset ICONV_DIR

+  echo > ext/iconv/php_have_libiconv.h
+  echo > ext/iconv/php_have_iconv.h
+
  dnl
  dnl Check libc first if no path is provided in --with-iconv
  dnl
  if test "$PHP_ICONV" = "yes"; then
    AC_CHECK_FUNC(iconv, [
-      PHP_DEFINE(HAVE_ICONV)
+      PHP_DEFINE(HAVE_ICONV,1,[ext/iconv])
      found_iconv=yes
    ],[
      AC_CHECK_FUNC(libiconv,[
-        PHP_DEFINE(HAVE_LIBICONV)
+        PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
        found_iconv=yes
      ])
    ])
@@ -1665,11 +1744,11 @@ AC_DEFUN([PHP_SETUP_ICONV], [
    then
      PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [
        found_iconv=yes
-        PHP_DEFINE(HAVE_LIBICONV)
+        PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
      ], [
        PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
          found_iconv=yes
-          PHP_DEFINE(HAVE_ICONV)
+          PHP_DEFINE(HAVE_ICONV,1,[ext/iconv])
        ], [], [
          -L$ICONV_DIR/lib
        ])
@@ -1748,12 +1827,12 @@ AC_DEFUN([PHP_CHECK_FUNC],[
  AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])

  case $found in
-  yes) 
+  yes[)] 
    PHP_DEF_HAVE($1)
    ac_cv_func_$1=yes
  ;;
  ifelse($#,1,,[
-    *) PHP_CHECK_FUNC_LIB($@) ;;
+    *[)] PHP_CHECK_FUNC_LIB($@) ;;
  ])
  esac
 ])
@@ -65,7 +65,7 @@ snapshot:
 	md5sum $$distname.tar.bz2; \
 	bzip2 -t $$distname.tar.bz2

-cvsclean:
+cvsclean-work:
 	@for i in `find . -name .cvsignore`; do \
 		(cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore | grep -v config.nice` *.o *.a .libs || true); \
 	done
@@ -52,8 +52,13 @@ $(TOUCH_FILES):
 	touch $(TOUCH_FILES)

 aclocal.m4: configure.in acinclude.m4
-	aclocal 2>&1 | $(SUPPRESS_WARNINGS)
-	
+	@echo rebuilding $@
+	@libtoolize=`./build/shtool path glibtoolize libtoolize`; \
+	$$libtoolize --copy --automake; \
+	ltpath=`dirname $$libtoolize`; \
+	ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \
+	cat acinclude.m4 $$ltfile > $@
+
 configure: aclocal.m4 configure.in $(config_m4_files)
 	@echo rebuilding $@
 	@autoconf 2>&1 | $(SUPPRESS_WARNINGS)
@@ -12,11 +12,11 @@
 #  | obtain it through the world-wide-web, please send a note to          |
 #  | license@php.net so we can mail you a copy immediately.               |
 #  +----------------------------------------------------------------------+
-#  | Authors: Stig Bakken <ssb@fast.no>                                   |
+#  | Authors: Stig Bakken <ssb@php.net>                                   |
 #  |          Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
-# $Id: buildcheck.sh,v 1.21.2.1 2003-02-11 21:11:51 sniper Exp $ 
+# $Id: buildcheck.sh,v 1.21.2.6 2003-09-28 13:37:59 tal Exp $ 
 #

 echo "buildconf: checking installation..."
@@ -24,7 +24,7 @@ echo "buildconf: checking installation..."
 stamp=$1

 # autoconf 2.13 or newer
-ac_version=`autoconf --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
+ac_version=`autoconf --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 if test -z "$ac_version"; then
 echo "buildconf: autoconf not found."
 echo "           You need autoconf version 2.13 or newer installed"
@@ -50,39 +50,17 @@ if test "$1" = "2" && test "$2" -ge "50"; then
  stamp=
 fi

-
-# automake 1.4 or newer
-am_version=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
-am_version_clean=`echo $am_version|sed -e 's/-p[0-9]*$//'`
-if test "$am_version" = ""; then
-echo "buildconf: automake not found."
-echo "           You need automake version 1.4 or newer installed"
-echo "           to build PHP from CVS."
-exit 1
-fi
-IFS=.; set $am_version_clean; IFS=' '
-if test "$1" = "1" -a "$2" -lt "4" || test "$1" -lt "1"; then
-echo "buildconf: automake version $am_version found."
-echo "           You need automake version 1.4 or newer installed"
-echo "           to build PHP from CVS."
-exit 1
-else
-echo "buildconf: automake version $am_version (ok)"
-fi
-
-# libtool 1.4 or newer
-# Prefer glibtool over libtool for Mac OS X compatibility
-libtool=`which glibtool 2> /dev/null`
-if test ! -f "$libtool"; then libtool=`which libtool`; fi
-lt_pversion=`$libtool --version 2>/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- ].*//p'`
+# libtoolize 1.4.3 or newer
+# Prefer glibtoolize over libtoolize for Mac OS X compatibility
+libtoolize=`./build/shtool path glibtoolize libtoolize 2> /dev/null`
+lt_pversion=`$libtoolize --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//'`
 if test "$lt_pversion" = ""; then
 echo "buildconf: libtool not found."
 echo "           You need libtool version 1.4.3 or newer installed"
 echo "           to build PHP from CVS."
 exit 1
 fi
-lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
-IFS=.; set $lt_version; IFS=' '
+IFS=.; set $lt_pversion; IFS=' '

 if test "$3" = ""; then
  third=0
@@ -100,12 +78,14 @@ echo "           to build PHP from CVS."
 exit 1
 fi

-am_prefix=`which automake | sed -e 's#/[^/]*/[^/]*$##'`
-lt_prefix=`echo $libtool | sed -e 's#/[^/]*/[^/]*$##'`
-if test "$am_prefix" != "$lt_prefix"; then
-    echo "WARNING: automake and libtool are installed in different"
-    echo "         directories.  This may cause aclocal to fail."
-    echo "         continuing anyway"
+ltpath=`echo $libtoolize | sed -e 's#/[^/]*/[^/]*$##'`
+ltfile="$ltpath/share/aclocal/libtool.m4"
+if test -r "$ltfile"; then
+  :
+else
+  echo "buildconf: $ltfile does not exist."
+  echo "           Please reinstall libtool."
+  exit 1
 fi

 test -n "$stamp" && touch $stamp
@@ -1,20 +1,60 @@
 #!/bin/sh
 # $Id$

+eval `grep '^EXTRA_VERSION=' configure.in`
+case "$EXTRA_VERSION" in
+	*-dev)
+		dev=1
+		;;
+	*)
+		dev=0
+		;;
+esac
+
+devok=0
+
 while test $# -gt 0; do
    if test "$1" = "--copy"; then
        automake_flags=--copy
    fi

-    if test "$1" = "--ZendEngine2"; then
-        ZENDDIR=ZendEngine2
-        echo "Using Zend Engine 2 code"
-    fi
+	if test "$1" = "--force"; then
+		devok=1
+		echo "Forcing buildconf"
+	fi

    shift
 done

+if test "$dev" = "0" -a "$devok" = "0"; then
+	echo "You should not run buildconf in a release package."
+	echo "use buildconf --force to override this check."
+	exit 1
+fi
+
 if test -z "$ZENDDIR"; then
+    if grep "PHP_MAJOR_VERSION 5" main/php_version.h >/dev/null; then
+      v=5
+    else
+      v=4
+    fi
+  
+    if test "$v" = "5"; then
+      if test -r "Zend/OBJECTS2_HOWTO"; then
+        :
+      else
+        mv Zend ZendEngine1 2>/dev/null
+        mv ZendEngine2 Zend
+      fi
+    else
+      if test -r "Zend/zend_execute_globals.h"; then
+           :
+      else
+        mv Zend ZendEngine2 2>/dev/null
+        mv ZendEngine1 Zend
+      fi
+    fi
+
    ZENDDIR=Zend
    echo "using default Zend directory"
 fi
@@ -40,8 +40,8 @@ AC_CONFIG_HEADER(main/php_config.h)

 MAJOR_VERSION=4
 MINOR_VERSION=3
-RELEASE_VERSION=2
-EXTRA_VERSION="-RC1"
+RELEASE_VERSION=10
+EXTRA_VERSION="RC2"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"

 dnl Define where extension directories are located in the configure context
@@ -127,6 +127,7 @@ dnl AC_PROG_CXXCPP
 dnl check for -R, etc. switch
 PHP_RUNPATH_SWITCH

+PHP_PROG_RE2C
 AC_PROG_RANLIB
 AC_PROG_LN_S
 AC_PROG_AWK
@@ -135,9 +136,9 @@ if test "$YACC" != "bison -y"; then
    AC_MSG_WARN([You will need bison if you want to regenerate the PHP parsers.])
 else
    AC_MSG_CHECKING([bison version])
-    set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /'`
-    if test "${1}" = "1" -a "${2}" -lt "28"; then
-      AC_MSG_WARN(You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2}).)
+    set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /'|tr -d a-z`
+    if test "${1}" -ne "1" -o "(" "${2}" != "28" -a "${2}" != "35" -a "${2}" != "75" -a "${2}" != "875" ")"; then
+      AC_MSG_WARN(You will need bison 1.28, 1.35, 1.75 or 1.875 if you want to regenerate the Zend parser (found ${1}.${2}).)
    fi
    AC_MSG_RESULT(${1}.${2} (ok))
 fi
@@ -155,11 +156,19 @@ if test "$ac_cv_c_const" = "yes" ; then
 fi

 AC_MSG_CHECKING([flex version])
-set `echo "" | $LEX -V -v --version 2>/dev/null | grep 'version' | cut -d ' ' -f 3 | sed -e 's/\./ /g' | sed -e 's/[^0-9 ]//g'`
-if test "${1}" != "2" -o "${2}" != "5" -o "${3}" -lt "4"; then
-	 AC_MSG_WARN(You will need flex 2.5.4 or later if you want to regenerate Zend/PHP lexical parsers.)
-fi
+if test "$LEX" ;then
+	flexvers=`echo "" | $LEX -V -v --version 2>/dev/null | 
+		sed -e 's/^.* //' -e 's/\./ /g'`
+	if test ! -z "$flexvers"; then
+		set $flexvers
+		if test "${1}" != "2" -o "${2}" != "5" -o "${3}" -lt "4"; then
+			AC_MSG_WARN(You will need flex 2.5.4 or later if you want to regenerate Zend/PHP lexical parsers.)
+		fi
+	fi
 AC_MSG_RESULT(${1}.${2}.${3} (ok))
+else
+	AC_MSG_WARN(You will need flex 2.5.4 or later if you want to regenerate Zend/PHP lexical parsers.)
+fi

 dnl Platform-specific compile settings.
 dnl -------------------------------------------------------------------------
@@ -180,6 +189,7 @@ case $host_alias in
    CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR";;
 *darwin*|*rhapsody*)
    CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
+    AC_DEFINE(BIND_8_COMPAT, 1, [Enabling BIND8 compatibility for Panther])
    php_multiple_shlib_versions_ok=yes;;
 *beos*)
    beos_threads=1
@@ -308,17 +318,14 @@ dnl -------------------------------------------------------------------------

 dnl Checks for header files.
 AC_HEADER_STDC
+AC_HEADER_DIRENT

-dnl In QNX opendir resides in libc but dirent.h is still required
-if test "`uname -s 2>/dev/null`" != "QNX"; then
-  AC_HEADER_DIRENT
-else
-  AC_CHECK_HEADERS(dirent.h)
-fi
 PHP_MISSING_FCLOSE_DECL
 dnl QNX requires unix.h to allow functions in libunix to work properly
 AC_CHECK_HEADERS([ \
+dirent.h \
 ApplicationServices/ApplicationServices.h \
+sys/param.h \
 sys/types.h \
 sys/time.h \
 netinet/in.h \
@@ -362,7 +369,11 @@ unix.h \
 utime.h \
 sys/utsname.h \
 sys/ipc.h \
+dlfcn.h
 ],[],[],[
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -378,6 +389,7 @@ sys/ipc.h \
 ])

 PHP_FOPENCOOKIE
+PHP_BROKEN_GETCWD
 PHP_BROKEN_GLIBC_FOPEN_APPEND

 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -470,6 +482,7 @@ memmove \
 mkstemp \
 mmap \
 nl_langinfo \
+perror \
 poll \
 putenv \
 realpath \
@@ -508,10 +521,48 @@ vsnprintf \
 )

 dnl Check for getaddrinfo, should be a better way, but...
+dnl Also check for working getaddrinfo
 AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo,
-[AC_TRY_COMPILE([#include <netdb.h>],
-                [struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);],
-  ac_cv_func_getaddrinfo=yes, ac_cv_func_getaddrinfo=no)])
+[AC_TRY_LINK([#include <netdb.h>],
+                [struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);], 
+  AC_TRY_RUN([
+#include <netdb.h>
+#include <sys/types.h>
+#ifndef AF_INET
+# include <sys/socket.h>
+#endif
+int main(void) {
+  struct addrinfo *ai, *pai, hints;
+
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_flags = AI_NUMERICHOST;
+
+  if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) {
+    exit(1);
+  }
+
+  if (ai == 0) {
+    exit(1);
+  }
+
+  pai = ai;
+  
+  while (pai) {
+    if (pai->ai_family != AF_INET) {
+      /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
+      exit(1);
+    }
+    if (pai->ai_addr->sa_family != AF_INET) {
+      /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
+      exit(1);
+    }
+    pai = pai->ai_next;
+  }
+  freeaddrinfo(ai);
+  exit(0);
+}
+  ],ac_cv_func_getaddrinfo=yes, ac_cv_func_getaddrinfo=no),
+ac_cv_func_getaddrinfo=no)])
 if test "$ac_cv_func_getaddrinfo" = yes; then
  AC_DEFINE(HAVE_GETADDRINFO,1,[Define if you have the getaddrinfo function])
 fi
@@ -519,8 +570,8 @@ fi
 AC_REPLACE_FUNCS(strlcat strlcpy getopt)
 AC_FUNC_UTIME_NULL
 AC_FUNC_ALLOCA
-PHP_AC_BROKEN_SPRINTF
-PHP_AC_BROKEN_SNPRINTF
+dnl PHP_AC_BROKEN_SPRINTF
+dnl PHP_AC_BROKEN_SNPRINTF
 PHP_DECLARED_TIMEZONE
 PHP_TIME_R_TYPE
 PHP_READDIR_R_TYPE
@@ -553,7 +604,7 @@ dnl ## In diversion 4 we check user-configurable general settings.

 dnl General settings.
 dnl -------------------------------------------------------------------------
-
+PHP_CONFIGURE_PART(General settings)

 PHP_HELP_SEPARATOR([General settings:])

@@ -603,27 +654,6 @@ if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then
 	PHP_CONFIG_FILE_SCAN_DIR=""
 fi

-# compatibility
-if test -z "$with_pear" && test "$enable_pear" = "no"; then
-  with_pear=no
-fi
-
-PHP_ARG_WITH(pear, [whether to install PEAR, and where],
-[  --with-pear=DIR         Install PEAR in DIR (default PREFIX/lib/php)
-  --without-pear          Do not install PEAR], DEFAULT, no)
-
-if test "$PHP_PEAR" != "no" && test "$disable_cli" != "1"; then
-  install_pear="install-pear"
-  PEAR_INSTALLDIR=$PHP_PEAR
-fi
-
-if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
-  case $PHP_LAYOUT in
-    GNU) PEAR_INSTALLDIR=$datadir/pear;;
-    *)   PEAR_INSTALLDIR=$libdir/php;;
-  esac
-fi
-
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"

 PHP_ARG_ENABLE(safe-mode, whether to enable safe mode by default,
@@ -721,17 +751,19 @@ if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then
  AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support])
 fi

-
-dnl
-dnl OpenSSL configure
-dnl
-PHP_ARG_WITH(openssl,for OpenSSL support,
-[  --with-openssl[=DIR]    Include OpenSSL support (requires OpenSSL >= 0.9.6) ])
-
-if test "$PHP_OPENSSL" != "no"; then
-  ext_openssl_shared=$ext_shared
-  PHP_SETUP_OPENSSL
-fi
+AC_MSG_CHECKING([whether to enable versioning])
+AC_ARG_ENABLE(versioning,
+[  --enable-versioning     Export only required symbols.
+                          See INSTALL for more information], [
+  if test "x$APXS" != "x"; then
+    PHP_VERSIONING=$enableval
+  else
+    PHP_VERSIONING=no
+  fi
+],[
+  PHP_VERSIONING=no
+])
+AC_MSG_RESULT([$PHP_VERSIONING])

 divert(5)

@@ -761,7 +793,6 @@ dnl

 AC_ARG_ENABLE(all,
 [ --disable-all   Disable all extensions enabled by default.
- --enable-all    Enable all extensions.
 ], [
  PHP_ENABLE_ALL=$enableval
 ])
@@ -769,26 +800,9 @@ AC_ARG_ENABLE(all,
 # reading config stubs
 esyscmd(./build/config-stubs ext)

-
-dnl Other settings.
+dnl Extensions post-config
 dnl -------------------------------------------------------------------------

-PHP_HELP_SEPARATOR([Other settings:])
-
-AC_MSG_CHECKING([whether to enable versioning])
-AC_ARG_ENABLE(versioning,
-[  --enable-versioning     Export only required symbols.
-                          See INSTALL for more information], [
-  if test "x$APXS" != "x"; then
-    PHP_VERSIONING=$enableval
-  else
-    PHP_VERSIONING=no
-  fi
-],[
-  PHP_VERSIONING=no
-])
-AC_MSG_RESULT([$PHP_VERSIONING])
-
 if test "$PHP_VERSIONING" = "yes"; then
  test -z "$PHP_SYM_FILE" && PHP_SYM_FILE="$abs_srcdir/sapi/$PHP_SAPI/php.sym"
  if test -f "$PHP_SYM_FILE"; then
@@ -814,8 +828,6 @@ shared)
 ;;
 esac

-PHP_REGEX
-
 EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"

 dnl this has to be here to prevent the openssl crypt() from
@@ -826,10 +838,70 @@ fi

 unset LIBS LDFLAGS

+dnl PEAR
+dnl -------------------------------------------------------------------------
+
+PHP_HELP_SEPARATOR([PEAR:])
+PHP_CONFIGURE_PART(Configuring PEAR)
+
+# compatibility
+if test -z "$with_pear" && test "$enable_pear" = "no"; then
+  with_pear=no
+fi
+
+PHP_ARG_WITH(pear, [whether to install PEAR],
+[  --with-pear=DIR         Install PEAR in DIR (default PREFIX/lib/php)
+  --without-pear          Do not install PEAR], DEFAULT, yes)
+
+if test "$PHP_PEAR" != "no"; then
+
+  dnl
+  dnl PEAR dependancies
+  dnl
+  if test "$PHP_SAPI_CLI" = "no"; then
+    pear_error_msg="$pear_error_msg 
+                    PEAR requires CLI to be enabled.     Add --enable-cli to the configure line. (or --disable-pear)"
+  fi
+  if test "$PHP_PCRE_REGEX" = "no"; then
+    pear_error_msg="$pear_error_msg 
+                    PEAR requires PCRE to be enabled.    Add --with-pcre-regex to the configure line. (or --disable-pear)"
+  fi
+  if test "$PHP_XML" = "no"; then
+    pear_error_msg="$pear_error_msg 
+                    PEAR requires XML to be enabled.     Add --enable-xml to the configure line. (or --disable-pear)"
+  fi
+
+dnl
+dnl ext/xmlrpc is not really there yet to be a requirement..
+dnl
+dnl  if test "$PHP_XMLRPC" = "no"; then
+dnl    pear_error_msg="$pear_error_msg 
+dnl                    PEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the configure line. (or --disable-pear)"
+dnl fi
+dnl
+
+  if test "$pear_error_msg"; then
+    AC_MSG_ERROR([$pear_error_msg])
+  fi
+
+  install_pear="install-pear"
+  PEAR_INSTALLDIR=$PHP_PEAR
+
+  if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
+    case $PHP_LAYOUT in
+      GNU) PEAR_INSTALLDIR=$datadir/pear;;
+      *)   PEAR_INSTALLDIR=$libdir/php;;
+    esac
+  fi
+fi
+
+
 dnl Configuring Zend and TSRM.
 dnl -------------------------------------------------------------------------

+PHP_HELP_SEPARATOR([Zend:])
 PHP_CONFIGURE_PART(Configuring Zend)
+
 LIBZEND_BASIC_CHECKS
 LIBZEND_DLSYM_CHECK
 LIBZEND_OTHER_CHECKS
@@ -847,23 +919,27 @@ fi

 if test "$abs_srcdir" != "$abs_builddir"; then
  INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend"
-  INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM"
+  INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM -I\$(top_builddir)/"
 fi

 ZEND_EXTRA_LIBS="$LIBS"
 unset LIBS LDFLAGS

+PHP_HELP_SEPARATOR([TSRM:])
 PHP_CONFIGURE_PART(Configuring TSRM)
 TSRM_BASIC_CHECKS
 if test "$PHP_THREAD_SAFETY" = "yes"; then
  TSRM_THREADS_CHECKS
 fi
 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
+EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $LDFLAGS"
 EXTRA_LIBS="$EXTRA_LIBS $LIBS"
 unset LIBS LDFLAGS

 test "$prefix" = "NONE" && prefix=/usr/local
 test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
+test "$program_prefix" = "NONE" && program_prefix=
+test "$program_suffix" = "NONE" && program_suffix=

 case $libdir in
  '${exec_prefix}/lib')
@@ -958,6 +1034,7 @@ if test -z "$php_ldflags_add_usr_lib"; then
 fi

 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
+EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"

 PHP_BUILD_DATE=`date '+%Y-%m-%d'`
 AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
@@ -988,6 +1065,8 @@ PHP_SUBST_OLD(php_abs_top_srcdir)

 PHP_SUBST(bindir)
 PHP_SUBST(exec_prefix)
+PHP_SUBST(program_prefix)
+PHP_SUBST(program_suffix)
 PHP_SUBST(includedir)
 PHP_SUBST(libdir)
 PHP_SUBST(mandir)
@@ -1013,6 +1092,7 @@ PHP_SUBST_OLD(DEBUG_CFLAGS)
 PHP_SUBST(DEFS)
 PHP_SUBST_OLD(EXTENSION_DIR)
 PHP_SUBST_OLD(EXTRA_LDFLAGS)
+PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
 PHP_SUBST_OLD(EXTRA_LIBS)
 PHP_SUBST_OLD(ZEND_EXTRA_LIBS)
 PHP_SUBST_OLD(INCLUDES)
@@ -1035,6 +1115,7 @@ PHP_SUBST(PHP_RPATHS)
 PHP_SUBST(PHP_SAPI)
 PHP_SUBST_OLD(PHP_VERSION)
 PHP_SUBST(PROG_SENDMAIL)
+PHP_SUBST(RE2C)
 PHP_SUBST(SHELL)
 PHP_SUBST(SHARED_LIBTOOL)
 PHP_SUBST(TSRM_DIR)
@@ -1068,6 +1149,7 @@ dnl
 dnl Libtool creation
 dnl

+PHP_HELP_SEPARATOR([Libtool:])
 PHP_CONFIGURE_PART(Configuring libtool)

 LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS"
@@ -1094,10 +1176,19 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"

 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets="install-sapi install-modules $install_pear install-build install-headers install-programs"
-if test "$PHP_SAPI" != "cgi"; then
-  install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
-fi
+install_targets="$install_modules $install_pear install-build install-headers install-programs"
+
+case $PHP_SAPI in
+  cgi)
+    install_targets="install-sapi $install_targets"
+    ;;
+  cli)
+    install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
+    ;;
+  *)
+    install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
+    ;;
+esac

 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)
@@ -1122,7 +1213,7 @@ PHP_ADD_SOURCES(Zend, \
    zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
    zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
    zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
-    zend_ini.c zend_qsort.c zend_multibyte.c)
+    zend_ini.c zend_qsort.c zend_multibyte.c zend_strtod.c)

 if test -r "$abs_srcdir/Zend/zend_objects.c"; then
  PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_mm.c)
@@ -1166,13 +1257,6 @@ if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test "\$CONFIG_FILES" = " $ALL
  REDO_ALL=yes
 fi

-if test ! -f $srcdir/ext/bcmath/number.c; then
-  echo "creating number.c"
-  echo "/* Dummy File */" > $srcdir/ext/bcmath/number.c
-  echo "creating number.h"
-  echo "/* Dummy File */" > $srcdir/ext/bcmath/number.h
-fi
-
 ################################################################
 # Create configuration headers
 #
@@ -1266,7 +1350,7 @@ cat <<X
 |                        *** WARNING ***                             |
 |                                                                    |
 | You chose to compile PHP with DB extension. This extension is      |
-| deprecated and does not support databse locking correctly. Please  |
+| deprecated and does not support database locking correctly. Please |
 | use DBA extension which is a fully operational superset.           |
 X
  fi
@@ -1326,7 +1410,7 @@ cat <<X
 | If your application relies on register_globals being ON, you       |
 | should explicitly set it to on in your php.ini file.               |
 | Note that you are strongly encouraged to read                      |
-| http://www.php.net/manual/en/security.registerglobals.php          |
+| http://www.php.net/manual/en/security.globals.php                  |
 | about the implications of having register_globals set to on, and   |
 | avoid using it if possible.                                        |
 +--------------------------------------------------------------------+
@@ -1,3 +1,3 @@
 #! /bin/sh

-${MAKE:-make} -f build/build.mk cvsclean
+${MAKE:-make} -f build/build.mk cvsclean-work
@@ -96,7 +96,7 @@ PHP_RINIT_FUNCTION(bcmath)
 	if (cfg_get_long("bcmath.scale", &bc_precision)==FAILURE) {
 		bc_precision=0;
 	}
-	
+	if(bc_precision<0) bc_precision=0;
 	bc_init_numbers(TSRMLS_C);
 	
 	return SUCCESS;
@@ -144,7 +144,7 @@ PHP_FUNCTION(bcadd)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) Z_LVAL_PP(scale_param);
+				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -189,7 +189,7 @@ PHP_FUNCTION(bcsub)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) Z_LVAL_PP(scale_param);
+				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -234,7 +234,7 @@ PHP_FUNCTION(bcmul)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) Z_LVAL_PP(scale_param);
+				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -279,7 +279,7 @@ PHP_FUNCTION(bcdiv)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) Z_LVAL_PP(scale_param);
+				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -371,7 +371,7 @@ PHP_FUNCTION(bcpow)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) Z_LVAL_PP(scale_param);
+				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -416,7 +416,7 @@ PHP_FUNCTION(bcsqrt)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) Z_LVAL_PP(scale_param);
+				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -439,7 +439,7 @@ PHP_FUNCTION(bcsqrt)
 }
 /* }}} */

-/* {{{ proto string bccomp(string left_operand, string right_operand [, int scale])
+/* {{{ proto int bccomp(string left_operand, string right_operand [, int scale])
   Compares two arbitrary precision numbers */
 PHP_FUNCTION(bccomp)
 {
@@ -458,7 +458,7 @@ PHP_FUNCTION(bccomp)
 		        	WRONG_PARAM_COUNT;
    			}
 				convert_to_long_ex(scale_param);
-				scale = (int) Z_LVAL_PP(scale_param);
+				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -481,7 +481,7 @@ PHP_FUNCTION(bccomp)
 }
 /* }}} */

-/* {{{ proto string bcscale(int scale)
+/* {{{ proto bool bcscale(int scale)
   Sets default scale parameter for all bc math functions */
 PHP_FUNCTION(bcscale)
 {
@@ -492,7 +492,8 @@ PHP_FUNCTION(bcscale)
 	}
 	
 	convert_to_long_ex(new_scale);
-	bc_precision = Z_LVAL_PP(new_scale);
+	bc_precision = (Z_LVAL_PP(new_scale)<0) ? 0 : Z_LVAL_PP(new_scale);
+
 	RETURN_TRUE;
 }
 /* }}} */
@@ -7,7 +7,7 @@ PHP_ARG_ENABLE(bcmath, whether to enable bc style precision math functions,

 if test "$PHP_BCMATH" != "no"; then
  AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath])
-  PHP_NEW_EXTENSION(bcmath, bcmath.c number.c \
+  PHP_NEW_EXTENSION(bcmath, bcmath.c \
 libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
 libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
 libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
@@ -52,9 +52,12 @@ typedef struct bc_struct
 			   in the case of leading zeros generated. */
    } bc_struct;

-#include <php.h>
-#include <ext/bcmath/php_bcmath.h>
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif

+#include "php.h"
+#include "../../php_bcmath.h"

 /* The base used in storing the numbers in n_value above.
   Currently this MUST be 10. */
@@ -1,6 +1,6 @@
 --TEST--
 bcadd() function
--SKIP--
+--SKIPIF--
 <?php if(!extension_loaded("bcmath")) print "skip"; ?>
 --INI--
 bcmath.scale=0
@@ -1,6 +1,6 @@
 --TEST--
 bccomp() function
--SKIP--
+--SKIPIF--
 <?php if(!extension_loaded("bcmath")) print "skip"; ?>
 --INI--
 bcmath.scale=0
@@ -1,6 +1,6 @@
 --TEST--
 bcdiv() function
--SKIP--
+--SKIPIF--
 <?php if(!extension_loaded("bcmath")) print "skip"; ?>
 --INI--
 bcmath.scale=0
@@ -1,6 +1,6 @@
 --TEST--
 bcmod() function
--SKIP--
+--SKIPIF--
 <?php if(!extension_loaded("bcmath")) print "skip"; ?>
 --INI--
 bcmath.scale=0
@@ -1,6 +1,6 @@
 --TEST--
 bcmul() function
--SKIP--
+--SKIPIF--
 <?php if(!extension_loaded("bcmath")) print "skip"; ?>
 --INI--
 bcmath.scale=0
@@ -1,6 +1,6 @@
 --TEST--
 bcpow() function
--SKIP--
+--SKIPIF--
 <?php if(!extension_loaded("bcmath")) print "skip"; ?>
 --INI--
 bcmath.scale=0
@@ -1,6 +1,6 @@
 --TEST--
 bcscale() function
--SKIP--
+--SKIPIF--
 <?php if(!extension_loaded("bcmath")) print "skip"; ?>
 --INI--
 bcmath.scale=0
@@ -1,6 +1,6 @@
 --TEST--
 bcsqrt() function
--SKIP--
+--SKIPIF--
 <?php if(!extension_loaded("bcmath")) print "skip"; ?>
 --INI--
 bcmath.scale=0
@@ -1,6 +1,6 @@
 --TEST--
 bcsub() function
--SKIP--
+--SKIPIF--
 <?php if(!extension_loaded("bcmath")) print "skip"; ?>
 --INI--
 bcmath.scale=0
@@ -0,0 +1,2 @@
+Bzip2
+Sterling Hughes
@@ -0,0 +1,542 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP version 4.0                                                      |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2003 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author: Sterling Hughes <sterling@php.net>                           |
+   +----------------------------------------------------------------------+
+ */
+ 
+/* $Id$ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+#include "php_bz2.h"
+
+#if HAVE_BZ2
+
+/* PHP Includes */
+#include "ext/standard/file.h"
+#include "ext/standard/info.h"
+#include "ext/standard/php_string.h"
+
+/* for fileno() */
+#include <stdio.h>
+
+/* Internal error constants */
+#define PHP_BZ_ERRNO   0
+#define PHP_BZ_ERRSTR  1
+#define PHP_BZ_ERRBOTH 2
+
+/* Blocksize of the decompression buffer */
+#define PHP_BZ_DECOMPRESS_SIZE 4096
+
+function_entry bz2_functions[] = {
+	PHP_FE(bzopen,       NULL)
+	PHP_FE(bzread,       NULL)
+	PHP_FALIAS(bzwrite,   fwrite,		NULL)
+	PHP_FALIAS(bzflush,   fflush,		NULL)
+	PHP_FALIAS(bzclose,   fclose,		NULL)
+	PHP_FE(bzerrno,      NULL)
+	PHP_FE(bzerrstr,     NULL)
+	PHP_FE(bzerror,      NULL)
+	PHP_FE(bzcompress,   NULL)
+	PHP_FE(bzdecompress, NULL)
+	{NULL, NULL, NULL}
+};
+
+zend_module_entry bz2_module_entry = {
+	STANDARD_MODULE_HEADER,
+	"bz2",
+	bz2_functions,
+	PHP_MINIT(bz2),
+	PHP_MSHUTDOWN(bz2),
+	NULL,
+	NULL,
+	PHP_MINFO(bz2),
+	NO_VERSION_YET,
+	STANDARD_MODULE_PROPERTIES
+};
+
+#ifdef COMPILE_DL_BZ2
+ZEND_GET_MODULE(bz2)
+#endif
+
+struct php_bz2_stream_data_t {
+	BZFILE *bz_file;
+	php_stream *stream;
+};
+
+/* {{{ BZip2 stream implementation */
+
+static size_t php_bz2iop_read(php_stream *stream, char *buf, size_t count TSRMLS_DC)
+{
+	struct php_bz2_stream_data_t *self = (struct php_bz2_stream_data_t *) stream->abstract;
+	size_t ret;
+	
+	ret = BZ2_bzread(self->bz_file, buf, count);
+
+	if (ret == 0) {
+		stream->eof = 1;
+	}
+
+	return ret;
+}
+
+static size_t php_bz2iop_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC)
+{
+	struct php_bz2_stream_data_t *self = (struct php_bz2_stream_data_t *) stream->abstract;
+
+	return BZ2_bzwrite(self->bz_file, (char*)buf, count); 
+}
+
+static int php_bz2iop_close(php_stream *stream, int close_handle TSRMLS_DC)
+{
+	struct php_bz2_stream_data_t *self = (struct php_bz2_stream_data_t *)stream->abstract;
+	int ret = EOF;
+	
+	if (close_handle) {
+		BZ2_bzclose(self->bz_file);
+	}
+
+	if (self->stream) {
+		php_stream_free(self->stream, PHP_STREAM_FREE_CLOSE | (close_handle == 0 ? PHP_STREAM_FREE_PRESERVE_HANDLE : 0));
+	}
+
+	efree(self);
+
+	return ret;
+}
+
+static int php_bz2iop_flush(php_stream *stream TSRMLS_DC)
+{
+	struct php_bz2_stream_data_t *self = (struct php_bz2_stream_data_t *)stream->abstract;
+	return BZ2_bzflush(self->bz_file);
+}
+/* }}} */
+
+php_stream_ops php_stream_bz2io_ops = {
+	php_bz2iop_write, php_bz2iop_read,
+	php_bz2iop_close, php_bz2iop_flush,
+	"BZip2",
+	NULL, /* seek */
+	NULL, /* cast */
+	NULL, /* stat */
+	NULL  /* set_option */
+};
+
+/* {{{ Bzip2 stream openers */
+PHP_BZ2_API php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, 
+														char *mode, php_stream *innerstream STREAMS_DC TSRMLS_DC)
+{
+	struct php_bz2_stream_data_t *self;
+	
+	self = emalloc(sizeof(*self));
+
+	self->stream = innerstream;
+	self->bz_file = bz;
+
+	return php_stream_alloc_rel(&php_stream_bz2io_ops, self, 0, mode);
+}
+
+PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper,
+											char *path,
+											char *mode,
+											int options,
+											char **opened_path,
+											php_stream_context *context STREAMS_DC TSRMLS_DC)
+{
+	php_stream *retstream = NULL, *stream = NULL;
+	char *path_copy = NULL;
+	BZFILE *bz_file = NULL;
+
+	if (strncasecmp("compress.bzip2://", path, 17) == 0) {
+		path += 17;
+	}
+	if (mode[0] != 'w' && mode[0] != 'r' && mode[1] != '\0') {
+		return NULL;
+	}
+
+#ifdef VIRTUAL_DIR
+	virtual_filepath_ex(path, &path_copy, NULL TSRMLS_CC);
+#else
+	path_copy = path;
+#endif  
+	
+	/* try and open it directly first */
+	bz_file = BZ2_bzopen(path_copy, mode);
+
+	if (opened_path && bz_file) {
+		*opened_path = estrdup(path_copy);
+	}
+	path_copy = NULL;
+	
+	if (bz_file == NULL) {
+		/* that didn't work, so try and get something from the network/wrapper */
+		stream = php_stream_open_wrapper(path, mode, options | STREAM_WILL_CAST, opened_path);
+	
+		if (stream) {
+			int fd;
+			if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD, (void **) &fd, REPORT_ERRORS)) {
+				bz_file = BZ2_bzdopen(fd, mode);
+			}
+		}
+		/* remove the file created by php_stream_open_wrapper(), it is not needed since BZ2 functions
+		 * failed.
+		 */
+		if (!bz_file && mode[0] == 'w') {
+			VCWD_UNLINK(*opened_path);
+		}
+	}
+	
+	if (bz_file) {
+		retstream = _php_stream_bz2open_from_BZFILE(bz_file, mode, stream STREAMS_REL_CC TSRMLS_CC);
+		if (retstream) {
+			return retstream;
+		}
+
+		BZ2_bzclose(bz_file);
+	}
+
+	if (stream) {
+		php_stream_close(stream);
+	}
+
+	return NULL;
+}
+
+/* }}} */
+
+static php_stream_wrapper_ops bzip2_stream_wops = {
+	_php_stream_bz2open,
+	NULL, /* close */
+	NULL, /* fstat */
+	NULL, /* stat */
+	NULL, /* opendir */
+	"BZip2"
+};
+
+php_stream_wrapper php_stream_bzip2_wrapper = {
+	&bzip2_stream_wops,
+	NULL,
+	0 /* is_url */
+};
+
+static void php_bz2_error(INTERNAL_FUNCTION_PARAMETERS, int);
+
+PHP_MINIT_FUNCTION(bz2)
+{
+	php_register_url_stream_wrapper("compress.bzip2", &php_stream_bzip2_wrapper TSRMLS_CC);
+
+	return SUCCESS;
+}
+
+PHP_MSHUTDOWN_FUNCTION(bz2)
+{
+	php_unregister_url_stream_wrapper("compress.bzip2" TSRMLS_CC);
+
+	return SUCCESS;
+}
+
+PHP_MINFO_FUNCTION(bz2)
+{
+	php_info_print_table_start();
+	php_info_print_table_row(2, "BZip2 Support", "Enabled");
+	php_info_print_table_row(2, "BZip2 Version", (char *) BZ2_bzlibVersion());
+	php_info_print_table_end();
+}
+
+/* {{{ proto string bzread(int bz[, int length])
+   Reads up to length bytes from a BZip2 stream, or 1024 bytes if length is not specified */
+PHP_FUNCTION(bzread)
+{
+	zval *bz;
+	long len = 1024;
+	php_stream *stream;
+
+	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &bz, &len)) {
+		RETURN_FALSE;
+	}
+	
+	php_stream_from_zval(stream, &bz);
+
+	if (len < 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "length may not be negative");
+		RETURN_FALSE;
+	}
+
+	Z_STRVAL_P(return_value) = emalloc(len + 1);
+	Z_STRLEN_P(return_value) = php_stream_read(stream, Z_STRVAL_P(return_value), len);
+	
+	if (Z_STRLEN_P(return_value) < 0) {
+		efree(Z_STRVAL_P(return_value));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "could not read valid bz2 data from stream");
+		RETURN_FALSE;		
+	}
+	
+	Z_STRVAL_P(return_value)[Z_STRLEN_P(return_value)] = 0;
+
+	if (PG(magic_quotes_runtime)) {
+		Z_STRVAL_P(return_value) = php_addslashes(	Z_STRVAL_P(return_value),
+													Z_STRLEN_P(return_value),
+													&Z_STRLEN_P(return_value), 1 TSRMLS_CC);
+	}
+
+	Z_TYPE_P(return_value) = IS_STRING;
+}
+/* }}} */
+
+/* {{{ proto resource bzopen(string|int file|fp, string mode)
+   Opens a new BZip2 stream */
+PHP_FUNCTION(bzopen)
+{
+	zval    **file,   /* The file to open */
+	        **mode;   /* The mode to open the stream with */
+	BZFILE   *bz;     /* The compressed file stream */
+	php_stream *stream = NULL;
+	
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &file, &mode) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+	convert_to_string_ex(mode);
+
+	if (Z_STRVAL_PP(mode)[0] != 'r' && Z_STRVAL_PP(mode)[0] != 'w' && Z_STRVAL_PP(mode)[1] != '\0') {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid mode for bzopen(). Only 'w' and 'r' are supported.", Z_STRVAL_PP(mode));
+		RETURN_FALSE;
+	}
+
+	/* If it's not a resource its a string containing the filename to open */
+	if (Z_TYPE_PP(file) != IS_RESOURCE) {
+		convert_to_string_ex(file);
+		stream = php_stream_bz2open(NULL,
+									Z_STRVAL_PP(file), 
+									Z_STRVAL_PP(mode), 
+									ENFORCE_SAFE_MODE | REPORT_ERRORS, 
+									NULL);
+	} else {
+		/* If it is a resource, than its a stream resource */
+		int fd;
+
+		php_stream_from_zval(stream, file);
+
+		if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_FD, (void *) &fd, REPORT_ERRORS)) {
+			RETURN_FALSE;
+		}
+		
+		bz = BZ2_bzdopen(fd, Z_STRVAL_PP(mode));
+
+		stream = php_stream_bz2open_from_BZFILE(bz, Z_STRVAL_PP(mode), stream);
+	}
+
+	if (stream) {
+		php_stream_to_zval(stream, return_value);
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto int bzerrno(resource bz)
+   Returns the error number */
+PHP_FUNCTION(bzerrno)
+{
+	php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRNO);
+}
+/* }}} */
+
+/* {{{ proto string bzerrstr(resource bz)
+   Returns the error string */
+PHP_FUNCTION(bzerrstr)
+{
+	php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRSTR);
+}
+/* }}} */
+
+/* {{{ proto array bzerror(resource bz)
+   Returns the error number and error string in an associative array */
+PHP_FUNCTION(bzerror)
+{
+	php_bz2_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_BZ_ERRBOTH);
+}
+/* }}} */
+
+/* {{{ proto string bzcompress(string source [, int blocksize100k [, int workfactor]])
+   Compresses a string into BZip2 encoded data */
+PHP_FUNCTION(bzcompress)
+{
+	zval            **source,          /* Source data to compress */
+	                **zblock_size,     /* Optional block size to use */
+					**zwork_factor;    /* Optional work factor to use */
+	char             *dest = NULL;     /* Destination to place the compressed data into */
+	int               error,           /* Error Container */
+					  block_size  = 4, /* Block size for compression algorithm */
+					  work_factor = 0, /* Work factor for compression algorithm */
+					  argc;            /* Argument count */
+	unsigned int      source_len,      /* Length of the source data */
+					  dest_len;        /* Length of the destination buffer */ 
+	
+	argc = ZEND_NUM_ARGS();
+
+	if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &source, &zblock_size, &zwork_factor) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_string_ex(source);
+	
+	/* Assign them to easy to use variables, dest_len is initially the length of the data
+	   + .01 x length of data + 600 which is the largest size the results of the compression 
+	   could possibly be, at least that's what the libbz2 docs say (thanks to jeremy@nirvani.net 
+	   for pointing this out).  */
+	source_len = Z_STRLEN_PP(source);
+	dest_len   = Z_STRLEN_PP(source) + (0.01 * Z_STRLEN_PP(source)) + 600;
+	
+	/* Allocate the destination buffer */
+	dest = emalloc(dest_len + 1);
+	
+	/* Handle the optional arguments */
+	if (argc > 1) {
+		convert_to_long_ex(zblock_size);
+		block_size = Z_LVAL_PP(zblock_size);
+	}
+	
+	if (argc > 2) {
+		convert_to_long_ex(zwork_factor);
+		work_factor = Z_LVAL_PP(zwork_factor);
+	}
+
+	error = BZ2_bzBuffToBuffCompress(dest, &dest_len, Z_STRVAL_PP(source), source_len, block_size, 0, work_factor);
+	if (error != BZ_OK) {
+		efree(dest);
+		RETURN_LONG(error);
+	} else {
+		/* Copy the buffer, we have perhaps allocate alot more than we need,
+		   so we erealloc() the buffer to the proper size */
+		dest = erealloc(dest, dest_len + 1);
+		dest[dest_len] = 0;
+		RETURN_STRINGL(dest, dest_len, 0);
+	}
+}
+/* }}} */
+
+/* {{{ proto string bzdecompress(string source [, int small])
+   Decompresses BZip2 compressed data */
+PHP_FUNCTION(bzdecompress)
+{
+	zval    **source,                             /* Source data to decompress */
+	        **zsmall;                             /* (Optional) user specified small */
+	char     *dest;                               /* Destination buffer, initially allocated */
+	int       error,                              /* Error container */
+	          iter = 1,                           /* Iteration count for the compression loop */
+			  size,                               /* Current size to realloc the dest buffer to */
+			  dest_len = PHP_BZ_DECOMPRESS_SIZE,  /* Size of the destination length */
+			  small    = 0,                       /* The actual small */
+			  argc     = ZEND_NUM_ARGS();         /* Argument count */
+	
+	if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &source, &zsmall) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_string_ex(source);
+	
+	/* optional small argument handling */
+	if (argc > 1) {
+		convert_to_long_ex(zsmall);
+		small = Z_LVAL_PP(zsmall);
+	}
+
+	/* Depending on the size of the source buffer, either allocate
+	  the length of the source buffer or the a default decompression
+	  size */
+	dest = emalloc(PHP_BZ_DECOMPRESS_SIZE > Z_STRLEN_PP(source) ? PHP_BZ_DECOMPRESS_SIZE : Z_STRLEN_PP(source));
+
+	/* (de)Compression Loop */	
+	do {
+		/* Handle the (re)allocation of the buffer */
+		size = dest_len * iter;
+		if (iter > 1) {
+			dest = erealloc(dest, size);
+		}
+		++iter;
+
+		/* Perform the decompression */
+		error = BZ2_bzBuffToBuffDecompress(dest, &size, Z_STRVAL_PP(source), Z_STRLEN_PP(source), small, 0);
+	} while (error == BZ_OUTBUFF_FULL);
+	
+	if (error != BZ_OK) {
+		efree(dest);
+		RETURN_LONG(error);
+	} else {
+		/* we might have allocated a little to much, so erealloc the buffer 
+		 down to size, before returning it */
+		dest = erealloc(dest, size + 1);
+		dest[size] = 0;
+		RETURN_STRINGL(dest, size, 0);
+	}
+}
+/* }}} */
+
+/* {{{ php_bz2_error()
+   The central error handling interface, does the work for bzerrno, bzerrstr and bzerror */
+static void php_bz2_error(INTERNAL_FUNCTION_PARAMETERS, int opt)
+{ 
+	zval        **bzp;     /* BZip2 Resource Pointer */
+	php_stream   *stream;
+	const char   *errstr;  /* Error string */
+	int           errnum;  /* Error number */
+	struct php_bz2_stream_data_t *self;
+	
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &bzp) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	php_stream_from_zval(stream, bzp);
+
+	if (!php_stream_is(stream, PHP_STREAM_IS_BZIP2)) {
+		RETURN_FALSE;
+	}
+
+	self = (struct php_bz2_stream_data_t *) stream->abstract;
+	
+	/* Fetch the error information */
+	errstr = BZ2_bzerror(self->bz_file, &errnum);
+	
+	/* Determine what to return */
+	switch (opt) {
+		case PHP_BZ_ERRNO:
+			RETURN_LONG(errnum);
+			break;
+		case PHP_BZ_ERRSTR:
+			RETURN_STRING((char*)errstr, 1);
+			break;
+		case PHP_BZ_ERRBOTH:
+			array_init(return_value);
+		
+			add_assoc_long  (return_value, "errno",  errnum);
+			add_assoc_string(return_value, "errstr", (char*)errstr, 1);
+			break;
+	}
+}
+/* }}} */
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: fdm=marker
+ * vim: noet sw=4 ts=4
+ */
@@ -0,0 +1,108 @@
+# Microsoft Developer Studio Project File - Name="bz2" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=bz2 - Win32 Debug_TS
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "bz2.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "bz2.mak" CFG="bz2 - Win32 Debug_TS"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "bz2 - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "bz2 - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "bz2 - Win32 Release_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release_TS"
+# PROP BASE Intermediate_Dir "Release_TS"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_TS"
+# PROP Intermediate_Dir "Release_TS"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BZ2_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\..\php_build\includes" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_BZ2" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_BZ2=1 /D "PHP_BZ2_EXPORTS" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 /nologo /dll /machine:I386
+# ADD LINK32 libbz2.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 php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_bz2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
+
+!ELSEIF  "$(CFG)" == "bz2 - Win32 Debug_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug_TS"
+# PROP BASE Intermediate_Dir "Debug_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_TS"
+# PROP Intermediate_Dir "Debug_TS"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BZ2_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\..\php_build\includes" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_BZ2" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_BZ2=1 /D "PHP_BZ2_EXPORTS" /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 php4ts_debug.lib libbz2.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 /debug /machine:I386 /out:"..\..\Debug_TS/php_bz2.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "bz2 - Win32 Release_TS"
+# Name "bz2 - Win32 Debug_TS"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\bz2.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\php_bz2.h
+# End Source File
+# End Group
+# End Target
+# End Project
@@ -0,0 +1,40 @@
+dnl
+dnl $Id$
+dnl
+
+PHP_ARG_WITH(bz2, for BZip2 support,
+[  --with-bz2[=DIR]        Include BZip2 support])
+
+if test "$PHP_BZ2" != "no"; then
+  if test -r $PHP_BZ2/include/bzlib.h; then
+    BZIP_DIR=$PHP_BZ2
+  else
+    AC_MSG_CHECKING(for BZip2 in default path)
+    for i in /usr/local /usr; do
+      if test -r $i/include/bzlib.h; then
+        BZIP_DIR=$i
+        AC_MSG_RESULT(found in $i)
+        break
+      fi
+    done
+  fi
+
+  if test -z "$BZIP_DIR"; then
+    AC_MSG_RESULT(not found)
+    AC_MSG_ERROR(Please reinstall the BZip2 distribution)
+  fi
+
+  PHP_CHECK_LIBRARY(bz2, BZ2_bzerror, 
+  [
+    PHP_ADD_INCLUDE($BZIP_DIR/include)
+    PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD)
+    AC_DEFINE(HAVE_BZ2,1,[ ])
+  ], [
+    AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0)
+  ], [
+    -L$BZIP_DIR/lib
+  ])
+
+  PHP_NEW_EXTENSION(bz2, bz2.c, $ext_shared)
+  PHP_SUBST(BZ2_SHARED_LIBADD)
+fi
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!-- do not use the "Type" attribute here, that one is only for
+     generated package.xml files -->
+<package>
+    <name>bz2</name>
+    <summary>A Bzip2 management extension</summary>
+    <description>
+Bz2 is an extension to create and parse bzip2 compressed data.
+	</description>
+    <license>PHP License</license>
+    <maintainers>
+        <maintainer>
+        <user>sterling</user>
+        <name>Sterling Hughes</name>
+        <email>sterling@php.net</email>
+        </maintainer>
+    </maintainers>
+     <release>
+        <version>1.0</version>
+        <date>2003-05-17</date>
+        <state>stable</state>
+        <notes>
+			Initial Release in PECL
+		</notes>
+    </release>
+    <filelist>
+        <dir role="src" name="/">
+            <file role="doc">CREDITS</file>
+            <file role="src">config.m4</file>
+            <file role="doc">php_bz2.h</file>
+            <file role="src">bz2.c</file>
+            <file role="src">bz2.dsp</file>
+         </dir>
+     </filelist> 
+</package>
@@ -0,0 +1,72 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 4                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2003 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author: Sterling Hughes <sterling@php.net>                           |
+   +----------------------------------------------------------------------+
+ */
+
+#ifndef PHP_BZ2_H
+#define PHP_BZ2_H
+
+#if HAVE_BZ2
+
+extern zend_module_entry bz2_module_entry;
+#define phpext_bz2_ptr &bz2_module_entry
+
+/* Bzip2 includes */
+#include <bzlib.h>
+
+PHP_MINIT_FUNCTION(bz2);
+PHP_MSHUTDOWN_FUNCTION(bz2);
+PHP_MINFO_FUNCTION(bz2);
+PHP_FUNCTION(bzopen);
+PHP_FUNCTION(bzread);
+PHP_FUNCTION(bzerrno);
+PHP_FUNCTION(bzerrstr);
+PHP_FUNCTION(bzerror);
+PHP_FUNCTION(bzcompress);
+PHP_FUNCTION(bzdecompress);
+
+#else
+#define phpext_bz2_ptr NULL
+#endif
+
+#ifdef PHP_WIN32
+# ifdef PHP_BZ2_EXPORTS
+# define PHP_BZ2_API __declspec(dllexport)
+# else
+# define PHP_BZ2_API __declspec(dllimport)
+# endif
+#else
+# define PHP_BZ2_API
+#endif
+
+PHP_BZ2_API PHPAPI php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC);
+PHP_BZ2_API PHPAPI php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, char *mode, php_stream *innerstream STREAMS_DC TSRMLS_DC);
+
+#define php_stream_bz2open_from_BZFILE(bz, mode, innerstream)	_php_stream_bz2open_from_BZFILE((bz), (mode), (innerstream) STREAMS_CC TSRMLS_CC)
+#define php_stream_bz2open(wrapper, path, mode, options, opened_path)	_php_stream_bz2open((wrapper), (path), (mode), (options), (opened_path), NULL STREAMS_CC TSRMLS_CC)
+
+php_stream_ops php_stream_bz2io_ops;
+#define PHP_STREAM_IS_BZIP2	&php_stream_bz2io_ops
+
+#endif
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
@@ -0,0 +1,25 @@
+--TEST--
+BZ2 with files
+--SKIPIF--
+<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--POST--
+--GET--
+--FILE--
+<?php // $Id$
+
+error_reporting(E_ALL);
+
+$filename = "testfile.bz2";
+$str = "This is a test string.\n";
+$bz = bzopen($filename, "w");
+bzwrite($bz, $str);
+bzclose($bz);
+
+$bz = bzopen($filename, "r");
+print bzread($bz, 10);
+print bzread($bz);
+bzclose($bz);
+unlink($filename);
+
+--EXPECT--
+This is a test string.
@@ -0,0 +1,28 @@
+--TEST--
+BZ2 with strings
+--SKIPIF--
+<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--POST--
+--GET--
+--FILE--
+<?php // $Id$
+
+error_reporting(E_ALL);
+
+# This FAILS
+$blaat = <<<HEREDOC
+This is some random data
+HEREDOC;
+
+# This Works: (so, is heredoc related)
+#$blaat= 'This is some random data';
+
+$blaat2 = bzdecompress(bzcompress($blaat));
+
+$tests = <<<TESTS
+ \$blaat === \$blaat2
+TESTS;
+ include(dirname(__FILE__) . '/../../../tests/quicktester.inc');
+
+--EXPECT--
+OK
@@ -161,7 +161,7 @@ PHP_FUNCTION(cal_info)
 	}
 	convert_to_long_ex(cal);
 	if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) {
-		zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal));
+		zend_error(E_WARNING, "%s(): invalid calendar ID %ld", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal));
 		RETURN_FALSE;
 	}

@@ -203,7 +203,7 @@ PHP_FUNCTION(cal_days_in_month)
 	convert_to_long_ex(year);

 	if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) {
-		zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal));
+		zend_error(E_WARNING, "%s(): invalid calendar ID %ld", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal));
 		RETURN_FALSE;
 	}

@@ -239,7 +239,7 @@ PHP_FUNCTION(cal_to_jd)
 	convert_to_long_ex(year);

 	if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) {
-		zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal));
+		zend_error(E_WARNING, "%s(): invalid calendar ID %ld", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal));
 		RETURN_FALSE;
 	}

@@ -265,7 +265,7 @@ PHP_FUNCTION(cal_from_jd)
 	convert_to_long_ex(cal);

 	if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) {
-		zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal));
+		zend_error(E_WARNING, "%s(): invalid calendar ID %ld", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal));
 		RETURN_FALSE;
 	}
 	calendar = &cal_conversion_table[Z_LVAL_PP(cal)];
@@ -260,6 +260,10 @@
 *
 **************************************************************************/

+#if defined(PHP_WIN32) && _MSC_VER >= 1200
+#pragma setlocale("english")
+#endif
+
 #include "sdncal.h"

 #define HALAKIM_PER_HOUR 1080
@@ -55,7 +55,7 @@
 #ifdef PHP_WIN32

 #define _WIN32_DCOM
-
+#define COBJMACROS
 #include <iostream.h>
 #include <math.h>
 #include <ocidl.h>
@@ -122,24 +122,7 @@ PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DIS
 	*ErrString = NULL;
 	/* @todo use DispInvoke here ? */
 	if (C_ISREFD(obj)) {
-		if (C_HASTLIB(obj)) {
-			hr = C_TYPEINFO_VT(obj)->Invoke(C_TYPEINFO(obj), C_DISPATCH(obj), dispIdMember, wFlags, pDispParams, pVarResult, &ExceptInfo, &ArgErr);
-			if (FAILED(hr)) {
-				hr = C_DISPATCH_VT(obj)->Invoke(C_DISPATCH(obj), dispIdMember, &IID_NULL, LOCALE_SYSTEM_DEFAULT, wFlags, pDispParams, pVarResult, &ExceptInfo, &ArgErr);
-				if (SUCCEEDED(hr)) {
-					/*
-					 * ITypLib doesn't work
-					 * Release ITypeLib and fall back to IDispatch
-					 */
-
-					C_TYPEINFO_VT(obj)->Release(C_TYPEINFO(obj));
-					C_HASTLIB(obj) = FALSE;
-					C_TYPEINFO(obj) = NULL;
-				}
-			}
-		} else {
-			hr = C_DISPATCH_VT(obj)->Invoke(C_DISPATCH(obj), dispIdMember, &IID_NULL, LOCALE_SYSTEM_DEFAULT, wFlags, pDispParams, pVarResult, &ExceptInfo, &ArgErr);
-		}
+		hr = C_DISPATCH_VT(obj)->Invoke(C_DISPATCH(obj), dispIdMember, &IID_NULL, LOCALE_SYSTEM_DEFAULT, wFlags, pDispParams, pVarResult, &ExceptInfo, &ArgErr);

 		if (FAILED(hr)) {
 			switch (hr) {
@@ -1627,6 +1610,11 @@ static void do_COM_propput(pval *return_value, comval *obj, pval *arg_property,

 		FREE_VARIANT(var_result);

+		/* free the string we allocated; invoked object made its own copy */
+		if (V_VT(new_value) == VT_BSTR) {
+			VariantClear(new_value);
+		}
+		
 		efree(new_value);
 		efree(propname);

@@ -1659,7 +1647,11 @@ static void do_COM_propput(pval *return_value, comval *obj, pval *arg_property,
 		FREE_VARIANT(var_result);
 	}

-	efree(new_value); // FREE_VARIANT does a VariantClear() which is not desired here !
+	/* free the string we allocated; invoked object made its own copy */
+	if (V_VT(new_value) == VT_BSTR) {
+		VariantClear(new_value);
+	}
+	efree(new_value);
 	efree(propname);
 }

@@ -1857,7 +1849,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer

 			obj = obj_prop;
 			php_COM_set(obj, &V_DISPATCH(var_result), TRUE TSRMLS_CC);
-			VariantInit(var_result);	// to protect C_DISPATCH(obj) from being freed when var_result is destructed
+			VariantInit(var_result);	/* to protect C_DISPATCH(obj) from being freed when var_result is destructed */
 		} else {
 			php_variant_to_pval(var_result, &retval, codepage TSRMLS_CC);

@@ -1942,7 +1934,7 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
 			return FAILURE;
 		}

-		VariantInit(var_result);	// to protect C_DISPATCH(obj) from being freed when var_result is destructed
+		VariantInit(var_result);	/* to protect C_DISPATCH(obj) from being freed when var_result is destructed */
 		zval_dtor(&overloaded_property->element);
 	}
 	FREE_VARIANT(var_result);
@@ -2215,7 +2207,6 @@ static ITypeLib *php_COM_find_typelib(char *search_string, int mode TSRMLS_DC)

 PHPAPI int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
 {
-	ITypeComp *TypeComp;
 	int i;
 	int interfaces;

@@ -2223,40 +2214,33 @@ PHPAPI int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
 		return FAILURE;
 	}

-	interfaces = TypeLib->lpVtbl->GetTypeInfoCount(TypeLib);
+	interfaces = ITypeLib_GetTypeInfoCount(TypeLib);

-	TypeLib->lpVtbl->GetTypeComp(TypeLib, &TypeComp);
 	for (i=0; i<interfaces; i++) {
 		TYPEKIND pTKind;

-		TypeLib->lpVtbl->GetTypeInfoType(TypeLib, i, &pTKind);
-		if (pTKind==TKIND_ENUM) {
+		ITypeLib_GetTypeInfoType(TypeLib, i, &pTKind);
+		if (pTKind == TKIND_ENUM) {
 			ITypeInfo *TypeInfo;
 			VARDESC *pVarDesc;
 			UINT NameCount;
 			int j;
-#if 0
-			BSTR bstr_EnumId;
-			char *EnumId;

-			TypeLib->lpVtbl->GetDocumentation(TypeLib, i, &bstr_EnumId, NULL, NULL, NULL);
-			EnumId = php_OLECHAR_to_char(bstr_EnumId, NULL, codepage);
-			printf("Enumeration %d - %s:\n", i, EnumId);
-			efree(EnumId);
-#endif
+			ITypeLib_GetTypeInfo(TypeLib, i, &TypeInfo);

-			TypeLib->lpVtbl->GetTypeInfo(TypeLib, i, &TypeInfo);
-
-			j=0;
-			while (SUCCEEDED(TypeInfo->lpVtbl->GetVarDesc(TypeInfo, j, &pVarDesc))) {
+			for (j = 0; ; j++) {
 				BSTR bstr_ids;
 				zend_constant c;
 				zval exists, results, value;
 				char *const_name;

-				TypeInfo->lpVtbl->GetNames(TypeInfo, pVarDesc->memid, &bstr_ids, 1, &NameCount);
-				if (NameCount!=1) {
-					j++;
+				if (FAILED(ITypeInfo_GetVarDesc(TypeInfo, j, &pVarDesc))) {
+					break;
+				}
+				
+				ITypeInfo_GetNames(TypeInfo, pVarDesc->memid, &bstr_ids, 1, &NameCount);
+				if (NameCount != 1) {
+					ITypeInfo_ReleaseVarDesc(TypeInfo, pVarDesc);
 					continue;
 				}
 				const_name = php_OLECHAR_to_char(bstr_ids, &c.name_len, codepage TSRMLS_CC);
@@ -2273,7 +2257,7 @@ PHPAPI int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
 						php_error(E_WARNING, "%s(): Type library value %s is already defined and has a different value", get_active_function_name(TSRMLS_C), c.name);
 					}
 					free(c.name);
-					j++;
+					ITypeInfo_ReleaseVarDesc(TypeInfo, pVarDesc);
 					continue;
 				}

@@ -2287,10 +2271,9 @@ PHPAPI int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)

 					zend_register_constant(&c TSRMLS_CC);
 				}
-
-				j++;
+				ITypeInfo_ReleaseVarDesc(TypeInfo, pVarDesc);
 			}
-			TypeInfo->lpVtbl->Release(TypeInfo);
+			ITypeInfo_Release(TypeInfo);
 		}
 	}

@@ -181,7 +181,7 @@ static pval php_VARIANT_get_property_handler(zend_property_reference *property_r

 			case OE_IS_OBJECT:
 				if (!strcmp(Z_STRVAL(overloaded_property->element), "value")) {
-					// var_arg can't be an idispatch, so we don't care for the implicit AddRef() call here
+					/* var_arg can't be an idispatch, so we don't care for the implicit AddRef() call here */
 					php_variant_to_pval(var_arg, &result, codepage TSRMLS_CC);
 				} else if (!strcmp(Z_STRVAL(overloaded_property->element), "type")) {
 					ZVAL_LONG(&result, V_VT(var_arg))
@@ -119,7 +119,7 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, VARTYPE ty
 			var_arg = V_VARIANTREF(var_arg);		/* put the array in that VARIANT */
 		}
 		if (!type) {
-			// if no type is given we take the variant type
+			/* if no type is given we take the variant type */
 			type = VT_VARIANT;
 		}

@@ -280,7 +280,7 @@ static HRESULT STDMETHODCALLTYPE disp_invokeex(
 					ZVAL_NULL(zarg);
 				}
 			} else {
-				// arg can't be an idispatch, so we don't care for the implicit AddRef() call here
+				/* arg can't be an idispatch, so we don't care for the implicit AddRef() call here */
 				if (FAILURE == php_variant_to_pval(arg, zarg, codepage TSRMLS_CC)) {
 					trace("failed to convert arg %d to zval\n", i);
 					ZVAL_NULL(zarg);
@@ -58,7 +58,7 @@ ZEND_BEGIN_MODULE_GLOBALS(com)
 	int nothing;
 ZEND_END_MODULE_GLOBALS(com)

-PHPAPI ZEND_EXTERN_MODULE_GLOBALS(com);
+PHPAPI ZEND_EXTERN_MODULE_GLOBALS(com)
 	
 #ifdef ZTS
 #define COMG(v)	TSRMG(com_globals_id, zend_com_globals *, v)
@@ -1,91 +1,82 @@
 dnl $Id$

-AC_DEFUN(CPDF_TEMP_SUBST,[
-  old_LIBS=$LIBS
-  $1
-  LIBS=$old_LIBS
-])
-
 AC_DEFUN(CPDF_JPEG_TEST,[
-  CPDF_TEMP_SUBST([
-    AC_ARG_WITH(jpeg-dir,
-    [  --with-jpeg-dir[=DIR]     CPDF: Set the path to libjpeg install prefix.],[
-      for i in $withval /usr/local /usr; do
-        if test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a; then
-          CPDF_JPEG_DIR=$i
-          break;
-        fi
-      done
-      if test -z "$CPDF_JPEG_DIR"; then
-        AC_MSG_CHECKING([for libjpeg (needed by cpdflib 2.x)])
-        AC_MSG_ERROR([libjpeg.(a|so) not found.])
+  AC_ARG_WITH(jpeg-dir,
+  [  --with-jpeg-dir[=DIR]     CPDF: Set the path to libjpeg install prefix.],[
+    for i in $withval /usr/local /usr; do
+      if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then
+        CPDF_JPEG_DIR=$i
+        break;
      fi
-      LIBS="$LIBS -L$CPDF_JPEG_DIR/lib"
-    ],) 
-    AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_ERROR(Problem with libjpeg.(a|so). Please check config.log for more information.)],)
-    if test -z $CPDF_JPEG_DIR; then
-      PHP_ADD_LIBRARY(jpeg)
-    else
-      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib)
+    done
+    if test -z "$CPDF_JPEG_DIR"; then
+      AC_MSG_CHECKING([for libjpeg (needed by cpdflib 2.x)])
+      AC_MSG_ERROR([libjpeg.(a|so) not found.])
    fi
-  ])
+    PHP_CHECK_LIBRARY(jpeg, jpeg_read_header, [
+      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib, CPDF_SHARED_LIBADD)
+    ] ,[
+      AC_MSG_ERROR([CPDF: Problem with libjpeg.(a|so). Please check config.log for more information.])
+    ], [
+      -L$CPDF_JPEG_DIR/lib
+    ])
+  ],)
 ])

 AC_DEFUN(CPDF_TIFF_TEST,[
-  CPDF_TEMP_SUBST([
-    AC_ARG_WITH(tiff-dir,
-    [  --with-tiff-dir[=DIR]     CPDF: Set the path to libtiff install prefix.],[
-      for i in $withval /usr/local /usr; do
-        if test -f $i/lib/libtiff.$SHLIB_SUFFIX_NAME -o -f $i/lib/libtiff.a; then
-          CPDF_TIFF_DIR=$i
-          break;
-        fi
-      done
-      if test -z "$CPDF_TIFF_DIR"; then
-        AC_MSG_CHECKING([for libtiff (needed by cpdflib 2.x)])
-        AC_MSG_ERROR([libtiff.(a|so) not found.])
+  AC_ARG_WITH(tiff-dir,
+  [  --with-tiff-dir[=DIR]     CPDF: Set the path to libtiff install prefix.],[
+    for i in $withval /usr/local /usr; do
+      if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then
+        CPDF_TIFF_DIR=$i
+        break;
      fi
-      LIBS="$LIBS -L$CPDF_TIFF_DIR/lib"
-    ],) 
-    AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_ERROR(Problem with libtiff.(a|so). Please check config.log for more information.)],)
-    if test -z $CPDF_TIFF_DIR; then
-      PHP_ADD_LIBRARY(tiff)
-    else
-      PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib)
+    done
+    if test -z "$CPDF_TIFF_DIR"; then
+      AC_MSG_CHECKING([for libtiff (needed by cpdflib 2.x)])
+      AC_MSG_ERROR([libtiff.(a|so) not found.])
    fi
-  ])
+    PHP_CHECK_LIBRARY(tiff, TIFFOpen, [
+      PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib, CPDF_SHARED_LIBADD)
+    ] ,[
+      AC_MSG_ERROR([CPDF: Problem with libtiff.(a|so). Please check config.log for more information.])
+    ], [
+      -L$CPDF_TIFF_DIR/lib
+    ])
+  ],)
 ])

 AC_MSG_CHECKING(for cpdflib support)
 AC_ARG_WITH(cpdflib,
 [  --with-cpdflib[=DIR]    Include cpdflib support (requires cpdflib >= 2).],
 [
-  if test "$withval" = "no"; then
-    AC_MSG_RESULT(no)
-  else
-    AC_MSG_RESULT(yes)
-    PHP_NEW_EXTENSION(cpdf, cpdf.c)
+  PHP_WITH_SHARED
+  if test "$withval" != "no"; then
+    cpdf_withval=$withval
+    PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared,, \\$(GDLIB_CFLAGS))
+    PHP_SUBST(CPDF_SHARED_LIBADD)
    CPDF_JPEG_TEST
    CPDF_TIFF_TEST
-    for i in $withval /usr /usr/local; do
-      if test -f $i/include/cpdflib.h; then
+
+    for i in $cpdf_withval /usr/local /usr; do
+      if test -f "$i/include/cpdflib.h"; then
        CPDFLIB_INCLUDE=$i/include
        AC_MSG_CHECKING(for cpdflib.h)
        AC_MSG_RESULT([in $i/include])
-        CPDF_TEMP_SUBST([
-          LIBS="$LIBS -L$i/lib"
-          AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
-            [AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])])
-        ])
-        if test "$i" != "/usr" -a "$i" != "/usr/local"; then
-          PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib)
+
+        PHP_CHECK_LIBRARY(cpdf, cpdf_open, [
          PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
-        else
-          PHP_ADD_LIBRARY(cpdf)
-        fi
+          PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD)
+          AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
+        ], [
+          AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
+        ], [
+          -L$i/lib $CPDF_SHARED_LIBADD
+        ])
        break
      fi
    done  
+
    if test -z "$CPDFLIB_INCLUDE"; then
      AC_MSG_CHECKING(for cpdflib.h)
      AC_MSG_ERROR([not found])
@@ -222,7 +222,7 @@ PHP_MSHUTDOWN_FUNCTION(cpdf)
 	return SUCCESS;
 }

-/* {{{ proto void cpdf_global_set_document_limits(int maxPages, int maxFonts, int maxImages, int maxAnnots, int maxObjects)
+/* {{{ proto bool cpdf_global_set_document_limits(int maxPages, int maxFonts, int maxImages, int maxAnnots, int maxObjects)
   Sets document settings for all documents */
 PHP_FUNCTION(cpdf_global_set_document_limits)
 {
@@ -356,7 +356,7 @@ PHP_FUNCTION(cpdf_set_keywords)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_viewer_preferences(int pdfdoc, array preferences)
+/* {{{ proto bool cpdf_set_viewer_preferences(int pdfdoc, array preferences)
   How to show the document in the viewer */
 PHP_FUNCTION(cpdf_set_viewer_preferences)
 {
@@ -475,6 +475,11 @@ PHP_FUNCTION(cpdf_open)
 		if(strcmp(Z_STRVAL_P(arg2), "-") == 0)
 			php_error(E_WARNING, "%s(): Writing to stdout as described in the ClibPDF manual is not possible if php is used as an Apache module. Write to a memory stream and use cpdf_output_buffer() instead.", get_active_function_name(TSRMLS_C));
 #endif
+		if (php_check_open_basedir(Z_STRVAL_P(arg2) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_P(arg2), "rb+", CHECKUID_CHECK_MODE_PARAM))) {
+			cpdf_close(cpdf);
+			RETURN_FALSE;
+		}
+
 		cpdf_setOutputFilename(cpdf, Z_STRVAL_P(arg2));
 	}
 	cpdf_init(cpdf);
@@ -510,7 +515,7 @@ PHP_FUNCTION(cpdf_close)
 /* }}} */

 #define BUFFERLEN 40
-/* {{{ proto void cpdf_page_init(int pdfdoc, int pagenr, int orientation, int height, int width [, float unit])
+/* {{{ proto bool cpdf_page_init(int pdfdoc, int pagenr, int orientation, int height, int width [, float unit])
   Starts page */
 PHP_FUNCTION(cpdf_page_init)
 {
@@ -555,7 +560,7 @@ PHP_FUNCTION(cpdf_page_init)
 /* }}} */
 #undef BUFFERLEN

-/* {{{ proto void cpdf_finalize_page(int pdfdoc, int pagenr)
+/* {{{ proto bool cpdf_finalize_page(int pdfdoc, int pagenr)
   Ends the page to save memory */
 PHP_FUNCTION(cpdf_finalize_page)
 {
@@ -583,7 +588,7 @@ PHP_FUNCTION(cpdf_finalize_page)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_current_page(int pdfdoc, int pagenr)
+/* {{{ proto bool cpdf_set_current_page(int pdfdoc, int pagenr)
   Sets page for output */
 PHP_FUNCTION(cpdf_set_current_page)
 {
@@ -611,7 +616,7 @@ PHP_FUNCTION(cpdf_set_current_page)
 }
 /* }}} */

-/* {{{ proto void cpdf_begin_text(int pdfdoc)
+/* {{{ proto bool cpdf_begin_text(int pdfdoc)
   Starts text section */
 PHP_FUNCTION(cpdf_begin_text)
 {
@@ -637,7 +642,7 @@ PHP_FUNCTION(cpdf_begin_text)
 }
 /* }}} */

-/* {{{ proto void cpdf_end_text(int pdfdoc)
+/* {{{ proto bool cpdf_end_text(int pdfdoc)
   Ends text section */
 PHP_FUNCTION(cpdf_end_text)
 {
@@ -663,7 +668,7 @@ PHP_FUNCTION(cpdf_end_text)
 }
 /* }}} */

-/* {{{ proto void cpdf_show(int pdfdoc, string text)
+/* {{{ proto bool cpdf_show(int pdfdoc, string text)
   Output text at current position */
 PHP_FUNCTION(cpdf_show)
 {
@@ -690,7 +695,7 @@ PHP_FUNCTION(cpdf_show)
 }
 /* }}} */

-/* {{{ proto void cpdf_show_xy(int pdfdoc, string text, float x-koor, float y-koor [, int mode])
+/* {{{ proto bool cpdf_show_xy(int pdfdoc, string text, float x-koor, float y-koor [, int mode])
   Output text at position */
 PHP_FUNCTION(cpdf_show_xy)
 {
@@ -728,7 +733,7 @@ PHP_FUNCTION(cpdf_show_xy)
 }
 /* }}} */

-/* {{{ proto void cpdf_continue_text(int pdfdoc, string text)
+/* {{{ proto bool cpdf_continue_text(int pdfdoc, string text)
   Outputs text in next line */
 PHP_FUNCTION(cpdf_continue_text)
 {
@@ -755,7 +760,7 @@ PHP_FUNCTION(cpdf_continue_text)
 }
 /* }}} */

-/* {{{ proto void cpdf_text(int pdfdoc, string text [, float x-koor, float y-koor [, int mode [, float orientation [, int alignmode]]]])
+/* {{{ proto bool cpdf_text(int pdfdoc, string text [, float x-koor, float y-koor [, int mode [, float orientation [, int alignmode]]]])
   Outputs text */
 PHP_FUNCTION(cpdf_text)
 {
@@ -845,7 +850,7 @@ PHP_FUNCTION(cpdf_text)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_font(int pdfdoc, string font, float size, string encoding)
+/* {{{ proto bool cpdf_set_font(int pdfdoc, string font, float size, string encoding)
   Selects the current font face, size and encoding */
 PHP_FUNCTION(cpdf_set_font)
 {
@@ -879,7 +884,7 @@ PHP_FUNCTION(cpdf_set_font)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_font_directories(int pdfdoc, string pfmdir, string pfbdir)
+/* {{{ proto bool cpdf_set_font_directories(int pdfdoc, string pfmdir, string pfbdir)
   Sets directories to search when using external fonts */
 PHP_FUNCTION(cpdf_set_font_directories)
 {
@@ -907,7 +912,7 @@ PHP_FUNCTION(cpdf_set_font_directories)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_font_map_file(int pdfdoc, string filename)
+/* {{{ proto bool cpdf_set_font_map_file(int pdfdoc, string filename)
   Sets fontname to filename translation map when using external fonts */
 PHP_FUNCTION(cpdf_set_font_map_file)
 {
@@ -928,13 +933,17 @@ PHP_FUNCTION(cpdf_set_font_map_file)
 		RETURN_FALSE;
 	}

+	if (php_check_open_basedir(Z_STRVAL_P(arg2) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_P(arg2), "rb+", CHECKUID_CHECK_MODE_PARAM))) {
+		RETURN_FALSE;
+	}
+
 	cpdf_setFontMapFile(pdf, Z_STRVAL_P(arg2));

 	RETURN_TRUE;
 }
 /* }}} */

-/* {{{ proto void cpdf_set_leading(int pdfdoc, float distance)
+/* {{{ proto bool cpdf_set_leading(int pdfdoc, float distance)
   Sets distance between text lines */
 PHP_FUNCTION(cpdf_set_leading)
 {
@@ -961,7 +970,7 @@ PHP_FUNCTION(cpdf_set_leading)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_text_rendering(int pdfdoc, int rendermode)
+/* {{{ proto bool cpdf_set_text_rendering(int pdfdoc, int rendermode)
   Determines how text is rendered */
 PHP_FUNCTION(cpdf_set_text_rendering)
 {
@@ -988,7 +997,7 @@ PHP_FUNCTION(cpdf_set_text_rendering)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_horiz_scaling(int pdfdoc, float scale)
+/* {{{ proto bool cpdf_set_horiz_scaling(int pdfdoc, float scale)
   Sets horizontal scaling of text */
 PHP_FUNCTION(cpdf_set_horiz_scaling)
 {
@@ -1015,7 +1024,7 @@ PHP_FUNCTION(cpdf_set_horiz_scaling)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_text_rise(int pdfdoc, float value)
+/* {{{ proto bool cpdf_set_text_rise(int pdfdoc, float value)
   Sets the text rise */
 PHP_FUNCTION(cpdf_set_text_rise)
 {
@@ -1042,7 +1051,7 @@ PHP_FUNCTION(cpdf_set_text_rise)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_text_matrix(int pdfdoc, arry matrix)
+/* {{{ proto bool cpdf_set_text_matrix(int pdfdoc, arry matrix)
   Sets the text matrix */
 PHP_FUNCTION(cpdf_set_text_matrix)
 {
@@ -1095,7 +1104,7 @@ PHP_FUNCTION(cpdf_set_text_matrix)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_text_pos(int pdfdoc, float x, float y [, int mode])
+/* {{{ proto bool cpdf_set_text_pos(int pdfdoc, float x, float y [, int mode])
   Sets the position of text for the next cpdf_show call */
 PHP_FUNCTION(cpdf_set_text_pos)
 {
@@ -1132,7 +1141,7 @@ PHP_FUNCTION(cpdf_set_text_pos)
 }
 /* }}} */

-/* {{{ proto void cpdf_rotate_text(int pdfdoc, float angle)
+/* {{{ proto bool cpdf_rotate_text(int pdfdoc, float angle)
   Sets text rotation angle */
 PHP_FUNCTION(cpdf_rotate_text)
 {
@@ -1159,7 +1168,7 @@ PHP_FUNCTION(cpdf_rotate_text)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_char_spacing(int pdfdoc, float space)
+/* {{{ proto bool cpdf_set_char_spacing(int pdfdoc, float space)
   Sets character spacing */
 PHP_FUNCTION(cpdf_set_char_spacing)
 {
@@ -1186,7 +1195,7 @@ PHP_FUNCTION(cpdf_set_char_spacing)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_word_spacing(int pdfdoc, float space)
+/* {{{ proto bool cpdf_set_word_spacing(int pdfdoc, float space)
   Sets spacing between words */
 PHP_FUNCTION(cpdf_set_word_spacing)
 {
@@ -1241,7 +1250,7 @@ PHP_FUNCTION(cpdf_stringwidth)
 }
 /* }}} */

-/* {{{ proto void cpdf_save(int pdfdoc)
+/* {{{ proto bool cpdf_save(int pdfdoc)
   Saves current enviroment */
 PHP_FUNCTION(cpdf_save)
 {
@@ -1267,7 +1276,7 @@ PHP_FUNCTION(cpdf_save)
 }
 /* }}} */

-/* {{{ proto void cpdf_restore(int pdfdoc)
+/* {{{ proto bool cpdf_restore(int pdfdoc)
   Restores formerly saved enviroment */
 PHP_FUNCTION(cpdf_restore)
 {
@@ -1293,7 +1302,7 @@ PHP_FUNCTION(cpdf_restore)
 }
 /* }}} */

-/* {{{ proto void cpdf_translate(int pdfdoc, float x, float y)
+/* {{{ proto bool cpdf_translate(int pdfdoc, float x, float y)
   Sets origin of coordinate system */
 PHP_FUNCTION(cpdf_translate)
 {
@@ -1321,7 +1330,7 @@ PHP_FUNCTION(cpdf_translate)
 }
 /* }}} */

-/* {{{ proto void cpdf_scale(int pdfdoc, float x_scale, float y_scale)
+/* {{{ proto bool cpdf_scale(int pdfdoc, float x_scale, float y_scale)
   Sets scaling */
 PHP_FUNCTION(cpdf_scale)
 {
@@ -1349,7 +1358,7 @@ PHP_FUNCTION(cpdf_scale)
 }
 /* }}} */

-/* {{{ proto void cpdf_rotate(int pdfdoc, float angle)
+/* {{{ proto bool cpdf_rotate(int pdfdoc, float angle)
   Sets rotation */
 PHP_FUNCTION(cpdf_rotate)
 {
@@ -1376,7 +1385,7 @@ PHP_FUNCTION(cpdf_rotate)
 }
 /* }}} */

-/* {{{ proto void cpdf_setflat(int pdfdoc, float value)
+/* {{{ proto bool cpdf_setflat(int pdfdoc, float value)
   Sets flatness */
 PHP_FUNCTION(cpdf_setflat)
 {
@@ -1408,7 +1417,7 @@ PHP_FUNCTION(cpdf_setflat)
 }
 /* }}} */

-/* {{{ proto void cpdf_setlinejoin(int pdfdoc, int value)
+/* {{{ proto bool cpdf_setlinejoin(int pdfdoc, int value)
   Sets linejoin parameter */
 PHP_FUNCTION(cpdf_setlinejoin)
 {
@@ -1440,7 +1449,7 @@ PHP_FUNCTION(cpdf_setlinejoin)
 }
 /* }}} */

-/* {{{ proto void cpdf_setlinecap(int pdfdoc, int value)
+/* {{{ proto bool cpdf_setlinecap(int pdfdoc, int value)
   Sets linecap parameter */
 PHP_FUNCTION(cpdf_setlinecap)
 {
@@ -1472,7 +1481,7 @@ PHP_FUNCTION(cpdf_setlinecap)
 }
 /* }}} */

-/* {{{ proto void cpdf_setmiterlimit(int pdfdoc, float value)
+/* {{{ proto bool cpdf_setmiterlimit(int pdfdoc, float value)
   Sets miter limit */
 PHP_FUNCTION(cpdf_setmiterlimit)
 {
@@ -1504,7 +1513,7 @@ PHP_FUNCTION(cpdf_setmiterlimit)
 }
 /* }}} */

-/* {{{ proto void cpdf_setlinewidth(int pdfdoc, float width)
+/* {{{ proto bool cpdf_setlinewidth(int pdfdoc, float width)
   Sets line width */
 PHP_FUNCTION(cpdf_setlinewidth)
 {
@@ -1532,7 +1541,7 @@ PHP_FUNCTION(cpdf_setlinewidth)
 /* }}} */

 #define BUFFERLEN 20
-/* {{{ proto void cpdf_setdash(int pdfdoc, long white, long black)
+/* {{{ proto bool cpdf_setdash(int pdfdoc, long white, long black)
   Sets dash pattern */
 PHP_FUNCTION(cpdf_setdash)
 {
@@ -1554,7 +1563,9 @@ PHP_FUNCTION(cpdf_setdash)
 		php_error(E_WARNING, "%s(): Unable to find identifier %d", get_active_function_name(TSRMLS_C), id);
 		RETURN_FALSE;
 	}
-
+	if (!pdf->currentMemStream) {
+		RETURN_FALSE;
+	}
 	snprintf(buffer, BUFFERLEN, "[%d %d] 0", (int) Z_LVAL_P(arg2), (int) Z_LVAL_P(arg3));
 	cpdf_setdash(pdf, buffer);

@@ -1563,7 +1574,7 @@ PHP_FUNCTION(cpdf_setdash)
 /* }}} */
 #undef BUFFERLEN

-/* {{{ proto void cpdf_moveto(int pdfdoc, float x, float y [, int mode])
+/* {{{ proto bool cpdf_moveto(int pdfdoc, float x, float y [, int mode])
   Sets current point */
 PHP_FUNCTION(cpdf_moveto)
 {
@@ -1600,7 +1611,7 @@ PHP_FUNCTION(cpdf_moveto)
 }
 /* }}} */

-/* {{{ proto void cpdf_rmoveto(int pdfdoc, float x, float y [, int mode])
+/* {{{ proto bool cpdf_rmoveto(int pdfdoc, float x, float y [, int mode])
   Sets current point */
 PHP_FUNCTION(cpdf_rmoveto)
 {
@@ -1637,7 +1648,7 @@ PHP_FUNCTION(cpdf_rmoveto)
 }
 /* }}} */

-/* {{{ proto void cpdf_curveto(int pdfdoc, float x1, float y1, float x2, float y2, float x3, float y3 [, int mode])
+/* {{{ proto bool cpdf_curveto(int pdfdoc, float x1, float y1, float x2, float y2, float x3, float y3 [, int mode])
   Draws a curve */
 PHP_FUNCTION(cpdf_curveto)
 {
@@ -1688,7 +1699,7 @@ PHP_FUNCTION(cpdf_curveto)
 }
 /* }}} */

-/* {{{ proto void cpdf_lineto(int pdfdoc, float x, float y [, int mode])
+/* {{{ proto bool cpdf_lineto(int pdfdoc, float x, float y [, int mode])
   Draws a line */
 PHP_FUNCTION(cpdf_lineto)
 {
@@ -1725,7 +1736,7 @@ PHP_FUNCTION(cpdf_lineto)
 }
 /* }}} */

-/* {{{ proto void cpdf_rlineto(int pdfdoc, float x, float y [, int mode])
+/* {{{ proto bool cpdf_rlineto(int pdfdoc, float x, float y [, int mode])
   Draws a line relative to current point */
 PHP_FUNCTION(cpdf_rlineto)
 {
@@ -1762,7 +1773,7 @@ PHP_FUNCTION(cpdf_rlineto)
 }
 /* }}} */

-/* {{{ proto void cpdf_circle(int pdfdoc, float x, float y, float radius [, int mode])
+/* {{{ proto bool cpdf_circle(int pdfdoc, float x, float y, float radius [, int mode])
   Draws a circle */
 PHP_FUNCTION(cpdf_circle)
 {
@@ -1800,7 +1811,7 @@ PHP_FUNCTION(cpdf_circle)
 }
 /* }}} */

-/* {{{ proto void cpdf_arc(int pdfdoc, float x, float y, float radius, float start, float end [, int mode])
+/* {{{ proto bool cpdf_arc(int pdfdoc, float x, float y, float radius, float start, float end [, int mode])
   Draws an arc */
 PHP_FUNCTION(cpdf_arc)
 {
@@ -1840,7 +1851,7 @@ PHP_FUNCTION(cpdf_arc)
 }
 /* }}} */

-/* {{{ proto void cpdf_rect(int pdfdoc, float x, float y, float width, float height [, int mode])
+/* {{{ proto bool cpdf_rect(int pdfdoc, float x, float y, float width, float height [, int mode])
   Draws a rectangle */
 PHP_FUNCTION(cpdf_rect)
 {
@@ -1885,7 +1896,7 @@ PHP_FUNCTION(cpdf_rect)
 }
 /* }}} */

-/* {{{ proto void cpdf_newpath(int pdfdoc)
+/* {{{ proto bool cpdf_newpath(int pdfdoc)
   Starts new path */
 PHP_FUNCTION(cpdf_newpath)
 {
@@ -1911,7 +1922,7 @@ PHP_FUNCTION(cpdf_newpath)
 }
 /* }}} */

-/* {{{ proto void cpdf_closepath(int pdfdoc)
+/* {{{ proto bool cpdf_closepath(int pdfdoc)
   Close path */
 PHP_FUNCTION(cpdf_closepath)
 {
@@ -1937,7 +1948,7 @@ PHP_FUNCTION(cpdf_closepath)
 }
 /* }}} */

-/* {{{ proto void cpdf_closepath_stroke(int pdfdoc)
+/* {{{ proto bool cpdf_closepath_stroke(int pdfdoc)
   Close path and draw line along path */
 PHP_FUNCTION(cpdf_closepath_stroke)
 {
@@ -1964,7 +1975,7 @@ PHP_FUNCTION(cpdf_closepath_stroke)
 }
 /* }}} */

-/* {{{ proto void cpdf_stroke(int pdfdoc)
+/* {{{ proto bool cpdf_stroke(int pdfdoc)
   Draws line along path path */
 PHP_FUNCTION(cpdf_stroke)
 {
@@ -1990,7 +2001,7 @@ PHP_FUNCTION(cpdf_stroke)
 }
 /* }}} */

-/* {{{ proto void cpdf_fill(int pdfdoc)
+/* {{{ proto bool cpdf_fill(int pdfdoc)
   Fills current path */
 PHP_FUNCTION(cpdf_fill)
 {
@@ -2016,7 +2027,7 @@ PHP_FUNCTION(cpdf_fill)
 }
 /* }}} */

-/* {{{ proto void cpdf_fill_stroke(int pdfdoc)
+/* {{{ proto bool cpdf_fill_stroke(int pdfdoc)
   Fills and stroke current path */
 PHP_FUNCTION(cpdf_fill_stroke)
 {
@@ -2043,7 +2054,7 @@ PHP_FUNCTION(cpdf_fill_stroke)
 }
 /* }}} */

-/* {{{ proto void cpdf_closepath_fill_stroke(int pdfdoc)
+/* {{{ proto bool cpdf_closepath_fill_stroke(int pdfdoc)
   Close, fill and stroke current path */
 PHP_FUNCTION(cpdf_closepath_fill_stroke)
 {
@@ -2071,7 +2082,7 @@ PHP_FUNCTION(cpdf_closepath_fill_stroke)
 }
 /* }}} */

-/* {{{ proto void cpdf_clip(int pdfdoc)
+/* {{{ proto bool cpdf_clip(int pdfdoc)
   Clips to current path */
 PHP_FUNCTION(cpdf_clip)
 {
@@ -2097,7 +2108,7 @@ PHP_FUNCTION(cpdf_clip)
 }
 /* }}} */

-/* {{{ proto void cpdf_setgray_fill(int pdfdoc, float value)
+/* {{{ proto bool cpdf_setgray_fill(int pdfdoc, float value)
   Sets filling color to gray value */
 PHP_FUNCTION(cpdf_setgray_fill)
 {
@@ -2124,7 +2135,7 @@ PHP_FUNCTION(cpdf_setgray_fill)
 }
 /* }}} */

-/* {{{ proto void cpdf_setgray_stroke(int pdfdoc, float value)
+/* {{{ proto bool cpdf_setgray_stroke(int pdfdoc, float value)
   Sets drawing color to gray value */
 PHP_FUNCTION(cpdf_setgray_stroke)
 {
@@ -2151,7 +2162,7 @@ PHP_FUNCTION(cpdf_setgray_stroke)
 }
 /* }}} */

-/* {{{ proto void cpdf_setgray(int pdfdoc, float value)
+/* {{{ proto bool cpdf_setgray(int pdfdoc, float value)
   Sets drawing and filling color to gray value */
 PHP_FUNCTION(cpdf_setgray)
 {
@@ -2178,7 +2189,7 @@ PHP_FUNCTION(cpdf_setgray)
 }
 /* }}} */

-/* {{{ proto void cpdf_setrgbcolor_fill(int pdfdoc, float red, float green, float blue)
+/* {{{ proto bool cpdf_setrgbcolor_fill(int pdfdoc, float red, float green, float blue)
   Sets filling color to rgb color value */
 PHP_FUNCTION(cpdf_setrgbcolor_fill)
 {
@@ -2207,7 +2218,7 @@ PHP_FUNCTION(cpdf_setrgbcolor_fill)
 }
 /* }}} */

-/* {{{ proto void cpdf_setrgbcolor_stroke(int pdfdoc, float red, float green, float blue)
+/* {{{ proto bool cpdf_setrgbcolor_stroke(int pdfdoc, float red, float green, float blue)
   Sets drawing color to RGB color value */
 PHP_FUNCTION(cpdf_setrgbcolor_stroke)
 {
@@ -2236,7 +2247,7 @@ PHP_FUNCTION(cpdf_setrgbcolor_stroke)
 }
 /* }}} */

-/* {{{ proto void cpdf_setrgbcolor(int pdfdoc, float red, float green, float blue)
+/* {{{ proto bool cpdf_setrgbcolor(int pdfdoc, float red, float green, float blue)
   Sets drawing and filling color to RGB color value */
 PHP_FUNCTION(cpdf_setrgbcolor)
 {
@@ -2265,7 +2276,7 @@ PHP_FUNCTION(cpdf_setrgbcolor)
 }
 /* }}} */

-/* {{{ proto void cpdf_set_page_animation(int pdfdoc, int transition, float duration, float direction, int orientation, int inout)
+/* {{{ proto bool cpdf_set_page_animation(int pdfdoc, int transition, float duration, float direction, int orientation, int inout)
   Sets transition between pages */
 PHP_FUNCTION(cpdf_set_page_animation)
 {
@@ -2297,7 +2308,7 @@ PHP_FUNCTION(cpdf_set_page_animation)
 }
 /* }}} */

-/* {{{ proto array cpdf_finalize(int pdfdoc)
+/* {{{ proto bool cpdf_finalize(int pdfdoc)
   Creates PDF doc in memory */
 PHP_FUNCTION(cpdf_finalize)
 {
@@ -2323,7 +2334,7 @@ PHP_FUNCTION(cpdf_finalize)
 }
 /* }}} */

-/* {{{ proto array cpdf_output_buffer(int pdfdoc)
+/* {{{ proto bool cpdf_output_buffer(int pdfdoc)
   Returns the internal memory stream as string */
 PHP_FUNCTION(cpdf_output_buffer)
 {
@@ -2352,7 +2363,7 @@ PHP_FUNCTION(cpdf_output_buffer)
 }
 /* }}} */

-/* {{{ proto array cpdf_save_to_file(int pdfdoc, string filename)
+/* {{{ proto bool cpdf_save_to_file(int pdfdoc, string filename)
   Saves the internal memory stream to a file */
 PHP_FUNCTION(cpdf_save_to_file)
 {
@@ -2378,13 +2389,17 @@ PHP_FUNCTION(cpdf_save_to_file)
 		php_error(E_WARNING, "%s(): Writing to stdout as described in the ClibPDF manual is not possible if php is used as an Apache module. Use cpdf_output_buffer() instead.", get_active_function_name(TSRMLS_C));
 #endif

+	if (php_check_open_basedir(Z_STRVAL_P(arg2) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_P(arg2), "wb+", CHECKUID_CHECK_MODE_PARAM))) {
+		RETURN_FALSE;
+	}
+
 	cpdf_savePDFmemoryStreamToFile(pdf, Z_STRVAL_P(arg2));

 	RETURN_TRUE;
 }
 /* }}} */

-/* {{{ proto void cpdf_import_jpeg(int pdfdoc, string filename, float x, float y, float angle, float width, float height, float x_scale, float y_scale, int gsave [, int mode])
+/* {{{ proto bool cpdf_import_jpeg(int pdfdoc, string filename, float x, float y, float angle, float width, float height, float x_scale, float y_scale, int gsave [, int mode])
   Includes JPEG image */
 PHP_FUNCTION(cpdf_import_jpeg)
 {
@@ -2401,6 +2416,11 @@ PHP_FUNCTION(cpdf_import_jpeg)

 	convert_to_long(argv[0]);
 	convert_to_string(argv[1]);
+
+	if (php_check_open_basedir(Z_STRVAL_P(argv[1]) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_P(argv[1]), "rb+", CHECKUID_CHECK_MODE_PARAM))) {
+		RETURN_FALSE;
+	}
+
 	convert_to_double(argv[2]);
 	convert_to_double(argv[3]);
 	convert_to_double(argv[4]);
@@ -2452,7 +2472,7 @@ PHP_FUNCTION(cpdf_import_jpeg)
 /* }}} */

 #if HAVE_LIBGD13
-/* {{{ proto void cpdf_place_inline_image(int pdfdoc, int gdimage, float x, float y, float angle, fload width, float height, int gsave [, int mode])
+/* {{{ proto bool cpdf_place_inline_image(int pdfdoc, int gdimage, float x, float y, float angle, fload width, float height, int gsave [, int mode])
   Includes image */
 PHP_FUNCTION(cpdf_place_inline_image)
 {
@@ -2504,16 +2524,30 @@ PHP_FUNCTION(cpdf_place_inline_image)
 	}

 	count = 3 * im->sx * im->sy;
-	if(NULL == (buffer = (unsigned char *) emalloc(count)))
-		RETURN_FALSE;
+	buffer = (unsigned char *) safe_emalloc(3 * im->sx, im->sy, 0);

 	ptr = buffer;
 	for(i=0; i<im->sy; i++) {
 		for(j=0; j<im->sx; j++) {
-			color = im->pixels[i][j];
-			*ptr++ = im->red[color];
-			*ptr++ = im->green[color];
-			*ptr++ = im->blue[color];
+#if HAVE_LIBGD20
+			if(gdImageTrueColor(im)) {
+				if (im->tpixels && gdImageBoundsSafe(im, j, i)) {
+					color = gdImageTrueColorPixel(im, j, i);
+					*ptr++ = (color >> 16) & 0xFF;
+					*ptr++ = (color >> 8) & 0xFF;
+					*ptr++ = color & 0xFF;
+				}
+			} else {
+#endif
+				if (im->pixels && gdImageBoundsSafe(im, j, i)) {
+					color = im->pixels[i][j];
+					*ptr++ = im->red[color];
+					*ptr++ = im->green[color];
+					*ptr++ = im->blue[color];
+				}
+#if HAVE_LIBGD20
+			}
+#endif
 		}
 	}

@@ -2544,7 +2578,7 @@ PHP_FUNCTION(cpdf_place_inline_image)
 /* }}} */
 #endif

-/* {{{ proto void cpdf_add_annotation(int pdfdoc, float xll, float yll, float xur, float xur, string title, string text [, int mode])
+/* {{{ proto bool cpdf_add_annotation(int pdfdoc, float xll, float yll, float xur, float xur, string title, string text [, int mode])
   Sets annotation */
 PHP_FUNCTION(cpdf_add_annotation)
 {
@@ -7,27 +7,26 @@ PHP_ARG_WITH(crack, for CRACKlib support,

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

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

-	for i in /usr/local/include /usr/include $PHP_CRACK/include $PHP_CRACK/cracklib; do
-		test -f $i/packer.h && CRACK_INCLUDEDIR=$i
-	done
+  if test -z "$CRACK_LIBDIR"; then
+    AC_MSG_ERROR(Cannot find the cracklib library file)
+  fi
+
+  for i in $PHP_CRACK/include $PHP_CRACK/cracklib /usr/local/include /usr/include; do
+    test -f $i/packer.h && CRACK_INCLUDEDIR=$i && break
+  done
  
-	if test -z "$CRACK_LIBDIR"; then
-		AC_MSG_ERROR(Cannot find the cracklib library file)
-	fi
+  if test -z "$CRACK_INCLUDEDIR"; then
+    AC_MSG_ERROR(Cannot find a cracklib header file)
+  fi

-	if test -z "$CRACK_INCLUDEDIR"; then
-		AC_MSG_ERROR(Cannot find a cracklib header file)
-	fi
+  PHP_ADD_INCLUDE($CRACK_INCLUDEDIR)
+  PHP_ADD_LIBRARY_WITH_PATH(crack, $CRACK_LIBDIR, CRACK_SHARED_LIBADD)

-	PHP_ADD_INCLUDE($CRACK_INCLUDEDIR)
-	PHP_ADD_LIBRARY_WITH_PATH(crack, $CRACK_LIBDIR, CRACK_SHARED_LIBADD)
-
-	PHP_NEW_EXTENSION(crack, crack.c, $ext_shared)
-	PHP_SUBST(CRACK_SHARED_LIBADD)
-	AC_DEFINE(HAVE_CRACK, 1, [ ])
+  PHP_NEW_EXTENSION(crack, crack.c, $ext_shared)
+  PHP_SUBST(CRACK_SHARED_LIBADD)
+  AC_DEFINE(HAVE_CRACK, 1, [ ])
 fi
-
@@ -29,6 +29,9 @@

 #include <packer.h>

+extern char * FascistLook(PWDICT *pwp, char *instring);
+extern int PWClose(PWDICT *pwp);
+
 ZEND_DECLARE_MODULE_GLOBALS(crack)

 /* True global resources - no need for thread safety here */
@@ -69,11 +72,16 @@ long _crack_open_dict(char *dictpath TSRMLS_DC)
 	long resource;

 	if (CRACKG(current_id) != -1) {
-		zend_error(E_WARNING, "Can not use more than one open dictionary with this implementation of libcrack");
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not use more than one open dictionary with this implementation of libcrack");
 		return -1;
 	}
+
+	if ((PG(safe_mode) && (!php_checkuid(dictpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(dictpath TSRMLS_CC)) {
+		return -1;
+	}
+
 	if (NULL == (pwdict = PWOpen(dictpath, "r"))) {
-		zend_error(E_WARNING, "Unable to open a crack dictionary");
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open a crack dictionary");
 		return -1;
 	}

@@ -140,7 +148,7 @@ ZEND_MODULE_INFO_D(crack)
 	DISPLAY_INI_ENTRIES();
 }

-/* {{{ proto string crack_opendict(string dictionary)
+/* {{{ proto resource crack_opendict(string dictionary)
   Opens a new cracklib dictionary */
 ZEND_FUNCTION(crack_opendict)
 {
@@ -156,12 +164,12 @@ ZEND_FUNCTION(crack_opendict)
 	if (-1 == (resource = _crack_open_dict(Z_STRVAL_PP(dictpath) TSRMLS_CC))) {
 		RETURN_FALSE;
 	}
-	
+
 	RETURN_RESOURCE(resource);
 }
 /* }}} */

-/* {{{ proto string crack_closedict([int link_identifier])
+/* {{{ proto bool crack_closedict([resource dictionary])
   Closes an open cracklib dictionary */
 ZEND_FUNCTION(crack_closedict)
 {
@@ -184,6 +192,10 @@ ZEND_FUNCTION(crack_closedict)
 			break;
 	}

+	if (id < 1) {
+		RETURN_FALSE;
+	}
+
 	ZEND_FETCH_RESOURCE(pwdict, PWDICT *, dictionary, id, "cracklib dictionary", le_crack);
 	if (CRACKG(current_id) == id) {
 		CRACKG(current_id) = -1;
@@ -194,7 +206,7 @@ ZEND_FUNCTION(crack_closedict)
 }
 /* }}} */

-/* {{{ proto string crack_check([int dictionary,] string password)
+/* {{{ proto bool crack_check([resource dictionary,] string password)
   Performs an obscure check with the given password */
 ZEND_FUNCTION(crack_check)
 {
@@ -218,7 +230,6 @@ ZEND_FUNCTION(crack_check)
 			if (zend_get_parameters_ex(2, &dictionary, &password) == FAILURE) {
 				RETURN_FALSE;
 			}
-			id = -1;
 			break;
 		default:
 			WRONG_PARAM_COUNT;
@@ -256,7 +267,7 @@ ZEND_FUNCTION(crack_getlastmessage)
 	}
 	
 	if (NULL == CRACKG(last_message)) {
-		zend_error(E_WARNING, "No obscure checks in this session");
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No obscure checks in this session");
 		RETURN_FALSE;
 	}

@@ -97,7 +97,13 @@ PHP_MINFO_FUNCTION(ctype)
 		return; \
 	switch (Z_TYPE_P(c)) { \
 	case IS_LONG: \
-		RETURN_BOOL(iswhat(Z_LVAL_P(c))); \
+		if (Z_LVAL_P(c) <= 255 && Z_LVAL_P(c) >= 0) { \
+			RETURN_BOOL(iswhat(Z_LVAL_P(c))); \
+		} else if (Z_LVAL_P(c) >= -128 && Z_LVAL_P(c) < 0) { \
+			RETURN_BOOL(iswhat(Z_LVAL_P(c) + 256)); \
+		} \
+		SEPARATE_ZVAL(&c);	\
+		convert_to_string(c);	\
 	case IS_STRING: \
 		{ \
 			char *p; \
@@ -105,7 +111,7 @@ PHP_MINFO_FUNCTION(ctype)
 			p=Z_STRVAL_P(c); \
 			len = Z_STRLEN_P(c); \
 			for(n=0;n<len;n++) { \
-				if(!iswhat(*p++)) RETURN_FALSE; \
+				if(!iswhat((int)*(unsigned char *)(p++))) RETURN_FALSE; \
 			} \
 			RETURN_TRUE; \
 		} \
@@ -0,0 +1,24 @@
+--TEST--
+Bug #25745 (ctype functions fail with non-ascii characters)
+--FILE--
+<?php
+$funcs = array(
+	"ctype_alnum", "ctype_alpha", "ctype_cntrl", "ctype_digit",
+	"ctype_graph", "ctype_lower", "ctype_print", "ctype_punct",
+	"ctype_space", "ctype_upper", "ctype_xdigit"
+);
+
+foreach ($funcs as $ctype_func) {
+	for ($i = 0; $i < 256; $i++) {
+		$a = $ctype_func($i);
+		$b = $ctype_func(chr($i));
+		if ($a != $b) {
+			echo "broken... $ctype_func($i) = $a, $ctype_func(chr($i)) = $b\n";
+			exit;
+		}
+	}
+}
+echo "ok\n";
+?>
+--EXPECT--
+ok
@@ -18,6 +18,7 @@ if test "$PHP_CURL" != "no"; then
      if test -r $i/include/curl/easy.h; then
        CURL_DIR=$i
        AC_MSG_RESULT(found in $i)
+        break
      fi
    done
  fi
@@ -22,6 +22,10 @@
 #include "config.h"
 #endif

+#ifdef PHP_WIN32
+#include <winsock2.h>
+#endif
+
 #include "php.h"

 #if HAVE_CURL
@@ -30,13 +34,17 @@
 #include <string.h>

 #ifdef PHP_WIN32
-#include <winsock.h>
 #include <sys/types.h>
 #endif

 #include <curl/curl.h>
 #include <curl/easy.h>

+/* As of curl 7.11.1 this is no longer defined inside curl.h */
+#ifndef HttpPost
+#define HttpPost curl_httppost
+#endif
+
 #define SMART_STR_PREALLOC 4096

 #include "ext/standard/php_smart_str.h"
@@ -133,7 +141,9 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
 	REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
 	REGISTER_CURL_CONSTANT(CURLOPT_PUT);
+#if CURLOPT_MUTE != 0
 	REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
+#endif
 	REGISTER_CURL_CONSTANT(CURLOPT_USERPWD);
 	REGISTER_CURL_CONSTANT(CURLOPT_PROXYUSERPWD);
 	REGISTER_CURL_CONSTANT(CURLOPT_RANGE);
@@ -191,7 +201,28 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE);
 	REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE_DEFAULT);
 	REGISTER_CURL_CONSTANT(CURLOPT_CRLF);
-	
+	REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFMODSINCE);
+ 	REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE);
+ 	REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);
+#if LIBCURL_VERSION_NUM >= 0x070a00
+	REGISTER_CURL_CONSTANT(CURLOPT_ENCODING);
+#endif
+		
+#if LIBCURL_VERSION_NUM > 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 7.10.6 */
+ 	REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
+ 	/* http authentication options */
+ 	REGISTER_CURL_CONSTANT(CURLAUTH_BASIC);
+ 	REGISTER_CURL_CONSTANT(CURLAUTH_DIGEST);
+ 	REGISTER_CURL_CONSTANT(CURLAUTH_GSSNEGOTIATE);
+ 	REGISTER_CURL_CONSTANT(CURLAUTH_NTLM);
+ 	REGISTER_CURL_CONSTANT(CURLAUTH_ANY);
+ 	REGISTER_CURL_CONSTANT(CURLAUTH_ANYSAFE);
+#endif
+
+#if LIBCURL_VERSION_NUM > 0x070a06 /* CURLOPT_PROXYAUTH is available since curl 7.10.7 */
+	REGISTER_CURL_CONSTANT(CURLOPT_PROXYAUTH);
+#endif
+
 	/* Constants effecting the way CURLOPT_CLOSEPOLICY works */
 	REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
 	REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_TRAFFIC);
@@ -274,6 +305,35 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
 	REGISTER_CURL_CONSTANT(CURLE_OBSOLETE);
 	REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE);
+	REGISTER_CURL_CONSTANT(CURLE_GOT_NOTHING);
+	REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
+	REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_SETFAILED);
+	REGISTER_CURL_CONSTANT(CURLE_SEND_ERROR);
+	REGISTER_CURL_CONSTANT(CURLE_RECV_ERROR);
+#ifdef CURLE_SHARE_IN_USE
+	REGISTER_CURL_CONSTANT(CURLE_SHARE_IN_USE);
+#endif
+#ifdef CURLE_SSL_CERTPROBLEM
+	REGISTER_CURL_CONSTANT(CURLE_SSL_CERTPROBLEM);
+#endif
+#ifdef CURLE_SSL_CIPHER
+	REGISTER_CURL_CONSTANT(CURLE_SSL_CIPHER);
+#endif
+#ifdef CURLE_SSL_CACERT	
+	REGISTER_CURL_CONSTANT(CURLE_SSL_CACERT);
+#endif
+#ifdef CURLE_BAD_CONTENT_ENCODING
+	REGISTER_CURL_CONSTANT(CURLE_BAD_CONTENT_ENCODING);
+#endif	
+#ifdef CURLE_LDAP_INVALID_URL
+	REGISTER_CURL_CONSTANT(CURLE_LDAP_INVALID_URL);
+#endif	
+#ifdef CURLE_FILESIZE_EXCEEDED
+	REGISTER_CURL_CONSTANT(CURLE_FILESIZE_EXCEEDED);
+#endif
+#ifdef CURLE_FTP_SSL_FAILED
+	REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
+#endif

 	REGISTER_CURL_CONSTANT(CURL_NETRC_OPTIONAL);
 	REGISTER_CURL_CONSTANT(CURL_NETRC_IGNORED);
@@ -335,7 +395,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)

 	switch (t->method) {
 	case PHP_CURL_STDOUT:
-		PHPWRITE(data, size);
+		PHPWRITE(data, length);
 		break;
 	case PHP_CURL_FILE:
 		return fwrite(data, size, nmemb, t->fp);
@@ -346,7 +406,6 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
 		zval *argv[2];
 		zval *retval;
 		int   error;
-		TSRMLS_FETCH();

 		MAKE_STD_ZVAL(argv[0]);
 		MAKE_STD_ZVAL(argv[1]);
@@ -366,6 +425,9 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
 			length = -1;
 		}
 		else {
+			if (Z_TYPE_P(retval) != IS_LONG) {
+				convert_to_long_ex(&retval);
+			}
 			length = Z_LVAL_P(retval);
 		}

@@ -391,12 +453,13 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)

 	switch (t->method) {
 	case PHP_CURL_DIRECT:
-		length = fread(data, size, nmemb, t->fp);
+		if (t->fp) {
+			length = fread(data, size, nmemb, t->fp);
+		}
 		break;
 	case PHP_CURL_USER: {
 		zval *argv[3];
 		zval *retval;
-		int   length;
 		int   error;
 		TSRMLS_FETCH();

@@ -418,11 +481,9 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
 		if (error == FAILURE) {
 			php_error(E_WARNING, "%s(): Cannot call the CURLOPT_READFUNCTION", 
 					  get_active_function_name(TSRMLS_C));
-			length = -1;
-		}
-		else {
-			memcpy(data, Z_STRVAL_P(retval), size * nmemb);
-			length = Z_STRLEN_P(retval);
+		} else if (Z_TYPE_P(retval) == IS_STRING) {
+			length = MIN(size * nmemb, Z_STRLEN_P(retval));
+			memcpy(data, Z_STRVAL_P(retval), length);
 		}

 		zval_ptr_dtor(&argv[0]);
@@ -453,7 +514,7 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
 			if (ch->handlers->write->method == PHP_CURL_RETURN)
 				smart_str_appendl(&ch->handlers->write->buf, data, (int) length);
 			else
-				PHPWRITE(data, size);
+				PHPWRITE(data, length);
 			break;
 		case PHP_CURL_FILE:
 			return fwrite(data, size, nmemb, t->fp);
@@ -481,6 +542,9 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
 				length = -1;
 			}
 			else {
+				if (Z_TYPE_P(retval) != IS_LONG) {
+					convert_to_long_ex(&retval);
+				}
 				length = Z_LVAL_P(retval);
 			}
 			zval_ptr_dtor(&argv[0]);
@@ -488,13 +552,18 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
 			zval_ptr_dtor(&retval);
 			break;
 		}
+
 		case PHP_CURL_IGNORE:
 			return length;
+
+		default:
+			return -1;
 	}
 	return length;
 }
 /* }}} */

+#if CURLOPT_PASSWDFUNCTION != 0
 /* {{{ curl_passwd
 */
 static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
@@ -504,7 +573,7 @@ static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
 	zval        *argv[3];
 	zval        *retval = NULL;
 	int          error;
-	int          ret = 0;
+	int          ret = -1;
 	TSRMLS_FETCH();

 	MAKE_STD_ZVAL(argv[0]);
@@ -522,17 +591,15 @@ static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
 	                           retval, 2, argv TSRMLS_CC);
 	if (error == FAILURE) {
 		php_error(E_WARNING, "%s(): Couldn't call the CURLOPT_PASSWDFUNCTION", get_active_function_name(TSRMLS_C));
-		ret = -1;
-	}
-	else {
+	} else if (Z_TYPE_P(retval) == IS_STRING) {
 		if (Z_STRLEN_P(retval) > buflen) {
 			php_error(E_WARNING, "%s(): Returned password is too long for libcurl to handle", 
 					  get_active_function_name(TSRMLS_C));
-			ret = -1;
-		}
-		else {
-			strlcpy(buf, Z_STRVAL_P(retval), buflen);
+		} else {
+			strlcpy(buf, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
 		}
+	} else {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "User handler '%s' did not return a string.", Z_STRVAL_P(func));
 	}
 	
 	zval_ptr_dtor(&argv[0]);
@@ -543,6 +610,7 @@ static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
 	return ret;
 }
 /* }}} */
+#endif

 /* {{{ curl_free_string
 */
@@ -569,7 +637,7 @@ static void curl_free_slist(void **slist)
 /* }}} */


-/* {{{ proto array curl_version(void)
+/* {{{ proto string curl_version(void)
   Return cURL version information. */
 PHP_FUNCTION(curl_version)
 {
@@ -627,6 +695,8 @@ PHP_FUNCTION(curl_init)
 	ch->handlers->read->method  = PHP_CURL_DIRECT;
 	ch->handlers->write_header->method = PHP_CURL_IGNORE;

+	ch->uses = 0;
+
 	curl_easy_setopt(ch->cp, CURLOPT_NOPROGRESS,        1);
 	curl_easy_setopt(ch->cp, CURLOPT_VERBOSE,           0);
 	curl_easy_setopt(ch->cp, CURLOPT_ERRORBUFFER,       ch->err.str);
@@ -638,6 +708,7 @@ PHP_FUNCTION(curl_init)
 	curl_easy_setopt(ch->cp, CURLOPT_WRITEHEADER,       (void *) ch);
 	curl_easy_setopt(ch->cp, CURLOPT_DNS_USE_GLOBAL_CACHE, 1);
 	curl_easy_setopt(ch->cp, CURLOPT_DNS_CACHE_TIMEOUT, 120);
+	curl_easy_setopt(ch->cp, CURLOPT_MAXREDIRS, 20); /* prevent infinite redirects */

 	if (argc > 0) {
 		char *urlcopy;
@@ -686,7 +757,9 @@ PHP_FUNCTION(curl_setopt)
 		case CURLOPT_NETRC:
 		case CURLOPT_FOLLOWLOCATION:
 		case CURLOPT_PUT:
-		case CURLOPT_MUTE:
+#if CURLOPT_MUTE != 0
+		 case CURLOPT_MUTE:
+#endif
 		case CURLOPT_TIMEOUT:
 		case CURLOPT_FTP_USE_EPSV:
 		case CURLOPT_LOW_SPEED_LIMIT:
@@ -710,6 +783,12 @@ PHP_FUNCTION(curl_setopt)
 		case CURLOPT_HTTPGET:
 		case CURLOPT_HTTP_VERSION:
 		case CURLOPT_CRLF:
+#if LIBCURL_VERSION_NUM > 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 7.10.6 */
+		case CURLOPT_HTTPAUTH:
+#endif
+#if LIBCURL_VERSION_NUM > 0x070a06 /* CURLOPT_PROXYAUTH is available since curl 7.10.7 */
+		case CURLOPT_PROXYAUTH:
+#endif
 			convert_to_long_ex(zvalue);
 			error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
 			break;
@@ -722,21 +801,20 @@ PHP_FUNCTION(curl_setopt)
 		case CURLOPT_USERAGENT:
 		case CURLOPT_FTPPORT:
 		case CURLOPT_COOKIE:
-		case CURLOPT_COOKIEFILE:
 		case CURLOPT_REFERER:
 		case CURLOPT_INTERFACE:
 		case CURLOPT_KRB4LEVEL: 
-		case CURLOPT_RANDOM_FILE:
 		case CURLOPT_EGDSOCKET:
 		case CURLOPT_CAINFO: 
 		case CURLOPT_CAPATH:
-		case CURLOPT_COOKIEJAR:
 		case CURLOPT_SSL_CIPHER_LIST: 
 		case CURLOPT_SSLKEY:
-		case CURLOPT_SSLCERT:
 		case CURLOPT_SSLKEYTYPE: 
-		case CURLOPT_SSLKEYPASSWD: 
+		case CURLOPT_SSLKEYPASSWD:
 		case CURLOPT_SSLENGINE: 
+#if LIBCURL_VERSION_NUM >= 0x070a00
+		case CURLOPT_ENCODING: 
+#endif
 		case CURLOPT_SSLENGINE_DEFAULT: {
 			char *copystr = NULL;
 	
@@ -797,7 +875,9 @@ PHP_FUNCTION(curl_setopt)

 			if (Z_LVAL_PP(zvalue)) {
 				ch->handlers->write->method = PHP_CURL_RETURN;
-			}
+			} else {
+				ch->handlers->write->method = PHP_CURL_STDOUT;
+			}	
 			break;
 		case CURLOPT_BINARYTRANSFER:
 			convert_to_long_ex(zvalue);	
@@ -830,6 +910,7 @@ PHP_FUNCTION(curl_setopt)
 			ch->handlers->write_header->func   = *zvalue;
 			ch->handlers->write_header->method = PHP_CURL_USER;
 			break;
+#if CURLOPT_PASSWDFUNCTION != 0
 		case CURLOPT_PASSWDFUNCTION:
 			if (ch->handlers->passwd) {
 				zval_ptr_dtor(&ch->handlers->passwd);
@@ -839,6 +920,7 @@ PHP_FUNCTION(curl_setopt)
 			error = curl_easy_setopt(ch->cp, CURLOPT_PASSWDFUNCTION, curl_passwd);
 			error = curl_easy_setopt(ch->cp, CURLOPT_PASSWDDATA,     (void *) ch);
 			break;
+#endif
 		case CURLOPT_POSTFIELDS:
 			if (Z_TYPE_PP(zvalue) == IS_ARRAY || Z_TYPE_PP(zvalue) == IS_OBJECT) {
 				zval            **current;
@@ -881,7 +963,7 @@ PHP_FUNCTION(curl_setopt)
 						error = curl_formadd(&first, &last, 
 											 CURLFORM_COPYNAME, string_key,
 											 CURLFORM_NAMELENGTH, string_key_len - 1,
-											 CURLFORM_PTRCONTENTS, postval, 
+											 CURLFORM_COPYCONTENTS, postval, 
 											 CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(current),
 											 CURLFORM_END);
 					}
@@ -944,6 +1026,28 @@ PHP_FUNCTION(curl_setopt)

 			error = curl_easy_setopt(ch->cp, option, slist);

+			break;
+		}
+		/* the following options deal with files, therefor safe_mode & open_basedir checks
+		 * are required.
+		 */
+		case CURLOPT_COOKIEJAR:
+		case CURLOPT_SSLCERT:
+		case CURLOPT_RANDOM_FILE:
+		case CURLOPT_COOKIEFILE: {
+			char *copystr = NULL;
+
+			convert_to_string_ex(zvalue);
+
+			if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(zvalue), "rb+", CHECKUID_CHECK_MODE_PARAM))) {
+				RETURN_FALSE;			
+			}
+
+			copystr = estrndup(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue));
+
+			error = curl_easy_setopt(ch->cp, option, copystr);
+			zend_llist_add_element(&ch->to_free.str, &copystr);
+
 			break;
 		}
 	}
@@ -993,7 +1097,8 @@ PHP_FUNCTION(curl_exec)
 	
 	error = curl_easy_perform(ch->cp);
 	SAVE_CURL_ERROR(ch, error);
-	if (error != CURLE_OK) {
+	/* CURLE_PARTIAL_FILE is returned by HEAD requests */
+	if (error != CURLE_OK && error != CURLE_PARTIAL_FILE) {
 		if (ch->handlers->write->buf.len > 0) {
 			smart_str_free(&ch->handlers->write->buf);
 		}
@@ -1013,7 +1118,7 @@ PHP_FUNCTION(curl_exec)
 }
 /* }}} */

-/* {{{ proto string curl_getinfo(resource ch, int opt)
+/* {{{ proto mixed curl_getinfo(resource ch, int opt)
   Get information regarding a specific transfer */
 PHP_FUNCTION(curl_getinfo)
 {
@@ -1103,10 +1208,13 @@ PHP_FUNCTION(curl_getinfo)
 		switch (option) {
 		case CURLINFO_EFFECTIVE_URL: 
 		case CURLINFO_CONTENT_TYPE: {
-			char *s_code;
+			char *s_code = NULL;

-			curl_easy_getinfo(ch->cp, option, &s_code);
-			RETURN_STRING(s_code, 1);
+			if (curl_easy_getinfo(ch->cp, option, &s_code) == CURLE_OK && s_code) {
+				RETURN_STRING(s_code, 1);
+			} else {
+				RETURN_FALSE;
+			}

 			break;
 		}
@@ -1116,10 +1224,13 @@ PHP_FUNCTION(curl_getinfo)
 		case CURLINFO_FILETIME: 
 		case CURLINFO_SSL_VERIFYRESULT: 
 		case CURLINFO_REDIRECT_COUNT: {
-			long code;
+			long code = 0;

-			curl_easy_getinfo(ch->cp, option, &code);
-			RETURN_LONG(code);
+			if (curl_easy_getinfo(ch->cp, option, &code) == CURLE_OK) {
+				RETURN_LONG(code);
+			} else {
+				RETURN_FALSE;
+			}
   
 			break;
 		}
@@ -1135,10 +1246,13 @@ PHP_FUNCTION(curl_getinfo)
 		case CURLINFO_CONTENT_LENGTH_UPLOAD: 
 		case CURLINFO_STARTTRANSFER_TIME:
 		case CURLINFO_REDIRECT_TIME: {
-			double code;
+			double code = 0.0;
 	
-			curl_easy_getinfo(ch->cp, option, &code);
-			RETURN_DOUBLE(code);
+			if (curl_easy_getinfo(ch->cp, option, &code) == CURLE_OK) {
+				RETURN_DOUBLE(code);
+			} else {
+				RETURN_FALSE;
+			}

 			break;
 		}
@@ -113,7 +113,7 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 php4ts_debug.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS"
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 php4ts_debug.lib libcurl.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib"
+# ADD LINK32 php4ts_debug.lib libcurl.lib ssleay32.lib libeay32.lib msvcrt.lib ws2_32.lib winmm.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 !ELSEIF  "$(CFG)" == "curl - Win32 Release_TS_SSL"
@@ -142,7 +142,7 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 php4ts.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 php4ts.lib libcurl.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
+# ADD LINK32 php4ts.lib libcurl.lib ssleay32.lib libeay32.lib msvcrt.lib ws2_32.lib winmm.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
 # SUBTRACT LINK32 /pdb:none

 !ENDIF 
@@ -307,7 +307,7 @@ PHPAPI php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *fil
 	curl_easy_setopt(curlstream->curl, CURLOPT_PROGRESSDATA, stream);
 	curl_easy_setopt(curlstream->curl, CURLOPT_NOPROGRESS, 0);

-	curl_easy_setopt(curlstream->curl, CURLOPT_USERAGENT, "PHP/" PHP_VERSION);
+	curl_easy_setopt(curlstream->curl, CURLOPT_USERAGENT, FG(user_agent) ? FG(user_agent) : "PHP/" PHP_VERSION);
 	
 	/* TODO: read cookies and options from context */

@@ -3,7 +3,7 @@ dnl $Id$
 dnl

 PHP_ARG_WITH(cyrus, for cyrus imap support,
-[  --with-cyrus[=dir]      Include Cyrus IMAP support])
+[  --with-cyrus[=DIR]      Include Cyrus IMAP support])

 if test "$PHP_CYRUS" != "no"; then
  found_cyrus=no
@@ -53,7 +53,7 @@ zend_module_entry cyrus_module_entry = {
 	cyrus_functions,
 	PHP_MINIT(cyrus),
 	NULL,
-	NULL,	
+	NULL,
 	NULL,
 	PHP_MINFO(cyrus),
 	NO_VERSION_YET,
@@ -71,7 +71,7 @@ static void cyrus_free(zend_rsrc_list_entry *rsrc)
 	if (conn->client)
 		imclient_close(conn->client);

-	if (conn->host) 
+	if (conn->host)
 		efree(conn->host);

 	if (conn->port)
@@ -79,16 +79,16 @@ static void cyrus_free(zend_rsrc_list_entry *rsrc)

 	efree(conn);
 }
-	
+
 PHP_MINIT_FUNCTION(cyrus)
 {
-	le_cyrus = zend_register_list_destructors_ex(cyrus_free, NULL, 
+	le_cyrus = zend_register_list_destructors_ex(cyrus_free, NULL,
 	                                             le_cyrus_name, module_number);

-	REGISTER_LONG_CONSTANT("CYRUS_CONN_NONSYNCLITERAL", 
+	REGISTER_LONG_CONSTANT("CYRUS_CONN_NONSYNCLITERAL",
 	                       IMCLIENT_CONN_NONSYNCLITERAL,
 	                       CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("CYRUS_CONN_INITIALRESPONSE", 
+	REGISTER_LONG_CONSTANT("CYRUS_CONN_INITIALRESPONSE",
 	                       IMCLIENT_CONN_INITIALRESPONSE,
 	                       CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CYRUS_CALLBACK_NUMBERED", CALLBACK_NUMBERED,
@@ -125,7 +125,7 @@ PHP_FUNCTION(cyrus_connect)
 	int               flags = 0;
 	int               error;
 	int               argc = ZEND_NUM_ARGS();
-	
+
 	if (argc < 0 || argc > 3 ||
 	    zend_get_parameters_ex(argc, &z_host, &z_port, &z_flags) == FAILURE) {
 		WRONG_PARAM_COUNT;
@@ -169,7 +169,7 @@ PHP_FUNCTION(cyrus_connect)
 	case -1:
 		php_error(E_WARNING, "%s(): Invalid hostname: %s", get_active_function_name(TSRMLS_C), host);
 		RETURN_FALSE;
-	
+
 	case -2:
 		php_error(E_WARNING, "%s(): Invalid port: %d", get_active_function_name(TSRMLS_C), port);
 		RETURN_FALSE;
@@ -181,14 +181,14 @@ PHP_FUNCTION(cyrus_connect)
 /* }}} */


-static void cyrus_capable_callback(struct imclient *client, void *rock, 
+static void cyrus_capable_callback(struct imclient *client, void *rock,
                                   struct imclient_reply *reply)
 {
 	char *token = NULL;
 	char *token_buf;
 	char *mechanism = rock;

-	
+
 	/* We need to split the reply up by the whitespace */
 	token = php_strtok_r(reply->text, " ", &token_buf);
 	while (token != NULL) {
@@ -202,7 +202,7 @@ static void cyrus_capable_callback(struct imclient *client, void *rock,
 }


-/* {{{ proto bool cyrus_authenticate( resource connection [, string mechlist [, string service [, string user [, int minssf [, int maxssf]]]]])
+/* {{{ proto void cyrus_authenticate( resource connection [, string mechlist [, string service [, string user [, int minssf [, int maxssf]]]]])
   Authenticate agaings a Cyrus IMAP server */
 PHP_FUNCTION(cyrus_authenticate)
 {
@@ -235,26 +235,26 @@ PHP_FUNCTION(cyrus_authenticate)
 	else {
 		char tmp_mechlist[100];
 		int  pos = 0;
-		
+
 		/* NULL out the buffer, ensures it has a safe ending and allows us to
 		 * test properly for the end of the buffer
 		 */
 		memset(tmp_mechlist, 0, sizeof tmp_mechlist);

 		/* We'll be calling the "CAPABILITY" command, which will give us a list
-		 * of the types of authorization the server is capable of 
+		 * of the types of authorization the server is capable of
 		 */
-		imclient_addcallback(conn->client, "CAPABILITY", 0, 
+		imclient_addcallback(conn->client, "CAPABILITY", 0,
 		                     cyrus_capable_callback, (void *) tmp_mechlist, 0);
 		imclient_send(conn->client, NULL, NULL, "CAPABILITY");

 		/* Grab the end of string position into pos */
-		while (tmp_mechlist[pos++] != 0) 
+		while (tmp_mechlist[pos++] != 0)
 			;

 		/* Tack on PLAIN to whatever the auth string is */
 		memcpy(tmp_mechlist + pos, " PLAIN", 6);
-		
+
 		/* Copy it onto the main buffer */
 		mechlist = estrndup(tmp_mechlist, pos + 6);
 	}
@@ -277,22 +277,22 @@ PHP_FUNCTION(cyrus_authenticate)
 		/* XXX: UGLY, but works, determines the username to use */
 		user = (char *) sapi_getenv("USER", 4);
 		if (! user) {
-		user = (char *) getenv("USER");
-		if (! user) {
-			user = (char *) sapi_getenv("LOGNAME", 7);
+			user = (char *) getenv("USER");
 			if (! user) {
-			user = (char *) getenv("LOGNAME");
-			if (! user) {
-				struct passwd *pwd = getpwuid(getuid());
-				if (! pwd) {
-				php_error(E_WARNING, "%s(): Couldn't determine user id", get_active_function_name(TSRMLS_C));
-				RETURN_FALSE;
+				user = (char *) sapi_getenv("LOGNAME", 7);
+				if (! user) {
+				user = (char *) getenv("LOGNAME");
+					if (! user) {
+						struct passwd *pwd = getpwuid(getuid());
+						if (! pwd) {
+							php_error(E_WARNING, "%s(): Couldn't determine user id", get_active_function_name(TSRMLS_C));
+							RETURN_FALSE;
+						}
+		
+						user = estrdup(pwd->pw_name);
+					}
 				}
-			
-				user = estrdup(pwd->pw_name);
 			}
-			}
-		}
 		}
 	}

@@ -314,7 +314,7 @@ PHP_FUNCTION(cyrus_authenticate)
 		maxssf = 1000;
 	}

-	imclient_authenticate(conn->client, mechlist, service, 
+	imclient_authenticate(conn->client, mechlist, service,
 	                      user, minssf, maxssf);

 	efree(mechlist);
@@ -324,8 +324,8 @@ PHP_FUNCTION(cyrus_authenticate)
 /* }}} */


-static void cyrus_generic_callback(struct imclient *client, 
-                                   void *rock, 
+static void cyrus_generic_callback(struct imclient *client,
+                                   void *rock,
                                   struct imclient_reply *reply)
 {
 	php_cyrus_callback *callback = rock;
@@ -356,7 +356,7 @@ static void cyrus_generic_callback(struct imclient *client,
 		argv[2] = &text;
 		argv[3] = &msgno;

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

-	
-/* {{{ proto bool cyrus_bind( resource connection, array callbacks) 
+
+/* {{{ proto bool cyrus_bind( resource connection, array callbacks)
 Bind callbacks to a Cyrus IMAP connection */
 PHP_FUNCTION(cyrus_bind)
 {
@@ -397,7 +397,7 @@ PHP_FUNCTION(cyrus_bind)

 	hash = HASH_OF(*z_callback);
 	if (! hash) {
-		php_error(E_WARNING, 
+		php_error(E_WARNING,
 		          "%s(): Second argument must be an array or object", get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
 	}
@@ -407,9 +407,9 @@ PHP_FUNCTION(cyrus_bind)
 		 zend_hash_move_forward(hash)) {
 		SEPARATE_ZVAL(tmp);
 		zend_hash_get_current_key(hash, &string_key, &num_key, 0);
-		if (! string_key) 
+		if (! string_key)
 			continue;
-		
+
 		if (! strcasecmp(string_key, "trigger")) {
 			convert_to_string_ex(tmp);
 			callback.trigger = estrndup(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
@@ -436,7 +436,7 @@ PHP_FUNCTION(cyrus_bind)

 	callback.le = conn->id;

-	imclient_addcallback(conn->client, callback.trigger, callback.flags, 
+	imclient_addcallback(conn->client, callback.trigger, callback.flags,
 	                     cyrus_generic_callback, (void **) &callback, 0);

 	RETURN_TRUE;
@@ -458,14 +458,14 @@ PHP_FUNCTION(cyrus_unbind)
 	ZEND_FETCH_RESOURCE(conn, php_cyrus *, z_conn, -1, le_cyrus_name, le_cyrus);
 	convert_to_string_ex(trigger_name);

-	imclient_addcallback(conn->client, Z_STRVAL_PP(trigger_name), 0, 
+	imclient_addcallback(conn->client, Z_STRVAL_PP(trigger_name), 0,
 	                     NULL, NULL, 0);

 	RETURN_TRUE;
 }
 /* }}} */

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

-	imclient_send(conn->client, NULL, NULL, Z_STRVAL_PP(query)); 
+	imclient_send(conn->client, NULL, NULL, Z_STRVAL_PP(query));

 	RETURN_TRUE;
 }
@@ -26,7 +26,7 @@ AC_DEFUN(AC_PREFERRED_DB_LIB,[


 PHP_ARG_WITH(db, for xDBM support,
-[  --with-db               Include old xDBM support (deprecated use --with-dba)])
+[  --with-db               Include old xDBM support (deprecated, use --enable-dba instead)])

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

@@ -513,7 +513,7 @@ PHP_FUNCTION(dbminsert)

 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id));
 		RETURN_FALSE;
 	}
 	
@@ -539,7 +539,7 @@ PHP_FUNCTION(dbmreplace)

 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id));
 		RETURN_FALSE;
 	}
 	
@@ -607,7 +607,7 @@ PHP_FUNCTION(dbmfetch)

 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id));
 		RETURN_FALSE;
 	}

@@ -683,7 +683,7 @@ PHP_FUNCTION(dbmexists)

 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id));
 		RETURN_FALSE;
 	}

@@ -732,7 +732,7 @@ PHP_FUNCTION(dbmdelete)

 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id));
 		RETURN_FALSE;
 	}

@@ -779,7 +779,7 @@ PHP_FUNCTION(dbmfirstkey)

 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id));
 		RETURN_FALSE;
 	}

@@ -841,7 +841,7 @@ PHP_FUNCTION(dbmnextkey)

 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id));
 		RETURN_FALSE;
 	}

@@ -0,0 +1,48 @@
+These functions build the foundation for accessing Berkeley DB style 
+databases. 
+
+This is a general abstraction layer for several file-based databases. As
+such, functionality is limited to a common subset of features supported 
+by modern databases such as Sleepycat Software's DB2. (This is not to be 
+confused with IBM's DB2 software, which is supported through the ODBC 
+functions.) 
+
+This extensions allows to work with the following databases:
+dbm      DBM is the oldest (original) type of Berkeley DB style databases.
+         You should avoid it, if possible. We do not support the 
+         compatibility functions built into DB2 and gdbm, because they are 
+         only compatible on the source code level, but cannot handle the 
+         original dbm format.  
+ndbm     NDBM is a newer type and more flexible than dbm. It still has 
+         most of the arbitrary limits of dbm (therefore it is deprecated).  
+gdbm     GDBM is the GNU database manager.  
+db2      DB2 is Sleepycat Software's DB2. It's described as "a programmatic
+         toolkit that provides high-performance built-in database support 
+         for both standalone and client/server applications.  
+db3      DB3 is Sleepycat Software's DB3.  
+db4      DB4 is Sleepycat Software's DB4. This is available since PHP 5.0.
+cdb      CDB is "a fast, reliable, lightweight package for creating and 
+         reading constant databases." It is from the author of qmail and 
+         can be found at http://cr.yp.to/cdb.html. Since it is constant, 
+         we support only reading operations. And since PHP 4.3.0 we support 
+         writing (not updating) through the internal cdb library.  
+cdb_make Since PHP 4.3.0 we support creation (not updating) of cdb files 
+         when the bundled cdb library is used.  
+flatfile This is available since PHP 4.3.0 for compatibility with the 
+         deprecated dbm extension only and should be avoided. However you 
+         may use this where files were created in this format. That happens 
+         when configure could not find any external library.  
+inifile  This is available since PHP 4.3.3 to be able to modify php.ini 
+         files from within PHP scripts. When working with ini files you 
+         can pass arrays of the form array(0=>group,1=>value_name) or 
+         strings of the form "[group]value_name" where group is optional. 
+
+
+After configuring and compiling PHP you must execute the following test
+from commandline: 
+  php run-tests.php ext/dba. 
+This shows whether your combination of handlers works. Most problematic 
+are dbm and ndbm which conflict with many installations. The reason for 
+this is that on several systems these libraries are part of more than one
+other library. The configuration test only prevents you from configuring 
+malfaunctioning single handlers but not combinations.
@@ -11,8 +11,11 @@ AC_DEFUN(PHP_DBA_STD_BEGIN,[
 AC_DEFUN(PHP_TEMP_LDFLAGS,[
  old_LDFLAGS=$LDFLAGS
  LDFLAGS="$1 $LDFLAGS"
-  $2
+  old_LIBS=$LIBS
+  LIBS="$2 $LIBS"
+  $3
  LDFLAGS=$old_LDFLAGS
+  LIBS=$old_LIBS
 ])

 dnl Assign INCLUDE/LFLAGS from PREFIX
@@ -26,10 +29,10 @@ dnl Standard check
 AC_DEFUN(PHP_DBA_STD_CHECK,[
  THIS_RESULT="yes"
  if test -z "$THIS_INCLUDE"; then
-    AC_MSG_ERROR(cannot find necessary header file(s))
+    AC_MSG_ERROR([DBA: Could not find necessary header file(s).])
  fi
  if test -z "$THIS_LIBS"; then
-    AC_MSG_ERROR(cannot find necessary library)
+    AC_MSG_ERROR([DBA: Could not find necessary library.])
  fi
 ])

@@ -79,13 +82,11 @@ AC_ARG_WITH(gdbm,

    if test -n "$THIS_INCLUDE"; then
      unset ac_cv_lib_gdbm_gdbm_open
-      PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
-        AC_CHECK_LIB(gdbm, gdbm_open, [
-          AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-          AC_DEFINE(DBA_GDBM, 1, [ ]) 
-          THIS_LIBS=gdbm
-        ])
-      ])
+      PHP_CHECK_LIBRARY(gdbm, gdbm_open, [
+        AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
+        AC_DEFINE(DBA_GDBM, 1, [ ]) 
+        THIS_LIBS=gdbm
+      ], [], [-L$THIS_PREFIX/lib])
    fi
    
    PHP_DBA_STD_ASSIGN
@@ -113,14 +114,14 @@ AC_ARG_WITH(ndbm,
    
    if test -n "$THIS_INCLUDE"; then
      for LIB in ndbm db1 c; do
-        PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
-          AC_CHECK_LIB($LIB, dbm_open, [
-            AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-            AC_DEFINE(DBA_NDBM,1, [ ]) 
-            THIS_LIBS=$LIB
-            break
-          ])
-        ])
+        PHP_CHECK_LIBRARY($LIB, dbm_open, [
+          AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
+          AC_DEFINE(DBA_NDBM, 1, [ ]) 
+          THIS_LIBS=$LIB
+        ], [], [-L$THIS_PREFIX/lib])
+        if test -n "$THIS_LIBS"; then
+          break
+        fi
      done
    fi

@@ -136,10 +137,15 @@ dnl parameters(version, library list, function)
 AC_DEFUN(PHP_DBA_DB_CHECK,[
  for LIB in $2; do
    if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
-      PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
-        AC_CHECK_LIB($LIB, $3, [
+      PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[
+        AC_TRY_LINK([
+#include "$THIS_INCLUDE"
+        ],[
+          $3;
+        ],[
          AC_EGREP_CPP(yes,[
 #include "$THIS_INCLUDE"
+#if DB_VERSION_MAJOR == $1
            yes
 #endif
          ],[
@@ -150,6 +156,10 @@ AC_DEFUN(PHP_DBA_DB_CHECK,[
      ])
    fi
  done
+  if test -z "$THIS_LIBS"; then
+	AC_MSG_CHECKING(for db$1 major version)
+    AC_MSG_ERROR(Header contains different version)
+  fi
  if test "$1" = "4"; then
    AC_MSG_CHECKING(for db4 minor version and patch level)
    AC_EGREP_CPP(yes,[
@@ -164,7 +174,7 @@ AC_DEFUN(PHP_DBA_DB_CHECK,[
    ])
  fi
  if test "$ext_shared" = "yes"; then
-    AC_MSG_CHECKING(if db can be used as shared extension)
+    AC_MSG_CHECKING(if dba can be used as shared extension)
    AC_EGREP_CPP(yes,[
 #include "$THIS_INCLUDE"
 #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2)
@@ -191,7 +201,7 @@ AC_ARG_WITH(db4,
 [  --with-db4[=DIR]          DBA: Include Berkeley DB4 support],[
  if test "$withval" != "no"; then
    PHP_DBA_STD_BEGIN
-    for i in $withval /usr/local/BerkeleyDB.4.1 /usr/local/BerkeleyDB.4.0 /usr/local /usr; do
+    for i in $withval /usr/local/BerkeleyDB.4.2 /usr/local/BerkeleyDB.4.1 /usr/local/BerkeleyDB.4.0 /usr/local /usr; do
      if test -f "$i/db4/db.h"; then
        THIS_PREFIX=$i
        THIS_INCLUDE=$i/db4/db.h
@@ -214,7 +224,7 @@ AC_ARG_WITH(db4,
        break
      fi
    done
-    PHP_DBA_DB_CHECK(4, db-4.1 db-4.0 db-4 db4 db, db_create)
+    PHP_DBA_DB_CHECK(4, db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
  fi
 ])
 AC_DBA_STD_RESULT(db4,Berkeley DB4)
@@ -249,9 +259,9 @@ AC_ARG_WITH(db3,
        break
      fi
    done
-    PHP_DBA_DB_CHECK(3, db-3.3 db-3.2 db-3.1 db-3.0 db-3 db3 db, db_create)
+    PHP_DBA_DB_CHECK(3, db-3.3 db-3.2 db-3.1 db-3.0 db-3 db3 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
  fi
-      ])
+])
 AC_DBA_STD_RESULT(db3,Berkeley DB3)

 AC_ARG_WITH(db2,
@@ -284,7 +294,7 @@ AC_ARG_WITH(db2,
        break
      fi
    done
-    PHP_DBA_DB_CHECK(2, db-2 db2 db, db_appinit)
+    PHP_DBA_DB_CHECK(2, db-2 db2 db, [(void)db_appinit("", NULL, (DB_ENV*)0, 0)])
  fi
 ])
 AC_DBA_STD_RESULT(db2,Berkeley DB2)
@@ -307,22 +317,22 @@ AC_ARG_WITH(dbm,

    if test -n "$THIS_INCLUDE"; then
      for LIB in dbm c gdbm; do
-        PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
-          AC_CHECK_LIB($LIB, dbminit, [
-            AC_MSG_CHECKING(for DBM using GDBM)
-            AC_DEFINE_UNQUOTED(DBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-            if test "$LIB" = "gdbm"; then
-              AC_DEFINE_UNQUOTED(DBM_VERSION, "GDBM", [ ])
-              AC_MSG_RESULT(yes)
-            else
-              AC_DEFINE_UNQUOTED(DBM_VERSION, "DBM", [ ])
-              AC_MSG_RESULT(no)
-            fi
-            AC_DEFINE(DBA_DBM,1,[ ]) 
-            THIS_LIBS=$LIB
-            break
-          ])
-        ])
+        PHP_CHECK_LIBRARY($LIB, dbminit, [
+          AC_MSG_CHECKING(for DBM using GDBM)
+          AC_DEFINE_UNQUOTED(DBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
+          if test "$LIB" = "gdbm"; then
+            AC_DEFINE_UNQUOTED(DBM_VERSION, "GDBM", [ ])
+            AC_MSG_RESULT(yes)
+          else
+            AC_DEFINE_UNQUOTED(DBM_VERSION, "DBM", [ ])
+            AC_MSG_RESULT(no)
+          fi
+          AC_DEFINE(DBA_DBM, 1, [ ]) 
+          THIS_LIBS=$LIB
+        ], [], [-L$THIS_PREFIX/lib])
+        if test -n "$THIS_LIBS"; then
+          break
+        fi
      done
    fi
    
@@ -334,7 +344,6 @@ AC_ARG_WITH(dbm,
 AC_DBA_STD_RESULT(dbm)

 AC_DEFUN(PHP_DBA_BUILTIN_CDB,[
-  PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
  AC_DEFINE(DBA_CDB_BUILTIN, 1, [ ])
  AC_DEFINE(DBA_CDB_MAKE, 1, [ ])
  AC_DEFINE(DBA_CDB, 1, [ ])
@@ -344,7 +353,7 @@ AC_DEFUN(PHP_DBA_BUILTIN_CDB,[

 AC_ARG_WITH(cdb,
 [  --with-cdb[=DIR]          DBA: Include CDB support],[
-  if test "$withval" = "yes"; then
+  if test "$withval" = "yes" -o "$HAVE_DBA" = "1"; then
    PHP_DBA_BUILTIN_CDB
  elif test "$withval" != "no"; then
    PHP_DBA_STD_BEGIN
@@ -358,14 +367,14 @@ AC_ARG_WITH(cdb,

    if test -n "$THIS_INCLUDE"; then
      for LIB in cdb c; do
-        PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
-          AC_CHECK_LIB($LIB, cdb_read, [
-            AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-            AC_DEFINE(DBA_CDB,1,[ ]) 
-            THIS_LIBS=$LIB
-            break
-          ])
-        ])
+        PHP_CHECK_LIBRARY($LIB, cdb_read, [
+          AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
+          AC_DEFINE(DBA_CDB, 1, [ ]) 
+          THIS_LIBS=$LIB
+        ], [], [-L$THIS_PREFIX/lib])
+        if test -n "$THIS_LIBS"; then
+          break
+        fi
      done
    fi
    
@@ -374,14 +383,31 @@ AC_ARG_WITH(cdb,
    PHP_DBA_STD_ATTACH
  fi
 ],[
-  if test "$PHP_DBA" != "no"; then
+  if test "$PHP_DBA" != "no" -o "$HAVE_DBA" = "1"; then
    PHP_DBA_BUILTIN_CDB
  fi
 ])
 AC_DBA_STD_RESULT(cdb)

+AC_DEFUN(PHP_DBA_BUILTIN_INI,[
+  AC_DEFINE(DBA_INIFILE, 1, [ ])
+  ini_sources="libinifile/inifile.c"
+  THIS_RESULT="builtin"
+])
+
+AC_ARG_WITH(inifile,
+[  --with-inifile            DBA: Include INI support],[
+  if test "$withval" != "no"; then
+    PHP_DBA_BUILTIN_INI
+  fi
+],[
+  if test "$PHP_DBA" != "no" -o "$HAVE_DBA" = "1"; then
+    PHP_DBA_BUILTIN_INI
+  fi
+])
+AC_DBA_STD_RESULT(inifile,INI File)
+
 AC_DEFUN(PHP_DBA_BUILTIN_FLATFILE,[
-  PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
  AC_DEFINE(DBA_FLATFILE, 1, [ ])
  flat_sources="libflatfile/flatfile.c"
  THIS_RESULT="builtin"
@@ -396,7 +422,7 @@ AC_ARG_WITH(flatfile,
    PHP_DBA_BUILTIN_FLATFILE
  fi
 ],[
-  if test "$PHP_DBA" != "no"; then
+  if test "$PHP_DBA" != "no" -o "$HAVE_DBA" = "1"; then
    PHP_DBA_BUILTIN_FLATFILE
  fi
 ])
@@ -406,7 +432,10 @@ AC_MSG_CHECKING(whether to enable DBA interface)
 if test "$HAVE_DBA" = "1"; then
  AC_MSG_RESULT(yes)
  AC_DEFINE(HAVE_DBA, 1, [ ])
-  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db3.c dba_db4.c dba_flatfile.c $cdb_sources $flat_sources, $ext_shared)
+  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c $cdb_sources $flat_sources $ini_sources, $ext_shared)
+  PHP_ADD_BUILD_DIR($ext_builddir/libinifile)
+  PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
+  PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
  PHP_SUBST(DBA_SHARED_LIBADD)
 else
  AC_MSG_RESULT(no)
@@ -27,7 +27,7 @@

 #if HAVE_DBA

-#include "ext/standard/flock_compat.h" 
+#include "php_ini.h"
 #include <stdio.h> 
 #include <fcntl.h>
 #ifdef HAVE_SYS_FILE_H
@@ -37,6 +37,7 @@
 #include "php_dba.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_string.h"
+#include "ext/standard/flock_compat.h" 

 #include "php_gdbm.h"
 #include "php_ndbm.h"
@@ -46,14 +47,13 @@
 #include "php_db3.h"
 #include "php_db4.h"
 #include "php_flatfile.h"
+#include "php_inifile.h"

 /* {{{ dba_functions[]
 */
 function_entry dba_functions[] = {
 	PHP_FE(dba_open, NULL)
-	PHP_FALIAS(dba_popen, dba_open, NULL)
-	/* Disabled until 4.3.1, when persistent STDIO streams are implemented.   */
-	/* PHP_FE(dba_popen, NULL) */
+	PHP_FE(dba_popen, NULL)
 	PHP_FE(dba_close, NULL)
 	PHP_FE(dba_delete, NULL)
 	PHP_FE(dba_exists, NULL)
@@ -105,15 +105,56 @@ ZEND_GET_MODULE(dba)
 		WRONG_PARAM_COUNT; 										\
 	}

+/* {{{ php_dba_myke_key */
+static size_t php_dba_make_key(zval **key, char **key_str, char **key_free TSRMLS_DC)
+{
+	if (Z_TYPE_PP(key) == IS_ARRAY) {
+		zval **group, **name;
+		HashPosition pos;
+		size_t len;
+	
+		if (zend_hash_num_elements(Z_ARRVAL_PP(key)) != 2) {
+			php_error_docref(NULL TSRMLS_CC, E_ERROR, "Key does not have exactly two elements: (key, name)");
+			return -1;
+		}
+		zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(key), &pos);
+		zend_hash_get_current_data_ex(Z_ARRVAL_PP(key), (void **) &group, &pos);
+		zend_hash_move_forward_ex(Z_ARRVAL_PP(key), &pos);
+		zend_hash_get_current_data_ex(Z_ARRVAL_PP(key), (void **) &name, &pos);
+		convert_to_string_ex(group);
+		convert_to_string_ex(name);
+		if (Z_STRLEN_PP(group) == 0) {
+			*key_str = Z_STRVAL_PP(name);
+			*key_free = NULL;
+			return Z_STRLEN_PP(name);
+		}
+		len = spprintf(key_str, 0, "[%s]%s", Z_STRVAL_PP(group), Z_STRVAL_PP(name));
+		*key_free = *key_str;
+		return len;
+	} else {
+		convert_to_string_ex(key);
+		*key_str = Z_STRVAL_PP(key);
+		*key_free = NULL;
+		return Z_STRLEN_PP(key);
+	}
+}
+/* }}} */
+
 #define DBA_GET2 												\
 	zval **key; 												\
+	char *key_str, *key_free;									\
+	size_t key_len; 											\
 	if(ac != 2 || zend_get_parameters_ex(ac, &key, &id) != SUCCESS) { 	\
 		WRONG_PARAM_COUNT; 										\
 	} 															\
-	convert_to_string_ex(key)
+	if ((key_len = php_dba_make_key(key, &key_str, &key_free TSRMLS_CC)) == 0) {\
+		RETURN_FALSE;											\
+	}

 #define DBA_GET2_3												\
 	zval **key; 												\
+	char *key_str, *key_free;									\
+	size_t key_len; 											\
 	zval **tmp; 												\
 	int skip = 0;  												\
 	switch(ac) {												\
@@ -132,7 +173,21 @@ ZEND_GET_MODULE(dba)
 	default:													\
 		WRONG_PARAM_COUNT; 										\
 	} 															\
-	convert_to_string_ex(key)
+	if ((key_len = php_dba_make_key(key, &key_str, &key_free TSRMLS_CC)) == 0) {\
+		RETURN_FALSE;											\
+	}
+
+#define DBA_GET3 												\
+	zval **key, **val;											\
+	char *key_str, *key_free;									\
+	size_t key_len; 											\
+	if(ac != 3 || zend_get_parameters_ex(ac, &key, &val, &id) != SUCCESS) { 	\
+		WRONG_PARAM_COUNT; 										\
+	} 															\
+	convert_to_string_ex(val);									\
+	if ((key_len = php_dba_make_key(key, &key_str, &key_free TSRMLS_CC)) == 0) {\
+		RETURN_FALSE;											\
+	}

 #define DBA_ID_GET 												\
 	ZEND_FETCH_RESOURCE2(info, dba_info *, id, -1, "DBA identifier", le_db, le_pdb);
@@ -140,7 +195,10 @@ ZEND_GET_MODULE(dba)
 #define DBA_ID_GET1   DBA_ID_PARS; DBA_GET1;   DBA_ID_GET
 #define DBA_ID_GET2   DBA_ID_PARS; DBA_GET2;   DBA_ID_GET
 #define DBA_ID_GET2_3 DBA_ID_PARS; DBA_GET2_3; DBA_ID_GET
+#define DBA_ID_GET3   DBA_ID_PARS; DBA_GET3;   DBA_ID_GET

+#define DBA_ID_DONE												\
+	if (key_free) efree(key_free)
 /* a DBA handler must have specific routines */

 #define DBA_NAMED_HND(alias, name, flags) \
@@ -188,30 +246,102 @@ static dba_handler handler[] = {
 #if DBA_DB4
 	DBA_HND(db4, DBA_LOCK_ALL) /* No lock in lib */
 #endif
+#if DBA_INIFILE
+	DBA_HND(inifile, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */
+#endif
 #if DBA_FLATFILE
 	DBA_HND(flatfile, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */
 #endif
 	{ NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 };

+#if DBA_FLATFILE
+#define DBA_DEFAULT "flatfile"
+#elif DBA_DB4
+#define DBA_DEFAULT "db4"
+#elif DBA_DB3
+#define DBA_DEFAULT "db3"
+#elif DBA_DB2
+#define DBA_DEFAULT "db2"
+#elif DBA_GDBM
+#define DBA_DEFAULT "gdbm"
+#elif DBA_NBBM
+#define DBA_DEFAULT "ndbm"
+#elif DBA_DBM
+#define DBA_DEFAULT "dbm"
+#else
+#define DBA_DEFAULT ""
+#endif
+/* cdb/cdb_make and ini are no option here */
+
+ZEND_BEGIN_MODULE_GLOBALS(dba)
+	char *default_handler;
+	dba_handler *default_hptr;
+ZEND_END_MODULE_GLOBALS(dba) 
+
+ZEND_DECLARE_MODULE_GLOBALS(dba)
+
+#ifdef ZTS
+#define DBA_G(v) TSRMG(dba_globals_id, zend_dba_globals *, v)
+#else
+#define DBA_G(v) (dba_globals.v)
+#endif 
+
 static int le_db;
 static int le_pdb;
+
+/* {{{ dba_fetch_resource
+PHPAPI void dba_fetch_resource(dba_info **pinfo, zval **id TSRMLS_DC)
+{
+	dba_info *info;
+	DBA_ID_FETCH
+	*pinfo = info;
+}
+*/
+/* }}} */
+
+/* {{{ dba_get_handler
+PHPAPI dba_handler *dba_get_handler(const char* handler_name)
+{
+	dba_handler *hptr;
+	for (hptr = handler; hptr->name && strcasecmp(hptr->name, handler_name); hptr++);
+	return hptr;
+}
+*/
 /* }}} */

 /* {{{ dba_close 
 */ 
 static void dba_close(dba_info *info TSRMLS_DC)
 {
-	if (info->hnd) info->hnd->close(info TSRMLS_CC);
-	if (info->path) pefree(info->path, info->flags&DBA_PERSISTENT);
-	if (info->fp && info->fp!=info->lock.fp) php_stream_close(info->fp);
+	if (info->hnd) {
+		info->hnd->close(info TSRMLS_CC);
+	}
+	if (info->path) {
+		pefree(info->path, info->flags&DBA_PERSISTENT);
+	}
+	if (info->fp && info->fp!=info->lock.fp) {
+		if(info->flags&DBA_PERSISTENT) {
+			php_stream_pclose(info->fp);
+		} else {
+			php_stream_close(info->fp);
+		}
+	}
 	if (info->lock.fd) {
 		php_flock(info->lock.fd, LOCK_UN);
 		/*close(info->lock.fd);*/
 		info->lock.fd = 0;
 	}
-	if (info->lock.fp) php_stream_close(info->lock.fp);
-	if (info->lock.name) pefree(info->lock.name, info->flags&DBA_PERSISTENT);
+	if (info->lock.fp) {
+		if(info->flags&DBA_PERSISTENT) {
+			php_stream_pclose(info->lock.fp);
+		} else {
+			php_stream_close(info->lock.fp);
+		}
+	}
+	if (info->lock.name) {
+		pefree(info->lock.name, info->flags&DBA_PERSISTENT);
+	}
 	pefree(info, info->flags&DBA_PERSISTENT);
 }
 /* }}} */
@@ -221,17 +351,71 @@ static void dba_close(dba_info *info TSRMLS_DC)
 static void dba_close_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 {
 	dba_info *info = (dba_info *)rsrc->ptr; 
-	
+
 	dba_close(info TSRMLS_CC);
 }
 /* }}} */

+/* {{{ dba_close_pe_rsrc_deleter */
+int dba_close_pe_rsrc_deleter(list_entry *le, void *pDba TSRMLS_DC)
+{
+	return le->ptr == pDba;
+}
+/* }}} */
+
+/* {{{ dba_close_pe_rsrc */
+static void dba_close_pe_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+	dba_info *info = (dba_info *)rsrc->ptr; 
+
+	/* closes the resource by calling dba_close_rsrc() */
+	zend_hash_apply_with_argument(&EG(persistent_list), (apply_func_arg_t) dba_close_pe_rsrc_deleter, info TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ PHP_INI
+ */
+ZEND_INI_MH(OnUpdateDefaultHandler)
+{
+	dba_handler *hptr;
+
+	if (!strlen(new_value)) {
+		DBA_G(default_hptr) = NULL;
+		return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+	}
+
+	for (hptr = handler; hptr->name && strcasecmp(hptr->name, new_value); hptr++);
+
+	if (!hptr->name) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such handler: %s", new_value);
+		return FAILURE;
+	}
+	DBA_G(default_hptr) = hptr;
+	return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+}
+
+PHP_INI_BEGIN()
+    STD_PHP_INI_ENTRY("dba.default_handler", DBA_DEFAULT, PHP_INI_ALL, OnUpdateDefaultHandler, default_handler,    zend_dba_globals, dba_globals)
+PHP_INI_END()
+/* }}} */
+ 
+/* {{{ php_dba_init_globals
+ */
+static void php_dba_init_globals(zend_dba_globals *dba_globals)
+{
+	dba_globals->default_handler = "";
+	dba_globals->default_hptr    = NULL;
+}
+/* }}} */
+
 /* {{{ PHP_MINIT_FUNCTION
 */
 PHP_MINIT_FUNCTION(dba)
 {
+	ZEND_INIT_MODULE_GLOBALS(dba, php_dba_init_globals, NULL);
+	REGISTER_INI_ENTRIES();
 	le_db = zend_register_list_destructors_ex(dba_close_rsrc, NULL, "dba", module_number);
-	le_pdb = zend_register_list_destructors_ex(NULL, dba_close_rsrc, "dba persistent", module_number);
+	le_pdb = zend_register_list_destructors_ex(dba_close_pe_rsrc, dba_close_rsrc, "dba persistent", module_number);
 	return SUCCESS;
 }
 /* }}} */
@@ -240,6 +424,7 @@ PHP_MINIT_FUNCTION(dba)
 */
 PHP_MSHUTDOWN_FUNCTION(dba)
 {
+	UNREGISTER_INI_ENTRIES();
 	return SUCCESS;
 }
 /* }}} */
@@ -275,17 +460,9 @@ PHP_MINFO_FUNCTION(dba)
 */
 static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
-	DBA_ID_PARS;
-	zval **val, **key;
 	char *v;
 	int len;
-
-	if(ac != 3 || zend_get_parameters_ex(ac, &key, &val, &id) != SUCCESS) {
-		WRONG_PARAM_COUNT;
-	}
-	convert_to_string_ex(key);
-	convert_to_string_ex(val);
-	DBA_ID_GET;
+	DBA_ID_GET3;

 	DBA_WRITE_CHECK;
 	
@@ -293,15 +470,20 @@ static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
 		len = Z_STRLEN_PP(val);
 		v = estrndup(Z_STRVAL_PP(val), len);
 		php_stripslashes(v, &len TSRMLS_CC); 
-		if(info->hnd->update(info, VALLEN(key), v, len, mode TSRMLS_CC) == SUCCESS) {
+		if(info->hnd->update(info, key_str, key_len, v, len, mode TSRMLS_CC) == SUCCESS) {
 			efree(v);
+			DBA_ID_DONE;
 			RETURN_TRUE;
 		}
 		efree(v);
 	} else {
-		if(info->hnd->update(info, VALLEN(key), VALLEN(val), mode TSRMLS_CC) == SUCCESS)
+		if(info->hnd->update(info, key_str, key_len, VALLEN(val), mode TSRMLS_CC) == SUCCESS)
+		{
+			DBA_ID_DONE;
 			RETURN_TRUE;
+		}
 	}
+	DBA_ID_DONE;
 	RETURN_FALSE;
 }
 /* }}} */
@@ -348,13 +530,14 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 	int lock_mode, lock_flag, lock_dbf = 0;
 	char *file_mode;
 	char mode[4], *pmode, *lock_file_mode = NULL;
+	int persistent_flag = persistent ? STREAM_OPEN_PERSISTENT : 0;
 	
-	if(ac < 3) {
+	if(ac < 2) {
 		WRONG_PARAM_COUNT;
 	}
 	
 	/* we pass additional args to the respective handler */
-	args = emalloc(ac * sizeof(zval *));
+	args = safe_emalloc(ac, sizeof(zval *), 0);
 	if (zend_get_parameters_array_ex(ac, args) != SUCCESS) {
 		FREENOW;
 		WRONG_PARAM_COUNT;
@@ -370,7 +553,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 		list_entry *le;
 		
 		/* calculate hash */
-		key = emalloc(keylen);
+		key = safe_emalloc(keylen, 1, 1);
+		key[keylen] = '\0';
 		keylen = 0;
 		
 		for(i = 0; i < ac; i++) {
@@ -393,7 +577,16 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 		}
 	}
 	
-	for (hptr = handler; hptr->name && strcasecmp(hptr->name, Z_STRVAL_PP(args[2])); hptr++);
+	if (ac==2) {
+		hptr = DBA_G(default_hptr);
+		if (!hptr) {
+			php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), Z_STRVAL_PP(args[1]), E_WARNING, "No default handler selected");
+			FREENOW;
+			RETURN_FALSE;
+		}
+	} else {
+		for (hptr = handler; hptr->name && strcasecmp(hptr->name, Z_STRVAL_PP(args[2])); hptr++);
+	}

 	if (!hptr->name) {
 		php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), Z_STRVAL_PP(args[1]), E_WARNING, "No such handler: %s", Z_STRVAL_PP(args[2]));
@@ -455,20 +648,39 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			lock_mode = (lock_flag & DBA_LOCK_WRITER) ? LOCK_EX : 0;
 			file_mode = "r+b";
 			break;
+		case 'c': 
+			modenr = DBA_CREAT; 
+			lock_mode = (lock_flag & DBA_LOCK_CREAT) ? LOCK_EX : 0;
+			if (lock_mode) {
+				if (lock_dbf) {
+					/* the create/append check will be done on the lock
+					 * when the lib opens the file it is already created
+					 */
+					file_mode = "r+b";       /* read & write, seek 0 */
+					lock_file_mode = "a+b";  /* append */
+				} else {
+					file_mode = "a+b";       /* append */
+					lock_file_mode = "w+b";  /* create/truncate */
+				}
+			} else {
+			file_mode = "a+b";
+			}
+			/* In case of the 'a+b' append mode, the handler is responsible 
+			 * to handle any rewind problems (see flatfile handler).
+			 */
+			break;
 		case 'n':
 			modenr = DBA_TRUNC;
 			lock_mode = (lock_flag & DBA_LOCK_TRUNC) ? LOCK_EX : 0;
 			file_mode = "w+b";
 			break;
-		case 'c': 
-			modenr = DBA_CREAT; 
-			lock_mode = (lock_flag & DBA_LOCK_CREAT) ? LOCK_EX : 0;
-			file_mode = "a+b";
-			break;
 		default:
-			modenr = 0;
-			lock_mode = 0;
-			file_mode = "";
+			php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), Z_STRVAL_PP(args[1]), E_WARNING, "Illegal DBA mode");
+			FREENOW;
+			RETURN_FALSE;
+	}
+	if (!lock_file_mode) {
+		lock_file_mode = file_mode;
 	}
 	if (*pmode=='d' || *pmode=='l' || *pmode=='-') {
 		pmode++; /* done already - skip here */
@@ -476,7 +688,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 	if (*pmode=='t') {
 		pmode++;
 		if (!lock_flag) {
-			php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), Z_STRVAL_PP(args[1]), E_WARNING, "You cannot combine modifiers - (no lock) and t (test lock)", hptr->name);
+			php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), Z_STRVAL_PP(args[1]), E_WARNING, "You cannot combine modifiers - (no lock) and t (test lock)");
 			FREENOW;
 			RETURN_FALSE;
 		}
@@ -494,7 +706,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			lock_mode |= LOCK_NB; /* test =: non blocking */
 		}
 	}
-	if (*pmode || !modenr) {
+	if (*pmode) {
 		php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), Z_STRVAL_PP(args[1]), E_WARNING, "Illegal DBA mode");
 		FREENOW;
 		RETURN_FALSE;
@@ -526,14 +738,13 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 	if (!error && lock_mode) {
 		if (lock_dbf) {
 			info->lock.name = pestrdup(info->path, persistent);
-			lock_file_mode = file_mode;
 		} else {
 			spprintf(&info->lock.name, 0, "%s.lck", info->path);
 			if (!strcmp(file_mode, "r")) {
 				/* when in read only mode try to use existing .lck file first */
 				/* do not log errors for .lck file while in read ony mode on .lck file */
 				lock_file_mode = "rb";
-				info->lock.fp = php_stream_open_wrapper(info->lock.name, lock_file_mode, STREAM_MUST_SEEK|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
+				info->lock.fp = php_stream_open_wrapper(info->lock.name, lock_file_mode, STREAM_MUST_SEEK|IGNORE_PATH|ENFORCE_SAFE_MODE|persistent_flag, NULL);
 			}
 			if (!info->lock.fp) {
 				/* when not in read mode or failed to open .lck file read only. now try again in create(write) mode and log errors */
@@ -541,7 +752,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			}
 		}
 		if (!info->lock.fp) {
-			info->lock.fp = php_stream_open_wrapper(info->lock.name, lock_file_mode, STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
+			info->lock.fp = php_stream_open_wrapper(info->lock.name, lock_file_mode, STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE|persistent_flag, NULL);
 		}
 		if (!info->lock.fp) {
 			dba_close(info TSRMLS_CC);
@@ -549,13 +760,13 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			FREENOW;
 			RETURN_FALSE;
 		}
-		if (php_stream_cast(info->lock.fp, PHP_STREAM_AS_FD, (void*)&info->lock.fd, 1) == FAILURE)	{
+		if (php_stream_cast(info->lock.fp, PHP_STREAM_AS_FD, (void*)&info->lock.fd, 1) == FAILURE) {
 			dba_close(info TSRMLS_CC);
 			/* stream operation already wrote an error message */
 			FREENOW;
 			RETURN_FALSE;
 		}
-		if (php_flock(info->lock.fd, lock_mode)) {
+		if (php_flock(info->lock.fd, lock_mode)) {		
 			error = "Unable to establish lock"; /* force failure exit */
 		}
 	}
@@ -565,7 +776,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 		if (info->lock.fp && lock_dbf) {
 			info->fp = info->lock.fp; /* use the same stream for locking and database access */
 		} else {
-			info->fp = php_stream_open_wrapper(info->path, file_mode, STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
+			info->fp = php_stream_open_wrapper(info->path, file_mode, STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE|persistent_flag, NULL);
 		}
 		if (!info->fp) {
 			dba_close(info TSRMLS_CC);
@@ -592,6 +803,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 		Z_TYPE(new_le) = le_pdb;
 		new_le.ptr = info;
 		if (zend_hash_update(&EG(persistent_list), key, keylen+1, &new_le, sizeof(list_entry), NULL) == FAILURE) {
+			dba_close(info TSRMLS_CC);
+			php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), Z_STRVAL_PP(args[1]), E_WARNING, "Could not register persistent resource");
 			FREENOW;
 			RETURN_FALSE;
 		}
@@ -603,7 +816,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 /* }}} */
 #undef FREENOW

-/* {{{ proto int dba_popen(string path, string mode, string handlername [, string ...])
+/* {{{ proto resource dba_popen(string path, string mode [, string handlername, string ...])
   Opens path using the specified handler in mode persistently */
 PHP_FUNCTION(dba_popen)
 {
@@ -611,7 +824,7 @@ PHP_FUNCTION(dba_popen)
 }
 /* }}} */

-/* {{{ proto int dba_open(string path, string mode, string handlername [, string ...])
+/* {{{ proto resource dba_open(string path, string mode [, string handlername, string ...])
   Opens path using the specified handler in mode*/
 PHP_FUNCTION(dba_open)
 {
@@ -629,20 +842,22 @@ PHP_FUNCTION(dba_close)
 }
 /* }}} */

-/* {{{ proto bool dba_exists(string key, int handle)
+/* {{{ proto bool dba_exists(string key, resource handle)
   Checks, if the specified key exists */
 PHP_FUNCTION(dba_exists)
 {
 	DBA_ID_GET2;

-	if(info->hnd->exists(info, VALLEN(key) TSRMLS_CC) == SUCCESS) {
+	if(info->hnd->exists(info, key_str, key_len TSRMLS_CC) == SUCCESS) {
+		DBA_ID_DONE;
 		RETURN_TRUE;
 	}
+	DBA_ID_DONE;
 	RETURN_FALSE;
 }
 /* }}} */

-/* {{{ proto string dba_fetch(string key, [int skip ,] int handle)
+/* {{{ proto string dba_fetch(string key, [int skip ,] resource handle)
   Fetches the data associated with key */
 PHP_FUNCTION(dba_fetch)
 {
@@ -650,20 +865,43 @@ PHP_FUNCTION(dba_fetch)
 	int len = 0;
 	DBA_ID_GET2_3;

-	if (ac==3 && strcmp(info->hnd->name, "cdb")) {
-		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Handler %s does not support optional skip parameter", info->hnd->name);
+	if (ac==3) {
+		if (!strcmp(info->hnd->name, "cdb")) {
+			if (skip < 0) {
+				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Handler %s accepts only skip values greater than or equal to zero, using skip=0", info->hnd->name);
+				skip = 0;
+			}
+		} else if (!strcmp(info->hnd->name, "inifile")) {
+			/* "-1" is compareable to 0 but allows a non restrictive 
+			 * access which is fater. For example 'inifile' uses this
+			 * to allow faster access when the key was already found
+			 * using firstkey/nextkey. However explicitly setting the
+			 * value to 0 ensures the first value. 
+			 */
+			if (skip < -1) {
+				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Handler %s accepts only skip value -1 and greater, using skip=0", info->hnd->name);
+				skip = 0;
+			}
+		} else {
+			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Handler %s does not support optional skip parameter, the value will be ignored", info->hnd->name);
+			skip = 0;			
+		}
+	} else {
+		skip = 0; 
 	}
-	if((val = info->hnd->fetch(info, VALLEN(key), skip, &len TSRMLS_CC)) != NULL) {
+	if((val = info->hnd->fetch(info, key_str, key_len, skip, &len TSRMLS_CC)) != NULL) {
 		if (val && PG(magic_quotes_runtime)) {
 			val = php_addslashes(val, len, &len, 1 TSRMLS_CC);
 		}
+		DBA_ID_DONE;
 		RETURN_STRINGL(val, len, 0);
 	} 
+	DBA_ID_DONE;
 	RETURN_FALSE;
 }
 /* }}} */

-/* {{{ proto string dba_firstkey(int handle)
+/* {{{ proto string dba_firstkey(resource handle)
   Resets the internal key pointer and returns the first key */
 PHP_FUNCTION(dba_firstkey)
 {
@@ -678,7 +916,7 @@ PHP_FUNCTION(dba_firstkey)
 }
 /* }}} */

-/* {{{ proto string dba_nextkey(int handle)
+/* {{{ proto string dba_nextkey(resource handle)
   Returns the next key */
 PHP_FUNCTION(dba_nextkey)
 {
@@ -693,37 +931,44 @@ PHP_FUNCTION(dba_nextkey)
 }
 /* }}} */

-/* {{{ proto bool dba_delete(string key, int handle)
-   Deletes the entry associated with key */
+/* {{{ proto bool dba_delete(string key, resource handle)
+   Deletes the entry associated with key
+   If inifile: remove all other key lines */
 PHP_FUNCTION(dba_delete)
 {
 	DBA_ID_GET2;
 	
 	DBA_WRITE_CHECK;
 	
-	if(info->hnd->delete(info, VALLEN(key) TSRMLS_CC) == SUCCESS)
+	if(info->hnd->delete(info, key_str, key_len TSRMLS_CC) == SUCCESS)
+	{
+		DBA_ID_DONE;
 		RETURN_TRUE;
+	}
+	DBA_ID_DONE;
 	RETURN_FALSE;
 }
 /* }}} */

-/* {{{ proto bool dba_insert(string key, string value, int handle)
-   Inserts value as key, returns false, if key exists already */
+/* {{{ proto bool dba_insert(string key, string value, resource handle)
+   If not inifile: Insert value as key, return false, if key exists already 
+   If inifile: Add vakue as key (next instance of key) */
 PHP_FUNCTION(dba_insert)
 {
 	php_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 }
 /* }}} */

-/* {{{ proto bool dba_replace(string key, string value, int handle)
-   Inserts value as key, replaces key, if key exists already */
+/* {{{ proto bool dba_replace(string key, string value, resource handle)
+   Inserts value as key, replaces key, if key exists already
+   If inifile: remove all other key lines */
 PHP_FUNCTION(dba_replace)
 {
 	php_dba_update(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
 /* }}} */

-/* {{{ proto bool dba_optimize(int handle)
+/* {{{ proto bool dba_optimize(resource handle)
   Optimizes (e.g. clean up, vacuum) database */
 PHP_FUNCTION(dba_optimize)
 {
@@ -737,7 +982,7 @@ PHP_FUNCTION(dba_optimize)
 }
 /* }}} */

-/* {{{ proto bool dba_sync(int handle)
+/* {{{ proto bool dba_sync(resource handle)
   Synchronizes database */
 PHP_FUNCTION(dba_sync)
 {
@@ -751,7 +996,7 @@ PHP_FUNCTION(dba_sync)
 /* }}} */

 /* {{{ proto array dba_handlers([bool full_info])
-   List configured databases */
+   List configured database handlers */
 PHP_FUNCTION(dba_handlers)
 {
 	dba_handler *hptr;
@@ -775,7 +1020,7 @@ PHP_FUNCTION(dba_handlers)
 /* }}} */

 /* {{{ proto array dba_list()
-   List configured databases */
+   List opened databases */
 PHP_FUNCTION(dba_list)
 {
 	ulong numitems, i;
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_DBA" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DBA=1 /D DBA_DB3=1 /D DB3_INCLUDE_FILE="db.h" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=0 /D DBA_DB3=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_DBA" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DBA=1 /D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=0 /D DBA_DB3=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_DBA" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DBA=1 /D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /D DBA_INIFILE=1 /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_DBA" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DBA=1 /D "DBA_DB3" /D DB3_INCLUDE_FILE="db.h" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "DBA_DB3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_DBA" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DBA=1 /D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "DBA_DB3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_DBA" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DBA=1 /D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /D DBA_INIFILE=1 /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -130,6 +130,10 @@ SOURCE=.\dba_gdbm.c
 # End Source File
 # Begin Source File

+SOURCE=.\dba_inifile.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\dba_ndbm.c
 # End Source File
 # Begin Source File
@@ -138,6 +142,10 @@ SOURCE=.\libflatfile\flatfile.c
 # End Source File
 # Begin Source File

+SOURCE=.\libinifile\inifile.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\libcdb\uint32.c
 # End Source File
 # End Group
@@ -186,12 +194,20 @@ SOURCE=.\php_gdbm.h
 # End Source File
 # Begin Source File

+SOURCE=.\php_inifile.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\php_ndbm.h
 # End Source File
 # Begin Source File

 SOURCE=.\libcdb\uint32.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\libinifile\inifile.h
+# End Source File
 # End Group
 # End Target
 # End Project
@@ -86,10 +86,10 @@ DBA_OPEN_FUNC(cdb)
 			break;
 #if DBA_CDB_BUILTIN
 		case DBA_TRUNC:
-		case DBA_CREAT:
 			make = 1;
 			file = info->fp;
 			break;
+		case DBA_CREAT:
 		case DBA_WRITER:
 			*error = "Update operations are not supported";
 			return FAILURE; /* not supported */
@@ -163,7 +163,7 @@ DBA_FETCH_FUNC(cdb)
 			}
 		}
 		len = cdb_datalen(&cdb->c);
-		new_entry = emalloc(len+1);
+		new_entry = safe_emalloc(len, 1, 1);
 		
 		if (php_cdb_read(&cdb->c, new_entry, len, cdb_datapos(&cdb->c)) == -1) {
 			efree(new_entry);
@@ -268,7 +268,7 @@ DBA_FIRSTKEY_FUNC(cdb)
 	uint32_unpack(buf, &klen);
 	uint32_unpack(buf + 4, &dlen);

-	key = emalloc(klen + 1);
+	key = safe_emalloc(klen, 1, 1);
 	if (cdb_file_read(cdb->file, key, klen) < klen) {
 		efree(key);
 		key = NULL;
@@ -300,7 +300,7 @@ DBA_NEXTKEY_FUNC(cdb)
 	uint32_unpack(buf, &klen);
 	uint32_unpack(buf + 4, &dlen);
 	
-	key = emalloc(klen + 1);
+	key = safe_emalloc(klen, 1, 1);
 	if (cdb_file_read(cdb->file, key, klen) < klen) {
 		efree(key);
 		key = NULL;
@@ -53,6 +53,10 @@ DBA_OPEN_FUNC(db2)
 	struct stat check_stat;
 	int s = VCWD_STAT(info->path, &check_stat);

+	if (!s && !check_stat.st_size) {
+		info->mode = DBA_TRUNC; /* force truncate */
+	}
+
 	type = info->mode == DBA_READER ? DB_UNKNOWN :
 		info->mode == DBA_TRUNC ? DB_BTREE :
 		s ? DB_BTREE : DB_UNKNOWN;
@@ -62,9 +62,13 @@ DBA_OPEN_FUNC(db3)
 	struct stat check_stat;
 	int s = VCWD_STAT(info->path, &check_stat);

-	type =  info->mode == DBA_READER ? DB_UNKNOWN :
+	if (!s && !check_stat.st_size) {
+		info->mode = DBA_TRUNC; /* force truncate */
+	}
+
+	type = info->mode == DBA_READER ? DB_UNKNOWN :
 		info->mode == DBA_TRUNC ? DB_BTREE :
-		s? DB_BTREE : DB_UNKNOWN;
+		s ? DB_BTREE : DB_UNKNOWN;
 	  
 	gmode = info->mode == DBA_READER ? DB_RDONLY :
 		(info->mode == DBA_CREAT && s) ? DB_CREATE : 
@@ -62,9 +62,13 @@ DBA_OPEN_FUNC(db4)
 	struct stat check_stat;
 	int s = VCWD_STAT(info->path, &check_stat);

-	type =  info->mode == DBA_READER ? DB_UNKNOWN :
+	if (!s && !check_stat.st_size) {
+		info->mode = DBA_TRUNC; /* force truncate */
+	}
+
+	type = info->mode == DBA_READER ? DB_UNKNOWN :
 		info->mode == DBA_TRUNC ? DB_BTREE :
-		s? DB_BTREE : DB_UNKNOWN;
+		s ? DB_BTREE : DB_UNKNOWN;
 	  
 	gmode = info->mode == DBA_READER ? DB_RDONLY :
 		(info->mode == DBA_CREAT && s) ? DB_CREATE : 
@@ -41,6 +41,25 @@

 DBA_OPEN_FUNC(flatfile)
 {
+	int fd;
+#ifdef F_SETFL
+	int flags;
+#endif
+
+	if (info->mode != DBA_READER) {
+		if (SUCCESS != php_stream_cast(info->fp, PHP_STREAM_AS_FD, (void*)&fd, 1)) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not cast stream");
+			return FAILURE;
+		}
+#ifdef F_SETFL
+		/* Needed becasue some systems do not allow to write to the original 
+		 * file contents with O_APPEND being set.
+		 */
+		flags = fcntl(fd, F_SETFL);
+		fcntl(fd, F_SETFL, flags & ~O_APPEND);
+#endif
+	}
+
 	info->dbf = pemalloc(sizeof(flatfile), info->flags&DBA_PERSISTENT);
 	memset(info->dbf, 0, sizeof(flatfile));

@@ -53,8 +72,9 @@ DBA_CLOSE_FUNC(flatfile)
 {
 	FLATFILE_DATA;

-	if (dba->nextkey.dptr)
+	if (dba->nextkey.dptr) {
 		efree(dba->nextkey.dptr);
+	}
 	pefree(dba, info->flags&DBA_PERSISTENT);
 }

@@ -67,8 +87,10 @@ DBA_FETCH_FUNC(flatfile)
 	FLATFILE_GKEY;

 	gval = flatfile_fetch(dba, gkey TSRMLS_CC);
-	if(gval.dptr) {
-		if(newlen) *newlen = gval.dsize;
+	if (gval.dptr) {
+		if (newlen) {
+			*newlen = gval.dsize;
+		}
 		new = estrndup(gval.dptr, gval.dsize);
 		efree(gval.dptr);
 	}
@@ -104,7 +126,7 @@ DBA_EXISTS_FUNC(flatfile)
 	FLATFILE_GKEY;
 	
 	gval = flatfile_fetch(dba, gkey TSRMLS_CC);
-	if(gval.dptr) {
+	if (gval.dptr) {
 		efree(gval.dptr);
 		return SUCCESS;
 	}
@@ -122,12 +144,14 @@ DBA_FIRSTKEY_FUNC(flatfile)
 {
 	FLATFILE_DATA;

-	if (dba->nextkey.dptr)
+	if (dba->nextkey.dptr) {
 		efree(dba->nextkey.dptr);
+	}
 	dba->nextkey = flatfile_firstkey(dba TSRMLS_CC);
-	if(dba->nextkey.dptr) {
-		if(newlen) 
+	if (dba->nextkey.dptr) {
+		if (newlen)  {
 			*newlen = dba->nextkey.dsize;
+		}
 		return estrndup(dba->nextkey.dptr, dba->nextkey.dsize);
 	}
 	return NULL;
@@ -137,15 +161,18 @@ DBA_NEXTKEY_FUNC(flatfile)
 {
 	FLATFILE_DATA;
 	
-	if(!dba->nextkey.dptr) 
+	if (!dba->nextkey.dptr) {
 		return NULL;
+	}
 	
-	if (dba->nextkey.dptr)
+	if (dba->nextkey.dptr) {
 		efree(dba->nextkey.dptr);
+	}
 	dba->nextkey = flatfile_nextkey(dba TSRMLS_CC);
-	if(dba->nextkey.dptr) {
-		if(newlen) 
+	if (dba->nextkey.dptr) {
+		if (newlen) {
 			*newlen = dba->nextkey.dsize;
+		}
 		return estrndup(dba->nextkey.dptr, dba->nextkey.dsize);
 	}
 	return NULL;
@@ -40,7 +40,12 @@
 	inifile *dba = info->dbf

 #define INIFILE_GKEY \
-	key_type ini_key = inifile_key_split((char*)key) /* keylen not needed here */
+	key_type ini_key; \
+	if (!key) { \
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No key specified"); \
+		return 0; \
+	} \
+	ini_key = inifile_key_split((char*)key) /* keylen not needed here */

 #define INIFILE_DONE \
 	inifile_key_free(&ini_key)
@@ -119,9 +124,12 @@ DBA_EXISTS_FUNC(inifile)

 DBA_DELETE_FUNC(inifile)
 {
+	int res;
+
 	INIFILE_DATA;
 	INIFILE_GKEY;
-	int res =  inifile_delete(dba, &ini_key TSRMLS_CC);
+
+	res =  inifile_delete(dba, &ini_key TSRMLS_CC);

 	INIFILE_DONE;
 	return (res == -1 ? FAILURE : SUCCESS);
@@ -79,8 +79,7 @@ int cdb_make_addend(struct cdb_make *c, unsigned int keylen, unsigned int datale

 	head = c->head;
 	if (!head || (head->num >= CDB_HPLIST)) {
-		head = (struct cdb_hplist *)
-			emalloc(sizeof(struct cdb_hplist));
+		head = (struct cdb_hplist *) emalloc(sizeof(struct cdb_hplist));
 		if (!head)
 			return -1;
 		head->num = 0;
@@ -172,8 +171,7 @@ int cdb_make_finish(struct cdb_make *c TSRMLS_DC)
 		return -1;
 	}

-	c->split = (struct cdb_hp *)
-		emalloc(memsize * sizeof(struct cdb_hp));
+	c->split = (struct cdb_hp *) safe_emalloc(memsize, sizeof(struct cdb_hp), 0);
 	if (!c->split)
 		return -1;

@@ -38,6 +38,8 @@

 #include "flatfile.h"

+#define FLATFILE_BLOCK_SIZE 1024
+
 /*
 * ret = -1 means that database was opened for read-only
 * ret = 0  success
@@ -54,21 +56,25 @@ int flatfile_store(flatfile *dba, datum key_datum, datum value_datum, int mode T
 		php_stream_seek(dba->fp, 0L, SEEK_END);
 		php_stream_printf(dba->fp TSRMLS_CC, "%d\n", key_datum.dsize);
 		php_stream_flush(dba->fp);
-		if (php_stream_write(dba->fp, key_datum.dptr, key_datum.dsize) < key_datum.dsize)
+		if (php_stream_write(dba->fp, key_datum.dptr, key_datum.dsize) < key_datum.dsize) {
 			return -1;
+		}
 		php_stream_printf(dba->fp TSRMLS_CC, "%d\n", value_datum.dsize);
 		php_stream_flush(dba->fp);
-		if (php_stream_write(dba->fp, value_datum.dptr, value_datum.dsize) < value_datum.dsize)
+		if (php_stream_write(dba->fp, value_datum.dptr, value_datum.dsize) < value_datum.dsize) {
 			return -1;
-	} else { /* DBM_REPLACE */
+		}
+	} else { /* FLATFILE_REPLACE */
 		flatfile_delete(dba, key_datum TSRMLS_CC);
 		php_stream_printf(dba->fp TSRMLS_CC, "%d\n", key_datum.dsize);
 		php_stream_flush(dba->fp);
-		if (php_stream_write(dba->fp, key_datum.dptr, key_datum.dsize) < key_datum.dsize)
+		if (php_stream_write(dba->fp, key_datum.dptr, key_datum.dsize) < key_datum.dsize) {
 			return -1;
+		}
 		php_stream_printf(dba->fp TSRMLS_CC, "%d\n", value_datum.dsize);
-		if (php_stream_write(dba->fp, value_datum.dptr, value_datum.dsize) < value_datum.dsize)
+		if (php_stream_write(dba->fp, value_datum.dptr, value_datum.dsize) < value_datum.dsize) {
 			return -1;
+		}
 	}

 	php_stream_flush(dba->fp);
@@ -80,25 +86,16 @@ int flatfile_store(flatfile *dba, datum key_datum, datum value_datum, int mode T
 */
 datum flatfile_fetch(flatfile *dba, datum key_datum TSRMLS_DC) {
 	datum value_datum = {NULL, 0};
-	size_t num=0;
-	size_t buf_size = 1024;
-	char *buf;	
+	char buf[16];

 	if (flatfile_findkey(dba, key_datum TSRMLS_CC)) {
-		buf = emalloc((buf_size+1) * sizeof(char));
-		if (php_stream_gets(dba->fp, buf, 15)) {
-			num = atoi(buf);
-			if (num > buf_size) {
-				buf_size+=num;
-				buf = erealloc(buf, (buf_size+1)*sizeof(char));
-			}
-			php_stream_read(dba->fp, buf, num);
-			value_datum.dptr = buf;
-			value_datum.dsize = num;
+		if (php_stream_gets(dba->fp, buf, sizeof(buf))) {
+			value_datum.dsize = atoi(buf);
+			value_datum.dptr = safe_emalloc(value_datum.dsize, 1, 1);
+			value_datum.dsize = php_stream_read(dba->fp, value_datum.dptr, value_datum.dsize);
 		} else {
 			value_datum.dptr = NULL;
 			value_datum.dsize = 0;
-			efree(buf);
 		}
 	}
 	return value_datum;
@@ -110,57 +107,55 @@ datum flatfile_fetch(flatfile *dba, datum key_datum TSRMLS_DC) {
 int flatfile_delete(flatfile *dba, datum key_datum TSRMLS_DC) {
 	char *key = key_datum.dptr;
 	size_t size = key_datum.dsize;
-
-	char *buf;
+	size_t buf_size = FLATFILE_BLOCK_SIZE;
+	char *buf = emalloc(buf_size);
 	size_t num;
-	size_t buf_size = 1024;
 	size_t pos;

 	php_stream_rewind(dba->fp);
-
-	buf = emalloc((buf_size + 1)*sizeof(char));
 	while(!php_stream_eof(dba->fp)) {
 		/* read in the length of the key name */
-		if (!php_stream_gets(dba->fp, buf, 15))
+		if (!php_stream_gets(dba->fp, buf, 15)) {
 			break;
+		}
 		num = atoi(buf);
-		if (num > buf_size) {
-			buf_size += num;
-			buf = erealloc(buf, (buf_size+1)*sizeof(char));
+		if (num >= buf_size) {
+			buf_size = num + FLATFILE_BLOCK_SIZE;
+			buf = erealloc(buf, buf_size);
 		}
 		pos = php_stream_tell(dba->fp);

 		/* read in the key name */
-		num = php_stream_read(dba->fp, buf, sizeof(char)*num);
-		if (num<0) 
+		num = php_stream_read(dba->fp, buf, num);
+		if (num < 0)  {
 			break;
-		*(buf+num) = '\0';
+		}

 		if (size == num && !memcmp(buf, key, size)) {
 			php_stream_seek(dba->fp, pos, SEEK_SET);
 			php_stream_putc(dba->fp, 0);
 			php_stream_flush(dba->fp);
 			php_stream_seek(dba->fp, 0L, SEEK_END);
-			if (buf) 
-				efree(buf);
+			efree(buf);
 			return SUCCESS;
 		}	

 		/* read in the length of the value */
-		if (!php_stream_gets(dba->fp, buf, 15))
+		if (!php_stream_gets(dba->fp, buf, 15)) {
 			break;
+		}
 		num = atoi(buf);
-		if (num > buf_size) {
-			buf_size+=num;
-			buf = erealloc(buf, (buf_size+1)*sizeof(char));
+		if (num >= buf_size) {
+			buf_size = num + FLATFILE_BLOCK_SIZE;
+			buf = erealloc(buf, buf_size);
 		}
 		/* read in the value */
-		num = php_stream_read(dba->fp, buf, sizeof(char)*num);
-		if (num<0)
+		num = php_stream_read(dba->fp, buf, num);
+		if (num < 0) {
 			break;
+		}
 	}
-	if (buf) 
-		efree(buf);
+	efree(buf);
 	return FAILURE;
 }	
 /* }}} */
@@ -168,130 +163,144 @@ int flatfile_delete(flatfile *dba, datum key_datum TSRMLS_DC) {
 /* {{{ flatfile_findkey
 */
 int flatfile_findkey(flatfile *dba, datum key_datum TSRMLS_DC) {
-	char *buf = NULL;
+	size_t buf_size = FLATFILE_BLOCK_SIZE;
+	char *buf = emalloc(buf_size);
 	size_t num;
-	size_t buf_size = 1024;
 	int ret=0;
 	void *key = key_datum.dptr;
 	size_t size = key_datum.dsize;

 	php_stream_rewind(dba->fp);
-	buf = emalloc((buf_size+1)*sizeof(char));
 	while (!php_stream_eof(dba->fp)) {
-		if (!php_stream_gets(dba->fp, buf, 15)) 
+		if (!php_stream_gets(dba->fp, buf, 15)) {
+			break;
+		}
+		num = atoi(buf);
+		if (num >= buf_size) {
+			buf_size = num + FLATFILE_BLOCK_SIZE;
+			buf = erealloc(buf, buf_size);
+		}
+		num = php_stream_read(dba->fp, buf, num);
+		if (num < 0) {
 			break;
-		num = atoi(buf);
-		if (num > buf_size) {
-			buf_size+=num;
-			buf = erealloc(buf, (buf_size+1)*sizeof(char));
 		}
-		num = php_stream_read(dba->fp, buf, sizeof(char)*num);
-		if (num<0) break;
-		*(buf+num) = '\0';
 		if (size == num) {
 			if (!memcmp(buf, key, size)) {
 				ret = 1;
 				break;
 			}
 		}	
-		if (!php_stream_gets(dba->fp, buf, 15))
+		if (!php_stream_gets(dba->fp, buf, 15)) {
 			break;
-		num = atoi(buf);
-		if (num > buf_size) {
-			buf_size+=num;
-			buf = erealloc(buf, (buf_size+1)*sizeof(char));
 		}
-		num = php_stream_read(dba->fp, buf, sizeof(char)*num);
-		if (num<0) 
+		num = atoi(buf);
+		if (num >= buf_size) {
+			buf_size = num + FLATFILE_BLOCK_SIZE;
+			buf = erealloc(buf, buf_size);
+		}
+		num = php_stream_read(dba->fp, buf, num);
+		if (num < 0) {
 			break;
-		*(buf+num) = '\0';
+		}
 	}
-	if (buf) 
-		efree(buf);
-	return(ret);
+	efree(buf);
+	return ret;
 }
 /* }}} */

 /* {{{ flatfile_firstkey
 */
 datum flatfile_firstkey(flatfile *dba TSRMLS_DC) {
-	datum buf;
+	datum res;
 	size_t num;
-	size_t buf_size = 1024;
+	size_t buf_size = FLATFILE_BLOCK_SIZE;
+	char *buf = emalloc(buf_size);

 	php_stream_rewind(dba->fp);
-	buf.dptr = emalloc((buf_size+1)*sizeof(char));
 	while(!php_stream_eof(dba->fp)) {
-		if (!php_stream_gets(dba->fp, buf.dptr, 15)) break;
-		num = atoi(buf.dptr);
-		if (num > buf_size) {
-			buf_size+=num;
-			buf.dptr = erealloc(buf.dptr, (buf_size+1)*sizeof(char));
-		}
-		num = php_stream_read(dba->fp, buf.dptr, num);
-		if (num<0) 
+		if (!php_stream_gets(dba->fp, buf, 15)) {
 			break;
-		buf.dsize = num;
-		if (*(buf.dptr)!=0) {
+		}
+		num = atoi(buf);
+		if (num >= buf_size) {
+			buf_size = num + FLATFILE_BLOCK_SIZE;
+			buf = erealloc(buf, buf_size);
+		}
+		num = php_stream_read(dba->fp, buf, num);
+		if (num < 0) {
+			break;
+		}
+		if (*(buf) != 0) {
 			dba->CurrentFlatFilePos = php_stream_tell(dba->fp);
-			return(buf);
+			res.dptr = buf;
+			res.dsize = num;
+			return res;
 		}
-		if (!php_stream_gets(dba->fp, buf.dptr, 15)) break;
-		num = atoi(buf.dptr);
-		if (num > buf_size) {
-			buf_size+=num;
-			buf.dptr = erealloc(buf.dptr, (buf_size+1)*sizeof(char));
-		}
-		num = php_stream_read(dba->fp, buf.dptr, num);
-		if (num<0) 
+		if (!php_stream_gets(dba->fp, buf, 15)) {
 			break;
+		}
+		num = atoi(buf);
+		if (num >= buf_size) {
+			buf_size = num + FLATFILE_BLOCK_SIZE;
+			buf = erealloc(buf, buf_size);
+		}
+		num = php_stream_read(dba->fp, buf, num);
+		if (num < 0) {
+			break;
+		}
 	}
-	if (buf.dptr) 
-		efree(buf.dptr);
-	buf.dptr = NULL;
-	return(buf);
+	efree(buf);
+	res.dptr = NULL;
+	res.dsize = 0;
+	return res;
 }
 /* }}} */

 /* {{{ flatfile_nextkey
 */
 datum flatfile_nextkey(flatfile *dba TSRMLS_DC) {
-	datum buf;
+	datum res;
 	size_t num;
-	size_t buf_size = 1024;
+	size_t buf_size = FLATFILE_BLOCK_SIZE;
+	char *buf = emalloc(buf_size);

 	php_stream_seek(dba->fp, dba->CurrentFlatFilePos, SEEK_SET);
-	buf.dptr = emalloc((buf_size+1)*sizeof(char));
 	while(!php_stream_eof(dba->fp)) {
-		if (!php_stream_gets(dba->fp, buf.dptr, 15)) break;
-		num = atoi(buf.dptr);
-		if (num > buf_size) {
-			buf_size+=num;
-			buf.dptr = erealloc(buf.dptr, (buf_size+1)*sizeof(char));
+		if (!php_stream_gets(dba->fp, buf, 15)) {
+			break;
 		}
-		num = php_stream_read(dba->fp, buf.dptr, num);
-		if (num<0) 
-			break;
-		if (!php_stream_gets(dba->fp, buf.dptr, 15)) 
-			break;
-		num = atoi(buf.dptr);
-		if (num > buf_size) {
-			buf_size+=num;
-			buf.dptr = erealloc(buf.dptr, (buf_size+1)*sizeof(char));
+		num = atoi(buf);
+		if (num >= buf_size) {
+			buf_size = num + FLATFILE_BLOCK_SIZE;
+			buf = erealloc(buf, buf_size);
 		}
-		num = php_stream_read(dba->fp, buf.dptr, num);
-		if (num<0) 
+		num = php_stream_read(dba->fp, buf, num);
+		if (num < 0)  {
 			break;
-		buf.dsize = num;
-		if (*(buf.dptr)!=0) {
+		}
+		if (!php_stream_gets(dba->fp, buf, 15)) {
+			break;
+		}
+		num = atoi(buf);
+		if (num >= buf_size) {
+			buf_size = num + FLATFILE_BLOCK_SIZE;
+			buf = erealloc(buf, buf_size);
+		}
+		num = php_stream_read(dba->fp, buf, num);
+		if (num < 0) {
+			break;
+		}
+		if (*(buf)!=0) {
 			dba->CurrentFlatFilePos = php_stream_tell(dba->fp);
-			return(buf);
+			res.dptr = buf;
+			res.dsize = num;
+			return res;
 		}
 	}
-	if (buf.dptr) 
-		efree(buf.dptr);
-	buf.dptr = NULL;
-	return(buf);
+	efree(buf);
+	res.dptr = NULL;
+	res.dsize = 0;
+	return res;
 }	
 /* }}} */

@@ -87,10 +87,6 @@ inifile * inifile_alloc(php_stream *fp, int readonly, int persistent TSRMLS_DC)
 	int fd = 0;

 	if (!readonly) {
-		if (!php_stream_truncate_supported(fp)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't truncate this stream");
-			return NULL;
-		}
 		if (SUCCESS != php_stream_cast(fp, PHP_STREAM_AS_FD, (void*)&fd, 1)) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not cast stream");
 			return NULL;
@@ -158,7 +154,7 @@ static char *etrim(const char *str)
 		return NULL;
 	}
 	val = (char*)str;
-	while (strchr(" \t\r\n", *val)) {
+	while (*val && strchr(" \t\r\n", *val)) {
 		val++;
 	}
 	l = strlen(val);
@@ -320,7 +316,8 @@ static int inifile_truncate(inifile *dba, size_t size TSRMLS_DC)
 {
 	int res;

-	if ((res=php_stream_truncate_set_size(dba->fp, size)) != 0) {
+	php_stream_flush(dba->fp);
+	if ((res=ftruncate(dba->fd, size)) != 0) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error in ftruncate: %d", res);
 		return FAILURE;
 	}
@@ -502,7 +499,7 @@ static int inifile_delete_replace_append(inifile *dba, const key_type *key, cons
 			ret = FAILURE;
 		} else {
 			php_stream_seek(dba->fp, 0, SEEK_END);
-			if (pos_grp_next != php_stream_tell(dba->fp)) {
+			if (pos_grp_next != (size_t)php_stream_tell(dba->fp)) {
 				php_stream_seek(dba->fp, pos_grp_next, SEEK_SET);
 				if (!php_stream_copy_to_stream(dba->fp, fp_tmp, PHP_STREAM_COPY_ALL)) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not copy remainder to temporary stream");
@@ -37,9 +37,9 @@ database file created
 database file created
 array(3) {
  [%d]=>
-  string(%d) "%sext/dba/tests/test0.dbm"
+  string(%d) "%s/dba/tests/test0.dbm"
  [%d]=>
-  string(%d) "%sext/dba/tests/test1.dbm"
+  string(%d) "%s/dba/tests/test1.dbm"
  [%d]=>
-  string(%d) "%sext/dba/tests/test2.dbm"
-}
+  string(%d) "%s/dba/tests/test2.dbm"
+}
@@ -0,0 +1,33 @@
+--TEST--
+DBA dba_popen Test
+--SKIPIF--
+<?php 
+	require_once('skipif.inc');
+	print("info $HND handler used");
+?>
+--FILE--
+<?php
+	require_once('test.inc');
+	echo "database handler: $handler\n";
+	if (($db=dba_popen($db_file, "n", $handler))!==FALSE) {
+		echo "Opened\n";
+		dba_insert("a", "Inserted", $db);
+		echo dba_fetch("a", $db)."\n";
+		dba_close($db);
+		echo "Closed\n";
+	} else {
+		echo "Error creating database\n";
+	}
+	if (($db=dba_popen($db_file, "n", $handler))!==FALSE) {
+		echo "Opened\n";
+		dba_insert("a", "Inserted", $db);
+		echo dba_fetch("a", $db)."\n";
+	}
+?>
+--EXPECTF--
+database handler: %s
+Opened
+Inserted
+Closed
+Opened
+Inserted
@@ -2,14 +2,14 @@
 DBA CDB handler test
 --SKIPIF--
 <?php 
+	$handler = 'cdb';
 	require_once('skipif.inc');
-	if (!in_array('cdb', dba_handlers())) die('skip CDB handler not available');
 	die('info CDB does not support replace or delete');
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
 	$handler = 'cdb';
+	require_once('test.inc');
 	require_once('dba_handler.inc');
 ?>
 --EXPECT--
@@ -4,16 +4,17 @@ DBA CDB_MAKE handler test
 magic_quotes_runtime=1
 --SKIPIF--
 <?php 
+	$handler = 'cdb_make';
 	require_once('skipif.inc');
-	if (!in_array('cdb_make', dba_handlers())) die('skip CDB_MAKE handler not available');
+	die('info CDB_MAKE does not support reading');
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
 	$handler = 'cdb_make';
+	require_once('test.inc');
 	echo "database handler: $handler\n";
 	// print md5 checksum of test.cdb which is generated by cdb_make program
-	var_dump(md5(implode('',file(dirname(__FILE__).'/test.cdb'))));
+	var_dump(md5_file(dirname(__FILE__).'/test.cdb'));
 	if (($db_make=dba_open($db_file, "n", $handler))!==FALSE) {
 		dba_insert("1", "1", $db_make);
 		dba_insert("2", "2", $db_make);
@@ -25,7 +26,7 @@ magic_quotes_runtime=1
 //		dba_replace cdb_make doesn't know replace
 		dba_close($db_make);
 		// write md5 checksum of generated database file
-		var_dump(md5(implode('',file($db_file))));
+		var_dump(md5_file($db_file));
 		// no need to test created database: this is done by dba_cdb_read.phpt
 	} else {
 		echo "Error creating database\n";
@@ -33,5 +34,5 @@ magic_quotes_runtime=1
 ?>
 --EXPECT--
 database handler: cdb_make
-string(32) "723d19f39c1b15b3b455dd64323148d1"
-string(32) "723d19f39c1b15b3b455dd64323148d1"
+string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
+string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
@@ -2,8 +2,8 @@
 DBA CDB handler test (read only)
 --SKIPIF--
 <?php 
-	if (!extension_loaded('dba')) die('skip dba extension not available');
-	if (!in_array('cdb', dba_handlers())) die('skip CDB handler not available');
+	$handler = 'cdb_make';
+	require_once('skipif.inc');
 ?>
 --FILE--
 <?php
@@ -2,13 +2,13 @@
 DBA DB2 handler test
 --SKIPIF--
 <?php 
+	$handler = 'db2';
 	require_once('skipif.inc');
-	if (!in_array('db2', dba_handlers())) die('skip DB2 handler not available');
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
 	$handler = 'db2';
+	require_once('test.inc');
 	require_once('dba_handler.inc');
 ?>
 --EXPECT--
@@ -2,13 +2,13 @@
 DBA DB3 handler test
 --SKIPIF--
 <?php 
+	$handler = 'db3';
 	require_once('skipif.inc');
-	if (!in_array('db3', dba_handlers())) die('skip DB3 handler not available');
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
 	$handler = 'db3';
+	require_once('test.inc');
 	require_once('dba_handler.inc');
 ?>
 --EXPECT--
@@ -2,13 +2,13 @@
 DBA DB4 handler test
 --SKIPIF--
 <?php 
+	$handler = 'db4';
 	require_once('skipif.inc');
-	if (!in_array('db4', dba_handlers())) die('skip DB4 handler not available');
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
 	$handler = 'db4';
+	require_once('test.inc');
 	require_once('dba_handler.inc');
 ?>
 --EXPECT--
@@ -2,13 +2,13 @@
 DBA DBM handler test
 --SKIPIF--
 <?php 
+	$handler = 'dbm';
 	require_once('skipif.inc');
-	if (!in_array('dbm', dba_handlers())) die('skip DBM handler not available');
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
 	$handler = 'dbm';
+	require_once('test.inc');
 	require_once('dba_handler.inc');
 ?>
 --EXPECT--
@@ -2,13 +2,13 @@
 DBA FlatFile handler test
 --SKIPIF--
 <?php 
+	$handler = 'flatfile';
 	require_once('skipif.inc');
-	if (!in_array('flatfile', dba_handlers())) die('skip FlatFile handler not available');
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
 	$handler = 'flatfile';
+	require_once('test.inc');
 	require_once('dba_handler.inc');
 ?>
 --EXPECT--
@@ -2,13 +2,13 @@
 DBA GDBM handler test
 --SKIPIF--
 <?php 
+	$handler = 'gdbm';
 	require_once('skipif.inc');
-	if (!in_array('gdbm', dba_handlers())) die('skip GDBM handler not available');
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
 	$handler = 'gdbm';
+	require_once('test.inc');
 	$lock_flag = ''; // lock in library
 	require_once('dba_handler.inc');
 	
@@ -36,7 +36,7 @@
 		echo "Error creating database\n";
 	}
 	if ($handler != 'cdb') {
-		$db_writer = dba_open($db_filename, 'w'.$lock_flag, $handler);
+		$db_writer = dba_open($db_filename, 'c'.$lock_flag, $handler);
 		if (($dba_reader = @dba_open($db_filename, 'r'.$lock_flag.($lock_flag ? 't' : ''), $handler))===false) {
 			echo "Read during write: not allowed\n";
 		} else {
@@ -2,13 +2,13 @@
 DBA NDBM handler test
 --SKIPIF--
 <?php 
+	$handler = 'ndbm';
 	require_once('skipif.inc');
-	if (!in_array('ndbm', dba_handlers())) die('skip NDBM handler not available');
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
 	$handler = 'ndbm';
+	require_once('test.inc');
 	require_once('dba_handler.inc');
 ?>
 --EXPECT--
@@ -2,19 +2,22 @@
 	if (!extension_loaded('dba')) die('skip dba extension not available');
 	if (!function_exists('dba_handlers')) die ('skip dba_handlers() not available');
 	if (!sizeof(dba_handlers())) die('skip no handlers installed');
-	$handler = dba_handlers(); 
-	if (in_array('flatfile', $handler)) {
-		$handler = 'flatfile';
-	} elseif ($handler[0]=='cdb') { // CDB currently supports only reading 
-		if (count($handler)==1) {
-			die('skip CDB currently supports only reading');
+	if (!isset($handler)) {
+		$handlers = dba_handlers();
+		if (in_array('flatfile', $handlers)) {
+			$handler = 'flatfile';
+		} else {
+			$handlers = array_diff($handlers, array('cdb', 'cdb_make')); /* these can only read OR write */
+			if (count($handlers)==0) {
+				die('skip no handler available that can be used for the test');
+			}
+			$handler = array_shift($handlers);
 		}
-		if ($handler[1]=='cdb_make' && count($handler)==2) {
-			die('skip CDB currently supports only reading and creating');
-		}
-		$handler = $handler[1];
 	} else {
-		$handler = $handler[0];
+		if (!in_array($handler, dba_handlers())) {
+			$HND = strtoupper($handler);
+			die("skip $HND handler not available");
+		}
 	}
 	$HND = strtoupper($handler);
 ?>
@@ -1,17 +1,7 @@
 <?php
-	$db_filename = $db_file = dirname(__FILE__).'/test0.dbm';
-	$handler = dba_handlers(); 
-	if (in_array('flatfile', $handler)) {
-		$handler = 'flatfile';
-	} elseif ($handler[0]=='cdb') { // CDB currently supports only reading 
-		if (count($handler)==1) {
-			die('CDB currently supports only reading ');
-		}
-		$handler = $handler[1];
-	} else {
-		$handler = $handler[0];
-	}
+	require_once('skipif.inc');
 	$lock_flag = 'l';
+	$db_filename = $db_file = dirname(__FILE__).'/test0.dbm';
 	@unlink($db_filename);
 	@unlink($db_filename.'.lck');
 ?>
@@ -298,7 +298,7 @@ PHP_FUNCTION(dbase_add_record)
 		tmp = **field;
 		zval_copy_ctor(&tmp);
 		convert_to_string(&tmp);
-		sprintf(t_cp, cur_f->db_format, Z_STRVAL(tmp));
+		snprintf(t_cp, cur_f->db_flen+1, cur_f->db_format, Z_STRVAL(tmp));
 		zval_dtor(&tmp); 
 		t_cp += cur_f->db_flen;
 	}
@@ -310,7 +310,7 @@ PHP_FUNCTION(dbase_add_record)
 		RETURN_FALSE;
 	}

-        put_dbf_info(dbh);
+	put_dbf_info(dbh);
 	efree(cp);

 	RETURN_TRUE;
@@ -369,7 +369,7 @@ PHP_FUNCTION(dbase_replace_record)
 			RETURN_FALSE;
 		}
 		convert_to_string_ex(field);
-		sprintf(t_cp, cur_f->db_format, Z_STRVAL_PP(field)); 
+		snprintf(t_cp, cur_f->db_flen+1, cur_f->db_format, Z_STRVAL_PP(field)); 
 		t_cp += cur_f->db_flen;
 	}

@@ -674,7 +674,7 @@ PHP_FUNCTION(dbase_create)

 		/* field type */
 		if (zend_hash_index_find(Z_ARRVAL_PP (field), 1, (void **)&value) == FAILURE) {
-			php_error(E_WARNING, "expected field type as sececond element of list in field %d", i);
+			php_error(E_WARNING, "expected field type as second element of list in field %d", i);
 			RETURN_FALSE;
 		}
 		convert_to_string_ex(value);
@@ -247,9 +247,10 @@ dbhead_t *dbf_open(char *dp, int o_flags TSRMLS_DC)

 	cp = dp;
 	if ((fd = VCWD_OPEN(cp, o_flags|O_BINARY)) < 0) {
-		cp = (char *)malloc(256);
-		strcpy(cp, dp); strcat(cp, ".dbf");
+		cp = (char *)malloc(MAXPATHLEN);  /* So where does this get free()'d?  -RL */
+		strncpy(cp, dp, MAXPATHLEN-5); strcat(cp, ".dbf");
 		if ((fd = VCWD_OPEN(cp, o_flags)) < 0) {
+			free(cp);
 			perror("open");
 			return NULL;
 		}
@@ -17,7 +17,7 @@
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
   | Author : Marc Boeren         <marc@guidance.nl>                      |
-   |          Frank M. Kromann    <frank@frontbase.com>                   |
+   |          Frank M. Kromann    <frank@kromann.info>                    |
   +----------------------------------------------------------------------+
 */

@@ -17,7 +17,7 @@
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
   | Author : Marc Boeren         <marc@guidance.nl>                      |
-   |          Frank M. Kromann    <frank@frontbase.com>                   |
+   |          Frank M. Kromann    <frank@kromann.info>                    |
   +----------------------------------------------------------------------+
 */

@@ -31,6 +31,15 @@
 #include <fcntl.h>
 #include <termios.h>

+/* e.g. IRIX does not have CRTSCTS */
+#ifndef CRTSCTS
+# ifdef CNEW_RTSCTS
+#  define CRTSCTS CNEW_RTSCTS
+# else
+#  define CRTSCTS 0
+# endif /* CNEW_RTSCTS */
+#endif /* !CRTSCTS */
+
 #define le_fd_name "Direct I/O File Descriptor"
 static int le_fd;

@@ -43,7 +52,7 @@ function_entry dio_functions[] = {
 	PHP_FE(dio_read,      NULL)
 	PHP_FE(dio_write,     NULL)
 	PHP_FE(dio_close,     NULL)
-        PHP_FE(dio_tcsetattr,     NULL)
+	PHP_FE(dio_tcsetattr,     NULL)
 	{NULL, NULL, NULL}
 };

@@ -70,8 +79,10 @@ ZEND_GET_MODULE(dio)
 static void _dio_close_fd(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 {
 	php_fd_t *f = (php_fd_t *) rsrc->ptr;
-	close(f->fd);
-	free(f);
+	if (f) {
+		close(f->fd);
+		free(f);
+	}
 }

 #define RDIOC(c) REGISTER_LONG_CONSTANT(#c, c, CONST_CS | CONST_PERSISTENT)
@@ -133,10 +144,13 @@ PHP_MINFO_FUNCTION(dio)
 	php_info_print_table_end();
 }

-static void new_php_fd(php_fd_t **f, int fd)
+static int new_php_fd(php_fd_t **f, int fd)
 {
-	*f = malloc(sizeof(php_fd_t));
+	if (!(*f = malloc(sizeof(php_fd_t)))) {
+		return 0;
+	}
 	(*f)->fd = fd;
+	return 1;
 }

 /* {{{ proto resource dio_open(string filename, int flags[, int mode])
@@ -154,6 +168,10 @@ PHP_FUNCTION(dio_open)
 		return;
 	}

+	if (php_check_open_basedir(file_name TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(file_name, "wb+", CHECKUID_CHECK_MODE_PARAM))) {
+		RETURN_FALSE;
+	}
+
 	if (ZEND_NUM_ARGS() == 3) {
 		fd = open(file_name, flags, mode);
 	} else {
@@ -161,12 +179,15 @@ PHP_FUNCTION(dio_open)
 	}

 	if (fd == -1) {
-		php_error(E_WARNING, "%s(): cannot open file %s with flags %d and permissions %d: %s", 
+		php_error(E_WARNING, "%s(): cannot open file %s with flags %ld and permissions %ld: %s", 
 				  get_active_function_name(TSRMLS_C), file_name, flags, mode, strerror(errno));
 		RETURN_FALSE;
 	}

-	new_php_fd(&f, fd);
+	
+	if (!new_php_fd(&f, fd)) {
+		RETURN_FALSE;
+	}
 	ZEND_REGISTER_RESOURCE(return_value, f, le_fd);
 }
 /* }}} */
@@ -186,6 +207,11 @@ PHP_FUNCTION(dio_read)
 	}
 	ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);

+	if (bytes <= 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than 0.");
+		RETURN_FALSE;
+	}
+
 	data = emalloc(bytes + 1);
 	res = read(f->fd, data, bytes);
 	if (res <= 0) {
@@ -214,6 +240,12 @@ PHP_FUNCTION(dio_write)
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &r_fd, &data, &data_len, &trunc_len) == FAILURE) {
 		return;
 	}
+
+	if (trunc_len < 0 || trunc_len > data_len) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "length must be greater or equal to zero and less then the length of the specified string.");
+		RETURN_FALSE;
+ 	}
+
 	ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);

 	res = write(f->fd, data, trunc_len ? trunc_len : data_len);
@@ -240,7 +272,7 @@ PHP_FUNCTION(dio_truncate)
 	ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);

 	if (ftruncate(f->fd, offset) == -1) {
-		php_error(E_WARNING, "%s(): couldn't truncate %d to %d bytes: %s",
+		php_error(E_WARNING, "%s(): couldn't truncate %d to %ld bytes: %s",
 				  get_active_function_name(TSRMLS_C), f->fd, offset, strerror(errno));
 		RETURN_FALSE;
 	}
@@ -397,7 +429,9 @@ PHP_FUNCTION(dio_fcntl)
 			RETURN_FALSE;
 		}

-		new_php_fd(&new_f, fcntl(f->fd, cmd, Z_LVAL_P(arg)));
+		if (!new_php_fd(&new_f, fcntl(f->fd, cmd, Z_LVAL_P(arg)))) {
+			RETURN_FALSE;
+		}
 		ZEND_REGISTER_RESOURCE(return_value, new_f, le_fd);
 		break;
 	}
@@ -426,13 +460,13 @@ PHP_FUNCTION(dio_tcsetattr)
 	long BAUD,DATABITS,STOPBITS,PARITYON,PARITY;
 	HashTable      *fh;
 	zval          **element;
-        
+
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &r_fd, &arg) == FAILURE) {
 		return;
 	}
 	ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);

- 
+
 	if (Z_TYPE_P(arg) != IS_ARRAY) {
 		zend_error(E_WARNING,"tcsetattr, third argument should be an associative array");
 		return;
@@ -464,8 +498,8 @@ PHP_FUNCTION(dio_tcsetattr)
 		Parity = Z_LVAL_PP(element);
 	} 

-    /* assign to correct values... */
-    switch (Baud_Rate)  {
+	/* assign to correct values... */
+	switch (Baud_Rate)  {
 		case 38400:            
 			BAUD = B38400;
 			break;
@@ -561,7 +595,7 @@ PHP_FUNCTION(dio_tcsetattr)
 			zend_error(E_WARNING, "invalid parity %d", Parity);
 			RETURN_FALSE;
 	}   
-        
+
 	newtio.c_cflag = BAUD | CRTSCTS | DATABITS | STOPBITS | PARITYON | PARITY | CLOCAL | CREAD;
 	newtio.c_iflag = IGNPAR;
 	newtio.c_oflag = 0;