osmocom
/
libtelnet
mirror of https://gerrit.osmocom.org/libtelnet
11
0
Fork 0
Code Releases Activity

Merge branch 'master' into rfc1143

This commit is contained in:
Sean Middleditch 2009-03-16 00:58:07 -04:00
parent 562257e754 4611d911d5
commit 59ef42ceed
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtelnet.c
View File

@ -547,7 +547,7 @@ void libtelnet_push(libtelnet_t *telnet, unsigned char *buffer,
unsigned int size) {
#ifdef HAVE_ZLIB
/* 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];
int rs;
@ -597,7 +597,7 @@ static void _send(libtelnet_t *telnet, unsigned char *buffer,
unsigned int size) {
#ifdef HAVE_ZLIB
/* 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];
int rs;