Merge branch 'baserock/richardipsum/distbuild_improve_annotation3'

Conflicts:
	distbuild/build_controller.py

Reviewed by:
    Lars Wirzenius
    Daniel Silverstone
    Sam Thursfield

1 files changed, 8 insertions, 2 deletions

diff --git a/distbuild-helper b/distbuild-helper
index 08e30f10..cdc1873e 100755
--- a/distbuild-helper
+++ b/distbuild-helper
@@ -155,7 +155,9 @@ class HelperMachine(distbuild.StateMachine):
 
         url = msg['url']
         method = msg['method']
-        assert method in ('HEAD', 'GET')
+        headers = msg['headers']
+        body = msg['body']
+        assert method in ('HEAD', 'GET', 'POST')
 
         logging.debug('JsonMachine: http request: %s %s' % (method, url))
 
@@ -166,7 +168,11 @@ class HelperMachine(distbuild.StateMachine):
 
         try:
             conn = httplib.HTTPConnection(netloc)
-            conn.request(method, path)
+
+            if headers:
+                conn.request(method, path, body, headers)
+            else:
+                conn.request(method, path, body)
         except (socket.error, httplib.HTTPException), e:
             status = 418 # teapot
             data = str(e)