#endif
#ifdef PHP_WIN32
-# define _WINSOCKAPI_
-# define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
# include <winsock2.h>
-# include <sys/types.h>
#endif
#include <curl/curl.h>
-#include <curl/easy.h>
#include "php.h"
#include "php_http.h"
#include "php_http_api.h"
#include "php_http_curl_api.h"
+#include "php_http_std_defs.h"
-#include "ext/standard/php_smart_str.h"
+#include "phpstr/phpstr.h"
ZEND_DECLARE_MODULE_GLOBALS(http)
+#if LIBCURL_VERSION_NUM >= 0x070c01
+# define http_curl_reset(ch) curl_easy_reset(ch)
+#else
+# define http_curl_reset(ch)
+#endif
+
+#if LIBCURL_VERSION_NUM < 0x070c00
+# define curl_easy_strerror(code) "unkown error"
+#endif
+
+#define http_curl_startup(ch, clean_curl, URL, options) \
+ if (!ch) { \
+ if (!(ch = curl_easy_init())) { \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl"); \
+ return FAILURE; \
+ } \
+ clean_curl = 1; \
+ } else { \
+ http_curl_reset(ch); \
+ } \
+ http_curl_setopts(ch, URL, options);
+
+#define http_curl_perform(ch, clean_curl) \
+ { \
+ CURLcode result; \
+ if (CURLE_OK != (result = curl_easy_perform(ch))) { \
+ http_curl_cleanup(ch, clean_curl); \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request: %s", curl_easy_strerror(result)); \
+ return FAILURE; \
+ } \
+ }
+
+#define http_curl_cleanup(ch, clean_curl) \
+ phpstr_dtor(&HTTP_G(curlbuf)); \
+ zend_llist_clean(&HTTP_G(to_free)); \
+ if (clean_curl) { \
+ curl_easy_cleanup(ch); \
+ ch = NULL; \
+ }
+
+#define http_curl_copybuf(d, l) \
+ phpstr_data(&HTTP_G(curlbuf), d, l)
+
#define http_curl_copystr(s) _http_curl_copystr((s) TSRMLS_CC)
static inline char *_http_curl_copystr(const char *str TSRMLS_DC);
-#define http_curl_freestr() _http_curl_freestr(TSRMLS_C)
-static inline void _http_curl_freestr(TSRMLS_D);
-
-#define http_curl_initbuf() _http_curl_initbuf_ex(0 TSRMLS_CC)
-#define http_curl_initbuf_ex(s) _http_curl_initbuf_ex((s) TSRMLS_CC)
-static inline void _http_curl_initbuf_ex(size_t chunk_size TSRMLS_DC);
-
-#define http_curl_freebuf() _http_curl_freebuf(TSRMLS_C)
-static inline void _http_curl_freebuf(TSRMLS_D);
-#define http_curl_sizebuf(l) _http_curl_sizebuf((l) TSRMLS_CC)
-static inline void _http_curl_sizebuf(size_t len TSRMLS_DC);
-#define http_curl_movebuf(d, l) _http_curl_movebuf((d), (l) TSRMLS_CC)
-static inline void _http_curl_movebuf(char **data, size_t *data_len TSRMLS_DC);
-#define http_curl_copybuf(d, l) _http_curl_copybuf((d), (l) TSRMLS_CC)
-static inline void _http_curl_copybuf(char **data, size_t *data_len TSRMLS_DC);
+
#define http_curl_setopts(c, u, o) _http_curl_setopts((c), (u), (o) TSRMLS_CC)
-static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC);
+static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC);
#define http_curl_getopt(o, k) _http_curl_getopt((o), (k) TSRMLS_CC, 0)
#define http_curl_getopt1(o, k, t1) _http_curl_getopt((o), (k) TSRMLS_CC, 1, (t1))
#define http_curl_getinfo(c, h) _http_curl_getinfo((c), (h) TSRMLS_CC)
static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC);
-#define http_curl_getinfo_ex(c, i, a) _http_curl_getinfo_ex((c), (i), (a) TSRMLS_CC)
-static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRMLS_DC);
-#define http_curl_getinfoname(i) _http_curl_getinfoname((i) TSRMLS_CC)
-static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC);
-/* {{{ */
+/* {{{ static inline char *http_curl_copystr(char *) */
static inline char *_http_curl_copystr(const char *str TSRMLS_DC)
{
char *new_str = estrdup(str);
}
/* }}} */
-/* {{{ */
-static inline void _http_curl_freestr(TSRMLS_D)
-{
- zend_llist_clean(&HTTP_G(to_free));
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_initbuf(size_t chunk_size) */
-static inline void _http_curl_initbuf_ex(size_t chunk_size TSRMLS_DC)
-{
- size_t size = (chunk_size > 0) ? chunk_size : HTTP_CURLBUF_SIZE;
-
- http_curl_freebuf();
-
- HTTP_G(curlbuf).data = emalloc(size);
- HTTP_G(curlbuf).free = size;
- HTTP_G(curlbuf).size = size;
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_freebuf(void) */
-static inline void _http_curl_freebuf(TSRMLS_D)
-{
- if (HTTP_G(curlbuf).data) {
- efree(HTTP_G(curlbuf).data);
- HTTP_G(curlbuf).data = NULL;
- }
- HTTP_G(curlbuf).used = 0;
- HTTP_G(curlbuf).free = 0;
- HTTP_G(curlbuf).size = 0;
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_copybuf(char **, size_t *) */
-static inline void _http_curl_copybuf(char **data, size_t *data_len TSRMLS_DC)
-{
- *data_len = HTTP_G(curlbuf).used;
-
- *data = ecalloc(1, HTTP_G(curlbuf).used + 1);
- memcpy(*data, HTTP_G(curlbuf).data, *data_len);
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_movebuf(char **, size_t *) */
-static inline void _http_curl_movebuf(char **data, size_t *data_len TSRMLS_DC)
-{
- http_curl_copybuf(data, data_len);
- http_curl_freebuf();
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_sizebuf(size_t len) */
-static inline void _http_curl_sizebuf(size_t len TSRMLS_DC)
-{
- if (len > HTTP_G(curlbuf).free) {
- size_t bsize = HTTP_G(curlbuf).size;
- while (bsize < len) {
- bsize *= 2;
- }
- HTTP_G(curlbuf).data = erealloc(HTTP_G(curlbuf).data, HTTP_G(curlbuf).used + bsize);
- HTTP_G(curlbuf).free += bsize;
- }
-}
-/* }}} */
-
/* {{{ static size_t http_curl_body_callback(char *, size_t, size_t, void *) */
static size_t http_curl_body_callback(char *buf, size_t len, size_t n, void *s)
{
TSRMLS_FETCH();
- http_curl_sizebuf(len *= n);
-
- memcpy(HTTP_G(curlbuf).data + HTTP_G(curlbuf).used, buf, len);
- HTTP_G(curlbuf).free -= len;
- HTTP_G(curlbuf).used += len;
+ phpstr_append(&HTTP_G(curlbuf), buf, len *= n);
return len;
}
/* }}} */
TSRMLS_FETCH();
/* discard previous headers */
- if ((HTTP_G(curlbuf).used) && (!strncmp(buf, "HTTP/1.", sizeof("HTTP/1.") - 1))) {
- http_curl_initbuf();
+ if (HTTP_G(curlbuf).used && (!strncmp(buf, "HTTP/1.", sizeof("HTTP/1.") - 1))) {
+ phpstr_free(&HTTP_G(curlbuf));
}
- http_curl_sizebuf(len *= n);
- memcpy(HTTP_G(curlbuf).data + HTTP_G(curlbuf).used, buf, len);
- HTTP_G(curlbuf).free -= len;
- HTTP_G(curlbuf).used += len;
+ phpstr_append(&HTTP_G(curlbuf), buf, len *= n);
return len;
}
/* }}} */
}
/* }}} */
-/* {{{ static inline void http_curl_setopts(CURL *, char *, HashTable *) */
-static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC)
+/* {{{ static void http_curl_setopts(CURL *, char *, HashTable *) */
+static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC)
{
zval *zoption;
+ zend_bool range_req = 0;
/* standard options */
curl_easy_setopt(ch, CURLOPT_URL, url);
curl_easy_setopt(ch, CURLOPT_HEADER, 0);
+ curl_easy_setopt(ch, CURLOPT_FILETIME, 1);
curl_easy_setopt(ch, CURLOPT_NOPROGRESS, 1);
curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1);
curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_body_callback);
return;
}
- /* redirects, defaults to 0 */
- if (zoption = http_curl_getopt1(options, "redirect", IS_LONG)) {
- curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0);
- curl_easy_setopt(ch, CURLOPT_MAXREDIRS, Z_LVAL_P(zoption));
- if (zoption = http_curl_getopt2(options, "unrestrictedauth", IS_LONG, IS_BOOL)) {
- curl_easy_setopt(ch, CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
- }
- } else {
- curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, 0);
- }
-
/* proxy */
if (zoption = http_curl_getopt1(options, "proxyhost", IS_STRING)) {
curl_easy_setopt(ch, CURLOPT_PROXY, http_curl_copystr(Z_STRVAL_P(zoption)));
if (zoption = http_curl_getopt1(options, "proxyauth", IS_STRING)) {
curl_easy_setopt(ch, CURLOPT_PROXYUSERPWD, http_curl_copystr(Z_STRVAL_P(zoption)));
}
-#if LIBCURL_VERSION_NUM > 0x070a06
+#if LIBCURL_VERSION_NUM >= 0x070a07
/* auth method */
if (zoption = http_curl_getopt1(options, "proxyauthtype", IS_LONG)) {
curl_easy_setopt(ch, CURLOPT_PROXYAUTH, Z_LVAL_P(zoption));
#endif
}
+ /* outgoing interface */
+ if (zoption = http_curl_getopt1(options, "interface", IS_STRING)) {
+ curl_easy_setopt(ch, CURLOPT_INTERFACE, http_curl_copystr(Z_STRVAL_P(zoption)));
+ }
+
+ /* another port */
+ if (zoption = http_curl_getopt1(options, "port", IS_LONG)) {
+ curl_easy_setopt(ch, CURLOPT_PORT, Z_LVAL_P(zoption));
+ }
+
/* auth */
if (zoption = http_curl_getopt1(options, "httpauth", IS_STRING)) {
curl_easy_setopt(ch, CURLOPT_USERPWD, http_curl_copystr(Z_STRVAL_P(zoption)));
}
-#if LIBCURL_VERSION_NUM > 0x070a05
+#if LIBCURL_VERSION_NUM >= 0x070a06
if (zoption = http_curl_getopt1(options, "httpauthtype", IS_LONG)) {
curl_easy_setopt(ch, CURLOPT_HTTPAUTH, Z_LVAL_P(zoption));
}
#endif
- /* compress, enabled by default (empty string enables deflate and gzip) */
+ /* compress, empty string enables deflate and gzip */
if (zoption = http_curl_getopt2(options, "compress", IS_LONG, IS_BOOL)) {
if (Z_LVAL_P(zoption)) {
curl_easy_setopt(ch, CURLOPT_ENCODING, "");
}
- } else {
- curl_easy_setopt(ch, CURLOPT_ENCODING, "");
}
- /* another port */
- if (zoption = http_curl_getopt1(options, "port", IS_LONG)) {
- curl_easy_setopt(ch, CURLOPT_PORT, Z_LVAL_P(zoption));
+ /* redirects, defaults to 0 */
+ if (zoption = http_curl_getopt1(options, "redirect", IS_LONG)) {
+ curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0);
+ curl_easy_setopt(ch, CURLOPT_MAXREDIRS, Z_LVAL_P(zoption));
+ if (zoption = http_curl_getopt2(options, "unrestrictedauth", IS_LONG, IS_BOOL)) {
+ curl_easy_setopt(ch, CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
+ }
+ } else {
+ curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, 0);
}
/* referer */
curl_easy_setopt(ch, CURLOPT_USERAGENT, http_curl_copystr(Z_STRVAL_P(zoption)));
} else {
curl_easy_setopt(ch, CURLOPT_USERAGENT,
- "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
+ "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")");
+ }
+
+ /* additional headers, array('name' => 'value') */
+ if (zoption = http_curl_getopt1(options, "headers", IS_ARRAY)) {
+ char *header_key;
+ long header_idx;
+ struct curl_slist *headers = NULL;
+
+ FOREACH_KEY(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)) {
+ char header[1024] = {0};
+ snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val));
+ headers = curl_slist_append(headers, http_curl_copystr(header));
+ }
+
+ /* reset */
+ header_key = NULL;
+ }
+ }
+
+ if (headers) {
+ curl_easy_setopt(ch, CURLOPT_HTTPHEADER, headers);
+ }
}
/* cookies, array('name' => 'value') */
if (zoption = http_curl_getopt1(options, "cookies", IS_ARRAY)) {
- char *cookie_key;
- zval **cookie_val;
- int key_type;
- smart_str qstr = {0};
-
- zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
- while (HASH_KEY_NON_EXISTANT != (key_type = zend_hash_get_current_key_type(Z_ARRVAL_P(zoption)))) {
- if (key_type == HASH_KEY_IS_STRING) {
- zend_hash_get_current_key(Z_ARRVAL_P(zoption), &cookie_key, NULL, 0);
- zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &cookie_val);
- smart_str_appends(&qstr, cookie_key);
- smart_str_appendl(&qstr, "=", 1);
- smart_str_appendl(&qstr, Z_STRVAL_PP(cookie_val), Z_STRLEN_PP(cookie_val));
- smart_str_appendl(&qstr, "; ", 2);
- zend_hash_move_forward(Z_ARRVAL_P(zoption));
+ char *cookie_key = NULL;
+ long cookie_idx = 0;
+ phpstr *qstr = phpstr_new();
+
+ FOREACH_KEY(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)) {
+ phpstr_appendf(qstr, "%s=%s; ", cookie_key, Z_STRVAL_PP(cookie_val));
+ }
+
+ /* reset */
+ cookie_key = NULL;
}
}
- smart_str_0(&qstr);
- if (qstr.c) {
- curl_easy_setopt(ch, CURLOPT_COOKIE, http_curl_copystr(qstr.c));
- efree(qstr.c);
+ if (qstr->used) {
+ phpstr_fix(qstr);
+ curl_easy_setopt(ch, CURLOPT_COOKIE, http_curl_copystr(qstr->data));
}
+ phpstr_free(qstr);
}
/* cookiestore */
curl_easy_setopt(ch, CURLOPT_COOKIEJAR, http_curl_copystr(Z_STRVAL_P(zoption)));
}
- /* additional headers, array('name' => 'value') */
- if (zoption = http_curl_getopt1(options, "headers", IS_ARRAY)) {
- int key_type;
- char *header_key, header[1024] = {0};
- zval **header_val;
- struct curl_slist *headers = NULL;
-
- zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
- while (HASH_KEY_NON_EXISTANT != (key_type = zend_hash_get_current_key_type(Z_ARRVAL_P(zoption)))) {
- if (key_type == HASH_KEY_IS_STRING) {
- zend_hash_get_current_key(Z_ARRVAL_P(zoption), &header_key, NULL, 0);
- zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val);
- snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val));
- headers = curl_slist_append(headers, http_curl_copystr(header));
- zend_hash_move_forward(Z_ARRVAL_P(zoption));
- }
- }
- if (headers) {
- curl_easy_setopt(ch, CURLOPT_HTTPHEADER, headers);
- }
+ /* resume */
+ if (zoption = http_curl_getopt1(options, "resume", IS_LONG)) {
+ range_req = 1;
+ curl_easy_setopt(ch, CURLOPT_RESUME_FROM, Z_LVAL_P(zoption));
}
-}
-/* }}} */
-/* {{{ static inline char *http_curl_getinfoname(CURLINFO) */
-static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC)
-{
-#define CASE(I) case CURLINFO_ ##I : { return pretty_key(http_curl_copystr(#I), sizeof(#I)-1, 0, 0); }
- switch (i)
- {
- /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */
- CASE(EFFECTIVE_URL);
- /* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */
-#if LIBCURL_VERSION_NUM > 0x070a06
- CASE(RESPONSE_CODE);
-#else
- CASE(HTTP_CODE);
-#endif
- /* CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE +3, */
- CASE(TOTAL_TIME);
- /* CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE +4, */
- CASE(NAMELOOKUP_TIME);
- /* CURLINFO_CONNECT_TIME = CURLINFO_DOUBLE +5, */
- CASE(CONNECT_TIME);
- /* CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE +6, */
- CASE(PRETRANSFER_TIME);
- /* CURLINFO_SIZE_UPLOAD = CURLINFO_DOUBLE +7, */
- CASE(SIZE_UPLOAD);
- /* CURLINFO_SIZE_DOWNLOAD = CURLINFO_DOUBLE +8, */
- CASE(SIZE_DOWNLOAD);
- /* CURLINFO_SPEED_DOWNLOAD = CURLINFO_DOUBLE +9, */
- CASE(SPEED_DOWNLOAD);
- /* CURLINFO_SPEED_UPLOAD = CURLINFO_DOUBLE +10, */
- CASE(SPEED_UPLOAD);
- /* CURLINFO_HEADER_SIZE = CURLINFO_LONG +11, */
- CASE(HEADER_SIZE);
- /* CURLINFO_REQUEST_SIZE = CURLINFO_LONG +12, */
- CASE(REQUEST_SIZE);
- /* CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG +13, */
- CASE(SSL_VERIFYRESULT);
- /* CURLINFO_FILETIME = CURLINFO_LONG +14, */
- CASE(FILETIME);
- /* CURLINFO_CONTENT_LENGTH_DOWNLOAD = CURLINFO_DOUBLE +15, */
- CASE(CONTENT_LENGTH_DOWNLOAD);
- /* CURLINFO_CONTENT_LENGTH_UPLOAD = CURLINFO_DOUBLE +16, */
- CASE(CONTENT_LENGTH_UPLOAD);
- /* CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE +17, */
- CASE(STARTTRANSFER_TIME);
- /* CURLINFO_CONTENT_TYPE = CURLINFO_STRING +18, */
- CASE(CONTENT_TYPE);
- /* CURLINFO_REDIRECT_TIME = CURLINFO_DOUBLE +19, */
- CASE(REDIRECT_TIME);
- /* CURLINFO_REDIRECT_COUNT = CURLINFO_LONG +20, */
- CASE(REDIRECT_COUNT);
- /* CURLINFO_PRIVATE = CURLINFO_STRING +21, * (mike) /
- CASE(PRIVATE);
- /* CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG +22, */
- CASE(HTTP_CONNECTCODE);
-#if LIBCURL_VERSION_NUM > 0x070a07
- /* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */
- CASE(HTTPAUTH_AVAIL);
- /* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */
- CASE(PROXYAUTH_AVAIL);
-#endif
+ /* maxfilesize */
+ if (zoption = http_curl_getopt1(options, "maxfilesize", IS_LONG)) {
+ curl_easy_setopt(ch, CURLOPT_MAXFILESIZE, Z_LVAL_P(zoption));
}
-#undef CASE
- return NULL;
-}
-/* }}} */
-/* {{{ static inline void http_curl_getinfo_ex(CURL, CURLINFO, zval *) */
-static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRMLS_DC)
-{
- char *key;
- if (key = http_curl_getinfoname(i)) {
- switch (i & ~CURLINFO_MASK)
- {
- case CURLINFO_STRING:
- {
- char *c;
- if (CURLE_OK == curl_easy_getinfo(ch, i, &c)) {
- add_assoc_string(array, key, c ? c : "", 1);
- }
- }
- break;
+ /* lastmodified */
+ if (zoption = http_curl_getopt1(options, "lastmodified", IS_LONG)) {
+ curl_easy_setopt(ch, CURLOPT_TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE);
+ curl_easy_setopt(ch, CURLOPT_TIMEVALUE, Z_LVAL_P(zoption));
+ }
- case CURLINFO_DOUBLE:
- {
- double d;
- if (CURLE_OK == curl_easy_getinfo(ch, i, &d)) {
- add_assoc_double(array, key, d);
- }
- }
- break;
+ /* timeout */
+ if (zoption = http_curl_getopt1(options, "timeout", IS_LONG)) {
+ curl_easy_setopt(ch, CURLOPT_TIMEOUT, Z_LVAL_P(zoption));
+ }
- case CURLINFO_LONG:
- {
- long l;
- if (CURLE_OK == curl_easy_getinfo(ch, i, &l)) {
- add_assoc_long(array, key, l);
- }
- }
- break;
- }
+ /* connecttimeout */
+ if (zoption = http_curl_getopt1(options, "connecttimeout", IS_LONG)) {
+ curl_easy_setopt(ch, CURLOPT_CONNECTTIMEOUT, Z_LVAL_P(zoption));
}
}
/* }}} */
zval array;
Z_ARRVAL(array) = info;
-#define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , &array)
- /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */
- INFO(EFFECTIVE_URL);
-#if LIBCURL_VERSION_NUM > 0x070a06
- /* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */
- INFO(RESPONSE_CODE);
+#define HTTP_CURL_INFO(I) HTTP_CURL_INFO_EX(I, I)
+#define HTTP_CURL_INFO_EX(I, X) \
+ switch (CURLINFO_ ##I & ~CURLINFO_MASK) \
+ { \
+ case CURLINFO_STRING: \
+ { \
+ char *c; \
+ if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &c)) { \
+ add_assoc_string(&array, pretty_key(http_curl_copystr(#X), sizeof(#X)-1, 0, 0), c ? c : "", 1); \
+ } \
+ } \
+ break; \
+\
+ case CURLINFO_DOUBLE: \
+ { \
+ double d; \
+ if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &d)) { \
+ add_assoc_double(&array, pretty_key(http_curl_copystr(#X), sizeof(#X)-1, 0, 0), d); \
+ } \
+ } \
+ break; \
+\
+ case CURLINFO_LONG: \
+ { \
+ long l; \
+ if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &l)) { \
+ add_assoc_long(&array, pretty_key(http_curl_copystr(#X), sizeof(#X)-1, 0, 0), l); \
+ } \
+ } \
+ break; \
+ }
+
+ HTTP_CURL_INFO(EFFECTIVE_URL);
+
+#if LIBCURL_VERSION_NUM >= 0x070a07
+ HTTP_CURL_INFO(RESPONSE_CODE);
#else
- INFO(HTTP_CODE);
+ HTTP_CURL_INFO_EX(HTTP_CODE, RESPONSE_CODE);
#endif
- /* CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE +3, */
- INFO(TOTAL_TIME);
- /* CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE +4, */
- INFO(NAMELOOKUP_TIME);
- /* CURLINFO_CONNECT_TIME = CURLINFO_DOUBLE +5, */
- INFO(CONNECT_TIME);
- /* CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE +6, */
- INFO(PRETRANSFER_TIME);
- /* CURLINFO_SIZE_UPLOAD = CURLINFO_DOUBLE +7, */
- INFO(SIZE_UPLOAD);
- /* CURLINFO_SIZE_DOWNLOAD = CURLINFO_DOUBLE +8, */
- INFO(SIZE_DOWNLOAD);
- /* CURLINFO_SPEED_DOWNLOAD = CURLINFO_DOUBLE +9, */
- INFO(SPEED_DOWNLOAD);
- /* CURLINFO_SPEED_UPLOAD = CURLINFO_DOUBLE +10, */
- INFO(SPEED_UPLOAD);
- /* CURLINFO_HEADER_SIZE = CURLINFO_LONG +11, */
- INFO(HEADER_SIZE);
- /* CURLINFO_REQUEST_SIZE = CURLINFO_LONG +12, */
- INFO(REQUEST_SIZE);
- /* CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG +13, */
- INFO(SSL_VERIFYRESULT);
- /* CURLINFO_FILETIME = CURLINFO_LONG +14, */
- INFO(FILETIME);
- /* CURLINFO_CONTENT_LENGTH_DOWNLOAD = CURLINFO_DOUBLE +15, */
- INFO(CONTENT_LENGTH_DOWNLOAD);
- /* CURLINFO_CONTENT_LENGTH_UPLOAD = CURLINFO_DOUBLE +16, */
- INFO(CONTENT_LENGTH_UPLOAD);
- /* CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE +17, */
- INFO(STARTTRANSFER_TIME);
- /* CURLINFO_CONTENT_TYPE = CURLINFO_STRING +18, */
- INFO(CONTENT_TYPE);
- /* CURLINFO_REDIRECT_TIME = CURLINFO_DOUBLE +19, */
- INFO(REDIRECT_TIME);
- /* CURLINFO_REDIRECT_COUNT = CURLINFO_LONG +20, */
- INFO(REDIRECT_COUNT);
- /* CURLINFO_PRIVATE = CURLINFO_STRING +21, */
- INFO(PRIVATE);
- /* CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG +22, */
- INFO(HTTP_CONNECTCODE);
-#if LIBCURL_VERSION_NUM > 0x070a07
- /* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */
- INFO(HTTPAUTH_AVAIL);
- /* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */
- INFO(PROXYAUTH_AVAIL);
+ HTTP_CURL_INFO(HTTP_CONNECTCODE);
+
+#if LIBCURL_VERSION_NUM >= 0x070500
+ HTTP_CURL_INFO(FILETIME);
+#endif
+ HTTP_CURL_INFO(TOTAL_TIME);
+ HTTP_CURL_INFO(NAMELOOKUP_TIME);
+ HTTP_CURL_INFO(CONNECT_TIME);
+ HTTP_CURL_INFO(PRETRANSFER_TIME);
+ HTTP_CURL_INFO(STARTTRANSFER_TIME);
+#if LIBCURL_VERSION_NUM >= 0x070907
+ HTTP_CURL_INFO(REDIRECT_TIME);
+ HTTP_CURL_INFO(REDIRECT_COUNT);
#endif
-#undef INFO
-}
-/* }}} */
+ HTTP_CURL_INFO(SIZE_UPLOAD);
+ HTTP_CURL_INFO(SIZE_DOWNLOAD);
+ HTTP_CURL_INFO(SPEED_DOWNLOAD);
+ HTTP_CURL_INFO(SPEED_UPLOAD);
+ HTTP_CURL_INFO(HEADER_SIZE);
+ HTTP_CURL_INFO(REQUEST_SIZE);
-/* {{{ STATUS http_get(char *, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,
- HashTable *info, char **data, size_t *data_len TSRMLS_DC)
-{
- STATUS rs;
- CURL *ch = curl_easy_init();
+ HTTP_CURL_INFO(SSL_VERIFYRESULT);
+#if LIBCURL_VERSION_NUM >= 0x070c03
+ /*HTTP_CURL_INFO(SSL_ENGINES);
+ todo: CURLINFO_SLIST */
+#endif
- if (!ch) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
- return FAILURE;
- }
+ HTTP_CURL_INFO(CONTENT_LENGTH_DOWNLOAD);
+ HTTP_CURL_INFO(CONTENT_LENGTH_UPLOAD);
+ HTTP_CURL_INFO(CONTENT_TYPE);
+
+#if LIBCURL_VERSION_NUM >= 0x070a03
+ /*HTTP_CURL_INFO(PRIVATE);*/
+#endif
- rs = http_get_ex(ch, URL, options, info, data, data_len);
- curl_easy_cleanup(ch);
- return rs;
+#if LIBCURL_VERSION_NUM >= 0x070a08
+ HTTP_CURL_INFO(HTTPAUTH_AVAIL);
+ HTTP_CURL_INFO(PROXYAUTH_AVAIL);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070c02
+ /*HTTP_CURL_INFO(OS_ERRNO);*/
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070c03
+ HTTP_CURL_INFO(NUM_CONNECTS);
+#endif
}
/* }}} */
PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options,
HashTable *info, char **data, size_t *data_len TSRMLS_DC)
{
- http_curl_initbuf();
- http_curl_setopts(ch, URL, options);
- curl_easy_setopt(ch, CURLOPT_NOBODY, 0);
- curl_easy_setopt(ch, CURLOPT_POST, 0);
+ zend_bool clean_curl = 0;
+
+ http_curl_startup(ch, clean_curl, URL, options);
+ curl_easy_setopt(ch, CURLOPT_HTTPGET, 1);
+ http_curl_perform(ch, clean_curl);
- if (CURLE_OK != curl_easy_perform(ch)) {
- http_curl_freebuf();
- http_curl_freestr();
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
- return FAILURE;
- }
if (info) {
http_curl_getinfo(ch, info);
}
- http_curl_movebuf(data, data_len);
- http_curl_freestr();
- return SUCCESS;
-}
-
-/* {{{ STATUS http_head(char *, HashTable *, HashTable *, char **data, size_t *) */
-PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options,
- HashTable *info, char **data, size_t *data_len TSRMLS_DC)
-{
- STATUS rs;
- CURL *ch = curl_easy_init();
- if (!ch) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
- return FAILURE;
- }
+ http_curl_copybuf(data, data_len);
+ http_curl_cleanup(ch, clean_curl);
- rs = http_head_ex(ch, URL, options, info, data, data_len);
- curl_easy_cleanup(ch);
- return rs;
+ return SUCCESS;
}
-/* }}} */
/* {{{ STATUS http_head_ex(CURL *, char *, HashTable *, HashTable *, char **data, size_t *) */
PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options,
HashTable *info, char **data, size_t *data_len TSRMLS_DC)
{
- http_curl_initbuf();
- http_curl_setopts(ch, URL, options);
+ zend_bool clean_curl = 0;
+
+ http_curl_startup(ch, clean_curl, URL, options);
curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
- curl_easy_setopt(ch, CURLOPT_POST, 0);
+ http_curl_perform(ch, clean_curl);
- if (CURLE_OK != curl_easy_perform(ch)) {
- http_curl_freebuf();
- http_curl_freestr();
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
- return FAILURE;
- }
if (info) {
http_curl_getinfo(ch, info);
}
- http_curl_movebuf(data, data_len);
- http_curl_freestr();
- return SUCCESS;
-}
-/* {{{ STATUS http_post_data(char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata,
- size_t postdata_len, HashTable *options, HashTable *info, char **data,
- size_t *data_len TSRMLS_DC)
-{
- STATUS rs;
- CURL *ch = curl_easy_init();
+ http_curl_copybuf(data, data_len);
+ http_curl_cleanup(ch, clean_curl);
- if (!ch) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
- return FAILURE;
- }
- rs = http_post_data_ex(ch, URL, postdata, postdata_len, options, info, data, data_len);
- curl_easy_cleanup(ch);
- return rs;
+ return SUCCESS;
}
-/* }}} */
/* {{{ STATUS http_post_data_ex(CURL *, char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
PHP_HTTP_API STATUS _http_post_data_ex(CURL *ch, const char *URL, char *postdata,
size_t postdata_len, HashTable *options, HashTable *info, char **data,
size_t *data_len TSRMLS_DC)
{
- http_curl_initbuf();
- http_curl_setopts(ch, URL, options);
+ zend_bool clean_curl = 0;
+
+ http_curl_startup(ch, clean_curl, URL, options);
curl_easy_setopt(ch, CURLOPT_POST, 1);
curl_easy_setopt(ch, CURLOPT_POSTFIELDS, postdata);
curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, postdata_len);
+ http_curl_perform(ch, clean_curl);
- if (CURLE_OK != curl_easy_perform(ch)) {
- http_curl_freebuf();
- http_curl_freestr();
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
- return FAILURE;
- }
if (info) {
http_curl_getinfo(ch, info);
}
- http_curl_movebuf(data, data_len);
- http_curl_freestr();
+
+ http_curl_copybuf(data, data_len);
+ http_curl_cleanup(ch, clean_curl);
+
return SUCCESS;
}
/* }}} */
PHP_HTTP_API STATUS _http_post_array_ex(CURL *ch, const char *URL, HashTable *postarray,
HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC)
{
- smart_str qstr = {0};
STATUS status;
+ char *encoded;
+ size_t encoded_len;
- HTTP_URL_ARGSEP_OVERRIDE;
- if (php_url_encode_hash_ex(postarray, &qstr, NULL,0,NULL,0,NULL,0,NULL TSRMLS_CC) != SUCCESS) {
- if (qstr.c) {
- efree(qstr.c);
- }
+ if (SUCCESS != http_urlencode_hash_ex(postarray, 1, NULL, 0, &encoded, &encoded_len)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not encode post data");
- HTTP_URL_ARGSEP_RESTORE;
return FAILURE;
}
- smart_str_0(&qstr);
- HTTP_URL_ARGSEP_RESTORE;
- if (ch) {
- status = http_post_data_ex(ch, URL, qstr.c, qstr.len, options, info, data, data_len);
- } else {
- status = http_post_data(URL, qstr.c, qstr.len, options, info, data, data_len);
- }
+ status = http_post_data_ex(ch, URL, encoded, encoded_len, options, info, data, data_len);
+ efree(encoded);
- if (qstr.c) {
- efree(qstr.c);
- }
return status;
}
/* }}} */
struct curl_httppost *curldata, HashTable *options, HashTable *info,
char **data, size_t *data_len TSRMLS_DC)
{
- http_curl_initbuf();
- http_curl_setopts(ch, URL, options);
+ zend_bool clean_curl = 0;
+
+ http_curl_startup(ch, clean_curl, URL, options);
curl_easy_setopt(ch, CURLOPT_POST, 1);
curl_easy_setopt(ch, CURLOPT_HTTPPOST, curldata);
+ http_curl_perform(ch, clean_curl);
- if (CURLE_OK != curl_easy_perform(ch)) {
- http_curl_freebuf();
- http_curl_freestr();
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
- return FAILURE;
- }
if (info) {
http_curl_getinfo(ch, info);
}
- http_curl_movebuf(data, data_len);
- http_curl_freestr();
- return SUCCESS;}
-/* }}} */
+ http_curl_copybuf(data, data_len);
+ http_curl_cleanup(ch, clean_curl);
+
+ return SUCCESS;
+}
+/* }}} */
/*
* Local variables:
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
- */
\ No newline at end of file
+ */
projects / m6w6 / ext-http / blobdiff