aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-06 11:03:03 +0200
committerHenrik Nord <[email protected]>2015-10-06 11:03:03 +0200
commit4f9905824002bebc33c2914669b4c364927cb0ee (patch)
treec91cc3e003b406e049c83ae73b208e10912d6df6 /lib/inets/doc
parent02a7407dfefd539b6850c13e1e3f4df9afd715ac (diff)
parenta2c538dee3013bb6285027d9ae45b7f055e8e8eb (diff)
downloadotp-4f9905824002bebc33c2914669b4c364927cb0ee.tar.gz
otp-4f9905824002bebc33c2914669b4c364927cb0ee.tar.bz2
otp-4f9905824002bebc33c2914669b4c364927cb0ee.zip
Merge branch 'maint-18' into maint
Diffstat (limited to 'lib/inets/doc')
-rw-r--r--lib/inets/doc/src/httpd_custom_api.xml14
-rw-r--r--lib/inets/doc/src/notes.xml33
2 files changed, 46 insertions, 1 deletions
diff --git a/lib/inets/doc/src/httpd_custom_api.xml b/lib/inets/doc/src/httpd_custom_api.xml
index 23417900fa..d2e5441895 100644
--- a/lib/inets/doc/src/httpd_custom_api.xml
+++ b/lib/inets/doc/src/httpd_custom_api.xml
@@ -33,6 +33,20 @@
</description>
<funcs>
+ <func>
+ <name>response_default_headers() -> [Header] </name>
+ <fsummary>Provide default headers for the HTTP servers responses.</fsummary>
+ <type>
+ <v>Header = {HeaderName :: string(), HeaderValue::string()}</v>
+ <d>string:to_lower/1 will be performed on the HeaderName</d>
+ </type>
+ <desc>
+ <p>Provide default headers for the HTTP servers responses. Note that this
+ option may override built-in defaults.
+ </p>
+ </desc>
+ </func>
+
<func>
<name>response_header({HeaderName, HeaderValue}) -> {true, Header} | false </name>
<fsummary>Filter and possible alter HTTP response headers.</fsummary>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index eb1027b028..ef11fdc10c 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,38 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 6.0.1</title>
+ <section><title>Inets 6.0.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Avoid crash in mod_auth_server and mod_security_server
+ due to using an atom instead of a string when creating a
+ name.</p>
+ <p>
+ Own Id: OTP-13022</p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Add function response_default_headers/0 to httpd
+ customize API, to allow user to specify default values
+ for HTTP response headers.</p>
+ <p>
+ Own Id: OTP-13013</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 6.0.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>