com php-src: Merge branch 'PHP-7.2' into PHP-7.3: php.ini-development php.ini-production
| From: | Remi Collet | Date: | Tue, 19 Mar 2019 15:27:57 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: php.ini-development php.ini-production | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105255@lists.php.net to get a copy of this message | ||
Commit: 5686e6e33ee8f60c87b4f3d8e0f43cd79301c5a1
Author: Remi Collet <remi@php.net> Tue, 19 Mar 2019 16:27:57 +0100
Parents: a2de42041c7ac70460521fc4bb8cbe370532f1d0 78c9a53df722132f9b2a1a4018eba6327438e695
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5686e6e33ee8f60c87b4f3d8e0f43cd79301c5a1
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
comment out sqlite3.defensive = 1 follow common practice, this is the default value
Changed paths:
MM php.ini-development
MM php.ini-production
Diff:
diff --cc php.ini-development
index ff996cd,6fd4018...fcc95fd
--- a/php.ini-development
+++ b/php.ini-development
@@@ -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
diff --cc php.ini-production
index 57ff374,91c6129..909bf6d
--- a/php.ini-production
+++ b/php.ini-production
@@@ -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