X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=missing.h;h=6afa3acbfef9eb1e1dbf8575f098e0a5d6f7b85f;hp=a9da727fce1439065c735c2bde725c4ac2a34501;hb=a82a43116a750e478d0d4be079a5fa5bac7e199b;hpb=c0fd8021cff2c4a134937098ef4fa9779c1924bd

diff --git a/missing.h b/missing.h
index a9da727..6afa3ac 100644
--- a/missing.h
+++ b/missing.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -17,13 +17,60 @@
 
 #include "php_version.h"
 
+#if ZEND_MODULE_API_NO >= 20100409
+#define ZEND_ENGINE_2_4
+#endif
+
+#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399)
+#	define ZEND_LITERAL_KEY_DC , const zend_literal *_zend_literal_key
+#	define ZEND_LITERAL_KEY_CC , _zend_literal_key
+#	define ZEND_LITERAL_NIL_CC , NULL
+#	define HTTP_CHECK_OPEN_BASEDIR(file, act) \
+	if ((PG(open_basedir) && *PG(open_basedir))) \
+	{ \
+		const char *tmp = file; \
+ \
+		if (!strncasecmp(tmp, "file:", lenof("file:"))) { \
+			tmp += lenof("file:"); \
+			while ((tmp - (const char *)file < 7) && (*tmp == '/' || *tmp == '\\')) ++tmp; \
+		} \
+ \
+ 		if (	(tmp != file || !strstr(file, "://")) && \
+		 		(!*tmp || php_check_open_basedir(tmp TSRMLS_CC))) { \
+		 		act; \
+		} \
+	}
+
+#else
+#	define ZEND_LITERAL_KEY_DC
+#	define ZEND_LITERAL_KEY_CC
+#	define ZEND_LITERAL_NIL_CC
+#	define HTTP_CHECK_OPEN_BASEDIR(file, act) \
+	if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) \
+	{ \
+		const char *tmp = file; \
+ \
+		if (!strncasecmp(tmp, "file:", lenof("file:"))) { \
+			tmp += lenof("file:"); \
+			while ((tmp - (const char *)file < 7) && (*tmp == '/' || *tmp == '\\')) ++tmp; \
+		} \
+ \
+ 		if (	(tmp != file || !strstr(file, "://")) && \
+		 		(!*tmp || php_check_open_basedir(tmp TSRMLS_CC) || \
+		 		(PG(safe_mode) && !php_checkuid(tmp, "rb+", CHECKUID_CHECK_MODE_PARAM)))) { \
+		 		act; \
+		} \
+	}
+
+#endif
+
 #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)
 #	define HTTP_ZAPI_HASH_TSRMLS_CC TSRMLS_CC
 #	define HTTP_ZAPI_HASH_TSRMLS_DC TSRMLS_DC
 #	define HTTP_ZAPI_CONST_CAST(t) (const t)
 #	define GLOBAL_ERROR_HANDLING EG(error_handling)
 #	define GLOBAL_EXCEPTION_CLASS EG(exception_class)
-#	define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp) TSRMLS_CC)
+#	define HTTP_IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp) TSRMLS_CC)
 #	define HTTP_STATIC_ARG_INFO
 #else
 #	define HTTP_ZAPI_HASH_TSRMLS_CC
@@ -31,7 +78,7 @@
 #	define HTTP_ZAPI_CONST_CAST(t) (t)
 #	define GLOBAL_ERROR_HANDLING PG(error_handling)
 #	define GLOBAL_EXCEPTION_CLASS PG(exception_class)
-#	define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp))
+#	define HTTP_IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp))
 #	define HTTP_STATIC_ARG_INFO static
 #endif