Mirror 1.1.x change.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3778 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index ea2386670a9a8ad578600e16c092534ec34fda05..a9a96ea95f2fa4ed4dc7079260d4b1e60a4df934 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,9 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.20rc1
 
+       - Chunked requests could cause a Denial of Service if
+         the connection is terminated before the first byte of
+         chunk data is sent/received (STR #143)
        - Printers with special characters in their names were
          not accessible from the web interface (STR #120)
        - The lpstat command now shows the correct interface

diff --git a/cups/ipp.c b/cups/ipp.c
index 227f716fedefa27dd6ab17d4ccae78f9c5143873..eaa18f4aa45472395947bac36cabb783bf596563 100644 (file)
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c,v 1.55.2.36 2003/05/09 16:06:43 mike Exp $"
+ * "$Id: ipp.c,v 1.55.2.37 2003/06/14 17:07:03 mike Exp $"
  *
  *   Internet Printing Protocol support functions for the Common UNIX
  *   Printing System (CUPS).
@@ -2500,7 +2500,7 @@ ipp_read_http(http_t      *http,          /* I - Client connection */
         bytes = -1;
        break;
       }
-      else if ((bytes = httpRead(http, (char *)buffer, length - tbytes)) < 0)
+      else if ((bytes = httpRead(http, (char *)buffer, length - tbytes)) <= 0)
         break;
     }
   }
@@ -2545,5 +2545,5 @@ ipp_write_file(int         *fd,                   /* I - File descriptor */
 
 
 /*
- * End of "$Id: ipp.c,v 1.55.2.36 2003/05/09 16:06:43 mike Exp $".
+ * End of "$Id: ipp.c,v 1.55.2.37 2003/06/14 17:07:03 mike Exp $".
  */