diff options
Diffstat (limited to 'ext/sqlite3')
| -rw-r--r-- | ext/sqlite3/php_sqlite3.h | 4 | ||||
| -rw-r--r-- | ext/sqlite3/php_sqlite3_structs.h | 4 | ||||
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 4 | ||||
| -rw-r--r-- | ext/sqlite3/tests/bug53463.phpt | 2 | ||||
| -rw-r--r-- | ext/sqlite3/tests/sqlite3_15_open_error.phpt | 7 | ||||
| -rw-r--r-- | ext/sqlite3/tests/sqlite3_prepare_001.phpt | 2 |
6 files changed, 16 insertions, 7 deletions
diff --git a/ext/sqlite3/php_sqlite3.h b/ext/sqlite3/php_sqlite3.h index db063bca4..c402e6ff9 100644 --- a/ext/sqlite3/php_sqlite3.h +++ b/ext/sqlite3/php_sqlite3.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sqlite3.h 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: php_sqlite3.h 321634 2012-01-01 13:15:04Z felipe $ */ #ifndef PHP_SQLITE3_H #define PHP_SQLITE3_H diff --git a/ext/sqlite3/php_sqlite3_structs.h b/ext/sqlite3/php_sqlite3_structs.h index d08c31db8..41d545b41 100644 --- a/ext/sqlite3/php_sqlite3_structs.h +++ b/ext/sqlite3/php_sqlite3_structs.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sqlite3_structs.h 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: php_sqlite3_structs.h 321634 2012-01-01 13:15:04Z felipe $ */ #ifndef PHP_SQLITE_STRUCTS_H #define PHP_SQLITE_STRUCTS_H diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index aa01d89cc..5ec2c2995 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sqlite3.c 314749 2011-08-10 15:30:07Z iliaa $ */ +/* $Id: sqlite3.c 321634 2012-01-01 13:15:04Z felipe $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/ext/sqlite3/tests/bug53463.phpt b/ext/sqlite3/tests/bug53463.phpt index c9216e660..dcfc13d5b 100644 --- a/ext/sqlite3/tests/bug53463.phpt +++ b/ext/sqlite3/tests/bug53463.phpt @@ -1,5 +1,7 @@ --TEST-- Bug #53463 (sqlite3 columnName() segfaults on bad column_number) +--SKIPIF-- +<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_15_open_error.phpt b/ext/sqlite3/tests/sqlite3_15_open_error.phpt index 49168fd19..f296f8277 100644 --- a/ext/sqlite3/tests/sqlite3_15_open_error.phpt +++ b/ext/sqlite3/tests/sqlite3_15_open_error.phpt @@ -1,7 +1,12 @@ --TEST-- SQLite3::open error test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php +require_once(dirname(__FILE__) . '/skipif.inc'); +if (posix_geteuid() == 0) { + die('SKIP Cannot run test as root.'); +} +?> --FILE-- <?php $unreadable = dirname(__FILE__) . '/unreadable.db'; diff --git a/ext/sqlite3/tests/sqlite3_prepare_001.phpt b/ext/sqlite3/tests/sqlite3_prepare_001.phpt index 7cd4e4ccf..f9e5fadce 100644 --- a/ext/sqlite3/tests/sqlite3_prepare_001.phpt +++ b/ext/sqlite3/tests/sqlite3_prepare_001.phpt @@ -1,5 +1,7 @@ --TEST-- SQLite3 - memory leak on SQLite3Result and SQLite3Stmt +--SKIPIF-- +<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php |