From 09d90cc6b0ba9642712eee4cdb99f919fb5fcd56 Mon Sep 17 00:00:00 2001 From: mike Date: Tue, 20 Apr 2004 14:14:13 +0000 Subject: [PATCH] Mirror 1.1.x change. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@4151 7a7537e8-13f0-0310-91df-b6672ffda945 --- CHANGES-1.1.txt | 2 ++ cups/http.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt index eacd34f53..f08a2ba52 100644 --- a/CHANGES-1.1.txt +++ b/CHANGES-1.1.txt @@ -3,6 +3,8 @@ CHANGES-1.1.txt 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 950c42681..c1939025b 100644 --- a/cups/http.c +++ b/cups/http.c @@ -1,5 +1,5 @@ /* - * "$Id: http.c,v 1.82.2.46 2004/03/19 22:19:44 mike Exp $" + * "$Id: http.c,v 1.82.2.47 2004/04/20 14:14:13 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.82.2.46 2004/03/19 22:19:44 mike Exp $". + * End of "$Id: http.c,v 1.82.2.47 2004/04/20 14:14:13 mike Exp $". */ -- 2.39.5