mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
113,948 Commits 500 Branches 1,381 Tags 797 MiB
ea3afcbae3
Commit Graph

12173 Commits

Author SHA1 Message Date
Christoph M. Becker
36943dfff1 Update NEWS 2019-10-22 09:50:11 +02:00
Remi Collet
2213bd36fd add NEWS entry 2019-10-22 09:37:35 +02:00
Dmitry Stogov
05c5e5dfde Fixed bug #78512 (Cannot make preload work) 2019-10-21 14:52:26 +03:00
Joe Watkins
1ac961bea8
Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #78697: inaccurate error message
 2019-10-21 09:24:41 +02:00
Joe Watkins
1c9b62fbd4
Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #78697: inaccurate error message
 2019-10-21 09:23:26 +02:00
Fabien Villepinte
bea2ff88c9
Fix bug #78697: inaccurate error message 2019-10-21 09:22:09 +02:00
Jakub Zelenka
666fb9a194 Add NEWS for the fixed bug #74083 2019-10-20 16:58:13 +01:00
Christoph M. Becker
26635ed71a Fix #78684: PCRE bug72463_2 test is sending emails on Linux 
This test is not supposed to run on non Windows systems; otherwise it
would try to send an email.
 2019-10-19 12:59:32 +02:00
Christoph M. Becker
ee6a71ca73 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78694: Appending to a variant array causes segfault
 2019-10-19 11:51:05 +02:00
Christoph M. Becker
ce035dc4a0 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78694: Appending to a variant array causes segfault
 2019-10-19 11:49:18 +02:00
Christoph M. Becker
45a7723267 Fix #78694: Appending to a variant array causes segfault 
`write_dimension` object handlers have to be able to handle `NULL`
`offset`s; for now we simply throw an exception instead of following
the `NULL` pointer.
 2019-10-19 11:47:00 +02:00
Christoph M. Becker
197568d634 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #70153 \DateInterval incorrectly unserialized
 2019-10-18 15:33:25 +02:00
Christoph M. Becker
c7c7ab53ac Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #70153 \DateInterval incorrectly unserialized
 2019-10-18 15:32:08 +02:00
m.yakunin
d2cde0bfd3 Fix #70153 \DateInterval incorrectly unserialized 
Added a separate macro for reading 'days' property, so that bool(false)
is correctly converted to the proper internal representation.
 2019-10-18 15:31:14 +02:00
Derick Rethans
6e2635d2f2 Update NEWS for 7.4.0RC5 2019-10-15 11:29:33 +00:00
Derick Rethans
998be7752c Update NEWS for PHP 7.4.0RC4 2019-10-15 11:28:15 +00:00
Joe Watkins
042e3b227e
Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix checksum calculation for opcache
 2019-10-14 16:50:23 +02:00
Joe Watkins
22ac57b064
Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix checksum calculation for opcache
 2019-10-14 16:49:48 +02:00
Mitch Hagstrand
e2a6bf482f
Fix checksum calculation for opcache 2019-10-14 16:46:42 +02:00
Christoph M. Becker
586f8515d5 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78665: Multicasting may leak memory
 2019-10-12 14:46:10 +02:00
Christoph M. Becker
7439d48bea Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78665: Multicasting may leak memory
 2019-10-12 14:44:55 +02:00
Christoph M. Becker
900bdcbd03 Fix #78665: Multicasting may leak memory 2019-10-12 14:43:43 +02:00
Remi Collet
a78b09c9b8 NEWS 2019-10-11 13:38:15 +02:00
Christoph M. Becker
973617cacd Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78656: Parse errors classified as highest log-level
 2019-10-09 17:29:54 +02:00
Christoph M. Becker
bbd481c11d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78656: Parse errors classified as highest log-level
 2019-10-09 17:28:50 +02:00
Erik Lundin
3164186d53 Fix #78656: Parse errors classified as highest log-level 2019-10-09 17:27:32 +02:00
Nikita Popov
91eb632472 Merge branch 'PHP-7.3' into PHP-7.4 2019-10-09 17:00:55 +02:00
Nikita Popov
6fd6ad8f53 Fixed bug #78658 2019-10-09 17:00:27 +02:00
Christoph M. Becker
4625fa181f Fix #78650: new COM Crash 
As of PHP 7.4.0, the `get_property_ptr_ptr` handler is mandatory; we
implement it to always return `NULL`, which is equivalent to not
setting the handler in former versions.

We add a portable and faster test case than what has been presented in
the bug ticket.
 2019-10-09 14:09:02 +02:00
