From 460dabb01a436274223336eda17c920d2c56076d Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Sun, 24 May 2026 15:17:49 +0200 Subject: [PATCH] main: remove OPENBASEDIR_CHECKPATH() compatibility macro --- UPGRADING.INTERNALS | 2 ++ main/fopen_wrappers.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 2daa75f798bb..c340ba64833c 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -108,6 +108,8 @@ PHP 8.6 INTERNALS UPGRADE NOTES instead of copying it in zend_call_function(). Currently only a single consumed argument is supported. . Added ZEND_CONTAINER_OF(). + . The OPENBASEDIR_CHECKPATH() compatibility macro has been removed, instead + use php_check_open_basedir() directly. ======================== 2. Build system changes diff --git a/main/fopen_wrappers.h b/main/fopen_wrappers.h index f92c7d6fd443..62bebca9b715 100644 --- a/main/fopen_wrappers.h +++ b/main/fopen_wrappers.h @@ -28,9 +28,6 @@ PHPAPI int php_check_open_basedir(const char *path); PHPAPI int php_check_open_basedir_ex(const char *path, int warn); PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path); -/* OPENBASEDIR_CHECKPATH(filename) to ease merge between 6.x and 5.x */ -#define OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename) - PHPAPI zend_string *php_resolve_path(const char *filename, size_t filename_len, const char *path); PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const char *path, zend_string **opened_path);