- unroll loop

[m6w6/ext-http] / http_curl_api.c

diff --git a/http_curl_api.c b/http_curl_api.c
index e94e5dc732d5446e87022f22f4fc1ff2c7491541..9fc04fb2dbe1a473eaf1273c66cacd6ac7b3958f 100644 (file)
--- a/http_curl_api.c
+++ b/http_curl_api.c
@@ -85,10 +85,13 @@ 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 *);
+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);
@@ -102,20 +105,54 @@ static inline char *_http_curl_copystr(const char *str TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ static size_t http_curl_callback(char *, size_t, size_t, void *) */
-static size_t http_curl_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)
 {
-       phpstr_append(PHPSTR(s), buf, len *= n);
-       return len;
+       return s ? phpstr_append(PHPSTR(s), buf, len * n) : len * n;
 }
 /* }}} */
 
-/* {{{ static inline zval *http_curl_getopt(HashTable *, char *, int) */
-static inline zval *_http_curl_getopt(HashTable *options, char *key, int type TSRMLS_DC)
+/* {{{ 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();
+
+       params_pass[0] = &params_local[0];
+       params_pass[1] = &params_local[1];
+       params_pass[2] = &params_local[2];
+       params_pass[3] = &params_local[3];
+
+       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 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] = &params_local[0];
+       params_pass[1] = &params_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;
 
-       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;
        }
 
@@ -146,15 +183,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);
+       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)
        HTTP_CURL_OPT(NOSIGNAL, 1);
 #endif
@@ -162,6 +206,24 @@ static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options, ph
        HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(curlerr));
 #endif
 
+       /* 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_getopt(options, "proxyhost", IS_STRING)) {
                HTTP_CURL_OPT(PROXY, http_curl_copystr(Z_STRVAL_P(zoption)));
@@ -204,7 +266,7 @@ static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options, ph
        /* compress, empty string enables deflate and gzip */
        if (zoption = http_curl_getopt(options, "compress", IS_BOOL)) {
                if (Z_LVAL_P(zoption)) {
-                       HTTP_CURL_OPT(ENCODING, "");
+                       HTTP_CURL_OPT(ENCODING, http_curl_copystr(""));
                }
        }
 
@@ -325,7 +387,7 @@ static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options, ph
 #define HTTP_CURL_OPT_STRING_EX(keyname, optname) \
        if (!strcasecmp(key, #keyname)) { \
                convert_to_string_ex(param); \
-               HTTP_CURL_OPT(optname, Z_STRVAL_PP(param)); \
+               HTTP_CURL_OPT(optname, http_curl_copystr(Z_STRVAL_PP(param))); \
                key = NULL; \
                continue; \
        }