Skip to content

Commit 76329a9

Browse files
committed
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 :-)
1 parent 68c1c83 commit 76329a9

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ PHP NEWS
2323
- Added tidyNode::getParent() method (John, Nuno)
2424
- Added openbasedir and safemode checks in zip:// stream wrapper and
2525
ZipArchive::open (Pierre)
26+
- Added php_pdo_sqlite_external.dll, a version of the PDO SQLite driver that
27+
links against an external sqlite3.dll. This provides Windows users to upgrade
28+
their sqlite3 version outside of the PHP release cycle. (Wez, Edin)
2629
- Fixed shmop_open() with IPC_CREAT|IPC_EXCL flags on Windows.
2730
(Vladimir Kamaev, Tony).
2831
- Fixed possible leak in ZipArchive::extractTo when safemode checks fails (Ilia)

ext/pdo_sqlite/config.w32

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,10 @@ if (PHP_PDO_SQLITE != "no") {
2929
ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
3030
}
3131

32+
ARG_WITH("pdo-sqlite-external", "for pdo_sqlite support from an external dll", "no");
33+
if (PHP_PDO_SQLITE_EXTERNAL != "no") {
34+
CHECK_HEADER_ADD_INCLUDE("sqlite3.h", "CFLAGS_PDO_SQLITE_EXTERNAL", PHP_PDO_SQLITE_EXTERNAL + ";" + PHP_PHP_BUILD + "\\include\\sqlite3");
35+
CHECK_LIB("sqlite3-import.lib", "pdo_sqlite_external", PHP_PDO_SQLITE_EXTERNAL + ";" + PHP_PHP_BUILD + "\\lib");
36+
EXTENSION("pdo_sqlite_external", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c", null, "/I" + configure_module_dirname, null, "ext\\pdo_sqlite_external");
37+
ADD_EXTENSION_DEP('pdo_sqlite_external', 'pdo');
38+
}

0 commit comments

Comments
 (0)