[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/03/05 10:43:47

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml commonWeb.ml 
        src/daemon/driver: driverCommands.ml 
        src/networks/bittorrent: bTInteractive.ml bTOptions.ml 

Log message:
        patch #4946

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.759&tr2=1.760&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.129&tr2=1.130&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonWeb.ml.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.126&tr2=1.127&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTOptions.ml.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.759 mldonkey/distrib/ChangeLog:1.760
--- mldonkey/distrib/ChangeLog:1.759    Sun Mar  5 10:41:50 2006
+++ mldonkey/distrib/ChangeLog  Sun Mar  5 10:43:46 2006
@@ -15,6 +15,9 @@
 =========
 
 2006/03/05
+4946: System-wide cookies and referers option
+- MLDonkey will not move data from bittorrent.ini to downloads.ini
+- This data will be used in web_infos, dllink and BT module.
 4951: GUI: Update server country codes after loading GeoIP data
 4949: Gzip/Bzip2: Close opened FD after opening an invalid archive file
 4945: BT: Automatically start new torrents downloads
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.129 
mldonkey/src/daemon/common/commonOptions.ml:1.130
--- mldonkey/src/daemon/common/commonOptions.ml:1.129   Sun Feb 26 16:23:55 2006
+++ mldonkey/src/daemon/common/commonOptions.ml Sun Mar  5 10:43:46 2006
@@ -910,6 +910,14 @@
   This implies some bandwidth-cost (with 200 connections ~10-20%)"
     bool_option !BasicSocket.socket_keepalive
 
+let referers = define_option current_section ["referers"]
+    "Cookies send with a http request (used for .torrent files and web_infos)"
+    (list_option (tuple2_option (string_option, string_option))) 
[(".*suprnova.*", "http://www.suprnova.org/";)]
+
+let cookies = define_option current_section ["cookies"]
+    "Cookies send with a http request (used for .torrent files and web_infos)"
+    (list_option (tuple2_option (string_option, list_option (tuple2_option 
(string_option, string_option))))) []
+
 let http_proxy_server = define_option current_section ["http_proxy_server"]
     "Direct HTTP queries to HTTP proxy" string_option ""
 let http_proxy_port = define_option current_section ["http_proxy_port"]
Index: mldonkey/src/daemon/common/commonWeb.ml
diff -u mldonkey/src/daemon/common/commonWeb.ml:1.27 
mldonkey/src/daemon/common/commonWeb.ml:1.28
--- mldonkey/src/daemon/common/commonWeb.ml:1.27        Sun Feb  5 13:17:40 2006
+++ mldonkey/src/daemon/common/commonWeb.ml     Sun Mar  5 10:43:46 2006
@@ -50,6 +50,23 @@
       H.basic_request with
       H.req_url = Url.of_string url;
       H.req_proxy = !CommonOptions.http_proxy;
+      H.req_referer = (
+        let (rule_search,rule_value) =
+          try (List.find(fun (rule_search,rule_value) ->
+            Str.string_match (Str.regexp rule_search) url 0
+          ) !!referers )
+          with Not_found -> ("",url) in
+        Some (Url.of_string rule_value) );
+      H.req_headers = (try
+        let cookies = List.assoc url !!cookies in
+          [ ( "Cookie", List.fold_left (fun res (key, value) ->
+              if res = "" then
+                key ^ "=" ^ value
+              else
+                res ^ "; " ^ key ^ "=" ^ value
+          ) "" cookies
+        ) ]
+      with Not_found -> []);
       H.req_user_agent =
       Printf.sprintf "MLDonkey/%s" Autoconf.current_version;
       H.req_max_retry = 20;
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.126 
mldonkey/src/daemon/driver/driverCommands.ml:1.127
--- mldonkey/src/daemon/driver/driverCommands.ml:1.126  Sun Feb 26 16:23:55 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml        Sun Mar  5 10:43:46 2006
@@ -2768,6 +2768,23 @@
                 H.req_proxy = !CommonOptions.http_proxy;
                 H.req_request = H.HEAD;
                H.req_max_retry = 10;
+                H.req_referer = (
+                  let (rule_search,rule_value) =
+                    try (List.find(fun (rule_search,rule_value) ->
+                            Str.string_match (Str.regexp rule_search) 
u.Url.server 0
+                        ) !!referers )
+                    with Not_found -> ("",u.Url.server) in
+                  Some (Url.of_string rule_value) );
+                H.req_headers = (try
+                  let cookies = List.assoc u.Url.server !!cookies in
+                 [ ( "Cookie", List.fold_left (fun res (key, value) ->
+                          if res = "" then
+                            key ^ "=" ^ value
+                          else
+                            res ^ "; " ^ key ^ "=" ^ value
+                      ) "" cookies
+                    ) ]
+                with Not_found -> []);
                 H.req_user_agent =
                        Printf.sprintf "MLDonkey/%s" Autoconf.current_version;
             } in
Index: mldonkey/src/networks/bittorrent/bTInteractive.ml
diff -u mldonkey/src/networks/bittorrent/bTInteractive.ml:1.83 
mldonkey/src/networks/bittorrent/bTInteractive.ml:1.84
--- mldonkey/src/networks/bittorrent/bTInteractive.ml:1.83      Sun Mar  5 
10:40:04 2006
+++ mldonkey/src/networks/bittorrent/bTInteractive.ml   Sun Mar  5 10:43:47 2006
@@ -661,15 +661,14 @@
             H.req_proxy = !CommonOptions.http_proxy;
             H.req_user_agent = get_user_agent ();
             H.req_referer = (
-              let referers = !!BTOptions.referers in
               let (rule_search,rule_value) =
                 try (List.find(fun (rule_search,rule_value) ->
                         Str.string_match (Str.regexp rule_search) real_url 0
-                    ) referers )
+                    ) !!referers )
                 with Not_found -> ("",real_url) in
               Some (Url.of_string rule_value) );
             H.req_headers = (try
-              let cookies = List.assoc u.Url.server !!BTOptions.cookies in
+              let cookies = List.assoc u.Url.server !!cookies in
               [ ( "Cookie", List.fold_left (fun res (key, value) ->
                       if res = "" then
                         key ^ "=" ^ value
Index: mldonkey/src/networks/bittorrent/bTOptions.ml
diff -u mldonkey/src/networks/bittorrent/bTOptions.ml:1.25 
mldonkey/src/networks/bittorrent/bTOptions.ml:1.26
--- mldonkey/src/networks/bittorrent/bTOptions.ml:1.25  Sun Jan  1 19:25:42 2006
+++ mldonkey/src/networks/bittorrent/bTOptions.ml       Sun Mar  5 10:43:47 2006
@@ -118,14 +118,6 @@
 let client_timeout = define_option bittorrent_section ["client_timeout"]
   "Timeout on client connections" float_option 90.
 
-let cookies = define_option bittorrent_section ["cookies"]
-    "Cookies send with http request to get .torrent file"
-    (list_option (tuple2_option (string_option, list_option (tuple2_option 
(string_option, string_option))))) []
-
-let referers = define_option bittorrent_section ["referers"]
-    "Referer sent with http request to get .torrent file"
-    (list_option (tuple2_option (string_option, string_option))) 
[(".*suprnova.*", "http://www.suprnova.org/";)]
-
 let user_agent = define_option bittorrent_section ["user_agent"]
     "User agent string (default = \"default\")"
     string_option "default"