Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  fix setcookie Max-Age to use php_time

diff --cc ext/standard/head.c
index 0043099b405c38429edb150374633a6de4e22f9c,f57b8b02edd2aca37a77ab8d700f12603eed513e..6897cc7cf8625d1e90dad91aae03e80ca046c3c5
--- 1/ext/standard/head.c
--- 2/ext/standard/head.c
+++ b/ext/standard/head.c
@@@ -149,11 -151,10 +149,11 @@@ PHPAPI int php_setcookie(zend_string *n
                                zend_error(E_WARNING, "Expiry date cannot have a year greater than 9999");
                                return FAILURE;
                        }
 -                      strlcat(cookie, ZSTR_VAL(dt), len + 100);
 +
 +                      smart_str_append(&buf, dt);
                        zend_string_free(dt);
  
-                       diff = difftime(expires, time(NULL));
+                       diff = difftime(expires, php_time());
                        if (diff < 0) {
                                diff = 0;
                        }