From ac1616c81a1b650551baf2e0c115fae44263caa7 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 5 Feb 2010 18:03:35 +0100 Subject: Apply 02_changeset_r49_http_support_1.patch from Debian --- ChangeLog | 6 ++++++ src/imlib.c | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83b505d..763afbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Oct 1 07:25:00 EDT 2005 Richard Lowe + * (imlib.c): Fix http grabbing via wget, wget --cache 0 is no longer valid + and treats the 0 as another URL. Debian bug #330912. + I view this as wget's fault, I'm sure others won't, however. + * (imlib.c): Tidy up a minor bit of bothersome logic while there. + Fri Aug 05 17:29:55 BST 2005 Tom Gilbert * Patch from Matthias Drochner to fix compilation on older systems. diff --git a/src/imlib.c b/src/imlib.c index fc4dcf0..a217da3 100644 --- a/src/imlib.c +++ b/src/imlib.c @@ -289,10 +289,6 @@ feh_http_load_image(char *url) snprintf(cppid, sizeof(cppid), "%06ld", (long)ppid); tmpname_timestamper = estrjoin("", "/tmp/feh_", cppid, "_", basename, NULL); - } - - if (opt.wget_timestamp) - { newurl = estrdup(url); } else @@ -548,8 +544,8 @@ feh_http_load_image(char *url) } else { - execlp("wget", "wget", "--cache", "0", newurl, "-O", tmpname, - quiet, (char*) NULL); + execlp("wget", "wget", "--cache=off", "-O", tmpname, newurl, + quiet, NULL); } eprintf("url: exec failed: wget:"); } -- cgit v1.2.3