clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 22:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,879 Commits 494 Branches 1,367 Tags 797 MiB
dedc9a4200
Commit Graph

60 Commits

Author SHA1 Message Date
Lior Kaplan
9642710a09 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)

 Conflicts:
	sapi/cgi/config9.m4
	sapi/fpm/config.m4
 2015-11-23 18:56:13 +02:00
Lior Kaplan
d6b78a3511 Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions) 2015-11-23 18:40:47 +02:00
Stanislav Malyshev
07241bbd70 FIx darwin build 2015-05-31 14:52:08 -07:00
Xinchen Hui
9f1788f00d Only link fastcgi into fpm and cgi 2015-05-26 13:55:39 +08:00
Xinchen Hui
18cf4e0a8a Fixed fpm-side (tests passes) 2015-05-23 19:01:41 +08:00
Elan Ruusamäe
9f189dd290 split fpm config to two parts. PR#903 
main config = global options
secondary config = pool options

makes easier to add new pools:
duplicate pool config in fpm.d dir

https://bugs.php.net/bug.php?id=67106
 2014-12-14 14:21:46 +01:00
Remi Collet
744ada7d9d Fix bug #68526 Implement POSIX Access Control List for UDS 
- add --with-fpm-acl build option which allow to manage ACL
on Unix Domain Socket
- add listen.acl_users pool option
- add listen.acl_groups pool option

Keep old behavior (chmod) if option not used or not supported.
 2014-12-10 08:15:21 +01:00
Xinchen Hui
235d0241d1 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-25 10:52:41 +08:00
Remi Collet
658f7d77f9 See bug #67635 
Improve previous fix:
- also rely on pkg-config for systemd < 209
- always check for header
- comments
 2014-07-20 11:14:43 +02:00
Remi Collet
144a083954 improve previous, add message during configure 2014-07-19 18:42:40 +02:00
Remi Collet
7b60315672 Fixed bug #67635 php links to systemd libraries without using pkg-config 
Patch from pacho at gentoo dot org

Rely on pkg-config for systemd >= 209
Failback on old check
 2014-07-19 18:40:20 +02:00
Antony Dovgal
98e6c8ca2d fix indentation 2014-01-17 12:49:21 +04:00
Gernot Vormayr
f6d137a716 Add apparmor change hat functionality to fpm 2014-01-17 12:48:33 +04:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Remi Collet
c79f162c37 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file.
 2013-05-21 09:53:51 +02:00
Remi Collet
0e99329e0a Add --with-fpm-systemd option to report health to systemd, and 
systemd_interval option to configure this. The service can now use
Type=notify in the systemd unit file.

Systemd status line will looks like:
Status: "Processes active: 0, idle: 5, Requests: 90, slow: 0, Traffic: 10req/sec"

Watchdog mode is also supported. In this case watchdog interval,
configured in the unit file, override the systemd_interval option.

When not used (default), no change from previous version.
 2013-05-21 09:49:00 +02:00
Jerome Loyet
be043ab6d0 Merge branch 'fuckgit' into PHP-5.4 
* fuckgit:
  - Fixed bug #62947 (Unneccesary warnings on FPM)
  - Fixed bug #63085 (Systemd integration and daemonize)

Conflicts:
	sapi/fpm/config.m4
 2012-09-28 01:19:01 +02:00
Jerome Loyet
c8b7ea0f57 - fix merge (fucking git merging system ... :( ) 2012-09-28 00:55:06 +02:00
Jerome Loyet
64a0e7cdc2 - Fixed bug #63085 (Systemd integration and daemonize) 2012-09-28 00:53:05 +02:00
Jerome Loyet
b2f4e686f0 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #63085 (Systemd integration and daemonize)
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)

Conflicts:
	sapi/fpm/config.m4
 2012-09-28 00:39:29 +02:00
