Imported Upstream version 1.4.15upstream/1.4.15

1 files changed, 10 insertions, 0 deletions

diff --git a/src/request.c b/src/request.c
index eb35332..f76252e 100644
--- a/src/request.c
+++ b/src/request.c
@@ -85,6 +85,9 @@ static int request_check_hostname(server *srv, connection *con, buffer *host) {
 	/* Host is empty */
 	if (host_len == 0) return -1;
 
+	/* if the hostname ends in a "." strip it */
+	if (host->ptr[host_len-1] == '.') host_len -= 1;
+
 	/* scan from the right and skip the \0 */
 	for (i = host_len - 1; i + 1 > 0; i--) {
 		const char c = host->ptr[i];
@@ -741,6 +744,13 @@ int http_request_parse(server *srv, connection *con) {
 
 						s_len = cur - value;
 
+						/* strip trailing white-spaces */
+						for (; s_len > 0 && 
+								(value[s_len - 1] == ' ' || 
+								 value[s_len - 1] == '\t'); s_len--);
+
+						value[s_len] = '\0';
+
 						if (s_len > 0) {
 							int cmp = 0;
 							if (NULL == (ds = (data_string *)array_get_unused_element(con->request.headers, TYPE_STRING))) {