Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

h1only: fix assumption about h2 and add sai

Browse source 
Fix an assumption about h2 being around if h1 is that crept in.

Add a sai scenario to catch this kind of problem, only needs one
build since testing lws' own consistency... add WITH_MINIMAL_EXAMPLES
as well
This commit is contained in:
Andy Green 2020-11-18 06:34:16 +00:00
parent a03181301d
commit 922b939521
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.sai.json
View file

@ -119,6 +119,10 @@
"cmake": "-DLWS_WITH_MINIMAL_EXAMPLES=1",
"platforms": "windows-10/x86_64-amd/msvc, windows-10/x86_64-amd/noptmsvc, linux-ubuntu-2004/aarch64-a72-bcm2711-rpi4/gcc"
},
"h1only-examples": {
"cmake": "cmake .. -DLWS_WITH_HTTP2=0 -DLWS_WITH_MINIMAL_EXAMPLES=1",
"platforms": "none,linux-fedora-32/x86_64-amd/gcc"
},
"unix-domain": {
"cmake": "-DUNIX_SOCK=1",
"platforms": "windows-10/x86_64-amd/msvc, windows-10/x86_64-amd/noptmsvc"

12
lib/core-net/network.c
View file

@ -442,7 +442,17 @@ lws_retry_sul_schedule_retry_wsi(struct lws *wsi, lws_sorted_usec_list_t *sul,
return 1;
#if defined(LWS_ROLE_H1) || defined(LWS_ROLE_H2)
if (wsi->role_ops == &role_ops_h1 || wsi->role_ops == &role_ops_h2)
if (
#if defined(LWS_ROLE_H1)
wsi->role_ops == &role_ops_h1
#endif
#if defined(LWS_ROLE_H1) && defined(LWS_ROLE_H2)
||
#endif
#if defined(LWS_ROLE_H2)
wsi->role_ops == &role_ops_h2
#endif
)
/*
* Since we're doing it by wsi, we're in a position to check for
* http retry-after, it will increase us accordingly if found