add current state of refactoring

[m6w6/ext-http] / php_http_misc.h

diff --git a/php_http_misc.h b/php_http_misc.h
index 35c8951df9a94cebadd6ae09eaede19b6f46e6d4..33be199507bcc68022032bd11af99267417507ee 100644 (file)
--- a/php_http_misc.h
+++ b/php_http_misc.h
@@ -80,9 +80,9 @@ PHP_HTTP_API void php_http_sleep(double s);
 #define PHP_HTTP_MATCH_STRICT  (PHP_HTTP_MATCH_CASE|PHP_HTTP_MATCH_FULL)
 
 extern int php_http_match(const char *haystack, const char *needle, int flags);
-
 extern char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen);
 extern size_t php_http_boundary(char *buf, size_t len TSRMLS_DC);
+extern int php_http_select_str(const char *cmp, int argc, ...);
 
 static inline const char *php_http_locate_str(const char *h, size_t h_len, const char *n, size_t n_len)
 {
@@ -418,6 +418,17 @@ typedef struct php_http_pass_callback_arg {
 
 PHP_HTTP_API size_t php_http_pass_wrapper(php_http_pass_callback_arg_t *cb_arg, const char *str, size_t len);
 
+typedef struct php_http_pass_fcall_arg {
+       zval *fcz;
+       zend_fcall_info fci;
+       zend_fcall_info_cache fcc;
+#ifdef ZTS
+       void ***ts;
+#endif
+} php_http_pass_fcall_arg_t;
+
+PHP_HTTP_API size_t php_http_pass_fcall_callback(void *cb_arg, const char *str, size_t len);
+
 /* ERROR */
 
 extern void php_http_error(long type TSRMLS_DC, long code, const char *format, ...);
@@ -450,9 +461,9 @@ typedef enum php_http_error {
        PHP_HTTP_E_MESSAGE_TYPE,
        PHP_HTTP_E_MESSAGE_BODY,
        PHP_HTTP_E_ENCODING,
-       PHP_HTTP_E_REQUEST,
-       PHP_HTTP_E_REQUEST_POOL,
-       PHP_HTTP_E_REQUEST_DATASHARE,
+       PHP_HTTP_E_CLIENT,
+       PHP_HTTP_E_CLIENT_POOL,
+       PHP_HTTP_E_CLIENT_DATASHARE,
        PHP_HTTP_E_REQUEST_FACTORY,
        PHP_HTTP_E_SOCKET,
        PHP_HTTP_E_RESPONSE,