X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=missing.h;h=3efe1a2b2873b163188f9951b80a98b9ebdf4841;hp=2a93ca74bdac980124e64fe43729071c1df75ef8;hb=refs%2Fheads%2Fv1.7.x;hpb=a5a48e24bce12e3b1a21763df927550f4cbc29e9

diff --git a/missing.h b/missing.h
index 2a93ca7..3efe1a2 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-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -17,14 +17,158 @@
 
 #include "php_version.h"
 
-#ifndef pemalloc_rel
-#	define pemalloc_rel(size, persistent) ((persistent)?malloc(size):emalloc_rel(size))
+#if ZEND_MODULE_API_NO >= 20100409
+#define ZEND_ENGINE_2_4
+#endif
+
+#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50500)
+#	define ZEND_GET_PPTR_TYPE_DC , int type
+#	define ZEND_GET_PPTR_TYPE_CC , type
+#else
+#	define ZEND_GET_PPTR_TYPE_DC
+#	define ZEND_GET_PPTR_TYPE_CC
+#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 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
+#	define HTTP_ZAPI_HASH_TSRMLS_DC
+#	define HTTP_ZAPI_CONST_CAST(t) (t)
+#	define GLOBAL_ERROR_HANDLING PG(error_handling)
+#	define GLOBAL_EXCEPTION_CLASS PG(exception_class)
+#	define HTTP_IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp))
+#	define HTTP_STATIC_ARG_INFO static
 #endif
 
 #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0)
 #	define WONKY
 #endif
 
+#ifndef pemalloc_rel
+#	define pemalloc_rel(size, persistent) ((persistent)?malloc(size):emalloc_rel(size))
+#endif
+
+#ifndef ZEND_ACC_DEPRECATED
+#	define ZEND_ACC_DEPRECATED 0
+#endif
+
+#if PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION < 10
+#	define php_url_parse_ex(u, l) php_url_parse(u)
+#endif
+
+#ifndef TSRMLS_FETCH_FROM_CTX
+#	ifdef ZTS
+#		define TSRMLS_FETCH_FROM_CTX(ctx)	void ***tsrm_ls = (void ***) ctx
+#	else
+#		define TSRMLS_FETCH_FROM_CTX(ctx)
+#	endif
+#endif
+
+#ifndef TSRMLS_SET_CTX
+#	ifdef ZTS
+#		define TSRMLS_SET_CTX(ctx)	ctx = (void ***) tsrm_ls
+#	else
+#		define TSRMLS_SET_CTX(ctx)
+#	endif
+#endif
+
+#ifndef ZVAL_ADDREF
+#	define ZVAL_ADDREF Z_ADDREF_P
+#endif
+
+#ifndef SEPARATE_ARG_IF_REF
+#define SEPARATE_ARG_IF_REF(zv) \
+	if (PZVAL_IS_REF(zv)) { \
+		zval *ov = zv; \
+		ALLOC_INIT_ZVAL(zv); \
+		Z_TYPE_P(zv) = Z_TYPE_P(ov); \
+		zv->value = ov->value; \
+		zval_copy_ctor(zv); \
+	} else { \
+		ZVAL_ADDREF(zv); \
+	}
+#endif
+
+#ifndef ZVAL_ZVAL
+#define ZVAL_ZVAL(z, zv, copy, dtor) {  \
+		int is_ref, refcount;           \
+		is_ref = (z)->is_ref;           \
+		refcount = (z)->refcount;       \
+		*(z) = *(zv);                   \
+		if (copy) {                     \
+			zval_copy_ctor(z);          \
+	    }                               \
+		if (dtor) {                     \
+			if (!copy) {                \
+				ZVAL_NULL(zv);          \
+			}                           \
+			zval_ptr_dtor(&zv);         \
+	    }                               \
+		(z)->is_ref = is_ref;           \
+		(z)->refcount = refcount;       \
+	}
+#endif
+#ifndef RETVAL_ZVAL
+#	define RETVAL_ZVAL(zv, copy, dtor)		ZVAL_ZVAL(return_value, zv, copy, dtor)
+#endif
+#ifndef RETURN_ZVAL
+#	define RETURN_ZVAL(zv, copy, dtor)		{ RETVAL_ZVAL(zv, copy, dtor); return; }
+#endif
+
+#ifndef ZEND_MN
+#	define ZEND_MN(name) ZEND_FN(name)
+#endif
+
 #ifdef WONKY
 extern int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC);
 extern void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC);