AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-12 05:20:17 +00:00
Code Issues Projects Releases Wiki Activity

broadway: Make Sec-WebSocket-Origin optional

Browse Source 
Sometimes we get no Origin in the request
This commit is contained in:
Alexander Larsson 2013-01-10 22:50:03 +01:00
parent 2e76e5a543
commit da8ff82df5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gdk/broadway/broadway-server.c
View File

@ -950,7 +950,7 @@ start_input (HttpRequest *request, gboolean binary)
} }
} }
if (origin == NULL || host == NULL) if (host == NULL)
{ {
g_strfreev (lines); g_strfreev (lines);
send_error (request, 400, "Bad websocket request"); send_error (request, 400, "Bad websocket request");
@ -964,10 +964,12 @@ start_input (HttpRequest *request, gboolean binary)
"Upgrade: websocket\r\n" "Upgrade: websocket\r\n"
"Connection: Upgrade\r\n" "Connection: Upgrade\r\n"
"Sec-WebSocket-Accept: %s\r\n" "Sec-WebSocket-Accept: %s\r\n"
"Sec-WebSocket-Origin: %s\r\n" "%s%s%s"
"Sec-WebSocket-Location: ws://%s/socket\r\n" "Sec-WebSocket-Location: ws://%s/socket\r\n"
"Sec-WebSocket-Protocol: broadway\r\n" "Sec-WebSocket-Protocol: broadway\r\n"
"\r\n", accept, origin, host); "\r\n", accept,
origin?"Sec-WebSocket-Origin: ":"", origin?origin:"", origin?"\r\n":"",
host);
g_free (accept); g_free (accept);
#ifdef DEBUG_WEBSOCKETS #ifdef DEBUG_WEBSOCKETS
@ -1013,11 +1015,12 @@ start_input (HttpRequest *request, gboolean binary)
res = g_strdup_printf ("HTTP/1.1 101 WebSocket Protocol Handshake\r\n" res = g_strdup_printf ("HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
"Upgrade: WebSocket\r\n" "Upgrade: WebSocket\r\n"
"Connection: Upgrade\r\n" "Connection: Upgrade\r\n"
"Sec-WebSocket-Origin: %s\r\n" "%s%s%s"
"Sec-WebSocket-Location: ws://%s/socket\r\n" "Sec-WebSocket-Location: ws://%s/socket\r\n"
"Sec-WebSocket-Protocol: broadway\r\n" "Sec-WebSocket-Protocol: broadway\r\n"
"\r\n", "\r\n",
origin, host); origin?"Sec-WebSocket-Origin: ":"", origin?origin:"", origin?"\r\n":"",
host);
#ifdef DEBUG_WEBSOCKETS #ifdef DEBUG_WEBSOCKETS
g_print ("legacy response:\n%s", res); g_print ("legacy response:\n%s", res);