diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-12-15 09:41:01 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-12-15 09:41:01 +0100 |
| commit | d7cd5ee8a34d289fbc91627a3f096a870bf70393 (patch) | |
| tree | c520fcd5d3d8f2cd4a02541c6b17affa151af572 | |
| parent | 995f437e6d4d9e1b42a3be1b181c9c52265c4274 (diff) | |
| parent | 8feea6e7ff910a32accb5587a2245f5725d7b38c (diff) | |
| download | otp-d7cd5ee8a34d289fbc91627a3f096a870bf70393.tar.gz otp-d7cd5ee8a34d289fbc91627a3f096a870bf70393.tar.bz2 otp-d7cd5ee8a34d289fbc91627a3f096a870bf70393.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/inets/src/http_server/Makefile | 2 | ||||
| -rw-r--r-- | lib/inets/src/http_server/httpd_custom_api.erl | 3 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.app.src | 1 |
3 files changed, 4 insertions, 2 deletions
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/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. 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, |