- add curl_ioctl_callback

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index 5c5d67cba8c9cdfc832e33f4ab93507570e029cf..8d61558a73a3052799db5850f9ed23c5d3b40afd 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -146,10 +146,7 @@ PHP_MSHUTDOWN_FUNCTION(http_request)
                                MAKE_STD_ZVAL(subarray); \
                                array_init(subarray); \
                                for (p = l; p; p = p->next) { \
-                                       zval *entry; \
-                                       MAKE_STD_ZVAL(entry); \
-                                       ZVAL_STRING(entry, p->data, 1); \
-                                       add_next_index_zval(subarray, entry); \
+                                       add_next_index_string(subarray, p->data, 1); \
                                } \
                                add_assoc_zval(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), subarray); \
                                curl_slist_free_all(l); \
@@ -188,6 +185,7 @@ static size_t http_curl_read_callback(void *, size_t, size_t, void *);
 static int http_curl_progress_callback(void *, double, double, double, double);
 static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *);
 static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { return n*l; }
+static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *);
 
 /* {{{ http_request_callback_ctx http_request_callback_data(void *) */
 http_request_callback_ctx *_http_request_callback_data_ex(void *data, zend_bool cpy TSRMLS_DC)
@@ -421,6 +419,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
        HTTP_CURL_OPT(FILETIME, 1);
        HTTP_CURL_OPT(AUTOREFERER, 1);
        HTTP_CURL_OPT(READFUNCTION, http_curl_read_callback);
+       HTTP_CURL_OPT(IOCTLFUNCTION, http_curl_ioctl_callback);
        /* we'll get all data through the debug function */
        HTTP_CURL_OPT(WRITEFUNCTION, http_curl_dummy_callback);
        HTTP_CURL_OPT(HEADERFUNCTION, NULL);
@@ -684,6 +683,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
                        break;
 
                        case HTTP_REQUEST_BODY_UPLOADFILE:
+                               curl_easy_setopt(ch, CURLOPT_IOCTLDATA, http_request_callback_data(body));
                                curl_easy_setopt(ch, CURLOPT_READDATA, http_request_callback_data(body));
                                curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size);
                        break;
@@ -824,6 +824,24 @@ static int http_curl_progress_callback(void *data, double dltotal, double dlnow,
 }
 /* }}} */
 
+/* {{{ static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *) */
+static curlioerr http_curl_ioctl_callback(CURL *ch, curliocmd cmd, void *ctx)
+{
+       HTTP_REQUEST_CALLBACK_DATA(ctx, http_request_body *, body);
+       
+       if (cmd != CURLIOCMD_RESTARTREAD) {
+               return CURLIOE_UNKNOWNCMD;
+       }
+       if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) {
+               return CURLIOE_FAILRESTART;
+       }
+       if (SUCCESS != php_stream_rewind((php_stream *) body->data)) {
+               return CURLIOE_FAILRESTART;
+       }
+       return CURLIOE_OK;
+}
+/* }}} */
+
 /* {{{ static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *) */
 static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size_t length, void *ctx)
 {
@@ -1050,6 +1068,7 @@ static inline void _http_curl_defaults(CURL *ch)
        HTTP_CURL_OPT(POSTFIELDS, NULL);
        HTTP_CURL_OPT(POSTFIELDSIZE, 0);
        HTTP_CURL_OPT(HTTPPOST, NULL);
+       HTTP_CURL_OPT(IOCTLDATA, NULL);
        HTTP_CURL_OPT(READDATA, NULL);
        HTTP_CURL_OPT(INFILESIZE, 0);
 }