[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr... |
Date: |
Sun, 24 Jun 2012 08:06:11 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 12/06/24 08:06:11
Modified files:
distrib : ChangeLog
src/daemon/driver: driverControlers.ml
Log message:
patch #7801
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1556&r2=1.1557
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.120&r2=1.121
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1556
retrieving revision 1.1557
diff -u -b -r1.1556 -r1.1557
--- distrib/ChangeLog 24 Jun 2012 08:04:44 -0000 1.1556
+++ distrib/ChangeLog 24 Jun 2012 08:06:11 -0000 1.1557
@@ -15,6 +15,7 @@
=========
2012/06/24
+7801: HTML: Fix content-type for 401 error (ygrek)
7800: Improve error message visibility (ygrek)
7799: HTML: fix validation errors (ygrek)
7798: Fix Mac OS X compilation (ygrek)
Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- src/daemon/driver/driverControlers.ml 24 Jun 2012 08:04:45 -0000
1.120
+++ src/daemon/driver/driverControlers.ml 24 Jun 2012 08:06:11 -0000
1.121
@@ -963,15 +963,14 @@
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 := TXT;
- let _, error_text_long, header = Http_server.error_page "401" "" ""
+ http_file_type := HTM;
+ let _, error_text_long, head = Http_server.error_page "401" "" ""
(Ip.to_string (TcpBufferedSocket.my_ip r.sock))
(string_of_int !!http_port) None in
Buffer.add_string buf error_text_long;
- r.reply_head <- header;
- r.reply_headers <- [
- "Connection", "close";
- "WWW-Authenticate", Printf.sprintf "Basic realm=\"%s\"" !!http_realm]
+ r.reply_head <- head;
+ http_add_html_header r;
+ add_reply_header r "WWW-Authenticate" (Printf.sprintf "Basic
realm=\"%s\"" !!http_realm);
end
else
begin