| commit | 881fc8fc5237cb38ae3565da8b74998fd3c766b5 | [log] [tgz] |
|---|---|---|
| author | tfarina <[email protected]> | Tue Mar 01 18:54:34 2016 |
| committer | Commit bot <[email protected]> | Tue Mar 01 18:55:42 2016 |
| tree | 1ee26c2a2d9335c821c23773452b18b2221aaa3c | |
| parent | 9d8b8320a54fc65539d99be0e2a489e2e2b1b7bc [diff] |
Reland of net: merge two versions of SetTCPNoDelay() function into one (patchset #1 id:1 of https://codereview.chromium.org/1744153003/ ) Reason for revert: It was not responsible for the failure on Mac - https://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests/builds/16976/steps/net_unittests%20on%20Mac-10.9/logs/CertVerifyProcTest.CybertrustGTERoot. See https://bugs.chromium.org/p/chromium/issues/detail?id=590868#c3 Original issue's description: > Revert of net: merge two versions of SetTCPNoDelay() function into one (patchset #4 id:60001 of https://codereview.chromium.org/1728853006/ ) > > Reason for revert: > net-unittests failure on Mac. > https://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests/builds/16976/steps/net_unittests%20on%20Mac-10.9/logs/CertVerifyProcTest.CybertrustGTERoot > > Original issue's description: > > net: merge DisableNagle() with two other SetTCPNoDelay() implementations > > > > This patch merges SetTCPNoDelay() function from tcp_socket_posix.cc, > > SetTCPNoDelay() function from tcp_socket_util.cc and DisableNagle() function > > from tcp_socket_win.cc, into a single slightly improved one in tcp_socket.cc > > with the following prototype: > > > > bool SetTCPNoDelay(SocketDescriptor socket, bool no_delay); > > > > BUG=None > > TEST=net_unittests > > [email protected] > > > > Committed: https://crrev.com/2d1f2621d8e6dd10feba6cab380fb46d60cb3098 > > Cr-Commit-Position: refs/heads/master@{#378129} > > [email protected],[email protected] > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=None > > Committed: https://crrev.com/5ee686747816a494180aad0bce62fbea9dac0f61 > Cr-Commit-Position: refs/heads/master@{#378335} [email protected],[email protected] # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=None Review URL: https://codereview.chromium.org/1756503002 Cr-Commit-Position: refs/heads/master@{#378496}