php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-16 20:41:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
117,571 Commits 547 Branches 1,483 Tags
cc704f5bb6bfbb7b17595f7ff24af011d66374a9
Commit Graph

5286 Commits

Author SHA1 Message Date
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
Christoph M. Becker
7d0102dfa7 Revert "Replace @param annotations with type declarations" 
This reverts commit c31029f335.
 2020-02-17 08:55:18 +01:00
Christoph M. Becker
c31029f335 Replace @param annotations with type declarations 2020-02-16 23:43:38 +01:00
George Peter Banyard
fa99811389 Fix [-Wmissing-field-initializers] compiler warning in PHPDBG_COMMAND_HELP_D macro 2020-02-10 11:33:06 +01:00
George Peter Banyard
c343c1bcae Fix some -Wold-style-declaration compiler warnings 2020-02-05 17:39:29 +01:00
Nikita Popov
f8d795820e Reindent phpt files 2020-02-03 22:52:20 +01:00
Nikita Popov
169805777c Merge branch 'PHP-7.4' 
* PHP-7.4:
  Apply tidy formatting
 2020-02-03 13:42:08 +01:00
Nikita Popov
58b17906f5 Apply tidy formatting 
Mostly reindent PHP scripts to spaces.
 2020-02-03 13:41:31 +01:00
Nikita Popov
4cdd15d414 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Disable parallelism for FPM tests
 2020-02-03 09:58:03 +01:00
Nikita Popov
aaf9cbb7eb Disable parallelism for FPM tests 
Let's see if this helps with spurious failures on Azure.
 2020-02-03 09:57:34 +01:00
Akim Demaille
4cbffd89d9 Clean up the generation of the parsers 
Prefer '%define api.value.type' to '#define YYSTYPE', so that Bison
know the type.

Use '%code requires' to declare what is needed to define the api.value.type
(that code is output in the generated header before the generated
definition of YYSTYPE).

Prefer '%define api.prefix' inside the grammar file to '-p' outside,
as anyway the functions defined in the file actually use this prefix.

Prefer `%param` to both `%parse-param` and `%lex-param`.

Closes GH-5138
 2020-02-01 14:21:53 +01:00
Akim Demaille
37d0f7d3b3 Use "%empty" in the parsers, instead of comments 
The annotation %empty is properly enforced: warnings when it's
missing, and errors when it's inappropriate.  Support for %empty was
introduced in Bison 3.0.

Pass -Wempty-rule to Bison.

Closes GH-5134
 2020-01-31 09:52:40 +01:00
Nikita Popov
16f194c75e Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix bug #78323: Code 0 is returned on invalid options
 2020-01-27 13:32:51 +01:00
Nikita Popov
1cccbb8ff1 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #78323: Code 0 is returned on invalid options
 2020-01-27 13:32:38 +01:00
Ivan Mikheykin
fd08f062ae Fix bug #78323: Code 0 is returned on invalid options 
Set CLI exit code to 1 when invalid parameters are passed,
and print error to stderr.
 2020-01-27 13:32:19 +01:00
wbender
98bfad738a Fix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree 
If CONTEXT_DOCUMENT_ROOT is set use that rather than DOCUMENT_ROOT to
scan up the dir tree looking for .user.ini files.

Closes GH-5051.
 2020-01-24 15:33:55 +01:00
Nikita Popov
06e193ba8d Merge branch 'PHP-7.4' 
* PHP-7.4:
  Add sleep in FPM reload test
 2020-01-21 17:56:43 +01:00
Nikita Popov
0aa09da486 Add sleep in FPM reload test 
Explicitly mark the point where we have to wait.
 2020-01-21 17:55:47 +01:00
Máté Kocsis
d1764ca330 Make error messages more consistent by fixing capitalization 
Closes GH-5066 As a first step, let's capitalize their initial letter when it is applicable.
 2020-01-17 14:52:46 +01:00
Máté Kocsis
afdaa91170 Fix #78880: Final spelling fixes 2020-01-16 19:14:31 +01:00
Máté Kocsis
c3cf01b553 Fix #78880: Yet another batch of spelling errors 2020-01-16 12:04:00 +01:00
Máté Kocsis
0b4778c377 Fix #78880: Another bunch of spelling errors 2020-01-16 09:46:47 +01:00
Nikita Popov
0a9bdd6e7b Merge branch 'PHP-7.4' 
* PHP-7.4:
  Increase select timeout in FPM tester
 2020-01-09 10:20:28 +01:00
Nikita Popov
b3cc30adf8 Increase select timeout in FPM tester 
Let's see if that helps with the recent failure spree on Azure.
 2020-01-09 10:19:02 +01:00
