diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-28 21:13:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 21:13:58 +0100 |
| commit | c6dff58f491c30ffc2a81a8d69da86ff8105053f (patch) | |
| tree | 70a1ec6616f76adbdbed37a84ca7d8bdde602654 | |
| parent | 3d03bcd0636aacfe530c52fc1cdc32c2edffea04 (diff) | |
| parent | 659c62ee338975eddf1f7e65f68190af65199324 (diff) | |
Merge pull request #17115 from Faless/lws_bsd_malloc
Fix mbedTLS and Websocket on FreeBSD
| -rwxr-xr-x | modules/mbedtls/SCsub | 2 | ||||
| -rw-r--r-- | modules/websocket/SCsub | 4 | ||||
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/modules/mbedtls/SCsub b/modules/mbedtls/SCsub index b846ae38ad..38198c9105 100755 --- a/modules/mbedtls/SCsub +++ b/modules/mbedtls/SCsub @@ -85,7 +85,7 @@ if env['builtin_mbedtls']: thirdparty_dir = "#thirdparty/mbedtls/library/" thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_mbed_tls.add_source_files(env.modules_sources, thirdparty_sources) - env_mbed_tls.Append(CPPPATH=["#thirdparty/mbedtls/include/"]) + env_mbed_tls.Prepend(CPPPATH=["#thirdparty/mbedtls/include/"]) # Module sources env_mbed_tls.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/websocket/SCsub b/modules/websocket/SCsub index 1a36e05863..8bb83436d9 100644 --- a/modules/websocket/SCsub +++ b/modules/websocket/SCsub @@ -69,11 +69,11 @@ else: env_lws.Append(CPPPATH=[thirdparty_dir]) wrapper_includes = ["#thirdparty/lws/mbedtls_wrapper/include/" + inc for inc in ["internal", "openssl", "platform", ""]] - env_lws.Append(CPPPATH=wrapper_includes) + env_lws.Prepend(CPPPATH=wrapper_includes) if env['builtin_mbedtls']: mbedtls_includes = "#thirdparty/mbedtls/include" - env_lws.Append(CPPPATH=[mbedtls_includes]) + env_lws.Prepend(CPPPATH=[mbedtls_includes]) if env_lws["platform"] == "windows" or env_lws["platform"] == "uwp": env_lws.Append(CPPPATH=[thirdparty_dir + helper_dir]) diff --git a/thirdparty/README.md b/thirdparty/README.md index ff05f3d084..746422cab4 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -235,7 +235,7 @@ File extracted from upstream source: - From `server/` exclude `access-log.c`, `cgi.c`, `daemonize.c`, `lws-spa.c`, `peer-limits.c`, `rewrite.c` - Also copy `win32helpers/` from `win32port/` -- `mbedtls_wrapper/include/platform/ssl_port.h` has a small change to check for OSX (missing `malloc.h`). +- `mbedtls_wrapper/include/platform/ssl_port.h` has a small change to check for OSX and FreeBSD (missing `malloc.h`). The bug is fixed in upstream master via `LWS_HAVE_MALLOC_H`, but not in the 2.4.1 branch (as the file structure has changed). Important: `lws_config.h` and `lws_config_private.h` contains custom diff --git a/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h b/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h index fd461e9819..2ffd7e7544 100644 --- a/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h +++ b/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h @@ -25,7 +25,7 @@ */ #include "string.h" -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__FreeBSD__) #include <stdlib.h> #else #include "malloc.h" |