commit 59ef42ceedba38ad69b5d0f66797c8e5fe9ce451
author Sean Middleditch <sean@middleditch.us> Mon Mar 16 00:58:07 2009 -0400
committer Sean Middleditch <sean@middleditch.us> Mon Mar 16 00:58:07 2009 -0400
tree 43a89817262c4ff7afefe326ccb0fcf0b656bb17
parent 562257e75443fa4b5ffe79810e75864f8ba42e0c
parent 4611d911d595d8b8215810e3b7bf21a82b06d813

Merge branch 'master' into rfc1143

libtelnet.c

diff --git a/libtelnet.c b/libtelnet.c
index 1b08287..1860ece 100644
--- a/libtelnet.c
+++ b/libtelnet.c
@@ -547,7 +547,7 @@
 		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 @@
 		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;