Skip to content

Commit 013f682

Browse files
committed
set all of decode_context in decoder
Signed-off-by: Somtochi Onyekwere <[email protected]>
1 parent 9e9e489 commit 013f682

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

src/messages/codec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ where
7070
{
7171
if let Some(msg_len) = get_length(buf, offset) {
7272
if msg_len > max_size {
73-
return Err(PgWireError::MessageTooLarge(msg_len, max_size));
73+
return Err(PgWireError::MessageTooLarge(max_size, msg_len));
7474
}
7575

7676
if buf.remaining() >= msg_len + offset {

src/messages/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ pub trait Message: Sized {
103103
let len = self.message_length();
104104
if len > Self::max_message_length() {
105105
return Err(PgWireError::MessageTooLarge(
106-
len,
107106
Self::max_message_length(),
107+
len,
108108
));
109109
}
110110

src/tokio/server.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,19 @@ impl<S> Decoder for PgWireMessageServerCodec<S> {
4848
self.decode_context.protocol_version = self.client_info.protocol_version;
4949

5050
match self.client_info.state() {
51-
PgWireConnectionState::AwaitingSslRequest => {}
51+
PgWireConnectionState::AwaitingSslRequest => {
52+
self.decode_context.awaiting_ssl = true;
53+
self.decode_context.awaiting_startup = true;
54+
}
5255

5356
PgWireConnectionState::AwaitingStartup => {
5457
self.decode_context.awaiting_ssl = false;
58+
self.decode_context.awaiting_startup = true;
5559
}
5660

5761
_ => {
5862
self.decode_context.awaiting_startup = false;
63+
self.decode_context.awaiting_ssl = false;
5964
}
6065
}
6166

0 commit comments

Comments
 (0)