com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/curl/ interface.c ext/openssl/openssl.c
ext/openssl/xp_ssl .c

Commit: bd9a370701b37afeddfce5ef8900518330eaece3 Author: Anatol Belski <ab@php.net> Wed, 26 Feb 2014 16:47:49 +0100 Parents: 05db0cbcc0c2a087f41b6c9ce4fbd00deccb15d6 44053a9daed3799cad2ccee90e237882c103021f Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bd9a370701b37afeddfce5ef8900518330eaece3 Log: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport * origin/PHP-5.6: (22 commits) move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged rearrange the NEWS blocks a bit add NEWS block for 5.6.0 beta1 restored that test part in ext/openssl to enable notify/wait remove echo fix stdin reading in new openssl tests kick redundant include Prevent implicit function declaration when TLSEXT unavailable Update NEWS+UPGRADING (openssl) Remove test case invalidated by openssl.cafile accessibility change Tolerate non-standard newlines when parsing stream CA files Remove openssl tests that shouldn't have survived last merge Add openssl.cafile ini check when loading cainfo Change openssl directives to PHP_INI_PERDIR Update openssl tests with new server/client test harness Add peer certificate verification on windows add news entry add news entry add clear_env option to FPM config add clear_env option to FPM config ... Conflicts: ext/openssl/openssl.c Changed paths: MM ext/curl/interface.c MM ext/openssl/openssl.c MM ext/openssl/xp_ssl.c Diff: diff --cc ext/openssl/openssl.c index d38f7d2,d2b4538..a141eca mode 100644,100755..100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -626,9 -635,11 +635,11 @@@ static EVP_PKEY * php_openssl_evp_from_ static int php_openssl_is_private_key(EVP_PKEY* pkey TSRMLS_DC); static X509_STORE * setup_verify(zval * calist TSRMLS_DC); static STACK_OF(X509) * load_all_certs_from_file(char *certfile); -static X509_REQ * php_openssl_csr_from_zval(zval ** val, int makeresource, long * resourceval TSRMLS_DC); +static X509_REQ * php_openssl_csr_from_zval(zval ** val, int makeresource, php_int_t * resourceval TSRMLS_DC); static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req TSRMLS_DC); + #define PHP_X509_NAME_ENTRY_TO_UTF8(ne, i, out) ASN1_STRING_to_UTF8(&out, X509_NAME_ENTRY_get_data(X509_NAME_get_entry(ne, i))) + static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int shortname TSRMLS_DC) /* {{{ */ { zval **data;