{
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;
}
}
-PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t message_length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
+#define http_message_body_parse(m, ms, ml, c) _http_message_body_parse((m), (ms), (ml), (c) TSRMLS_CC)
+static inline void _http_message_body_parse(http_message *msg, const char *message, size_t message_length, const char **continue_at TSRMLS_DC)
{
- const char *body = NULL;
- zend_bool free_msg = msg ? 0 : 1;
-
- if ((!message) || (message_length < HTTP_MSG_MIN_SIZE)) {
- http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Empty or too short HTTP message: '%s'", message);
- return NULL;
- }
-
- 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 (free_msg) {
- http_message_free(&msg);
- }
- http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse message headers");
- return NULL;
- }
+ zval *c;
+ size_t remaining;
+ const char *body;
- /* header parsing stops at (CR)LF (CR)LF */
+ *continue_at = NULL;
if ((body = http_locate_body(message))) {
- zval *c;
- const char *continue_at = NULL;
- size_t remaining = message + message_length - body;
-
- /* message has chunked transfer encoding */
- if ((c = http_message_header(msg, "Transfer-Encoding")) && (!strcasecmp("chunked", Z_STRVAL_P(c)))) {
- char *decoded;
- size_t decoded_len;
-
- /* decode and replace Transfer-Encoding with Content-Length header */
- if ((continue_at = http_encoding_dechunk(body, message + message_length - body, &decoded, &decoded_len))) {
- zval *len;
- char *tmp;
- int tmp_len;
-
- tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len);
- MAKE_STD_ZVAL(len);
- ZVAL_STRINGL(len, tmp, tmp_len, 0);
-
- ZVAL_ADDREF(c);
- zend_hash_add(&msg->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), (void *) &c, sizeof(zval *), NULL);
- zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding"));
- zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length"));
- zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
+ remaining = message + message_length - body;
+
+ if ((c = http_message_header(msg, "Transfer-Encoding"))) {
+ if (strstr(Z_STRVAL_P(c), "chunked")) {
+ /* message has chunked transfer encoding */
+ char *decoded;
+ size_t decoded_len;
- phpstr_from_string_ex(PHPSTR(msg), decoded, decoded_len);
- efree(decoded);
+ /* decode and replace Transfer-Encoding with Content-Length header */
+ if ((*continue_at = http_encoding_dechunk(body, message + message_length - body, &decoded, &decoded_len))) {
+ zval *len;
+ char *tmp;
+ int tmp_len;
+
+ tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len);
+ MAKE_STD_ZVAL(len);
+ ZVAL_STRINGL(len, tmp, tmp_len, 0);
+
+ ZVAL_ADDREF(c);
+ zend_hash_update(&msg->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), (void *) &c, sizeof(zval *), NULL);
+ zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding"));
+ zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length"));
+ zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
+
+ phpstr_from_string_ex(PHPSTR(msg), decoded, decoded_len);
+ efree(decoded);
+ }
}
- } else
-
- /* message has content-length header */
- if ((c = http_message_header(msg, "Content-Length"))) {
+ zval_ptr_dtor(&c);
+ }
+
+ if (!*continue_at && (c = http_message_header(msg, "Content-Length"))) {
+ /* message has content-length header */
ulong len = strtoul(Z_STRVAL_P(c), NULL, 10);
if (len > remaining) {
http_error_ex(HE_NOTICE, HTTP_E_MALFORMED_HEADERS, "The Content-Length header pretends a larger body than actually received (expected %lu bytes; got %lu bytes)", len, remaining);
len = remaining;
}
phpstr_from_string_ex(PHPSTR(msg), body, len);
- continue_at = body + len;
- } else
-
- /* message has content-range header */
- if ((c = http_message_header(msg, "Content-Range"))) {
+ *continue_at = body + len;
+ zval_ptr_dtor(&c);
+ }
+
+ if (!*continue_at && (c = http_message_header(msg, "Content-Range"))) {
+ /* message has content-range header */
ulong total = 0, start = 0, end = 0, len = 0;
if (!strncasecmp(Z_STRVAL_P(c), "bytes", lenof("bytes")) &&
- (Z_STRVAL_P(c)[lenof("bytes")] == ':' || Z_STRVAL_P(c)[lenof("bytes")] == ' ')) {
+ ( Z_STRVAL_P(c)[lenof("bytes")] == ':' ||
+ Z_STRVAL_P(c)[lenof("bytes")] == ' ' ||
+ Z_STRVAL_P(c)[lenof("bytes")] == '=')) {
char *total_at = NULL, *end_at = NULL;
char *start_at = Z_STRVAL_P(c) + sizeof("bytes");
}
if (end >= start && (!total || end < total)) {
phpstr_from_string_ex(PHPSTR(msg), body, len);
- continue_at = body + len;
+ *continue_at = body + len;
}
}
}
-
- if (!continue_at) {
+
+ if (!*continue_at) {
http_error_ex(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid Content-Range header: %s", Z_STRVAL_P(c));
}
- } else
-
- /* no headers that indicate content length */
- if (HTTP_MSG_TYPE(RESPONSE, msg)) {
- phpstr_from_string_ex(PHPSTR(msg), body, remaining);
- } else {
- continue_at = body;
+ zval_ptr_dtor(&c);
+ }
+
+ if (!*continue_at) {
+ /* no headers that indicate content length */
+ if (HTTP_MSG_TYPE(RESPONSE, msg)) {
+ phpstr_from_string_ex(PHPSTR(msg), body, remaining);
+ } else {
+ *continue_at = body;
+ }
}
#ifdef HTTP_HAVE_ZLIB
/* check for compressed data */
- if (http_message_header(msg, "Vary") && (c = http_message_header(msg, "Content-Encoding"))) {
- char *decoded = NULL;
- size_t decoded_len = 0;
-
- if ( !strcasecmp(Z_STRVAL_P(c), "gzip") ||
- !strcasecmp(Z_STRVAL_P(c), "x-gzip") ||
- !strcasecmp(Z_STRVAL_P(c), "deflate")) {
- http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
- }
+ if ((c = http_message_header(msg, "Vary"))) {
+ zval_ptr_dtor(&c);
- if (decoded) {
- zval *len, **original_len;
- char *tmp;
- int tmp_len;
+ if ((c = http_message_header(msg, "Content-Encoding"))) {
+ char *decoded = NULL;
+ size_t decoded_len = 0;
- tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len);
- MAKE_STD_ZVAL(len);
- ZVAL_STRINGL(len, tmp, tmp_len, 0);
-
- 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)) {
- 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);
- } else {
- zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
+ if ( !strcasecmp(Z_STRVAL_P(c), "gzip") ||
+ !strcasecmp(Z_STRVAL_P(c), "x-gzip") ||
+ !strcasecmp(Z_STRVAL_P(c), "deflate")) {
+ http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
}
-
- phpstr_dtor(PHPSTR(msg));
- PHPSTR(msg)->data = decoded;
- PHPSTR(msg)->used = decoded_len;
- PHPSTR(msg)->free = 1;
+
+ if (decoded) {
+ zval *len, **original_len;
+ char *tmp;
+ int tmp_len;
+
+ tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len);
+ MAKE_STD_ZVAL(len);
+ ZVAL_STRINGL(len, tmp, tmp_len, 0);
+
+ ZVAL_ADDREF(c);
+ zend_hash_update(&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)) {
+ ZVAL_ADDREF(*original_len);
+ zend_hash_update(&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);
+ } else {
+ zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
+ }
+
+ phpstr_dtor(PHPSTR(msg));
+ PHPSTR(msg)->data = decoded;
+ PHPSTR(msg)->used = decoded_len;
+ PHPSTR(msg)->free = 1;
+ }
+
+ zval_ptr_dtor(&c);
}
}
#endif /* HTTP_HAVE_ZLIB */
+ }
+}
- /* check for following messages */
- if (continue_at && (continue_at < (message + message_length))) {
- while (isspace(*continue_at)) ++continue_at;
- if (continue_at < (message + message_length)) {
- http_message *next = NULL, *most = NULL;
-
- /* set current message to parent of most parent following messages and return deepest */
- if ((most = next = http_message_parse_rel(NULL, continue_at, message + message_length - continue_at))) {
- while (most->parent) most = most->parent;
- most->parent = msg;
- msg = next;
- }
+PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t message_length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
+{
+ const char *continue_at;
+ zend_bool free_msg = msg ? 0 : 1;
+
+ if ((!message) || (message_length < HTTP_MSG_MIN_SIZE)) {
+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Empty or too short HTTP message: '%s'", message);
+ return NULL;
+ }
+
+ 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 (free_msg) {
+ http_message_free(&msg);
+ }
+ http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse message headers");
+ return NULL;
+ }
+
+ http_message_body_parse(msg, message, message_length, &continue_at);
+
+ /* check for following messages */
+ if (continue_at && (continue_at < (message + message_length))) {
+ while (HTTP_IS_CTYPE(space, *continue_at)) ++continue_at;
+ if (continue_at < (message + message_length)) {
+ http_message *next = NULL, *most = NULL;
+
+ /* set current message to parent of most parent following messages and return deepest */
+ if ((most = next = http_message_parse_rel(NULL, continue_at, message + message_length - continue_at))) {
+ while (most->parent) most = most->parent;
+ most->parent = msg;
+ msg = next;
}
}
}
PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_t *length)
{
phpstr str;
- char *key, *data;
- ulong idx;
+ HashKey key = initHashKey(0);
zval **header;
+ char *data;
HashPosition pos1;
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.info.request.method?msg->http.info.request.method:"UNKNOWN",
+ msg->http.info.request.url?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.version,
msg->http.info.response.code,
- *msg->http.info.response.status ? " ":"",
- msg->http.info.response.status);
- break;
+ msg->http.info.response.status&&*msg->http.info.response.status ? " ":"",
+ STR_PTR(msg->http.info.response.status));
+ break;
case HTTP_MSG_NONE:
default:
- break;
+ break;
}
- FOREACH_HASH_KEYVAL(pos1, &msg->hdrs, key, idx, header) {
- if (key) {
+ FOREACH_HASH_KEYVAL(pos1, &msg->hdrs, key, header) {
+ if (key.type == HASH_KEY_IS_STRING) {
+ HashPosition pos2;
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;
+ phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key.str, Z_STRVAL_PP(header));
+ break;
case IS_ARRAY:
- {
- HashPosition pos2;
FOREACH_VAL(pos2, *header, single_header) {
- phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key, Z_STRVAL_PP(single_header));
+ phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key.str, 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;
- ulong idx;
+ HashKey key = initHashKey(0);
zval **val;
- HashPosition pos1;
-
- FOREACH_HASH_KEYVAL(pos1, &message->hdrs, key, idx, val) {
- if (key) {
- if (Z_TYPE_PP(val) == IS_ARRAY) {
- zend_bool first = 1;
- zval **data;
- HashPosition pos2;
-
- FOREACH_VAL(pos2, *val, data) {
- http_send_header_ex(key, strlen(key), Z_STRVAL_PP(data), Z_STRLEN_PP(data), first, NULL);
- first = 0;
- }
- } else {
- http_send_header_ex(key, strlen(key), Z_STRVAL_PP(val), Z_STRLEN_PP(val), 1, NULL);
- }
- key = NULL;
+ HashPosition pos;
+
+ FOREACH_HASH_KEYVAL(pos, &message->hdrs, key, val) {
+ if (key.type == HASH_KEY_IS_STRING) {
+ http_send_header_zval_ex(key.str, key.len-1, val, 1);
}
}
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);
#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