Skip to content

Commit 7876306

Browse files
committed
Use the username and password encode sets within authority state. Fixes webspecs#28.
1 parent 7468c39 commit 7876306

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

url.bs

+9-7
Original file line numberDiff line numberDiff line change
@@ -1260,13 +1260,14 @@ optionally with an <a>encoding</a>
12601260
<var>url</var>'s <a lt='URL password'>password</a>
12611261
to the empty string and continue.
12621262

1263-
<li><p><a>utf-8 percent encode</a> <var>code point</var> using
1264-
the <a>default encode set</a> and append the result to
1265-
<var>url</var>'s <a lt='URL password'>password</a>
1266-
if <var>url</var>'s <a lt='URL password'>password</a>
1267-
is non-null, and to
1268-
<var>url</var>'s <a lt='URL username'>username</a>
1269-
otherwise.
1263+
<li><p>If <var>url</var>'s <a lt="URL password">password</a> is non-null,
1264+
<a>utf-8 percent encode</a> <var>code point</var> using the
1265+
<a>password encode set</a> and append the result to <var>url</var>'s
1266+
<a lt="URL password">password</a>.
1267+
1268+
<li><p>Otherwise, <a>utf-8 percent encode</a> <var>code point</var> using the
1269+
<a>username encode set</a> and append the result to <var>url</var>'s
1270+
<a lt="URL username">username</a>.
12701271
</ol>
12711272
<li><p>Set <var>buffer</var> to the empty string.
12721273
</ol>
@@ -2835,6 +2836,7 @@ Peter Occil,
28352836
Rodney Rehm,
28362837
Roy Fielding,
28372838
Santiago M. Mola,
2839+
Sebastian Mayr,
28382840
Simon Pieters,
28392841
Simon Sapin,
28402842
Tab Atkins,

url.html

+12-8
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<h1 class="p-name no-ref allcaps" id="title">URL</h1>
3131

3232
<h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Living Standard — Last Updated
33-
<time class="dt-updated" datetime="2015-06-15">15 June 2015</time></span></h2>
33+
<time class="dt-updated" datetime="2015-06-16">16 June 2015</time></span></h2>
3434

3535
<div data-fill-with="spec-metadata">
3636
<dl>
@@ -1899,13 +1899,16 @@ <h3 class="heading settled" data-level="4.2" id="url-parsing"><span class="secno
18991899

19001900
</p>
19011901
<li>
1902-
<p><a data-link-type="dfn" href="#utf_8-percent-encode">utf-8 percent encode</a> <var>code point</var> using
1903-
the <a data-link-type="dfn" href="#default-encode-set">default encode set</a> and append the result to
1904-
<var>url</var>’s <a data-link-type="dfn" href="#concept-url-password">password</a>
1905-
if <var>url</var>’s <a data-link-type="dfn" href="#concept-url-password">password</a>
1906-
is non-null, and to
1907-
<var>url</var>’s <a data-link-type="dfn" href="#concept-url-username">username</a>
1908-
otherwise.
1902+
<p>If <var>url</var>’s <a data-link-type="dfn" href="#concept-url-password">password</a> is non-null,
1903+
<a data-link-type="dfn" href="#utf_8-percent-encode">utf-8 percent encode</a> <var>code point</var> using the
1904+
<a data-link-type="dfn" href="#password-encode-set">password encode set</a> and append the result to <var>url</var>’s
1905+
<a data-link-type="dfn" href="#concept-url-password">password</a>.
1906+
1907+
</p>
1908+
<li>
1909+
<p>Otherwise, <a data-link-type="dfn" href="#utf_8-percent-encode">utf-8 percent encode</a> <var>code point</var> using the
1910+
<a data-link-type="dfn" href="#username-encode-set">username encode set</a> and append the result to <var>url</var>’s
1911+
<a data-link-type="dfn" href="#concept-url-username">username</a>.
19091912
</p>
19101913
</ol>
19111914

@@ -4258,6 +4261,7 @@ <h2 class="no-num heading settled" id="acknowledgments"><span class="content">Ac
42584261
Rodney Rehm,
42594262
Roy Fielding,
42604263
Santiago M. Mola,
4264+
Sebastian Mayr,
42614265
Simon Pieters,
42624266
Simon Sapin,
42634267
Tab Atkins,

0 commit comments

Comments
 (0)