[packages/squid.git] / squid-2.5.STABLE2-external_acl_overload.patch

Index: squid/src/external_acl.c
diff -c squid/src/external_acl.c:1.1.2.21 squid/src/external_acl.c:1.1.2.22
*** squid/src/external_acl.c:1.1.2.21	Mon Mar 24 10:25:51 2003
--- squid/src/external_acl.c	Wed Apr  9 06:35:25 2003
***************
*** 433,439 ****
      }
      if (!entry || entry->result == -1) {
  	debug(82, 2) ("aclMatchExternal: %s(\"%s\") = lookup needed\n", acl->def->name, key);
! 	ch->state[ACL_EXTERNAL] = ACL_LOOKUP_NEEDED;
  	return 0;
      }
      external_acl_cache_touch(acl->def, entry);
--- 433,442 ----
      }
      if (!entry || entry->result == -1) {
  	debug(82, 2) ("aclMatchExternal: %s(\"%s\") = lookup needed\n", acl->def->name, key);
! 	if (acl->def->helper->stats.queue_size >= acl->def->helper->n_running)
! 	    debug(82, 1) ("aclMatchExternal: '%s' queue overload. Request rejected.\n", acl->def->name);
! 	else
! 	    ch->state[ACL_EXTERNAL] = ACL_LOOKUP_NEEDED;
  	return 0;
      }
      external_acl_cache_touch(acl->def, entry);
Commit	Line	Data
d46ed595 AM	1	Index: squid/src/external_acl.c
	2	diff -c squid/src/external_acl.c:1.1.2.21 squid/src/external_acl.c:1.1.2.22
	3	*** squid/src/external_acl.c:1.1.2.21 Mon Mar 24 10:25:51 2003
	4	--- squid/src/external_acl.c Wed Apr 9 06:35:25 2003
	5	***************
	6	* 433,439 **
	7	}
	8	if (!entry \|\| entry->result == -1) {
	9	debug(82, 2) ("aclMatchExternal: %s(\"%s\") = lookup needed\n", acl->def->name, key);
	10	! ch->state[ACL_EXTERNAL] = ACL_LOOKUP_NEEDED;
	11	return 0;
	12	}
	13	external_acl_cache_touch(acl->def, entry);
	14	--- 433,442 ----
	15	}
	16	if (!entry \|\| entry->result == -1) {
	17	debug(82, 2) ("aclMatchExternal: %s(\"%s\") = lookup needed\n", acl->def->name, key);
	18	! if (acl->def->helper->stats.queue_size >= acl->def->helper->n_running)
	19	! debug(82, 1) ("aclMatchExternal: '%s' queue overload. Request rejected.\n", acl->def->name);
	20	! else
	21	! ch->state[ACL_EXTERNAL] = ACL_LOOKUP_NEEDED;
	22	return 0;
	23	}
	24	external_acl_cache_touch(acl->def, entry);