From: Michael Wallner <mike@php.net>
Date: Wed, 1 Jun 2016 07:30:42 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_BETA1~13
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=74e7358add4c74d212b91d23e8600ef3c10d081e;hp=b51f6b6c64d28742ef630f430c53954e286b72b1

Merge branch 'v2.6.x'
---

diff --git a/src/php_http_url.c b/src/php_http_url.c
index 3ed2e3c..8352608 100644
--- a/src/php_http_url.c
+++ b/src/php_http_url.c
@@ -1099,9 +1099,7 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt
 			state->buffer[state->offset++] = *ptr;
 			break;
 
-		case '!': case '$': case '&': case '\'': case '(': case ')': case '*':
-		case '+': case ',': case ';': case '=': /* sub-delims */
-		case '-': case '.': case '_': case '~': /* unreserved */
+		case '.':
 			if (port || !label) {
 				/* sort of a compromise, just ensure we don't end up
 				 * with a dot at the beginning or two consecutive dots
@@ -1116,6 +1114,21 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt
 			label = NULL;
 			break;
 
+		case '-':
+			if (!label) {
+				/* sort of a compromise, just ensure we don't end up
+				 * with a hyphen at the beginning
+				 */
+				php_error_docref(NULL TSRMLS_CC, E_WARNING,
+						"Failed to parse %s; unexpected '%c' at pos %u in '%s'",
+						port ? "port" : "host",
+						(unsigned char) *ptr, (unsigned) (ptr - tmp), tmp);
+				return FAILURE;
+			}
+			/* no break */
+		case '_': case '~': /* unreserved */
+		case '!': case '$': case '&': case '\'': case '(': case ')': case '*':
+		case '+': case ',': case ';': case '=': /* sub-delims */
 		case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G':
 		case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N':
 		case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U':
diff --git a/tests/gh-issue42.phpt b/tests/gh-issue42.phpt
new file mode 100644
index 0000000..a6f9ded
--- /dev/null
+++ b/tests/gh-issue42.phpt
@@ -0,0 +1,16 @@
+--TEST--
+URL barfs on punycode
+--SKIPIF--
+<?php
+include "./skipif.inc";
+?>
+--FILE--
+<?php 
+echo "Test\n";
+echo new http\Url("http://www.xn--kln-sna.de"), "\n";
+?>
+===DONE===
+--EXPECT--
+Test
+http://www.xn--kln-sna.de/
+===DONE===