com php-src: Merge branch 'PHP-5.6': ext/standard/http_fopen _wrapper.c main/streams/php_stream_transport.h

From: Date: Fri, 06 Mar 2015 04:18:09 +0000
Subject: com php-src: Merge branch 'PHP-5.6': ext/standard/http_fopen _wrapper.c main/streams/php_stream_transport.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85283@lists.php.net to get a copy of this message
Commit: 3e0a1a71e951bfb29bd43c6341b2e72f4386377f Author: Daniel Lowrey <rdlowrey@php.net> Thu, 5 Mar 2015 21:18:09 -0700 Parents: 88cfc6ccb6594e8bacd4adce45094dc2d4d65eac 10bc5fd4c4c8e1dd57bd911b086e9872a56300a0 Branches: master Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=3e0a1a71e951bfb29bd43c6341b2e72f4386377f Log: Merge branch 'PHP-5.6' * PHP-5.6: Fixed bug (#69195 Inconsistent stream crypto values across versions) Conflicts: ext/standard/http_fopen_wrapper.c Bugs: https://bugs.php.net/69195 Changed paths: MM ext/standard/http_fopen_wrapper.c MM main/streams/php_stream_transport.h Diff: diff --cc ext/standard/http_fopen_wrapper.c index 1f54f62,eb371c4..457e806 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@@ -331,9 -323,9 +331,9 @@@ finish /* enable SSL transport layer */ if (stream) { - if (php_stream_xport_crypto_setup(stream, STREAM_CRYPTO_METHOD_ANY_CLIENT, NULL) < 0 || - if (php_stream_xport_crypto_setup(stream, STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL TSRMLS_CC) < 0 || - php_stream_xport_crypto_enable(stream, 1 TSRMLS_CC) < 0) { - php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Cannot connect to HTTPS server through proxy"); ++ if (php_stream_xport_crypto_setup(stream, STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL) < 0 || + php_stream_xport_crypto_enable(stream, 1) < 0) { + php_stream_wrapper_log_error(wrapper, options, "Cannot connect to HTTPS server through proxy"); php_stream_close(stream); stream = NULL; }

« previous php.cvs (#85283) next »