From 36eba4090549ad88ec788c93386491776d30204c Mon Sep 17 00:00:00 2001
From: hniksic <devnull@localhost>
Date: Mon, 14 May 2001 02:32:11 -0700
Subject: [PATCH] [svn] Make sure cookie code works with the real URL data, not
the proxy one. Published in <sxsg0e8z3bp.fsf@florida.arsdigita.de>.
---
src/ChangeLog | 5 +++++
src/http.c | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index b873a47c..e84f3d4e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-14 Hrvoje Niksic <hniksic@arsdigita.com>
+
+ * http.c (gethttp): Use real URL data for cookies, not the cookie
+ stuff.
+
2001-05-12 Hrvoje Niksic <hniksic@arsdigita.com>
* main.c (print_help): Document `--no-http-keep-alive'.
diff --git a/src/http.c b/src/http.c
index 23ed7ddc..93b3a12f 100644
--- a/src/http.c
+++ b/src/http.c
@@ -596,10 +596,6 @@ gethttp (struct urlinfo *u, struct http_stat *hs, int *dt)
keep_alive = 0;
http_keep_alive_1 = http_keep_alive_2 = 0;
- if (opt.cookies)
- cookies = build_cookies_request (u->host, u->port, u->path,
- u->proto == URLHTTPS);
-
/* Initialize certain elements of struct http_stat. */
hs->len = 0L;
hs->contlen = -1;
@@ -807,6 +803,10 @@ gethttp (struct urlinfo *u, struct http_stat *hs, int *dt)
else
request_keep_alive = NULL;
+ if (opt.cookies)
+ cookies = build_cookies_request (ou->host, ou->port, ou->path,
+ ou->proto == URLHTTPS);
+
/* Allocate the memory for the request. */
request = (char *)alloca (strlen (command) + strlen (path)
+ strlen (useragent)