gofix for release r59

connection.go

@@ -242,9 +242,9 @@ func (c *Conn) receive(data []byte) {
 		c.sio.Log("sio/conn: receive/decode:", err, c)
 		return
 	}
-	
+
 	c.ticker.Reset(c.sio.config.HeartbeatInterval)
-	
+
 	for _, m := range msgs {
 		if hb, ok := m.heartbeat(); ok {
 			c.lastHeartbeat = hb

socketio.go

@@ -22,10 +22,10 @@ type SocketIO struct {
 
 	// The callbacks set by the user
 	callbacks struct {
-		onConnect    func(*Conn)          // Invoked on new connection.
-		onDisconnect func(*Conn)          // Invoked on a lost connection.
-		onMessage    func(*Conn, Message) // Invoked on a message.
-		isAuthorized func(*http.Request) bool  // Auth test during new http request
+		onConnect    func(*Conn)              // Invoked on new connection.
+		onDisconnect func(*Conn)              // Invoked on a lost connection.
+		onMessage    func(*Conn, Message)     // Invoked on a message.
+		isAuthorized func(*http.Request) bool // Auth test during new http request
 	}
 }
 
@@ -146,13 +146,13 @@ func (sio *SocketIO) handle(t Transport, w http.ResponseWriter, req *http.Reques
 	var parts []string
 	var c *Conn
 	var err os.Error
-	
+
 	if allowed := sio.isAuthorized(req); !allowed {
 		sio.Log("sio/handle: unauthorized request:", req)
 		w.WriteHeader(http.StatusUnauthorized)
-		return	
+		return
 	}
-	
+
 	if origin := req.Header.Get("Origin"); origin != "" {
 		if _, ok := sio.verifyOrigin(origin); !ok {
 			sio.Log("sio/handle: unauthorized origin:", origin)
@@ -185,7 +185,7 @@ func (sio *SocketIO) handle(t Transport, w http.ResponseWriter, req *http.Reques
 			pathLen--
 		}
 
-		parts = strings.Split(req.URL.Path[i:pathLen], "/", -1)
+		parts = strings.Split(req.URL.Path[i:pathLen], "/")
 	}
 
 	if len(parts) < 2 || parts[1] == "" {
@@ -267,10 +267,10 @@ func (sio *SocketIO) verifyOrigin(reqOrigin string) (string, bool) {
 		return "", false
 	}
 
-	host := strings.Split(url.Host, ":", 2)
+	host := strings.SplitN(url.Host, ":", 2)
 
 	for _, o := range sio.config.Origins {
-		origin := strings.Split(o, ":", 2)
+		origin := strings.SplitN(o, ":", 2)
 		if origin[0] == "*" || origin[0] == host[0] {
 			if len(origin) < 2 || origin[1] == "*" {
 				return o, true
@@ -306,7 +306,7 @@ func (sio *SocketIO) generatePolicyFile() []byte {
 
 	if sio.config.Origins != nil {
 		for _, origin := range sio.config.Origins {
-			parts := strings.Split(origin, ":", 2)
+			parts := strings.SplitN(origin, ":", 2)
 			if len(parts) < 1 {
 				continue
 			}