[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] com php-src: Re-ordered the read and write methods to match the order of the original code
From:       rdlowrey () php ! net
Date:       2014-12-31 18:30:48
Message-ID: php-mail-9019f482c88b1e60042993bcea008f752076054992 () git ! php ! net
[Download RAW message or body]

Commit:    8ded274413590a073a2412098ba3e5413d481ef6
Author:    Brad Broerman <bbroerman@bbroerman.net>         Wed, 31 Dec 2014 13:30:48 \
                -0500
Parents:   fea9253c1cbe86a4e637a5df6726a601dc85e504
Branches:  master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=8ded274413590a073a2412098ba3e5413d481ef6


Log:
Re-ordered the read and write methods to match the order of the original code, to \
make the DIFF easier to read.

Changed paths:
  M  ext/openssl/xp_ssl.c


Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 5f43881..5950021 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 );
 }
 /* }}} */


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]