From: Michael Wallner Date: Wed, 13 Apr 2005 17:29:50 +0000 (+0000) Subject: - cosmetics X-Git-Tag: RELEASE_0_8_0~59 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=fe866e74d586515ae1a4fc8dd33ccd35c40b4fb0;p=m6w6%2Fext-http - cosmetics --- diff --git a/http_auth_api.c b/http_auth_api.c index 386faff..be2f744 100644 --- a/http_auth_api.c +++ b/http_auth_api.c @@ -60,10 +60,8 @@ PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC) zval *zauth = NULL; HTTP_GSC(zauth, "HTTP_AUTHORIZATION", FAILURE); { - char *decoded, *colon; int decoded_len; - decoded = php_base64_decode(Z_STRVAL_P(zauth), Z_STRLEN_P(zauth), - &decoded_len); + char *colon, *decoded = php_base64_decode(Z_STRVAL_P(zauth), Z_STRLEN_P(zauth), &decoded_len); if (colon = strchr(decoded + 6, ':')) { *user = estrndup(decoded + 6, colon - decoded - 6); diff --git a/http_curl_api.c b/http_curl_api.c index 1da840c..7938573 100644 --- a/http_curl_api.c +++ b/http_curl_api.c @@ -85,8 +85,9 @@ static inline char *_http_curl_copystr(const char *str TSRMLS_DC); #define http_curl_setopts(c, u, o, r) _http_curl_setopts((c), (u), (o), (r) TSRMLS_CC) static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options, phpstr *response TSRMLS_DC); -#define http_curl_getopt(o, k, t) _http_curl_getopt((o), (k), (t) TSRMLS_CC) -static inline zval *_http_curl_getopt(HashTable *options, char *key, int type TSRMLS_DC); +#define http_curl_getopt(o, k, t) _http_curl_getopt_ex((o), (k), sizeof(k), (t) TSRMLS_CC) +#define http_curl_getopt_ex(o, k, l, t) _http_curl_getopt_ex((o), (k), (l), (t) TSRMLS_CC) +static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC); static size_t http_curl_callback(char *, size_t, size_t, void *); @@ -109,12 +110,12 @@ static size_t http_curl_callback(char *buf, size_t len, size_t n, void *s) } /* }}} */ -/* {{{ static inline zval *http_curl_getopt(HashTable *, char *, int) */ -static inline zval *_http_curl_getopt(HashTable *options, char *key, int type TSRMLS_DC) +/* {{{ static inline zval *http_curl_getopt(HashTable *, char *, size_t, int) */ +static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC) { zval **zoption; - if (SUCCESS != zend_hash_find(options, key, strlen(key) + 1, (void **) &zoption)) { + if (!options || (SUCCESS != zend_hash_find(options, key, keylen, (void **) &zoption))) { return NULL; } @@ -145,15 +146,22 @@ static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options, ph #define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt(ch, CURLOPT_##OPTION, (p)) /* standard options */ - HTTP_CURL_OPT(URL, url); + if (url) { + HTTP_CURL_OPT(URL, url); + } + HTTP_CURL_OPT(HEADER, 0); HTTP_CURL_OPT(FILETIME, 1); HTTP_CURL_OPT(NOPROGRESS, 1); HTTP_CURL_OPT(AUTOREFERER, 1); HTTP_CURL_OPT(WRITEFUNCTION, http_curl_callback); HTTP_CURL_OPT(HEADERFUNCTION, http_curl_callback); - HTTP_CURL_OPT(WRITEDATA, response); - HTTP_CURL_OPT(WRITEHEADER, response); + + if (response) { + HTTP_CURL_OPT(WRITEDATA, response); + HTTP_CURL_OPT(WRITEHEADER, response); + } + #if defined(ZTS) && (LIBCURL_VERSION_NUM >= 0x070a00) HTTP_CURL_OPT(NOSIGNAL, 1); #endif