[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/bittorr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/25 21:09:03

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTClients.ml 
        src/utils/lib  : url.ml 

Log message:
        patch #4928

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.748&tr2=1.749&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/url.ml.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.748 mldonkey/distrib/ChangeLog:1.749
--- mldonkey/distrib/ChangeLog:1.748    Thu Feb 23 10:50:36 2006
+++ mldonkey/distrib/ChangeLog  Sat Feb 25 21:09:03 2006
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2006/02/25
+4928: BT: Fix invalid encoding in announce URL (darkfader)
+- removed old, broken version and added new version
+
 2006/02/23
 4934: FileTP: Small improvements
 - fix download restart bug when core is restarted, sources where not loaded
Index: mldonkey/src/networks/bittorrent/bTClients.ml
diff -u mldonkey/src/networks/bittorrent/bTClients.ml:1.64 
mldonkey/src/networks/bittorrent/bTClients.ml:1.65
--- mldonkey/src/networks/bittorrent/bTClients.ml:1.64  Tue Feb 21 08:33:29 2006
+++ mldonkey/src/networks/bittorrent/bTClients.ml       Sat Feb 25 21:09:03 2006
@@ -186,9 +186,7 @@
                   (t.tracker_last_conn - last_time()) file.file_name;
 
               let module H = Http_client in
-              let url = 
-               (t.tracker_url ^ if not (Str.string_match (Str.regexp "\\?") 
t.tracker_url 0) then "&" else "")
-              in
+              let url = t.tracker_url in
               let r = {
                   H.basic_request with
                   H.req_url = Url.of_string ~args: args url;
Index: mldonkey/src/utils/lib/url.ml
diff -u mldonkey/src/utils/lib/url.ml:1.5 mldonkey/src/utils/lib/url.ml:1.6
--- mldonkey/src/utils/lib/url.ml:1.5   Thu Aug 19 07:56:55 2004
+++ mldonkey/src/utils/lib/url.ml       Sat Feb 25 21:09:03 2006
@@ -161,7 +161,7 @@
   if args = [] then s else
   let res = Buffer.create 256 in
   Buffer.add_string res s;
-  Buffer.add_char res '?';
+  Buffer.add_char res (if String.contains s '?' then '&' else '?');
   let rec manage_args = function
     | [] -> assert false
     | [a, ""] ->