summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4'Xinchen Hui2012-06-161-0/+3
|\ | | | | | | | | * PHP-5.4: Fix potential leak in cli server
| * Fix potential leak in cli serverstealth352012-06-161-0/+3
| |
| * Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Jerome Loyet2012-06-011-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 ...
| * | - Fixed bug #62205 (php-fpm segfaults (null passed to strstr))Jerome Loyet2012-06-013-4/+44
| | |
| * | - fix missing include for unix socketsJerome Loyet2012-06-011-0/+1
| | |
| * | - Comment unused function to avoid warningsJerome Loyet2012-06-011-0/+4
| | |
* | | Merge branch 'master' of git.php.net:php-srcJerome Loyet2012-06-011-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 ...
| * \ \ Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-291-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
| | * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-291-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
| | | * Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phptMatt Ficken2012-05-291-1/+10
| | | |
| | | * Fixed bug #61218 (the previous patch was not enough restritive on fcgi name ↵Jerome Loyet2012-05-261-6/+42
| | | | | | | | | | | | | | | | string checks)
| | | * Fixed bug #61218 (FPM drops connection while receiving some binary valuesin ↵Jerome Loyet2012-05-261-40/+8
| | | | | | | | | | | | | | | | FastCGI requests)
| | | * - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize ↵Jerome Loyet2012-05-264-2/+5
| | | | | | | | | | | | | | | | and an error occured)
| | | * - Fixed bug #62160 (Add process.priority to set nice(2) priorities)Jerome Loyet2012-05-264-0/+65
| | | |
| | | * - add missing headers to avoid warningsJerome Loyet2012-05-261-0/+2
| | | |
| | | * - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be ↵Jerome Loyet2012-05-252-0/+26
| | | | | | | | | | | | | | | | launched without errors)
| | | * - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)Jerome Loyet2012-05-259-31/+135
| | | |
| | | * - Fixed bug #61026 (FPM pools can listen on the same address)Jerome Loyet2012-05-231-1/+15
| | | |
| | | * - Fixed bug #61295 (php-fpm should not fail with commented 'user' for ↵Jerome Loyet2012-05-231-2/+2
| | | | | | | | | | | | | | | | non-root start)
| | | * - Fix help message for '-R'Jerome Loyet2012-05-231-1/+1
| | | |
| | | * - add missing help message for '-R'Jerome Loyet2012-05-231-1/+4
| | | |
| | | * - Fixed bug #61835 (php-fpm is not allowed to run as root)Jerome Loyet2012-05-234-9/+18
| | | |
| | | * - Fixed bug #61045 (fpm don't send error log to fastcgi clients)Jerome Loyet2012-05-223-3/+51
| | | |
| | | * improve fix for CVE-2012-1823Stanislav Malyshev2012-05-071-3/+8
| | | |
| | | * Fix for CVE-2012-1823Rasmus Lerdorf2012-05-051-1/+14
| | | | | | | | | | | | | | | | (cherry picked from commit 29300b1f9dab068d477b241d8fd872e3a7c829b3)
| | * | Fixed bug #61218 (the previous patch was not enough restritive on fcgi name ↵Jerome Loyet2012-05-261-6/+42
| | | | | | | | | | | | | | | | string checks)
| | * | Fixed bug #61218 (FPM drops connection while receiving some binary values in ↵Jerome Loyet2012-05-261-40/+8
| | | | | | | | | | | | | | | | FastCGI requests)
| | * | Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and ↵Jerome Loyet2012-05-264-2/+5
| | | | | | | | | | | | | | | | an error occured)
| | * | - Fixed bug #62160 (Add process.priority to set nice(2) priorities)Jerome Loyet2012-05-264-0/+65
| | | |
| | * | - add missing headers to avoid warningsJerome Loyet2012-05-261-0/+2
| | | |
| | * | - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be ↵Jerome Loyet2012-05-252-0/+26
| | | | | | | | | | | | | | | | launched without errors)
| | * | - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)Jerome Loyet2012-05-259-31/+135
| | | |
| | * | Fix broken apache_request_headers testRasmus Lerdorf2012-05-231-1/+3
| | | | | | | | | | | | | | | | | | | | This test depends on the default_charset setting, so set it to UTF-8 for consistent output
* | | | - Fixed bug #62205 (php-fpm segfaults (null passed to strstr))Jerome Loyet2012-06-013-4/+44
| | | |
* | | | - fix missing include for unix socketsJerome Loyet2012-06-011-0/+1
| | | |
* | | | - Comment unused function to avoid warningsJerome Loyet2012-06-011-0/+4
|/ / /
* | | Fixed bug #61218 (the previous patch was not enough restritive on fcgi name ↵Jerome Loyet2012-05-261-6/+42
| | | | | | | | | | | | string checks)
* | | Fixed bug #61218 (FPM drops connection while receiving some binary values in ↵Jerome Loyet2012-05-261-40/+8
| | | | | | | | | | | | FastCGI requests)
* | | Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and ↵Jerome Loyet2012-05-264-2/+5
| | | | | | | | | | | | an error occured)
* | | - Fixed bug #62160 (Add process.priority to set nice(2) priorities)Jerome Loyet2012-05-264-0/+65
| | |
* | | - add missing headers to avoid warningsJerome Loyet2012-05-261-0/+2
| | |
* | | - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be ↵Jerome Loyet2012-05-252-0/+26
| | | | | | | | | | | | launched without errors)
* | | - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).Jerome Loyet2012-05-259-31/+135
| | |
* | | This test depends on the default_charset setting, so set it toRasmus Lerdorf2012-05-231-1/+3
| | | | | | | | | | | | UTF-8 for consistent output
* | | Merge branch 'PHP-5.4'Jerome Loyet2012-05-231-1/+15
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: - Fixed bug #61026 (FPM pools can listen on the same address)
| * | - Fixed bug #61026 (FPM pools can listen on the same address)Jerome Loyet2012-05-231-1/+15
| | |
* | | Merge branch 'PHP-5.4'Jerome Loyet2012-05-231-0/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm)
| * | - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm)Jerome Loyet2012-05-231-0/+4
| | |
* | | Merge branch 'PHP-5.4'Jerome Loyet2012-05-231-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)
| * | - Fixed bug #61295 (php-fpm should not fail with commented 'user' for ↵Jerome Loyet2012-05-231-2/+2
| | | | | | | | | | | | non-root start)
View Lorry Controller Status