php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
118,795 Commits 547 Branches 1,481 Tags
cebe750f460b8060ab21ae1e21980098f3f5b8e2
Commit Graph

5331 Commits

Author SHA1 Message Date
Nikita Popov
0374cf08c7 Add --file-cache-prime/use options to run-tests 
--file-cache-prime populates the file cache,
--file-cache-use uses the file cache.

And fix a number of tests to run under file cache or disabled
timestamp validation.
 2020-05-20 15:29:32 +02:00
Christoph M. Becker
5211ddce0e Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix INI setting member name
 2020-05-19 16:01:48 +02:00
Christoph M. Becker
6a9db9573e Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix INI setting member name
 2020-05-19 16:00:19 +02:00
Christoph M. Becker
85ac5643ff Fix INI setting member name 
Since the member is not used in `OnUpdateEol()` that's not really an
issue, but still it's confusing to apparently have two INI settings
targeting the same member.
 2020-05-19 15:59:21 +02:00
Nikita Popov
c3bbcff5e6 Fix phpdbg test with JIT 
With JIT one extra cache slot is allocated, so the extended_value
needs one more character, and the output ends up having one space
less...
 2020-05-18 15:25:24 +02:00
George Peter Banyard
f717ec608d Adjust bogus checks in FPM as HAVE_FPM_LQ is always defined 
Drop checks for FPM status as per review

Closes GH-5530
 2020-05-17 22:04:35 +02:00
Nikita Popov
406c95758d Remove some uses of zend_inline_hash_func 
There's no need to force-inline the hashing for all of these.
 2020-05-15 10:14:22 +02:00
Máté Kocsis
68527a7834 Add stubs for some SAPIs 
For apache2handler, fpm, litespeed, phpdbg, specifically.
Partially implements GH-5295
 2020-05-14 13:35:12 +02:00
George Peter Banyard
c0997130ec Fix [-Wundef] warning in PHPDBG SAPI 2020-05-12 22:02:51 +02:00
George Peter Banyard
56698afb6d Fix [-Wundef] warning in CLI SAPI 2020-05-12 22:02:12 +02:00
George Peter Banyard
f87743de9f Fix [-Wundef] warning in FPM SAPI 2020-05-12 22:02:03 +02:00
Christoph M. Becker
9dcf494e36 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79489: .user.ini does not inherit
 2020-05-12 11:49:04 +02:00
Christoph M. Becker
4b0d5e0faf Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79489: .user.ini does not inherit
 2020-05-12 11:48:36 +02:00
Christoph M. Becker
bdba0cd3d2 Fix #79489: .user.ini does not inherit 
On Windows, PATH_TRANSLATED may contain backslashes as well as slashes,
so we must not only check for `DEFAULT_SLASH`.
 2020-05-12 11:47:47 +02:00
Nikita Popov
c50cfc4d3d Add quiet parameter to internal HTML entities API 
In some places, we need to make sure that no warnings are thrown
due to unknown encoding. The error reporting code tried to avoid
this by determining a "safe charset", but this introduces subtle
discrepancies in which charset is picked (normally
internal_encoding takes precedence). Avoid this by suppressing
the warning in the first place.

While here, use the fallback logic to print error messages with
substitution characters more consistently, to avoid skipping
parts of the error message entirely.
 2020-05-07 15:46:08 +02:00
Alex Dowad
8ddaf13ed3 Code tweaks: Remove unneeded semicolons 2020-04-29 23:17:40 +02:00
Máté Kocsis
33c3691c33 Generate method entries from stubs for Zend classes 
Closes GH-5459
 2020-04-26 11:13:14 +02:00
George Peter Banyard
f91f72607b Drop unnecessary stdint and inttypes header checks 
These are always available as of C99.

Closes GH-5323

Co-authored-by: "Christoph M. Becker" <cmbecker69@gmx.de>
 2020-04-22 20:18:19 +02:00
Máté Kocsis
6111d64cda Improve a last couple of argument error messages 
Closes GH-5404
 2020-04-20 13:09:00 +02:00
Christoph M. Becker
193cb97a0e Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79491: Search for .user.ini extends up to root dir
 2020-04-20 11:00:01 +02:00
Christoph M. Becker
18ad38a7b2 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79491: Search for .user.ini extends up to root dir
 2020-04-20 10:58:33 +02:00
Christoph M. Becker
fa10abd6d7 Fix #79491: Search for .user.ini extends up to root dir 
The `start` parameter of `php_cgi_ini_activate_user_config` is supposed
to hold the byte offset of the doc root in the given `path`.  However,
the current expression which fixes a potential type incompatibility
will ever only evaluate to zero or one, because it uses the *logical*
and operator (`&&`).  Furthermore we notice that subtracting one from
`doc_root_len` is not necessary, so there is even no need for the
`start` parameter at all.
 2020-04-20 10:56:36 +02:00
Nikita Popov
ae5d7e4e96 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Apply doc root fix for FPM
 2020-04-20 10:48:20 +02:00
