- less custom macro cruft
[m6w6/ext-http] / php_http_misc.h
index 67fc711e2c96113bf72ed87a9e03dc10f5e62c1c..358c75bd2164d06fd104c7dd483e8a06bd46a0c0 100644 (file)
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* CR LF */
 #define PHP_HTTP_CRLF "\r\n"
 
-/* default cache control */
-#define PHP_HTTP_DEFAULT_CACHECONTROL "private, must-revalidate, max-age=0"
-
-/* max URL length */
-#define PHP_HTTP_URL_MAXLEN 4096
-
-/* max request method length */
-#define PHP_HTTP_REQUEST_METHOD_MAXLEN 31
-
 /* def URL arg separator */
 #define PHP_HTTP_URL_ARGSEP "&"
 
 /* send buffer size */
 #define PHP_HTTP_SENDBUF_SIZE 40960
 
-/* CURL buffer size */
-#define PHP_HTTP_CURLBUF_SIZE 16384
-
 /* SLEEP */
 
 #define PHP_HTTP_DIFFSEC (0.001)
@@ -104,25 +92,6 @@ static inline const char *php_http_locate_str(const char *h, size_t h_len, const
        return NULL;
 }
 
-static inline const char *php_http_locate_body(const char *message)
-{
-       const char *body = NULL, *msg = message;
-
-       while (*msg) {
-               if (*msg == '\n') {
-                       if (*(msg+1) == '\n') {
-                               body = msg + 2;
-                               break;
-                       } else if (*(msg+1) == '\r' && *(msg+2) == '\n') {
-                               body = msg + 3;
-                               break;
-                       }
-               }
-               ++msg;
-       }
-       return body;
-}
-
 static inline const char *php_http_locate_eol(const char *line, int *eol_len)
 {
        const char *eol = strpbrk(line, "\r\n");
@@ -137,7 +106,7 @@ static inline const char *php_http_locate_bin_eol(const char *bin, size_t len, i
 {
        const char *eol;
 
-       for (eol = bin; eol - bin <= len; ++eol) {
+       for (eol = bin; eol - bin < len; ++eol) {
                if (*eol == '\r' || *eol == '\n') {
                        if (eol_len) {
                                *eol_len = ((eol[0] == '\r' && eol[1] == '\n') ? 2 : 1);
@@ -228,9 +197,8 @@ static inline STATUS php_http_ini_entry(const char *name_str, size_t name_len, c
        return FAILURE;
 }
 
-/* return bool (v == SUCCESS) */
-#define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v))
-#define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v))
+STATUS php_http_method_call(zval *object, const char *method_str, size_t method_len, int argc, zval **argv[], zval **retval_ptr TSRMLS_DC);
+
 /* return object(values) */
 #define RETVAL_OBJECT(o, addref) \
        RETVAL_OBJVAL((o)->value.obj, addref)
@@ -248,29 +216,6 @@ static inline STATUS php_http_ini_entry(const char *name_str, size_t name_len, c
        if (addref && Z_OBJ_HT_P(zv)->add_ref) { \
                Z_OBJ_HT_P(zv)->add_ref((zv) TSRMLS_CC); \
        }
-/* return property */
-#define RETVAL_PROP(CE, n) RETVAL_PROP_EX(CE, getThis(), n)
-#define RETURN_PROP(CE, n) RETURN_PROP_EX(CE, getThis(), n)
-#define RETVAL_PROP_EX(CE, this, n) \
-       { \
-               zval *__prop = zend_read_property(CE, this, ZEND_STRL(n), 0 TSRMLS_CC); \
-               RETVAL_ZVAL(__prop, 1, 0); \
-       }
-#define RETURN_PROP_EX(CE, this, n) \
-       { \
-               zval *__prop = zend_read_property(CE, this, ZEND_STRL(n), 0 TSRMLS_CC); \
-               RETURN_ZVAL(__prop, 1, 0); \
-       }
-#define RETVAL_SPROP(CE, n) \
-       { \
-               zval *__prop = zend_read_static_property(CE, ZEND_STRL(n), 0 TSRMLS_CC); \
-               RETVAL_ZVAL(__prop, 1, 0); \
-       }
-#define RETURN_SPROP(CE, n) \
-       { \
-               zval *__prop = zend_read_static_property(CE, ZEND_STRL(n), 0 TSRMLS_CC); \
-               RETURN_ZVAL(__prop, 1, 0); \
-       }
 
 #define Z_OBJ_DELREF(z) \
        if (Z_OBJ_HT(z)->del_ref) { \
@@ -297,15 +242,6 @@ static inline STATUS php_http_ini_entry(const char *name_str, size_t name_len, c
                Z_OBJ_HT_PP(z)->add_ref(*(z) TSRMLS_CC); \
        }
 
-#define PHP_HTTP_BEGIN_ARGS_EX(class, method, ret_ref, req_args)       ZEND_BEGIN_ARG_INFO_EX(args_for_ ##class## _ ##method , 0, ret_ref, req_args)
-#define PHP_HTTP_BEGIN_ARGS_AR(class, method, ret_ref, req_args)       ZEND_BEGIN_ARG_INFO_EX(args_for_ ##class## _ ##method , 1, ret_ref, req_args)
-#define PHP_HTTP_END_ARGS                                                                                      }
-#define PHP_HTTP_EMPTY_ARGS_EX(class, method, ret_ref)                         PHP_HTTP_BEGIN_ARGS_EX(class, method, ret_ref, 0) PHP_HTTP_END_ARGS
-#define PHP_HTTP_ARGS(class, method)                                                           args_for_ ##class## _ ##method
-#define PHP_HTTP_ARG_VAL(name, pass_ref)                                                       ZEND_ARG_INFO(pass_ref, name)
-#define PHP_HTTP_ARG_OBJ(class, name, allow_null)                                      ZEND_ARG_OBJ_INFO(0, name, class, allow_null)
-#define PHP_HTTP_ARG_ARR(name, allow_null, pass_ref)                           ZEND_ARG_ARRAY_INFO(pass_ref, name, allow_null)
-
 #define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL, 0, 0}
 
 #define PHP_MINIT_CALL(func) PHP_MINIT(func)(INIT_FUNC_ARGS_PASSTHRU)
@@ -313,95 +249,6 @@ static inline STATUS php_http_ini_entry(const char *name_str, size_t name_len, c
 #define PHP_MSHUTDOWN_CALL(func) PHP_MSHUTDOWN(func)(SHUTDOWN_FUNC_ARGS_PASSTHRU)
 #define PHP_RSHUTDOWN_CALL(func) PHP_RSHUTDOWN(func)(SHUTDOWN_FUNC_ARGS_PASSTHRU)
 
-
-#define PHP_HTTP_INI_ENTRY(entry, default, scope, updater, global) \
-       STD_PHP_INI_ENTRY(entry, default, scope, updater, global, zend_php_http_globals, php_http_globals)
-#define PHP_HTTP_INI_ENTRY_EX(entry, default, scope, updater, displayer, global) \
-       STD_PHP_INI_ENTRY_EX(entry, default, scope, updater, global, zend_php_http_globals, php_http_globals, displayer)
-
-#define PHP_HTTP_REGISTER_CLASS(ns, classname, name, parent, flags) \
-       { \
-               zend_class_entry ce; \
-               memset(&ce, 0, sizeof(zend_class_entry)); \
-               INIT_NS_CLASS_ENTRY(ce, #ns, #classname, php_ ##name## _method_entry); \
-               php_ ##name## _class_entry = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
-               php_ ##name## _class_entry->ce_flags |= flags;  \
-               php_http_register_class(php_ ##name## _get_class_entry); \
-       }
-
-#define PHP_HTTP_REGISTER_INTERFACE(ns, ifacename, name, flags) \
-       { \
-               zend_class_entry ce; \
-               memset(&ce, 0, sizeof(zend_class_entry)); \
-               INIT_NS_CLASS_ENTRY(ce, #ns, #ifacename, php_ ##name## _method_entry); \
-               php_ ##name## _class_entry = zend_register_internal_interface(&ce TSRMLS_CC); \
-               php_ ##name## _class_entry->ce_flags |= flags; \
-               php_http_register_class(php_ ##name## _get_class_entry); \
-       }
-
-#define PHP_HTTP_REGISTER_EXCEPTION(classname, cename, parent) \
-       { \
-               zend_class_entry ce; \
-               memset(&ce, 0, sizeof(zend_class_entry)); \
-               INIT_NS_CLASS_ENTRY(ce, "http", #classname, NULL); \
-               ce.create_object = NULL; \
-               cename = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
-       }
-
-#define ACC_PROP_PRIVATE(ce, flags)            ((flags & ZEND_ACC_PRIVATE) && (EG(scope) && ce == EG(scope))
-#define ACC_PROP_PROTECTED(ce, flags)  ((flags & ZEND_ACC_PROTECTED) && (zend_check_protected(ce, EG(scope))))
-#define ACC_PROP_PUBLIC(flags)                 (flags & ZEND_ACC_PUBLIC)
-#define ACC_PROP(ce, flags)                            (ACC_PROP_PUBLIC(flags) || ACC_PROP_PRIVATE(ce, flags) || ACC_PROP_PROTECTED(ce, flags))
-
-#ifdef PHP_HTTP_HAVE_CURL
-#              define PHP_HTTP_DECLARE_ARG_PASS_INFO() \
-                       ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_2, 0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(1) \
-                       ZEND_END_ARG_INFO(); \
- \
-                       ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_3, 0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(1) \
-                       ZEND_END_ARG_INFO(); \
- \
-                       ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_4, 0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(1) \
-                       ZEND_END_ARG_INFO(); \
- \
-                       ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_5, 0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(1) \
-                       ZEND_END_ARG_INFO();
-
-#else
-#              define PHP_HTTP_DECLARE_ARG_PASS_INFO() \
-                       ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_2, 0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(1) \
-                       ZEND_END_ARG_INFO(); \
-\
-                       ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_3, 0) \
-                       ZEND_ARG_PASS_INFO(0) \
-                       ZEND_ARG_PASS_INFO(0) \
-                       ZEND_ARG_PASS_INFO(1) \
-                       ZEND_END_ARG_INFO(); \
-\
-                       ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_4, 0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(0) \
-                               ZEND_ARG_PASS_INFO(1) \
-                       ZEND_END_ARG_INFO();
-#endif /* PHP_HTTP_HAVE_CURL */
-
 /* ARRAYS */
 PHP_HTTP_API unsigned php_http_array_list(HashTable *ht TSRMLS_DC, unsigned argc, ...);
 
@@ -428,9 +275,6 @@ static inline void php_http_array_hashkey_stringfree(php_http_array_hashkey_t *k
        }
 }
 
-typedef void (*php_http_array_visitor_t)(void *visitor_arg, php_http_array_hashkey_t *key, zval **val TSRMLS_DC);
-PHP_HTTP_API void php_http_array_visit(HashTable *ht, php_http_array_visitor_t visitor_func, void *visitor_arg TSRMLS_DC);
-
 #define FOREACH_VAL(pos, array, val) FOREACH_HASH_VAL(pos, HASH_OF(array), val)
 #define FOREACH_HASH_VAL(pos, hash, val) \
        for (   zend_hash_internal_pointer_reset_ex(hash, &pos); \
@@ -462,13 +306,7 @@ int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list
 
 typedef size_t (*php_http_pass_callback_t)(void *cb_arg, const char *str, size_t len);
 typedef size_t (*php_http_pass_php_http_buffer_callback_t)(void *cb_arg, php_http_buffer_t *str);
-
-typedef struct php_http_pass_callback_arg {
-       size_t (*cb_zts)(void *cb_arg, const char *str, size_t len TSRMLS_DC);
-       void *cb_arg;
-} php_http_pass_callback_arg_t;
-
-PHP_HTTP_API size_t php_http_pass_wrapper(php_http_pass_callback_arg_t *cb_arg, const char *str, size_t len);
+typedef size_t (*php_http_pass_format_callback_t)(void *cb_arg, const char *fmt, ...);
 
 typedef struct php_http_pass_fcall_arg {
        zval *fcz;
@@ -525,6 +363,7 @@ typedef enum php_http_error {
 } php_http_error_t;
 
 #endif
+
 /*
  * Local variables:
  * tab-width: 4