php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
130,022 Commits 549 Branches 1,484 Tags
31aeed270dfd6e138b7c0d2d194f65b3d3742739
Commit Graph

62912 Commits

Author SHA1 Message Date
Anatol Belski 3c602fdf67 libmagic: Keep the WS limitation piece 
Signed-off-by: Anatol Belski <ab@php.net>
 2022-10-02 21:00:03 +02:00
Anatol Belski 1b39d4c6d2 libmagic: Further simplify diff 
Avoid displaced lines where not necessary, use include guard and don't
change called function names.

Signed-off-by: Anatol Belski <ab@php.net>
 2022-10-02 20:48:35 +02:00
Anatol Belski 962c082a5b fileinfo: Fix expected values for test on s390x 
The peak memory usage increased by the blanket 1mb on s390 only.
This is good to note but otherwise seems acceptable, so just
adjusting the test is fine.

Signed-off-by: Anatol Belski <ab@php.net>
 2022-10-02 19:57:41 +02:00
Anatol Belski bb6b41c3b1 Revert "fileinfo: tests: Disable times sensitive tests on debug build" 
This reverts commit cab2f05f5a.
 2022-10-02 18:39:54 +02:00
Anatol Belski 78b6f0d255 fileinfo: libmagic: Update libmagic.patch 
[ci skip]

Signed-off-by: Anatol Belski <ab@php.net>
 2022-10-02 18:26:06 +02:00
Anatol Belski 5c9cb24aa0 libmagic: Follow up fixes for 5.43 
Fixes possible build and runtime issues on Windows.`

Signed-off-by: Anatol Belski <ab@php.net>
 2022-10-02 16:11:50 +02:00
Anatol Belski 25bb817804 fileinfo: libmagic: Simplify libmagic patch 
For the time being, the new args passing pre-compiled regex are cut out.
On the PHP side, PCRE patterns are cached and thus a duplicated
mechanism isn't necessary.

There might be still advantages to carry pre-compiled patterns for
libmagic separately, but reusing this mechanism needs a better
consideration, as it might require to retain from the PHP internal pattern
caching mechanism.

Signed-off-by: Anatol Belski <ab@php.net>
 2022-10-02 03:02:47 +02:00
Anatol Belski a4280d23dd fileinfo: tests: Sync more upstream tests and fix phpt 
Signed-off-by: Anatol Belski <ab@php.net>
 2022-10-02 03:02:47 +02:00
Anatol Belski a3dd514d4d fileinfo: Introduce php_libmagic.* to simplify patch 
Signed-off-by: Anatol Belski <ab@php.net>
 2022-10-02 03:02:47 +02:00
Anatol Belski a24727a5ca fileinfo: libmagic: Apply libmagic.patch 
Signed-off-by: Anatol Belski <ab@php.net>
 2022-10-02 03:02:46 +02:00
Anatol Belski 6219d7fbc6 fileinfo: libmagic: Check in unpatched 5.43 
Signed-off-by: Anatol Belski <ab@php.net>
 2022-10-02 03:02:46 +02:00
Christoph M. Becker 63a0775474 Merge branch 'PHP-8.2' 
* PHP-8.2:
  gh9590.phpt requires ext/posix
 2022-10-01 14:35:15 +02:00
Christoph M. Becker a5003bb4f4 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  gh9590.phpt requires ext/posix
 2022-10-01 14:34:59 +02:00
Christoph M. Becker 48ae3a0e3f gh9590.phpt requires ext/posix 2022-10-01 14:34:24 +02:00
Christoph M. Becker d6a958e861 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Use --EXTENSIONS-- section for newly added tests
 2022-10-01 14:09:43 +02:00
Christoph M. Becker c5f53c4ef4 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Use --EXTENSIONS-- section for newly added tests
 2022-10-01 14:09:26 +02:00
Christoph M. Becker 47c79a97f5 Use --EXTENSIONS-- section for newly added tests 
As of PHP 8.1.0, the `--EXTENSIONS-- section is properly supported, and
CIs may make use of that (our AppVeyor CI does).  Thus it is important
to list required extensions there, since otherwise they may not be
loaded, causing the test to be skipped, or worse, to be borked.
 2022-10-01 14:08:59 +02:00
