activate the new memory limit tests if requested

only set cookiejar if selected

diff --git a/src/main.c b/src/main.c
index 5495591..a8afbe9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2505,6 +2505,11 @@ operate(struct Configurable *config, int argc, char *argv[])
     curl_free(env);
     curl_memdebug("memdump");
   }
+  env = curl_getenv("CURL_MEMLIMIT");
+  if(env) {
+    curl_memlimit(atoi(env));
+    curl_free(env);
+  }
 #endif
 
   /* we get libcurl info right away */
@@ -3057,7 +3062,8 @@ operate(struct Configurable *config, int argc, char *argv[])
                        config->headerfile?&heads:NULL);
       curl_easy_setopt(curl, CURLOPT_COOKIEFILE, config->cookiefile);
       /* cookie jar was added in 7.9 */
-      curl_easy_setopt(curl, CURLOPT_COOKIEJAR, config->cookiejar);
+      if(config->cookiejar)
+        curl_easy_setopt(curl, CURLOPT_COOKIEJAR, config->cookiejar);
       /* cookie session added in 7.9.7 */
       curl_easy_setopt(curl, CURLOPT_COOKIESESSION, config->cookiesession);