Merge commit 'origin'

This commit is contained in:
psyc://psyced.org/~lynX 2009-10-16 22:27:15 +02:00
commit 082d64dc19
2 changed files with 8 additions and 2 deletions

View File

@ -3972,3 +3972,9 @@ net/irc
- bugfix from fippo concerning alias interpretation
include/net.h
- the efun has changed from stringprep() to idna_stringprep()
=== 200910 ============================================================
irc/user
- handle root messages
jabber/*
- deal with < and > in status updates

View File

@ -103,7 +103,7 @@ varargs int real_logon(int failure) {
// emit("If-None-Match: " + etag + "\r\n");
// we won't need connection: close w/ http/1.0
//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))
emit("GET /"+ resource +" HTTP/1.0\r\n"
"Host: "+ host +"\r\n"
@ -137,7 +137,7 @@ int parse_status(string all) {
sscanf(all, "%s%t%s", prot, state);
sscanf(state, "%d%t%s", http_status, http_message);
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));
monitor_report("_failure_unsupported_code_HTTP",
S("http/fetch'ing %O returned %O %O", url || ME,