Import CUPS v1.7.1

[thirdparty/cups.git] / cgi-bin / html.c

diff --git a/cgi-bin/html.c b/cgi-bin/html.c
index 2db9bdd25344daaa07177dc9216e71cb6f1a117d..af58c88f5ee7b7d0ccdd1e59f338474b1dc4f796 100644 (file)
--- a/cgi-bin/html.c
+++ b/cgi-bin/html.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: html.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: html.c 10996 2013-05-29 11:51:34Z msweet $"
  *
- *   HTML support functions for the Common UNIX Printing System (CUPS).
+ *   HTML support functions for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -68,7 +68,10 @@ void
 cgiEndMultipart(void)
 {
   if (cgi_multipart)
+  {
     printf("\n%s--\n", cgi_multipart);
+    fflush(stdout);
+  }
 }
 
 
@@ -190,8 +193,10 @@ cgiStartHTML(const char *title)            /* I - Title of page */
 void
 cgiStartMultipart(void)
 {
-  puts("MIME-Version: 1.0");
-  puts("Content-Type: multipart/x-mixed-replace; boundary=\"CUPS-MULTIPART\"\n");
+  puts("MIME-Version: 1.0\n"
+       "Content-Type: multipart/x-mixed-replace; boundary=\"CUPS-MULTIPART\"\n");
+  fflush(stdout);
+
   cgi_multipart = "--CUPS-MULTIPART";
 }
 
@@ -203,31 +208,13 @@ cgiStartMultipart(void)
 int                                    /* O - 1 if multi-part supported, 0 otherwise */
 cgiSupportsMultipart(void)
 {
-  const char   *user_agent;            /* User-Agent string */
-  static int   supports_multipart = -1;/* Cached value */
-
-
-  if (supports_multipart < 0)
-  {
-   /*
-    * CUPS STR #3049: Apparently some browsers don't support multi-part
-    * documents, which makes them useless for many web sites.  Rather than
-    * abandoning those users, we'll offer a degraded single-part mode...
-    *
-    * Currently we know that anything based on Gecko, MSIE, and Safari all
-    * work.  We'll add more as they are reported/tested.
-    */
-
-    if ((user_agent = getenv("HTTP_USER_AGENT")) != NULL &&
-        (strstr(user_agent, " Gecko/") != NULL ||
-        strstr(user_agent, " MSIE ") != NULL ||
-        strstr(user_agent, " Safari/") != NULL))
-      supports_multipart = 1;
-    else
-      supports_multipart = 0;
-  }
+ /*
+  * Too many bug reports for browsers that don't support it, and too much pain
+  * to whitelist known-good browsers, so for now we just punt on multi-part
+  * support... :(
+  */
 
-  return (supports_multipart);
+  return (0);
 }
 
 
@@ -248,5 +235,5 @@ cgi_null_passwd(const char *prompt) /* I - Prompt string (unused) */
 
 
 /*
- * End of "$Id: html.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: html.c 10996 2013-05-29 11:51:34Z msweet $".
  */