Jerome Loyet
851a04bb7b - Fixed bug #63085 (Systemd integration and daemonize) 2012-09-28 00:33:05 +02:00
Jerome Loyet
c2f33fb129 - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start) 2012-05-25 21:13:57 +02:00
Jerome Loyet
bf9120ecae - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start) 2012-05-25 21:10:17 +02:00
Jerome Loyet
0b44f16ea2 - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm) 2012-05-23 11:40:22 +02:00
Jérôme Loyet
d1312936cd - remove experimental flag on fpm 2011-11-15 22:40:10 +00:00
Jérôme Loyet
62fd3369cb - fix r317922 (missing PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events) in config.m4) 2011-10-09 09:22:36 +00:00
Jérôme Loyet
e7c6f9c62d - Implemented FR #52569 (Add the "ondemand" process-manager to allow zero children) 2011-10-08 21:04:10 +00:00
Jérôme Loyet
1034cbc758 - Implemented FR #52569 (Add the "ondemand" process-manager to allow zero children) 2011-10-08 21:04:10 +00:00
Jérôme Loyet
4d554c45b9 - Fixed bug #55577 (status.html does not install) 2011-10-08 19:31:32 +00:00
Jérôme Loyet
81565fdf45 - Fixed bug #55577 (status.html does not install) 2011-10-08 19:31:32 +00:00
Jérôme Loyet
f5b05ce162 - Replaced shm_slots with a real scoreboard 
- Added several improvements to the status page
 2011-06-26 15:48:11 +00:00
Jérôme Loyet
849d4e0357 - Replaced shm_slots with a real scoreboard 
- Added several improvements to the status page
 2011-06-26 15:48:11 +00:00
Jérôme Loyet
bbe8518456 - Added custom access log (also added per request %CPU and memory mesurement) 2011-06-23 08:03:52 +00:00
Jérôme Loyet
73b6310098 - Added custom access log (also added per request %CPU and memory mesurement) 2011-06-23 08:03:52 +00:00
Jérôme Loyet
f7cd7afd33 - Fixed bug #52501 (libevent made FPM crashed when forking -- libevent has been removed) 2010-11-26 13:46:15 +00:00
Jérôme Loyet
f13f4bc872 - Fixed bug #52501 (libevent made FPM crashed when forking -- libevent has been removed) 2010-11-26 13:46:15 +00:00
Jérôme Loyet
c95477e729 - Fixed #52691 (allow multiple instance of FPM using a custom prefix) 2010-11-14 22:01:34 +00:00
Jérôme Loyet
ae01a576b3 - Fixed #52691 (allow multiple instance of FPM using a custom prefix) 2010-11-14 22:01:34 +00:00
Jani Taskinen
25aee9cad9 - Implemented FR #53271, FR #52410 (Building multiple PHP binary SAPIs and one SAPI module the same time) 
# Bug #53271, Bug #52410
 2010-11-13 23:13:07 +00:00
Jérôme Loyet
e3b4bf5685 - Fixed #52660 (custom process title for FPM) 2010-11-12 00:30:35 +00:00
Jérôme Loyet
c28f44e409 - Fixed #52660 (custom process title for FPM) 2010-11-12 00:30:35 +00:00
Jérôme Loyet
b38d57249e - add "listen queue len" stat (thx to Andrei Nigmatulin) 2010-11-11 02:34:47 +00:00
Jérôme Loyet
0a1e29d74b - add "listen queue len" stat (thx to Andrei Nigmatulin) 2010-11-11 02:34:47 +00:00
Jérôme Loyet
9a1623dc5f - remove FPM specific version which is irrelevant since FPM integration into core. 2010-09-07 22:03:43 +00:00
Jérôme Loyet
a7e18ea855 - remove FPM specific version which is irrelevant since FPM integration into core. 2010-09-07 22:03:43 +00:00
Jérôme Loyet
c725c054d6 - Fixed bug #52498 (libevent was not only linked to php-fpm) 2010-09-07 21:12:28 +00:00
Jérôme Loyet
75891691ed - Fixed bug #52498 (libevent was not only linked to php-fpm) 2010-09-07 21:12:28 +00:00
Jérôme Loyet
6b2b7046ed - Fixed bug #52725 (gcc builtin atomic functions were sometimes used when they were not available). 2010-09-01 08:17:18 +00:00
Jérôme Loyet
70d7d86505 - Fixed bug #52725 (gcc builtin atomic functions were sometimes used when they were not available). 2010-09-01 08:17:18 +00:00
Jérôme Loyet
51dd4c2feb - Fixed bug #52476 (move php-fpm man page from section 1 to section 8) 2010-07-29 22:07:00 +00:00