clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 15:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,665 Commits 494 Branches 1,367 Tags 813 MiB
f3802db7a0
Commit Graph

2798 Commits

Author SHA1 Message Date
Anatoliy Belsky
dffbc98239 Merge branch 'PHP-5.4' 
* PHP-5.4: (21 commits)
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  fix unchecked emalloc
  add CVE
  add bug 62146
  add bug #62082
  sync with HEAD
  sync with HEAD
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests)
  Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
  Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - add missing headers to avoid warnings
  - add missing headers to avoid warnings
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)
  ...

Conflicts:
	NEWS
 2012-05-29 12:25:25 +02:00
Anatoliy Belsky
c4f9b01422 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  sync with HEAD
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
  - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - add missing headers to avoid warnings
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)

Conflicts:
	NEWS
	sapi/fpm/fpm/fpm_main.c
 2012-05-29 12:19:20 +02:00
Matt Ficken
4054890b26 Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt 2012-05-29 11:41:44 +02:00
Jerome Loyet
e7a7f533e3 Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) 2012-05-26 19:37:24 +02:00
Jerome Loyet
773e85a788 Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) 2012-05-26 19:37:09 +02:00
Jerome Loyet
2f7bd57f93 Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) 2012-05-26 19:36:01 +02:00
Jerome Loyet
78de6eb03d Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests) 2012-05-26 19:29:01 +02:00
Jerome Loyet
60cca8b9c9 Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests) 2012-05-26 19:27:45 +02:00
Jerome Loyet
e7ff3e839b Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests) 2012-05-26 19:27:02 +02:00
Jerome Loyet
0225300b70 Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) 2012-05-26 18:48:56 +02:00
Jerome Loyet
e052da3a6b Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) 2012-05-26 18:48:40 +02:00
Jerome Loyet
0298b92b69 - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) 2012-05-26 18:44:35 +02:00
Jerome Loyet
7127135c87 - Fixed bug #62160 (Add process.priority to set nice(2) priorities) 2012-05-26 18:24:28 +02:00
Jerome Loyet
decc394a20 - Fixed bug #62160 (Add process.priority to set nice(2) priorities) 2012-05-26 18:24:08 +02:00
Jerome Loyet
f6655b62d8 - Fixed bug #62160 (Add process.priority to set nice(2) priorities) 2012-05-26 18:22:12 +02:00
Jerome Loyet
18cd5772d6 - add missing headers to avoid warnings 2012-05-26 17:38:39 +02:00
Jerome Loyet
0037598252 - add missing headers to avoid warnings 2012-05-26 17:38:08 +02:00
Jerome Loyet
63e11f9025 - add missing headers to avoid warnings 2012-05-26 17:37:33 +02:00
Jerome Loyet
eeba67914e - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) 2012-05-25 21:23:39 +02:00
Jerome Loyet
d90003b549 - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) 2012-05-25 21:22:54 +02:00
Jerome Loyet
a7761262f7 - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) 2012-05-25 21:21:44 +02:00
Jerome Loyet
a28fe034f2 - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start). 2012-05-25 21:15:06 +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
Rasmus Lerdorf
8208462fc1 This test depends on the default_charset setting, so set it to 
UTF-8 for consistent output
 2012-05-23 17:48:01 -07:00
Rasmus Lerdorf
523fd2c244 Fix broken apache_request_headers test 
This test depends on the default_charset setting, so set it to
UTF-8 for consistent output
 2012-05-23 17:38:23 -07:00
Jerome Loyet
e9a7039e60 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61026 (FPM pools can listen on the same address)
 2012-05-23 11:53:20 +02:00
Jerome Loyet
1299503936 - Fixed bug #61026 (FPM pools can listen on the same address) 2012-05-23 11:53:04 +02:00
Jerome Loyet
5d61e56dd7 - Fixed bug #61026 (FPM pools can listen on the same address) 2012-05-23 11:52:04 +02:00
Jerome Loyet
2cd6855d4f Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm)
 2012-05-23 11:40:36 +02:00
Jerome Loyet
0b44f16ea2 - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm) 2012-05-23 11:40:22 +02:00
Jerome Loyet
9438b2c401 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)
 2012-05-23 11:32:02 +02:00
Jerome Loyet
a07d76c0ba - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start) 2012-05-23 11:31:33 +02:00
Jerome Loyet
812d248193 - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start) 2012-05-23 11:30:27 +02:00
Jerome Loyet
3ec70a895e Merge branch 'PHP-5.4' 
* PHP-5.4:
  - fix help message for '-R'
  - Fixed bug #61835 (php-fpm is not allowed to run as root)
 2012-05-23 10:37:36 +02:00
Jerome Loyet
f4c38016b6 - Fix help message for '-R' 2012-05-23 10:36:45 +02:00
Jerome Loyet
757e3fc3d5 - fix help message for '-R' 2012-05-23 10:35:37 +02:00
Jerome Loyet
629273d11b - add missing help message for '-R' 2012-05-23 10:34:16 +02:00
Jerome Loyet
06c7c3674b - Fixed bug #61835 (php-fpm is not allowed to run as root) 2012-05-23 10:32:42 +02:00
Jerome Loyet
7b396c078c - Fixed bug #61835 (php-fpm is not allowed to run as root) 2012-05-23 09:49:13 +02:00
Jerome Loyet
085e6a9f3b Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61045 (fpm don't send error log to fastcgi clients)
  - fix NEWS for bug #61812
 2012-05-22 08:42:17 +02:00
Jerome Loyet
dce259099d - Fixed bug #61045 (fpm don't send error log to fastcgi clients) 2012-05-22 08:40:37 +02:00
Jerome Loyet
faca4e08b4 - Fixed bug #61045 (fpm don't send error log to fastcgi clients) 2012-05-22 08:34:27 +02:00
Xinchen Hui
134da93fbd Merge branch 'PHP-5.4' 
* PHP-5.4:
  Correct test title
 2012-05-09 11:29:19 +08:00
Xinchen Hui
d394c17293 Correct test title 2012-05-09 11:28:57 +08:00
Xinchen Hui
67075609d3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions)
 2012-05-09 11:28:09 +08:00
Xinchen Hui
1e60d0c105 Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions) 2012-05-09 11:27:39 +08:00
Xinchen Hui
c4d0b796c2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test failed,  the fsockopen will be refused immediately if the server is not set up.
  - BFN
 2012-05-09 11:23:37 +08:00
Xinchen Hui
7b2ab56997 Fix test failed, the fsockopen will be refused immediately if the server is not set up. 2012-05-09 11:21:24 +08:00
David Soria Parra
e67567088e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Typo
 2012-05-08 22:09:13 +02:00