fix bug #64380 (http_message_object.c build fails in 5.5.0alpha6)

[m6w6/ext-http] / missing.h

diff --git a/missing.h b/missing.h
index 0b46545f866194a1673486935505dc43801a2e35..0186ea50b3f8efb7c5a2207e62d945e1b52a4aee 100644 (file)
--- 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,16 +17,75 @@
 
 #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)
+#      if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50500)
+#              define ZEND_GET_PPTR_TYPE_DC , int type
+#              define ZEND_GET_PPTR_TYPE_CC , type
+#endif
+#      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_GET_PPTR_TYPE_DC
+#      define ZEND_GET_PPTR_TYPE_CC
+#      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
+#      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 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
 
 #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0)
@@ -65,6 +124,19 @@
 #      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;           \