com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/standard/head.c
| From: | Nikita Popov | Date: | Thu, 14 Feb 2019 09:43:45 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/standard/head.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104625@lists.php.net to get a copy of this message | ||
Commit: 8b6dba25c784ef9f190f84ced351d9ccc16f0a91
Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 14 Feb 2019 10:43:45 +0100
Parents: 3ece2640ea97027636e321e6f6e112dff815bea7 eb063c8a9f130f2981c590d31aa2dd548a8d523b
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8b6dba25c784ef9f190f84ced351d9ccc16f0a91
Log:
Merge branch 'PHP-7.3' into PHP-7.4
Changed paths:
MM ext/standard/head.c
Diff:
diff --cc ext/standard/head.c
index 0ab0293,0043099..4e0ac202
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@@ -23,9 -23,14 +23,10 @@@
#include "SAPI.h"
#include "php_main.h"
#include "head.h"
-#ifdef TM_IN_SYS_TIME
-#include <sys/time.h>
-#else
#include <time.h>
-#endif
#include "php_globals.h"
+ #include "zend_smart_str.h"
/* Implementation of the language Header() function */