===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/fetch.c,v
retrieving revision 1.210
retrieving revision 1.211
diff -c -r1.210 -r1.211
*** src/usr.bin/ftp/fetch.c	2022/09/15 12:47:10	1.210
--- src/usr.bin/ftp/fetch.c	2022/11/09 16:29:58	1.211
***************
*** 1,4 ****
! /*	$OpenBSD: fetch.c,v 1.210 2022/09/15 12:47:10 millert Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: fetch.c,v 1.211 2022/11/09 16:29:58 claudio Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
***************
*** 875,881 ****
  			goto cleanup_url_get;
  		}
  
! 		while (len > 0 && (buf[len-1] == '\r' || buf[len-1] == '\n'))
  			buf[--len] = '\0';
  		if (len == 0)
  			break;
--- 875,882 ----
  			goto cleanup_url_get;
  		}
  
! 		while (len > 0 && (buf[len-1] == '\r' || buf[len-1] == '\n' ||
! 		    buf[len-1] == ' ' || buf[len-1] == '\t'))
  			buf[--len] = '\0';
  		if (len == 0)
  			break;
***************
*** 1161,1167 ****
  		if (getline(&header, &hsize, fin) == -1)
  			break;
  		/* strip CRLF and any optional chunk extension */
! 		header[strcspn(header, ";\r\n")] = '\0';
  		errno = 0;
  		chunksize = strtoul(header, &end, 16);
  		if (errno || header[0] == '\0' || *end != '\0' ||
--- 1162,1168 ----
  		if (getline(&header, &hsize, fin) == -1)
  			break;
  		/* strip CRLF and any optional chunk extension */
! 		header[strcspn(header, "; \t\r\n")] = '\0';
  		errno = 0;
  		chunksize = strtoul(header, &end, 16);
  		if (errno || header[0] == '\0' || *end != '\0' ||