X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=2cd1dfe554b4d5974253b35efed8eb37e5201186;hp=8f9130042def69c1a234e5e3f2a46d6970ae271c;hb=687515f3fa8863f97fd281152a80171ad438532d;hpb=6086d2a97b6959531650c886b10dc814ad2392f9 diff --git a/http_functions.c b/http_functions.c index 8f91300..2cd1dfe 100644 --- a/http_functions.c +++ b/http_functions.c @@ -250,7 +250,7 @@ PHP_FUNCTION(http_build_str) zval **value; \ \ zend_hash_internal_pointer_reset(Z_ARRVAL_P(supported)); \ - if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void **) &value)) { \ + if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void *) &value)) { \ RETVAL_ZVAL(*value, 1, 0); \ } else { \ RETVAL_NULL(); \ @@ -1034,6 +1034,7 @@ PHP_FUNCTION(http_parse_headers) array_init(return_value); if (SUCCESS != http_parse_headers(header, return_value)) { zval_dtor(return_value); + http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse headers"); RETURN_FALSE; } } @@ -1206,7 +1207,7 @@ PHP_FUNCTION(http_match_request_header) zval **bodyonly; \ \ /* check if only the body should be returned */ \ - if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void **) &bodyonly)) && zval_is_true(*bodyonly)) { \ + if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void *) &bodyonly)) && zval_is_true(*bodyonly)) { \ http_message *msg = http_message_parse(PHPSTR_VAL(&request.conv.response), PHPSTR_LEN(&request.conv.response)); \ \ if (msg) { \ @@ -1230,6 +1231,7 @@ PHP_FUNCTION(http_match_request_header) * redirects to a different host * - proxyhost: string, proxy host in "host[:port]" format * - proxyport: int, use another proxy port as specified in proxyhost + * - proxytype: int, HTTP_PROXY_HTTP, SOCKS4 or SOCKS5 * - proxyauth: string, proxy credentials in "user:pass" format * - proxyauthtype: int, HTTP_AUTH_BASIC and/or HTTP_AUTH_NTLM * - httpauth: string, http credentials in "user:pass" format @@ -1249,6 +1251,9 @@ PHP_FUNCTION(http_match_request_header) * - cookiesession: bool, accept (true) or reset (false) sessioncookies * - resume: int, byte offset to start the download from; * if the server supports ranges + * - range: array, array of arrays, each containing two integers, + * specifying the ranges to download if server support is + * given; only recognized if the resume option is empty * - maxfilesize: int, maximum file size that should be downloaded; * has no effect, if the size of the requested entity is not known * - lastmodified: int, timestamp for If-(Un)Modified-Since header