|
1 | 1 | #if NET6_0_OR_GREATER
|
| 2 | +using System.Diagnostics; |
| 3 | +using System; |
2 | 4 | using System.IO;
|
3 | 5 | using System.IO.Compression;
|
| 6 | +using System.Threading.Tasks; |
| 7 | +using System.Threading; |
4 | 8 |
|
5 | 9 | namespace Renci.SshNet.Compression
|
6 | 10 | {
|
@@ -28,20 +32,24 @@ public override string Name
|
28 | 32 | protected override byte[] CompressCore(byte[] data, int offset, int length)
|
29 | 33 | {
|
30 | 34 | using var outputStream = new MemoryStream();
|
31 |
| - using var zlibStream = new ZLibStream(outputStream, CompressionMode.Compress); |
| 35 | + using var stream = new ZLibStream(outputStream, CompressionMode.Compress); |
32 | 36 |
|
33 |
| - zlibStream.Write(data, offset, length); |
| 37 | + stream.Write(data, offset, length); |
34 | 38 |
|
35 | 39 | return outputStream.ToArray();
|
36 | 40 | }
|
37 | 41 |
|
38 | 42 | protected override byte[] DecompressCore(byte[] data, int offset, int length)
|
39 | 43 | {
|
40 | 44 | using var inputStream = new MemoryStream(data, offset, length);
|
41 |
| - using var zlibStream = new ZLibStream(inputStream, CompressionMode.Decompress); |
| 45 | + |
| 46 | + // Handle raw deflate response from some servers |
| 47 | + using Stream stream = (data[offset] & 0xF) == 8 ? |
| 48 | + new ZLibStream(inputStream, CompressionMode.Decompress) : |
| 49 | + new DeflateStream(inputStream, CompressionMode.Decompress); |
42 | 50 |
|
43 | 51 | using var outputStream = new MemoryStream();
|
44 |
| - zlibStream.CopyTo(outputStream); |
| 52 | + stream.CopyTo(outputStream); |
45 | 53 |
|
46 | 54 | return outputStream.ToArray();
|
47 | 55 | }
|
|
0 commit comments