Merge pull request #5621 from zdohnal/cgigetarray-sigsegv

[thirdparty/cups.git] / conf / mime.types

diff --git a/conf/mime.types b/conf/mime.types
index 002674e43a11aa99fcfb9969aa1d2b387abfc2a5..fcd6b6effeee40f90b46c0762465820dd723d7eb 100644 (file)
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -1,20 +1,15 @@
 #
-# "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $"
-#
 # Base MIME types file for CUPS.
 #
 # DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
 # VERSIONS OF CUPS.  Instead, create a "local.types" file that
 # reflects your local configuration changes.
 #
-# Copyright 2007-2014 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products.
+# Copyright © 2007-2017 by Apple Inc.
+# Copyright © 1997-2007 by Easy Software Products.
 #
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file.  If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 ########################################################################
@@ -71,7 +66,7 @@
 #
 
 #application/msword            doc string(0,<D0CF11E0A1B11AE1>)
-application/pdf                        pdf regex(0,^[\\n\\r]*%PDF)
+application/pdf                        pdf regex(0,^[\n\r]*%PDF)
 application/postscript         ai eps ps string(0,%!) string(0,<04>%!) \
                                contains(0,128,<1B>%-12345X) + \
                                (contains(0,4096,"LANGUAGE=POSTSCRIPT") \
@@ -81,6 +76,7 @@ application/postscript                ai eps ps string(0,%!) string(0,<04>%!) \
                                 (contains(0,4096,<0a>%!) + \
                                  !contains(0,4096,"ENTER LANGUAGE")))
 
+
 ########################################################################
 #
 # Image files...
@@ -107,6 +103,7 @@ image/x-xpixmap                     xpm ascii(0,1024) + string(3,"XPM")
 image/x-sun-raster             ras string(0,<59a66a95>)
 
 #image/fpx                     fpx
+image/urf                      urf string(0,UNIRAST<00>)
 image/x-alias                  pix short(8,8) short(8,24)
 image/x-bitmap                 bmp string(0,BM) + !printable(2,14)
 image/x-icon                   ico
@@ -125,7 +122,7 @@ application/x-shell         sh printable(0,1024) + string(0,#!) +\
                                 contains(2,80,/sh) contains(2,80,/zsh))
 application/x-csource          c cxx cpp cc C h hpp \
                                printable(0,1024) + ! css + \
-                               (string(0,/*) string(0,//)
+                               (string(0,/*) string(0,//) \
                                 string(0,#include) contains(0,1024,<0a>#include) \
                                 string(0,#define) contains(0,1024,<0a>#define))
 text/html                      html htm printable(0,1024) +\
@@ -169,7 +166,3 @@ application/vnd.cups-raw    (string(0,<1B>E) + !string(2,<1B>%0B)) \
 #
 
 application/octet-stream
-
-#
-# End of "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $".
-#