[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/net/http_c...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/15 17:45:35

Modified files:
        distrib        : ChangeLog 
        src/utils/net  : http_client.ml http_client.mli 

Log message:
        patch #5090

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.828&tr2=1.829&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/net/http_client.ml.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/net/http_client.mli.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.828 mldonkey/distrib/ChangeLog:1.829
--- mldonkey/distrib/ChangeLog:1.828    Mon May 15 17:43:09 2006
+++ mldonkey/distrib/ChangeLog  Mon May 15 17:45:35 2006
@@ -15,6 +15,8 @@
 =========
 
 2006/05/15
+5090: Http_client: Fix 302 redirect when Location starts with "."
+      and filename changes
 5095: Configure: improve libpng detection, optical improvements
 
 2006/05/14
Index: mldonkey/src/utils/net/http_client.ml
diff -u mldonkey/src/utils/net/http_client.ml:1.30 
mldonkey/src/utils/net/http_client.ml:1.31
--- mldonkey/src/utils/net/http_client.ml:1.30  Sun May 14 19:09:21 2006
+++ mldonkey/src/utils/net/http_client.ml       Mon May 15 17:45:35 2006
@@ -44,7 +44,7 @@
     req_user_agent : string;
     req_accept : string;
     req_proxy : (string * int) option;
-    req_url : url;
+    mutable req_url : url;
     mutable req_save_to_file_time : float;
     req_request : http_request;
     req_referer : Url.url option;
@@ -302,13 +302,17 @@
               if !verbose then
                 print_headers ();
               let url =
+                if String2.check_prefix !url "." then url := String2.after 
!url 1;
                 if String.length !url > 0 && !url.[0] <> '/' then
                   !url
                 else
-                  Printf.sprintf "http://%s:%d%s";
-                    old_url.Url.server old_url.Url.port !url
+                  Printf.sprintf "http://%s%s%s";
+                    old_url.Url.server
+                    (if old_url.Url.port = 80 then "" else Printf.sprintf 
":%d" old_url.Url.port)
+                    !url
               in
               if !verbose then lprintf_nl () "Redirected to %s" url;
+              r.req_url <- (Url.of_string url);
               let r = { r with
       req_url = Url.of_string url;
       req_retry = retrynum+1 }
Index: mldonkey/src/utils/net/http_client.mli
diff -u mldonkey/src/utils/net/http_client.mli:1.6 
mldonkey/src/utils/net/http_client.mli:1.7
--- mldonkey/src/utils/net/http_client.mli:1.6  Sun May 14 19:09:21 2006
+++ mldonkey/src/utils/net/http_client.mli      Mon May 15 17:45:35 2006
@@ -36,7 +36,7 @@
     req_user_agent : string;
     req_accept : string;
     req_proxy : (string * int) option;
-    req_url : Url.url;
+    mutable req_url : Url.url;
     mutable req_save_to_file_time : float;
 (* re-download a saved file only if newer *)
     req_request : http_request;