[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog ...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog ... |
Date: |
Sun, 29 Jan 2006 18:42:02 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Branch:
Changes by: spiralvoice <address@hidden> 06/01/29 18:42:02
Modified files:
config : configure.in
distrib : ChangeLog
src/daemon/common: commonWeb.ml
src/daemon/driver: driverMain.ml
src/networks/bittorrent: bTClients.ml bTInteractive.ml
src/utils/cdk : unix2.ml
src/utils/net : geoip.ml http_client.ml
Log message:
patch #4841
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.247&tr2=1.248&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.690&tr2=1.691&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonWeb.ml.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverMain.ml.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/cdk/unix2.ml.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/net/geoip.ml.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/net/http_client.ml.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
Patches:
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.247 mldonkey/config/configure.in:1.248
--- mldonkey/config/configure.in:1.247 Thu Jan 26 00:25:24 2006
+++ mldonkey/config/configure.in Sun Jan 29 18:42:02 2006
@@ -678,6 +678,8 @@
DONKEY_SUI=no
AC_MSG_RESULT(no)
fi
+ else
+ DONKEY_SUI=no
fi
if test "$BITTORRENT" = "yes"; then
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.690 mldonkey/distrib/ChangeLog:1.691
--- mldonkey/distrib/ChangeLog:1.690 Sun Jan 29 18:40:18 2006
+++ mldonkey/distrib/ChangeLog Sun Jan 29 18:42:02 2006
@@ -15,6 +15,11 @@
=========
2006/01/29
+4841: Create new dir web_infos for web_infos files,
+ BT: do not save .torrent or announce.*
+ all files downloaded by web_infos go to $MLDONKEY_DIR/web_infos
+ to avoid downloading files twice move files from $MLDONKEY_DIR
+ into that new dir
4826: improve error message due to corrupt config files (schlumpf)
4821: improve display of sysinfo (schlumpf)
Index: mldonkey/src/daemon/common/commonWeb.ml
diff -u mldonkey/src/daemon/common/commonWeb.ml:1.24
mldonkey/src/daemon/common/commonWeb.ml:1.25
--- mldonkey/src/daemon/common/commonWeb.ml:1.24 Thu Jan 19 02:13:19 2006
+++ mldonkey/src/daemon/common/commonWeb.ml Sun Jan 29 18:42:02 2006
@@ -81,11 +81,11 @@
Unix.gmtime t
end
in
- if not (Sys.file_exists (Filename.basename r.H.req_url.Url.short_file))
then
+ let file = Filename.concat "web_infos" (Filename.basename
r.H.req_url.Url.short_file) in
+ if not (Sys.file_exists file) then
H.wget r f
else
begin
- let file = Filename.basename r.H.req_url.Url.short_file in
let file_date = Unix.LargeFile.stat file in
let file_time = Unix.gmtime file_date.Unix.LargeFile.st_mtime in
if html_time <= file_time then
Index: mldonkey/src/daemon/driver/driverMain.ml
diff -u mldonkey/src/daemon/driver/driverMain.ml:1.91
mldonkey/src/daemon/driver/driverMain.ml:1.92
--- mldonkey/src/daemon/driver/driverMain.ml:1.91 Wed Jan 25 22:29:53 2006
+++ mldonkey/src/daemon/driver/driverMain.ml Sun Jan 29 18:42:02 2006
@@ -381,6 +381,8 @@
) !!CommonComplexOptions.shared_directories;
Unix2.safe_mkdir "searches";
Unix2.can_write_to_directory "searches";
+ Unix2.safe_mkdir "web_infos";
+ Unix2.can_write_to_directory "web_infos";
Unix2.safe_mkdir !!temp_directory;
Unix2.can_write_to_directory !!temp_directory
Index: mldonkey/src/networks/bittorrent/bTClients.ml
diff -u mldonkey/src/networks/bittorrent/bTClients.ml:1.62
mldonkey/src/networks/bittorrent/bTClients.ml:1.63
--- mldonkey/src/networks/bittorrent/bTClients.ml:1.62 Sun Jan 1 19:36:03 2006
+++ mldonkey/src/networks/bittorrent/bTClients.ml Sun Jan 29 18:42:02 2006
@@ -203,7 +203,8 @@
(fun fileres ->
t.tracker_last_conn <- last_time ();
file.file_tracker_connected <- true;
- f t fileres)
+ f t fileres;
+ (try Sys.remove fileres with _ -> ()))
end
end
Index: mldonkey/src/networks/bittorrent/bTInteractive.ml
diff -u mldonkey/src/networks/bittorrent/bTInteractive.ml:1.79
mldonkey/src/networks/bittorrent/bTInteractive.ml:1.80
--- mldonkey/src/networks/bittorrent/bTInteractive.ml:1.79 Thu Jan 26
10:34:53 2006
+++ mldonkey/src/networks/bittorrent/bTInteractive.ml Sun Jan 29 18:42:02 2006
@@ -610,6 +610,7 @@
if ft_state ft = FileDownloading then begin
load_torrent_file filename;
file_cancel (as_ft ft);
+ (try Sys.remove filename with _ -> ())
end)
let valid_torrent_extension url =
Index: mldonkey/src/utils/cdk/unix2.ml
diff -u mldonkey/src/utils/cdk/unix2.ml:1.21
mldonkey/src/utils/cdk/unix2.ml:1.22
--- mldonkey/src/utils/cdk/unix2.ml:1.21 Mon Jan 9 00:25:59 2006
+++ mldonkey/src/utils/cdk/unix2.ml Sun Jan 29 18:42:02 2006
@@ -162,7 +162,7 @@
let temp_file = Filename.concat dirname "tmp_" ^ random () ^ "_mld.tmp" in
try
(let oc = open_out_gen [Open_creat; Open_wronly; Open_append] 0o600
temp_file in
- output_string oc "accesstest";
+ output_string oc "mldonkey accesstest - this file can be deleted";
close_out oc);
(try Sys.remove temp_file with _ -> ())
with
Index: mldonkey/src/utils/net/geoip.ml
diff -u mldonkey/src/utils/net/geoip.ml:1.2 mldonkey/src/utils/net/geoip.ml:1.3
--- mldonkey/src/utils/net/geoip.ml:1.2 Thu Jan 19 02:13:19 2006
+++ mldonkey/src/utils/net/geoip.ml Sun Jan 29 18:42:02 2006
@@ -139,9 +139,10 @@
let file = Zip.find_entry ic "GeoIP.dat" in
Zip.close_in ic;
ignore(Misc.archive_extract filename "zip");
- (try Sys.remove "GeoIP.dat" with _ -> ());
- Unix2.rename file.Zip.filename "GeoIP.dat";
- "GeoIP.dat"
+ let geo_file = Filename.concat "web_infos" "GeoIP.dat" in
+ (try Sys.remove geo_file with _ -> ());
+ Unix2.rename file.Zip.filename geo_file;
+ geo_file
with e ->
Zip.close_in ic;
lprintf_nl "Exception %s while extracting geoip.dat"
@@ -160,10 +161,11 @@
else
"gz"
in try
+ let geo_file = Filename.concat "web_infos" "GeoIP.dat" in
let s = Misc.archive_extract filename filetype in
- (try Sys.remove "GeoIP.dat" with _ -> ());
- Unix2.rename s "GeoIP.dat";
- "GeoIP.dat"
+ (try Sys.remove geo_file with _ -> ());
+ Unix2.rename s geo_file;
+ geo_file
with e ->
lprintf_nl "Exception %s while extracting"
(Printexc2.to_string e);
Index: mldonkey/src/utils/net/http_client.ml
diff -u mldonkey/src/utils/net/http_client.ml:1.26
mldonkey/src/utils/net/http_client.ml:1.27
--- mldonkey/src/utils/net/http_client.ml:1.26 Thu Jan 19 02:13:19 2006
+++ mldonkey/src/utils/net/http_client.ml Sun Jan 29 18:42:02 2006
@@ -387,7 +387,10 @@
lprintf_nl () "Empty content for url %s"
(Url.to_string r.req_url);
end;
- let filename = Filename.basename r.req_url.Url.short_file in
+ let webinfos_dir = "web_infos" in
+ Unix2.safe_mkdir webinfos_dir;
+ Unix2.can_write_to_directory webinfos_dir;
+ let filename = Filename.concat webinfos_dir (Filename.basename
r.req_url.Url.short_file) in
let oc = open_out_bin filename in
output_string oc s;
close_out oc;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog ...,
mldonkey-commits <=