summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix testphp-5.4.4RC2Stanislav Malyshev2012-05-291-1/+1
* fix testStanislav Malyshev2012-05-291-1/+1
* Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-05-301-1/+1
|\
| * Typofix in comment in proc_open.cJille Timmermans2012-05-301-1/+1
* | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2012-05-293-1/+22
|\ \ | |/
| * fix CVE-2012-2143Stanislav Malyshev2012-05-293-1/+24
* | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-291-74/+50
|\ \ | |/
| * updated the libmagic patch after Felipes regex fixAnatoliy Belsky2012-05-291-74/+50
* | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-294-2/+91
|\ \ | |/
| * Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phptMatt Ficken2012-05-292-1/+50
| * Bug #62177 deactivate the linux test version on winMatt Ficken2012-05-291-1/+5
| * Fix bug #62177 Test Bug - finfo_file_regex.phptMatt Ficken2012-05-291-0/+36
* | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-291-1/+10
|\ \ | |/
| * Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phptMatt Ficken2012-05-291-1/+10
| * sync with HEADNuno Lopes2012-05-271-4/+1
| * Fixed bug #61218 (the previous patch was not enough restritive on fcgi name s...Jerome Loyet2012-05-261-6/+42
| * Fixed bug #61218 (FPM drops connection while receiving some binary valuesin F...Jerome Loyet2012-05-262-40/+10
| * - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and...Jerome Loyet2012-05-264-2/+5
| * - Fixed bug #62160 (Add process.priority to set nice(2) priorities)Jerome Loyet2012-05-265-0/+66
| * - add missing headers to avoid warningsJerome Loyet2012-05-261-0/+2
| * - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be l...Jerome Loyet2012-05-253-0/+28
| * - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)Jerome Loyet2012-05-2510-31/+137
* | fix unchecked emallocStanislav Malyshev2012-05-281-3/+3
* | add CVEStanislav Malyshev2012-05-281-1/+1
* | add bug 62146Stanislav Malyshev2012-05-281-0/+3
* | add bug #62082Stanislav Malyshev2012-05-281-0/+2
* | sync with HEADNuno Lopes2012-05-271-4/+1
* | Fixed bug #61218 (the previous patch was not enough restritive on fcgi name s...Jerome Loyet2012-05-261-6/+42
* | Fixed bug #61218 (FPM drops connection while receiving some binary values in ...Jerome Loyet2012-05-262-40/+10
* | Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and a...Jerome Loyet2012-05-264-2/+5
* | - Fixed bug #62160 (Add process.priority to set nice(2) priorities)Jerome Loyet2012-05-265-0/+66
* | - add missing headers to avoid warningsJerome Loyet2012-05-261-0/+2
* | - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be l...Jerome Loyet2012-05-253-0/+28
* | - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)Jerome Loyet2012-05-2510-31/+137
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-05-252-4/+4
|\ \ | |/
| * Fixed bug #62128 superfluous ";"Xinchen Hui2012-05-252-4/+4
* | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-253-1/+39
|\ \ | |/
| * Fixed bug #62149 Test Bug - ext/curl/tests/bug61948Matt Ficken2012-05-252-1/+29
| * Fixed bug #62148 mail_skipif doesn't skip imap tests on Release BuildMatt Ficken2012-05-251-0/+10
* | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-251-1/+4
|\ \ | |/
| * Fixed bug #62147 test bug - popen_pclose_basic-win32Matt Ficken2012-05-251-1/+4
* | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-05-258-28/+36
|\ \ | |/
| * Fix bug #62146 com_dotnet cannot be built shared, tested by AnatoliyJohannes Schlüter2012-05-259-28/+39
| * Those changes are in 5.3.15Johannes Schlüter2012-05-251-3/+2
| * Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3Felipe Pena2012-05-247-213/+260
| |\
| * | - BFNFelipe Pena2012-05-241-2/+5
* | | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-05-244-25/+33
|\ \ \ | |/ /
| * | - Fixed magic file regex supportFelipe Pena2012-05-244-25/+33
* | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-05-245-213/+235
|\ \ \ | | |/ | |/|
| * | Fixed bug #62073Xinchen Hui2012-05-246-217/+243
| |\ \