Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | improve fix for CVE-2012-1823 | Stanislav Malyshev | 2012-05-07 | 1 | -3/+8 | |
| | | | ||||||
* | | | Merge branch 'PHP-5.4' | Stanislav Malyshev | 2012-05-07 | 1 | -3/+8 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: improve fix for CVE-2012-1823 Fix for CVE-2012-1823 | |||||
| * \ \ | Merge branch 'PHP-5.3' into PHP-5.4 | Stanislav Malyshev | 2012-05-07 | 1 | -3/+8 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: improve fix for CVE-2012-1823 Fix for CVE-2012-1823 | |||||
| | * | | | improve fix for CVE-2012-1823 | Stanislav Malyshev | 2012-05-07 | 1 | -3/+8 | |
| | | | | | ||||||
| | * | | | Fix for CVE-2012-1823 | Rasmus Lerdorf | 2012-05-07 | 1 | -1/+14 | |
| | | |/ | | |/| | ||||||
* | | | | Merge branch 'PHP-5.4' | Anatoliy Belsky | 2012-05-06 | 2 | -2/+25 | |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | * PHP-5.4: Fix bug 61769 Random failure of php_cli_server*phpt tests | |||||
| * | | | Fix bug 61769 Random failure of php_cli_server*phpt tests | Matt Ficken | 2012-05-06 | 2 | -2/+25 | |
| | | | | ||||||
* | | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-05-06 | 1 | -14/+14 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-5.4: correct variable name | |||||
| * | | | correct variable name | Xinchen Hui | 2012-05-06 | 1 | -14/+14 | |
| |/ / | ||||||
* | | | Merge branch 'PHP-5.4' | David Soria Parra | 2012-05-05 | 1 | -1/+14 | |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | By Rasmus Lerdorf * PHP-5.4: Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9dab068d477b241d8fd872e3a7c829b3) Fix for CVE-2012-1823 | |||||
| * | | Fix for CVE-2012-1823 | Rasmus Lerdorf | 2012-05-04 | 1 | -1/+14 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'origin/PHP-5.4' | Xinchen Hui | 2012-04-30 | 2 | -3/+30 | |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | * origin/PHP-5.4: Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi). - BFN - BFN | |||||
| * | | Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-04-30 | 2 | -3/+30 | |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | * origin/PHP-5.3: Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi). - BFN Conflicts: sapi/cli/php_cli.c | |||||
| | * | Fixed bug #61546 (functions related to current script failed when chdir() in ↵ | Xinchen Hui | 2012-04-30 | 2 | -3/+30 | |
| | | | | | | | | | | | | cli sapi). | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-04-21 | 1 | -1/+1 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: typo in test | |||||
| * | | typo in test | Xinchen Hui | 2012-04-21 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-04-21 | 1 | -1/+1 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: Make css string constant | |||||
| * | | Make css string constant | Xinchen Hui | 2012-04-21 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-04-21 | 1 | -1/+1 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: Fixed typo | |||||
| * | | Fixed typo | Xinchen Hui | 2012-04-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | report by reeze.xia@gmail.com | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-04-21 | 1 | -67/+30 | |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-5.4: Improved performance while sending error page - BFN | |||||
| * | | Improved performance while sending error page | Xinchen Hui | 2012-04-21 | 1 | -67/+30 | |
| | | | | | | | | | | | | this also fixed bug #61785 (Memory leak when access a non-exists file without router) | |||||
* | | | Merge branch 'PHP-5.4' | Felipe Pena | 2012-04-19 | 1 | -3/+4 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Felipe Pena | 2012-04-19 | 1 | -3/+4 | |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.3: - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net | |||||
| | * | - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename ↵ | Felipe Pena | 2012-04-19 | 1 | -3/+4 | |
| | | | | | | | | | | | | set to null) patch by ab@php.net | |||||
| | * | Fixed bug #61605 (header_remove() does not remove all headers) | Xinchen Hui | 2012-04-04 | 1 | -0/+34 | |
| | | | ||||||
| | * | Fixed bug #61043: Regression in magic_quotes_gpc fix (CVE-2012-0831) | Gustavo André dos Santos Lopes | 2012-03-21 | 2 | -4/+8 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3 Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net> | |||||
| | | * | Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831) | Ondřej Surý | 2012-03-21 | 2 | -4/+8 | |
| | | | | ||||||
* | | | | Merge branch 'PHP-5.4' | Felipe Pena | 2012-04-19 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | - Fixed expected test result (patch by ab@php.net in #61769) | Felipe Pena | 2012-04-19 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'PHP-5.4' | Felipe Pena | 2012-04-19 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | - Fix test title | Felipe Pena | 2012-04-19 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Fix bug #61430 for trunk | Xinchen Hui | 2012-04-17 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-04-04 | 1 | -0/+34 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #61605 (header_remove() does not remove all headers) Conflicts: NEWS | |||||
| * | | | Fixed bug Fixed bug #61605 (header_remove() does not remove all headers) | Xinchen Hui | 2012-04-04 | 1 | -0/+34 | |
| | | | | ||||||
* | | | | Merge branch 'PHP-5.4' | David Soria Parra | 2012-03-21 | 1 | -0/+10 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #61461 (missing checks around malloc() calls). Conflicts: NEWS | |||||
| * | | | Fixed bug #61461 (missing checks around malloc() calls). | Ilia Alshanetsky | 2012-03-20 | 1 | -0/+10 | |
| | | | | ||||||
* | | | | Merge branch 'PHP-5.4' | David Soria Parra | 2012-03-20 | 2 | -2/+2 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Replace $Revision$ with $Id$ in keyword expansion enable files Enable $Id$ expansion for files with the $Revision$ keyword Conflicts: ext/mysqlnd/mysqlnd.h | |||||
| * | | | Merge branch 'PHP-5.3' into PHP-5.4 | David Soria Parra | 2012-03-20 | 2 | -2/+2 | |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Replace $Revision$ with $Id$ in keyword expansion enable files Enable $Id$ expansion for files with the $Revision$ keyword Conflicts: ext/mysqlnd/mysqlnd.h | |||||
| | * | | Replace $Revision$ with $Id$ in keyword expansion enable files | David Soria Parra | 2012-03-20 | 2 | -2/+2 | |
| | |/ | ||||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-03-20 | 1 | -0/+1 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: Minor change, test using php mail address as account | |||||
| * | | Minor change, test using php mail address as account | Xinchen Hui | 2012-03-20 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-03-20 | 2 | -4/+4 | |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-5.4: Use newdoc instead of escape char adapt makedist to git | |||||
| * | | Use newdoc instead of escape char | Xinchen Hui | 2012-03-20 | 2 | -4/+4 | |
| | | | ||||||
| * | | Merge branch '53' into 54 | Ilia Alshanetsky | 2012-03-19 | 1 | -1/+1 | |
| |\ \ | | |/ | | | | | | | | | | * 53: Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). | |||||
| | * | Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). | Ilia Alshanetsky | 2012-03-19 | 1 | -1/+1 | |
| | | | ||||||
| | * | Fixed bug #61172 (Add Apache 2.4 support) | Christopher Jones | 2012-03-02 | 2 | -6/+20 | |
| | | | ||||||
| | * | more verbose skip reason in test files with not so obvious extension ↵ | Olivier DOUCET | 2012-02-25 | 3 | -3/+3 | |
| | | | | | | | | | | | | requirements | |||||
| | * | Yup, these need to be escaped. Good catch. | Rasmus Lerdorf | 2012-02-21 | 1 | -1/+1 | |
| | | | ||||||
| | * | Fix bug 61149 | Rasmus Lerdorf | 2012-02-20 | 1 | -1/+1 | |
| | | |