]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorRemi Collet <remi@php.net>
Tue, 19 Mar 2019 15:27:57 +0000 (16:27 +0100)
committerRemi Collet <remi@php.net>
Tue, 19 Mar 2019 15:27:57 +0000 (16:27 +0100)
* PHP-7.2:
  comment out sqlite3.defensive = 1 follow common practice, this is the default value

1  2 
php.ini-development
php.ini-production

index ff996cd1b83c2803d495dc8116c1de1d0a4895e4,6fd4018218def730c52ff0790bd00f3e684d47ff..fcc95fd3c50d62b5a7e5f5116d50d97aaae4935b
@@@ -1016,10 -997,10 +1016,10 @@@ cli_server.color = O
  ; 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.
 +; PCRE library backtracking limit.
  ; http://php.net/pcre.backtrack-limit
  ;pcre.backtrack_limit=100000
  
index 57ff3741021a7770c81625cabbd2eb2dc6b22ba8,91c6129d407c385593e7aaff230a925b086ceb0f..909bf6d8dcef339303eb352c4cf53258e9143d16
@@@ -1023,10 -1004,10 +1023,10 @@@ cli_server.color = O
  ; 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.
 +; PCRE library backtracking limit.
  ; http://php.net/pcre.backtrack-limit
  ;pcre.backtrack_limit=100000