summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-011-0/+82
|\ | | | | | | | | | | | | | | | | * PHP-5.4: Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected. fix NEWS Conflicts: main/main.c
| * Bug #43177: If an eval() has a parse error, the overall exit status and ↵Stanislav Malyshev2013-01-011-0/+82
| | | | | | | | | | | | | | return code should not be affected. Without this fix, a webpage using eval() may return code 500. That might display fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
| * Happy New YearXinchen Hui2013-01-0162-70/+70
| |
* | Happy New YearXinchen Hui2013-01-0162-70/+70
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Lars Strojny2012-12-142-134/+35
|\ \ | |/
| * update test for supported Mime Types checkingpascalc2012-12-141-133/+31
| |
| * update list of common Mime Types in PHP development server to support Web ↵pascalc2012-12-141-1/+4
| | | | | | | | audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together
| * Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2012-11-282-5/+10
| |\ | | | | | | | | | | | | | | | * PHP-5.3: Fixed Bug #63581 Possible buffer overflow Fixed Bug #63581 Possible null dereference
* | \ Merge branch 'PHP-5.3' into PHP-5.5Remi Collet2012-11-282-5/+10
|\ \ \ | | |/ | |/| | | | | | | | | | * PHP-5.3: Fixed Bug #63581 Possible buffer overflow Fixed Bug #63581 Possible null dereference
| * | Fixed Bug #63581 Possible buffer overflowRemi Collet2012-11-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | In fpm-log, possible buffer overflow. Check for length is done at the beginning of the loop, so is not done when overflow occurs on the last loop (len = 1024 or 1025). (ack from fat). This issue where found from by static code analysis tool and, so, I can't provide any reproducer.
| * | Fixed Bug #63581 Possible null dereferenceRemi Collet2012-11-281-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Possible NULL dereference when trying to delete the single item of a list (ack from fat). This issues where found from by static code analysis tool and, so, I can't provide any reproducer.
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-141-1/+1
|\ \ \ | | |/ | |/| | | | | | | * PHP-5.4: Fixed test sapi/cli/tests/006.phpt
| * | Fixed test sapi/cli/tests/006.phptAnatoliy Belsky2012-11-141-1/+1
| | | | | | | | | | | | Third param in preg_match_all() is optional for a while )
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-131-10/+10
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Enabled apache 2.4 handler build option
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-11-131-10/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-5.3: Enabled apache 2.4 handler build option Conflicts: sapi/apache2handler/config.w32
| | * Enabled apache 2.4 handler build optionPierre Joye2012-11-131-0/+19
| | |
* | | Add missed fileXinchen Hui2012-10-241-0/+12
| | |
* | | Merge branch '5.4'George Wang2012-10-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * 5.4: sapi/litespeed/lsapi_main.c: Fix bug #63228
| * \ \ Merge branch '5.3' into 5.4George Wang2012-10-121-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | * 5.3: sapi/litespeed/lsapi_main.c: Fix bug #63228
| | * | sapi/litespeed/lsapi_main.c: Fix bug #63228George Wang2012-10-121-1/+1
| | |/ | | | | | | | | | | | | Fix compiling error at line 606 (error: format not a string literal and no format arguments [-Werror=format-security]
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-103-33/+21
|\ \ \ | |/ /
| * | Implemented FR #63242 (Default error page in PHP built-in web server uses ↵Xinchen Hui2012-10-103-33/+21
| | | | | | | | | | | | outdated html/css)
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-101-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-101-0/+0
| |\ \ | | |/
| | * Remove executable permission on phptXinchen Hui2012-10-101-0/+0
| | |
* | | Merge branch 'PHP-5.4'Jerome Loyet2012-09-281-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: Add missing NEWS entry Fixed bug #62216
| * | Merge branch 'PHP-5.3' into PHP-5.4Jerome Loyet2012-09-281-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Fixed bug #62216
| | * Fixed bug #62216Jerome Loyet2012-09-281-1/+1
| | | | | | | | | | | | Add PID to php-fpm init.d script
| | * - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")Jerome Loyet2012-09-281-9/+9
| | |
| | * - Fixed bug #62947 (Unneccesary warnings on FPM)Jerome Loyet2012-09-281-5/+5
| | |
| | * - add missing php-fpm.service.inJerome Loyet2012-09-281-0/+12
| | |
| * | - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")Jerome Loyet2012-09-281-9/+9
| | |
| * | Merge branch 'fuckgit' into PHP-5.4Jerome Loyet2012-09-283-5/+674
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fuckgit: - Fixed bug #62947 (Unneccesary warnings on FPM) - Fixed bug #63085 (Systemd integration and daemonize) Conflicts: sapi/fpm/config.m4
| | * | - Fixed bug #62947 (Unneccesary warnings on FPM)Jerome Loyet2012-09-281-5/+5
| | | |
| | * | - Fixed bug #63085 (Systemd integration and daemonize)Jerome Loyet2012-09-289-12/+64
| | | |
* | | | - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")Jerome Loyet2012-09-281-9/+9
| | | |
* | | | - Fixed bug #62947 (Unneccesary warnings on FPM)Jerome Loyet2012-09-281-5/+5
| | | |
* | | | - fix merge (fucking git merging system ... :( )Jerome Loyet2012-09-281-0/+653
| | | |
* | | | Merge branch 'PHP-5.4'Jerome Loyet2012-09-288-664/+51
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-5.4: - Fixed bug #63085 (Systemd integration and daemonize) - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
| * | | Merge branch 'PHP-5.3' into PHP-5.4Jerome Loyet2012-09-288-664/+51
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | * PHP-5.3: - Fixed bug #63085 (Systemd integration and daemonize) - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup) Conflicts: sapi/fpm/config.m4
| | * - Fixed bug #63085 (Systemd integration and daemonize)Jerome Loyet2012-09-288-12/+52
| | |
| | * - Fixed bug #62954 (startup problems fpm / php-fpm)Jerome Loyet2012-09-276-57/+59
| | | | | | | | | | | | - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
* | | Merge branch 'PHP-5.4'Jerome Loyet2012-09-286-57/+59
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
| * | - Fixed bug #62954 (startup problems fpm / php-fpm)Jerome Loyet2012-09-286-57/+59
| | | | | | | | | | | | - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
* | | Merge branch 'PHP-5.4'Lars Strojny2012-09-183-0/+48
|\ \ \ | |/ /
| * | Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserverLars Strojny2012-09-183-0/+48
| | |
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-09-154-22/+71
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Respond with 501 to unknown request methods
| * | Respond with 501 to unknown request methodsNiklas Lindgren2012-09-154-22/+71
| | | | | | | | | | | | | | | | | | | | | | | | Fixed typo Moved 501 response from dispatch to event_read_request Return return value of send_error_page
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-09-058-12/+12
|\ \ \ | |/ / | | | | | | | | | Conflicts: sapi/litespeed/lsapi_main.c
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-09-058-12/+12
| |\ \ | | |/ | | | | | | | | | Conflicts: ext/interbase/interbase.rc
View Lorry Controller Status