php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 08:58:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
131,498 Commits 549 Branches 1,485 Tags
244b883c07652bf7efdb65e117e17a34ecfb8a64
Commit Graph

63688 Commits

Author SHA1 Message Date
David Carlier 244b883c07 Merge branch 'PHP-8.2' 2023-03-03 21:12:27 +00:00
David Carlier eb9d556fd4 Merge branch 'PHP-8.1' into PHP-8.2 2023-03-03 21:12:04 +00:00
David Carlier 574a7e7ef8 ext/ftp fix ftp_nb_get signature (for failure). 
ref: https://github.com/php/doc-en/pull/2331#issuecomment-1448984096

Closes GH-10760.
 2023-03-03 21:08:16 +00:00
Ilija Tovilo cfba9cd4bd Merge branch 'PHP-8.2' 
* PHP-8.2:
  Propagate success status of ftp_close() to userland
 2023-03-03 15:26:51 +01:00
Ilija Tovilo 4c2ee6fa21 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Propagate success status of ftp_close() to userland
 2023-03-03 15:26:45 +01:00
nielsdos abc6fe8f2e Propagate success status of ftp_close() to userland 
The docs say that this function returns true on success, and false on
error. This function always returns true in the current implementation
because the success return value from ftp_close() is never propagated to
userland. This affects one test: since the test server exits after an
invalid login, the ftp close correctly fails (because the server has
gone away).
 2023-03-03 15:26:11 +01:00
David Carlier 02e8c16dfd Merge branch 'PHP-8.2' 2023-03-03 12:45:10 +00:00
David Carlier 8b70393c23 Merge branch 'PHP-8.1' into PHP-8.2 2023-03-03 12:44:33 +00:00
David Carlier ffc2a53a9b Fix GH-10728: opcache capstone header's inclusion. 
Remove capstone include folder.
For most of the supported systems it worked fine somehow despite
 the pkg-config --cflags, but is always include it even on Linux.

Closes GH-10732.
 2023-03-03 12:43:12 +00:00
