Attachment 308487 Details for Bug 450201 – patch

[patch] patch

rpm-httpproxy.patch (text/plain), 1.20 KB, created by ritz on 2008-06-05 21:02:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ritz

Created: 2008-06-05 21:02:36 UTC

Size: 1.20 KB

patch

obsolete

>diff -urN rpm-4.3.3-orig/rpmio/rpmio.c rpm-4.3.3/rpmio/rpmio.c
>--- rpm-4.3.3-orig/rpmio/rpmio.c	2004-11-11 16:35:48.000000000 -0500
>+++ rpm-4.3.3/rpmio/rpmio.c	2008-05-28 23:05:26.000000000 -0400
>@@ -1568,7 +1568,32 @@
> 	return FTPERR_BAD_HOSTNAME;
> 
>     if ((port = (u->proxyp > 0 ? u->proxyp : u->port)) < 0) port = 80;
>-    path = (u->proxyh || u->proxyp > 0) ? u->url : httpArg;
>+
>+    if (u->proxyh || u->proxyp > 0) {
>+
>+        /* Fix the path in the URL if we're in proxy mode */
>+	/* First find out where the path section begins in the URL */
>+	(void) urlPath(u->url, &path);
>+
>+	/* Figure out how long is the service://hostname/ section  */
>+	int prefix = strlen(u->url)-strlen(path);
>+
>+	/* Now we know what's the length of the string before 
>+	   the path in the URL, so reallocate memory for that section
>+	   plus the new path (directory + filename) */
>+	xrealloc((char *)u->url,prefix+strlen(httpArg));
>+
>+	/* Copy the right path into the URL */
>+	strcpy((char *)u->url+prefix,httpArg);
>+
>+	path=u->url;
>+    }
>+    else {
>+	/* If there's no proxy we can use the path directly with no 
>+ 	   modification */
>+	path = httpArg;
>+    }
>+
>     /*@-branchstate@*/
>     if (path == NULL) path = "";
>     /*@=branchstate@*/

Actions: View | Diff

Attachments on bug 450201: 308487 | 330172