diff options
| author | Remi Collet <remi@php.net> | 2019-03-19 16:28:22 +0100 | 
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2019-03-19 16:28:22 +0100 | 
| commit | 1df4ef0773f82fe6fbb8879bb081b28b7e954d7d (patch) | |
| tree | 918ffd03f69dfb2ae1078ff071b742fbe88f8d16 | |
| parent | ebb6c86d2841544f383d90fe474b89eec6379dc9 (diff) | |
| parent | 11bdc3eca401a65e8c6bf5b612cb9f589b4408a2 (diff) | |
| download | php-git-1df4ef0773f82fe6fbb8879bb081b28b7e954d7d.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
  comment out sqlite3.defensive = 1 follow common practice, this is the default value
| -rw-r--r-- | php.ini-development | 2 | ||||
| -rw-r--r-- | php.ini-production | 2 | 
2 files changed, 2 insertions, 2 deletions
| diff --git a/php.ini-development b/php.ini-development index e633427ed9..0bf89f4543 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1008,7 +1008,7 @@ cli_server.color = On  ; 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 +;sqlite3.defensive = 1  [Pcre]  ; PCRE library backtracking limit. diff --git a/php.ini-production b/php.ini-production index 980598584b..457b93e0b4 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1008,7 +1008,7 @@ cli_server.color = On  ; 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 +;sqlite3.defensive = 1  [Pcre]  ; PCRE library backtracking limit. | 
