From: Brad Broerman Date: Wed, 31 Dec 2014 18:30:48 +0000 (-0500) Subject: Re-ordered the read and write methods to match the order of the original code, to... X-Git-Tag: PRE_PHP7_REMOVALS~25^2~20^2~1^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ded274413590a073a2412098ba3e5413d481ef6;p=php Re-ordered the read and write methods to match the order of the original code, to make the DIFF easier to read. --- diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 5f4388142d..59500217a5 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1733,15 +1733,15 @@ static int php_openssl_enable_crypto(php_stream *stream, return -1; } -static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) /* {{{ */ +static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) /* {{{ */ { - return php_openssl_sockop_io( 1, stream, buf, count ); + return php_openssl_sockop_io( 0, stream, buf, count ); } /* }}} */ -static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) /* {{{ */ +static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) /* {{{ */ { - return php_openssl_sockop_io( 0, stream, buf, count ); + return php_openssl_sockop_io( 1, stream, buf, count ); } /* }}} */