Skip to content

Commit

Permalink
Merge branch 'v1' into jh/use-sigterm
Browse files Browse the repository at this point in the history
  • Loading branch information
jhump authored Nov 20, 2023
2 parents 35da051 + 23ff2a3 commit 550e227
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions internal/gen/proto/go/connectrpc/conformance/v1/service.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions proto/connectrpc/conformance/v1/client_compat.proto
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,10 @@ message ClientCompatRequest {
// or respond with an error if the client receives a request where
// it is set.
//
// The raw request may be specified instead of the above group
// of fields for defining the request to send.
// When this field is present, it defines the actual HTTP request
// that will be sent. The above group of fields must still be
// provided and valid so that the reference client knows how it
// should try to interpret the server's response.
RawHTTPRequest raw_request = 20;
}

Expand Down
2 changes: 1 addition & 1 deletion proto/connectrpc/conformance/v1/service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ message StreamContents {
repeated StreamItem items = 1;
message StreamItem {
uint32 flags = 1; // must be in the range 0 to 255.
optional int32 length = 2; // if absent use actual length of payload
optional uint32 length = 2; // if absent use actual length of payload
MessageContents payload = 3;
}
}
Expand Down

0 comments on commit 550e227

Please sign in to comment.