Nikita Popov
ad3ddf46f9 Fixed bug #78644 
Make sure the initialize the result of FETCH_OBJ_UNSET operations.
I'm using a NULL value rather than ERROR here, because the latter
no longer exists in master.
 2019-10-08 14:32:49 +02:00
Christoph M. Becker
346be2cf59 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78642: Wrong libiconv version displayed
 2019-10-08 12:10:58 +02:00
Christoph M. Becker
d6fdc17f7f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78642: Wrong libiconv version displayed
 2019-10-08 12:10:06 +02:00
Christoph M. Becker
195c2008e8 Fix #78642: Wrong libiconv version displayed 
The high byte of `_libiconv_version` specifies the major version; the
low byte the minor version.
 2019-10-08 12:09:11 +02:00
Christoph M. Becker
26f45cb4bb 7.3.12 is next 2019-10-08 12:04:25 +02:00
Remi Collet
05d6878b3b next is 7.2.25 2019-10-08 11:36:10 +02:00
Christoph M. Becker
88e0d88897 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78641: addGlob can modify given remove_path value
 2019-10-08 09:49:46 +02:00
Christoph M. Becker
11654fdfa6 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78641: addGlob can modify given remove_path value
 2019-10-08 09:48:59 +02:00
Christoph M. Becker
fd3118ffb0 Fix #78641: addGlob can modify given remove_path value 
`remove_path` points to the given string, so we must not modify it.
Instead we use a duplicate, if we need the modification.

We may want to switch to `zend_string`s in master.
 2019-10-08 09:45:05 +02:00
Christoph M. Becker
b142e8a4b3 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78623: Regression caused by "SP call yields additional empty result set"
 2019-10-07 09:18:46 +02:00
Christoph M. Becker
3322c78a88 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78623: Regression caused by "SP call yields additional empty result set"
 2019-10-07 09:17:29 +02:00
Christoph M. Becker
114c03b9a6 Fix #78623: Regression caused by "SP call yields additional empty result set" 
This reverts commit 41a4379cb4.
 2019-10-07 09:15:51 +02:00
Nikita Popov
ca652aafa8 Fixed bug #78632 
I'm going for a very conservative fix here, where the previous
logic is restored for the case where an object is passed to
method_exists(). We might want to check against EG(scope) instead,
but this seems like a safer choice.

This means that behavior in PHP 7.4 changes only for
method_exists('C', 'privateMethodNotOnC'), which should be sensible.
 2019-10-04 12:41:49 +02:00
Christoph M. Becker
6627f782d6 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78620: Out of memory error
 2019-10-04 09:11:18 +02:00
Dmitry Stogov
3ded328bea Fixed bug #78614 (Does not compile with DTRACE anymore) 2019-10-04 10:10:22 +03:00
Christoph M. Becker
cf183a5e2c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78620: Out of memory error
 2019-10-04 09:09:39 +02:00
Christoph M. Becker
abaf9a76dc Fix #78620: Out of memory error 
The integer addition in `ZEND_MM_ALIGNED_SIZE_EX` can overflow, what we
have to catch early.
 2019-10-04 09:08:01 +02:00
Joe Watkins
74ca3a5cad
Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  fix #78624: session_gc return value for user defined session handlers
 2019-10-04 06:16:18 +02:00
Joe Watkins
f45eb353d1
Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix #78624: session_gc return value for user defined session handlers
 2019-10-04 06:12:29 +02:00
Brent Shaffer
a6d219630c
fix #78624: session_gc return value for user defined session handlers 2019-10-04 06:12:02 +02:00
Joe Watkins
5a8e7b95a1
Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
 2019-10-03 07:13:15 +02:00
Joe Watkins
f4d078b1c7
Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
 2019-10-03 06:57:05 +02:00
Fábio Souto
9a2b42a5c1
Fix bug #76809 (SSL settings aren't respected when persistent connection is reused) 2019-10-03 06:56:21 +02:00
Joe Watkins
de83036f13
Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #76859 stream_get_line skips data if used with data-generating filter
 2019-10-03 06:51:56 +02:00
Joe Watkins
5b1bb23edf
Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #76859 stream_get_line skips data if used with data-generating filter
 2019-10-03 06:51:10 +02:00
