1
0
mirror of https://github.com/php/php-src.git synced 2026-04-14 11:32:11 +02:00
Commit Graph

109366 Commits

Author SHA1 Message Date
Jakub Zelenka
751dfc7514 Merge branch 'PHP-7.3' 2018-10-21 19:40:53 +01:00
Jakub Zelenka
c8febbe039 Fix arginfo and clean up fpm_get_status 2018-10-21 19:39:47 +01:00
Peter Kokot
8217cd20f1 Defragment two Zend related Makefile fragments together
The two are more logically connected together in the Zend directory.
2018-10-21 15:59:16 +02:00
Peter Kokot
f8fb45facf [ci skip] Remove automake and aclocal in comments
The Automake and aclocal were part of the previous PHP build system
where Automake created Makefile from the Makefile.in templates and
aclocal was used to produce the aclocal.m4. They were removed as
dependencies via 9d9d39a0de and
e715fb00f8.
2018-10-21 13:06:58 +02:00
Christoph M. Becker
d88b006ad6 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix #75282: xmlrpc_encode_request() crashes
2018-10-21 12:11:57 +02:00
Christoph M. Becker
10800106b3 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix #75282: xmlrpc_encode_request() crashes
2018-10-21 12:10:54 +02:00
Christoph M. Becker
502b187ae8 Fix #75282: xmlrpc_encode_request() crashes
Since we allow ext/xmlrpc to be built against a system libxmlrpc(-epi),
we must not `efree` memory which has been allocated via `malloc`.  To
distinguish bundled and system libxmlrpc(-epi) we introduce the macro
`HAVE_XMLRPC_BUNDLED` (analogous to how it is done by ext/gd).  We
deliberately keep the ugly `#ifdef`s, instead of tucking them away in
an `XMLRPC_FREE()` macro, to not forget that it is a bad idea to fork
and bundle a library, but to also allow building against an unpatched
system lib.
2018-10-21 12:06:55 +02:00
Anatol Belski
63353b95c6 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix tests for ICU 63.1
2018-10-20 23:05:38 +02:00
Anatol Belski
7f8efd9a6e Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix tests for ICU 63.1
2018-10-20 23:04:54 +02:00
Anatol Belski
ba43d5acef Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix tests for ICU 63.1
2018-10-20 23:04:15 +02:00
Anatol Belski
4461fb9c26 Fix tests for ICU 63.1
The most of change is U+00A0 vs. new U+202F used in some outputs.
2018-10-20 23:02:06 +02:00
Peter Kokot
04be076a5d Fix .gitattributes
The `crlf` Git attribute has been long deprecated and made obsolete. A
replacement for using `-crlf` is `-text`. That way Git doesn't do
newlines normalization on any system.

Since the phpt files don't need specific line endings in any files
except for some special CR characters in some, this can be also removed
and line normalization can happen on all phpt files. The run-tests.php
file converts the CRLF to LF before running the test.

This patch also sets a `diff` attributes for all *.phpt files. It
helps showing diffs for some phpt files with special characters such
as ASCII control characters which makes Git recognize them as binary and
stops showing commit diffs otherwise

Some additional short info about used Git attributes has been also added
as comments for easier understanding.

Remove -text gitattribute
2018-10-20 22:58:27 +02:00
Khan M Rashedun-Naby
36ae074036 Simplify mb_gpc() code
Use a switch (consistent with other places in this file) and also
don't unnecessarily set free_buffer.
2018-10-20 22:30:21 +02:00
Anatol Belski
251bd9c253 Use C++ symbols with C++11, take 2 2018-10-20 10:56:02 +02:00
Peter Kokot
d6c05c6cd1 Rename two *.php files in tests folders
Current run-tests.php script produces the `*.php` files from the
*.phpt. So all *.php files in tests folders are ignored by Git.

