From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 28 Dec 2018 12:35:08 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.4.0alpha1~1323
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9bbc827f10311ff036d542a4fbca4e8699436a7;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fixed bug #77346 webm files incorrectly detected as application/octet-stream
---

a9bbc827f10311ff036d542a4fbca4e8699436a7