upgrade poco to 1.11.6

DLLVersion.rc

@@ -4,8 +4,8 @@
 
 #include "winres.h"
 
-#define POCO_VERSION 1,11,5,0
-#define POCO_VERSION_STR "1.11.5"
+#define POCO_VERSION 1,11,6,0
+#define POCO_VERSION_STR "1.11.6"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION POCO_VERSION

Foundation/include/Poco/Version.h

@@ -35,7 +35,7 @@
 //      Ax: alpha releases
 //      Bx: beta releases
 //
-#define POCO_VERSION 0x010B0500
+#define POCO_VERSION 0x010B0600
 
 
 #endif // Foundation_Version_INCLUDED

Foundation/include/Poco/zconf.h

@@ -1,9 +1,9 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: //poco/1.4/Foundation/include/Poco/zconf.h#5 $ */
+/* @(#) $Id$ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
@@ -38,6 +38,9 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
 #  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
@@ -349,6 +352,9 @@
 #    ifdef FAR
 #      undef FAR
 #    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
 #    include <windows.h>
      /* No need for _export, use ZLIB.DEF instead. */
      /* For complete Windows compatibility, use WINAPI, not __stdcall. */
@@ -439,13 +445,11 @@ typedef uLong FAR uLongf;
 #  define Z_HAVE_STDARG_H
 #endif
 
-#ifndef _WIN32_WCE
 #ifdef STDC
 #  ifndef Z_SOLO
 #    include <sys/types.h>      /* for off_t */
 #  endif
 #endif
-#endif
 
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #  ifndef Z_SOLO
@@ -469,11 +473,18 @@ typedef uLong FAR uLongf;
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
 #endif
 #ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#  if defined(Z_HAVE_UNISTD_H)
 #    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
 #    ifdef VMS
 #      include <unixio.h>       /* for off_t */

Foundation/testsuite/src/StringTest.cpp

@@ -1343,7 +1343,7 @@ void formatStream(double value, std::string& str)
 void formatSprintf(double value, std::string& str)
 {
 	char buffer[128];
-	std::sprintf(buffer, "%.*g", 16, value);
+	std::snprintf(buffer, sizeof(buffer), "%.*g", 16, value);
 	str = buffer;
 }
 

Net/src/HTTPChunkedStream.cpp

@@ -70,23 +70,30 @@ int HTTPChunkedStreamBuf::readFromDevice(char* buffer, std::streamsize length)
 		while (ch != eof && ch != '\n') ch = _session.get();
 		unsigned chunk;
 		if (NumberParser::tryParseHex(chunkLen, chunk))
+		{
 			_chunk = (std::streamsize) chunk;
+		}
 		else
+		{
+			_chunk = -1;
 			return eof;
 	}
+	}
 	if (_chunk > 0)
 	{
 		if (length > _chunk) length = _chunk;
 		int n = _session.read(buffer, length);
 		if (n > 0) _chunk -= n;
 		return n;
 	}
-	else 
+	else if (_chunk == 0)
 	{
 		int ch = _session.get();
 		while (ch != eof && ch != '\n') ch = _session.get();
+		_chunk = -1;
 		return 0;
 	}
+	else return eof;
 }
 
 

VERSION

@@ -1 +1 @@
-1.11.5
+1.11.6

libversion

@@ -1 +1 @@
-85
+86