wez Thu Mar 22 01:00:23 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/pdo_sqlite config.w32
Log:
Add php_pdo_sqlite_external.dll to windows build.
This allows the user to provide their own version of sqlite3.dll.
The php_pdo_sqlite.dll is still there, and will continue to be there.
It is built from the bundled sources.
[[DOC]]
(this should cc: phpdoc, if it's wrong, please let the docs folks know :-)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.608&r2=1.2027.2.547.2.609&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.608 php-src/NEWS:1.2027.2.547.2.609
--- php-src/NEWS:1.2027.2.547.2.608 Wed Mar 21 00:25:43 2007
+++ php-src/NEWS Thu Mar 22 01:00:23 2007
@@ -23,6 +23,9 @@
- Added tidyNode::getParent() method (John, Nuno)
- Added openbasedir and safemode checks in zip:// stream wrapper and
ZipArchive::open (Pierre)
+- Added php_pdo_sqlite_external.dll, a version of the PDO SQLite driver that
+ links against an external sqlite3.dll. This provides Windows users to
upgrade
+ their sqlite3 version outside of the PHP release cycle. (Wez, Edin)
- Fixed shmop_open() with IPC_CREAT|IPC_EXCL flags on Windows.
(Vladimir Kamaev, Tony).
- Fixed possible leak in ZipArchive::extractTo when safemode checks fails
(Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.6.2.1.2.2&r2=1.6.2.1.2.3&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.2
php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3
--- php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.2 Mon Aug 14 16:15:28 2006
+++ php-src/ext/pdo_sqlite/config.w32 Thu Mar 22 01:00:23 2007
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6.2.1.2.2 2006/08/14 16:15:28 iliaa Exp $
+// $Id: config.w32,v 1.6.2.1.2.3 2007/03/22 01:00:23 wez Exp $
// vim:ft=javascript
ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
@@ -29,3 +29,10 @@
ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
}
+ARG_WITH("pdo-sqlite-external", "for pdo_sqlite support from an external dll",
"no");
+if (PHP_PDO_SQLITE_EXTERNAL != "no") {
+ CHECK_HEADER_ADD_INCLUDE("sqlite3.h", "CFLAGS_PDO_SQLITE_EXTERNAL",
PHP_PDO_SQLITE_EXTERNAL + ";" + PHP_PHP_BUILD + "\\include\\sqlite3");
+ CHECK_LIB("sqlite3-import.lib", "pdo_sqlite_external",
PHP_PDO_SQLITE_EXTERNAL + ";" + PHP_PHP_BUILD + "\\lib");
+ EXTENSION("pdo_sqlite_external", "pdo_sqlite.c sqlite_driver.c
sqlite_statement.c", null, "/I" + configure_module_dirname, null,
"ext\\pdo_sqlite_external");
+ ADD_EXTENSION_DEP('pdo_sqlite_external', 'pdo');
+}