url: introduce `URL_FLAGS_IS_DEFAULT_SCHEME_PORT` flag #20479

AyushG3112 · 2018-05-02T19:09:26Z

Introduce URL_FLAGS_IS_DEFAULT_SCHEME_PORT flag which is retured
when the parser detects that the port passed is the default port
for that scheme.

Fixes: #20465

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
tests and/or benchmarks are included
commit message follows commit guidelines

AyushG3112 · 2018-05-02T19:15:31Z

If anyone could suggest where to add tests, that would be great. The fixture used in the existing test is the one provided by W3C and I'm not sure if I should modify that.

TimothyGu · 2018-05-02T19:40:20Z

src/node_url.cc

@@ -1748,6 +1755,9 @@ void URL::Parse(const char* input,
              return;
            }
            // the port is valid
+            if (IsDefaultSchemePort(url->scheme, static_cast<int>(port))) {
+              url->flags |= URL_FLAGS_IS_DEFAULT_SCHEME_PORT;
+            }
            url->port = NormalizePort(url->scheme, static_cast<int>(port));


The job done by IsDefaultSchemePort is pretty similar to what NormalizePort does already. Can we instead check url->port == -1 as an indicator for default scheme port?

TimothyGu · 2018-05-02T19:41:44Z

lib/internal/url.js

