- add OPENBASEDIR_CHECKPATH macro to ease merge between 5.3 and 6, it includes safemo...

diff --git a/main/fopen_wrappers.h b/main/fopen_wrappers.h
index e67f31ae6ede7d3dfa0b9aa0908d7fffa4c488eb..b746a3c7e05a43b9a1b3e862a1d8eee6e81d1eb9 100644 (file)
--- a/main/fopen_wrappers.h
+++ b/main/fopen_wrappers.h
@@ -33,6 +33,18 @@ PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC);
 PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC);
 PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path TSRMLS_DC);
 
+/* {{{ OPENBASEDIR_CHECKPATH(filename) to ease merge between 6.x and 5.x */
+#if (PHP_MAJOR_VERSION < 6)
+# define OPENBASEDIR_CHECKPATH(filename) \
+       (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC)
+#else
+#define OPENBASEDIR_CHECKPATH(filename) \
+       php_check_open_basedir(filename TSRMLS_CC)
+#endif
+/* }}} */
+
+PHPAPI int php_check_safe_mode_include_dir(const char *path TSRMLS_DC);
+
 PHPAPI char *php_resolve_path(const char *filename, int filename_len, const char *path TSRMLS_DC);
 
 PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const char *path, char **opened_path TSRMLS_DC);