archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
110059 commits 526 branches 1434 tags 867 MiB
Commit graph

49635 commits

Author SHA1 Message Date
Nikita Popov
043a11cf01 Merge branch 'PHP-7.3' 2019-01-03 09:40:49 +01:00
Nikita Popov
349dbb7938 Merge branch 'PHP-7.2' into PHP-7.3 2019-01-03 09:40:42 +01:00
Nikita Popov
cb009b12a5 Fixed bug #77273 2019-01-03 09:40:07 +01:00
Nikita Popov
31375c5ca3 Merge branch 'PHP-7.3' 2019-01-02 14:14:07 +01:00
Nikita Popov
325a113974 Possible fix for bug #77287 
The cache size could be off by 4, if we're on a 32-bit system and
the slot had to be bumped for alignment reasons.

I wasn't able to reproduce the issue reported in bug #77287, but I
think this might be the cause.
 2019-01-02 14:12:58 +01:00
Andrey Hristov
d64b74869c Test commit 2019-01-02 12:30:12 +02:00
Nikita Popov
25d56a594d Merge branch 'PHP-7.3' 2019-01-02 11:21:30 +01:00
Vincent JARDIN
91e44a27f6 skeleton: support PHP 7.2 
skeleton can still be leveraged with older PHP releases, including
PHP 7.2.

I wanted to add this capability since PHP 7.2 is still widely provided
with most Linux distributions.

I am using ext_skel.php on a vanilla Ubuntu 18.04 and Windows
in order to illustrate how to develop a PHP extension for both
OS using the default tools provided by the distributions.
  see: https://github.com/vjardin/php-bonjour
 2019-01-02 11:21:25 +01:00
Nikita Popov
2fab3302ae Use ZEND_PARSE_PARAMETERS_NONE in pcre 
Instead of the manual ZEND_PARSE_PARAMETERS_START(0, 0) form.
 2019-01-02 11:18:35 +01:00
Anatol Belski
5c3bac9c21 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Update NEWS
  Fixed bug #75684 In mysqlnd_ext_plugin.h the plugin methods family has no external visibility
 2019-01-02 11:03:16 +01:00
Anatol Belski
d1c616f077 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #75684 In mysqlnd_ext_plugin.h the plugin methods family has no external visibility
 2019-01-02 11:01:34 +01:00
Anatol Belski
7b3f8e746a Fixed bug #75684 In mysqlnd_ext_plugin.h the plugin methods family has no external visibility 2019-01-02 11:00:33 +01:00
Nikita Popov
7ac3c2fa65 Fix ZEND_NORMALIZE_BOOL usage 
Typo introduced in cdd8368d6f.
 2019-01-02 09:56:40 +01:00
Nikita Popov
685307b081 Merge branch 'PHP-7.3' 2019-01-02 09:32:59 +01:00
Nikita Popov
91888cc372 Fixed bug #77257 
Correctly handle the case of duplicate predecessors, by removing the
duplicate predecessor and corresponding phi node operands.

For the future, it would be better to instead allow duplicate
predecessors and avoid this kind of fragile code...
 2019-01-02 09:31:50 +01:00
Xinchen Hui
c5c76fbd61 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Update NEWS
  Fixed bug #77395 (segfault about array_multisort)
 2019-01-02 12:10:41 +08:00
Xinchen Hui
e527626d9f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #77395 (segfault about array_multisort)
 2019-01-02 12:10:04 +08:00
Xinchen Hui
8ebae84674 Fixed bug #77395 (segfault about array_multisort) 2019-01-02 12:09:47 +08:00
Christoph M. Becker
c670b622ab Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fix #77391: 1bpp BMPs may fail to be loaded
 2018-12-31 20:52:27 +01:00
Christoph M. Becker
6f663c3a2e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77391: 1bpp BMPs may fail to be loaded
 2018-12-31 20:50:19 +01:00
Christoph M. Becker
b0cfa28d6d Fix #77391: 1bpp BMPs may fail to be loaded 
We port the upstream fix[1].

[1] <d0859134fc>
 2018-12-31 20:45:47 +01:00
Christoph M. Becker
0f9d369921 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Regenerate certs for openssl tests
 2018-12-31 18:28:11 +01:00
Christoph M. Becker
b051ab56dc Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Regenerate certs for openssl tests
 2018-12-31 18:27:26 +01:00
Alexander Kurilo
687dad3674 Regenerate certs for openssl tests 2018-12-31 18:20:34 +01:00
Anatol Belski
67c0415d86 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Increase timeout for test on AppVeyor
 2018-12-29 17:52:10 +01:00
