diff options
author | corvid <devnull@localhost> | 2014-08-08 01:14:52 +0000 |
---|---|---|
committer | corvid <devnull@localhost> | 2014-08-08 01:14:52 +0000 |
commit | ffb8100ff3222e8aa11bd33a7c1ea7342f2c6aea (patch) | |
tree | bcb85bba820a9580b76259cd42ebaa91b87073d7 /src/IO | |
parent | 0553cb9e777357d8d25819735503f3251198c27c (diff) |
abort failed queries
http://lists.dillo.org/pipermail/dillo-dev/2014-July/010190.html
and no one objected, and it hasn't given me any trouble, so...
Diffstat (limited to 'src/IO')
-rw-r--r-- | src/IO/IO.c | 9 | ||||
-rw-r--r-- | src/IO/http.c | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/IO/IO.c b/src/IO/IO.c index 43a3ff3a..0addf486 100644 --- a/src/IO/IO.c +++ b/src/IO/IO.c @@ -298,6 +298,8 @@ static void IO_fd_write_cb(int fd, void *data) } else { if (IO_callback(io) == 0) a_IOwatch_remove_fd(fd, DIO_WRITE); + if (io->Status) + a_IO_ccc(OpAbort, 1, FWD, io->Info, NULL, NULL); } } @@ -385,6 +387,13 @@ void a_IO_ccc(int Op, int Branch, int Dir, ChainLink *Info, } else { /* 1 FWD */ /* Write-data status */ switch (Op) { + case OpAbort: + io = Info->LocalKey; + IO_close_fd(io, IO_StopRdWr); + IO_free(io); + a_Chain_fcb(OpAbort, Info, NULL, NULL); + dFree(Info); + break; default: MSG_WARN("Unused CCC\n"); break; diff --git a/src/IO/http.c b/src/IO/http.c index 68294fb4..d5664fb2 100644 --- a/src/IO/http.c +++ b/src/IO/http.c @@ -696,8 +696,16 @@ void a_Http_ccc(int Op, int Branch, int Dir, ChainLink *Info, break; } } else { /* 1 FWD */ + SocketData_t *sd; /* HTTP send-query status branch */ switch (Op) { + case OpAbort: + if ((sd = a_Klist_get_data(ValidSocks, SKey))) + MSG_BW(sd->web, 1, "Can't get %s", URL_STR(sd->web->url)); + a_Chain_fcb(OpAbort, Info, NULL, "Both"); + Http_socket_free(SKey); + dFree(Info); + break; default: MSG_WARN("Unused CCC\n"); break; |