mirror of https://gerrit.osmocom.org/libtelnet
Merge branch 'master' into rfc1143
This commit is contained in:
commit
59ef42ceed
|
@ -547,7 +547,7 @@ void libtelnet_push(libtelnet_t *telnet, unsigned char *buffer,
|
||||||
unsigned int size) {
|
unsigned int size) {
|
||||||
#ifdef HAVE_ZLIB
|
#ifdef HAVE_ZLIB
|
||||||
/* if we have an inflate (decompression) zlib stream, use it */
|
/* if we have an inflate (decompression) zlib stream, use it */
|
||||||
if (telnet->z != 0) {
|
if (telnet->z != 0 && !(telnet->flags & LIBTELNET_PFLAG_DEFLATE)) {
|
||||||
unsigned char inflate_buffer[4096];
|
unsigned char inflate_buffer[4096];
|
||||||
int rs;
|
int rs;
|
||||||
|
|
||||||
|
@ -597,7 +597,7 @@ static void _send(libtelnet_t *telnet, unsigned char *buffer,
|
||||||
unsigned int size) {
|
unsigned int size) {
|
||||||
#ifdef HAVE_ZLIB
|
#ifdef HAVE_ZLIB
|
||||||
/* if we have a deflate (compression) zlib box, use it */
|
/* if we have a deflate (compression) zlib box, use it */
|
||||||
if (telnet->z != 0) {
|
if (telnet->z != 0 && telnet->flags & LIBTELNET_PFLAG_DEFLATE) {
|
||||||
unsigned char deflate_buffer[1024];
|
unsigned char deflate_buffer[1024];
|
||||||
int rs;
|
int rs;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue