aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc/src
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2015-01-14 10:35:37 +0100
committerMarcus Arendt <[email protected]>2015-01-14 10:35:37 +0100
commit0c35538676e6598243721ef0488c2043b62715f2 (patch)
tree9a21411dacdb8f69e14d51dca3de5cf3b3f341fc /lib/inets/doc/src
parent6624d531fddfb09a86b6960d76f9174bf5c686e4 (diff)
parente564cfb82f28fa24ed842ee96e2addf41180700d (diff)
downloadotp-0c35538676e6598243721ef0488c2043b62715f2.tar.gz
otp-0c35538676e6598243721ef0488c2043b62715f2.tar.bz2
otp-0c35538676e6598243721ef0488c2043b62715f2.zip
Merge branch 'nox/http_uri-fragment/OTP-12398' into maint
* nox/http_uri-fragment/OTP-12398: Properly parse URI fragments
Diffstat (limited to 'lib/inets/doc/src')
-rw-r--r--lib/inets/doc/src/http_uri.xml11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/inets/doc/src/http_uri.xml b/lib/inets/doc/src/http_uri.xml
index e64c375bba..acbd79b201 100644
--- a/lib/inets/doc/src/http_uri.xml
+++ b/lib/inets/doc/src/http_uri.xml
@@ -63,6 +63,7 @@ host() = string()
port() = pos_integer()
path() = string() - Representing a file path or directory path
query() = string()
+fragment() = string()
]]></code>
<marker id="scheme_defaults"></marker>
@@ -92,13 +93,16 @@ query() = string()
<v>URI = uri() </v>
<v>Options = [Option] </v>
<v>Option = {ipv6_host_with_brackets, boolean()} |
- {scheme_defaults, scheme_defaults()}]</v>
- <v>Result = {Scheme, UserInfo, Host, Port, Path, Query}</v>
+ {scheme_defaults, scheme_defaults()} |
+ {fragment, boolean()}]</v>
+ <v>Result = {Scheme, UserInfo, Host, Port, Path, Query} |
+ {Scheme, UserInfo, Host, Port, Path, Query, Fragment}</v>
<v>UserInfo = user_info()</v>
<v>Host = host()</v>
<v>Port = pos_integer()</v>
<v>Path = path()</v>
<v>Query = query()</v>
+ <v>Fragment = fragment()</v>
<v>Reason = term() </v>
</type>
<desc>
@@ -111,6 +115,9 @@ query() = string()
a scheme not found in the scheme defaults) a port number must be
provided or else the parsing will fail. </p>
+ <p>If the fragment option is true, the URI fragment will be returned as
+ part of the parsing result, otherwise it is completely ignored.</p>
+
<marker id="encode"></marker>
</desc>
</func>