summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* PHP 5.5.0 Alpha 4php-5.5.0alpha4David Soria Parra2013-01-222-3/+3
* NEWS for PHP 5.5.0alpha4David Soria Parra2013-01-221-1/+1
* Fix NEWSDavid Soria Parra2013-01-221-21/+23
* Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Stanislav Malyshev2013-01-2217-39/+288
|\
| * Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-01-212-31/+37
| |\
| | * Merge fix of #62836 to ?.re, and regenerate ?.cXinchen Hui2013-01-212-31/+37
| * | Fixed bug #64007 (There is an ability to create instance of Generator by hand).Xinchen Hui2013-01-193-8/+29
| * | - Fixed ZTS buildFelipe Pena2013-01-181-1/+1
| * | Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5Lars Strojny2013-01-192-0/+84
| |\ \
| * | | Class Name Resolution As Scalar Via "class" KeywordLars Strojny2013-01-1913-0/+222
* | | | fix testsStanislav Malyshev2013-01-221-3/+3
| |/ / |/| |
* | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Stanislav Malyshev2013-01-1836-130/+416
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Gustavo Lopes2013-01-182-2/+123
| |\ \
| * | | Fixed bug #63988 (Two Date tests fail) only for PHP-5.5Xinchen Hui2013-01-181-7/+17
| * | | Merge remote-tracking branch 'cataphract/zpp_improv' into PHP-5.5Gustavo Lopes2013-01-163-17/+63
| |\ \ \
| | * | | Update README.PARAMETER_PARSING_APIGustavo Lopes2013-01-091-3/+18
| | * | | Export zend_parse_parameter()Gustavo Lopes2013-01-092-2/+2
| | * | | Expose zend_parse_arg() as zend_parse_parameter()Gustavo André dos Santos Lopes2012-07-182-0/+15
| | * | | zend_parse_parameters: allow ! for non pointersGustavo André dos Santos Lopes2012-07-181-14/+30
| * | | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-01-162-1/+4
| |\ \ \ \
| * | | | | - Fixed ZTS buildFelipe Pena2013-01-151-10/+10
| * | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2013-01-151-1/+5
| |\ \ \ \ \
| * | | | | | Dereferencing process-handles no longer waits on those processes.Jille Timmermans2013-01-154-5/+24
| * | | | | | Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5Gustavo Lopes2013-01-154-90/+332
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'strtr_wu94_54' into strtr_wu94_55Gustavo Lopes2013-01-151-2/+2
| | |\ \ \ \ \ \
| | * | | | | | | UPGRADING.INTERNALS: document zend_qsort_rGustavo Lopes2013-01-141-0/+11
| | * | | | | | | Add zend_qsort_r & use it in strtrGustavo Lopes2013-01-143-61/+19
| | * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Gustavo Lopes2013-01-141-87/+360
| | |\ \ \ \ \ \ \
| | | * | | | | | | NEWS for bug #63893Gustavo Lopes2013-01-141-0/+2
| * | | | | | | | | revert change. now it doesn't compile again...someone should fix ext/date...Andrey Hristov2013-01-151-1/+1
| * | | | | | | | | Use two dtors thus allow allocation based on the alloc model of theAndrey Hristov2013-01-152-6/+20
| * | | | | | | | | plug a leak - forgot ot use the dtor already writtenAndrey Hristov2013-01-151-1/+2
| * | | | | | | | | Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5Andrey Hristov2013-01-150-0/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."Adam Harvey2013-01-151-5/+5
| | * | | | | | | | | Revert "Update fputcsv() to escape all characters equally."Adam Harvey2013-01-153-27/+11
| * | | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-01-154-32/+16
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5Andrey Hristov2013-01-1546-123/+1147
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug #62489: dba_insert not working as expectedLars Strojny2013-01-1517-22/+83
| * | | | | | | | | | | Add support for connect attributes, as of MySQL 5.6Andrey Hristov2013-01-158-8/+171
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-1810-122/+588
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2013-01-183-1/+87
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | fix bug #63462 (Magic methods called twice for unset protected properties)Stanislav Malyshev2013-01-183-0/+86
| * | | | | | | | | NEWS for bug #64011. See 77ee200Gustavo Lopes2013-01-181-0/+2
| * | | | | | | | | Fix bug #64011 (get_html_translation_table())Gustavo Lopes2013-01-182-2/+123
| * | | | | | | | | Fix NewsChristopher Jones2013-01-151-3/+5
| | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'PHP-5.3' into PHP-5.4Adam Harvey2013-01-162-1/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Update the arguments in the prototype of fpm_socket_unix_test_connect().Adam Harvey2013-01-162-1/+4
| * | | | | | | fixed buildAnatoliy Belsky2013-01-151-1/+5
| * | | | | | | NEWS for bug #63893Gustavo Lopes2013-01-151-0/+2
| * | | | | | | Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_54' into PHP-5.4Gustavo Lopes2013-01-151-87/+360
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |