Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2017-08-01 | 1 | -0/+14 |
|\ | |||||
| * | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-08-01 | 1 | -0/+14 |
| |\ | |||||
| | * | Test to cover the change in ce1a0d97 | Anatol Belski | 2017-08-01 | 1 | -0/+14 |
* | | | fix test | Anatol Belski | 2017-08-01 | 1 | -1/+1 |
* | | | fix NULL deref | Anatol Belski | 2017-08-01 | 1 | -2/+2 |
* | | | Update NEWS | Xinchen Hui | 2017-07-31 | 1 | -0/+2 |
* | | | Req #74963 (Improved error message on fetching property of non-object) | Xinchen Hui | 2017-07-31 | 21 | -628/+932 |
* | | | Reduce EXIF test image sizes, there is still one large image left that I will... | Kalle Sommer Nielsen | 2017-07-30 | 9 | -2/+2 |
* | | | Lowercase the file extension | Kalle Sommer Nielsen | 2017-07-30 | 1 | -0/+0 |
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2017-07-30 | 2 | -2/+24 |
|\ \ \ | |/ / | |||||
| * | | remove dup of the binary file, rely on a test runtime copy instead | Anatol Belski | 2017-07-30 | 2 | -2/+24 |
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Christoph M. Becker | 2017-07-30 | 2 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2017-07-30 | 2 | -3/+3 |
| |\ \ | | |/ | |||||
| | * | Shrink another large image | Christoph M. Becker | 2017-07-30 | 2 | -3/+3 |
* | | | Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2 | Frank Denis | 2017-07-30 | 1 | -0/+0 |
|\ \ \ | |||||
| * \ \ | Merge branch 'PHP-7.1' into PHP-7.2 | Christoph M. Becker | 2017-07-30 | 1 | -0/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2017-07-30 | 1 | -0/+0 |
| | |\ \ | | | |/ | |||||
| | | * | Shrink test image | Christoph M. Becker | 2017-07-30 | 1 | -0/+0 |
* | | | | sodium ext: skip scrypt if it is not available | Frank Denis | 2017-07-30 | 2 | -5/+9 |
* | | | | sodium ext: fix tests/pwhash_argon2i description | Frank Denis | 2017-07-30 | 1 | -1/+1 |
* | | | | sodium ext: check hash length for scrypt | Frank Denis | 2017-07-30 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2 | Frank Denis | 2017-07-30 | 3 | -3/+3 |
|\ \ \ | |||||
| * | | | It's `--SKIPIF--`, not `--SKIP--` | Christoph M. Becker | 2017-07-30 | 3 | -3/+3 |
* | | | | sodium ext: no need for #ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTES | Frank Denis | 2017-07-30 | 1 | -2/+0 |
* | | | | sodium ext: check that message sizes are safe, to avoid hitting abort() in li... | Frank Denis | 2017-07-30 | 1 | -28/+43 |
* | | | | sodium ext: use unexpand -t 4 --first-only to convert from spaces to tabs | Frank Denis | 2017-07-30 | 1 | -281/+281 |
|/ / / | |||||
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Christoph M. Becker | 2017-07-30 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Christoph M. Becker | 2017-07-30 | 1 | -0/+4 |
| |\ \ | | |/ | |||||
| | * | Skip this test if ext/gd is not available | Christoph M. Becker | 2017-07-30 | 1 | -0/+4 |
* | | | sodium ext: let crypto_pwhash() accept an optional algorithm identifier | Frank Denis | 2017-07-29 | 2 | -4/+31 |
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Nikita Popov | 2017-07-28 | 3 | -2/+14 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-07-28 | 3 | -2/+14 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #62934 | Nikita Popov | 2017-07-28 | 3 | -2/+14 |
* | | | add missing makefile fragment for .w32 | Anatol Belski | 2017-07-28 | 2 | -0/+7 |
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Anatol Belski | 2017-07-28 | 1 | -12/+13 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-07-28 | 1 | -12/+13 |
| |\ \ | | |/ | |||||
| | * | relax test on travis | Anatol Belski | 2017-07-28 | 1 | -12/+13 |
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Sara Golemon | 2017-07-27 | 2 | -21/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Sara Golemon | 2017-07-27 | 2 | -21/+1 |
| |\ \ | | |/ | |||||
| | * | Simpler fix for #74974 | Pedro Magalhães | 2017-07-27 | 2 | -21/+1 |
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Xinchen Hui | 2017-07-27 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Xinchen Hui | 2017-07-27 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fixed test | Xinchen Hui | 2017-07-27 | 1 | -1/+1 |
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Xinchen Hui | 2017-07-27 | 2 | -1/+40 |
|\ \ \ | |/ / | |||||
| * | | Update NEWS | Xinchen Hui | 2017-07-27 | 1 | -0/+3 |
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Xinchen Hui | 2017-07-27 | 2 | -1/+40 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #74949 (null pointer dereference in _function_string) | Xinchen Hui | 2017-07-27 | 3 | -1/+43 |
* | | | Update NEWS | Xinchen Hui | 2017-07-27 | 1 | -0/+3 |
* | | | Merge branch 'PHP-7.1' into PHP-7.2 | Sara Golemon | 2017-07-26 | 3 | -21/+97 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Sara Golemon | 2017-07-26 | 3 | -21/+97 |
| |\ \ | | |/ |