From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 21 Jan 2014 19:26:01 +0000 (-0500)
Subject: Merge remote-tracking branch 'joakimsoderberg/new_cmake'
X-Git-Tag: release-2.1.4-alpha~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cb44fdf56252015d24afcca5ef4bca026f10a67;p=libevent

Merge remote-tracking branch 'joakimsoderberg/new_cmake'

Conflicts:
	sample/https-client.c
---

4cb44fdf56252015d24afcca5ef4bca026f10a67
diff --cc sample/https-client.c
index dfb77c66,6a9d1baf..3721378b
--- a/sample/https-client.c
+++ b/sample/https-client.c
@@@ -194,34 -192,27 +202,50 @@@ main(int argc, char **argv
  	struct evhttp_connection *evcon;
  	struct evhttp_request *req;
  	struct evkeyvalq *output_headers;
 +	struct evbuffer * output_buffer;
 +
 +	int i;
 +
 +	for (i = 1; i < argc; i++) {
 +		if (!strcmp("-url", argv[i])) {
 +			if (i < argc - 1) {
 +				url = argv[i + 1];
 +			} else {
 +				syntax();
 +			}
 +		} else if (!strcmp("-ignore-cert", argv[i])) {
 +			ignore_cert = 1;
 +		} else if (!strcmp("-data", argv[i])) {
 +			if (i < argc - 1) {
 +				data_file = argv[i + 1];
 +			} else {
 +				syntax();
 +			}
 +		} else if (!strcmp("-help", argv[i])) {
 +			syntax();
 +		}
 +	}
  
 -	if (argc != 2)
 +	if (!url) {
  		syntax();
 +	}
  
+ #ifdef _WIN32
+ 	{
+ 		WORD wVersionRequested;
+ 		WSADATA wsaData;
+ 		int err;
+ 
+ 		wVersionRequested = MAKEWORD(2, 2);
+ 
+ 		err = WSAStartup(wVersionRequested, &wsaData);
+ 		if (err != 0) {
+ 			printf("WSAStartup failed with error: %d\n", err);
+ 			return 1;
+ 		}
+ 	}
+ #endif // _WIN32
+ 
 -	url = argv[1];
  	http_uri = evhttp_uri_parse(url);
  	if (http_uri == NULL) {
  		die("malformed url");
diff --cc test/bench_http.c
index 801fd2a6,255aae57..6d0d9717
--- a/test/bench_http.c
+++ b/test/bench_http.c
@@@ -183,9 -182,12 +183,13 @@@ main(int argc, char **argv
  		struct timeval tv={99999999,0};
  		event_base_loopexit(base, &tv);
  	}
 +#endif
  	event_base_dispatch(base);
  
+ #ifdef _WIN32
+ 	WSACleanup();
+ #endif
+ 
  	/* NOTREACHED */
  	return (0);
  }