mirror of
git://git.psyced.org/git/psyced
synced 2024-08-15 03:25:10 +00:00
Merge commit 'origin'
This commit is contained in:
commit
082d64dc19
2 changed files with 8 additions and 2 deletions
|
@ -3972,3 +3972,9 @@ net/irc
|
||||||
- bugfix from fippo concerning alias interpretation
|
- bugfix from fippo concerning alias interpretation
|
||||||
include/net.h
|
include/net.h
|
||||||
- the efun has changed from stringprep() to idna_stringprep()
|
- the efun has changed from stringprep() to idna_stringprep()
|
||||||
|
=== 200910 ============================================================
|
||||||
|
irc/user
|
||||||
|
- handle root messages
|
||||||
|
jabber/*
|
||||||
|
- deal with < and > in status updates
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,7 @@ varargs int real_logon(int failure) {
|
||||||
// emit("If-None-Match: " + etag + "\r\n");
|
// emit("If-None-Match: " + etag + "\r\n");
|
||||||
// we won't need connection: close w/ http/1.0
|
// we won't need connection: close w/ http/1.0
|
||||||
//emit("Connection: close\r\n\r\n");
|
//emit("Connection: close\r\n\r\n");
|
||||||
P1(("%O fetching /%s from %O\n", ME, resource, host))
|
P2(("%O fetching /%s from %O\n", ME, resource, host))
|
||||||
P4(("%O using %O\n", ME, buffer))
|
P4(("%O using %O\n", ME, buffer))
|
||||||
emit("GET /"+ resource +" HTTP/1.0\r\n"
|
emit("GET /"+ resource +" HTTP/1.0\r\n"
|
||||||
"Host: "+ host +"\r\n"
|
"Host: "+ host +"\r\n"
|
||||||
|
@ -137,7 +137,7 @@ int parse_status(string all) {
|
||||||
sscanf(all, "%s%t%s", prot, state);
|
sscanf(all, "%s%t%s", prot, state);
|
||||||
sscanf(state, "%d%t%s", http_status, http_message);
|
sscanf(state, "%d%t%s", http_status, http_message);
|
||||||
if (http_status != R_OK) {
|
if (http_status != R_OK) {
|
||||||
P1(("%O got %O %O from %O\n", ME,
|
P0(("%O got %O %O from %O\n", ME,
|
||||||
http_status, http_message, host));
|
http_status, http_message, host));
|
||||||
monitor_report("_failure_unsupported_code_HTTP",
|
monitor_report("_failure_unsupported_code_HTTP",
|
||||||
S("http/fetch'ing %O returned %O %O", url || ME,
|
S("http/fetch'ing %O returned %O %O", url || ME,
|
||||||
|
|
Loading…
Reference in a new issue