X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_object.c;h=e42998ea773407c830ac3cb9282a3ade55cd7081;hp=d4785f196c69745c673db61cfcc8060129ce2520;hb=f00dec5b0217c81cf9d71d96103106fdaf2ab310;hpb=8b8cdb96032f50d57dbdad74ae45336d01a7f0c5

diff --git a/php_http_object.c b/php_http_object.c
index d4785f1..e42998e 100644
--- a/php_http_object.c
+++ b/php_http_object.c
@@ -6,80 +6,125 @@
     | 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"
 
-zend_object_value php_http_object_new(zend_class_entry *ce TSRMLS_DC)
+static zend_object_handlers php_http_object_handlers;
+
+zend_object *php_http_object_new(zend_class_entry *ce)
 {
-	return php_http_object_new_ex(ce, NULL, NULL TSRMLS_CC);
+	return &php_http_object_new_ex(ce, NULL)->zo;
 }
 
-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);
+	o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
+	zend_object_std_init(&o->zo, ce);
+	object_properties_init(&o->zo, ce);
 
-	if (ptr) {
-		*ptr = o;
-	}
+	o->intern = intern;
+	o->zo.handlers = &php_http_object_handlers;
 
-	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();
+	return o;
+}
 
-	return o->zv;
+void php_http_object_free(zend_object *object)
+{
+	zend_object_std_dtor(object);
 }
 
-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_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)
 {
-	zend_object_value ov;
+	void *obj;
 
 	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);
+	} 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;
 	}
 
-	ov = create(ce, intern_ptr, obj_ptr TSRMLS_CC);
-	if (ovp) {
-		*ovp = ov;
+	obj = create(ce, intern_ptr);
+	if (obj_ptr) {
+		*obj_ptr = obj;
 	}
 	return SUCCESS;
 }
 
-STATUS php_http_method_call(zval *object, const char *method_str, size_t method_len, int argc, zval **argv[], zval **retval_ptr TSRMLS_DC)
+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)
+{
+	if (!cb) {
+		cb = ecalloc(1, sizeof(*cb));
+	} else {
+		memset(cb, 0, sizeof(*cb));
+	}
+
+	cb->fci.size = sizeof(cb->fci);
+	ZVAL_STRINGL(&cb->fci.function_name, method_str, method_len);
+	cb->fcc.initialized = 1;
+	cb->fcc.calling_scope = cb->fcc.called_scope = Z_OBJCE_P(zobject);
+	cb->fcc.function_handler = Z_OBJ_HT_P(zobject)->get_method(&Z_OBJ_P(zobject), Z_STR(cb->fci.function_name), NULL);
+
+	return cb;
+}
+
+void php_http_object_method_dtor(php_http_object_method_t *cb)
+{
+	zval_ptr_dtor(&cb->fci.function_name);
+}
+
+void php_http_object_method_free(php_http_object_method_t **cb)
+{
+	if (*cb) {
+		php_http_object_method_dtor(*cb);
+		efree(*cb);
+		*cb = NULL;
+	}
+}
+
+ZEND_RESULT_CODE php_http_object_method_call(php_http_object_method_t *cb, zval *zobject, zval *retval_ptr, int argc, zval *args)
 {
-	zend_fcall_info fci;
-	zval zmethod;
-	zval *retval;
-	STATUS rv;
-
-	fci.size = sizeof(fci);
-	fci.object_ptr = object;
-	fci.function_name = &zmethod;
-	fci.retval_ptr_ptr = retval_ptr ? retval_ptr : &retval;
-	fci.param_count = argc;
-	fci.params = argv;
-	fci.no_separation = 1;
-	fci.symbol_table = NULL;
-	fci.function_table = NULL;
-
-	INIT_PZVAL(&zmethod);
-	ZVAL_STRINGL(&zmethod, method_str, method_len, 0);
-	rv = zend_call_function(&fci, NULL TSRMLS_CC);
-
-	if (!retval_ptr && retval) {
+	ZEND_RESULT_CODE rv;
+	zval retval;
+
+	ZVAL_UNDEF(&retval);
+	Z_ADDREF_P(zobject);
+	cb->fci.object = Z_OBJ_P(zobject);
+	cb->fcc.object = Z_OBJ_P(zobject);
+
+	cb->fci.retval = retval_ptr ? retval_ptr : &retval;
+
+	cb->fci.param_count = argc;
+	cb->fci.params = args;
+
+	if (cb->fcc.called_scope != Z_OBJCE_P(zobject)) {
+		cb->fcc.called_scope = Z_OBJCE_P(zobject);
+		cb->fcc.function_handler = Z_OBJ_HT_P(zobject)->get_method(&Z_OBJ_P(zobject), Z_STR(cb->fci.function_name), NULL);
+	}
+
+	rv = zend_call_function(&cb->fci, &cb->fcc);
+
+	zval_ptr_dtor(zobject);
+	if (!retval_ptr && !Z_ISUNDEF(retval)) {
 		zval_ptr_dtor(&retval);
 	}
+
 	return rv;
 }
 
+PHP_MINIT_FUNCTION(http_object)
+{
+	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