X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_api.c;h=93c4bf1d5cbb1ba027511b45d3f2db12d769b59e;hp=5a2302b5205f890cebdbc212e0517b40c3737a73;hb=4fcbd8e8ae31611c5197ff2369673b5939fc2b80;hpb=7fef44c902c86eebce30f36003a27905fbaeba65 diff --git a/http_message_api.c b/http_message_api.c index 5a2302b..93c4bf1 100644 --- a/http_message_api.c +++ b/http_message_api.c @@ -6,21 +6,17 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2005, Michael Wallner | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - +#define HTTP_WANT_SAPI #define HTTP_WANT_CURL +#define HTTP_WANT_ZLIB #include "php_http.h" -#include "SAPI.h" - #include "php_http_api.h" #include "php_http_encoding_api.h" #include "php_http_headers_api.h" @@ -29,8 +25,6 @@ #include "php_http_send_api.h" #include "php_http_url_api.h" -ZEND_EXTERN_MODULE_GLOBALS(http); - #define http_message_info_callback _http_message_info_callback static void _http_message_info_callback(http_message **message, HashTable **headers, http_info *info TSRMLS_DC) { @@ -49,7 +43,7 @@ static void _http_message_info_callback(http_message **message, HashTable **head { case IS_HTTP_REQUEST: (*message)->type = HTTP_MSG_REQUEST; - HTTP_INFO(*message).request.URI = estrdup(HTTP_INFO(info).request.URI); + HTTP_INFO(*message).request.url = estrdup(HTTP_INFO(info).request.url); HTTP_INFO(*message).request.method = estrdup(HTTP_INFO(info).request.method); break; @@ -75,7 +69,7 @@ static inline void _http_message_init_type(http_message *message, http_message_t case HTTP_MSG_REQUEST: message->http.info.request.method = NULL; - message->http.info.request.URI = NULL; + message->http.info.request.url = NULL; break; case HTTP_MSG_NONE: @@ -84,10 +78,10 @@ static inline void _http_message_init_type(http_message *message, http_message_t } } -PHP_HTTP_API http_message *_http_message_init_ex(http_message *message, http_message_type type) +PHP_HTTP_API http_message *_http_message_init_ex(http_message *message, http_message_type type ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) { if (!message) { - message = ecalloc(1, sizeof(http_message)); + message = ecalloc_rel(1, sizeof(http_message)); } http_message_init_type(message, type); @@ -109,7 +103,7 @@ PHP_HTTP_API void _http_message_set_type(http_message *message, http_message_typ { case HTTP_MSG_REQUEST: STR_FREE(message->http.info.request.method); - STR_FREE(message->http.info.request.URI); + STR_FREE(message->http.info.request.url); break; case HTTP_MSG_RESPONSE: @@ -125,24 +119,26 @@ PHP_HTTP_API void _http_message_set_type(http_message *message, http_message_typ } } -PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t message_length TSRMLS_DC) +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 *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(msg); + 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; } - + /* header parsing stops at (CR)LF (CR)LF */ if ((body = http_locate_body(message))) { zval *c; @@ -224,47 +220,16 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char continue_at = body; } -#if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB) +#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 !defined(HTTP_HAVE_ZLIB) - zval func, retval, arg, *args[1]; - INIT_PZVAL(&func); - INIT_PZVAL(&retval); - INIT_PZVAL(&arg); - args[0] = &arg; -# endif /* !HTTP_HAVE_ZLIB */ - -# define DECODE_WITH_EXT_ZLIB(function, S, L) \ - ZVAL_STRINGL(&func, function, lenof(function), 0); \ - ZVAL_STRINGL(&arg, (S), (L), 0); \ - if (SUCCESS == call_user_function(EG(function_table), NULL, &func, &retval, 1, args TSRMLS_CC)) { \ - if (Z_TYPE(retval) == IS_STRING) { \ - decoded = Z_STRVAL(retval); \ - decoded_len = Z_STRLEN(retval); \ - } \ - } - if (!strcasecmp(Z_STRVAL_P(c), "gzip") || !strcasecmp(Z_STRVAL_P(c), "x-gzip")) { -# ifdef HTTP_HAVE_ZLIB - http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len); -# else - DECODE_WITH_EXT_ZLIB("gzinflate", PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18); -# endif /* HTTP_HAVE_ZLIB */ - } else if (!strcasecmp(Z_STRVAL_P(c), "deflate")) { -# ifdef HTTP_HAVE_ZLIB + 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); -# else - DECODE_WITH_EXT_ZLIB("gzinflate", PHPSTR_VAL(msg), PHPSTR_LEN(msg)); -# endif /* HTTP_HAVE_ZLIB */ - } else if (!strcasecmp(Z_STRVAL_P(c), "compress") || !strcasecmp(Z_STRVAL_P(c), "x-compress")) { -# ifdef HTTP_HAVE_ZLIB - http_encoding_uncompress(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len); -# else - DECODE_WITH_EXT_ZLIB("gzuncompress", PHPSTR_VAL(msg), PHPSTR_LEN(msg)); -# endif /* HTTP_HAVE_ZLIB */ } if (decoded) { @@ -293,16 +258,16 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char PHPSTR(msg)->free = 1; } } -#endif /* HTTP_HAVE_ZLIB || HAVE_ZLIB */ +#endif /* HTTP_HAVE_ZLIB */ /* check for following messages */ - if (continue_at) { + 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(continue_at, message + message_length - continue_at))) { + 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; @@ -329,7 +294,7 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_ case HTTP_MSG_REQUEST: phpstr_appendf(&str, "%s %s HTTP/%1.1f" HTTP_CRLF, msg->http.info.request.method, - msg->http.info.request.URI, + msg->http.info.request.url, msg->http.version); break; @@ -424,7 +389,7 @@ PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *obj case HTTP_MSG_REQUEST: add_assoc_string(&strct, "requestMethod", msg->http.info.request.method, 1); - add_assoc_string(&strct, "requestUri", msg->http.info.request.URI, 1); + add_assoc_string(&strct, "requestUrl", msg->http.info.request.url, 1); break; case HTTP_MSG_NONE: @@ -507,30 +472,31 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC) /* check host header */ if (SUCCESS == zend_hash_find(&message->hdrs, "Host", sizeof("Host"), (void **) &zhost)) { - char *colon = NULL, *host = NULL; - size_t host_len = 0; - int port = 0; + char *colon = NULL; + php_url parts, *url = php_url_parse(message->http.info.request.url); + + memset(&parts, 0, sizeof(php_url)); /* check for port */ if ((colon = strchr(Z_STRVAL_PP(zhost), ':'))) { - port = atoi(colon + 1); - host = estrndup(Z_STRVAL_PP(zhost), host_len = (Z_STRVAL_PP(zhost) - colon - 1)); + parts.port = atoi(colon + 1); + parts.host = estrndup(Z_STRVAL_PP(zhost), (Z_STRVAL_PP(zhost) - colon - 1)); } else { - host = estrndup(Z_STRVAL_PP(zhost), host_len = Z_STRLEN_PP(zhost)); + parts.host = estrndup(Z_STRVAL_PP(zhost), Z_STRLEN_PP(zhost)); } - uri = http_absolute_uri_ex( - message->http.info.request.URI, strlen(message->http.info.request.URI), - NULL, 0, host, host_len, port); - efree(host); + + http_build_url(url, &parts, NULL, &uri, NULL); + php_url_free(url); + efree(parts.host); } else { - uri = http_absolute_uri(message->http.info.request.URI); + uri = http_absolute_url(message->http.info.request.url); } - if (request.meth = http_request_method_exists(1, 0, message->http.info.request.method)) { - http_request_body body = {HTTP_REQUEST_BODY_CSTRING, PHPSTR_VAL(message), PHPSTR_LEN(message)}; + if ((request.meth = http_request_method_exists(1, 0, message->http.info.request.method))) { + http_request_body body; http_request_init_ex(&request, NULL, request.meth, uri); - request.body = &body; + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, PHPSTR_VAL(message), PHPSTR_LEN(message), 0); if (SUCCESS == (rs = http_request_prepare(&request, NULL))) { http_request_exec(&request); } @@ -581,7 +547,7 @@ PHP_HTTP_API void _http_message_dtor(http_message *message) { case HTTP_MSG_REQUEST: STR_SET(message->http.info.request.method, NULL); - STR_SET(message->http.info.request.URI, NULL); + STR_SET(message->http.info.request.url, NULL); break; case HTTP_MSG_RESPONSE: