Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-18 01:57:02 +00:00
Code Issues Releases Wiki Activity

smtp: rename readByteLine to readDataBlock for #98.

Browse Source 
Update change log.
This commit is contained in:
James Hillyerd
2018-05-06 12:09:55 -07:00
parent 894db04d70
commit fdcb29a52b
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -4,12 +4,20 @@ Change Log
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]
### Added
- SMTP TLS support (thanks kingforaday.)
## [v2.0.0] - 2018-05-05 ## [v2.0.0] - 2018-05-05
### Changed ### Changed
- Corrected docs for INBUCKET_STORAGE_PARAMS (thanks evilmrburns.) - Corrected docs for INBUCKET_STORAGE_PARAMS (thanks evilmrburns.)
- Disabled color log output on Windows, doesn't work there. - Disabled color log output on Windows, doesn't work there.
## [v2.0.0-rc1] - 2018-04-07 ## [v2.0.0-rc1] - 2018-04-07
### Added ### Added

8
pkg/server/smtp/handler.go
View File

@@ -402,7 +402,7 @@ func (s *Session) mailHandler(cmd string, arg string) {
// DATA // DATA
func (s *Session) dataHandler() { func (s *Session) dataHandler() {
s.send("354 Start mail input; end with <CRLF>.<CRLF>") s.send("354 Start mail input; end with <CRLF>.<CRLF>")
msgBuf, err := s.readByteLine() msgBuf, err := s.readDataBlock()
if err != nil { if err != nil {
if netErr, ok := err.(net.Error); ok { if netErr, ok := err.(net.Error); ok {
if netErr.Timeout() { if netErr.Timeout() {
@@ -471,8 +471,8 @@ func (s *Session) send(msg string) {
} }
} }
// readByteLine reads a line of input, returns byte slice. // readDataBlock reads message DATA until `.` using the textproto pkg.
func (s *Session) readByteLine() ([]byte, error) { func (s *Session) readDataBlock() ([]byte, error) {
if err := s.conn.SetReadDeadline(s.nextDeadline()); err != nil { if err := s.conn.SetReadDeadline(s.nextDeadline()); err != nil {
return nil, err return nil, err
} }
@@ -486,7 +486,7 @@ func (s *Session) readByteLine() ([]byte, error) {
return b, err return b, err
} }
// Reads a line of input // readLine reads a line of input respecting deadlines.
func (s *Session) readLine() (line string, err error) { func (s *Session) readLine() (line string, err error) {
if err = s.conn.SetReadDeadline(s.nextDeadline()); err != nil { if err = s.conn.SetReadDeadline(s.nextDeadline()); err != nil {
return "", err return "", err