summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update versions for PHP 7.2.0beta1php-7.2.0beta1Sara Golemon2017-07-182-3/+3
* Update NEWS for PHP 7.2.0beta1Sara Golemon2017-07-181-1/+1
* Bump all API numbers in prep for 7.2 forkSara Golemon2017-07-183-3/+3
* sodium ext: implement sodium_crypto_kdf()Frank Denis2017-07-183-0/+200
* Merge remote-tracking branch 'jedisct1/sodium-keygen'Frank Denis2017-07-186-22/+108
|\
| * sodium ext: remove unused sodium_randombytes_*() prototypesFrank Denis2017-07-131-3/+0
| * sodium ext: add bindings for keygen() functionsFrank Denis2017-07-126-12/+101
| * sodium ext: sort prototypesFrank Denis2017-07-121-10/+10
* | Merge branch 'PHP-7.1'Anatol Belski2017-07-181-1/+1
|\ \
| * \ Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-07-181-1/+1
| |\ \
| | * | Exclude ext/ftp from AppVeyor test runAnatol Belski2017-07-181-1/+1
* | | | Merge branch 'PHP-7.1'Anatol Belski2017-07-180-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-07-180-0/+0
| |\ \ \ | | |/ /
| | * | move to 7.0.23 for devAnatol Belski2017-07-183-5/+9
* | | | fix regression introduced by 0782a7fc6314c8bd3cbfd57f12d0479bf9cc8dc7Anatol Belski2017-07-181-24/+24
* | | | Added NEWS entryDmitry Stogov2017-07-171-0/+3
* | | | gc_check_possible_root() may throw exception.Dmitry Stogov2017-07-172-4/+4
* | | | Merge branch 'master' into unset_cvDmitry Stogov2017-07-173-0/+67
|\ \ \ \
| * \ \ \ Merge branch 'master' of git.php.net:php-srcDmitry Stogov2017-07-173-0/+67
| |\ \ \ \
| | * \ \ \ Merge branch 'PHP-7.1'Anatol Belski2017-07-170-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-07-171-0/+1
| | | |\ \ \ | | | | |/ /
| | | | * | fix missing var for phpizeAnatol Belski2017-07-171-0/+1
| | * | | | Add support for OpenSSL security levelJakub Zelenka2017-07-173-0/+67
| * | | | | Constant evaluation of in_array() (support for more cases).Dmitry Stogov2017-07-172-1/+52
| |/ / / /
* | | | | Constant evaluation of in_array() (support for more cases).Dmitry Stogov2017-07-172-1/+52
* | | | | Separate ISSET_ISEMPTY_CV/UNSET_CV from ISSET_ISEMPTY_VAR/UNSET_VARDmitry Stogov2017-07-1714-333/+364
|/ / / /
* | | | Fixed CFG/SSA construction (avoid multiple identical predecessors)Dmitry Stogov2017-07-171-2/+11
* | | | Removed vim mode lines. zend_vm_opcodes.h loses these lines after regeneratio...Dmitry Stogov2017-07-172-20/+0
* | | | Allocate additional slot for third argumentDmitry Stogov2017-07-171-1/+1
* | | | fix new password related pieces wrt failing testsAnatol Belski2017-07-171-5/+5
* | | | Fixed bug #74906 redirecting incorrect include <sys/errno.h>Peter Kokot2017-07-172-6/+2
* | | | Merge branch 'PHP-7.1'Joe Watkins2017-07-170-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-07-172-7/+2
| |\ \ \ | | |/ /
| | * | Fixed bug #74906 redirecting incorrect include <sys/errno.h>Peter Kokot2017-07-172-7/+2
* | | | Merge branch 'PHP-7.1'Joe Watkins2017-07-172-1/+6
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-07-172-1/+6
| |\ \ \ | | |/ /
| | * | Fixed bug 74913 redirecting incorrect include <sys/poll.h>Peter Kokot2017-07-172-1/+6
* | | | fix typoAnatol Belski2017-07-171-1/+1
* | | | fix missing var for phpizeAnatol Belski2017-07-171-0/+1
* | | | Refactor password_hash()Sara Golemon2017-07-161-119/+120
* | | | Refactor password.cSara Golemon2017-07-161-110/+86
* | | | Provide zend_string wrappers for php_base64_(en|de)codeSara Golemon2017-07-163-8/+12
* | | | Make functions in openssl.c more consistentJakub Zelenka2017-07-161-61/+78
* | | | Make consitent naming and improve CS in xp_sslJakub Zelenka2017-07-161-134/+155
* | | | Allow setting SNI cert and pk in separate filesJakub Zelenka2017-07-169-19/+387
* | | | Bump PHP_JSON_VERSION to 1.6.0Jakub Zelenka2017-07-161-1/+1
* | | | [ci skip] Remove CSV leftovers from json code - $Id$Jakub Zelenka2017-07-163-6/+0
* | | | Introduce internal php_json_encode_ex to allow extensions setting depthJakub Zelenka2017-07-162-5/+9
* | | | Add JSON_INVALID_UTF8_SUBSTITUTE and JSON_INVALID_UTF8_IGNOREJakub Zelenka2017-07-1610-198/+718
* | | | Merge branch 'PHP-7.1'Anatol Belski2017-07-151-0/+26
|\ \ \ \ | |/ / /