From f23a31abf292fafa4e46772d15cf65e98042e6c9 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 29 Jul 2008 19:45:38 +0000 Subject: [PATCH] Removed weird dns fix/hack from APT. M cfnetwork.diff git-svn-id: http://svn.telesphoreo.org/trunk@402 514c082c-b64e-11dc-b46d-3d985efe055d --- methods/http.cc | 17 ----------------- methods/http.cc.orig | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/methods/http.cc b/methods/http.cc index 2819ae1..1a7e7c9 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1125,17 +1125,6 @@ int HttpMethod::Loop() URI uri = std::string(url); std::string hs = uri.Host; -#if __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ >= 10200 - struct hostent *he = gethostbyname(hs.c_str()); - if (he == NULL || he->h_addr_list[0] == NULL) { - _error->Error(hstrerror(h_errno)); - Fail(true); - free(url); - } - - uri.Host = inet_ntoa(* (struct in_addr *) he->h_addr_list[0]); -#endif - std::string urs = uri; CFStringRef sr = CFStringCreateWithCString(kCFAllocatorDefault, urs.c_str(), se); @@ -1172,12 +1161,6 @@ int HttpMethod::Loop() CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("User-Agent"), CFSTR("Telesphoreo APT-HTTP/1.0.98")); -#if __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ >= 10200 - sr = CFStringCreateWithCString(kCFAllocatorDefault, hs.c_str(), se); - CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("Host"), sr); - CFRelease(sr); -#endif - CFReadStreamRef rs = CFReadStreamCreateForHTTPRequest(kCFAllocatorDefault, hm); CFRelease(hm); diff --git a/methods/http.cc.orig b/methods/http.cc.orig index 5e87631..10f1ae0 100644 --- a/methods/http.cc.orig +++ b/methods/http.cc.orig @@ -1121,17 +1121,6 @@ int HttpMethod::Loop() URI uri = std::string(url); std::string hs = uri.Host; -#if __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ >= 10200 - struct hostent *he = gethostbyname(hs.c_str()); - if (he == NULL || he->h_addr_list[0] == NULL) { - _error->Error(hstrerror(h_errno)); - Fail(true); - free(url); - } - - uri.Host = inet_ntoa(* (struct in_addr *) he->h_addr_list[0]); -#endif - std::string urs = uri; CFStringRef sr = CFStringCreateWithCString(kCFAllocatorDefault, urs.c_str(), se); @@ -1168,12 +1157,6 @@ int HttpMethod::Loop() CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("User-Agent"), CFSTR("Telesphoreo APT-HTTP/1.0.98")); -#if __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ >= 10200 - sr = CFStringCreateWithCString(kCFAllocatorDefault, hs.c_str(), se); - CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("Host"), sr); - CFRelease(sr); -#endif - CFReadStreamRef rs = CFReadStreamCreateForHTTPRequest(kCFAllocatorDefault, hm); CFRelease(hm); -- 2.45.2