aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2000-11-13 18:23:21 +0000
committerDaniel Stenberg <daniel@haxx.se>2000-11-13 18:23:21 +0000
commit2bd70e13511c7ec678f934366801fda02801e9f9 (patch)
tree9b3012cac47d6a955d830aa381ecebb4d169a61b /lib
parent336124c3dc45bb4e54e3a2d2b26eae4c5c8220f7 (diff)
moved the followlocation field from the http struct to the urldata struct
since it has to survive http struct deletion
Diffstat (limited to 'lib')
-rw-r--r--lib/highlevel.c2
-rw-r--r--lib/urldata.h18
2 files changed, 12 insertions, 8 deletions
diff --git a/lib/highlevel.c b/lib/highlevel.c
index a67e0f024..fbdde4bff 100644
--- a/lib/highlevel.c
+++ b/lib/highlevel.c
@@ -646,7 +646,7 @@ CURLcode curl_transfer(CURL *curl)
/* mark the next request as a followed location: */
data->bits.this_is_a_follow = TRUE;
- data->proto.http->followlocation++; /* count location-followers */
+ data->followlocation++; /* count location-followers */
if(data->bits.http_auto_referer) {
/* We are asked to automatically set the previous URL as the
diff --git a/lib/urldata.h b/lib/urldata.h
index 5f5bb7b95..29b4e725f 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -272,8 +272,6 @@ struct HTTP {
struct Form form;
size_t (*storefread)(char *, size_t , size_t , FILE *);
FILE *in;
-
- long followlocation;
};
/****************************************************************************
@@ -412,17 +410,23 @@ struct UrlData {
char *userpwd; /* <user:password>, if used */
char *range; /* range, if used. See README for detailed specification on
this syntax. */
- char *postfields; /* if POST, set the fields' values here */
- long postfieldsize; /* if POST, this might have a size to use instead of
- strlen(), and then the data *may* be binary (contain
- zero bytes) */
+ /* stuff related to HTTP */
+
+ long followlocation;
+ char *referer;
bool free_referer; /* set TRUE if 'referer' points to a string we
allocated */
- char *referer;
char *useragent; /* User-Agent string */
+ char *postfields; /* if POST, set the fields' values here */
+ long postfieldsize; /* if POST, this might have a size to use instead of
+ strlen(), and then the data *may* be binary (contain
+ zero bytes) */
+ /* stuff related to FTP */
char *ftpport; /* port to send with the PORT command */
+
+ /* general things */
char *device; /* Interface to use */
/* function that stores the output:*/