Merge branch 'PHP-7.3' into PHP-7.4

krakjoe · krakjoe · commit 11f30d67ea05 · 2019-06-19T12:43:17.000+02:00
* PHP-7.3:
  fix setcookie Max-Age to use php_time
diff --git 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;
 			}

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ PHPAPI int php_setcookie(zend_string name, zend_string value, time_t expires,`
`149`	`149`	`smart_str_append(&buf, dt);`
`150`	`150`	`zend_string_free(dt);`
`151`	`151`
`152`		`- diff = difftime(expires, time(NULL));`
	`152`	`+ diff = difftime(expires, php_time());`
`153`	`153`	`if (diff < 0) {`
`154`	`154`	`diff = 0;`
`155`	`155`	`}`