diff options
| author | John Högberg <[email protected]> | 2018-10-17 07:56:56 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-10-17 07:56:56 +0200 |
| commit | e18ee8b3d0ced05a8905d20f486f025a26f7c8c8 (patch) | |
| tree | d11106f62eaa86d17a2cb8750a6c3d215fdd000c /lib/kernel/src | |
| parent | b20482625cf11dfe9330527330660ef5c15cfcaf (diff) | |
| parent | 2c9cfa8663df4b73afb6d9a6e5a40d6887cdc744 (diff) | |
| download | otp-e18ee8b3d0ced05a8905d20f486f025a26f7c8c8.tar.gz otp-e18ee8b3d0ced05a8905d20f486f025a26f7c8c8.tar.bz2 otp-e18ee8b3d0ced05a8905d20f486f025a26f7c8c8.zip | |
Merge branch 'maint'
* maint:
"cork" tcp socket around file:sendfile
Add nopush TCP socket option
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/inet_int.hrl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/kernel/src/inet_int.hrl b/lib/kernel/src/inet_int.hrl index c8e09d18ad..f6525d7261 100644 --- a/lib/kernel/src/inet_int.hrl +++ b/lib/kernel/src/inet_int.hrl @@ -162,6 +162,7 @@ -define(INET_OPT_PKTOPTIONS, 45). -define(INET_OPT_TTL, 46). -define(INET_OPT_RECVTTL, 47). +-define(TCP_OPT_NOPUSH, 48). % Specific SCTP options: separate range: -define(SCTP_OPT_RTOINFO, 100). -define(SCTP_OPT_ASSOCINFO, 101). |