Import curl 7.43

This is a simple import of curl 7.43.
The only change from the official release is the fact that the
Android.mk was removed to avoid build error trying to parse it.

BUG: 22347561

Change-Id: I52ef6798d30b25d22d1f62770d571adec8bcf4d5

1 files changed, 97 insertions, 8 deletions

diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c
index dc6967c..4d62208 100644
--- a/tests/libtest/lib500.c
+++ b/tests/libtest/lib500.c
@@ -1,16 +1,62 @@
-/*****************************************************************************
+/***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
  *                             / __| | | | |_) | |
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- */
-
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
 #include "test.h"
 
+#include "testtrace.h"
 #include "memdebug.h"
 
+#ifdef LIB585
+
+static int counter;
+
+static curl_socket_t tst_opensocket(void *clientp,
+                                    curlsocktype purpose,
+                                    struct curl_sockaddr *addr)
+{
+  (void)clientp;
+  (void)purpose;
+  printf("[OPEN] counter: %d\n", ++counter);
+  return socket(addr->family, addr->socktype, addr->protocol);
+}
+
+static int tst_closesocket(void *clientp, curl_socket_t sock)
+{
+  (void)clientp;
+  printf("[CLOSE] counter: %d\n", counter--);
+  return sclose(sock);
+}
+
+static void setupcallbacks(CURL *curl)
+{
+  curl_easy_setopt(curl, CURLOPT_OPENSOCKETFUNCTION, tst_opensocket);
+  curl_easy_setopt(curl, CURLOPT_CLOSESOCKETFUNCTION, tst_closesocket);
+  counter = 0;
+}
+
+#else
+#define setupcallbacks(x) Curl_nop_stmt
+#endif
+
+
 int test(char *URL)
 {
   CURLcode res;
@@ -31,15 +77,58 @@ int test(char *URL)
   test_setopt(curl, CURLOPT_URL, URL);
   test_setopt(curl, CURLOPT_HEADER, 1L);
 
+  libtest_debug_config.nohex = 1;
+  libtest_debug_config.tracetime = 1;
+  test_setopt(curl, CURLOPT_DEBUGDATA, &libtest_debug_config);
+  test_setopt(curl, CURLOPT_DEBUGFUNCTION, libtest_debug_cb);
+  test_setopt(curl, CURLOPT_VERBOSE, 1L);
+
+  if(libtest_arg3 && !strcmp(libtest_arg3, "activeftp"))
+    test_setopt(curl, CURLOPT_FTPPORT, "-");
+
+  setupcallbacks(curl);
+
   res = curl_easy_perform(curl);
 
   if(!res) {
-    FILE *moo;
     res = curl_easy_getinfo(curl, CURLINFO_PRIMARY_IP, &ipstr);
-    moo = fopen(libtest_arg2, "wb");
-    if(moo) {
-      fprintf(moo, "IP: %s\n", ipstr);
-      fclose(moo);
+    if (libtest_arg2) {
+      FILE *moo = fopen(libtest_arg2, "wb");
+      if(moo) {
+	double time_namelookup;
+	double time_connect;
+	double time_pretransfer;
+	double time_starttransfer;
+	double time_total;
+	fprintf(moo, "IP: %s\n", ipstr);
+	curl_easy_getinfo(curl, CURLINFO_NAMELOOKUP_TIME, &time_namelookup);
+	curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME, &time_connect);
+	curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME, &time_pretransfer);
+	curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME,
+			  &time_starttransfer);
+	curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &time_total);
+
+	/* since the timing will always vary we only compare relative differences
+	   between these 5 times */
+	if(time_namelookup > time_connect) {
+	  fprintf(moo, "namelookup vs connect: %f %f\n",
+		  time_namelookup, time_connect);
+	}
+	if(time_connect > time_pretransfer) {
+	  fprintf(moo, "connect vs pretransfer: %f %f\n",
+		  time_connect, time_pretransfer);
+	}
+	if(time_pretransfer > time_starttransfer) {
+	  fprintf(moo, "pretransfer vs starttransfer: %f %f\n",
+		  time_pretransfer, time_starttransfer);
+	}
+	if(time_starttransfer > time_total) {
+	  fprintf(moo, "starttransfer vs total: %f %f\n",
+		  time_starttransfer, time_total);
+	}
+
+	fclose(moo);
+      }
     }
   }