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

diff --git a/php_http_api.h b/php_http_api.h
index 2c54e2b..a7349b2 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -21,6 +21,11 @@
 #define HTTP_SUPPORT_ENCODINGS		0x08L
 #define HTTP_SUPPORT_SSLREQUESTS	0x20L
 
+#define HTTP_PARAMS_ALLOW_COMMA		0x01
+#define HTTP_PARAMS_ALLOW_FAILURE	0x02
+#define HTTP_PARAMS_RAISE_ERROR		0x04
+#define HTTP_PARAMS_DEFAULT	(HTTP_PARAMS_ALLOW_COMMA|HTTP_PARAMS_ALLOW_FAILURE|HTTP_PARAMS_RAISE_ERROR)
+
 extern PHP_MINIT_FUNCTION(http_support);
 
 #define http_support(f) _http_support(f)
@@ -29,14 +34,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, ...);
@@ -127,19 +124,35 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
 #define http_get_request_body_stream() _http_get_request_body_stream(TSRMLS_C)
 PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D);
 
+
+typedef void (*http_parse_params_callback)(void *cb_arg, const char *key, int keylen, const char *val, int vallen TSRMLS_DC);
+
+#define http_parse_params_default_callback _http_parse_params_default_callback
+PHP_HTTP_API void _http_parse_params_default_callback(void *ht, const char *key, int keylen, const char *val, int vallen TSRMLS_DC);
+
+#define http_parse_params(s, f, ht) _http_parse_params_ex((s), (f), _http_parse_params_default_callback, (ht) TSRMLS_CC)
+#define http_parse_params_ex(s, f, cb, a) _http_parse_params_ex((s), (f), (cb), (a) TSRMLS_CC)
+PHP_HTTP_API STATUS _http_parse_params_ex(const char *params, int flags, http_parse_params_callback cb, void *cb_arg TSRMLS_DC);
+
+
 #define http_locate_body _http_locate_body
 static inline const char *_http_locate_body(const char *message)
 {
-	const char *cr = strstr(message, "\r\n\r\n");
-	const char *lf = strstr(message, "\n\n");
-
-	if (lf && cr) {
-		return MIN(lf + 2, cr + 4);
-	} else if (lf || cr) {
-		return MAX(lf + 2, cr + 4);
-	} else {
-		return NULL;
+	const char *body = NULL, *msg = message;
+	
+	while (*msg) {
+		if (*msg == '\n') {
+			if (*(msg+1) == '\n') {
+				body = msg + 2;
+				break;
+			} else if (*(msg+1) == '\r' && *(msg+2) == '\n' && msg != message && *(msg-1) == '\r') {
+				body = msg + 3;
+				break;
+			}
+		}
+		++msg;
 	}
+	return body;
 }
 
 #define http_locate_eol _http_locate_eol
@@ -157,12 +170,11 @@ static inline const char *_http_locate_eol(const char *line, int *eol_len)
 static inline zval *_convert_to_type(int type, zval *z)
 {
 	if (Z_TYPE_P(z) != type) {
-		switch (type)
-		{
+		switch (type) {
 			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;
@@ -175,12 +187,11 @@ static inline zval *_convert_to_type_ex(int type, zval *z, zval **p)
 {
 	*p = z;
 	if (Z_TYPE_P(z) != type) {
-		switch (type)
-		{
+		switch (type) {
 			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;