- ditch TSRMLS_FETCH() occurences

[m6w6/ext-http] / php_http_request_api.h

diff --git a/php_http_request_api.h b/php_http_request_api.h
index ea7281ce7b640460c646862a6c440eb53f364077..3b773a3edbb939ba9d036449d7f81ef31526be68 100644 (file)
--- a/php_http_request_api.h
+++ b/php_http_request_api.h
@@ -17,8 +17,11 @@
 
 #ifndef PHP_HTTP_REQUEST_API_H
 #define PHP_HTTP_REQUEST_API_H
+#ifdef HTTP_HAVE_CURL
 
 #include "php_http_std_defs.h"
+#include "php_http_request_method_api.h"
+
 #include "phpstr/phpstr.h"
 
 #ifdef PHP_WIN32
@@ -27,45 +30,6 @@
 
 #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_STD_REQUEST_METHOD(m) ((m > HTTP_NO_REQUEST_METHOD) && (m < HTTP_MAX_REQUEST_METHOD))
-#define HTTP_CUSTOM_REQUEST_METHOD(m) (m - HTTP_MAX_REQUEST_METHOD)
-
 #define HTTP_REQUEST_BODY_CSTRING              1
 #define HTTP_REQUEST_BODY_CURLPOST             2
 #define HTTP_REQUEST_BODY_UPLOADFILE   3
@@ -78,13 +42,24 @@ typedef struct {
 typedef struct {
        void ***tsrm_ctx;
        void *data;
-} http_curl_callback_ctx;
+} http_request_callback_ctx;
 
 typedef struct {
        phpstr *response;
        phpstr *request;
        curl_infotype last_info;
-} http_curl_conv;
+} http_request_conv;
+
+
+#define HTTP_REQUEST_CALLBACK_DATA(from, type, var) \
+       http_request_callback_ctx *__CTX = (http_request_callback_ctx *) (from); \
+       TSRMLS_FETCH_FROM_CTX(__CTX->tsrm_ctx); \
+       type (var) = (type) (__CTX->data)
+
+#define http_request_callback_data(data) _http_request_callback_data_ex((data), 1 TSRMLS_CC)
+#define http_request_callback_data_ex(data, copy) _http_request_callback_data_ex((data), (copy) TSRMLS_CC)
+extern http_request_callback_ctx *_http_request_callback_data_ex(void *data, zend_bool cpy TSRMLS_DC);
+
 
 #define COPY_STRING            1
 #define        COPY_SLIST              2
@@ -104,18 +79,6 @@ extern void _http_request_data_free_conv(void *conv);
 #define http_request_conv(ch, rs, rq) _http_request_conv((ch), (rs), (rq) TSRMLS_CC)
 extern void _http_request_conv(CURL *ch, phpstr* response, phpstr *request TSRMLS_DC);
 
-#define http_request_method_name(m) _http_request_method_name((m) TSRMLS_CC)
-PHP_HTTP_API const char *_http_request_method_name(http_request_method m TSRMLS_DC);
-
-#define http_request_method_exists(u, l, c) _http_request_method_exists((u), (l), (c) TSRMLS_CC)
-PHP_HTTP_API unsigned long _http_request_method_exists(zend_bool by_name, unsigned long id, const char *name TSRMLS_DC);
-
-#define http_request_method_register(m) _http_request_method_register((m) TSRMLS_CC)
-PHP_HTTP_API unsigned long _http_request_method_register(const char *method TSRMLS_DC);
-
-#define http_request_method_unregister(mn) _http_request_method_unregister((mn) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_DC);
-
 #define http_request_body_new() _http_request_body_new(TSRMLS_C)
 PHP_HTTP_API http_request_body *_http_request_body_new(TSRMLS_D);
 
@@ -153,6 +116,7 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *U
 #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)
 
+#endif
 #endif
 
 /*
@@ -163,3 +127,4 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *U
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+