Merge pull request #4868 from nxhack/CVE-2017-1000250

[feed/packages.git] / net / squid / patches / 100-mime.patch

diff --git a/net/squid/patches/100-mime.patch b/net/squid/patches/100-mime.patch
index b5f3aaf8f4b766f73fb6cd289fc107fc83f7cbfd..1138a413dd9d89ffc112a48b9b44308ee0f16088 100644 (file)
--- a/net/squid/patches/100-mime.patch
+++ b/net/squid/patches/100-mime.patch
@@ -1,29 +1,30 @@
 --- a/src/mime.conf.default
 +++ b/src/mime.conf.default
-@@ -1,19 +1,3 @@
--# This file associates filename extensions (for servers or services
--# that don't automatically include them - like ftp) with a mime type
--# and a graphical icon.
--#
--#
--# This file has the format :
--# regex content-type icon content-encoding transfer-mode
--#-----------------------------------------------------------------------------------
+@@ -1,20 +1,3 @@
+-## Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+-##
+-## Squid software is distributed under GPLv2+ license and includes
+-## contributions from numerous individuals and organizations.
+-## Please see the COPYING and CONTRIBUTORS files for details.
+-##
 -#
+-# This file associates URL patterns for servers or services
+-# that don't automatically include Content-Type (like ftp) with a mime type
+-# and a graphical icon.
 -#
 -# Content-Encodings are taken from section 3.1 of RFC2068 (HTTP/1.1)
 -#
--#
+-# This file has the format :
 -#
 -# regexp      content-type                    icon                            encoding mode   actions
 -#--------------------------------------------------------------------------------------------------------
  \.gif$                        image/gif               silk/image.png                  -       image   +download
  \.mime$                       www/mime                silk/page_white_text.png        -       ascii   +download
  ^internal-dirup$      -                       silk/arrow_up.png               -       -
-@@ -190,6 +174,4 @@ README             text/plain                      silk/information.pn
+@@ -191,6 +174,4 @@ README             text/plain                      silk/information.pn
  \.xml$                text/xml                        silk/page_world.png             -       ascii   +download
  \.xsl$                text/xml                        silk/layout.png                 -       ascii   +download
  \.xyz$                chemical/x-xyz                  silk/chart_line.png             -       image   +download
--
+-#
 -# the default
  .             text/plain                      silk/bullet_red.png             -       image   +download +view