aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2010-07-12 16:48:49 -0700
committerRuss Cox <rsc@golang.org>2010-07-12 16:48:49 -0700
commit36560d2b4a916f8461ef9ee5a5a7c193878046a6 (patch)
tree5369ecbb7c0ece3028a8b10541539f21acdb4f96
parentccd28e8eb6f81f21093deb730ea70982cb381514 (diff)
downloadgo-36560d2b4a916f8461ef9ee5a5a7c193878046a6.tar.gz
go-36560d2b4a916f8461ef9ee5a5a7c193878046a6.zip
pem: print \n after 1 header line too
rearrange to make reason for if clear. Fixes #911. R=agl1 CC=golang-dev https://golang.org/cl/1774044
-rw-r--r--src/pkg/encoding/pem/pem.go13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/pkg/encoding/pem/pem.go b/src/pkg/encoding/pem/pem.go
index f39540756b..5653aeb77c 100644
--- a/src/pkg/encoding/pem/pem.go
+++ b/src/pkg/encoding/pem/pem.go
@@ -218,14 +218,13 @@ func Encode(out io.Writer, b *Block) (err os.Error) {
return
}
- for k, v := range b.Headers {
- _, err = out.Write([]byte(k + ": " + v + "\n"))
- if err != nil {
- return
+ if len(b.Headers) > 0 {
+ for k, v := range b.Headers {
+ _, err = out.Write([]byte(k + ": " + v + "\n"))
+ if err != nil {
+ return
+ }
}
- }
-
- if len(b.Headers) > 1 {
_, err = out.Write([]byte{'\n'})
if err != nil {
return