------------------------------------------------------------ revno: 12220 revision-id: chtsanti@users.sourceforge.net-20120718202034-6qcmia756z3kxh3s parent: chtsanti@users.sourceforge.net-20120718174554-7ic3sj9hv6v8xkvm committer: Christos Tsantilas branch nick: trunk timestamp: Wed 2012-07-18 23:20:34 +0300 message: SslBump: Support bump-ssl-server-first / fix build errors Wrap inside "#if USE_AUTH .. #endif" block authentication related code to allow build when no authentication used in squid ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chtsanti@users.sourceforge.net-20120718202034-\ # 6qcmia756z3kxh3s # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 10f8217608d54cdbcdcafba51f1aa47e6eea99d8 # timestamp: 2012-07-18 20:52:12 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: chtsanti@users.sourceforge.net-20120718174554-\ # 7ic3sj9hv6v8xkvm # # Begin patch === modified file 'src/client_side_request.cc' --- src/client_side_request.cc 2012-07-18 16:21:47 +0000 +++ src/client_side_request.cc 2012-07-18 20:20:34 +0000 @@ -828,9 +828,11 @@ http->request ); +#if USE_AUTH error->auth_user_request = http->getConn() != NULL && http->getConn()->auth_user_request != NULL ? http->getConn()->auth_user_request : http->request->auth_user_request; +#endif readNextRequest = true; }