Merge remote-tracking branch 'upstream/master' into feature/fix_ReadCodeLine

This commit is contained in:
SunRunAway 2013-07-10 18:20:42 +08:00
commit 2a6b9c2640
3 changed files with 11 additions and 2 deletions

7
README.md Normal file
View File

@ -0,0 +1,7 @@
# goftp #
A FTP client package for Go
## Documentation ##
http://godoc.org/github.com/jlaffaye/goftp

View File

@ -111,6 +111,7 @@ func TestConn(t *testing.T) {
}
}
// ftp.mozilla.org uses multiline 220 response
func TestConn2(t *testing.T) {
c, err := Connect("ftp.mozilla.org:21")
if err != nil {
@ -126,4 +127,6 @@ func TestConn2(t *testing.T) {
if err != nil {
t.Error(err)
}
c.Quit()
}

View File

@ -1,11 +1,10 @@
package ftp
import (
"time"
"testing"
"time"
)
var thisYear, _, _ = time.Now().Date()
type line struct {