Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-print/cups/files: cups-1.4.6-web-hang.patch
Date: Sat, 30 Apr 2011 15:39:55
Message-Id: 20110430153945.1C32820057@flycatcher.gentoo.org
1 scarabeus 11/04/30 15:39:45
2
3 Added: cups-1.4.6-web-hang.patch
4 Log:
5 Revision bump to fix few bugs reported on bugzilla. Wrong libgcrypt dependency and cgi hangup.
6
7 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 net-print/cups/files/cups-1.4.6-web-hang.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.4.6-web-hang.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.4.6-web-hang.patch?rev=1.1&content-type=text/plain
14
15 Index: cups-1.4.6-web-hang.patch
16 ===================================================================
17 Index: cgi-bin/html.c
18 ===================================================================
19 --- cgi-bin/html.c (revision 9428)
20 +++ cgi-bin/html.c (working copy)
21 @@ -1,9 +1,9 @@
22 /*
23 * "$Id: cups-1.4.6-web-hang.patch,v 1.1 2011/04/30 15:39:45 scarabeus Exp $"
24 *
25 - * HTML support functions for the Common UNIX Printing System (CUPS).
26 + * HTML support functions for CUPS.
27 *
28 - * Copyright 2007-2009 by Apple Inc.
29 + * Copyright 2007-2011 by Apple Inc.
30 * Copyright 1997-2006 by Easy Software Products.
31 *
32 * These coded instructions, statements, and computer programs are the
33 @@ -208,31 +208,13 @@
34 int /* O - 1 if multi-part supported, 0 otherwise */
35 cgiSupportsMultipart(void)
36 {
37 - const char *user_agent; /* User-Agent string */
38 - static int supports_multipart = -1;/* Cached value */
39 + /*
40 + * Too many bug reports for browsers that don't support it, and too much pain
41 + * to whitelist known-good browsers, so for now we just punt on multi-part
42 + * support... :(
43 + */
44
45 -
46 - if (supports_multipart < 0)
47 - {
48 - /*
49 - * CUPS STR #3049: Apparently some browsers don't support multi-part
50 - * documents, which makes them useless for many web sites. Rather than
51 - * abandoning those users, we'll offer a degraded single-part mode...
52 - *
53 - * Currently we know that anything based on Gecko, MSIE, and Safari all
54 - * work. We'll add more as they are reported/tested.
55 - */
56 -
57 - if ((user_agent = getenv("HTTP_USER_AGENT")) != NULL &&
58 - (strstr(user_agent, " Gecko/") != NULL ||
59 - strstr(user_agent, " MSIE ") != NULL ||
60 - strstr(user_agent, " Safari/") != NULL))
61 - supports_multipart = 1;
62 - else
63 - supports_multipart = 0;
64 - }
65 -
66 - return (supports_multipart);
67 + return (0);
68 }