Commits

michal.ptaszek  committed 5d296db Merge

merged changes

  • Participants
  • Parent commits 010dca8, 0198fdb
  • Branches eptic-1.3

Comments (0)

Files changed (3)

File lib/eptic-1.3/src/e_mod_inets.erl

 with_formatted_error(F) ->
     case catch F() of
 	{'EXIT', Reason} ->
-	    format_response(e_mod_gen:error_page(501, "", Reason));
+	    format_response(e_mod_gen:error_page(501, e_dict:fget("__path"), Reason));
 	Response ->
 	    format_response(Response)
     end.

File lib/eptic-1.3/src/e_mod_yaws.erl

 with_formatted_error(F) ->
     case catch F() of
 	{'EXIT', Reason} ->
-	    e_mod_gen:error_page(501, "", Reason);
+	    e_mod_gen:error_page(501, e_dict:fget("__path"), Reason);
 	Result ->
 	    Result
     end.

File lib/wpart-1.3/src/wpartlib.erl

     Value = case string:tokens(lists:reverse(Op0), "[]") of
 		[Format, Key] ->
 		    [Token|Tokens] = string:tokens(Key,":"),
-		    wtype:format("[" ++ Format ++ "]", search(wpart:fget(Token), Tokens));
+		    V = search(wpart:fget(Token), Tokens),
+		    try
+			wtype:format("[" ++ Format ++ "]", V)
+		    catch
+			error:Reason ->
+			    erlang:error({format_error, Format, Key, V,
+					  {Reason, erlang:get_stacktrace()}})
+		    end;
 		[Key] ->
 		    [Token|Tokens] = string:tokens(Key,":"),
 		    case search(wpart:fget(Token), Tokens) of