Compare commits
4 Commits
feature/vc
...
v4.0.4
Author | SHA1 | Date | |
---|---|---|---|
2d02ae0f0c | |||
a8879da4fc | |||
5f4a430845 | |||
b9231be305 |
16
.travis.yml
16
.travis.yml
@ -31,11 +31,11 @@ matrix:
|
|||||||
# - CXX=clang++
|
# - CXX=clang++
|
||||||
|
|
||||||
# Windows
|
# Windows
|
||||||
- os: windows
|
# - os: windows
|
||||||
env:
|
# env:
|
||||||
- CMAKE_PATH="/c/Program Files/CMake/bin"
|
# - CMAKE_PATH="/c/Program Files/CMake/bin"
|
||||||
script:
|
# script:
|
||||||
- export PATH=$CMAKE_PATH:$PATH
|
# - export PATH=$CMAKE_PATH:$PATH
|
||||||
- cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 -DUSE_VENDORED_THIRD_PARTY=1 .
|
# # - cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 -DUSE_VENDORED_THIRD_PARTY=1 .
|
||||||
- cmake --build --parallel .
|
# # - cmake --build --parallel .
|
||||||
- python test/run.py
|
# - python test/run.py
|
||||||
|
@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
## [unreleased] - 2019-06-09
|
## [unreleased] - 2019-06-09
|
||||||
### Changed
|
### Changed
|
||||||
|
- cobra_to_sentry / backtraces are reversed and line number is not extracted correctly
|
||||||
- mbedtls and zlib are searched with find_package, and we use the vendored version if nothing is found
|
- mbedtls and zlib are searched with find_package, and we use the vendored version if nothing is found
|
||||||
- travis CI uses g++ on Linux
|
- travis CI uses g++ on Linux
|
||||||
|
|
||||||
|
@ -134,6 +134,11 @@ if (APPLE AND USE_TLS AND NOT USE_MBED_TLS)
|
|||||||
target_link_libraries(ixwebsocket "-framework foundation" "-framework security")
|
target_link_libraries(ixwebsocket "-framework foundation" "-framework security")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (UNIX)
|
||||||
|
find_package(Threads)
|
||||||
|
target_link_libraries(ixwebsocket ${CMAKE_THREAD_LIBS_INIT})
|
||||||
|
endif()
|
||||||
|
|
||||||
if (USE_OPEN_SSL)
|
if (USE_OPEN_SSL)
|
||||||
find_package(OpenSSL REQUIRED)
|
find_package(OpenSSL REQUIRED)
|
||||||
add_definitions(${OPENSSL_DEFINITIONS})
|
add_definitions(${OPENSSL_DEFINITIONS})
|
||||||
|
@ -1 +1 @@
|
|||||||
4.0.0
|
4.0.4
|
||||||
|
@ -99,8 +99,10 @@ def runCMake(sanitizer, buildDir):
|
|||||||
#generator = '"NMake Makefiles"'
|
#generator = '"NMake Makefiles"'
|
||||||
#generator = '"Visual Studio 16 2019"'
|
#generator = '"Visual Studio 16 2019"'
|
||||||
generator = '"Visual Studio 15 2017"'
|
generator = '"Visual Studio 15 2017"'
|
||||||
|
USE_VENDORED_THIRD_PARTY = 'ON'
|
||||||
else:
|
else:
|
||||||
generator = '"Unix Makefiles"'
|
generator = '"Unix Makefiles"'
|
||||||
|
USE_VENDORED_THIRD_PARTY = 'OFF'
|
||||||
|
|
||||||
CMAKE_BUILD_TYPE = BUILD_TYPE
|
CMAKE_BUILD_TYPE = BUILD_TYPE
|
||||||
|
|
||||||
@ -110,6 +112,7 @@ def runCMake(sanitizer, buildDir):
|
|||||||
-DCMAKE_BUILD_TYPE={CMAKE_BUILD_TYPE} \
|
-DCMAKE_BUILD_TYPE={CMAKE_BUILD_TYPE} \
|
||||||
-DUSE_TLS=1 \
|
-DUSE_TLS=1 \
|
||||||
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
|
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
|
||||||
|
-DUSE_VENDORED_THIRD_PARTY={USE_VENDORED_THIRD_PARTY} \
|
||||||
-G{generator}'
|
-G{generator}'
|
||||||
|
|
||||||
cmakeCmd = fmt.format(**locals())
|
cmakeCmd = fmt.format(**locals())
|
||||||
|
@ -72,7 +72,6 @@ namespace ix
|
|||||||
std::string line;
|
std::string line;
|
||||||
std::stringstream tokenStream(stack);
|
std::stringstream tokenStream(stack);
|
||||||
|
|
||||||
std::stringstream ss;
|
|
||||||
std::smatch group;
|
std::smatch group;
|
||||||
|
|
||||||
while (std::getline(tokenStream, line))
|
while (std::getline(tokenStream, line))
|
||||||
@ -84,6 +83,7 @@ namespace ix
|
|||||||
const auto linenoStr = group.str(2);
|
const auto linenoStr = group.str(2);
|
||||||
const auto function = group.str(3);
|
const auto function = group.str(3);
|
||||||
|
|
||||||
|
std::stringstream ss;
|
||||||
ss << linenoStr;
|
ss << linenoStr;
|
||||||
uint64_t lineno;
|
uint64_t lineno;
|
||||||
ss >> lineno;
|
ss >> lineno;
|
||||||
@ -97,6 +97,8 @@ namespace ix
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::reverse(frames.begin(), frames.end());
|
||||||
|
|
||||||
return frames;
|
return frames;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user