X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2Ftelnet.py;h=ed99faf268072bb8d16f2d3fae98f0f5b3836bf4;hp=245f44a18fa2fdb77fb10ff6c46ca50878bac2de;hb=7d270b507a1788a8d2b0a6f4747cf67ffdf81bee;hpb=f75bc473e2c6d7ef1954087261e1e139d200cfa4

diff --git a/mudpy/telnet.py b/mudpy/telnet.py
index 245f44a..ed99faf 100644
--- a/mudpy/telnet.py
+++ b/mudpy/telnet.py
@@ -125,9 +125,11 @@ def negotiate_telnet_options(user):
         # the byte following the IAC is our command
         command = text[position+1]
 
-        # replace a double (literal) IAC if there's an LF later
+        # replace a double (literal) IAC if there's a CR+NUL or CR+LF later
         if command is IAC:
-            if text.find(b"\n", position) > 0:
+            if (
+                    text.find(b"\r\0", position) > 0 or
+                    text.find(b"\r\n", position) > 0):
                 position += 1
                 text = text[:position] + text[position + 1:]
             else: