Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-14 | 1 | -2/+2 |
|\ | |||||
| * | Fix test - on CI somebody could create a process in the meantime | Stanislav Malyshev | 2014-04-14 | 1 | -2/+2 |
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-04-14 | 1 | -1/+7 |
|\ \ | |/ | |||||
| * | fix windows build | Anatol Belski | 2014-04-14 | 1 | -1/+7 |
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-14 | 2 | -24/+24 |
|\ \ | |/ | |||||
| * | Fix #66942: openssl_seal() memory leak | Chuan Ma | 2014-04-14 | 1 | -12/+12 |
| * | ws fix | Stanislav Malyshev | 2014-04-14 | 1 | -12/+12 |
| * | Fix null byte in LDAP bindings | Stanislav Malyshev | 2014-04-14 | 1 | -0/+10 |
| * | Fix bug #66171: better handling of symlinks | Stanislav Malyshev | 2014-04-14 | 1 | -17/+20 |
* | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 | Andrey Hristov | 2014-04-14 | 16 | -27/+1456 |
|\ \ | |||||
| * | | Fix null byte in LDAP bindings | Stanislav Malyshev | 2014-04-14 | 1 | -0/+10 |
| * | | Fix bug #66171: better handling of symlinks | Stanislav Malyshev | 2014-04-14 | 1 | -17/+20 |
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-04-14 | 14 | -10/+1426 |
| |\ \ | | |/ | |||||
| | * | backported some ext/intl tests from 5.6 into 5.4 | Anatol Belski | 2014-04-14 | 38 | -19/+3652 |
* | | | Add test | Andrey Hristov | 2014-04-14 | 1 | -0/+119 |
|/ / | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-13 | 2 | -8/+30 |
|\ \ | |/ | |||||
| * | Merge branch 'pull-request/518' into PHP-5.4 | Stanislav Malyshev | 2014-04-13 | 2 | -8/+30 |
| |\ | |||||
| | * | Fix #66021 (Blank line inside empty array/object) | Kevin Israel | 2013-11-02 | 2 | -8/+30 |
* | | | 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.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-13 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Fix #66562: Consistency bug where curl_multi_getcontent behaves different fro... | Freek | 2014-04-13 | 1 | -0/+2 |
* | | | 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.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-13 | 2 | -0/+15 |
|\ \ \ | |/ / | |||||
| * | | Fix bug #66721 | Boro Sitnikovski | 2014-04-13 | 2 | -0/+15 |
* | | | 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.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.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.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 |
* | | | Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3 | Anatol Belski | 2014-04-11 | 2 | -1848/+2495 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Popa Adrian Marius | 2014-04-10 | 20 | -39/+3 |
|\ \ \ | |/ / | |||||
| * | | Cleanup $ is not needed for git | Popa Adrian Marius | 2014-04-10 | 20 | -39/+3 |
* | | | 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 |
* | | | Don't test for specific non-zero substr_compare() return value | Tjerk Meesters | 2014-04-09 | 1 | -2/+2 |
* | | | fixed bug66702 : regexiterator's invert flag doesn't work as expected | Joshua Thijssen | 2014-04-09 | 2 | -1/+42 |
* | | | Fixed bug 67043 | Tjerk Meesters | 2014-04-09 | 2 | -5/+14 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Popa Adrian Marius | 2014-04-08 | 2 | -5/+5 |
|\ \ \ | |/ / | |||||
| * | | cleanup | Popa Adrian Marius | 2014-04-08 | 1 | -1/+1 |
| * | | Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced wi... | Popa Adrian Marius | 2014-04-08 | 1 | -4/+4 |
* | | | fixed the test for ICI >= 52.1 | Anatol Belski | 2014-04-07 | 2 | -1/+424 |
* | | | fix the test according to how new date code does it | Stanislav Malyshev | 2014-04-05 | 1 | -10/+10 |
* | | | fix to work on different ICU versions | Stanislav Malyshev | 2014-04-05 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-04-05 | 3 | -1/+86 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #66084 simplexml_load_string() mangles empty node name | Anatol Belski | 2014-04-05 | 3 | -1/+86 |