X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=48e3c3151b4f6a9b5d130f2b0c3238e92f29de3e;hp=18b14e2cf1265803f1068167e21f9169f6dfb7ce;hb=dac9fc69ba6208b3a150ad447c0ede3b786a83c5;hpb=9ee138af54714e0fba18766313d8a738b52196fe

diff --git a/http_api.c b/http_api.c
index 18b14e2..48e3c31 100644
--- a/http_api.c
+++ b/http_api.c
@@ -22,6 +22,7 @@
 #include <ctype.h>
 
 #include "php.h"
+#include "ext/standard/url.h"
 
 #include "php_http.h"
 #include "php_http_std_defs.h"
@@ -60,6 +61,99 @@ char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool x
 }
 /* }}} */
 
+/* {{{ */
+void _http_key_list_default_decoder(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC)
+{
+	*decoded = estrndup(encoded, encoded_len);
+	*decoded_len = (size_t) php_url_decode(*decoded, encoded_len);
+}
+/* }}} */
+
+/* {{{ */
+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)
+{
+	const char *key = list, *val = NULL;
+	int vallen = 0, keylen = 0, done = 0;
+	zval array;
+
+	Z_ARRVAL(array) = items;
+
+	if (!(val = strchr(list, '='))) {
+		return FAILURE;
+	}
+
+#define HTTP_KEYLIST_VAL(array, k, str, len) \
+	{ \
+		char *decoded; \
+		size_t decoded_len; \
+		if (decode) { \
+			decode(str, len, &decoded, &decoded_len TSRMLS_CC); \
+		} else { \
+			decoded = estrdup(str); \
+			decoded_len = len; \
+		} \
+		add_assoc_stringl(array, k, decoded, decoded_len, 0); \
+	}
+#define HTTP_KEYLIST_FIXKEY() \
+	{ \
+			while (isspace(*key)) ++key; \
+			keylen = val - key; \
+			while (isspace(key[keylen - 1])) --keylen; \
+	}
+#define HTTP_KEYLIST_FIXVAL() \
+	{ \
+			++val; \
+			while (isspace(*val)) ++val; \
+			vallen = key - val; \
+			while (isspace(val[vallen - 1])) --vallen; \
+	}
+
+	HTTP_KEYLIST_FIXKEY();
+
+	if (first_entry_is_name_value_pair) {
+		HTTP_KEYLIST_VAL(&array, "name", key, keylen);
+
+		/* just one name=value */
+		if (!(key = strchr(val, separator))) {
+			key = val + strlen(val);
+			HTTP_KEYLIST_FIXVAL();
+			HTTP_KEYLIST_VAL(&array, "value", val, vallen);
+			goto list_done;
+		}
+		/* additional info appended */
+		else {
+			HTTP_KEYLIST_FIXVAL();
+			HTTP_KEYLIST_VAL(&array, "value", val, vallen);
+		}
+	}
+
+	do {
+		char *keydup = NULL;
+
+		if (!(val = strchr(key, '='))) {
+			break;
+		}
+
+		/* start at 0 if first_entry_is_name_value_pair==0 */
+		if (zend_hash_num_elements(items)) {
+			++key;
+		}
+
+		HTTP_KEYLIST_FIXKEY();
+		keydup = estrndup(key, keylen);
+		if (!(key = strchr(val, separator))) {
+			done = 1;
+			key = val + strlen(val);
+		}
+		HTTP_KEYLIST_FIXVAL();
+		HTTP_KEYLIST_VAL(&array, keydup, val, vallen);
+		efree(keydup);
+	} while (!done);
+
+list_done:
+	return SUCCESS;
+}
+
 /* {{{ void http_error(long, long, char*) */
 void _http_error_ex(long type, long code, const char *format, ...)
 {
@@ -192,19 +286,8 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
 }
 /* }}} */
 
-/* {{{ STATUS http_split_response(zval *, zval *, zval *) */
-PHP_HTTP_API STATUS _http_split_response(zval *response, zval *headers, zval *body TSRMLS_DC)
-{
-	char *b = NULL;
-	size_t l = 0;
-	STATUS status = http_split_response_ex(Z_STRVAL_P(response), Z_STRLEN_P(response), Z_ARRVAL_P(headers), &b, &l);
-	ZVAL_STRINGL(body, b, l, 0);
-	return status;
-}
-/* }}} */
-
 /* {{{ STATUS http_split_response(char *, size_t, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_split_response_ex(char *response, size_t response_len,
+PHP_HTTP_API STATUS _http_split_response(char *response, size_t response_len,
 	HashTable *headers, char **body, size_t *body_len TSRMLS_DC)
 {
 	char *header = response, *real_body = NULL;