rpms/cups/FC-6 cups-str2133.patch,NONE,1.1 cups.spec,1.307,1.308

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv1539

Modified Files:
	cups.spec 
Added Files:
	cups-str2133.patch 
Log Message:
* Thu Dec  7 2006 Tim Waugh <twaugh at redhat.com>
- Fixed If-Modified-Since: handling in libcups (bug #217556, STR #2133).
- Resolves: rhbz#217556


cups-str2133.patch:
 http.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE cups-str2133.patch ---
--- cups-1.2.7/cups/http.c.str2133	2006-12-07 13:08:37.000000000 +0000
+++ cups-1.2.7/cups/http.c	2006-12-07 13:09:20.000000000 +0000
@@ -694,8 +694,18 @@
     * after the transfer is complete...
     */
 
-    if (http->fields[HTTP_FIELD_CONTENT_LENGTH][0] == '\0')
-      http->data_remaining = 2147483647;
+    if (!http->fields[HTTP_FIELD_CONTENT_LENGTH][0])
+    {
+     /*
+      * Default content length is 0 for errors and 2^31-1 for other
+      * successful requests...
+      */
+
+      if (http->status >= HTTP_MULTIPLE_CHOICES)
+        http->data_remaining = 0;
+      else
+        http->data_remaining = 2147483647;
+    }
     else
       http->data_remaining = strtoll(http->fields[HTTP_FIELD_CONTENT_LENGTH],
                                      NULL, 10);


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- cups.spec	7 Dec 2006 13:08:15 -0000	1.307
+++ cups.spec	7 Dec 2006 13:11:10 -0000	1.308
@@ -47,6 +47,7 @@
 Patch21: cups-driverd-timeout.patch
 Patch22: cups-translate-prompt.patch
 Patch23: cups-str2111.patch
+Patch24: cups-str2133.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -152,6 +153,7 @@
 %patch21 -p1 -b .driverd-timeout
 %patch22 -p1 -b .translate-prompt
 %patch23 -p1 -b .str2111
+%patch24 -p1 -b .str2133
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -435,6 +437,7 @@
 
 %changelog
 * Thu Dec  7 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed If-Modified-Since: handling in libcups (bug #217556, STR #2133).
 - Fixed extra EOF in pstops output (bug #216154, STR #2111).
 
 * Tue Nov 28 2006 Tim Waugh <twaugh at redhat.com>