clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
113,482 Commits 491 Branches 1,363 Tags 836 MiB
650115c827
Commit Graph

12012 Commits

Author SHA1 Message Date
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