com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/openssl/x p_ssl.c
| From: | Anatol Belski | Date: | Thu, 07 Aug 2014 17:50:45 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/openssl/x p_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79790@lists.php.net to get a copy of this message | ||
Commit: 8b8297170ec9d17f975df4189142d989f9c9b21a
Author: Anatol Belski <ab@php.net> Thu, 7 Aug 2014 19:50:45 +0200
Parents: 6e8de9b4185e55b091a0293397845cb8dd8b79bd 75991561d65e3e7dcbb86a056a7d33074ae27231
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8b8297170ec9d17f975df4189142d989f9c9b21a
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix TS build
Changed paths:
MM ext/openssl/xp_ssl.c
Diff:
diff --cc ext/openssl/xp_ssl.c
index 45b3d61,b9a30df..16516e5
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@@ -1796,9 -203,8 +1796,9 @@@ static size_t php_openssl_sockop_write(
return didwrite;
}
+/* }}} */
- static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock TSRMLS_DC)
+ static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock)
{
int retval;
struct timeval *ptimeout;