nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

tools/web: improve redirection reliability

Browse Source
This commit is contained in:
nemunaire 2017-07-04 07:26:37 +02:00 committed by nemunaire
parent b1ad4bcf23
commit 109b7440e0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nemubot/tools/web.py
View File

@ -14,7 +14,7 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from urllib.parse import urlparse, urlsplit, urlunsplit from urllib.parse import urljoin, urlparse, urlsplit, urlunsplit
from nemubot.exception import IMException from nemubot.exception import IMException
@ -156,7 +156,11 @@ def getURLContent(url, body=None, timeout=7, header=None):
elif ((res.status == http.client.FOUND or elif ((res.status == http.client.FOUND or
res.status == http.client.MOVED_PERMANENTLY) and res.status == http.client.MOVED_PERMANENTLY) and
res.getheader("Location") != url): res.getheader("Location") != url):
return getURLContent(res.getheader("Location"), timeout=timeout) return getURLContent(
urljoin(url, res.getheader("Location")),
body=body,
timeout=timeout,
header=header)
else: else:
raise IMException("A HTTP error occurs: %d - %s" % raise IMException("A HTTP error occurs: %d - %s" %
(res.status, http.client.responses[res.status])) (res.status, http.client.responses[res.status]))