Compare commits
	
		
			1 Commits
		
	
	
		
			v11.4.4
			...
			feature/or
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					4027f9282b | 
@@ -6,7 +6,7 @@
 | 
				
			|||||||
cmake_minimum_required(VERSION 3.4.1...3.17.2)
 | 
					cmake_minimum_required(VERSION 3.4.1...3.17.2)
 | 
				
			||||||
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
 | 
					set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
project(ixwebsocket LANGUAGES C CXX VERSION 11.4.4)
 | 
					project(ixwebsocket C CXX)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set (CMAKE_CXX_STANDARD 11)
 | 
					set (CMAKE_CXX_STANDARD 11)
 | 
				
			||||||
set (CXX_STANDARD_REQUIRED ON)
 | 
					set (CXX_STANDARD_REQUIRED ON)
 | 
				
			||||||
@@ -136,7 +136,6 @@ if (USE_TLS)
 | 
				
			|||||||
    else() # default to OpenSSL on all other platforms
 | 
					    else() # default to OpenSSL on all other platforms
 | 
				
			||||||
      if (NOT USE_MBED_TLS) # Unless mbedtls is requested
 | 
					      if (NOT USE_MBED_TLS) # Unless mbedtls is requested
 | 
				
			||||||
        set(USE_OPEN_SSL ON)
 | 
					        set(USE_OPEN_SSL ON)
 | 
				
			||||||
        set(requires "openssl")
 | 
					 | 
				
			||||||
      endif()
 | 
					      endif()
 | 
				
			||||||
    endif()
 | 
					    endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -166,9 +165,9 @@ if(BUILD_SHARED_LIBS)
 | 
				
			|||||||
        ${IXWEBSOCKET_SOURCES}
 | 
					        ${IXWEBSOCKET_SOURCES}
 | 
				
			||||||
        ${IXWEBSOCKET_HEADERS}
 | 
					        ${IXWEBSOCKET_HEADERS}
 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
    # Set library version
 | 
					    # Set library version
 | 
				
			||||||
    set_target_properties(ixwebsocket PROPERTIES VERSION ${CMAKE_PROJECT_VERSION})
 | 
					    set_target_properties(ixwebsocket PROPERTIES VERSION 11.3.2)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
else()
 | 
					else()
 | 
				
			||||||
    # Static library
 | 
					    # Static library
 | 
				
			||||||
@@ -291,10 +290,6 @@ if (IXWEBSOCKET_INSTALL)
 | 
				
			|||||||
  configure_file("${CMAKE_CURRENT_LIST_DIR}/ixwebsocket-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/ixwebsocket-config.cmake" @ONLY)
 | 
					  configure_file("${CMAKE_CURRENT_LIST_DIR}/ixwebsocket-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/ixwebsocket-config.cmake" @ONLY)
 | 
				
			||||||
  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ixwebsocket-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ixwebsocket")
 | 
					  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ixwebsocket-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ixwebsocket")
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  set(prefix ${CMAKE_INSTALL_PREFIX})
 | 
					 | 
				
			||||||
  configure_file("${CMAKE_CURRENT_LIST_DIR}/ixwebsocket.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/ixwebsocket.pc" @ONLY)
 | 
					 | 
				
			||||||
  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ixwebsocket.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  install(EXPORT ixwebsocket
 | 
					  install(EXPORT ixwebsocket
 | 
				
			||||||
          FILE ixwebsocket-targets.cmake
 | 
					          FILE ixwebsocket-targets.cmake
 | 
				
			||||||
          NAMESPACE ixwebsocket::
 | 
					          NAMESPACE ixwebsocket::
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -107,7 +107,6 @@ If your company or project is using this library, feel free to open an issue or
 | 
				
			|||||||
- [Teleport](http://teleportconnect.com/), Teleport is your own personal remote robot avatar
 | 
					- [Teleport](http://teleportconnect.com/), Teleport is your own personal remote robot avatar
 | 
				
			||||||
- [Abaddon](https://github.com/uowuo/abaddon), An alternative Discord client made with C++/gtkmm 
 | 
					- [Abaddon](https://github.com/uowuo/abaddon), An alternative Discord client made with C++/gtkmm 
 | 
				
			||||||
- [NovaCoin](https://github.com/novacoin-project/novacoin), a hybrid scrypt PoW + PoS based cryptocurrency.
 | 
					- [NovaCoin](https://github.com/novacoin-project/novacoin), a hybrid scrypt PoW + PoS based cryptocurrency.
 | 
				
			||||||
- [Candy](https://github.com/lanthora/candy), A WebSocket and TUN based VPN for Linux 
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Alternative libraries
 | 
					## Alternative libraries
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,8 +2,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
All changes to this project will be documented in this file.
 | 
					All changes to this project will be documented in this file.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## [11.4.4] - 2023-06-05
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
## [11.4.3] - 2022-05-13
 | 
					## [11.4.3] - 2022-05-13
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Set shorter thread names
 | 
					Set shorter thread names
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,11 +0,0 @@
 | 
				
			|||||||
prefix=@prefix@
 | 
					 | 
				
			||||||
exec_prefix=${prefix}
 | 
					 | 
				
			||||||
libdir=${exec_prefix}/lib
 | 
					 | 
				
			||||||
includedir=${prefix}/include
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Name: ixwebsocket
 | 
					 | 
				
			||||||
Description: websocket and http client and server library, with TLS support and very few dependencies
 | 
					 | 
				
			||||||
Version: @CMAKE_PROJECT_VERSION@
 | 
					 | 
				
			||||||
Libs: -L${libdir} -lixwebsocket
 | 
					 | 
				
			||||||
Cflags: -I${includedir}
 | 
					 | 
				
			||||||
Requires: @requires@
 | 
					 | 
				
			||||||
@@ -6,4 +6,4 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#pragma once
 | 
					#pragma once
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define IX_WEBSOCKET_VERSION "11.4.4"
 | 
					#define IX_WEBSOCKET_VERSION "11.4.3"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,7 +16,7 @@ set (TEST_TARGET_NAMES
 | 
				
			|||||||
  IXWebSocketServerTest
 | 
					  IXWebSocketServerTest
 | 
				
			||||||
  IXWebSocketTestConnectionDisconnection
 | 
					  IXWebSocketTestConnectionDisconnection
 | 
				
			||||||
  IXUrlParserTest
 | 
					  IXUrlParserTest
 | 
				
			||||||
  # IXHttpClientTest ## FIXME httpbin.org does not seem normal
 | 
					  IXHttpClientTest
 | 
				
			||||||
  IXUnityBuildsTest
 | 
					  IXUnityBuildsTest
 | 
				
			||||||
  IXHttpTest
 | 
					  IXHttpTest
 | 
				
			||||||
  IXDNSLookupTest
 | 
					  IXDNSLookupTest
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user