Imported Upstream version 6.4.0.152
Former-commit-id: 9581b2879201a39de16b05882d3ad003b4a23a64
This commit is contained in:
parent
345224e2bc
commit
354a7ffa75
@ -1 +1 @@
|
||||
4eeeb3ab453806bf94a1e3f92727c3a5b3ffebdc
|
||||
5a71458baca48b9afee5435d6a116632b3b1c2cd
|
@ -1 +1 @@
|
||||
5a41cd4d1bea5ebec3323c0a8dbeba933276a231
|
||||
8af8ff011e5451fed36d2a3fef4da686e7400bca
|
@ -1 +1 @@
|
||||
37208de3822bb74521236d8b06326e9e402b24c7
|
||||
0d6b344f9ca2923c6465a8978ac10c76e9cbf5b9
|
@ -1 +1 @@
|
||||
593c0f8865b7e48b38ce75d6dd591bd91ee53416
|
||||
3627807f156c3de3bd4d8df1a6b7c0669d6484a1
|
@ -1 +1 @@
|
||||
0613b729a2a86a759624e3244f1588c5c808a665
|
||||
1617e73abb022826553279ef920edc829ab8d529
|
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.4.0.150";
|
||||
public const string MonoVersion = "6.4.0.152";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -104,8 +104,13 @@ namespace System.IO.Compression
|
||||
{
|
||||
}
|
||||
|
||||
~DeflateStream () => Dispose (false);
|
||||
|
||||
protected override void Dispose (bool disposing)
|
||||
{
|
||||
if (disposing)
|
||||
GC.SuppressFinalize (this);
|
||||
|
||||
native.Dispose (disposing);
|
||||
|
||||
if (disposing && !disposed) {
|
||||
@ -380,12 +385,12 @@ namespace System.IO.Compression
|
||||
if (disposing && !disposed) {
|
||||
disposed = true;
|
||||
GC.SuppressFinalize (this);
|
||||
|
||||
io_buffer = null;
|
||||
} else {
|
||||
// When we are in the finalizer we don't want to access the underlying stream anymore
|
||||
base_stream = Stream.Null;
|
||||
}
|
||||
|
||||
io_buffer = null;
|
||||
|
||||
if (z_stream != null) {
|
||||
z_stream.Dispose();
|
||||
|
@ -1 +1 @@
|
||||
78e840ae40e63ee229d424842c1b198599479976
|
||||
63167183234be324be0b84742a372e60bdd93cbc
|
@ -1 +1 @@
|
||||
bd341c852711b054c75b8b8a5bc12abb7c7a2ce7
|
||||
32467bc1560d39e74fafe09be7d6c41a47073c5d
|
@ -1 +1 @@
|
||||
ff3aff6636cde78c4a8c955d75cd54b44ab80af7
|
||||
a9d5b3e41d21ff652708eeaa10a9e003db94b15b
|
@ -1 +1 @@
|
||||
c7e807fcdf92a15876a9a6af5b8b0a5fc9ad846c
|
||||
9fc70ffa1af2c36797c4c514e737e91b5993ffe9
|
@ -1 +1 @@
|
||||
c8de5b2048f45959a30c316a582f09a8eea17336
|
||||
04f4ba0053364f34ba7cef1584761de3c17bc650
|
@ -1 +1 @@
|
||||
ded1cacbead68b6c90b00225d6cd0116f86b9fd2
|
||||
687e38575b8386a0ae471dee67ffe3380cf465f0
|
@ -1 +1 @@
|
||||
ace51ee45521f0d46d823c686c14e4cb4a032435
|
||||
1e213927c7eaa4acff458796dd7ba1442c1a6adf
|
@ -1 +1 @@
|
||||
37133050404f7178b0319551cf43e14c5aa3ab52
|
||||
63a6d5f9321f4e72e6732bafb0c2ea3ed0b8326e
|
@ -1 +1 @@
|
||||
78e840ae40e63ee229d424842c1b198599479976
|
||||
63167183234be324be0b84742a372e60bdd93cbc
|
@ -1 +1 @@
|
||||
bd341c852711b054c75b8b8a5bc12abb7c7a2ce7
|
||||
32467bc1560d39e74fafe09be7d6c41a47073c5d
|
@ -1 +1 @@
|
||||
ff3aff6636cde78c4a8c955d75cd54b44ab80af7
|
||||
a9d5b3e41d21ff652708eeaa10a9e003db94b15b
|
@ -1 +1 @@
|
||||
c7e807fcdf92a15876a9a6af5b8b0a5fc9ad846c
|
||||
9fc70ffa1af2c36797c4c514e737e91b5993ffe9
|
@ -1 +1 @@
|
||||
c8de5b2048f45959a30c316a582f09a8eea17336
|
||||
04f4ba0053364f34ba7cef1584761de3c17bc650
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user