go
/
ws
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

minmod + rename statusCode.'Explicit()' to 'Message()'

This commit is contained in:
xdrm-brackets 2018-04-26 11:05:08 +02:00
parent c4863e396b
commit 5f88fede99
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/http/upgrade/request/public.go
View File

@ -64,7 +64,7 @@ func (r T) String() string{
l1 := fmt.Sprintf("Upgrade Request\n - host: %s\n - port: %d\n - origin: %s\n", r.host, r.port, r.origin) l1 := fmt.Sprintf("Upgrade Request\n - host: %s\n - port: %d\n - origin: %s\n", r.host, r.port, r.origin)
l2 := fmt.Sprintf(" - origin policy: %t\n - connection header: %t\n - upgrade header: %t\n - valid ws version: %t\n", r.validPolicy, r.hasConnection, r.hasUpgrade, r.hasVersion) l2 := fmt.Sprintf(" - origin policy: %t\n - connection header: %t\n - upgrade header: %t\n - valid ws version: %t\n", r.validPolicy, r.hasConnection, r.hasUpgrade, r.hasVersion)
l3 := fmt.Sprintf(" - key: %s\n - protocols: %s\n", r.key, r.protocols) l3 := fmt.Sprintf(" - key: %s\n - protocols: %s\n", r.key, r.protocols)
l4 := fmt.Sprintf(" - current status: %d %s\n", r.code, r.code.Explicit()) l4 := fmt.Sprintf(" - current status: %d %s\n", r.code, r.code.Message())
return fmt.Sprintf("%s%s%s%s", l1, l2, l3, l4) return fmt.Sprintf("%s%s%s%s", l1, l2, l3, l4)

2
internal/http/upgrade/response/public.go
View File

@ -40,7 +40,7 @@ func (r *T) ProcessKey(k []byte) {
func (r T) Send(w io.Writer) (int, error) { func (r T) Send(w io.Writer) (int, error) {
/* (1) Build response line */ /* (1) Build response line */
responseLine := fmt.Sprintf("HTTP/%s %d %s\r\n", HttpVersion, r.code, r.code.Explicit()) responseLine := fmt.Sprintf("HTTP/%s %d %s\r\n", HttpVersion, r.code, r.code.Message())
/* (2) Build headers */ /* (2) Build headers */
optionalProtocol := "" optionalProtocol := ""

2
internal/http/upgrade/response/status_code.go
View File

@ -10,7 +10,7 @@ var UPGRADE_REQUIRED StatusCode = 426 // invalid WS version
var NOT_FOUND StatusCode = 404 // unserved or invalid URI var NOT_FOUND StatusCode = 404 // unserved or invalid URI
var INTERNAL StatusCode = 500 // custom error var INTERNAL StatusCode = 500 // custom error
func (sc StatusCode) Explicit() string { func (sc StatusCode) Message() string {
switch sc { switch sc {
case SWITCHING_PROTOCOLS: return "Switching Protocols" case SWITCHING_PROTOCOLS: return "Switching Protocols"

2
upgrader/public.go
View File

@ -18,7 +18,7 @@ func Upgrade(s net.Conn) error {
/* (3) Write into socket */ /* (3) Write into socket */
_, err := res.Send(s) _, err := res.Send(s)
if err != nil { if err != nil {
return fmt.Errorf("Socket write: %s", err) return fmt.Errorf("Socket write error: %s", err)
} }
return nil return nil