Arnaud Le Blanc 5b6f9df51a Merge branch 'PHP-8.2' 
* PHP-8.2:
  [ci skip] NEWS
  [ci skip] NEWS
  [ci skip] NEWS
  Return immediately when FD_SETSIZE is exceeded (#9602)
 2022-10-01 11:26:17 +02:00
Arnaud Le Blanc 246d13cd99 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [ci skip] NEWS
  [ci skip] NEWS
  Return immediately when FD_SETSIZE is exceeded (#9602)
 2022-10-01 11:24:23 +02:00
Arnaud Le Blanc d4b99542d5 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  [ci skip] NEWS
  Return immediately when FD_SETSIZE is exceeded (#9602)
 2022-10-01 11:23:34 +02:00
Arnaud Le Blanc 80232de0e4 Return immediately when FD_SETSIZE is exceeded (#9602) 2022-10-01 11:20:43 +02:00
Jakub Zelenka ac7d812fb7 Merge branch 'PHP-8.2' 2022-09-30 17:10:15 +01:00
Jakub Zelenka d2b7d67dac Merge branch 'PHP-8.1' into PHP-8.2 2022-09-30 17:08:55 +01:00
Jakub Zelenka ee8f2c75e0 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-30 17:08:17 +01:00
Andy Postnikov c58241a003 Make socket path shorter for ext/sockets/tests/socket_cmsg_{rights|credentials}.phpt 
When running in CI it fails when path/address is longer 108
 2022-09-30 17:07:40 +01:00
Máté Kocsis ed0f1f04b9 Declare ext/standard constants in stubs - part 8 (#9615) 2022-09-30 13:51:18 +02:00
David Carlier 615b8006c4 socket module add SO_ATTACH_REUSEPORT_CPBF for Linux. 
to be used in conjunction with SO_REUSPORT, giving a greater control
over how we bind a socket instead of the round robin workflow, we do
 instead attach to the processor id as :
- we assign the processor_id to A in the BPF filter.
- then returns A.

in other words, a more modern version of SO_INCOMING_CPU (ie can have a per
 worker notion we do not use here).
Closes #8062
 2022-09-29 23:32:39 +01:00
David Carlier e23076f527 Merge branch 'PHP-8.2' 2022-09-29 20:40:57 +01:00
David Carlier ed1d41465a Merge branch 'PHP-8.1' into PHP-8.2 2022-09-29 20:40:45 +01:00
David Carlier 2440d29efd Merge branch 'PHP-8.0' into PHP-8.1 2022-09-29 20:40:33 +01:00
David Carlier 257f108924 fix php_init_crypt_r/php_shutdown_crypt_r signatures warning. 2022-09-29 20:40:16 +01:00
Dmitry Stogov e69a3c3e6b Merge branch 'PHP-8.2' 
* PHP-8.2:
  Force exit to VM
 2022-09-29 15:28:28 +03:00
Dmitry Stogov efcffc9d5f Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Force exit to VM
 2022-09-29 15:28:23 +03:00
Dmitry Stogov aa179bf3dd Force exit to VM 2022-09-29 15:27:38 +03:00
Dmitry Stogov 6bb0b705fc Merge branch 'PHP-8.2' 
* PHP-8.2:
  Keep original EG(jit_trace_num) value around __autoload()
 2022-09-29 15:01:50 +03:00
Dmitry Stogov 57a01e3a4a Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Keep original EG(jit_trace_num) value around __autoload()
 2022-09-29 15:01:39 +03:00
Dmitry Stogov f7d0a3e0e0 Keep original EG(jit_trace_num) value around __autoload() 2022-09-29 15:00:52 +03:00
Ilija Tovilo a5fdfc4fc0 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci ] Rename matrix-include output on old branches
  Updated to version 2022.4 (2022d)
  Updated to version 2022.4 (2022d)
 2022-09-29 13:08:45 +02:00
Derick Rethans dc985723c8 Updated to version 2022.4 (2022d) 2022-09-29 11:52:09 +01:00
Derick Rethans 0360e62cae Updated to version 2022.4 (2022d) 2022-09-29 11:52:08 +01:00
Derick Rethans d16b5d3803 Updated to version 2022.4 (2022d) 2022-09-29 11:52:06 +01:00
Christoph M. Becker 4a8e35ceed Merge branch 'PHP-8.2' 
* PHP-8.2:
  Revert unintended test expectation change
 2022-09-28 12:15:06 +02:00
Christoph M. Becker 3d2d7d1000 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Revert unintended test expectation change
 2022-09-28 12:14:39 +02:00
Christoph M. Becker 9caa71f94f Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Revert unintended test expectation change
 2022-09-28 12:13:39 +02:00
Athos Ribeiro e6a822d437 Revert unintended test expectation change 
Commit fbe3059 included an unintended change to the test which checks if
dns_get_record populates its additional parameter. This patch reverts
such change.

The issue was not detected by the CIs because their tests run in
the --offline mode, and the test in question needs internet connection.

Closes GH-9625.
 2022-09-28 12:12:21 +02:00
Ilija Tovilo 4e747599c8 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Skip some OCI tests with repeat
 2022-09-27 23:32:48 +02:00
Ilija Tovilo 81bedb0f7d Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Skip some OCI tests with repeat
 2022-09-27 23:32:37 +02:00
Ilija Tovilo 93e509fd8c Skip some OCI tests with repeat 2022-09-27 23:32:15 +02:00
Ilija Tovilo 518f108b01 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix invalid label before }
 2022-09-27 23:28:22 +02:00
Ilija Tovilo 980c2edbe2 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix invalid label before }
 2022-09-27 23:28:07 +02:00