Author: jmb Date: Sun Feb 22 09:13:10 2009 New Revision: 6600 URL: http://source.netsurf-browser.org?rev=6600&view=rev Log: Purge WITH_AUTH Modified: trunk/netsurf/Docs/Doxyfile trunk/netsurf/content/content.h trunk/netsurf/content/fetch.h trunk/netsurf/content/fetchcache.c trunk/netsurf/content/fetchers/fetch_curl.c trunk/netsurf/css/css.c trunk/netsurf/desktop/401login.h trunk/netsurf/desktop/browser.c trunk/netsurf/render/html.c trunk/netsurf/riscos/401login.c trunk/netsurf/riscos/dialog.c trunk/netsurf/riscos/gui.h trunk/netsurf/utils/config.h Modified: trunk/netsurf/Docs/Doxyfile URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/Doxyfile?rev=6600&am... ============================================================================== --- trunk/netsurf/Docs/Doxyfile (original) +++ trunk/netsurf/Docs/Doxyfile Sun Feb 22 09:13:10 2009 @@ -894,7 +894,7 @@ # or name=definition (no spaces). If the definition and the = are # 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 # this tag can be used to specify a list of macro names that should be expanded. Modified: trunk/netsurf/content/content.h URL: http://source.netsurf-browser.org/trunk/netsurf/content/content.h?rev=660... ============================================================================== --- trunk/netsurf/content/content.h (original) +++ trunk/netsurf/content/content.h Sun Feb 22 09:13:10 2009 @@ -97,9 +97,7 @@ CONTENT_MSG_NEWPTR, /**< structure has been replaced */ CONTENT_MSG_REFRESH, /**< wants refresh */ CONTENT_MSG_LAUNCH, /**< needs url launching in external program */ -#ifdef WITH_AUTH CONTENT_MSG_AUTH, /**< authentication required */ -#endif CONTENT_MSG_SSL /**< SSL cert verify failed */ } content_msg; Modified: trunk/netsurf/content/fetch.h URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetch.h?rev=6600&... ============================================================================== --- trunk/netsurf/content/fetch.h (original) +++ trunk/netsurf/content/fetch.h Sun Feb 22 09:13:10 2009 @@ -36,9 +36,7 @@ FETCH_ERROR, FETCH_REDIRECT, FETCH_NOTMODIFIED, -#ifdef WITH_AUTH FETCH_AUTH, -#endif FETCH_CERT_ERR, } fetch_msg; Modified: trunk/netsurf/content/fetchcache.c URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchcache.c?rev=... ============================================================================== --- trunk/netsurf/content/fetchcache.c (original) +++ trunk/netsurf/content/fetchcache.c Sun Feb 22 09:13:10 2009 @@ -501,7 +501,6 @@ fetchcache_notmodified(c, data); break; -#ifdef WITH_AUTH case FETCH_AUTH: /* data -> string containing the Realm */ LOG(("FETCH_AUTH, '%s'", (const char *)data)); @@ -512,7 +511,6 @@ * destroyed in content_clean() */ c->status = CONTENT_STATUS_ERROR; break; -#endif case FETCH_CERT_ERR: c->fetch = 0; Modified: trunk/netsurf/content/fetchers/fetch_curl.c URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchers/fetch_cu... ============================================================================== --- trunk/netsurf/content/fetchers/fetch_curl.c (original) +++ trunk/netsurf/content/fetchers/fetch_curl.c Sun Feb 22 09:13:10 2009 @@ -561,16 +561,13 @@ SETOPT(CURLOPT_COOKIE, NULL); } -#ifdef WITH_AUTH if ((auth = urldb_get_auth_details(f->url)) != NULL) { SETOPT(CURLOPT_HTTPAUTH, CURLAUTH_ANY); SETOPT(CURLOPT_USERPWD, auth); } else { -#endif SETOPT(CURLOPT_USERPWD, NULL); -#ifdef WITH_AUTH - } -#endif + } + if (option_http_proxy && option_http_proxy_host) { SETOPT(CURLOPT_PROXY, option_http_proxy_host); SETOPT(CURLOPT_PROXYPORT, (long) option_http_proxy_port); @@ -1036,7 +1033,6 @@ SKIP_ST(15); if (i < (int)size && '0' <= data[i] && data[i] <= '9') f->content_length = atol(data + i); -#ifdef WITH_AUTH } else if (17 < size && strncasecmp(data, "WWW-Authenticate:", 17) == 0) { /* extract the first Realm from WWW-Authenticate header */ free(f->realm); @@ -1065,7 +1061,6 @@ f->realm[i] == '\n'); --i) f->realm[i] = '\0'; } -#endif } else if (11 < size && strncasecmp(data, "Set-Cookie:", 11) == 0) { /* extract Set-Cookie header */ SKIP_ST(11); @@ -1118,12 +1113,10 @@ } /* handle HTTP 401 (Authentication errors) */ -#ifdef WITH_AUTH if (http_code == 401) { fetch_send_callback(FETCH_AUTH, f->fetch_handle, f->realm,0); return true; } -#endif /* handle HTTP errors (non 2xx response codes) */ if (f->only_2xx && strncmp(f->url, "http", 4) == 0 && Modified: trunk/netsurf/css/css.c URL: http://source.netsurf-browser.org/trunk/netsurf/css/css.c?rev=6600&r1... ============================================================================== --- trunk/netsurf/css/css.c (original) +++ trunk/netsurf/css/css.c Sun Feb 22 09:13:10 2009 @@ -956,12 +956,10 @@ /*css_dump_stylesheet(css->data.css);*/ c->active--; break; -#ifdef WITH_AUTH + case CONTENT_MSG_AUTH: -#endif case CONTENT_MSG_SSL: /* todo: handle AUTH and SSL */ - case CONTENT_MSG_LAUNCH: /* Fall through */ case CONTENT_MSG_ERROR: Modified: trunk/netsurf/desktop/401login.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/401login.h?rev=66... ============================================================================== --- trunk/netsurf/desktop/401login.h (original) +++ trunk/netsurf/desktop/401login.h Sun Feb 22 09:13:10 2009 @@ -20,7 +20,6 @@ #define NETSURF_DESKTOP_401LOGIN_H #include "utils/config.h" -#ifdef WITH_AUTH #include "content/content.h" #include "desktop/browser.h" @@ -29,5 +28,3 @@ const char *realm); #endif - -#endif Modified: trunk/netsurf/desktop/browser.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=660... ============================================================================== --- trunk/netsurf/desktop/browser.c (original) +++ trunk/netsurf/desktop/browser.c Sun Feb 22 09:13:10 2009 @@ -40,9 +40,7 @@ #include "content/fetchcache.h" #include "content/urldb.h" #include "css/css.h" -#ifdef WITH_AUTH #include "desktop/401login.h" -#endif #include "desktop/browser.h" #include "desktop/frames.h" #include "desktop/history_core.h" @@ -587,7 +585,6 @@ bw->referer = 0; break; -#ifdef WITH_AUTH case CONTENT_MSG_AUTH: gui_401login_open(bw, c, data.auth_realm); if (c == bw->loading_content) @@ -602,7 +599,6 @@ free(bw->referer); bw->referer = 0; break; -#endif case CONTENT_MSG_SSL: gui_cert_verify(bw, c, data.ssl.certs, data.ssl.num); Modified: trunk/netsurf/render/html.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/html.c?rev=6600&am... ============================================================================== --- trunk/netsurf/render/html.c (original) +++ trunk/netsurf/render/html.c Sun Feb 22 09:13:10 2009 @@ -1131,13 +1131,11 @@ c->data.html.stylesheet_content[i] = css; break; -#ifdef WITH_AUTH case CONTENT_MSG_AUTH: c->data.html.stylesheet_content[i] = 0; c->active--; content_add_error(c, "?", 0); break; -#endif case CONTENT_MSG_SSL: c->data.html.stylesheet_content[i] = 0; @@ -1410,13 +1408,11 @@ c->data.html.object[i].content = object; break; -#ifdef WITH_AUTH case CONTENT_MSG_AUTH: c->data.html.object[i].content = 0; c->active--; content_add_error(c, "?", 0); break; -#endif case CONTENT_MSG_SSL: c->data.html.object[i].content = 0; Modified: trunk/netsurf/riscos/401login.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/401login.c?rev=660... ============================================================================== --- trunk/netsurf/riscos/401login.c (original) +++ trunk/netsurf/riscos/401login.c Sun Feb 22 09:13:10 2009 @@ -17,7 +17,6 @@ */ #include "utils/config.h" -#ifdef WITH_AUTH #include <assert.h> #include <stdbool.h> @@ -213,4 +212,3 @@ return true; } -#endif Modified: trunk/netsurf/riscos/dialog.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/dialog.c?rev=6600&... ============================================================================== --- trunk/netsurf/riscos/dialog.c (original) +++ trunk/netsurf/riscos/dialog.c Sun Feb 22 09:13:10 2009 @@ -64,9 +64,7 @@ wimp_w dialog_info, dialog_saveas, -#ifdef WITH_AUTH dialog_401li, -#endif dialog_zoom, dialog_pageinfo, dialog_objinfo, dialog_tooltip, dialog_warning, dialog_debug, dialog_folder, dialog_entry, dialog_search, dialog_print, @@ -105,9 +103,7 @@ ro_gui_configure_initialise(); /* 401 login window */ -#ifdef WITH_AUTH ro_gui_401login_init(); -#endif /* certificate verification window */ ro_gui_cert_init(); Modified: trunk/netsurf/riscos/gui.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.h?rev=6600&... ============================================================================== --- trunk/netsurf/riscos/gui.h (original) +++ trunk/netsurf/riscos/gui.h Sun Feb 22 09:13:10 2009 @@ -134,9 +134,7 @@ bool ro_gui_download_prequit(void); /* in 401login.c */ -#ifdef WITH_AUTH void ro_gui_401login_init(void); -#endif /* in sslcert.c */ void ro_gui_cert_init(void); Modified: trunk/netsurf/utils/config.h URL: http://source.netsurf-browser.org/trunk/netsurf/utils/config.h?rev=6600&a... ============================================================================== --- trunk/netsurf/utils/config.h (original) +++ trunk/netsurf/utils/config.h Sun Feb 22 09:13:10 2009 @@ -39,9 +39,6 @@ * IF ADDING A FEATURE HERE, ADD IT TO Docs/Doxyfile's "PREDEFINED" DEFINITION AS WELL. */ -/* HTTP Auth */ -#define WITH_AUTH - /* Platform specific features */ #if defined(riscos) /* Acorn URI protocol support */