mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Merge branch 'PHP-7.4'
* PHP-7.4: Fix #79681: mime_content_type/finfo returning incorrect mimetype
This commit is contained in:
Christoph M. Becker
commit
0eaecb9c87
File diff suppressed because it is too large
Load Diff
@ -1,29 +1,80 @@
|
||||
diff --git a/magic/Magdir/rpm b/magic/Magdir/rpm
|
||||
index 9a795f8..31db083 100644
|
||||
--- a/magic/Magdir/rpm
|
||||
+++ b/magic/Magdir/rpm
|
||||
@@ -29,6 +29,7 @@
|
||||
>>8 beshort 17 SuperH
|
||||
>>8 beshort 18 Xtensa
|
||||
>>8 beshort 255 noarch
|
||||
+>>10 string x %s
|
||||
magic/Magdir/animation | 47 +++++++++++++++++++---------------------------
|
||||
magic/Magdir/images | 28 +++++++++++++--------------
|
||||
magic/Magdir/rpm | 1 +
|
||||
magic/Magdir/securitycerts | 2 ++
|
||||
4 files changed, 36 insertions(+), 42 deletions(-)
|
||||
|
||||
diff --git a/magic/Magdir/animation b/magic/Magdir/animation
|
||||
index aaf32dd4..5c9ee1d9 100644
|
||||
--- a/magic/Magdir/animation
|
||||
+++ b/magic/Magdir/animation
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
#delta RPM Daniel Novotny (dnovotny@redhat.com)
|
||||
0 string drpm Delta RPM
|
||||
diff --git a/magic/Magdir/securitycerts b/magic/Magdir/securitycerts
|
||||
index 8785dd8..1c340be 100644
|
||||
--- a/magic/Magdir/securitycerts
|
||||
+++ b/magic/Magdir/securitycerts
|
||||
@@ -4,3 +4,5 @@
|
||||
0 search/1 -----BEGIN\ CERTIFICATE------ RFC1421 Security Certificate text
|
||||
0 search/1 -----BEGIN\ NEW\ CERTIFICATE RFC1421 Security Certificate Signing Request text
|
||||
0 belong 0xedfeedfe Sun 'jks' Java Keystore File data
|
||||
+
|
||||
+0 string \0volume_key volume_key escrow packet
|
||||
|
||||
|
||||
--- a/magic.orig.0/Magdir/images 2019-04-19 02:42:27.000000000 +0200
|
||||
+++ b/magic/Magdir/images 2019-06-29 16:09:31.654107495 +0200
|
||||
#------------------------------------------------------------------------------
|
||||
-# $File: animation,v 1.71 2019/04/19 00:42:27 christos Exp $
|
||||
+# $File: animation,v 1.73 2019/07/05 19:20:38 christos Exp $
|
||||
# animation: file(1) magic for animation/movie formats
|
||||
#
|
||||
# animation formats
|
||||
@@ -445,36 +445,27 @@
|
||||
# modified by Joerg Jenderek
|
||||
# GRR the original test are too common for many DOS files
|
||||
# so don't accept as MP3 until we've tested the rate
|
||||
+# But also beat GEMDOS fonts
|
||||
0 beshort&0xFFFE 0xFFFA
|
||||
# rates
|
||||
->2 byte&0xF0 0x10 MPEG ADTS, layer III, v1, 32 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0x20 MPEG ADTS, layer III, v1, 40 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0x30 MPEG ADTS, layer III, v1, 48 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0x40 MPEG ADTS, layer III, v1, 56 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0x50 MPEG ADTS, layer III, v1, 64 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0x60 MPEG ADTS, layer III, v1, 80 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0x70 MPEG ADTS, layer III, v1, 96 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0x80 MPEG ADTS, layer III, v1, 112 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0x90 MPEG ADTS, layer III, v1, 128 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0xA0 MPEG ADTS, layer III, v1, 160 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0xB0 MPEG ADTS, layer III, v1, 192 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0xC0 MPEG ADTS, layer III, v1, 224 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0xD0 MPEG ADTS, layer III, v1, 256 kbps
|
||||
-!:mime audio/mpeg
|
||||
->2 byte&0xF0 0xE0 MPEG ADTS, layer III, v1, 320 kbps
|
||||
+>2 byte&0xF0 !0
|
||||
+>>2 byte&0xF0 !0xF0 MPEG ADTS, layer III, v1
|
||||
+!:strength +20
|
||||
!:mime audio/mpeg
|
||||
+>2 byte&0xF0 0x10 \b, 32 kbps
|
||||
+>2 byte&0xF0 0x20 \b, 40 kbps
|
||||
+>2 byte&0xF0 0x30 \b, 48 kbps
|
||||
+>2 byte&0xF0 0x40 \b, 56 kbps
|
||||
+>2 byte&0xF0 0x50 \b, 64 kbps
|
||||
+>2 byte&0xF0 0x60 \b, 80 kbps
|
||||
+>2 byte&0xF0 0x70 \b, 96 kbps
|
||||
+>2 byte&0xF0 0x80 \b, 112 kbps
|
||||
+>2 byte&0xF0 0x90 \b, 128 kbps
|
||||
+>2 byte&0xF0 0xA0 \b, 160 kbps
|
||||
+>2 byte&0xF0 0xB0 \b, 192 kbps
|
||||
+>2 byte&0xF0 0xC0 \b, 224 kbps
|
||||
+>2 byte&0xF0 0xD0 \b, 256 kbps
|
||||
+>2 byte&0xF0 0xE0 \b, 320 kbps
|
||||
# timing
|
||||
>2 byte&0x0C 0x00 \b, 44.1 kHz
|
||||
>2 byte&0x0C 0x04 \b, 48 kHz
|
||||
diff --git a/magic/Magdir/images b/magic/Magdir/images
|
||||
index 0e314ade..edf647d7 100644
|
||||
--- a/magic/Magdir/images
|
||||
+++ b/magic/Magdir/images
|
||||
@@ -30,22 +30,22 @@
|
||||
# Prevent conflicts with CRI ADX.
|
||||
>(2.S-2) belong !0x28632943
|
||||
@ -61,3 +112,25 @@ index 8785dd8..1c340be 100644
|
||||
# display tga bitmap image information
|
||||
0 name tga-image
|
||||
>2 ubyte <34 Targa image data
|
||||
diff --git a/magic/Magdir/rpm b/magic/Magdir/rpm
|
||||
index fa336c07..00bda501 100644
|
||||
--- a/magic/Magdir/rpm
|
||||
+++ b/magic/Magdir/rpm
|
||||
@@ -29,6 +29,7 @@
|
||||
>>8 beshort 17 SuperH
|
||||
>>8 beshort 18 Xtensa
|
||||
>>8 beshort 255 noarch
|
||||
+>>10 string x %s
|
||||
|
||||
#delta RPM Daniel Novotny (dnovotny@redhat.com)
|
||||
0 string drpm Delta RPM
|
||||
diff --git a/magic/Magdir/securitycerts b/magic/Magdir/securitycerts
|
||||
index d315a157..301d3c3d 100644
|
||||
--- a/magic/Magdir/securitycerts
|
||||
+++ b/magic/Magdir/securitycerts
|
||||
@@ -4,3 +4,5 @@
|
||||
0 search/1 -----BEGIN\ CERTIFICATE------ RFC1421 Security Certificate text
|
||||
0 search/1 -----BEGIN\ NEW\ CERTIFICATE RFC1421 Security Certificate Signing Request text
|
||||
0 belong 0xedfeedfe Sun 'jks' Java Keystore File data
|
||||
+
|
||||
+0 string \0volume_key volume_key escrow packet
|
||||
|
||||
Loading…
Reference in New Issue
Block a user