| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2013, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2014, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#include "php_http_api.h"
-PHP_HTTP_API STATUS php_http_new(zend_object_value *ovp, zend_class_entry *ce, php_http_new_t create, zend_class_entry *parent_ce, void *intern_ptr, void **obj_ptr TSRMLS_DC)
-{
- zend_object_value ov;
-
- if (!ce) {
- ce = parent_ce;
- } else if (parent_ce && !instanceof_function(ce, parent_ce TSRMLS_CC)) {
- php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "Class %s does not extend %s", ce->name, parent_ce->name);
- return FAILURE;
- }
-
- ov = create(ce, intern_ptr, obj_ptr TSRMLS_CC);
- if (ovp) {
- *ovp = ov;
- }
- return SUCCESS;
-}
+static zend_object_handlers php_http_object_handlers;
-PHP_HTTP_API zend_error_handling_t php_http_object_get_error_handling(zval *object TSRMLS_DC)
+zend_object *php_http_object_new(zend_class_entry *ce)
{
- zval *zeh, *lzeh;
- long eh;
-
- zeh = zend_read_property(Z_OBJCE_P(object), object, ZEND_STRL("errorHandling"), 0 TSRMLS_CC);
- if (Z_TYPE_P(zeh) != IS_NULL) {
- lzeh = php_http_ztyp(IS_LONG, zeh);
- eh = Z_LVAL_P(lzeh);
- zval_ptr_dtor(&lzeh);
- return eh;
- }
- zeh = zend_read_static_property(php_http_object_class_entry, ZEND_STRL("defaultErrorHandling"), 0 TSRMLS_CC);
- if (Z_TYPE_P(zeh) != IS_NULL) {
- lzeh = php_http_ztyp(IS_LONG, zeh);
- eh = Z_LVAL_P(lzeh);
- zval_ptr_dtor(&lzeh);
- return eh;
- }
- return EH_NORMAL;
+ return &php_http_object_new_ex(ce, NULL)->zo;
}
-zend_object_value php_http_object_new(zend_class_entry *ce TSRMLS_DC)
-{
- return php_http_object_new_ex(ce, NULL, NULL TSRMLS_CC);
-}
-
-zend_object_value php_http_object_new_ex(zend_class_entry *ce, void *nothing, php_http_object_t **ptr TSRMLS_DC)
+php_http_object_t *php_http_object_new_ex(zend_class_entry *ce, void *intern)
{
php_http_object_t *o;
- o = ecalloc(1, sizeof(php_http_object_t));
- zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
- object_properties_init((zend_object *) o, ce);
-
- if (ptr) {
- *ptr = o;
- }
+ o = ecalloc(1, sizeof(php_http_object_t) + (ce->default_properties_count - 1) * sizeof(zval));
+ zend_object_std_init(&o->zo, ce);
+ object_properties_init(&o->zo, ce);
- o->zv.handle = zend_objects_store_put(o, NULL, (zend_objects_free_object_storage_t) zend_objects_free_object_storage, NULL TSRMLS_CC);
- o->zv.handlers = zend_get_std_object_handlers();
+ o->intern = intern;
+ o->zo.handlers = &php_http_object_handlers;
- return o->zv;
+ return o;
}
-ZEND_BEGIN_ARG_INFO_EX(ai_HttpObject_getErrorHandling, 0, 0, 0)
-ZEND_END_ARG_INFO();
-PHP_METHOD(HttpObject, getErrorHandling)
+void php_http_object_free(zend_object *object)
{
- zval *zeh = zend_read_property(php_http_object_class_entry, getThis(), ZEND_STRL("errorHandling"), 0 TSRMLS_CC);
- RETURN_ZVAL(zeh, 1, 0);
+ php_http_object_t *obj = PHP_HTTP_OBJ(object, NULL);
+ zend_object_std_dtor(object);
}
-ZEND_BEGIN_ARG_INFO_EX(ai_HttpObject_setErrorHandling, 0, 0, 1)
- ZEND_ARG_INFO(0, eh)
-ZEND_END_ARG_INFO();
-PHP_METHOD(HttpObject, setErrorHandling)
+ZEND_RESULT_CODE php_http_new(void **obj_ptr, zend_class_entry *ce, php_http_new_t create, zend_class_entry *parent_ce, void *intern_ptr)
{
- long eh;
-
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &eh)) {
- switch (eh) {
- case EH_NORMAL:
- case EH_SUPPRESS:
- case EH_THROW:
- zend_update_property_long(php_http_object_class_entry, getThis(), ZEND_STRL("errorHandling"), eh TSRMLS_CC);
- break;
-
- default:
- php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "unknown error handling code (%ld)", eh);
- break;
- }
- }
+ void *obj;
- RETURN_ZVAL(getThis(), 1, 0);
-}
-
-ZEND_BEGIN_ARG_INFO_EX(ai_HttpObject_getDefaultErrorHandling, 0, 0, 0)
-ZEND_END_ARG_INFO();
-PHP_METHOD(HttpObject, getDefaultErrorHandling)
-{
- zval *zdeh = zend_read_static_property(php_http_object_class_entry, ZEND_STRL("defaultErrorHandling"), 0 TSRMLS_CC);
- RETURN_ZVAL(zdeh, 1, 0);
-}
+ if (!ce) {
+ ce = parent_ce;
+ } else if (parent_ce && !instanceof_function(ce, parent_ce)) {
+ php_http_throw(unexpected_val, "Class %s does not extend %s", ce->name->val, parent_ce->name->val);
+ return FAILURE;
+ }
-ZEND_BEGIN_ARG_INFO_EX(ai_HttpObject_setDefaultErrorHandling, 0, 0, 1)
- ZEND_ARG_INFO(0, eh)
-ZEND_END_ARG_INFO();
-PHP_METHOD(HttpObject, setDefaultErrorHandling)
-{
- long eh;
-
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &eh)) {
- switch (eh) {
- case EH_NORMAL:
- case EH_SUPPRESS:
- case EH_THROW:
- zend_update_static_property_long(php_http_object_class_entry, ZEND_STRL("defaultErrorHandling"), eh TSRMLS_CC);
- break;
-
- default:
- php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "unknown error handling code (%ld)", eh);
- break;
- }
+ obj = create(ce, intern_ptr);
+ if (obj_ptr) {
+ *obj_ptr = obj;
}
+ return SUCCESS;
}
-ZEND_BEGIN_ARG_INFO_EX(ai_HttpObject_triggerError, 0, 0, 3)
- ZEND_ARG_INFO(0, error_type)
- ZEND_ARG_INFO(0, error_code)
- ZEND_ARG_INFO(0, error_message)
-ZEND_END_ARG_INFO();
-PHP_METHOD(HttpObject, triggerError)
+ZEND_RESULT_CODE php_http_method_call(zval *object, const char *method_str, size_t method_len, int argc, zval argv[], zval *retval_ptr)
{
- long eh, code;
- char *msg_str;
- int msg_len;
-
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lls", &eh, &code, &msg_str, &msg_len)) {
- php_http_error(eh TSRMLS_CC, code, "%.*s", msg_len, msg_str);
+ zend_fcall_info fci;
+ zval retval;
+ ZEND_RESULT_CODE rv;
+
+ ZVAL_UNDEF(&retval);
+ fci.size = sizeof(fci);
+ fci.object = Z_OBJ_P(object);
+ fci.retval = retval_ptr ? retval_ptr : &retval;
+ fci.param_count = argc;
+ fci.params = argv;
+ fci.no_separation = 1;
+ fci.symbol_table = NULL;
+ fci.function_table = NULL;
+
+ ZVAL_STRINGL(&fci.function_name, method_str, method_len);
+ rv = zend_call_function(&fci, NULL TSRMLS_CC);
+ zval_ptr_dtor(&fci.function_name);
+
+ if (!retval_ptr) {
+ zval_ptr_dtor(&retval);
}
+ return rv;
}
-static zend_function_entry php_http_object_methods[] = {
- PHP_ME(HttpObject, setErrorHandling, ai_HttpObject_setErrorHandling, ZEND_ACC_PUBLIC)
- PHP_ME(HttpObject, getErrorHandling, ai_HttpObject_getErrorHandling, ZEND_ACC_PUBLIC)
- PHP_ME(HttpObject, setDefaultErrorHandling, ai_HttpObject_setDefaultErrorHandling, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
- PHP_ME(HttpObject, getDefaultErrorHandling, ai_HttpObject_getDefaultErrorHandling, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
- PHP_ME(HttpObject, triggerError, ai_HttpObject_triggerError, ZEND_ACC_PUBLIC)
-
- EMPTY_FUNCTION_ENTRY
-};
-
-zend_class_entry *php_http_object_class_entry;
-
PHP_MINIT_FUNCTION(http_object)
{
- zend_class_entry ce = {0};
-
- INIT_NS_CLASS_ENTRY(ce, "http", "Object", php_http_object_methods);
- php_http_object_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
- php_http_object_class_entry->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
- php_http_object_class_entry->create_object = php_http_object_new;
-
- zend_declare_property_null(php_http_object_class_entry, ZEND_STRL("defaultErrorHandling"), (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC);
- zend_declare_property_null(php_http_object_class_entry, ZEND_STRL("errorHandling"), ZEND_ACC_PROTECTED TSRMLS_CC);
-
- zend_declare_class_constant_long(php_http_object_class_entry, ZEND_STRL("EH_NORMAL"), EH_NORMAL TSRMLS_CC);
- zend_declare_class_constant_long(php_http_object_class_entry, ZEND_STRL("EH_SUPPRESS"), EH_SUPPRESS TSRMLS_CC);
- zend_declare_class_constant_long(php_http_object_class_entry, ZEND_STRL("EH_THROW"), EH_THROW TSRMLS_CC);
+ memcpy(&php_http_object_handlers, zend_get_std_object_handlers(), sizeof(php_http_object_handlers));
+ php_http_object_handlers.offset = XtOffsetOf(php_http_object_t, zo);
return SUCCESS;
}
-
/*
* Local variables:
* tab-width: 4