Module Name: src
Committed By: snj
Date: Fri Apr 29 19:03:44 UTC 2016
Modified Files:
src/usr.bin/ftp [netbsd-7]: fetch.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1153):
usr.bin/ftp/fetch.c: revision 1.223
PR/51043: Yorick Hardy: ftp(1) should use the port number for CONNECT
To generate a diff of this commit:
cvs rdiff -u -r1.205.4.3 -r1.205.4.4 src/usr.bin/ftp/fetch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.205.4.3 src/usr.bin/ftp/fetch.c:1.205.4.4
--- src/usr.bin/ftp/fetch.c:1.205.4.3 Sun Mar 13 11:49:14 2016
+++ src/usr.bin/ftp/fetch.c Fri Apr 29 19:03:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.205.4.3 2016/03/13 11:49:14 martin Exp $ */
+/* $NetBSD: fetch.c,v 1.205.4.4 2016/04/29 19:03:44 snj Exp $ */
/*-
* Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.205.4.3 2016/03/13 11:49:14 martin Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.205.4.4 2016/04/29 19:03:44 snj Exp $");
#endif /* not lint */
/*
@@ -847,8 +847,8 @@ print_connect(FETCH *fin, const struct u
} else
h = ui->host;
- fetch_printf(fin, "CONNECT %s:%s HTTP/1.1\r\n", h, ui->port);
- fetch_printf(fin, "Host: %s:%s\r\n", h, ui->port);
+ fetch_printf(fin, "CONNECT %s:%d HTTP/1.1\r\n", h, ui->portnum);
+ fetch_printf(fin, "Host: %s:%d\r\n", h, ui->portnum);
}
#endif
