X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=f1a6705cdccea600e1ccb1473fcf9fc272a06ebb;hp=08dc0dd61b98981615d2e0c96f4d8f73f18d2c43;hb=16ea91ddd08d15dd9b7206229fec6158f212adaf;hpb=4a881fb37338bfeacd40c42a97f334c9faed299a diff --git a/http_message_object.c b/http_message_object.c index 08dc0dd..f1a6705 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -22,9 +22,12 @@ #include "php.h" +#include "php_http.h" #include "php_http_std_defs.h" #include "php_http_message_object.h" +#include "phpstr/phpstr.h" + #ifdef ZEND_ENGINE_2 #define http_message_object_declare_default_properties() _http_message_object_declare_default_properties(TSRMLS_C) @@ -39,7 +42,27 @@ static HashTable *_http_message_object_get_props(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, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) + 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) {NULL, NULL, NULL} }; static zend_object_handlers http_message_object_handlers; @@ -48,19 +71,37 @@ void _http_message_object_init(INIT_FUNC_ARGS) { HTTP_REGISTER_CLASS_EX(HttpMessage, http_message_object, NULL, 0); + HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE); + HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST); + HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE); + 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; } zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC) +{ + return http_message_object_new_ex(ce, NULL); +} + +zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg TSRMLS_DC) { zend_object_value ov; http_message_object *o; o = ecalloc(1, sizeof(http_message_object)); o->zo.ce = ce; - o->message = http_message_new(); + o->message = NULL; + o->parent.handle = 0; + o->parent.handlers = NULL; + + if (msg) { + o->message = msg; + if (msg->parent) { + o->parent = http_message_object_from_msg(msg->parent); + } + } ALLOC_HASHTABLE(OBJ_PROP(o)); zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0); @@ -76,20 +117,16 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D) zend_class_entry *ce = http_message_object_ce; DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE); - - DCL_PROP(PROTECTED, string, raw, ""); DCL_PROP(PROTECTED, string, body, ""); - DCL_PROP(PROTECTED, string, requestMethod, ""); DCL_PROP(PROTECTED, string, requestUri, ""); - DCL_PROP(PROTECTED, long, responseStatus, 0); - + DCL_PROP(PROTECTED, long, responseCode, 0); DCL_PROP_N(PROTECTED, httpVersion); DCL_PROP_N(PROTECTED, headers); - DCL_PROP_N(PROTECTED, nestedMessage); + 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; @@ -98,7 +135,8 @@ static void _http_message_object_free(zend_object *object TSRMLS_DC) FREE_HASHTABLE(OBJ_PROP(o)); } if (o->message) { - http_message_free(o->message); + http_message_dtor(o->message); + efree(o->message); } efree(o); } @@ -109,21 +147,16 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type http_message *msg = obj->message; zval *return_value; + /* tmp var */ + ALLOC_ZVAL(return_value); + return_value->refcount = 0; + if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) { zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member)); return EG(uninitialized_zval_ptr); } - ALLOC_ZVAL(return_value); - return_value->refcount = 0; - -#if 0 - fprintf(stderr, "Reading property: %s(%d==%d) (%lu)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member)), - zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1) - ); -#endif - - switch (zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1)) + switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1)) { case HTTP_MSG_PROPHASH_TYPE: RETVAL_LONG(msg->type); @@ -132,10 +165,6 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type case HTTP_MSG_PROPHASH_HTTP_VERSION: switch (msg->type) { - case HTTP_MSG_NONE: - RETVAL_NULL(); - break; - case HTTP_MSG_REQUEST: RETVAL_DOUBLE(msg->info.request.http_version); break; @@ -143,18 +172,11 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type case HTTP_MSG_RESPONSE: RETVAL_DOUBLE(msg->info.response.http_version); break; - } - break; - case HTTP_MSG_PROPHASH_RAW: - if (msg->raw) { - if (msg->len) { - RETVAL_STRINGL(msg->raw, msg->len, 1); - } else { - RETVAL_STRINGL(empty_string, 0, 0); - } - } else { - RETVAL_NULL(); + case HTTP_MSG_NONE: + default: + RETVAL_NULL(); + break; } break; @@ -164,16 +186,23 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type break; case HTTP_MSG_PROPHASH_HEADERS: - Z_TYPE_P(return_value) = IS_ARRAY; - Z_ARRVAL_P(return_value) = &msg->hdrs; + array_init(return_value); + zend_hash_copy(Z_ARRVAL_P(return_value), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); break; - case HTTP_MSG_PROPHASH_NESTED_MESSAGE: - RETVAL_NULL(); + case HTTP_MSG_PROPHASH_PARENT_MESSAGE: + if (msg->parent) { + RETVAL_OBJVAL(obj->parent); + Z_TYPE_P(return_value) = IS_OBJECT; + return_value->value.obj = obj->parent; + zend_objects_store_add_ref(return_value TSRMLS_CC); + } else { + RETVAL_NULL(); + } break; case HTTP_MSG_PROPHASH_REQUEST_METHOD: - if (msg->type == HTTP_MSG_REQUEST && msg->info.request.method) { + if (HTTP_MSG_TYPE(REQUEST, msg) && msg->info.request.method) { RETVAL_STRING(msg->info.request.method, 1); } else { RETVAL_NULL(); @@ -181,16 +210,16 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type break; case HTTP_MSG_PROPHASH_REQUEST_URI: - if (msg->type == HTTP_MSG_REQUEST && msg->info.request.URI) { + if (HTTP_MSG_TYPE(REQUEST, msg) && msg->info.request.URI) { RETVAL_STRING(msg->info.request.URI, 1); } else { RETVAL_NULL(); } break; - case HTTP_MSG_PROPHASH_RESPONSE_STATUS: - if (msg->type == HTTP_MSG_RESPONSE) { - RETVAL_LONG(msg->info.response.status); + case HTTP_MSG_PROPHASH_RESPONSE_CODE: + if (HTTP_MSG_TYPE(RESPONSE, msg)) { + RETVAL_LONG(msg->info.response.code); } else { RETVAL_NULL(); } @@ -213,19 +242,30 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member)); } -#if 0 - fprintf(stderr, "Writing property: %s(%d==%d) (%lu)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member)), - zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1) - ); -#endif - - switch (zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1)) + switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1)) { case HTTP_MSG_PROPHASH_TYPE: - msg->type = Z_LVAL_P(value); + convert_to_long_ex(&value); + if (Z_LVAL_P(value) != msg->type) { + if (HTTP_MSG_TYPE(REQUEST, msg)) { + if (msg->info.request.method) { + efree(msg->info.request.method); + } + if (msg->info.request.URI) { + efree(msg->info.request.URI); + } + } + msg->type = Z_LVAL_P(value); + if (HTTP_MSG_TYPE(REQUEST, msg)) { + msg->info.request.method = NULL; + msg->info.request.URI = NULL; + } + } + break; case HTTP_MSG_PROPHASH_HTTP_VERSION: + convert_to_double_ex(&value); switch (msg->type) { case HTTP_MSG_REQUEST: @@ -238,26 +278,31 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va } break; - case HTTP_MSG_PROPHASH_RAW: - http_message_dtor(msg); - http_message_parse_ex(msg, Z_STRVAL_P(value), Z_STRLEN_P(value), 1); - break; - case HTTP_MSG_PROPHASH_BODY: + convert_to_string_ex(&value); phpstr_dtor(PHPSTR(msg)); phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(value), Z_STRLEN_P(value)); break; case HTTP_MSG_PROPHASH_HEADERS: + convert_to_array_ex(&value); zend_hash_clean(&msg->hdrs); zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(value), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); break; - case HTTP_MSG_PROPHASH_NESTED_MESSAGE: + case HTTP_MSG_PROPHASH_PARENT_MESSAGE: + if (msg->parent) { + zval tmp; + tmp.value.obj = obj->parent; + zend_objects_store_del_ref(&tmp TSRMLS_CC); + } + zend_objects_store_add_ref(value TSRMLS_CC); + obj->parent = value->value.obj; break; case HTTP_MSG_PROPHASH_REQUEST_METHOD: - if (msg->type == HTTP_MSG_REQUEST) { + convert_to_string_ex(&value); + if (HTTP_MSG_TYPE(REQUEST, msg)) { if (msg->info.request.method) { efree(msg->info.request.method); } @@ -266,7 +311,8 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va break; case HTTP_MSG_PROPHASH_REQUEST_URI: - if (msg->type == HTTP_MSG_REQUEST) { + convert_to_string_ex(&value); + if (HTTP_MSG_TYPE(REQUEST, msg)) { if (msg->info.request.URI) { efree(msg->info.request.URI); } @@ -274,9 +320,10 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va } break; - case HTTP_MSG_PROPHASH_RESPONSE_STATUS: - if (msg->type == HTTP_MSG_RESPONSE) { - msg->info.response.status = Z_LVAL_P(value); + case HTTP_MSG_PROPHASH_RESPONSE_CODE: + convert_to_long_ex(&value); + if (HTTP_MSG_TYPE(RESPONSE, msg)) { + msg->info.response.code = Z_LVAL_P(value); } break; } @@ -305,13 +352,12 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) int m_prop_len; \ Z_ARRVAL(array) = OBJ_PROP(obj); \ zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \ - add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, val != empty_string); \ + add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, 1); \ } zend_hash_clean(OBJ_PROP(obj)); ASSOC_PROP(obj, long, "type", msg->type); - ASSOC_STRINGL(obj, "raw", msg->raw, msg->len) ASSOC_STRINGL(obj, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg)); MAKE_STD_ZVAL(headers); @@ -324,24 +370,24 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) { case HTTP_MSG_REQUEST: ASSOC_PROP(obj, double, "httpVersion", msg->info.request.http_version); - ASSOC_PROP(obj, long, "responseStatus", 0); + ASSOC_PROP(obj, long, "responseCode", 0); ASSOC_STRING(obj, "requestMethod", msg->info.request.method); ASSOC_STRING(obj, "requestUri", msg->info.request.URI); break; case HTTP_MSG_RESPONSE: ASSOC_PROP(obj, double, "httpVersion", msg->info.response.http_version); - ASSOC_PROP(obj, long, "responseStatus", msg->info.response.status); - ASSOC_STRING(obj, "requestMethod", empty_string); - ASSOC_STRING(obj, "requestUri", empty_string); + ASSOC_PROP(obj, long, "responseCode", msg->info.response.code); + ASSOC_STRING(obj, "requestMethod", ""); + ASSOC_STRING(obj, "requestUri", ""); break; case HTTP_MSG_NONE: default: ASSOC_PROP(obj, double, "httpVersion", 0.0); - ASSOC_PROP(obj, long, "responseStatus", 0); - ASSOC_STRING(obj, "requestMethod", empty_string); - ASSOC_STRING(obj, "requestUri", empty_string); + ASSOC_PROP(obj, long, "responseCode", 0); + ASSOC_STRING(obj, "requestMethod", ""); + ASSOC_STRING(obj, "requestUri", ""); break; }