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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/07/29 12:30:10

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

Log message:
        patch #6592

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1377&r2=1.1378
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.111&r2=1.112

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1377
retrieving revision 1.1378
diff -u -b -r1.1377 -r1.1378
--- distrib/ChangeLog   17 Jul 2008 18:34:56 -0000      1.1377
+++ distrib/ChangeLog   29 Jul 2008 12:30:09 -0000      1.1378
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2008/07/29
+6592: HTML: Fix invalid html respond when login is invalid
+
 2008/07/17
 6571: Runinfo: Include DirectConnect in list of enabled nets
 

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- src/daemon/driver/driverControlers.ml       3 Feb 2008 23:13:20 -0000       
1.111
+++ src/daemon/driver/driverControlers.ml       29 Jul 2008 12:30:09 -0000      
1.112
@@ -952,7 +952,7 @@
   let user = if r.options.login = "" then (admin_user 
()).CommonTypes.user_name else r.options.login in
   if not (valid_password user r.options.passwd) || (r.get_url.Url.short_file = 
"logout") then begin
       clear_page buf;
-      http_file_type := HTM;
+      http_file_type := TXT;
       let _, error_text_long, header = Http_server.error_page "401" "" ""
        (Ip.to_string (TcpBufferedSocket.my_ip r.sock))
        (string_of_int !!http_port) None in