X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_body.c;h=aeadb1804065a476406b62056fda7448712d8fca;hp=e1a0288f51aee80d5295f3f5867419e6f2a23548;hb=5913db177b07398233cb00d2357aba595eab8371;hpb=de1f7e0ab81d134c3dffe95623b6c27b9ce16235

diff --git a/php_http_message_body.c b/php_http_message_body.c
index e1a0288..aeadb18 100644
--- a/php_http_message_body.c
+++ b/php_http_message_body.c
@@ -543,6 +543,8 @@ PHP_HTTP_BEGIN_ARGS(toCallback, 1)
 	PHP_HTTP_ARG_VAL(callback, 0)
 PHP_HTTP_END_ARGS;
 
+PHP_HTTP_EMPTY_ARGS(getResource);
+
 PHP_HTTP_BEGIN_ARGS(append, 1)
 	PHP_HTTP_ARG_VAL(string, 0)
 PHP_HTTP_END_ARGS;
@@ -553,7 +555,7 @@ PHP_HTTP_BEGIN_ARGS(addForm, 0)
 PHP_HTTP_END_ARGS;
 
 PHP_HTTP_BEGIN_ARGS(addPart, 1)
-	PHP_HTTP_ARG_OBJ("http\\Message", "message", 0)
+	PHP_HTTP_ARG_OBJ(http\\Message, message, 0)
 PHP_HTTP_END_ARGS;
 
 PHP_HTTP_EMPTY_ARGS(etag);
@@ -562,13 +564,20 @@ PHP_HTTP_BEGIN_ARGS(stat, 0)
 	PHP_HTTP_ARG_VAL(what, 0)
 PHP_HTTP_END_ARGS;
 
-zend_class_entry *php_http_message_body_class_entry;
-zend_function_entry php_http_message_body_method_entry[] = {
+static zend_class_entry *php_http_message_body_class_entry;
+
+zend_class_entry *php_http_message_body_get_class_entry(void)
+{
+	return php_http_message_body_class_entry;
+}
+
+static zend_function_entry php_http_message_body_method_entry[] = {
 	PHP_HTTP_MESSAGE_BODY_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_HTTP_MESSAGE_BODY_ME(__toString, ZEND_ACC_PUBLIC)
 	PHP_MALIAS(HttpMessageBody, toString, __toString, args_for_HttpMessageBody___toString, ZEND_ACC_PUBLIC)
 	PHP_HTTP_MESSAGE_BODY_ME(toStream, ZEND_ACC_PUBLIC)
 	PHP_HTTP_MESSAGE_BODY_ME(toCallback, ZEND_ACC_PUBLIC)
+	PHP_HTTP_MESSAGE_BODY_ME(getResource, ZEND_ACC_PUBLIC)
 	PHP_HTTP_MESSAGE_BODY_ME(append, ZEND_ACC_PUBLIC)
 	PHP_HTTP_MESSAGE_BODY_ME(addForm, ZEND_ACC_PUBLIC)
 	PHP_HTTP_MESSAGE_BODY_ME(addPart, ZEND_ACC_PUBLIC)
@@ -580,7 +589,7 @@ static zend_object_handlers php_http_message_body_object_handlers;
 
 PHP_MINIT_FUNCTION(http_message_body)
 {
-	PHP_HTTP_REGISTER_CLASS(http\\Message, Body, http_message_body, php_http_object_class_entry, 0);
+	PHP_HTTP_REGISTER_CLASS(http\\Message, Body, http_message_body, php_http_object_get_class_entry(), 0);
 	php_http_message_body_class_entry->create_object = php_http_message_body_object_new;
 	memcpy(&php_http_message_body_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_http_message_body_object_handlers.clone_obj = php_http_message_body_object_clone;
@@ -644,7 +653,7 @@ PHP_METHOD(HttpMessageBody, __construct)
 	zval *zstream = NULL;
 	php_stream *stream;
 
-	with_error_handling(EH_THROW, php_http_exception_class_entry) {
+	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
 		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r!", &zstream)) {
 			if (zstream) {
 				php_stream_from_zval(stream, &zstream);
@@ -694,34 +703,10 @@ PHP_METHOD(HttpMessageBody, toStream)
 	RETURN_FALSE;
 }
 
-struct fcd {
-	zval *fcz;
-	zend_fcall_info fci;
-	zend_fcall_info_cache fcc;
-#ifdef ZTS
-	void ***ts;
-#endif
-};
-
-static size_t pass(void *cb_arg, const char *str, size_t len)
-{
-	struct fcd *fcd = cb_arg;
-	zval *zdata;
-	TSRMLS_FETCH_FROM_CTX(fcd->ts);
-
-	MAKE_STD_ZVAL(zdata);
-	ZVAL_STRINGL(zdata, str, len, 1);
-	if (SUCCESS == zend_fcall_info_argn(&fcd->fci TSRMLS_CC, 2, &fcd->fcz, &zdata)) {
-		zend_fcall_info_call(&fcd->fci, &fcd->fcc, NULL, NULL TSRMLS_CC);
-		zend_fcall_info_args_clear(&fcd->fci, 0);
-	}
-	zval_ptr_dtor(&zdata);
-	return len;
-}
 
 PHP_METHOD(HttpMessageBody, toCallback)
 {
-	struct fcd fcd;
+	php_http_pass_fcall_arg_t fcd;
 	long offset = 0, forlen = 0;
 
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "f|ll", &fcd.fci, &fcd.fcc, &offset, &forlen)) {
@@ -731,7 +716,7 @@ PHP_METHOD(HttpMessageBody, toCallback)
 		Z_ADDREF_P(fcd.fcz);
 		TSRMLS_SET_CTX(fcd.ts);
 
-		php_http_message_body_to_callback(obj->body, pass, &fcd, offset, forlen);
+		php_http_message_body_to_callback(obj->body, php_http_pass_fcall_callback, &fcd, offset, forlen);
 		zend_fcall_info_args_clear(&fcd.fci, 1);
 
 		zval_ptr_dtor(&fcd.fcz);
@@ -740,6 +725,15 @@ PHP_METHOD(HttpMessageBody, toCallback)
 	RETURN_FALSE;
 }
 
+PHP_METHOD(HttpMessageBody, getResource)
+{
+	if (SUCCESS == zend_parse_parameters_none()) {
+		php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+		RETVAL_RESOURCE(obj->body->stream_id);
+	}
+}
+
 PHP_METHOD(HttpMessageBody, append)
 {
 	char *str;
@@ -767,10 +761,11 @@ PHP_METHOD(HttpMessageBody, addForm)
 
 PHP_METHOD(HttpMessageBody, addPart)
 {
-	php_http_message_object_t *mobj;
+	zval *zobj;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &mobj, php_http_message_class_entry)) {
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zobj, php_http_message_get_class_entry())) {
 		php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+		php_http_message_object_t *mobj = zend_object_store_get_object(zobj TSRMLS_CC);
 
 		php_http_message_body_add_part(obj->body, mobj->message);
 		RETURN_TRUE;