aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-10-04 10:36:51 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-10-04 10:36:51 +0000
commit95def48071e54c769ee063ddf53f05c9595602d2 (patch)
tree92fb9afab75a2ebad3a2c8f19096ccad2da851ea /lib
parent2ee6c334126b257708ac92b19c57701e18bb31cc (diff)
Made the dns entry remain locked while a connection to the host remains to
allow verbose output during this period. Bertrand Demiddelaer reported and helped fixing.
Diffstat (limited to 'lib')
-rw-r--r--lib/easy.c5
-rw-r--r--lib/hostip.c9
-rw-r--r--lib/url.c31
3 files changed, 25 insertions, 20 deletions
diff --git a/lib/easy.c b/lib/easy.c
index 4782fc459..228d2aef0 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -391,11 +391,6 @@ void curl_easy_cleanup(CURL *curl)
if(!data)
return;
- if ( ! (data->share && data->share->hostcache) ) {
- if ( !Curl_global_host_cache_use(data)) {
- Curl_hash_destroy(data->hostcache);
- }
- }
Curl_close(data);
}
diff --git a/lib/hostip.c b/lib/hostip.c
index f3aa36c6a..c9c78784f 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -263,8 +263,9 @@ void Curl_hostcache_prune(struct SessionHandle *data)
{
time_t now;
- if(data->set.dns_cache_timeout == -1)
- /* cache forever means never prune! */
+ if((data->set.dns_cache_timeout == -1) || !data->hostcache)
+ /* cache forever means never prune, and NULL hostcache means
+ we can't do it */
return;
if(data->share)
@@ -459,7 +460,11 @@ int Curl_resolv(struct connectdata *conn,
}
}
else {
+ if(data->share)
+ Curl_share_lock(data, CURL_LOCK_DATA_DNS, CURL_LOCK_ACCESS_SINGLE);
dns->inuse++; /* we use it! */
+ if(data->share)
+ Curl_share_unlock(data, CURL_LOCK_DATA_DNS);
rc = CURLRESOLV_RESOLVED;
}
diff --git a/lib/url.c b/lib/url.c
index c0921ced4..9ac054a68 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -204,6 +204,12 @@ CURLcode Curl_close(struct SessionHandle *data)
/* Loop through all open connections and kill them one by one */
while(-1 != ConnectionKillOne(data));
+ if ( ! (data->share && data->share->hostcache) ) {
+ if ( !Curl_global_host_cache_use(data)) {
+ Curl_hash_destroy(data->hostcache);
+ }
+ }
+
#ifdef USE_SSLEAY
/* Close down all open SSL info and sessions */
Curl_SSL_Close_All(data);
@@ -1432,6 +1438,17 @@ CURLcode Curl_disconnect(struct connectdata *conn)
data = conn->data;
+ if(conn->dns_entry)
+ Curl_resolv_unlock(data, conn->dns_entry); /* done with this */
+
+#if defined(CURLDEBUG) && defined(AGGRESIVE_TEST)
+ /* scan for DNS cache entries still marked as in use */
+ Curl_hash_apply(data->hostcache,
+ NULL, Curl_scan_cache_used);
+#endif
+
+ Curl_hostcache_prune(data); /* kill old DNS cache entries */
+
/*
* The range string is usually freed in curl_done(), but we might
* get here *instead* if we fail prematurely. Thus we need to be able
@@ -3230,8 +3247,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
if(conn->bits.reuse) {
/* re-used connection, no resolving is necessary */
hostaddr = NULL;
- conn->dns_entry = NULL; /* we don't connect now so we don't have any fresh
- dns entry struct to point to */
+ /* we'll need to clear conn->dns_entry later in Curl_disconnect() */
if (conn->bits.httpproxy)
fix_hostname(conn, &conn->host);
@@ -3480,17 +3496,6 @@ CURLcode Curl_done(struct connectdata **connp,
conn->newurl = NULL;
}
- if(conn->dns_entry)
- Curl_resolv_unlock(conn->data, conn->dns_entry); /* done with this */
-
-#if defined(CURLDEBUG) && defined(AGGRESIVE_TEST)
- /* scan for DNS cache entries still marked as in use */
- Curl_hash_apply(data->hostcache,
- NULL, Curl_scan_cache_used);
-#endif
-
- Curl_hostcache_prune(data); /* kill old DNS cache entries */
-
/* this calls the protocol-specific function pointer previously set */
if(conn->curl_done)
result = conn->curl_done(conn, status);