psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

http/fetch: call callback even if status is not OK so errors can be handled; surf: added back dest param for cmd()

Browse source
This commit is contained in:
Gabor Adam Toth 2010-02-23 20:34:26 +01:00
parent 7d715092c1
commit c6264e1087
4 changed files with 35 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
world/net/http/fetch.c
View file

@ -202,15 +202,14 @@ disconnected(remainder) {
fheaders = headers;
buffer = headers = 0;
switch (http_status) {
case R_OK:
default:
mixed *waiter;
while (qSize(ME)) {
waiter = shift(ME);
P2(("%O calls back.. body is %O\n", ME, fetched))
funcall(waiter[0], fetched, waiter[1] ? fheaders : copy(fheaders));
funcall(waiter[0], fetched, waiter[1] ? fheaders : copy(fheaders), http_status);
}
break;
default:
if (http_status == R_OK) break;
// doesn't seem to get here when HTTP returns 301 or 302. strange.
// fall thru
case R_NOTMODIFIED:

41
world/net/http/oauth.c
View file

@ -9,6 +9,7 @@
#include <net.h>
#include <tls.h>
#include <ht/http.h>
string consumer_key;
string consumer_secret;
@ -51,28 +52,32 @@ varargs void fetch(object ua, string url, string method, mapping post, mapping o
ua->fetch(url, method, post, (["authorization": "OAuth " + p]));
}
void parse_request_token(string body, mapping headers) {
P3((">> oauth:parse_request_token(%O, %O)\n", body, headers))
request_params = ([]);
url_parse_query(request_params, body);
if (strlen(request_params["oauth_token"]) && strlen(request_params["oauth_token_secret"])) {
shared_memory("oauth_request_tokens")[request_params["oauth_token"]] = ME;
sendmsg(user, "_notice_oauth_authorize_url", "Open [_url] to perform authorization.",
(["_url": authorize_url + "?oauth_token=" + request_params["oauth_token"]]));
} else {
sendmsg(user, "_error_oauth_token_request", "OAuth failed: could not get a request token.");
void parse_request_token(string body, mapping headers, int http_status) {
P3((">> oauth:parse_request_token(%O, %O, %O)\n", body, headers, http_status))
if (http_status == R_OK) {
request_params = ([]);
url_parse_query(request_params, body);
if (strlen(request_params["oauth_token"]) && strlen(request_params["oauth_token_secret"])) {
shared_memory("oauth_request_tokens")[request_params["oauth_token"]] = ME;
sendmsg(user, "_notice_oauth_authorize_url", "Open [_url] to perform authorization.",
(["_url": authorize_url + "?oauth_token=" + request_params["oauth_token"]]));
return;
}
}
sendmsg(user, "_error_oauth_token_request", "OAuth failed: could not get a request token.");
}
void parse_access_token(string body, mapping headers) {
P3((">> oauth:parse_access_token(%O, %O)\n", body, headers))
access_params = ([]);
url_parse_query(access_params, body);
if (strlen(access_params["oauth_token"]) && strlen(access_params["oauth_token_secret"])) {
sendmsg(user, "_notice_oauth_success", "OAuth successful.");
} else {
sendmsg(user, "_error_oauth_token_access", "OAuth failed: could not get an access token.");
void parse_access_token(string body, mapping headers, int http_status) {
P3((">> oauth:parse_access_token(%O, %O, %O)\n", body, headers, http_status))
if (http_status == R_OK) {
access_params = ([]);
url_parse_query(access_params, body);
if (strlen(access_params["oauth_token"]) && strlen(access_params["oauth_token_secret"])) {
sendmsg(user, "_notice_oauth_success", "OAuth successful.");
return;
}
}
sendmsg(user, "_error_oauth_token_access", "OAuth failed: could not get an access token.");
}
void verified(string verifier) {