-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Open
Description
Hello!
After upgrading we found that connection to WS server fails on Android platform. We identified the commit introducing the issue: ef4a85d (previous commit works fine)
From the code it looks like in some cases one CRLF is missing compared to previous commit. Probably LWS_CPYAPP(p, "\x0d\x0a");
should be moved just outside of }
:
libwebsockets/lib/roles/ws/server-ws.c
Lines 738 to 741 in ef4a85d
LWS_CPYAPP(p, "\x0d\x0aSec-WebSocket-Protocol: "); | |
p += lws_snprintf(p, 128, "%s", prot); | |
LWS_CPYAPP(p, "\x0d\x0a"); | |
} |
I don't think it has something to do with Android, but with specific compilation flags we use to compile (I think it is about LWS_WITHOUT_EXTENSIONS):
CFLAGS="-I${ANDROID_TOOLCHAIN}/include -I${ANDROID_TOOLCHAIN}/sysroot/usr/include -I${TARGET_DIR}/include" cmake \
-DANDROID_TOOLCHAIN_NAME=${ANDROID_TOOLCHAIN_ABI}-${ANDROID_API} \
-DANDROID_PLATFORM=android-${ANDROID_API} \
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
-DLWS_WITH_SHARED=ON \
-DLWS_WITH_STATIC=ON \
-DLWS_WITHOUT_TESTAPPS=ON \
-DLWS_WITH_ZLIB=ON \
-DLWS_STATIC_PIC=ON \
-DLWS_AVOID_SIGPIPE_IGN=ON \
-DLWS_OPENSSL_INCLUDE_DIRS=${TARGET_DIR}/include \
-DLWS_OPENSSL_LIBRARIES="${TARGET_DIR}/lib/libssl.a;${TARGET_DIR}/lib/libcrypto.a" \
-DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \
..
Andy @lws-team, could you please have a look at it?
Metadata
Metadata
Assignees
Labels
No labels