------------------------------------------------------------ revno: 13759 revision-id: squid3@treenet.co.nz-20150302144210-07aiw4l8euzr55ps parent: squid3@treenet.co.nz-20150218121621-mw1yu712qc6lu2ef author: Stuart Henderson committer: Amos Jeffries branch nick: 3.5 timestamp: Mon 2015-03-02 06:42:10 -0800 message: Portability: SSLv2 is not always available SSLv2 client handshake is deprecated and not all SSL libraries support it any longer. Allow buildign Squid anyway. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20150302144210-07aiw4l8euzr55ps # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 11787ba7470259e3fe5d45217fd28e9839450c65 # timestamp: 2015-03-02 14:51:13 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20150218121621-\ # mw1yu712qc6lu2ef # # Begin patch === modified file 'src/ssl/bio.cc' --- src/ssl/bio.cc 2015-01-13 09:13:49 +0000 +++ src/ssl/bio.cc 2015-03-02 14:42:10 +0000 @@ -151,7 +151,10 @@ bool Ssl::ClientBio::isClientHello(int state) { - return (state == SSL2_ST_GET_CLIENT_HELLO_A || + return ( +#if defined(SSL2_ST_GET_CLIENT_HELLO_A) + state == SSL2_ST_GET_CLIENT_HELLO_A || +#endif state == SSL3_ST_SR_CLNT_HELLO_A || state == SSL23_ST_SR_CLNT_HELLO_A || state == SSL23_ST_SR_CLNT_HELLO_B ||