#endif
#define HTTP_WANT_CURL
+#define HTTP_WANT_ZLIB
#include "php_http.h"
#include "SAPI.h"
}
}
-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);
}
}
-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;
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);
}
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 */
}
#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;
{
#ifdef HTTP_HAVE_CURL
char *uri = NULL;
+ http_request request;
zval **zhost, options, headers;
INIT_PZVAL(&options);
/* 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 (!strcasecmp("POST", message->http.info.request.method)) {
- http_request_body body = {HTTP_REQUEST_BODY_CSTRING, PHPSTR_VAL(message), PHPSTR_LEN(message)};
- rs = http_post(uri, &body, Z_ARRVAL(options), NULL, NULL);
- } else
- if (!strcasecmp("GET", message->http.info.request.method)) {
- rs = http_get(uri, Z_ARRVAL(options), NULL, NULL);
- } else
- if (!strcasecmp("HEAD", message->http.info.request.method)) {
- rs = http_head(uri, Z_ARRVAL(options), NULL, NULL);
+ 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 = 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);
+ }
+ http_request_dtor(&request);
} else {
http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD,
"Cannot send HttpMessage. Request method %s not supported",
message->http.info.request.method);
}
-
efree(uri);
#else
http_error(HE_WARNING, HTTP_E_RUNTIME, "HTTP requests not supported - ext/http was not linked against libcurl.");
projects / m6w6 / ext-http / blobdiff