Arnaud Le Blanc 0c7fc351ea Merge branch 'PHP-8.2' 
* PHP-8.2:
  [ci skip] NEWS
  [ci skip] NEWS
  fix: support for timeouts with ZTS on Linux (#10141)
 2023-03-03 11:56:34 +01:00
Arnaud Le Blanc 37030257b8 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [ci skip] NEWS
  fix: support for timeouts with ZTS on Linux (#10141)
 2023-03-03 11:45:50 +01:00
Kévin Dunglas ad85e71421 fix: support for timeouts with ZTS on Linux (#10141) 2023-03-03 11:35:06 +01:00
Alex Dowad e447036dc6 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Propagate error checks for mbfl_filt_conv_illegal_output()
  Use CK() macro to check the output function in mbfilter_unicode2sjis_emoji_sb()
  Make error checks on encoding methods for docomo, kddi, sb consistent
 2023-03-02 23:12:09 +02:00
Alex Dowad 3142829562 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Propagate error checks for mbfl_filt_conv_illegal_output()
  Use CK() macro to check the output function in mbfilter_unicode2sjis_emoji_sb()
  Make error checks on encoding methods for docomo, kddi, sb consistent
 2023-03-02 22:50:37 +02:00
nielsdos d66ca5dabb Propagate error checks for mbfl_filt_conv_illegal_output() 2023-03-02 22:36:00 +02:00
nielsdos 263655a520 Use CK() macro to check the output function in mbfilter_unicode2sjis_emoji_sb() 2023-03-02 22:36:00 +02:00
nielsdos 69543e6a10 Make error checks on encoding methods for docomo, kddi, sb consistent 
Some places use an if check, which implicitly checks for a non-zero
value, and some places use > 0. The > 0 is the correct one because at
least some of those functions already use the CK() macro to return -1 on
error. Because -1 != 0 this is wrongly interpreted as a success instead
of a failure.
 2023-03-02 22:36:00 +02:00
Ilija Tovilo 86669774ae Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix missing readonly modification error with inc/dec in JIT
 2023-03-02 11:31:42 +01:00
Ilija Tovilo 7934a0fcfb Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix missing readonly modification error with inc/dec in JIT
 2023-03-02 11:31:29 +01:00
Ilija Tovilo df93146a15 Fix missing readonly modification error with inc/dec in JIT 
Closes GH-10746
 2023-03-02 11:29:53 +01:00
Ilija Tovilo 4ea869901f [skip ci] Skip failing mbstring test on Windows x86 32-bit 2023-03-02 00:07:23 +01:00
Ilija Tovilo 5859297f7f Merge branch 'PHP-8.2' 
* PHP-8.2:
  Add Windows GitHub actions build
 2023-03-01 23:05:24 +01:00
Ilija Tovilo 603367946b Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Add Windows GitHub actions build
 2023-03-01 23:05:17 +01:00
Michael Voříšek 916b132ea0 Add Windows GitHub actions build 
Closes GH-10664
 2023-03-01 23:02:03 +01:00
Niels Dossche 2b15061fbb Use zend_result in ext/spl where appropriate (#10734) 
* Convert functions in spl_heap to return zend_result

* Convert functions in spl_iterators to return zend_result
 2023-03-01 18:58:17 +01:00
Ilija Tovilo da4167b918 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix unescaped {TMP} variables in tests
 2023-03-01 13:25:34 +01:00
Ilija Tovilo 2b5aac9303 Fix unescaped {TMP} variables in tests 
On Windows {TMP} can return ~, which will result in a parse error
 2023-03-01 13:24:39 +01:00
Ilija Tovilo 8c9c6787cc Temporarily disable failing zlib tests on travis (#10738) 2023-03-01 02:19:29 +01:00
Dmitry Stogov 28be84a146 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix Zend/tests/type_declarations/variance/class_order_autoload1.phpt test failre introduced by 44e5c04e55
 2023-02-28 23:05:40 +03:00
Dmitry Stogov dcf2810cd1 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix Zend/tests/type_declarations/variance/class_order_autoload1.phpt test failre introduced by 44e5c04e55
 2023-02-28 23:05:30 +03:00
Dmitry Stogov 18b43d2950 Fix Zend/tests/type_declarations/variance/class_order_autoload1.phpt 
test failre introduced by 44e5c04e55

This ASSERT-ion path was never reached becuase of the bug fixed by
44e5c04e55. It's possible in case of
circular class dependencies that may resolved by __autoload().
Unfortunately these circular dependencies can't be stored in the
inheritace cahce.
 2023-02-28 22:57:52 +03:00
George Peter Banyard f13d541ca6 Fix GCC 12 compiler warnings (#10713) 
* Fix -Wunused-but-set-variable compiler warning in ext/mysqli

* Fix -Wstrict-prototypes compiler warning in ext/mysqlnd

* Fix -Wstrict-prototypes compiler warning in ext/soap

* Fix -Wunused-but-set-variable compiler warning in ext/exif

However, this code looks really sketchy...

* Fix -Wstrict-prototypes compiler warning in ext/openssl

* Fix -Wstrict-prototypes compiler warning in ext/dba

Add void to our bundled libraries

* Refactor bundled BCMath library

Fix -Wdeprecated-non-prototype compiler warnings
Use bool instead of char/int
Cleanup some useless header includes
 2023-02-28 14:21:01 +00:00
David Carlier 02ec4c5071 Fix GH-10727: Spoofchecker constant updates. 
- Adding MIXED_NUMBERS from ICU 58.
- Adding HIDDEN_OVERLAY from ICU 62.

Closes GH-10730.
 2023-02-28 12:27:38 +00:00
Niels Dossche 4177257178 3 minor cleanups in ext/session (#10722) 
* sid can never be NULL because it was NULL-checked earlier

* Change namelen to size_t because it is always unsigned and less in size than size_t

* Remove redundant check on ser

It can't be NULL, and even if it could, the ser++ would be UB.
 2023-02-28 12:29:40 +01:00
Bob Weinand 145602f38e Fix bug in zend_test assuming null not being the first type 
(I agree that null should come last, but then it should rather throw with a proper message than emit an undefined key warning.)

Signed-off-by: Bob Weinand <bobwei9@hotmail.com>
 2023-02-28 12:01:41 +01:00
David CARLIER fbaa2eb059 ext/sockets: add TCP_REPAIR to silently close a connection. 
Closes GH-10724.
 2023-02-27 22:56:06 +00:00
Dmitry Stogov 44e5c04e55 Fix incorrect inheritance cache update (#10719) 2023-02-27 21:47:29 +03:00
Dmitry Stogov c7a9190124 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix incorrect inheritance cache update (#10719)
 2023-02-27 21:39:53 +03:00
Dmitry Stogov 2e3fc8c0ff Fix incorrect inheritance cache update (#10719) 2023-02-27 21:39:18 +03:00
Niels Dossche edacfbd1d4 Remove unnecessary checks in ftp_fopen_wrapper.c (#10711) 
* resource is always non-NULL at this point because we check for NULL
  right after its creation.
* resource->path is always set at this point because of the check right
  above the code where it's used. It was also confusing to see "/" being
  considered as a "default".
 2023-02-27 13:20:37 +00:00
George Peter Banyard 81e59c6497 Improve handling of XML options 
Mark boolean options as such
Warn on invalid types
Stubs info

Closes GH-10675
 2023-02-26 14:34:39 +00:00
George Peter Banyard 524391bcf6 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fixed ValueError message in count_chars()
  Fixed ValueError message in substr_compare()
  The userland constants do not start with PHP_
 2023-02-26 14:28:49 +00:00
George Peter Banyard f440911057 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fixed ValueError message in count_chars()
  Fixed ValueError message in substr_compare()
  The userland constants do not start with PHP_
 2023-02-26 14:28:22 +00:00
George Peter Banyard adc5edd411 Fixed ValueError message in count_chars() 
The value of the mode argument must be between 0 and 4 inclusive, not 1 and 4.
 2023-02-26 14:27:46 +00:00
George Peter Banyard 2133970152 Fixed ValueError message in substr_compare() 
It used some random argument name instead of
 2023-02-26 14:25:02 +00:00
George Peter Banyard 6a5b3f0ff9 The userland constants do not start with PHP_ 2023-02-26 14:18:12 +00:00
Marcos Marcolin 9004725367 chore: standardize the visibility of functions. (#10708) 
Co-authored-by: Marcos Marcolin <marcos@ixcsoft.com.br>
 2023-02-26 14:08:33 +00:00
Niels Dossche 07fe46fb5d Simplify checks and returns in ext/xmlwriter (#10701) 
* The ptr check is redundant because XMLWRITER_FROM_OBJECT will return
  if ptr is NULL.
* Use RETURN_BOOL to simplify the return code.
 2023-02-26 14:07:55 +00:00
Niels Dossche 375e7402af Change implicit enum return value checks to explicit checks (#10703) 2023-02-26 08:56:20 +00:00
Niels Dossche f0cfebc2b8 Use zend_result where appropriate in ext/openssl 
Remove dead code

s is always NULL, so the check is always false.

Closes GH-10704.
 2023-02-26 08:28:23 +00:00