From: Michael Wallner <mike@php.net>
Date: Sat, 11 Feb 2006 12:19:10 +0000 (+0000)
Subject: - add "@" to allowed token characters
X-Git-Tag: RELEASE_0_23_0~19
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=075264509532fc8440b937d6cd2c7e88bb050d1d;p=m6w6%2Fext-http

- add "@" to allowed token characters
- add general error message on failure
---

diff --git a/http_api.c b/http_api.c
index 1d3f657..a17c608 100644
--- a/http_api.c
+++ b/http_api.c
@@ -137,21 +137,16 @@ PHP_HTTP_API STATUS _http_parse_cookie(const char *list, HashTable *items TSRMLS
 		switch (st)
 		{
 			case ST_QUOTE:
-				switch (*c)
-				{
-					case '"':
-						if (*(c-1) != '\\') {
-							st = ST_ADD;
-						} else {
-							memmove(c-1, c, strlen(c)+1);
-						}
-					break;
-					
-					default:
-						if (!val) {
-							val = c;
-						}
-					break;
+				if (*c == '"') {
+					if (*(c-1) != '\\') {
+						st = ST_ADD;
+					} else {
+						memmove(c-1, c, strlen(c)+1);
+					}
+				} else {
+					if (!val) {
+						val = c;
+					}
 				}
 			break;
 				
@@ -190,6 +185,7 @@ PHP_HTTP_API STATUS _http_parse_cookie(const char *list, HashTable *items TSRMLS
 					case '.':
 					case '_':
 					case '$':
+					case '@':
 						if (!key) {
 							key = c;
 						}
@@ -264,6 +260,7 @@ PHP_HTTP_API STATUS _http_parse_cookie(const char *list, HashTable *items TSRMLS
 	return SUCCESS;
 	
 failure:
+	http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Unexpected character (%c) at pos %tu of %zu", *c, c-s, strlen(s));
 	efree(s);
 	return FAILURE;
 }