struct HttpHeader changed to struct curl_slist

diff --git a/lib/http.c b/lib/http.c
index 0f41e7c09549c5f7376255657466451fc4c214ec..b6b87f9053943654426b4f6b12670d3afda0a91c 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -107,11 +107,11 @@
  */
 bool static checkheaders(struct UrlData *data, char *thisheader)
 {
-  struct HttpHeader *head;
+  struct curl_slist *head;
   size_t thislen = strlen(thisheader);
 
   for(head = data->headers; head; head=head->next) {
-    if(strnequal(head->header, thisheader, thislen)) {
+    if(strnequal(head->data, thisheader, thislen)) {
       return TRUE;
     }
   }
@@ -280,6 +280,7 @@ CURLcode http(struct connectdata *conn)
     http->p_accept = "Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r\n";
 
   do {
+    struct curl_slist *headers=data->headers;
     sendf(data->firstsocket, data,
           "%s " /* GET/HEAD/POST/PUT */
           "%s HTTP/1.0\r\n" /* path */
@@ -362,11 +363,11 @@ CURLcode http(struct connectdata *conn)
       }
     }
 
-    while(data->headers) {
+    while(headers) {
       sendf(data->firstsocket, data,
             "%s\015\012",
-            data->headers->header);
-      data->headers = data->headers->next;
+            headers->data);
+      headers = headers->next;
     }
 
     if(data->bits.http_post || data->bits.http_formpost) {

diff --git a/lib/urldata.h b/lib/urldata.h
index 5af199c2e675f1126eb1eba9f0b8bd24a81b06a0..b5493a700f33a138f434032624d1d3d2d2b1ee7f 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -390,7 +390,7 @@ struct UrlData {
   char *newurl; /* This can only be set if a Location: was in the
                   document headers */
 
-  struct HttpHeader *headers; /* linked list of extra headers */
+  struct curl_slist *headers; /* linked list of extra headers */
   struct HttpPost *httppost;  /* linked list of POST data */
 
   char *cert; /* PEM-formatted certificate */