[cups/f17] backport fixes for STR #4191, STR #4194

[Tim Waugh]

commit 1de3a8b72790fde39fedc217fba5ca3513ca4358
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Oct 1 12:28:11 2012 +0200

    backport fixes for STR #4191, STR #4194

 cups-str4194.patch |   24 ++++++++++++++++++++++++
 cups.spec          |    5 +++++
 2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/cups-str4194.patch b/cups-str4194.patch
new file mode 100644
index 0000000..56905a6
--- /dev/null
+++ b/cups-str4194.patch
@@ -0,0 +1,24 @@
+From a94dbce56edeebbd3631ab6e734cf88248a41065 Mon Sep 17 00:00:00 2001
+From: mike <mike at 7a7537e8-13f0-0310-91df-b6672ffda945>
+Date: Mon, 1 Oct 2012 02:10:26 +0000
+Subject: [PATCH] The IPP backend could get stuck in an endless loop on
+ certain network errors (STR #4194)
+
+git-svn-id: http://svn.easysw.com/public/cups/trunk@10623 7a7537e8-13f0-0310-91df-b6672ffda945
+---
+diff --git a/backend/ipp.c b/backend/ipp.c
+index a53929e..b509996 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -952,6 +952,8 @@ main(int  argc,				/* I - Number of command-line args */
+ 	_cupsLangPrintFilter(stderr, "ERROR",
+ 	                     _("Unable to get printer status."));
+         sleep(10);
++
++	httpReconnect(http);
+       }
+ 
+       ippDelete(supported);
+-- 
+1.7.11.4
+
diff --git a/cups.spec b/cups.spec
index 8748e60..59b491e 100644
--- a/cups.spec
+++ b/cups.spec
@@ -75,6 +75,7 @@ Patch37: cups-ipp-no-create-job.patch
 Patch40: cups-r10572.patch
 Patch41: cups-str4072.patch
 Patch42: cups-str4124.patch
+Patch43: cups-str4194.patch
 
 Patch100: cups-lspp.patch
 
@@ -310,6 +311,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 # cupsBackendReport() now filters out all control characters
 # from the reported 1284 device IDs (STR #4124)
 %patch42 -p1 -b .str4124
+# The IPP backend could get stuck in an endless loop on certain network errors
+# (STR #4194)
+%patch43 -p1 -b .str4194
 
 %if %lspp
 # LSPP support.
@@ -680,6 +684,7 @@ rm -f %{cups_serverbin}/backend/smb
 
 %changelog
 * Thu Oct 11 2012 Jiri Popelka <jpopelka at redhat.com>
+- backport fixes for STR #4191, STR #4194
 - backport fixes for STR #4072, STR #4124
 - backport 2 upstream commits (r10572, r10573)