X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_message_api.c;h=fee445b12042405e160a4c312df9869631029bfc;hb=2945591b02528824cc52b0affb44cdd64743d820;hp=5a2302b5205f890cebdbc212e0517b40c3737a73;hpb=7fef44c902c86eebce30f36003a27905fbaeba65;p=m6w6%2Fext-http diff --git a/http_message_api.c b/http_message_api.c index 5a2302b..fee445b 100644 --- a/http_message_api.c +++ b/http_message_api.c @@ -17,6 +17,7 @@ #endif #define HTTP_WANT_CURL +#define HTTP_WANT_ZLIB #include "php_http.h" #include "SAPI.h" @@ -84,10 +85,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); @@ -125,24 +126,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; @@ -248,22 +251,12 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char } 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 +# ifndef HTTP_HAVE_ZLIB 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 - 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)); + http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len); + } else if (!strcasecmp(Z_STRVAL_P(c), "deflate") || !strcasecmp(Z_STRVAL_P(c), "compress") || !strcasecmp(Z_STRVAL_P(c), "x-compress")) { + http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len); # endif /* HTTP_HAVE_ZLIB */ } @@ -296,13 +289,13 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char #endif /* HTTP_HAVE_ZLIB || 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; @@ -507,30 +500,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.URI); + + 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.URI); } - 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); }