com php-src: Merge branch 'PHP-5.6': ext/mysqlnd/mysqlnd_net .c
| From: | Christoph Michael Becker | Date: | Wed, 09 Sep 2015 01:19:55 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/mysqlnd/mysqlnd_net .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88964@lists.php.net to get a copy of this message | ||
Commit: 71f90dfbad753bc00538dbb736ec023e63b72504
Author: Christoph M. Becker <cmb@php.net> Wed, 9 Sep 2015 03:19:55 +0200
Parents: c7dffb5673c5e2303e293cb71997f2fae6bdf2e9 b89f128480e673c0c0981a0037c6f4af883881d0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=71f90dfbad753bc00538dbb736ec023e63b72504
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #70456: mysqlnd doesn't activate TCP keep-alive when connecting to a server
Resolved conflicts:
ext/mysqlnd/mysqlnd_net.c
Bugs:
https://bugs.php.net/70456
Changed paths:
MM ext/mysqlnd/mysqlnd_net.c
Diff:
diff --cc ext/mysqlnd/mysqlnd_net.c
index bcd40d7,fa0ea8f..72f7dfc
--- a/ext/mysqlnd/mysqlnd_net.c
+++ b/ext/mysqlnd/mysqlnd_net.c
@@@ -61,6 -61,27 +61,27 @@@ mysqlnd_set_sock_no_delay(php_stream *
/* }}} */
+ /* {{{ mysqlnd_set_sock_keepalive */
+ static int
-mysqlnd_set_sock_keepalive(php_stream * stream TSRMLS_DC)
++mysqlnd_set_sock_keepalive(php_stream * stream)
+ {
+
+ int socketd = ((php_netstream_data_t*)stream->abstract)->socket;
+ int ret = SUCCESS;
+ int flag = 1;
+ int result = setsockopt(socketd, SOL_SOCKET, SO_KEEPALIVE, (char *) &flag, sizeof(int));
+
+ DBG_ENTER("mysqlnd_set_sock_keepalive");
+
+ if (result == -1) {
+ ret = FAILURE;
+ }
+
+ DBG_RETURN(ret);
+ }
+ /* }}} */
+
+
/* {{{ mysqlnd_net::network_read_ex */
static enum_func_status
MYSQLND_METHOD(mysqlnd_net, network_read_ex)(MYSQLND_NET * const net, zend_uchar * const buffer,
const size_t count,
@@@ -259,7 -272,9 +280,9 @@@ MYSQLND_METHOD(mysqlnd_net, post_connec
if (!memcmp(scheme, "tcp://", sizeof("tcp://") - 1)) {
/* TCP -> Set TCP_NODELAY */
- mysqlnd_set_sock_no_delay(net_stream TSRMLS_CC);
+ mysqlnd_set_sock_no_delay(net_stream);
+ /* TCP -> Set SO_KEEPALIVE */
- mysqlnd_set_sock_keepalive(net_stream TSRMLS_CC);
++ mysqlnd_set_sock_keepalive(net_stream);
}
}