Nikita Popov
721ca87e56 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Apply doc root fix for FPM
 2020-04-20 10:48:05 +02:00
Nikita Popov
f62571c121 Apply doc root fix for FPM 
This is the change from GH-5417 but for FPM. This was stripping the
last character from the doc_root. Given how it is used, this should
be harmless, but let's make it less confusing...
 2020-04-20 10:47:54 +02:00
Nikita Popov
d68dfaf05e Remove return value from llist apply functions 
Unlike the hash apply functions, these do not return int.
 2020-04-15 11:01:12 +02:00
Máté Kocsis
3709e74b5e Store default parameter values of internal functions in arg info 
Closes GH-5353. From now on, PHP will have reflection information
about default values of parameters of internal functions.

Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>
 2020-04-08 18:37:51 +02:00
Nikita Popov
b0d8f012f9 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Add php_cli_server_connect() helper
 2020-04-08 17:11:50 +02:00
Nikita Popov
1327491224 Add php_cli_server_connect() helper 
To encapsulate the repeated fsockopen() code.

This gives us a chance to control the timeout in one place:
Raise it to one second.
 2020-04-08 17:10:20 +02:00
Christoph M. Becker
6a67067c21 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Relax overly strict test expectation
 2020-04-08 11:35:28 +02:00
Christoph M. Becker
73a0719f45 Relax overly strict test expectation 
There is no reason to expect a `1` after the PID; neither the session
ID nor the memory usage are required to contain one.  Actually, we just
want to verify here, that the process with the $child_pid is running,
and is a php.exe process.
 2020-04-08 11:34:18 +02:00
Máté Kocsis
21cfa03f17 Generate function entries for another batch of extensions 
Closes GH-5352
 2020-04-05 21:15:30 +02:00
Matteo Beccati
66ec60cb45 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Skip fpm tests not designed to be run as root
  Allow fpm tests to be run with long socket path
 2020-04-02 16:17:24 +02:00
Matteo Beccati
87375fa2be Skip fpm tests not designed to be run as root 
When running as root with TEST_FPM_RUN_AS_ROOT=1
 2020-04-02 16:16:42 +02:00
Matteo Beccati
af337ae47e Allow fpm tests to be run with long socket path 
Socket path is restricted to ~100 bytes, so we can use
the system temp dir if the path ends up too long.
 2020-04-02 16:16:42 +02:00
Nikita Popov
184fdac7c2 Remove <default> prefix from reflection dump 
This really doesn't add anything, and only makes for confusing
terminology. Only marking properties as dynamic is sufficient.
 2020-04-02 11:25:41 +02:00
Jakub Zelenka
477efe935b Merge branch 'PHP-7.4' 2020-03-29 20:21:24 +01:00
Andre Nathan
0b4e80b8c1 Allow numeric [UG]ID in FPM listen.{owner,group} 2020-03-29 20:20:01 +01:00
Nikita Popov
33ef3d64da Use separate typedef for bucket comparison function 
Avoid performing the same casting dance inside each sort compare
function.
 2020-03-04 12:46:06 +01:00
Nicolas Grekas
9e775db025 Define Stringable with __toString():string method 2020-03-02 15:25:32 +01:00
Nikita Popov
a297c4ef9e Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix another flaky FPM test
 2020-02-28 14:41:32 +01:00
Nikita Popov
b2d01e0be8 Fix another flaky FPM test 2020-02-28 14:40:21 +01:00
Nikita Popov
b89ba475df Merge branch 'PHP-7.4' 
* PHP-7.4:
  Try to fix intermittent FPM failures
 2020-02-28 13:19:53 +01:00
Nikita Popov
3c096b51f9 Try to fix intermittent FPM failures 
Terminate only after expecting the log lines to avoid race
condition.
 2020-02-28 13:19:10 +01:00
Nicolas Oelgart
aa79a22d32 Add preg_last_error_msg() function 
Provides the last PCRE error as a human-readable message, similar
to functionality existing in other extensions, such as
json_last_error_msg().

Closes GH-5185.
 2020-02-25 10:26:03 +01:00
Jakub Zelenka
736b1ab200 Merge branch 'PHP-7.4' 2020-02-23 19:15:05 +00:00
Jakub Zelenka
578a8113eb Fix bug #79014 (PHP-FPM & Primary script unknown) 2020-02-23 19:14:05 +00:00
Jakub Zelenka
ee0579350f Merge branch 'PHP-7.4' 2020-02-23 18:32:20 +00:00
Jakub Zelenka
0bc6a66a7a Fix bug #77653 (operator displayed instead of the real error message) 2020-02-23 18:29:10 +00:00
Nikita Popov
318fe06042 Create memory stream in exif fuzzer 
At least one segfault observed because temp file creation failed.
Switch to using a memory stream, which should be more robust, and
more efficient for that matter.
 2020-02-19 10:24:12 +01:00