X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message.c;h=3ac96550b5ac20bf8d819775c635d879b034ed66;hp=d063b21a40bf5f5ce6465e8b52e0480de83e41b7;hb=f05a032e5e994a8b1ea8b5ab0291f1d1d6d42355;hpb=6f61c56b9d16c4fd68e388e629cc5a9248fe8281 diff --git a/php_http_message.c b/php_http_message.c index d063b21..3ac9655 100644 --- a/php_http_message.c +++ b/php_http_message.c @@ -20,7 +20,7 @@ PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **messa /* advance message */ if (!old || old->type || zend_hash_num_elements(&old->hdrs)) { - (*message) = php_http_message_init(NULL, 0 TSRMLS_CC); + (*message) = php_http_message_init(NULL, 0, NULL TSRMLS_CC); (*message)->parent = old; if (headers) { (*headers) = &((*message)->hdrs); @@ -34,7 +34,7 @@ PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **messa return old != *message; } -PHP_HTTP_API php_http_message_t *php_http_message_init(php_http_message_t *message, php_http_message_type_t type TSRMLS_DC) +PHP_HTTP_API php_http_message_t *php_http_message_init(php_http_message_t *message, php_http_message_type_t type, php_http_message_body_t *body TSRMLS_DC) { if (!message) { message = emalloc(sizeof(*message)); @@ -46,7 +46,7 @@ PHP_HTTP_API php_http_message_t *php_http_message_init(php_http_message_t *messa message->http.version.major = 1; message->http.version.minor = 1; zend_hash_init(&message->hdrs, 0, NULL, ZVAL_PTR_DTOR, 0); - php_http_message_body_init(&message->body, NULL TSRMLS_CC); + message->body = body ? body : php_http_message_body_init(NULL, NULL TSRMLS_CC); return message; } @@ -57,10 +57,11 @@ PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m zval *sval, tval; php_http_message_body_t *mbody; - message = php_http_message_init(message, type TSRMLS_CC); - switch (type) { case PHP_HTTP_REQUEST: + mbody = php_http_env_get_request_body(TSRMLS_C); + php_http_message_body_addref(mbody); + message = php_http_message_init(message, type, mbody TSRMLS_CC); if ((sval = php_http_env_get_server_var(ZEND_STRL("SERVER_PROTOCOL"), 1 TSRMLS_CC)) && !strncmp(Z_STRVAL_P(sval), "HTTP/", lenof("HTTP/"))) { php_http_version_parse(&message->http.version, Z_STRVAL_P(sval) TSRMLS_CC); } @@ -72,14 +73,10 @@ PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m } php_http_env_get_request_headers(&message->hdrs TSRMLS_CC); - - if ((mbody = php_http_env_get_request_body(TSRMLS_C))) { - php_http_message_body_dtor(&message->body); - php_http_message_body_copy(mbody, &message->body, 0); - } break; case PHP_HTTP_RESPONSE: + message = php_http_message_init(NULL, type, NULL TSRMLS_CC); if (!SG(sapi_headers).http_status_line || !php_http_info_parse((php_http_info_t *) &message->http, SG(sapi_headers).http_status_line TSRMLS_CC)) { if (!(message->http.info.response.code = SG(sapi_headers).http_response_code)) { message->http.info.response.code = 200; @@ -97,7 +94,7 @@ PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "Could not fetch response body"); goto error; } else { - php_http_message_body_append(&message->body, Z_STRVAL(tval), Z_STRLEN(tval)); + php_http_message_body_append(message->body, Z_STRVAL(tval), Z_STRLEN(tval)); zval_dtor(&tval); } } @@ -107,7 +104,9 @@ PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m default: error: if (free_msg) { - php_http_message_free(&message); + if (message) { + php_http_message_free(&message); + } } else { message = NULL; } @@ -128,13 +127,13 @@ PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg, php_http_message_parser_init(&p TSRMLS_CC); if ((free_msg = !msg)) { - msg = php_http_message_init(NULL, 0 TSRMLS_CC); + msg = php_http_message_init(NULL, 0, NULL TSRMLS_CC); } 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); } @@ -277,25 +276,25 @@ PHP_HTTP_API void php_http_message_update_headers(php_http_message_t *msg) zval *h; size_t size; - if (php_http_message_body_stream(&msg->body)->readfilters.head) { + if (php_http_message_body_stream(msg->body)->readfilters.head) { /* if a read stream filter is attached to the body the caller must also care for the headers */ - } else if ((size = php_http_message_body_size(&msg->body))) { + } else if ((size = php_http_message_body_size(msg->body))) { MAKE_STD_ZVAL(h); ZVAL_LONG(h, size); zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), &h, sizeof(zval *), NULL); - if (msg->body.boundary) { + if (msg->body->boundary) { char *str; size_t len; if (!(h = php_http_message_header(msg, ZEND_STRL("Content-Type"), 1))) { - len = spprintf(&str, 0, "multipart/form-data; boundary=\"%s\"", msg->body.boundary); + len = spprintf(&str, 0, "multipart/form-data; boundary=\"%s\"", msg->body->boundary); MAKE_STD_ZVAL(h); ZVAL_STRINGL(h, str, len, 0); zend_hash_update(&msg->hdrs, "Content-Type", sizeof("Content-Type"), &h, sizeof(zval *), NULL); } else if (!php_http_match(Z_STRVAL_P(h), "boundary=", PHP_HTTP_MATCH_WORD)) { zval_dtor(h); - Z_STRLEN_P(h) = spprintf(&Z_STRVAL_P(h), 0, "%s; boundary=\"%s\"", Z_STRVAL_P(h), msg->body.boundary); + Z_STRLEN_P(h) = spprintf(&Z_STRVAL_P(h), 0, "%s; boundary=\"%s\"", Z_STRVAL_P(h), msg->body->boundary); zend_hash_update(&msg->hdrs, "Content-Type", sizeof("Content-Type"), &h, sizeof(zval *), NULL); } else { zval_ptr_dtor(&h); @@ -334,9 +333,9 @@ PHP_HTTP_API void php_http_message_to_callback(php_http_message_t *msg, php_http cb(cb_arg, str.data, str.used); php_http_buffer_dtor(&str); - if (php_http_message_body_size(&msg->body)) { + if (php_http_message_body_size(msg->body)) { cb(cb_arg, ZEND_STRL(PHP_HTTP_CRLF)); - php_http_message_body_to_callback(&msg->body, cb, cb_arg, 0, 0); + php_http_message_body_to_callback(msg->body, cb, cb_arg, 0, 0); } } @@ -347,9 +346,9 @@ PHP_HTTP_API void php_http_message_to_string(php_http_message_t *msg, char **str php_http_buffer_init_ex(&str, 0x1000, 0); message_headers(msg, &str); - if (php_http_message_body_size(&msg->body)) { + if (php_http_message_body_size(msg->body)) { php_http_buffer_appends(&str, PHP_HTTP_CRLF); - php_http_message_body_to_callback(&msg->body, (php_http_pass_callback_t) php_http_buffer_append, &str, 0, 0); + php_http_message_body_to_callback(msg->body, (php_http_pass_callback_t) php_http_buffer_append, &str, 0, 0); } data = php_http_buffer_data(&str, string, length); @@ -437,19 +436,17 @@ PHP_HTTP_API php_http_message_t *php_http_message_copy_ex(php_http_message_t *fr info.type = from->type; info.http = from->http; - copy = temp = php_http_message_init(to, 0 TSRMLS_CC); + copy = temp = php_http_message_init(to, 0, php_http_message_body_copy(from->body, NULL) TSRMLS_CC); php_http_message_set_info(temp, &info); zend_hash_copy(&temp->hdrs, &from->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - php_http_message_body_copy(&from->body, &temp->body, 1); if (parents) while (from->parent) { info.type = from->parent->type; info.http = from->parent->http; - temp->parent = php_http_message_init(NULL, 0 TSRMLS_CC); + temp->parent = php_http_message_init(NULL, 0, php_http_message_body_copy(from->parent->body, NULL) TSRMLS_CC); php_http_message_set_info(temp->parent, &info); zend_hash_copy(&temp->parent->hdrs, &from->parent->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - php_http_message_body_copy(&from->parent->body, &temp->parent->body, 1); temp = temp->parent; from = from->parent; @@ -468,7 +465,7 @@ PHP_HTTP_API void php_http_message_dtor(php_http_message_t *message) { if (message) { zend_hash_destroy(&message->hdrs); - php_http_message_body_dtor(&message->body); + php_http_message_body_free(&message->body); switch (message->type) { case PHP_HTTP_REQUEST: @@ -692,11 +689,9 @@ 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); } @@ -865,11 +860,21 @@ PHP_MSHUTDOWN_FUNCTION(http_message) return SUCCESS; } +#define PHP_HTTP_MESSAGE_OBJECT_INIT(obj) \ + do { \ + if (!obj->message) { \ + obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); \ + } \ + } while(0) + + 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); @@ -1001,16 +1006,15 @@ STATUS php_http_message_object_set_body(php_http_message_object_t *msg_obj, zval if (msg_obj->body.handle) { zend_objects_store_del_ref_by_handle(msg_obj->body.handle TSRMLS_CC); - php_http_message_body_dtor(&msg_obj->message->body); } + php_http_message_body_free(&msg_obj->message->body); - php_http_message_body_copy(body_obj->body, &msg_obj->message->body, 0); + msg_obj->message->body = php_http_message_body_init(&body_obj->body, NULL TSRMLS_CC); msg_obj->body = Z_OBJVAL_P(zbody); if (tmp) { - zval_ptr_dtor(&tmp); + FREE_ZVAL(tmp); } - return SUCCESS; } @@ -1033,14 +1037,11 @@ zend_object_value php_http_message_object_new_ex(zend_class_entry *ce, php_http_ } if (msg) { - php_http_message_body_object_t *body_obj; - o->message = msg; if (msg->parent) { o->parent = php_http_message_object_new_ex(ce, msg->parent, NULL TSRMLS_CC); } - o->body = php_http_message_body_object_new_ex(php_http_message_body_get_class_entry(), &msg->body, &body_obj TSRMLS_CC); - body_obj->shared = 1; + 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); } ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_message_object_free, NULL TSRMLS_CC); @@ -1088,10 +1089,9 @@ void php_http_message_object_free(void *object TSRMLS_DC) 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)) { + if (php_http_message_object_has_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy))) { zval_ptr_dtor(©); return &php_http_property_proxy_init(NULL, object, member, NULL TSRMLS_CC)->myself; } @@ -1106,6 +1106,8 @@ static zval *php_http_message_object_read_prop(zval *object, zval *member, int t 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); @@ -1132,6 +1134,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 { @@ -1141,7 +1145,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; @@ -1151,65 +1154,66 @@ 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_copy(&obj->message->body, NULL, 0), NULL TSRMLS_CC); + 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); } ZVAL_OBJVAL(body, obj->body, 1); - ASSOC_PROP(array, zval, "body", body); + ASSOC_PROP(zval, "body", body); MAKE_STD_ZVAL(parent); if (msg->parent) { @@ -1217,7 +1221,7 @@ static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC) } else { ZVAL_NULL(parent); } - ASSOC_PROP(array, zval, "parentMessage", parent); + ASSOC_PROP(zval, "parentMessage", parent); return props; } @@ -1264,9 +1268,7 @@ PHP_METHOD(HttpMessage, __construct) } } } - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); } end_error_handling(); } @@ -1277,13 +1279,11 @@ PHP_METHOD(HttpMessage, getBody) 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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + if (!obj->body.handle) { - php_http_message_body_object_t *body_obj; - obj->body = php_http_message_body_object_new_ex(php_http_message_body_get_class_entry(), &obj->message->body, &body_obj TSRMLS_CC); - body_obj->shared = 1; + 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); } if (obj->body.handle) { RETVAL_OBJVAL(obj->body, 1); @@ -1299,9 +1299,7 @@ PHP_METHOD(HttpMessage, setBody) if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zbody, php_http_message_body_get_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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_message_object_prophandler_set_body(obj, zbody TSRMLS_CC); } RETVAL_ZVAL(getThis(), 1, 0); @@ -1315,7 +1313,8 @@ PHP_METHOD(HttpMessage, addBody) 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_body_to_callback(new_obj->body, (php_http_pass_callback_t) php_http_message_body_append, &obj->message->body, 0, 0); + 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); } @@ -1330,9 +1329,7 @@ PHP_METHOD(HttpMessage, getHeader) 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 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); @@ -1346,9 +1343,7 @@ 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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); array_init(return_value); array_copy(&obj->message->hdrs, Z_ARRVAL_P(return_value)); @@ -1365,9 +1360,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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (!zvalue) { zend_symtable_del(&obj->message->hdrs, name, name_len + 1); @@ -1387,9 +1380,7 @@ PHP_METHOD(HttpMessage, setHeaders) 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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); zend_hash_clean(&obj->message->hdrs); if (new_headers) { @@ -1410,9 +1401,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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); Z_ADDREF_P(zvalue); if ((header = php_http_message_header(obj->message, name, name_len, 0))) { @@ -1435,9 +1424,7 @@ 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 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); } @@ -1449,9 +1436,7 @@ 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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); RETURN_LONG(obj->message->type); } @@ -1464,9 +1449,7 @@ PHP_METHOD(HttpMessage, setType) 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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_message_set_type(obj->message, type); } @@ -1478,9 +1461,7 @@ 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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); switch (obj->message->type) { case PHP_HTTP_REQUEST: @@ -1509,9 +1490,7 @@ PHP_METHOD(HttpMessage, setInfo) && php_http_info_parse(&inf, str TSRMLS_CC)) { 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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_message_set_info(obj->message, &inf); php_http_info_dtor(&inf); @@ -1526,9 +1505,7 @@ PHP_METHOD(HttpMessage, getHttpVersion) 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 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); @@ -1546,9 +1523,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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (php_http_version_parse(&version, v_str TSRMLS_CC)) { obj->message->http.version = version; @@ -1562,9 +1537,7 @@ 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 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); @@ -1580,9 +1553,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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); PHP_HTTP_MESSAGE_TYPE_CHECK(RESPONSE, obj->message, RETURN_FALSE); if (strict && (code < 100 || code > 599)) { @@ -1601,9 +1572,7 @@ 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 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) { @@ -1624,9 +1593,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 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)); @@ -1639,9 +1606,7 @@ 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 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) { @@ -1662,9 +1627,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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); PHP_HTTP_MESSAGE_TYPE_CHECK(REQUEST, obj->message, RETURN_FALSE); if (method_len < 1) { @@ -1682,9 +1645,7 @@ 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 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) { @@ -1705,9 +1666,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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); PHP_HTTP_MESSAGE_TYPE_CHECK(REQUEST, obj->message, RETURN_FALSE); if (url_len < 1) { @@ -1726,9 +1685,7 @@ PHP_METHOD(HttpMessage, getParentMessage) 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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (obj->message->parent) { RETVAL_OBJVAL(obj->parent, 1); @@ -1748,9 +1705,7 @@ PHP_METHOD(HttpMessage, toString) char *string; size_t length; - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (include_parent) { php_http_message_serialize(obj->message, &string, &length); @@ -1772,12 +1727,9 @@ 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 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); } } @@ -1789,6 +1741,8 @@ PHP_METHOD(HttpMessage, toCallback) 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); @@ -1809,9 +1763,7 @@ PHP_METHOD(HttpMessage, serialize) char *string; size_t length; - if (!obj->message) { - obj->message = php_http_message_init(NULL, 0 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_message_serialize(obj->message, &string, &length); RETURN_STRINGL(string, length, 0); @@ -1835,7 +1787,7 @@ PHP_METHOD(HttpMessage, unserialize) if ((msg = php_http_message_parse(NULL, serialized, (size_t) length, 1 TSRMLS_CC))) { obj->message = msg; } else { - obj->message = php_http_message_init(NULL, 0 TSRMLS_CC); + obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); php_http_error(HE_ERROR, PHP_HTTP_E_RUNTIME, "Could not unserialize HttpMessage"); } } @@ -1847,9 +1799,7 @@ PHP_METHOD(HttpMessage, detach) 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 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); } @@ -1866,11 +1816,10 @@ 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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + if (!prepend_obj->message) { - prepend_obj->message = php_http_message_init(NULL, 0 TSRMLS_CC); + prepend_obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); } /* safety check */ @@ -1902,6 +1851,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) { @@ -1917,10 +1868,12 @@ PHP_METHOD(HttpMessage, splitMultipartBody) 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; - if ((msg = php_http_message_body_split(&obj->message->body, boundary))) { + if ((msg = php_http_message_body_split(obj->message->body, boundary))) { RETVAL_OBJVAL(php_http_message_object_new_ex(php_http_message_class_entry, msg, NULL TSRMLS_CC), 0); } } @@ -1934,9 +1887,7 @@ PHP_METHOD(HttpMessage, count) 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 TSRMLS_CC); - } + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_message_count(i, obj->message); RETURN_LONG(i);