diff --git a/CHANGELOG b/CHANGELOG index fe216aef71..e1857de747 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,11 @@ This is the changelog file for the POCO C++ Libraries. +Release 1.11.8p1 (2023-11-02) +============================= + +- GH #4241: Poco::FileInputStream broken in 1.12.5 and 1.11.8 + + Release 1.11.8 (2023-10-18) =========================== diff --git a/DLLVersion.rc b/DLLVersion.rc index f2d10c553d..2d4454eb0d 100644 --- a/DLLVersion.rc +++ b/DLLVersion.rc @@ -4,8 +4,8 @@ #include "winres.h" -#define POCO_VERSION 1,11,8,0 -#define POCO_VERSION_STR "1.11.8" +#define POCO_VERSION 1,11,8,1 +#define POCO_VERSION_STR "1.11.8p1" VS_VERSION_INFO VERSIONINFO FILEVERSION POCO_VERSION diff --git a/Foundation/include/Poco/Version.h b/Foundation/include/Poco/Version.h index efa7130de8..ea61958ace 100644 --- a/Foundation/include/Poco/Version.h +++ b/Foundation/include/Poco/Version.h @@ -35,7 +35,7 @@ // Ax: alpha releases // Bx: beta releases // -#define POCO_VERSION 0x010B0800 +#define POCO_VERSION 0x010B0801 #endif // Foundation_Version_INCLUDED diff --git a/Foundation/src/FileStream.cpp b/Foundation/src/FileStream.cpp index 158cdb5e85..0ddffe9b0e 100644 --- a/Foundation/src/FileStream.cpp +++ b/Foundation/src/FileStream.cpp @@ -39,6 +39,10 @@ FileIOS::~FileIOS() void FileIOS::open(const std::string& path, std::ios::openmode mode) { clear(); + if (!(mode & std::ios::in) && !(mode & std::ios::out)) + { + mode |= _defaultMode; + } _buf.open(path, mode); } @@ -73,7 +77,7 @@ FileInputStream::FileInputStream(): FileInputStream::FileInputStream(const std::string& path, std::ios::openmode mode): - FileIOS(mode | std::ios::in), + FileIOS(std::ios::in), std::istream(&_buf) { open(path, mode | std::ios::in); @@ -93,7 +97,7 @@ FileOutputStream::FileOutputStream(): FileOutputStream::FileOutputStream(const std::string& path, std::ios::openmode mode): - FileIOS(mode | std::ios::out), + FileIOS(std::ios::out), std::ostream(&_buf) { open(path, mode | std::ios::out); @@ -113,7 +117,7 @@ FileStream::FileStream(): FileStream::FileStream(const std::string& path, std::ios::openmode mode): - FileIOS(mode), + FileIOS(std::ios::in | std::ios::out), std::iostream(&_buf) { open(path, mode); diff --git a/VERSION b/VERSION index 40faed9aa4..745960fa4a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.11.8 +1.11.8p1 diff --git a/doc/99100-ReleaseNotes.page b/doc/99100-ReleaseNotes.page index f95091bf71..0f797f754b 100644 --- a/doc/99100-ReleaseNotes.page +++ b/doc/99100-ReleaseNotes.page @@ -1,6 +1,13 @@ POCO C++ Libraries Release Notes AAAIntroduction +!!!Release 1.11.8p1 + +!! Summary of Changes + + - GH #4241: Poco::FileInputStream broken in 1.12.5 and 1.11.8 + + !!!Release 1.11.8 !!Summary of Changes