Browse Source

revert change for GH #1828: causes Zip file corruption in some cases; bumped version no to 1.8.0.1

Guenter Obiltschnig 8 years ago
parent
commit
fe47b58652
6 changed files with 24 additions and 5 deletions
  1. 8 0
      CHANGELOG
  2. 2 2
      DLLVersion.rc
  3. 1 1
      Foundation/include/Poco/Version.h
  4. 3 1
      Foundation/src/DeflatingStream.cpp
  5. 1 1
      VERSION
  6. 9 0
      doc/99100-ReleaseNotes.page

+ 8 - 0
CHANGELOG

@@ -1,6 +1,14 @@
 This is the changelog file for the POCO C++ Libraries.
 
 
+Release 1.8.0.1 (2017-11-11)
+============================
+
+- Reverted change for GH #1828; DeflatingStreamBuf::sync() no longer flushes
+  underlying stream as this causes corruption for some Zip files.
+- PocoDoc: fix for handling compiler configuration for Gradle builds.
+
+
 Release 1.8.0 (2017-11-10)
 ==========================
 

+ 2 - 2
DLLVersion.rc

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

+ 1 - 1
Foundation/include/Poco/Version.h

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

+ 3 - 1
Foundation/src/DeflatingStream.cpp

@@ -196,7 +196,9 @@ int DeflatingStreamBuf::sync()
 			_zstr.next_out  = (unsigned char*) _buffer;
 			_zstr.avail_out = DEFLATE_BUFFER_SIZE;
 		}
-		_pOstr->flush();
+		// NOTE: This breaks the Zip library and causes corruption in some files.
+		// See GH #1828
+		// _pOstr->flush();
 	}
 	return 0;
 }

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.8.0
+1.8.0.1

+ 9 - 0
doc/99100-ReleaseNotes.page

@@ -1,6 +1,15 @@
 POCO C++ Libraries Release Notes
 AAAIntroduction
 
+!!!Release 1.8.0.1
+
+!!Summary of Changes
+
+  - Reverted change for GH #1828; DeflatingStreamBuf::sync() no longer flushes
+    underlying stream as this causes corruption for some Zip files.
+  - PocoDoc: fix for handling compiler configuration for Gradle builds.
+
+
 !!!Release 1.8.0
 
 !!Summary of Changes