X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_api.h;h=cbbaf6f7dd1af2a55d34fc391f5fd835dfc7e825;hb=c565d29e26b3b8be1b24a08bec57081aafc33a58;hp=2c54e2b3acfd939036e189843e52225f99c82a6a;hpb=ab7ffb9d04418a394dec4604f88a3aa5d94b9a08;p=m6w6%2Fext-http

diff --git a/php_http_api.h b/php_http_api.h
index 2c54e2b..cbbaf6f 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -29,13 +29,8 @@ 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_parse_cookie(l, i) _http_parse_cookie((l), (i) TSRMLS_CC)
+PHP_HTTP_API STATUS _http_parse_cookie(const char *list, HashTable *items TSRMLS_DC);
 
 #define http_error(type, code, string) _http_error_ex(type, code, "%s", string)
 #define http_error_ex _http_error_ex
@@ -162,7 +157,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 +175,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;