Imported Upstream version 5.3.0RC1upstream/5.3.0_RC1upstream/5.3.0RC1

24 files changed, 135 insertions, 112 deletions

diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 60cb8116f..a77adc01b 100644
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.70.2.2.2.9 2007/12/06 14:17:43 helly Exp $
+dnl $Id: config.m4,v 1.70.2.2.2.8.2.2 2007/12/06 14:01:49 helly Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index e33d7f9f5..991c257dd 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dba.c,v 1.111.2.4.2.8 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba.c,v 1.111.2.4.2.5.2.10 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -52,7 +52,6 @@
 #include "php_qdbm.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
 	ZEND_ARG_INFO(0, path)
 	ZEND_ARG_INFO(0, mode)
@@ -60,7 +59,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
 	ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_open, 0, 0, 2)
 	ZEND_ARG_INFO(0, path)
 	ZEND_ARG_INFO(0, mode)
@@ -68,75 +66,62 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_open, 0, 0, 2)
 	ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_close, 0)
 	ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_exists, 0)
 	ZEND_ARG_INFO(0, key)
 	ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_fetch, 0, 0, 2)
 	ZEND_ARG_INFO(0, key)
 	ZEND_ARG_INFO(0, skip)
 	ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_key_split, 0)
 	ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_firstkey, 0)
 	ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_nextkey, 0)
 	ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_delete, 0)
 	ZEND_ARG_INFO(0, key)
 	ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_insert, 0)
 	ZEND_ARG_INFO(0, key)
 	ZEND_ARG_INFO(0, value)
 	ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_replace, 0)
 	ZEND_ARG_INFO(0, key)
 	ZEND_ARG_INFO(0, value)
 	ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_optimize, 0)
 	ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_sync, 0)
 	ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_handlers, 0, 0, 0)
 	ZEND_ARG_INFO(0, full_info)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_list, 0)
 ZEND_END_ARG_INFO()
 
@@ -144,7 +129,7 @@ ZEND_END_ARG_INFO()
 
 /* {{{ dba_functions[]
  */
