d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fixes'

Browse Source
This commit is contained in:
Roger A. Light 2015-12-21 11:32:53 +00:00
commit 646e0a0c32
12 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -11,7 +11,7 @@ project(mosquitto)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
# Only for version 3 and up. cmake_policy(SET CMP0042 NEW) # Only for version 3 and up. cmake_policy(SET CMP0042 NEW)
set (VERSION 1.4.6) set (VERSION 1.4.7)
if (WIN32) if (WIN32)
execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP

7
ChangeLog.txt
View File

@ -1,3 +1,10 @@
1.4.7 - 20151221
================
Broker:
- Fix support for libwebsockets 1.22.
1.4.6 - 20151220 1.4.6 - 20151220
================ ================

2
config.mk
View File

@ -83,7 +83,7 @@ WITH_SOCKS:=yes
# Also bump lib/mosquitto.h, CMakeLists.txt, # Also bump lib/mosquitto.h, CMakeLists.txt,
# installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi # installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi
VERSION=1.4.6 VERSION=1.4.7
TIMESTAMP:=$(shell date "+%F %T%z") TIMESTAMP:=$(shell date "+%F %T%z")
# Client library SO version. Bump if incompatible API/ABI changes are made. # Client library SO version. Bump if incompatible API/ABI changes are made.

2
installer/mosquitto-cygwin.nsi
View File

@ -7,7 +7,7 @@
!define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
Name "mosquitto" Name "mosquitto"
!define VERSION 1.4.6 !define VERSION 1.4.7
OutFile "mosquitto-${VERSION}-install-cygwin.exe" OutFile "mosquitto-${VERSION}-install-cygwin.exe"
InstallDir "$PROGRAMFILES\mosquitto" InstallDir "$PROGRAMFILES\mosquitto"

2
installer/mosquitto.nsi
View File

@ -9,7 +9,7 @@
!define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
Name "mosquitto" Name "mosquitto"
!define VERSION 1.4.6 !define VERSION 1.4.7
OutFile "mosquitto-${VERSION}-install-win32.exe" OutFile "mosquitto-${VERSION}-install-win32.exe"
InstallDir "$PROGRAMFILES\mosquitto" InstallDir "$PROGRAMFILES\mosquitto"

2
lib/mosquitto.h
View File

@ -45,7 +45,7 @@ extern "C" {
#define LIBMOSQUITTO_MAJOR 1 #define LIBMOSQUITTO_MAJOR 1
#define LIBMOSQUITTO_MINOR 4 #define LIBMOSQUITTO_MINOR 4
#define LIBMOSQUITTO_REVISION 6 #define LIBMOSQUITTO_REVISION 7
/* LIBMOSQUITTO_VERSION_NUMBER looks like 1002001 for e.g. version 1.2.1. */ /* LIBMOSQUITTO_VERSION_NUMBER looks like 1002001 for e.g. version 1.2.1. */
#define LIBMOSQUITTO_VERSION_NUMBER (LIBMOSQUITTO_MAJOR*1000000+LIBMOSQUITTO_MINOR*1000+LIBMOSQUITTO_REVISION) #define LIBMOSQUITTO_VERSION_NUMBER (LIBMOSQUITTO_MAJOR*1000000+LIBMOSQUITTO_MINOR*1000+LIBMOSQUITTO_REVISION)

1
lib/net_mosq.c
View File

@ -68,7 +68,6 @@ Contributors:
extern unsigned long g_pub_msgs_sent; extern unsigned long g_pub_msgs_sent;
# endif # endif
# ifdef WITH_WEBSOCKETS # ifdef WITH_WEBSOCKETS
# include <lws_config.h>
# include <libwebsockets.h> # include <libwebsockets.h>
# endif # endif
#else #else

1
src/loop.c
View File

@ -37,7 +37,6 @@ Contributors:
#include <time.h> #include <time.h>
#ifdef WITH_WEBSOCKETS #ifdef WITH_WEBSOCKETS
# include <lws_config.h>
# include <libwebsockets.h> # include <libwebsockets.h>
#endif #endif

1
src/mosquitto.c
View File

@ -43,7 +43,6 @@ Contributors:
#include <tcpd.h> #include <tcpd.h>
#endif #endif
#ifdef WITH_WEBSOCKETS #ifdef WITH_WEBSOCKETS
# include <lws_config.h>
# include <libwebsockets.h> # include <libwebsockets.h>
#endif #endif

1
src/mosquitto_broker.h
View File

@ -21,7 +21,6 @@ Contributors:
#include <stdio.h> #include <stdio.h>
#ifdef WITH_WEBSOCKETS #ifdef WITH_WEBSOCKETS
# include <lws_config.h>
# include <libwebsockets.h> # include <libwebsockets.h>
# if defined(LWS_LIBRARY_VERSION_NUMBER) # if defined(LWS_LIBRARY_VERSION_NUMBER)

1
src/read_handle_server.c
View File

@ -32,7 +32,6 @@ Contributors:
#endif #endif
#ifdef WITH_WEBSOCKETS #ifdef WITH_WEBSOCKETS
# include <lws_config.h>
# include <libwebsockets.h> # include <libwebsockets.h>
#endif #endif

1
src/websockets.c
View File

@ -29,7 +29,6 @@ POSSIBILITY OF SUCH DAMAGE.
#ifdef WITH_WEBSOCKETS #ifdef WITH_WEBSOCKETS
#include <lws_config.h>
#include <libwebsockets.h> #include <libwebsockets.h>
#include "mosquitto_internal.h" #include "mosquitto_internal.h"
#include "mosquitto_broker.h" #include "mosquitto_broker.h"