helly Thu Nov 14 16:52:22 2002 EDT
Added files: (Branch: PHP_4_3)
/php4/ext/dba/tests dba008.phpt
Modified files:
/php4/ext/dba dba.c
/php4/ext/dba/tests dba_cdb_make.phpt
Log:
MFH: magic_quotes_runtime support is needed to have ext/dba being
superset of deprectaed ext/db
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.61.2.1 php4/ext/dba/dba.c:1.61.2.2
--- php4/ext/dba/dba.c:1.61.2.1 Thu Nov 14 09:40:42 2002
+++ php4/ext/dba/dba.c Thu Nov 14 16:52:21 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.61.2.1 2002/11/14 14:40:42 helly Exp $ */
+/* $Id: dba.c,v 1.61.2.2 2002/11/14 21:52:21 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -36,6 +36,7 @@
#include "php_dba.h"
#include "ext/standard/info.h"
+#include "ext/standard/php_string.h"
#include "php_gdbm.h"
#include "php_ndbm.h"
@@ -613,6 +614,9 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Handler %s does not
support optional skip parameter", info->hnd->name);
}
if((val = info->hnd->fetch(info, VALLEN(key), skip, &len TSRMLS_CC)) != NULL) {
+ if (val && PG(magic_quotes_runtime)) {
+ val = php_addslashes(val, len, &len, 1 TSRMLS_CC);
+ }
RETURN_STRINGL(val, len, 0);
}
RETURN_FALSE;
Index: php4/ext/dba/tests/dba_cdb_make.phpt
diff -u php4/ext/dba/tests/dba_cdb_make.phpt:1.1
php4/ext/dba/tests/dba_cdb_make.phpt:1.1.2.1
--- php4/ext/dba/tests/dba_cdb_make.phpt:1.1 Mon Nov 4 12:53:04 2002
+++ php4/ext/dba/tests/dba_cdb_make.phpt Thu Nov 14 16:52:22 2002
@@ -1,5 +1,7 @@
--TEST--
DBA CDB_MAKE handler test
+--INI--
+magic_quotes_runtime=1
--SKIPIF--
<?php
require_once('skipif.inc');
Index: php4/ext/dba/tests/dba008.phpt
+++ php4/ext/dba/tests/dba008.phpt
--TEST--
DBA magic_quotes_runtime Test
--SKIPIF--
<?php
require_once('skipif.inc');
?>
--FILE--
<?php
require_once('test.inc');
echo "database handler: $handler\n";
if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
dba_insert("key1", '"', $db_file);
ini_set('magic_quotes_runtime', 0);
var_dump(dba_fetch("key1", $db_file));
ini_set('magic_quotes_runtime', 1);
var_dump(dba_fetch("key1", $db_file));
dba_close($db_file);
} else {
echo "Error creating database\n";
}
?>
--EXPECTF--
database handler: %s
string(1) """
string(2) "\""
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
