cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-10 04:50:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

http: fix EVHTTP_CON_READ_ON_WRITE_ERROR when it doesn't supported by OS

Browse Source 
For example win32 doesn't accept such things (maybe via overloaded IO, I'm not
sure), also I looked into curl and seems that the behaviour is the same (IOW
like with EVHTTP_CON_READ_ON_WRITE_ERROR on linux/win32).

Fixes: https://ci.appveyor.com/project/nmathewson/libevent/build/2.1.5.216#L499 (win32)
Fixes: 680742e1665b85487f10c0ef3df021e3b8e98634 ("http: read server response
even after server closed the connection")
v2: v0 was just removing that flag, i.e. make it deprecated and set_flags() will return -1
This commit is contained in:
Azat Khuzhin 2016-03-11 19:58:05 +03:00
parent 3b581693ac
commit 2ff164abac
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
http-internal.h
View File

@ -76,6 +76,9 @@ struct evhttp_connection {
#define EVHTTP_CON_CLOSEDETECT 0x0004 /* detecting if persistent close */ #define EVHTTP_CON_CLOSEDETECT 0x0004 /* detecting if persistent close */
/* set when we want to auto free the connection */ /* set when we want to auto free the connection */
#define EVHTTP_CON_AUTOFREE EVHTTP_CON_PUBLIC_FLAGS_END #define EVHTTP_CON_AUTOFREE EVHTTP_CON_PUBLIC_FLAGS_END
/* Installed when attempt to read HTTP error after write failed, see
* EVHTTP_CON_READ_ON_WRITE_ERROR */
#define EVHTTP_CON_READING_ERROR (EVHTTP_CON_AUTOFREE << 1)
struct timeval timeout; /* timeout for events */ struct timeval timeout; /* timeout for events */
int retry_cnt; /* retry count */ int retry_cnt; /* retry count */

7
http.c
View File

@ -1449,6 +1449,7 @@ evhttp_connection_read_on_write_error(struct evhttp_connection *evcon,
evhttp_error_cb, evhttp_error_cb,
evcon); evcon);
evhttp_connection_start_detectclose(evcon); evhttp_connection_start_detectclose(evcon);
evcon->flags |= EVHTTP_CON_READING_ERROR;
} }
static void static void
@ -1496,6 +1497,12 @@ evhttp_error_cb(struct bufferevent *bufev, short what, void *arg)
*/ */
if (evcon->flags & EVHTTP_CON_CLOSEDETECT) { if (evcon->flags & EVHTTP_CON_CLOSEDETECT) {
evcon->flags &= ~EVHTTP_CON_CLOSEDETECT; evcon->flags &= ~EVHTTP_CON_CLOSEDETECT;
if (evcon->flags & EVHTTP_CON_READING_ERROR) {
evcon->flags &= ~EVHTTP_CON_READING_ERROR;
evhttp_connection_fail_(evcon, EVREQ_HTTP_EOF);
return;
}
EVUTIL_ASSERT(evcon->http_server == NULL); EVUTIL_ASSERT(evcon->http_server == NULL);
/* For connections from the client, we just /* For connections from the client, we just
* reset the connection so that it becomes * reset the connection so that it becomes