commit c9af31dad084f3fb58a7523e0bcf917a1d98cf3e
author Craig Tiller <ctiller@google.com> Thu Jul 16 16:34:22 2015 -0700
committer Craig Tiller <ctiller@google.com> Thu Jul 16 16:34:22 2015 -0700
tree cb98c1d7e3b448fd9735ee6cb5c2320d23c6604b
parent 9a3f858f9316cf8acca4aa964a35a784a93d7a17
parent 275a02c317d3c204b216aab5f7c7e74852c6ff60

Merge pull request #2473 from hongweiwang/uri_parser

Fix authority in uri_parser

src/core/client_config/uri_parser.c

diff --git a/src/core/client_config/uri_parser.c b/src/core/client_config/uri_parser.c
index 776a255..410a61c 100644
--- a/src/core/client_config/uri_parser.c
+++ b/src/core/client_config/uri_parser.c
@@ -98,7 +98,7 @@
 
   if (uri_text[scheme_end + 1] == '/' && uri_text[scheme_end + 2] == '/') {
     authority_begin = scheme_end + 3;
-    for (i = authority_begin; uri_text[i] != 0; i++) {
+    for (i = authority_begin; uri_text[i] != 0 && authority_end == -1; i++) {
       if (uri_text[i] == '/') {
         authority_end = i;
       }

test/core/client_config/uri_parser_test.c

diff --git a/test/core/client_config/uri_parser_test.c b/test/core/client_config/uri_parser_test.c
index e5f9017..3451ca1 100644
--- a/test/core/client_config/uri_parser_test.c
+++ b/test/core/client_config/uri_parser_test.c
@@ -60,6 +60,7 @@
   test_succeeds("http://www.google.com:90", "http", "www.google.com:90", "");
   test_succeeds("a192.4-df:foo.coom", "a192.4-df", "", "foo.coom");
   test_succeeds("a+b:foo.coom", "a+b", "", "foo.coom");
+  test_succeeds("zookeeper://127.0.0.1:2181/foo/bar", "zookeeper", "127.0.0.1:2181", "/foo/bar");
   test_fails("xyz");
   test_fails("http://www.google.com?why-are-you-using-queries");
   test_fails("dns:foo.com#fragments-arent-supported-here");