From ef8f24f28cdc7dd75db48467ae47d6775b081f21 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 28 Jul 2024 09:14:42 -0400 Subject: [PATCH] fix PUT to http proxied special remote It was hanging because it never sent FAILURE in the INVALID case. And putoffset always triggers the INVALID case. --- Annex/Proxy.hs | 2 +- doc/todo/git-annex_proxies.mdwn | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Annex/Proxy.hs b/Annex/Proxy.hs index ba46087451..34bed0f24a 100644 --- a/Annex/Proxy.hs +++ b/Annex/Proxy.hs @@ -175,7 +175,7 @@ proxySpecialRemote protoversion r ihdl ohdl owaitv endv = go Just (VALIDITY Valid) -> store Just (VALIDITY Invalid) -> - return () + liftIO $ sendmessage FAILURE _ -> giveup "protocol error" else store _ -> giveup "protocol error" diff --git a/doc/todo/git-annex_proxies.mdwn b/doc/todo/git-annex_proxies.mdwn index 68799817b4..d050ab7976 100644 --- a/doc/todo/git-annex_proxies.mdwn +++ b/doc/todo/git-annex_proxies.mdwn @@ -28,11 +28,8 @@ Planned schedule of work: ## work notes -* test http server proxying with special remotes - - git-annex get --from origin-d works - git-annex drop --from origin-d works - git-annex copy --to origin-d HANGS +* shut down of a connection to a http proxied special remote may not work + properly * Make http server support clusters.