X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=79b69ae9d294691a72d68ccc4612494c380bce1d;hp=93b5f65ef4ca6fddb566b3dbed9748229579a145;hb=693aff1dce7d26388ff36794fe4b90a26b7f2ccd;hpb=791714f8fbc8e92970711321a3fd99331df566f1 diff --git a/php_http_std_defs.h b/php_http_std_defs.h index 93b5f65..79b69ae 100644 --- a/php_http_std_defs.h +++ b/php_http_std_defs.h @@ -36,10 +36,28 @@ typedef int STATUS; /* lenof() */ #define lenof(S) (sizeof(S) - 1) +#ifndef MIN +# define MIN(a,b) (ab?a:b) +#endif + /* STR_SET() */ -#define STR_SET(target, source) \ - if(target) efree(target); \ - target = source +#ifndef STR_SET +# define STR_SET(STR, SET) \ + { \ + STR_FREE(STR); \ + STR = SET; \ + } +#endif + +#define INIT_ZARR(zv, ht) \ + { \ + INIT_PZVAL(&(zv)); \ + Z_TYPE(zv) = IS_ARRAY; \ + Z_ARRVAL(zv) = (ht); \ + } /* return bool (v == SUCCESS) */ #define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v)) @@ -51,13 +69,17 @@ typedef int STATUS; RETVAL_OBJECT(o); \ return #define RETVAL_OBJVAL(ov) \ - return_value->is_ref = 1; \ - return_value->type = IS_OBJECT; \ - return_value->value.obj = (ov); \ - zend_objects_store_add_ref(return_value TSRMLS_CC) + ZVAL_OBJVAL(return_value, ov) #define RETURN_OBJVAL(ov) \ RETVAL_OBJVAL(ov); \ return +#define ZVAL_OBJVAL(zv, ov) \ + (zv)->is_ref = 1; \ + (zv)->type = IS_OBJECT; \ + (zv)->value.obj = (ov); \ + if (Z_OBJ_HT_P(zv)->add_ref) { \ + Z_OBJ_HT_P(zv)->add_ref((zv) TSRMLS_CC); \ + } /* function accepts no args */ #define NO_ARGS \ @@ -105,11 +127,10 @@ typedef int STATUS; /* END */ -/* server vars shorthand */ -#define HTTP_SERVER_VARS Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]) - #define HTTP_PHP_INI_ENTRY(entry, default, scope, updater, global) \ STD_PHP_INI_ENTRY(entry, default, scope, updater, global, zend_http_globals, http_globals) +#define HTTP_PHP_INI_ENTRY_EX(entry, default, scope, updater, displayer, global) \ + STD_PHP_INI_ENTRY_EX(entry, default, scope, updater, global, zend_http_globals, http_globals, displayer) /* {{{ arrays */ #define FOREACH_VAL(array, val) FOREACH_HASH_VAL(Z_ARRVAL_P(array), val) @@ -203,103 +224,27 @@ typedef int STATUS; # define getObjectEx(t, o, v) t * o = ((t *) zend_object_store_get_object(v TSRMLS_CC)) # define putObject(t, o) zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) t## _free, NULL TSRMLS_CC); # define OBJ_PROP(o) (o)->zo.properties -# define DCL_STATIC_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC) -# define DCL_STATIC_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC) -# define DCL_STATIC_PROP_N(a, n) zend_declare_property_null(ce, (#n), sizeof(#n), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC) -# define GET_STATIC_PROP_EX(ce, n) zend_std_get_static_property(ce, (#n), sizeof(#n), 0 TSRMLS_CC) -#ifdef zend_update_class_constants -# define USE_STATIC_PROP_EX(ce) zend_update_class_constants(ce TSRMLS_CC) -#else -# define USE_STATIC_PROP_EX(ce) -#endif -# define SET_STATIC_PROP_EX(ce, n, v) \ - { \ - int refcount; \ - zend_uchar is_ref; \ - zval **__static = GET_STATIC_PROP_EX(ce, n); \ - \ - refcount = (*__static)->refcount; \ - is_ref = (*__static)->is_ref; \ - switch (Z_TYPE_PP(__static)) \ - { \ - case IS_BOOL: case IS_LONG: case IS_NULL: \ - break; \ - case IS_RESOURCE: \ - zend_list_delete(Z_LVAL_PP(__static)); \ - break; \ - case IS_STRING: case IS_CONSTANT: \ - free(Z_STRVAL_PP(__static)); \ - break; \ - case IS_OBJECT: \ - Z_OBJ_HT_PP(__static)->del_ref(*__static TSRMLS_CC); \ - break; \ - case IS_ARRAY: case IS_CONSTANT_ARRAY: \ - if (Z_ARRVAL_PP(__static) && Z_ARRVAL_PP(__static) != &EG(symbol_table)) { \ - zend_hash_destroy(Z_ARRVAL_PP(__static)); \ - free(Z_ARRVAL_PP(__static)); \ - } \ - break; \ - } \ - **__static = *(v); \ - switch (Z_TYPE_PP(__static)) \ - { \ - case IS_BOOL: case IS_LONG: case IS_NULL: \ - break; \ - case IS_RESOURCE: \ - zend_list_addref(Z_LVAL_PP(__static)); \ - break; \ - case IS_STRING: case IS_CONSTANT: \ - Z_STRVAL_PP(__static) = (char *) zend_strndup(Z_STRVAL_PP(__static), Z_STRLEN_PP(__static)); \ - break; \ - case IS_OBJECT: \ - { \ - Z_OBJ_HT_PP(__static)->add_ref(*__static TSRMLS_CC); \ - } \ - break; \ - case IS_ARRAY: case IS_CONSTANT_ARRAY: \ - { \ - if (Z_ARRVAL_PP(__static) != &EG(symbol_table)) { \ - zval *tmp; \ - HashTable *old = Z_ARRVAL_PP(__static); \ - Z_ARRVAL_PP(__static) = (HashTable *) malloc(sizeof(HashTable)); \ - zend_hash_init(Z_ARRVAL_PP(__static), 0, NULL, ZVAL_PTR_DTOR, 0); \ - zend_hash_copy(Z_ARRVAL_PP(__static), old, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); \ - } \ - } \ - break; \ - } \ - (*__static)->refcount = refcount; \ - (*__static)->is_ref = is_ref; \ - } -#define SET_STATIC_PROP_STRING_EX(ce, n, s, d) \ - { \ - zval *__tmp; \ - MAKE_STD_ZVAL(__tmp); \ - ZVAL_STRING(__tmp, (s), (d)); \ - SET_STATIC_PROP_EX(ce, n, __tmp); \ - zval_dtor(__tmp); \ - efree(__tmp); \ - } -#define SET_STATIC_PROP_STRINGL_EX(ce, n, s, l, d) \ - { \ - zval *__tmp; \ - MAKE_STD_ZVAL(__tmp); \ - ZVAL_STRINGL(__tmp, (s), (l), (d)); \ - SET_STATIC_PROP_EX(ce, n, __tmp); \ - zval_dtor(__tmp); \ - efree(__tmp); \ - } -# define DCL_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a) TSRMLS_CC) -# define DCL_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a) TSRMLS_CC) -# define DCL_PROP_N(a, n) zend_declare_property_null(ce, (#n), sizeof(#n)-1, (ZEND_ACC_ ##a) TSRMLS_CC) -# define UPD_PROP(o, t, n, v) UPD_PROP_EX(o, getThis(), t, n, v) -# define UPD_PROP_EX(o, this, t, n, v) zend_update_property_ ##t(o->zo.ce, this, (#n), sizeof(#n)-1, (v) TSRMLS_CC) -# define SET_PROP(o, n, z) SET_PROP_EX(o, getThis(), n, z) -# define SET_PROP_EX(o, this, n, z) zend_update_property(o->zo.ce, this, (#n), sizeof(#n)-1, (z) TSRMLS_CC) -# define GET_PROP(o, n) GET_PROP_EX(o, getThis(), n) -# define GET_PROP_EX(o, this, n) zend_read_property(o->zo.ce, this, (#n), sizeof(#n)-1, 0 TSRMLS_CC) - -# define DCL_CONST(t, n, v) zend_declare_class_constant_ ##t(ce, (n), sizeof(n), (v) TSRMLS_CC) + +# define DCL_STATIC_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC) +# define DCL_STATIC_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC) +# define DCL_STATIC_PROP_N(a, n) zend_declare_property_null(ce, (#n), sizeof(#n)-1, (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC) +# define GET_STATIC_PROP_EX(ce, n) zend_std_get_static_property(ce, (#n), sizeof(#n)-1, 0 TSRMLS_CC) +# define UPD_STATIC_PROP_EX(ce, t, n, v) zend_update_static_property_ ##t(ce, #n, sizeof(#n)-1, (v) TSRMLS_CC) +# define UPD_STATIC_STRL_EX(ce, n, v, l) zend_update_static_property_stringl(ce, #n, sizeof(#n)-1, (v), (l) TSRMLS_CC) +# define SET_STATIC_PROP_EX(ce, n, v) zend_update_static_property(ce, #n, sizeof(#n)-1, v TSRMLS_CC) + +# define DCL_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a) TSRMLS_CC) +# define DCL_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a) TSRMLS_CC) +# define DCL_PROP_N(a, n) zend_declare_property_null(ce, (#n), sizeof(#n)-1, (ZEND_ACC_ ##a) TSRMLS_CC) +# define UPD_PROP(o, t, n, v) UPD_PROP_EX(o, getThis(), t, n, v) +# define UPD_PROP_EX(o, this, t, n, v) zend_update_property_ ##t(o->zo.ce, this, (#n), sizeof(#n)-1, (v) TSRMLS_CC) +# define UPD_STRL(o, n, v, l) zend_update_property_stringl(o->zo.ce, getThis(), (#n), sizeof(#n)-1, (v), (l) TSRMLS_CC) +# define SET_PROP(o, n, z) SET_PROP_EX(o, getThis(), n, z) +# define SET_PROP_EX(o, this, n, z) zend_update_property(o->zo.ce, this, (#n), sizeof(#n)-1, (z) TSRMLS_CC) +# define GET_PROP(o, n) GET_PROP_EX(o, getThis(), n) +# define GET_PROP_EX(o, this, n) zend_read_property(o->zo.ce, this, (#n), sizeof(#n)-1, 0 TSRMLS_CC) + +# define DCL_CONST(t, n, v) zend_declare_class_constant_ ##t(ce, (n), sizeof(n)-1, (v) TSRMLS_CC) # define ACC_PROP_PRIVATE(ce, flags) ((flags & ZEND_ACC_PRIVATE) && (EG(scope) && ce == EG(scope)) # define ACC_PROP_PROTECTED(ce, flags) ((flags & ZEND_ACC_PROTECTED) && (zend_check_protected(ce, EG(scope)))) @@ -318,9 +263,7 @@ typedef int STATUS; { \ zval *__tmp = GET_PROP(o, p); \ if (__tmp) { \ - zval_dtor(__tmp); \ - FREE_ZVAL(__tmp); \ - __tmp = NULL; \ + zval_ptr_dtor(&__tmp); \ } \ } @@ -335,15 +278,16 @@ typedef int STATUS; #ifndef E_THROW # define E_THROW 0 #endif -#define HE_THROW E_THROW #ifdef ZEND_ENGINE_2 -# define HE_NOTICE (HTTP_G(only_exceptions) ? E_THROW : E_NOTICE) -# define HE_WARNING (HTTP_G(only_exceptions) ? E_THROW : E_WARNING) -# define HE_ERROR (HTTP_G(only_exceptions) ? E_THROW : E_ERROR) +# define HE_THROW E_THROW TSRMLS_CC +# define HE_NOTICE (HTTP_G(only_exceptions) ? E_THROW : E_NOTICE) TSRMLS_CC +# define HE_WARNING (HTTP_G(only_exceptions) ? E_THROW : E_WARNING) TSRMLS_CC +# define HE_ERROR (HTTP_G(only_exceptions) ? E_THROW : E_ERROR) TSRMLS_CC #else -# define HE_NOTICE E_NOTICE -# define HE_WARNING E_WARNING -# define HE_ERROR E_ERROR +# define HE_THROW E_WARNING TSRMLS_CC +# define HE_NOTICE E_NOTICE TSRMLS_CC +# define HE_WARNING E_WARNING TSRMLS_CC +# define HE_ERROR E_ERROR TSRMLS_CC #endif #define HTTP_E_RUNTIME 1L @@ -366,12 +310,24 @@ typedef int STATUS; # define HTTP_EMPTY_ARGS_EX(class, method, ret_ref) HTTP_BEGIN_ARGS_EX(class, method, ret_ref, 0) HTTP_END_ARGS # define HTTP_ARGS(class, method) args_for_ ##class## _ ##method # define HTTP_ARG_VAL(name, pass_ref) ZEND_ARG_INFO(pass_ref, name) -# define HTTP_ARG_OBJ(class, name, allow_null) ZEND_ARG_OBJ_INFO(1, name, class, allow_null) +# define HTTP_ARG_OBJ(class, name, allow_null) ZEND_ARG_OBJ_INFO(0, name, class, allow_null) +#endif + +#ifdef ZEND_ENGINE_2 +# define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL, 0, 0} +#else +# define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL} #endif #ifdef HTTP_HAVE_CURL # ifdef ZEND_ENGINE_2 # define HTTP_DECLARE_ARG_PASS_INFO() \ + static \ + ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_2, 0) \ + ZEND_ARG_PASS_INFO(0) \ + ZEND_ARG_PASS_INFO(1) \ + ZEND_END_ARG_INFO(); \ + \ static \ ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_3, 0) \ ZEND_ARG_PASS_INFO(0) \ @@ -394,18 +350,14 @@ typedef int STATUS; ZEND_ARG_PASS_INFO(0) \ ZEND_ARG_PASS_INFO(0) \ ZEND_ARG_PASS_INFO(1) \ - ZEND_END_ARG_INFO(); \ - \ - static \ - ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_all, 1) \ - ZEND_ARG_PASS_INFO(1) \ - ZEND_END_ARG_INFO() + ZEND_END_ARG_INFO(); + # else # define HTTP_DECLARE_ARG_PASS_INFO() \ + static unsigned char http_arg_pass_ref_2[] = {2, BYREF_NONE, BYREF_FORCE}; \ static unsigned char http_arg_pass_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \ static unsigned char http_arg_pass_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \ - static unsigned char http_arg_pass_ref_5[] = {5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \ - static unsigned char http_arg_pass_ref_all[]={1, BYREF_FORCE_REST} + static unsigned char http_arg_pass_ref_5[] = {5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; # endif /* ZEND_ENGINE_2 */ #else # define HTTP_DECLARE_ARG_PASS_INFO() @@ -422,12 +374,37 @@ typedef int STATUS; #ifndef TSRMLS_SET_CTX # ifdef ZTS -# define TSRMLS_SET_CTX(ctx) (void ***) ctx = tsrm_ls +# define TSRMLS_SET_CTX(ctx) ctx = (void ***) tsrm_ls # else # define TSRMLS_SET_CTX(ctx) # endif #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 #endif /* PHP_HTTP_STD_DEFS_H */