From: Micah Cowan <micah@cowan.name>
Date: Mon, 17 Mar 2008 08:53:49 +0000 (-0700)
Subject: Imported slash/--no-parents and sys/time.h fixes from eleven (99b1afbc14bc).
X-Git-Tag: v1.13~445^2~1
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=1db9f1e9acb901b14bf64fc126a6662ebcf6cd75

Imported slash/--no-parents and sys/time.h fixes from eleven (99b1afbc14bc).
---

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 509828cc..2f25f5a8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-17  Micah Cowan  <micah@cowan.name>
+
+	* wget.texi <Directory-Based Limits>: Mention importance of
+	trailing slashes to --no-parents.
+
 2008-02-10  Micah Cowan  <micah@cowan.name>
 
 	* wget.texi <HTTP Options>: Added documentation of
diff --git a/doc/wget.texi b/doc/wget.texi
index 008e1809..a4407949 100644
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -2202,6 +2202,14 @@ followed.  Only the archive you are interested in will be downloaded.
 Essentially, @samp{--no-parent} is similar to
 @samp{-I/~luzer/my-archive}, only it handles redirections in a more
 intelligent fashion.
+
+@strong{Note} that, for HTTP (and HTTPS), the trailing slash is very
+important to @samp{--no-parent}. HTTP has no concept of a ``directory''---Wget
+relies on you to indicate what's a directory and what isn't. In
+@samp{http://foo/bar/}, Wget will consider @samp{bar} to be a
+directory, while in @samp{http://foo/bar} (no trailing slash),
+@samp{bar} will be considered a filename (so @samp{--no-parent} would be
+meaningless, as its parent is @samp{/}).
 @end table
 
 @node Relative Links
diff --git a/src/ChangeLog b/src/ChangeLog
index c78ee268..b6169204 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-17  Micah Cowan  <micah@cowan.name>
+
+	* connect.c: Include sys/time.h to support use of the select
+	function on older systems.
+
 2008-02-11  Benno Schulenberg  <bensberg@justemail.net>
 
 	* http.c: More accurate and descriptive messages for when a file
diff --git a/src/connect.c b/src/connect.c
index e4ad453b..2be764d4 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -51,6 +51,9 @@ as that of the covered work.  */
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif /* HAVE_SYS_SELECT_H */
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
 #include "utils.h"
 #include "host.h"
 #include "connect.h"