Peter Kokot [Tue, 23 Apr 2019 06:51:23 +0000 (08:51 +0200)]
[ci skip] Remove CLI sapi README
Removing in favour of:
- https://www.php.net/manual/en/features.commandline.introduction.php
- https://www.php.net/manual/en/features.commandline.differences.php
Peter Kokot [Tue, 23 Apr 2019 06:27:11 +0000 (08:27 +0200)]
Remove sinclude from tsrm.m4
This was once part of a standalone TSRM build and is not used in current
build system anymore.
Dmitry Stogov [Mon, 22 Apr 2019 23:21:08 +0000 (02:21 +0300)]
Remove unused BIND_STATIC insructions
Christoph M. Becker [Mon, 22 Apr 2019 10:58:09 +0000 (12:58 +0200)]
Merge link.c and link_win32.c
CrazyMiaoo [Mon, 22 Apr 2019 11:29:30 +0000 (14:29 +0300)]
Add gcc global register for aarch64
Christoph M. Becker [Mon, 22 Apr 2019 09:46:19 +0000 (11:46 +0200)]
Fix parameter order
The parameter order of `php_sys_link()` should be identical on Windows
and POSIX, bug commit
c9861bd[1] got that wrong.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
c9861bd7a974ef1555395b879c1035a0bbc12ef1>
Dmitry Stogov [Mon, 22 Apr 2019 08:05:56 +0000 (11:05 +0300)]
Fixed wrong opline
George Wang [Sun, 21 Apr 2019 19:59:49 +0000 (15:59 -0400)]
Merge branch 'PHP-7.3' into PHP-7.4
George Wang [Sun, 21 Apr 2019 19:59:07 +0000 (15:59 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
George Wang [Sun, 21 Apr 2019 19:04:54 +0000 (15:04 -0400)]
Improved LSAPI_End_Response_r() .
George Wang [Sun, 21 Apr 2019 18:59:51 +0000 (14:59 -0400)]
Fixed bug in litespeed_finish_request(), disable fastcgi_finish_request() alias for now.
Peter Kokot [Sat, 20 Apr 2019 22:21:14 +0000 (00:21 +0200)]
Refactor Zend/acinclude.m4 local macro
There is now only a single M4 macro in the legacy acinclude.m4 file. A
separate acinclude file was once used with a standalone Zend engine
building but with current build system this can be simplified a bit.
Peter Kokot [Sun, 21 Apr 2019 13:33:20 +0000 (15:33 +0200)]
[ci skip] Fix CS in Markdown files
Checked and quickfixed with Markdown linter
- 80 columns line width (~)
- code highlighting
- ...
Some most obvious outdated content updated a bit more.
Rodrigo Prado [Sun, 21 Apr 2019 02:53:02 +0000 (23:53 -0300)]
Updated visual text elements using markdown
Peter Kokot [Sun, 21 Apr 2019 01:16:11 +0000 (03:16 +0200)]
[ci skip] Fix logo location
Peter Kokot [Sat, 20 Apr 2019 20:55:37 +0000 (22:55 +0200)]
[ci skip] Fix typo
Peter Kokot [Sat, 20 Apr 2019 20:41:00 +0000 (22:41 +0200)]
Refactor docs files for bcmath library
Peter Kokot [Sat, 20 Apr 2019 20:35:25 +0000 (22:35 +0200)]
Move ucgendata README to generator file header
Peter Kokot [Sat, 20 Apr 2019 20:22:56 +0000 (22:22 +0200)]
Remove zend.ico
The usage of the `zend.ico` image file was removed via
4b3e19802385c5874eefd3ba4565f2efbc55dc96 and is in current code base
not used anymore.
Rodrigo Prado [Mon, 15 Apr 2019 01:10:06 +0000 (22:10 -0300)]
Added test for imagecolorclosesthwb
The function was not tested yet.
See http://gcov.php.net/viewer.php?version=PHP_HEAD&func=tested_functions
Vitor Mattos [Sat, 13 Apr 2019 18:13:38 +0000 (15:13 -0300)]
Add test for date timestamp
- [date_timestamp_get] adding coverage for date_timestamp_get alias to
DateTime::getTimestamp feature at PHPRio TestFest
- [date_timestamp_get] adding coverage for date_timestamp_get basic
feature at PHPRio TestFest
- Combine tests into single file
Peter Kokot [Sat, 20 Apr 2019 17:13:21 +0000 (19:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update changelog
Update changelog
Fix #77921: static.php.net doesn't work anymore
Peter Kokot [Sat, 20 Apr 2019 17:13:06 +0000 (19:13 +0200)]
Update changelog
Peter Kokot [Sat, 20 Apr 2019 17:12:31 +0000 (19:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update changelog
Fix #77921: static.php.net doesn't work anymore
Peter Kokot [Sat, 20 Apr 2019 17:12:17 +0000 (19:12 +0200)]
Update changelog
Peter Kokot [Sat, 20 Apr 2019 17:00:51 +0000 (19:00 +0200)]
Fix #77921: static.php.net doesn't work anymore
This embeds the PHP logo image in the FPM status HTML page instead of
using remote location. The phpinfo() output also uses such approach
and browser compatibility looks decent [1].
1: https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
Peter Kokot [Sat, 20 Apr 2019 14:16:18 +0000 (16:16 +0200)]
Update changelogs
Peter Kokot [Sat, 20 Apr 2019 14:12:54 +0000 (16:12 +0200)]
Remove PHP_SETUP_KERBEROS m4 macro
With recent transition to pkg-config/pkgconf this macro has been now a
simple wrapper for PKG_CHECK_MODULES and PHP_EVAL_INCLINE so it's better
to omit it altogether and use these two in the *.m4 code directly.
Gabriel Rodrigues Couto [Tue, 9 Apr 2019 00:42:11 +0000 (21:42 -0300)]
Fixed bug #77011
Added ".tbd" extension support for libiconv on Mac to use
CommandLineTools SDK shared library.
Hugh McMaster [Fri, 19 Apr 2019 04:57:35 +0000 (14:57 +1000)]
Use PKG_CHECK_MODULES to detect the kerberos libraries
Peter Kokot [Fri, 19 Apr 2019 19:11:23 +0000 (21:11 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update Git repository for Windows build tool kit
Peter Kokot [Fri, 19 Apr 2019 19:11:01 +0000 (21:11 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update Git repository for Windows build tool kit
Peter Kokot [Fri, 19 Apr 2019 19:09:46 +0000 (21:09 +0200)]
Update Git repository for Windows build tool kit
Fabien Villepinte [Fri, 19 Apr 2019 15:41:19 +0000 (17:41 +0200)]
Fix typo in comments
Christoph M. Becker [Thu, 18 Apr 2019 14:52:03 +0000 (16:52 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Use php-sdk-2.2.0beta5 on AppVeyor
Christoph M. Becker [Thu, 18 Apr 2019 14:51:38 +0000 (16:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Use php-sdk-2.2.0beta5 on AppVeyor
Christoph M. Becker [Thu, 18 Apr 2019 14:51:10 +0000 (16:51 +0200)]
Use php-sdk-2.2.0beta5 on AppVeyor
Nikita Popov [Thu, 18 Apr 2019 13:05:43 +0000 (15:05 +0200)]
Remove dead "props" member from date objects
Nikita Popov [Thu, 18 Apr 2019 11:48:38 +0000 (13:48 +0200)]
Revert "Fix zend_test interned strings loaded via dl()"
This reverts commit
7435ab3375ad1ef313e13ac3b0658c948f2f4dac.
It looks like we can't access EG(current_module) here in ZTS builds.
As the problematic asserts have now been disabled outside RC_DEBUG,
I'm just reverting this commit and leaving things as they were.
Dmitry Stogov [Thu, 18 Apr 2019 11:27:05 +0000 (14:27 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Check assert only when RC_DEBUG is enabled
Dmitry Stogov [Thu, 18 Apr 2019 11:26:15 +0000 (14:26 +0300)]
Check assert only when RC_DEBUG is enabled
Hugh McMaster [Thu, 18 Apr 2019 10:09:01 +0000 (20:09 +1000)]
Rename --enable-libxml to --with-libxml to meet naming guidelines
Hugh McMaster [Wed, 17 Apr 2019 11:07:15 +0000 (21:07 +1000)]
Use PKG_CHECK_MODULES to detect libxml2
Hugh McMaster [Sun, 14 Apr 2019 13:00:01 +0000 (23:00 +1000)]
Remove support for --with-libxml-dir
Nikita Popov [Thu, 18 Apr 2019 10:59:05 +0000 (12:59 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 18 Apr 2019 10:24:34 +0000 (12:24 +0200)]
Add a dl() test to Travis
Compile the zend_test extension as shared and try loading it with dl()
to test for obvious issues. Doing this as a standalone call because this
is very specific to the CI setup.
Nikita Popov [Thu, 18 Apr 2019 10:33:53 +0000 (12:33 +0200)]
Fix zend_test interned strings loaded via dl()
Nikita Popov [Thu, 18 Apr 2019 10:14:49 +0000 (12:14 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 18 Apr 2019 10:08:09 +0000 (12:08 +0200)]
Fix more dl() interned string assertions
Nikita Popov [Thu, 18 Apr 2019 10:10:09 +0000 (12:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 18 Apr 2019 10:08:09 +0000 (12:08 +0200)]
Fix more dl() interned string assertions
Nikita Popov [Thu, 18 Apr 2019 08:10:15 +0000 (10:10 +0200)]
Fix dl() module unloading in post deactivate
FOREACH_END_DEL() does not call the destructor by itself, we need to
explicitly call it. Due to the missing dtor call the functions were
not unregistered early, which resulted in later shutdown segfaults.
Dmitry Stogov [Wed, 17 Apr 2019 23:31:12 +0000 (02:31 +0300)]
Don't initialize return value before calling user functions
Dmitry Stogov [Wed, 17 Apr 2019 22:33:56 +0000 (01:33 +0300)]
Fixed compatibility with phpdbg
Peter Kokot [Tue, 16 Apr 2019 22:09:36 +0000 (00:09 +0200)]
Join build makefiles together
Changes:
- Joins build/build.mk and build/build2.mk files together since there
isn't any practical reason for having two different files with the
current build system.
- Makefile is now more portable. All special syntaxes are omitted, for
example, a conditional assignment operators `?=`. This makes buildconf
more useful on Solaris make derivative, so there is no longer need to
override make with gmake: `MAKE=gmake ./buildconf`.
- Suppressing autoconf and autoheader warnings is not needed anymore
with current build system. Instead, the option `-Wall` has been used
when running `./buildconf --debug` to get more useful debug info
about current M4.
Dmitry Stogov [Wed, 17 Apr 2019 19:08:55 +0000 (22:08 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
It's safe to keep old string if it's stored not in SHM.
Dmitry Stogov [Wed, 17 Apr 2019 18:57:17 +0000 (21:57 +0300)]
It's safe to keep old string if it's stored not in SHM.
Dmitry Stogov [Wed, 17 Apr 2019 16:32:34 +0000 (19:32 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed dl() function. It failed in DEBUG build without opcache because of assert during string interning.
Dmitry Stogov [Wed, 17 Apr 2019 16:31:28 +0000 (19:31 +0300)]
Fixed dl() function. It failed in DEBUG build without opcache because of assert during string interning.
Christoph M. Becker [Wed, 17 Apr 2019 15:24:36 +0000 (17:24 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77911: Wrong warning for session.sid_bits_per_character
Christoph M. Becker [Wed, 17 Apr 2019 15:23:42 +0000 (17:23 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77911: Wrong warning for session.sid_bits_per_character
Christoph M. Becker [Wed, 17 Apr 2019 15:23:23 +0000 (17:23 +0200)]
Fix #77911: Wrong warning for session.sid_bits_per_character
Nikita Popov [Wed, 17 Apr 2019 12:24:11 +0000 (14:24 +0200)]
Remove some uses of deprecated internal_encoding settings in tests
Nikita Popov [Tue, 16 Apr 2019 14:35:35 +0000 (16:35 +0200)]
Fix internal_encoding fallback in mbstring
By introducing a hook that is called whenever one of
internal_encoding / input_encoding / output_encoding changes, so
that mbstring can adjust it's internal state.
This also makes internal_encoding work with zend multibyte.
Dmitry Stogov [Wed, 17 Apr 2019 08:52:56 +0000 (11:52 +0300)]
Eliminate FETCH $GLOBALS followed by FETCH_DIM/UNSET_DIM/ISSET_ISEMPTY_DIM
Gabriel Caruso [Wed, 17 Apr 2019 08:44:06 +0000 (05:44 -0300)]
Fix typo
Introduced via
9a85a944d8
Derick Rethans [Wed, 17 Apr 2019 08:40:28 +0000 (09:40 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Derick Rethans [Wed, 17 Apr 2019 08:39:18 +0000 (09:39 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Ignace Nyamagana Butera [Mon, 25 Mar 2019 19:30:02 +0000 (20:30 +0100)]
Fixed bug #77909: DatePeriod::__construct() with invalid recurrence count value
Improve error message on invalid reccurence count
Adding test when reccurence is -1
Christoph M. Becker [Wed, 17 Apr 2019 07:58:12 +0000 (09:58 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix tests for non English environments
Christoph M. Becker [Wed, 17 Apr 2019 07:57:37 +0000 (09:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix tests for non English environments
Christoph M. Becker [Wed, 17 Apr 2019 07:54:01 +0000 (09:54 +0200)]
Fix tests for non English environments
Peter Kokot [Sat, 13 Apr 2019 13:53:20 +0000 (15:53 +0200)]
Simplify generated_lists generation
The `generated_lists` file is generated as a helper for build related
Makefile to include a list of *.m4 files prerequisites. When some of
these *.m4 files change, the configure script is regenerated when
buildconf is run. This can be simplified using dynamic environment
variable passed to the Makefile directly so it avoids another file from
being generated in the project root directory and shipping it with the
PHP release or creating a dedicated gitignore rule.
This is portable across all POSIX compatible makes So this patch
includes GNU Make, and everybody elses' make derivative support.
Artem Panfilov [Mon, 15 Apr 2019 14:54:53 +0000 (17:54 +0300)]
ext/pcre/config0.m4: add ac_cv_have_pcre2_jit variable
The HAVE_PCRE_JIT_SUPPORT check uses AC_RUN_IFELSE, which is not
available when cross-compiling. As a fallback, JIT support is enabled
based on CPU architecture. However, this may be wrong,
e.g. when the JIT the feature was not enabled in the pcre2 build.
Add a cache variable for the PCRE JIT feature to make it possible to
override the check.
Remi Collet [Tue, 16 Apr 2019 11:12:49 +0000 (13:12 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
next is 7.2.19
Remi Collet [Tue, 16 Apr 2019 11:12:33 +0000 (13:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
next is 7.2.19
Remi Collet [Tue, 16 Apr 2019 11:11:23 +0000 (13:11 +0200)]
next is 7.2.19
Nikita Popov [Tue, 16 Apr 2019 10:19:37 +0000 (12:19 +0200)]
Don't overwrite iterator count during real init
Nikita Popov [Tue, 16 Apr 2019 10:21:16 +0000 (12:21 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 16 Apr 2019 09:47:41 +0000 (11:47 +0200)]
Fix HT flags copying wrt iterator count
HT_FLAGS() includes the full flag word, including the iterator
count. When we're fully reassigning it, we need to make sure that
we either really do want to copy the iterator count (as in some
cases in array.c) or we need to mask only the actual flag byte.
Add an assert to hash_iterators_del() to make sure the iterator
count is non-zero (which is how I ran into this) and make sure that
the iterator count is correctly preserved during array splicing.
Christoph M. Becker [Tue, 16 Apr 2019 09:56:58 +0000 (11:56 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Prepare main branch for PHP 7.3.6
Christoph M. Becker [Tue, 16 Apr 2019 09:56:03 +0000 (11:56 +0200)]
Prepare main branch for PHP 7.3.6
Nikita Popov [Tue, 16 Apr 2019 08:39:48 +0000 (10:39 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 15 Apr 2019 15:14:11 +0000 (17:14 +0200)]
s/mysql_connect()/mysqli_connect() in php.ini
Nikita Popov [Tue, 16 Apr 2019 08:38:20 +0000 (10:38 +0200)]
Fix second part of bug #77903
When a HT iterator is one past the end and we rehash, we need to make
sure that it is move to the new one past the end position, to make
sure that newly inserted elements are picked up.
Nikita Popov [Tue, 16 Apr 2019 08:20:19 +0000 (10:20 +0200)]
Partial fix for bug #77903
In the hash position APIs, make sure we always advance to the next
non-undef element and not just when the position is 0 (similar to
what foreach does). This can happen when the position of an
ArrayIterator is one past its current end and a new element is
inserted not directly at that position because the array is packed.
There is still a bug here (as shown in the tests), but this is a
separate issue that also affects plain array iteration in foreach.
Christoph M. Becker [Mon, 15 Apr 2019 16:24:59 +0000 (18:24 +0200)]
Use curl_mime_*() functions if available
As of curl 7.56.0, `curl_formadd()` is deprecated in favor of
`curl_mime_*()`, so we use the latter if available.
Dmitry Stogov [Mon, 15 Apr 2019 21:09:45 +0000 (00:09 +0300)]
Merge branch 'PHP-7.4' of git.php.net:php-src into PHP-7.4
* 'PHP-7.4' of git.php.net:php-src:
Remove not needed extension generated files gitignores
Add test for curl_version()
Fixed bug #77895
Zero sockaddr struct
Fix saproxy_property_write signature
Correctly destroy reference in ArrayObject sort
Dmitry Stogov [Mon, 15 Apr 2019 21:08:16 +0000 (00:08 +0300)]
execute_data->return_value is not used for internal functions
Peter Kokot [Mon, 15 Apr 2019 18:03:48 +0000 (20:03 +0200)]
Remove not needed extension generated files gitignores
These were refactored and moved to build directory via:
2957651c5c2a003e96318fc9217764b91266723a and
7e445ef3b1a197dccbc92f35cb66988b66671841
Rodrigo Prado [Mon, 15 Apr 2019 00:40:27 +0000 (21:40 -0300)]
Add test for curl_version()
Nikita Popov [Mon, 15 Apr 2019 13:27:37 +0000 (15:27 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 15 Apr 2019 13:27:19 +0000 (15:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 15 Apr 2019 13:26:58 +0000 (15:26 +0200)]
Fixed bug #77895
Nikita Popov [Mon, 15 Apr 2019 13:00:56 +0000 (15:00 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 15 Apr 2019 13:00:49 +0000 (15:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 15 Apr 2019 12:59:05 +0000 (14:59 +0200)]
Zero sockaddr struct
in6 has a bunch of extra fields that we're leaving uninitialized. I
don't see them locally, but there's valgrind warnings on gcov.
Nikita Popov [Mon, 15 Apr 2019 12:33:47 +0000 (14:33 +0200)]
Fix saproxy_property_write signature
Nikita Popov [Mon, 15 Apr 2019 11:16:16 +0000 (13:16 +0200)]
Correctly destroy reference in ArrayObject sort
The reference may be captured in an exception backtrace, in which
case the refcount may be more than one.
Dmitry Stogov [Mon, 15 Apr 2019 10:18:16 +0000 (13:18 +0300)]
Removed tests that always (or almost always) true