Skip to content

Commit 0fd8aae

Browse files
bukkabukka
committed
Fix TCP_KEEPALIVE no inheriting for accepted sockets on MacOS
1 parent 9582d8e commit 0fd8aae

4 files changed

Lines changed: 80 additions & 22 deletions

File tree

‎ext/openssl/xp_ssl.c‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2219,25 +2219,32 @@ static int php_openssl_sockop_stat(php_stream *stream, php_stream_statbuf *ssb)
22192219
static inline int php_openssl_tcp_sockop_accept(php_stream *stream, php_openssl_netstream_data_t *sock,
22202220
php_stream_xport_param *xparam STREAMS_DC) /* {{{ */
22212221
{
2222-
bool nodelay = false;
2222+
php_sockvals sockvals = {0};
22232223
zval *tmpzval = NULL;
22242224

22252225
xparam->outputs.client = NULL;
22262226

2227-
if (PHP_STREAM_CONTEXT(stream) &&
2228-
(tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_nodelay")) != NULL &&
2229-
zend_is_true(tmpzval)) {
2230-
nodelay = true;
2227+
if (PHP_STREAM_CONTEXT(stream)) {
2228+
tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_nodelay");
2229+
if (tmpzval != NULL && zend_is_true(tmpzval)) {
2230+
sockvals.mask |= PHP_SOCKVAL_TCP_NODELAY;
2231+
sockvals.tcp_nodelay = 1;
2232+
}
2233+
tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_keepidle");
2234+
if (tmpzval != NULL && Z_TYPE_P(tmpzval) == IS_LONG) {
2235+
sockvals.mask |= PHP_SOCKVAL_TCP_KEEPIDLE;
2236+
sockvals.keepalive.keepidle = Z_LVAL_P(tmpzval);
2237+
}
22312238
}
22322239

2233-
php_socket_t clisock = php_network_accept_incoming(sock->s.socket,
2240+
php_socket_t clisock = php_network_accept_incoming_ex(sock->s.socket,
22342241
xparam->want_textaddr ? &xparam->outputs.textaddr : NULL,
22352242
xparam->want_addr ? &xparam->outputs.addr : NULL,
22362243
xparam->want_addr ? &xparam->outputs.addrlen : NULL,
22372244
xparam->inputs.timeout,
22382245
xparam->want_errortext ? &xparam->outputs.error_text : NULL,
22392246
&xparam->outputs.error_code,
2240-
nodelay);
2247+
&sockvals);
22412248

22422249
if (clisock != SOCK_ERR) {
22432250
php_openssl_netstream_data_t *clisockdata = (php_openssl_netstream_data_t*) emalloc(sizeof(*clisockdata));

‎main/network.c‎

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -801,15 +801,22 @@ PHPAPI int php_network_get_sock_name(php_socket_t sock,
801801
* version of the address will be emalloc'd and returned.
802802
* */
803803

804-
/* {{{ php_network_accept_incoming */
805-
PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock,
804+
/* Accept a client connection from a server socket,
805+
* using an optional timeout.
806+
* Returns the peer address in addr/addrlen (it will emalloc
807+
* these, so be sure to efree the result).
808+
* If you specify textaddr, a text-printable
809+
* version of the address will be emalloc'd and returned.
810+
* */
811+
812+
PHPAPI php_socket_t php_network_accept_incoming_ex(php_socket_t srvsock,
806813
zend_string **textaddr,
807814
struct sockaddr **addr,
808815
socklen_t *addrlen,
809816
struct timeval *timeout,
810817
zend_string **error_string,
811818
int *error_code,
812-
int tcp_nodelay
819+
php_sockvals *sockvals
813820
)
814821
{
815822
php_socket_t clisock = -1;
@@ -833,11 +840,19 @@ PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock,
833840
textaddr,
834841
addr, addrlen
835842
);
836-
if (tcp_nodelay) {
837843
#ifdef TCP_NODELAY
844+
if (PHP_SOCKVAL_IS_SET(sockvals, PHP_SOCKVAL_TCP_NODELAY)) {
845+
int tcp_nodelay = 1;
838846
setsockopt(clisock, IPPROTO_TCP, TCP_NODELAY, (char*)&tcp_nodelay, sizeof(tcp_nodelay));
847+
}
839848
#endif
849+
#ifdef TCP_KEEPALIVE
850+
/* MacOS does not inherit TCP_KEEPALIVE so it needs to be set */
851+
if (PHP_SOCKVAL_IS_SET(sockvals, PHP_SOCKVAL_TCP_KEEPIDLE)) {
852+
setsockopt(clisock, IPPROTO_TCP, TCP_KEEPALIVE,
853+
(char*)&sockvals->keepalive.keepidle, sizeof(sockvals->keepalive.keepidle));
840854
}
855+
#endif
841856
} else {
842857
error = php_socket_errno();
843858
}
@@ -852,7 +867,22 @@ PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock,
852867

853868
return clisock;
854869
}
855-
/* }}} */
870+
871+
PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock,
872+
zend_string **textaddr,
873+
struct sockaddr **addr,
874+
socklen_t *addrlen,
875+
struct timeval *timeout,
876+
zend_string **error_string,
877+
int *error_code,
878+
int tcp_nodelay
879+
)
880+
{
881+
php_sockvals sockvals = { .mask = tcp_nodelay ? PHP_SOCKVAL_TCP_NODELAY : 0 };
882+
883+
return php_network_accept_incoming_ex(srvsock, textaddr, addr, addrlen, timeout, error_string,
884+
error_code, &sockvals);
885+
}
856886

857887
/* Connect to a remote host using an interruptible connect with optional timeout.
858888
* Optionally, the connect can be made asynchronously, which will implicitly

‎main/php_network.h‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,16 @@ typedef struct {
267267
} php_sockaddr_storage;
268268
#endif
269269

270-
#define PHP_SOCKVAL_TCP_KEEPIDLE (1 << 0)
271-
#define PHP_SOCKVAL_TCP_KEEPCNT (1 << 1)
272-
#define PHP_SOCKVAL_TCP_KEEPINTVL (1 << 2)
270+
#define PHP_SOCKVAL_TCP_NODELAY (1 << 0)
271+
#define PHP_SOCKVAL_TCP_KEEPIDLE (1 << 1)
272+
#define PHP_SOCKVAL_TCP_KEEPCNT (1 << 2)
273+
#define PHP_SOCKVAL_TCP_KEEPINTVL (1 << 3)
274+
275+
#define PHP_SOCKVAL_IS_SET(sockvals, opt) (sockvals->mask & opt)
273276

274277
typedef struct {
275278
unsigned int mask;
279+
int tcp_nodelay;
276280
struct {
277281
int keepidle;
278282
int keepcnt;
@@ -313,6 +317,16 @@ PHPAPI php_socket_t php_network_bind_socket_to_local_addr(const char *host, unsi
313317
int socktype, long sockopts, zend_string **error_string, int *error_code
314318
);
315319

320+
PHPAPI php_socket_t php_network_accept_incoming_ex(php_socket_t srvsock,
321+
zend_string **textaddr,
322+
struct sockaddr **addr,
323+
socklen_t *addrlen,
324+
struct timeval *timeout,
325+
zend_string **error_string,
326+
int *error_code,
327+
php_sockvals *sockvals
328+
);
329+
316330
PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock,
317331
zend_string **textaddr,
318332
struct sockaddr **addr,

‎main/streams/xp_socket.c‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -964,25 +964,32 @@ static inline int php_tcp_sockop_connect(php_stream *stream, php_netstream_data_
964964
static inline int php_tcp_sockop_accept(php_stream *stream, php_netstream_data_t *sock,
965965
php_stream_xport_param *xparam STREAMS_DC)
966966
{
967-
bool nodelay = 0;
967+
php_sockvals sockvals = {0};
968968
zval *tmpzval = NULL;
969969

970970
xparam->outputs.client = NULL;
971971

972-
if ((NULL != PHP_STREAM_CONTEXT(stream)) &&
973-
(tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_nodelay")) != NULL &&
974-
zend_is_true(tmpzval)) {
975-
nodelay = 1;
972+
if (PHP_STREAM_CONTEXT(stream)) {
973+
tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_nodelay");
974+
if (tmpzval != NULL && zend_is_true(tmpzval)) {
975+
sockvals.mask |= PHP_SOCKVAL_TCP_NODELAY;
976+
sockvals.tcp_nodelay = 1;
977+
}
978+
tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_keepidle");
979+
if (tmpzval != NULL && Z_TYPE_P(tmpzval) == IS_LONG) {
980+
sockvals.mask |= PHP_SOCKVAL_TCP_KEEPIDLE;
981+
sockvals.keepalive.keepidle = Z_LVAL_P(tmpzval);
982+
}
976983
}
977984

978-
php_socket_t clisock = php_network_accept_incoming(sock->socket,
985+
php_socket_t clisock = php_network_accept_incoming_ex(sock->socket,
979986
xparam->want_textaddr ? &xparam->outputs.textaddr : NULL,
980987
xparam->want_addr ? &xparam->outputs.addr : NULL,
981988
xparam->want_addr ? &xparam->outputs.addrlen : NULL,
982989
xparam->inputs.timeout,
983990
xparam->want_errortext ? &xparam->outputs.error_text : NULL,
984991
&xparam->outputs.error_code,
985-
nodelay);
992+
&sockvals);
986993

987994
if (clisock != SOCK_ERR) {
988995
php_netstream_data_t *clisockdata = (php_netstream_data_t*) emalloc(sizeof(*clisockdata));

0 commit comments

Comments
 (0)