diff options
| author | Zandra Hird <[email protected]> | 2015-02-03 12:55:45 +0100 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-02-03 12:55:45 +0100 |
| commit | 9a393fb5237b637cc4cfdb79443a1517743eadd8 (patch) | |
| tree | 55137e2b85afd9bffdf9355673479878ed6f9d08 /lib/inets/src/http_server/mod_alias.erl | |
| parent | c8bbf52191e3c87eedde061051eebcd02dbb7fd5 (diff) | |
| parent | 42d6afe554e11813385dbf175fce58f995c2f9e5 (diff) | |
| download | otp-9a393fb5237b637cc4cfdb79443a1517743eadd8.tar.gz otp-9a393fb5237b637cc4cfdb79443a1517743eadd8.tar.bz2 otp-9a393fb5237b637cc4cfdb79443a1517743eadd8.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
erts/emulator/sys/unix/sys.c
erts/vsn.mk
Diffstat (limited to 'lib/inets/src/http_server/mod_alias.erl')
| -rw-r--r-- | lib/inets/src/http_server/mod_alias.erl | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/mod_alias.erl b/lib/inets/src/http_server/mod_alias.erl index 0b9fe4cfe0..5039cd56b5 100644 --- a/lib/inets/src/http_server/mod_alias.erl +++ b/lib/inets/src/http_server/mod_alias.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2010. All Rights Reserved. +%% Copyright Ericsson AB 1997-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -55,6 +55,7 @@ do(#mod{data = Data} = Info) -> do_alias(#mod{config_db = ConfigDB, request_uri = ReqURI, + socket_type = SocketType, data = Data}) -> {ShortPath, Path, AfterPath} = real_name(ConfigDB, ReqURI, which_alias(ConfigDB)), @@ -70,8 +71,9 @@ do_alias(#mod{config_db = ConfigDB, (LastChar =/= $/)) -> ?hdrt("directory and last-char is a /", []), ServerName = which_server_name(ConfigDB), - Port = port_string( which_port(ConfigDB) ), - URL = "http://" ++ ServerName ++ Port ++ ReqURI ++ "/", + Port = port_string(which_port(ConfigDB)), + Protocol = get_protocol(SocketType), + URL = Protocol ++ ServerName ++ Port ++ ReqURI ++ "/", ReasonPhrase = httpd_util:reason_phrase(301), Message = httpd_util:message(301, URL, ConfigDB), {proceed, @@ -94,6 +96,12 @@ port_string(80) -> port_string(Port) -> ":" ++ integer_to_list(Port). +get_protocol(ip_comm) -> + "http://"; +get_protocol(_) -> + %% Should clean up to have only one ssl type essl vs ssl is not relevant any more + "https://". + %% real_name real_name(ConfigDB, RequestURI, []) -> |