Fixed a segfault problem with some of the client programs (STR #668)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@4150 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index d7550e32d67dc37dac66d10be9bafc8ec9e22eb8..960246efe5aea7cf42c4ee8404cc13c93436b0c0 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,8 @@ CHANGES.txt - 04/20/2004
 
 CHANGES IN CUPS V1.1.21rc1
 
+       - Fixed a segfault problem with some of the client
+         programs (STR #668)
        - When using RunAsUser, the scheduler did not correctly
          set the ownership of the log files, preventing log
          file rotation (STR #686)

diff --git a/cups/http.c b/cups/http.c
index eccf86b93f248b81587b15844cadf6ed3e524509..fb3abfb7424c90cec2b31f2f8f324870d62eec7f 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.c,v 1.134 2004/03/19 22:19:35 mike Exp $"
+ * "$Id: http.c,v 1.135 2004/04/20 14:13:54 mike Exp $"
  *
  *   HTTP routines for the Common UNIX Printing System (CUPS).
  *
@@ -1193,7 +1193,7 @@ httpWrite(http_t     *http,               /* I - HTTP data */
 #else
       if (errno == EINTR)
         continue;
-      else if (errno != http->error)
+      else if (errno != http->error && errno != ECONNRESET)
       {
         http->error = errno;
        continue;
@@ -2462,5 +2462,5 @@ CDSAWriteFunc(SSLConnectionRef connection,        /* I  - SSL/TLS connection */
 
 
 /*
- * End of "$Id: http.c,v 1.134 2004/03/19 22:19:35 mike Exp $".
+ * End of "$Id: http.c,v 1.135 2004/04/20 14:13:54 mike Exp $".
  */