From c1405676f49994a62426fb14ef5f905bcd5dfb83 Mon Sep 17 00:00:00 2001
From: amcewen <amcewen@bcs.org.uk>
Date: Mon, 13 Aug 2012 17:07:57 +0100
Subject: [PATCH] Disabled proxy capability as it introduced a dependency on
 Ethernet, which meant that it didn't work properly with a WiFi shield

---
 HttpClient.cpp | 12 +++++++++++-
 HttpClient.h   |  5 ++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/HttpClient.cpp b/HttpClient.cpp
index 6bf8121..0f645b9 100644
--- a/HttpClient.cpp
+++ b/HttpClient.cpp
@@ -4,7 +4,9 @@
 
 #include "HttpClient.h"
 #include "b64.h"
+#ifdef PROXY_ENABLED // currently disabled as introduces dependency on Dns.h in Ethernet
 #include <Dns.h>
+#endif
 #include <string.h>
 #include <ctype.h>
 
@@ -16,6 +18,7 @@ const char* HttpClient::kPut = "PUT";
 const char* HttpClient::kDelete = "DELETE";
 const char* HttpClient::kContentLengthPrefix = "Content-Length: ";
 
+#ifdef PROXY_ENABLED // currently disabled as introduces dependency on Dns.h in Ethernet
 HttpClient::HttpClient(Client& aClient, const char* aProxy, uint16_t aProxyPort)
  : iClient(&aClient), iProxyPort(aProxyPort)
 {
@@ -30,6 +33,13 @@ HttpClient::HttpClient(Client& aClient, const char* aProxy, uint16_t aProxyPort)
     (void)dns.getHostByName(aProxy, iProxyAddress);
   }
 }
+#else
+HttpClient::HttpClient(Client& aClient)
+ : iClient(&aClient)
+{
+  resetState();
+}
+#endif
 
 void HttpClient::resetState()
 {
@@ -162,7 +172,7 @@ int HttpClient::sendInitialHeaders(const char* aServerName, IPAddress aServerIP,
       }
     }
     iClient->print(aURLPath);
-    iClient->println(" HTTP/1.0");
+    iClient->println(" HTTP/1.1");
     // The host header, if required
     if (aServerName)
     {
diff --git a/HttpClient.h b/HttpClient.h
index 78cbefe..016d47a 100644
--- a/HttpClient.h
+++ b/HttpClient.h
@@ -7,7 +7,6 @@
 
 #include <Arduino.h>
 #include <IPAddress.h>
-#include "Ethernet.h"
 #include "Client.h"
 
 static const int HTTP_SUCCESS =0;
@@ -38,7 +37,11 @@ class HttpClient : public Client
 // FIXME Write longer API request, using port and user-agent, example
 // FIXME Update tempToPachube example to calculate Content-Length correctly
 
+#ifdef PROXY_ENABLED // currently disabled as introduces dependency on Dns.h in Ethernet
     HttpClient(Client& aClient, const char* aProxy =NULL, uint16_t aProxyPort =0);
+#else
+    HttpClient(Client& aClient);
+#endif
 
     /** Start a more complex request.
         Use this when you need to send additional headers in the request,