-zend_function_entry dba_functions[] = {
+const zend_function_entry dba_functions[] = {
 	PHP_FE(dba_open, arginfo_dba_open)
 	PHP_FE(dba_popen, arginfo_dba_popen)
 	PHP_FE(dba_close, arginfo_dba_close)
@@ -207,33 +192,28 @@ ZEND_GET_MODULE(dba)
 /* {{{ macromania */
 
 #define DBA_ID_PARS 											\
-	zval **id; 													\
+	zval *id; 													\
 	dba_info *info = NULL; 										\
 	int ac = ZEND_NUM_ARGS()
 
 /* these are used to get the standard arguments */
 
-#define DBA_GET1 												\
-	if(ac != 1 || zend_get_parameters_ex(ac, &id) != SUCCESS) { \
-		WRONG_PARAM_COUNT; 										\
-	}
-
 /* {{{ php_dba_myke_key */
-static size_t php_dba_make_key(zval **key, char **key_str, char **key_free TSRMLS_DC)
+static size_t php_dba_make_key(zval *key, char **key_str, char **key_free TSRMLS_DC)
 {
-	if (Z_TYPE_PP(key) == IS_ARRAY) {
+	if (Z_TYPE_P(key) == IS_ARRAY) {
 		zval **group, **name;
 		HashPosition pos;
 		size_t len;
 	
-		if (zend_hash_num_elements(Z_ARRVAL_PP(key)) != 2) {
+		if (zend_hash_num_elements(Z_ARRVAL_P(key)) != 2) {
 			php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_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);
+		zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(key), &pos);
+		zend_hash_get_current_data_ex(Z_ARRVAL_P(key), (void **) &group, &pos);
+		zend_hash_move_forward_ex(Z_ARRVAL_P(key), &pos);
+		zend_hash_get_current_data_ex(Z_ARRVAL_P(key), (void **) &name, &pos);
 		convert_to_string_ex(group);
 		convert_to_string_ex(name);
 		if (Z_STRLEN_PP(group) == 0) {
@@ -245,43 +225,42 @@ static size_t php_dba_make_key(zval **key, char **key_str, char **key_free TSRML
 		*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);
+
+		convert_to_string(key);
+		*key_str = Z_STRVAL_P(key);
+
+		return Z_STRLEN_P(key);
 	}
 }
 /* }}} */
 
 #define DBA_GET2 												\
-	zval **key; 												\
+	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; 										\
+	if (zend_parse_parameters(ac TSRMLS_CC, "zr", &key, &id) == FAILURE) { 	\
+		return; 												\
 	} 															\
 	if ((key_len = php_dba_make_key(key, &key_str, &key_free TSRMLS_CC)) == 0) {\
 		RETURN_FALSE;											\
 	}
 
 #define DBA_GET2_3												\
-	zval **key; 												\
+	zval *key;													\
 	char *key_str, *key_free;									\
 	size_t key_len; 											\
-	zval **tmp; 												\
 	int skip = 0;  												\
 	switch(ac) {												\
 	case 2: 													\
-		if (zend_get_parameters_ex(ac, &key, &id) != SUCCESS) { \
-			WRONG_PARAM_COUNT; 									\
+		if (zend_parse_parameters(ac TSRMLS_CC, "zr", &key, &id) == FAILURE) { \
+			return;												\
 		} 														\
 		break;  												\
 	case 3: 													\
-		if (zend_get_parameters_ex(ac, &key, &tmp, &id) != SUCCESS) { \
-			WRONG_PARAM_COUNT; 									\
+		if (zend_parse_parameters(ac TSRMLS_CC, "zlr", &key, &skip, &id) == FAILURE) { \
+			return;												\
 		} 														\
-		convert_to_long_ex(tmp);								\
-		skip = Z_LVAL_PP(tmp);  								\
 		break;  												\
 	default:													\
 		WRONG_PARAM_COUNT; 										\
@@ -290,25 +269,12 @@ static size_t php_dba_make_key(zval **key, char **key_str, char **key_free TSRML
 		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 												\
+#define DBA_FETCH_RESOURCE(info, id)	\
 	ZEND_FETCH_RESOURCE2(info, dba_info *, id, -1, "DBA identifier", le_db, le_pdb);
-	
-#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_GET2   DBA_ID_PARS; DBA_GET2;   DBA_FETCH_RESOURCE(info, &id)
+#define DBA_ID_GET2_3 DBA_ID_PARS; DBA_GET2_3; DBA_FETCH_RESOURCE(info, &id)
 
 #define DBA_ID_DONE												\
 	if (key_free) efree(key_free)
@@ -558,6 +524,7 @@ PHP_MINFO_FUNCTION(dba)
 		php_info_print_table_row(2, "Supported handlers", "none");
 	}
 	php_info_print_table_end();
+	DISPLAY_INI_ENTRIES();
 }
 /* }}} */
 
@@ -566,28 +533,43 @@ PHP_MINFO_FUNCTION(dba)
 static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
 	char *v;
-	int len;
-	DBA_ID_GET3;
+	int val_len;
+	zval *id;
+	dba_info *info = NULL;
+	int ac = ZEND_NUM_ARGS();
+	zval *key;
+	char *val;
+	char *key_str, *key_free;
+	size_t key_len;
+
+	if (zend_parse_parameters(ac TSRMLS_CC, "zsr", &key, &val, &val_len, &id) == FAILURE) {
+		return;
+	}
+
+	if ((key_len = php_dba_make_key(key, &key_str, &key_free TSRMLS_CC)) == 0) {
+		RETURN_FALSE;
+	}
+
+	DBA_FETCH_RESOURCE(info, &id);
 
 	DBA_WRITE_CHECK;
-	
+
 	if (PG(magic_quotes_runtime)) {
-		len = Z_STRLEN_PP(val);
-		v = estrndup(Z_STRVAL_PP(val), len);
-		php_stripslashes(v, &len TSRMLS_CC); 
-		if(info->hnd->update(info, key_str, key_len, v, len, mode TSRMLS_CC) == SUCCESS) {
+		v = estrndup(val, val_len);
+		php_stripslashes(v, &val_len TSRMLS_CC);
+		if (info->hnd->update(info, key_str, key_len, v, val_len, mode TSRMLS_CC) == SUCCESS) {
 			efree(v);
 			DBA_ID_DONE;
 			RETURN_TRUE;
 		}
 		efree(v);
 	} else {
-		if(info->hnd->update(info, key_str, key_len, VALLEN(val), mode TSRMLS_CC) == SUCCESS)
-		{
+		if (info->hnd->update(info, key_str, key_len, val, val_len, mode TSRMLS_CC) == SUCCESS) {
 			DBA_ID_DONE;
 			RETURN_TRUE;
 		}
 	}
+
 	DBA_ID_DONE;
 	RETURN_FALSE;
 }
@@ -980,9 +962,16 @@ PHP_FUNCTION(dba_open)
    Closes database */
 PHP_FUNCTION(dba_close)
 {
-	DBA_ID_GET1;
-	
-	zend_list_delete(Z_RESVAL_PP(id));
+	zval *id;
+	dba_info *info = NULL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) {
+		return;
+	}
+
+	DBA_FETCH_RESOURCE(info, &id);
+
+	zend_list_delete(Z_RESVAL_P(id));
 }
 /* }}} */
 
@@ -1081,11 +1070,20 @@ PHP_FUNCTION(dba_firstkey)
 {
 	char *fkey;
 	int len;
-	DBA_ID_GET1;
+	zval *id;
+	dba_info *info = NULL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) {
+		return;
+	}
+
+	DBA_FETCH_RESOURCE(info, &id);
 
 	fkey = info->hnd->firstkey(info, &len TSRMLS_CC);
-	if(fkey)
+
+	if (fkey)
 		RETURN_STRINGL(fkey, len, 0);
+
 	RETURN_FALSE;
 }
 /* }}} */
@@ -1096,11 +1094,20 @@ PHP_FUNCTION(dba_nextkey)
 {
 	char *nkey;
 	int len;
-	DBA_ID_GET1;
+	zval *id;
+	dba_info *info = NULL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) {
+		return;
+	}
+
+	DBA_FETCH_RESOURCE(info, &id);
 
 	nkey = info->hnd->nextkey(info, &len TSRMLS_CC);
-	if(nkey)
+
+	if (nkey)
 		RETURN_STRINGL(nkey, len, 0);
+
 	RETURN_FALSE;
 }
 /* }}} */
@@ -1146,12 +1153,21 @@ PHP_FUNCTION(dba_replace)
    Optimizes (e.g. clean up, vacuum) database */
 PHP_FUNCTION(dba_optimize)
 {
-	DBA_ID_GET1;
-	
+	zval *id;
+	dba_info *info = NULL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) {
+		return;
+	}
+
+	DBA_FETCH_RESOURCE(info, &id);
+
 	DBA_WRITE_CHECK;
-	if(info->hnd->optimize(info TSRMLS_CC) == SUCCESS) {
+
+	if (info->hnd->optimize(info TSRMLS_CC) == SUCCESS) {
 		RETURN_TRUE;
 	}
+
 	RETURN_FALSE;
 }
 /* }}} */
@@ -1160,11 +1176,19 @@ PHP_FUNCTION(dba_optimize)
    Synchronizes database */
 PHP_FUNCTION(dba_sync)
 {
-	DBA_ID_GET1;
-	
-	if(info->hnd->sync(info TSRMLS_CC) == SUCCESS) {
+	zval *id;
+	dba_info *info = NULL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &id) == FAILURE) {
+		return;
+	}
+
+	DBA_FETCH_RESOURCE(info, &id);
+
+	if (info->hnd->sync(info TSRMLS_CC) == SUCCESS) {
 		RETURN_TRUE;
 	}
+
 	RETURN_FALSE;
 }
 /* }}} */
@@ -1200,8 +1224,7 @@ PHP_FUNCTION(dba_list)
 	zend_rsrc_list_entry *le;
 	dba_info *info;
 
-	if (ZEND_NUM_ARGS()!=0) {
-		ZEND_WRONG_PARAM_COUNT();
+	if (zend_parse_parameters_none() == FAILURE) {
 		RETURN_FALSE;
 	}
 
diff --git a/ext/dba/dba_cdb.c b/ext/dba/dba_cdb.c
index 60bb38603..a436875bb 100644
--- a/ext/dba/dba_cdb.c
+++ b/ext/dba/dba_cdb.c
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dba_cdb.c,v 1.32.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba_cdb.c,v 1.32.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/dba/dba_db1.c b/ext/dba/dba_db1.c
index 35e28c9d2..7bc348ee9 100755
--- a/ext/dba/dba_db1.c
+++ b/ext/dba/dba_db1.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dba_db1.c,v 1.3.2.1.2.4 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba_db1.c,v 1.3.2.1.2.1.2.3 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/dba/dba_db2.c b/ext/dba/dba_db2.c
index 56d145149..b12606a3b 100644
--- a/ext/dba/dba_db2.c
+++ b/ext/dba/dba_db2.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dba_db2.c,v 1.39.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba_db2.c,v 1.39.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c
index 0209cb8ca..a229cb429 100644
--- a/ext/dba/dba_db3.c
+++ b/ext/dba/dba_db3.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dba_db3.c,v 1.33.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba_db3.c,v 1.33.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c
index 9bb3e9726..774bd1764 100644
--- a/ext/dba/dba_db4.c
+++ b/ext/dba/dba_db4.c
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dba_db4.c,v 1.15.2.3.2.4 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba_db4.c,v 1.15.2.3.2.1.2.3 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/dba/dba_dbm.c b/ext/dba/dba_dbm.c
index 27e196b90..a65510208 100644
--- a/ext/dba/dba_dbm.c
+++ b/ext/dba/dba_dbm.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dba_dbm.c,v 1.29.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba_dbm.c,v 1.29.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/dba/dba_flatfile.c b/ext/dba/dba_flatfile.c
index f57d1e4c4..617c81bda 100644
--- a/ext/dba/dba_flatfile.c
+++ b/ext/dba/dba_flatfile.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dba_flatfile.c,v 1.19.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba_flatfile.c,v 1.19.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/dba/dba_gdbm.c b/ext/dba/dba_gdbm.c
index 0a821b1f8..63ddef82e 100644
--- a/ext/dba/dba_gdbm.c
+++ b/ext/dba/dba_gdbm.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dba_gdbm.c,v 1.23.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba_gdbm.c,v 1.23.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/dba/dba_inifile.c b/ext/dba/dba_inifile.c
index 6fa9a80ad..bbea05ddb 100644
--- a/ext/dba/dba_inifile.c
+++ b/ext/dba/dba_inifile.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dba_inifile.c,v 1.5.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba_inifile.c,v 1.5.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/dba/dba_ndbm.c b/ext/dba/dba_ndbm.c
index 8062d67c2..c74d761b4 100644
--- a/ext/dba/dba_ndbm.c
+++ b/ext/dba/dba_ndbm.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dba_ndbm.c,v 1.19.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba_ndbm.c,v 1.19.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/dba/dba_qdbm.c b/ext/dba/dba_qdbm.c
index 4cfcbbfcd..94fb9fc67 100755
--- a/ext/dba/dba_qdbm.c
+++ b/ext/dba/dba_qdbm.c
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: dba_qdbm.c,v 1.4.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba_qdbm.c,v 1.4.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/ext/dba/libcdb/cdb.c b/ext/dba/libcdb/cdb.c
index 597ab02b8..9fccda705 100644
--- a/ext/dba/libcdb/cdb.c
+++ b/ext/dba/libcdb/cdb.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: cdb.c,v 1.10.2.1.2.5 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: cdb.c,v 1.10.2.1.2.3.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 /* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
 
@@ -189,6 +189,6 @@ int cdb_find(struct cdb *c, char *key, unsigned int len TSRMLS_DC)
 /* {{{ cdb_version */
 char *cdb_version() 
 {
-	return "0.75, $Revision: 1.10.2.1.2.5 $";
+	return "0.75, $Revision: 1.10.2.1.2.3.2.2 $";
 }
 /* }}} */
diff --git a/ext/dba/libcdb/cdb.h b/ext/dba/libcdb/cdb.h
index e5a828104..14e6cb3ae 100644
--- a/ext/dba/libcdb/cdb.h
+++ b/ext/dba/libcdb/cdb.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: cdb.h,v 1.7.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: cdb.h,v 1.7.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 /* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
 
diff --git a/ext/dba/libcdb/cdb_make.c b/ext/dba/libcdb/cdb_make.c
index 79a15c1cf..81e001e3d 100644
--- a/ext/dba/libcdb/cdb_make.c
+++ b/ext/dba/libcdb/cdb_make.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: cdb_make.c,v 1.9.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: cdb_make.c,v 1.9.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 /* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
 
@@ -240,5 +240,5 @@ int cdb_make_finish(struct cdb_make *c TSRMLS_DC)
 /* {{{ cdb_make_version */
 char *cdb_make_version() 
 {
-	return "0.75, $Revision: 1.9.2.1.2.3 $";
+	return "0.75, $Revision: 1.9.2.1.2.1.2.2 $";
 }
diff --git a/ext/dba/libcdb/cdb_make.h b/ext/dba/libcdb/cdb_make.h
index d121ea85a..f341124c1 100644
--- a/ext/dba/libcdb/cdb_make.h
+++ b/ext/dba/libcdb/cdb_make.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: cdb_make.h,v 1.7.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: cdb_make.h,v 1.7.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 /* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
 
diff --git a/ext/dba/libcdb/uint32.c b/ext/dba/libcdb/uint32.c
index 06dcc40a6..a45a3e66c 100644
--- a/ext/dba/libcdb/uint32.c
+++ b/ext/dba/libcdb/uint32.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: uint32.c,v 1.6.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: uint32.c,v 1.6.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 /* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
 
diff --git a/ext/dba/libcdb/uint32.h b/ext/dba/libcdb/uint32.h
index 8dcdb2b35..2675653b9 100644
--- a/ext/dba/libcdb/uint32.h
+++ b/ext/dba/libcdb/uint32.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: uint32.h,v 1.6.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: uint32.h,v 1.6.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 /* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
 
diff --git a/ext/dba/libflatfile/flatfile.c b/ext/dba/libflatfile/flatfile.c
index 0e7d1c8c4..fff029b85 100644
--- a/ext/dba/libflatfile/flatfile.c
+++ b/ext/dba/libflatfile/flatfile.c
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: flatfile.c,v 1.14.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: flatfile.c,v 1.14.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -307,7 +307,7 @@ datum flatfile_nextkey(flatfile *dba TSRMLS_DC) {
 /* {{{ flatfile_version */
 char *flatfile_version() 
 {
-	return "1.0, $Revision: 1.14.2.1.2.3 $";
+	return "1.0, $Revision: 1.14.2.1.2.1.2.2 $";
 }
 /* }}} */ 
 
diff --git a/ext/dba/libflatfile/flatfile.h b/ext/dba/libflatfile/flatfile.h
index 4ad468427..864903bca 100644
--- a/ext/dba/libflatfile/flatfile.h
+++ b/ext/dba/libflatfile/flatfile.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: flatfile.h,v 1.11.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: flatfile.h,v 1.11.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifndef PHP_LIB_FLATFILE_H
 #define PHP_LIB_FLATFILE_H
diff --git a/ext/dba/libinifile/inifile.c b/ext/dba/libinifile/inifile.c
index 080124ff7..df4070cfe 100644
--- a/ext/dba/libinifile/inifile.c
+++ b/ext/dba/libinifile/inifile.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: inifile.c,v 1.14.2.1.2.6 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: inifile.c,v 1.14.2.1.2.3.2.3 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -43,7 +43,7 @@
 /* {{{ inifile_version */
 char *inifile_version() 
 {
-	return "1.0, $Revision: 1.14.2.1.2.6 $";
+	return "1.0, $Revision: 1.14.2.1.2.3.2.3 $";
 }
 /* }}} */ 
 
diff --git a/ext/dba/libinifile/inifile.h b/ext/dba/libinifile/inifile.h
index 34268209c..68c167533 100644
--- a/ext/dba/libinifile/inifile.h
+++ b/ext/dba/libinifile/inifile.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: inifile.h,v 1.5.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: inifile.h,v 1.5.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifndef PHP_LIB_INIFILE_H
 #define PHP_LIB_INIFILE_H
diff --git a/ext/dba/php_dba.h b/ext/dba/php_dba.h
index 2440cba40..45f38b9a5 100644
--- a/ext/dba/php_dba.h
+++ b/ext/dba/php_dba.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_dba.h,v 1.29.2.1.2.3 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: php_dba.h,v 1.29.2.1.2.1.2.2 2008/12/31 11:15:36 sebastian Exp $ */
 
 #ifndef PHP_DBA_H
 #define PHP_DBA_H