summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-08-011-0/+14
|\
| * Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-08-011-0/+14
| |\
| | * Test to cover the change in ce1a0d97Anatol Belski2017-08-011-0/+14
* | | fix testAnatol Belski2017-08-011-1/+1
* | | fix NULL derefAnatol Belski2017-08-011-2/+2
* | | Update NEWSXinchen Hui2017-07-311-0/+2
* | | Req #74963 (Improved error message on fetching property of non-object)Xinchen Hui2017-07-3121-628/+932
* | | Reduce EXIF test image sizes, there is still one large image left that I will...Kalle Sommer Nielsen2017-07-309-2/+2
* | | Lowercase the file extensionKalle Sommer Nielsen2017-07-301-0/+0
* | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-07-302-2/+24
|\ \ \ | |/ /
| * | remove dup of the binary file, rely on a test runtime copy insteadAnatol Belski2017-07-302-2/+24
* | | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2017-07-302-3/+3
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2017-07-302-3/+3
| |\ \ | | |/
| | * Shrink another large imageChristoph M. Becker2017-07-302-3/+3
* | | Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2Frank Denis2017-07-301-0/+0
|\ \ \
| * \ \ Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2017-07-301-0/+0
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2017-07-301-0/+0
| | |\ \ | | | |/
| | | * Shrink test imageChristoph M. Becker2017-07-301-0/+0
* | | | sodium ext: skip scrypt if it is not availableFrank Denis2017-07-302-5/+9
* | | | sodium ext: fix tests/pwhash_argon2i descriptionFrank Denis2017-07-301-1/+1
* | | | sodium ext: check hash length for scryptFrank Denis2017-07-301-1/+1
|/ / /
* | | Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2Frank Denis2017-07-303-3/+3
|\ \ \
| * | | It's `--SKIPIF--`, not `--SKIP--`Christoph M. Becker2017-07-303-3/+3
* | | | sodium ext: no need for #ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTESFrank Denis2017-07-301-2/+0
* | | | sodium ext: check that message sizes are safe, to avoid hitting abort() in li...Frank Denis2017-07-301-28/+43
* | | | sodium ext: use unexpand -t 4 --first-only to convert from spaces to tabsFrank Denis2017-07-301-281/+281
|/ / /
* | | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2017-07-301-0/+4
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2017-07-301-0/+4
| |\ \ | | |/
| | * Skip this test if ext/gd is not availableChristoph M. Becker2017-07-301-0/+4
* | | sodium ext: let crypto_pwhash() accept an optional algorithm identifierFrank Denis2017-07-292-4/+31
* | | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2017-07-283-2/+14
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-07-283-2/+14
| |\ \ | | |/
| | * Fixed bug #62934Nikita Popov2017-07-283-2/+14
* | | add missing makefile fragment for .w32Anatol Belski2017-07-282-0/+7
* | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-07-281-12/+13
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-07-281-12/+13
| |\ \ | | |/
| | * relax test on travisAnatol Belski2017-07-281-12/+13
* | | Merge branch 'PHP-7.1' into PHP-7.2Sara Golemon2017-07-272-21/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Sara Golemon2017-07-272-21/+1
| |\ \ | | |/
| | * Simpler fix for #74974Pedro Magalhães2017-07-272-21/+1
* | | Merge branch 'PHP-7.1' into PHP-7.2Xinchen Hui2017-07-271-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-07-271-1/+1
| |\ \ | | |/
| | * Fixed testXinchen Hui2017-07-271-1/+1
* | | Merge branch 'PHP-7.1' into PHP-7.2Xinchen Hui2017-07-272-1/+40
|\ \ \ | |/ /
| * | Update NEWSXinchen Hui2017-07-271-0/+3
| * | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-07-272-1/+40
| |\ \ | | |/
| | * Fixed bug #74949 (null pointer dereference in _function_string)Xinchen Hui2017-07-273-1/+43
* | | Update NEWSXinchen Hui2017-07-271-0/+3
* | | Merge branch 'PHP-7.1' into PHP-7.2Sara Golemon2017-07-263-21/+97
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Sara Golemon2017-07-263-21/+97
| |\ \ | | |/