mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 02:15:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
79,075 Commits 500 Branches 1,381 Tags 797 MiB
6976eb2919
Commit Graph

390 Commits

Author SHA1 Message Date
Dmitry Stogov
5de7115679 Use better data structures (incomplete; able to run bench.php) 2014-02-18 16:27:38 +04:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Antony Dovgal
a053e69991 fix indentation 2014-01-17 12:22:07 +04:00
Antony Dovgal
998f506b6d Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src 
* 'fpm-apparmor-fixed' of https://github.com/notti/php-src:
  Add some basic and apparmor tests to fpm
  Add --force-stderr to fpm
  Add apparmor change hat functionality to fpm
 2014-01-16 17:36:03 +04:00
Gernot Vormayr
e9883779a0 Add some basic and apparmor tests to fpm 2014-01-07 00:21:24 +01:00
Gernot Vormayr
32d9409a24 Add --force-stderr to fpm 2014-01-07 00:19:01 +01:00
Xinchen Hui
0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
fb4678f1ac Merge branch 'PHP-5.6' 2013-12-27 20:46:08 +08:00
Xinchen Hui
a8cd9b417c Fixed bug #66358 (fpm starts segfault) 2013-12-27 20:45:43 +08:00
Kalle Sommer Nielsen
ed5a8d510f Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRMLS_FETCH() calls in our various SAPIs 2013-12-18 09:06:39 +01:00
Rasmus Lerdorf
a0244a69cc Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #66008
 2013-10-31 03:18:36 -07:00
Rasmus Lerdorf
812dfbc431 Fix bug #66008 2013-10-31 03:18:07 -07:00
Antony Dovgal
09ad5fbbb3 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  Improved performance of func_get_args() by eliminating useless copying
  fix limitation of upload size == (U)INT_MAX in CGI
  Link to more readmes
  test commit
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
 2013-10-28 13:46:40 +04:00
Michael Wallner
8962f3ff0c fix limitation of upload size == (U)INT_MAX in CGI 2013-10-28 07:37:47 +01:00
Antony Dovgal
73788d1c23 Merge branch 'PHP-5.5' 
* PHP-5.5:
  increase backlog to the highest value everywhere
 2013-10-27 22:57:31 +04:00
Antony Dovgal
9765763413 increase backlog to the highest value everywhere 
It makes no sense to use -1 for *BSD (which is the highest value there)
and still use 128 for Linux.
Lets raise it right to up the limit and let the people lower it if they
think that 3.5Mb is too much for a process.
IMO this is better than silently dropping connections.
 2013-10-27 22:54:47 +04:00
Michael Wallner
454a9fcb14 Merge branch 'master' of https://github.com/guggemand/php-src 
* 'master' of https://github.com/guggemand/php-src:
  Dont reset other counters when incrementing slow_rq
 2013-10-21 12:04:37 +02:00
Michael Wallner
41da537614 Merge branch 'master' of https://github.com/DylanArnold/php-src 
* 'master' of https://github.com/DylanArnold/php-src:
  Call php_module_shutdown() for php-fpm child processes
 2013-10-21 12:04:06 +02:00
Rasmus Lerdorf
9e4651f6f1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix typo
 2013-10-20 17:56:14 -07:00
Rasmus Lerdorf
18cc5386de Fix typo 2013-10-20 17:55:55 -07:00
Rasmus Lerdorf
26b27767a6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Initialize these to make Coverity happy
  Typo fix: managment -> management
  Use minus sign instead of hyphen
  Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
 2013-10-19 17:41:04 -07:00
Rasmus Lerdorf
813e867652 Initialize these to make Coverity happy 2013-10-19 17:37:59 -07:00
Lior Kaplan
a55d3b9295 Typo fix: managment -> management 2013-10-19 23:53:23 +03:00
Lior Kaplan
df501fd464 Use minus sign instead of hyphen 2013-10-19 23:52:43 +03:00
Dylan Arnold
a911fbc80a Call php_module_shutdown() for php-fpm child processes 2013-09-09 13:06:38 +12: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
Stanislav Malyshev
c793a65690 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
 2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Veres Lajos
4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Gernot Vormayr
a90a93f1a4 Add apparmor change hat functionality to fpm 2013-07-02 13:06:02 +02:00
Felipe Pena
efbf573e9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
 2013-06-26 15:08:51 -03:00
Felipe Pena
cd176e0452 - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de 2013-06-26 15:06:27 -03:00
Stanislav Malyshev
a770ae36c2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64764: Add status option to fpm init.d script
 2013-06-16 16:56:29 -07:00
Lior Kaplan
ee01af7df1 Fix bug #64764: Add status option to fpm init.d script 2013-06-16 16:54:49 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Stanislav Malyshev
84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa typo fixes (argument) 2013-06-10 13:36:17 -07:00
Remi Collet
433731d463 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #64915 (error_log ignored when daemonize=0)
 2013-05-24 12:10:39 +02:00
Remi Collet
9f6ca9bc64 Fixed Bug #64915 (error_log ignored when daemonize=0) 
Use configured error_log file when stderr is not a tty.
So only use tty during interactive debug run.
 2013-05-24 12:09:05 +02: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
Remi Collet
c9085837a9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  From code coverity scan, syscall return value must be check.
 2013-05-03 08:23:07 +02:00
Remi Collet
3fd4b6be63 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  From code coverity scan, syscall return value must be check.
 2013-05-03 08:22:55 +02:00
Remi Collet
0549e55d82 From code coverity scan, syscall return value must be check. 
To not alter current behaviour, we simply log the problem,
so, if it occurs, the message will give explanation.

This are only warning as they don't block the server,
but such fail can explain strange (not expected) behaviour later.
 2013-05-03 08:19:14 +02:00
Remi Collet
6494faa844 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix more resource leaks
 2013-05-02 13:47:48 +02:00
Remi Collet
b7b150b830 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix more resource leaks
 2013-05-02 13:47:36 +02:00