php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 07:28:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
128,151 Commits 549 Branches 1,485 Tags
php-8.1.24
Commit Graph

827 Commits

Author SHA1 Message Date
Anatol Belski 86f79b299e fileinfo: Backport xz detection fix 
Upstream: https://github.com/file/file/commit/9b0459afab309a82aa4e46f73a4e50dd641f3d39

Fixes: #11298

Signed-off-by: Anatol Belski <ab@php.net>
 2023-07-01 17:58:38 +02:00
Anatol Belski cab2f05f5a fileinfo: tests: Disable times sensitive tests on debug build 
Signed-off-by: Anatol Belski <ab@php.net>
 2022-09-25 20:43:31 +02:00
Anatol Belski 34fa65a6c2 fileinfo: magic: Backport mime type support for woff/woff2 fonts 
Upstream patch: https://github.com/file/file/commit/7a821aedc144f70ec848ea632a64db74b79563c1

Fixes GH-8805.

Signed-off-by: Anatol Belski <ab@php.net>
(cherry picked from commit 8a2ebe069148909a00739c83e9bcc031734bf826)
 2022-09-18 14:39:12 +02:00
Christoph M. Becker ca6d511fa5 Fix #81723: Memory corruption in finfo_buffer() 
We need to use the same memory allocator throughout.
 2022-07-05 00:44:00 -06:00
George Peter Banyard 16c98d481f Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix Bug #81462 mime_content_type() indicates wrong arg num on TypeError
 2021-09-20 22:48:46 +01:00
George Peter Banyard 0ea38b9509 Fix Bug #81462 mime_content_type() indicates wrong arg num on TypeError 2021-09-20 22:48:00 +01:00
Anatol Belski 1399e08ab9 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  fileinfo: Fix test value for s390x on travis-ci
 2021-09-19 16:04:47 +02:00
Anatol Belski fafdf744fa Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  fileinfo: Fix test value for s390x on travis-ci
 2021-09-19 16:04:35 +02:00
Anatol Belski 8f75ab0dfc fileinfo: Fix test value for s390x on travis-ci 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-19 16:02:30 +02:00
Anatol Belski 62bfadc3b8 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  fileinfo: Capture more sizes for test as delivered by travis-ci
  fileinfo: Capture more sizes for test as delivered by AppVeyor
 2021-09-18 23:18:11 +02:00
Anatol Belski d225770e9e Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  fileinfo: Capture more sizes for test as delivered by travis-ci
  fileinfo: Capture more sizes for test as delivered by AppVeyor
 2021-09-18 23:17:41 +02:00
Anatol Belski 6e0acece68 fileinfo: Capture more sizes for test as delivered by travis-ci 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-18 23:16:38 +02:00
Anatol Belski e56435c86d fileinfo: Capture more sizes for test as delivered by AppVeyor 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-18 23:06:57 +02:00
Anatol Belski f88fb1af5f Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  fileinfo: Adjust value in test
 2021-09-18 22:52:52 +02:00
Anatol Belski a4f85a5796 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  fileinfo: Adjust value in test
 2021-09-18 22:52:30 +02:00
Anatol Belski 0208374ad4 fileinfo: Adjust value in test 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-18 22:51:08 +02:00
Anatol Belski df5d7ec482 fileinfo: Fix test skip condition 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-18 22:36:04 +02:00
Anatol Belski 31c908af8e Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  libmagic: Update patch
  fileinfo: Fixed bug #78987 High memory usage during encoding detection
 2021-09-18 22:11:06 +02:00
Anatol Belski 3c40d9bf77 libmagic: Update patch 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-18 22:04:32 +02:00
Anatol Belski 2a9a521d71 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  fileinfo: Fixed bug #78987 High memory usage during encoding detection
 2021-09-18 22:02:56 +02:00
Anatol Belski fa96c7e000 fileinfo: Fixed bug #78987 High memory usage during encoding detection 
The default buffer size for the encoding detection is set to 64K.

Signed-off-by: Anatol Belski <ab@php.net>
 2021-09-18 21:00:30 +02:00
