From: Michael Wallner <mike@php.net>
Date: Fri, 31 Oct 2014 14:03:11 +0000 (+0100)
Subject: fix edge cases with @
X-Git-Tag: RELEASE_2_2_0_RC1~9^2~12
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=7205cf3cfe9e5dd142513541414b0327aa3be0cf;ds=inline

fix edge cases with @
---

diff --git a/php_http_url.c b/php_http_url.c
index 4263aab..1f06271 100644
--- a/php_http_url.c
+++ b/php_http_url.c
@@ -528,7 +528,7 @@ static STATUS parse_hostinfo(php_http_url_t *url, const char *ptr)
 		case ':':
 			if (port) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING,
-						"Failed to parse port; duplicate ':' at pos %u in '%s'",
+						"Failed to parse port; unexpected ':' at pos %u in '%s'",
 						(unsigned) (ptr - tmp), tmp);
 				return FAILURE;
 			}
@@ -625,12 +625,19 @@ static STATUS parse_hostinfo(php_http_url_t *url, const char *ptr)
 
 static const char *parse_authority(php_http_url_t *url)
 {
-	const char *tmp = url->ptr;
+	const char *tmp = url->ptr, *host = NULL;
 
 	do {
 		switch (*url->ptr) {
 		case '@':
 			/* userinfo delimiter */
+			if (host) {
+				TSRMLS_FETCH_FROM_CTX(url->ts);
+				php_error_docref(NULL TSRMLS_CC, E_WARNING,
+						"Failed to parse userinfo; unexpected '@'");
+				return NULL;
+			}
+			host = url->ptr + 1;
 			if (tmp != url->ptr && SUCCESS != parse_userinfo(url, tmp)) {
 				return NULL;
 			}