php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-10 09:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
127,716 Commits 547 Branches 1,483 Tags
php-8.1.16
Commit Graph

1428 Commits

Author SHA1 Message Date
Niels Dossche
347b7c3628 Fix wrong flags check for compression method in phar_object.c 
I found this issue using static analysis tools, it reported that the condition was always false.
We can see that flags is assigned in the switch statement above, but a mistake was made in the comparison.

Closes GH-10328

Signed-off-by: George Peter Banyard <girgias@php.net>
 2023-01-15 15:35:35 +00:00
Christoph M. Becker
d981def074 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix new bug81726.phpt for PHP 8.0
 2022-09-27 18:45:54 +02:00
Christoph M. Becker
809176dab0 Fix new bug81726.phpt for PHP 8.0 
The error message has slightly changed, so we adapt our expectations.
 2022-09-27 18:40:02 +02:00
Christoph M. Becker
4552f62911 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix regression introduced by fixing bug 81726
 2022-09-27 18:24:07 +02:00
Christoph M. Becker
3477499d26 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix regression introduced by fixing bug 81726
 2022-09-27 18:22:57 +02:00
Christoph M. Becker
432bf196d5 Fix regression introduced by fixing bug 81726 
When a tar phar is created, `phar_open_from_fp()` is also called, but
since the file has just been created, none of the format checks can
succeed, so we continue to loop, but must not check again for the
format.  Therefore, we bring back the old `test` variable.

Closes GH-9620.
 2022-09-27 18:21:32 +02:00
Derick Rethans
cfee252a95 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-27 14:11:31 +01:00
Derick Rethans
def8c8d174 Merge branch 'PHP-7.4' into PHP-8.0 2022-09-27 14:11:14 +01:00
Christoph M. Becker
404e8bdb68 Fix #81726: phar wrapper: DOS when using quine gzip file 
The phar wrapper needs to uncompress the file; the uncompressed file
might be compressed, so the wrapper implementation loops. This raises
potential DOS issues regarding too deep or even infinite recursion (the
latter are called compressed file quines[1]). We avoid that by
introducing a recursion limit; we choose the somewhat arbitrary limit
`3`.

This issue has been reported by real_as3617 and gPayl0ad.

[1] <https://honno.dev/gzip-quine/>
 2022-09-09 17:10:04 +01:00
Christoph M. Becker
c9fba10242 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix test XFAIL, update phar to use spl_autoload_register
 2022-05-02 14:00:19 +02:00
Michael Voříšek
60487621c1 Fix test XFAIL, update phar to use spl_autoload_register 
Closes GH-8449.
 2022-05-02 13:58:25 +02:00
George Peter Banyard
be2500f229 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix param name order for Phar::copy()
 2021-09-08 12:32:58 +01:00
George Peter Banyard
0d0c9acafb Fix param name order for Phar::copy() 2021-09-08 12:31:09 +01:00
Stanislav Malyshev
1fefd482f4 Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix test
 2021-08-23 23:44:06 -07:00
Stanislav Malyshev
ffcf5ba4ae Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix test
 2021-08-23 23:43:58 -07:00
Stanislav Malyshev
c1f427b506 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix test
 2021-08-23 23:43:51 -07:00
Stanislav Malyshev
b815645aac Fix test 2021-08-23 23:43:32 -07:00
Stanislav Malyshev
18ebe1588d Merge branch 'PHP-8.0' 
* PHP-8.0:
  Update NEWS
  Fix #81211: Symlinks are followed when creating PHAR archive
 2021-08-23 23:31:00 -07:00
Stanislav Malyshev
33e4174d1c Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Update NEWS
  Fix #81211: Symlinks are followed when creating PHAR archive
 2021-08-23 23:30:34 -07:00
Stanislav Malyshev
40db8947e2 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Update NEWS
  Fix #81211: Symlinks are followed when creating PHAR archive
 2021-08-23 23:29:01 -07:00
Christoph M. Becker
2ff853aa11 Fix #81211: Symlinks are followed when creating PHAR archive 
It is insufficient to check whether the `base` is contained in `fname`;
we also need to ensure that `fname` is properly separated.  And of
course, `fname` has to start with `base`.
 2021-08-23 23:25:16 -07:00
Nikita Popov
ddc21b0902 Fix phar test 
As the REPORT_ERRORS flag is now respected, this no longer
throws a warning (in addition to the exception).
 2021-08-17 14:57:17 +02:00
Remi Collet
c51af22fef implement openssl_256 and openssl_512 for phar singatures 2021-08-11 14:13:57 +02:00
Remi Collet
8bb0c74e24 switch phar to use sha256 signature by default 2021-08-11 14:13:54 +02:00
Nikita Popov
1a370d3321 Skip some tests under --preload 
A genuine problem here is that we sometime get different class
casing due interaction with the ZSTR CE cache. Ignore these for
now.
 2021-07-30 17:26:39 +02:00
