Merge branch 'poco-1.10.0' into devel

CHANGELOG

@@ -1,10 +1,161 @@
 This is the changelog file for the POCO C++ Libraries.
 
-
+Release 1.10.0 (2020-01-xx)
-Release 1.9.1 (2018-xx-xx)
 ==========================
 
-- TODO
+- This release now requires a C++14 compiler (GCC 5, Clang 3.4, Visual C++ 2015).
+- POCO's fixed-size integer types are now based on <cstdint> types. This changes
+  the definition of Poco::Int64 and Poco::UInt64 on some platforms.
+- Many methods exposing raw pointers have been changed to use smart pointers
+  (usually Poco::SharedPtr or Poco::AutoPtr) instead. This may break some existing
+  code. Specifically, the Logging framework in the Foundation library and the
+  Configuration framework in the Util library have been changed.
+- New JWT library for dealing with JSON Web Tokens.
+- Upgrade bundled SQLite to version 3.31.0.
+- The NetSSL_OpenSSL library supports TLS 1.3 with OpenSSL 1.1.1 or later.
+- The NetSSL_Win library supports TLS 1.3 if it's supported by the underlying SChannel
+  implementation.
+- Added support for NTLM authentication in the Net library.
+- NetSSL_OpenSSL now has a Poco::Net::FTPSClientSession and Poco::Net::FTPSStreamOpener
+  class for connecting to FTP servers over TLS.
+- Fixed a potential crash in Poco::Net::NetworkInterface on Linux and macOS due to
+  an invalid cast when obtaining the MAC address of an interface.
+- GH #2624: Poco::FileChannel/Poco:LogFileImpl::writeImpl() on Windows should translate \n to \r\n.
+- GH #2869: X509Certificate does not render UTF-8 characters in subjectName
+- GH #2863: NetworkInterface::map can fail to reveal some interfaces if an earlier one can not be handled
+- GH #2807: Poco::Data::ODBC Binding of SQL Decimal Type
+- GH #2812: String trimInPlace crashes with 0 size on Visual Studio Express 2017
+- GH #2830: Fix wrong buffer size in client handshake when re-using a SecureSocket [NetSSL_Win]
+- GH #2809: Allow to filter long tests using a command line argument
+- GH #2853: Poco::Process::launch process environment unicode support is broken on Windows
+- GH #2843: Poco::Net::MediaType::parse() does not split parameters
+- GH #2772: On iOS real device (not simulator) the home directory is not usable
+- GH #2689: Added tryWait() into Process and ProcessHandle. Handle kill()-ed UNIX process exit codes.
+- GH #2866: unescape Backslash char in UTF8 unescape method
+- GH #2879: Add support for SameSite attribute in HTTPCookie
+- GH #2824: Poco::Environment missing UTF8/wstring support on Windows
+- GH #2295: setEscapeUnicode() functions in JSON Array and Object classes ignore their boolean parameter
+- GH #2306: Why does Poco explicitly define _WIN32_WINNT?
+- GH #2802: Deprecated warning when building POCO with OpenSSL in submodule + cmake
+- GH #2884: Is it a description error about setReceiveTimeout()?
+- GH #2780: Allow Poco::Net::Context::usePrivateKey to accept ECKey and/or general EVPPKey
+- GH #2747: NetSSL_Win: Context constructor usage argument should specify minimum supported SSL/TLS version
+- GH #2745: Small problem in the code
+- GH #2743: X509Certificate validFrom expiresOn Date parsing
+- GH #2744: Poco::Mysql does not build with MySQL 8.0+
+- GH #2686: Uploads larger than 2GB fail
+- GH #2217: UUIDGenerator should allow random seed
+- GH #1609: Improve XDG Base Directory Specification implementation
+- GH #561: Support for XDG Base Directory Specification
+- GH #2881: Add an option to force the use of PollingDirectoryWatcherStrategy
+- GH #2584: Adding standard macOS legacy encodings
+- GH #2885: fix Dynamic::Var parse string issue
+- GH #2616: Restore pre-1.8.0 behaviour of Poco::Net::ServerSocket::bind.
+- GH #2641: Implement DataURIStream for extracting data from data URIs.
+- GH #2842: File fail on overwrite
+- GH #2840: Deleting Registry Keys on the WOW6432Node is not possible on 64Bit Applications
+- GH #2841: Service manager improvments
+- GH #2827: X509Certificate: Get rid of deprecated OpenSSL 1.1 APIs
+- GH #2826: CipherImpl: Fix small error with OpenSSL 1.1
+- GH #2775: Fix issue in NetSSL_Win. Windows Server 2016 reboots while trying to establish an SSL connection.
+- GH #2773: Fix the issue with incorrect type of store name parameter in CertOpenStore API call into NetSSL_Win
+- GH #2766: Support qnx sdp7
+- GH #2308: SocketAcceptor::setReactor() is broken
+- GH #2250: Poco::strToInt<> fails for values right above the type's boundary / limit
+- GH #2249: Poco::JSON::Object::set() should return reference to this to allow chaining.
+- GH #2275: SQLite mismatch open/close API calls
+- GH #1921: ICMPSocket does not check reply address
+- GH #2092: Use PollSet in SocketReactor
+- GH #2552: Poco::MongoDB test cases failed in Linux on IBM z
+- GH #2546: MySQL session state is not cleared in SessionPool
+- GH #2410: Preserve entries order in DynamicStruct
+- GH #2467: Can not open certain zip files include data descriptor
+- GH #2398: Poco 1.9.1 branch cmake build on FreeBSD 11.1 failed
+- GH #2365: add struct tm support to DateTime
+- GH #2348: NTPClient not checking reply address
+- GH #2346: lock-order-inversion in SocketReactor
+- GH #2330: add socket gather/scatter capabilities
+- GH #2343: UDPServer and client
+- GH #2329: add PMTU discovery
+- GH #2345: SocketNotifier not thread-safe
+- GH #2323: WebSocketTest.cpp faults reported by valgrind
+- GH #1160: Poco::Net::NetException "SSL Exception: error:1409F07F:SSL routines:ssl3_write_pending:bad write retry"
+- GH #2547: Reset connection when a session is returned to the SessionPool
+- GH #2451: http client timeout on Windows 7 and Server 2008 R2
+- GH #2417: Added missing IPv6 methods to SecureSocketImpl
+- GH #2408: add ordered containers
+- GH #2042: Android abstract namespace local socket address
+- GH #2088: Fix race condition in TCPServerDispatcher.cpp
+
+
+Release 1.9.4 (2019-09-18)
+==========================
+
+- fixed GH #2784: Upgrade bundled expat XML parser library to release 2.2.8,
+  which fixes CVE-2019-15903.
+
+
+Release 1.9.3 (2019-08-20)
+==========================
+
+- fixed GH #2603: Remove incorrect upper size limits for SSL certificates in NetSSL_Win
+- fixed GH #2661: Poco::Zip::ZipArchive cannot load new tomcat.zip file (additional fix)
+- fixed GH #2742: Support of vs150 & vs160 with the official Microsoft localization executable,
+  vswhere.exe, installed by MSVC starting from VS2017
+- Data/ODBC: make binding of std::string configurable (SQL_LONGVARCHAR - default or SQL_VARCHAR)
+  through a global setting (Poco::Data::ODBC::Connector::bindStringToLongVarChar()).
+- added Poco::SharedLibrary::setSearchPath() (currently implemented on Windows only)
+- Windows required minimum version is now Windows XP SP2
+- upgraded bundled SQLite to 3.29.0
+- CppParser now supports type aliases defined with using keyword.
+- PageCompiler: added support for adding Content-Security-Policy and Cache-Control headers.
+
+
+Release 1.9.2 (2019-07-02)
+==========================
+
+- fixed GH #2736: Error using CMake gui - latest version
+- fixed GH #2737: Bundles vulnerable copy of Expat — please upgrade to Expat 2.2.7
+- fixed GH #2738: Poco::AccessExpireStrategy::onGet() must not extend expiration time after expiration
+
+
+Release 1.9.1 (2019-06-24)
+==========================
+
+- Added support for building with different OpenSSL distributions on Windows.
+  See the POCO_EXTERNAL_OPENSSL macro defined in Foundation/include/Poco/Config.h
+  for options.
+- Added Poco::Net::HTTPClientSession::flushRequest()
+- Added Poco::Net::WebSocket::setMaxPayloadSize() and Poco::Net::WebSocket::getMaxPayloadSize()
+  to specify a maximum acceptable payload size for Poco::Net::WebSocket::receiveFrame().
+- Poco::Net::WebSocket: don't attempt to send empty credentials in response to 401 response.
+- Redis: added support for additional commands (exists, expire, ping, multi, exec, discard)
+- Redis: added Poco::Redis::Client::isConnected()
+- Upgraded bundled PCRE to version 8.43
+- Upgraded bundled SQLite to version 3.28.0
+- Added project/solution files for Visual Studio 2019
+- Fixed Visual Studio project files (version information from DLLVersion.rc not included in DLLs)
+- Include version resource in DLLs built with CMake
+- Added HTTP*Credentials::empty() and HTTPCredentials::clear()
+- fixed GH #2220: Encoding/DoubleByteEncoding.cpp fails to compile with VS2008 and _DEBUG
+- fixed GH #2243: DLLVersion.rc is excluded from build, missing detail information in properties of *.dll
+- fixed GH #2277: SQLite null pointer dereference occurs when exception is being thrown
+- fixed GH #2313: PollSet behaves differently on windows
+- fixed GH #2316: cmake can't find MySQL and ODBC libraries
+- fixed GH #2336: Omit ContentLength in WebSocket accept response
+- fixed GH #2358: Don't include <openssl/fips.h> for later OpenSSL
+- fixed GH #2364: Stringify escapes every unicode symbol when object contain an array
+- fixed GH #2380: Calling Poco::Net::X509Certificate::addChainCertificate() leads to double free.
+- fixed GH #2492: Net::Socket::address() crash on Android
+- fixed GH #2549: Fix keepAlive in http client session
+- fixed GH #2565: HTMLForm: optional enforcement of Content-Length instead of Chunked Transfer-Encoding
+- fixed GH #2570: DialogSocket: receiveStatusMessage() - line length limit applies to entire multi-line message
+- fixed GH #2583: Crypto library does not build with OpenSSL 1.0.0
+- fixed GH #2655: MongoDB Binary element to string - bug
+- fixed GH #2661: Poco::Zip::ZipArchive cannot load new tomcat.zip file
+- fixed GH #2700: Invalid read of memory in Poco::Environment::set which may cause crashes.
+- fixed GH #2712: File_WIN32.cpp(168): error C2065: "_upath":Undeclared identifier
+- fixed GH #2723: Access violation when trying to decompress .zip file with unsupported compression method.
 
 
 Release 1.9.0 (2018-03-07)
@@ -33,7 +184,6 @@ Release 1.9.0 (2018-03-07)
 - fixed GH #2199 and GH #2188: Illegal header in zip file exception/assertion failure during JAR file decompression
 - fixed GH #2203: Use MAX_ADDRESS_LENGTH to determine buffer size
 
-
 Release 1.8.1 (2018-01-09)
 ==========================
 

Crypto/src/X509Certificate.cpp

