{
message->http.version = .0;
- switch (message->type = type)
- {
+ switch (message->type = type) {
case HTTP_MSG_RESPONSE:
message->http.info.response.code = 0;
message->http.info.response.status = NULL;
- break;
+ break;
case HTTP_MSG_REQUEST:
message->http.info.request.method = NULL;
message->http.info.request.url = NULL;
- break;
+ break;
case HTTP_MSG_NONE:
default:
- break;
+ break;
}
}
if (type != message->type) {
/* free request info */
- switch (message->type)
- {
+ switch (message->type) {
case HTTP_MSG_REQUEST:
STR_FREE(message->http.info.request.method);
STR_FREE(message->http.info.request.url);
- break;
+ break;
case HTTP_MSG_RESPONSE:
STR_FREE(message->http.info.response.status);
- break;
+ break;
default:
- break;
+ break;
}
/* init */
{
message->http.version = info->http.version;
- switch (message->type = info->type)
- {
+ switch (message->type = info->type) {
case IS_HTTP_REQUEST:
HTTP_INFO(message).request.url = estrdup(HTTP_INFO(info).request.url);
STR_SET(HTTP_INFO(message).request.method, estrdup(HTTP_INFO(info).request.method));
- break;
+ break;
case IS_HTTP_RESPONSE:
HTTP_INFO(message).response.code = HTTP_INFO(info).response.code;
STR_SET(HTTP_INFO(message).response.status, estrdup(HTTP_INFO(info).response.status));
- break;
+ break;
default:
- break;
+ break;
}
}
msg = http_message_init_rel(msg, 0);
- if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, (void **) &msg)) {
+ if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, (void *) &msg)) {
if (free_msg) {
http_message_free(&msg);
}
ZVAL_ADDREF(c);
zend_hash_add(&msg->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), (void *) &c, sizeof(zval *), NULL);
zend_hash_del(&msg->hdrs, "Content-Encoding", sizeof("Content-Encoding"));
- if (SUCCESS == zend_hash_find(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void **) &original_len)) {
+ if (SUCCESS == zend_hash_find(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &original_len)) {
ZVAL_ADDREF(*original_len);
zend_hash_add(&msg->hdrs, "X-Original-Content-Length", sizeof("X-Original-Content-Length"), (void *) original_len, sizeof(zval *), NULL);
zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
/* check for following messages */
if (continue_at && (continue_at < (message + message_length))) {
- while (isspace(*continue_at)) ++continue_at;
+ while (HTTP_IS_CTYPE(space, *continue_at)) ++continue_at;
if (continue_at < (message + message_length)) {
http_message *next = NULL, *most = NULL;
phpstr_init_ex(&str, 4096, 0);
- switch (msg->type)
- {
+ switch (msg->type) {
case HTTP_MSG_REQUEST:
phpstr_appendf(&str, "%s %s HTTP/%1.1f" HTTP_CRLF,
msg->http.info.request.method,
msg->http.info.request.url,
msg->http.version);
- break;
+ break;
case HTTP_MSG_RESPONSE:
phpstr_appendf(&str, "HTTP/%1.1f %d%s%s" HTTP_CRLF,
msg->http.info.response.code,
*msg->http.info.response.status ? " ":"",
msg->http.info.response.status);
- break;
+ break;
case HTTP_MSG_NONE:
default:
- break;
+ break;
}
FOREACH_HASH_KEYVAL(pos1, &msg->hdrs, key, idx, header) {
if (key) {
zval **single_header;
- switch (Z_TYPE_PP(header))
- {
+ switch (Z_TYPE_PP(header)) {
case IS_STRING:
phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key, Z_STRVAL_PP(header));
- break;
+ break;
case IS_ARRAY:
{
FOREACH_VAL(pos2, *header, single_header) {
phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key, Z_STRVAL_PP(single_header));
}
+ break;
}
- break;
}
key = NULL;
phpstr_dtor(&str);
}
+PHP_HTTP_API http_message *_http_message_reverse(http_message *msg)
+{
+ int i, c;
+
+ http_message_count(c, msg);
+
+ if (c > 1) {
+ http_message *tmp = msg, **arr = ecalloc(c, sizeof(http_message *));
+
+ for (i = 0; i < c; ++i) {
+ arr[i] = tmp;
+ tmp = tmp->parent;
+ }
+ arr[0]->parent = NULL;
+ for (i = 0; i < c-1; ++i) {
+ arr[i+1]->parent = arr[i];
+ }
+
+ msg = arr[c-1];
+ efree(arr);
+ }
+
+ return msg;
+}
+
+PHP_HTTP_API http_message *_http_message_interconnect(http_message *m1, http_message *m2)
+{
+ if (m1 && m2) {
+ int i = 0, c1, c2;
+ http_message *t1 = m1, *t2 = m2, *p1, *p2;
+
+ http_message_count(c1, m1);
+ http_message_count(c2, m2);
+
+ while (i++ < (c1 - c2)) {
+ t1 = t1->parent;
+ }
+ while (i++ <= c1) {
+ p1 = t1->parent;
+ p2 = t2->parent;
+ t1->parent = t2;
+ t2->parent = p1;
+ t1 = p1;
+ t2 = p2;
+ }
+ } else if (!m1 && m2) {
+ m1 = m2;
+ }
+ return m1;
+}
+
PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *obj TSRMLS_DC)
{
zval strct;
{
STATUS rs = FAILURE;
- switch (message->type)
- {
+ switch (message->type) {
case HTTP_MSG_RESPONSE:
{
char *key;
rs = SUCCESS == http_send_status(message->http.info.response.code) &&
SUCCESS == http_send_data(PHPSTR_VAL(message), PHPSTR_LEN(message)) ?
SUCCESS : FAILURE;
+ break;
}
- break;
case HTTP_MSG_REQUEST:
{
add_assoc_zval(&options, "headers", &headers);
/* check host header */
- if (SUCCESS == zend_hash_find(&message->hdrs, "Host", sizeof("Host"), (void **) &zhost)) {
+ if (SUCCESS == zend_hash_find(&message->hdrs, "Host", sizeof("Host"), (void *) &zhost)) {
char *colon = NULL;
php_url parts, *url = php_url_parse(message->http.info.request.url);
parts.host = estrndup(Z_STRVAL_PP(zhost), Z_STRLEN_PP(zhost));
}
- http_build_url(url, &parts, NULL, &uri, NULL);
+ http_build_url(HTTP_URL_REPLACE, url, &parts, NULL, &uri, NULL);
php_url_free(url);
efree(parts.host);
} else {
#else
http_error(HE_WARNING, HTTP_E_RUNTIME, "HTTP requests not supported - ext/http was not linked against libcurl.");
#endif
- }
break;
+ }
case HTTP_MSG_NONE:
default:
http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is neither of type HTTP_MSG_REQUEST nor HTTP_MSG_RESPONSE");
- break;
+ break;
}
return rs;
}
-PHP_HTTP_API http_message *_http_message_dup(http_message *msg TSRMLS_DC)
+PHP_HTTP_API http_message *_http_message_dup(http_message *orig TSRMLS_DC)
{
- /*
- * TODO: unroll
- */
- http_message *new;
- char *serialized_data;
- size_t serialized_length;
-
- http_message_serialize(msg, &serialized_data, &serialized_length);
- new = http_message_parse(serialized_data, serialized_length);
- efree(serialized_data);
- return new;
+ http_message *temp, *copy = NULL;
+ http_info info;
+
+ if (orig) {
+ info.type = orig->type;
+ info.http = orig->http;
+
+ copy = temp = http_message_new();
+ http_message_set_info(temp, &info);
+ zend_hash_copy(&temp->hdrs, &orig->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+ phpstr_append(&temp->body, orig->body.data, orig->body.used);
+
+ while (orig->parent) {
+ info.type = orig->parent->type;
+ info.http = orig->parent->http;
+
+ temp->parent = http_message_new();
+ http_message_set_info(temp->parent, &info);
+ zend_hash_copy(&temp->parent->hdrs, &orig->parent->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+ phpstr_append(&temp->parent->body, orig->parent->body.data, orig->parent->body.used);
+
+ temp = temp->parent;
+ orig = orig->parent;
+ }
+ }
+
+ return copy;
}
PHP_HTTP_API void _http_message_dtor(http_message *message)
zend_hash_destroy(&message->hdrs);
phpstr_dtor(PHPSTR(message));
- switch (message->type)
- {
+ switch (message->type) {
case HTTP_MSG_REQUEST:
STR_SET(message->http.info.request.method, NULL);
STR_SET(message->http.info.request.url, NULL);
- break;
+ break;
case HTTP_MSG_RESPONSE:
STR_SET(message->http.info.response.status, NULL);
- break;
+ break;
default:
- break;
+ break;
}
}
}
projects / m6w6 / ext-http / blobdiff