com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/sqlite3/php_sqlite3.h ext/sqlite3/sqlite3.c php.ini-development php.ini-production

From: Date: Mon, 11 Mar 2019 15:30:16 +0000
Subject: com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/sqlite3/php_sqlite3.h ext/sqlite3/sqlite3.c php.ini-development php.ini-production
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105084@lists.php.net to get a copy of this message
Commit: e7ce7c6bb211011569d8036b663bc4ccd45b9984 Author: Christoph M. Becker <cmbecker69@gmx.de> Mon, 11 Mar 2019 16:28:46 +0100 Parents: 6818ca3c022d70bd48ac86df8798aa537245935c e93259bb23500e26a7b0317cde9ad5398eec074e Branches: PHP-7.3 PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e7ce7c6bb211011569d8036b663bc4ccd45b9984 Log: Merge branch 'PHP-7.2' into PHP-7.3 * PHP-7.2: SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws Changed paths: MM NEWS MM ext/sqlite3/php_sqlite3.h MM ext/sqlite3/sqlite3.c MM php.ini-development MM php.ini-production Diff: diff --cc php.ini-development index 1cf2a41,b8141af..e475e37 --- a/php.ini-development +++ b/php.ini-development @@@ -1004,10 -986,21 +1004,21 @@@ cli_server.color = O ;intl.use_exceptions = 0 [sqlite3] + ; Directory pointing to SQLite3 extensions + ; http://php.net/sqlite3.extension-dir ;sqlite3.extension_dir = + ; SQLite defensive mode flag (only available from SQLite 3.26+) + ; When the defensive flag is enabled, language features that allow ordinary + ; SQL to deliberately corrupt the database file are disabled. This forbids + ; writing directly to the schema, shadow tables (eg. FTS data tables), or + ; the sqlite_dbpage virtual table. + ; https://www.sqlite.org/c3ref/c_dbconfig_defensive.html + ; (for older SQLite versions, this flag has no use) + sqlite3.defensive = 1 + [Pcre] -;PCRE library backtracking limit. +; PCRE library backtracking limit. ; http://php.net/pcre.backtrack-limit ;pcre..backtrack_limit=100000 diff --cc php.ini-production index fa09ade,1dbbfc8..980e9a8 --- a/php.ini-production +++ b/php.ini-production @@@ -1011,10 -993,21 +1011,21 @@@ cli_server.color = O ;intl.use_exceptions = 0 [sqlite3] + ; Directory pointing to SQLite3 extensions + ; http://php.net/sqlite3.extension-dir ;sqlite3.extension_dir = + ; SQLite defensive mode flag (only available from SQLite 3.26+) + ; When the defensive flag is enabled, language features that allow ordinary + ; SQL to deliberately corrupt the database file are disabled. This forbids + ; writing directly to the schema, shadow tables (eg. FTS data tables), or + ; the sqlite_dbpage virtual table. + ; https://www.sqlite.org/c3ref/c_dbconfig_defensive.html + ; (for older SQLite versions, this flag has no use) + sqlite3.defensive = 1 + [Pcre] -;PCRE library backtracking limit. +; PCRE library backtracking limit. ; http://php.net/pcre.backtrack-limit ;pcre.backtrack_limit=100000

« previous php.cvs (#105084) next »