com php-src: Adding bunch of FreeBSD socket options flags specifics.: UPGRADING ext/sockets/sockets.c
| From: | Nikita Popov | Date: | Tue, 12 Feb 2019 09:27:33 +0000 |
| Subject: | com php-src: Adding bunch of FreeBSD socket options flags specifics.: UPGRADING ext/sockets/sockets.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104583@lists.php.net to get a copy of this message | ||
Commit: 4e87e56e22958ae43078c216178e2c080c722f14
Author: David Carlier <devnexen@gmail.com> Thu, 7 Feb 2019 14:23:27 +0000
Committer: Nikita Popov <nikita.ppv@gmail.com> Tue, 12 Feb 2019 10:27:33 +0100
Parents: 120137ca148134b9796dbc511a49df8d5f6018e2
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e87e56e22958ae43078c216178e2c080c722f14
Log:
Adding bunch of FreeBSD socket options flags specifics.
SO_USER_COOKIE primarly to be traced via dtrace instrumentation.
If SO_USER_COOKIE is available, the rest is so the former is
two years old while the rest is from around 2008.
Changed paths:
M UPGRADING
M ext/sockets/sockets.c
Diff:
diff --git a/UPGRADING b/UPGRADING
index e33e759..9ba0dfd 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -256,6 +256,14 @@ PHP 7.4 UPGRADE NOTES
. MB_ONIGURUMA_VERSION specifies the version of the oniguruma library against
which mbregex has been built.
+- Socket:
+ . Added FreeBSD-specific socket options:
+ . SO_LABEL
+ . SO_PEERLABEL
+ . SO_LISTENQLIMIT
+ . SO_LISTENQLEN
+ . SO_USER_COOKIE
+
- Tidy:
. TIDY_TAG_ARTICLE
. TIDY_TAG_ASIDE
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index ea8caa7..46484e3 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -782,6 +782,13 @@ static PHP_MINIT_FUNCTION(sockets)
#ifdef SO_BINDTODEVICE
REGISTER_LONG_CONSTANT("SO_BINDTODEVICE", SO_BINDTODEVICE, CONST_CS |
CONST_PERSISTENT);
#endif
+#ifdef SO_USER_COOKIE
+ REGISTER_LONG_CONSTANT("SO_LABEL", SO_LABEL, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("SO_PEERLABEL", SO_PEERLABEL, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("SO_LISTENQLIMIT", SO_LISTENQLIMIT, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("SO_LISTENQLEN", SO_LISTENQLEN, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("SO_USER_COOKIE", SO_USER_COOKIE, CONST_CS |
CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT("SOL_SOCKET", SOL_SOCKET, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SOMAXCONN", SOMAXCONN, CONST_CS | CONST_PERSISTENT);
#ifdef TCP_NODELAY