GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-09 00:56:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master'

Browse Source
This commit is contained in:
Nick Mathewson 2011-06-01 14:02:56 -04:00
commit 25fe382981
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
buffer.c
View File

@ -1373,21 +1373,17 @@ evbuffer_search_eol(struct evbuffer *buffer,
break;
}
case EVBUFFER_EOL_CRLF:
while (1) {
if (evbuffer_find_eol_char(&it) < 0)
goto done;
if (evbuffer_getchr(&it) == '\n') {
extra_drain = 1;
break;
} else if (!evbuffer_ptr_memcmp(
buffer, &it, "\r\n", 2)) {
extra_drain = 2;
break;
} else {
if (evbuffer_ptr_set(buffer, &it, 1,
EVBUFFER_PTR_ADD)<0)
goto done;
}
// Is a LF
if (evbuffer_strchr(&it, '\n') < 0)
goto done;
extra_drain = 1;
// Optionally preceeded by a CR
if (it.pos < 1) break;
memcpy(&it2, &it, sizeof(it));
if (evbuffer_ptr_set(buffer, &it2, it2.pos - 1, EVBUFFER_PTR_SET)<0) break;
if (evbuffer_getchr(&it2) == '\r') {
memcpy(&it, &it2, sizeof(it));
extra_drain = 2;
}
break;
case EVBUFFER_EOL_LF: