summaryrefslogtreecommitdiff
path: root/sapi
AgeCommit message (Collapse)AuthorFilesLines
2012-06-16Merge branch 'PHP-5.4'HEADmasterXinchen Hui1-0/+3
* PHP-5.4: Fix potential leak in cli server
2012-06-15Fix potential leak in cli serverstealth351-0/+3
2012-06-01Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Jerome Loyet1-1/+10
* 'PHP-5.4' of git.php.net:php-src: (27 commits) Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant) sort NEWS fix bug #55042 - erealloc without updating pointer Fix bug #62186 readline fails to compile fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854) fix test fix test Typofix in comment in proc_open.c fix CVE-2012-2143 updated the libmagic patch after Felipes regex fix Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt Bug #62177 deactivate the linux test version on win Fix bug #62177 Test Bug - finfo_file_regex.phpt 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 ...
2012-06-01Merge branch 'master' of git.php.net:php-srcJerome Loyet1-1/+10
* 'master' of git.php.net:php-src: (43 commits) close the stream whenever possible, no need to keep it open altough the connection is marked as unusable Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant) more refactoring stuff. Reduced code duplication in the authentication code sort NEWS fix bug #55042 - erealloc without updating pointer Fix bug #62186 readline fails to compile fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854) small refactoring - factour out code from connection establishment. Add a define for the default authentication protocol - get away from the hardcoded magic value fix test fix test Typofix in comment in proc_open.c fix CVE-2012-2143 updated the libmagic patch after Felipes regex fix Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt Bug #62177 deactivate the linux test version on win Fix bug #62177 Test Bug - finfo_file_regex.phpt Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt fix unchecked emalloc add CVE add bug 62146 ...
2012-06-01- Fixed bug #62205 (php-fpm segfaults (null passed to strstr))Jerome Loyet3-4/+44
2012-06-01- fix missing include for unix socketsJerome Loyet1-0/+1
2012-06-01- Comment unused function to avoid warningsJerome Loyet1-0/+4
2012-06-01- Fixed bug #62205 (php-fpm segfaults (null passed to strstr))Jerome Loyet3-4/+44
2012-06-01- fix missing include for unix socketsJerome Loyet1-0/+1
2012-06-01- Comment unused function to avoid warningsJerome Loyet1-0/+4
2012-05-29Merge branch 'PHP-5.4'Anatoliy Belsky1-1/+10
* 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-29Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky1-1/+10
* 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-29Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phptMatt Ficken1-1/+10
2012-05-26Fixed bug #61218 (the previous patch was not enough restritive on fcgi name ↵Jerome Loyet1-6/+42
string checks)
2012-05-26Fixed bug #61218 (the previous patch was not enough restritive on fcgi name ↵Jerome Loyet1-6/+42
string checks)
2012-05-26Fixed bug #61218 (the previous patch was not enough restritive on fcgi name ↵Jerome Loyet1-6/+42
string checks)
2012-05-26Fixed bug #61218 (FPM drops connection while receiving some binary values in ↵Jerome Loyet1-40/+8
FastCGI requests)
2012-05-26Fixed bug #61218 (FPM drops connection while receiving some binary values in ↵Jerome Loyet1-40/+8
FastCGI requests)
2012-05-26Fixed bug #61218 (FPM drops connection while receiving some binary valuesin ↵Jerome Loyet1-40/+8
FastCGI requests)
2012-05-26Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and ↵Jerome Loyet4-2/+5
an error occured)
2012-05-26Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and ↵Jerome Loyet4-2/+5
an error occured)
2012-05-26- Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize ↵Jerome Loyet4-2/+5
and an error occured)
2012-05-26- Fixed bug #62160 (Add process.priority to set nice(2) priorities)Jerome Loyet4-0/+65
2012-05-26- Fixed bug #62160 (Add process.priority to set nice(2) priorities)Jerome Loyet4-0/+65
2012-05-26- Fixed bug #62160 (Add process.priority to set nice(2) priorities)Jerome Loyet4-0/+65
2012-05-26- add missing headers to avoid warningsJerome Loyet1-0/+2
2012-05-26- add missing headers to avoid warningsJerome Loyet1-0/+2
2012-05-26- add missing headers to avoid warningsJerome Loyet1-0/+2
2012-05-25- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be ↵Jerome Loyet2-0/+26
launched without errors)
2012-05-25- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be ↵Jerome Loyet2-0/+26
launched without errors)
2012-05-25- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be ↵Jerome Loyet2-0/+26
launched without errors)
2012-05-25- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).Jerome Loyet9-31/+135
2012-05-25- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)Jerome Loyet9-31/+135
2012-05-25- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)Jerome Loyet9-31/+135
2012-05-24This test depends on the default_charset setting, so set it toRasmus Lerdorf1-1/+3
UTF-8 for consistent output
2012-05-24Fix broken apache_request_headers testRasmus Lerdorf1-1/+3
This test depends on the default_charset setting, so set it to UTF-8 for consistent output
2012-05-23Merge branch 'PHP-5.4'Jerome Loyet1-1/+15
* PHP-5.4: - Fixed bug #61026 (FPM pools can listen on the same address)
2012-05-23- Fixed bug #61026 (FPM pools can listen on the same address)Jerome Loyet1-1/+15
2012-05-23- Fixed bug #61026 (FPM pools can listen on the same address)Jerome Loyet1-1/+15
2012-05-23Merge branch 'PHP-5.4'Jerome Loyet1-0/+4
* PHP-5.4: - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm)
2012-05-23- Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm)Jerome Loyet1-0/+4
2012-05-23Merge branch 'PHP-5.4'Jerome Loyet1-2/+2
* PHP-5.4: - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)
2012-05-23- Fixed bug #61295 (php-fpm should not fail with commented 'user' for ↵Jerome Loyet1-2/+2
non-root start)
2012-05-23- Fixed bug #61295 (php-fpm should not fail with commented 'user' for ↵Jerome Loyet1-2/+2
non-root start)
2012-05-23Merge branch 'PHP-5.4'Jerome Loyet4-10/+21
* PHP-5.4: - fix help message for '-R' - Fixed bug #61835 (php-fpm is not allowed to run as root)
2012-05-23- Fix help message for '-R'Jerome Loyet1-1/+1
2012-05-23- fix help message for '-R'Jerome Loyet1-2/+2
2012-05-23- add missing help message for '-R'Jerome Loyet1-1/+4
2012-05-23- Fixed bug #61835 (php-fpm is not allowed to run as root)Jerome Loyet4-9/+20
2012-05-23- Fixed bug #61835 (php-fpm is not allowed to run as root)Jerome Loyet4-9/+18