From e2c05fea94c53f3191e79a556452255140dba9b1 Mon Sep 17 00:00:00 2001
From: Matt Goodall <matt.goodall@gmail.com>
Date: Mon, 9 Jul 2012 02:49:33 +0100
Subject: [PATCH] Send xml PI encoding. Route through Stream.send for logging.

---
 src/xmpp/stream.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/stream.go b/src/xmpp/stream.go
index d053cc7..6852259 100644
--- a/src/xmpp/stream.go
+++ b/src/xmpp/stream.go
@@ -31,12 +31,13 @@ func NewStream(addr string) (*Stream, error) {
 		return nil, err
 	}
 
-	if _, err := conn.Write([]byte("<?xml version='1.0'?>")); err != nil {
+	stream := &Stream{conn, xml.NewDecoder(conn)}
+
+	if err := stream.send([]byte("<?xml version='1.0' encoding='utf-8'?>")); err != nil {
 		return nil, err
 	}
 
-	dec := xml.NewDecoder(conn)
-	return &Stream{conn, dec}, nil
+	return stream, nil
 }
 
 // Upgrade the stream's underlying net conncetion to TLS.