Index: squid/src/helper.c
diff -c squid/src/helper.c:1.34.2.11 squid/src/helper.c:1.34.2.12
*** squid/src/helper.c:1.34.2.11	Sun Sep 29 06:22:37 2002
--- squid/src/helper.c	Wed Jan 8 13:58:54 2003
***************
*** 302,308 ****
 dlink_node *n;
 helper_stateful_server *srv = NULL, *rv = NULL;
 if (hlp == NULL) {
! 	debug(84, 3) ("helperStatefulReserve: hlp == NULL\n");
 	return NULL;
 }
 debug(84, 5) ("helperStatefulDefer: Running servers %d.\n", hlp->n_running);
--- 302,308 ----
 dlink_node *n;
 helper_stateful_server *srv = NULL, *rv = NULL;
 if (hlp == NULL) {
! 	debug(84, 3) ("helperStatefulDefer: hlp == NULL\n");
 	return NULL;
 }
 debug(84, 5) ("helperStatefulDefer: Running servers %d.\n", hlp->n_running);
***************
*** 310,319 ****
 	debug(84, 1) ("helperStatefulDefer: No running servers!. \n");
 	return NULL;
 }
! srv = StatefulGetFirstAvailable(hlp);
! /* all currently busy:loop through servers and find server with the shortest queue */
! rv = srv;
! if (rv == NULL)
 	for (n = hlp->servers.head; n != NULL; n = n->next) {
 	 srv = n->data;
 	 if (srv->flags.reserved == S_HELPER_RESERVED)
--- 310,321 ----
 	debug(84, 1) ("helperStatefulDefer: No running servers!. \n");
 	return NULL;
 }
! rv = srv = StatefulGetFirstAvailable(hlp);
! if (rv == NULL) {
! 	/*
! 	 * all currently busy; loop through servers and find server
! 	 * with the shortest queue
! 	 */
 	for (n = hlp->servers.head; n != NULL; n = n->next) {
 	 srv = n->data;
 	 if (srv->flags.reserved == S_HELPER_RESERVED)
***************
*** 327,332 ****
--- 329,335 ----
 		continue;
 	 rv = srv;
 	}
+ }
 if (rv == NULL) {
 	debug(84, 1) ("helperStatefulDefer: None available.\n");
 	return NULL;
***************
*** 407,412 ****
--- 410,417 ----
 helper_server *srv;
 dlink_node *link;
 double tt;
+ storeAppendPrintf(sentry, "program: %s\n",
+ 	hlp->cmdline->key);
 storeAppendPrintf(sentry, "number running: %d of %d\n",
 	hlp->n_running, hlp->n_to_start);
 storeAppendPrintf(sentry, "requests sent: %d\n",
***************
*** 468,474 ****
 storeAppendPrintf(sentry, "avg service time: %d msec\n",
 	hlp->stats.avg_svc_time);
 storeAppendPrintf(sentry, "\n");
! storeAppendPrintf(sentry, "%7s\t%7s\t%7s\t%11s\t%s\t%7s\t%7s\t%7s\t%7s\n",
 	"#",
 	"FD",
 	"PID",
--- 473,479 ----
 storeAppendPrintf(sentry, "avg service time: %d msec\n",
 	hlp->stats.avg_svc_time);
 storeAppendPrintf(sentry, "\n");
! storeAppendPrintf(sentry, "%7s\t%7s\t%7s\t%11s\t%20s\t%s\t%7s\t%7s\t%7s\n",
 	"#",
 	"FD",
 	"PID",
***************
*** 481,487 ****
 for (link = hlp->servers.head; link; link = link->next) {
 	srv = link->data;
 	tt = 0.001 * tvSubMsec(srv->dispatch_time, current_time);
! 	storeAppendPrintf(sentry, "%7d\t%7d\t%7d\t%11d\t%11d\t%c%c%c%c%c%c\t%7.3f\t%7d\t%s\n",
 	 srv->index + 1,
 	 srv->rfd,
 	 srv->pid,
--- 486,492 ----
 for (link = hlp->servers.head; link; link = link->next) {
 	srv = link->data;
 	tt = 0.001 * tvSubMsec(srv->dispatch_time, current_time);
! 	storeAppendPrintf(sentry, "%7d\t%7d\t%7d\t%11d\t%20d\t%c%c%c%c%c%c\t%7.3f\t%7d\t%s\n",
 	 srv->index + 1,
 	 srv->rfd,
 	 srv->pid,
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE1-helper_stats.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE1-helper_stats.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>