X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Frecur.c;h=72274fb52673c36f0924ccbfb1dbc306b5f12bfa;hb=b718128b4f3eb8473fb3b31c8397b49854e74ab7;hp=00e7603163c1b2be1998c0f7dc74339af35253fc;hpb=2f6aa1d7417df1dfc58597777686fbd77179b9fd;p=wget diff --git a/src/recur.c b/src/recur.c index 00e76031..72274fb5 100644 --- a/src/recur.c +++ b/src/recur.c @@ -563,7 +563,8 @@ download_child_p (const struct urlpos *upos, struct url *parent, int depth, if (opt.no_parent && schemes_are_similar_p (u->scheme, start_url_parsed->scheme) && 0 == strcasecmp (u->host, start_url_parsed->host) - && u->port == start_url_parsed->port + && (u->scheme != start_url_parsed->scheme + || u->port == start_url_parsed->port) && !(opt.page_requisites && upos->link_inline_p)) { if (!subdir_p (start_url_parsed->dir, u->dir)) @@ -585,6 +586,11 @@ download_child_p (const struct urlpos *upos, struct url *parent, int depth, goto out; } } + if (!accept_url (url)) + { + DEBUGP (("%s is excluded/not-included through regex.\n", url)); + goto out; + } /* 6. Check for acceptance/rejection rules. We ignore these rules for directories (no file name to match) and for non-leaf HTMLs,