summaryrefslogtreecommitdiff
path: root/riscos
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2004-04-12 23:59:01 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2004-04-12 23:59:01 +0000
commit04cdfb6151e4e50fc041f12958d977dc9d933246 (patch)
tree756686eb35b85217b5068c3e50099a84e381b651 /riscos
parent226f3efbe8f530a4c46c0c30d91cb00c63c1c41e (diff)
downloadnetsurf-04cdfb6151e4e50fc041f12958d977dc9d933246.tar.gz
netsurf-04cdfb6151e4e50fc041f12958d977dc9d933246.tar.bz2
[project @ 2004-04-12 23:59:01 by jmb]
Fix flawed check for URL scheme we can handle svn path=/import/netsurf/; revision=768
Diffstat (limited to 'riscos')
-rw-r--r--riscos/uri.c13
-rw-r--r--riscos/url_protocol.c7
2 files changed, 5 insertions, 15 deletions
diff --git a/riscos/uri.c b/riscos/uri.c
index d513af8c6..a03e40a64 100644
--- a/riscos/uri.c
+++ b/riscos/uri.c
@@ -11,6 +11,7 @@
#include "oslib/uri.h"
#include "oslib/wimp.h"
#include "netsurf/utils/config.h"
+#include "netsurf/content/fetch.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/riscos/theme.h"
#include "netsurf/desktop/gui.h"
@@ -32,21 +33,11 @@ void ro_uri_message_received(uri_full_message_process* uri_message)
{
uri_h uri_handle;
char* uri_requested;
-
- struct browser_window* bw;
int uri_length;
uri_handle = uri_message->handle;
- LOG(("URI message... %s, handle = %d", uri_message->uri,
- (int)uri_message->handle));
-
- if ( (strspn(uri_message->uri, "http://") != strlen("http://")) &&
- (strspn(uri_message->uri, "https://") != strlen("https://")) &&
- (strspn(uri_message->uri, "file:/") != strlen("file:/")) )
- return;
-
- else LOG(("URI message deemed relevant"));
+ if (!fetch_can_fetch(uri_message->uri)) return;
uri_message->your_ref = uri_message->my_ref;
uri_message->action = message_URI_PROCESS_ACK;
diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c
index b24e68401..90cd6877a 100644
--- a/riscos/url_protocol.c
+++ b/riscos/url_protocol.c
@@ -11,6 +11,7 @@
#include "oslib/inetsuite.h"
#include "oslib/wimp.h"
#include "netsurf/utils/config.h"
+#include "netsurf/content/fetch.h"
#include "netsurf/desktop/browser.h"
#include "netsurf/riscos/theme.h"
#include "netsurf/desktop/gui.h"
@@ -31,8 +32,8 @@ void ro_url_message_received(wimp_message* message)
#ifdef ALLOW_POST
char* filename = NULL, *mimetype = NULL;
bool post=false;
-#endif
struct browser_window* bw;
+#endif
inetsuite_message_open_url *url_message = (inetsuite_message_open_url*)&message->data;
/* If the url_message->indirect.tag is non-zero,
@@ -83,9 +84,7 @@ void ro_url_message_received(wimp_message* message)
#endif
}
- if ( (strspn(uri_requested, "http://") != strlen("http://")) &&
- (strspn(uri_requested, "https://") != strlen("https://")) &&
- (strspn(uri_requested, "file:/") != strlen("file:/")) ) {
+ if (!fetch_can_fetch(uri_requested)) {
#ifdef ALLOW_POST
xfree(filename);
xfree(mimetype);