Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 2 additions & 37 deletions pkg/web/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -390,10 +390,8 @@ func serviceRpc(w http.ResponseWriter, r *http.Request) {

version := r.Header.Get("Git-Protocol")

var stdout bytes.Buffer
cmd := git.ServiceCommand{
Stdout: &stdout,
Dir: dir,
Dir: dir,
}

switch service {
Expand Down Expand Up @@ -438,7 +436,7 @@ func serviceRpc(w http.ResponseWriter, r *http.Request) {
}

cmd.Stdin = reader
cmd.Stdout = &flushResponseWriter{w}
cmd.Stdout = w

if err := service.Handler(ctx, cmd); err != nil {
logger.Errorf("failed to handle service: %v", err)
Expand All @@ -452,39 +450,6 @@ func serviceRpc(w http.ResponseWriter, r *http.Request) {
}
}

// Handle buffered output
// Useful when using proxies
type flushResponseWriter struct {
http.ResponseWriter
}

func (f *flushResponseWriter) ReadFrom(r io.Reader) (int64, error) {
flusher := http.NewResponseController(f.ResponseWriter)

var n int64
p := make([]byte, 1024)
for {
nRead, err := r.Read(p)
if err == io.EOF {
break
}
nWrite, err := f.ResponseWriter.Write(p[:nRead])
if err != nil {
return n, err
}
if nRead != nWrite {
return n, err
}
n += int64(nRead)
// ResponseWriter must support http.Flusher to handle buffered output.
if err := flusher.Flush(); err != nil {
return n, fmt.Errorf("%w: error while flush", err)
}
}

return n, nil
}

func getInfoRefs(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
cfg := config.FromContext(ctx)
Expand Down
1 change: 0 additions & 1 deletion pkg/web/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ func NewRouter(ctx context.Context) http.Handler {
// Adds context to the request
h := NewLoggingMiddleware(router, logger)
h = NewContextHandler(ctx)(h)
h = handlers.CompressHandler(h)
h = handlers.RecoveryHandler()(h)

cfg := config.FromContext(ctx)
Expand Down