Konstantin Kopachev
05560b67bc
Fix #76859 stream_get_line skips data if used with data-generating filter 
stream_get-line repeatedly calls php_stream_fill_read_buffer until
enough data is accumulated in buffer. However, when stream contains
filters attached to it, then each call to fill buffer essentially
resets buffer read/write pointers and new data is written over old.
This causes stream_get_line to skip parts of data from stream
This patch fixes such behavior, so fill buffer call will append.
 2019-10-03 06:50:43 +02:00
Christoph M. Becker
2508131588 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Revert "Fix #78620: Out of memory error"
 2019-10-02 19:03:25 +02:00
Christoph M. Becker
d295e1dce2 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Revert "Fix #78620: Out of memory error"
 2019-10-02 19:02:28 +02:00
Christoph M. Becker
f2fb37a772 Revert "Fix #78620: Out of memory error" 
This reverts commit 8ce04df7e0.

Cf. <https://github.com/php/php-src/pull/4766#discussion_r330658679>.
 2019-10-02 19:01:35 +02:00
Christoph M. Becker
b262b24beb Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78620: Out of memory error
 2019-10-02 18:21:50 +02:00
Christoph M. Becker
752a34fb2c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78620: Out of memory error
 2019-10-02 18:20:09 +02:00
Christoph M. Becker
8ce04df7e0 Fix #78620: Out of memory error 
If the integer addition in `ZEND_MM_ALIGNED_SIZE_EX` overflows, the
macro evaluates to `0`, what we should catch early.
 2019-10-02 18:18:52 +02:00
Nikita Popov
e98e1f92c9 Allow SA_RESTART for SIGALRM 
If no explicit restart_syscalls is passed, default to
restart_syscalls=0 for SIGALRM only, to reduce BC impact.
 2019-10-02 10:09:17 +02:00
Erik Lundin
6462c19689
Fixed #75245 Don't set content of elements with only whitespaces 2019-10-02 08:17:04 +02:00
Derick Rethans
a453258959 Update NEWS for 7.4.0RC4 2019-10-01 08:31:43 +00:00
Derick Rethans
c5b4cd6556 Update NEWS for PHP 7.4.0RC3 2019-10-01 08:30:24 +00:00
Christoph M. Becker
59ac81f81e Update regarding changed OpenSSL default config path 2019-10-01 09:14:58 +02:00
Nikita Popov
0805e132b0 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-30 15:06:32 +02:00
Nikita Popov
6fcde56b03 Fixed bug #78612 2019-09-30 15:06:07 +02:00
Christoph M. Becker
70f367d48a Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78609: mb_check_encoding() no longer supports stringable objects
 2019-09-30 13:06:57 +02:00
Christoph M. Becker
2046b3ce4f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78609: mb_check_encoding() no longer supports stringable objects
 2019-09-30 13:04:54 +02:00
Sergei Turchanov
e546d721e8 Fix #78413: php-fpm request_terminate_timeout does not take effect after fastcgi_finish_request 
To retain legacy behavior I decided to add an option to control request
termination logic. If request_terminate_timeout_track_finished is set,
then request will be tracked for time limits even after
fastcgi_finish_request was called.

