X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=96a8b66fb5ea573ec370f49d8cd704cfc0124767;hp=7d824525602ae4f45451392702fef9eb17b3f276;hb=ace08ce673845bc13aa2497182f881bcf5e32e17;hpb=654450f933ee1532cc1a52144f3e0e04c3ea3334

diff --git a/http_headers_api.c b/http_headers_api.c
index 7d82452..96a8b66 100644
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -366,78 +366,6 @@ PHP_HTTP_API void _http_parse_headers_default_callback(const char *http_line, Ha
 	}
 }
 
-/* {{{ */
-PHP_HTTP_API STATUS _http_parse_cookie(const char *cookie, HashTable *values TSRMLS_DC)
-{
-	const char *key = cookie, *val = NULL;
-	int vallen = 0, keylen = 0, done = 0;
-	zval array;
-
-	Z_ARRVAL(array) = values;
-
-	if (!(val = strchr(cookie, '='))) {
-		return FAILURE;
-	}
-
-#define HTTP_COOKIE_VAL(array, k, str, len) \
-	{ \
-		const char *encoded = str; \
-		char *decoded = NULL; \
-		int decoded_len = 0, encoded_len = len; \
-		decoded = estrndup(encoded, encoded_len); \
-		decoded_len = php_url_decode(decoded, encoded_len); \
-		add_assoc_stringl(array, k, decoded, decoded_len, 0); \
-	}
-#define HTTP_COOKIE_FIXKEY() \
-	{ \
-			while (isspace(*key)) ++key; \
-			keylen = val - key; \
-			while (isspace(key[keylen - 1])) --keylen; \
-	}
-#define HTTP_COOKIE_FIXVAL() \
-	{ \
-			++val; \
-			while (isspace(*val)) ++val; \
-			vallen = key - val; \
-			while (isspace(val[vallen - 1])) --vallen; \
-	}
-
-	HTTP_COOKIE_FIXKEY();
-	HTTP_COOKIE_VAL(&array, "name", key, keylen);
-
-	/* just a name=value cookie */
-	if (!(key = strchr(val, ';'))) {
-		key = val + strlen(val);
-		HTTP_COOKIE_FIXVAL();
-		HTTP_COOKIE_VAL(&array, "value", val, vallen);
-	}
-	/* additional info appended */
-	else {
-		char *keydup = NULL;
-
-		HTTP_COOKIE_FIXVAL();
-		HTTP_COOKIE_VAL(&array, "value", val, vallen);
-
-		do {
-			if (!(val = strchr(key, '='))) {
-				break;
-			}
-			++key;
-			HTTP_COOKIE_FIXKEY();
-			keydup = estrndup(key, keylen);
-			if (!(key = strchr(val, ';'))) {
-				done = 1;
-				key = val + strlen(val);
-			}
-			HTTP_COOKIE_FIXVAL();
-			HTTP_COOKIE_VAL(&array, keydup, val, vallen);
-			efree(keydup);
-		} while (!done);
-	}
-	return SUCCESS;
-}
-/* }}} */
-
 /* {{{ void http_get_request_headers_ex(HashTable *, zend_bool) */
 PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool prettify TSRMLS_DC)
 {
@@ -464,6 +392,36 @@ PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool pre
 }
 /* }}} */
 
+/* {{{ zend_bool http_match_request_header(char *, char *) */
+PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const char *value, zend_bool match_case TSRMLS_DC)
+{
+	char *name, *key = NULL;
+	ulong idx;
+	zend_bool result = 0;
+	HashTable headers;
+
+	name = pretty_key(estrdup(header), strlen(header), 1, 1);
+	zend_hash_init(&headers, 0, NULL, ZVAL_PTR_DTOR, 0);
+	http_get_request_headers_ex(&headers, 1);
+
+	FOREACH_HASH_KEY(&headers, key, idx) {
+		if (key && (!strcmp(key, name))) {
+			zval **data;
+
+			if (SUCCESS == zend_hash_get_current_data(&headers, (void **) &data)) {
+				result = (match_case ? strcmp(Z_STRVAL_PP(data), value) : strcasecmp(Z_STRVAL_PP(data), value)) ? 0 : 1;
+			}
+			break;
+		}
+	}
+
+	zend_hash_destroy(&headers);
+	efree(name);
+
+	return result;
+}
+/* }}} */
+
 
 /*
  * Local variables: