X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message.c;h=1c337035cc7cac2c89e4e509c3b1f8f5226c4a2b;hp=c0e60f29be326642eb49bae683a71edfcec3d641;hb=18750f34ec9a9b16ffd07f54346136ca0f72e9a8;hpb=34c8af32031e2e847b4919402373ad70fc28a863 diff --git a/php_http_message.c b/php_http_message.c index c0e60f2..1c33703 100644 --- a/php_http_message.c +++ b/php_http_message.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2011, Michael Wallner | + | Copyright (c) 2004-2013, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -133,7 +133,7 @@ PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg, if (greedy) { flags |= PHP_HTTP_MESSAGE_PARSER_GREEDY; } - if (FAILURE == php_http_message_parser_parse(&p, &buf, flags, &msg)) { + if (PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE == php_http_message_parser_parse(&p, &buf, flags, &msg)) { if (free_msg) { php_http_message_free(&msg); } @@ -495,186 +495,10 @@ PHP_HTTP_API void php_http_message_free(php_http_message_t **message) } } -#define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpMessage, method, 0, req_args) -#define PHP_HTTP_EMPTY_ARGS(method) PHP_HTTP_EMPTY_ARGS_EX(HttpMessage, method, 0) -#define PHP_HTTP_MESSAGE_ME(method, visibility) PHP_ME(HttpMessage, method, PHP_HTTP_ARGS(HttpMessage, method), visibility) - -PHP_HTTP_BEGIN_ARGS(__construct, 0) - PHP_HTTP_ARG_VAL(message, 0) - PHP_HTTP_ARG_VAL(greedy, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getBody); -PHP_HTTP_BEGIN_ARGS(setBody, 1) - PHP_HTTP_ARG_VAL(body, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_BEGIN_ARGS(addBody, 1) - PHP_HTTP_ARG_VAL(body, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_BEGIN_ARGS(getHeader, 1) - PHP_HTTP_ARG_VAL(header, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_BEGIN_ARGS(setHeader, 1) - PHP_HTTP_ARG_VAL(header, 0) - PHP_HTTP_ARG_VAL(value, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_BEGIN_ARGS(addHeader, 2) - PHP_HTTP_ARG_VAL(header, 0) - PHP_HTTP_ARG_VAL(value, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getHeaders); -PHP_HTTP_BEGIN_ARGS(setHeaders, 1) - PHP_HTTP_ARG_VAL(headers, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_BEGIN_ARGS(addHeaders, 1) - PHP_HTTP_ARG_VAL(headers, 0) - PHP_HTTP_ARG_VAL(append, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getType); -PHP_HTTP_BEGIN_ARGS(setType, 1) - PHP_HTTP_ARG_VAL(type, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getInfo); -PHP_HTTP_BEGIN_ARGS(setInfo, 1) - PHP_HTTP_ARG_VAL(http_info, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getResponseCode); -PHP_HTTP_BEGIN_ARGS(setResponseCode, 1) - PHP_HTTP_ARG_VAL(response_code, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getResponseStatus); -PHP_HTTP_BEGIN_ARGS(setResponseStatus, 1) - PHP_HTTP_ARG_VAL(response_status, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getRequestMethod); -PHP_HTTP_BEGIN_ARGS(setRequestMethod, 1) - PHP_HTTP_ARG_VAL(request_method, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getRequestUrl); -PHP_HTTP_BEGIN_ARGS(setRequestUrl, 1) - PHP_HTTP_ARG_VAL(url, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getHttpVersion); -PHP_HTTP_BEGIN_ARGS(setHttpVersion, 1) - PHP_HTTP_ARG_VAL(http_version, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getParentMessage); -PHP_HTTP_EMPTY_ARGS(__toString); -PHP_HTTP_BEGIN_ARGS(toString, 0) - PHP_HTTP_ARG_VAL(include_parent, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(toCallback, 1) - PHP_HTTP_ARG_VAL(callback, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(toStream, 1) - PHP_HTTP_ARG_VAL(stream, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(count); - -PHP_HTTP_EMPTY_ARGS(serialize); -PHP_HTTP_BEGIN_ARGS(unserialize, 1) - PHP_HTTP_ARG_VAL(serialized, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(rewind); -PHP_HTTP_EMPTY_ARGS(valid); -PHP_HTTP_EMPTY_ARGS(key); -PHP_HTTP_EMPTY_ARGS(current); -PHP_HTTP_EMPTY_ARGS(next); - -PHP_HTTP_EMPTY_ARGS(detach); -PHP_HTTP_BEGIN_ARGS(prepend, 1) - PHP_HTTP_ARG_OBJ(http\\Message, message, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_EMPTY_ARGS(reverse); - -PHP_HTTP_BEGIN_ARGS(isMultipart, 0) - PHP_HTTP_ARG_VAL(boundary, 1) -PHP_HTTP_END_ARGS; -PHP_HTTP_EMPTY_ARGS(splitMultipartBody); - static zval *php_http_message_object_read_prop(zval *object, zval *member, int type PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC); static void php_http_message_object_write_prop(zval *object, zval *member, zval *value PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC); -static zval **php_http_message_object_get_prop_ptr(zval *object, zval *member PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC); static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC); -static zend_class_entry *php_http_message_class_entry; - -zend_class_entry *php_http_message_get_class_entry(void) -{ - return php_http_message_class_entry; -} - -static zend_function_entry php_http_message_method_entry[] = { - PHP_HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_HTTP_MESSAGE_ME(getBody, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(setBody, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(addBody, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(getHeader, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(setHeader, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(addHeader, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(getHeaders, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(setHeaders, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(addHeaders, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(getType, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(setType, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(getInfo, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(setInfo, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(getResponseCode, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(setResponseCode, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(getResponseStatus, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(setResponseStatus, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(getRequestMethod, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(setRequestMethod, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(getRequestUrl, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(setRequestUrl, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(getHttpVersion, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(setHttpVersion, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(getParentMessage, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(toString, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(toCallback, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(toStream, ZEND_ACC_PUBLIC) - - /* implements Countable */ - PHP_HTTP_MESSAGE_ME(count, ZEND_ACC_PUBLIC) - - /* implements Serializable */ - PHP_HTTP_MESSAGE_ME(serialize, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(unserialize, ZEND_ACC_PUBLIC) - - /* implements Iterator */ - PHP_HTTP_MESSAGE_ME(rewind, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(valid, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(current, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(key, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(next, ZEND_ACC_PUBLIC) - - ZEND_MALIAS(HttpMessage, __toString, toString, PHP_HTTP_ARGS(HttpMessage, __toString), ZEND_ACC_PUBLIC) - - PHP_HTTP_MESSAGE_ME(detach, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(prepend, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(reverse, ZEND_ACC_PUBLIC) - - PHP_HTTP_MESSAGE_ME(isMultipart, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_ME(splitMultipartBody, ZEND_ACC_PUBLIC) - - EMPTY_FUNCTION_ENTRY -}; static zend_object_handlers php_http_message_object_handlers; static HashTable php_http_message_object_prophandlers; @@ -689,11 +513,6 @@ static STATUS php_http_message_object_add_prophandler(const char *prop_str, size php_http_message_object_prophandler_t h = { read, write }; return zend_hash_add(&php_http_message_object_prophandlers, prop_str, prop_len + 1, (void *) &h, sizeof(h), NULL); } -/* -static int php_http_message_object_has_prophandler(const char *prop_str, size_t prop_len) { - return zend_hash_exists(&php_http_message_object_prophandlers, prop_str, prop_len + 1); -} -*/ static STATUS php_http_message_object_get_prophandler(const char *prop_str, size_t prop_len, php_http_message_object_prophandler_t **handler) { return zend_hash_find(&php_http_message_object_prophandlers, prop_str, prop_len + 1, (void *) handler); } @@ -786,8 +605,8 @@ static void php_http_message_object_prophandler_set_headers(php_http_message_obj zval_ptr_dtor(&cpy); } static void php_http_message_object_prophandler_get_body(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) { - if (obj->body.handle) { - RETVAL_OBJVAL(obj->body, 1); + if (obj->body) { + RETVAL_OBJVAL(obj->body->zv, 1); } else { RETVAL_NULL(); } @@ -797,7 +616,7 @@ static void php_http_message_object_prophandler_set_body(php_http_message_object } static void php_http_message_object_prophandler_get_parent_message(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) { if (obj->message->parent) { - RETVAL_OBJVAL(obj->parent, 1); + RETVAL_OBJVAL(obj->parent->zv, 1); } else { RETVAL_NULL(); } @@ -807,103 +626,60 @@ static void php_http_message_object_prophandler_set_parent_message(php_http_mess php_http_message_object_t *parent_obj = zend_object_store_get_object(value TSRMLS_CC); if (obj->message->parent) { - zend_objects_store_del_ref_by_handle(obj->parent.handle TSRMLS_CC); + zend_objects_store_del_ref_by_handle(obj->parent->zv.handle TSRMLS_CC); } Z_OBJ_ADDREF_P(value); - obj->parent = Z_OBJVAL_P(value); + obj->parent = parent_obj; obj->message->parent = parent_obj->message; } } -PHP_MINIT_FUNCTION(http_message) -{ - PHP_HTTP_REGISTER_CLASS(http, Message, http_message, php_http_object_get_class_entry(), 0); - php_http_message_class_entry->create_object = php_http_message_object_new; - memcpy(&php_http_message_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); - php_http_message_object_handlers.clone_obj = php_http_message_object_clone; - php_http_message_object_handlers.read_property = php_http_message_object_read_prop; - php_http_message_object_handlers.write_property = php_http_message_object_write_prop; - php_http_message_object_handlers.get_properties = php_http_message_object_get_props; - php_http_message_object_handlers.get_property_ptr_ptr = php_http_message_object_get_prop_ptr; - - zend_class_implements(php_http_message_class_entry TSRMLS_CC, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator); - - zend_hash_init(&php_http_message_object_prophandlers, 9, NULL, NULL, 1); - zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("type"), PHP_HTTP_NONE, ZEND_ACC_PROTECTED TSRMLS_CC); - php_http_message_object_add_prophandler(ZEND_STRL("type"), php_http_message_object_prophandler_get_type, php_http_message_object_prophandler_set_type); - zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("body"), ZEND_ACC_PROTECTED TSRMLS_CC); - php_http_message_object_add_prophandler(ZEND_STRL("body"), php_http_message_object_prophandler_get_body, php_http_message_object_prophandler_set_body); - zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("requestMethod"), "", ZEND_ACC_PROTECTED TSRMLS_CC); - php_http_message_object_add_prophandler(ZEND_STRL("requestMethod"), php_http_message_object_prophandler_get_request_method, php_http_message_object_prophandler_set_request_method); - zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("requestUrl"), "", ZEND_ACC_PROTECTED TSRMLS_CC); - php_http_message_object_add_prophandler(ZEND_STRL("requestUrl"), php_http_message_object_prophandler_get_request_url, php_http_message_object_prophandler_set_request_url); - zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("responseStatus"), "", ZEND_ACC_PROTECTED TSRMLS_CC); - php_http_message_object_add_prophandler(ZEND_STRL("responseStatus"), php_http_message_object_prophandler_get_response_status, php_http_message_object_prophandler_set_response_status); - zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("responseCode"), 0, ZEND_ACC_PROTECTED TSRMLS_CC); - php_http_message_object_add_prophandler(ZEND_STRL("responseCode"), php_http_message_object_prophandler_get_response_code, php_http_message_object_prophandler_set_response_code); - zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("httpVersion"), ZEND_ACC_PROTECTED TSRMLS_CC); - php_http_message_object_add_prophandler(ZEND_STRL("httpVersion"), php_http_message_object_prophandler_get_http_version, php_http_message_object_prophandler_set_http_version); - zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("headers"), ZEND_ACC_PROTECTED TSRMLS_CC); - php_http_message_object_add_prophandler(ZEND_STRL("headers"), php_http_message_object_prophandler_get_headers, php_http_message_object_prophandler_set_headers); - zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("parentMessage"), ZEND_ACC_PROTECTED TSRMLS_CC); - php_http_message_object_add_prophandler(ZEND_STRL("parentMessage"), php_http_message_object_prophandler_get_parent_message, php_http_message_object_prophandler_set_parent_message); - - zend_declare_class_constant_long(php_http_message_class_entry, ZEND_STRL("TYPE_NONE"), PHP_HTTP_NONE TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_class_entry, ZEND_STRL("TYPE_REQUEST"), PHP_HTTP_REQUEST TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_class_entry, ZEND_STRL("TYPE_RESPONSE"), PHP_HTTP_RESPONSE TSRMLS_CC); - - return SUCCESS; -} - -PHP_MSHUTDOWN_FUNCTION(http_message) -{ - zend_hash_destroy(&php_http_message_object_prophandlers); +#define PHP_HTTP_MESSAGE_OBJECT_INIT(obj) \ + do { \ + if (!obj->message) { \ + obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); \ + } \ + } while(0) - return SUCCESS; -} void php_http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_DC) { int i = 0; php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + /* count */ php_http_message_count(i, obj->message); if (i > 1) { - zend_object_value *ovalues = NULL; - php_http_message_object_t **objects = NULL; + php_http_message_object_t **objects; int last; objects = ecalloc(i, sizeof(**objects)); - ovalues = ecalloc(i, sizeof(*ovalues)); /* we are the first message */ objects[0] = obj; - ovalues[0] = getThis()->value.obj; /* fetch parents */ - for (i = 1; obj->parent.handle; ++i) { - ovalues[i] = obj->parent; - objects[i] = obj = zend_object_store_get_object_by_handle(obj->parent.handle TSRMLS_CC); + for (i = 1; obj->parent; ++i) { + objects[i] = obj = obj->parent; } /* reorder parents */ for (last = --i; i; --i) { objects[i]->message->parent = objects[i-1]->message; - objects[i]->parent = ovalues[i-1]; + objects[i]->parent = objects[i-1]; } objects[0]->message->parent = NULL; - objects[0]->parent.handle = 0; - objects[0]->parent.handlers = NULL; + objects[0]->parent = NULL; /* add ref, because we previously have not been a parent message */ Z_OBJ_ADDREF_P(getThis()); - RETVAL_OBJVAL(ovalues[last], 1); + RETVAL_OBJVAL(objects[last]->zv, 0); efree(objects); - efree(ovalues); } else { RETURN_ZVAL(getThis(), 1, 0); } @@ -913,8 +689,7 @@ void php_http_message_object_prepend(zval *this_ptr, zval *prepend, zend_bool to { zval m; php_http_message_t *save_parent_msg = NULL; - zend_object_value save_parent_obj = {0, NULL}; - php_http_message_object_t *obj = zend_object_store_get_object(this_ptr TSRMLS_CC); + php_http_message_object_t *save_parent_obj = NULL, *obj = zend_object_store_get_object(this_ptr TSRMLS_CC); php_http_message_object_t *prepend_obj = zend_object_store_get_object(prepend TSRMLS_CC); INIT_PZVAL(&m); @@ -925,24 +700,24 @@ void php_http_message_object_prepend(zval *this_ptr, zval *prepend, zend_bool to save_parent_msg = obj->message->parent; } else { /* iterate to the most parent object */ - while (obj->parent.handle) { - m.value.obj = obj->parent; - obj = zend_object_store_get_object(&m TSRMLS_CC); + while (obj->parent) { + obj = obj->parent; } } /* prepend */ - obj->parent = prepend->value.obj; + obj->parent = prepend_obj; obj->message->parent = prepend_obj->message; /* add ref */ zend_objects_store_add_ref(prepend TSRMLS_CC); - while (prepend_obj->parent.handle) { - m.value.obj = prepend_obj->parent; + /* + while (prepend_obj->parent) { + m.value.obj = prepend_obj->parent->zv; zend_objects_store_add_ref(&m TSRMLS_CC); prepend_obj = zend_object_store_get_object(&m TSRMLS_CC); } - + */ if (!top) { prepend_obj->parent = save_parent_obj; prepend_obj->message->parent = save_parent_msg; @@ -968,7 +743,7 @@ STATUS php_http_message_object_set_body(php_http_message_object_t *msg_obj, zval is_resource: body = php_http_message_body_init(NULL, s TSRMLS_CC); - if (SUCCESS != php_http_new(&ov, php_http_message_body_get_class_entry(), (php_http_new_t) php_http_message_body_object_new_ex, NULL, body, NULL TSRMLS_CC)) { + if (SUCCESS != php_http_new(&ov, php_http_message_body_class_entry, (php_http_new_t) php_http_message_body_object_new_ex, NULL, body, NULL TSRMLS_CC)) { php_http_message_body_free(&body); return FAILURE; } @@ -978,7 +753,7 @@ STATUS php_http_message_object_set_body(php_http_message_object_t *msg_obj, zval break; case IS_OBJECT: - if (instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_get_class_entry() TSRMLS_CC)) { + if (instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry TSRMLS_CC)) { Z_OBJ_ADDREF_P(zbody); break; } @@ -996,14 +771,20 @@ STATUS php_http_message_object_set_body(php_http_message_object_t *msg_obj, zval body_obj = zend_object_store_get_object(zbody TSRMLS_CC); - if (msg_obj->body.handle) { - zend_objects_store_del_ref_by_handle(msg_obj->body.handle TSRMLS_CC); + if (msg_obj->body) { + zend_objects_store_del_ref_by_handle(msg_obj->body->zv.handle TSRMLS_CC); } - php_http_message_body_free(&msg_obj->message->body); - - msg_obj->message->body = php_http_message_body_init(&body_obj->body, NULL TSRMLS_CC); - msg_obj->body = Z_OBJVAL_P(zbody); + if (msg_obj->message) { + php_http_message_body_free(&msg_obj->message->body); + msg_obj->message->body = php_http_message_body_init(&body_obj->body, NULL TSRMLS_CC); + } else { + msg_obj->message = php_http_message_init(NULL, 0, php_http_message_body_init(&body_obj->body, NULL TSRMLS_CC) TSRMLS_CC); + } + msg_obj->body = body_obj; + if (tmp) { + FREE_ZVAL(tmp); + } return SUCCESS; } @@ -1014,7 +795,6 @@ zend_object_value php_http_message_object_new(zend_class_entry *ce TSRMLS_DC) zend_object_value php_http_message_object_new_ex(zend_class_entry *ce, php_http_message_t *msg, php_http_message_object_t **ptr TSRMLS_DC) { - zend_object_value ov; php_http_message_object_t *o; o = ecalloc(1, sizeof(php_http_message_object_t)); @@ -1028,15 +808,15 @@ zend_object_value php_http_message_object_new_ex(zend_class_entry *ce, php_http_ if (msg) { o->message = msg; if (msg->parent) { - o->parent = php_http_message_object_new_ex(ce, msg->parent, NULL TSRMLS_CC); + php_http_message_object_new_ex(ce, msg->parent, &o->parent TSRMLS_CC); } - o->body = php_http_message_body_object_new_ex(php_http_message_body_get_class_entry(), php_http_message_body_init(&msg->body, NULL TSRMLS_CC), NULL TSRMLS_CC); + php_http_message_body_object_new_ex(php_http_message_body_class_entry, php_http_message_body_init(&msg->body, NULL TSRMLS_CC), &o->body TSRMLS_CC); } - ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_message_object_free, NULL TSRMLS_CC); - ov.handlers = &php_http_message_object_handlers; + o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_message_object_free, NULL TSRMLS_CC); + o->zv.handlers = &php_http_message_object_handlers; - return ov; + return o->zv; } zend_object_value php_http_message_object_clone(zval *this_ptr TSRMLS_DC) @@ -1065,47 +845,36 @@ void php_http_message_object_free(void *object TSRMLS_DC) efree(o->message); o->message = NULL; } - if (o->parent.handle) { - zend_objects_store_del_ref_by_handle(o->parent.handle TSRMLS_CC); + if (o->parent) { + zend_objects_store_del_ref_by_handle(o->parent->zv.handle TSRMLS_CC); + o->parent = NULL; } - if (o->body.handle) { - zend_objects_store_del_ref_by_handle(o->body.handle TSRMLS_CC); + if (o->body) { + zend_objects_store_del_ref_by_handle(o->body->zv.handle TSRMLS_CC); + o->body = NULL; } zend_object_std_dtor((zend_object *) o TSRMLS_CC); efree(o); } - -static zval **php_http_message_object_get_prop_ptr(zval *object, zval *member PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC) -{ - php_http_message_object_prophandler_t *handler; - zval *copy = php_http_ztyp(IS_STRING, member); - - if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) { - zval_ptr_dtor(©); - return &php_http_property_proxy_init(NULL, object, member, NULL TSRMLS_CC)->myself; - } - zval_ptr_dtor(©); - - return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member PHP_HTTP_ZEND_LITERAL_CC TSRMLS_CC); -} - static zval *php_http_message_object_read_prop(zval *object, zval *member, int type PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC) { php_http_message_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); php_http_message_object_prophandler_t *handler; zval *return_value, *copy = php_http_ztyp(IS_STRING, member); + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) { - if (type == BP_VAR_R) { - ALLOC_ZVAL(return_value); - Z_SET_REFCOUNT_P(return_value, 0); - Z_UNSET_ISREF_P(return_value); + ALLOC_ZVAL(return_value); + Z_SET_REFCOUNT_P(return_value, 0); + Z_UNSET_ISREF_P(return_value); + if (type == BP_VAR_R) { handler->read(obj, return_value TSRMLS_CC); } else { - zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index"); - return_value = NULL; + php_property_proxy_t *proxy = php_property_proxy_init(object, Z_STRVAL_P(copy), Z_STRLEN_P(copy) TSRMLS_CC); + RETVAL_OBJVAL(php_property_proxy_object_new_ex(php_property_proxy_get_class_entry(), proxy, NULL TSRMLS_CC), 0); } } else { return_value = zend_get_std_object_handlers()->read_property(object, member, type PHP_HTTP_ZEND_LITERAL_CC TSRMLS_CC); @@ -1122,6 +891,8 @@ static void php_http_message_object_write_prop(zval *object, zval *member, zval php_http_message_object_prophandler_t *handler; zval *copy = php_http_ztyp(IS_STRING, member); + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) { handler->write(obj, value TSRMLS_CC); } else { @@ -1131,7 +902,6 @@ static void php_http_message_object_write_prop(zval *object, zval *member, zval zval_ptr_dtor(©); } - static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC) { zval *headers; @@ -1141,87 +911,90 @@ static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC) zval array, *parent, *body; char *version; + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + INIT_PZVAL_ARRAY(&array, props); - -#define ASSOC_PROP(array, ptype, name, val) \ - { \ - char *m_prop_name; \ - int m_prop_len; \ - zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 0); \ - add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+3, val); \ - efree(m_prop_name); \ - } -#define ASSOC_STRING(array, name, val) ASSOC_STRINGL(array, name, val, strlen(val)) -#define ASSOC_STRINGL(array, name, val, len) ASSOC_STRINGL_EX(array, name, val, len, 1) -#define ASSOC_STRINGL_EX(array, name, val, len, cpy) \ - { \ - char *m_prop_name; \ - int m_prop_len; \ - zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 0); \ - add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+3, val, len, cpy); \ - efree(m_prop_name); \ - } - - ASSOC_PROP(array, long, "type", msg->type); - ASSOC_STRINGL_EX(array, "httpVersion", version, spprintf(&version, 0, "%u.%u", msg->http.version.major, msg->http.version.minor), 0); + +#define ASSOC_PROP(ptype, n, val) \ + do { \ + zend_property_info *pi; \ + if (SUCCESS == zend_hash_find(&obj->zo.ce->properties_info, n, sizeof(n), (void *) &pi)) { \ + add_assoc_ ##ptype## _ex(&array, pi->name, pi->name_length + 1, val); \ + } \ + } while(0) \ + +#define ASSOC_STRING(name, val) ASSOC_STRINGL(name, val, strlen(val)) +#define ASSOC_STRINGL(name, val, len) ASSOC_STRINGL_EX(name, val, len, 1) +#define ASSOC_STRINGL_EX(n, val, len, cpy) \ + do { \ + zend_property_info *pi; \ + if (SUCCESS == zend_hash_find(&obj->zo.ce->properties_info, n, sizeof(n), (void *) &pi)) { \ + add_assoc_stringl_ex(&array, pi->name, pi->name_length + 1, val, len, cpy); \ + } \ + } while(0) + + ASSOC_PROP(long, "type", msg->type); + ASSOC_STRINGL_EX("httpVersion", version, spprintf(&version, 0, "%u.%u", msg->http.version.major, msg->http.version.minor), 0); switch (msg->type) { case PHP_HTTP_REQUEST: - ASSOC_PROP(array, long, "responseCode", 0); - ASSOC_STRINGL(array, "responseStatus", "", 0); - ASSOC_STRING(array, "requestMethod", STR_PTR(msg->http.info.request.method)); - ASSOC_STRING(array, "requestUrl", STR_PTR(msg->http.info.request.url)); + ASSOC_PROP(long, "responseCode", 0); + ASSOC_STRINGL("responseStatus", "", 0); + ASSOC_STRING("requestMethod", STR_PTR(msg->http.info.request.method)); + ASSOC_STRING("requestUrl", STR_PTR(msg->http.info.request.url)); break; case PHP_HTTP_RESPONSE: - ASSOC_PROP(array, long, "responseCode", msg->http.info.response.code); - ASSOC_STRING(array, "responseStatus", STR_PTR(msg->http.info.response.status)); - ASSOC_STRINGL(array, "requestMethod", "", 0); - ASSOC_STRINGL(array, "requestUrl", "", 0); + ASSOC_PROP(long, "responseCode", msg->http.info.response.code); + ASSOC_STRING("responseStatus", STR_PTR(msg->http.info.response.status)); + ASSOC_STRINGL("requestMethod", "", 0); + ASSOC_STRINGL("requestUrl", "", 0); break; case PHP_HTTP_NONE: default: - ASSOC_PROP(array, long, "responseCode", 0); - ASSOC_STRINGL(array, "responseStatus", "", 0); - ASSOC_STRINGL(array, "requestMethod", "", 0); - ASSOC_STRINGL(array, "requestUrl", "", 0); + ASSOC_PROP(long, "responseCode", 0); + ASSOC_STRINGL("responseStatus", "", 0); + ASSOC_STRINGL("requestMethod", "", 0); + ASSOC_STRINGL("requestUrl", "", 0); break; } MAKE_STD_ZVAL(headers); array_init(headers); zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - ASSOC_PROP(array, zval, "headers", headers); + ASSOC_PROP(zval, "headers", headers); MAKE_STD_ZVAL(body); - if (!obj->body.handle) { - php_http_new(&obj->body, php_http_message_body_get_class_entry(), (php_http_new_t) php_http_message_body_object_new_ex, NULL, (void *) php_http_message_body_init(&obj->message->body, NULL TSRMLS_CC), NULL TSRMLS_CC); + if (!obj->body) { + php_http_new(NULL, php_http_message_body_class_entry, (php_http_new_t) php_http_message_body_object_new_ex, NULL, (void *) php_http_message_body_init(&obj->message->body, NULL TSRMLS_CC), (void *) &obj->body TSRMLS_CC); } - ZVAL_OBJVAL(body, obj->body, 1); - ASSOC_PROP(array, zval, "body", body); + ZVAL_OBJVAL(body, obj->body->zv, 1); + ASSOC_PROP(zval, "body", body); MAKE_STD_ZVAL(parent); if (msg->parent) { - ZVAL_OBJVAL(parent, obj->parent, 1); + ZVAL_OBJVAL(parent, obj->parent->zv, 1); } else { ZVAL_NULL(parent); } - ASSOC_PROP(array, zval, "parentMessage", parent); + ASSOC_PROP(zval, "parentMessage", parent); return props; } -/* PHP */ - -PHP_METHOD(HttpMessage, __construct) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage___construct, 0, 0, 0) + ZEND_ARG_INFO(0, message) + ZEND_ARG_INFO(0, greedy) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, __construct) { zend_bool greedy = 1; zval *zmessage = NULL; php_http_message_t *msg = NULL; php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!b", &zmessage, &greedy) && zmessage) { if (Z_TYPE_P(zmessage) == IS_RESOURCE) { php_stream *s; @@ -1250,101 +1023,132 @@ PHP_METHOD(HttpMessage, __construct) php_http_message_dtor(obj->message); obj->message = msg; if (obj->message->parent) { - obj->parent = php_http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL TSRMLS_CC); + php_http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, &obj->parent TSRMLS_CC); } } } - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); } end_error_handling(); } -PHP_METHOD(HttpMessage, getBody) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_getBody, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, getBody) { - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } - if (!obj->body.handle) { + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + + if (!obj->body) { php_http_message_body_addref(obj->message->body); - php_http_new(&obj->body, php_http_message_body_get_class_entry(), (php_http_new_t) php_http_message_body_object_new_ex, NULL, obj->message->body, NULL TSRMLS_CC); + php_http_new(NULL, php_http_message_body_class_entry, (php_http_new_t) php_http_message_body_object_new_ex, NULL, obj->message->body, (void *) &obj->body TSRMLS_CC); } - if (obj->body.handle) { - RETVAL_OBJVAL(obj->body, 1); + if (obj->body) { + RETVAL_OBJVAL(obj->body->zv, 1); } } } end_error_handling(); } -PHP_METHOD(HttpMessage, setBody) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_setBody, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, body, http\\Message\\Body, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, setBody) { zval *zbody; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zbody, php_http_message_body_get_class_entry())) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zbody, php_http_message_body_class_entry)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_message_object_prophandler_set_body(obj, zbody TSRMLS_CC); } RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpMessage, addBody) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_addBody, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, body, http\\Message\\Body, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, addBody) { zval *new_body; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &new_body, php_http_message_body_get_class_entry())) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &new_body, php_http_message_body_class_entry)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); php_http_message_body_object_t *new_obj = zend_object_store_get_object(new_body TSRMLS_CC); + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_message_body_to_callback(new_obj->body, (php_http_pass_callback_t) php_http_message_body_append, obj->message->body, 0, 0); } RETVAL_ZVAL(getThis(), 1, 0); } - -PHP_METHOD(HttpMessage, getHeader) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_getHeader, 0, 0, 1) + ZEND_ARG_INFO(0, header) + ZEND_ARG_INFO(0, into_class) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, getHeader) { char *header_str; int header_len; + zend_class_entry *header_ce = NULL; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &header_str, &header_len)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|C!", &header_str, &header_len, &header_ce)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); zval *header; - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if ((header = php_http_message_header(obj->message, header_str, header_len, 0))) { - RETURN_ZVAL(header, 1, 1); + if (!header_ce) { + RETURN_ZVAL(header, 1, 1); + } else if (instanceof_function(header_ce, php_http_header_class_entry TSRMLS_CC)) { + zval *header_name, **argv[2]; + + MAKE_STD_ZVAL(header_name); + ZVAL_STRINGL(header_name, header_str, header_len, 1); + Z_ADDREF_P(header); + + argv[0] = &header_name; + argv[1] = &header; + + object_init_ex(return_value, header_ce); + php_http_method_call(return_value, ZEND_STRL("__construct"), 2, argv, NULL TSRMLS_CC); + + zval_ptr_dtor(&header_name); + zval_ptr_dtor(&header); + + return; + } else { + php_http_error(HE_WARNING, PHP_HTTP_E_INVALID_PARAM, "Class '%s' is not as descendant of http\\Header", header_ce->name); + } } } RETURN_FALSE; } -PHP_METHOD(HttpMessage, getHeaders) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_getHeaders, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, getHeaders) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); array_init(return_value); array_copy(&obj->message->hdrs, Z_ARRVAL_P(return_value)); } } -PHP_METHOD(HttpMessage, setHeader) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_setHeader, 0, 0, 1) + ZEND_ARG_INFO(0, header) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, setHeader) { zval *zvalue = NULL; char *name_str; @@ -1354,9 +1158,7 @@ PHP_METHOD(HttpMessage, setHeader) php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); char *name = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (!zvalue) { zend_symtable_del(&obj->message->hdrs, name, name_len + 1); @@ -1369,16 +1171,17 @@ PHP_METHOD(HttpMessage, setHeader) RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpMessage, setHeaders) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_setHeaders, 0, 0, 1) + ZEND_ARG_ARRAY_INFO(0, headers, 1) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, setHeaders) { zval *new_headers = NULL; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &new_headers)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); zend_hash_clean(&obj->message->hdrs); if (new_headers) { @@ -1388,7 +1191,11 @@ PHP_METHOD(HttpMessage, setHeaders) RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpMessage, addHeader) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_addHeader, 0, 0, 2) + ZEND_ARG_INFO(0, header) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, addHeader) { zval *zvalue; char *name_str; @@ -1399,9 +1206,7 @@ PHP_METHOD(HttpMessage, addHeader) char *name = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1); zval *header; - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); Z_ADDREF_P(zvalue); if ((header = php_http_message_header(obj->message, name, name_len, 0))) { @@ -1416,7 +1221,11 @@ PHP_METHOD(HttpMessage, addHeader) RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpMessage, addHeaders) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_addHeaders, 0, 0, 1) + ZEND_ARG_ARRAY_INFO(0, headers, 0) + ZEND_ARG_INFO(0, append) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, addHeaders) { zval *new_headers; zend_bool append = 0; @@ -1424,52 +1233,51 @@ PHP_METHOD(HttpMessage, addHeaders) if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b", &new_headers, &append)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, append, ARRAY_JOIN_STRONLY|ARRAY_JOIN_PRETTIFY); } RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpMessage, getType) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_getType, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, getType) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); RETURN_LONG(obj->message->type); } } -PHP_METHOD(HttpMessage, setType) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_setType, 0, 0, 1) + ZEND_ARG_INFO(0, type) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, setType) { long type; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &type)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_message_set_type(obj->message, type); } RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpMessage, getInfo) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_getInfo, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, getInfo) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); switch (obj->message->type) { case PHP_HTTP_REQUEST: @@ -1485,48 +1293,52 @@ PHP_METHOD(HttpMessage, getInfo) Z_TYPE_P(return_value) = IS_STRING; return; } - RETURN_FALSE; } -PHP_METHOD(HttpMessage, setInfo) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_setInfo, 0, 0, 1) + ZEND_ARG_INFO(0, http_info) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, setInfo) { char *str; int len; php_http_info_t inf; - if ( SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len) - && php_http_info_parse(&inf, str TSRMLS_CC)) { + if ( SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - php_http_message_set_info(obj->message, &inf); - php_http_info_dtor(&inf); + if (php_http_info_parse(&inf, str TSRMLS_CC)) { + php_http_message_set_info(obj->message, &inf); + php_http_info_dtor(&inf); + } else { + php_http_error(HE_WARNING, PHP_HTTP_E_MALFORMED_HEADERS, "Could not parse message info '%s'", str); + } } RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpMessage, getHttpVersion) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_getHttpVersion, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, getHttpVersion) { if (SUCCESS == zend_parse_parameters_none()) { char *str; size_t len; php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_version_to_string(&obj->message->http.version, &str, &len, NULL, NULL TSRMLS_CC); RETURN_STRINGL(str, len, 0); } - - RETURN_FALSE; } -PHP_METHOD(HttpMessage, setHttpVersion) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_setHttpVersion, 0, 0, 1) + ZEND_ARG_INFO(0, http_version) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, setHttpVersion) { char *v_str; int v_len; @@ -1535,9 +1347,7 @@ PHP_METHOD(HttpMessage, setHttpVersion) php_http_version_t version; php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (php_http_version_parse(&version, v_str TSRMLS_CC)) { obj->message->http.version = version; @@ -1546,22 +1356,24 @@ PHP_METHOD(HttpMessage, setHttpVersion) RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpMessage, getResponseCode) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_getResponseCode, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, getResponseCode) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); PHP_HTTP_MESSAGE_TYPE_CHECK(RESPONSE, obj->message, RETURN_FALSE); RETURN_LONG(obj->message->http.info.response.code); } - RETURN_FALSE; } -PHP_METHOD(HttpMessage, setResponseCode) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_setResponseCode, 0, 0, 1) + ZEND_ARG_INFO(0, response_code) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, setResponseCode) { long code; zend_bool strict = 1; @@ -1569,9 +1381,7 @@ PHP_METHOD(HttpMessage, setResponseCode) if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|b", &code, &strict)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); PHP_HTTP_MESSAGE_TYPE_CHECK(RESPONSE, obj->message, RETURN_FALSE); if (strict && (code < 100 || code > 599)) { @@ -1585,14 +1395,14 @@ PHP_METHOD(HttpMessage, setResponseCode) RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpMessage, getResponseStatus) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_getResponseStatus, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, getResponseStatus) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); PHP_HTTP_MESSAGE_TYPE_CHECK(RESPONSE, obj->message, RETURN_FALSE); if (obj->message->http.info.response.status) { @@ -1601,11 +1411,12 @@ PHP_METHOD(HttpMessage, getResponseStatus) RETURN_EMPTY_STRING(); } } - - RETURN_FALSE; } -PHP_METHOD(HttpMessage, setResponseStatus) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_setResponseStatus, 0, 0, 1) + ZEND_ARG_INFO(0, response_status) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, setResponseStatus) { char *status; int status_len; @@ -1613,9 +1424,7 @@ PHP_METHOD(HttpMessage, setResponseStatus) if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); PHP_HTTP_MESSAGE_TYPE_CHECK(RESPONSE, obj->message, RETURN_FALSE); STR_SET(obj->message->http.info.response.status, estrndup(status, status_len)); @@ -1623,14 +1432,14 @@ PHP_METHOD(HttpMessage, setResponseStatus) RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpMessage, getRequestMethod) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_getRequestMethod, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, getRequestMethod) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); PHP_HTTP_MESSAGE_TYPE_CHECK(REQUEST, obj->message, RETURN_FALSE); if (obj->message->http.info.request.method) { @@ -1639,11 +1448,12 @@ PHP_METHOD(HttpMessage, getRequestMethod) RETURN_EMPTY_STRING(); } } - - RETURN_FALSE; } -PHP_METHOD(HttpMessage, setRequestMethod) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_setRequestMethod, 0, 0, 1) + ZEND_ARG_INFO(0, request_method) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, setRequestMethod) { char *method; int method_len; @@ -1651,9 +1461,7 @@ PHP_METHOD(HttpMessage, setRequestMethod) if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); PHP_HTTP_MESSAGE_TYPE_CHECK(REQUEST, obj->message, RETURN_FALSE); if (method_len < 1) { @@ -1666,14 +1474,14 @@ PHP_METHOD(HttpMessage, setRequestMethod) RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpMessage, getRequestUrl) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_getRequestUrl, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, getRequestUrl) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); PHP_HTTP_MESSAGE_TYPE_CHECK(REQUEST, obj->message, RETURN_FALSE); if (obj->message->http.info.request.url) { @@ -1682,11 +1490,12 @@ PHP_METHOD(HttpMessage, getRequestUrl) RETURN_EMPTY_STRING(); } } - - RETURN_FALSE; } -PHP_METHOD(HttpMessage, setRequestUrl) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_setRequestUrl, 0, 0, 1) + ZEND_ARG_INFO(0, url) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, setRequestUrl) { char *url_str; int url_len; @@ -1694,9 +1503,7 @@ PHP_METHOD(HttpMessage, setRequestUrl) if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &url_str, &url_len)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); PHP_HTTP_MESSAGE_TYPE_CHECK(REQUEST, obj->message, RETURN_FALSE); if (url_len < 1) { @@ -1708,19 +1515,18 @@ PHP_METHOD(HttpMessage, setRequestUrl) RETVAL_ZVAL(getThis(), 1, 0); } - -PHP_METHOD(HttpMessage, getParentMessage) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_getParentMessage, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, getParentMessage) { - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (obj->message->parent) { - RETVAL_OBJVAL(obj->parent, 1); + RETVAL_OBJVAL(obj->parent->zv, 1); } else { php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "HttpMessage does not have a parent message"); } @@ -1728,7 +1534,12 @@ PHP_METHOD(HttpMessage, getParentMessage) } end_error_handling(); } -PHP_METHOD(HttpMessage, toString) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage___toString, 0, 0, 0) +ZEND_END_ARG_INFO(); +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_toString, 0, 0, 0) + ZEND_ARG_INFO(0, include_parent) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, toString) { zend_bool include_parent = 0; @@ -1737,9 +1548,7 @@ PHP_METHOD(HttpMessage, toString) char *string; size_t length; - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (include_parent) { php_http_message_serialize(obj->message, &string, &length); @@ -1753,7 +1562,10 @@ PHP_METHOD(HttpMessage, toString) RETURN_EMPTY_STRING(); } -PHP_METHOD(HttpMessage, toStream) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_toStream, 0, 0, 1) + ZEND_ARG_INFO(0, stream) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, toStream) { zval *zstream; @@ -1761,23 +1573,25 @@ PHP_METHOD(HttpMessage, toStream) php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); php_stream *s; - php_stream_from_zval(s, &zstream); - - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + php_stream_from_zval(s, &zstream); php_http_message_to_callback(obj->message, (php_http_pass_callback_t) _php_stream_write, s); } } -PHP_METHOD(HttpMessage, toCallback) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_toCallback, 0, 0, 1) + ZEND_ARG_INFO(0, callback) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, toCallback) { php_http_pass_fcall_arg_t fcd; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "f", &fcd.fci, &fcd.fcc)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + fcd.fcz = getThis(); Z_ADDREF_P(fcd.fcz); TSRMLS_SET_CTX(fcd.ts); @@ -1786,21 +1600,20 @@ PHP_METHOD(HttpMessage, toCallback) zend_fcall_info_args_clear(&fcd.fci, 1); zval_ptr_dtor(&fcd.fcz); - RETURN_TRUE; + RETURN_ZVAL(getThis(), 1, 0); } - RETURN_FALSE; } -PHP_METHOD(HttpMessage, serialize) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_serialize, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, serialize) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); char *string; size_t length; - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_message_serialize(obj->message, &string, &length); RETURN_STRINGL(string, length, 0); @@ -1808,7 +1621,10 @@ PHP_METHOD(HttpMessage, serialize) RETURN_EMPTY_STRING(); } -PHP_METHOD(HttpMessage, unserialize) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_unserialize, 0, 0, 1) + ZEND_ARG_INFO(0, serialized) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, unserialize) { int length; char *serialized; @@ -1830,22 +1646,26 @@ PHP_METHOD(HttpMessage, unserialize) } } -PHP_METHOD(HttpMessage, detach) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_detach, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, detach) { - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); RETVAL_OBJVAL(php_http_message_object_new_ex(obj->zo.ce, php_http_message_copy_ex(obj->message, NULL, 0), NULL TSRMLS_CC), 0); } } end_error_handling(); } -PHP_METHOD(HttpMessage, prepend) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_prepend, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, message, http\\Message, 0) + ZEND_ARG_INFO(0, top) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, prepend) { zval *prepend; zend_bool top = 1; @@ -1855,12 +1675,8 @@ PHP_METHOD(HttpMessage, prepend) php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); php_http_message_object_t *prepend_obj = zend_object_store_get_object(prepend TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } - if (!prepend_obj->message) { - prepend_obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + PHP_HTTP_MESSAGE_OBJECT_INIT(prepend_obj); /* safety check */ for (msg[0] = obj->message; msg[0]; msg[0] = msg[0]->parent) { @@ -1876,14 +1692,19 @@ PHP_METHOD(HttpMessage, prepend) } } -PHP_METHOD(HttpMessage, reverse) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_reverse, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, reverse) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_reverse(getThis(), return_value TSRMLS_CC); } } -PHP_METHOD(HttpMessage, isMultipart) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_isMultipart, 0, 0, 0) + ZEND_ARG_INFO(1, boundary) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, isMultipart) { zval *zboundary = NULL; @@ -1891,6 +1712,8 @@ PHP_METHOD(HttpMessage, isMultipart) php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); char *boundary = NULL; + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + RETVAL_BOOL(php_http_message_is_multipart(obj->message, zboundary ? &boundary : NULL)); if (zboundary && boundary) { @@ -1900,12 +1723,16 @@ PHP_METHOD(HttpMessage, isMultipart) } } -PHP_METHOD(HttpMessage, splitMultipartBody) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_splitMultipartBody, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, splitMultipartBody) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); char *boundary = NULL; + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + if (php_http_message_is_multipart(obj->message, &boundary)) { php_http_message_t *msg; @@ -1917,15 +1744,15 @@ PHP_METHOD(HttpMessage, splitMultipartBody) } } -PHP_METHOD(HttpMessage, count) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_count, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, count) { if (SUCCESS == zend_parse_parameters_none()) { long i = 0; php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_message_count(i, obj->message); RETURN_LONG(i); @@ -1933,7 +1760,9 @@ PHP_METHOD(HttpMessage, count) RETURN_FALSE; } -PHP_METHOD(HttpMessage, rewind) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_rewind, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, rewind) { if (SUCCESS == zend_parse_parameters_none()) { zval *zobj = getThis(); @@ -1947,7 +1776,9 @@ PHP_METHOD(HttpMessage, rewind) } } -PHP_METHOD(HttpMessage, valid) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_valid, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, valid) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); @@ -1956,7 +1787,9 @@ PHP_METHOD(HttpMessage, valid) } } -PHP_METHOD(HttpMessage, next) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_next, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, next) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); @@ -1964,10 +1797,10 @@ PHP_METHOD(HttpMessage, next) if (obj->iterator) { php_http_message_object_t *itr = zend_object_store_get_object(obj->iterator TSRMLS_CC); - if (itr && itr->parent.handle) { + if (itr && itr->parent) { zval *old = obj->iterator; MAKE_STD_ZVAL(obj->iterator); - ZVAL_OBJVAL(obj->iterator, itr->parent, 1); + ZVAL_OBJVAL(obj->iterator, itr->parent->zv, 1); zval_ptr_dtor(&old); } else { zval_ptr_dtor(&obj->iterator); @@ -1977,7 +1810,9 @@ PHP_METHOD(HttpMessage, next) } } -PHP_METHOD(HttpMessage, key) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_key, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, key) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); @@ -1986,7 +1821,9 @@ PHP_METHOD(HttpMessage, key) } } -PHP_METHOD(HttpMessage, current) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_current, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpMessage, current) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); @@ -1997,6 +1834,114 @@ PHP_METHOD(HttpMessage, current) } } +static zend_function_entry php_http_message_methods[] = { + PHP_ME(HttpMessage, __construct, ai_HttpMessage___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(HttpMessage, getBody, ai_HttpMessage_getBody, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, setBody, ai_HttpMessage_setBody, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, addBody, ai_HttpMessage_addBody, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, getHeader, ai_HttpMessage_getHeader, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, setHeader, ai_HttpMessage_setHeader, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, addHeader, ai_HttpMessage_addHeader, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, getHeaders, ai_HttpMessage_getHeaders, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, setHeaders, ai_HttpMessage_setHeaders, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, addHeaders, ai_HttpMessage_addHeaders, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, getType, ai_HttpMessage_getType, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, setType, ai_HttpMessage_setType, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, getInfo, ai_HttpMessage_getInfo, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, setInfo, ai_HttpMessage_setInfo, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, getResponseCode, ai_HttpMessage_getResponseCode, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, setResponseCode, ai_HttpMessage_setResponseCode, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, getResponseStatus, ai_HttpMessage_getResponseStatus, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, setResponseStatus, ai_HttpMessage_setResponseStatus, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, getRequestMethod, ai_HttpMessage_getRequestMethod, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, setRequestMethod, ai_HttpMessage_setRequestMethod, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, getRequestUrl, ai_HttpMessage_getRequestUrl, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, setRequestUrl, ai_HttpMessage_setRequestUrl, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, getHttpVersion, ai_HttpMessage_getHttpVersion, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, setHttpVersion, ai_HttpMessage_setHttpVersion, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, getParentMessage, ai_HttpMessage_getParentMessage, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, toString, ai_HttpMessage_toString, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, toCallback, ai_HttpMessage_toCallback, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, toStream, ai_HttpMessage_toStream, ZEND_ACC_PUBLIC) + + /* implements Countable */ + PHP_ME(HttpMessage, count, ai_HttpMessage_count, ZEND_ACC_PUBLIC) + + /* implements Serializable */ + PHP_ME(HttpMessage, serialize, ai_HttpMessage_serialize, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, unserialize, ai_HttpMessage_unserialize, ZEND_ACC_PUBLIC) + + /* implements Iterator */ + PHP_ME(HttpMessage, rewind, ai_HttpMessage_rewind, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, valid, ai_HttpMessage_valid, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, current, ai_HttpMessage_current, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, key, ai_HttpMessage_key, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, next, ai_HttpMessage_next, ZEND_ACC_PUBLIC) + + ZEND_MALIAS(HttpMessage, __toString, toString, ai_HttpMessage___toString, ZEND_ACC_PUBLIC) + + PHP_ME(HttpMessage, detach, ai_HttpMessage_detach, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, prepend, ai_HttpMessage_prepend, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, reverse, ai_HttpMessage_reverse, ZEND_ACC_PUBLIC) + + PHP_ME(HttpMessage, isMultipart, ai_HttpMessage_isMultipart, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessage, splitMultipartBody, ai_HttpMessage_splitMultipartBody, ZEND_ACC_PUBLIC) + + EMPTY_FUNCTION_ENTRY +}; + +zend_class_entry *php_http_message_class_entry; + +PHP_MINIT_FUNCTION(http_message) +{ + zend_class_entry ce = {0}; + + INIT_NS_CLASS_ENTRY(ce, "http", "Message", php_http_message_methods); + php_http_message_class_entry = zend_register_internal_class_ex(&ce, php_http_object_class_entry, NULL TSRMLS_CC); + php_http_message_class_entry->create_object = php_http_message_object_new; + memcpy(&php_http_message_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + php_http_message_object_handlers.clone_obj = php_http_message_object_clone; + php_http_message_object_handlers.read_property = php_http_message_object_read_prop; + php_http_message_object_handlers.write_property = php_http_message_object_write_prop; + php_http_message_object_handlers.get_properties = php_http_message_object_get_props; + php_http_message_object_handlers.get_property_ptr_ptr = NULL; + + zend_class_implements(php_http_message_class_entry TSRMLS_CC, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator); + + zend_hash_init(&php_http_message_object_prophandlers, 9, NULL, NULL, 1); + zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("type"), PHP_HTTP_NONE, ZEND_ACC_PROTECTED TSRMLS_CC); + php_http_message_object_add_prophandler(ZEND_STRL("type"), php_http_message_object_prophandler_get_type, php_http_message_object_prophandler_set_type); + zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("body"), ZEND_ACC_PROTECTED TSRMLS_CC); + php_http_message_object_add_prophandler(ZEND_STRL("body"), php_http_message_object_prophandler_get_body, php_http_message_object_prophandler_set_body); + zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("requestMethod"), "", ZEND_ACC_PROTECTED TSRMLS_CC); + php_http_message_object_add_prophandler(ZEND_STRL("requestMethod"), php_http_message_object_prophandler_get_request_method, php_http_message_object_prophandler_set_request_method); + zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("requestUrl"), "", ZEND_ACC_PROTECTED TSRMLS_CC); + php_http_message_object_add_prophandler(ZEND_STRL("requestUrl"), php_http_message_object_prophandler_get_request_url, php_http_message_object_prophandler_set_request_url); + zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("responseStatus"), "", ZEND_ACC_PROTECTED TSRMLS_CC); + php_http_message_object_add_prophandler(ZEND_STRL("responseStatus"), php_http_message_object_prophandler_get_response_status, php_http_message_object_prophandler_set_response_status); + zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("responseCode"), 0, ZEND_ACC_PROTECTED TSRMLS_CC); + php_http_message_object_add_prophandler(ZEND_STRL("responseCode"), php_http_message_object_prophandler_get_response_code, php_http_message_object_prophandler_set_response_code); + zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("httpVersion"), ZEND_ACC_PROTECTED TSRMLS_CC); + php_http_message_object_add_prophandler(ZEND_STRL("httpVersion"), php_http_message_object_prophandler_get_http_version, php_http_message_object_prophandler_set_http_version); + zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("headers"), ZEND_ACC_PROTECTED TSRMLS_CC); + php_http_message_object_add_prophandler(ZEND_STRL("headers"), php_http_message_object_prophandler_get_headers, php_http_message_object_prophandler_set_headers); + zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("parentMessage"), ZEND_ACC_PROTECTED TSRMLS_CC); + php_http_message_object_add_prophandler(ZEND_STRL("parentMessage"), php_http_message_object_prophandler_get_parent_message, php_http_message_object_prophandler_set_parent_message); + + zend_declare_class_constant_long(php_http_message_class_entry, ZEND_STRL("TYPE_NONE"), PHP_HTTP_NONE TSRMLS_CC); + zend_declare_class_constant_long(php_http_message_class_entry, ZEND_STRL("TYPE_REQUEST"), PHP_HTTP_REQUEST TSRMLS_CC); + zend_declare_class_constant_long(php_http_message_class_entry, ZEND_STRL("TYPE_RESPONSE"), PHP_HTTP_RESPONSE TSRMLS_CC); + + return SUCCESS; +} + +PHP_MSHUTDOWN_FUNCTION(http_message) +{ + zend_hash_destroy(&php_http_message_object_prophandlers); + + return SUCCESS; +} + /* * Local variables: * tab-width: 4