Máté Kocsis 50f31829b1 Generate optimizer func info from stubs for a few extensions - part 2 (#7401) 
ext/bcmath, ext/fileinfo, ext/filter, ext/gettext, ext/session
 2021-08-25 15:29:46 +02:00
Máté Kocsis 2378f35787 Use single line phpdoc in stubs where possible 2021-07-20 13:16:56 +02:00
Joe Watkins 570d9b63e9 Not serializable flag permeation 2021-07-20 12:28:35 +02:00
Nikita Popov 4a107523bf Merge branch 'PHP-8.0' 
* PHP-8.0:
  Regenerate arginfo file
  Fixed bug #80197
 2021-06-14 11:00:15 +02:00
Nikita Popov 5dc31e0cb6 Fixed bug #80197 
Use "libmagic/magic.h" rather than <magic.h> to make sure that we
use the bundled libmagic, even if there is a system libmagic on the
include path.
 2021-06-14 10:59:13 +02:00
Máté Kocsis 657cb45b84 Declare tentative return types for ext/fileinfo 
Relates to GH-6985
 2021-05-26 12:30:31 +02:00
KsaR 01b3fc03c3 Update http->https in license (#6945) 
1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as 3.0 states "php 5.1.1, 4.1.1, and earlier".
3. In some license comments is "at through the world-wide-web" while most is without "at", so deleted.
4. fixed indentation in some files before |
 2021-05-06 12:16:35 +02:00
Anatol Belski 9b78000432 Revert "fileinfo: Obey POSIX in pattern conversion" 
This reverts commit 343d1c2b1f.

Also remove the incompatible test data for time being. The new line
handling will need an extra fix.

Signed-off-by: Anatol Belski <ab@php.net>
 2021-04-24 14:59:53 +02:00
Anatol Belski 343d1c2b1f fileinfo: Obey POSIX in pattern conversion 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-04-24 01:40:15 +02:00
Anatol Belski 34bdab538b fileinfo: Pull upstream tests 
Integrating the upstream tests is important to ensure the quality of the
patch and to ensure the parity in the function.

Signed-off-by: Anatol Belski <ab@php.net>
 2021-04-23 22:01:34 +02:00
Anatol Belski 6ab4286f2e fileinfo: Fix version in patch update script 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-04-09 23:18:21 +02:00
Anatol Belski 7251f3900e fileinfo: Update the patch 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-04-06 22:43:05 +02:00
Anatol Belski ecfb888354 fileinfo: Turn back the WS check mitigation 
Looks like there's still a timing issue shown on some pipeline runs.

Signed-off-by: Anatol Belski <ab@php.net>
 2021-04-06 12:29:04 +02:00
Anatol Belski 4af6679d78 fileinfo: Update libmagic.patch 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-04-05 22:41:00 +02:00
Anatol Belski f60dc3bd34 fileinfo: More VS compat 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-04-05 21:23:26 +02:00
Anatol Belski cd238bd09d fileinfo: Fix VS compat 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-04-05 21:10:20 +02:00
Anatol Belski f7ab54cbe7 fileinfo: Restore config.h for libmagic 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-04-05 20:56:41 +02:00
Anatol Belski 3b9173dc8f fileinfo: Port libmagic 5.40 
Signed-off-by: Anatol Belski <ab@php.net>
 2021-04-05 20:19:07 +02:00
Max Semenik bd9f4fa676 Migrate skip checks to --EXTENSIONS--, p2 
For rationale, see https://github.com/php/php-src/pull/6787

Make extension checks lowercase, add a special case for opcache
that has internal name not matching .so filename.

Extensions migrated in part 2:
* dom
* exif
* fileinfo
* ffi
 2021-04-01 12:08:24 +01:00
Máté Kocsis bf0f6aaf18 Improve class entry generation 
Related to GH-6701
 2021-02-16 13:09:56 +01:00
Nikita Popov b10416a652 Deprecate passing null to non-nullable arg of internal function 
This deprecates passing null to non-nullable scale arguments of
internal functions, with the eventual goal of making the behavior
consistent with userland functions, where null is never accepted
for non-nullable arguments.

This change is expected to cause quite a lot of fallout. In most
cases, calling code should be adjusted to avoid passing null. In
some cases, PHP should be adjusted to make some function arguments
nullable. I have already fixed a number of functions before landing
this, but feel free to file a bug if you encounter a function that
doesn't accept null, but probably should. (The rule of thumb for
this to be applicable is that the function must have special behavior
for 0 or "", which is distinct from the natural behavior of the
parameter.)

RFC: https://wiki.php.net/rfc/deprecate_null_to_scalar_internal_arg

Closes GH-6475.
 2021-02-11 21:46:13 +01:00
Nikita Popov 89c55afeb5 Merge branch 'PHP-8.0' 
* PHP-8.0:
  Make finfo_open() $magic_database nullable
 2021-02-10 12:21:15 +01:00
Nikita Popov fd5ff37db7 Make finfo_open() $magic_database nullable 
Empty string was interpreted as a special value here, which indicates
that the default magic database should be used. It makes more sense
to use null for this purpose.

The documentation also explicitly mentions that null can be used.
 2021-02-10 12:18:42 +01:00
Máté Kocsis 99b08ac281 Implicitly enable function entry generation when class entry generation is enabled 
Closes GH-6675
 2021-02-09 13:37:24 +01:00
Máté Kocsis 98fb565c74 Generate class entries from stubs for another batch of extensions 
Closes GH-6669
 2021-02-08 19:53:55 +01:00
Christoph M. Becker b85f0d1cd0 Convert file_info resources to objects 
Besides our general desire to get rid of the legacy resource types,
this is particularly appealing for fileinfo, because there are already
respective objects.

Closes GH-5987.
 2020-12-20 18:19:22 +01:00
Christoph M. Becker e589609b4c Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #77961: finfo_open crafted magic parsing SIGABRT
 2020-11-24 14:06:53 +01:00
Christoph M. Becker 39f95f5614 Fix #77961: finfo_open crafted magic parsing SIGABRT 
libmagic may abort the running process, which is not desirable for PHP;
we raise a fatal error instead.

Closes GH-6437.
 2020-11-24 14:01:15 +01:00
Christoph M. Becker 337031abbd [ci skip] Update generate_patch.sh 
This has apparently been forgotten when updating to libmagic 5.39.
 2020-11-24 13:38:31 +01:00