diff options
| author | George Peter Banyard <girgias@php.net> | 2020-09-03 14:15:18 +0200 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2020-09-03 14:23:18 +0200 |
| commit | 430b3ac7df59aa42b52995be1c704394fa29ad3d (patch) | |
| tree | 5f60a90073c29b6367ed6175ba0bdff3810b9713 /ext/standard/flock_compat.c | |
| parent | 7b3ac296a5242f9ded4d2dc7cf2c6349e583caf8 (diff) | |
| download | php-git-430b3ac7df59aa42b52995be1c704394fa29ad3d.tar.gz | |
Refactor parts of SPL Dir/SplFileObject
This fixes a way it was possible to trigger an Internel Error
by disabling function (via the INI setting) when SPL was acting
as a proxy to the function call.
Fix flock_compat layer as it needs to used in SPL now.
Use macro to check if object is initialized
Closes GH-6014
Diffstat (limited to 'ext/standard/flock_compat.c')
| -rw-r--r-- | ext/standard/flock_compat.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/ext/standard/flock_compat.c b/ext/standard/flock_compat.c index 6751aedfc1..7b0ad2df23 100644 --- a/ext/standard/flock_compat.c +++ b/ext/standard/flock_compat.c @@ -18,17 +18,6 @@ #include <errno.h> #include "ext/standard/flock_compat.h" -#if HAVE_STRUCT_FLOCK -#include <unistd.h> -#include <fcntl.h> -#include <sys/file.h> -#endif - -#ifdef PHP_WIN32 -#include <io.h> -#include "config.w32.h" -#endif - #ifndef HAVE_FLOCK PHPAPI int flock(int fd, int operation) { |