diff options
| author | Frank Denis <github@pureftpd.org> | 2018-10-14 11:01:53 +0200 |
|---|---|---|
| committer | Frank Denis <github@pureftpd.org> | 2018-10-14 11:01:53 +0200 |
| commit | c4ea98455db3c7c56a7d00d15418fea4f18cc27b (patch) | |
| tree | 772502693ec2ce6407b8335069dfdfcdfd84b2a7 /ext/json/php_json_parser.h | |
| parent | 1670c4679dc414cf83371de85f8cc5083de21414 (diff) | |
| parent | 5d70165f632d8857f2e75975d5857fa29a68f3fc (diff) | |
| download | php-git-c4ea98455db3c7c56a7d00d15418fea4f18cc27b.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
ext/sodium: sodium_pad(): do not copy any bytes if the string is empty
ext/sodium: Fix sodium_pad() with blocksize >= 256
ext/sodium: Use a correct max output size for base64 decoding
ext/sodium: Avoid shifts wider than 32 bits on size_t values
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions