X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=496a63ed8d4e735cf057dfaf5ac2307b6323877b;hp=857bc6706b8afc27f0a6451012accbaf4d708d61;hb=a0bca521b491711e43aef74fe19c23a8eb4d0777;hpb=c11d087f021a9ea83d544aebbb979b8e57941c99 diff --git a/http_request_api.c b/http_request_api.c index 857bc67..496a63e 100644 --- a/http_request_api.c +++ b/http_request_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$ */ @@ -280,12 +277,15 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable * char *key = NULL; ulong idx; zval **data; + HashPosition pos; struct curl_httppost *http_post_data[2] = {NULL, NULL}; /* normal data */ - FOREACH_HASH_KEYVAL(fields, key, idx, data) { + FOREACH_HASH_KEYVAL(pos, fields, key, idx, data) { CURLcode err; if (key) { + zval *orig = *data; + convert_to_string_ex(data); err = curl_formadd(&http_post_data[0], &http_post_data[1], CURLFORM_COPYNAME, key, @@ -293,6 +293,11 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable * CURLFORM_CONTENTSLENGTH, (long) Z_STRLEN_PP(data), CURLFORM_END ); + + if (orig != *data) { + zval_ptr_dtor(data); + } + if (CURLE_OK != err) { http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post fields: %s", curl_easy_strerror(err)); curl_formfree(http_post_data[0]); @@ -305,12 +310,14 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable * } /* file data */ - FOREACH_HASH_VAL(files, data) { + FOREACH_HASH_VAL(pos, files, data) { zval **file, **type, **name; - if ( SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) || - SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) || - SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) { + if (Z_TYPE_PP(data) != IS_ARRAY) { + http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Unrecognized type of post file array entry"); + } else if ( SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) || + SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) || + SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) { http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry"); } else { CURLcode err = curl_formadd(&http_post_data[0], &http_post_data[1], @@ -419,47 +426,47 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char #endif /* progress callback */ - if (zoption = http_curl_getopt(options, "onprogress", 0)) { + if ((zoption = http_curl_getopt(options, "onprogress", 0))) { HTTP_CURL_OPT(NOPROGRESS, 0); HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback); HTTP_CURL_OPT(PROGRESSDATA, http_request_callback_data(zoption)); } /* proxy */ - if (zoption = http_curl_getopt(options, "proxyhost", IS_STRING)) { + if ((zoption = http_curl_getopt(options, "proxyhost", IS_STRING))) { HTTP_CURL_OPT(PROXY, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); /* port */ - if (zoption = http_curl_getopt(options, "proxyport", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "proxyport", IS_LONG))) { HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption)); } /* user:pass */ - if (zoption = http_curl_getopt(options, "proxyauth", IS_STRING)) { + if ((zoption = http_curl_getopt(options, "proxyauth", IS_STRING))) { HTTP_CURL_OPT(PROXYUSERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); } #if LIBCURL_VERSION_NUM >= 0x070a07 /* auth method */ - if (zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG))) { HTTP_CURL_OPT(PROXYAUTH, Z_LVAL_P(zoption)); } #endif } /* outgoing interface */ - if (zoption = http_curl_getopt(options, "interface", IS_STRING)) { + if ((zoption = http_curl_getopt(options, "interface", IS_STRING))) { HTTP_CURL_OPT(INTERFACE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); } /* another port */ - if (zoption = http_curl_getopt(options, "port", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "port", IS_LONG))) { HTTP_CURL_OPT(PORT, Z_LVAL_P(zoption)); } /* auth */ - if (zoption = http_curl_getopt(options, "httpauth", IS_STRING)) { + if ((zoption = http_curl_getopt(options, "httpauth", IS_STRING))) { HTTP_CURL_OPT(USERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); } #if LIBCURL_VERSION_NUM >= 0x070a06 - if (zoption = http_curl_getopt(options, "httpauthtype", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "httpauthtype", IS_LONG))) { HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption)); } #endif @@ -474,34 +481,35 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char } /* redirects, defaults to 0 */ - if (zoption = http_curl_getopt(options, "redirect", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "redirect", IS_LONG))) { HTTP_CURL_OPT(FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0); HTTP_CURL_OPT(MAXREDIRS, Z_LVAL_P(zoption)); - if (zoption = http_curl_getopt(options, "unrestrictedauth", IS_BOOL)) { + if ((zoption = http_curl_getopt(options, "unrestrictedauth", IS_BOOL))) { HTTP_CURL_OPT(UNRESTRICTED_AUTH, Z_LVAL_P(zoption)); } } /* referer */ - if (zoption = http_curl_getopt(options, "referer", IS_STRING)) { + if ((zoption = http_curl_getopt(options, "referer", IS_STRING))) { HTTP_CURL_OPT(REFERER, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); } /* useragent, default "PECL::HTTP/version (PHP/version)" */ - if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) { + if ((zoption = http_curl_getopt(options, "useragent", IS_STRING))) { HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); } /* additional headers, array('name' => 'value') */ - if (zoption = http_curl_getopt(options, "headers", IS_ARRAY)) { + if ((zoption = http_curl_getopt(options, "headers", IS_ARRAY))) { char *header_key; ulong header_idx; + HashPosition pos; struct curl_slist *headers = NULL; - FOREACH_KEY(zoption, header_key, header_idx) { + FOREACH_KEY(pos, zoption, header_key, header_idx) { if (header_key) { zval **header_val; - if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val)) { + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &header_val, &pos)) { char header[1024] = {0}; snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val)); headers = curl_slist_append(headers, http_request_data_copy(COPY_STRING, header)); @@ -518,15 +526,16 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char } /* cookies, array('name' => 'value') */ - if (zoption = http_curl_getopt(options, "cookies", IS_ARRAY)) { + if ((zoption = http_curl_getopt(options, "cookies", IS_ARRAY))) { char *cookie_key = NULL; ulong cookie_idx = 0; + HashPosition pos; phpstr *qstr = phpstr_new(); - FOREACH_KEY(zoption, cookie_key, cookie_idx) { + FOREACH_KEY(pos, zoption, cookie_key, cookie_idx) { if (cookie_key) { zval **cookie_val; - if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &cookie_val)) { + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) { phpstr_appendf(qstr, "%s=%s; ", cookie_key, Z_STRVAL_PP(cookie_val)); } @@ -543,7 +552,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char } /* session cookies */ - if (zoption = http_curl_getopt(options, "cookiesession", IS_BOOL)) { + if ((zoption = http_curl_getopt(options, "cookiesession", IS_BOOL))) { if (Z_LVAL_P(zoption)) { /* accept cookies for this session */ HTTP_CURL_OPT(COOKIEFILE, ""); @@ -566,12 +575,12 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char } /* maxfilesize */ - if (zoption = http_curl_getopt(options, "maxfilesize", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "maxfilesize", IS_LONG))) { HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption)); } /* lastmodified */ - if (zoption = http_curl_getopt(options, "lastmodified", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "lastmodified", IS_LONG))) { if (Z_LVAL_P(zoption)) { if (Z_LVAL_P(zoption) > 0) { HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption)); @@ -585,22 +594,23 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char } /* timeout, defaults to 0 */ - if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "timeout", IS_LONG))) { HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption)); } /* connecttimeout, defaults to 3 */ - if (zoption = http_curl_getopt(options, "connecttimeout", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "connecttimeout", IS_LONG))) { HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption)); } /* ssl */ - if (zoption = http_curl_getopt(options, "ssl", IS_ARRAY)) { + if ((zoption = http_curl_getopt(options, "ssl", IS_ARRAY))) { ulong idx; char *key = NULL; zval **param; + HashPosition pos; - FOREACH_KEYVAL(zoption, key, idx, param) { + FOREACH_KEYVAL(pos, zoption, key, idx, param) { if (key) { HTTP_CURL_OPT_SSL_STRING(CERT); #if LIBCURL_VERSION_NUM >= 0x070903 @@ -619,7 +629,6 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char HTTP_CURL_OPT_SSL_LONG_(VERIFYHOST); HTTP_CURL_OPT_SSL_STRING_(CIPHER_LIST); - HTTP_CURL_OPT_STRING(CAINFO); #if LIBCURL_VERSION_NUM >= 0x070908 HTTP_CURL_OPT_STRING(CAPATH); @@ -712,15 +721,14 @@ PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info, phpstr *respon /* perform request */ if (CURLE_OK != (result = curl_easy_perform(ch))) { - http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not perform request: %s", curl_easy_strerror(result)); - return FAILURE; - } else { - /* get curl info */ - if (info) { - http_request_info(ch, info); - } - return SUCCESS; + http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(result)); + } + /* get curl info */ + if (info) { + http_request_info(ch, info); } + /* always succeeds */ + return SUCCESS; } /* }}} */ @@ -837,10 +845,6 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size { HTTP_REQUEST_CALLBACK_DATA(ctx, http_request_conv *, conv); -#if 0 - fprintf(stderr, "DEBUG: %s\n", data); -#endif - switch (type) { case CURLINFO_DATA_IN: @@ -861,6 +865,26 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size phpstr_append(conv->request, data, length); } break; + default: +#if 0 + fprintf(stderr, "## ", type); + if (!type) { + fprintf(stderr, "%s", data); + } else { + ulong i; + for (i = 1; i <= length; ++i) { + fprintf(stderr, "%02X ", data[i-1] & 0xFF); + if (!(i % 20)) { + fprintf(stderr, "\n## "); + } + } + fprintf(stderr, "\n"); + } + if (data[length-1] != 0xa) { + fprintf(stderr, "\n"); + } +#endif + break; } if (type) { @@ -910,9 +934,9 @@ static void http_ssl_lock(int mode, int n, const char * file, int line) } } -static unsigned long http_ssl_id(void) +static ulong http_ssl_id(void) { - return (unsigned long) tsrm_thread_id(); + return (ulong) tsrm_thread_id(); } static inline void http_ssl_init(void)