php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 00:48:25 +02:00
Code Issues Packages Projects Releases Wiki Activity
126,550 Commits 549 Branches 1,485 Tags
98dbae4feb4f905cf9f429200062880e03f9fa3f
Commit Graph

1076 Commits

Author SHA1 Message Date
Nikita Popov 0c6c882b92 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Disable failing FPM test
 2021-10-04 23:31:48 +02:00
Nikita Popov cd84480e54 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Disable failing FPM test
 2021-10-04 23:31:40 +02:00
Nikita Popov a00d933242 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Disable failing FPM test
 2021-10-04 23:31:31 +02:00
Nikita Popov 4c01bd2ade Disable failing FPM test 
Test fails intermittently, e.g.:

https://dev.azure.com/phpazuredevops/PHP/_build/results?buildId=20597&view=ms.vss-test-web.build-test-results-tab&runId=475324&resultId=115501&paneView=debug

Possibly this is because the two requests end up being processed
in sequence and no second process is spawned.
 2021-10-04 23:30:14 +02:00
Jakub Zelenka 582cd2ca7f Merge branch 'PHP-8.1' 2021-10-04 21:57:25 +01:00
Jakub Zelenka 7dd87b2343 Merge branch 'PHP-8.0' into PHP-8.1 2021-10-04 21:56:06 +01:00
Jakub Zelenka 9ed95846a3 Merge branch 'PHP-7.4' into PHP-8.0 2021-10-04 21:55:21 +01:00
Jakub Zelenka 66a655fdf4 Add the actual test for FPM prod idle timeout test with 6s sleep 2021-10-04 21:54:32 +01:00
Jakub Zelenka 2cd69115d5 Merge branch 'PHP-7.4' into PHP-8.0 2021-10-04 21:53:34 +01:00
Jakub Zelenka edfb347019 Add FPM prod idle timeout test with 6s sleep 2021-10-04 21:50:57 +01:00
Nikita Popov 17a237a561 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Revert "Add FPM prod idle timeout test"
 2021-10-04 10:17:18 +02:00
Nikita Popov 0431bd3137 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Revert "Add FPM prod idle timeout test"
  [ci skip] Fix missing NEWS
  [ci skip] Add missing NEWS
 2021-10-04 10:17:07 +02:00
Nikita Popov 987aee10a9 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Revert "Add FPM prod idle timeout test"
 2021-10-04 10:16:53 +02:00
Nikita Popov 69514e6ffb Revert "Add FPM prod idle timeout test" 
This reverts commit 08f52b1643.

The newly added test fails.
 2021-10-04 10:16:20 +02:00
