/*
- +----------------------------------------------------------------------+
- | PECL :: http |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, that |
- | is bundled with this package in the file LICENSE, and is available |
- | through the world-wide-web at http://www.php.net/license/3_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Copyright (c) 2004-2005 Michael Wallner <mike@php.net> |
- +----------------------------------------------------------------------+
+ +--------------------------------------------------------------------+
+ | PECL :: http |
+ +--------------------------------------------------------------------+
+ | Redistribution and use in source and binary forms, with or without |
+ | modification, are permitted provided that the conditions mentioned |
+ | in the accompanying LICENSE file are met. |
+ +--------------------------------------------------------------------+
+ | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ +--------------------------------------------------------------------+
*/
/* $Id$ */
RETVAL_OBJECT(o); \
return
#define RETVAL_OBJVAL(ov) \
- ZVAL_OBJVAL(return_value, ov)
+ ZVAL_OBJVAL(return_value, ov) \
+ if (Z_OBJ_HT_P(return_value)->add_ref) { \
+ Z_OBJ_HT_P(return_value)->add_ref(return_value TSRMLS_CC); \
+ }
#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); \
- }
-
+ (zv)->value.obj = (ov);
+
/* function accepts no args */
#define NO_ARGS \
if (ZEND_NUM_ARGS()) { \
#define HTTP_URI_ARGSEP HTTP_URL_ARGSEP
/* send buffer size */
-#define HTTP_SENDBUF_SIZE 2097152
+#define HTTP_SENDBUF_SIZE 40960
/* CURL buffer size */
#define HTTP_CURLBUF_SIZE 16384
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)
-#define FOREACH_HASH_VAL(hash, val) \
- for ( zend_hash_internal_pointer_reset(hash); \
- zend_hash_get_current_data(hash, (void **) &val) == SUCCESS; \
- zend_hash_move_forward(hash))
-
-#define FOREACH_KEY(array, strkey, numkey) FOREACH_HASH_KEY(Z_ARRVAL_P(array), strkey, numkey)
-#define FOREACH_HASH_KEY(hash, strkey, numkey) \
- for ( zend_hash_internal_pointer_reset(hash); \
- zend_hash_get_current_key(hash, &strkey, &numkey, 0) != HASH_KEY_NON_EXISTANT; \
- zend_hash_move_forward(hash)) \
-
-#define FOREACH_KEYVAL(array, strkey, numkey, val) FOREACH_HASH_KEYVAL(Z_ARRVAL_P(array), strkey, numkey, val)
-#define FOREACH_HASH_KEYVAL(hash, strkey, numkey, val) \
- for ( zend_hash_internal_pointer_reset(hash); \
- zend_hash_get_current_key(hash, &strkey, &numkey, 0) != HASH_KEY_NON_EXISTANT && \
- zend_hash_get_current_data(hash, (void **) &val) == SUCCESS; \
- zend_hash_move_forward(hash)) \
+#define FOREACH_VAL(pos, array, val) FOREACH_HASH_VAL(pos, Z_ARRVAL_P(array), val)
+#define FOREACH_HASH_VAL(pos, hash, val) \
+ for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \
+ zend_hash_get_current_data_ex(hash, (void **) &val, &pos) == SUCCESS; \
+ zend_hash_move_forward_ex(hash, &pos))
+
+#define FOREACH_KEY(pos, array, strkey, numkey) FOREACH_HASH_KEY(pos, Z_ARRVAL_P(array), strkey, numkey)
+#define FOREACH_HASH_KEY(pos, hash, strkey, numkey) \
+ for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \
+ zend_hash_get_current_key_ex(hash, &strkey, NULL, &numkey, 0, &pos) != HASH_KEY_NON_EXISTANT; \
+ zend_hash_move_forward_ex(hash, &pos)) \
+
+#define FOREACH_KEYVAL(pos, array, strkey, numkey, val) FOREACH_HASH_KEYVAL(pos, Z_ARRVAL_P(array), strkey, numkey, val)
+#define FOREACH_HASH_KEYVAL(pos, hash, strkey, numkey, val) \
+ for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \
+ zend_hash_get_current_key_ex(hash, &strkey, NULL, &numkey, 0, &pos) != HASH_KEY_NON_EXISTANT && \
+ zend_hash_get_current_data_ex(hash, (void **) &val, &pos) == SUCCESS; \
+ zend_hash_move_forward_ex(hash, &pos))
+
+#define FOREACH_KEYLENVAL(pos, array, strkey, keylen, numkey, val) FOREACH_HASH_KEYVAL(pos, Z_ARRVAL_P(array), strkey, keylen, numkey, val)
+#define FOREACH_HASH_KEYLENVAL(pos, hash, strkey, keylen, numkey, val) \
+ for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \
+ zend_hash_get_current_key_ex(hash, &strkey, &keylen, &numkey, 0, &pos) != HASH_KEY_NON_EXISTANT && \
+ zend_hash_get_current_data_ex(hash, (void **) &val, &pos) == SUCCESS; \
+ zend_hash_move_forward_ex(hash, &pos))
#define array_copy(src, dst) zend_hash_copy(Z_ARRVAL_P(dst), Z_ARRVAL_P(src), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *))
#define array_merge(src, dst) zend_hash_merge(Z_ARRVAL_P(dst), Z_ARRVAL_P(src), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *), 1)
uint klen; \
char *key = NULL; \
zval **data; \
+ HashPosition pos; \
\
- for ( zend_hash_internal_pointer_reset(Z_ARRVAL_P(src)); \
- zend_hash_get_current_key_ex(Z_ARRVAL_P(src), &key, &klen, &idx, 0, NULL) != HASH_KEY_NON_EXISTANT && \
- zend_hash_get_current_data(Z_ARRVAL_P(src), (void **) &data) == SUCCESS; \
- zend_hash_move_forward(Z_ARRVAL_P(src))) \
+ for ( zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(src), &pos); \
+ zend_hash_get_current_key_ex(Z_ARRVAL_P(src), &key, &klen, &idx, 0, &pos) != HASH_KEY_NON_EXISTANT && \
+ zend_hash_get_current_data_ex(Z_ARRVAL_P(src), (void **) &data, &pos) == SUCCESS; \
+ zend_hash_move_forward_ex(Z_ARRVAL_P(src), &pos)) \
{ \
if (key) { \
zval **tmp; \
} else { \
add_assoc_zval(dst, key, *data); \
} \
- zval_add_ref(data); \
+ ZVAL_ADDREF(*data); \
key = NULL; \
} \
} \
# define HTTP_REGISTER_CLASS_EX(classname, name, parent, flags) \
{ \
zend_class_entry ce; \
+ memset(&ce, 0, sizeof(zend_class_entry)); \
INIT_CLASS_ENTRY(ce, #classname, name## _fe); \
- ce.create_object = name## _new; \
+ ce.create_object = _ ##name## _new; \
name## _ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
name## _ce->ce_flags |= flags; \
memcpy(& name## _handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
# define HTTP_REGISTER_CLASS(classname, name, parent, flags) \
{ \
zend_class_entry ce; \
+ memset(&ce, 0, sizeof(zend_class_entry)); \
INIT_CLASS_ENTRY(ce, #classname, name## _fe); \
ce.create_object = NULL; \
name## _ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
# define HTTP_REGISTER_EXCEPTION(classname, cename, parent) \
{ \
zend_class_entry ce; \
+ memset(&ce, 0, sizeof(zend_class_entry)); \
INIT_CLASS_ENTRY(ce, #classname, NULL); \
ce.create_object = NULL; \
cename = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
# define getObject(t, o) getObjectEx(t, o, getThis())
# 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 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)-1, (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
} \
}
+/*
+ * the property *MUST* be updated after SEP_PROP()
+ */
+# define SEP_PROP(zpp) \
+ { \
+ zval **op = zpp; \
+ SEPARATE_ZVAL_IF_NOT_REF(zpp); \
+ if (op != zpp) { \
+ zval_ptr_dtor(op); \
+ } \
+ }
+
# define SET_EH_THROW() SET_EH_THROW_EX(zend_exception_get_default())
# define SET_EH_THROW_HTTP() SET_EH_THROW_EX(http_exception_get_default())
# define SET_EH_THROW_EX(ex) php_set_error_handling(EH_THROW, ex TSRMLS_CC)
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()
+# 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();
+# else
+# define HTTP_DECLARE_ARG_PASS_INFO() \
+ static unsigned char http_arg_pass_ref_2[] = {2, BYREF_NONE, BYREF_FORCE};
+# endif /* ZEND_ENGINE_2 */
#endif /* HTTP_HAVE_CURL */
#define RETURN_ZVAL(zv, copy, dtor) { RETVAL_ZVAL(zv, copy, dtor); return; }
#endif
+#define PHP_MINIT_CALL(func) PHP_MINIT(func)(INIT_FUNC_ARGS_PASSTHRU)
+#define PHP_RINIT_CALL(func) PHP_RINIT(func)(INIT_FUNC_ARGS_PASSTHRU)
+#define PHP_MSHUTDOWN_CALL(func) PHP_MSHUTDOWN(func)(SHUTDOWN_FUNC_ARGS_PASSTHRU)
+#define PHP_RSHUTDOWN_CALL(func) PHP_RSHUTDOWN(func)(SHUTDOWN_FUNC_ARGS_PASSTHRU)
+
+#define Z_OBJ_DELREF(z) \
+ if (Z_OBJ_HT(z)->del_ref) { \
+ Z_OBJ_HT(z)->del_ref(&(z) TSRMLS_CC); \
+ }
+#define Z_OBJ_ADDREF(z) \
+ if (Z_OBJ_HT(z)->add_ref) { \
+ Z_OBJ_HT(z)->add_ref(&(z) TSRMLS_CC); \
+ }
+#define Z_OBJ_DELREF_P(z) \
+ if (Z_OBJ_HT_P(z)->del_ref) { \
+ Z_OBJ_HT_P(z)->del_ref((z) TSRMLS_CC); \
+ }
+#define Z_OBJ_ADDREF_P(z) \
+ if (Z_OBJ_HT_P(z)->add_ref) { \
+ Z_OBJ_HT_P(z)->add_ref((z) TSRMLS_CC); \
+ }
+#define Z_OBJ_DELREF_PP(z) \
+ if (Z_OBJ_HT_PP(z)->del_ref) { \
+ Z_OBJ_HT_PP(z)->del_ref(*(z) TSRMLS_CC); \
+ }
+#define Z_OBJ_ADDREF_PP(z) \
+ if (Z_OBJ_HT_PP(z)->add_ref) { \
+ Z_OBJ_HT_PP(z)->add_ref(*(z) TSRMLS_CC); \
+ }
#endif /* PHP_HTTP_STD_DEFS_H */
projects / m6w6 / ext-http / blobdiff