Index: ext/standard/array.c
===================================================================
RCS file: /repository/php-src/ext/standard/array.c,v
retrieving revision 1.199.2.21
diff -u -r1.199.2.21 array.c
--- ext/standard/array.c	17 Jun 2003 13:20:18 -0000	1.199.2.21
+++ ext/standard/array.c	2 Oct 2003 09:36:16 -0000
@@ -2032,7 +2046,66 @@
 	return 1;
 }
 
-static void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMETERS, int recursive)
+
+
+PHPAPI int php_array_merge_clobber(HashTable *dest, HashTable *src TSRMLS_DC)
+{
+	zval	  **src_entry, **dest_entry;
+	char	   *string_key;
+	uint		string_key_len;
+	ulong		num_key;
+	HashPosition pos;
+
+	zend_hash_internal_pointer_reset_ex(src, &pos);
+	while (zend_hash_get_current_data_ex(src, (void **)&src_entry, &pos) == SUCCESS) {
+		switch (zend_hash_get_current_key_ex(src, &string_key, &string_key_len, &num_key, 0, &pos)) {
+			case HASH_KEY_IS_STRING:
+				if(zend_hash_find(dest, string_key, string_key_len,
+					    (void **)&dest_entry) == SUCCESS) {
+				    if (*src_entry == *dest_entry && ((*dest_entry)->refcount % 2)) {
+					    zend_error(E_WARNING, "%s(): recursion detected!!",
+							   get_active_function_name(TSRMLS_C));
+					    return 0;
+				    }
+				    if(Z_TYPE_PP(dest_entry) == IS_ARRAY &&
+					Z_TYPE_PP(src_entry) == IS_ARRAY )	{
+					    SEPARATE_ZVAL(dest_entry);
+					    if (!php_array_merge_clobber(Z_ARRVAL_PP(dest_entry),
+				    	    	    Z_ARRVAL_PP(src_entry) TSRMLS_CC))
+						    return 0;
+				    } else {
+					ZVAL_ADDREF(*src_entry);
+					zend_hash_update(dest, string_key, strlen(string_key)+1,
+									 src_entry, sizeof(zval *), NULL);
+				    }
+				}else
+				{
+				    ZVAL_ADDREF(*src_entry);
+				    zend_hash_update(dest, string_key, strlen(string_key)+1,
+				    				 src_entry, sizeof(zval *), NULL);
+				}
+			break;
+
+			case HASH_KEY_IS_LONG:
+			    ZVAL_ADDREF(*src_entry);
+			    if(zend_hash_index_find(dest, num_key, (void**)&dest_entry) == SUCCESS) {
+				zend_hash_index_update(dest, num_key, src_entry, sizeof(zval*), NULL);
+			    }else {
+				zend_hash_next_index_insert(dest, src_entry, sizeof(zval *), NULL);
+			    }
+			break;
+		}
+
+		zend_hash_move_forward_ex(src, &pos);
+	}
+
+	return 1;
+}
+
+
+
+
+static void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMETERS, int recursive, int clobber)
 {
 	zval	  ***args = NULL;
 	int			 argc,
@@ -2056,18 +2129,21 @@
 	for (i=0; i<argc; i++) {
 		SEPARATE_ZVAL(args[i]);
 		convert_to_array_ex(args[i]);
-		php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(args[i]), recursive TSRMLS_CC);
+		if(clobber) {
+		    php_array_merge_clobber(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(args[i]) TSRMLS_CC);
+		} else {
+		    php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(args[i]), recursive TSRMLS_CC);
+		}
 	}
 	
 	efree(args);
 }
 
-
 /* {{{ proto array array_merge(array arr1, array arr2 [, array ...])
    Merges elements from passed arrays into one array */
 PHP_FUNCTION(array_merge)
 {
-	php_array_merge_wrapper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+	php_array_merge_wrapper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0);
 }
 /* }}} */
 
@@ -2076,9 +2152,20 @@
    Recursively merges elements from passed arrays into one array */
 PHP_FUNCTION(array_merge_recursive)
 {
-	php_array_merge_wrapper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+	php_array_merge_wrapper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1, 0);
 }
 /* }}} */
+
+
+/* {{{ proto array array_merge_clobber(array arr1, array arr2 [, array ...])
+    Merges elements from passed arrays, overwriting keys and their elements */
+    
+PHP_FUNCTION(array_merge_clobber)
+{
+	php_array_merge_wrapper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1, 1);
+}
+/* }}} */
+
 
 
 /* {{{ proto array array_keys(array input [, mixed search_value])
Index: ext/standard/basic_functions.c
===================================================================
RCS file: /repository/php-src/ext/standard/basic_functions.c,v
retrieving revision 1.543.2.18
diff -u -r1.543.2.18 basic_functions.c
--- ext/standard/basic_functions.c	31 May 2003 01:37:43 -0000	1.543.2.18
+++ ext/standard/basic_functions.c	2 Oct 2003 09:36:18 -0000
@@ -821,6 +821,7 @@
 	PHP_FE(array_slice,														NULL)
 	PHP_FE(array_merge,														NULL)
 	PHP_FE(array_merge_recursive,											NULL)
+	PHP_FE(array_merge_clobber,											NULL)
 	PHP_FE(array_keys,														NULL)
 	PHP_FE(array_values,													NULL)
 	PHP_FE(array_count_values,												NULL)
Index: ext/standard/php_array.h
===================================================================
RCS file: /repository/php-src/ext/standard/php_array.h,v
retrieving revision 1.39.2.1
diff -u -r1.39.2.1 php_array.h
--- ext/standard/php_array.h	31 Dec 2002 16:35:32 -0000	1.39.2.1
+++ ext/standard/php_array.h	2 Oct 2003 09:36:18 -0000
@@ -64,6 +64,7 @@
 PHP_FUNCTION(array_slice);
 PHP_FUNCTION(array_merge);
 PHP_FUNCTION(array_merge_recursive);
+PHP_FUNCTION(array_merge_clobber);
 PHP_FUNCTION(array_keys);
 PHP_FUNCTION(array_values);
 PHP_FUNCTION(array_count_values);