Merge pull request 'fix query param struct filling' (#167) from matchesfix into v3

Reviewed-on: #167
This commit is contained in:
Василий Толстов 2023-05-29 12:27:16 +03:00
commit cd3e2526b4

View File

@ -487,11 +487,13 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
} }
if len(matches) > 0 {
matches = rflutil.FlattenMap(matches) matches = rflutil.FlattenMap(matches)
if err = rflutil.Merge(argv.Interface(), matches, rflutil.SliceAppend(true), rflutil.Tags([]string{"protobuf", "json"})); err != nil { if err = rflutil.Merge(argv.Interface(), matches, rflutil.SliceAppend(true), rflutil.Tags([]string{"protobuf", "json"})); err != nil {
h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest) h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
return return
} }
}
hr := &rpcRequest{ hr := &rpcRequest{
codec: cf, codec: cf,