#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
+#define HTTP_WANT_CURL
+#define HTTP_WANT_ZLIB
#include "php_http.h"
-#include "php_http_std_defs.h"
+
+#include "SAPI.h"
+
#include "php_http_api.h"
-#include "php_http_message_api.h"
+#include "php_http_encoding_api.h"
#include "php_http_headers_api.h"
-#include "php_http_send_api.h"
+#include "php_http_message_api.h"
#include "php_http_request_api.h"
+#include "php_http_send_api.h"
#include "php_http_url_api.h"
-#include "php_http_encoding_api.h"
-
-#include "phpstr/phpstr.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)
}
}
-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)) {
+ if ((body = http_locate_body(message))) {
zval *c;
const char *continue_at = NULL;
size_t remaining = message + message_length - body;
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)) {
+ 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, "%lu", (ulong) decoded_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);
} else
/* message has content-length header */
- if (c = http_message_header(msg, "Content-Length")) {
- unsigned long len = strtoul(Z_STRVAL_P(c), NULL, 10);
+ if ((c = http_message_header(msg, "Content-Length"))) {
+ 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;
} else
/* message has content-range header */
- if (c = http_message_header(msg, "Content-Range")) {
+ if ((c = http_message_header(msg, "Content-Range"))) {
ulong total = 0, start = 0, end = 0, len = 0;
- if (!strncasecmp(Z_STRVAL_P(c), "bytes=", lenof("bytes="))) {
+ if (!strncasecmp(Z_STRVAL_P(c), "bytes", 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) + lenof("bytes=");
+ char *start_at = Z_STRVAL_P(c) + sizeof("bytes");
start = strtoul(start_at, &end_at, 10);
if (end_at) {
}
if (end >= start && (!total || end < total)) {
phpstr_from_string_ex(PHPSTR(msg), body, len);
- continue_at = body + (end + 1 - start);
+ continue_at = body + len;
}
}
}
continue_at = body;
}
-#if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
+#ifdef HTTP_HAVE_ZLIB
/* check for compressed data */
- if (c = http_message_header(msg, "Content-Encoding")) {
+ if (http_message_header(msg, "Vary") && (c = http_message_header(msg, "Content-Encoding"))) {
char *decoded = NULL;
size_t decoded_len = 0;
-# if defined(HAVE_ZLIB) && !defined(HTTP_HAVE_ZLIB)
- zval func, retval, arg, *args[1];
- INIT_PZVAL(&func);
- INIT_PZVAL(&retval);
- INIT_PZVAL(&arg);
- ZVAL_STRINGL(&func, "gzinflate", lenof("gzinflate"), 0);
- args[0] = &arg;
-# endif /* HAVE_ZLIB && !HTTP_HAVE_ZLIB */
-
-# define DECODE_WITH_EXT_ZLIB() \
- 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
- ZVAL_STRINGL(&arg, PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18, 0);
- DECODE_WITH_EXT_ZLIB();
-# 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") ||
+ !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);
-# else
- ZVAL_STRINGL(&arg, PHPSTR_VAL(msg), PHPSTR_LEN(msg), 0);
- DECODE_WITH_EXT_ZLIB();
-# endif /* HTTP_HAVE_ZLIB */
}
- if (decoded && decoded_len) {
- zval *len;
+ if (decoded) {
+ zval *len, **original_len;
char *tmp;
int tmp_len;
- tmp_len = (int) spprintf(&tmp, 0, "%lu", (ulong) decoded_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-Content-Encoding", sizeof("X-Original-Content-Encoding"), (void *) &c, sizeof(zval *), NULL);
zend_hash_del(&msg->hdrs, "Content-Encoding", sizeof("Content-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 (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);
+ }
+
phpstr_dtor(PHPSTR(msg));
PHPSTR(msg)->data = decoded;
PHPSTR(msg)->used = decoded_len;
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;
char *key, *data;
ulong idx;
zval **header;
+ HashPosition pos1;
phpstr_init_ex(&str, 4096, 0);
break;
}
- FOREACH_HASH_KEYVAL(&msg->hdrs, key, idx, header) {
+ FOREACH_HASH_KEYVAL(pos1, &msg->hdrs, key, idx, header) {
if (key) {
zval **single_header;
break;
case IS_ARRAY:
- FOREACH_VAL(*header, single_header) {
+ {
+ HashPosition pos2;
+ FOREACH_VAL(pos2, *header, single_header) {
phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key, Z_STRVAL_PP(single_header));
}
+ }
break;
}
http_message_tostring(message, &buf, &len);
phpstr_prepend(&str, buf, len);
efree(buf);
- } while (message = message->parent);
+ } while ((message = message->parent));
buf = phpstr_data(&str, string, length);
if (!string) {
add_assoc_string(&strct, "requestMethod", msg->http.info.request.method, 1);
add_assoc_string(&strct, "requestUri", msg->http.info.request.URI, 1);
break;
+
+ case HTTP_MSG_NONE:
+ /* avoid compiler warning */
+ break;
}
MAKE_STD_ZVAL(headers);
char *key;
ulong idx;
zval **val;
+ HashPosition pos1;
- FOREACH_HASH_KEYVAL(&message->hdrs, key, idx, val) {
+ 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(*val, data) {
+ FOREACH_VAL(pos2, *val, data) {
http_send_header_ex(key, strlen(key), Z_STRVAL_PP(data), Z_STRLEN_PP(data), first, NULL);
first = 0;
}
{
#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));
+ if ((colon = strchr(Z_STRVAL_PP(zhost), ':'))) {
+ 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