X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_object.c;h=d57388d03a8a28e6ef8381e504c1680545fd0e5f;hp=4ec54d374f20ba8381bc7d01c279d7794b565b07;hb=refs%2Fheads%2Fv2.4.x;hpb=0b83632b2b0a03eeca090f993259ccd95ab646fb

diff --git a/php_http_object.c b/php_http_object.c
index 4ec54d3..d57388d 100644
--- a/php_http_object.c
+++ b/php_http_object.c
@@ -6,52 +6,12 @@
     | 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;
-}
-
-PHP_HTTP_API zend_error_handling_t php_http_object_get_error_handling(zval *object TSRMLS_DC)
-{
-	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;
-}
-
 zend_object_value php_http_object_new(zend_class_entry *ce TSRMLS_DC)
 {
 	return php_http_object_new_ex(ce, NULL, NULL TSRMLS_CC);
@@ -75,116 +35,101 @@ zend_object_value php_http_object_new_ex(zend_class_entry *ce, void *nothing, ph
 	return o->zv;
 }
 
-ZEND_BEGIN_ARG_INFO_EX(ai_HttpObject_getErrorHandling, 0, 0, 0)
-ZEND_END_ARG_INFO();
-PHP_METHOD(HttpObject, getErrorHandling)
+ZEND_RESULT_CODE 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)
 {
-	zval *zeh = zend_read_property(php_http_object_class_entry, getThis(), ZEND_STRL("errorHandling"), 0 TSRMLS_CC);
-	RETURN_ZVAL(zeh, 1, 0);
-}
+	zend_object_value ov;
 
-ZEND_BEGIN_ARG_INFO_EX(ai_HttpObject_setErrorHandling, 0, 0, 1)
-	ZEND_ARG_INFO(0, eh)
-ZEND_END_ARG_INFO();
-PHP_METHOD(HttpObject, setErrorHandling)
-{
-	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;
-		}
+	if (!ce) {
+		ce = parent_ce;
+	} else if (parent_ce && !instanceof_function(ce, parent_ce TSRMLS_CC)) {
+		php_http_throw(unexpected_val, "Class %s does not extend %s", ce->name, parent_ce->name);
+		return FAILURE;
 	}
 
-	RETURN_ZVAL(getThis(), 1, 0);
+	ov = create(ce, intern_ptr, obj_ptr TSRMLS_CC);
+	if (ovp) {
+		*ovp = ov;
+	}
+	return SUCCESS;
 }
 
-ZEND_BEGIN_ARG_INFO_EX(ai_HttpObject_getDefaultErrorHandling, 0, 0, 0)
-ZEND_END_ARG_INFO();
-PHP_METHOD(HttpObject, getDefaultErrorHandling)
+static inline zend_function *get_object_method(zval *zobject, zval *zmeth TSRMLS_DC)
 {
-	zval *zdeh = zend_read_static_property(php_http_object_class_entry, ZEND_STRL("defaultErrorHandling"), 0 TSRMLS_CC);
-	RETURN_ZVAL(zdeh, 1, 0);
+#if PHP_VERSION_ID >= 50400
+	return Z_OBJ_HT_P(zobject)->get_method(&zobject, Z_STRVAL_P(zmeth), Z_STRLEN_P(zmeth), NULL TSRMLS_CC);
+#else
+	return Z_OBJ_HT_P(zobject)->get_method(&zobject, Z_STRVAL_P(zmeth), Z_STRLEN_P(zmeth) TSRMLS_CC);
+#endif
 }
 
-ZEND_BEGIN_ARG_INFO_EX(ai_HttpObject_setDefaultErrorHandling, 0, 0, 1)
-	ZEND_ARG_INFO(0, eh)
-ZEND_END_ARG_INFO();
-PHP_METHOD(HttpObject, setDefaultErrorHandling)
+php_http_object_method_t *php_http_object_method_init(php_http_object_method_t *cb, zval *zobject, const char *method_str, size_t method_len TSRMLS_DC)
 {
-	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;
-		}
+	zval *zfn;
+
+	if (!cb) {
+		cb = ecalloc(1, sizeof(*cb));
+	} else {
+		memset(cb, 0, sizeof(*cb));
 	}
+
+	MAKE_STD_ZVAL(zfn);
+	ZVAL_STRINGL(zfn, method_str, method_len, 1);
+
+	cb->fci.size = sizeof(cb->fci);
+	cb->fci.function_name = zfn;
+	cb->fcc.initialized = 1;
+	cb->fcc.calling_scope = cb->fcc.called_scope = Z_OBJCE_P(zobject);
+	cb->fcc.function_handler = get_object_method(zobject, cb->fci.function_name TSRMLS_CC);
+
+	return cb;
 }
 
-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)
+void php_http_object_method_dtor(php_http_object_method_t *cb)
 {
-	long eh, code;
-	char *msg_str;
-	int msg_len;
+	if (cb->fci.function_name) {
+		zval_ptr_dtor(&cb->fci.function_name);
+		cb->fci.function_name = NULL;
+	}
+}
 
-	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);
+void php_http_object_method_free(php_http_object_method_t **cb)
+{
+	if (*cb) {
+		php_http_object_method_dtor(*cb);
+		efree(*cb);
+		*cb = NULL;
 	}
 }
 
-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)
+ZEND_RESULT_CODE php_http_object_method_call(php_http_object_method_t *cb, zval *zobject, zval **retval_ptr, int argc, zval ***args TSRMLS_DC)
+{
+	ZEND_RESULT_CODE rv;
+	zval *retval = NULL;
 
-	EMPTY_FUNCTION_ENTRY
-};
+	Z_ADDREF_P(zobject);
+	cb->fci.object_ptr = zobject;
+	cb->fcc.object_ptr = zobject;
 
-zend_class_entry *php_http_object_class_entry;
+	cb->fci.retval_ptr_ptr = retval_ptr ? retval_ptr : &retval;
 
-PHP_MINIT_FUNCTION(http_object)
-{
-	zend_class_entry ce = {0};
+	cb->fci.param_count = argc;
+	cb->fci.params = args;
 
-	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;
+	if (cb->fcc.called_scope != Z_OBJCE_P(zobject)) {
+		cb->fcc.called_scope = Z_OBJCE_P(zobject);
+		cb->fcc.function_handler = get_object_method(zobject, cb->fci.function_name TSRMLS_CC);
+	}
 
-	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);
+	rv = zend_call_function(&cb->fci, &cb->fcc 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);
+	zval_ptr_dtor(&zobject);
+	if (!retval_ptr && retval) {
+		zval_ptr_dtor(&retval);
+	}
 
-	return SUCCESS;
+	return rv;
 }
 
-
 /*
  * Local variables:
  * tab-width: 4