From f8f46f99175e4ae5531983306930bd3685cb46d4 Mon Sep 17 00:00:00 2001
From: Daijiro Wachi <daijiro.wachi@gmail.com>
Date: Mon, 3 Apr 2017 17:44:43 +0900
Subject: [PATCH] url: change path parsing for non-special URLs

This changes to the way path parsing for non-special URLs.
It allows paths to be empty for non-special URLs and also
takes that into account when serializing.

Fixes: https://github.com/nodejs/node/issues/11962
Refs: https://github.com/whatwg/url/pull/213
PR-URL: https://github.com/nodejs/node/pull/12058
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
---
 src/node_url.cc | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/node_url.cc b/src/node_url.cc
index 54a2944588071c..f9965d537b9abf 100644
--- a/src/node_url.cc
+++ b/src/node_url.cc
@@ -862,8 +862,10 @@ namespace url {
           }
           break;
         case kRelativeSlash:
-          if (ch == '/' || special_back_slash) {
+          if (IsSpecial(url->scheme) && (ch == '/' || ch == '\\')) {
             state = kSpecialAuthorityIgnoreSlashes;
+          } else if (ch == '/') {
+            state = kAuthority;
           } else {
             if (base->flags & URL_FLAGS_HAS_USERNAME) {
               url->flags |= URL_FLAGS_HAS_USERNAME;
@@ -1145,9 +1147,25 @@ namespace url {
           }
           break;
         case kPathStart:
-          state = kPath;
-          if (ch != '/' && !special_back_slash)
-            continue;
+          if (IsSpecial(url->scheme)) {
+            state = kPath;
+            if (ch != '/' && ch != '\\') {
+              continue;
+            }
+          } else if (!has_state_override && ch == '?') {
+            url->flags |= URL_FLAGS_HAS_QUERY;
+            url->query.clear();
+            state = kQuery;
+          } else if (!has_state_override && ch == '#') {
+            url->flags |= URL_FLAGS_HAS_FRAGMENT;
+            url->fragment.clear();
+            state = kFragment;
+          } else if (ch != kEOL) {
+            state = kPath;
+            if (ch != '/') {
+              continue;
+            }
+          }
           break;
         case kPath:
           if (ch == kEOL ||
@@ -1165,7 +1183,7 @@ namespace url {
                 url->flags |= URL_FLAGS_HAS_PATH;
                 url->path.push_back("");
               }
-            } else {
+            } else if (!IsSingleDotSegment(buffer)) {
               if (url->scheme == "file:" &&
                   url->path.empty() &&
                   buffer.size() == 2 &&