summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Derick Rethans2014-01-266-12/+84
|\
| * Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2014-01-266-12/+84
| |\
| | * Merge branch '45543-timezone-set' into PHP-5.4Derick Rethans2014-01-266-12/+84
| | |\
| | | * Fixed bug #45543: DateTime::setTimezone can not set timezones without ID.Derick Rethans2014-01-266-12/+84
| | |/
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-01-251-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-01-251-2/+2
| |\ \ | | |/
| | * fix test bug62479.phptStanislav Malyshev2014-01-251-2/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-01-254-0/+588
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-01-256-0/+595
| |\ \ | | |/
| | * Merge branch 'pull-request/571' into PHP-5.4Stanislav Malyshev2014-01-256-1/+594
| | |\
| | | * Implement ldap_modify_batch.Ondřej Hošek2014-01-224-0/+588
* | | | Merge branch 'PHP-5.5' into PHP-5.6Derick Rethans2014-01-254-44/+56
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2014-01-254-44/+56
| |\ \ \ | | |/ /
| | * | Merge branch '44780-fallback' into PHP-5.4Derick Rethans2014-01-254-44/+56
| | |\ \
| | | * | Fixed bug #44780: some time zone offsets not recognized by timezone_name_from...Derick Rethans2014-01-254-44/+56
| | |/ /
* | | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-01-241-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-01-241-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.3' into PHP-5.4Ferenc Kovacs2014-01-241-2/+2
| | |\ \
| | | * | fix the primary qa email address and update the list of available people bein...Ferenc Kovacs2014-01-241-2/+2
| | | * | Revert "Fix #62479: Some chars not parsed in passwords"Will Fitch2014-01-193-88/+2
| | | * | Fix #62479: Some chars not parsed in passwordsWill Fitch2014-01-183-2/+88
* | | | | WSAndrey Hristov2014-01-241-5/+5
* | | | | Reduce code duplication a bitAndrey Hristov2014-01-241-10/+4
* | | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Andrey Hristov2014-01-244-2/+7
|\ \ \ \ \
| * | | | | Fixed warning "No new line at end of file"Xinchen Hui2014-01-242-2/+2
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6Will Fitch2014-01-232-0/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'PHP-5.4' into PHP-5.5Will Fitch2014-01-232-0/+5
| | |\ \ \ \ | | | |/ / /
| | | * | | Update gitignore and Makefile for additional entriesWill Fitch2014-01-232-0/+5
| | | | |/ | | | |/|
* | | | | Backport refactoring from php-srcAndrey Hristov2014-01-242-148/+193
|/ / / /
* | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-01-221-0/+1
|\ \ \ \ | |/ / /
| * | | refixed that test for 5.5+Anatol Belski2014-01-221-0/+1
| * | | 5.5.10 nextJulien Pauli2014-01-221-0/+2
* | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-01-221-1/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-01-221-1/+0
| |\ \ \ | | |/ /
| | * | fixed testAnatol Belski2014-01-221-1/+0
* | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-01-221-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-01-221-2/+2
| |\ \ \ | | |/ /
| | * | fix ztsAnatol Belski2014-01-221-2/+2
* | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-01-221-0/+3
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-01-222-0/+5
| |\ \ \ | | |/ /
| | * | fixed missing usleep() prototype in pgsqlAnatol Belski2014-01-222-0/+5
* | | | Merge branch 'PHP-5.5' into PHP-5.6Yasuo Ohgaki2014-01-221-1/+45
|\ \ \ \ | |/ / /
| * | | Fixed previous commit may delete unwanted cookies.Yasuo Ohgaki2014-01-221-1/+45
| |\ \ \ | | |/ /
| | * | Fixed previous commit may delete unwanted cookies. Sync tests from upper bran...Yasuo Ohgaki2014-01-224-6/+52
| | * | Re-fixed bug #66469Yasuo Ohgaki2014-01-226-13/+14
* | | | Merge branch 'PHP-5.5' into PHP-5.6Yasuo Ohgaki2014-01-223-3/+3
|\ \ \ \ | |/ / /
| * | | Re-fixed bug #66469Yasuo Ohgaki2014-01-223-3/+3
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-01-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-01-210-0/+0
| |\ \ \ | | |/ /
| | * | fix CVE ref for bug #66060Stanislav Malyshev2014-01-211-1/+2