Nikita Popov
d5f26de63d Merge branch 'PHP-7.4' 
* PHP-7.4:
  Revert "Display a message if select in FPM test timeouts"
 2020-01-08 16:32:00 +01:00
Nikita Popov
4b860c06ed Revert "Display a message if select in FPM test timeouts" 
This reverts commit e2361498d5.

Ooops, this occurs normally during some tests, but I didn't notice
because I have slow tests disabled...
 2020-01-08 16:31:33 +01:00
Nikita Popov
c669a1a4da Merge branch 'PHP-7.4' 
* PHP-7.4:
  Display a message if select in FPM test timeouts
 2020-01-08 15:57:21 +01:00
Nikita Popov
e2361498d5 Display a message if select in FPM test timeouts 2020-01-08 15:57:05 +01:00
Máté Kocsis
e1b57310b1 Use RETURN_THROWS() during ZPP in main, sapi, win32, and Zend 2019-12-30 17:38:10 +01:00
Christoph M. Becker
1ab9d626d1 Fix typo 2019-12-30 17:21:50 +01:00
Christoph M. Becker
dabc28d182 Fix #78880: Spelling error report 
We fix the most often occuring typos according to a recent codespell
report[1] in tests, code comments and documentation.

[1] <https://fossies.org/linux/test/php-src-master-f8f48ce.191129.tar.gz/codespell.html>.
 2019-12-21 11:58:00 +01:00
Nikita Popov
7df8f952ae Further reduce parse depth limit in mbstring fuzzer 
Depth limit of 1024 still causes optimize_node stack overflows
when running under asan.
 2019-12-14 22:43:15 +01:00
Nikita Popov
9de4f87aca Limit parse depth in mbstring fuzzer 
The default depth of 4096 is large enough to cause optimize_node
stack overflows under asan. Reduce to 1024.
 2019-12-13 16:09:28 +01:00
ekinhbayar
a74484cc98 Remove phpdbg README 
phpdbg documentation has been moved to PHP manual and the link at the
bottom of this README is dead, so the file can be removed.
 2019-12-09 17:32:17 +01:00
Jakub Zelenka
d98df5b6c6 Merge branch 'PHP-7.4' 2019-12-08 17:58:59 +00:00
Jakub Zelenka
ac042f839f Fix bug #78916 (php-fpm 7.4.0 don't send mail via mail()) 2019-12-08 17:57:17 +00:00
Jakub Zelenka
2a742546bf Merge branch 'PHP-7.4' 2019-12-01 17:17:30 +00:00
Jakub Zelenka
67cd4271e9 Fix bug #78889 (php-fpm service fails to start) 2019-12-01 17:13:20 +00:00
George Wang
8a977e07d0 Merge branch 'PHP-7.4' 2019-11-21 17:59:05 -05:00
George Wang
99b8e67615 Merge branch 'PHP-7.3' into PHP-7.4 2019-11-21 17:58:44 -05:00
George Wang
e981f5af51 Merge branch 'PHP-7.2' into PHP-7.3 2019-11-21 17:58:16 -05:00
George Wang
c7141412ce Added environment LSAPI_CLEAN_SHUTDOWN to control clean shutdown. Update SAPI version to LiteSpeed v7.6 . 2019-11-21 17:57:50 -05:00
Craig Duncan
e208d236b3 Convert apache2handler arginfo to php stubs 2019-11-18 15:07:04 +01:00
Jakub Zelenka
f826bbde93 Merge branch 'PHP-7.4' 2019-11-17 14:53:53 +00:00
Maksim Nikulin
e37bd5dcc2 Do not let PHP-FPM children miss SIGTERM, SIGQUIT 
Postpone signal delivery while spawning children.
Prevent the following case:

- Reload (reexec) is in progress.
- New master is forking to start enough children for pools
  where `pm` is not `on-demand`.
- Another `SIGUSR2` is received by the master process.
- Master process switches to reloading state.
- Some child has not set its own signal handlers.
- `SIGQUIT` and `SIGTERM` sent by master process are caught
  by signal handler set by master process and so they are ignored.
- A child is running, it has no reason to finish

Before pull request #4465 this scenario could cause deadlock,
however with 0ed6c37140 reload finishes after `SIGKILL`.

Use sigprocmask() around fork() to avoid race of delivery signal to children
and setting of own signal handlers.

Fixes bug #76601
 2019-11-17 14:46:56 +00:00
Máté Kocsis
27e83d0fb8 Add union return types for function stubs 2019-11-11 14:54:55 +01:00