Nikita Popov
bca1ebf529 Merge branch 'PHP-8.0' 
* PHP-8.0:
  Create interned strings for internal union types
  Duplicate possibly persistent string in phar metadata clone
 2021-07-20 16:24:33 +02:00
Nikita Popov
9726bc6977 Duplicate possibly persistent string in phar metadata clone 2021-07-20 16:24:00 +02:00
Máté Kocsis
75a678a7e3 Declare tentative return types for Zend (#7251) 
Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>
 2021-07-19 13:44:20 +02:00
Nikita Popov
edb6b375dd Don't return bool from Phar::offsetUnset() 
This violates the ArrayAccess interface. Use offsetExists() to
check if an entry exists.
 2021-07-16 16:39:27 +02:00
Nikita Popov
4423253700 Fix deprecation warnings in phar.php 2021-07-16 14:19:01 +02:00
Máté Kocsis
c6357b804e Declare tentative return types for ext/spl - part 1 (#7115) 2021-07-13 13:04:45 +02:00
Nikita Popov
3fc3cfbad0 Fix Phar::offsetGet() return type 
It's possible to change the returned type using setFileClass(),
which unfortunately only enforces that it's a subtype of
SplFileInfo, not PharFileInfo.
 2021-07-13 12:02:05 +02:00
Nikita Popov
5502910ed8 Fix phar test 
Make getCurrentLine() return a string rather than an array.
 2021-07-06 14:53:50 +02:00
Anatol Belski
e7123ef569 phar: crc32: Extend and cleanup API for the new bulk crc32 functions 
As suggested on the patch discussion, adding init/end macros. Plus,
prefixed the new functions with php_ to avoid possible symbol conflicts.

Signed-off-by: Anatol Belski <ab@php.net>
 2021-07-03 21:03:47 +02:00
Patrick Allaert
aff365871a Fixed some spaces used instead of tabs 2021-06-29 11:30:26 +02:00
jianxind
28a1a6be08 phar: use crc32 bulk method instead. (#6099) 
phar: use crc32 bulk method instead.

Benefit from the hardware crc32 computing.

Signed-off-by: Frank Du <frank.du@intel.com>
 2021-06-19 22:21:21 +02:00
Nikita Popov
39131219e8 Migrate more SKIPIF -> EXTENSIONS (#7139) 
This is a mix of more automated and manual migration. It should remove all applicable extension_loaded() checks outside of skipif.inc files.
 2021-06-11 12:58:44 +02:00
Nikita Popov
7485978339 Migrate SKIPIF -> EXTENSIONS (#7138) 
This is an automated migration of most SKIPIF extension_loaded checks.
 2021-06-11 11:57:42 +02:00
Máté Kocsis
83916e83b4 Declare tentative return types for ext/phar (#7052) 2021-05-28 15:07:15 +02:00
Máté Kocsis
0224cc83fc Merge branch 'PHP-8.0' 
* Add a few missing RETURN_THROWS();
* Fix a few ext/phar return types
 2021-05-27 16:32:16 +02:00
Máté Kocsis
9bba9f68df Fix a few ext/phar return types 2021-05-27 16:31:18 +02:00
Máté Kocsis
2d47447d66 Add a few missing RETURN_THROWS(); 
Only PharFileInfo::compress() really needs it though.
 2021-05-27 16:31:18 +02:00
Nikita Popov
f57526a07a Store base path as zend_string in Phar::buildFrom* 
This also removes the need to check for length overflow, as the
length is now size_t.
 2021-05-27 10:57:51 +02:00
Nikita Popov
8c192c717c Accept regex as zend_string in Phar::buildFromDirectory() 
No need to copy it...
 2021-05-27 10:51:51 +02:00
twosee
9066d695e9 Remove all *_EXTERN_C() in C source files (#7054) 2021-05-27 15:52:54 +08:00
George Peter Banyard
e7135cb817 Use zend_string_equals_* API in a couple of more place 
Closes GH-6979
 2021-05-14 13:45:17 +01: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
Christoph M. Becker
c8a966a9ae Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix #80960: opendir() warning wrong info when failed on Windows
 2021-04-19 16:18:03 +02:00
Christoph M. Becker
cb262cd974 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80960: opendir() warning wrong info when failed on Windows
 2021-04-19 16:17:01 +02:00
Christoph M. Becker
ea3c992bff Fix #80960: opendir() warning wrong info when failed on Windows 
Firstly, we must not forget to set appropriate error codes for "manual"
checks in `virtual_file_ex()`.

Secondly, we must not call `php_error_docref2()` for warnings regarding
unary functions; thus, we introduce `php_win32_docref1_from_error()`.

Closes GH-6872.
 2021-04-19 16:12:22 +02:00