-#include <curl/curl.h>
-
-typedef enum {
- HTTP_NO_REQUEST_METHOD = 0,
- /* HTTP/1.1 */
- HTTP_GET = 1,
- HTTP_HEAD = 2,
- HTTP_POST = 3,
- HTTP_PUT = 4,
- HTTP_DELETE = 5,
- HTTP_OPTIONS = 6,
- HTTP_TRACE = 7,
- HTTP_CONNECT = 8,
- /* WebDAV - RFC 2518 */
- HTTP_PROPFIND = 9,
- HTTP_PROPPATCH = 10,
- HTTP_MKCOL = 11,
- HTTP_COPY = 12,
- HTTP_MOVE = 13,
- HTTP_LOCK = 14,
- HTTP_UNLOCK = 15,
- /* WebDAV Versioning - RFC 3253 */
- HTTP_VERSION_CONTROL = 16,
- HTTP_REPORT = 17,
- HTTP_CHECKOUT = 18,
- HTTP_CHECKIN = 19,
- HTTP_UNCHECKOUT = 20,
- HTTP_MKWORKSPACE = 21,
- HTTP_UPDATE = 22,
- HTTP_LABEL = 23,
- HTTP_MERGE = 24,
- HTTP_BASELINE_CONTROL = 25,
- HTTP_MKACTIVITY = 26,
- /* WebDAV Access Control - RFC 3744 */
- HTTP_ACL = 27,
- HTTP_MAX_REQUEST_METHOD = 28
-} http_request_method;
-
-#define HTTP_REQUEST_BODY_CSTRING 0
-#define HTTP_REQUEST_BODY_CURLPOST 1
-#define HTTP_REQUEST_BODY_UPLOADFILE 2
-#define HTTP_REQUEST_BODY_UPLOADDATA 3
-typedef struct {
- int type;
- void *data;
- size_t size;
-} http_request_body;
-
-#define http_request_method_string(m) _http_request_method((m))
-PHP_HTTP_API const char *_http_request_method_string(http_request_method m);
-
-#define http_request_body_fill(b, fields, files) _http_request_body_fill((b), (fields), (files) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *fields, HashTable *files TSRMLS_DC);
-
-#define http_request_body_dtor(b) _http_request_body_dtor((b) TSRMLS_CC)
-PHP_HTTP_API void _http_request_body_dtor(http_request_body *body TSRMLS_DC);
-
-#define http_request(meth, url, body, opt, info, resp) _http_request_ex(NULL, (meth), (url), (body), (opt), (info), (resp) TSRMLS_CC)
-#define http_request_ex(ch, meth, url, body, opt, info, resp) _http_request_ex((ch), (meth), (url), (body), (opt), (info), (resp) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const char *URL, http_request_body *body, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC);
-
-#define http_get(u, o, i, r) _http_request_ex(NULL, HTTP_GET, (u), NULL, (o), (i), (r) TSRMLS_CC)
-#define http_get_ex(c, u, o, i, r) _http_request_ex((c), HTTP_GET, (u), NULL, (o), (i), (r) TSRMLS_CC)
-
-#define http_head(u, o, i, r) _http_request_ex(NULL, HTTP_HEAD, (u), NULL, (o), (i), (r) TSRMLS_CC)
-#define http_head_ex(c, u, o, i, r) _http_request_ex((c), HTTP_HEAD, (u), NULL, (o), (i), (r) TSRMLS_CC)
-
-#define http_post(u, b, o, i, r) _http_request_ex(NULL, HTTP_POST, (u), (b), (o), (i), (r) TSRMLS_CC)
-#define http_post_ex(c, u, b, o, i, r) _http_request_ex((c), HTTP_POST, (u), (b), (o), (i), (r) TSRMLS_CC)
-
-#define http_put(u, b, o, i, r) _http_request_ex(NULL, HTTP_PUT, (u), (b), (o), (i), (r) TSRMLS_CC)
-#define http_put_ex(c, u, b, o, i, r) _http_request_ex((c), HTTP_PUT, (u), (b), (o), (i), (r) TSRMLS_CC)
+ uint _in_progress_cb:1;
+
+} http_request;
+
+#define http_curl_init(r) http_curl_init_ex(NULL, (r))
+#define http_curl_init_ex(c, r) _http_curl_init_ex((c), (r) TSRMLS_CC)
+PHP_HTTP_API CURL *_http_curl_init_ex(CURL *ch, http_request *request TSRMLS_DC);
+
+#define http_curl_free(c) _http_curl_free((c) TSRMLS_CC)
+PHP_HTTP_API void _http_curl_free(CURL **ch TSRMLS_DC);
+
+#define http_curl_copy(c) _http_curl_copy((c) TSRMLS_CC)
+PHP_HTTP_API CURL *_http_curl_copy(CURL *ch TSRMLS_DC);
+
+#define http_request_new() _http_request_init_ex(NULL, NULL, 0, NULL ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC)
+#define http_request_init(r) _http_request_init_ex((r), NULL, 0, NULL ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC)
+#define http_request_init_ex(r, c, m, u) _http_request_init_ex((r), (c), (m), (u) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC)
+PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch, http_request_method meth, const char *url ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC);
+
+#define http_request_dtor(r) _http_request_dtor((r))
+PHP_HTTP_API void _http_request_dtor(http_request *request);
+
+#define http_request_free(r) _http_request_free((r))
+PHP_HTTP_API void _http_request_free(http_request **request);
+
+#define http_request_reset(r) _http_request_reset(r)
+PHP_HTTP_API void _http_request_reset(http_request *r);