From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 26 Aug 2015 18:32:22 +0000 (+0000)
Subject: The new PDF file type rule did not work (STR #4692)
X-Git-Tag: v2.2b1~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff455bc67fc7aafeee3cc56bc85efb66c1af4ec8;p=thirdparty%2Fcups.git

The new PDF file type rule did not work (STR #4692)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12847 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index d3c080a8ef..70c5c58511 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ CHANGES IN CUPS V2.1.0
 	  (<rdar://problem/22086642>, <rdar://problem/22130168>)
 	- "make check" incorrectly reported an expectation of 18 warning
 	  messages when 8 were expected (STR #4684)
+	- The new PDF file type rule did not work (STR #4692)
 	- Fixed some configure script issues (STR #4694, STR #4695)
 
 
diff --git a/conf/mime.types b/conf/mime.types
index 68759232a5..dcb07710ef 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -71,7 +71,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") \