Merge branch 'poco-1.7.8'

This commit is contained in:
Guenter Obiltschnig 2017-04-16 08:34:26 +02:00
commit 6520dade57
8 changed files with 23 additions and 9 deletions

View File

@ -1,5 +1,11 @@
This is the changelog file for the POCO C++ Libraries.
Release 1.7.8p1 (2017-04-16)
============================
- fixed GH #1655: CipherImpl memory leak with OpenSSL 1.1
Release 1.7.8 (2017-02-21)
==========================

View File

@ -119,6 +119,7 @@ namespace
{
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
EVP_CIPHER_CTX_cleanup(_pContext);
EVP_CIPHER_free(_pContext);
#else
EVP_CIPHER_CTX_cleanup(&_context);
#endif

View File

@ -4,8 +4,8 @@
#include "winres.h"
#define POCO_VERSION 1,7,8,0
#define POCO_VERSION_STR "1.7.8"
#define POCO_VERSION 1,7,8,1
#define POCO_VERSION_STR "1.7.8p1"
VS_VERSION_INFO VERSIONINFO
FILEVERSION POCO_VERSION

View File

@ -37,7 +37,7 @@
// Ax: alpha releases
// Bx: beta releases
//
#define POCO_VERSION 0x01070800
#define POCO_VERSION 0x01070801
#endif // Foundation_Version_INCLUDED

View File

@ -4,8 +4,8 @@ POCO C++ Libraries
Build Status
------------
- Travis: [![Travis Build Status](https://travis-ci.org/pocoproject/poco.png?branch=master)](https://travis-ci.org/pocoproject/poco)
- AppVeyor: [![Build status](https://ci.appveyor.com/api/projects/status/7iyrx3f233s3akae/branch/master?svg=true)](https://ci.appveyor.com/project/obiltschnig/poco/branch/master)
- Travis: [![Travis Build Status](https://travis-ci.org/pocoproject/poco.png?branch=poco-1.7.8)](https://travis-ci.org/pocoproject/poco)
- AppVeyor: [![Build status](https://ci.appveyor.com/api/projects/status/7iyrx3f233s3akae/branch/poco-1.7.8?svg=true)](https://ci.appveyor.com/project/obiltschnig/poco/branch/poco-1.7.8)
- [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/370/badge)](https://bestpractices.coreinfrastructure.org/projects/370)

View File

@ -1 +1 @@
1.7.8
1.7.8p1

View File

@ -85,7 +85,7 @@ else (CYGWIN)
# Standard 'must be' defines
if (APPLE)
add_definitions( -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64)
set(SYSLIBS dl)
set(SYSLIBS ${CMAKE_DL_LIBS})
else (APPLE)
add_definitions( -D_REENTRANT -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 )
if (QNX)
@ -93,7 +93,7 @@ else (CYGWIN)
set(SYSLIBS m socket)
else (QNX)
add_definitions( -D_XOPEN_SOURCE=500 -DPOCO_HAVE_FD_EPOLL)
set(SYSLIBS pthread dl rt)
set(SYSLIBS pthread ${CMAKE_DL_LIBS} rt)
endif (QNX)
endif (APPLE)
endif(UNIX AND NOT ANDROID )
@ -103,7 +103,7 @@ if (CMAKE_SYSTEM MATCHES "SunOS")
add_definitions( -DPOCO_OS_FAMILY_UNIX )
# Standard 'must be' defines
add_definitions( -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 )
set(SYSLIBS pthread socket xnet nsl resolv rt dl)
set(SYSLIBS pthread socket xnet nsl resolv rt ${CMAKE_DL_LIBS})
endif(CMAKE_SYSTEM MATCHES "SunOS")
if (CMAKE_COMPILER_IS_MINGW)

View File

@ -1,6 +1,13 @@
POCO C++ Libraries Release Notes
AAAIntroduction
!!!Release 1.7.8p1
!!Summary of Changes
- fixed GH #1655: CipherImpl memory leak with OpenSSL 1.1
!!!Release 1.7.8
!!Summary of Changes