From 69f4b8be1899eb115ced063ef7d606880df72d3d Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 11 Dec 2015 17:19:47 +0100
Subject: inets: Fix dialyzer warning

---
 lib/inets/src/http_server/httpd_custom_api.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/inets/src/http_server/httpd_custom_api.erl b/lib/inets/src/http_server/httpd_custom_api.erl
index 282f3a6ee6..d5a6fa8715 100644
--- a/lib/inets/src/http_server/httpd_custom_api.erl
+++ b/lib/inets/src/http_server/httpd_custom_api.erl
@@ -23,7 +23,8 @@
 -callback response_default_headers() -> 
     [{Key::string(), Value::string()}].
 -callback response_header({Key::string(), Value::string()}) -> 
-    {true, {Key::string(), Value::string()}} | false.
+    {true, {Key::string(), Value::string()}} | false |
+    {true, string()}. %% Used internally to avoid traversing headers twice 
 -callback request_header({Key::string(), Value::string()}) -> 
     {true, {Key::string(), Value::string()}} | false.
 
-- 
cgit v1.2.3


From 4ba8b8b69f18e642dc430746cd5857ec34a47aeb Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Mon, 14 Dec 2015 10:36:49 +0100
Subject: inets: Include behaviour modules in install target

---
 lib/inets/src/http_server/Makefile    | 2 +-
 lib/inets/src/inets_app/inets.app.src | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
index b9f2290289..1c05d454a5 100644
--- a/lib/inets/src/http_server/Makefile
+++ b/lib/inets/src/http_server/Makefile
@@ -137,7 +137,7 @@ release_spec: opt
 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_server"
 	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server"
 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index 2b9b8f5f32..883ba84e8e 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -65,6 +65,7 @@
 	    httpd_connection_sup,
             httpd_conf,
 	    httpd_custom,
+	    httpd_custom_api,
 	    httpd_esi,
             httpd_example,
 	    httpd_file,
-- 
cgit v1.2.3