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.

diff --git a/Annex/Proxy.hs b/Annex/Proxy.hs
index ba46087451016bfe95c5493af9ed6a31f3ed5241..34bed0f24ae4f03551b983a8a12eec367f7cd7e0 100644 (file)
--- 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 68799817b46263217121458acfcc340ba63c539f..d050ab797662cb25c203f989d8a96ce0469cae7f 100644 (file)
--- 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.