diff --git a/CMakeLists.txt b/CMakeLists.txt index 268ee5380cbafeab541ef62be001849fbe95597f..972c0058255bcd6f5211ad297afbdef8e9ab25d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,11 +10,11 @@ set(PACKAGE "libwebsockets") set(CPACK_PACKAGE_NAME "${PACKAGE}") set(CPACK_PACKAGE_VERSION_MAJOR "1") set(CPACK_PACKAGE_VERSION_MINOR "7") -set(CPACK_PACKAGE_VERSION_PATCH "8") +set(CPACK_PACKAGE_VERSION_PATCH "9") set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set(CPACK_PACKAGE_VENDOR "andy@warmcat.com") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}") -set(SOVERSION "7") +set(SOVERSION "7.1") set(CPACK_SOURCE_GENERATOR "TGZ") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") set(VERSION "${CPACK_PACKAGE_VERSION}") diff --git a/changelog b/changelog index 68c876addbd95b1229c8eabfa84ac7b91629f829..9a8710e207f5957608c45daba5b90b4c0f29c8a9 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,24 @@ Changelog --------- +v1.7.9 +====== + +NB: lws_snprintf() added, but only used in library and test apps +SONAME bump to 7.1 + +Fixes: + +1) Fix leak caused by undestroyed pthread mutex + +2) Add CLIENT_CONNECTION_ERROR callbacks for more failure paths + +3) Fix for client close to callback on one error path + +4) lws_snprintf() needed in a couple of test apps (1.7.x lib doesn't use it +for aggregated buffer truncation) + + v1.7.8 ====== diff --git a/libwebsockets-api-doc.html b/libwebsockets-api-doc.html index 13d3f006950aac97c29c2e61ad89d7e5336baab6..730a2ab56ac04648853c5407a5de962fefad8c01 100644 --- a/libwebsockets-api-doc.html +++ b/libwebsockets-api-doc.html @@ -1674,3 +1674,27 @@ Otherwise a default timeout is used. <dd>Length of data in <tt><b>buf</b></tt> to send </dl> <hr> +<h2>lws_snprintf - </h2> +<i>LWS_EXTERN int</i> +<b>lws_snprintf</b> +(<i>char *</i> <b>str</b>, +<i>size_t</i> <b>size</b>, +<i>const char *</i> <b>format</b>, +<i></i> <b>...</b>) +<h3>Arguments</h3> +<dl> +<dt><b>...</b> +<dd>variable arguments +</dl> +<h3>Description</h3> +<blockquote> +<p> +\param str: destination buffer +\param size: bytes left in destination buffer +\param format: format string +\param ...: args for format +<p> +This lets you correctly truncate buffers by concatenating lengths, if you +reach the limit the reported length doesn't exceed the limit. +</blockquote> +<hr> diff --git a/libwebsockets.spec b/libwebsockets.spec index c6b561288d21092ea9bde5d87a921133707faa5b..2068c27b427f3c76384f98703bcd7c75ab376a5a 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -1,5 +1,5 @@ Name: libwebsockets -Version: 1.7.8 +Version: 1.7.9 Release: 1%{?dist} Summary: Websocket Server and Client Library @@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT /usr/bin/libwebsockets-test-echo /usr/bin/libwebsockets-test-fraggle /usr/bin/libwebsockets-test-fuzxy -/%{_libdir}/libwebsockets.so.7 +/%{_libdir}/libwebsockets.so.7.1 /%{_libdir}/libwebsockets.so /%{_libdir}/cmake/libwebsockets/LibwebsocketsConfig.cmake /%{_libdir}/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 15 2016 Andy Green <andy@warmcat.com> 1.7.9-1 +- MINOR fixes Upstream 1.7.9 release (see changelog) + * Thu May 12 2016 Andy Green <andy@warmcat.com> 1.7.8-1 - MINOR fixes Upstream 1.7.8 release (see changelog)