php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
106,404 Commits 547 Branches 1,483 Tags
4752f8a8ed906ca2be93b0bae5617c2f76a2a8ac
Commit Graph

781 Commits

Author SHA1 Message Date
motecshine 0e10bed83e Remove double include of fpm_scoreboard.h 2018-01-15 12:22:04 +01:00
Gabriel Caruso 471da3eddc Trailing whitespaces on sapi/* 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-04 02:39:54 -02:00
Gabriel Caruso 6400264856 Trailing whitespaces 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-03 14:38:00 +01:00
Xinchen Hui a76eeea736 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Happy new year (Update copyright to 2018)

Conflicts:
	ext/phar/LICENSE
 2018-01-03 16:02:15 +08:00
Xinchen Hui 0e62639d28 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Happy new year (Update copyright to 2018)
 2018-01-03 16:00:34 +08:00
Lior Kaplan fbfdd1e1c4 Happy new year (Update copyright to 2018) 2018-01-02 23:42:29 +02:00
Xinchen Hui a6519d0514 year++ 2018-01-02 12:57:58 +08:00
Xinchen Hui 7a7ec01a49 year++ 2018-01-02 12:55:14 +08:00
Xinchen Hui ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Dmitry Stogov c890d469fa Use array specific functions 2017-12-07 15:20:17 +03:00
Sebastian Ramadan 7d5691cd69 Fix some printf() specifier usages 
Use PRIu32 when printing uint32_t.
Fix some %u/%d confusions.
Add some casts where types are not standardized.
 2017-11-21 22:50:27 +01:00
Dmitry Stogov 00fc9e80c6 Disable RC_DEBUG for FPM initialisation 2017-11-03 00:48:04 +03:00
Peter Kokot 39ea632f74 Join untracked files to root .gitignore 2017-10-05 12:36:47 +02:00
Joe Watkins 17cf32ef45 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Typo in status.html
 2017-10-03 07:22:26 +01:00
Joe Watkins 6e39258302 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Typo in status.html
 2017-10-03 07:22:15 +01:00
Joe Watkins d0cda9d0bd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Typo in status.html
 2017-10-03 07:22:04 +01:00
Viktor Szépe e995b7e475 Typo in status.html 
feet needs -> fit needs
 2017-10-03 07:21:53 +01:00
Remi Collet c26d8ecf58 Merge branch 'PHP-7.2' 
* PHP-7.2:
  rename test
 2017-09-19 07:27:04 +02:00
Remi Collet ee84f34344 rename test 2017-09-19 07:26:53 +02:00
Remi Collet ce59da1997 Merge branch 'PHP-7.2' 
* PHP-7.2:
  NEWS
  Fixed Bug #75212 php_value acts like php_admin_value
 2017-09-18 18:09:40 +02:00
Remi Collet cfc6c4d297 Fixed Bug #75212 php_value acts like php_admin_value 2017-09-18 18:08:51 +02:00
Fabien Potencier cbda84f87c Fixed typo in FPM error message 2017-08-23 22:16:47 +02:00
Joe Watkins 515b396889 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update copyright year to 2017
 2017-07-24 17:24:22 +01:00
Joe Watkins b44484b912 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update copyright year to 2017
 2017-07-24 17:24:10 +01:00
Peter Kokot 924ff6164e Update copyright year to 2017 2017-07-24 17:23:57 +01:00
Tom Van Looy 04fb3f28ff Remove superfluous semicolons 2017-06-26 00:23:25 +02:00
Sara Golemon d316ba2d65 Remove user=foo from FPM test config 
This setting has nothing to do with what's being tested,
and on any system without a "foo" user we'll get a spurious error.
 2017-05-24 15:07:24 -07:00
Sara Golemon d8d1c78ed0 Skip FPM tests when running as root (unless requested) 
FPM must be configured as a user.
Normally it defaults to the current user,
but if that's root it'll fail to startup
unless the --run-as-root option is provided.

Extend that logic into the test runner so that
we don't fail for stupid reasons.

If you're running `make test` as root and you want
FPM tests to run anyway, set TEST_FPM_RUN_AS_ROOT=1
in your environment.
 2017-05-24 13:58:18 -07:00
Xinchen Hui 282d09a740 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix typo: exectute => execute
 2017-05-09 11:02:02 +08:00
Xinchen Hui 15dbe775d1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix typo: exectute => execute
 2017-05-09 11:01:52 +08:00
Andrew Marcinkevičius abad134681 Fix typo: exectute => execute 2017-05-08 13:59:05 +03:00
Sara Golemon b63c45c69e Try fallback on IPv4 ANYADDR when IPv6 ANYADDR fails 
https://bugs.php.net/bug.php?id=74166
A host system with no/limited IPv6 support will fail at binding
the IPv6 ANYADDR address (::) as the address family is unsupported.

Deal with this by handling failure to implicitly bind to ::
as a soft failure, falling back to 0.0.0.0.

If binding to :: failed for some other reason (e.g. port in use)
then binding to 0.0.0.0 will likely fail as well, but we'll
get appropriate warnings for that.
 2017-03-08 11:02:54 -08:00
Joe Watkins 78ae563a48 Merge branch 'PHP-7.1' 
* PHP-7.1:
  pull-request/2393:
    stop fpm make install clobbering dot d configuration
 2017-02-22 06:49:22 +00:00
Joe Watkins 46d0933668 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  pull-request/2393:
    stop fpm make install clobbering dot d configuration
 2017-02-22 06:48:48 +00:00
Coenraad Loubser 9eaf551c86 pull-request/2393: 
stop make install from clobbering default dot d configuration
 2017-02-22 06:47:23 +00:00
Nikita Popov 5383c9d9e5 Merge branch 'PHP-7.1' 2017-02-12 00:06:47 +01:00
Nikita Popov 6d5ea20e0b Merge branch 'PHP-7.0' into PHP-7.1 2017-02-12 00:06:35 +01:00
Denis Yeldandi 9814be4bc2 Fixed bug #69860 2017-02-12 00:06:04 +01:00
Jakub Zelenka 10cd88588e Merge branch 'PHP-7.1' 2017-01-29 20:46:20 +00:00
Jakub Zelenka 1dab39b9aa Merge branch 'PHP-7.0' into PHP-7.1 2017-01-29 20:44:51 +00:00
Jakub Zelenka df16579642 Try fpm path for testing in sbin as it is default target 2017-01-29 20:43:58 +00:00
Joe Watkins 5c6bf3598a Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix Bug #69865 php-fpm does not close stderr when using syslog
 2017-01-23 16:57:01 +00:00
Joe Watkins 9aad38038e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix Bug #69865 php-fpm does not close stderr when using syslog
 2017-01-23 16:56:08 +00:00
Michael Wallner 80a851b4dd Fix Bug #69865 php-fpm does not close stderr when using syslog 2017-01-23 16:55:15 +00:00
Antony Dovgal b5cfe11c5b use correct shift and fix slowlog bt in 7.1 2017-01-23 14:52:21 +03:00
Antony Dovgal 9d7054693e use correct shift and fix slowlog bt in 7.1 2017-01-23 14:50:09 +03:00
Joe Watkins 28391c30ca Merge branch 'PHP-7.1' 
* PHP-7.1:
  Increase wait time for tests involving sockets to improve Travis relability
 2017-01-13 06:45:31 +00:00
Joe Watkins 19363de12f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Increase wait time for tests involving sockets to improve Travis relability
 2017-01-13 06:45:17 +00:00
Mitch Hagstrand fd92b91188 Increase wait time for tests involving sockets to improve Travis relability 
1. Increased sleep time from 25ms to 50ms
2. Added sleep to shutdown handlers
 2017-01-13 06:45:04 +00:00
Joe Watkins b2da9230f2 Merge branch 'PHP-7.1' 
* PHP-7.1:
  improve FPM tests (mostly for systemd build)
 2017-01-08 19:03:33 +00:00