1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

[svn] Follow https links from http.

Submitted by Christian Lackas in <20020211202444.GA20371@lackas.desy.de>.
This commit is contained in:
hniksic 2002-02-18 21:23:35 -08:00
parent 57f36f8a6a
commit 75a080ad0d
2 changed files with 18 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2002-02-11 Christian Lackas <delta@lackas.net>
* recur.c: recurive downloading for https fixed.
2002-02-19 Alan Eldridge <alane@geeksrus.net> 2002-02-19 Alan Eldridge <alane@geeksrus.net>
* host.h: Also include <netinet/in.h> and <sys/socket.h>. * host.h: Also include <netinet/in.h> and <sys/socket.h>.

View File

@ -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. */ /* 1. Schemes other than HTTP are normally not recursed into. */
if (u->scheme != SCHEME_HTTP if (u->scheme != SCHEME_HTTP
#ifdef HAVE_SSL
&& u->scheme != SCHEME_HTTPS
#endif
&& !(u->scheme == SCHEME_FTP && opt.follow_ftp)) && !(u->scheme == SCHEME_FTP && opt.follow_ftp))
{ {
DEBUGP (("Not following non-HTTP schemes.\n")); 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 /* 2. If it is an absolute link and they are not followed, throw it
out. */ 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) if (opt.relative_only && !upos->link_relative_p)
{ {
DEBUGP (("It doesn't really look like a relative link.\n")); 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. */ /* 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); struct robot_specs *specs = res_get_specs (u->host, u->port);
if (!specs) if (!specs)