summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/json.c3
-rw-r--r--src/testdir/test_channel_lsp.py4
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/json.c b/src/json.c
index acf7ac57cf..e2a011309c 100644
--- a/src/json.c
+++ b/src/json.c
@@ -105,8 +105,7 @@ json_encode_lsp_msg(typval_T *val)
ga_init2(&lspga, 1, 4000);
// Header according to LSP specification.
vim_snprintf((char *)IObuff, IOSIZE,
- "Content-Length: %u\r\n"
- "Content-Type: application/vscode-jsonrpc; charset=utf-8\r\n\r\n",
+ "Content-Length: %u\r\n\r\n",
ga.ga_len - 1);
ga_concat(&lspga, IObuff);
ga_concat_len(&lspga, ga.ga_data, ga.ga_len);
diff --git a/src/testdir/test_channel_lsp.py b/src/testdir/test_channel_lsp.py
index dd107be157..eccb8937f0 100644
--- a/src/testdir/test_channel_lsp.py
+++ b/src/testdir/test_channel_lsp.py
@@ -172,7 +172,7 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
def do_extra_hdr_fields(self, payload):
self.send_extra_hdr_fields(payload['id'], 'extra-hdr-fields')
- def do_delayad_payload(self, payload):
+ def do_delayed_payload(self, payload):
self.send_delayed_payload(payload['id'], 'delayed-payload')
def do_hdr_without_len(self, payload):
@@ -208,7 +208,7 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
'msg-specific-cb': self.do_msg_specific_cb,
'server-req': self.do_server_req,
'extra-hdr-fields': self.do_extra_hdr_fields,
- 'delayed-payload': self.do_delayad_payload,
+ 'delayed-payload': self.do_delayed_payload,
'hdr-without-len': self.do_hdr_without_len,
'hdr-with-wrong-len': self.do_hdr_with_wrong_len,
'hdr-with-negative-len': self.do_hdr_with_negative_len,
diff --git a/src/version.c b/src/version.c
index eb7d598eeb..9e4e742341 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1790,
+/**/
1789,
/**/
1788,