Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-7.0' | Julien Pauli | 2016-02-02 | 2 | -3/+23 |
|\ | |||||
| * | Merge branch 'PHP-5.6' into PHP-7.0 | Julien Pauli | 2016-02-02 | 2 | -3/+23 |
| |\ | |||||
| | * | Fix #70720 | Julien Pauli | 2016-02-02 | 2 | -4/+9 |
| | * | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2016-02-02 | 1 | -0/+11 |
| | |\ | |||||
| | | * | add error check to sysconf call | Anatol Belski | 2016-02-02 | 1 | -0/+11 |
* | | | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-02-02 | 1 | -0/+11 |
|\ \ \ \ | |/ / / | |||||
| * | | | reapply the sysconf error check patch | Anatol Belski | 2016-02-02 | 1 | -0/+11 |
* | | | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-02-02 | 2 | -6/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | fix dir separator | Anatol Belski | 2016-02-02 | 2 | -6/+6 |
* | | | | Merge branch 'PHP-7.0' | Stanislav Malyshev | 2016-02-01 | 30 | -291/+461 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-7.0.3' into PHP-7.0 | Stanislav Malyshev | 2016-02-01 | 30 | -291/+461 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'PHP-5.6.18' into PHP-7.0.3 | Stanislav Malyshev | 2016-02-01 | 18 | -246/+287 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'PHP-5.5' into PHP-5.6.18 | Stanislav Malyshev | 2016-02-01 | 2 | -34/+34 |
| | | |\ \ | | | | |/ | |||||
| | | | * | fix tests | Stanislav Malyshev | 2016-02-01 | 2 | -34/+34 |
| | | * | | Merge branch 'PHP-5.5.32' into PHP-5.6.18 | Stanislav Malyshev | 2016-02-01 | 22 | -219/+376 |
| | | |\ \ | | | | |/ | |||||
| | | | * | add missing headers for SIZE_MAX | Anatol Belski | 2016-01-28 | 1 | -0/+9 |
| | | | * | backport the escapeshell* functions hardening branch | Anatol Belski | 2016-01-28 | 3 | -5/+73 |
| | | | * | add tests | Anatol Belski | 2016-01-28 | 4 | -0/+44 |
| | | | * | Fix bug #71459 - Integer overflow in iptcembed() | Stanislav Malyshev | 2016-01-26 | 1 | -1/+6 |
| | | | * | Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input | Stanislav Malyshev | 2016-01-16 | 14 | -213/+244 |
| | * | | | Merge remote-tracking branch 'origin/PHP-7.0.3' into PHP-7.0.3 | Stanislav Malyshev | 2016-02-01 | 5 | -19/+82 |
| | |\ \ \ | |||||
| | | * | | | Revert "Fix #70720" | Anatol Belski | 2016-01-29 | 2 | -16/+1 |
| | | * | | | improve fix for bug #71201php-7.0.3RC1 | Anatol Belski | 2016-01-20 | 1 | -3/+9 |
| | * | | | | Merge branch 'escapeshell_hardened_70' into PHP-7.0.3 | Anatol Belski | 2016-01-28 | 7 | -5/+105 |
| | |\ \ \ \ | |||||
| | | * | | | | extend _SC_ARG_MAX usage onto platforms where it's available | Anatol Belski | 2016-01-28 | 1 | -2/+2 |
| | | * | | | | Fixed bug #71039 exec functions ignore length but look for NULL termination | Anatol Belski | 2016-01-12 | 3 | -0/+28 |
| | | * | | | | Follow up on bug #71270 | Anatol Belski | 2016-01-12 | 5 | -5/+77 |
| | * | | | | | Fix bug #71459 - Integer overflow in iptcembed() | Stanislav Malyshev | 2016-01-26 | 1 | -1/+6 |
| | * | | | | | Fix bug #71313 - Use-after-free vulnerability in SPL(SplObjectStorage, unseri... | Stanislav Malyshev | 2016-01-17 | 1 | -0/+14 |
| | * | | | | | Fixed bug #71311: Use-after-free vulnerability in SPL(ArrayObject, unserialize) | Stanislav Malyshev | 2016-01-17 | 3 | -27/+52 |
| | |/ / / / | |||||
| * | | | | | use correct pointer in the math | Antony Dovgal | 2016-02-01 | 1 | -1/+1 |
* | | | | | | use correct pointer in the math | Antony Dovgal | 2016-02-01 | 1 | -1/+1 |
* | | | | | | Remove HAVE_SPL checks | Nikita Popov | 2016-01-30 | 1 | -6/+0 |
* | | | | | | Use special type IS_ERROR instread of EG(error_zval). (we still need EG(error... | Dmitry Stogov | 2016-01-28 | 1 | -1/+2 |
* | | | | | | Merge branch 'PHP-7.0' | Stanislav Malyshev | 2016-01-26 | 1 | -14/+26 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Use safe alloc functions when calculations are made on sizes. | Stanislav Malyshev | 2016-01-26 | 1 | -14/+26 |
* | | | | | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-01-26 | 2 | -5/+7 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled) | Xinchen Hui | 2016-01-26 | 2 | -5/+7 |
* | | | | | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-01-25 | 2 | -2/+39 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fixed bug #71442 (forward_static_call crash) | Xinchen Hui | 2016-01-25 | 2 | -2/+39 |
* | | | | | | Merge branch 'PHP-7.0' | Remi Collet | 2016-01-20 | 1 | -4/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'PHP-5.6' into PHP-7.0 | Remi Collet | 2016-01-20 | 1 | -4/+4 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) | Remi Collet | 2016-01-20 | 1 | -4/+4 |
| | * | | | | improve fix for bug #71201 | Anatol Belski | 2016-01-20 | 1 | -3/+9 |
* | | | | | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-01-20 | 1 | -3/+9 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | improve fix for bug #71201 | Anatol Belski | 2016-01-20 | 1 | -3/+9 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-01-18 | 1 | -0/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | fix test for 7.0, OpenSSL >= 1.0.2 disables SSLv2 by default | Anatol Belski | 2016-01-18 | 1 | -0/+2 |
* | | | | | Merge branch 'PHP-7.0' | Anatol Belski | 2016-01-18 | 2 | -0/+70 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2016-01-18 | 2 | -0/+70 |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | |