]> granicus.if.org Git - php/log
php
6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Apr 2019 11:54:04 +0000 (13:54 +0200)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Apr 2019 11:53:57 +0000 (13:53 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 29 Apr 2019 11:53:21 +0000 (13:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFixed bug #77945
Nikita Popov [Mon, 29 Apr 2019 11:51:26 +0000 (13:51 +0200)]
Fixed bug #77945

Make sure that we proper distinguish between empty string key and
no key during SDL serialization.

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 29 Apr 2019 10:18:11 +0000 (12:18 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Properly initialize out parameter

6 years agoProperly initialize out parameter
Christoph M. Becker [Mon, 29 Apr 2019 10:17:38 +0000 (12:17 +0200)]
Properly initialize out parameter

The MS docs on `SQLColAttribute()`[1] state regarding the
`NumericAttributePtr` parameter:

| Please note that some drivers may only write the lower 32-bit or
| 16-bit of a buffer and leave the higher-order bit unchanged.
| Therefore, applications should initialize the value to 0 before
| calling this function.

[1] <https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/sqlcolattribute-function?view=sql-server-2017>

6 years agofixed typo
Markus Staab [Mon, 29 Apr 2019 09:03:58 +0000 (11:03 +0200)]
fixed typo

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Apr 2019 08:23:46 +0000 (10:23 +0200)]
Merge branch 'PHP-7.4'

6 years agoAdds json_encode test for unpacked arrays
Jury [Mon, 29 Apr 2019 02:58:11 +0000 (22:58 -0400)]
Adds json_encode test for unpacked arrays

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 29 Apr 2019 08:21:44 +0000 (10:21 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Extend CURLFile to support streams

6 years agoExtend CURLFile to support streams
Christoph M. Becker [Mon, 29 Apr 2019 08:21:07 +0000 (10:21 +0200)]
Extend CURLFile to support streams

Due to former restrictions of the libcurl API, curl multipart/formdata
file uploads supported only proper files.  However, as of curl 7.56.0
the new `curl_mime_*()` API is available (and already supported by
PHP[1]), which allows us to support arbitrary *seekable* streams, which
is generally desirable, and particularly resolves issues with the
transparent Unicode and long part support on Windows (see bug #77711).

Note that older curl versions are still supported, but CURLFile is
still restricted to proper files in this case.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=a83b68ba56714bfa06737a61af795460caa4a105>

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Apr 2019 07:58:56 +0000 (09:58 +0200)]
Merge branch 'PHP-7.4'

6 years agoFix typo in TRY_ASSIGN macro name
Nikita Popov [Mon, 29 Apr 2019 07:58:45 +0000 (09:58 +0200)]
Fix typo in TRY_ASSIGN macro name

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 29 Apr 2019 07:07:45 +0000 (09:07 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix tests

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 29 Apr 2019 07:07:13 +0000 (09:07 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix tests

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Mon, 29 Apr 2019 07:05:04 +0000 (09:05 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix tests

6 years agoFix tests
Christoph M. Becker [Mon, 29 Apr 2019 07:02:13 +0000 (09:02 +0200)]
Fix tests

These tests are obviously meant to test successful and failing uri:
DSNs, but did not pass proper file:// URIs, so actually ended up
testing for invalid data source URIs twice.  We fix this, and adjust
the expectations accordingly.

We also unfork the -win32 variant, since both test cases are almost
identical, and the expected error message may be either one.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 28 Apr 2019 23:35:49 +0000 (01:35 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Simplify checking of *nix build tools

6 years agoSimplify checking of *nix build tools
Peter Kokot [Sat, 27 Apr 2019 15:21:56 +0000 (17:21 +0200)]
Simplify checking of *nix build tools

The buildmk.stamp file has been created by the *nix build checking step
to run the check step only once. Instead of poluting the project root
directory, the stamp file can be also omitted. Performance difference is
very minimal to not justify having the stamp check at all today anymore.

This patch integrates the buildcheck.sh to buildconf script directly.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 28 Apr 2019 22:55:59 +0000 (00:55 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove unused TSRM/readdir.h header

6 years agoRemove unused TSRM/readdir.h header
Peter Kokot [Sun, 28 Apr 2019 03:15:47 +0000 (05:15 +0200)]
Remove unused TSRM/readdir.h header

This was once part of TSRM but then got refactored into the windows
implementation win32/readdir.h directly. Instead of including such files
directly code should use zend_virtual_cwd.h which is already part of the
php.h file.

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sun, 28 Apr 2019 21:51:15 +0000 (23:51 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Make MySQLPDOTest::extractVersion() more liberal

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sun, 28 Apr 2019 21:50:43 +0000 (23:50 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Make MySQLPDOTest::extractVersion() more liberal

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sun, 28 Apr 2019 21:49:19 +0000 (23:49 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Make MySQLPDOTest::extractVersion() more liberal

6 years agoMake MySQLPDOTest::extractVersion() more liberal
Christoph M. Becker [Sun, 28 Apr 2019 21:48:27 +0000 (23:48 +0200)]
Make MySQLPDOTest::extractVersion() more liberal

MySQL/MariaDB version strings may have suffixes which may contain dots;
for instance, Debian stretch has 5.5.5-10.1.37-MariaDB-0+deb9u1 or
such.  Therefore, we make the version extraction more liberal, and only
require that there are at least three parts separated by dot, and
ignore additional parts.

We also fix an erroneous test expectation, which would be triggered on
CI now, right away.  This patch has been provided by petk@.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 28 Apr 2019 19:19:30 +0000 (21:19 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Enhance the buildconf force option

6 years agoEnhance the buildconf force option
Peter Kokot [Sun, 28 Apr 2019 19:15:54 +0000 (21:15 +0200)]
Enhance the buildconf force option

The force option used to only remove the Autoconf cache files. Now it
also removes entire configure file so the configure file always gets
rebuilt when needs be done.

Additionally, the buildconf now also accepts the shorter version of the
force option:
  buildconf -f

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 28 Apr 2019 19:05:58 +0000 (21:05 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Automatically remove aclocal.m4 if present

6 years agoAutomatically remove aclocal.m4 if present
Peter Kokot [Thu, 25 Apr 2019 20:44:56 +0000 (22:44 +0200)]
Automatically remove aclocal.m4 if present

Commit 4e7064d173d2b5b22e159fcf52d22b10213b67b8 removed the usage of
`aclocal.m4`. When using Git repositories, many times cleaning of the
generated files is not done prior to running phpize or buildconf. For
example:

  git clone git://github.com/php/php-src
  cd php-src
  git checkout PHP-7.3
  ./buildconf
  ./configure
  git checkout PHP-7.4
  ./buildconf # -> warnings
  ./configure # -> errors

To not accidentally include `aclocal.m4` file in the generated configure
this enhances build system experience a bit more by removing aclocal.m4
file prior to start building configure file using phpize or buildconf.

6 years agoMerge branch 'PHP-7.4'
Jakub Zelenka [Sun, 28 Apr 2019 17:51:36 +0000 (18:51 +0100)]
Merge branch 'PHP-7.4'

6 years agoUpdate NEWS with added TLS 1.3 info
Jakub Zelenka [Sun, 28 Apr 2019 17:48:35 +0000 (18:48 +0100)]
Update NEWS with added TLS 1.3 info

6 years agoEnable TLS 1.3 by default
Jakub Zelenka [Sun, 10 Mar 2019 17:11:54 +0000 (17:11 +0000)]
Enable TLS 1.3 by default

6 years agoFix tests and logic for TLS 1.3
Jakub Zelenka [Sun, 3 Mar 2019 14:22:14 +0000 (14:22 +0000)]
Fix tests and logic for TLS 1.3

6 years agoAdded tls 1.3 support for PHP
codarrenvelvindron [Wed, 5 Dec 2018 04:23:34 +0000 (08:23 +0400)]
Added tls 1.3 support for PHP

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 28 Apr 2019 00:30:20 +0000 (02:30 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Remove outdated and redundant Apache README

6 years ago[ci skip] Remove outdated and redundant Apache README
Peter Kokot [Sun, 28 Apr 2019 00:29:08 +0000 (02:29 +0200)]
[ci skip] Remove outdated and redundant Apache README

PHP manual includes more information and a bit more updated than this
README.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 27 Apr 2019 22:51:53 +0000 (00:51 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Update NEWS
  Update NEWS
  Fix #77024: SplFileObject::__toString() may return array

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Peter Kokot [Sat, 27 Apr 2019 22:51:38 +0000 (00:51 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Update NEWS
  Update NEWS
  Fix #77024: SplFileObject::__toString() may return array

6 years agoUpdate NEWS
Peter Kokot [Sat, 27 Apr 2019 22:51:18 +0000 (00:51 +0200)]
Update NEWS

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Sat, 27 Apr 2019 22:50:54 +0000 (00:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Update NEWS
  Fix #77024: SplFileObject::__toString() may return array

6 years agoUpdate NEWS
Peter Kokot [Sat, 27 Apr 2019 22:50:40 +0000 (00:50 +0200)]
Update NEWS

6 years agoFix #77024: SplFileObject::__toString() may return array
Craig Duncan [Sat, 27 Apr 2019 22:44:48 +0000 (00:44 +0200)]
Fix #77024: SplFileObject::__toString() may return array

- Correct the behaviour of casting spl files to strings
- Add a test for Bug 77024

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 27 Apr 2019 19:18:47 +0000 (21:18 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Little detection change proposal.

6 years agoLittle detection change proposal.
David Carlier [Fri, 26 Apr 2019 21:56:08 +0000 (22:56 +0100)]
Little detection change proposal.

As pointed out, the further path is called by open rather than shm_open.

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sat, 27 Apr 2019 17:22:56 +0000 (19:22 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  PHP, meet MySQL

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sat, 27 Apr 2019 17:22:30 +0000 (19:22 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  PHP, meet MySQL

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 27 Apr 2019 17:22:10 +0000 (19:22 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  PHP, meet MySQL

6 years agoPHP, meet MySQL
Christoph M. Becker [Sat, 27 Apr 2019 17:21:51 +0000 (19:21 +0200)]
PHP, meet MySQL

All pdo_mysql tests are skipped on AppVeyor because "No such host is
known".  We change the DSN to use semicolons instead of spaces to fix
that.

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sat, 27 Apr 2019 16:48:39 +0000 (18:48 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #77944: Wrong meta pdo_type for bigint on LLP64

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sat, 27 Apr 2019 16:48:09 +0000 (18:48 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #77944: Wrong meta pdo_type for bigint on LLP64

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 27 Apr 2019 16:46:57 +0000 (18:46 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77944: Wrong meta pdo_type for bigint on LLP64

6 years agoFix #77944: Wrong meta pdo_type for bigint on LLP64
Christoph M. Becker [Sat, 27 Apr 2019 16:46:27 +0000 (18:46 +0200)]
Fix #77944: Wrong meta pdo_type for bigint on LLP64

When actually fetching the data, bigint (unsigned) column values are
returned as integers on LLP64 architectures, so their pdo_type has to
be PDO::PARAM_INT accordingly.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 26 Apr 2019 13:05:56 +0000 (15:05 +0200)]
Merge branch 'PHP-7.4'

6 years agoFix file name clash in zlib tests
Nikita Popov [Fri, 26 Apr 2019 13:05:42 +0000 (15:05 +0200)]
Fix file name clash in zlib tests

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 26 Apr 2019 07:57:52 +0000 (09:57 +0200)]
Merge branch 'PHP-7.4'

6 years agoEnable -Werror in CI
Nikita Popov [Tue, 23 Apr 2019 11:24:29 +0000 (13:24 +0200)]
Enable -Werror in CI

Add --enable-werror configure option and use it on Travis. It's not
possible to directly use CFLAGS, because it also affects configure
checks which often throw warnings.

We can't enable something similar for Windows builds at this time,
because they throw a lot more warnings.

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 26 Apr 2019 07:09:35 +0000 (09:09 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix VirtualProtect() related Phar issues

6 years agoFix VirtualProtect() related Phar issues
Christoph M. Becker [Fri, 26 Apr 2019 07:09:22 +0000 (09:09 +0200)]
Fix VirtualProtect() related Phar issues

We must not (try to) modify shared values, but rather have to use our
own copies, if unixified filenames are required on Windows.  To avoid
excessive string duplication, we add checks whether the filenames are
already unixified (i.e. do not contain backslashes).  To improve the
performance if we need to copy strings, we use do_alloca() and friends.

Besides generally being somewhat messy, the handling of unixified
filenames is still suboptimal performance-wise, but we leave this for a
future cleanup, and focus on fixing the issue at hand for now.

We also enable opcache.protect_memory for the AppVeyor CI.

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 25 Apr 2019 21:29:42 +0000 (23:29 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #77940: test using outdated mon_thousands_sep for Swedish

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Thu, 25 Apr 2019 21:29:25 +0000 (23:29 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #77940: test using outdated mon_thousands_sep for Swedish

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Thu, 25 Apr 2019 21:29:03 +0000 (23:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77940: test using outdated mon_thousands_sep for Swedish

6 years agoFix #77940: test using outdated mon_thousands_sep for Swedish
Christoph M. Becker [Thu, 25 Apr 2019 21:28:41 +0000 (23:28 +0200)]
Fix #77940: test using outdated mon_thousands_sep for Swedish

Of course, we should expect a comma, not a period.

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 25 Apr 2019 17:41:01 +0000 (19:41 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #77940: test using outdated mon_thousands_sep for Swedish

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Thu, 25 Apr 2019 17:40:37 +0000 (19:40 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #77940: test using outdated mon_thousands_sep for Swedish

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Thu, 25 Apr 2019 17:40:05 +0000 (19:40 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77940: test using outdated mon_thousands_sep for Swedish

6 years agoFix #77940: test using outdated mon_thousands_sep for Swedish
Christoph M. Becker [Thu, 25 Apr 2019 17:39:42 +0000 (19:39 +0200)]
Fix #77940: test using outdated mon_thousands_sep for Swedish

This time so that it works for all Windows 10 versions (hopefully).

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 25 Apr 2019 07:00:02 +0000 (09:00 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #77940: test using outdated mon_thousands_sep for Swedish

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Thu, 25 Apr 2019 06:59:35 +0000 (08:59 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #77940: test using outdated mon_thousands_sep for Swedish

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Thu, 25 Apr 2019 06:59:09 +0000 (08:59 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77940: test using outdated mon_thousands_sep for Swedish

6 years agoFix #77940: test using outdated mon_thousands_sep for Swedish
Christoph M. Becker [Thu, 25 Apr 2019 06:58:13 +0000 (08:58 +0200)]
Fix #77940: test using outdated mon_thousands_sep for Swedish

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Wed, 24 Apr 2019 22:08:05 +0000 (00:08 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #77938: socket_get_option error

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Wed, 24 Apr 2019 22:06:15 +0000 (00:06 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #77938: socket_get_option error

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Wed, 24 Apr 2019 22:04:37 +0000 (00:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77938: socket_get_option error

6 years agoFix #77938: socket_get_option error
Christoph M. Becker [Wed, 24 Apr 2019 22:03:45 +0000 (00:03 +0200)]
Fix #77938: socket_get_option error

Since tcp_socket/ssl streams are not representable, we suppress the
redirect to fix the test case.

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Wed, 24 Apr 2019 19:28:05 +0000 (22:28 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Use better macros

6 years agoUse better macros
Dmitry Stogov [Wed, 24 Apr 2019 19:27:40 +0000 (22:27 +0300)]
Use better macros

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Wed, 24 Apr 2019 19:24:05 +0000 (22:24 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  settype() optimization

6 years agosettype() optimization
Dmitry Stogov [Wed, 24 Apr 2019 19:23:49 +0000 (22:23 +0300)]
settype() optimization

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Wed, 24 Apr 2019 17:22:11 +0000 (19:22 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove html_errors from INI Quick Reference as INI values are identical to Engine values

6 years agoRemove html_errors from INI Quick Reference as INI values are identical to Engine...
George Peter Banyard [Wed, 24 Apr 2019 14:31:01 +0000 (16:31 +0200)]
Remove html_errors from INI Quick Reference as INI values are identical to Engine values

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Wed, 24 Apr 2019 15:28:40 +0000 (18:28 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Use ZEND_TRY_ASSIGN_REF_... macros for arguments passed to internal function by reference

6 years agoUse ZEND_TRY_ASSIGN_REF_... macros for arguments passed to internal function by reference
Dmitry Stogov [Wed, 24 Apr 2019 15:28:29 +0000 (18:28 +0300)]
Use ZEND_TRY_ASSIGN_REF_... macros for arguments passed to internal function by reference

6 years agoUse ZEND_TRY_ASSIGN_REF_... macros for arguments passed to internal function by reference
Dmitry Stogov [Wed, 24 Apr 2019 15:16:47 +0000 (18:16 +0300)]
Use ZEND_TRY_ASSIGN_REF_... macros for arguments passed to internal function by reference

6 years agoUse ZEND_TRA_ASSIGN_REF_... macros for by reference arguments of internal functions.
Dmitry Stogov [Wed, 24 Apr 2019 13:14:48 +0000 (16:14 +0300)]
Use ZEND_TRA_ASSIGN_REF_... macros for by reference arguments of internal functions.

6 years agoJIT profiling other BSD build fixes
David Carlier [Mon, 22 Apr 2019 07:17:12 +0000 (08:17 +0100)]
JIT profiling other BSD build fixes

6 years agoMerge branch 'PHP-7.4'
Remi Collet [Wed, 24 Apr 2019 07:46:36 +0000 (09:46 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  news entry for litespeed

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Remi Collet [Wed, 24 Apr 2019 07:46:20 +0000 (09:46 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  news entry for litespeed

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Remi Collet [Wed, 24 Apr 2019 07:46:06 +0000 (09:46 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  news entry for litespeed

6 years agonews entry for litespeed
Remi Collet [Wed, 24 Apr 2019 07:45:48 +0000 (09:45 +0200)]
news entry for litespeed

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Tue, 23 Apr 2019 21:09:12 +0000 (00:09 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Optimize constant SWITCH_LONG and SWITCH_STRING

6 years agoOptimize constant SWITCH_LONG and SWITCH_STRING
Dmitry Stogov [Tue, 23 Apr 2019 21:08:17 +0000 (00:08 +0300)]
Optimize constant SWITCH_LONG and SWITCH_STRING

6 years agoFixed test (Warning -> Exception)
Dmitry Stogov [Tue, 23 Apr 2019 19:44:30 +0000 (22:44 +0300)]
Fixed test (Warning -> Exception)

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Tue, 23 Apr 2019 19:40:11 +0000 (22:40 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Don't eliminate BIND_STATIC if it may cause undefined constant warning

6 years agoDon't eliminate BIND_STATIC if it may cause undefined constant warning
Dmitry Stogov [Tue, 23 Apr 2019 19:39:14 +0000 (22:39 +0300)]
Don't eliminate BIND_STATIC if it may cause undefined constant warning

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Tue, 23 Apr 2019 18:38:57 +0000 (20:38 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Move Autoconf Archive macros to a common m4 dir

6 years agoMove Autoconf Archive macros to a common m4 dir
Peter Kokot [Tue, 23 Apr 2019 18:37:31 +0000 (20:37 +0200)]
Move Autoconf Archive macros to a common m4 dir

In PHP the build dir is used as a directory for external macros
including Autoconf Archive macros.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Tue, 23 Apr 2019 18:32:03 +0000 (20:32 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Move acinclude.m4 to build/php.m4

6 years agoMove acinclude.m4 to build/php.m4
Peter Kokot [Tue, 12 Mar 2019 23:25:07 +0000 (00:25 +0100)]
Move acinclude.m4 to build/php.m4

The acinclude.m4 file is in a usual Autotools build processed with
Automake's aclocal tool. Since PHP currently doesn't use Automake and
aclocal this file can be moved into the build directory. PHP build
system currently generates a combined aclocal.m4 file that Autoconf
can processes automatically.

However, a newer practice is writing all local macros in separate
dedicated files prefixed with package name, in PHP's case PHP_MACRO_NAME
and putting them in a common `m4` directory. PHP uses currently `build`
directory for this purpose.

Name `php.m4` probably most resembles such file for PHP's case.

PHP manually created the aclocal.m4 file from acinclude.m4 and
build/libtool.m4. Which is also not a particularly good practice [1], so
this patch also removes the generated alocal.m4 usage and uses
m4_include() calls manually in the configure.ac and phpize.m4 files
manually.

- sort order is not important but can be alphabetical
- list of *.m4 files prerequisites for configure script generation
  updated
- Moving m4_include() before AC_INIT also removes all comments starting
  with hash character (`#`) in the included files.

[1] https://autotools.io/autoconf/macros.html

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Tue, 23 Apr 2019 18:18:38 +0000 (20:18 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Simplify libxmlrpc bundling and building

6 years agoSimplify libxmlrpc bundling and building
Peter Kokot [Mon, 22 Apr 2019 22:20:50 +0000 (00:20 +0200)]
Simplify libxmlrpc bundling and building

The xmlrpc library is a forked, modified and bundled into the PHP source
code. Instead of having a separate *nix build system files in the xmlrpc
library this patch removes unneeded build checks.

- AC_PROG_CC is not needed to be called by the extension itself since it
  is already part of the main configure.ac and the phpize's
  configure.ac.
- UNDEF_THREADS_HACK is not used in the current codebase.
- Symbols defined by XMLRPC_HEADER_CHECKS are not used in the current
  code.
- Symbols defined by XMLRPC_FUNCTION_CHECKS are not used in the current
  code.
- AC_PROG_RANLIB is already done by the TSRM's files and isn't needed
  for the xmlrpc extension to work.
- AC_PROG_LN_S is already done by the PHP main configure.ac and also
  isn't needed by the xmlrpc extension to be built.