1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00

truncated send issue independent of LWS_NO_EXTENSIONS 2

Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2014-04-01 14:20:44 +08:00
parent f9196dd85c
commit 03cf1dde39

View file

@ -105,6 +105,10 @@ int lws_issue_raw(struct libwebsocket *wsi, unsigned char *buf, size_t len)
#ifndef LWS_NO_EXTENSIONS
int m;
#endif
if (!len)
return 0;
if (wsi->truncated_send_len && (buf < wsi->truncated_send_malloc ||
buf > (wsi->truncated_send_malloc +
@ -114,6 +118,7 @@ int lws_issue_raw(struct libwebsocket *wsi, unsigned char *buf, size_t len)
assert(0);
}
#ifndef LWS_NO_EXTENSIONS
/*
* one of the extensions is carrying our data itself? Like mux?
*/
@ -639,7 +644,7 @@ send_raw:
*/
n = lws_issue_raw_ext_access(wsi, buf - pre, len + pre + post);
if (n < 0)
if (n <= 0)
return n;
if (n == len + pre + post) {