diff mbox

Fix crash when connecting to VNC through websocket

Message ID A24CCA9D-484A-4AD0-A34C-8DFB6D891D7F@gmail.com
State New
Headers show

Commit Message

Jorge Acereda MaciĆ” Feb. 24, 2015, 12:29 a.m. UTC
Please, forget my previous patch, worked somehow with Chrome but failed with Safari (with a good reason, the sent headers were incorrect). This one should be correct and simpler.

Signed-off-by: Jorge Acereda Macia <jacereda@gmail.com>

---
 ui/vnc-ws.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Peter Crosthwaite Feb. 24, 2015, 6:09 a.m. UTC | #1
The subject should read V2 as this is a resubmit. Use git format-patch
--subject-prefix="PATCH v2".

On Mon, Feb 23, 2015 at 4:29 PM, Jorge Acereda MaciĆ” <jacereda@gmail.com> wrote:
> Please, forget my previous patch, worked somehow with Chrome but failed with Safari (with a good reason, the sent headers were incorrect). This one should be correct and simpler.
>

You should also start a fresh with your commit message content. Don't
mention discarded versions of the patch or changes in your patch
content. Just say what the patch does. Your v1 commit message looks
good and coulld probably be reused as-is.

> Signed-off-by: Jorge Acereda Macia <jacereda@gmail.com>
>
> ---

But you put you patch change log here, below the "---". This allows
reviewers to see your change information, but git will discard the
changlog on application of the final accepted version.

Regards,
Peter

>  ui/vnc-ws.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
> index e304baf..d75950d 100644
> --- a/ui/vnc-ws.c
> +++ b/ui/vnc-ws.c
> @@ -207,8 +207,7 @@ static void vncws_send_handshake_response(VncState *vs, const char* key)
>      }
>
>      response = g_strdup_printf(WS_HANDSHAKE, accept);
> -    vnc_write(vs, response, strlen(response));
> -    vnc_flush(vs);
> +    vnc_client_write_buf(vs, (const uint8_t *)response, strlen(response));
>
>      g_free(accept);
>      g_free(response);
> --
> 1.9.3 (Apple Git-50)
>
>
>
Eric Blake Feb. 24, 2015, 4:33 p.m. UTC | #2
On 02/23/2015 11:09 PM, Peter Crosthwaite wrote:
> The subject should read V2 as this is a resubmit. Use git format-patch
> --subject-prefix="PATCH v2".

Or shorter,

git format-patch -v2

Also, remember that 'git send-email' will take any options understood by
'git format-patch'.
diff mbox

Patch

diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index e304baf..d75950d 100644
--- a/ui/vnc-ws.c
+++ b/ui/vnc-ws.c
@@ -207,8 +207,7 @@  static void vncws_send_handshake_response(VncState *vs, const char* key)
     }
 
     response = g_strdup_printf(WS_HANDSHAKE, accept);
-    vnc_write(vs, response, strlen(response));
-    vnc_flush(vs);
+    vnc_client_write_buf(vs, (const uint8_t *)response, strlen(response));
 
     g_free(accept);
     g_free(response);