diff options
Diffstat (limited to 'content')
| -rw-r--r-- | content/content.h | 5 | ||||
| -rw-r--r-- | content/fetch.c | 50 | ||||
| -rw-r--r-- | content/fetch.h | 6 | ||||
| -rw-r--r-- | content/fetchcache.c | 10 | ||||
| -rw-r--r-- | content/overview | 4 |
5 files changed, 60 insertions, 15 deletions
diff --git a/content/content.h b/content/content.h index 077b3cc89..571e23ab2 100644 --- a/content/content.h +++ b/content/content.h @@ -1,5 +1,5 @@ /** - * $Id: content.h,v 1.12 2003/06/17 19:24:20 bursa Exp $ + * $Id: content.h,v 1.13 2003/06/26 11:41:26 bursa Exp $ */ #ifndef _NETSURF_DESKTOP_CONTENT_H_ @@ -64,7 +64,8 @@ typedef enum { CONTENT_MSG_READY, /* may be displayed */ CONTENT_MSG_DONE, /* finished */ CONTENT_MSG_ERROR, /* error occurred */ - CONTENT_MSG_STATUS /* new status string */ + CONTENT_MSG_STATUS, /* new status string */ + CONTENT_MSG_REDIRECT /* replacement URL */ } content_msg; struct content_user diff --git a/content/fetch.c b/content/fetch.c index 1e2f4686a..714aff555 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -1,5 +1,5 @@ /** - * $Id: fetch.c,v 1.11 2003/06/24 23:22:00 bursa Exp $ + * $Id: fetch.c,v 1.12 2003/06/26 11:41:26 bursa Exp $ * * This module handles fetching of data from any url. * @@ -39,6 +39,8 @@ struct fetch void *p; struct curl_slist *headers; char *host; + int status_code; + char *location; struct fetch *queue; struct fetch *prev; struct fetch *next; @@ -50,7 +52,7 @@ static CURLM * curl_multi; static struct fetch *fetch_list = 0; static size_t fetch_curl_data(void * data, size_t size, size_t nmemb, struct fetch *f); -static size_t fetch_curl_header(void *data, size_t size, size_t nmemb, struct fetch *f); +static size_t fetch_curl_header(char * data, size_t size, size_t nmemb, struct fetch *f); /** @@ -128,6 +130,7 @@ struct fetch * fetch_start(char *url, char *referer, fetch->host = 0; if (uri->server != 0) fetch->host = xstrdup(uri->server); + fetch->status_code = 0; fetch->queue = 0; fetch->prev = 0; fetch->next = 0; @@ -170,10 +173,10 @@ struct fetch * fetch_start(char *url, char *referer, assert(code == CURLE_OK); code = curl_easy_setopt(fetch->curl_handle, CURLOPT_WRITEDATA, fetch); assert(code == CURLE_OK); -/* code = curl_easy_setopt(fetch->curl_handle, CURLOPT_HEADERFUNCTION, fetch_curl_header); + code = curl_easy_setopt(fetch->curl_handle, CURLOPT_HEADERFUNCTION, fetch_curl_header); assert(code == CURLE_OK); code = curl_easy_setopt(fetch->curl_handle, CURLOPT_WRITEHEADER, fetch); - assert(code == CURLE_OK);*/ + assert(code == CURLE_OK); code = curl_easy_setopt(fetch->curl_handle, CURLOPT_USERAGENT, user_agent); assert(code == CURLE_OK); if (referer != 0) { @@ -279,8 +282,9 @@ void fetch_abort(struct fetch *f) } xfree(f->url); - xfree(f->host); - xfree(f->referer); + free(f->host); + free(f->referer); + free(f->location); xfree(f); } @@ -357,10 +361,23 @@ size_t fetch_curl_data(void * data, size_t size, size_t nmemb, struct fetch *f) LOG(("fetch %p, size %u", f, size * nmemb)); if (!f->had_headers) { - /* find the content type and inform the caller */ + /* find the status code and content type and inform the caller */ + long http_code; const char *type; CURLcode code; + code = curl_easy_getinfo(f->curl_handle, CURLINFO_HTTP_CODE, &http_code); + assert(code == CURLE_OK); + LOG(("HTTP status code %li", http_code)); + + if (300 <= http_code && http_code < 400 && f->location != 0) { + /* redirect */ + LOG(("FETCH_REDIRECT, '%s'", f->location)); + f->callback(FETCH_REDIRECT, f->p, f->location, 0); + f->in_callback = 0; + return 0; + } + code = curl_easy_getinfo(f->curl_handle, CURLINFO_CONTENT_TYPE, &type); assert(code == CURLE_OK); @@ -397,10 +414,23 @@ size_t fetch_curl_data(void * data, size_t size, size_t nmemb, struct fetch *f) * fetch_curl_header -- callback function for headers */ -size_t fetch_curl_header(void *data, size_t size, size_t nmemb, struct fetch *f) +size_t fetch_curl_header(char * data, size_t size, size_t nmemb, struct fetch *f) { - LOG(("header '%*s'", size * nmemb, data)); - return size * nmemb; + int i; + size *= nmemb; + if (12 < size && strncasecmp(data, "Location:", 9) == 0) { + /* extract Location header */ + f->location = xcalloc(size, 1); + for (i = 9; data[i] == ' ' || data[i] == '\t'; i++) + ; + strncpy(f->location, data + i, size - i); + for (i = size - i - 1; f->location[i] == ' ' || + f->location[i] == '\t' || + f->location[i] == '\r' || + f->location[i] == '\n'; i--) + f->location[i] = '\0'; + } + return size; } diff --git a/content/fetch.h b/content/fetch.h index 92c269a02..af1414a77 100644 --- a/content/fetch.h +++ b/content/fetch.h @@ -1,5 +1,5 @@ /** - * $Id: fetch.h,v 1.3 2003/04/17 21:35:02 bursa Exp $ + * $Id: fetch.h,v 1.4 2003/06/26 11:41:26 bursa Exp $ * * This module handles fetching of data from any url. * @@ -16,6 +16,8 @@ * Content-Type header in data, then one or more times with FETCH_DATA with * some data for the url, and finally with FETCH_FINISHED. Alternatively, * FETCH_ERROR indicates an error occurred: data contains an error message. + * FETCH_REDIRECT may replace the FETCH_TYPE, FETCH_DATA, FETCH_FINISHED + * sequence if the server sends a replacement URL. * Some private data can be passed as the last parameter to fetch_start, and * callbacks will contain this. * @@ -28,7 +30,7 @@ #ifndef _NETSURF_DESKTOP_FETCH_H_ #define _NETSURF_DESKTOP_FETCH_H_ -typedef enum {FETCH_TYPE, FETCH_DATA, FETCH_FINISHED, FETCH_ERROR} fetch_msg; +typedef enum {FETCH_TYPE, FETCH_DATA, FETCH_FINISHED, FETCH_ERROR, FETCH_REDIRECT} fetch_msg; struct content; struct fetch; diff --git a/content/fetchcache.c b/content/fetchcache.c index 0755b37c5..da5d65e13 100644 --- a/content/fetchcache.c +++ b/content/fetchcache.c @@ -1,5 +1,5 @@ /** - * $Id: fetchcache.c,v 1.10 2003/06/17 19:24:20 bursa Exp $ + * $Id: fetchcache.c,v 1.11 2003/06/26 11:41:26 bursa Exp $ */ #include <assert.h> @@ -83,6 +83,14 @@ void fetchcache_callback(fetch_msg msg, void *p, char *data, unsigned long size) content_destroy(c); break; + case FETCH_REDIRECT: + LOG(("FETCH_REDIRECT, '%s'", data)); + c->fetch = 0; + content_broadcast(c, CONTENT_MSG_REDIRECT, data); + cache_destroy(c); + content_destroy(c); + break; + default: assert(0); } diff --git a/content/overview b/content/overview index 0a911dc44..f58a995c1 100644 --- a/content/overview +++ b/content/overview @@ -44,6 +44,10 @@ callback function is called when the state changes or at other times as follows: CONTENT_MSG_STATUS -- the content structure's status message has changed. + CONTENT_MSG_REDIRECT -- the server has sent a replacement URL for the content. + This message may only occur in CONTENT_STATUS_TYPE_UNKNOWN. The content + will be destroyed and must not be used. + If at any time the resource is no longer required, call content_remove_user(): content_remove_user(c, callback, p1, p2); |