com php-src: Fix #70456: mysqlnd doesn't activate TCP keep-alive when connecting to a server: ext/mysqlnd/mysqlnd_net.c
| From: | Christoph Michael Becker | Date: | Tue, 08 Sep 2015 23:43:29 +0000 |
| Subject: | com php-src: Fix #70456: mysqlnd doesn't activate TCP keep-alive when connecting to a server: ext/mysqlnd/mysqlnd_net.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88963@lists.php.net to get a copy of this message | ||
Commit: 7b3616db775ce11bd85918af2a7a38bb15c3729f
Author: Sergei Turchanov <turchanov@farpost.com> Thu, 3 Sep 2015 17:24:34 +1000
Committer: Christoph M. Becker <cmb@php.net> Wed, 9 Sep 2015 01:43:29 +0200
Parents: debfc866d2971c69d4f47662fb4bb70feb0c0007
Branches: PHP-5..6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7b3616db775ce11bd85918af2a7a38bb15c3729f
Log:
Fix #70456: mysqlnd doesn't activate TCP keep-alive when connecting to a server
libmysqlclient activates TCP keep-alive when connecting to a server. PHP
mysqlnd extension must do the same to maintain compatibility.
Bugs:
https://bugs.php.net/70456
Changed paths:
M ext/mysqlnd/mysqlnd_net.c
Diff:
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c
index 8683248..fa0ea8f 100644
--- a/ext/mysqlnd/mysqlnd_net.c
+++ b/ext/mysqlnd/mysqlnd_net.c
@@ -61,6 +61,27 @@ mysqlnd_set_sock_no_delay(php_stream * stream TSRMLS_DC)
/* }}} */
+/* {{{ mysqlnd_set_sock_keepalive */
+static int
+mysqlnd_set_sock_keepalive(php_stream * stream TSRMLS_DC)
+{
+
+ 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,
@@ -252,6 +273,8 @@ MYSQLND_METHOD(mysqlnd_net, post_connect_set_opt)(MYSQLND_NET * const net,
if (!memcmp(scheme, "tcp://", sizeof("tcp://") - 1)) {
/* TCP -> Set TCP_NODELAY */
mysqlnd_set_sock_no_delay(net_stream TSRMLS_CC);
+ /* TCP -> Set SO_KEEPALIVE */
+ mysqlnd_set_sock_keepalive(net_stream TSRMLS_CC);
}
}