X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=573b2a4f835d58ae444f66f09001d1413e0e1be5;hp=2c54e2b3acfd939036e189843e52225f99c82a6a;hb=e6b35fbe072a13b0e792952852fcd1499bd8e610;hpb=ab7ffb9d04418a394dec4604f88a3aa5d94b9a08 diff --git a/php_http_api.h b/php_http_api.h index 2c54e2b..573b2a4 100644 --- a/php_http_api.h +++ b/php_http_api.h @@ -29,14 +29,6 @@ PHP_HTTP_API long _http_support(long feature); #define pretty_key(key, key_len, uctitle, xhyphen) _http_pretty_key(key, key_len, uctitle, xhyphen) extern char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen); -typedef void (*http_key_list_decode_t)(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC); -#define http_key_list_default_decoder _http_key_list_default_decoder -extern void _http_key_list_default_decoder(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC); - -#define http_parse_cookie(l, i) _http_parse_key_list((l), (i), ';', http_key_list_default_decoder, 1 TSRMLS_CC) -#define http_parse_key_list(l, i, s, d, f) _http_parse_key_list((l), (i), (s), (d), (f) TSRMLS_CC) -extern STATUS _http_parse_key_list(const char *list, HashTable *items, char separator, http_key_list_decode_t decode, zend_bool first_entry_is_name_value_pair TSRMLS_DC); - #define http_error(type, code, string) _http_error_ex(type, code, "%s", string) #define http_error_ex _http_error_ex extern void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...); @@ -162,7 +154,7 @@ static inline zval *_convert_to_type(int type, zval *z) case IS_NULL: convert_to_null(z); break; case IS_BOOL: convert_to_boolean(z); break; case IS_LONG: convert_to_long(z); break; - case IS_DOUBLE: convert_to_array(z); break; + case IS_DOUBLE: convert_to_double(z); break; case IS_STRING: convert_to_string(z); break; case IS_ARRAY: convert_to_array(z); break; case IS_OBJECT: convert_to_object(z); break; @@ -180,7 +172,7 @@ static inline zval *_convert_to_type_ex(int type, zval *z, zval **p) case IS_NULL: convert_to_null_ex(&z); break; case IS_BOOL: convert_to_boolean_ex(&z); break; case IS_LONG: convert_to_long_ex(&z); break; - case IS_DOUBLE: convert_to_array_ex(&z); break; + case IS_DOUBLE: convert_to_double_ex(&z); break; case IS_STRING: convert_to_string_ex(&z); break; case IS_ARRAY: convert_to_array_ex(&z); break; case IS_OBJECT: convert_to_object_ex(&z); break;