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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/04/12 10:02:57

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

Log message:
        patch #5859

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1228&r2=1.1229
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.102&r2=1.103

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1228
retrieving revision 1.1229
diff -u -b -r1.1228 -r1.1229
--- distrib/ChangeLog   10 Apr 2007 16:25:50 -0000      1.1228
+++ distrib/ChangeLog   12 Apr 2007 10:02:57 -0000      1.1229
@@ -14,7 +14,10 @@
 ChangeLog
 =========
 
-2004/04/10
+2007/04/12
+5859: HTML: Support sending files from $MLDONKEY_DIR/html_themes/
+
+2007/04/10
 5861: HTML: Fix errors reported by w3.org validator in html_header_mods0
 5860: HTML: fix broken refresh on Opera/Safari (schlumpf)
 

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- src/daemon/driver/driverControlers.ml       18 Mar 2007 15:08:18 -0000      
1.102
+++ src/daemon/driver/driverControlers.ml       12 Apr 2007 10:02:57 -0000      
1.103
@@ -821,6 +821,9 @@
 
 let http_send_bin r buf filename =
   let file_to_send =
+    if theme_page_exists filename then
+      File.to_string (get_theme_page filename)
+    else
     try
       File.to_string filename
     with _ ->