0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-30 09:06:21 +01:00

Merge branch 'master' of git@github.com:mongodb/mongo

This commit is contained in:
dwight 2010-05-16 23:38:32 -04:00
commit dd68004146

View File

@ -42,6 +42,8 @@ namespace mongo {
int x = 1;
if ( setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *) &x, sizeof(x)) )
out() << "ERROR: disableNagle failed" << endl;
if ( setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char *) &x, sizeof(x)) )
out() << "ERROR: SO_KEEPALIVE failed" << endl;
}
inline void prebindOptions( int sock ) {
}
@ -84,7 +86,12 @@ namespace mongo {
#endif
if ( setsockopt(sock, level, TCP_NODELAY, (char *) &x, sizeof(x)) )
log() << "ERROR: disableNagle failed" << endl;
log() << "ERROR: disableNagle failed: " << errnoWithDescription() << endl;
#ifdef SO_KEEPALIVE
if ( setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char *) &x, sizeof(x)) )
log() << "ERROR: SO_KEEPALIVE failed: " << errnoWithDescription() << endl;
#endif
}
inline void prebindOptions( int sock ) {