From: hniksic Date: Tue, 19 Feb 2002 05:23:35 +0000 (-0800) Subject: [svn] Follow https links from http. X-Git-Tag: v1.13~1836 X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=75a080ad0d39e7962e621af33b354acfc1fafc90 [svn] Follow https links from http. Submitted by Christian Lackas in <20020211202444.GA20371@lackas.desy.de>. --- diff --git a/src/ChangeLog b/src/ChangeLog index 29075ace..43d80e50 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2002-02-11 Christian Lackas + + * recur.c: recurive downloading for https fixed. + 2002-02-19 Alan Eldridge * host.h: Also include and . diff --git a/src/recur.c b/src/recur.c index fa6327d5..a20f7d5f 100644 --- a/src/recur.c +++ b/src/recur.c @@ -438,6 +438,9 @@ download_child_p (const struct urlpos *upos, struct url *parent, int depth, /* 1. Schemes other than HTTP are normally not recursed into. */ if (u->scheme != SCHEME_HTTP +#ifdef HAVE_SSL + && u->scheme != SCHEME_HTTPS +#endif && !(u->scheme == SCHEME_FTP && opt.follow_ftp)) { DEBUGP (("Not following non-HTTP schemes.\n")); @@ -446,7 +449,11 @@ download_child_p (const struct urlpos *upos, struct url *parent, int depth, /* 2. If it is an absolute link and they are not followed, throw it out. */ - if (u->scheme == SCHEME_HTTP) + if (u->scheme == SCHEME_HTTP +#ifdef HAVE_SSL + || u->scheme == SCHEME_HTTPS +#endif + ) if (opt.relative_only && !upos->link_relative_p) { DEBUGP (("It doesn't really look like a relative link.\n")); @@ -534,7 +541,12 @@ download_child_p (const struct urlpos *upos, struct url *parent, int depth, } /* 8. */ - if (opt.use_robots && u->scheme == SCHEME_HTTP) + if (opt.use_robots && (u->scheme == SCHEME_HTTP +#ifdef HAVE_SSL + || u->scheme == SCHEME_HTTPS +#endif + ) + ) { struct robot_specs *specs = res_get_specs (u->host, u->port); if (!specs)