#include <curl/curl.h>
+#include "phpstr/phpstr.h"
+
#include "php.h"
#include "php_http.h"
+#include "php_http_std_defs.h"
#include "php_http_api.h"
#include "php_http_curl_api.h"
-#include "php_http_std_defs.h"
-
-#ifdef ZEND_ENGINE_2
-# include "ext/standard/php_http.h"
-#endif
-
-#include "phpstr/phpstr.h"
+#include "php_http_url_api.h"
-ZEND_DECLARE_MODULE_GLOBALS(http)
+ZEND_EXTERN_MODULE_GLOBALS(http)
#if LIBCURL_VERSION_NUM >= 0x070c01
# define http_curl_reset(ch) curl_easy_reset(ch)
#endif
#if LIBCURL_VERSION_NUM < 0x070c00
+# define http_curl_error(dummy) HTTP_G(curlerr)
# define curl_easy_strerror(code) "unkown error"
+#else
+# define http_curl_error(code) curl_easy_strerror(code)
#endif
-#define http_curl_startup(ch, clean_curl, URL, options) \
+#define http_curl_startup(ch, clean_curl, URL, options, response) \
if (!ch) { \
if (!(ch = curl_easy_init())) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl"); \
+ http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl"); \
return FAILURE; \
} \
clean_curl = 1; \
} else { \
http_curl_reset(ch); \
} \
- http_curl_setopts(ch, URL, options);
+ http_curl_setopts(ch, URL, options, response);
-#define http_curl_perform(ch, clean_curl) \
+#define http_curl_perform(ch, clean_curl, response) \
{ \
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)); \
+ http_error_ex(E_WARNING, HTTP_E_CURL, "Could not perform request: %s", curl_easy_strerror(result)); \
+ http_curl_cleanup(ch, clean_curl, response); \
return FAILURE; \
} \
}
-#define http_curl_cleanup(ch, clean_curl) \
- phpstr_free(&HTTP_G(curlbuf)); \
+#define http_curl_cleanup(ch, clean_curl, response) \
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)
+ } \
+ phpstr_fix(PHPSTR(response))
#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_setopts(c, u, o) _http_curl_setopts((c), (u), (o) TSRMLS_CC)
-static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options 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) _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_getopt2(o, k, t1, t2) _http_curl_getopt((o), (k) TSRMLS_CC, 2, (t1), (t2))
-static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, int checks, ...);
+#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_body_callback(char *, size_t, size_t, void *);
-static size_t http_curl_hdrs_callback(char *, size_t, size_t, void *);
+static size_t http_curl_write_callback(char *, size_t, size_t, void *);
+static int http_curl_progress_callback(void *, double, double, double, double);
+static int http_curl_debug_callback(CURL *, curl_infotype, char *, size_t, void *);
#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);
}
/* }}} */
-/* {{{ 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)
+/* {{{ static size_t http_curl_write_callback(char *, size_t, size_t, void *) */
+static size_t http_curl_write_callback(char *buf, size_t len, size_t n, void *s)
{
- TSRMLS_FETCH();
-
- phpstr_append(&HTTP_G(curlbuf), buf, len *= n);
- return len;
+ return s ? phpstr_append(PHPSTR(s), buf, len * n) : len * n;
}
/* }}} */
-/* {{{ static size_t http_curl_hdrs_callback(char *, size_t, size_t, void *) */
-static size_t http_curl_hdrs_callback(char *buf, size_t len, size_t n, void *s)
+/* {{{ static int http_curl_progress_callback(void *, double, double, double, double) */
+static int http_curl_progress_callback(void *data, double dltotal, double dlnow, double ultotal, double ulnow)
{
+ zval *params_pass[4], params_local[4], retval, *func = (zval *) data;
TSRMLS_FETCH();
- /* discard previous headers */
- if (HTTP_G(curlbuf).used && (!strncmp(buf, "HTTP/1.", sizeof("HTTP/1.") - 1))) {
- phpstr_free(&HTTP_G(curlbuf));
- }
+ params_pass[0] = ¶ms_local[0];
+ params_pass[1] = ¶ms_local[1];
+ params_pass[2] = ¶ms_local[2];
+ params_pass[3] = ¶ms_local[3];
- phpstr_append(&HTTP_G(curlbuf), buf, len *= n);
- return len;
+ ZVAL_DOUBLE(params_pass[0], dltotal);
+ ZVAL_DOUBLE(params_pass[1], dlnow);
+ ZVAL_DOUBLE(params_pass[2], ultotal);
+ ZVAL_DOUBLE(params_pass[3], ulnow);
+
+ return call_user_function(EG(function_table), NULL, func, &retval, 4, params_pass TSRMLS_CC);
}
/* }}} */
-/* {{{ static inline zval *http_curl_getopt(HashTable *, char *, int, ...) */
-static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, int checks, ...)
+static int http_curl_debug_callback(CURL *ch, curl_infotype type, char *string, size_t length, void *data)
+{
+ zval *params_pass[2], params_local[2], retval, *func = (zval *) data;
+ TSRMLS_FETCH();
+
+ params_pass[0] = ¶ms_local[0];
+ params_pass[1] = ¶ms_local[1];
+
+ ZVAL_LONG(params_pass[0], type);
+ ZVAL_STRINGL(params_pass[1], string, length, 1);
+
+ call_user_function(EG(function_table), NULL, func, &retval, 2, params_pass TSRMLS_CC);
+
+ return 0;
+}
+/* {{{ 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;
- va_list types;
- int i;
- 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;
}
- if (checks < 1) {
- return *zoption;
- }
- va_start(types, checks);
- for (i = 0; i < checks; ++i) {
- if ((va_arg(types, int)) == (Z_TYPE_PP(zoption))) {
- va_end(types);
- return *zoption;
+ if (Z_TYPE_PP(zoption) != type) {
+ switch (type)
+ {
+ case IS_BOOL: convert_to_boolean_ex(zoption); break;
+ case IS_LONG: convert_to_long_ex(zoption); break;
+ case IS_DOUBLE: convert_to_double_ex(zoption); break;
+ case IS_STRING: convert_to_string_ex(zoption); break;
+ case IS_ARRAY: convert_to_array_ex(zoption); break;
+ case IS_OBJECT: convert_to_object_ex(zoption); break;
+ default:
+ break;
}
}
- va_end(types);
- return NULL;
+
+ return *zoption;
}
/* }}} */
-/* {{{ static void http_curl_setopts(CURL *, char *, HashTable *) */
-static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC)
+/* {{{ static void http_curl_setopts(CURL *, char *, HashTable *, phpstr *) */
+static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options, phpstr *response TSRMLS_DC)
{
zval *zoption;
zend_bool range_req = 0;
+#define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt(ch, CURLOPT_##OPTION, (p))
+
/* 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);
- curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, http_curl_hdrs_callback);
+ 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_write_callback);
+ HTTP_CURL_OPT(HEADERFUNCTION, http_curl_write_callback);
+
+ if (response) {
+ HTTP_CURL_OPT(WRITEDATA, response);
+ HTTP_CURL_OPT(WRITEHEADER, response);
+ }
+
#if defined(ZTS) && (LIBCURL_VERSION_NUM >= 0x070a00)
- curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1);
+ HTTP_CURL_OPT(NOSIGNAL, 1);
+#endif
+#if LIBCURL_VERSION_NUM < 0x070c00
+ HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(curlerr));
#endif
- if ((!options) || (1 > zend_hash_num_elements(options))) {
- return;
+ /* progress callback */
+ 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, zoption);
+ } else {
+ HTTP_CURL_OPT(NOPROGRESS, 1);
+ }
+
+ /* debug callback */
+ if (zoption = http_curl_getopt(options, "ondebug", 0)) {
+ HTTP_CURL_OPT(VERBOSE, 1);
+ HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_debug_callback);
+ HTTP_CURL_OPT(DEBUGDATA, zoption);
+ } else {
+ HTTP_CURL_OPT(VERBOSE, 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_getopt(options, "proxyhost", IS_STRING)) {
+ HTTP_CURL_OPT(PROXY, http_curl_copystr(Z_STRVAL_P(zoption)));
/* port */
- if (zoption = http_curl_getopt1(options, "proxyport", IS_LONG)) {
- curl_easy_setopt(ch, CURLOPT_PROXYPORT, Z_LVAL_P(zoption));
+ if (zoption = http_curl_getopt(options, "proxyport", IS_LONG)) {
+ HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption));
}
/* user:pass */
- if (zoption = http_curl_getopt1(options, "proxyauth", IS_STRING)) {
- curl_easy_setopt(ch, CURLOPT_PROXYUSERPWD, http_curl_copystr(Z_STRVAL_P(zoption)));
+ if (zoption = http_curl_getopt(options, "proxyauth", IS_STRING)) {
+ HTTP_CURL_OPT(PROXYUSERPWD, http_curl_copystr(Z_STRVAL_P(zoption)));
}
#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));
+ if (zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG)) {
+ HTTP_CURL_OPT(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)));
+ if (zoption = http_curl_getopt(options, "interface", IS_STRING)) {
+ HTTP_CURL_OPT(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));
+ if (zoption = http_curl_getopt(options, "port", IS_LONG)) {
+ HTTP_CURL_OPT(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 (zoption = http_curl_getopt(options, "httpauth", IS_STRING)) {
+ HTTP_CURL_OPT(USERPWD, http_curl_copystr(Z_STRVAL_P(zoption)));
}
#if LIBCURL_VERSION_NUM >= 0x070a06
- if (zoption = http_curl_getopt1(options, "httpauthtype", IS_LONG)) {
- curl_easy_setopt(ch, CURLOPT_HTTPAUTH, Z_LVAL_P(zoption));
+ if (zoption = http_curl_getopt(options, "httpauthtype", IS_LONG)) {
+ HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption));
}
#endif
/* compress, empty string enables deflate and gzip */
- if (zoption = http_curl_getopt2(options, "compress", IS_LONG, IS_BOOL)) {
+ if (zoption = http_curl_getopt(options, "compress", IS_BOOL)) {
if (Z_LVAL_P(zoption)) {
- curl_easy_setopt(ch, CURLOPT_ENCODING, "");
+ HTTP_CURL_OPT(ENCODING, http_curl_copystr(""));
}
}
/* 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));
+ 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)) {
+ HTTP_CURL_OPT(UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
}
} else {
- curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, 0);
+ HTTP_CURL_OPT(FOLLOWLOCATION, 0);
}
/* referer */
- if (zoption = http_curl_getopt1(options, "referer", IS_STRING)) {
- curl_easy_setopt(ch, CURLOPT_REFERER, http_curl_copystr(Z_STRVAL_P(zoption)));
+ if (zoption = http_curl_getopt(options, "referer", IS_STRING)) {
+ HTTP_CURL_OPT(REFERER, http_curl_copystr(Z_STRVAL_P(zoption)));
}
/* useragent, default "PECL::HTTP/version (PHP/version)" */
- if (zoption = http_curl_getopt1(options, "useragent", IS_STRING)) {
- curl_easy_setopt(ch, CURLOPT_USERAGENT, http_curl_copystr(Z_STRVAL_P(zoption)));
+ if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) {
+ HTTP_CURL_OPT(USERAGENT, http_curl_copystr(Z_STRVAL_P(zoption)));
} else {
- curl_easy_setopt(ch, CURLOPT_USERAGENT,
+ HTTP_CURL_OPT(USERAGENT,
"PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")");
}
/* additional headers, array('name' => 'value') */
- if (zoption = http_curl_getopt1(options, "headers", IS_ARRAY)) {
+ if (zoption = http_curl_getopt(options, "headers", IS_ARRAY)) {
char *header_key;
long header_idx;
struct curl_slist *headers = NULL;
}
if (headers) {
- curl_easy_setopt(ch, CURLOPT_HTTPHEADER, headers);
+ HTTP_CURL_OPT(HTTPHEADER, headers);
}
}
/* cookies, array('name' => 'value') */
- if (zoption = http_curl_getopt1(options, "cookies", IS_ARRAY)) {
+ if (zoption = http_curl_getopt(options, "cookies", IS_ARRAY)) {
char *cookie_key = NULL;
long cookie_idx = 0;
phpstr *qstr = phpstr_new();
if (qstr->used) {
phpstr_fix(qstr);
- curl_easy_setopt(ch, CURLOPT_COOKIE, http_curl_copystr(qstr->data));
+ HTTP_CURL_OPT(COOKIE, http_curl_copystr(qstr->data));
}
- phpstr_dtor(qstr);
+ phpstr_free(qstr);
}
/* cookiestore */
- if (zoption = http_curl_getopt1(options, "cookiestore", IS_STRING)) {
- curl_easy_setopt(ch, CURLOPT_COOKIEFILE, http_curl_copystr(Z_STRVAL_P(zoption)));
- curl_easy_setopt(ch, CURLOPT_COOKIEJAR, http_curl_copystr(Z_STRVAL_P(zoption)));
+ if (zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) {
+ HTTP_CURL_OPT(COOKIEFILE, http_curl_copystr(Z_STRVAL_P(zoption)));
+ HTTP_CURL_OPT(COOKIEJAR, http_curl_copystr(Z_STRVAL_P(zoption)));
}
/* resume */
- if (zoption = http_curl_getopt1(options, "resume", IS_LONG)) {
+ if (zoption = http_curl_getopt(options, "resume", IS_LONG)) {
range_req = 1;
- curl_easy_setopt(ch, CURLOPT_RESUME_FROM, Z_LVAL_P(zoption));
+ HTTP_CURL_OPT(RESUME_FROM, Z_LVAL_P(zoption));
}
/* maxfilesize */
- if (zoption = http_curl_getopt1(options, "maxfilesize", IS_LONG)) {
- curl_easy_setopt(ch, CURLOPT_MAXFILESIZE, Z_LVAL_P(zoption));
+ if (zoption = http_curl_getopt(options, "maxfilesize", IS_LONG)) {
+ HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption));
}
/* 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));
+ if (zoption = http_curl_getopt(options, "lastmodified", IS_LONG)) {
+ HTTP_CURL_OPT(TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE);
+ HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption));
}
/* timeout */
- if (zoption = http_curl_getopt1(options, "timeout", IS_LONG)) {
- curl_easy_setopt(ch, CURLOPT_TIMEOUT, Z_LVAL_P(zoption));
+ if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) {
+ HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption));
+ }
+
+ /* connecttimeout, defaults to 1 */
+ if (zoption = http_curl_getopt(options, "connecttimeout", IS_LONG)) {
+ HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption));
+ } else {
+ HTTP_CURL_OPT(CONNECTTIMEOUT, 1);
+ }
+
+ /* ssl */
+ if (zoption = http_curl_getopt(options, "ssl", IS_ARRAY)) {
+#define HTTP_CURL_OPT_STRING(keyname) HTTP_CURL_OPT_STRING_EX(keyname, keyname)
+#define HTTP_CURL_OPT_SSL_STRING(keyname) HTTP_CURL_OPT_STRING_EX(keyname, SSL##keyname)
+#define HTTP_CURL_OPT_SSL_STRING_(keyname) HTTP_CURL_OPT_STRING_EX(keyname, SSL_##keyname)
+#define HTTP_CURL_OPT_STRING_EX(keyname, optname) \
+ if (!strcasecmp(key, #keyname)) { \
+ convert_to_string_ex(param); \
+ HTTP_CURL_OPT(optname, http_curl_copystr(Z_STRVAL_PP(param))); \
+ key = NULL; \
+ continue; \
+ }
+#define HTTP_CURL_OPT_LONG(keyname) HTTP_OPT_SSL_LONG_EX(keyname, keyname)
+#define HTTP_CURL_OPT_SSL_LONG(keyname) HTTP_CURL_OPT_LONG_EX(keyname, SSL##keyname)
+#define HTTP_CURL_OPT_SSL_LONG_(keyname) HTTP_CURL_OPT_LONG_EX(keyname, SSL_##keyname)
+#define HTTP_CURL_OPT_LONG_EX(keyname, optname) \
+ if (!strcasecmp(key, #keyname)) { \
+ convert_to_long_ex(param); \
+ HTTP_CURL_OPT(optname, Z_LVAL_PP(param)); \
+ key = NULL; \
+ continue; \
}
- /* connecttimeout */
- if (zoption = http_curl_getopt1(options, "connecttimeout", IS_LONG)) {
- curl_easy_setopt(ch, CURLOPT_CONNECTTIMEOUT, Z_LVAL_P(zoption));
+ long idx;
+ char *key = NULL;
+ zval **param;
+
+ FOREACH_KEYVAL(zoption, key, idx, param) {
+ if (key) {fprintf(stderr, "%s\n", key);
+ HTTP_CURL_OPT_SSL_STRING(CERT);
+#if LIBCURL_VERSION_NUM >= 0x070903
+ HTTP_CURL_OPT_SSL_STRING(CERTTYPE);
+#endif
+ HTTP_CURL_OPT_SSL_STRING(CERTPASSWD);
+
+ HTTP_CURL_OPT_SSL_STRING(KEY);
+ HTTP_CURL_OPT_SSL_STRING(KEYTYPE);
+ HTTP_CURL_OPT_SSL_STRING(KEYPASSWD);
+
+ HTTP_CURL_OPT_SSL_STRING(ENGINE);
+ HTTP_CURL_OPT_SSL_LONG(VERSION);
+
+ HTTP_CURL_OPT_SSL_LONG_(VERIFYPEER);
+ 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);
+#endif
+ HTTP_CURL_OPT_STRING(RANDOM_FILE);
+ HTTP_CURL_OPT_STRING(EGDSOCKET);
+
+ /* reset key */
+ key = NULL;
+ }
+ }
+ } else {
+ /* disable SSL verification by default */
+ HTTP_CURL_OPT(SSL_VERIFYPEER, 0);
+ HTTP_CURL_OPT(SSL_VERIFYHOST, 0);
}
}
/* }}} */
}
/* }}} */
-/* {{{ STATUS http_get_ex(CURL *, char *, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options,
- HashTable *info, char **data, size_t *data_len TSRMLS_DC)
+/* {{{ STATUS http_get_ex(CURL *, char *, HashTable *, HashTable *, phpstr *) */
+PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC)
{
zend_bool clean_curl = 0;
- http_curl_startup(ch, clean_curl, URL, options);
+ http_curl_startup(ch, clean_curl, URL, options, response);
curl_easy_setopt(ch, CURLOPT_HTTPGET, 1);
- http_curl_perform(ch, clean_curl);
+ http_curl_perform(ch, clean_curl, response);
if (info) {
http_curl_getinfo(ch, info);
}
- http_curl_copybuf(data, data_len);
- http_curl_cleanup(ch, clean_curl);
+ http_curl_cleanup(ch, clean_curl, response);
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)
+/* {{{ STATUS http_head_ex(CURL *, char *, HashTable *, HashTable *, phpstr *) */
+PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options,HashTable *info, phpstr *response TSRMLS_DC)
{
zend_bool clean_curl = 0;
- http_curl_startup(ch, clean_curl, URL, options);
+ http_curl_startup(ch, clean_curl, URL, options, response);
curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
- http_curl_perform(ch, clean_curl);
+ http_curl_perform(ch, clean_curl, response);
if (info) {
http_curl_getinfo(ch, info);
}
- http_curl_copybuf(data, data_len);
- http_curl_cleanup(ch, clean_curl);
+ http_curl_cleanup(ch, clean_curl, response);
return SUCCESS;
}
-/* {{{ STATUS http_post_data_ex(CURL *, char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
+/* {{{ STATUS http_post_data_ex(CURL *, char *, char *, size_t, HashTable *, HashTable *, phpstr *) */
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)
+ size_t postdata_len, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC)
{
zend_bool clean_curl = 0;
- http_curl_startup(ch, clean_curl, URL, options);
+ http_curl_startup(ch, clean_curl, URL, options, response);
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);
+ http_curl_perform(ch, clean_curl, response);
if (info) {
http_curl_getinfo(ch, info);
}
- http_curl_copybuf(data, data_len);
- http_curl_cleanup(ch, clean_curl);
+ http_curl_cleanup(ch, clean_curl, response);
return SUCCESS;
}
/* }}} */
-/* {{{ STATUS http_post_array_ex(CURL *, char *, HashTable *, HashTable *, HashTable *, char **, size_t *) */
+/* {{{ STATUS http_post_array_ex(CURL *, char *, HashTable *, HashTable *, HashTable *, phpstr *) */
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)
+ HashTable *options, HashTable *info, phpstr *response TSRMLS_DC)
{
STATUS status;
char *encoded;
size_t encoded_len;
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_error(E_WARNING, HTTP_E_ENCODE, "Could not encode post data");
return FAILURE;
}
- status = http_post_data_ex(ch, URL, encoded, encoded_len, options, info, data, data_len);
+ status = http_post_data_ex(ch, URL, encoded, encoded_len, options, info, response);
efree(encoded);
-
+
return status;
}
/* }}} */
-/* {{{ STATUS http_post_curldata_ex(CURL *, char *, curl_httppost *, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL,
- struct curl_httppost *curldata, HashTable *options, HashTable *info,
- char **data, size_t *data_len TSRMLS_DC)
+/* {{{ STATUS http_post_curldata_ex(CURL *, char *, curl_httppost *, HashTable *, HashTable *, phpstr *) */
+PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL, struct curl_httppost *curldata,
+ HashTable *options, HashTable *info, phpstr *response TSRMLS_DC)
{
zend_bool clean_curl = 0;
- http_curl_startup(ch, clean_curl, URL, options);
+ http_curl_startup(ch, clean_curl, URL, options, response);
curl_easy_setopt(ch, CURLOPT_POST, 1);
curl_easy_setopt(ch, CURLOPT_HTTPPOST, curldata);
- http_curl_perform(ch, clean_curl);
+ http_curl_perform(ch, clean_curl, response);
if (info) {
http_curl_getinfo(ch, info);
}
- http_curl_copybuf(data, data_len);
- http_curl_cleanup(ch, clean_curl);
+ http_curl_cleanup(ch, clean_curl, response);
return SUCCESS;
}
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
-
projects / m6w6 / ext-http / blobdiff