mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 20:16:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Purge WITH_AUTH

Browse Source 
svn path=/trunk/netsurf/; revision=6600
This commit is contained in:
John Mark Bell 2009-02-22 15:13:10 +00:00
parent 847b776285
commit b98f105b24
13 changed files with 3 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docs/Doxyfile
View File

@ -894,7 +894,7 @@ INCLUDE_FILE_PATTERNS =
# or name=definition (no spaces). If the definition and the = are # or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed. # omitted =1 is assumed.
PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_AUTH WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_PRINT WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URI WITH_URL WITH_PDF_EXPORT PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_PRINT WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URI WITH_URL WITH_PDF_EXPORT
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded. # this tag can be used to specify a list of macro names that should be expanded.

2
content/content.h
View File

@ -97,9 +97,7 @@ typedef enum {
CONTENT_MSG_NEWPTR, /**< structure has been replaced */ CONTENT_MSG_NEWPTR, /**< structure has been replaced */
CONTENT_MSG_REFRESH, /**< wants refresh */ CONTENT_MSG_REFRESH, /**< wants refresh */
CONTENT_MSG_LAUNCH, /**< needs url launching in external program */ CONTENT_MSG_LAUNCH, /**< needs url launching in external program */
#ifdef WITH_AUTH
CONTENT_MSG_AUTH, /**< authentication required */ CONTENT_MSG_AUTH, /**< authentication required */
#endif
CONTENT_MSG_SSL /**< SSL cert verify failed */ CONTENT_MSG_SSL /**< SSL cert verify failed */
} content_msg; } content_msg;

2
content/fetch.h
View File

@ -36,9 +36,7 @@ typedef enum {
FETCH_ERROR, FETCH_ERROR,
FETCH_REDIRECT, FETCH_REDIRECT,
FETCH_NOTMODIFIED, FETCH_NOTMODIFIED,
#ifdef WITH_AUTH
FETCH_AUTH, FETCH_AUTH,
#endif
FETCH_CERT_ERR, FETCH_CERT_ERR,
} fetch_msg; } fetch_msg;

2
content/fetchcache.c
View File

