summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
...
| * | improve fix for CVE-2012-1823Stanislav Malyshev2012-05-071-3/+8
| | |
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-05-071-3/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | * PHP-5.4: improve fix for CVE-2012-1823 Fix for CVE-2012-1823
| * \ \ Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2012-05-071-3/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: improve fix for CVE-2012-1823 Fix for CVE-2012-1823
| | * | | improve fix for CVE-2012-1823Stanislav Malyshev2012-05-071-3/+8
| | | | |
| | * | | Fix for CVE-2012-1823Rasmus Lerdorf2012-05-071-1/+14
| | | |/ | | |/|
* | | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-062-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 testsMatt Ficken2012-05-062-2/+25
| | | |
* | | | Merge branch 'PHP-5.4'Xinchen Hui2012-05-061-14/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.4: correct variable name
| * | | correct variable nameXinchen Hui2012-05-061-14/+14
| |/ /
* | | Merge branch 'PHP-5.4'David Soria Parra2012-05-051-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-1823Rasmus Lerdorf2012-05-041-1/+14
| | |
* | | Merge remote-tracking branch 'origin/PHP-5.4'Xinchen Hui2012-04-302-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.4Xinchen Hui2012-04-302-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 Hui2012-04-302-3/+30
| | | | | | | | | | | | cli sapi).
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-04-211-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: typo in test
| * | typo in testXinchen Hui2012-04-211-1/+1
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-04-211-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Make css string constant
| * | Make css string constantXinchen Hui2012-04-211-1/+1
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-04-211-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed typo
| * | Fixed typoXinchen Hui2012-04-211-1/+1
| | | | | | | | | | | | report by reeze.xia@gmail.com
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-04-211-67/+30
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: Improved performance while sending error page - BFN
| * | Improved performance while sending error pageXinchen Hui2012-04-211-67/+30
| | | | | | | | | | | | this also fixed bug #61785 (Memory leak when access a non-exists file without router)
* | | Merge branch 'PHP-5.4'Felipe Pena2012-04-191-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.4Felipe Pena2012-04-191-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 Pena2012-04-191-3/+4
| | | | | | | | | | | | set to null) patch by ab@php.net
| | * Fixed bug #61605 (header_remove() does not remove all headers)Xinchen Hui2012-04-041-0/+34
| | |
| | * Fixed bug #61043: Regression in magic_quotes_gpc fix (CVE-2012-0831)Gustavo André dos Santos Lopes2012-03-212-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-212-4/+8
| | | |
* | | | Merge branch 'PHP-5.4'Felipe Pena2012-04-191-1/+1
|\ \ \ \ | |/ / /
| * | | - Fixed expected test result (patch by ab@php.net in #61769)Felipe Pena2012-04-191-1/+1
| | | |
* | | | Merge branch 'PHP-5.4'Felipe Pena2012-04-191-1/+1
|\ \ \ \ | |/ / /
| * | | - Fix test titleFelipe Pena2012-04-191-1/+1
| | | |
* | | | Fix bug #61430 for trunkXinchen Hui2012-04-171-1/+1
| | | |
* | | | Merge branch 'PHP-5.4'Xinchen Hui2012-04-041-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 Hui2012-04-041-0/+34
| | | |
* | | | Merge branch 'PHP-5.4'David Soria Parra2012-03-211-0/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #61461 (missing checks around malloc() calls). Conflicts: NEWS
| * | | Fixed bug #61461 (missing checks around malloc() calls).Ilia Alshanetsky2012-03-201-0/+10
| | | |
* | | | Merge branch 'PHP-5.4'David Soria Parra2012-03-202-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.4David Soria Parra2012-03-202-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 filesDavid Soria Parra2012-03-202-2/+2
| | |/
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-03-201-0/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Minor change, test using php mail address as account
| * | Minor change, test using php mail address as accountXinchen Hui2012-03-201-0/+1
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-03-202-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: Use newdoc instead of escape char adapt makedist to git
| * | Use newdoc instead of escape charXinchen Hui2012-03-202-4/+4
| | |
| * | Merge branch '53' into 54Ilia Alshanetsky2012-03-191-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 Alshanetsky2012-03-191-1/+1
| | |
| | * Fixed bug #61172 (Add Apache 2.4 support)Christopher Jones2012-03-022-6/+20
| | |
| | * more verbose skip reason in test files with not so obvious extension ↵Olivier DOUCET2012-02-253-3/+3
| | | | | | | | | | | | requirements
| | * Yup, these need to be escaped. Good catch.Rasmus Lerdorf2012-02-211-1/+1
| | |
| | * Fix bug 61149Rasmus Lerdorf2012-02-201-1/+1
| | |