[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       12/06/24 08:04:45

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverControlers.ml 

Log message:
        patch #7800

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1555&r2=1.1556
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.119&r2=1.120

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1555
retrieving revision 1.1556
diff -u -b -r1.1555 -r1.1556
--- distrib/ChangeLog   24 Jun 2012 08:03:39 -0000      1.1555
+++ distrib/ChangeLog   24 Jun 2012 08:04:44 -0000      1.1556
@@ -15,6 +15,7 @@
 =========
 
 2012/06/24
+7800: Improve error message visibility (ygrek)
 7799: HTML: fix validation errors (ygrek)
 7798: Fix Mac OS X compilation (ygrek)
 7797: allow build with upcoming OCaml 4.00 (ygrek)

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- src/daemon/driver/driverControlers.ml       7 May 2011 18:59:56 -0000       
1.119
+++ src/daemon/driver/driverControlers.ml       24 Jun 2012 08:04:45 -0000      
1.120
@@ -1520,14 +1520,17 @@
         | 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;