[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-users] [PATCH 5/7] Improve error message visibility (bug #3517
From: |
ygrek |
Subject: |
[Mldonkey-users] [PATCH 5/7] Improve error message visibility (bug #35171) |
Date: |
Mon, 18 Jun 2012 00:20:40 +0300 |
---
src/daemon/driver/driverControlers.ml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/daemon/driver/driverControlers.ml
b/src/daemon/driver/driverControlers.ml
index fc89f20..7fc6e2b 100644
--- a/src/daemon/driver/driverControlers.ml
+++ b/src/daemon/driver/driverControlers.ml
@@ -1519,14 +1519,17 @@ let http_handler o t r =
| s -> http_send_bin_pictures r buf (String.lowercase s)
with
| Not_found ->
- let _, error_text_long, header = Http_server.error_page "404" "" ""
+ let _, error_text_long, head = Http_server.error_page "404" "" ""
(Ip.to_string (TcpBufferedSocket.my_ip r.sock))
(string_of_int !!http_port)
(Some (Url_not_found r.get_url.Url.full_file)) in
- r.reply_head <- header;
+ r.reply_head <- head;
+ http_add_html_header r;
Buffer.add_string buf error_text_long
| e ->
- Printf.bprintf buf "\nException %s\n" (Printexc2.to_string e);
+ http_add_text_header r TEXTS;
+ Printf.bprintf buf "%sException %s\n"
+ (if Buffer.length buf = 0 then "" else "\n") (Printexc2.to_string
e);
r.reply_stream <- None
end;
--
1.7.10
- [Mldonkey-users] [PATCH 1/7] new option filenames_utf8, ygrek, 2012/06/17
- [Mldonkey-users] [PATCH 2/7] pause conditions: "pause where priority < X", ygrek, 2012/06/17
- [Mldonkey-users] [PATCH 3/7] Do not leave empty files if code generation fails, ygrek, 2012/06/17
- [Mldonkey-users] [PATCH 5/7] Improve error message visibility (bug #35171),
ygrek <=
- [Mldonkey-users] [PATCH 6/7] fix html validation errors, ygrek, 2012/06/17
- [Mldonkey-users] [PATCH 7/7] restore OSX compatibility (bug #36654), ygrek, 2012/06/17
- [Mldonkey-users] [PATCH 4/7] Fix content-type for 401 error (bug #35170), ygrek, 2012/06/17