Anatol Belski
d4b7cc1dba Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Increase timeout for test on AppVeyor
 2018-12-29 17:51:39 +01:00
Anatol Belski
54a2b42778 Increase timeout for test on AppVeyor 2018-12-29 17:48:25 +01:00
Anatol Belski
a11e7d2c1f Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fixed bug #77346 webm files incorrectly detected as application/octet-stream
 2018-12-28 13:27:31 +01:00
Anatol Belski
d874d4a15c Fixed bug #77346 webm files incorrectly detected as application/octet-stream 
HEADSUP data from file 5.34 is used from now on
 2018-12-28 13:25:40 +01:00
Dmitry Stogov
76d8f3923e Revert HASH_FLAG_INITIALIZED into HASH_FLAG_UNINITIALIZED. 2018-12-28 11:22:18 +03:00
Dmitry Stogov
c706adaaab Added missing invalidations. 2018-12-28 00:14:49 +03:00
Dmitry Stogov
675a8a64c3 Use HT_IS_INITIALIZED() and HT_INVALIDATE() macros instead of hackish HT_FLAGS assumtions. 2018-12-27 22:48:25 +03:00
Dmitry Stogov
c2179309f4 Removed useless check 2018-12-27 22:35:37 +03:00
Nikita Popov
cd7601ebfc Merge branch 'PHP-7.3' 2018-12-27 15:34:22 +01:00
Lauri Kenttä
16c62a8179 Fix #77360: class_uses causes segfault 2018-12-27 15:34:02 +01:00
Nikita Popov
6a06190850 Merge branch 'PHP-7.3' 2018-12-27 15:29:51 +01:00
Lauri Kenttä
89bf3df67d Fix #77359: spl_autoload causes segfault 
Use the correct function to free the string.
 2018-12-27 15:28:25 +01:00
Dmitry Stogov
9bf80ef385 Respect static method visibility 2018-12-27 10:42:52 +03:00
Nikita Popov
0bbfebb6d9 Add SCCP support for ZEND_ARRAY_KEY_EXISTS 2018-12-26 23:54:11 +03:00
Michael Moravec
f5044a12dd Implement ZEND_ARRAY_KEY_EXISTS opcode to speed up array_key_exists() 2018-12-26 23:54:11 +03:00
Anatol Belski
8789348364 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Initialize s_un (sockaddr_un) to zero before using it. Fixes #76839.
 2018-12-26 19:03:04 +01:00
Anatol Belski
e38e44e3c6 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Initialize s_un (sockaddr_un) to zero before using it. Fixes #76839.
 2018-12-26 19:01:36 +01:00
Michael Meyer
3c42c784c2 Initialize s_un (sockaddr_un) to zero before using it. Fixes #76839. 2018-12-26 18:58:27 +01:00
Nikita Popov
27e9c05e81 Remove preg_options param from pcre_get_compiled_regex() 
This parameter is always zero and not necessary to call pcre2_match.

I'm leaving the parameter behind on the _ex() variant, so the preg_flags
are still accessible in some way.
 2018-12-26 17:20:13 +01:00
Nikita Popov
fc30c0f7ad Merge branch 'PHP-7.3' 2018-12-26 17:13:21 +01:00
Nikita Popov
b1deb98c42 Fixed bug #77338 
Set preg_options to 0 in php_pcre_get_compiled_regex(_ex). These
options are intended to be passed to pcre2_match. However, we do
not have any flags that actually need to be set during matching
(all relevant flags are set during compilation), and the preg_flags
value is used for PHP-specific flags instead.

This parameter should be removed entirely in master to avoid confusion.
 2018-12-26 17:11:27 +01:00
Nikita Popov
e595f5cd8a Migrate ext/zlib to use pkg-config 
There are other extensions checking for zlib as well, not quite
sure what to do there with regard to option names.
 2018-12-26 16:59:24 +01:00
Eli Schwartz
c1a22f3d4e Require pkg-config for external PCRE 
Use standard PKG_CHECK_MODULES macro and remove the fallback case.
The option is renamed to --with-external-pcre and no longer accepts
an explicit path -- it should be specified through pkg-config instead.
 2018-12-26 13:51:15 +01:00
Eli Schwartz
285a077c12 ext/gd: use --with instead of --enable 
By convention it probably makes sense to stick with this even when
dropping the *-dir=DIR part.

See:
https://github.com/php/php-src/pull/3632#discussion_r229474568
https://autotools.io/autoconf/arguments.html
 2018-12-26 13:37:39 +01:00
Dmitry Stogov
cbf642b715 Create object only after parameter checks 2018-12-26 13:06:33 +03:00