src/ejabberd_listener.erl

@@ -139,13 +139,16 @@ init({Port, _, udp} = EndPoint, Module, Opts, SockOpts) ->
 			{error, _} ->
 			    ok
 		    end;
-		{error, Reason} ->
+		{error, Reason} = Err ->
-		    return_socket_error(Reason, EndPoint, Module)
+		    report_socket_error(Reason, EndPoint, Module),
+		    proc_lib:init_ack(Err)
 	    end;
-	{{error, Reason}, _} ->
+	{{error, Reason} = Err, _} ->
-	    return_socket_error(Reason, EndPoint, Module);
+	    report_socket_error(Reason, EndPoint, Module),
-	{_, {error, Reason} } ->
+	    proc_lib:init_ack(Err);
-	    return_socket_error(Reason, EndPoint, Module)
+	{_, {error, Reason} = Err} ->
+	    report_socket_error(Reason, EndPoint, Module),
+	    proc_lib:init_ack(Err)
     end;
 init({Port, _, tcp} = EndPoint, Module, Opts, SockOpts) ->
     case {listen_tcp(Port, SockOpts),
@@ -174,13 +177,16 @@ init({Port, _, tcp} = EndPoint, Module, Opts, SockOpts) ->
 			{error, _} ->
 			    ok
 		    end;
-		{error, Reason} ->
+		{error, Reason} = Err ->
-		    return_socket_error(Reason, EndPoint, Module)
+		    report_socket_error(Reason, EndPoint, Module),
+		    proc_lib:init_ack(Err)
 	    end;
-	{{error, Reason}, _} ->
+	{{error, Reason}, _} = Err ->
-	    return_socket_error(Reason, EndPoint, Module);
+	    report_socket_error(Reason, EndPoint, Module),
-	{_, {error, Reason}} ->
+	    proc_lib:init_ack(Err);
-	    return_socket_error(Reason, EndPoint, Module)
+	{_, {error, Reason}} = Err ->
+	    report_socket_error(Reason, EndPoint, Module),
+	    proc_lib:init_ack(Err)
     end.
 
 -spec listen_tcp(inet:port_number(), [gen_tcp:option()]) ->
@@ -602,20 +608,10 @@ config_reloaded() ->
 	      end
       end, New).
 
--spec return_socket_error(inet:posix(), endpoint(), module()) -> no_return().
+-spec report_socket_error(inet:posix(), endpoint(), module()) -> ok.
-return_socket_error(Reason, EndPoint, Module) ->
+report_socket_error(Reason, EndPoint, Module) ->
     ?ERROR_MSG("Failed to open socket at ~ts for ~ts: ~ts",
-               [format_endpoint(EndPoint), Module, format_error(Reason)]),
+	       [format_endpoint(EndPoint), Module, format_error(Reason)]).
-    return_init_error(Reason).
-
--ifdef(OTP_BELOW_26).
-return_init_error(Reason) ->
-    proc_lib:init_ack({error, Reason}).
--else.
--spec return_init_error(inet:posix()) -> no_return().
-return_init_error(Reason) ->
-    proc_lib:init_fail({error, Reason}, {exit, normal}).
--endif.
 
 -spec format_error(inet:posix() | atom()) -> string().
 format_error(Reason) ->

src/mod_conversejs.erl

@@ -69,7 +69,7 @@ process([], #request{method = 'GET', host = Host, q = Query, raw_path = RawPath1
             {<<"default_domain">>, Domain},
             {<<"domain_placeholder">>, Domain},
             {<<"registration_domain">>, Domain},
-            {<<"assets_path">>, <<RawPath/binary, "/">>},
+            {<<"assets_path">>, RawPath},
             {<<"view_mode">>, <<"fullscreen">>}
            | ExtraOptions],
     Init2 =