diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2013-07-18 14:10:05 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2013-07-18 14:10:05 +0900 |
| commit | d6692514f8c7654aa71e4263d42f919dcf62ffa7 (patch) | |
| tree | 894377befa76d9e7d70cfe6c44581b4322c811c6 | |
| parent | fec93992de67a3bc30559e0a741b6ca5e0db8025 (diff) | |
| parent | 445dffa75a1ffdbcf03670781c48fa4f88ce2ce9 (diff) | |
| download | php-git-d6692514f8c7654aa71e4263d42f919dcf62ffa7.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Improve php.ini-* documentation
| -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 b7f0b30359..b77d0feed6 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1478,7 +1478,7 @@ session.gc_maxlifetime = 1440 ; 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): -; find /path/to/sessions -cmin +24 | xargs rm +; find /path/to/sessions -cmin +24 -type f | xargs rm ; PHP 4.2 and less have an undocumented feature/bug that allows you to ; to initialize a session variable in the global scope. diff --git a/php.ini-production b/php.ini-production index 8b14386c1f..e0ee589682 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1478,7 +1478,7 @@ session.gc_maxlifetime = 1440 ; 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): -; find /path/to/sessions -cmin +24 | xargs rm +; find /path/to/sessions -cmin +24 -type f | xargs rm ; PHP 4.2 and less have an undocumented feature/bug that allows you to ; to initialize a session variable in the global scope. |