X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_misc.h;h=2ee38e1f07e2e4eb18ea529eef9f95737f7aae6b;hb=dab62efe8ad1d6ca4f8101503743dccc74583fb0;hp=972ba92855c3e99db3b2041c1ea27513267aeeed;hpb=302149963f42c5e839f34dfa79195d6fc441e279;p=m6w6%2Fext-http diff --git a/php_http_misc.h b/php_http_misc.h index 972ba92..2ee38e1 100644 --- a/php_http_misc.h +++ b/php_http_misc.h @@ -151,6 +151,21 @@ static inline const char *php_http_locate_bin_eol(const char *bin, size_t len, i /* ZEND */ +#if PHP_VERSION_ID < 50400 +# define object_properties_init(o, ce) zend_hash_copy(((zend_object *) o)->properties, &(ce->default_properties), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval*)) +# define PHP_HTTP_ZEND_LITERAL_DC +# define PHP_HTTP_ZEND_LITERAL_CC +# define PHP_HTTP_ZEND_LITERAL_CCN +# define ZVAL_COPY_VALUE(zv, arr) do { \ + (zv)->value = (arr)->value; \ + Z_TYPE_P(zv) = Z_TYPE_P(arr); \ + } while (0) +#else +# define PHP_HTTP_ZEND_LITERAL_DC , const zend_literal *literal_key +# define PHP_HTTP_ZEND_LITERAL_CC , (literal_key) +# define PHP_HTTP_ZEND_LITERAL_CCN , NULL +#endif + #define INIT_PZVAL_ARRAY(zv, ht) \ { \ INIT_PZVAL((zv)); \ @@ -387,6 +402,8 @@ static inline STATUS php_http_ini_entry(const char *name_str, size_t name_len, c /* ARRAYS */ +PHP_HTTP_API unsigned php_http_array_list(zval *hash TSRMLS_DC, unsigned argc, ...); + typedef struct php_http_array_hashkey { char *str; uint len;