Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/7dd43902190fb0298e42962ab0174190693ff3af
...commit
http://git.netsurf-browser.org/netsurf.git/commit/7dd43902190fb0298e42962ab0174190693ff3af
...tree
http://git.netsurf-browser.org/netsurf.git/tree/7dd43902190fb0298e42962ab0174190693ff3af
The branch, tlsa/401 has been updated
via 7dd43902190fb0298e42962ab0174190693ff3af (commit)
via d1263ced0fabc2f41ecd4faf8a682e370090bcbd (commit)
from 696a46d9802a88ae45c148a135de3222070a3f24 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7dd43902190fb0298e42962ab0174190693ff3af
commit 7dd43902190fb0298e42962ab0174190693ff3af
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Monkey: Update for new HTTP auth API.
diff --git a/frontends/monkey/401login.c b/frontends/monkey/401login.c
index 090f189..58335dd 100644
--- a/frontends/monkey/401login.c
+++ b/frontends/monkey/401login.c
@@ -27,20 +27,23 @@ typedef struct monkey401 {
struct monkey401 *r_next, *r_prev;
uint32_t num;
lwc_string *host; /* Ignore */
- nserror (*cb)(bool,void*);
+ nserror (*cb)(const char *, const char *, void *);
void *pw;
} monkey401_t;
static monkey401_t *m4_ring = NULL;
static uint32_t m4_ctr = 0;
-void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw)
+nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw)
{
monkey401_t *m4t = calloc(sizeof(*m4t), 1);
if (m4t == NULL) {
- cb(false, cbpw);
- return;
+ return NSERROR_NOMEM;
}
m4t->cb = cb;
m4t->pw = cbpw;
@@ -50,6 +53,8 @@ void gui_401login_open(nsurl *url, const char *realm,
fprintf(stdout, "401LOGIN OPEN M4 %u URL %s REALM %s\n",
m4t->num, nsurl_access(url), realm);
+
+ return NSERROR_OK;
}
diff --git a/frontends/monkey/401login.h b/frontends/monkey/401login.h
index e78355e..93606e5 100644
--- a/frontends/monkey/401login.h
+++ b/frontends/monkey/401login.h
@@ -5,5 +5,9 @@
#include "utils/errors.h"
-void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw);
+nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=d1263ced0fabc2f41ecd4faf8a682e370090bcbd
commit d1263ced0fabc2f41ecd4faf8a682e370090bcbd
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Haiku: Update for new HTTP auth API.
diff --git a/frontends/beos/gui.h b/frontends/beos/gui.h
index debb5f3..35f3134 100644
--- a/frontends/beos/gui.h
+++ b/frontends/beos/gui.h
@@ -35,7 +35,12 @@ extern bool nsbeos_done;
extern bool replicated;
int gui_init_replicant(int argc, char** argv);
-extern "C" void gui_401login_open(struct nsurl *url, const char *realm,
nserror (*cb)(bool proceed, void *pw), void *cbpw);
+extern "C" void nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw);
extern "C" void nsbeos_gui_poll(void);
diff --git a/frontends/beos/login.cpp b/frontends/beos/login.cpp
index 8506298..18f9967 100644
--- a/frontends/beos/login.cpp
+++ b/frontends/beos/login.cpp
@@ -164,8 +164,12 @@ LoginAlert::MessageReceived(BMessage *message)
}
-extern "C" void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw)
+extern "C" nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw)
{
lwc_string *host;
@@ -174,6 +178,8 @@ extern "C" void gui_401login_open(nsurl *url, const char
*realm,
create_login_window(url, host, realm, cb, cbpw);
free(host);
+
+ return NSERROR_OK;
}
//void create_login_window(struct browser_window *bw, const char *host,
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index f422920..9461559 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -655,7 +655,8 @@ void nsbeos_dispatch_event(BMessage *message)
{
nsurl* url;
BString realm;
- BString auth;
+ BString username;
+ BString password;
void* cbpw;
nserror (*cb)(bool proceed, void* pw);
@@ -663,15 +664,15 @@ void nsbeos_dispatch_event(BMessage *message)
break;
if (message->FindString("Realm", &realm) < B_OK)
break;
- if (message->FindString("Auth", &auth) < B_OK)
+ if (message->FindString("User", &username) < B_OK)
+ break;
+ if (message->FindString("Pass", &password) < B_OK)
break;
if (message->FindPointer("callback", (void**)&cb) <
B_OK)
break;
if (message->FindPointer("callback_pw", (void**)&cbpw)
< B_OK)
break;
- //printf("login to '%s' with '%s'\n", url.String(),
auth.String());
- urldb_set_auth_details(url, realm.String(),
auth.String());
- cb(true, cbpw);
+ cb(username.String(), password.String(), cbpw);
break;
}
default:
-----------------------------------------------------------------------
Summary of changes:
frontends/beos/gui.h | 7 ++++++-
frontends/beos/login.cpp | 10 ++++++++--
frontends/beos/window.cpp | 11 ++++++-----
frontends/monkey/401login.c | 15 ++++++++++-----
frontends/monkey/401login.h | 8 ++++++--
5 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/frontends/beos/gui.h b/frontends/beos/gui.h
index debb5f3..35f3134 100644
--- a/frontends/beos/gui.h
+++ b/frontends/beos/gui.h
@@ -35,7 +35,12 @@ extern bool nsbeos_done;
extern bool replicated;
int gui_init_replicant(int argc, char** argv);
-extern "C" void gui_401login_open(struct nsurl *url, const char *realm,
nserror (*cb)(bool proceed, void *pw), void *cbpw);
+extern "C" void nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw);
extern "C" void nsbeos_gui_poll(void);
diff --git a/frontends/beos/login.cpp b/frontends/beos/login.cpp
index 8506298..18f9967 100644
--- a/frontends/beos/login.cpp
+++ b/frontends/beos/login.cpp
@@ -164,8 +164,12 @@ LoginAlert::MessageReceived(BMessage *message)
}
-extern "C" void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw)
+extern "C" nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw)
{
lwc_string *host;
@@ -174,6 +178,8 @@ extern "C" void gui_401login_open(nsurl *url, const char
*realm,
create_login_window(url, host, realm, cb, cbpw);
free(host);
+
+ return NSERROR_OK;
}
//void create_login_window(struct browser_window *bw, const char *host,
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index f422920..9461559 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -655,7 +655,8 @@ void nsbeos_dispatch_event(BMessage *message)
{
nsurl* url;
BString realm;
- BString auth;
+ BString username;
+ BString password;
void* cbpw;
nserror (*cb)(bool proceed, void* pw);
@@ -663,15 +664,15 @@ void nsbeos_dispatch_event(BMessage *message)
break;
if (message->FindString("Realm", &realm) < B_OK)
break;
- if (message->FindString("Auth", &auth) < B_OK)
+ if (message->FindString("User", &username) < B_OK)
+ break;
+ if (message->FindString("Pass", &password) < B_OK)
break;
if (message->FindPointer("callback", (void**)&cb) <
B_OK)
break;
if (message->FindPointer("callback_pw", (void**)&cbpw)
< B_OK)
break;
- //printf("login to '%s' with '%s'\n", url.String(),
auth.String());
- urldb_set_auth_details(url, realm.String(),
auth.String());
- cb(true, cbpw);
+ cb(username.String(), password.String(), cbpw);
break;
}
default:
diff --git a/frontends/monkey/401login.c b/frontends/monkey/401login.c
index 090f189..58335dd 100644
--- a/frontends/monkey/401login.c
+++ b/frontends/monkey/401login.c
@@ -27,20 +27,23 @@ typedef struct monkey401 {
struct monkey401 *r_next, *r_prev;
uint32_t num;
lwc_string *host; /* Ignore */
- nserror (*cb)(bool,void*);
+ nserror (*cb)(const char *, const char *, void *);
void *pw;
} monkey401_t;
static monkey401_t *m4_ring = NULL;
static uint32_t m4_ctr = 0;
-void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw)
+nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw)
{
monkey401_t *m4t = calloc(sizeof(*m4t), 1);
if (m4t == NULL) {
- cb(false, cbpw);
- return;
+ return NSERROR_NOMEM;
}
m4t->cb = cb;
m4t->pw = cbpw;
@@ -50,6 +53,8 @@ void gui_401login_open(nsurl *url, const char *realm,
fprintf(stdout, "401LOGIN OPEN M4 %u URL %s REALM %s\n",
m4t->num, nsurl_access(url), realm);
+
+ return NSERROR_OK;
}
diff --git a/frontends/monkey/401login.h b/frontends/monkey/401login.h
index e78355e..93606e5 100644
--- a/frontends/monkey/401login.h
+++ b/frontends/monkey/401login.h
@@ -5,5 +5,9 @@
#include "utils/errors.h"
-void gui_401login_open(nsurl *url, const char *realm,
- nserror (*cb)(bool proceed, void *pw), void *cbpw);
+nserror gui_401login_open(nsurl *url, const char *realm,
+ const char *username, const char *password,
+ nserror (*cb)(const char *username,
+ const char *password,
+ void *pw),
+ void *cbpw);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
