From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Tue, 4 Nov 2003 16:37:55 +0000 (+0000)
Subject: Mirror 1.1.x changes.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84eef03ce80fab9ba750bca3f5b313c85796138e;hp=d16f87bc0ff642d76bef29cd2d23db5d56988d48;p=thirdparty%2Fcups.git

Mirror 1.1.x changes.


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

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index b38f19cf1..9d9c6acba 100644
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,9 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.20
 
+	- The scheduler's cupsLangSeek() function did not reset
+	  the "EOF" flag, preventing compressed files from being
+	  typed properly in some cases (STR #368)
 	- The cupsLangGet() cache was only used if the locale
 	  name provided an explicit character set name (STR
 	  #354)
diff --git a/scheduler/file.c b/scheduler/file.c
index 3f64c4452..683670820 100644
--- a/scheduler/file.c
+++ b/scheduler/file.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: file.c,v 1.1.2.4 2003/06/14 13:35:50 mike Exp $"
+ * "$Id: file.c,v 1.1.2.5 2003/11/04 16:37:55 mike Exp $"
  *
  *   File functions for the Common UNIX Printing System (CUPS).
  *
@@ -535,6 +535,7 @@ cupsFileSeek(cups_file_t *fp,		/* I - CUPS file */
       fp->pos = 0;
       fp->ptr = NULL;
       fp->end = NULL;
+      fp->eof = 0;
 
       while ((bytes = cups_fill(fp)) > 0)
         if (pos >= fp->pos && pos < (fp->pos + bytes))
@@ -550,6 +551,7 @@ cupsFileSeek(cups_file_t *fp,		/* I - CUPS file */
       fp->pos = pos;
       fp->ptr = NULL;
       fp->end = NULL;
+      fp->eof = 0;
     }
   }
   else if (pos >= (fp->pos + bytes))
@@ -969,5 +971,5 @@ cups_write(int        fd,		/* I - File descriptor */
 
 
 /*
- * End of "$Id: file.c,v 1.1.2.4 2003/06/14 13:35:50 mike Exp $".
+ * End of "$Id: file.c,v 1.1.2.5 2003/11/04 16:37:55 mike Exp $".
  */