X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_message.c;h=3f08ee46f681bb2860bb8c5ed8294bf005c2f415;hp=45f584f6094e5fff1c1561cf119660f15dcabe05;hb=075f83355aefd5ee83c71ed297cb5be2acc6aadb;hpb=cc8acf603d067ea4ad52e676e43f03701728eb9d diff --git a/src/php_http_message.c b/src/php_http_message.c index 45f584f..3f08ee4 100644 --- a/src/php_http_message.c +++ b/src/php_http_message.c @@ -68,8 +68,9 @@ php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_h message->http.info.request.method = estrdup(Z_STRVAL_P(sval)); } if ((sval = php_http_env_get_server_var(ZEND_STRL("REQUEST_URI"), 1))) { - message->http.info.request.url = php_http_url_parse(Z_STRVAL_P(sval), Z_STRLEN_P(sval), ~0); + message->http.info.request.url = php_http_url_parse(Z_STRVAL_P(sval), Z_STRLEN_P(sval), PHP_HTTP_URL_STDFLAGS); } + php_http_env_get_request_headers(&message->hdrs); break; @@ -81,11 +82,12 @@ php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_h } message->http.info.response.status = estrdup(php_http_env_get_response_status_for_code(message->http.info.response.code)); } - + php_http_env_get_response_headers(&message->hdrs); if (php_output_get_level()) { if (php_output_get_status() & PHP_OUTPUT_SENT) { php_error_docref(NULL, E_WARNING, "Could not fetch response body, output has already been sent at %s:%d", php_output_get_start_filename(), php_output_get_start_lineno()); + goto error; } else if (SUCCESS != php_output_get_contents(&tval)) { php_error_docref(NULL, E_WARNING, "Could not fetch response body"); @@ -328,24 +330,14 @@ void php_http_message_update_headers(php_http_message_t *msg) static void message_headers(php_http_message_t *msg, php_http_buffer_t *str) { char *tmp = NULL; + size_t len = 0; - switch (msg->type) { - case PHP_HTTP_REQUEST: - php_http_buffer_appendf(str, PHP_HTTP_INFO_REQUEST_FMT_ARGS(&msg->http, tmp, PHP_HTTP_CRLF)); - PTR_FREE(tmp); - break; - - case PHP_HTTP_RESPONSE: - php_http_buffer_appendf(str, PHP_HTTP_INFO_RESPONSE_FMT_ARGS(&msg->http, tmp, PHP_HTTP_CRLF)); - PTR_FREE(tmp); - break; - - default: - break; - } - + php_http_info_to_string((php_http_info_t *) msg, &tmp, &len, PHP_HTTP_CRLF TSRMLS_CC); php_http_message_update_headers(msg); + + php_http_buffer_append(str, tmp, len); php_http_header_to_string(str, &msg->hdrs); + PTR_FREE(tmp); } void php_http_message_to_callback(php_http_message_t *msg, php_http_pass_callback_t cb, void *cb_arg) @@ -409,11 +401,11 @@ void php_http_message_serialize(php_http_message_t *message, char **string, size php_http_message_t *php_http_message_reverse(php_http_message_t *msg) { size_t i, c = php_http_message_count(msg); - + if (c > 1) { php_http_message_t *tmp = msg, **arr; - arr = ecalloc(c, sizeof(**arr)); + arr = ecalloc(c, sizeof(*arr)); for (i = 0; i < c; ++i) { arr[i] = tmp; tmp = tmp->parent; @@ -452,23 +444,22 @@ php_http_message_t *php_http_message_copy_ex(php_http_message_t *from, php_http_ { php_http_message_t *temp, *copy = NULL; php_http_info_t info; - + if (from) { info.type = from->type; info.http = from->http; - + copy = temp = php_http_message_init(to, 0, php_http_message_body_copy(from->body, NULL)); php_http_message_set_info(temp, &info); - zend_hash_copy(&temp->hdrs, &from->hdrs, (copy_ctor_func_t) zval_add_ref); - + array_copy(&from->hdrs, &temp->hdrs); + if (parents) while (from->parent) { info.type = from->parent->type; info.http = from->parent->http; - + temp->parent = php_http_message_init(NULL, 0, php_http_message_body_copy(from->parent->body, NULL)); php_http_message_set_info(temp->parent, &info); array_copy(&from->parent->hdrs, &temp->parent->hdrs); - temp = temp->parent; from = from->parent; @@ -578,7 +569,7 @@ static void php_http_message_object_prophandler_get_request_url(php_http_message } static void php_http_message_object_prophandler_set_request_url(php_http_message_object_t *obj, zval *value) { if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message)) { - PTR_SET(obj->message->http.info.request.url, php_http_url_from_zval(value, ~0)); + PTR_SET(obj->message->http.info.request.url, php_http_url_from_zval(value, PHP_HTTP_URL_STDFLAGS)); } } static void php_http_message_object_prophandler_get_response_status(php_http_message_object_t *obj, zval *return_value) { @@ -662,7 +653,7 @@ static void php_http_message_object_prophandler_set_parent_message(php_http_mess php_http_message_object_t *parent_obj = PHP_HTTP_OBJ(NULL, value); if (obj->message->parent) { - zend_objects_store_del(&obj->parent->zo); + zend_object_release(&obj->parent->zo); } Z_ADDREF_P(value); obj->parent = parent_obj; @@ -692,7 +683,7 @@ void php_http_message_object_reverse(zval *zmsg, zval *return_value) php_http_message_object_t **objects; int last; - objects = ecalloc(i, sizeof(**objects)); + objects = ecalloc(i, sizeof(*objects)); /* we are the first message */ objects[0] = obj; @@ -796,7 +787,7 @@ ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *msg body_obj->body = php_http_message_body_init(NULL, NULL); } if (msg_obj->body) { - zend_objects_store_del(&msg_obj->body->zo); + zend_object_release(&msg_obj->body->zo); } if (msg_obj->message) { php_http_message_body_free(&msg_obj->message->body); @@ -857,6 +848,8 @@ void php_http_message_object_free(zend_object *object) { php_http_message_object_t *o = PHP_HTTP_OBJ(object, NULL); + PTR_FREE(o->gc); + if (!Z_ISUNDEF(o->iterator)) { zval_ptr_dtor(&o->iterator); ZVAL_UNDEF(&o->iterator); @@ -868,17 +861,11 @@ void php_http_message_object_free(zend_object *object) o->message = NULL; } if (o->parent) { - if (GC_REFCOUNT(&o->parent->zo) == 1) { - zend_objects_store_del(&o->parent->zo); - } - zend_objects_store_del(&o->parent->zo); + zend_object_release(&o->parent->zo); o->parent = NULL; } if (o->body) { - if (GC_REFCOUNT(&o->body->zo) == 1) { - zend_objects_store_del(&o->body->zo); - } - zend_objects_store_del(&o->body->zo); + zend_object_release(&o->body->zo); o->body = NULL; } zend_object_std_dtor(object); @@ -899,7 +886,7 @@ static zval *php_http_message_object_read_prop(zval *object, zval *member, int t PHP_HTTP_MESSAGE_OBJECT_INIT(obj); handler->read(obj, tmp); - zval_ptr_dtor(return_value); + //zval_ptr_dtor(return_value); ZVAL_COPY_VALUE(return_value, tmp); } zend_string_release(member_name); @@ -944,7 +931,7 @@ static HashTable *php_http_message_object_get_debug_info(zval *object, int *is_t PHP_HTTP_MESSAGE_OBJECT_INIT(obj); *is_temp = 0; - + #define UPDATE_PROP(name_str, action_with_tmp) \ do { \ zend_property_info *pi; \ @@ -1013,6 +1000,32 @@ static HashTable *php_http_message_object_get_debug_info(zval *object, int *is_t return props; } +static HashTable *php_http_message_object_get_gc(zval *object, zval **table, int *n) +{ + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object); + HashTable *props = Z_OBJPROP_P(object); + uint32_t count = 2 + zend_hash_num_elements(props); + zval *val; + + *n = 0; + *table = obj->gc = erealloc(obj->gc, count * sizeof(zval)); + + if (obj->body) { + ZVAL_OBJ(&obj->gc[(*n)++], &obj->body->zo); + } + if (obj->parent) { + ZVAL_OBJ(&obj->gc[(*n)++], &obj->parent->zo); + } + + ZEND_HASH_FOREACH_VAL(props, val) + { + ZVAL_COPY_VALUE(&obj->gc[(*n)++], val); + } + ZEND_HASH_FOREACH_END(); + + return NULL; +} + ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage___construct, 0, 0, 0) ZEND_ARG_INFO(0, message) ZEND_ARG_INFO(0, greedy) @@ -1233,6 +1246,38 @@ static PHP_METHOD(HttpMessage, setHeaders) RETVAL_ZVAL(getThis(), 1, 0); } +static inline void php_http_message_object_add_header(php_http_message_object_t *obj, const char *name_str, size_t name_len, zval *zvalue) +{ + char *name = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1); + zend_string *hstr, *vstr; + zval *header, tmp; + + if (Z_TYPE_P(zvalue) == IS_NULL) { + return; + } + + vstr = php_http_header_value_to_string(zvalue); + + if ((name_len != lenof("Set-Cookie") && strcmp(name, "Set-Cookie")) + && (hstr = php_http_message_header_string(obj->message, name, name_len))) { + char *hdr_str; + size_t hdr_len = spprintf(&hdr_str, 0, "%s, %s", hstr->val, vstr->val); + + ZVAL_STR(&tmp, php_http_cs2zs(hdr_str, hdr_len)); + zend_symtable_str_update(&obj->message->hdrs, name, name_len, &tmp); + zend_string_release(hstr); + zend_string_release(vstr); + } else if ((header = php_http_message_header(obj->message, name, name_len))) { + convert_to_array(header); + ZVAL_STR(&tmp, vstr); + zend_hash_next_index_insert(Z_ARRVAL_P(header), &tmp); + } else { + ZVAL_STR(&tmp, vstr); + zend_symtable_str_update(&obj->message->hdrs, name, name_len, &tmp); + } + efree(name); +} + ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_addHeader, 0, 0, 2) ZEND_ARG_INFO(0, header) ZEND_ARG_INFO(0, value) @@ -1245,19 +1290,10 @@ static PHP_METHOD(HttpMessage, addHeader) if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "sz", &name_str, &name_len, &zvalue)) { php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); - char *name = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1); - zval *header; PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - Z_TRY_ADDREF_P(zvalue); - if ((header = php_http_message_header(obj->message, name, name_len))) { - convert_to_array(header); - zend_hash_next_index_insert(Z_ARRVAL_P(header), zvalue); - } else { - zend_symtable_str_update(&obj->message->hdrs, name, name_len, zvalue); - } - efree(name); + php_http_message_object_add_header(obj, name_str, name_len, zvalue); } RETVAL_ZVAL(getThis(), 1, 0); } @@ -1276,7 +1312,20 @@ static PHP_METHOD(HttpMessage, addHeaders) PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, append, ARRAY_JOIN_STRONLY|ARRAY_JOIN_PRETTIFY); + if (append) { + php_http_arrkey_t key = {0}; + zval *val; + + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(new_headers), key.h, key.key, val) + { + php_http_arrkey_stringify(&key, NULL); + php_http_message_object_add_header(obj, key.key->val, key.key->len, val); + php_http_arrkey_dtor(&key); + } + ZEND_HASH_FOREACH_END(); + } else { + array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, 0, ARRAY_JOIN_PRETTIFY|ARRAY_JOIN_STRONLY); + } } RETVAL_ZVAL(getThis(), 1, 0); } @@ -1316,25 +1365,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, getInfo) { if (SUCCESS == zend_parse_parameters_none()) { - char *str, *tmp = NULL; - size_t len; + char *str = NULL; + size_t len = 0; php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - - switch (obj->message->type) { - case PHP_HTTP_REQUEST: - len = spprintf(&str, 0, PHP_HTTP_INFO_REQUEST_FMT_ARGS(&obj->message->http, tmp, "")); - PTR_FREE(tmp); - break; - case PHP_HTTP_RESPONSE: - len = spprintf(&str, 0, PHP_HTTP_INFO_RESPONSE_FMT_ARGS(&obj->message->http, tmp, "")); - PTR_FREE(tmp); - break; - default: - RETURN_NULL(); - break; - } + php_http_info_to_string((php_http_info_t *) obj->message, &str, &len, ""); RETVAL_STR(php_http_cs2zs(str, len)); } @@ -1596,7 +1632,7 @@ static PHP_METHOD(HttpMessage, setRequestUrl) } zend_replace_error_handling(EH_THROW, php_http_get_exception_bad_url_class_entry(), &zeh); - url = php_http_url_from_zval(zurl, ~0); + url = php_http_url_from_zval(zurl, PHP_HTTP_URL_STDFLAGS); zend_restore_error_handling(&zeh); if (url && php_http_url_is_empty(url)) { @@ -1691,7 +1727,7 @@ static PHP_METHOD(HttpMessage, toCallback) zend_fcall_info_args_clear(&fcd.fci, 1); zval_ptr_dtor(&fcd.fcz); - RETURN_ZVAL(getThis(), 1, 0); + RETURN_ZVAL(&fcd.fcz, 1, 0); } } @@ -2009,6 +2045,7 @@ PHP_MINIT_FUNCTION(http_message) php_http_message_object_handlers.write_property = php_http_message_object_write_prop; php_http_message_object_handlers.get_debug_info = php_http_message_object_get_debug_info; php_http_message_object_handlers.get_property_ptr_ptr = NULL; + php_http_message_object_handlers.get_gc = php_http_message_object_get_gc; zend_class_implements(php_http_message_class_entry, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator);