[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c

[Marcus Boerger]

helly           Sun Sep 21 15:36:41 2003 EDT

  Modified files:              
    /php-src/ext/sqlite sqlite.c 
  Log:
  - return correct hash constants
  - check for 'memory' in sqlite_factory() too (noticed by John Coggeshal)
  
  
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.95 php-src/ext/sqlite/sqlite.c:1.96
--- php-src/ext/sqlite/sqlite.c:1.95    Sat Sep 13 06:31:06 2003
+++ php-src/ext/sqlite/sqlite.c Sun Sep 21 15:36:40 2003
@@ -17,7 +17,7 @@
    |          Marcus Boerger <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
 
-   $Id: sqlite.c,v 1.95 2003/09/13 10:31:06 helly Exp $ 
+   $Id: sqlite.c,v 1.96 2003/09/21 19:36:40 helly Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -757,7 +757,7 @@
 
 static int sqlite_free_persistent(list_entry *le, void *ptr TSRMLS_DC)
 {
-       return le->ptr == ptr;
+       return le->ptr == ptr ? ZEND_HASH_APPLY_REMOVE : ZEND_HASH_APPLY_KEEP;
 }
 
 static void sqlite_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
@@ -944,7 +944,7 @@
 {
        php_info_print_table_start();
        php_info_print_table_header(2, "SQLite support", "enabled");
-       php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " 
$Id: sqlite.c,v 1.95 2003/09/13 10:31:06 helly Exp $");
+       php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " 
$Id: sqlite.c,v 1.96 2003/09/21 19:36:40 helly Exp $");
        php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
        php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
        php_info_print_table_end();
@@ -1172,14 +1172,16 @@
                zval_dtor(errmsg);
        }
 
-       if (PG(safe_mode) && (!php_checkuid(filename, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
-               php_std_error_handling();
-               RETURN_NULL();
-       }
-
-       if (php_check_open_basedir(filename TSRMLS_CC)) {
-               php_std_error_handling();
-               RETURN_NULL();
+       if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
+               if (PG(safe_mode) && (!php_checkuid(filename, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
+                       php_std_error_handling();
+                       RETURN_NULL();
+               }
+       
+               if (php_check_open_basedir(filename TSRMLS_CC)) {
+                       php_std_error_handling();
+                       RETURN_NULL();
+               }
        }
 
        php_sqlite_open(filename, mode, NULL, return_value, errmsg, return_value 
TSRMLS_CC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php