diff options
| -rw-r--r-- | ext/pdo_sqlite/config.w32 | 7 | ||||
| -rw-r--r-- | ext/pdo_sqlite/sqlite_driver.c | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/ext/pdo_sqlite/config.w32 b/ext/pdo_sqlite/config.w32 index 8f72e94ee3..dc45f0ff67 100644 --- a/ext/pdo_sqlite/config.w32 +++ b/ext/pdo_sqlite/config.w32 @@ -1,12 +1,13 @@ // $Id$ // vim:ft=javascript -ARG_WITH("pdo_sqlite", "for pdo_sqlite support", "no"); +ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no"); if (PHP_PDO_SQLITE != "no") { - if (CHECK_LIB("libsqlite3.lib", "pdo_sqlite", PHP_PDO_SQLITE) && + if (CHECK_LIB("sqlite3.lib", "pdo_sqlite", PHP_PDO_SQLITE) && CHECK_HEADER_ADD_INCLUDE("sqlite3.h", "CFLAGS_PDO_SQLITE", PHP_PDO_SQLITE)) { - EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c", "/I ..\\pecl"); + EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c"); + ADD_FLAG('CFLAGS_PDO_SQLITE', "/I ..\\pecl"); } else { WARNING("pdo_sqlite not enabled; libraries and headers not found"); } diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index 8e2db506db..3fd2152702 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -265,21 +265,25 @@ static int authorizer(void *autharg, int access_type, const char *arg3, const ch { char *filename; switch (access_type) { - case SQLITE_COPY: - filename = make_filename_safe(arg4); + case SQLITE_COPY: { + TSRMLS_FETCH(); + filename = make_filename_safe(arg4 TSRMLS_CC); if (!filename) { return SQLITE_DENY; } efree(filename); return SQLITE_OK; + } - case SQLITE_ATTACH: - filename = make_filename_safe(arg3); + case SQLITE_ATTACH: { + TSRMLS_FETCH(); + filename = make_filename_safe(arg3 TSRMLS_CC); if (!filename) { return SQLITE_DENY; } efree(filename); return SQLITE_OK; + } default: /* access allowed */ @@ -300,7 +304,7 @@ static int pdo_sqlite_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS H->einfo.errmsg = NULL; dbh->driver_data = H; - filename = make_filename_safe(dbh->data_source); + filename = make_filename_safe(dbh->data_source TSRMLS_CC); if (!filename) { zend_throw_exception_ex(php_pdo_get_exception(), PDO_ERR_CANT_MAP TSRMLS_CC, |