X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_misc.h;h=35c8951df9a94cebadd6ae09eaede19b6f46e6d4;hp=bcf8d37834042b6cd180ef06d49b57cf6e90a15b;hb=3de3e5f65db0e7c24849c0e7c60c54a4e8566422;hpb=8d05291f42b3b42159b3fe91492aa4862f3d4405 diff --git a/php_http_misc.h b/php_http_misc.h index bcf8d37..35c8951 100644 --- a/php_http_misc.h +++ b/php_http_misc.h @@ -77,7 +77,7 @@ PHP_HTTP_API void php_http_sleep(double s); #define PHP_HTTP_MATCH_CASE 0x01 #define PHP_HTTP_MATCH_WORD 0x10 #define PHP_HTTP_MATCH_FULL 0x20 -#define PHP_HTTP_MATCH_STRICT (PHP_HTTP_ENV_MATCH_CASE|PHP_HTTP_ENV_MATCH_FULL) +#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); @@ -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}