php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 13:31:27 +02:00
Code Issues Packages Projects Releases Wiki Activity
107,568 Commits 547 Branches 1,483 Tags
8db4543fdcd49ec3d73dfaa4a5d1131c9fd7a1da
Commit Graph

798 Commits

Author SHA1 Message Date
Dmitry Stogov
5eb1f92f31 Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence. 2018-05-28 16:27:12 +03:00
Jakub Zelenka
b7b65fbc7b Merge branch 'PHP-7.2' 2018-04-13 20:13:18 +01:00
Jakub Zelenka
4302c0b542 Merge branch 'PHP-7.1' into PHP-7.2 2018-04-13 20:12:03 +01:00
Michał Górny
4ea7f3467d Support using acl_* functions on *BSD 
The *BSD systems have ACL routines built-in in libc rather than
in separate libacl. Update the configure check to detect that and enable
ACL support without adding 'acl' library.
 2018-04-13 19:48:13 +01:00
Jakub Zelenka
6441b1bb31 Merge branch 'PHP-7.2' 2018-03-30 18:02:07 +01:00
Jakub Zelenka
8b642af484 Merge branch 'PHP-7.1' into PHP-7.2 2018-03-30 17:58:29 +01:00
Jakub Zelenka
0be5b9e6b0 Prevent modifying of getenv result 2018-03-30 17:20:19 +01:00
Jacob Hipps
008eb1461c 68440: ensure backwards compatibility with FPM_SOCKETS var; fix sockname size 2018-03-30 17:20:19 +01:00
Jacob Hipps
77bf9245d2 Fix bug #68440: [sapi/fpm] use multiple FPM_SOCKETS env vars to prevent hitting MAX_ARG_STRLEN with a large number of pools 2018-03-30 17:20:19 +01:00
Anatol Belski
5e00c15b88 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Do not set PR_SET_DUMPABLE by default
  Do not set PR_SET_DUMPABLE by default
 2018-03-27 14:21:42 +02:00
Anatol Belski
600b6277f8 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Do not set PR_SET_DUMPABLE by default
  Do not set PR_SET_DUMPABLE by default
 2018-03-27 14:20:53 +02:00
Anatol Belski
6b39c81957 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Do not set PR_SET_DUMPABLE by default
  Do not set PR_SET_DUMPABLE by default
 2018-03-27 14:20:10 +02:00
Jakub Zelenka
276d19feaa Do not set PR_SET_DUMPABLE by default 2018-03-27 14:19:36 +02:00
Gabriel Caruso
ded3d984c6 Use EXPECT instead of EXPECTF when possible 
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
 2018-02-20 21:53:48 +01:00
Gabriel Caruso
21e3b0c70c Remove trailing whitespace in inc files 2018-02-10 19:20:23 +01:00
Gabriel Caruso
2d48d734a2 Fix some misspellings 2018-02-06 16:59:00 +01:00
Lee Hsun
4b19f710e1 Set max_requests to 0 
The value will always be overwritten by fpm_run(), and the default
value there is 0 and not 500.
 2018-02-03 16:15:12 +01:00
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