Merge branch 'fix_proxy'

DataDog · Jun 19, 2014 · 344d97d · 344d97d
2 parents d18f32e + 3fb3264
commit 344d97d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/config.py b/config.py
@@ -61,7 +61,7 @@ def get_parsed_args():
 
 
 def get_version():
-    return "4.3.0"
+    return "4.3.1"
 
 def skip_leading_wsp(f):
     "Works on a file, returns a file-like object"

diff --git a/ddagent.py b/ddagent.py
@@ -204,6 +204,11 @@ def flush(self):
 
             if proxy_settings is not None and endpoint != PUP_ENDPOINT:
 
+                # When using a proxy we do a CONNECT request why shouldn't include Content-Length
+                # This is pretty hacky though as it should be done in pycurl or curl or tornado
+                del tornado_client_params['headers']['Content-Length']
+                log.debug("Removing Content-Length header.")
+
                 log.debug("Configuring tornado to use proxy settings: %s:****@%s:%s" % (proxy_settings['user'],
                     proxy_settings['host'], proxy_settings['port']))
                 tornado_client_params['proxy_host'] = proxy_settings['host']