From d21ff04bea72350c55bb018348f936fdef162c17 Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Fri, 20 Mar 2015 12:10:35 +0000 Subject: [PATCH] Update netsurf for newer http.obj git-svn-id: svn://kolibrios.org@5535 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/network/netsurf/netsurf/content/fetchers/curl.c | 4 ++-- contrib/network/netsurf/netsurf/content/fetchers/http.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/network/netsurf/netsurf/content/fetchers/curl.c b/contrib/network/netsurf/netsurf/content/fetchers/curl.c index d05051eacd..41058599da 100644 --- a/contrib/network/netsurf/netsurf/content/fetchers/curl.c +++ b/contrib/network/netsurf/netsurf/content/fetchers/curl.c @@ -682,7 +682,7 @@ bool fetch_curl_initiate_fetch(struct curl_fetch_info *fetch, struct http_msg *h if(fetch->post_urlenc) { LOG(("http_post on %s with headers: %s", zz, fetch->post_urlenc)); - wererat = http_post(zz, NULL, "application/x-www-form-urlencoded", strlen(fetch->post_urlenc)); + wererat = http_post(zz, NULL, NULL, NULL, "application/x-www-form-urlencoded", strlen(fetch->post_urlenc)); if(wererat == 0) { @@ -699,7 +699,7 @@ bool fetch_curl_initiate_fetch(struct curl_fetch_info *fetch, struct http_msg *h else /* GET Request */ { LOG(("http_get on URL : %s", zz)); - wererat = http_get(zz, NULL); /* Initiates the GET on the handle we want to initiate for */ + wererat = http_get(zz, NULL, NULL, NULL); /* Initiates the GET on the handle we want to initiate for */ if(wererat == 0) /* http_get failed. Something wrong. Can't do anything here */ { diff --git a/contrib/network/netsurf/netsurf/content/fetchers/http.c b/contrib/network/netsurf/netsurf/content/fetchers/http.c index 2a3fc39df4..082673f172 100644 --- a/contrib/network/netsurf/netsurf/content/fetchers/http.c +++ b/contrib/network/netsurf/netsurf/content/fetchers/http.c @@ -13,12 +13,12 @@ extern int mem_ReAlloc(); int (* __stdcall http_init)(void); // On the next line, we should tell the C compiler that this procedure actually returns a pointer. (to the http_msg struct) -unsigned int (* __stdcall http_get) (char * url, char * add_head); //yay, it's NOT uint, but hey, C is stubborn, and I'm dumb +unsigned int (* __stdcall http_get) (char * url, unsigned int identifier, unsigned int flags, char * add_head); //yay, it's NOT uint, but hey, C is stubborn, and I'm dumb int (* __stdcall http_receive) (unsigned int identifier); void (* __stdcall http_free) (unsigned int identifier); -char * (* __stdcall http_find_header_field) (struct http_msg *http_ahoy, char *field_name); //This is crazzzzzzyyyyyy +char * (* __stdcall http_find_header_field) (struct http_msg *http_ahoy, char *field_name); char * (* __stdcall http_unescape_url) (char * url_asciiz); -char * (* __stdcall http_post) (char *url, char *headers, char *content_type, int content_length); +char * (* __stdcall http_post) (char *url, unsigned int identifier, unsigned int flags, char *headers, char *content_type, int content_length); int (* __stdcall http_send) (struct http_msg *handle, char *data, unsigned int length); void (* __stdcall http_disconnect) (struct http_msg *handle);