Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.6.6RC1php-5.6.6RC1 | Julien Pauli | 2015-02-04 | 3 | -4/+4 |
* | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2015-02-04 | 3 | -19/+2 |
|\ | |||||
| * | Revert "json_decode() should generate a syntax error when given ""." | Julien Pauli | 2015-02-04 | 3 | -19/+2 |
| * | Update NEWS | Yasuo Ohgaki | 2015-02-03 | 1 | -0/+5 |
* | | make buildconf work as expected; | Michael Wallner | 2015-02-04 | 1 | -1/+2 |
* | | Fixed indent | Xinchen Hui | 2015-02-03 | 1 | -1/+1 |
* | | Update NEWS | Yasuo Ohgaki | 2015-02-03 | 1 | -0/+7 |
* | | Fixed Bug #67988 htmlspecialchars() does not respect default_charset specifie... | Yasuo Ohgaki | 2015-02-03 | 3 | -14/+35 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Yasuo Ohgaki | 2015-02-03 | 2 | -10/+66 |
|\ \ | |/ | |||||
| * | Fixed Bug #65199 pg_copy_from() modifies input array variable | Yasuo Ohgaki | 2015-02-03 | 2 | -10/+66 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Yasuo Ohgaki | 2015-02-03 | 1 | -2/+5 |
|\ \ | |/ | |||||
| * | Fixed Bug #66623 no EINTR check on flock(LOCK_EX) | Yasuo Ohgaki | 2015-02-03 | 1 | -2/+5 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Yasuo Ohgaki | 2015-02-03 | 2 | -0/+25 |
|\ \ | |/ | |||||
| * | Fixed bug #68063 Empty session IDs do still start sessions | Yasuo Ohgaki | 2015-02-03 | 2 | -0/+25 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Yasuo Ohgaki | 2015-02-03 | 1 | -21/+0 |
|\ \ | |/ | |||||
| * | Bug #61470 is fixed only in master | Yasuo Ohgaki | 2015-02-03 | 1 | -21/+0 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Daniel Lowrey | 2015-02-02 | 3 | -0/+34 |
|\ \ | |/ | |||||
| * | Fixed bug #65272: correctly set flock() out param in windows | Daniel Lowrey | 2015-02-02 | 3 | -0/+34 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2015-02-02 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Let's not assume bash is always /bin/bash. | Adam Harvey | 2015-02-02 | 1 | -2/+2 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2015-02-02 | 4 | -2/+23 |
|\ \ | |/ | |||||
| * | json_decode() should generate a syntax error when given "". | Adam Harvey | 2015-02-02 | 4 | -2/+23 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Yasuo Ohgaki | 2015-02-02 | 1 | -0/+21 |
|\ \ | |/ | |||||
| * | Add test for bug #61470. It is already fixed. | Yasuo Ohgaki | 2015-02-02 | 1 | -0/+21 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-02-01 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 | Stanislav Malyshev | 2015-02-01 | 1 | -17289/+17211 |
| |\ | |||||
| * \ | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-02-01 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | fix sizeof size | Stanislav Malyshev | 2015-02-01 | 1 | -1/+1 |
* | | | | - Updated to version 2015.1 (2015a) | Derick Rethans | 2015-02-01 | 1 | -17289/+17211 |
* | | | | Empty merge | Derick Rethans | 2015-02-01 | 0 | -0/+0 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | - Updated to version 2015.1 (2015a) | Derick Rethans | 2015-02-01 | 1 | -17289/+17211 |
| |/ / | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-02-01 | 2 | -2/+5 |
|\ \ \ | |/ / | |||||
| * | | Fix #66479: Wrong response to FCGI_GET_VALUES | Frank Stolle | 2015-02-01 | 2 | -2/+5 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-02-01 | 2 | -0/+10 |
|\ \ \ | |/ / | |||||
| * | | Fix bug #64938: libxml_disable_entity_loader setting is shared between threads | Martin Jansen | 2015-02-01 | 2 | -0/+10 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | fix group name handling | Stanislav Malyshev | 2015-01-31 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-01-31 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | fix TSRM | Stanislav Malyshev | 2015-01-31 | 1 | -2/+2 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | add NEWS | Stanislav Malyshev | 2015-01-31 | 1 | -0/+2 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 2 | -0/+19 |
|\ \ \ | |/ / | |||||
| * | | Added test and possible fix for https://bugs.php.net/bug.php?id=67068 | Danack | 2015-01-31 | 2 | -0/+19 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 7 | -18/+18 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-01-31 | 7 | -18/+18 |
| |\ \ | | |/ | |||||
| | * | Use better constant since MAXHOSTNAMELEN may mean shorter name | Stanislav Malyshev | 2015-01-31 | 5 | -12/+16 |
| | * | use right sizeof for memset | Stanislav Malyshev | 2015-01-31 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 7 | -5/+50 |
|\ \ \ | |/ / | |||||
| * | | Add mitigation for CVE-2015-0235 (bug #68925) | Stanislav Malyshev | 2015-01-31 | 4 | -3/+9 |