From 83432149e212155469b1e9f06eb0095121377356 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 7 Dec 2015 16:48:51 -0700 Subject: Import patches-unapplied version 2.1.2-0ubuntu1 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: 04946cba49f19c0b6b876bccdbb36d47334af002 New changelog entries: * New upstream release (LP: #1523715): - Bug fixes for Ubuntu 15.10 on Azure - Enablement for Azure Stack - Dropped patch for systemd job as upstream now includes it. --- azurelinuxagent/utils/restutil.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'azurelinuxagent/utils/restutil.py') diff --git a/azurelinuxagent/utils/restutil.py b/azurelinuxagent/utils/restutil.py index 1015f71..2acfa57 100644 --- a/azurelinuxagent/utils/restutil.py +++ b/azurelinuxagent/utils/restutil.py @@ -1,4 +1,4 @@ -# Windows Azure Linux Agent +# Microsoft Azure Linux Agent # # Copyright 2014 Microsoft Corporation # @@ -66,7 +66,7 @@ def _http_request(method, host, rel_uri, port=None, data=None, secure=False, #If proxy is used, full url is needed. url = "https://{0}:{1}{2}".format(host, port, rel_uri) else: - conn = httpclient.HTTPSConnection(host, port) + conn = httpclient.HTTPSConnection(host, port, timeout=10) url = rel_uri else: port = 80 if port is None else port @@ -75,7 +75,7 @@ def _http_request(method, host, rel_uri, port=None, data=None, secure=False, #If proxy is used, full url is needed. url = "http://{0}:{1}{2}".format(host, port, rel_uri) else: - conn = httpclient.HTTPConnection(host, port) + conn = httpclient.HTTPConnection(host, port, timeout=10) url = rel_uri if headers == None: conn.request(method, url, data) -- cgit v1.2.3