summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamon Fernandez <ramon@mongodb.com>2015-07-28 09:09:27 -0400
committerRamon Fernandez <ramon@mongodb.com>2015-07-28 09:09:27 -0400
commit82c6c2ac4fff73aeeafa8282f2b933a44d0f127e (patch)
tree565ac17f4eaecb6f138ec2d52e7c92ed3995b76d
parentcfefe4e0c90aca20e74b5a2551c1587a07b96459 (diff)
downloadmongo-82c6c2ac4fff73aeeafa8282f2b933a44d0f127e.tar.gz
Revert "Revert "SERVER-19389: Remove wire level endianness check""
This reverts commit d1eeb94a9064eedeabea683f4f8a19c3ee6dcbfd.
-rw-r--r--src/mongo/util/net/message_port.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mongo/util/net/message_port.cpp b/src/mongo/util/net/message_port.cpp
index 2748c61fa67..6acfaa015aa 100644
--- a/src/mongo/util/net/message_port.cpp
+++ b/src/mongo/util/net/message_port.cpp
@@ -175,7 +175,9 @@ namespace mongo {
bool MessagingPort::recv(Message& m) {
try {
+#ifdef MONGO_SSL
again:
+#endif
//mmm( log() << "* recv() sock:" << this->sock << endl; )
MSGHEADER::Value header;
int headerLen = sizeof(MSGHEADER::Value);
@@ -192,13 +194,6 @@ again:
send( s.c_str(), s.size(), "http" );
return false;
}
- else if ( len == -1 ) {
- // Endian check from the client, after connecting, to see what mode server is running in.
- unsigned foo = 0x10203040;
- send( (char *) &foo, 4, "endian" );
- psock->setHandshakeReceived();
- goto again;
- }
// If responseTo is not 0 or -1 for first packet assume SSL
else if (psock->isAwaitingHandshake()) {
#ifndef MONGO_SSL