1 files changed, 21 insertions, 1 deletions

diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c
index e79dba83b0ab..b814336285b3 100644
--- a/lib/libfetch/fetch.c
+++ b/lib/libfetch/fetch.c
@@ -367,7 +367,27 @@ nohost:
     if (!*p)
 	p = "/";
     
-    if ((u->doc = strdup(p)) == NULL) {
+    if (strcmp(u->scheme, "http") == 0 || strcmp(u->scheme, "https") == 0) {
+	const char hexnums[] = "0123456789abcdef";
+	char *doc;
+
+	/* Perform %hh encoding of white space. */
+	if ((doc = u->doc = malloc(strlen(p) * 3 + 1)) == NULL) {
+	    _fetch_syserr();
+	    goto ouch;
+	}
+	while (*p != '\0') {
+	    if (!isspace(*p)) {
+		*doc++ = *p++;
+            } else {
+		*doc++ = '%';
+		*doc++ = hexnums[((unsigned int)*p) >> 4];
+		*doc++ = hexnums[((unsigned int)*p) & 0xf];
+		p++;
+            }
+	}
+	*doc = '\0';
+    } else if ((u->doc = strdup(p)) == NULL) {
 	_fetch_syserr();
 	goto ouch;
     }