X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_api.c;h=c28ff6f7945c8a152573cf0ea374f06c0c1e497e;hp=d0c8f486947c41d6236854d5b5a9b00470b99149;hb=dc7248a073febcade23e6a1a296ab1b2bb752298;hpb=91c98198094e89bd2a0d0648b60dd2c361d3054b diff --git a/http_message_api.c b/http_message_api.c index d0c8f48..c28ff6f 100644 --- a/http_message_api.c +++ b/http_message_api.c @@ -1,16 +1,13 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2005, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ @@ -147,9 +144,10 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char } /* 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; /* message has chunked transfer encoding */ if ((c = http_message_header(msg, "Transfer-Encoding")) && (!strcasecmp("chunked", Z_STRVAL_P(c)))) { @@ -157,12 +155,12 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char 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); @@ -176,19 +174,24 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char } else /* message has content-length header */ - if (c = http_message_header(msg, "Content-Length")) { - long len = atol(Z_STRVAL_P(c)); + 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; + } phpstr_from_string_ex(PHPSTR(msg), body, len); continue_at = body + len; } else /* message has content-range header */ - if (c = http_message_header(msg, "Content-Range")) { - ulong total = 0, start = 0, end = 0; + 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) { @@ -196,10 +199,13 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char if (total_at && strncmp(total_at + 1, "*", 1)) { total = strtoul(total_at + 1, NULL, 10); } - + if ((len = (end + 1 - start)) > remaining) { + http_error_ex(HE_NOTICE, HTTP_E_MALFORMED_HEADERS, "The Content-Range header pretends a larger body than actually received (expected %lu bytes; got %lu bytes)", len, remaining); + len = remaining; + } if (end >= start && (!total || end < total)) { - phpstr_from_string_ex(PHPSTR(msg), body, (size_t) (end + 1 - start)); - continue_at = body + (end + 1 - start); + phpstr_from_string_ex(PHPSTR(msg), body, len); + continue_at = body + len; } } } @@ -211,33 +217,55 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char /* no headers that indicate content length */ if (HTTP_MSG_TYPE(RESPONSE, msg)) { - phpstr_from_string_ex(PHPSTR(msg), body, message + message_length - body); + phpstr_from_string_ex(PHPSTR(msg), body, remaining); } else { continue_at = body; } -#ifdef HTTP_HAVE_ZLIB +#if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB) /* check for compressed data */ - if (c = http_message_header(msg, "Content-Encoding")) { + if ((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")) { + 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 - if (!strcasecmp(Z_STRVAL_P(c), "deflate")) { +# 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 http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len); - } else - if (!strcasecmp(Z_STRVAL_P(c), "compress")) { - http_encoding_uncompress(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) { + if (decoded) { 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); @@ -251,7 +279,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char PHPSTR(msg)->free = 1; } } -#endif +#endif /* HTTP_HAVE_ZLIB || HAVE_ZLIB */ /* check for following messages */ if (continue_at) { @@ -260,7 +288,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(continue_at, message + message_length - continue_at))) { while (most->parent) most = most->parent; most->parent = msg; msg = next; @@ -278,6 +306,7 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_ char *key, *data; ulong idx; zval **header; + HashPosition pos1; phpstr_init_ex(&str, 4096, 0); @@ -303,7 +332,7 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_ break; } - FOREACH_HASH_KEYVAL(&msg->hdrs, key, idx, header) { + FOREACH_HASH_KEYVAL(pos1, &msg->hdrs, key, idx, header) { if (key) { zval **single_header; @@ -314,9 +343,12 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_ 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; } @@ -350,7 +382,7 @@ PHP_HTTP_API void _http_message_serialize(http_message *message, char **string, 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) { @@ -380,6 +412,10 @@ PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *obj 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); @@ -416,14 +452,16 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC) 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; } @@ -459,7 +497,7 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC) int port = 0; /* check for port */ - if (colon = strchr(Z_STRVAL_PP(zhost), ':')) { + 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)); } else {