Skip to content

Commit d768d98

Browse files
committed
Remove recursive context inclusion error and replace with context overflow error. Obsoletes two expansion tests.
For #14.
1 parent a1e1e30 commit d768d98

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

index.html

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,8 +1030,9 @@ <h3>Algorithm</h3>
10301030
characters are treated in URI references, per
10311031
<a data-cite="RFC3987#section-6.5">section 6.5</a>
10321032
of [[RFC3987]].</li>
1033-
<li>If <var>context</var> is in the <var>remote contexts</var> array, a
1034-
<a data-link-for="JsonLdErrorCode">recursive context inclusion</a>
1033+
<li>If the number of entries in the <var>remote contexts</var> array
1034+
exceeds a processor defined limit, a
1035+
<a data-link-for="JsonLdErrorCode">context overflow</a>
10351036
error has been detected and processing is aborted;
10361037
otherwise, add <var>context</var> to <var>remote contexts</var>.</li>
10371038
<li class="changed">If <var>context</var> was previously dereferenced,
@@ -5437,7 +5438,7 @@ <h4>JsonLdErrorCode</h4>
54375438
"loading remote context failed",
54385439
"multiple context link headers",
54395440
"processing mode conflict",
5440-
"recursive context inclusion"
5441+
"context overflow"
54415442
};
54425443
--></pre>
54435444

@@ -5551,8 +5552,8 @@ <h4>JsonLdErrorCode</h4>
55515552
<dt><dfn>processing mode conflict</dfn></dt>
55525553
<dd>An attempt was made to change the <a>processing mode</a>
55535554
which is incompatible with the previous specified version.</dd>
5554-
<dt><dfn>recursive context inclusion</dfn></dt>
5555-
<dd>A cycle in remote context inclusions has been detected.</dd>
5555+
<dt><dfn>context overflow</dfn></dt>
5556+
<dd>maximum number of <code>@context</code> URLs exceeded.</dd>
55565557
</dl>
55575558
</section>
55585559
</section> <!-- end of Error Handling -->
@@ -5680,6 +5681,8 @@ <h2>Changes since JSON-LD Community Group Final Report</h2>
56805681
or all <a>JSON-LD script elements</a>.</li>
56815682
<li>Added <a data-link-for="RemoteDocument">contentType</a> field to <a>RemoteDocument</a>.</li>
56825683
<li>Added support for sealed <a>contexts</a> and <a>term definitions</a>.</li>
5684+
<li>Because scoped contexts can lead to contexts being reloaded, replace the
5685+
<strong>recursive context inclusion</strong> error with a <a data-link-for="JsonLdErrorCode">context overflow</a> error.</li>
56835686
</ul>
56845687
</section>
56855688

tests/expand-manifest.jsonld

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -932,14 +932,16 @@
932932
"name": "A context may not include itself recursively (direct)",
933933
"purpose": "Verifies that an exception is raised on expansion when processing a context referencing itself",
934934
"input": "expand/e002-in.jsonld",
935-
"expect": "recursive context inclusion"
935+
"expect": "recursive context inclusion",
936+
"option": {"specVersion": "json-ld-1.0"}
936937
}, {
937938
"@id": "#te003",
938939
"@type": [ "jld:NegativeEvaluationTest", "jld:ExpandTest" ],
939940
"name": "A context may not include itself recursively (indirect)",
940941
"purpose": "Verifies that an exception is raised on expansion when processing a context referencing itself indirectly",
941942
"input": "expand/e003-in.jsonld",
942-
"expect": "recursive context inclusion"
943+
"expect": "recursive context inclusion",
944+
"option": {"specVersion": "json-ld-1.0"}
943945
}, {
944946
"@id": "#te004",
945947
"@type": [ "jld:NegativeEvaluationTest", "jld:ExpandTest" ],

0 commit comments

Comments
 (0)