Remove AC_FUNC_UTIME_NULL

Autoconf 2.59d (released in 2006) [1] started promoting several macros
as not relevant for newer systems, including the AC_FUNC_UTIME_NULL.

This macro checks if `utime(file, NULL)` sets file's timestamp to the
current time and defines the `HAVE_UTIME_NULL` symbol. This check was
relevant on very old systems (for example, 4.3BSD released in 1986) and
today can be omitted for systems with utime since it should be well
supported by now. [2]

Refs:
[1] http://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS
[2] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/autoconf.html

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index af5a36b1937f1748c46f8a995c44fb0be1908ab1..9981b56f8b3ea64d11ca0522a863f4ef43931901 100644 (file)
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -29,8 +29,9 @@ PHP 7.4 INTERNALS UPGRADE NOTES
   a. Unix build system changes
     - configure --help now also outputs --program-suffix and --program-prefix
       information by using the Autoconf AC_ARG_PROGRAM macro.
-    - Obsolescent macro AC_FUNC_VPRINTF has been removed and the HAVE_VPRINTF
-      symbol is no longer defined since it is not needed on current systems.
+    - Obsolescent macros AC_FUNC_VPRINTF and AC_FUNC_UTIME_NULL have been
+      removed. Symbols HAVE_VPRINTF and HAVE_UTIME_NULL are no longer defined
+      since they are not needed on the current systems.
 
   b. Windows build system changes
 

diff --git a/configure.ac b/configure.ac
index 06ae3f406c4013c8cb1d3e116521ccecf44d4abe..2ad2190275ce5263d3220a730b08034da6a1e40b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -738,7 +738,6 @@ if test "$ac_cv_func_sync_fetch_and_add" = yes; then
 fi
 
 AC_REPLACE_FUNCS(strlcat strlcpy explicit_bzero getopt)
-AC_FUNC_UTIME_NULL
 AC_FUNC_ALLOCA
 dnl PHP_AC_BROKEN_SPRINTF
 dnl PHP_AC_BROKEN_SNPRINTF

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index cec67df148a134507e69a01277ab6a3cfe1c7970..2a5cf27068179efa45ade8209da39f92e0783080 100644 (file)
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -571,8 +571,6 @@ PS_WRITE_FUNC(files)
 PS_UPDATE_TIMESTAMP_FUNC(files)
 {
        char buf[MAXPATHLEN];
-       struct utimbuf newtimebuf;
-       struct utimbuf *newtime = &newtimebuf;
        int ret;
        PS_FILES_DATA;
 
@@ -581,12 +579,7 @@ PS_UPDATE_TIMESTAMP_FUNC(files)
        }
 
        /* Update mtime */
-#ifdef HAVE_UTIME_NULL
-       newtime = NULL;
-#else
-       newtime->modtime = newtime->actime = time(NULL);
-#endif
-       ret = VCWD_UTIME(buf, newtime);
+       ret = VCWD_UTIME(buf, NULL);
        if (ret == -1) {
                /* New session ID, create data file */
                return ps_files_write(data, key, val);

diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 6822e055a82ced3bcd7c69c6f777f8c58f59c004..3a3c024b6aeb3008fcfe1fb8fe99364c48994a5d 100644 (file)
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -640,11 +640,7 @@ PHP_FUNCTION(touch)
 
        switch (argc) {
                case 1:
-#ifdef HAVE_UTIME_NULL
                        newtime = NULL;
-#else
-                       newtime->modtime = newtime->actime = time(NULL);
-#endif
                        break;
                case 2:
                        newtime->modtime = newtime->actime = filetime;

diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 92d27dde9f7930025d9de6dbd8826e294ee4a831..4a510ea6b443db91f2a7fc23687431468630ddb4 100644 (file)
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -69,7 +69,6 @@
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 #undef HAVE_STRUCT_STAT_ST_BLOCKS
 #define HAVE_STRUCT_STAT_ST_RDEV 1
-#define HAVE_UTIME_NULL 1
 #define STDC_HEADERS 1
 #define REGEX 1
 #define HSREGEX 1