@ -501,7 +501,6 @@ void fetchcache_callback(fetch_msg msg, void *p, const void *data,
fetchcache_notmodified(c, data); fetchcache_notmodified(c, data);
break; break;
#ifdef WITH_AUTH
case FETCH_AUTH: case FETCH_AUTH:
/* data -> string containing the Realm */ /* data -> string containing the Realm */
LOG(("FETCH_AUTH, '%s'", (const char *)data)); LOG(("FETCH_AUTH, '%s'", (const char *)data));
@ -512,7 +511,6 @@ void fetchcache_callback(fetch_msg msg, void *p, const void *data,
* destroyed in content_clean() */ * destroyed in content_clean() */
c->status = CONTENT_STATUS_ERROR; c->status = CONTENT_STATUS_ERROR;
break; break;
#endif
case FETCH_CERT_ERR: case FETCH_CERT_ERR:
c->fetch = 0; c->fetch = 0;

9
content/fetchers/fetch_curl.c
View File

@ -561,16 +561,13 @@ fetch_curl_set_options(struct curl_fetch_info *f)
SETOPT(CURLOPT_COOKIE, NULL); SETOPT(CURLOPT_COOKIE, NULL);
} }
#ifdef WITH_AUTH
if ((auth = urldb_get_auth_details(f->url)) != NULL) { if ((auth = urldb_get_auth_details(f->url)) != NULL) {
SETOPT(CURLOPT_HTTPAUTH, CURLAUTH_ANY); SETOPT(CURLOPT_HTTPAUTH, CURLAUTH_ANY);
SETOPT(CURLOPT_USERPWD, auth); SETOPT(CURLOPT_USERPWD, auth);
} else { } else {
#endif
SETOPT(CURLOPT_USERPWD, NULL); SETOPT(CURLOPT_USERPWD, NULL);
#ifdef WITH_AUTH
} }
#endif
if (option_http_proxy && option_http_proxy_host) { if (option_http_proxy && option_http_proxy_host) {
SETOPT(CURLOPT_PROXY, option_http_proxy_host); SETOPT(CURLOPT_PROXY, option_http_proxy_host);
SETOPT(CURLOPT_PROXYPORT, (long) option_http_proxy_port); SETOPT(CURLOPT_PROXYPORT, (long) option_http_proxy_port);
@ -1036,7 +1033,6 @@ size_t fetch_curl_header(char *data, size_t size, size_t nmemb,
SKIP_ST(15); SKIP_ST(15);
if (i < (int)size && '0' <= data[i] && data[i] <= '9') if (i < (int)size && '0' <= data[i] && data[i] <= '9')
f->content_length = atol(data + i); f->content_length = atol(data + i);
#ifdef WITH_AUTH
} else if (17 < size && strncasecmp(data, "WWW-Authenticate:", 17) == 0) { } else if (17 < size && strncasecmp(data, "WWW-Authenticate:", 17) == 0) {
/* extract the first Realm from WWW-Authenticate header */ /* extract the first Realm from WWW-Authenticate header */
free(f->realm); free(f->realm);
@ -1065,7 +1061,6 @@ size_t fetch_curl_header(char *data, size_t size, size_t nmemb,
f->realm[i] == '\n'); --i) f->realm[i] == '\n'); --i)
f->realm[i] = '\0'; f->realm[i] = '\0';
} }
#endif
} else if (11 < size && strncasecmp(data, "Set-Cookie:", 11) == 0) { } else if (11 < size && strncasecmp(data, "Set-Cookie:", 11) == 0) {
/* extract Set-Cookie header */ /* extract Set-Cookie header */
SKIP_ST(11); SKIP_ST(11);
@ -1118,12 +1113,10 @@ bool fetch_curl_process_headers(struct curl_fetch_info *f)
} }
/* handle HTTP 401 (Authentication errors) */ /* handle HTTP 401 (Authentication errors) */
#ifdef WITH_AUTH
if (http_code == 401) { if (http_code == 401) {
fetch_send_callback(FETCH_AUTH, f->fetch_handle, f->realm,0); fetch_send_callback(FETCH_AUTH, f->fetch_handle, f->realm,0);
return true; return true;
} }
#endif
/* handle HTTP errors (non 2xx response codes) */ /* handle HTTP errors (non 2xx response codes) */
if (f->only_2xx && strncmp(f->url, "http", 4) == 0 && if (f->only_2xx && strncmp(f->url, "http", 4) == 0 &&

4
css/css.c
View File

@ -956,12 +956,10 @@ void css_atimport_callback(content_msg msg, struct content *css,
/*css_dump_stylesheet(css->data.css);*/ /*css_dump_stylesheet(css->data.css);*/
c->active--; c->active--;
break; break;
#ifdef WITH_AUTH
case CONTENT_MSG_AUTH: case CONTENT_MSG_AUTH:
#endif
case CONTENT_MSG_SSL: case CONTENT_MSG_SSL:
/* todo: handle AUTH and SSL */ /* todo: handle AUTH and SSL */
case CONTENT_MSG_LAUNCH: case CONTENT_MSG_LAUNCH:
/* Fall through */ /* Fall through */
case CONTENT_MSG_ERROR: case CONTENT_MSG_ERROR:

3
desktop/401login.h
View File

@ -20,7 +20,6 @@
#define NETSURF_DESKTOP_401LOGIN_H #define NETSURF_DESKTOP_401LOGIN_H
#include "utils/config.h" #include "utils/config.h"
#ifdef WITH_AUTH
#include "content/content.h" #include "content/content.h"
#include "desktop/browser.h" #include "desktop/browser.h"
@ -29,5 +28,3 @@ void gui_401login_open(struct browser_window *bw, struct content *c,
const char *realm); const char *realm);
#endif #endif
#endif

4
desktop/browser.c
View File

@ -40,9 +40,7 @@
#include "content/fetchcache.h" #include "content/fetchcache.h"
#include "content/urldb.h" #include "content/urldb.h"
#include "css/css.h" #include "css/css.h"
#ifdef WITH_AUTH
#include "desktop/401login.h" #include "desktop/401login.h"
#endif
#include "desktop/browser.h" #include "desktop/browser.h"
#include "desktop/frames.h" #include "desktop/frames.h"
#include "desktop/history_core.h" #include "desktop/history_core.h"
@ -587,7 +585,6 @@ void browser_window_callback(content_msg msg, struct content *c,
bw->referer = 0; bw->referer = 0;
break; break;
#ifdef WITH_AUTH
case CONTENT_MSG_AUTH: case CONTENT_MSG_AUTH:
gui_401login_open(bw, c, data.auth_realm); gui_401login_open(bw, c, data.auth_realm);
if (c == bw->loading_content) if (c == bw->loading_content)
@ -602,7 +599,6 @@ void browser_window_callback(content_msg msg, struct content *c,
free(bw->referer); free(bw->referer);
bw->referer = 0; bw->referer = 0;
break; break;
#endif
case CONTENT_MSG_SSL: case CONTENT_MSG_SSL:
gui_cert_verify(bw, c, data.ssl.certs, data.ssl.num); gui_cert_verify(bw, c, data.ssl.certs, data.ssl.num);

4
render/html.c
View File

@ -1131,13 +1131,11 @@ void html_convert_css_callback(content_msg msg, struct content *css,
c->data.html.stylesheet_content[i] = css; c->data.html.stylesheet_content[i] = css;
break; break;
#ifdef WITH_AUTH
case CONTENT_MSG_AUTH: case CONTENT_MSG_AUTH:
c->data.html.stylesheet_content[i] = 0; c->data.html.stylesheet_content[i] = 0;
c->active--; c->active--;
content_add_error(c, "?", 0); content_add_error(c, "?", 0);
break; break;
#endif
case CONTENT_MSG_SSL: case CONTENT_MSG_SSL:
c->data.html.stylesheet_content[i] = 0; c->data.html.stylesheet_content[i] = 0;
@ -1410,13 +1408,11 @@ void html_object_callback(content_msg msg, struct content *object,
c->data.html.object[i].content = object; c->data.html.object[i].content = object;
break; break;
#ifdef WITH_AUTH
case CONTENT_MSG_AUTH: case CONTENT_MSG_AUTH:
c->data.html.object[i].content = 0; c->data.html.object[i].content = 0;
c->active--; c->active--;
content_add_error(c, "?", 0); content_add_error(c, "?", 0);
break; break;
#endif
case CONTENT_MSG_SSL: case CONTENT_MSG_SSL:
c->data.html.object[i].content = 0; c->data.html.object[i].content = 0;

2
riscos/401login.c
View File

@ -17,7 +17,6 @@
*/ */
#include "utils/config.h" #include "utils/config.h"
#ifdef WITH_AUTH
#include <assert.h> #include <assert.h>
#include <stdbool.h> #include <stdbool.h>
@ -213,4 +212,3 @@ bool ro_gui_401login_apply(wimp_w w)
return true; return true;
} }
#endif

4
riscos/dialog.c
View File

@ -64,9 +64,7 @@
wimp_w dialog_info, dialog_saveas, wimp_w dialog_info, dialog_saveas,
#ifdef WITH_AUTH
dialog_401li, dialog_401li,
#endif
dialog_zoom, dialog_pageinfo, dialog_objinfo, dialog_tooltip, dialog_zoom, dialog_pageinfo, dialog_objinfo, dialog_tooltip,
dialog_warning, dialog_debug, dialog_warning, dialog_debug,
dialog_folder, dialog_entry, dialog_search, dialog_print, dialog_folder, dialog_entry, dialog_search, dialog_print,
@ -105,9 +103,7 @@ void ro_gui_dialog_init(void)
ro_gui_configure_initialise(); ro_gui_configure_initialise();
/* 401 login window */ /* 401 login window */
#ifdef WITH_AUTH
ro_gui_401login_init(); ro_gui_401login_init();
#endif
/* certificate verification window */ /* certificate verification window */
ro_gui_cert_init(); ro_gui_cert_init();

2
riscos/gui.h
View File

@ -134,9 +134,7 @@ void ro_gui_download_datasave_ack(wimp_message *message);
bool ro_gui_download_prequit(void); bool ro_gui_download_prequit(void);
/* in 401login.c */ /* in 401login.c */
#ifdef WITH_AUTH
void ro_gui_401login_init(void); void ro_gui_401login_init(void);
#endif
/* in sslcert.c */ /* in sslcert.c */
void ro_gui_cert_init(void); void ro_gui_cert_init(void);

3
utils/config.h
View File

@ -39,9 +39,6 @@ char *strndup(const char *s, size_t n);
* IF ADDING A FEATURE HERE, ADD IT TO Docs/Doxyfile's "PREDEFINED" DEFINITION AS WELL. * IF ADDING A FEATURE HERE, ADD IT TO Docs/Doxyfile's "PREDEFINED" DEFINITION AS WELL.
*/ */
/* HTTP Auth */
#define WITH_AUTH
/* Platform specific features */ /* Platform specific features */
#if defined(riscos) #if defined(riscos)
/* Acorn URI protocol support */ /* Acorn URI protocol support */