This commit was manufactured by cvs2svn to create tag 'php_4_3_0RC3'.php-4.3.0RC3

3 files changed, 3 insertions, 14 deletions

diff --git a/ext/dba/php_db4.h b/ext/dba/php_db4.h
deleted file mode 100644
index fa814c3f5e..0000000000
--- a/ext/dba/php_db4.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef PHP_DB4_H
-#define PHP_DB4_H
-
-#if DBA_DB4
-
-#include "php_dba.h"
-
-DBA_FUNCS(db4);
-
-#endif
-
-#endif
diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c
index 5200d87351..611a93a48e 100644
--- a/ext/fdf/fdf.c
+++ b/ext/fdf/fdf.c
@@ -1416,7 +1416,8 @@ PHP_FUNCTION(fdf_remove_item) {
 	FDFErc err;
 	
 	if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsl", &r_fdf, 
-							 &fieldname, &fieldname_len
+							 &fieldname, &fieldname_len,
+							 &item
 							 )
 	   == FAILURE) {
 		return;
diff --git a/run-tests.php b/run-tests.php
index 130294a164..03fd27c08e 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -335,7 +335,7 @@ if ($sum_results['FAILED'] && !getenv('NO_INTERACTION')) {
 		 */
 		
 		/* Ask the user to provide an email address, so that QA team can contact the user */
-		if (!strncasecmp($user_input, 'y', 1)) {
+		if (!strncasecmp($user_input, 'y', 1) || strlen(trim($user_input)) == 0) {
 			echo "Please enter your email address: ";
 			flush();
 			$fp = fopen("php://stdin", "r+");