branch off v1 as R_1_7

[m6w6/ext-http] / php_http_request_api.h

diff --git a/php_http_request_api.h b/php_http_request_api.h
index 28e3a852e0f80624745097a2577e2ecb2dd1e0d5..bebceaebe8f90e49e1305af8c758d18ce2a86697 100644 (file)
--- a/php_http_request_api.h
+++ b/php_http_request_api.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -23,7 +23,7 @@
 extern PHP_MINIT_FUNCTION(http_request);
 extern PHP_MSHUTDOWN_FUNCTION(http_request);
 
-typedef struct {
+typedef struct _http_request_t {
        CURL *ch;
        char *url;
        http_request_method meth;
@@ -41,6 +41,11 @@ typedef struct {
                struct curl_slist *headers;
        } _cache;
        
+       struct {
+               uint count;
+               double delay;
+       } _retry;
+       
        char _error[CURL_ERROR_SIZE+1];
        zval *_progress_callback;
 
@@ -48,14 +53,44 @@ typedef struct {
        void ***tsrm_ls;
 #endif
 
+       uint _in_progress_cb:1;
+
 } http_request;
 
-#define http_curl_init(r) http_curl_init_ex(NULL, (r), (r)->_error)
-#define http_curl_init_ex(c, r, e) _http_curl_init_ex((c), (r), (e))
-PHP_HTTP_API CURL *_http_curl_init_ex(CURL *ch, void *context, char *error_buffer);
+#ifndef pestrndup
+#      define pestrndup(s,l,p) _pestrndup((s),(l),(p))
+static inline void *_pestrndup(const void *s, size_t l, int p)
+{
+       void *d = pemalloc(l+1, p);
+       memcpy(d, s, l);
+       ((char *) d)[l] = '\0';
+       return d;
+}
+#endif
+
+/* CURLOPT_PRIVATE storage living as long as a CURL handle */
+typedef struct _http_request_storage_t {
+       char *url;
+       char *cookiestore;
+       char errorbuffer[CURL_ERROR_SIZE];
+} http_request_storage;
+
+static inline http_request_storage *http_request_storage_get(CURL *ch)
+{
+       http_request_storage *st = NULL;
+       curl_easy_getinfo(ch, CURLINFO_PRIVATE, &st);
+       return st;
+}
+
+#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_free(c) _http_curl_free(c)
-PHP_HTTP_API void _http_curl_free(CURL **ch);
+#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)
@@ -71,6 +106,15 @@ 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);
 
+#define http_request_enable_cookies(r) _http_request_enable_cookies(r)
+PHP_HTTP_API STATUS _http_request_enable_cookies(http_request *request);
+
+#define http_request_reset_cookies(r, s) _http_request_reset_cookies((r), (s))
+PHP_HTTP_API STATUS _http_request_reset_cookies(http_request *request, int session_only);
+
+#define http_request_flush_cookies(r) _http_request_flush_cookies(r)
+PHP_HTTP_API STATUS _http_request_flush_cookies(http_request *request);
+
 #define http_request_defaults(r) _http_request_defaults(r)
 PHP_HTTP_API void _http_request_defaults(http_request *request);