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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/21 08:33:29

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

Log message:
        patch #4928

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.745&tr2=1.746&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml.diff?tr1=1.63&tr2=1.64&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.745 mldonkey/distrib/ChangeLog:1.746
--- mldonkey/distrib/ChangeLog:1.745    Tue Feb 21 08:23:12 2006
+++ mldonkey/distrib/ChangeLog  Tue Feb 21 08:33:29 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/02/21
+4928: BT: Fix invalid encoding in announce URL (darkfader)
 4929: Do not print password_empty warning if enable_user_config true
 4926: Runinfo: Warn about not-working DNS resolution,
       /dev/urandom detection was not disabled if --disable-donkeysui is used
Index: mldonkey/src/networks/bittorrent/bTClients.ml
diff -u mldonkey/src/networks/bittorrent/bTClients.ml:1.63 
mldonkey/src/networks/bittorrent/bTClients.ml:1.64
--- mldonkey/src/networks/bittorrent/bTClients.ml:1.63  Sun Jan 29 18:42:02 2006
+++ mldonkey/src/networks/bittorrent/bTClients.ml       Tue Feb 21 08:33:29 2006
@@ -186,7 +186,9 @@
                   (t.tracker_last_conn - last_time()) file.file_name;
 
               let module H = Http_client in
-              let url = t.tracker_url in
+              let url = 
+               (t.tracker_url ^ if not (Str.string_match (Str.regexp "\\?") 
t.tracker_url 0) then "&" else "")
+              in
               let r = {
                   H.basic_request with
                   H.req_url = Url.of_string ~args: args url;