roland/xo-alloc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

websock: initializer for lws_http_mount._unused[] with lws 4.0

Browse source
This commit is contained in:
Roland Conybeare 2023-10-17 22:19:30 -04:00
commit c8326018bb
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View file

@ -242,8 +242,8 @@ jobs:
# ---------------------------------------------------------------- # ----------------------------------------------------------------
- name: check stuff - name: check cmake-supporting packages
run: ls /usr/lib/x86_64-linux-gnu run: ls /usr/lib/x86_64-linux-gnu/cmake
- name: Configure self (websock) - name: Configure self (websock)
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

5
src/websock/Webserver.cpp
View file

@ -657,6 +657,8 @@ namespace xo {
virtual void init_protocols(std::vector<lws_protocols> * p_v) = 0; virtual void init_protocols(std::vector<lws_protocols> * p_v) = 0;
void init_mount_dynamic(lws_http_mount * p_mount) { void init_mount_dynamic(lws_http_mount * p_mount) {
/* see lws-context-vhost.h for lws_http_mount */
*p_mount = { *p_mount = {
/* .mount_next */ NULL, /* linked-list "next" */ /* .mount_next */ NULL, /* linked-list "next" */
/* .mountpoint */ "/dyn", /* mountpoint URL */ /* .mountpoint */ "/dyn", /* mountpoint URL */
@ -675,6 +677,9 @@ namespace xo {
/* .origin_protocol */ LWSMPRO_CALLBACK, /* dynamic */ /* .origin_protocol */ LWSMPRO_CALLBACK, /* dynamic */
/* .mountpoint_len */ 4, /* char count */ /* .mountpoint_len */ 4, /* char count */
/* .basic_auth_login_file */ NULL, /* .basic_auth_login_file */ NULL,
# if (LWS_LIBRARY_VERSION_MAJOR < 4) || (LWS_LIBRARY_VERSION_MINOR < 3) // -Werror=missing-field-initializers
/* ._unused[] */ { nullptr, nullptr },
# endif
}; };
} /*init_mount_dynamic*/ } /*init_mount_dynamic*/