To avoid confusion and to for bettere consistency this patch renames
two remaining tests/*/*.php files to *.inc and *.phar as current
practice in *.phpt files.

- The `ext/curl/tests/resonder/get.php` to .inc extension
- The `ext/phar/tests/files/pear2coverage.phar.php` to .phar extension
2018-10-20 10:11:29 +02:00
Peter Kokot
addcf2402d Remove mkdep.awk
The `mkdep.awk` file was part of the previous *nix build system and was
used to create a .deps file with a list of dependencies that could be
processed by Automake further on.

Newer build system was done via 9d9d39a0de
and outdated files removed via 22815419f8
so the current file in the PHP source code is not used anymore.

Additionally, the *.slo files were processed by this file. The *.slo
files also used to be generated by older libtool so today, these don't
get generated anymore.
2018-10-20 10:08:54 +02:00
Peter Kokot
82f59a9682 Merge branch 'PHP-7.3'
* PHP-7.3:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  Fix #77041: buildconf should output error messages to stderr
2018-10-20 09:55:33 +02:00
Peter Kokot
13aae9f3d5 [ci skip] Update NEWS 2018-10-20 09:55:07 +02:00
Peter Kokot
b7cef2b008 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  Fix #77041: buildconf should output error messages to stderr
2018-10-20 09:54:00 +02:00
Peter Kokot
3b8be227bd [ci skip] Update NEWS 2018-10-20 09:52:46 +02:00
Peter Kokot
0dc15e1885 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  [ci skip] Update NEWS
  Fix #77041: buildconf should output error messages to stderr
2018-10-20 09:51:22 +02:00
Peter Kokot
1b936033b0 [ci skip] Update NEWS 2018-10-20 09:48:50 +02:00
Mizunashi Mana
9f5cb626ed Fix #77041: buildconf should output error messages to stderr 2018-10-20 09:42:56 +02:00
Dmitry Stogov
3fe698b904 Mark "top-level" functions. 2018-10-19 13:22:29 +03:00
Dmitry Stogov
03384cae3c Don't initialize static_member_tables during start-up, when inherit internal classes. 2018-10-19 13:21:31 +03:00
Peter Kokot
1257664ca2 Merge branch 'PHP-7.3'
* PHP-7.3:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  Fix #77035: The phpize and ./configure create redundant .deps file
2018-10-19 00:12:48 +02:00
Peter Kokot
2224277d7d [ci skip] Update NEWS 2018-10-19 00:12:34 +02:00
Peter Kokot
74131ca342 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  Fix #77035: The phpize and ./configure create redundant .deps file
2018-10-19 00:10:22 +02:00
Peter Kokot
b9d8e5d706 [ci skip] Update NEWS 2018-10-19 00:08:57 +02:00
Peter Kokot
5531dde5e9 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  [ci skip] Update NEWS
  Fix #77035: The phpize and ./configure create redundant .deps file
2018-10-19 00:07:42 +02:00
Peter Kokot
4be0528476 [ci skip] Update NEWS 2018-10-19 00:06:11 +02:00
Peter Kokot
447b41f6bb Fix #77035: The phpize and ./configure create redundant .deps file
The `.deps` file(s) was once used by Automake and created to write
dependencies to it. The file creation has been removed via the commit
779c11af21.

The phpize and ./configure script create a redundant .deps file in a
PECL extension directory which might cause confusions why is it used.
Today it is no longer relevant so this redundant artefact can be
removed in the phpize configure script.
2018-10-19 00:02:09 +02:00
Peter Kokot
00db0e7a04 Remove outdated PEAR artefacts
The `pear/scripts`, `pear/php-config`, `pear/phpize`, and
`pear/run-tests` used to be part of the PEAR installation. Now, the
pear installation PHAR file is directly downloaded from pear.php.net
instead.
2018-10-18 23:43:13 +02:00
Peter Kokot
d61c7ae5ed Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix tests/output/bug74815.phpt generating errors.log
2018-10-18 23:40:00 +02:00
Peter Kokot
93427292f6 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix tests/output/bug74815.phpt generating errors.log
2018-10-18 23:39:39 +02:00
Peter Kokot
de9f325c12 Fix tests/output/bug74815.phpt generating errors.log
Test tests/output/bug74815.phpt was creating an errors.log file
in project root directory and didn't removed it after the test.
2018-10-18 23:39:00 +02:00
Anatol Belski
f5bc049136 Revert "Use C++ symbols, when C++11 or upper is compiled"
This reverts commit 322b97a19a.

GCC 5 vs. 8 seems to be a big deal in this regard. The approach needs
further consideration.
2018-10-18 23:36:46 +02:00
Anatol Belski
322b97a19a Use C++ symbols, when C++11 or upper is compiled 2018-10-18 23:17:48 +02:00
Dmitry Stogov
a4b33f775e Added new line 2018-10-18 16:40:24 +03:00
Peter Kokot
370882bb59 Remove stamp-h
The stamp-* files can be used as helpers for Makefiles to not redo
certain targets again. The stamp-h are mentioned in the Autoconf docs [1]
to help generate the config.h file.

Since the usage of stamp-h file was removed in 232afa4816
this patch cleans few obsolete occurrences.

This patch also removes two occurrences of `main/stamp-h1` and
`main/streams/stamp-h1` rules in the .gitignore file since they are not
generated with the current build systems anymore. The `stamp-h$am_indx` files
were once generated using aclocal and automake.

[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/autoconf.html
2018-10-18 08:35:43 +02:00
Peter Kokot
0e60b812c0 Move all testing docs to qa.php.net
The qa.php.net currently includes nice collection of information about
tests and how to run them. Instead of maintaining two locations of this
information, this patch removes the README.TESTING from the php-src
repo. Patch for qa.php.net has been sent separately to that repo.
2018-10-18 08:01:22 +02:00
Tyson Andre
78a8b0f0d7 Fix a typo in UPGRADING.INTERNALS 2018-10-17 21:14:46 -04:00
Anatol Belski
7e6ad00cc9 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix test when it's run on another drive
2018-10-18 00:45:43 +02:00
Anatol Belski
bca89bb735 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix test when it's run on another drive
2018-10-18 00:45:17 +02:00
Anatol Belski
6a5254bc96 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix test when it's run on another drive
2018-10-18 00:44:43 +02:00
Anatol Belski
fda06127fa Fix test when it's run on another drive 2018-10-18 00:43:24 +02:00
Christoph M. Becker
0187eeb6e2 Merge branch 'PHP-7.3'
* PHP-7.3:
  [ci skip] Update UPGRADING wrt. tidyp support
2018-10-17 23:45:34 +02:00
Christoph M. Becker
24b6779254 [ci skip] Update UPGRADING wrt. tidyp support
This is especially noteworthy since `tidy_get_relase()` returns
'unknown' when built against libtidyp, which might break some code
which relies on `tidy_get_release()` to return a date formatted as
`yyyy/mm/dd`.
2018-10-17 23:45:03 +02:00
Dmitry Stogov
a0a1c8990e Fixed incorrect reallocation 2018-10-17 17:44:03 +03:00
Christoph M. Becker
f307e5962f Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix #77027: tidy::getOptDoc() not available on Windows
2018-10-17 16:38:17 +02:00