Jakub Zelenka cbdcb0e46f Merge branch 'PHP-8.1' 2021-10-02 18:32:20 +01:00
Jakub Zelenka 4ef6280b9a Fix conflicting pattern wrapping in FPM openmetrics test 2021-10-02 18:31:49 +01:00
Jakub Zelenka 390d4e94ed Merge branch 'PHP-8.0' into PHP-8.1 2021-10-02 18:29:25 +01:00
Jakub Zelenka ca3f20209f Merge branch 'PHP-7.4' into PHP-8.0 2021-10-02 18:27:47 +01:00
Jakub Zelenka 08f52b1643 Add FPM prod idle timeout test 2021-10-02 18:26:18 +01:00
David CARLIER 83697aa95e fpm allow to ptrace/make the the process dumpable for FreeBSD. (#7375) 2021-09-27 21:16:23 +01:00
Jakub Zelenka 590af4678b Sync the FPM openmetrics status with php-fpm_exporter 2021-07-21 19:58:36 +01:00
Christoph M. Becker 1f9b044c80 Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix #80849: HTTP Status header truncation
 2021-07-15 19:16:21 +02:00
Christoph M. Becker bb4dbbc150 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80849: HTTP Status header truncation
 2021-07-15 19:13:58 +02:00
Christoph M. Becker a054ef2aad Fix #80849: HTTP Status header truncation 
While truncating the contents of a header is okay, we must never omit
the trailing CRLF.

Closes GH-7238.
 2021-07-15 19:10:53 +02:00
Patrick Allaert aff365871a Fixed some spaces used instead of tabs 2021-06-29 11:30:26 +02:00
Nikita Popov 9871a624bf Clean up some more function_exists() checks 2021-06-14 15:47:08 +02:00
George Peter Banyard e7135cb817 Use zend_string_equals_* API in a couple of more place 
Closes GH-6979
 2021-05-14 13:45:17 +01:00
George Peter Banyard ff988a6f4f Fix remaining [-Wstrict-prototypes] warnings 
Two missing void qualifiers for parameter list.
 2021-05-12 19:02:48 +01:00
George Peter Banyard c40231afbf Mark various functions with void arguments. 
This fixes a bunch of [-Wstrict-prototypes] warning,
because in C func() and func(void) have different semantics.
 2021-05-12 14:55:53 +01:00
Joe Watkins 8b8c8fd79c Merge branch 'PHP-8.0' 
* PHP-8.0:
  missing ;
 2021-05-11 11:11:35 +02:00
Joe Watkins 33a93b5ed7 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  missing ;
 2021-05-11 11:10:52 +02:00
Joe Watkins ef3e0ee08a missing ; 2021-05-11 11:10:38 +02:00
Joe Watkins 3318dcc8ef Merge branch 'PHP-8.0' 
* PHP-8.0:
  php-fpm: fix Solaris port events.mechanism
 2021-05-11 11:08:35 +02:00
Joe Watkins 6ccbaa12e0 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  php-fpm: fix Solaris port events.mechanism
 2021-05-11 11:07:47 +02:00
Petr Sumbera 04078a597c php-fpm: fix Solaris port events.mechanism 
Bug #65800
Fix by: rainer.jung@kippdata.de
 2021-05-11 11:01:38 +02:00
KsaR 01b3fc03c3 Update http->https in license (#6945) 
1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as 3.0 states "php 5.1.1, 4.1.1, and earlier".
3. In some license comments is "at through the world-wide-web" while most is without "at", so deleted.
4. fixed indentation in some files before |
 2021-05-06 12:16:35 +02:00
Christoph M. Becker 8667dc92aa Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix misleading error message
 2021-04-20 15:45:26 +02:00
Christoph M. Becker 0f40426450 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix misleading error message
 2021-04-20 15:43:04 +02:00
Christoph M. Becker 263f14ac60 Fix misleading error message 
Closes GH-6889.
 2021-04-20 15:41:42 +02:00
Nikita Popov 0c7cdbbaba Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix return type of sparc atomic helper
 2021-04-13 14:37:26 +02:00
Nikita Popov ec24f14820 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix return type of sparc atomic helper
 2021-04-13 14:37:18 +02:00
David Carlier 5ccb5fd91e Fix return type of sparc atomic helper 
Closes GH-6808.
 2021-04-13 14:36:58 +02:00
Josh Soref 462da6e09c Fix spelling and grammar mistakes 
This PR corrects misspellings identified by the check-spelling action.

The misspellings have been reported at jsoref@b6ba3e2#commitcomment-48946465

The action reports that the changes in this PR would make it happy: jsoref@602417c

Closes GH-6822.
 2021-04-13 12:09:37 +02:00
George Peter Banyard 5caaf40b43 Introduce pseudo-keyword ZEND_FALLTHROUGH 
And use it instead of comments
 2021-04-07 00:46:29 +01:00
Jakub Zelenka 4361fffaea Add extra run test for pm.max_spawn_rate 2021-03-28 21:06:45 +01:00
Paulius Sapragonas eac1609a84 Max spawn child processes rate an once 
* Add functionality to expect log config options
 2021-03-28 20:53:58 +01:00
Nikita Popov 74075896e1 Revert "Do not check exact values of unstable metrices in FPM status test" 
This reverts commit 5b01c4863f.

The previous commit fixes the 32-bit issue. Maybe this one is also
needed, but let's see if any failures of this form turn up first.
 2021-03-24 10:07:56 +01:00
Nikita Popov 9403840ae3 Fix printf type in fpm status 2021-03-24 10:07:53 +01:00
Jakub Zelenka 5b01c4863f Do not check exact values of unstable metrices in FPM status test 2021-03-23 22:10:30 +00:00
Jakub Zelenka 72a22d92cd Fix types in FPM status openmetrics format 2021-03-22 21:32:15 +00:00