1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00
Commit Graph

65207 Commits

Author SHA1 Message Date
Saki Takamachi 61c251d7bc Add XLEAK for some msodbcsql tests (#12615) 2023-11-07 18:11:54 +01:00
Dmitry Stogov b88d38787b Revert "Fix incorrect trace type inference in a false loop"
This reverts commit 7f06a9daa2.
2023-11-07 18:29:26 +03:00
Dmitry Stogov 7f06a9daa2 Fix incorrect trace type inference in a false loop
Fixes oss-fuzz #63846
2023-11-07 17:29:10 +03:00
Dmitry Stogov 8ef695795c Fixed GH-12623: Segmentation fault in ZEND_DO_UCALL_SPEC_RETVAL_USED_HANDLER 2023-11-07 16:15:22 +03:00
Dmitry Stogov 3a3d83625b Fixed IR construction
Fixes oss-fuzz #63857
2023-11-07 13:25:09 +03:00
Dmitry Stogov a30d809290 Fixed incorrect dead edge elimination during IR construction
Fixes oss-fuzz #63931
2023-11-07 11:41:23 +03:00
Dmitry Stogov fa59bbe662 Update IR
IR commit: ec588537889c84a4ec649a6f1aa9d7f1bfea7b4d
2023-11-07 11:40:11 +03:00
KentarouTakeda c15988aab3 ext/pgsql: Refactor tests (#12608)
This makes the tests independent of each other and allows them to be run in parallel.

Co-authored-by: Gina Peter Banyard <girgias@php.net>
2023-11-06 22:36:52 +00:00
Niels Dossche 92e4e8bdf4 Fix #49278: SoapClient::__getLastResponseHeaders returns NULL if wsdl operation !has output
Instead of early exiting, process the headers if tracing is enabled, and
exit after that.

Closes GH-12609.
2023-11-06 19:04:15 +01:00
Peter Kokot ccdc21b39a Remove check for dnet_addr in dnet_stub library (#12611)
The dnet_stub library was once used on some obsolete systems and was
needed for transitive linking with Sybase and some PHP extensions. At
this point, no known and supported system uses the dnet_stub library
name, so it's safe to remove this check. This also came in pdo_dblib as
a copy/paste from other removed PHP extensions.

Partially was already removed in 1b969a74d0.
2023-11-06 12:46:04 +00:00
Dmitry Stogov 93ed314432 Fixed incorrect type stores 2023-11-06 15:20:26 +03:00
David Carlier 44f9c226aa following-up on GH-12551: removing inet_ntoa usage
Close GH-12554
2023-11-06 12:05:56 +00:00
Niels Dossche bb42b418d4 Cleanup arguments of _php_dom_insert_fragment() (#12610) 2023-11-04 17:09:01 +01:00
Peter Kokot 7d485aa628 ext/sockets: Clean header checks (#12607)
- Unused header checks removed:
  HAVE_NETINET_TCP_H and HAVE_SYS_UN_H are not used in the code.
- Duplicate linux/filter.h check removed:
  HAVE_LINUX_FILTER_H is already defined in ext/sockets.
2023-11-04 15:12:16 +00:00
Niels Dossche 9a973a3743 Optimize strcspn (#12594) 2023-11-04 13:54:30 +00:00
Saki Takamachi bbe1222956 Fix GH-12296: [odbc] [pdo_odbc] Optimized odbc connection string creating (#12306)
Declare and initialize on one line

changed to use php_memnistr

store strlen(db) in a variable

Added a semicolon to the end of dsn.

If there is a semicolon at the end of the original dsn, it will be duplicated, so it will be removed.

Add condition when authentication information is null
2023-11-04 13:46:17 +00:00
Jakub Zelenka f288d9c4b0 Merge branch 'PHP-8.3' 2023-11-03 17:18:40 +00:00
Jakub Zelenka 52b13f6ddb Merge branch 'PHP-8.2' into PHP-8.3 2023-11-03 17:17:52 +00:00
Jakub Zelenka 882cc4f804 Merge branch 'PHP-8.1' into PHP-8.2 2023-11-03 17:17:23 +00:00
Jakub Zelenka a8c6c6165b Fix GH-9921: Loading ext in FPM config does not register module handlers
Closes GH-12377
2023-11-03 16:53:09 +00:00
Dmitry Stogov 3844593bfb An attempt to fix GH-12512 2023-11-03 13:49:50 +03:00
Dmitry Stogov 4ee72a8dda Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Backport fix for HASH/PACKED array inference through MAY_BE_ARRAY_EMPTY flag (#12591)
2023-11-03 10:55:33 +03:00
Dmitry Stogov 6bf4041398 Backport fix for HASH/PACKED array inference through MAY_BE_ARRAY_EMPTY flag (#12591)
* Fixed HASH/PACKED array inference through MAY_BE_ARRAY_EMPTY flag

This fixes GH-12527

* typo
2023-11-03 10:54:57 +03:00
Dmitry Stogov 77312d8ea1 Fixed assertion 2023-11-03 02:16:08 +03:00
Niels Dossche 4af359c93a Merge branch 'PHP-8.3'
* PHP-8.3:
  Fix validation logic of php:function() callbacks in dom and xsl
2023-11-02 20:36:16 +01:00
Dmitry Stogov 7aa9ef7d12 Fixed incorrect type assumption
Fixes oss-fuzz #63809
2023-11-02 22:33:01 +03:00
Niels Dossche ea299d44a1 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix validation logic of php:function() callbacks in dom and xsl
2023-11-02 20:32:36 +01:00
Niels Dossche 304e482813 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix validation logic of php:function() callbacks in dom and xsl
2023-11-02 20:32:10 +01:00
Niels Dossche 20c9c4a367 Fix validation logic of php:function() callbacks in dom and xsl
Two issues:
- Assumed that at least 1 argument (function name) was provided.
- Incorrect error path for the non-callable case.

Closes GH-12593.
2023-11-02 20:28:55 +01:00
Dmitry Stogov 1226fe027a Fixed codegeneration for ISSET_ISEMPTY_DIM
Fixes oss-fuzz #63805
2023-11-02 19:48:04 +03:00
Dmitry Stogov 1c95e227e9 Fixed HASH/PACKED array inference through MAY_BE_ARRAY_EMPTY flag (#12591)
* Fixed HASH/PACKED array inference through MAY_BE_ARRAY_EMPTY flag

This fixes GH-12527

* typo
2023-11-02 16:17:31 +03:00
Dmitry Stogov 4fce8c83bc Merge branch 'PHP-8.3'
* PHP-8.3:
  Don't JIT after fatal errors
2023-11-02 14:15:13 +03:00
Dmitry Stogov 83bbea7c5b Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Don't JIT after fatal errors
2023-11-02 14:15:05 +03:00
Dmitry Stogov bbf2fc99a3 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Don't JIT after fatal errors
2023-11-02 14:14:48 +03:00
Dmitry Stogov 77a497d56a Don't JIT after fatal errors 2023-11-02 14:14:12 +03:00
Dmitry Stogov 110cdd336a Merge branch 'PHP-8.3'
* PHP-8.3:
  Fixed GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT
  ext/intl: change when the locale is invalid for the 8.1/8.2 serie.
2023-11-02 08:21:36 +03:00
Dmitry Stogov 22735b3ff5 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fixed GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT
  ext/intl: change when the locale is invalid for the 8.1/8.2 serie.
2023-11-02 08:15:50 +03:00
Dmitry Stogov 177a6f5d8a Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fixed GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT
2023-11-02 08:11:00 +03:00
Dmitry Stogov 798b9d097b Fixed GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT 2023-11-02 08:09:29 +03:00
David Carlier a39e869b55 Merge branch 'PHP-8.1' into PHP-8.2 2023-11-01 19:13:08 +00:00
David Carlier 0da1356c66 ext/intl: change when the locale is invalid for the 8.1/8.2 serie.
does not throws an exception as it's considered as a too string change,
but the code user still needs to double check.
2023-11-01 19:12:50 +00:00
Peter Kokot 2a60543cee Add deprecation notice when enabling mhash (#12586)
The mhash* functions are deprecated as of PHP 8.1.0.
https://wiki.php.net/rfc/deprecations_php_8_1
2023-11-01 16:26:27 +00:00
Dmitry Stogov 1b846f89b9 Fixed GH-12584: Assertion `ctx->control' failed with new JIT and CALL
VM`
2023-11-01 17:19:17 +03:00
Dmitry Stogov d7fc3ab07f Fixed GH-12585: Assertion t->stack_map[t->exit_info[exit_point].stack_offset + var].type == 4 2023-11-01 16:11:54 +03:00
Ilija Tovilo d35faecbf2 Split strtr zpp (#12583) 2023-11-01 13:08:06 +01:00
Dmitry Stogov aa7465a435 Fixed missed type store
Fixes oss-fuzz #63601
2023-11-01 14:26:01 +03:00
Dmitry Stogov 7fcbedd7df Merge branch 'PHP-8.3'
* PHP-8.3:
  Fixed inorrect QM_ASSIGN elimination
2023-11-01 09:55:51 +03:00
Dmitry Stogov 916fa73d80 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fixed inorrect QM_ASSIGN elimination
2023-11-01 09:55:37 +03:00
Dmitry Stogov 125dbb2c03 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fixed inorrect QM_ASSIGN elimination
2023-11-01 09:55:28 +03:00
Dmitry Stogov 19dfe05f16 Fixed inorrect QM_ASSIGN elimination
Fixes oss-fuzz #63771
2023-11-01 09:54:58 +03:00