View | Details | Raw Unified
Collapse All | Expand All

(-) squid-2.6.STABLE13.orig/src/forward.c (-2 / +12 lines)
 Lines 424-430    Link Here  
    aclCheck_t ch;
    aclCheck_t ch;
    memset(&ch, '\0', sizeof(aclCheck_t));
    memset(&ch, '\0', sizeof(aclCheck_t));
    if (request) {
    if (request) {
	ch.src_addr = request->client_addr;
 
#if FOLLOW_X_FORWARDED_FOR
 

              
	if (Config.onoff.acl_uses_indirect_client) {

            

            

              

              
	    ch.src_addr = request->indirect_client_addr;

            

            

              

              
	} else

            

            

              

              
#endif /* FOLLOW_X_FORWARDED_FOR */

            

            

              

              
	    ch.src_addr = request->client_addr;

            

        
	ch.my_addr = request->my_addr;
	ch.my_addr = request->my_addr;

        
	ch.my_port = request->my_port;
	ch.my_port = request->my_port;

        
	ch.request = request;
	ch.request = request;

  

    

    

       Lines 438-444
       
    
  Link Here 
    

  

        
    aclCheck_t ch;
    aclCheck_t ch;

        
    memset(&ch, '\0', sizeof(aclCheck_t));
    memset(&ch, '\0', sizeof(aclCheck_t));

        
    if (request) {
    if (request) {

            

              
	ch.src_addr = request->client_addr;

              
#if FOLLOW_X_FORWARDED_FOR

            

            

              

              
	if (Config.onoff.acl_uses_indirect_client) {

            

            

              

              
	    ch.src_addr = request->indirect_client_addr;

            

            

              

              
	} else

            

            

              

              
#endif /* FOLLOW_X_FORWARDED_FOR */

            

            

              

              
	    ch.src_addr = request->client_addr;

            

        
	ch.my_addr = request->my_addr;
	ch.my_addr = request->my_addr;

        
	ch.my_port = request->my_port;
	ch.my_port = request->my_port;

        
	ch.request = request;
	ch.request = request;