@@ -40,6 +40,7 @@
 namespace Poco {
 namespace Crypto {
 
+
 X509Certificate::X509Certificate(std::istream& istr):
 	_pCert(0)
 {

Encodings/Encodings_vs140.vcxproj

@@ -555,6 +555,13 @@
     <ClInclude Include="include\Poco\ISO8859_7Encoding.h"/>
     <ClInclude Include="include\Poco\ISO8859_8Encoding.h"/>
     <ClInclude Include="include\Poco\ISO8859_9Encoding.h"/>
+    <ClInclude Include="include\Poco\MacCentralEurRomanEncoding.h"/>
+    <ClInclude Include="include\Poco\MacChineseSimpEncoding.h"/>
+    <ClInclude Include="include\Poco\MacChineseTradEncoding.h"/>
+    <ClInclude Include="include\Poco\MacCyrillicEncoding.h"/>
+    <ClInclude Include="include\Poco\MacJapaneseEncoding.h"/>
+    <ClInclude Include="include\Poco\MacKoreanEncoding.h"/>
+    <ClInclude Include="include\Poco\MacRomanEncoding.h"/>
     <ClInclude Include="include\Poco\Windows1253Encoding.h"/>
     <ClInclude Include="include\Poco\Windows1254Encoding.h"/>
     <ClInclude Include="include\Poco\Windows1255Encoding.h"/>
@@ -610,6 +617,27 @@
     <ClCompile Include="src\ISO8859_9Encoding.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
+    <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseSimpEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseTradEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacCyrillicEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacJapaneseEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacKoreanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacRomanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
     <ClCompile Include="src\Windows1253Encoding.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>

Encodings/Encodings_vs140.vcxproj.filters

@@ -2,13 +2,13 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Encodings">
-      <UniqueIdentifier>{58b191ff-154a-4063-ad01-b07863dd1cc5}</UniqueIdentifier>
+      <UniqueIdentifier>{2ac0c7b3-1706-4a76-895c-f3d4d3867af6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Encodings\Header Files">
-      <UniqueIdentifier>{dcda7a77-ed5e-4a20-ade1-10854f25a93e}</UniqueIdentifier>
+      <UniqueIdentifier>{8e7ce3c1-f21d-42d1-9963-13ccbad20fb9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Encodings\Source Files">
-      <UniqueIdentifier>{014c6981-a0a7-4866-a4c5-aa31aeba6ed1}</UniqueIdentifier>
+      <UniqueIdentifier>{2d656b8f-d362-4626-9ffb-7c9ee3bf0d7c}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -54,6 +54,27 @@
     <ClInclude Include="include\Poco\ISO8859_9Encoding.h">
       <Filter>Encodings\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\MacCentralEurRomanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacChineseSimpEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacChineseTradEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacCyrillicEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacJapaneseEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacKoreanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacRomanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Windows1253Encoding.h">
       <Filter>Encodings\Header Files</Filter>
     </ClInclude>
@@ -131,6 +152,27 @@
     <ClCompile Include="src\ISO8859_9Encoding.cpp">
       <Filter>Encodings\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseSimpEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseTradEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacCyrillicEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacJapaneseEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacKoreanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacRomanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Windows1253Encoding.cpp">
       <Filter>Encodings\Source Files</Filter>
     </ClCompile>

Encodings/Encodings_vs150.vcxproj

@@ -555,6 +555,13 @@
     <ClInclude Include="include\Poco\ISO8859_7Encoding.h"/>
     <ClInclude Include="include\Poco\ISO8859_8Encoding.h"/>
     <ClInclude Include="include\Poco\ISO8859_9Encoding.h"/>
+    <ClInclude Include="include\Poco\MacCentralEurRomanEncoding.h"/>
+    <ClInclude Include="include\Poco\MacChineseSimpEncoding.h"/>
+    <ClInclude Include="include\Poco\MacChineseTradEncoding.h"/>
+    <ClInclude Include="include\Poco\MacCyrillicEncoding.h"/>
+    <ClInclude Include="include\Poco\MacJapaneseEncoding.h"/>
+    <ClInclude Include="include\Poco\MacKoreanEncoding.h"/>
+    <ClInclude Include="include\Poco\MacRomanEncoding.h"/>
     <ClInclude Include="include\Poco\Windows1253Encoding.h"/>
     <ClInclude Include="include\Poco\Windows1254Encoding.h"/>
     <ClInclude Include="include\Poco\Windows1255Encoding.h"/>
@@ -610,6 +617,27 @@
     <ClCompile Include="src\ISO8859_9Encoding.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
+    <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseSimpEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseTradEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacCyrillicEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacJapaneseEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacKoreanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacRomanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
     <ClCompile Include="src\Windows1253Encoding.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>

Encodings/Encodings_vs150.vcxproj.filters

@@ -2,13 +2,13 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Encodings">
-      <UniqueIdentifier>{c0d9c3b6-9378-44c7-a21a-929edee5dd7f}</UniqueIdentifier>
+      <UniqueIdentifier>{059be2e2-58fd-4d6e-a62f-54b17f0b1844}</UniqueIdentifier>
     </Filter>
     <Filter Include="Encodings\Header Files">
-      <UniqueIdentifier>{b9a983be-7c7f-4eec-9dcf-eb7b7b2f86fb}</UniqueIdentifier>
+      <UniqueIdentifier>{273f8676-5623-4cd9-af43-21034e4198ba}</UniqueIdentifier>
     </Filter>
     <Filter Include="Encodings\Source Files">
-      <UniqueIdentifier>{72afe60a-e118-457c-81bf-0ddb945bc776}</UniqueIdentifier>
+      <UniqueIdentifier>{2dafa9e2-18b7-42e1-acfb-befdc79fad72}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -54,6 +54,27 @@
     <ClInclude Include="include\Poco\ISO8859_9Encoding.h">
       <Filter>Encodings\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\MacCentralEurRomanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacChineseSimpEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacChineseTradEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacCyrillicEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacJapaneseEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacKoreanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacRomanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Windows1253Encoding.h">
       <Filter>Encodings\Header Files</Filter>
     </ClInclude>
@@ -131,6 +152,27 @@
     <ClCompile Include="src\ISO8859_9Encoding.cpp">
       <Filter>Encodings\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseSimpEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseTradEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacCyrillicEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacJapaneseEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacKoreanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacRomanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Windows1253Encoding.cpp">
       <Filter>Encodings\Source Files</Filter>
     </ClCompile>

Encodings/Encodings_vs160.vcxproj

@@ -555,6 +555,13 @@
     <ClInclude Include="include\Poco\ISO8859_7Encoding.h"/>
     <ClInclude Include="include\Poco\ISO8859_8Encoding.h"/>
     <ClInclude Include="include\Poco\ISO8859_9Encoding.h"/>
+    <ClInclude Include="include\Poco\MacCentralEurRomanEncoding.h"/>
+    <ClInclude Include="include\Poco\MacChineseSimpEncoding.h"/>
+    <ClInclude Include="include\Poco\MacChineseTradEncoding.h"/>
+    <ClInclude Include="include\Poco\MacCyrillicEncoding.h"/>
+    <ClInclude Include="include\Poco\MacJapaneseEncoding.h"/>
+    <ClInclude Include="include\Poco\MacKoreanEncoding.h"/>
+    <ClInclude Include="include\Poco\MacRomanEncoding.h"/>
     <ClInclude Include="include\Poco\Windows1253Encoding.h"/>
     <ClInclude Include="include\Poco\Windows1254Encoding.h"/>
     <ClInclude Include="include\Poco\Windows1255Encoding.h"/>
@@ -610,6 +617,27 @@
     <ClCompile Include="src\ISO8859_9Encoding.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
+    <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseSimpEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseTradEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacCyrillicEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacJapaneseEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacKoreanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ClCompile Include="src\MacRomanEncoding.cpp">
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
     <ClCompile Include="src\Windows1253Encoding.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>

Encodings/Encodings_vs160.vcxproj.filters

@@ -2,13 +2,13 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Encodings">
-      <UniqueIdentifier>{771c4676-654f-44d3-a24c-7d31745bcd04}</UniqueIdentifier>
+      <UniqueIdentifier>{55103894-3f7d-468d-8f72-02dfb1f682c4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Encodings\Header Files">
-      <UniqueIdentifier>{2eee337f-d34c-42e3-8cdd-a82de9eb348e}</UniqueIdentifier>
+      <UniqueIdentifier>{8309e362-b466-4aaf-8e25-bdb584f77382}</UniqueIdentifier>
     </Filter>
     <Filter Include="Encodings\Source Files">
-      <UniqueIdentifier>{b859645a-894c-49c5-97f2-1d2141dd2922}</UniqueIdentifier>
+      <UniqueIdentifier>{fbc64e7d-d8ff-43a9-86e1-9193e72d9317}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -54,6 +54,27 @@
     <ClInclude Include="include\Poco\ISO8859_9Encoding.h">
       <Filter>Encodings\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\MacCentralEurRomanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacChineseSimpEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacChineseTradEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacCyrillicEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacJapaneseEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacKoreanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\MacRomanEncoding.h">
+      <Filter>Encodings\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="include\Poco\Windows1253Encoding.h">
       <Filter>Encodings\Header Files</Filter>
     </ClInclude>
@@ -131,6 +152,27 @@
     <ClCompile Include="src\ISO8859_9Encoding.cpp">
       <Filter>Encodings\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseSimpEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacChineseTradEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacCyrillicEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacJapaneseEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacKoreanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MacRomanEncoding.cpp">
+      <Filter>Encodings\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\Windows1253Encoding.cpp">
       <Filter>Encodings\Source Files</Filter>
     </ClCompile>

Encodings/Encodings_vs90.vcproj

@@ -556,6 +556,34 @@
 					RelativePath=".\include\Poco\ISO8859_9Encoding.h"
 					>
 				</File>
+				<File
+					RelativePath=".\include\Poco\MacCentralEurRomanEncoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\MacChineseSimpEncoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\MacChineseTradEncoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\MacCyrillicEncoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\MacJapaneseEncoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\MacKoreanEncoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\MacRomanEncoding.h"
+					>
+				</File>
 				<File
 					RelativePath=".\include\Poco\Windows1253Encoding.h"
 					>
@@ -660,6 +688,34 @@
 					RelativePath=".\src\ISO8859_9Encoding.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\MacCentralEurRomanEncoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\MacChineseSimpEncoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\MacChineseTradEncoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\MacCyrillicEncoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\MacJapaneseEncoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\MacKoreanEncoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\MacRomanEncoding.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\Windows1253Encoding.cpp"
 					>
@@ -709,20 +765,6 @@
 		<File
 			RelativePath="..\DLLVersion.rc"
 			>
-			<FileConfiguration
-				Name="debug_shared|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="release_shared|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-				/>
-			</FileConfiguration>
 			<FileConfiguration
 				Name="debug_static_mt|Win32"
 				ExcludedFromBuild="true"

Encodings/Makefile

@@ -31,7 +31,14 @@ objects = \
 	Windows932Encoding \
 	Windows936Encoding \
 	Windows949Encoding \
-	Windows950Encoding
+	Windows950Encoding \
+	MacRomanEncoding \
+	MacCentralEurRomanEncoding \
+	MacCyrillicEncoding \
+	MacChineseTradEncoding \
+	MacChineseSimpEncoding \
+	MacJapaneseEncoding \
+	MacKoreanEncoding
 
 target         = PocoEncodings
 target_version = $(LIBVERSION)

Encodings/include/Poco/MacCentralEurRomanEncoding.h

@@ -0,0 +1,48 @@
+//
+// MacCentralEurRomanEncoding.h
+//
+// Library: Encodings
+// Package: Encodings
+// Module:  MacCentralEurRomanEncoding
+//
+// Definition of the Windows1252Encoding class.
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier: BSL-1.0
+//
+
+
+#ifndef Encodings_MacCentralEurRomanEncoding_INCLUDED
+#define Encodings_MacCentralEurRomanEncoding_INCLUDED
+
+
+#include "Poco/DoubleByteEncoding.h"
+
+
+namespace Poco {
+
+
+class Encodings_API MacCentralEurRomanEncoding: public DoubleByteEncoding
+	/// MacCentralEurRoman Encoding.
+	///
+	/// This text encoding class has been generated from
+	/// http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CENTEURO.TXT.
+{
+public:
+	MacCentralEurRomanEncoding();
+	~MacCentralEurRomanEncoding();
+	
+private:
+	static const char* _names[];
+	static const CharacterMap _charMap;
+	static const Mapping _mappingTable[];
+	static const Mapping _reverseMappingTable[];
+};
+
+
+} // namespace Poco
+
+
+#endif // Encodings_MacCentralEurRomanEncoding_INCLUDED

Encodings/include/Poco/MacChineseSimpEncoding.h

@@ -0,0 +1,48 @@
+//
+// MacChineseSimpEncoding.h
+//
+// Library: Encodings
+// Package: Encodings
+// Module:  MacChineseSimpEncoding
+//
+// Definition of the Windows1252Encoding class.
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier: BSL-1.0
+//
+
+
+#ifndef Encodings_MacChineseSimpEncoding_INCLUDED
+#define Encodings_MacChineseSimpEncoding_INCLUDED
+
+
+#include "Poco/DoubleByteEncoding.h"
+
+
+namespace Poco {
+
+
+class Encodings_API MacChineseSimpEncoding: public DoubleByteEncoding
+	/// MacChineseSimp Encoding.
+	///
+	/// This text encoding class has been generated from
+	/// http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CHINSIMP.TXT.
+{
+public:
+	MacChineseSimpEncoding();
+	~MacChineseSimpEncoding();
+	
+private:
+	static const char* _names[];
+	static const CharacterMap _charMap;
+	static const Mapping _mappingTable[];
+	static const Mapping _reverseMappingTable[];
+};
+
+
+} // namespace Poco
+
+
+#endif // Encodings_MacChineseSimpEncoding_INCLUDED

Encodings/include/Poco/MacChineseTradEncoding.h

@@ -0,0 +1,48 @@
+//
+// MacChineseTradEncoding.h
+//
+// Library: Encodings
+// Package: Encodings
+// Module:  MacChineseTradEncoding
+//
+// Definition of the Windows1252Encoding class.
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier: BSL-1.0
+//
+
+
+#ifndef Encodings_MacChineseTradEncoding_INCLUDED
+#define Encodings_MacChineseTradEncoding_INCLUDED
+
+
+#include "Poco/DoubleByteEncoding.h"
+
+
+namespace Poco {
+
+
+class Encodings_API MacChineseTradEncoding: public DoubleByteEncoding
+	/// MacChineseTrad Encoding.
+	///
+	/// This text encoding class has been generated from
+	/// http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CHINTRAD.TXT.
+{
+public:
+	MacChineseTradEncoding();
+	~MacChineseTradEncoding();
+	
+private:
+	static const char* _names[];
+	static const CharacterMap _charMap;
+	static const Mapping _mappingTable[];
+	static const Mapping _reverseMappingTable[];
+};
+
+
+} // namespace Poco
+
+
+#endif // Encodings_MacChineseTradEncoding_INCLUDED

Encodings/include/Poco/MacCyrillicEncoding.h

@@ -0,0 +1,48 @@
+//
+// MacCyrillicEncoding.h
+//
+// Library: Encodings
+// Package: Encodings
+// Module:  MacCyrillicEncoding
+//
+// Definition of the Windows1252Encoding class.
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier: BSL-1.0
+//
+
+
+#ifndef Encodings_MacCyrillicEncoding_INCLUDED
+#define Encodings_MacCyrillicEncoding_INCLUDED
+
+
+#include "Poco/DoubleByteEncoding.h"
+
+
+namespace Poco {
+
+
+class Encodings_API MacCyrillicEncoding: public DoubleByteEncoding
+	/// MacCyrillic Encoding.
+	///
+	/// This text encoding class has been generated from
+	/// http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CYRILLIC.TXT.
+{
+public:
+	MacCyrillicEncoding();
+	~MacCyrillicEncoding();
+	
+private:
+	static const char* _names[];
+	static const CharacterMap _charMap;
+	static const Mapping _mappingTable[];
+	static const Mapping _reverseMappingTable[];
+};
+
+
+} // namespace Poco
+
+
+#endif // Encodings_MacCyrillicEncoding_INCLUDED

Encodings/include/Poco/MacJapaneseEncoding.h

@@ -0,0 +1,48 @@
+//
+// MacJapaneseEncoding.h
+//
+// Library: Encodings
+// Package: Encodings
+// Module:  MacJapaneseEncoding
+//
+// Definition of the Windows1252Encoding class.
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier: BSL-1.0
+//
+
+
+#ifndef Encodings_MacJapaneseEncoding_INCLUDED
+#define Encodings_MacJapaneseEncoding_INCLUDED
+
+
+#include "Poco/DoubleByteEncoding.h"
+
+
+namespace Poco {
+
+
+class Encodings_API MacJapaneseEncoding: public DoubleByteEncoding
+	/// MacJapanese Encoding.
+	///
+	/// This text encoding class has been generated from
+	/// http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/JAPANESE.TXT.
+{
+public:
+	MacJapaneseEncoding();
+	~MacJapaneseEncoding();
+	
+private:
+	static const char* _names[];
+	static const CharacterMap _charMap;
+	static const Mapping _mappingTable[];
+	static const Mapping _reverseMappingTable[];
+};
+
+
+} // namespace Poco
+
+
+#endif // Encodings_MacJapaneseEncoding_INCLUDED

Encodings/include/Poco/MacKoreanEncoding.h

@@ -0,0 +1,48 @@
+//
+// MacKoreanEncoding.h
+//
+// Library: Encodings
+// Package: Encodings
+// Module:  MacKoreanEncoding
+//
+// Definition of the Windows1252Encoding class.
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier: BSL-1.0
+//
+
+
+#ifndef Encodings_MacKoreanEncoding_INCLUDED
+#define Encodings_MacKoreanEncoding_INCLUDED
+
+
+#include "Poco/DoubleByteEncoding.h"
+
+
+namespace Poco {
+
+
+class Encodings_API MacKoreanEncoding: public DoubleByteEncoding
+	/// MacKorean Encoding.
+	///
+	/// This text encoding class has been generated from
+	/// http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/KOREAN.TXT.
+{
+public:
+	MacKoreanEncoding();
+	~MacKoreanEncoding();
+	
+private:
+	static const char* _names[];
+	static const CharacterMap _charMap;
+	static const Mapping _mappingTable[];
+	static const Mapping _reverseMappingTable[];
+};
+
+
+} // namespace Poco
+
+
+#endif // Encodings_MacKoreanEncoding_INCLUDED

Encodings/include/Poco/MacRomanEncoding.h

@@ -0,0 +1,48 @@
+//
+// MacRomanEncoding.h
+//
+// Library: Encodings
+// Package: Encodings
+// Module:  MacRomanEncoding
+//
+// Definition of the Windows1252Encoding class.
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier: BSL-1.0
+//
+
+
+#ifndef Encodings_MacRomanEncoding_INCLUDED
+#define Encodings_MacRomanEncoding_INCLUDED
+
+
+#include "Poco/DoubleByteEncoding.h"
+
+
+namespace Poco {
+
+
+class Encodings_API MacRomanEncoding: public DoubleByteEncoding
+	/// MacRoman Encoding.
+	///
+	/// This text encoding class has been generated from
+	/// http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ROMAN.TXT.
+{
+public:
+	MacRomanEncoding();
+	~MacRomanEncoding();
+	
+private:
+	static const char* _names[];
+	static const CharacterMap _charMap;
+	static const Mapping _mappingTable[];
+	static const Mapping _reverseMappingTable[];
+};
+
+
+} // namespace Poco
+
+
+#endif // Encodings_MacRomanEncoding_INCLUDED

Encodings/src/Encodings.cpp

@@ -37,6 +37,13 @@
 #include "Poco/Windows936Encoding.h"
 #include "Poco/Windows949Encoding.h"
 #include "Poco/Windows950Encoding.h"
+#include "Poco/MacRomanEncoding.h"
+#include "Poco/MacCentralEurRomanEncoding.h"
+#include "Poco/MacCyrillicEncoding.h"
+#include "Poco/MacChineseTradEncoding.h"
+#include "Poco/MacChineseSimpEncoding.h"
+#include "Poco/MacJapaneseEncoding.h"
+#include "Poco/MacKoreanEncoding.h"
 
 
 namespace Poco {
@@ -67,6 +74,13 @@ void registerExtraEncodings()
 	TextEncoding::add(new Windows936Encoding);
 	TextEncoding::add(new Windows949Encoding);
 	TextEncoding::add(new Windows950Encoding);
+	TextEncoding::add(new MacRomanEncoding);
+	TextEncoding::add(new MacCentralEurRomanEncoding);
+	TextEncoding::add(new MacCyrillicEncoding);
+	TextEncoding::add(new MacChineseTradEncoding);
+	TextEncoding::add(new MacChineseSimpEncoding);
+	TextEncoding::add(new MacJapaneseEncoding);
+	TextEncoding::add(new MacKoreanEncoding);
 }
 
 

Encodings/src/MacCentralEurRomanEncoding.cpp

@@ -0,0 +1,97 @@
+//
+// MacCentralEurRomanEncoding.cpp
+//
+// Library: Encodings
+// Package: Encodings
+// Module:  MacCentralEurRomanEncoding
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier: BSL-1.0
+//
+
+
+#include "Poco/MacCentralEurRomanEncoding.h"
+
+
+namespace Poco {
+
+
+const char* MacCentralEurRomanEncoding::_names[] =
+{
+	"MacCentralEurRoman",
+	NULL
+};
+
+
+const TextEncoding::CharacterMap MacCentralEurRomanEncoding::_charMap = 
+{
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1, 
+	0x00C4, 0x0100, 0x0101, 0x00C9, 0x0104, 0x00D6, 0x00DC, 0x00E1, 0x0105, 0x010C, 0x00E4, 0x010D, 0x0106, 0x0107, 0x00E9, 0x0179, 
+	0x017A, 0x010E, 0x00ED, 0x010F, 0x0112, 0x0113, 0x0116, 0x00F3, 0x0117, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x011A, 0x011B, 0x00FC, 
+	0x2020, 0x00B0, 0x0118, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, 0x00AE, 0x00A9, 0x2122, 0x0119, 0x00A8, 0x2260, 0x0123, 0x012E, 
+	0x012F, 0x012A, 0x2264, 0x2265, 0x012B, 0x0136, 0x2202, 0x2211, 0x0142, 0x013B, 0x013C, 0x013D, 0x013E, 0x0139, 0x013A, 0x0145, 
+	0x0146, 0x0143, 0x00AC, 0x221A, 0x0144, 0x0147, 0x2206, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x0148, 0x0150, 0x00D5, 0x0151, 0x014C, 
+	0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, 0x014D, 0x0154, 0x0155, 0x0158, 0x2039, 0x203A, 0x0159, 0x0156, 
+	0x0157, 0x0160, 0x201A, 0x201E, 0x0161, 0x015A, 0x015B, 0x00C1, 0x0164, 0x0165, 0x00CD, 0x017D, 0x017E, 0x016A, 0x00D3, 0x00D4, 
+	0x016B, 0x016E, 0x00DA, 0x016F, 0x0170, 0x0171, 0x0172, 0x0173, 0x00DD, 0x00FD, 0x0137, 0x017B, 0x0141, 0x017C, 0x0122, 0x02C7, 
+};
+
+
+const DoubleByteEncoding::Mapping MacCentralEurRomanEncoding::_mappingTable[] = {
+	{ 0x0000, 0x0000 } // dummy entry
+};
+
+
+const DoubleByteEncoding::Mapping MacCentralEurRomanEncoding::_reverseMappingTable[] = {
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x00A0, 0x00CA }, 
+	{ 0x00A3, 0x00A3 }, { 0x00A7, 0x00A4 }, { 0x00A8, 0x00AC }, { 0x00A9, 0x00A9 }, { 0x00AB, 0x00C7 }, { 0x00AC, 0x00C2 }, { 0x00AE, 0x00A8 }, { 0x00B0, 0x00A1 }, 
+	{ 0x00B6, 0x00A6 }, { 0x00BB, 0x00C8 }, { 0x00C1, 0x00E7 }, { 0x00C4, 0x0080 }, { 0x00C9, 0x0083 }, { 0x00CD, 0x00EA }, { 0x00D3, 0x00EE }, { 0x00D4, 0x00EF }, 
+	{ 0x00D5, 0x00CD }, { 0x00D6, 0x0085 }, { 0x00DA, 0x00F2 }, { 0x00DC, 0x0086 }, { 0x00DD, 0x00F8 }, { 0x00DF, 0x00A7 }, { 0x00E1, 0x0087 }, { 0x00E4, 0x008A }, 
+	{ 0x00E9, 0x008E }, { 0x00ED, 0x0092 }, { 0x00F3, 0x0097 }, { 0x00F4, 0x0099 }, { 0x00F5, 0x009B }, { 0x00F6, 0x009A }, { 0x00F7, 0x00D6 }, { 0x00FA, 0x009C }, 
+	{ 0x00FC, 0x009F }, { 0x00FD, 0x00F9 }, { 0x0100, 0x0081 }, { 0x0101, 0x0082 }, { 0x0104, 0x0084 }, { 0x0105, 0x0088 }, { 0x0106, 0x008C }, { 0x0107, 0x008D }, 
+	{ 0x010C, 0x0089 }, { 0x010D, 0x008B }, { 0x010E, 0x0091 }, { 0x010F, 0x0093 }, { 0x0112, 0x0094 }, { 0x0113, 0x0095 }, { 0x0116, 0x0096 }, { 0x0117, 0x0098 }, 
+	{ 0x0118, 0x00A2 }, { 0x0119, 0x00AB }, { 0x011A, 0x009D }, { 0x011B, 0x009E }, { 0x0122, 0x00FE }, { 0x0123, 0x00AE }, { 0x012A, 0x00B1 }, { 0x012B, 0x00B4 }, 
+	{ 0x012E, 0x00AF }, { 0x012F, 0x00B0 }, { 0x0136, 0x00B5 }, { 0x0137, 0x00FA }, { 0x0139, 0x00BD }, { 0x013A, 0x00BE }, { 0x013B, 0x00B9 }, { 0x013C, 0x00BA }, 
+	{ 0x013D, 0x00BB }, { 0x013E, 0x00BC }, { 0x0141, 0x00FC }, { 0x0142, 0x00B8 }, { 0x0143, 0x00C1 }, { 0x0144, 0x00C4 }, { 0x0145, 0x00BF }, { 0x0146, 0x00C0 }, 
+	{ 0x0147, 0x00C5 }, { 0x0148, 0x00CB }, { 0x014C, 0x00CF }, { 0x014D, 0x00D8 }, { 0x0150, 0x00CC }, { 0x0151, 0x00CE }, { 0x0154, 0x00D9 }, { 0x0155, 0x00DA }, 
+	{ 0x0156, 0x00DF }, { 0x0157, 0x00E0 }, { 0x0158, 0x00DB }, { 0x0159, 0x00DE }, { 0x015A, 0x00E5 }, { 0x015B, 0x00E6 }, { 0x0160, 0x00E1 }, { 0x0161, 0x00E4 }, 
+	{ 0x0164, 0x00E8 }, { 0x0165, 0x00E9 }, { 0x016A, 0x00ED }, { 0x016B, 0x00F0 }, { 0x016E, 0x00F1 }, { 0x016F, 0x00F3 }, { 0x0170, 0x00F4 }, { 0x0171, 0x00F5 }, 
+	{ 0x0172, 0x00F6 }, { 0x0173, 0x00F7 }, { 0x0179, 0x008F }, { 0x017A, 0x0090 }, { 0x017B, 0x00FB }, { 0x017C, 0x00FD }, { 0x017D, 0x00EB }, { 0x017E, 0x00EC }, 
+	{ 0x02C7, 0x00FF }, { 0x2013, 0x00D0 }, { 0x2014, 0x00D1 }, { 0x2018, 0x00D4 }, { 0x2019, 0x00D5 }, { 0x201A, 0x00E2 }, { 0x201C, 0x00D2 }, { 0x201D, 0x00D3 }, 
+	{ 0x201E, 0x00E3 }, { 0x2020, 0x00A0 }, { 0x2022, 0x00A5 }, { 0x2026, 0x00C9 }, { 0x2039, 0x00DC }, { 0x203A, 0x00DD }, { 0x2122, 0x00AA }, { 0x2202, 0x00B6 }, 
+	{ 0x2206, 0x00C6 }, { 0x2211, 0x00B7 }, { 0x221A, 0x00C3 }, { 0x2260, 0x00AD }, { 0x2264, 0x00B2 }, { 0x2265, 0x00B3 }, { 0x25CA, 0x00D7 }, 
+};
+
+
+MacCentralEurRomanEncoding::MacCentralEurRomanEncoding():
+	DoubleByteEncoding(_names, _charMap, _mappingTable, sizeof(_mappingTable)/sizeof(Mapping), _reverseMappingTable, sizeof(_reverseMappingTable)/sizeof(Mapping))
+{
+}
+
+
+MacCentralEurRomanEncoding::~MacCentralEurRomanEncoding()
+{
+}
+
+
+} // namespace Poco

Encodings/src/MacCyrillicEncoding.cpp

@@ -0,0 +1,97 @@
+//
+// MacCyrillicEncoding.cpp
+//
+// Library: Encodings
+// Package: Encodings
+// Module:  MacCyrillicEncoding
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier: BSL-1.0
+//
+
+
+#include "Poco/MacCyrillicEncoding.h"
+
+
+namespace Poco {
+
+
+const char* MacCyrillicEncoding::_names[] =
+{
+	"MacCyrillic",
+	NULL
+};
+
+
+const TextEncoding::CharacterMap MacCyrillicEncoding::_charMap = 
+{
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1, 
+	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 
+	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 
+	0x2020, 0x00B0, 0x0490, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x0406, 0x00AE, 0x00A9, 0x2122, 0x0402, 0x0452, 0x2260, 0x0403, 0x0453, 
+	0x221E, 0x00B1, 0x2264, 0x2265, 0x0456, 0x00B5, 0x0491, 0x0408, 0x0404, 0x0454, 0x0407, 0x0457, 0x0409, 0x0459, 0x040A, 0x045A, 
+	0x0458, 0x0405, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x040B, 0x045B, 0x040C, 0x045C, 0x0455, 
+	0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x201E, 0x040E, 0x045E, 0x040F, 0x045F, 0x2116, 0x0401, 0x0451, 0x044F, 
+	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 
+	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x20AC, 
+};
+
+
+const DoubleByteEncoding::Mapping MacCyrillicEncoding::_mappingTable[] = {
+	{ 0x0000, 0x0000 } // dummy entry
+};
+
+
+const DoubleByteEncoding::Mapping MacCyrillicEncoding::_reverseMappingTable[] = {
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x00A0, 0x00CA }, 
+	{ 0x00A3, 0x00A3 }, { 0x00A7, 0x00A4 }, { 0x00A9, 0x00A9 }, { 0x00AB, 0x00C7 }, { 0x00AC, 0x00C2 }, { 0x00AE, 0x00A8 }, { 0x00B0, 0x00A1 }, { 0x00B1, 0x00B1 }, 
+	{ 0x00B5, 0x00B5 }, { 0x00B6, 0x00A6 }, { 0x00BB, 0x00C8 }, { 0x00F7, 0x00D6 }, { 0x0192, 0x00C4 }, { 0x0401, 0x00DD }, { 0x0402, 0x00AB }, { 0x0403, 0x00AE }, 
+	{ 0x0404, 0x00B8 }, { 0x0405, 0x00C1 }, { 0x0406, 0x00A7 }, { 0x0407, 0x00BA }, { 0x0408, 0x00B7 }, { 0x0409, 0x00BC }, { 0x040A, 0x00BE }, { 0x040B, 0x00CB }, 
+	{ 0x040C, 0x00CD }, { 0x040E, 0x00D8 }, { 0x040F, 0x00DA }, { 0x0410, 0x0080 }, { 0x0411, 0x0081 }, { 0x0412, 0x0082 }, { 0x0413, 0x0083 }, { 0x0414, 0x0084 }, 
+	{ 0x0415, 0x0085 }, { 0x0416, 0x0086 }, { 0x0417, 0x0087 }, { 0x0418, 0x0088 }, { 0x0419, 0x0089 }, { 0x041A, 0x008A }, { 0x041B, 0x008B }, { 0x041C, 0x008C }, 
+	{ 0x041D, 0x008D }, { 0x041E, 0x008E }, { 0x041F, 0x008F }, { 0x0420, 0x0090 }, { 0x0421, 0x0091 }, { 0x0422, 0x0092 }, { 0x0423, 0x0093 }, { 0x0424, 0x0094 }, 
+	{ 0x0425, 0x0095 }, { 0x0426, 0x0096 }, { 0x0427, 0x0097 }, { 0x0428, 0x0098 }, { 0x0429, 0x0099 }, { 0x042A, 0x009A }, { 0x042B, 0x009B }, { 0x042C, 0x009C }, 
+	{ 0x042D, 0x009D }, { 0x042E, 0x009E }, { 0x042F, 0x009F }, { 0x0430, 0x00E0 }, { 0x0431, 0x00E1 }, { 0x0432, 0x00E2 }, { 0x0433, 0x00E3 }, { 0x0434, 0x00E4 }, 
+	{ 0x0435, 0x00E5 }, { 0x0436, 0x00E6 }, { 0x0437, 0x00E7 }, { 0x0438, 0x00E8 }, { 0x0439, 0x00E9 }, { 0x043A, 0x00EA }, { 0x043B, 0x00EB }, { 0x043C, 0x00EC }, 
+	{ 0x043D, 0x00ED }, { 0x043E, 0x00EE }, { 0x043F, 0x00EF }, { 0x0440, 0x00F0 }, { 0x0441, 0x00F1 }, { 0x0442, 0x00F2 }, { 0x0443, 0x00F3 }, { 0x0444, 0x00F4 }, 
+	{ 0x0445, 0x00F5 }, { 0x0446, 0x00F6 }, { 0x0447, 0x00F7 }, { 0x0448, 0x00F8 }, { 0x0449, 0x00F9 }, { 0x044A, 0x00FA }, { 0x044B, 0x00FB }, { 0x044C, 0x00FC }, 
+	{ 0x044D, 0x00FD }, { 0x044E, 0x00FE }, { 0x044F, 0x00DF }, { 0x0451, 0x00DE }, { 0x0452, 0x00AC }, { 0x0453, 0x00AF }, { 0x0454, 0x00B9 }, { 0x0455, 0x00CF }, 
+	{ 0x0456, 0x00B4 }, { 0x0457, 0x00BB }, { 0x0458, 0x00C0 }, { 0x0459, 0x00BD }, { 0x045A, 0x00BF }, { 0x045B, 0x00CC }, { 0x045C, 0x00CE }, { 0x045E, 0x00D9 }, 
+	{ 0x045F, 0x00DB }, { 0x0490, 0x00A2 }, { 0x0491, 0x00B6 }, { 0x2013, 0x00D0 }, { 0x2014, 0x00D1 }, { 0x2018, 0x00D4 }, { 0x2019, 0x00D5 }, { 0x201C, 0x00D2 }, 
+	{ 0x201D, 0x00D3 }, { 0x201E, 0x00D7 }, { 0x2020, 0x00A0 }, { 0x2022, 0x00A5 }, { 0x2026, 0x00C9 }, { 0x20AC, 0x00FF }, { 0x2116, 0x00DC }, { 0x2122, 0x00AA }, 
+	{ 0x2206, 0x00C6 }, { 0x221A, 0x00C3 }, { 0x221E, 0x00B0 }, { 0x2248, 0x00C5 }, { 0x2260, 0x00AD }, { 0x2264, 0x00B2 }, { 0x2265, 0x00B3 }, 
+};
+
+
+MacCyrillicEncoding::MacCyrillicEncoding():
+	DoubleByteEncoding(_names, _charMap, _mappingTable, sizeof(_mappingTable)/sizeof(Mapping), _reverseMappingTable, sizeof(_reverseMappingTable)/sizeof(Mapping))
+{
+}
+
+
+MacCyrillicEncoding::~MacCyrillicEncoding()
+{
+}
+
+
+} // namespace Poco

Encodings/src/MacRomanEncoding.cpp

@@ -0,0 +1,97 @@
+//
+// MacRomanEncoding.cpp
+//
+// Library: Encodings
+// Package: Encodings
+// Module:  MacRomanEncoding
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier: BSL-1.0
+//
+
+
+#include "Poco/MacRomanEncoding.h"
+
+
+namespace Poco {
+
+
+const char* MacRomanEncoding::_names[] =
+{
+	"MacRoman",
+	NULL
+};
+
+
+const TextEncoding::CharacterMap MacRomanEncoding::_charMap = 
+{
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
+	    -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, 
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,     -1, 
+	0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, 
+	0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, 
+	0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8, 
+	0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8, 
+	0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, 
+	0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, 0x00FF, 0x0178, 0x2044, 0x20AC, 0x2039, 0x203A, 0xFB01, 0xFB02, 
+	0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, 
+	0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7, 
+};
+
+
+const DoubleByteEncoding::Mapping MacRomanEncoding::_mappingTable[] = {
+	{ 0x0000, 0x0000 } // dummy entry
+};
+
+
+const DoubleByteEncoding::Mapping MacRomanEncoding::_reverseMappingTable[] = {
+	{ 0x0020, 0x0020 }, { 0x0021, 0x0021 }, { 0x0022, 0x0022 }, { 0x0023, 0x0023 }, { 0x0024, 0x0024 }, { 0x0025, 0x0025 }, { 0x0026, 0x0026 }, { 0x0027, 0x0027 }, 
+	{ 0x0028, 0x0028 }, { 0x0029, 0x0029 }, { 0x002A, 0x002A }, { 0x002B, 0x002B }, { 0x002C, 0x002C }, { 0x002D, 0x002D }, { 0x002E, 0x002E }, { 0x002F, 0x002F }, 
+	{ 0x0030, 0x0030 }, { 0x0031, 0x0031 }, { 0x0032, 0x0032 }, { 0x0033, 0x0033 }, { 0x0034, 0x0034 }, { 0x0035, 0x0035 }, { 0x0036, 0x0036 }, { 0x0037, 0x0037 }, 
+	{ 0x0038, 0x0038 }, { 0x0039, 0x0039 }, { 0x003A, 0x003A }, { 0x003B, 0x003B }, { 0x003C, 0x003C }, { 0x003D, 0x003D }, { 0x003E, 0x003E }, { 0x003F, 0x003F }, 
+	{ 0x0040, 0x0040 }, { 0x0041, 0x0041 }, { 0x0042, 0x0042 }, { 0x0043, 0x0043 }, { 0x0044, 0x0044 }, { 0x0045, 0x0045 }, { 0x0046, 0x0046 }, { 0x0047, 0x0047 }, 
+	{ 0x0048, 0x0048 }, { 0x0049, 0x0049 }, { 0x004A, 0x004A }, { 0x004B, 0x004B }, { 0x004C, 0x004C }, { 0x004D, 0x004D }, { 0x004E, 0x004E }, { 0x004F, 0x004F }, 
+	{ 0x0050, 0x0050 }, { 0x0051, 0x0051 }, { 0x0052, 0x0052 }, { 0x0053, 0x0053 }, { 0x0054, 0x0054 }, { 0x0055, 0x0055 }, { 0x0056, 0x0056 }, { 0x0057, 0x0057 }, 
+	{ 0x0058, 0x0058 }, { 0x0059, 0x0059 }, { 0x005A, 0x005A }, { 0x005B, 0x005B }, { 0x005C, 0x005C }, { 0x005D, 0x005D }, { 0x005E, 0x005E }, { 0x005F, 0x005F }, 
+	{ 0x0060, 0x0060 }, { 0x0061, 0x0061 }, { 0x0062, 0x0062 }, { 0x0063, 0x0063 }, { 0x0064, 0x0064 }, { 0x0065, 0x0065 }, { 0x0066, 0x0066 }, { 0x0067, 0x0067 }, 
+	{ 0x0068, 0x0068 }, { 0x0069, 0x0069 }, { 0x006A, 0x006A }, { 0x006B, 0x006B }, { 0x006C, 0x006C }, { 0x006D, 0x006D }, { 0x006E, 0x006E }, { 0x006F, 0x006F }, 
+	{ 0x0070, 0x0070 }, { 0x0071, 0x0071 }, { 0x0072, 0x0072 }, { 0x0073, 0x0073 }, { 0x0074, 0x0074 }, { 0x0075, 0x0075 }, { 0x0076, 0x0076 }, { 0x0077, 0x0077 }, 
+	{ 0x0078, 0x0078 }, { 0x0079, 0x0079 }, { 0x007A, 0x007A }, { 0x007B, 0x007B }, { 0x007C, 0x007C }, { 0x007D, 0x007D }, { 0x007E, 0x007E }, { 0x00A0, 0x00CA }, 
+	{ 0x00A1, 0x00C1 }, { 0x00A2, 0x00A2 }, { 0x00A3, 0x00A3 }, { 0x00A5, 0x00B4 }, { 0x00A7, 0x00A4 }, { 0x00A8, 0x00AC }, { 0x00A9, 0x00A9 }, { 0x00AA, 0x00BB }, 
+	{ 0x00AB, 0x00C7 }, { 0x00AC, 0x00C2 }, { 0x00AE, 0x00A8 }, { 0x00AF, 0x00F8 }, { 0x00B0, 0x00A1 }, { 0x00B1, 0x00B1 }, { 0x00B4, 0x00AB }, { 0x00B5, 0x00B5 }, 
+	{ 0x00B6, 0x00A6 }, { 0x00B7, 0x00E1 }, { 0x00B8, 0x00FC }, { 0x00BA, 0x00BC }, { 0x00BB, 0x00C8 }, { 0x00BF, 0x00C0 }, { 0x00C0, 0x00CB }, { 0x00C1, 0x00E7 }, 
+	{ 0x00C2, 0x00E5 }, { 0x00C3, 0x00CC }, { 0x00C4, 0x0080 }, { 0x00C5, 0x0081 }, { 0x00C6, 0x00AE }, { 0x00C7, 0x0082 }, { 0x00C8, 0x00E9 }, { 0x00C9, 0x0083 }, 
+	{ 0x00CA, 0x00E6 }, { 0x00CB, 0x00E8 }, { 0x00CC, 0x00ED }, { 0x00CD, 0x00EA }, { 0x00CE, 0x00EB }, { 0x00CF, 0x00EC }, { 0x00D1, 0x0084 }, { 0x00D2, 0x00F1 }, 
+	{ 0x00D3, 0x00EE }, { 0x00D4, 0x00EF }, { 0x00D5, 0x00CD }, { 0x00D6, 0x0085 }, { 0x00D8, 0x00AF }, { 0x00D9, 0x00F4 }, { 0x00DA, 0x00F2 }, { 0x00DB, 0x00F3 }, 
+	{ 0x00DC, 0x0086 }, { 0x00DF, 0x00A7 }, { 0x00E0, 0x0088 }, { 0x00E1, 0x0087 }, { 0x00E2, 0x0089 }, { 0x00E3, 0x008B }, { 0x00E4, 0x008A }, { 0x00E5, 0x008C }, 
+	{ 0x00E6, 0x00BE }, { 0x00E7, 0x008D }, { 0x00E8, 0x008F }, { 0x00E9, 0x008E }, { 0x00EA, 0x0090 }, { 0x00EB, 0x0091 }, { 0x00EC, 0x0093 }, { 0x00ED, 0x0092 }, 
+	{ 0x00EE, 0x0094 }, { 0x00EF, 0x0095 }, { 0x00F1, 0x0096 }, { 0x00F2, 0x0098 }, { 0x00F3, 0x0097 }, { 0x00F4, 0x0099 }, { 0x00F5, 0x009B }, { 0x00F6, 0x009A }, 
+	{ 0x00F7, 0x00D6 }, { 0x00F8, 0x00BF }, { 0x00F9, 0x009D }, { 0x00FA, 0x009C }, { 0x00FB, 0x009E }, { 0x00FC, 0x009F }, { 0x00FF, 0x00D8 }, { 0x0131, 0x00F5 }, 
+	{ 0x0152, 0x00CE }, { 0x0153, 0x00CF }, { 0x0178, 0x00D9 }, { 0x0192, 0x00C4 }, { 0x02C6, 0x00F6 }, { 0x02C7, 0x00FF }, { 0x02D8, 0x00F9 }, { 0x02D9, 0x00FA }, 
+	{ 0x02DA, 0x00FB }, { 0x02DB, 0x00FE }, { 0x02DC, 0x00F7 }, { 0x02DD, 0x00FD }, { 0x03A9, 0x00BD }, { 0x03C0, 0x00B9 }, { 0x2013, 0x00D0 }, { 0x2014, 0x00D1 }, 
+	{ 0x2018, 0x00D4 }, { 0x2019, 0x00D5 }, { 0x201A, 0x00E2 }, { 0x201C, 0x00D2 }, { 0x201D, 0x00D3 }, { 0x201E, 0x00E3 }, { 0x2020, 0x00A0 }, { 0x2021, 0x00E0 }, 
+	{ 0x2022, 0x00A5 }, { 0x2026, 0x00C9 }, { 0x2030, 0x00E4 }, { 0x2039, 0x00DC }, { 0x203A, 0x00DD }, { 0x2044, 0x00DA }, { 0x20AC, 0x00DB }, { 0x2122, 0x00AA }, 
+	{ 0x2202, 0x00B6 }, { 0x2206, 0x00C6 }, { 0x220F, 0x00B8 }, { 0x2211, 0x00B7 }, { 0x221A, 0x00C3 }, { 0x221E, 0x00B0 }, { 0x222B, 0x00BA }, { 0x2248, 0x00C5 }, 
+	{ 0x2260, 0x00AD }, { 0x2264, 0x00B2 }, { 0x2265, 0x00B3 }, { 0x25CA, 0x00D7 }, { 0xF8FF, 0x00F0 }, { 0xFB01, 0x00DE }, { 0xFB02, 0x00DF }, 
+};
+
+
+MacRomanEncoding::MacRomanEncoding():
+	DoubleByteEncoding(_names, _charMap, _mappingTable, sizeof(_mappingTable)/sizeof(Mapping), _reverseMappingTable, sizeof(_reverseMappingTable)/sizeof(Mapping))
+{
+}
+
+
+MacRomanEncoding::~MacRomanEncoding()
+{
+}
+
+
+} // namespace Poco

Foundation/Foundation_vs140.vcxproj

@@ -603,6 +603,8 @@
     <ClCompile Include="src\ConsoleChannel.cpp" />
     <ClCompile Include="src\CountingStream.cpp" />
     <ClCompile Include="src\crc32.c" />
+    <ClCompile Include="src\DataURIStream.cpp" />
+    <ClCompile Include="src\DataURIStreamFactory.cpp" />
     <ClCompile Include="src\DateTime.cpp" />
     <ClCompile Include="src\DateTimeFormat.cpp" />
     <ClCompile Include="src\DateTimeFormatter.cpp" />
@@ -1595,6 +1597,8 @@
     <ClInclude Include="include\Poco\Configurable.h" />
     <ClInclude Include="include\Poco\ConsoleChannel.h" />
     <ClInclude Include="include\Poco\CountingStream.h" />
+    <ClInclude Include="include\Poco\DataURIStream.h" />
+    <ClInclude Include="include\Poco\DataURIStreamFactory.h" />
     <ClInclude Include="include\Poco\DateTime.h" />
     <ClInclude Include="include\Poco\DateTimeFormat.h" />
     <ClInclude Include="include\Poco\DateTimeFormatter.h" />

Foundation/Foundation_vs140.vcxproj.filters

@@ -909,6 +909,12 @@
     <ClCompile Include="src\SHA2Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DataURIStream.cpp">
+      <Filter>URI\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\DataURIStreamFactory.cpp">
+      <Filter>URI\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -1865,6 +1871,12 @@
     <ClInclude Include="include\Poco\SHA2Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\DataURIStream.h">
+      <Filter>URI\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\DataURIStreamFactory.h">
+      <Filter>URI\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">

Foundation/Foundation_vs150.vcxproj

@@ -603,6 +603,8 @@
     <ClCompile Include="src\ConsoleChannel.cpp" />
     <ClCompile Include="src\CountingStream.cpp" />
     <ClCompile Include="src\crc32.c" />
+    <ClCompile Include="src\DataURIStream.cpp" />
+    <ClCompile Include="src\DataURIStreamFactory.cpp" />
     <ClCompile Include="src\DateTime.cpp" />
     <ClCompile Include="src\DateTimeFormat.cpp" />
     <ClCompile Include="src\DateTimeFormatter.cpp" />
@@ -1595,6 +1597,8 @@
     <ClInclude Include="include\Poco\Configurable.h" />
     <ClInclude Include="include\Poco\ConsoleChannel.h" />
     <ClInclude Include="include\Poco\CountingStream.h" />
+    <ClInclude Include="include\Poco\DataURIStream.h" />
+    <ClInclude Include="include\Poco\DataURIStreamFactory.h" />
     <ClInclude Include="include\Poco\DateTime.h" />
     <ClInclude Include="include\Poco\DateTimeFormat.h" />
     <ClInclude Include="include\Poco\DateTimeFormatter.h" />

Foundation/Foundation_vs150.vcxproj.filters

@@ -909,6 +909,12 @@
     <ClCompile Include="src\SHA2Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DataURIStream.cpp">
+      <Filter>URI\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\DataURIStreamFactory.cpp">
+      <Filter>URI\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -1865,6 +1871,12 @@
     <ClInclude Include="include\Poco\SHA2Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\DataURIStream.h">
+      <Filter>URI\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\DataURIStreamFactory.h">
+      <Filter>URI\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">

Foundation/Foundation_vs160.vcxproj

@@ -603,6 +603,8 @@
     <ClCompile Include="src\ConsoleChannel.cpp" />
     <ClCompile Include="src\CountingStream.cpp" />
     <ClCompile Include="src\crc32.c" />
+    <ClCompile Include="src\DataURIStream.cpp" />
+    <ClCompile Include="src\DataURIStreamFactory.cpp" />
     <ClCompile Include="src\DateTime.cpp" />
     <ClCompile Include="src\DateTimeFormat.cpp" />
     <ClCompile Include="src\DateTimeFormatter.cpp" />
@@ -1595,6 +1597,8 @@
     <ClInclude Include="include\Poco\Configurable.h" />
     <ClInclude Include="include\Poco\ConsoleChannel.h" />
     <ClInclude Include="include\Poco\CountingStream.h" />
+    <ClInclude Include="include\Poco\DataURIStream.h" />
+    <ClInclude Include="include\Poco\DataURIStreamFactory.h" />
     <ClInclude Include="include\Poco\DateTime.h" />
     <ClInclude Include="include\Poco\DateTimeFormat.h" />
     <ClInclude Include="include\Poco\DateTimeFormatter.h" />

Foundation/Foundation_vs160.vcxproj.filters

@@ -909,6 +909,12 @@
     <ClCompile Include="src\SHA2Engine.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DataURIStream.cpp">
+      <Filter>URI\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\DataURIStreamFactory.cpp">
+      <Filter>URI\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Any.h">
@@ -1865,6 +1871,12 @@
     <ClInclude Include="include\Poco\SHA2Engine.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\DataURIStream.h">
+      <Filter>URI\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Poco\DataURIStreamFactory.h">
+      <Filter>URI\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\pocomsg.rc">

Foundation/Makefile

@@ -30,7 +30,7 @@ objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel \
 	FileStreamFactory URIStreamFactory URIStreamOpener UTF32Encoding UTF16Encoding UTF8Encoding UTF8String \
 	Unicode UnicodeConverter Windows1250Encoding Windows1251Encoding Windows1252Encoding \
 	UUID UUIDGenerator Void Var VarHolder VarIterator Format Pipe PipeImpl PipeStream SharedMemory \
-	MemoryStream FileStream AtomicCounter
+	MemoryStream FileStream AtomicCounter DataURIStream DataURIStreamFactory
 
 zlib_objects = adler32 compress crc32 deflate \
 	infback inffast inflate inftrees trees zutil

Foundation/include/Poco/DataURIStream.h

@@ -0,0 +1,78 @@
+//
+// DataURIStream.h
+//
+// Library: Foundation
+// Package: Streams
+// Module:  DataURIStreamFactory
+//
+// Definition of the DataURIStream class.
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#ifndef Foundation_DataURIStream_INCLUDED
+#define Foundation_DataURIStream_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include <istream>
+#include <memory>
+
+
+namespace Poco {
+
+
+class Base64Decoder;
+class MemoryInputStream;
+class URI;
+
+
+class Foundation_API DataURIStreamIOS: public virtual std::ios
+	/// The base class for DataURIStream.
+	///
+	/// This class is needed to ensure the correct initialization
+	/// order of the stream buffer and base classes.
+{
+public:
+	DataURIStreamIOS(const URI& uri);
+	~DataURIStreamIOS();
+	std::streambuf* rdbuf();
+
+protected:
+	std::streambuf* _buf;
+
+private:
+	DataURIStreamIOS(const DataURIStreamIOS&);
+	DataURIStreamIOS& operator = (const DataURIStreamIOS&);
+	std::string _data;
+	std::unique_ptr<MemoryInputStream> _memoryStream;
+	std::unique_ptr<Base64Decoder> _base64Decoder;
+};
+
+
+class Foundation_API DataURIStream: public DataURIStreamIOS, public std::istream
+	/// An input stream for reading data from a data URI.
+	/// For example, when constructed from  "data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D" it reads "Hello, World!".
+{
+public:
+	DataURIStream(const URI& uri);
+		/// Creates a DataURIStream for the given data URI,
+		/// ready for reading data.
+		/// Throws a DataFormatException exception if the data is incorrect format.
+	~DataURIStream();
+		/// Destroys the DataURIStream.
+
+private:
+	DataURIStream(const DataURIStream&);
+	DataURIStream& operator = (const DataURIStream&);
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_DataURIStream_INCLUDED

Foundation/include/Poco/DataURIStreamFactory.h

@@ -0,0 +1,58 @@
+//
+// DataURIStreamFactory.h
+//
+// Library: Foundation
+// Package: URI
+// Module:  DataURIStreamFactory
+//
+// Definition of the DataURIStreamFactory class.
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#ifndef Foundation_DataURIStreamFactory_INCLUDED
+#define Foundation_DataURIStreamFactory_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/URIStreamFactory.h"
+
+
+namespace Poco {
+
+
+class Foundation_API DataURIStreamFactory: public URIStreamFactory
+	/// An implementation of the URIStreamFactory interface
+	/// that read data from data URIs.
+	/// For example, for URI "data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D" it read "Hello, World!".
+{
+public:
+	DataURIStreamFactory();
+		/// Creates the DataURIStreamFactory.
+
+	~DataURIStreamFactory();
+		/// Destroys the DataURIStreamFactory.
+		
+	std::istream* open(const URI& uri);
+		/// Creates an input stream returning decoded data from the given data URI.
+		///
+		/// Throws a DataFormatException exception if the data is incorrect format.
+
+	static void registerFactory();
+		/// Registers the DataURIStreamFactory with the
+		/// default URIStreamOpener instance.
+
+	static void unregisterFactory();
+		/// Unregisters the DataURIStreamFactory with the
+		/// default URIStreamOpener instance.
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_DataURIStreamFactory_INCLUDED

Foundation/src/DataURIStream.cpp

@@ -0,0 +1,72 @@
+//
+// DataURIStream.cpp
+//
+// Library: Foundation
+// Package: Streams
+// Module:  DataURIStreamFactory
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#include "Poco/DataURIStream.h"
+#include "Poco/Base64Decoder.h"
+#include "Poco/Exception.h"
+#include "Poco/MemoryStream.h"
+#include "Poco/Path.h"
+#include "Poco/StreamUtil.h"
+#include "Poco/URI.h"
+#include <string.h>
+
+
+namespace Poco {
+
+
+DataURIStreamIOS::DataURIStreamIOS(const URI& uri)
+{
+	poco_assert (uri.getScheme() == "data");
+
+	const std::string& path = uri.getPath();
+	size_t comma = path.find(',');
+	if (comma == std::string::npos)
+		throw DataFormatException();
+	_data = path.substr(comma + 1);
+	_memoryStream.reset(new MemoryInputStream(_data.data(), _data.length()));
+	constexpr char base64[] = ";base64";
+	const size_t base64Len = strlen(base64);
+	if ((comma >= base64Len) && !path.compare(comma - base64Len, base64Len, base64, base64Len))
+	{
+		_base64Decoder.reset(new Base64Decoder(*_memoryStream, 0));
+		_buf = _base64Decoder->rdbuf();
+	}
+	else
+		_buf = _memoryStream->rdbuf();
+	poco_ios_init(_buf);
+}
+
+
+DataURIStreamIOS::~DataURIStreamIOS()
+{
+}
+
+
+std::streambuf* DataURIStreamIOS::rdbuf()
+{
+	return _buf;
+}
+
+
+DataURIStream::DataURIStream(const URI& uri): DataURIStreamIOS(uri), std::istream(_buf)
+{
+}
+
+
+DataURIStream::~DataURIStream()
+{
+}
+
+
+} // namespace Poco

Foundation/src/DataURIStreamFactory.cpp

@@ -0,0 +1,54 @@
+//
+// DataURIStreamFactory.cpp
+//
+// Library: Foundation
+// Package: URI
+// Module:  DataURIStreamFactory
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#include "Poco/DataURIStreamFactory.h"
+#include "Poco/DataURIStream.h"
+#include "Poco/URI.h"
+#include "Poco/URIStreamOpener.h"
+
+
+namespace Poco {
+
+
+DataURIStreamFactory::DataURIStreamFactory()
+{
+}
+
+
+DataURIStreamFactory::~DataURIStreamFactory()
+{
+}
+
+
+std::istream* DataURIStreamFactory::open(const URI& uri)
+{
+	poco_assert (uri.getScheme() == "data");
+
+	return new DataURIStream(uri);
+}
+
+
+void DataURIStreamFactory::registerFactory()
+{
+	URIStreamOpener::defaultOpener().registerStreamFactory("data", new DataURIStreamFactory);
+}
+
+
+void DataURIStreamFactory::unregisterFactory()
+{
+	URIStreamOpener::defaultOpener().unregisterStreamFactory("data");
+}
+
+
+} // namespace Poco

Foundation/testsuite/Makefile-Driver

@@ -37,7 +37,8 @@ objects = ActiveMethodTest ActivityTest ActiveDispatcherTest \
 	HashSetTest HashMapTest SharedMemoryTest OrderedContainersTest \
 	UniqueExpireCacheTest UniqueExpireLRUCacheTest UnicodeConverterTest \
 	TuplesTest NamedTuplesTest TypeListTest VarTest DynamicTestSuite FileStreamTest \
-	MemoryStreamTest ObjectPoolTest DirectoryWatcherTest DirectoryIteratorsTest
+	MemoryStreamTest ObjectPoolTest DirectoryWatcherTest DirectoryIteratorsTest \
+	DataURIStreamTest
 
 target         = testrunner
 target_version = 1

Foundation/testsuite/TestSuite_vs140.vcxproj

@@ -626,6 +626,7 @@
     <ClCompile Include="src\CoreTestSuite.cpp" />
     <ClCompile Include="src\CountingStreamTest.cpp" />
     <ClCompile Include="src\CryptTestSuite.cpp" />
+    <ClCompile Include="src\DataURIStreamTest.cpp" />
     <ClCompile Include="src\DateTimeFormatterTest.cpp" />
     <ClCompile Include="src\DateTimeParserTest.cpp" />
     <ClCompile Include="src\DateTimeTest.cpp" />
@@ -766,6 +767,7 @@
     <ClInclude Include="src\CoreTestSuite.h" />
     <ClInclude Include="src\CountingStreamTest.h" />
     <ClInclude Include="src\CryptTestSuite.h" />
+    <ClInclude Include="src\DataURIStreamTest.h" />
     <ClInclude Include="src\DateTimeFormatterTest.h" />
     <ClInclude Include="src\DateTimeParserTest.h" />
     <ClInclude Include="src\DateTimeTest.h" />

Foundation/testsuite/TestSuite_vs140.vcxproj.filters

@@ -594,6 +594,9 @@
     <ClCompile Include="src\SHA2EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DataURIStreamTest.cpp">
+      <Filter>URI\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AnyTest.h">
@@ -1010,5 +1013,8 @@
     <ClInclude Include="src\SHA2EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\DataURIStreamTest.h">
+      <Filter>URI\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Foundation/testsuite/TestSuite_vs150.vcxproj

@@ -626,6 +626,7 @@
     <ClCompile Include="src\CoreTestSuite.cpp" />
     <ClCompile Include="src\CountingStreamTest.cpp" />
     <ClCompile Include="src\CryptTestSuite.cpp" />
+    <ClCompile Include="src\DataURIStreamTest.cpp" />
     <ClCompile Include="src\DateTimeFormatterTest.cpp" />
     <ClCompile Include="src\DateTimeParserTest.cpp" />
     <ClCompile Include="src\DateTimeTest.cpp" />
@@ -766,6 +767,7 @@
     <ClInclude Include="src\CoreTestSuite.h" />
     <ClInclude Include="src\CountingStreamTest.h" />
     <ClInclude Include="src\CryptTestSuite.h" />
+    <ClInclude Include="src\DataURIStreamTest.h" />
     <ClInclude Include="src\DateTimeFormatterTest.h" />
     <ClInclude Include="src\DateTimeParserTest.h" />
     <ClInclude Include="src\DateTimeTest.h" />

Foundation/testsuite/TestSuite_vs150.vcxproj.filters

@@ -594,6 +594,9 @@
     <ClCompile Include="src\SHA2EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DataURIStreamTest.cpp">
+      <Filter>URI\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AnyTest.h">
@@ -1010,5 +1013,8 @@
     <ClInclude Include="src\SHA2EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\DataURIStreamTest.h">
+      <Filter>URI\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Foundation/testsuite/TestSuite_vs160.vcxproj

@@ -626,6 +626,7 @@
     <ClCompile Include="src\CoreTestSuite.cpp" />
     <ClCompile Include="src\CountingStreamTest.cpp" />
     <ClCompile Include="src\CryptTestSuite.cpp" />
+    <ClCompile Include="src\DataURIStreamTest.cpp" />
     <ClCompile Include="src\DateTimeFormatterTest.cpp" />
     <ClCompile Include="src\DateTimeParserTest.cpp" />
     <ClCompile Include="src\DateTimeTest.cpp" />
@@ -766,6 +767,7 @@
     <ClInclude Include="src\CoreTestSuite.h" />
     <ClInclude Include="src\CountingStreamTest.h" />
     <ClInclude Include="src\CryptTestSuite.h" />
+    <ClInclude Include="src\DataURIStreamTest.h" />
     <ClInclude Include="src\DateTimeFormatterTest.h" />
     <ClInclude Include="src\DateTimeParserTest.h" />
     <ClInclude Include="src\DateTimeTest.h" />

Foundation/testsuite/TestSuite_vs160.vcxproj.filters

@@ -594,6 +594,9 @@
     <ClCompile Include="src\SHA2EngineTest.cpp">
       <Filter>Crypt\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\DataURIStreamTest.cpp">
+      <Filter>URI\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AnyTest.h">
@@ -1010,5 +1013,8 @@
     <ClInclude Include="src\SHA2EngineTest.h">
       <Filter>Crypt\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\DataURIStreamTest.h">
+      <Filter>URI\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Foundation/testsuite/src/DataURIStreamTest.cpp

@@ -0,0 +1,113 @@
+//
+// DataURIStreamTest.cpp
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#include "DataURIStreamTest.h"
+#include "Poco/CppUnit/TestCaller.h"
+#include "Poco/CppUnit/TestSuite.h"
+#include "Poco/DataURIStream.h"
+#include "Poco/Exception.h"
+#include "Poco/URI.h"
+#include "Poco/StreamCopier.h"
+#include <sstream>
+
+
+using Poco::DataFormatException;
+using Poco::DataURIStream;
+using Poco::StreamCopier;
+using Poco::URI;
+
+
+DataURIStreamTest::DataURIStreamTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+DataURIStreamTest::~DataURIStreamTest()
+{
+}
+
+
+void DataURIStreamTest::testWithBase64()
+{
+	{
+		DataURIStream ds(URI("data:;base64,SGVsbG8sIFdvcmxkIQ%3D%3D"));
+		std::ostringstream ostr;
+		StreamCopier::copyStream(ds, ostr);
+		assertTrue (ostr.str() == "Hello, World!");
+	}
+	{
+		DataURIStream ds(URI("data:text/vnd-example+xyz;foo=bar;base64,R0lGODdh"));
+		std::ostringstream ostr;
+		StreamCopier::copyStream(ds, ostr);
+		assertTrue (ostr.str() == "GIF87a");
+	}
+	{
+		DataURIStream ds(URI("data:application/octet-stream;base64,A+b/7A=="));
+		std::ostringstream ostr;
+		StreamCopier::copyStream(ds, ostr);
+		assertTrue (ostr.str() == "\x03\xE6\xFF\xEC");
+	}
+}
+
+
+void DataURIStreamTest::testWithoutBase64()
+{
+	{
+		DataURIStream ds(URI("data:,Hello%2C%20World!"));
+		std::ostringstream ostr;
+		StreamCopier::copyStream(ds, ostr);
+		assertTrue (ostr.str() == "Hello, World!");
+	}
+	{
+		DataURIStream ds(URI("data:text/plain;charset=UTF-8;page=21,the%20data:1234,5678"));
+		std::ostringstream ostr;
+		StreamCopier::copyStream(ds, ostr);
+		assertTrue (ostr.str() == "the data:1234,5678");
+	}
+}
+
+
+void DataURIStreamTest::testZeroLengthData()
+{
+	{
+		DataURIStream ds(URI("data:text/plain;base64,"));
+		std::ostringstream ostr;
+		StreamCopier::copyStream(ds, ostr);
+		assertTrue (ostr.str().empty());
+	}
+	{
+		DataURIStream ds(URI("data:,"));
+		std::ostringstream ostr;
+		StreamCopier::copyStream(ds, ostr);
+		assertTrue (ostr.str().empty());
+	}
+}
+
+
+void DataURIStreamTest::setUp()
+{
+}
+
+
+void DataURIStreamTest::tearDown()
+{
+}
+
+
+CppUnit::Test* DataURIStreamTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("DataURIStreamTest");
+
+	CppUnit_addTest(pSuite, DataURIStreamTest, testWithBase64);
+	CppUnit_addTest(pSuite, DataURIStreamTest, testWithoutBase64);
+	CppUnit_addTest(pSuite, DataURIStreamTest, testZeroLengthData);
+
+	return pSuite;
+}

Foundation/testsuite/src/DataURIStreamTest.h

@@ -0,0 +1,37 @@
+//
+// DataURIStreamTest.h
+//
+// Definition of the DataURItreamTest class.
+//
+// Copyright (c) 2019, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#ifndef DataURIStreamTest_INCLUDED
+#define DataURIStreamTest_INCLUDED
+
+
+#include "Poco/CppUnit/TestCase.h"
+
+
+class DataURIStreamTest: public CppUnit::TestCase
+{
+public:
+	DataURIStreamTest(const std::string& name);
+	~DataURIStreamTest();
+
+	void testWithBase64();
+	void testWithoutBase64();
+	void testZeroLengthData();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+};
+
+
+#endif // DataURIStreamTest_INCLUDED

Foundation/testsuite/src/StreamsTestSuite.cpp

@@ -23,6 +23,7 @@
 #include "FileStreamTest.h"
 #include "MemoryStreamTest.h"
 #include "FIFOBufferStreamTest.h"
+#include "DataURIStreamTest.h"
 
 
 CppUnit::Test* StreamsTestSuite::suite()
@@ -43,6 +44,7 @@ CppUnit::Test* StreamsTestSuite::suite()
 	pSuite->addTest(FileStreamTest::suite());
 	pSuite->addTest(MemoryStreamTest::suite());
 	pSuite->addTest(FIFOBufferStreamTest::suite());
+	pSuite->addTest(DataURIStreamTest::suite());
 
 	return pSuite;
 }

doc/99100-ReleaseNotes.page

@@ -1,11 +1,177 @@
 POCO C++ Libraries Release Notes
 AAAIntroduction
 
+!!!Release 1.10.0
+
+!!Summary of Changes
+
+  - This release now requires a C++14 compiler (GCC 5, Clang 3.4, Visual C++ 2015).
+  - POCO's fixed-size integer types are now based on <cstdint> types. This changes
+    the definition of Poco::Int64 and Poco::UInt64 on some platforms.
+  - Many methods exposing raw pointers have been changed to use smart pointers
+    (usually Poco::SharedPtr or Poco::AutoPtr) instead. This may break some existing
+    code. Specifically, the Logging framework in the Foundation library and the
+    Configuration framework in the Util library have been changed.
+  - New JWT library for dealing with JSON Web Tokens.
+  - Upgrade bundled SQLite to version 3.31.0.
+  - The NetSSL_OpenSSL library supports TLS 1.3 with OpenSSL 1.1.1 or later.
+  - The NetSSL_Win library supports TLS 1.3 if it's supported by the underlying SChannel
+    implementation.
+  - Added support for NTLM authentication in the Net library.
+  - NetSSL_OpenSSL now has a Poco::Net::FTPSClientSession and Poco::Net::FTPSStreamOpener
+    class for connecting to FTP servers over TLS.
+  - Fixed a potential crash in Poco::Net::NetworkInterface on Linux and macOS due to
+    an invalid cast when obtaining the MAC address of an interface.
+  - GH #2624: Poco::FileChannel/Poco:LogFileImpl::writeImpl() on Windows should translate \n to \r\n.
+  - GH #2869: X509Certificate does not render UTF-8 characters in subjectName
+  - GH #2863: NetworkInterface::map can fail to reveal some interfaces if an earlier one can not be handled
+  - GH #2807: Poco::Data::ODBC Binding of SQL Decimal Type
+  - GH #2812: String trimInPlace crashes with 0 size on Visual Studio Express 2017
+  - GH #2830: Fix wrong buffer size in client handshake when re-using a SecureSocket [NetSSL_Win]
+  - GH #2809: Allow to filter long tests using a command line argument
+  - GH #2853: Poco::Process::launch process environment unicode support is broken on Windows
+  - GH #2843: Poco::Net::MediaType::parse() does not split parameters
+  - GH #2772: On iOS real device (not simulator) the home directory is not usable
+  - GH #2689: Added tryWait() into Process and ProcessHandle. Handle kill()-ed UNIX process exit codes.
+  - GH #2866: unescape Backslash char in UTF8 unescape method
+  - GH #2879: Add support for SameSite attribute in HTTPCookie
+  - GH #2824: Poco::Environment missing UTF8/wstring support on Windows
+  - GH #2295: setEscapeUnicode() functions in JSON Array and Object classes ignore their boolean parameter
+  - GH #2306: Why does Poco explicitly define _WIN32_WINNT?
+  - GH #2802: Deprecated warning when building POCO with OpenSSL in submodule + cmake
+  - GH #2884: Is it a description error about setReceiveTimeout()?
+  - GH #2780: Allow Poco::Net::Context::usePrivateKey to accept ECKey and/or general EVPPKey
+  - GH #2747: NetSSL_Win: Context constructor usage argument should specify minimum supported SSL/TLS version
+  - GH #2745: Small problem in the code
+  - GH #2743: X509Certificate validFrom expiresOn Date parsing
+  - GH #2744: Poco::Mysql does not build with MySQL 8.0+
+  - GH #2686: Uploads larger than 2GB fail
+  - GH #2217: UUIDGenerator should allow random seed
+  - GH #1609: Improve XDG Base Directory Specification implementation
+  - GH #561: Support for XDG Base Directory Specification
+  - GH #2881: Add an option to force the use of PollingDirectoryWatcherStrategy
+  - GH #2584: Adding standard macOS legacy encodings
+  - GH #2885: fix Dynamic::Var parse string issue
+  - GH #2616: Restore pre-1.8.0 behaviour of Poco::Net::ServerSocket::bind.
+  - GH #2641: Implement DataURIStream for extracting data from data URIs.
+  - GH #2842: File fail on overwrite
+  - GH #2840: Deleting Registry Keys on the WOW6432Node is not possible on 64Bit Applications
+  - GH #2841: Service manager improvments
+  - GH #2827: X509Certificate: Get rid of deprecated OpenSSL 1.1 APIs
+  - GH #2826: CipherImpl: Fix small error with OpenSSL 1.1
+  - GH #2775: Fix issue in NetSSL_Win. Windows Server 2016 reboots while trying to establish an SSL connection.
+  - GH #2773: Fix the issue with incorrect type of store name parameter in CertOpenStore API call into NetSSL_Win
+  - GH #2766: Support qnx sdp7
+  - GH #2308: SocketAcceptor::setReactor() is broken
+  - GH #2250: Poco::strToInt<> fails for values right above the type's boundary / limit
+  - GH #2249: Poco::JSON::Object::set() should return reference to this to allow chaining.
+  - GH #2275: SQLite mismatch open/close API calls
+  - GH #1921: ICMPSocket does not check reply address
+  - GH #2092: Use PollSet in SocketReactor
+  - GH #2552: Poco::MongoDB test cases failed in Linux on IBM z
+  - GH #2546: MySQL session state is not cleared in SessionPool
+  - GH #2410: Preserve entries order in DynamicStruct
+  - GH #2467: Can not open certain zip files include data descriptor
+  - GH #2398: Poco 1.9.1 branch cmake build on FreeBSD 11.1 failed
+  - GH #2365: add struct tm support to DateTime
+  - GH #2348: NTPClient not checking reply address
+  - GH #2346: lock-order-inversion in SocketReactor
+  - GH #2330: add socket gather/scatter capabilities
+  - GH #2343: UDPServer and client
+  - GH #2329: add PMTU discovery
+  - GH #2345: SocketNotifier not thread-safe
+  - GH #2323: WebSocketTest.cpp faults reported by valgrind
+  - GH #1160: Poco::Net::NetException "SSL Exception: error:1409F07F:SSL routines:ssl3_write_pending:bad write retry"
+  - GH #2547: Reset connection when a session is returned to the SessionPool
+  - GH #2451: http client timeout on Windows 7 and Server 2008 R2
+  - GH #2417: Added missing IPv6 methods to SecureSocketImpl
+  - GH #2408: add ordered containers
+  - GH #2042: Android abstract namespace local socket address
+  - GH #2088: Fix race condition in TCPServerDispatcher.cpp
+
+!!Incompatible Changes and Possible Transition Issues
+
+  - This release now requires a C++14 compiler (GCC 5, Clang 3.4, Visual C++ 2015).
+  - POCO's fixed-size integer types are now based on <cstdint> types. This changes
+    the definition of Poco::Int64 and Poco::UInt64 on some platforms.
+  - Many methods exposing raw pointers have been changed to use smart pointers
+    (usually Poco::SharedPtr or Poco::AutoPtr) instead. This may break some existing
+    code. Specifically, the Logging framework in the Foundation library and the
+    Configuration framework in the Util library have been changed.
+
+
+!!!Release 1.9.4
+
+!!Summary of Changes
+
+  - fixed GH #2784: Upgrade bundled expat XML parser library to release 2.2.8,
+    which fixes CVE-2019-15903.
+
+
+!!!Release 1.9.3
+
+!!Summary of Changes
+
+  - fixed GH #2603: Remove incorrect upper size limits for SSL certificates in NetSSL_Win
+  - fixed GH #2661: Poco::Zip::ZipArchive cannot load new tomcat.zip file (additional fix)
+  - fixed GH #2742: Support of vs150 & vs160 with the official Microsoft localization executable,
+    vswhere.exe, installed by MSVC starting from VS2017
+  - Data/ODBC: make binding of std::string configurable (SQL_LONGVARCHAR - default or SQL_VARCHAR)
+    through a global setting (Poco::Data::ODBC::Connector::bindStringToLongVarChar()).
+  - added Poco::SharedLibrary::setSearchPath() (currently implemented on Windows only)
+  - Windows required minimum version is now Windows XP SP2
+  - upgraded bundled SQLite to 3.29.0
+  - CppParser now supports type aliases defined with using keyword.
+  - PageCompiler: added support for adding Content-Security-Policy and Cache-Control headers.
+
+
+!!!Release 1.9.2
+
+!!Summary of Changes
+
+  - fixed GH #2736: Error using CMake gui - latest version
+  - fixed GH #2737: Bundles vulnerable copy of Expat — please upgrade to Expat 2.2.7
+  - fixed GH #2738: Poco::AccessExpireStrategy::onGet() must not extend expiration time after expiration
+
+
 !!!Release 1.9.1
 
 !!Summary of Changes
 
-  - TODO
+  - Added support for building with different OpenSSL distributions on Windows.
+    See the POCO_EXTERNAL_OPENSSL macro defined in Foundation/include/Poco/Config.h
+    for options.
+  - Added Poco::Net::HTTPClientSession::flushRequest()
+  - Added Poco::Net::WebSocket::setMaxPayloadSize() and Poco::Net::WebSocket::getMaxPayloadSize()
+    to specify a maximum acceptable payload size for Poco::Net::WebSocket::receiveFrame().
+  - Poco::Net::WebSocket: don't attempt to send empty credentials in response to 401 response.
+  - Redis: added support for additional commands (exists, expire, ping, multi, exec, discard)
+  - Redis: added Poco::Redis::Client::isConnected()
+  - Upgraded bundled PCRE to version 8.43
+  - Upgraded bundled SQLite to version 3.28.0
+  - Added project/solution files for Visual Studio 2019
+  - Fixed Visual Studio project files (version information from DLLVersion.rc not included in DLLs)
+  - Include version resource in DLLs built with CMake
+  - Added HTTP*Credentials::empty() and HTTPCredentials::clear()
+  - fixed GH #2220: Encoding/DoubleByteEncoding.cpp fails to compile with VS2008 and _DEBUG
+  - fixed GH #2243: DLLVersion.rc is excluded from build, missing detail information in properties of *.dll
+  - fixed GH #2277: SQLite null pointer dereference occurs when exception is being thrown
+  - fixed GH #2313: PollSet behaves differently on windows
+  - fixed GH #2316: cmake can't find MySQL and ODBC libraries
+  - fixed GH #2336: Omit ContentLength in WebSocket accept response
+  - fixed GH #2358: Don't include <openssl/fips.h> for later OpenSSL
+  - fixed GH #2364: Stringify escapes every unicode symbol when object contain an array
+  - fixed GH #2380: Calling Poco::Net::X509Certificate::addChainCertificate() leads to double free.
+  - fixed GH #2492: Net::Socket::address() crash on Android
+  - fixed GH #2549: Fix keepAlive in http client session
+  - fixed GH #2565: HTMLForm: optional enforcement of Content-Length instead of Chunked Transfer-Encoding
+  - fixed GH #2570: DialogSocket: receiveStatusMessage() - line length limit applies to entire multi-line message
+  - fixed GH #2583: Crypto library does not build with OpenSSL 1.0.0
+  - fixed GH #2655: MongoDB Binary element to string - bug
+  - fixed GH #2661: Poco::Zip::ZipArchive cannot load new tomcat.zip file
+  - fixed GH #2700: Invalid read of memory in Poco::Environment::set which may cause crashes.
+  - fixed GH #2712: File_WIN32.cpp(168): error C2065: “_upath”:Undeclared identifier
+  - fixed GH #2723: Access violation when trying to decompress .zip file with unsupported compression method.
 
 
 !!!Release 1.9.0