php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
139,963 Commits 545 Branches 1,479 Tags
c04f2d2d88840effe718a456ca9457f1e90e4e71
Commit Graph

139963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Dossche
c04f2d2d88 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Add missing cc clobber
 2025-07-22 12:43:21 +02:00
Niels Dossche
13c781f04d Add missing cc clobber 
Closes GH-19205.
 2025-07-22 12:43:08 +02:00
Niels Dossche
e572e899bd Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix test conflict between chmod_variation2 and file_variation5
 2025-07-21 23:57:49 +02:00
Niels Dossche
7ab37e81e0 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix test conflict between chmod_variation2 and file_variation5
 2025-07-21 23:57:42 +02:00
Niels Dossche
27f24bd9bc Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix test conflict between chmod_variation2 and file_variation5
 2025-07-21 23:57:34 +02:00
Niels Dossche
605ee05491 Fix test conflict between chmod_variation2 and file_variation5 
Both used "somelink".
See https://github.com/php/php-src/actions/runs/16427526464/job/46421461376

Closes GH-19208.
 2025-07-21 23:57:21 +02:00
Ilija Tovilo
c8cc23336d Fix properties_info_table for abstract properties 
Fixes GH-19053
Closes GH-19140

Co-authored-by: Bob Weinand <bobwei9@hotmail.com>
 2025-07-21 15:54:24 +02:00
Niels Dossche
f8196a5db5 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix GH-18640: heap-use-after-free ext/soap/php_encoding.c:299:32 in soap_check_zval_ref
 2025-07-20 19:49:56 +02:00
Niels Dossche
6cc4ae1f1d Fix GH-18640: heap-use-after-free ext/soap/php_encoding.c:299:32 in soap_check_zval_ref 
For attributes, relying on the ref_map doesn't make sense the first
place as you can't really refer to attributes from attributes.
The code therefore assumes that the node is unique, which is broken.

Closes GH-19181.
 2025-07-20 19:49:22 +02:00
Niels Dossche
cb73155945 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix GH-19098: libxml<2.13 segmentation fault caused by php_libxml_node_free
 2025-07-20 17:20:47 +02:00
Niels Dossche
312869381a Fix GH-19098: libxml<2.13 segmentation fault caused by php_libxml_node_free 
This implements a workaround for reconciliation not being performed for
document-less nodes in libxml<2.13.

Closes GH-19186.
 2025-07-20 17:19:43 +02:00
David Carlier
f1a77c0198 Merge branch 'PHP-8.3' into PHP-8.4 2025-07-18 18:02:02 +01:00
Petr Sumbera
be09985c87 Fix GH-19169: ZEND_STATIC_ASSERT for -std=c++17 
needs to define ZEND_STATIC_ASSERT to appropriate C++ static_assert
instead of the C version.
 2025-07-18 18:00:24 +01:00
Niels Dossche
d9602e4362 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  NEWS for GH-19162
  ext/socket: Remove incorrect zval_ptr_dtor
  ext/hash: Remove incorrect zval_ptr_dtor
 2025-07-17 21:52:23 +02:00
Niels Dossche
86aaded7e5 NEWS for GH-19162 
Closes GH-19162.
 2025-07-17 21:51:49 +02:00
