- Re-initialize the resolver if getnameinfo() returns EAI_AGAIN (bug

#567353).
This commit is contained in:
Tim Waugh 2010-02-23 11:37:47 +00:00
parent 4869f1b1cd
commit da745e9fe4
2 changed files with 19 additions and 1 deletions

12
cups-EAI_AGAIN.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up cups-1.4.2/cups/http-addr.c.EAI_AGAIN cups-1.4.2/cups/http-addr.c
--- cups-1.4.2/cups/http-addr.c.EAI_AGAIN 2010-02-23 10:39:35.038261623 +0000
+++ cups-1.4.2/cups/http-addr.c 2010-02-23 10:41:14.684385991 +0000
@@ -253,7 +253,7 @@ httpAddrLookup(
if (error)
{
- if (error == EAI_FAIL)
+ if (error == EAI_FAIL || error == EAI_AGAIN)
cg->need_res_init = 1;
return (httpAddrString(addr, name, namelen));

View File

@ -8,7 +8,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.2 Version: 1.4.2
Release: 29%{?dist} Release: 30%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -74,6 +74,7 @@ Patch49: cups-gnutls-gcrypt-threads.patch
Patch50: cups-str3458.patch Patch50: cups-str3458.patch
Patch51: cups-0755.patch Patch51: cups-0755.patch
Patch52: cups-str3460.patch Patch52: cups-str3460.patch
Patch53: cups-EAI_AGAIN.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -262,6 +263,7 @@ module.
%patch50 -p1 -b .str3458 %patch50 -p1 -b .str3458
%patch51 -p1 -b .0755 %patch51 -p1 -b .0755
%patch52 -p1 -b .str3460 %patch52 -p1 -b .str3460
%patch53 -p1 -b .EAI_AGAIN
%if %lspp %if %lspp
%patch100 -p1 -b .lspp %patch100 -p1 -b .lspp
@ -552,6 +554,10 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Tue Feb 23 2010 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-30
- Re-initialize the resolver if getnameinfo() returns EAI_AGAIN
(bug #567353).
* Mon Feb 15 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-29 * Mon Feb 15 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-29
- Improve cups-gnutls-gcrypt-threads.patch (#564841, STR #3461). - Improve cups-gnutls-gcrypt-threads.patch (#564841, STR #3461).