This patch depends on the fix provided in BUG 78469 (otherwise php-fpm
workers listening on named pipes on Windows will be erroneously terminated)
(PR #4636)
 2019-09-30 12:54:09 +02:00
Christoph M. Becker
45db6fa567 Fix #78609: mb_check_encoding() no longer supports stringable objects 
We apply type juggling for other types than array.
 2019-09-30 12:42:04 +02:00
Nikita Popov
19e7e4b197 Fixed bug #78604 
<?php followed by EOF is valid since PHP 7.4.
 2019-09-30 10:41:14 +02:00
Nikita Popov
1806ce9cb0 Add max_depth option to unserialize() 
Add a max_depth option to unserialize and an unserialize_max_depth
ini setting, which can be used to control the depth limit. The
default value is 4096.

This option is intended to prevent stack overflows during the
unserialization of deeply nested structures.

This fixes bug #78549 and addresses oss-fuzz #17581, #17589, #17664,
and #17788.
 2019-09-30 10:28:24 +02:00
Christoph M. Becker
7530938670 Update NEWS 2019-09-24 11:13:55 +02:00
Christoph M. Becker
8c9c58436b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix NEWS entry
 2019-09-23 23:03:07 +02:00
Christoph M. Becker
ed099ab186 Fix NEWS entry 
Cf. <https://bugs.php.net/78590>.
 2019-09-23 22:59:55 +02:00
Christoph M. Becker
6dea11acd8 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78579: mb_decode_numericentity: args number inconsistency
 2019-09-21 16:17:45 +02:00
Christoph M. Becker
698088ca7c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78579: mb_decode_numericentity: args number inconsistency
 2019-09-21 16:16:52 +02:00
Christoph M. Becker
398b308316 Fix #78579: mb_decode_numericentity: args number inconsistency 
mb_decode_numericentity() accepts a fourth optional parameter, which is
unused, however.  Since this parameter doesn't do any harm, and to avoid
the small BC break, we're keeping this parameter for PHP 7, but adjust
the arginfo.

For PHP 8, we will remove this parameter.
 2019-09-21 16:15:23 +02:00
Remi Collet
dc40332bb2 Fixed bug #78574 (broken shared build) 2019-09-20 13:30:13 +02:00
Christoph M. Becker
9dfbcd7248 Fix #78543: is_callable() on FFI\CData throws Exception 
If `Z_OBJ_HANDLER_P(callable, get_closure)` throws, we must not let the
exeception pass to userland, if called through `is_callable()`.
 2019-09-19 09:13:22 +02:00
Nikita Popov
e11ed02870 Fixed bug #78272 
Use MAP_JIT only when running under hardened runtime, because MAP_JIT
is incompatible with fork().

The check is based on
f879e35e3e.
 2019-09-18 10:41:27 +02:00
Derick Rethans
7baca20067 Update NEWS for 7.4.0RC3 2019-09-17 16:39:07 +00:00
Derick Rethans
19ac6b2a58 Update NEWS for PHP 7.4.0RC2 2019-09-17 16:37:49 +00:00
Derick Rethans
9ed247b7b1 Revert "Update NEWS for PHP 7.4.0RC2" 
This reverts commit 050059cb26.
 2019-09-17 17:32:33 +01:00
Derick Rethans
4c39f557e6 Revert "Update NEWS for 7.4.0RC3" 
This reverts commit 803dc6b8f2.
 2019-09-17 17:32:31 +01:00
Nikita Popov
c5d4c45e7d Merge branch 'PHP-7.2' into PHP-7.3 2019-09-17 15:42:58 +02:00
fancyweb
e691a98c1f Fix #76342: file_get_contents waits twice specified timeout 2019-09-17 15:42:29 +02:00
Derick Rethans
803dc6b8f2 Update NEWS for 7.4.0RC3 2019-09-17 07:37:35 +00:00
Derick Rethans
050059cb26 Update NEWS for PHP 7.4.0RC2 2019-09-17 07:36:16 +00:00
Christoph M. Becker
20f73d3d8f Fix #78429: opcache_compile_file(__FILE__); segfaults 
We have to ensure that OPcache has been properly started up when
`opcache_compile_file()` is called.
 2019-09-16 16:01:09 +02:00
Fabien Villepinte
42046c71ee Fix typo 2019-09-16 15:55:23 +02:00
Christoph M. Becker
145ffd93fc Fix #78516: password_hash(): Memory cost is not in allowed range 
libsodium measures the memory cost in bytes, while password_hash() and
friends expect kibibyte values.  We have to properly map between these
scales not only when calling libsodium functions, but also when
checking for allowed values.

We also refactor to rid the code duplication.
 2019-09-16 14:58:39 +02:00
Dmitry Stogov
6417c507ce Fixed typos 2019-09-16 10:29:29 +03:00
Christoph M. Becker
d0247a63b6 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78535: auto_detect_line_endings value not parsed as bool
 2019-09-14 18:48:28 +02:00
Christoph M. Becker
00ad365125 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78535: auto_detect_line_endings value not parsed as bool
 2019-09-14 18:47:12 +02:00
bugreportuser
fdcca93056 Fix #78535: auto_detect_line_endings value not parsed as bool 2019-09-14 18:46:09 +02:00
Nikita Popov
df982da587 Fix bug #78525 
When calling free_result_buffers(), also free field metadata and
restore the mempool state to what it was before any allocations
have been made. Remove the mempool save/restore logic for the
inner result set as this is now handled on a higher level.
 2019-09-13 14:37:03 +02:00
Dmitry Stogov
e45a757bc2 Fixed incorrect usage of QM_ASSIGN instruction 2019-09-13 12:08:59 +03:00
Dmitry Stogov
51d9f32dbe Fixed bug #78531 (Crash when using undefined variable as object 2019-09-13 01:42:02 +03:00
Kalle Sommer Nielsen
f6f981c13c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  NEWS
 2019-09-12 06:52:24 +03:00
Kalle Sommer Nielsen
716518373f NEWS 2019-09-12 06:50:53 +03:00
Nikita Popov
11f3e24190 Fixed bug #78506 2019-09-11 10:27:32 +02:00
Sara Golemon
a270eb1911 Bump for 7.2.24 2019-09-10 13:04:01 -04:00
Christoph M. Becker
cf31210f29 PHP 7.3.10RC1 has been tagged 2019-09-10 15:11:54 +02:00
Dmitry Stogov
21c3cdf668 NEWS entry, test and minor cleanup for FFI::isNull() 2019-09-10 11:23:12 +03:00
Simonov Denis
481f89551e Request #77863: PDO firebird support type Boolean in input parameters 2019-09-10 09:22:26 +02:00
CHU Zhaowei
1ac6b0251b Fix bug #72884 isCloneable() on SplFileObject should return false 2019-09-09 17:27:17 +02:00
Christoph M. Becker
167ea6307b Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78510: Partially uninitialized buffer returned by sodium_crypto_generichash_init()
 2019-09-09 15:33:02 +02:00
Christoph M. Becker
af2033b1cd Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78510: Partially uninitialized buffer returned by sodium_crypto_generichash_init()
 2019-09-09 15:31:15 +02:00
Christoph M. Becker
8ead77936e Fix #78510: Partially uninitialized buffer returned by sodium_crypto_generichash_init() 
Backport jedisct1/libsodium.php@28d13bf437.
 2019-09-09 15:30:28 +02:00
Nikita Popov
36a8cf5182 Fixed bug #78514 
The property class may have already been translated as part of
some other class. Only translate if xlat returns non-null.
 2019-09-09 11:36:50 +02:00
Peter Kokot
f5dfea60a2 Update NEWS 2019-09-08 21:49:42 +02:00
Dmitry Stogov
1db0bad6a7 Fixed bug #78488 (OOB in ZEND_FUNCTION(ffi_trampoline)). 2019-09-04 12:16:12 +03:00
Christoph M. Becker
61dcae50d5 Document opcache.preload_user directive 2019-09-03 14:08:17 +02:00
Christoph M. Becker
fd7309d194 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #41997: SP call yields additional empty result set
 2019-09-03 13:33:15 +02:00
Christoph M. Becker
b90cd91eba Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #41997: SP call yields additional empty result set
 2019-09-03 13:31:24 +02:00
Christoph M. Becker
41a4379cb4 Fix #41997: SP call yields additional empty result set 
When stored procedures are called, the "final result set is a status
result that includes no result set".  Calling `::nextRowset()` on the
actual last result set should return FALSE, since there is actually no
further result set to be processed.
 2019-09-03 13:29:30 +02:00
Derick Rethans
c53da9b631 Update NEWS for 7.4.0RC2 2019-09-03 07:46:16 +00:00
Derick Rethans
ba7ae00bde Update NEWS for PHP 7.4.0RC1 2019-09-03 07:44:58 +00:00
Christoph M. Becker
f712925500 Update NEWS 2019-09-02 15:21:20 +02:00
Nikita Popov
e9cfd94b8e Merge branch 'PHP-7.2' into PHP-7.3 2019-08-30 16:07:43 +02:00
Sergei Turchanov
8f564e5308 Fixed bug #78469 
fcgi_accept_request function is supposed to call a FastCGI implementation's
on_accept hook when entering an "accepting" stage (that is right before
calling "accept"). This hook implementation (fpm_request_accepting) updates
a worker state to an "accepting" state which is effectively an "Idle" state,
and updates counters on the scoreboard of the corresponding pool (idle++,
active--).

But this is not done when listening for client connections on a named pipe on
Windows platform. In that case a combination of
ConnectNamedPipe/WaitForSingleObject is used (to be able to catch in_shutdown
as far as I understand), but it is nonetheless functionally equivalent to
"accept" call. Also by not calling on_hook neither a worker's state is updated
to "accepting" state nor scoreboard counters are updated.
 2019-08-30 16:06:50 +02:00
Peter Kokot
ae59a6d49d Update NEWS 2019-08-30 04:32:05 +02:00
Christoph M. Becker
35177027f4 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78473: odbc_close() closes arbitrary resources
 2019-08-28 17:58:35 +02:00
Christoph M. Becker
195b8ae779 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78473: odbc_close() closes arbitrary resources
 2019-08-28 17:57:10 +02:00
Christoph M. Becker
b557265816 Fix #78473: odbc_close() closes arbitrary resources 
We have to bail out, if an invalid resource is given.  For consistency
with the other `zend_fetch_resource(2)` calls, we return `FALSE`.
 2019-08-28 17:55:15 +02:00
Nikita Popov
ec9a96dc60 Fixed bug #78335 
Destroy static properties and variables prior to the final GC run,
as they may hold GC roots.
 2019-08-28 12:32:06 +02:00
Jakub Zelenka
302a1400f3 Merge branch 'PHP-7.3' into PHP-7.4 2019-08-26 18:11:04 +01:00
Tsuyoshi Sadakata
ffcf57fa18 Fix bug #78334 (fpm log prefix message includes wrong stdout/stderr notation) 2019-08-26 18:05:11 +01:00
Nikita Popov
9483c50772 Fixed bug #78456 2019-08-26 11:08:42 +02:00
Theodore Brown
1a78bdab27 Fix #78454: Consecutive numeric separators cause OOM error 
Resolves out of memory error when consecutive numeric separators follow a binary/hex literal.
 2019-08-25 22:46:18 +02:00
Nikita Popov
13e92223c0 Fixed bug #78436 2019-08-23 15:27:28 +02:00
Christoph M. Becker
514be3ff87 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #77812: Interactive mode does not support PHP 7.3-style heredoc
 2019-08-23 14:04:31 +02:00
Christoph M. Becker
03c7749dc8 Fix #77812: Interactive mode does not support PHP 7.3-style heredoc 
As of PHP 7.3.0, the rules regarding the heredoc and nowdoc closing
identifier have been relaxed.  While formerly, the closing identifier
was required to be placed at the beginning of a line and to be
immediately followed by (a semicolon and) a line break, it may now be
preceeded by whitespace, and may be followed by any non-word character.
We adjust the recognition logic respectively.
 2019-08-23 13:59:10 +02:00
Christoph M. Becker
ca265eb545 Fix #78438: Corruption when __unserializing deeply nested structures 
When storing two temporary variables for delayed __unserialize() calls,
we have to make sure that both fit into the same linked list element.
To that end we introduce the internal API `tmp_var` which allows to
reserve `num` slots in the same list element.

We also fix the `var_dtor_entries` struct definition to use the proper
size, namely `VAR_DTOR_ENTRIES_MAX`.
 2019-08-23 11:41:06 +02:00
Christoph M. Becker
1eb75f2937 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78441: Parse error due to heredoc identifier followed by digit
 2019-08-21 22:54:52 +02:00
Christoph M. Becker
310708845f Fix #78441: Parse error due to heredoc identifier followed by digit 
Since digits are allowed for identifiers, we have to cater to them as
well.
 2019-08-21 22:51:51 +02:00
Derick Rethans
cf678da52d Update NEWS for 7.4.0RC1 2019-08-20 14:10:36 +00:00
Derick Rethans
b3561e9329 Update NEWS for PHP 7.4.0beta4 2019-08-20 14:09:17 +00:00
Christoph M. Becker
c03114e55c Fix #78386: fstat mode has unexpected value on PHP 7.4 
We must not assume that any file which is not a directory is a regular
file.  Therefore we employ `GetFileType()` in this case to properly
distinguish between character special, FIFO special and regular files.
 2019-08-20 16:04:14 +02:00
Christoph M. Becker
a18f53ec2c Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  fix the problem for connect_attr, set db condition, and add a new attribute _server_host
 2019-08-20 13:35:17 +02:00
Christoph M. Becker
3771d66142 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix the problem for connect_attr, set db condition, and add a new attribute _server_host
 2019-08-20 13:33:45 +02:00
Qianqian Bu
cdf16c010a fix the problem for connect_attr, set db condition, and add a new attribute _server_host 2019-08-20 13:31:58 +02:00
Christoph M. Becker
3775d47eee Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78220: Can't access OneDrive folder
 2019-08-19 19:58:45 +02:00
Christoph M. Becker
5e19f1d458 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78220: Can't access OneDrive folder
 2019-08-19 19:57:22 +02:00
Christoph M. Becker
81f52158b4 Fix #78220: Can't access OneDrive folder 
As of Windows 1903, when the OneDrive on-demand feature is enabled, the
OneDrive folder is reported as reparse point by `FindFirstFile()`, but
trying to get information about the reparse point using
`DeviceIoControl()` fails with `ERROR_NOT_A_REPARSE_POINT`.  We work
around this problem by falling back to `GetFileInformationByHandle()`
if that happens, but only if the reparse point is reported as cloud
reparse point, and only if PHP is running on Windows 1903 or later.

The patch has been developed in collaboration with ab@php.net.

We should keep an eye on the somewhat quirky OneDrive behavior, since
it might change again in a future Windows release.
 2019-08-19 19:55:35 +02:00
Nikita Popov
be7e819068 Fixed bug #77922 
In PHP 7.3 shadow properties are no longer duplicated. Make sure we
only release them if the property was defined on the parent class,
which means that it changed from private->shadow, which is where
duplication does happen.
 2019-08-17 10:58:54 +02:00
Sara Golemon
9b9814fa77
Revert "Move to non deprecated API on suitable ICU versions" 
This reverts commit 13a2f2d041.

The APIs used by this commit aren't entirely equivalent to the original ones.
 2019-08-16 11:39:05 -04:00
Christoph M. Becker
4966647443 Update NEWS 
This fix has been cherry-picked into PHP-7.3.9.
 2019-08-15 15:28:52 +02:00
Nikita Popov
34885408db Fixed bug #78409 
This removes an incorrect optimization (I think this code used to be
necessary to properly handle references in the Serializable based
implementation, but now this code just avoids an array duplication
in a way that is not sound).
 2019-08-15 10:40:28 +02:00
Nikita Popov
1166359acb Merge branch 'PHP-7.2' into PHP-7.3 2019-08-14 17:51:35 +02:00
Nikita Popov
fcabe7e5e4 Fixed bug #78412 
$this should only be included in the generator GC buffer, if it
will be released on destruction.
 2019-08-14 17:50:58 +02:00
Sara Golemon
4b64d47c99
Bump for 7.2.23 2019-08-13 19:32:12 -04:00
Christoph M. Becker
5536105b67 Next will be 7.3.10 2019-08-13 23:57:48 +02:00
Nikita Popov
d891b5f458 Fixed bug #78410 2019-08-13 20:23:56 +02:00
Nikita Popov
60a7e60b61 Fixed bug #72530 
For objects with destructors, we will now only call the destructor
in the initial GC run, and remove any nested data. The object is
marked purple so it will be considered a root for the next GC run,
at which point it will be fully destroyed, if possible.

GC counts change on a number of tests, as the objects now get
destroyed later.
 2019-08-13 14:53:53 +02:00
Nikita Popov
a33361a37c Merge branch 'PHP-7.2' into PHP-7.3 2019-08-13 11:22:41 +02:00
Nikita Popov
4eeb41d1ea Fixed bug #77191 2019-08-13 11:19:58 +02:00
Nikita Popov
b01824e596 Fixed bug #78406 2019-08-13 10:22:32 +02:00
Nikita Popov
a18ad194c4 Fixed bug #78396 2019-08-12 10:45:13 +02:00
Nikita Popov
699b465da2 Fixed bug #78391 2019-08-09 15:03:40 +02:00
Nikita Popov
fc17bfaacf Fixed bug #78383 2019-08-08 09:55:52 +02:00
Dmitry Stogov
720438c8ee Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #78379 (Cast to object confuses GC, causes crash)
 2019-08-08 10:07:39 +03:00
Dmitry Stogov
bff2743caf Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #78379 (Cast to object confuses GC, causes crash)
 2019-08-08 10:05:59 +03:00
Dmitry Stogov
358379be22 Fixed bug #78379 (Cast to object confuses GC, causes crash) 2019-08-08 10:00:39 +03:00
Christoph M. Becker
9ea39d15ab Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78282: atime and mtime mismatch
 2019-08-06 17:28:11 +02:00
Christoph M. Becker
954543cec6 Fix #78282: atime and mtime mismatch 
The fix for bug #78241 assumed that `time_t` would always be 64bit, but
actually is 32bit for x86.  We therefore enforce 64bit arithmetic to
avoid wrapping.

(cherry picked from commit bf242d58e7)
 2019-08-06 17:25:54 +02:00
Derick Rethans
2811e924d1 Update NEWS for 7.4.0beta3 2019-08-06 06:55:20 +00:00
Derick Rethans
6da7f015e1 Update NEWS for PHP 7.4.0beta2 2019-08-06 06:54:01 +00:00
Dmitry Stogov
3fc0e2bb80 Fixed bug #78376 (Incorrect preloading of constant static properties) 2019-08-05 22:55:06 +03:00
Christoph M. Becker
f12dc90e5e Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78346: strip_tags no longer handling nested php tags
 2019-08-02 17:04:36 +02:00
Christoph M. Becker
a87ef5e3dd Fix #78346: strip_tags no longer handling nested php tags 
When the strip tags state machine has been flattened, an if statement
has mistakenly been treated as else if.  We fix this, and also simplify
a bit right away.
 2019-08-02 17:03:20 +02:00
Christoph M. Becker
e60c507362 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78179: MariaDB server version incorrectly detected
 2019-08-02 16:45:29 +02:00
Christoph M. Becker
81efd489db Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78179: MariaDB server version incorrectly detected
 2019-08-02 16:44:15 +02:00
Christoph M. Becker
f9f4a68368 Fix #78179: MariaDB server version incorrectly detected 
As of MariaDB 10.0.2, the server reports a fake version number as work-
around for replication issues[1].  We apply the same "fix" as in the
MariaDB client to cater to this.

[1] <c50ee6c23d (diff-5b45fa673c88c06a9651c7906364f592)>
 2019-08-02 16:42:49 +02:00
Nikita Popov
d89157cd67 Add test for bug #78363 2019-08-02 10:37:44 +02:00
Nikita Popov
85e8ccd55e Fixed bug #78363 2019-08-02 10:35:24 +02:00
Nikita Popov
bab8b3a8be Add test for bug #78356 2019-08-01 10:10:28 +02:00
Christoph M. Becker
1f9a77baef Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix 78213: Empty row pocket
 2019-07-31 18:08:05 +02:00
Christoph M. Becker
8af14024c2 Fix 78213: Empty row pocket 
We have to ensure that we don't create an arena which is smaller than
its header, regardless of the configured alignment.
 2019-07-31 18:05:40 +02:00
Peter Kokot
3e8774e57a Update NEWS 2019-07-30 22:09:00 +02:00
Christoph M. Becker
8413df5e55 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Add security related NEWS entries [ci skip]
 2019-07-30 09:51:37 +02:00
Christoph M. Becker
ef439abd46 Add security related NEWS entries [ci skip] 2019-07-30 09:49:39 +02:00
Remi Collet
b29ecec4ef add security NEW entries + reorder [ci skip] 2019-07-30 09:26:50 +02:00
Nikita Popov
536c91c535 Merge branch 'PHP-7.3' into PHP-7.4 2019-07-29 17:34:37 +02:00
Nikita Popov
44fe025c28 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-29 17:34:16 +02:00
Albert Casademont
dc7aa22b18 Fix bug #78326 
Similar to what fread() does, truncate the stream_get_contents()
result if the original buffer was way too large.
 2019-07-29 17:33:57 +02:00
Christoph M. Becker
76683ea999 Update NEWS [ci skip] 
The fix has been cherry-picked into PHP-7.3.8, so the bug will be fixed
already there.
 2019-07-29 14:48:23 +02:00
Nikita Popov
a22a06c351 Merge branch 'PHP-7.3' into PHP-7.4 2019-07-29 13:03:53 +02:00
Nikita Popov
8e63bb5e46 Fixed bug #78341 
The smart branch logic assumed b->start refers to the old offsets,
while b->start was already adjusted to the new offsets at this
point. Delay the change until later.
 2019-07-29 13:02:01 +02:00
Nikita Popov
68fd435ba8 Fixed bug #78333 
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
 2019-07-29 11:27:21 +02:00
Nikita Popov
2eb159d589 Merge branch 'PHP-7.3' into PHP-7.4 2019-07-29 11:26:31 +02:00
Nikita Popov
727929765b Merge branch 'PHP-7.2' into PHP-7.3 2019-07-29 11:26:09 +02:00
Nikita Popov
d142dfc93d Fixed bug #78333 
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
 2019-07-29 11:25:27 +02:00
Nikita Popov
4ae807e84e Fixed bug #78344 
When performing a constant visibility check during compilation we
might be dealing with unlinked classes and as such should account
for the possibility of unresolved parents.
 2019-07-29 11:12:00 +02:00
Nikita Popov
9bfda013d3 Fixed bug #78340 
Even if we know the file size, we still need to read in a loop in
case the read call returns an incomplete result.

This was less of an issue previously because we did not use the
"one large read" approach for non-plain stream wrappers.
 2019-07-29 10:07:12 +02:00
Christoph M. Becker
fec71e3f25 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78342: Bus error in configure test for iconv //IGNORE
 2019-07-29 08:51:33 +02:00
Christoph M. Becker
585131f901 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78342: Bus error in configure test for iconv //IGNORE
 2019-07-29 08:50:39 +02:00