From f88f96383d81bb32ae1047deda996ff6d054c0f0 Mon Sep 17 00:00:00 2001
From: marco <m.toma99@gmail.com>
Date: Fri, 27 Dec 2019 18:29:46 +0100
Subject: [PATCH] risolta doppia chiamata

---
 core/httptools.py       | 2 +-
 specials/resolverdns.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/httptools.py b/core/httptools.py
index 2debd727..a6d90ba0 100755
--- a/core/httptools.py
+++ b/core/httptools.py
@@ -441,7 +441,7 @@ def downloadpage(url, **opt):
     opt['url_save'] = url
     opt['post_save'] = opt.get('post', None)
 
-    while opt['proxy_retries_counter'] <= opt.get('proxy_retries', 1):
+    while opt['proxy_retries_counter'] < opt.get('proxy_retries', 1):
         response = {}
         info_dict = []
         payload = dict()
diff --git a/specials/resolverdns.py b/specials/resolverdns.py
index daa30146..0b19637c 100644
--- a/specials/resolverdns.py
+++ b/specials/resolverdns.py
@@ -132,6 +132,7 @@ class session(requests.Session):
                     ret = self.request(method, newUrl, headers=headers, **kwargs)
                     newUrl = ret.headers.get('Location', realUrl)
                     redirectN += 1
+            ret.url = newUrl
         except Exception as e:
             logger.info('Request for ' + domain + ' with ip ' + ip + ' failed')
             logger.info(e)
@@ -139,5 +140,6 @@ class session(requests.Session):
         if (tryFlush or not ret) and not flushedDns:  # re-request ips and update cache
             logger.info('Flushing dns cache for ' + domain)
             return self.flushDns(method, realUrl, domain, **kwargs)
+
         logger.info('tempo dns: ' + str(time.time()-t))
         return ret