diff options
| author | Scott MacVicar <scottmac@php.net> | 2009-03-17 02:42:41 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2009-03-17 02:42:41 +0000 |
| commit | 719ba687c029e3e0a0747ecab502d7ee7c6d0a73 (patch) | |
| tree | 399811d671ae85a5f03a144570dc74a1820a43c2 /ext/sqlite3/sqlite3.c | |
| parent | de4891ab2aa9827d70a0f1b53499670268294cab (diff) | |
| download | php-git-719ba687c029e3e0a0747ecab502d7ee7c6d0a73.tar.gz | |
Fix bug #47678 - Allow loadExtension to be disabled in SQLite3
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index da409a655d..fb3b7f0986 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -281,6 +281,7 @@ PHP_METHOD(sqlite3, lastErrorMsg) } /* }}} */ +#ifndef SQLITE_OMIT_LOAD_EXTENSION /* {{{ proto bool SQLite3::loadExtension(String Shared Library) Attempts to load an SQLite extension library */ PHP_METHOD(sqlite3, loadExtension) @@ -343,6 +344,7 @@ PHP_METHOD(sqlite3, loadExtension) RETURN_TRUE; } /* }}} */ +#endif /* {{{ proto int SQLite3::changes() U Returns the number of database rows that were changed (or inserted or deleted) by the most recent SQL statement. */ @@ -1636,9 +1638,11 @@ ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_open, 0) ZEND_ARG_INFO(0, encryption_key) ZEND_END_ARG_INFO() +#ifndef SQLITE_OMIT_LOAD_EXTENSION ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_loadextension, 0) ZEND_ARG_INFO(0, shared_library) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_escapestring, 0, 0, 1) ZEND_ARG_INFO(0, value) @@ -1717,7 +1721,9 @@ static zend_function_entry php_sqlite3_class_methods[] = { PHP_ME(sqlite3, lastInsertRowID, arginfo_sqlite3_void, ZEND_ACC_PUBLIC) PHP_ME(sqlite3, lastErrorCode, arginfo_sqlite3_void, ZEND_ACC_PUBLIC) PHP_ME(sqlite3, lastErrorMsg, arginfo_sqlite3_void, ZEND_ACC_PUBLIC) +#ifndef SQLITE_OMIT_LOAD_EXTENSION PHP_ME(sqlite3, loadExtension, arginfo_sqlite3_loadextension, ZEND_ACC_PUBLIC) +#endif PHP_ME(sqlite3, changes, arginfo_sqlite3_void, ZEND_ACC_PUBLIC) PHP_ME(sqlite3, escapeString, arginfo_sqlite3_escapestring, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) PHP_ME(sqlite3, prepare, arginfo_sqlite3_query, ZEND_ACC_PUBLIC) |