Index: squid/src/ftp.c
diff -c squid/src/ftp.c:1.316.2.21 squid/src/ftp.c:1.316.2.22
*** squid/src/ftp.c:1.316.2.21	Sun Feb 20 20:35:08 2005
--- squid/src/ftp.c	Fri Mar 4 04:19:53 2005
***************
*** 595,601 ****
 	p->type = 0;
 	while (ct && *ct) {
 	 time_t t;
! 	 int l = strcspn(ct + 1, ",");
 	 char *tmp;
 	 if (l < 1) goto blank; --- 595,601 ---- p->type = 0;
 	while (ct && *ct) {
 	 time_t t;
! 	 int l = strcspn(ct, ",");
 	 char *tmp;
 	 if (l < 1) goto blank; *************** *** 608,614 **** break; case 'm': t = (time_t) strtol(ct + 1, &tmp, 0); ! if (*tmp &#124;&#124; (tmp == ct + 1)) break; /* not a valid integer */ p->date = xstrdup(ctime(&t));
 		*(strstr(p->date, "\n")) = '0円';
--- 608,614 ----
 		break;
 	 case 'm':
 		t = (time_t) strtol(ct + 1, &tmp, 0);
! 		if (tmp != ct + l)
 		 break;	/* not a valid integer */
 		p->date = xstrdup(ctime(&t));
 		*(strstr(p->date, "\n")) = '0円';
***************
*** 1800,1815 ****
 /* 227 Entering Passive Mode (h1,h2,h3,h4,p1,p2). */
 /* ANSI sez [^0-9] is undefined, it breaks on Watcom cc */
 debug(9, 5) ("scanning: %s\n", ftpState->ctrl.last_reply);
! buf = strstr(ftpState->ctrl.last_reply, "(");
! if (!buf) {
! 	debug(9, 1) ("Unsafe PASV reply from %s: '%s'\n", fd_table[ftpState->ctrl.fd].ipaddr, ftpState->ctrl.last_reply);
! 	ftpSendPort(ftpState);
! 	return;
! }
! buf++;			/* skip ( */
 n = sscanf(buf, "%d,%d,%d,%d,%d,%d", &h1, &h2, &h3, &h4, &p1, &p2);
 if (n != 6 &#124;&#124; p1 < 0 &#124;&#124; p2 < 0 &#124;&#124; p1> 255 &#124;&#124; p2> 255) {
! 	debug(9, 1) ("Unsafe PASV reply from %s: %s\n", fd_table[ftpState->ctrl.fd].ipaddr, ftpState->ctrl.last_reply);
 	ftpSendPort(ftpState);
 	return;
 }
--- 1800,1809 ----
 /* 227 Entering Passive Mode (h1,h2,h3,h4,p1,p2). */
 /* ANSI sez [^0-9] is undefined, it breaks on Watcom cc */
 debug(9, 5) ("scanning: %s\n", ftpState->ctrl.last_reply);
! buf = ftpState->ctrl.last_reply + strcspn(ftpState->ctrl.last_reply, "0123456789");
 n = sscanf(buf, "%d,%d,%d,%d,%d,%d", &h1, &h2, &h3, &h4, &p1, &p2);
 if (n != 6 &#124;&#124; p1 < 0 &#124;&#124; p2 < 0 &#124;&#124; p1> 255 &#124;&#124; p2> 255) {
! 	debug(9, 1) ("Odd PASV reply from %s: %s\n", fd_table[ftpState->ctrl.fd].ipaddr, ftpState->ctrl.last_reply);
 	ftpSendPort(ftpState);
 	return;
 }
***************
*** 1826,1848 ****
 	return;
 }
 if (Config.Ftp.sanitycheck) {
- 	if (strcmp(fd_table[ftpState->ctrl.fd].ipaddr, ipaddr) != 0) {
- 	 debug(9, 1) ("Unsafe PASV reply from %s: %s\n", fd_table[ftpState->ctrl.fd].ipaddr, ftpState->ctrl.last_reply);
- 	 ftpSendPort(ftpState);
- 	 return;
- 	}
 	if (port < 1024) { debug(9, 1) ("Unsafe PASV reply from %s: %s\n", fd_table[ftpState->ctrl.fd].ipaddr, ftpState->ctrl.last_reply);
 	 ftpSendPort(ftpState);
 	 return;
 	}
 }
- debug(9, 5) ("ftpReadPasv: connecting to %s, port %d\n", ipaddr, port);
 ftpState->data.port = port;
! ftpState->data.host = xstrdup(ipaddr);
 safe_free(ftpState->ctrl.last_command);
 safe_free(ftpState->ctrl.last_reply);
 ftpState->ctrl.last_command = xstrdup("Connect to server data port");
 commConnectStart(fd, ipaddr, port, ftpPasvCallback, ftpState);
 }
 
--- 1820,1840 ----
 	return;
 }
 if (Config.Ftp.sanitycheck) {
 	if (port < 1024) { debug(9, 1) ("Unsafe PASV reply from %s: %s\n", fd_table[ftpState->ctrl.fd].ipaddr, ftpState->ctrl.last_reply);
 	 ftpSendPort(ftpState);
 	 return;
 	}
 }
 ftpState->data.port = port;
! if (Config.Ftp.sanitycheck)
! 	ftpState->data.host = xstrdup(fd_table[ftpState->ctrl.fd].ipaddr);
! else
! 	ftpState->data.host = xstrdup(ipaddr);
 safe_free(ftpState->ctrl.last_command);
 safe_free(ftpState->ctrl.last_reply);
 ftpState->ctrl.last_command = xstrdup("Connect to server data port");
+ debug(9, 5) ("ftpReadPasv: connecting to %s, port %d\n", ftpState->data.host, ftpState->data.port);
 commConnectStart(fd, ipaddr, port, ftpPasvCallback, ftpState);
 }
 
</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.STABLE9-ftp_EPLF.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.STABLE9-ftp_EPLF.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>