X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=e43750949746d7bfe0bc92e0adc3f5435a5c6ae5;hp=2b8de8ba9b7448571fe9c31a78395c9b5308a762;hb=020d5b055921392c0dfb25043962a40867d8b033;hpb=d04466a4756cc1ccf2fc17fa807ee0d372d912a7 diff --git a/http_message_object.c b/http_message_object.c index 2b8de8b..e437509 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -19,14 +19,69 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #include "php.h" +#ifdef ZEND_ENGINE_2 + #include "php_http.h" #include "php_http_std_defs.h" #include "php_http_message_object.h" -#ifdef ZEND_ENGINE_2 +#include "phpstr/phpstr.h" + +#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpMessage, method, ZEND_RETURN_REFERENCE_AGNOSTIC, req_args) +#define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpMessage, method, ret_ref) +#define HTTP_MESSAGE_ME(method, visibility) PHP_ME(HttpMessage, method, HTTP_ARGS(HttpMessage, method), visibility) + +HTTP_BEGIN_ARGS(__construct, 0) + HTTP_ARG_VAL(message, 0) +HTTP_END_ARGS; + +HTTP_BEGIN_ARGS(fromString, 1) + HTTP_ARG_VAL(message, 0) +HTTP_END_ARGS; + +HTTP_EMPTY_ARGS(getBody, 0); +HTTP_EMPTY_ARGS(getHeaders, 0); +HTTP_BEGIN_ARGS(setHeaders, 1) + HTTP_ARG_VAL(headers, 0) +HTTP_END_ARGS; + +HTTP_BEGIN_ARGS(addHeaders, 1) + HTTP_ARG_VAL(headers, 0) + HTTP_ARG_VAL(append, 0) +HTTP_END_ARGS; + +HTTP_EMPTY_ARGS(getType, 0); +HTTP_BEGIN_ARGS(setType, 1) + HTTP_ARG_VAL(type, 0) +HTTP_END_ARGS; + +HTTP_EMPTY_ARGS(getResponseCode, 0); +HTTP_BEGIN_ARGS(setResponseCode, 1) + HTTP_ARG_VAL(response_code, 0) +HTTP_END_ARGS; + +HTTP_EMPTY_ARGS(getRequestMethod, 0); +HTTP_BEGIN_ARGS(setRequestMethod, 1) + HTTP_ARG_VAL(request_method, 0) +HTTP_END_ARGS; + +HTTP_EMPTY_ARGS(getRequestUri, 0); +HTTP_BEGIN_ARGS(setRequestUri, 1) + HTTP_ARG_VAL(uri, 0) +HTTP_END_ARGS; + +HTTP_EMPTY_ARGS(getHttpVersion, 0); +HTTP_BEGIN_ARGS(setHttpVersion, 1) + HTTP_ARG_VAL(http_version, 0) +HTTP_END_ARGS; + +HTTP_EMPTY_ARGS(getParentMessage, 1); +HTTP_EMPTY_ARGS(send, 0); +HTTP_BEGIN_ARGS(toString, 0) + HTTP_ARG_VAL(include_parent, 0) +HTTP_END_ARGS; #define http_message_object_declare_default_properties() _http_message_object_declare_default_properties(TSRMLS_C) static inline void _http_message_object_declare_default_properties(TSRMLS_D); @@ -36,31 +91,33 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC); #define http_message_object_get_props _http_message_object_get_props static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC); +#define http_message_object_clone_obj _http_message_object_clone_obj +static inline zend_object_value _http_message_object_clone_obj(zval *object TSRMLS_DC); zend_class_entry *http_message_object_ce; zend_function_entry http_message_object_fe[] = { - PHP_ME(HttpMessage, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_ME(HttpMessage, getBody, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, getHeaders, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, setHeaders, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, addHeaders, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, getType, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, setType, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, getResponseCode, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, setResponseCode, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, getRequestMethod, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, setRequestMethod, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, getRequestUri, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, setRequestUri, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, getHttpVersion, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, setHttpVersion, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, getParentMessage, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, send, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpMessage, toString, NULL, ZEND_ACC_PUBLIC) - - ZEND_MALIAS(HttpMessage, __toString, toString, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpMessage, fromString, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) + HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + HTTP_MESSAGE_ME(getBody, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(getHeaders, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(setHeaders, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(addHeaders, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(getType, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(setType, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(getResponseCode, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(setResponseCode, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(getRequestMethod, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(setRequestMethod, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(getRequestUri, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(setRequestUri, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(getHttpVersion, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(setHttpVersion, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(getParentMessage, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(send, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(toString, ZEND_ACC_PUBLIC) + + ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, toString), ZEND_ACC_PUBLIC) + + HTTP_MESSAGE_ME(fromString, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) {NULL, NULL, NULL} }; static zend_object_handlers http_message_object_handlers; @@ -73,6 +130,7 @@ void _http_message_object_init(INIT_FUNC_ARGS) HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST); HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE); + http_message_object_handlers.clone_obj = http_message_object_clone_obj; http_message_object_handlers.read_property = http_message_object_read_prop; http_message_object_handlers.write_property = http_message_object_write_prop; http_message_object_handlers.get_properties = http_message_object_get_props; @@ -110,6 +168,11 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message return ov; } +zend_object_value _http_message_object_clone(zval *this_ptr TSRMLS_DC) +{ + return http_message_object_clone_obj(this_ptr TSRMLS_CC); +} + static inline void _http_message_object_declare_default_properties(TSRMLS_D) { zend_class_entry *ce = http_message_object_ce; @@ -124,7 +187,7 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D) DCL_PROP_N(PROTECTED, parentMessage); } -static void _http_message_object_free(zend_object *object TSRMLS_DC) +void _http_message_object_free(zend_object *object TSRMLS_DC) { http_message_object *o = (http_message_object *) object; @@ -139,6 +202,12 @@ static void _http_message_object_free(zend_object *object TSRMLS_DC) efree(o); } +static inline zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC) +{ + getObject(http_message_object, obj); + return http_message_object_from_msg(http_message_dup(obj->message)); +} + static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC) { getObjectEx(http_message_object, obj, object); @@ -267,11 +336,11 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va switch (msg->type) { case HTTP_MSG_REQUEST: - msg->info.request.http_version = (float) Z_DVAL_P(value); + msg->info.request.http_version = Z_DVAL_P(value); break; case HTTP_MSG_RESPONSE: - msg->info.response.http_version = (float) Z_DVAL_P(value); + msg->info.response.http_version = Z_DVAL_P(value); break; } break;