X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_api.c;h=2a7a1ebbe6bc7ce7ab83672c52ac1bce2d98554e;hp=ac056ad7e4cc437c8f0b1fc674c2ceb736cb902c;hb=eabc03de1d511ce49640322859c6175f27a413e5;hpb=419ba9235752d56f15b393fc7969316978c6c721 diff --git a/http_message_api.c b/http_message_api.c index ac056ad..2a7a1eb 100644 --- a/http_message_api.c +++ b/http_message_api.c @@ -84,10 +84,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 +125,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; @@ -164,6 +166,8 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char 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); @@ -227,16 +231,17 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char 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) +# if !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 */ +# endif /* !HTTP_HAVE_ZLIB */ -# define DECODE_WITH_EXT_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); \ @@ -244,28 +249,14 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char } \ } -# define REMEMBER_ENCODING() \ - if (decoded) { \ - ZVAL_ADDREF(c); \ - zend_hash_add(&msg->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), (void *) &c, 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); +# ifndef HTTP_HAVE_ZLIB + DECODE_WITH_EXT_ZLIB("gzinflate", PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18); # else - ZVAL_STRINGL(&arg, PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18, 0); - DECODE_WITH_EXT_ZLIB(); -# endif /* HTTP_HAVE_ZLIB */ - REMEMBER_ENCODING(); - } else if (!strcasecmp(Z_STRVAL_P(c), "deflate")) { -# ifdef HTTP_HAVE_ZLIB + 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); -# else - ZVAL_STRINGL(&arg, PHPSTR_VAL(msg), PHPSTR_LEN(msg), 0); - DECODE_WITH_EXT_ZLIB(); # endif /* HTTP_HAVE_ZLIB */ - REMEMBER_ENCODING(); } if (decoded) { @@ -277,8 +268,10 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char 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 (zend_hash_find(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void **) &original_len) == SUCCESS) { + 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); @@ -301,7 +294,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char 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; @@ -494,6 +487,7 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC) { #ifdef HTTP_HAVE_CURL char *uri = NULL; + http_request request; zval **zhost, options, headers; INIT_PZVAL(&options); @@ -524,21 +518,20 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC) uri = http_absolute_uri(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.");