X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=php_http_misc.h;h=16a7be8255d8d3c753dcfd73c77a3f74e9a348ce;hb=bd80b17b026a00a254ee8693cd7bacf1ebdec4cf;hp=cbb2d3d155d2d9d64a5bc2d3facaf7d5eea26237;hpb=516f722a0c4c2b0f195cc71a55e05b2e935c8733;p=m6w6%2Fext-http

diff --git a/php_http_misc.h b/php_http_misc.h
index cbb2d3d..16a7be8 100644
--- a/php_http_misc.h
+++ b/php_http_misc.h
@@ -79,10 +79,10 @@ PHP_HTTP_API void php_http_sleep(double s);
 #define PHP_HTTP_MATCH_FULL		0x20
 #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);
+int php_http_match(const char *haystack, const char *needle, int flags);
+char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen);
+size_t php_http_boundary(char *buf, size_t len TSRMLS_DC);
+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)
 {
@@ -139,7 +139,9 @@ static inline const char *php_http_locate_bin_eol(const char *bin, size_t len, i
 
 	for (eol = bin; eol - bin < len; ++eol) {
 		if (*eol == '\r' || *eol == '\n') {
-			*eol_len = eol ? ((eol[0] == '\r' && eol[1] == '\n') ? 2 : 1) : 0;
+			if (eol_len) {
+				*eol_len = eol ? ((eol[0] == '\r' && eol[1] == '\n') ? 2 : 1) : 0;
+			}
 			return eol;
 		}
 	}
@@ -270,6 +272,7 @@ static inline zval *php_http_zsep(zend_bool add_ref, int type, zval *z) {
 #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}
 
@@ -400,8 +403,8 @@ typedef struct php_http_array_hashkey {
 #define ARRAY_JOIN_PRETTIFY 2
 #define array_join(src, dst, append, flags) zend_hash_apply_with_arguments(src TSRMLS_CC, (append)?php_http_array_apply_append_func:php_http_array_apply_merge_func, 2, dst, (int)flags)
 
-extern int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key);
-extern int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key);
+int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key);
+int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key);
 
 /* PASS CALLBACK */
 
@@ -415,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, ...);
@@ -447,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,