aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/formdata.c2
-rw-r--r--lib/getenv.c2
-rw-r--r--lib/getinfo.c2
-rw-r--r--lib/getpass.c2
-rw-r--r--lib/hash.c2
-rw-r--r--lib/hostip.c12
-rw-r--r--lib/hostip.h4
-rw-r--r--lib/http_chunks.c2
-rw-r--r--lib/http_digest.c5
-rw-r--r--lib/if2ip.c2
-rw-r--r--lib/krb4.c2
-rw-r--r--lib/llist.c2
-rw-r--r--lib/memdebug.c4
-rw-r--r--lib/mprintf.c2
-rw-r--r--lib/multi.c4
-rw-r--r--lib/netrc.c6
-rw-r--r--lib/security.c2
-rw-r--r--lib/sendf.c2
-rw-r--r--lib/ssluse.c2
-rw-r--r--lib/telnet.c2
20 files changed, 33 insertions, 30 deletions
diff --git a/lib/formdata.c b/lib/formdata.c
index 76798616a..9ac805bb0 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -124,7 +124,7 @@ Content-Disposition: form-data; name="FILECONTENT"
#include "strequal.h"
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
diff --git a/lib/getenv.c b/lib/getenv.c
index f5459072c..09749fde5 100644
--- a/lib/getenv.c
+++ b/lib/getenv.c
@@ -35,7 +35,7 @@
#include <unixlib.h>
#endif
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
diff --git a/lib/getinfo.c b/lib/getinfo.c
index 28975aa94..9bd737020 100644
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -36,7 +36,7 @@
#endif
/* Make this the last #include */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#else
#include <stdlib.h>
diff --git a/lib/getpass.c b/lib/getpass.c
index b6ea97805..5886748b7 100644
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -89,7 +89,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
#endif
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
diff --git a/lib/hash.c b/lib/hash.c
index cd6d5d539..7310aba5a 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -29,7 +29,7 @@
#include "hash.h"
#include "llist.h"
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
/* this must be the last include file */
#include "memdebug.h"
#endif
diff --git a/lib/hostip.c b/lib/hostip.c
index c245ab1b7..5be36a6fa 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -74,7 +74,7 @@
#endif
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
@@ -192,7 +192,7 @@ hostcache_prune(curl_hash *hostcache, int cache_timeout, int now)
hostcache_timestamp_remove);
}
-#if defined(MALLOCDEBUG) && defined(AGGRESIVE_TEST)
+#if defined(CURLDEBUG) && defined(AGGRESIVE_TEST)
/* Called from Curl_done() to check that there's no DNS cache entry with
a non-zero counter left. */
void Curl_scan_cache_used(void *user, void *ptr)
@@ -282,7 +282,7 @@ struct Curl_dns_entry *Curl_resolv(struct SessionHandle *data,
dns->timestamp = now;
dns->inuse++; /* mark entry as in-use */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
dns->entry_id = entry_id;
#endif
@@ -337,7 +337,7 @@ void Curl_freednsinfo(void *freethis)
#ifdef ENABLE_IPV6
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
/* These two are strictly for memory tracing and are using the same
* style as the family otherwise present in memdebug.c. I put these ones
* here since they require a bunch of struct types I didn't wanna include
@@ -631,7 +631,7 @@ static Curl_addrinfo *my_getaddrinfo(struct SessionHandle *data,
step_size+=200;
}
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
infof(data, "gethostbyname_r() uses %d bytes\n", step_size);
#endif
@@ -681,7 +681,7 @@ static Curl_addrinfo *my_getaddrinfo(struct SessionHandle *data,
if(!h) /* failure */
res=1;
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
infof(data, "gethostbyname_r() uses %d bytes\n", step_size);
#endif
if(!res) {
diff --git a/lib/hostip.h b/lib/hostip.h
index d07b75e3d..36828ee1b 100644
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -41,7 +41,7 @@ struct Curl_dns_entry {
time_t timestamp;
long inuse; /* use-counter, make very sure you decrease this
when you're done using the address you received */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
char *entry_id;
#endif
};
@@ -70,7 +70,7 @@ void Curl_freeaddrinfo(Curl_addrinfo *freeaddr);
/* free cached name info */
void Curl_freednsinfo(void *freethis);
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
void curl_freeaddrinfo(struct addrinfo *freethis,
int line, const char *source);
int curl_getaddrinfo(char *hostname, char *service,
diff --git a/lib/http_chunks.c b/lib/http_chunks.c
index 90f891f31..b0309fec8 100644
--- a/lib/http_chunks.c
+++ b/lib/http_chunks.c
@@ -39,7 +39,7 @@
#include <curl/mprintf.h>
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
diff --git a/lib/http_digest.c b/lib/http_digest.c
index 7f62c26b4..51bcb8450 100644
--- a/lib/http_digest.c
+++ b/lib/http_digest.c
@@ -41,7 +41,7 @@
#include <curl/mprintf.h>
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
@@ -106,6 +106,9 @@ CURLdigest Curl_input_digest(struct connectdata *conn,
/* allow the list to be comma-separated */
header++;
}
+
+ if(!data->state.digest.nonce)
+ return CURLDIGEST_BAD;
}
else
/* else not a digest, get out */
diff --git a/lib/if2ip.c b/lib/if2ip.c
index d4cfa5181..07f30986b 100644
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -73,7 +73,7 @@
#endif
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
diff --git a/lib/krb4.c b/lib/krb4.c
index cb4fbc0d2..6c91e2fb9 100644
--- a/lib/krb4.c
+++ b/lib/krb4.c
@@ -64,7 +64,7 @@
#endif
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
diff --git a/lib/llist.c b/lib/llist.c
index ceee9e822..9e38f6766 100644
--- a/lib/llist.c
+++ b/lib/llist.c
@@ -28,7 +28,7 @@
#include "llist.h"
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
/* this must be the last include file */
#include "memdebug.h"
#endif
diff --git a/lib/memdebug.c b/lib/memdebug.c
index c06296910..d159fa0f3 100644
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -1,4 +1,4 @@
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -220,4 +220,4 @@ int curl_fclose(FILE *file, int line, const char *source)
#ifdef VMS
int VOID_VAR_MEMDEBUG;
#endif
-#endif /* MALLOCDEBUG */
+#endif /* CURLDEBUG */
diff --git a/lib/mprintf.c b/lib/mprintf.c
index 08a98c796..b51e883f1 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -48,7 +48,7 @@
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
diff --git a/lib/multi.c b/lib/multi.c
index 3dfccd028..651a47d1b 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -44,7 +44,7 @@
#include "progress.h"
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
@@ -302,7 +302,7 @@ CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles)
easy=multi->easy.next;
while(easy) {
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
fprintf(stderr, "HANDLE %p: State: %x\n",
(char *)easy, easy->state);
#endif
diff --git a/lib/netrc.c b/lib/netrc.c
index 0c0db6e11..e15263344 100644
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -46,7 +46,7 @@
#include "strtok.h"
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
@@ -119,7 +119,7 @@ int Curl_parsenetrc(char *host,
sprintf(netrcbuffer, "%s%s%s", home, DIR_CHAR, NETRC);
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
{
/* This is a hack to allow testing.
* If compiled with --enable-debug and CURL_DEBUG_NETRC is defined,
@@ -141,7 +141,7 @@ int Curl_parsenetrc(char *host,
free(override);
}
}
-#endif /* MALLOCDEBUG */
+#endif /* CURLDEBUG */
file = fopen(netrcbuffer, "r");
if(file) {
diff --git a/lib/security.c b/lib/security.c
index 079975154..1c83a18f9 100644
--- a/lib/security.c
+++ b/lib/security.c
@@ -60,7 +60,7 @@
#include "ftp.h"
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
diff --git a/lib/sendf.c b/lib/sendf.c
index efb89f205..e4983fa68 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -56,7 +56,7 @@
#endif
#include <string.h>
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
diff --git a/lib/ssluse.c b/lib/ssluse.c
index d520a2b54..b4af2ba0d 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -46,7 +46,7 @@
#include <openssl/rand.h>
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
diff --git a/lib/telnet.c b/lib/telnet.c
index c1cc07d08..e345caaa3 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -84,7 +84,7 @@
#include "arpa_telnet.h"
/* The last #include file should be: */
-#ifdef MALLOCDEBUG
+#ifdef CURLDEBUG
#include "memdebug.h"
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 22:34:48 +0000