Niels Dossche
d11099ae32 ext/socket: Remove incorrect zval_ptr_dtor 2025-07-17 21:50:35 +02:00
Niels Dossche
bdca73cc14 ext/hash: Remove incorrect zval_ptr_dtor 2025-07-17 21:50:35 +02:00
Jakub Zelenka
554ae518a2 Merge branch 'PHP-8.3' into PHP-8.4 2025-07-17 13:45:14 +02:00
Jakub Zelenka
8516ae86d7 Skip LDAP TLS max version test for now 2025-07-17 13:44:21 +02:00
Niels Dossche
826fa36ba3 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  ext/xml: Suppress libxml deprecation for `_xmlParserCtxt.inState` (#19131)
 2025-07-16 18:27:02 +02:00
Niels Dossche
034c3f2270 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  ext/xml: Suppress libxml deprecation for `_xmlParserCtxt.inState` (#19131)
 2025-07-16 18:26:54 +02:00
Niels Dossche
9eee4dd92b Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  ext/xml: Suppress libxml deprecation for `_xmlParserCtxt.inState` (#19131)
 2025-07-16 18:24:55 +02:00
Tim Düsterhus
a5df26691d ext/xml: Suppress libxml deprecation for _xmlParserCtxt.inState (#19131) 
The FreeBSD build fails due to the deprecation and -Werror:

    2025-07-15T00:37:20.8390774Z /home/runner/work/php-src/php-src/ext/xml/compat.c:358:38: error: 'instate' is deprecated [-Werror,-Wdeprecated-declarations]
    2025-07-15T00:37:20.8392577Z   358 |                 if (ret == NULL || parser->parser->instate == XML_PARSER_CONTENT) {
    2025-07-15T00:37:20.8393184Z       |                                                    ^
    2025-07-15T00:37:20.8394006Z /usr/local/include/libxml2/libxml/parser.h:309:33: note: 'instate' has been explicitly marked deprecated here
    2025-07-15T00:37:20.8394903Z   309 |     xmlParserInputState instate XML_DEPRECATED_MEMBER;
    2025-07-15T00:37:20.8395413Z       |                                 ^
    2025-07-15T00:37:20.8396166Z /usr/local/include/libxml2/libxml/xmlexports.h:74:50: note: expanded from macro 'XML_DEPRECATED_MEMBER'
    2025-07-15T00:37:20.8397058Z    74 |     #define XML_DEPRECATED_MEMBER __attribute__((deprecated))
    2025-07-15T00:37:20.8397581Z       |                                                  ^
    2025-07-15T00:37:20.8425542Z 1 error generated.
 2025-07-16 18:23:54 +02:00
Jakub Zelenka
a57f58253a Merge branch 'PHP-8.3' into PHP-8.4 2025-07-16 17:31:24 +02:00
Jakub Zelenka
eade5c17ea Fix GH-18529: additional inheriting of TLS int options 
This is for LDAP_OPT_X_TLS_PROTOCOL_MIN and LDAP_OPT_X_TLS_PROTOCOL_MAX

It also adds a test that uses LDAPCONF with TLS max version lower than
the minimum TLS server version so it should always fail. However it
does not fial for the second case without this change which confirms
that the change works as expected.

Closes GH-18676
 2025-07-16 17:29:42 +02:00
Jakub Zelenka
4647dfc988 Merge branch 'PHP-8.3' into PHP-8.4 2025-07-16 14:10:35 +02:00
Jakub Zelenka
faf833bffc PHP 8.3 is now for PHP-8.3.25-dev 2025-07-16 14:09:24 +02:00
Niels Dossche
0f731b455c Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix error return check of EVP_CIPHER_CTX_ctrl()
  Fix memleak on failure in collator_get_sort_key()
 2025-07-15 20:38:22 +02:00
Niels Dossche
cd8722304c Fix error return check of EVP_CIPHER_CTX_ctrl() 
OpenSSL can return -1 on error [1, 2], and OpenBSD's docs confirm this
[3]. Change all checks to <= 0.

[1] b3161bd9a9/crypto/evp/evp_enc.c (L1530-L1531)
[2] b3161bd9a9/crypto/evp/evp_enc.c (L1611)
[3] https://man.openbsd.org/EVP_CIPHER_CTX_ctrl.3

Closes GH-18987.
 2025-07-15 20:37:33 +02:00
Niels Dossche
b495ce0371 Fix memleak on failure in collator_get_sort_key() 
Closes GH-19138.
 2025-07-15 20:36:56 +02:00
Niels Dossche
f938f356cb Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix GH-18986: OpenSSL backend: incorrect RAND_{load,write}_file() return value check
 2025-07-15 18:50:46 +02:00
Niels Dossche
a8086be81c Fix GH-18986: OpenSSL backend: incorrect RAND_{load,write}_file() return value check 
As noted by the LibreSSL maintainer, these functions return -1 on error.
This is further confirmed by my static analyzer that inferred the same
thing for OpenSSL.

Closes GH-19013.
 2025-07-15 18:50:19 +02:00
Calvin Buckley
3d468a181a PHP-8.4 is now for PHP 8.4.12-dev 2025-07-15 13:46:33 -03:00
Jakub Zelenka
0d19984cda Merge branch 'PHP-8.3' into PHP-8.4 2025-07-15 11:24:34 +02:00
Jakub Zelenka
6b2b60f683 Fix bug #80770: openssl cafile not used in SNI SSL_CTX 
The issue is about not being able to connect as cafile for SNI
is not used in its SSL context. This sets it up so it is possible
to capture the client certificate which is only possible when
verify_peer is true.

Closes GH-18893
 2025-07-15 11:23:10 +02:00
Dmitry Stogov
9abb0fb0c4 Revert "Update IR" 
This reverts commit e8ae27bf8a.

Something wrong in irrducable loops habdling that causes ir_find_loop()
to stuck. See https://github.com/php/php-src/issues/19104
 2025-07-14 14:27:05 +03:00
Niels Dossche
76b6b60b8c Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix GH-19094: Attaching class with no Iterator implementation to MultipleIterator causes crash
 2025-07-11 12:28:25 +02:00
Niels Dossche
71472268c0 Fix GH-19094: Attaching class with no Iterator implementation to MultipleIterator causes crash 
Closes GH-19097.
 2025-07-11 12:27:41 +02:00
Niels Dossche
de7a212630 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  ext/soap/php_http.c: Fix memory leak of header value
 2025-07-10 22:32:52 +02:00
Gina Peter Banyard
85a49d4198 ext/soap/php_http.c: Fix memory leak of header value 2025-07-10 22:32:31 +02:00
Niels Dossche
5a45d71a11 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  ext/gd: Drop useless and doubtful MSVC specific code (libgd/libgd@f1480ab)
 2025-07-10 22:22:26 +02:00
Demon
974526b244 ext/gd: Drop useless and doubtful MSVC specific code (libgd/libgd@f1480ab) 2025-07-10 22:22:01 +02:00
Niels Dossche
2fa0e55450 Update NEWS for GH-19068 2025-07-10 22:14:38 +02:00
Demon
12fa8c637f ext/gd: Drop useless and doubtful MSVC specific code (libgd/libgd@f1480ab) 2025-07-10 22:13:29 +02:00
Demon
2be3aa86f0 Zend: fix undefined symbol 'execute_ex' on Windows ARM64 #19064; ext/gd: fix emmintrin.h not found on Windows ARM64 2025-07-10 22:13:29 +02:00
Ilija Tovilo
74784a0d52 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  [skip ci] Add missing zlib dep to phar compression test
 2025-07-07 16:28:49 +02:00
Ilija Tovilo
faa78313d9 [skip ci] Add missing zlib dep to phar compression test 2025-07-07 16:28:18 +02:00
Dmitry Stogov
e8ae27bf8a Update IR 
IR commit: af6dc83bcd91c3123f40efcdcbeba8794b9b2abf
 2025-07-07 14:03:11 +03:00
Peter Kokot
ab6e73066b Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix -Wuseless-escape warnings emitted by re2c (#19050)
 2025-07-07 09:51:50 +02:00
Peter Kokot
258fbd6bf9 Fix -Wuseless-escape warnings emitted by re2c (#19050) 
re2c version 4 enabled some warnings by default. This fixes re2c code
for the `-Wuseless-escape` warnings.

There are two same issues reported.
Issue: GH-17523
Closes: GH-17204
 2025-07-07 09:51:25 +02:00