Commit: 7e85b12b5375a4e10d83dce3c8f91e0d0a48f0e8 Author: Jakub Zelenka <bu...@php.net> Sun, 1 Dec 2013 20:04:58 +0000 Parents: b34ce97417ffe7269a340982fe8b0f86983e12e7 6b9396bd8ebe06567646bb77a78724474ac13ba8 Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7e85b12b5375a4e10d83dce3c8f91e0d0a48f0e8 Log: Merge branch 'str_size_and_int64' into str_size_and_int64_openssl Conflicts: ext/openssl/openssl.c Changed paths: MM ext/openssl/openssl.c Diff: diff --cc ext/openssl/openssl.c index 2fe8341,3bb1b06..335a39f --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -5200,13 -5134,13 +5200,13 @@@ static int passwd_callback(char *buf, i GET_VER_OPT_STRING("passphrase", passphrase); - if (passphrase) { - if (Z_STRSIZE_PP(val) < num - 1) { - memcpy(buf, Z_STRVAL_PP(val), Z_STRSIZE_PP(val)+1); - return (int) Z_STRSIZE_PP(val); - } - } + if (passphrase) { + if (Z_STRSIZE_PP(val) < num - 1) { + memcpy(buf, Z_STRVAL_PP(val), Z_STRSIZE_PP(val)+1); + return Z_STRSIZE_PP(val); + } + } - return 0; + return 0; } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
