com php-src: Remove sqlite extension leftover references (was removed in PHP 5.4): .gitignore main/internal_functions_win32.c php.ini-development
php.ini-production
| From: | Lior Kaplan | Date: | Wed, 16 Dec 2015 07:40:02 +0000 |
| Subject: | com php-src: Remove sqlite extension leftover references (was removed in PHP 5.4): .gitignore main/internal_functions_win32.c php.ini-development php.ini-production |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90297@lists.php.net to get a copy of this message | ||
Commit: ef9ddd0d82960d5c52f3abc00458c1eabdc149ec
Author: Lior Kaplan <kaplanlior@gmail.com> Tue, 15 Dec 2015 16:39:43 +0200
Parents: 57be57ac94ef46fa7a73889a1e7d6e75aa4ab00f
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ef9ddd0d82960d5c52f3abc00458c1eabdc149ec
Log:
Remove sqlite extension leftover references (was removed in PHP 5.4)
Changed paths:
M .gitignore
M main/internal_functions_win32.c
M php.ini-development
M php.ini-production
Diff:
diff --git a/.gitignore b/.gitignore
index e69463a..0a4efdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -219,10 +219,6 @@ ext/reflection/spl.chm
ext/simplexml/examples/security.new.xml
ext/spl/examples/.htaccess
ext/spl/examples/*.phps
-ext/sqlite/weztest.sqlite
-ext/sqlite/libsqlite/src/sqlite.h
-ext/sqlite/libsqlite/src/parse.out
-ext/sqlite/libsqlite/src/libsqlite.dsw
ext/sqlite3/tests/phpsql*
ext/sqlite3/tests/*.db
ext/sqlite3/tests/*.tmp
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 6c8cf41..49144e9 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -101,9 +101,6 @@
#if HAVE_XML && HAVE_WDDX
#include "ext/wddx/php_wddx.h"
#endif
-#ifdef HAVE_SQLITE
-#include "ext/sqlite/php_sqlite.h"
-#endif
#include "ext/com_dotnet/php_com_dotnet.h"
#ifdef HAVE_SPL
#include "ext/spl/php_spl.h"
@@ -176,9 +173,6 @@ static zend_module_entry *php_builtin_extensions[] = {
#if HAVE_XML && HAVE_WDDX
,phpext_wddx_ptr
#endif
-#if HAVE_SQLITE
- ,phpext_sqlite_ptr
-#endif
#if HAVE_SPL
,phpext_spl_ptr
#endif
diff --git a/php.ini-development b/php.ini-development
index dac7525..f350476 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -969,10 +969,6 @@ cli_server.color = On
; Default is 0, which does not produce any errors.
;intl.error_level = E_WARNING
-[sqlite]
-; http://php.net/sqlite.assoc-case
-;sqlite.assoc_case = 0
-
[sqlite3]
;sqlite3.extension_dir =
diff --git a/php.ini-production b/php.ini-production
index 4ee3310..e462003 100644
--- a/php..ini-production
+++ b/php.ini-production
@@ -969,10 +969,6 @@ cli_server.color = On
; Default is 0, which does not produce any errors.
;intl.error_level = E_WARNING
-[sqlite]
-; http://php.net/sqlite.assoc-case
-;sqlite.assoc_case = 0
-
[sqlite3]
;sqlite3.extension_dir =