summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
...
| | * year++Xinchen Hui2012-09-057-11/+11
| | |
| | * Fix bug #62654Rasmus Lerdorf2012-07-251-3/+3
| | |
| * | Merging PR 121 to add support for slow request counting on the PHP-FPM ↵Lars Strojny2012-08-267-13/+24
| | | | | | | | | | | | status page
* | | Merging PR 121 to add support for slow request counting on the PHP-FPM ↵Lars Strojny2012-08-267-13/+24
| | | | | | | | | | | | status page
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-08-181-2/+2
|\ \ \ | |/ /
| * | Fix test failedXinchen Hui2012-08-181-2/+2
| | |
* | | Merge branch 'PHP-5.4'Felipe Pena2012-08-161-1/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)
| * | - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not ↵Felipe Pena2012-08-161-1/+4
| | | | | | | | | | | | set)
* | | Merge branch 'pull-request/132'Stanislav Malyshev2012-08-052-70/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/132: OK, bye bye JavaScript, let's just include credits before license Nicer (JSLint-compliant!) credits reveal JavaScript Removed now-unnecessary expose_php checks for logo Fixed small misalignment in prev commit Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
| * | | Removed Logo GUIDs and replaced with Data URIs and div hidden with JSAndrew Faulds2012-07-142-70/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - removed php_logo_guid() - removed php_egg_logo_guid() - removed php_real_logo_guid() - removed zend_logo_guid() - removed logo GUID handling - removed logo GUIDs from source - added logo data URIs instead for phpinfo() - added credits to phpinfo() page, but hidden by default
* | | | Merge branch 'PHP-5.4'Xinchen Hui2012-08-021-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Fixed bug #62725 (Calling exit() in a shutdown function does not return the ↵Xinchen Hui2012-08-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | exit value) The fix is make 5.4 behavior consistent with 5.3
* | | | Merge branch 'PHP-5.4'Xinchen Hui2012-08-011-1/+1
|\ \ \ \ | |/ / /
| * | | Sleep a little bit more, in some slow machine (like gcov), it will take a ↵Xinchen Hui2012-08-011-1/+1
| | | | | | | | | | | | | | | | little more time to setup server
* | | | Merge branch 'PHP-5.4'Xinchen Hui2012-07-311-1/+1
|\ \ \ \ | |/ / /
| * | | Implemented FR #62700 (have the console output 'Listening on ↵Xinchen Hui2012-07-311-1/+1
| | | | | | | | | | | | | | | | http://localhost:8000')
| * | | Fix bug #62654Rasmus Lerdorf2012-07-241-3/+3
| | | |
* | | | Fix bug #62654Rasmus Lerdorf2012-07-241-3/+3
| | | |
* | | | Merge branch 'PHP-5.4'Johannes Schlüter2012-07-221-0/+2
|\ \ \ \ | |/ / /
| * | | Fix Bug #62612 readline extension compilation failsJohannes Schlüter2012-07-221-0/+2
| | | |
* | | | Merge branch 'PHP-5.4'Xinchen Hui2012-07-221-1/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.4: Improve error message for ssl request
| * | | Improve error message for ssl requestXinchen Hui2012-07-221-1/+5
| | | |
* | | | Merge branch 'PHP-5.4'Xinchen Hui2012-07-181-1/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| | * PHP-5.4: Fix test (no charset outputed)
| * | Fix test (no charset outputed)Xinchen Hui2012-07-181-1/+1
| | |
* | | Merge branch 'PHP-5.4'Felipe Pena2012-07-081-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds)
| * | - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds ↵Felipe Pena2012-07-081-1/+1
| | | | | | | | | | | | instead of seconds)
* | | Merge branch 'PHP-5.4'Johannes Schlüter2012-06-271-0/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fix memleak in CLI
| * | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-06-271-0/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-5.3: Fix memleak in CLI Conflicts: sapi/cli/php_cli.c
| | * Fix memleak in CLIJohannes Schlüter2012-06-271-0/+3
| | |
| | * - 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 '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
| | | |
View Lorry Controller Status