@@ -270,13 +271,17 @@ function onParseHostnameComplete(flags, protocol, username, password,

 function onParsePortComplete(flags, protocol, username, password,
                             host, port, path, query, fragment) {
-  this[context].port = port;
+  if ((flags & URL_FLAGS_IS_DEFAULT_SCHEME_PORT) !== 0) {
+    this[context].port = null;


In the case where URL_FLAGS_IS_DEFAULT_SCHEME_PORT is set, port should already be null. Unless I'm missing something there doesn't seem to be a need to have a conditional here.

The reason I added the conditional is because the spec explicitly mentions setting the port to null in case of default scheme port.

I can remove it if you think we can just rely on C++ land to send us null in that situation though.

TimothyGu · 2018-05-02T19:43:20Z

This PR also lacks tests. Please check out https://github.com/nodejs/node/blob/master/test/fixtures/url-setter-tests.js, add a test in there, and then upstream that test to https://github.com/w3c/web-platform-tests/blob/master/url/setters_tests.json.

AyushG3112 · 2018-05-03T04:40:23Z

@TimothyGu Fixed. PTAL. Also, to upstream the test, do I just open a PR for https://github.com/w3c/web-platform-tests/blob/master/url/setters_tests.json, or is there any other mechanism?

AyushG3112 · 2018-05-03T09:01:18Z

/cc @nodejs/url PTAL

AyushG3112 · 2018-05-07T06:02:28Z

Ping

joyeecheung · 2018-05-07T07:01:49Z

Also, to upstream the test, do I just open a PR for https://github.com/w3c/web-platform-tests/blob/master/url/setters_tests.json, or is there any other mechanism?

@AyushG3112 Yes I think so.

Refs: nodejs/node#20479

See nodejs/node#20479.

AyushG3112 · 2018-05-08T13:33:06Z

Test has landed at upstream W3C via web-platform-tests/wpt#10892, and I updated the ordering in test/fixtures/url-setter-tests.js to match the upstream contents.

AyushG3112 · 2018-05-09T17:10:17Z

@jasnell could you please run the CI on this? Also, would this be semver major or patch? Because this fixes a bug but changes the output of an action.

jasnell · 2018-05-09T17:28:27Z

CI: https://ci.nodejs.org/job/node-test-pull-request/14750/

It's semver-patch :-)

AyushG3112 · 2018-05-10T04:24:01Z

Do any of the failures look related?

targos · 2018-05-10T08:58:36Z

Failures look unrelated. New try: https://ci.nodejs.org/job/node-test-pull-request/14778/

AyushG3112 · 2018-05-10T11:41:14Z

Looks like builds timed out this time. Infra issue?

AyushG3112 · 2018-05-11T15:58:12Z

Could anyone run the CI on this again please? thanks!

jasnell · 2018-05-12T23:28:08Z

CI: https://ci.nodejs.org/job/node-test-pull-request/14827/

…d if new port is scheme default, a=testonly Automatic update from web-platform-testsURL: host setter with default port against URL with non-default port See nodejs/node#20479. -- wpt-commits: f0fe4791f5b87491d8d9662832fae543e4edbca1 wpt-pr: 10892

Introduce `URL_FLAGS_IS_DEFAULT_SCHEME_PORT` flag which is retured when the parser detects that the port passed is the default port for that scheme. Fixes: nodejs#20465

PR-URL: nodejs#20479

AyushG3112 · 2018-05-15T04:09:33Z

Rebased to master in hope of CI passing. Can this have another CI run please?

apapirovski · 2018-05-17T09:43:06Z

src/node_url.cc

@@ -1749,6 +1749,9 @@ void URL::Parse(const char* input,
            }
            // the port is valid
            url->port = NormalizePort(url->scheme, static_cast<int>(port));
+            if (url->port == -1) {


I would prefer no curlies, it's the more common style in our C++ code.

apapirovski · 2018-05-17T09:45:39Z

src/node_url.h

@@ -50,7 +50,8 @@ using v8::Value;
  XX(URL_FLAGS_HAS_HOST, 0x80)                                                \
  XX(URL_FLAGS_HAS_PATH, 0x100)                                               \
  XX(URL_FLAGS_HAS_QUERY, 0x200)                                              \
-  XX(URL_FLAGS_HAS_FRAGMENT, 0x400)
+  XX(URL_FLAGS_HAS_FRAGMENT, 0x400)                                           \
+  XX(URL_FLAGS_IS_DEFAULT_SCHEME_PORT, 0x800)


Can we add the final \ if it doesn't break this. It makes diffs cleaner.

apapirovski · 2018-05-17T09:46:10Z

CI: https://ci.nodejs.org/job/node-test-pull-request/14926/

PR-URL: nodejs#20479

AyushG3112 · 2018-05-17T15:25:16Z

@apapirovski PTAL

apapirovski · 2018-05-17T15:26:41Z

CI: https://ci.nodejs.org/job/node-test-pull-request/14932/

then we land this.

apapirovski

Reaffirming.

AyushG3112 · 2018-05-17T16:23:31Z

parallel/test-http2-compat-client-upload-reject failed with ECONNRESET on a few platforms, is it related by any chance?

apapirovski · 2018-05-17T18:03:52Z

@AyushG3112 That one is definitely unrelated. We have a bug in http2 at the moment. (As an aside, I'm working on changes to http2 that will get rid of those failures.)

AyushG3112 · 2018-05-18T08:44:36Z

@apapirovski what would the next step here be then? Should we wait for the fix to land before landing this, or run the CI on the failed platforms till it is green, or ,assuming parallel/test-http2-compat-client-upload-reject is the only failure, ignore it?

Introduce `URL_FLAGS_IS_DEFAULT_SCHEME_PORT` flag which is retured when the parser detects that the port passed is the default port for that scheme. PR-URL: nodejs#20479 Fixes: nodejs#20465 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>

BridgeAR · 2018-05-18T13:24:24Z

Landed in 11892b0 🎉

Introduce `URL_FLAGS_IS_DEFAULT_SCHEME_PORT` flag which is retured when the parser detects that the port passed is the default port for that scheme. PR-URL: #20479 Fixes: #20465 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>

…d if new port is scheme default, a=testonly Automatic update from web-platform-testsURL: host setter with default port against URL with non-default port See nodejs/node#20479. -- wpt-commits: f0fe4791f5b87491d8d9662832fae543e4edbca1 wpt-pr: 10892 UltraBlame original commit: 497bd5c8c632f4828e13d82f8c7f0f6d7553126c

nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. labels May 2, 2018

TimothyGu reviewed May 2, 2018

View reviewed changes

AyushG3112 added a commit to AyushG3112/web-platform-tests that referenced this pull request May 8, 2018

add url host test: Port number is removed if new port is scheme default

27ce28c

Refs: nodejs/node#20479

AyushG3112 mentioned this pull request May 8, 2018

add url host test: Port number is removed if new port is scheme default web-platform-tests/wpt#10892

Merged

annevk pushed a commit to web-platform-tests/wpt that referenced this pull request May 8, 2018

URL: host setter with default port against URL with non-default port

f0fe479

See nodejs/node#20479.

jasnell approved these changes May 8, 2018

View reviewed changes

targos approved these changes May 10, 2018

View reviewed changes

AyushG3112 added 3 commits May 15, 2018 09:21

url: introduce URL_FLAGS_IS_DEFAULT_SCHEME_PORT flag

374f2be

Introduce `URL_FLAGS_IS_DEFAULT_SCHEME_PORT` flag which is retured when the parser detects that the port passed is the default port for that scheme. Fixes: nodejs#20465

test: add tests

d70644a

PR-URL: nodejs#20479

fixup: cleanup conditionals

54fa5c1

PR-URL: nodejs#20479

AyushG3112 force-pushed the fix-url-port-host-flag branch from 92051fa to 70d5dc2 Compare May 15, 2018 04:06

apapirovski approved these changes May 17, 2018

View reviewed changes

fixup: address code style nits

47ac6ec

PR-URL: nodejs#20479

apapirovski approved these changes May 17, 2018

View reviewed changes

TimothyGu approved these changes May 17, 2018

View reviewed changes

BridgeAR approved these changes May 18, 2018

View reviewed changes

BridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label May 18, 2018

BridgeAR closed this May 18, 2018

AyushG3112 deleted the fix-url-port-host-flag branch May 20, 2018 09:09

addaleax mentioned this pull request May 22, 2018

v10.2.0 proposal #20724

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

url: introduce `URL_FLAGS_IS_DEFAULT_SCHEME_PORT` flag #20479

url: introduce `URL_FLAGS_IS_DEFAULT_SCHEME_PORT` flag #20479

AyushG3112 commented May 2, 2018 •

edited

Loading

AyushG3112 commented May 2, 2018

TimothyGu May 2, 2018

TimothyGu May 2, 2018

AyushG3112 May 3, 2018 •

edited

Loading

TimothyGu commented May 2, 2018

AyushG3112 commented May 3, 2018

AyushG3112 commented May 3, 2018

AyushG3112 commented May 7, 2018 •

edited

Loading

joyeecheung commented May 7, 2018

AyushG3112 commented May 8, 2018

AyushG3112 commented May 9, 2018

jasnell commented May 9, 2018

AyushG3112 commented May 10, 2018

targos commented May 10, 2018

AyushG3112 commented May 10, 2018

AyushG3112 commented May 11, 2018 •

edited

Loading

jasnell commented May 12, 2018

AyushG3112 commented May 15, 2018

apapirovski May 17, 2018

apapirovski May 17, 2018

apapirovski commented May 17, 2018

AyushG3112 commented May 17, 2018

apapirovski commented May 17, 2018

apapirovski left a comment

AyushG3112 commented May 17, 2018

apapirovski commented May 17, 2018

AyushG3112 commented May 18, 2018

BridgeAR commented May 18, 2018

url: introduce URL_FLAGS_IS_DEFAULT_SCHEME_PORT flag #20479

url: introduce URL_FLAGS_IS_DEFAULT_SCHEME_PORT flag #20479

Conversation

AyushG3112 commented May 2, 2018 • edited Loading

Checklist

AyushG3112 commented May 2, 2018

TimothyGu May 2, 2018

Choose a reason for hiding this comment

TimothyGu May 2, 2018

Choose a reason for hiding this comment

AyushG3112 May 3, 2018 • edited Loading

Choose a reason for hiding this comment

TimothyGu commented May 2, 2018

AyushG3112 commented May 3, 2018

AyushG3112 commented May 3, 2018

AyushG3112 commented May 7, 2018 • edited Loading

joyeecheung commented May 7, 2018

AyushG3112 commented May 8, 2018

AyushG3112 commented May 9, 2018

jasnell commented May 9, 2018

AyushG3112 commented May 10, 2018

targos commented May 10, 2018

AyushG3112 commented May 10, 2018

AyushG3112 commented May 11, 2018 • edited Loading

jasnell commented May 12, 2018

AyushG3112 commented May 15, 2018

apapirovski May 17, 2018

Choose a reason for hiding this comment

apapirovski May 17, 2018

Choose a reason for hiding this comment

apapirovski commented May 17, 2018

AyushG3112 commented May 17, 2018

apapirovski commented May 17, 2018

apapirovski left a comment

Choose a reason for hiding this comment

AyushG3112 commented May 17, 2018

apapirovski commented May 17, 2018

AyushG3112 commented May 18, 2018

BridgeAR commented May 18, 2018

url: introduce `URL_FLAGS_IS_DEFAULT_SCHEME_PORT` flag #20479

url: introduce `URL_FLAGS_IS_DEFAULT_SCHEME_PORT` flag #20479

AyushG3112 commented May 2, 2018 •

edited

Loading

AyushG3112 May 3, 2018 •

edited

Loading

AyushG3112 commented May 7, 2018 •

edited

Loading

AyushG3112 commented May 11, 2018 •

edited

Loading