Prevent handshake spoofing of Client data.
Merge pull request #3487 from pchote/server-client-fix

Prevent handshake spoofing of Client data.