aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/httpd_SUITE_data/server_root/config/mime.types
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-05-11 14:47:59 +0200
committerZandra Hird <[email protected]>2015-05-11 14:47:59 +0200
commit1f9201ca7db28e19e92c094b0317230ee930829c (patch)
tree19547de92bc874b9645a0901b51fe2cd6b8babe2 /lib/inets/test/httpd_SUITE_data/server_root/config/mime.types
parentb5ed0f90e7a57c5c51e32f58ed217e87aad7112d (diff)
parent098f7b59ef26c57f8b759c14a6f3757534d50175 (diff)
downloadotp-1f9201ca7db28e19e92c094b0317230ee930829c.tar.gz
otp-1f9201ca7db28e19e92c094b0317230ee930829c.tar.bz2
otp-1f9201ca7db28e19e92c094b0317230ee930829c.zip
Merge branch 'zandra/mime-types-config/OTP-12731'
* zandra/mime-types-config/OTP-12731: make it possible to use a file to configure mime types
Diffstat (limited to 'lib/inets/test/httpd_SUITE_data/server_root/config/mime.types')
-rw-r--r--lib/inets/test/httpd_SUITE_data/server_root/config/mime.types4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/inets/test/httpd_SUITE_data/server_root/config/mime.types b/lib/inets/test/httpd_SUITE_data/server_root/config/mime.types
new file mode 100644
index 0000000000..b68cff21a6
--- /dev/null
+++ b/lib/inets/test/httpd_SUITE_data/server_root/config/mime.types
@@ -0,0 +1,4 @@
+text/html html
+text/html htm
+text/html shtml
+image/gif gif