summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_back...str_size_and_int64_56_backportAnatol Belski2014-08-046-13/+121
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-041-0/+8
| |\
| | * Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-041-0/+8
| | |\
| | | * backport the fix for bug #67739Anatol Belski2014-08-041-0/+8
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-08-040-0/+0
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-041-0/+35
| | |\ \ | | | |/
| | | * add testStanislav Malyshev2014-08-041-0/+35
| | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-044-21/+76
| | |\ \ | | | |/
| | | * Fix bug #67705 (extensive backtracking in rule regular expression)Stanislav Malyshev2014-08-044-21/+76
| * | | Fix bug #67705 (extensive backtracking in rule regular expression)Stanislav Malyshev2014-08-045-13/+113
* | | | fix macroAnatol Belski2014-08-041-1/+1
* | | | Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_back...Anatol Belski2014-08-0440-11708/+12140
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-07-311-1/+1
| |\ \ \ | | |/ /
| | * | Fix wrong lenght sizeAndrey Hristov2014-07-311-1/+1
| * | | Merge branch 'PHP-5.5' into PHP-5.6Peter Cowburn2014-07-312-11514/+11512
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Peter Cowburn2014-07-312-11514/+11512
| | |\ \ | | | |/
| | | * Merge branch 'pull-request/754' into PHP-5.4Peter Cowburn2014-07-312-11514/+11512
| | | |\
| | | | * Bug #51096 - Remove unnecessary ? for first/last day ofPeter Cowburn2014-07-312-11514/+11512
| | | |/
| * | | Moved streams related functions to xp_ssl.cTjerk Meesters2014-07-312-57/+57
| * | | Remove duplicate NEWSKeyur Govande2014-07-301-4/+0
| * | | Merge branch 'PHP-5.5' into PHP-5.6Keyur Govande2014-07-300-0/+0
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Keyur Govande2014-07-300-0/+0
| | |\ \ | | | |/
| | | * Update NEWSKeyur Govande2014-07-301-0/+4
| | * | Update NEWSKeyur Govande2014-07-301-0/+4
| * | | Update NEWSKeyur Govande2014-07-301-0/+4
| * | | BFNMichael Wallner2014-07-301-1/+4
| * | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-07-303-6/+10
| |\ \ \ | | |/ /
| | * | BFNMichael Wallner2014-07-301-0/+3
| | * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-07-303-6/+10
| | |\ \ | | | |/
| | | * Fixed bug #67715 (php-milter does not build and crashes randomly).Michael Wallner2014-07-304-6/+13
| | * | Merge commit '8b9719d' into PHP-5.5Rasmus Lerdorf2014-07-301-0/+3
| | |\ \ | | | |/
| * | | Merge commit '8b9719d' into PHP-5.6Rasmus Lerdorf2014-07-301-0/+3
| |\ \ \ | | | |/ | | |/|
| | * | We need to turn off any strict mode here for this warning to show upRasmus Lerdorf2014-07-301-0/+3
| * | | Disable restrictions regarding arrays in constants at run-time.Bob Weinand2014-07-308-32/+65
| * | | Revert "Fix bug #67064 in a BC safe way"Bob Weinand2014-07-303-22/+5
| * | | Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-07-303-1/+29
| |\ \ \ | | | |/ | | |/|
| | * | Updated NEWS for #67693Tjerk Meesters2014-07-301-0/+3
| | * | Merge branch 'PHP-5.4' into PHP-5.5Tjerk Meesters2014-07-302-1/+26
| | |\ \ | | | |/
| | | * Updated NEWS for #67693Tjerk Meesters2014-07-301-0/+3
| | | * Fixed bug #67693 - incorrect push to the empty arrayTjerk Meesters2014-07-302-1/+26
| * | | add missing entry to NEWSFerenc Kovacs2014-07-301-0/+4
| * | | add missing entries to NEWSFerenc Kovacs2014-07-301-0/+6
| * | | add NEWS block for the next RCFerenc Kovacs2014-07-301-1/+3
| * | | NEWS entry for #67713Ferenc Kovacs2014-07-301-0/+4
| * | | Merge branch 'newInstanceWithoutConstructor' into PHP-5.6Ferenc Kovacs2014-07-303-4/+9
| |\ \ \
| | * | | update the exception message to better match the actual checkFerenc Kovacs2014-07-303-3/+3
| | * | | ReflectionClass::newInstanceWithoutConstructor() should be allowed to instant...Ferenc Kovacs2014-07-303-4/+9
| |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2014-07-301-1/+4
| |\ \ \ | | |/ /
| | * | Fixed usage after freeDmitry Stogov2014-07-301-1/+4
| * | | Merge branch 'PHP-5.5' into PHP-5.6Keyur Govande2014-07-305-26/+121
| |\ \ \ | | |/ /