Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-25 | 12 | -44/+20 |
|\ | |||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-24 | 12 | -44/+20 |
| |\ | |||||
| | * | add a test case previously broken by a bad fix | Stanislav Malyshev | 2014-04-24 | 10 | -0/+16 |
| | * | Revert "Fixed bug #64604" | Stanislav Malyshev | 2014-04-24 | 2 | -44/+4 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-20 | 2 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-20 | 2 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fix a compiler warning in php_rand.h | Rouven Weßling | 2014-04-20 | 2 | -1/+1 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-20 | 2 | -1/+31 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-20 | 2 | -1/+31 |
| |\ \ | | |/ | |||||
| | * | Fix bug #65701: Do not use cache for file file copy | Boro Sitnikovski | 2014-04-20 | 2 | -1/+31 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-04-18 | 4 | -44/+50 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-04-18 | 4 | -44/+50 |
| |\ \ | | |/ | |||||
| | * | Improved the fix for bug #67072, thanks Nikita | Anatol Belski | 2014-04-18 | 4 | -44/+50 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-04-17 | 4 | -34/+66 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-04-17 | 4 | -34/+66 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #67072 Echoing unserialized "SplFileObject" crash | Anatol Belski | 2014-04-17 | 4 | -34/+66 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-13 | 2 | -4/+44 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-13 | 2 | -4/+44 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #64604 | Ingo Walz | 2014-04-13 | 2 | -4/+44 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-13 | 1 | -0/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-13 | 1 | -0/+3 |
| |\ \ | | |/ | |||||
| | * | Fix windows build | Stanislav Malyshev | 2014-04-13 | 1 | -0/+3 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-13 | 4 | -2/+20 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-13 | 4 | -2/+20 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #67024 - getimagesize should recognize BMP files with negative height | Gabor Buella | 2014-04-13 | 4 | -2/+20 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Bob Weinand | 2014-04-14 | 2 | -5/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Bob Weinand | 2014-04-13 | 2 | -21/+1 |
| |\ \ | | |/ | |||||
| | * | Reverted to 5a0da281e5a9fa02db18b4822d8b103c65849fa9 | Bob Weinand | 2014-04-13 | 2 | -21/+1 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Bob Weinand | 2014-04-13 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Bob Weinand | 2014-04-13 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Forgot title in phpt for bug #67064 | Bob Weinand | 2014-04-13 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Bob Weinand | 2014-04-13 | 2 | -1/+21 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Bob Weinand | 2014-04-13 | 2 | -1/+21 |
| |\ \ | | |/ | |||||
| | * | Fix bug #67064 in a BC safe way | Bob Weinand | 2014-04-13 | 2 | -1/+21 |
* | | | Fix bug #66568: the second arg for unserialize is optional. | Ferenc Kovacs | 2014-04-13 | 1 | -1/+1 |
* | | | Shut up, my lovely compiler; I do not like your warnings | Bob Weinand | 2014-04-11 | 1 | -5/+0 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2014-04-09 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2014-04-09 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | abstract namespace for unix sockets is a linux only feature | Ferenc Kovacs | 2014-04-09 | 1 | -0/+1 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Tjerk Meesters | 2014-04-09 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Don't test for specific non-zero substr_compare() return value | Tjerk Meesters | 2014-04-09 | 1 | -2/+2 |
* | | | Add only_integer_keys option to zend_hash_reindex | Nikita Popov | 2014-04-09 | 1 | -17/+3 |
* | | | Don't always separate splice replacement array | Nikita Popov | 2014-04-09 | 1 | -5/+5 |
* | | | Add zend_hash_splice | Nikita Popov | 2014-04-09 | 2 | -143/+30 |
* | | | Add zend_hash_reindex | Nikita Popov | 2014-04-09 | 1 | -18/+1 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Tjerk Meesters | 2014-04-09 | 2 | -5/+14 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug 67043 | Tjerk Meesters | 2014-04-09 | 2 | -5/+14 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Michael Wallner | 2014-04-03 | 1 | -0/+5 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Michael Wallner | 2014-04-03 | 1 | -0/+5 |
| |\ \ | | |/ | |||||
| | * | Fix bug #66182 exit in stream filter produces segfault | Michael Wallner | 2014-04-03 | 1 | -0/+5 |