From 83c78409a13dd3ad73ae15d9698b2ac47cde36d3 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Apr 26 2009 12:19:29 +0000
Subject: - Accept "Host: ::1" (bug #497393).


---

diff --git a/cups-localhost-ipv6.patch b/cups-localhost-ipv6.patch
new file mode 100644
index 0000000..98625bc
--- /dev/null
+++ b/cups-localhost-ipv6.patch
@@ -0,0 +1,13 @@
+diff -up cups-1.3.10/scheduler/client.c.localhost-ipv6 cups-1.3.10/scheduler/client.c
+--- cups-1.3.10/scheduler/client.c.localhost-ipv6	2009-04-24 18:13:29.000000000 +0100
++++ cups-1.3.10/scheduler/client.c	2009-04-26 12:40:49.000000000 +0100
+@@ -5050,7 +5050,8 @@ valid_host(cupsd_client_t *con)		/* I - 
+             !strcmp(host, "127.0.0.1") ||
+ 	    !strncmp(host, "127.0.0.1:", 10) ||
+ 	    !strcmp(host, "[::1]") ||
+-	    !strncmp(host, "[::1]:", 6));
++	    !strncmp(host, "[::1]:", 6) ||
++	    !strcmp(host, "::1"));
+   }
+ 
+ #ifdef HAVE_DNSSD
diff --git a/cups.spec b/cups.spec
index 2b15ec3..a669b08 100644
--- a/cups.spec
+++ b/cups.spec
@@ -48,6 +48,7 @@ Patch21: cups-usb-paperout.patch
 Patch22: cups-getnameddest.patch
 Patch23: cups-str2101.patch
 Patch24: cups-str2536.patch
+Patch25: cups-localhost-ipv6.patch
 Patch26: cups-str3023.patch
 Patch29: cups-str2831.patch
 Patch100: cups-lspp.patch
@@ -184,6 +185,7 @@ module.
 %patch22 -p1 -b .getnameddest
 %patch23 -p1 -b .str2101
 %patch24 -p1 -b .str2536
+%patch25 -p1 -b .localhost-ipv6
 %patch26 -p1 -b .str3023
 %patch29 -p1 -b .str2831
 
@@ -478,7 +480,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/php/modules/*.so
 
 %changelog
-* Fri Apr 24 2009 Tim Waugh <twaugh@redhat.com> 1:1.3.10-2
+* Sun Apr 26 2009 Tim Waugh <twaugh@redhat.com> 1:1.3.10-2
+- Accept "Host: ::1" (bug #497393).
 - Accept Host: fields set to the ServerName value (bug #497301).
 - Temporarily relax requirement to have printer-uri attribute in
   IPP-Get-Jobs request (bug #497519).