diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-06-19 12:43:17 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-06-19 12:43:17 +0200 |
| commit | 11f30d67ea058554cb6d16fb67c7708070f78d47 (patch) | |
| tree | 95b45a68946f755025f34cd417d5831af26b13ad | |
| parent | 5f9ee161ec0a3c5d25312ab43b8fec4a1e0d540e (diff) | |
| parent | a5db31946361af4655c9ed4622f2c87c062009f0 (diff) | |
| download | php-git-11f30d67ea058554cb6d16fb67c7708070f78d47.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
fix setcookie Max-Age to use php_time
| -rw-r--r-- | ext/standard/head.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/head.c b/ext/standard/head.c index f1b2fa4e8b..91b12108bf 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -149,7 +149,7 @@ PHPAPI int php_setcookie(zend_string *name, zend_string *value, time_t expires, smart_str_append(&buf, dt); zend_string_free(dt); - diff = difftime(expires, time(NULL)); + diff = difftime(expires, php_time()); if (diff < 0) { diff = 0; } |