summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-03-15 15:01:23 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2020-03-15 15:01:23 +0100
commitb48c05a982cf79de59190f6de26b9e868a7330aa (patch)
tree7dfbf837423b2c50b93f7eb1e65e94e0a5a5498c
parentc5159b383218968be307fb96f9fd19b2b6e17c90 (diff)
parent68e2da63622938396df91d617f496ebad5df3e4d (diff)
downloadphp-git-b48c05a982cf79de59190f6de26b9e868a7330aa.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix typo in php.ini comment
-rw-r--r--php.ini-development4
-rw-r--r--php.ini-production4
2 files changed, 4 insertions, 4 deletions
diff --git a/php.ini-development b/php.ini-development
index 66d2f0eefd..a9d5c9b70e 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1422,8 +1422,8 @@ session.gc_maxlifetime = 1440
; (see session.save_path above), then garbage collection does *not*
; happen automatically. You will need to do your own garbage
; collection through a shell script, cron entry, or some other method.
-; For example, the following script would is the equivalent of
-; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
+; For example, the following script is the equivalent of setting
+; session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
; find /path/to/sessions -cmin +24 -type f | xargs rm
; Check HTTP Referer to invalidate externally stored URLs containing ids.
diff --git a/php.ini-production b/php.ini-production
index 7925a4f52e..876b6143e9 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1426,8 +1426,8 @@ session.gc_maxlifetime = 1440
; (see session.save_path above), then garbage collection does *not*
; happen automatically. You will need to do your own garbage
; collection through a shell script, cron entry, or some other method.
-; For example, the following script would is the equivalent of
-; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
+; For example, the following script is the equivalent of setting
+; session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
; find /path/to/sessions -cmin +24 -type f | xargs rm
; Check HTTP Referer to invalidate externally stored URLs containing ids.