From b7321a23b12d2e50253b2829d241d0e7506afb1b Mon Sep 17 00:00:00 2001
From: Dave Falkenburg <falken@mac.com>
Date: Mon, 26 Sep 2011 17:30:54 -0700
Subject: [PATCH 01/75] Arduino 1.0 changes

---
 WebServer.cpp | 16 ++++++++--------
 WebServer.h   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/WebServer.cpp b/WebServer.cpp
index 5d9a88d..a781d8b 100644
--- a/WebServer.cpp
+++ b/WebServer.cpp
@@ -60,24 +60,24 @@ void WebServer::addCommand(const char *verb, Command *cmd)
   }
 }
 
-void WebServer::write(uint8_t ch)
+size_t WebServer::write(uint8_t ch)
 {
-  m_client.write(ch);
+  return m_client.write(ch);
 }
 
-void WebServer::write(const char *str)
+size_t WebServer::write(const char *str)
 {
-  m_client.write(str);
+  return m_client.write(str);
 }
 
-void WebServer::write(const uint8_t *buffer, size_t size)
+size_t WebServer::write(const uint8_t *buffer, size_t size)
 {
-  m_client.write(buffer, size);
+  return m_client.write(buffer, size);
 }
 
-void WebServer::write(const char *buffer, size_t length)
+size_t WebServer::write(const char *buffer, size_t length)
 {
-  m_client.write((const uint8_t *)buffer, length);
+  return m_client.write((const uint8_t *)buffer, length);
 }
 
 void WebServer::writeP(const prog_uchar *data, size_t length)
diff --git a/WebServer.h b/WebServer.h
index bdcd614..4879f44 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -29,8 +29,8 @@
 #include <stdlib.h>
 #include "avr/pgmspace.h"
 
-#include <Client.h>
-#include <Server.h>
+#include <EthernetClient.h>
+#include <EthernetServer.h>
 
 /********************************************************************
  * CONFIGURATION
@@ -200,14 +200,14 @@ class WebServer: public Print
   void httpSeeOther(const char *otherURL);
 
   // implementation of write used to implement Print interface
-  virtual void write(uint8_t);
-  virtual void write(const char *str);
-  virtual void write(const uint8_t *buffer, size_t size);
-  void write(const char *data, size_t length);
+  virtual size_t write(uint8_t);
+  virtual size_t write(const char *str);
+  virtual size_t write(const uint8_t *buffer, size_t size);
+  size_t write(const char *data, size_t length);
 
 private:
-  Server m_server;
-  Client m_client;
+  EthernetServer m_server;
+  EthernetClient m_client;
   const char *m_urlPrefix;
 
   char m_pushback[32];

From 90f5140b29d0af0d3bb76d0d3159b9855ca37596 Mon Sep 17 00:00:00 2001
From: Chris Lee <sirleech@gmail.com>
Date: Thu, 8 Dec 2011 01:04:05 +0800
Subject: [PATCH 02/75] issue 2: send CRLF for extraHeaders httpSuccess()

---
 WebServer.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/WebServer.cpp b/WebServer.cpp
index 5d9a88d..afff8ce 100644
--- a/WebServer.cpp
+++ b/WebServer.cpp
@@ -263,8 +263,10 @@ void WebServer::httpSuccess(const char *contentType,
   printP(successMsg1);
   print(contentType);
   printCRLF();
-  if (extraHeaders)
+  if (extraHeaders) {
     print(extraHeaders);
+    printCRLF();
+  }
   printCRLF();
 }
 

From 8ceb13395974af9e6c95cd489533750d6e7d56c3 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Fri, 30 Dec 2011 22:59:43 +0100
Subject: [PATCH 03/75] bumped to Webduino 1.5, handling favicon.ico requests,
 added keywords.txt for syntax highlighting

---
 keywords.txt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 keywords.txt

diff --git a/keywords.txt b/keywords.txt
new file mode 100644
index 0000000..c1365ab
--- /dev/null
+++ b/keywords.txt
@@ -0,0 +1,23 @@
+WebServer	KEYWORD1
+ConnectionType	KEYWORD1
+begin	KEYWORD2
+processConnection	KEYWORD2
+setDefaultCommand	KEYWORD2
+setFailureCommand	KEYWORD2
+addCommand	KEYWORD2
+printCRLF	KEYWORD2
+printP	KEYWORD2
+writeP	KEYWORD2
+radioButton	KEYWORD2
+checkBox	KEYWORD2
+read	KEYWORD2
+push	KEYWORD2
+expect	KEYWORD2
+readInt	KEYWORD2
+readPOSTparam	KEYWORD2
+nextURLparam	KEYWORD2
+httpFail	KEYWORD2
+httpSuccess	KEYWORD2
+httpSeeOther	KEYWORD2
+write	KEYWORD2
+P	KEYWORD2

From dbd2c9a1deba801045e203b65b8589bddbe822b0 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Fri, 30 Dec 2011 23:03:08 +0100
Subject: [PATCH 04/75] bumped to Webduino 1.5, handling favicon.ico requests,
 added keywords.txt for syntax highlighting

---
 WebServer.cpp                              | 30 ++++++++++-
 WebServer.h                                |  7 +--
 examples/Web_HelloWorld/Web_HelloWorld.pde |  4 +-
 readme.md                                  | 62 +++++++++++++++++++---
 4 files changed, 91 insertions(+), 12 deletions(-)

diff --git a/WebServer.cpp b/WebServer.cpp
index c0c74e1..8a18904 100644
--- a/WebServer.cpp
+++ b/WebServer.cpp
@@ -206,6 +206,10 @@ void WebServer::processConnection(char *buff, int *bufflen)
     {
       noRobots(requestType);
     }
+    else if (strcmp(buff, "/favicon.ico") == 0)
+    {
+      favicon(requestType);
+    }
     else if (requestType == INVALID ||
              strncmp(buff, m_urlPrefix, urlPrefixLen) != 0 ||
              !dispatchCommand(requestType, buff + urlPrefixLen,
@@ -251,6 +255,30 @@ void WebServer::noRobots(ConnectionType type)
   }
 }
 
+void WebServer::favicon(ConnectionType type)
+{
+  httpSuccess("image/x-icon");
+  if (type != HEAD)
+  {
+    P(faviconIco) = {
+      0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x10, 0x10, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0xb0, 0x00,
+      0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00,
+      0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff,
+      0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc1, 0xbf,
+      0x00, 0x00, 0xc0, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xbf, 0x00, 0x00, 0xc1, 0xbf,
+      0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, 0xff, 0xff,
+      0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    writeP(faviconIco, sizeof(faviconIco));
+  }
+}
+
 void WebServer::httpSuccess(const char *contentType,
                             const char *extraHeaders)
 {
@@ -258,7 +286,7 @@ void WebServer::httpSuccess(const char *contentType,
     "HTTP/1.0 200 OK" CRLF
     WEBDUINO_SERVER_HEADER
     "Access-Control-Allow-Origin: *" CRLF
-	"Content-Type: ";
+    "Content-Type: ";
 
   printP(successMsg1);
   print(contentType);
diff --git a/WebServer.h b/WebServer.h
index 4879f44..161ae94 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -36,8 +36,8 @@
  * CONFIGURATION
  ********************************************************************/
 
-#define WEBDUINO_VERSION 1004
-#define WEBDUINO_VERSION_STRING "1.4"
+#define WEBDUINO_VERSION 1005
+#define WEBDUINO_VERSION_STRING "1.5"
 
 #if WEBDUINO_SUPRESS_SERVER_HEADER
 #define WEBDUINO_SERVER_HEADER ""
@@ -112,7 +112,7 @@ class WebServer: public Print
                        char *url_tail, bool tail_complete);
 
   // constructor for webserver object
-  WebServer(const char *urlPrefix = "/", int port = 80);
+  WebServer(const char *urlPrefix = "", int port = 80);
 
   // start listening for connections
   void begin();
@@ -237,6 +237,7 @@ class WebServer: public Print
   static void defaultFailCmd(WebServer &server, ConnectionType type,
                              char *url_tail, bool tail_complete);
   void noRobots(ConnectionType type);
+  void favicon(ConnectionType type);
 };
 
 #endif // WEBDUINO_H_
diff --git a/examples/Web_HelloWorld/Web_HelloWorld.pde b/examples/Web_HelloWorld/Web_HelloWorld.pde
index d523f26..aebf90a 100644
--- a/examples/Web_HelloWorld/Web_HelloWorld.pde
+++ b/examples/Web_HelloWorld/Web_HelloWorld.pde
@@ -17,8 +17,8 @@ static uint8_t mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
 static uint8_t ip[] = { 192, 168, 1, 210 };
 
 /* This creates an instance of the webserver.  By specifying a prefix
- * of "/", all pages will be at the root of the server. */
-#define PREFIX "/"
+ * of "", all pages will be at the root of the server. */
+#define PREFIX ""
 WebServer webserver(PREFIX, 80);
 
 /* commands are functions that get called by the webserver framework
diff --git a/readme.md b/readme.md
index 934ff43..23a616c 100644
--- a/readme.md
+++ b/readme.md
@@ -1,5 +1,6 @@
 # Webduino
-### Project forked from 1.4.1 of http://code.google.com/p/webduino/ By Ben Combee
+
+### Project forked from 1.4.1 of http://code.google.com/p/webduino/ by Ben Combee
 
 This is an Arduino-based Web Server library, originally developed for a class at NYC Resistor. It's called Webduino, and it's an extensible web server library for the Arduino using the Wiznet-based Ethernet shields. It's released under the MIT license allowing all sorts of reuse. 
 
@@ -7,26 +8,29 @@ I've got a few examples up right now -- the Buzz example interfaces with Zach's
 
 I hope to add a few more examples in the next few weeks, including a web-enabled fridge sign using a serial LCD and how to serve things other than just HTML text from the device. I also need to work on more documentation and finishing up my slides.
 
-### Features
+## Features
+
 - URL parameter parsing
 - Handle HTTP Methods, e.g. GET, POST
 - Web Forms
 - Images
 - JSON/RESTful interface
 
-### Installation Notes
+## Installation Notes
 
-With Arduino 0022, add the Webduino folder to the "libraries" folder of your sketchbook directory. 
+With Arduino 1.0, add the Webduino folder to the "libraries" folder of your sketchbook directory. 
 
 You can put the examples in your own sketchbook directory, or in hardware/libraries/webduino/examples, as you prefer.
 
 If you get an error message when building the examples similar to "WebServer.h not found", it's a problem with where you put the Webduino folder. The server won't work if the header is directly in the libraries folder.
 
 
-### Presentation
+## Presentation
+
 [Wedbuino Presentation on Google Docs](http://docs.google.com/present/view?id=dd8gqxt8_5c8w9qfg3)
 
-### Compatible Ethernet Shields
+## Compatible Ethernet Shields
+
 These have all been tested with the library successfully:
 
 - Freetronics Etherten
@@ -35,4 +39,50 @@ These have all been tested with the library successfully:
 - Adafruit Ethernet Shield w/ Wiznet 811MJ module
 - NKC Electronics Ethernet Shield DIY Kit
 
+## Version history
+
+### 1.5 released in Dec 2011
+
+- added a default favicon.ico based on the led.png from the Image example to save resources on Firefox trying to load this file on every request if it can't be loaded
+- added keywords.txt for syntax highlighting in Arduino IDE
+- bumped the version number up in response headers and compiler variables
+- added version history to readme
+- fixed default value for prefix
+- fixed /index.html in Hello World example
+
+### releases between Jul 2011 and Dec 2011
+
+- project forked on GitHub by Chris Lee
+- JSON/RESTful interface
+- header Access-Control-Allow-Origin added
+- code split in .h and .cpp files
+- Arduino 1.0 changes by Dave Falkenburg and others
+- adding CRLF after extraHeaders
+
+### 1.4.1 released in Nov 2009
+
+- fix examples to use readPOSTparam method
+
+### 1.4 released in Sep 2009
+
+- bug fix for multple connections
+
+### 1.3.1 released in Aug 2009
+
+- major bug fix for 1.3 for posts where Content-Length is last header sent
+
+### 1.3 released in Aug 2009
+
+- mostly robustness fixes (beta)
+
+### 1.2.1 released in Aug 2009
+
+- fixed HelloWorld example
+
+### 1.2 released in Jul 2009
+
+- now with GET parameter handling
+
+### 1.1 released in Apr 2009
 
+### 1.0 released in Mar 2009

From 5daa62c32d1d77cdaa3fc07737223f54d8b7b82c Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Sun, 1 Jan 2012 22:55:22 +0100
Subject: [PATCH 05/75] fixed line break in serial debug output

---
 WebServer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.cpp b/WebServer.cpp
index 8a18904..bd01bbf 100644
--- a/WebServer.cpp
+++ b/WebServer.cpp
@@ -192,7 +192,7 @@ void WebServer::processConnection(char *buff, int *bufflen)
 #if WEBDUINO_SERIAL_DEBUGGING > 1
     Serial.print("*** requestType = ");
     Serial.print((int)requestType);
-    Serial.println(", request = \"");
+    Serial.print(", request = \"");
     Serial.print(buff);
     Serial.println("\" ***");
 #endif

From ab23635620da2aade3c3eb0b3c7f6680656c5db4 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Sun, 1 Jan 2012 23:00:35 +0100
Subject: [PATCH 06/75] moving contents of WebServer.cpp and WebServer.h back
 together in one file: fixes issue with #define statements (serial debugging
 in particular)

---
 WebServer.cpp | 770 --------------------------------------------------
 WebServer.h   | 749 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 749 insertions(+), 770 deletions(-)
 delete mode 100644 WebServer.cpp

diff --git a/WebServer.cpp b/WebServer.cpp
deleted file mode 100644
index bd01bbf..0000000
--- a/WebServer.cpp
+++ /dev/null
@@ -1,770 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil;  c-file-style: "k&r"; c-basic-offset: 2; -*-
-
-   Webduino, a simple Arduino web server
-   Copyright 2009 Ben Combee, Ran Talbott
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-*/
-
-#include <WebServer.h>
-
-WebServer::WebServer(const char *urlPrefix, int port) :
-  m_server(port),
-  m_client(255),
-  m_urlPrefix(urlPrefix),
-  m_pushbackDepth(0),
-  m_cmdCount(0),
-  m_contentLength(0),
-  m_failureCmd(&defaultFailCmd),
-  m_defaultCmd(&defaultFailCmd)
-{
-}
-
-void WebServer::begin()
-{
-  m_server.begin();
-}
-
-void WebServer::setDefaultCommand(Command *cmd)
-{
-  m_defaultCmd = cmd;
-}
-
-void WebServer::setFailureCommand(Command *cmd)
-{
-  m_failureCmd = cmd;
-}
-
-void WebServer::addCommand(const char *verb, Command *cmd)
-{
-  if (m_cmdCount < SIZE(m_commands))
-  {
-    m_commands[m_cmdCount].verb = verb;
-    m_commands[m_cmdCount++].cmd = cmd;
-  }
-}
-
-size_t WebServer::write(uint8_t ch)
-{
-  return m_client.write(ch);
-}
-
-size_t WebServer::write(const char *str)
-{
-  return m_client.write(str);
-}
-
-size_t WebServer::write(const uint8_t *buffer, size_t size)
-{
-  return m_client.write(buffer, size);
-}
-
-size_t WebServer::write(const char *buffer, size_t length)
-{
-  return m_client.write((const uint8_t *)buffer, length);
-}
-
-void WebServer::writeP(const prog_uchar *data, size_t length)
-{
-  // copy data out of program memory into local storage, write out in
-  // chunks of 32 bytes to avoid extra short TCP/IP packets
-  uint8_t buffer[32];
-  size_t bufferEnd = 0;
-
-  while (length--)
-  {
-    if (bufferEnd == 32)
-    {
-      m_client.write(buffer, 32);
-      bufferEnd = 0;
-    }
-
-    buffer[bufferEnd++] = pgm_read_byte(data++);
-  }
-
-  if (bufferEnd > 0)
-    m_client.write(buffer, bufferEnd);
-}
-
-void WebServer::printP(const prog_uchar *str)
-{
-  // copy data out of program memory into local storage, write out in
-  // chunks of 32 bytes to avoid extra short TCP/IP packets
-  uint8_t buffer[32];
-  size_t bufferEnd = 0;
-  
-  while (buffer[bufferEnd++] = pgm_read_byte(str++))
-  {
-    if (bufferEnd == 32)
-    {
-      m_client.write(buffer, 32);
-      bufferEnd = 0;
-    }
-  }
-
-  // write out everything left but trailing NUL
-  if (bufferEnd > 1)
-    m_client.write(buffer, bufferEnd - 1);
-}
-
-void WebServer::printCRLF()
-{
-  m_client.write((const uint8_t *)"\r\n", 2);
-}
-
-bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
-        bool tail_complete)
-{
-  if ((verb[0] == 0) || ((verb[0] == '/') && (verb[1] == 0)))
-  {
-    m_defaultCmd(*this, requestType, verb, tail_complete);
-    return true;
-  }
-  // We now know that the URL contains at least one character.  And,
-  // if the first character is a slash,  there's more after it.
-  if (verb[0] == '/')
-  {
-    char i;
-    char *qm_loc;
-    int verb_len;
-    int qm_offset;
-    // Skip over the leading "/",  because it makes the code more
-    // efficient and easier to understand.
-    verb++;
-    // Look for a "?" separating the filename part of the URL from the
-    // parameters.  If it's not there, compare to the whole URL.
-    qm_loc = strchr(verb, '?');
-    verb_len = (qm_loc == NULL) ? strlen(verb) : (qm_loc - verb);
-    qm_offset = (qm_loc == NULL) ? 0 : 1;
-    for (i = 0; i < m_cmdCount; ++i)
-    {
-      if ((verb_len == strlen(m_commands[i].verb))
-          && (strncmp(verb, m_commands[i].verb, verb_len) == 0))
-      {
-        // Skip over the "verb" part of the URL (and the question
-        // mark, if present) when passing it to the "action" routine
-        m_commands[i].cmd(*this, requestType,
-        verb + verb_len + qm_offset,
-        tail_complete);
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-// processConnection with a default buffer
-void WebServer::processConnection()
-{
-  char request[WEBDUINO_DEFAULT_REQUEST_LENGTH];
-  int  request_len = WEBDUINO_DEFAULT_REQUEST_LENGTH;
-  processConnection(request, &request_len);
-}
-
-void WebServer::processConnection(char *buff, int *bufflen)
-{
-  m_client = m_server.available();
-
-  if (m_client) {
-    m_readingContent = false;
-    buff[0] = 0;
-    ConnectionType requestType = INVALID;
-#if WEBDUINO_SERIAL_DEBUGGING > 1
-    Serial.println("*** checking request ***");
-#endif
-    getRequest(requestType, buff, bufflen);
-#if WEBDUINO_SERIAL_DEBUGGING > 1
-    Serial.print("*** requestType = ");
-    Serial.print((int)requestType);
-    Serial.print(", request = \"");
-    Serial.print(buff);
-    Serial.println("\" ***");
-#endif
-    processHeaders();
-#if WEBDUINO_SERIAL_DEBUGGING > 1
-    Serial.println("*** headers complete ***");
-#endif
-
-    int urlPrefixLen = strlen(m_urlPrefix);
-    if (strcmp(buff, "/robots.txt") == 0)
-    {
-      noRobots(requestType);
-    }
-    else if (strcmp(buff, "/favicon.ico") == 0)
-    {
-      favicon(requestType);
-    }
-    else if (requestType == INVALID ||
-             strncmp(buff, m_urlPrefix, urlPrefixLen) != 0 ||
-             !dispatchCommand(requestType, buff + urlPrefixLen,
-                              (*bufflen) >= 0))
-    {
-      m_failureCmd(*this, requestType, buff, (*bufflen) >= 0);
-    }
-
-#if WEBDUINO_SERIAL_DEBUGGING > 1
-    Serial.println("*** stopping connection ***");
-#endif
-    m_client.stop();
-  }
-}
-
-void WebServer::httpFail()
-{
-  P(failMsg) =
-    "HTTP/1.0 400 Bad Request" CRLF
-    WEBDUINO_SERVER_HEADER
-    "Content-Type: text/html" CRLF
-    CRLF
-    WEBDUINO_FAIL_MESSAGE;
-
-  printP(failMsg);
-}
-
-void WebServer::defaultFailCmd(WebServer &server,
-                               WebServer::ConnectionType type,
-                               char *url_tail,
-                               bool tail_complete)
-{
-  server.httpFail();
-}
-
-void WebServer::noRobots(ConnectionType type)
-{
-  httpSuccess("text/plain");
-  if (type != HEAD)
-  {
-    P(allowNoneMsg) = "User-agent: *" CRLF "Disallow: /" CRLF;
-    printP(allowNoneMsg);
-  }
-}
-
-void WebServer::favicon(ConnectionType type)
-{
-  httpSuccess("image/x-icon");
-  if (type != HEAD)
-  {
-    P(faviconIco) = {
-      0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x10, 0x10, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0xb0, 0x00,
-      0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00,
-      0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff,
-      0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc1, 0xbf,
-      0x00, 0x00, 0xc0, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xbf, 0x00, 0x00, 0xc1, 0xbf,
-      0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, 0xff, 0xff,
-      0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    };
-    writeP(faviconIco, sizeof(faviconIco));
-  }
-}
-
-void WebServer::httpSuccess(const char *contentType,
-                            const char *extraHeaders)
-{
-  P(successMsg1) =
-    "HTTP/1.0 200 OK" CRLF
-    WEBDUINO_SERVER_HEADER
-    "Access-Control-Allow-Origin: *" CRLF
-    "Content-Type: ";
-
-  printP(successMsg1);
-  print(contentType);
-  printCRLF();
-  if (extraHeaders) {
-    print(extraHeaders);
-    printCRLF();
-  }
-  printCRLF();
-}
-
-void WebServer::httpSeeOther(const char *otherURL)
-{
-  P(seeOtherMsg) =
-    "HTTP/1.0 303 See Other" CRLF
-    WEBDUINO_SERVER_HEADER
-    "Location: ";
-
-  printP(seeOtherMsg);
-  print(otherURL);
-  printCRLF();
-  printCRLF();
-}
-
-int WebServer::read()
-{
-  if (m_client == NULL)
-    return -1;
-
-  if (m_pushbackDepth == 0)
-  {
-    unsigned long timeoutTime = millis() + WEBDUINO_READ_TIMEOUT_IN_MS;
-
-    while (m_client.connected())
-    {
-      // stop reading the socket early if we get to content-length
-      // characters in the POST.  This is because some clients leave
-      // the socket open because they assume HTTP keep-alive.
-      if (m_readingContent)
-      {
-        if (m_contentLength == 0)
-        {
-#if WEBDUINO_SERIAL_DEBUGGING > 1
-          Serial.println("\n*** End of content, terminating connection");
-#endif
-          return -1;
-        }
-        --m_contentLength;
-      }
-
-      int ch = m_client.read();
-
-      // if we get a character, return it, otherwise continue in while
-      // loop, checking connection status
-      if (ch != -1)
-      {
-#if WEBDUINO_SERIAL_DEBUGGING
-        if (ch == '\r')
-          Serial.print("<CR>");
-        else if (ch == '\n')
-          Serial.println("<LF>");
-        else
-          Serial.print((char)ch);
-#endif
-        return ch;
-      }
-      else
-      {
-        unsigned long now = millis();
-        if (now > timeoutTime)
-        {
-          // connection timed out, destroy client, return EOF
-#if WEBDUINO_SERIAL_DEBUGGING
-          Serial.println("*** Connection timed out");
-#endif
-          m_client.flush();
-          m_client.stop();
-          return -1;
-        }
-      }
-    }
-
-    // connection lost, return EOF
-#if WEBDUINO_SERIAL_DEBUGGING
-    Serial.println("*** Connection lost");
-#endif
-    return -1;
-  }
-  else
-    return m_pushback[--m_pushbackDepth];
-}
-
-void WebServer::push(int ch)
-{
-  // don't allow pushing EOF
-  if (ch == -1)
-    return;
-
-  m_pushback[m_pushbackDepth++] = ch;
-  // can't raise error here, so just replace last char over and over
-  if (m_pushbackDepth == SIZE(m_pushback))
-    m_pushbackDepth = SIZE(m_pushback) - 1;
-}
-
-void WebServer::reset()
-{
-  m_pushbackDepth = 0;
-}
-
-bool WebServer::expect(const char *str)
-{
-  const char *curr = str;
-  while (*curr != 0)
-  {
-    int ch = read();
-    if (ch != *curr++)
-    {
-      // push back ch and the characters we accepted
-      push(ch);
-      while (--curr != str)
-        push(curr[-1]);
-      return false;
-    }
-  }
-  return true;
-}
-
-bool WebServer::readInt(int &number)
-{
-  bool negate = false;
-  bool gotNumber = false;
-  int ch;
-  number = 0;
-
-  // absorb whitespace
-  do
-  {
-    ch = read();
-  } while (ch == ' ' || ch == '\t');
-
-  // check for leading minus sign
-  if (ch == '-')
-  {
-    negate = true;
-    ch = read();
-  }
-
-  // read digits to update number, exit when we find non-digit
-  while (ch >= '0' && ch <= '9')
-  {
-    gotNumber = true;
-    number = number * 10 + ch - '0';
-    ch = read();
-  }
-
-  push(ch);
-  if (negate)
-    number = -number;
-  return gotNumber;
-}
-
-bool WebServer::readPOSTparam(char *name, int nameLen,
-                              char *value, int valueLen)
-{
-  // assume name is at current place in stream
-  int ch;
-
-  // clear out name and value so they'll be NUL terminated
-  memset(name, 0, nameLen);
-  memset(value, 0, valueLen);
-
-  // decrement length so we don't write into NUL terminator
-  --nameLen;
-  --valueLen;
-
-  while ((ch = read()) != -1)
-  {
-    if (ch == '+')
-    {
-      ch = ' ';
-    }
-    else if (ch == '=')
-    {
-      /* that's end of name, so switch to storing in value */
-      nameLen = 0;
-      continue;
-    }
-    else if (ch == '&')
-    {
-      /* that's end of pair, go away */
-      return true;
-    }
-    else if (ch == '%')
-    {
-      /* handle URL encoded characters by converting back to original form */
-      int ch1 = read();
-      int ch2 = read();
-      if (ch1 == -1 || ch2 == -1)
-        return false;
-      char hex[3] = { ch1, ch2, 0 };
-      ch = strtoul(hex, NULL, 16);
-    }
-
-    // check against 1 so we don't overwrite the final NUL
-    if (nameLen > 1)
-    {
-      *name++ = ch;
-      --nameLen;
-    }
-    else if (valueLen > 1)
-    {
-      *value++ = ch;
-      --valueLen;
-    }
-  }
-
-  // if we get here, we hit the end-of-file, so POST is over and there
-  // are no more parameters
-  return false;
-}
-
-/* Retrieve a parameter that was encoded as part of the URL, stored in
- * the buffer pointed to by *tail.  tail is updated to point just past
- * the last character read from the buffer. */
-URLPARAM_RESULT WebServer::nextURLparam(char **tail, char *name, int nameLen,
-                                        char *value, int valueLen)
-{
-  // assume name is at current place in stream
-  char ch, hex[3];
-  URLPARAM_RESULT result = URLPARAM_OK;
-  char *s = *tail;
-  bool keep_scanning = true;
-  bool need_value = true;
-
-  // clear out name and value so they'll be NUL terminated
-  memset(name, 0, nameLen);
-  memset(value, 0, valueLen);
-
-  if (*s == 0)
-    return URLPARAM_EOS;
-  // Read the keyword name
-  while (keep_scanning)
-  {
-    ch = *s++;
-    switch (ch)
-    {
-    case 0:
-      s--;  // Back up to point to terminating NUL
-      // Fall through to "stop the scan" code
-    case '&':
-      /* that's end of pair, go away */
-      keep_scanning = false;
-      need_value = false;
-      break;
-    case '+':
-      ch = ' ';
-      break;
-    case '%':
-      /* handle URL encoded characters by converting back
-       * to original form */
-      if ((hex[0] = *s++) == 0)
-      {
-        s--;        // Back up to NUL
-        keep_scanning = false;
-        need_value = false;
-      }
-      else
-      {
-        if ((hex[1] = *s++) == 0)
-        {
-          s--;  // Back up to NUL
-          keep_scanning = false;
-          need_value = false;
-        }
-        else
-        {
-          hex[2] = 0;
-          ch = strtoul(hex, NULL, 16);
-        }
-      }
-      break;
-    case '=':
-      /* that's end of name, so switch to storing in value */
-      keep_scanning = false;
-      break;
-    }
-
-
-    // check against 1 so we don't overwrite the final NUL
-    if (keep_scanning && (nameLen > 1))
-    {
-      *name++ = ch;
-      --nameLen;
-    }
-    else
-      result = URLPARAM_NAME_OFLO;
-  }
-
-  if (need_value && (*s != 0))
-  {
-    keep_scanning = true;
-    while (keep_scanning)
-    {
-      ch = *s++;
-      switch (ch)
-      {
-      case 0:
-        s--;  // Back up to point to terminating NUL
-              // Fall through to "stop the scan" code
-      case '&':
-        /* that's end of pair, go away */
-        keep_scanning = false;
-        need_value = false;
-        break;
-      case '+':
-        ch = ' ';
-        break;
-      case '%':
-        /* handle URL encoded characters by converting back to original form */
-        if ((hex[0] = *s++) == 0)
-        {
-          s--;  // Back up to NUL
-          keep_scanning = false;
-          need_value = false;
-        }
-        else
-        {
-          if ((hex[1] = *s++) == 0)
-          {
-            s--;  // Back up to NUL
-            keep_scanning = false;
-            need_value = false;
-          }
-          else
-          {
-            hex[2] = 0;
-            ch = strtoul(hex, NULL, 16);
-          }
-
-        }
-        break;
-      }
-
-
-      // check against 1 so we don't overwrite the final NUL
-      if (keep_scanning && (valueLen > 1))
-      {
-        *value++ = ch;
-        --valueLen;
-      }
-      else
-        result = (result == URLPARAM_OK) ?
-          URLPARAM_VALUE_OFLO :
-          URLPARAM_BOTH_OFLO;
-    }
-  }
-  *tail = s;
-  return result;
-}
-
-
-
-// Read and parse the first line of the request header.
-// The "command" (GET/HEAD/POST) is translated into a numeric value in type.
-// The URL is stored in request,  up to the length passed in length
-// NOTE 1: length must include one byte for the terminating NUL.
-// NOTE 2: request is NOT checked for NULL,  nor length for a value < 1.
-// Reading stops when the code encounters a space, CR, or LF.  If the HTTP
-// version was supplied by the client,  it will still be waiting in the input
-// stream when we exit.
-//
-// On return, length contains the amount of space left in request.  If it's
-// less than 0,  the URL was longer than the buffer,  and part of it had to
-// be discarded.
-
-void WebServer::getRequest(WebServer::ConnectionType &type,
-                           char *request, int *length)
-{
-  --*length; // save room for NUL
-
-  type = INVALID;
-
-  // store the GET/POST line of the request
-  if (expect("GET "))
-    type = GET;
-  else if (expect("HEAD "))
-    type = HEAD;
-  else if (expect("POST "))
-    type = POST;
-
-  // if it doesn't start with any of those, we have an unknown method
-  // so just eat rest of header
-
-  int ch;
-  while ((ch = read()) != -1)
-  {
-    // stop storing at first space or end of line
-    if (ch == ' ' || ch == '\n' || ch == '\r')
-    {
-      break;
-    }
-    if (*length > 0)
-    {
-      *request = ch;
-      ++request;
-      --*length;
-    }
-  }
-  // NUL terminate
-  *request = 0;
-}
-
-void WebServer::processHeaders()
-{
-  // look for two things: the Content-Length header and the double-CRLF
-  // that ends the headers.
-
-  while (1)
-  {
-    if (expect("Content-Length:"))
-    {
-      readInt(m_contentLength);
-#if WEBDUINO_SERIAL_DEBUGGING > 1
-      Serial.print("\n*** got Content-Length of ");
-      Serial.print(m_contentLength);
-      Serial.print(" ***");
-#endif
-      continue;
-    }
-
-    if (expect(CRLF CRLF))
-    {
-      m_readingContent = true;
-      return;
-    }
-
-    // no expect checks hit, so just absorb a character and try again
-    if (read() == -1)
-    {
-      return;
-    }
-  }
-}
-
-void WebServer::outputCheckboxOrRadio(const char *element, const char *name,
-                                      const char *val, const char *label,
-                                      bool selected)
-{
-  P(cbPart1a) = "<label><input type='";
-  P(cbPart1b) = "' name='";
-  P(cbPart2) = "' value='";
-  P(cbPart3) = "' ";
-  P(cbChecked) = "checked ";
-  P(cbPart4) = "/> ";
-  P(cbPart5) = "</label>";
-
-  printP(cbPart1a);
-  print(element);
-  printP(cbPart1b);
-  print(name);
-  printP(cbPart2);
-  print(val);
-  printP(cbPart3);
-  if (selected)
-    printP(cbChecked);
-  printP(cbPart4);
-  print(label);
-  printP(cbPart5);
-}
-
-void WebServer::checkBox(const char *name, const char *val,
-                         const char *label, bool selected)
-{
-  outputCheckboxOrRadio("checkbox", name, val, label, selected);
-}
-
-void WebServer::radioButton(const char *name, const char *val,
-                            const char *label, bool selected)
-{
-  outputCheckboxOrRadio("radio", name, val, label, selected);
-}
diff --git a/WebServer.h b/WebServer.h
index 161ae94..0224400 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -240,4 +240,753 @@ class WebServer: public Print
   void favicon(ConnectionType type);
 };
 
+/********************************************************************
+ * IMPLEMENTATION
+ ********************************************************************/
+
+WebServer::WebServer(const char *urlPrefix, int port) :
+  m_server(port),
+  m_client(255),
+  m_urlPrefix(urlPrefix),
+  m_pushbackDepth(0),
+  m_cmdCount(0),
+  m_contentLength(0),
+  m_failureCmd(&defaultFailCmd),
+  m_defaultCmd(&defaultFailCmd)
+{
+}
+
+void WebServer::begin()
+{
+  m_server.begin();
+}
+
+void WebServer::setDefaultCommand(Command *cmd)
+{
+  m_defaultCmd = cmd;
+}
+
+void WebServer::setFailureCommand(Command *cmd)
+{
+  m_failureCmd = cmd;
+}
+
+void WebServer::addCommand(const char *verb, Command *cmd)
+{
+  if (m_cmdCount < SIZE(m_commands))
+  {
+    m_commands[m_cmdCount].verb = verb;
+    m_commands[m_cmdCount++].cmd = cmd;
+  }
+}
+
+size_t WebServer::write(uint8_t ch)
+{
+  return m_client.write(ch);
+}
+
+size_t WebServer::write(const char *str)
+{
+  return m_client.write(str);
+}
+
+size_t WebServer::write(const uint8_t *buffer, size_t size)
+{
+  return m_client.write(buffer, size);
+}
+
+size_t WebServer::write(const char *buffer, size_t length)
+{
+  return m_client.write((const uint8_t *)buffer, length);
+}
+
+void WebServer::writeP(const prog_uchar *data, size_t length)
+{
+  // copy data out of program memory into local storage, write out in
+  // chunks of 32 bytes to avoid extra short TCP/IP packets
+  uint8_t buffer[32];
+  size_t bufferEnd = 0;
+
+  while (length--)
+  {
+    if (bufferEnd == 32)
+    {
+      m_client.write(buffer, 32);
+      bufferEnd = 0;
+    }
+
+    buffer[bufferEnd++] = pgm_read_byte(data++);
+  }
+
+  if (bufferEnd > 0)
+    m_client.write(buffer, bufferEnd);
+}
+
+void WebServer::printP(const prog_uchar *str)
+{
+  // copy data out of program memory into local storage, write out in
+  // chunks of 32 bytes to avoid extra short TCP/IP packets
+  uint8_t buffer[32];
+  size_t bufferEnd = 0;
+  
+  while (buffer[bufferEnd++] = pgm_read_byte(str++))
+  {
+    if (bufferEnd == 32)
+    {
+      m_client.write(buffer, 32);
+      bufferEnd = 0;
+    }
+  }
+
+  // write out everything left but trailing NUL
+  if (bufferEnd > 1)
+    m_client.write(buffer, bufferEnd - 1);
+}
+
+void WebServer::printCRLF()
+{
+  m_client.write((const uint8_t *)"\r\n", 2);
+}
+
+bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
+        bool tail_complete)
+{
+  if ((verb[0] == 0) || ((verb[0] == '/') && (verb[1] == 0)))
+  {
+    m_defaultCmd(*this, requestType, verb, tail_complete);
+    return true;
+  }
+  // We now know that the URL contains at least one character.  And,
+  // if the first character is a slash,  there's more after it.
+  if (verb[0] == '/')
+  {
+    char i;
+    char *qm_loc;
+    int verb_len;
+    int qm_offset;
+    // Skip over the leading "/",  because it makes the code more
+    // efficient and easier to understand.
+    verb++;
+    // Look for a "?" separating the filename part of the URL from the
+    // parameters.  If it's not there, compare to the whole URL.
+    qm_loc = strchr(verb, '?');
+    verb_len = (qm_loc == NULL) ? strlen(verb) : (qm_loc - verb);
+    qm_offset = (qm_loc == NULL) ? 0 : 1;
+    for (i = 0; i < m_cmdCount; ++i)
+    {
+      if ((verb_len == strlen(m_commands[i].verb))
+          && (strncmp(verb, m_commands[i].verb, verb_len) == 0))
+      {
+        // Skip over the "verb" part of the URL (and the question
+        // mark, if present) when passing it to the "action" routine
+        m_commands[i].cmd(*this, requestType,
+        verb + verb_len + qm_offset,
+        tail_complete);
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+// processConnection with a default buffer
+void WebServer::processConnection()
+{
+  char request[WEBDUINO_DEFAULT_REQUEST_LENGTH];
+  int  request_len = WEBDUINO_DEFAULT_REQUEST_LENGTH;
+  processConnection(request, &request_len);
+}
+
+void WebServer::processConnection(char *buff, int *bufflen)
+{
+  m_client = m_server.available();
+
+  if (m_client) {
+    m_readingContent = false;
+    buff[0] = 0;
+    ConnectionType requestType = INVALID;
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+    Serial.println("*** checking request ***");
+#endif
+    getRequest(requestType, buff, bufflen);
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+    Serial.print("*** requestType = ");
+    Serial.print((int)requestType);
+    Serial.print(", request = \"");
+    Serial.print(buff);
+    Serial.println("\" ***");
+#endif
+    processHeaders();
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+    Serial.println("*** headers complete ***");
+#endif
+
+    int urlPrefixLen = strlen(m_urlPrefix);
+    if (strcmp(buff, "/robots.txt") == 0)
+    {
+      noRobots(requestType);
+    }
+    else if (strcmp(buff, "/favicon.ico") == 0)
+    {
+      favicon(requestType);
+    }
+    else if (requestType == INVALID ||
+             strncmp(buff, m_urlPrefix, urlPrefixLen) != 0 ||
+             !dispatchCommand(requestType, buff + urlPrefixLen,
+                              (*bufflen) >= 0))
+    {
+      m_failureCmd(*this, requestType, buff, (*bufflen) >= 0);
+    }
+
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+    Serial.println("*** stopping connection ***");
+#endif
+    m_client.stop();
+  }
+}
+
+void WebServer::httpFail()
+{
+  P(failMsg) =
+    "HTTP/1.0 400 Bad Request" CRLF
+    WEBDUINO_SERVER_HEADER
+    "Content-Type: text/html" CRLF
+    CRLF
+    WEBDUINO_FAIL_MESSAGE;
+
+  printP(failMsg);
+}
+
+void WebServer::defaultFailCmd(WebServer &server,
+                               WebServer::ConnectionType type,
+                               char *url_tail,
+                               bool tail_complete)
+{
+  server.httpFail();
+}
+
+void WebServer::noRobots(ConnectionType type)
+{
+  httpSuccess("text/plain");
+  if (type != HEAD)
+  {
+    P(allowNoneMsg) = "User-agent: *" CRLF "Disallow: /" CRLF;
+    printP(allowNoneMsg);
+  }
+}
+
+void WebServer::favicon(ConnectionType type)
+{
+  httpSuccess("image/x-icon");
+  if (type != HEAD)
+  {
+    P(faviconIco) = {
+      0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x10, 0x10, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0xb0, 0x00,
+      0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00,
+      0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff,
+      0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc1, 0xbf,
+      0x00, 0x00, 0xc0, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xbf, 0x00, 0x00, 0xc1, 0xbf,
+      0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, 0xff, 0xff,
+      0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    writeP(faviconIco, sizeof(faviconIco));
+  }
+}
+
+void WebServer::httpSuccess(const char *contentType,
+                            const char *extraHeaders)
+{
+  P(successMsg1) =
+    "HTTP/1.0 200 OK" CRLF
+    WEBDUINO_SERVER_HEADER
+    "Access-Control-Allow-Origin: *" CRLF
+    "Content-Type: ";
+
+  printP(successMsg1);
+  print(contentType);
+  printCRLF();
+  if (extraHeaders) {
+    print(extraHeaders);
+    printCRLF();
+  }
+  printCRLF();
+}
+
+void WebServer::httpSeeOther(const char *otherURL)
+{
+  P(seeOtherMsg) =
+    "HTTP/1.0 303 See Other" CRLF
+    WEBDUINO_SERVER_HEADER
+    "Location: ";
+
+  printP(seeOtherMsg);
+  print(otherURL);
+  printCRLF();
+  printCRLF();
+}
+
+int WebServer::read()
+{
+  if (m_client == NULL)
+    return -1;
+
+  if (m_pushbackDepth == 0)
+  {
+    unsigned long timeoutTime = millis() + WEBDUINO_READ_TIMEOUT_IN_MS;
+
+    while (m_client.connected())
+    {
+      // stop reading the socket early if we get to content-length
+      // characters in the POST.  This is because some clients leave
+      // the socket open because they assume HTTP keep-alive.
+      if (m_readingContent)
+      {
+        if (m_contentLength == 0)
+        {
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+          Serial.println("\n*** End of content, terminating connection");
+#endif
+          return -1;
+        }
+        --m_contentLength;
+      }
+
+      int ch = m_client.read();
+
+      // if we get a character, return it, otherwise continue in while
+      // loop, checking connection status
+      if (ch != -1)
+      {
+#if WEBDUINO_SERIAL_DEBUGGING
+        if (ch == '\r')
+          Serial.print("<CR>");
+        else if (ch == '\n')
+          Serial.println("<LF>");
+        else
+          Serial.print((char)ch);
+#endif
+        return ch;
+      }
+      else
+      {
+        unsigned long now = millis();
+        if (now > timeoutTime)
+        {
+          // connection timed out, destroy client, return EOF
+#if WEBDUINO_SERIAL_DEBUGGING
+          Serial.println("*** Connection timed out");
+#endif
+          m_client.flush();
+          m_client.stop();
+          return -1;
+        }
+      }
+    }
+
+    // connection lost, return EOF
+#if WEBDUINO_SERIAL_DEBUGGING
+    Serial.println("*** Connection lost");
+#endif
+    return -1;
+  }
+  else
+    return m_pushback[--m_pushbackDepth];
+}
+
+void WebServer::push(int ch)
+{
+  // don't allow pushing EOF
+  if (ch == -1)
+    return;
+
+  m_pushback[m_pushbackDepth++] = ch;
+  // can't raise error here, so just replace last char over and over
+  if (m_pushbackDepth == SIZE(m_pushback))
+    m_pushbackDepth = SIZE(m_pushback) - 1;
+}
+
+void WebServer::reset()
+{
+  m_pushbackDepth = 0;
+}
+
+bool WebServer::expect(const char *str)
+{
+  const char *curr = str;
+  while (*curr != 0)
+  {
+    int ch = read();
+    if (ch != *curr++)
+    {
+      // push back ch and the characters we accepted
+      push(ch);
+      while (--curr != str)
+        push(curr[-1]);
+      return false;
+    }
+  }
+  return true;
+}
+
+bool WebServer::readInt(int &number)
+{
+  bool negate = false;
+  bool gotNumber = false;
+  int ch;
+  number = 0;
+
+  // absorb whitespace
+  do
+  {
+    ch = read();
+  } while (ch == ' ' || ch == '\t');
+
+  // check for leading minus sign
+  if (ch == '-')
+  {
+    negate = true;
+    ch = read();
+  }
+
+  // read digits to update number, exit when we find non-digit
+  while (ch >= '0' && ch <= '9')
+  {
+    gotNumber = true;
+    number = number * 10 + ch - '0';
+    ch = read();
+  }
+
+  push(ch);
+  if (negate)
+    number = -number;
+  return gotNumber;
+}
+
+bool WebServer::readPOSTparam(char *name, int nameLen,
+                              char *value, int valueLen)
+{
+  // assume name is at current place in stream
+  int ch;
+
+  // clear out name and value so they'll be NUL terminated
+  memset(name, 0, nameLen);
+  memset(value, 0, valueLen);
+
+  // decrement length so we don't write into NUL terminator
+  --nameLen;
+  --valueLen;
+
+  while ((ch = read()) != -1)
+  {
+    if (ch == '+')
+    {
+      ch = ' ';
+    }
+    else if (ch == '=')
+    {
+      /* that's end of name, so switch to storing in value */
+      nameLen = 0;
+      continue;
+    }
+    else if (ch == '&')
+    {
+      /* that's end of pair, go away */
+      return true;
+    }
+    else if (ch == '%')
+    {
+      /* handle URL encoded characters by converting back to original form */
+      int ch1 = read();
+      int ch2 = read();
+      if (ch1 == -1 || ch2 == -1)
+        return false;
+      char hex[3] = { ch1, ch2, 0 };
+      ch = strtoul(hex, NULL, 16);
+    }
+
+    // check against 1 so we don't overwrite the final NUL
+    if (nameLen > 1)
+    {
+      *name++ = ch;
+      --nameLen;
+    }
+    else if (valueLen > 1)
+    {
+      *value++ = ch;
+      --valueLen;
+    }
+  }
+
+  // if we get here, we hit the end-of-file, so POST is over and there
+  // are no more parameters
+  return false;
+}
+
+/* Retrieve a parameter that was encoded as part of the URL, stored in
+ * the buffer pointed to by *tail.  tail is updated to point just past
+ * the last character read from the buffer. */
+URLPARAM_RESULT WebServer::nextURLparam(char **tail, char *name, int nameLen,
+                                        char *value, int valueLen)
+{
+  // assume name is at current place in stream
+  char ch, hex[3];
+  URLPARAM_RESULT result = URLPARAM_OK;
+  char *s = *tail;
+  bool keep_scanning = true;
+  bool need_value = true;
+
+  // clear out name and value so they'll be NUL terminated
+  memset(name, 0, nameLen);
+  memset(value, 0, valueLen);
+
+  if (*s == 0)
+    return URLPARAM_EOS;
+  // Read the keyword name
+  while (keep_scanning)
+  {
+    ch = *s++;
+    switch (ch)
+    {
+    case 0:
+      s--;  // Back up to point to terminating NUL
+      // Fall through to "stop the scan" code
+    case '&':
+      /* that's end of pair, go away */
+      keep_scanning = false;
+      need_value = false;
+      break;
+    case '+':
+      ch = ' ';
+      break;
+    case '%':
+      /* handle URL encoded characters by converting back
+       * to original form */
+      if ((hex[0] = *s++) == 0)
+      {
+        s--;        // Back up to NUL
+        keep_scanning = false;
+        need_value = false;
+      }
+      else
+      {
+        if ((hex[1] = *s++) == 0)
+        {
+          s--;  // Back up to NUL
+          keep_scanning = false;
+          need_value = false;
+        }
+        else
+        {
+          hex[2] = 0;
+          ch = strtoul(hex, NULL, 16);
+        }
+      }
+      break;
+    case '=':
+      /* that's end of name, so switch to storing in value */
+      keep_scanning = false;
+      break;
+    }
+
+
+    // check against 1 so we don't overwrite the final NUL
+    if (keep_scanning && (nameLen > 1))
+    {
+      *name++ = ch;
+      --nameLen;
+    }
+    else
+      result = URLPARAM_NAME_OFLO;
+  }
+
+  if (need_value && (*s != 0))
+  {
+    keep_scanning = true;
+    while (keep_scanning)
+    {
+      ch = *s++;
+      switch (ch)
+      {
+      case 0:
+        s--;  // Back up to point to terminating NUL
+              // Fall through to "stop the scan" code
+      case '&':
+        /* that's end of pair, go away */
+        keep_scanning = false;
+        need_value = false;
+        break;
+      case '+':
+        ch = ' ';
+        break;
+      case '%':
+        /* handle URL encoded characters by converting back to original form */
+        if ((hex[0] = *s++) == 0)
+        {
+          s--;  // Back up to NUL
+          keep_scanning = false;
+          need_value = false;
+        }
+        else
+        {
+          if ((hex[1] = *s++) == 0)
+          {
+            s--;  // Back up to NUL
+            keep_scanning = false;
+            need_value = false;
+          }
+          else
+          {
+            hex[2] = 0;
+            ch = strtoul(hex, NULL, 16);
+          }
+
+        }
+        break;
+      }
+
+
+      // check against 1 so we don't overwrite the final NUL
+      if (keep_scanning && (valueLen > 1))
+      {
+        *value++ = ch;
+        --valueLen;
+      }
+      else
+        result = (result == URLPARAM_OK) ?
+          URLPARAM_VALUE_OFLO :
+          URLPARAM_BOTH_OFLO;
+    }
+  }
+  *tail = s;
+  return result;
+}
+
+
+
+// Read and parse the first line of the request header.
+// The "command" (GET/HEAD/POST) is translated into a numeric value in type.
+// The URL is stored in request,  up to the length passed in length
+// NOTE 1: length must include one byte for the terminating NUL.
+// NOTE 2: request is NOT checked for NULL,  nor length for a value < 1.
+// Reading stops when the code encounters a space, CR, or LF.  If the HTTP
+// version was supplied by the client,  it will still be waiting in the input
+// stream when we exit.
+//
+// On return, length contains the amount of space left in request.  If it's
+// less than 0,  the URL was longer than the buffer,  and part of it had to
+// be discarded.
+
+void WebServer::getRequest(WebServer::ConnectionType &type,
+                           char *request, int *length)
+{
+  --*length; // save room for NUL
+
+  type = INVALID;
+
+  // store the GET/POST line of the request
+  if (expect("GET "))
+    type = GET;
+  else if (expect("HEAD "))
+    type = HEAD;
+  else if (expect("POST "))
+    type = POST;
+
+  // if it doesn't start with any of those, we have an unknown method
+  // so just eat rest of header
+
+  int ch;
+  while ((ch = read()) != -1)
+  {
+    // stop storing at first space or end of line
+    if (ch == ' ' || ch == '\n' || ch == '\r')
+    {
+      break;
+    }
+    if (*length > 0)
+    {
+      *request = ch;
+      ++request;
+      --*length;
+    }
+  }
+  // NUL terminate
+  *request = 0;
+}
+
+void WebServer::processHeaders()
+{
+  // look for two things: the Content-Length header and the double-CRLF
+  // that ends the headers.
+
+  while (1)
+  {
+    if (expect("Content-Length:"))
+    {
+      readInt(m_contentLength);
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+      Serial.print("\n*** got Content-Length of ");
+      Serial.print(m_contentLength);
+      Serial.print(" ***");
+#endif
+      continue;
+    }
+
+    if (expect(CRLF CRLF))
+    {
+      m_readingContent = true;
+      return;
+    }
+
+    // no expect checks hit, so just absorb a character and try again
+    if (read() == -1)
+    {
+      return;
+    }
+  }
+}
+
+void WebServer::outputCheckboxOrRadio(const char *element, const char *name,
+                                      const char *val, const char *label,
+                                      bool selected)
+{
+  P(cbPart1a) = "<label><input type='";
+  P(cbPart1b) = "' name='";
+  P(cbPart2) = "' value='";
+  P(cbPart3) = "' ";
+  P(cbChecked) = "checked ";
+  P(cbPart4) = "/> ";
+  P(cbPart5) = "</label>";
+
+  printP(cbPart1a);
+  print(element);
+  printP(cbPart1b);
+  print(name);
+  printP(cbPart2);
+  print(val);
+  printP(cbPart3);
+  if (selected)
+    printP(cbChecked);
+  printP(cbPart4);
+  print(label);
+  printP(cbPart5);
+}
+
+void WebServer::checkBox(const char *name, const char *val,
+                         const char *label, bool selected)
+{
+  outputCheckboxOrRadio("checkbox", name, val, label, selected);
+}
+
+void WebServer::radioButton(const char *name, const char *val,
+                            const char *label, bool selected)
+{
+  outputCheckboxOrRadio("radio", name, val, label, selected);
+}
+
 #endif // WEBDUINO_H_

From efa2ec998e79c13834e4a46384d0e3a7c94aeb20 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Sun, 1 Jan 2012 23:56:05 +0100
Subject: [PATCH 07/75] remove #include "avr/pgmspace.h"

---
 WebServer.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index 0224400..bfb325e 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -27,7 +27,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include "avr/pgmspace.h"
 
 #include <EthernetClient.h>
 #include <EthernetServer.h>

From 3c8d015be0d4f3045f6ce580ad94aba5c0271b71 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Mon, 2 Jan 2012 20:11:54 +0100
Subject: [PATCH 08/75] add Cache-Control header to favicon.ico

---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index bfb325e..e488747 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -476,7 +476,7 @@ void WebServer::noRobots(ConnectionType type)
 
 void WebServer::favicon(ConnectionType type)
 {
-  httpSuccess("image/x-icon");
+  httpSuccess("image/x-icon","Cache-Control: max-age=31536000");
   if (type != HEAD)
   {
     P(faviconIco) = {

From 766bfb80f42b1965855f57e755c063e47556b80c Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Mon, 2 Jan 2012 20:44:21 +0100
Subject: [PATCH 09/75] moved favicon.ico data to define to allow users to
 override icon file or to send null file (see inline comments)

---
 WebServer.h | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index e488747..7f43e9c 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -61,6 +61,14 @@
 #define WEBDUINO_FAIL_MESSAGE "<h1>EPIC FAIL</h1>"
 #endif
 
+// add '#define WEBDUINO_FAVICON_DATA ""' to your application
+// before including WebServer.h to send a null file as the favicon.ico file
+// otherwise this defaults to a 16x16 px black diode on blue ground
+// (or include your own icon if you like)
+#ifndef WEBDUINO_FAVICON_DATA
+#define WEBDUINO_FAVICON_DATA { 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x10, 0x10, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0xb0, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc1, 0xbf, 0x00, 0x00, 0xc0, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xbf, 0x00, 0x00, 0xc1, 0xbf, 0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+#endif // #ifndef WEBDUINO_FAVICON_DATA
+
 // add "#define WEBDUINO_SERIAL_DEBUGGING 1" to your application
 // before including WebServer.h to have incoming requests logged to
 // the serial port.
@@ -479,21 +487,7 @@ void WebServer::favicon(ConnectionType type)
   httpSuccess("image/x-icon","Cache-Control: max-age=31536000");
   if (type != HEAD)
   {
-    P(faviconIco) = {
-      0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x10, 0x10, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0xb0, 0x00,
-      0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00,
-      0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff,
-      0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc1, 0xbf,
-      0x00, 0x00, 0xc0, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xbf, 0x00, 0x00, 0xc1, 0xbf,
-      0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, 0xff, 0xff,
-      0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    };
+    P(faviconIco) = WEBDUINO_FAVICON_DATA;
     writeP(faviconIco, sizeof(faviconIco));
   }
 }

From 90416958510d4a5be6b15e5176512c6a89690860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=F6nnqvist?= <simon@simon.fi>
Date: Mon, 2 Jan 2012 22:15:45 +0200
Subject: [PATCH 10/75] updated broken links to use Google CDN links found at
 http://the-xavi.com/articles/jquery-ui-css-themes-hosted-on-cdn (Google
 themselves nowadays seem to suggest using some JS loader that requires an API
 key)

---
 examples/Web_AjaxBuzzer/Web_AjaxBuzzer.pde | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/examples/Web_AjaxBuzzer/Web_AjaxBuzzer.pde b/examples/Web_AjaxBuzzer/Web_AjaxBuzzer.pde
index 0fc5649..e546030 100644
--- a/examples/Web_AjaxBuzzer/Web_AjaxBuzzer.pde
+++ b/examples/Web_AjaxBuzzer/Web_AjaxBuzzer.pde
@@ -73,11 +73,10 @@ void buzzCmd(WebServer &server, WebServer::ConnectionType type, char *, bool)
     P(message) = 
 "<!DOCTYPE html><html><head>"
   "<title>Webduino AJAX Buzzer Example</title>"
-  "<link href='http://jqueryui.com/latest/themes/base/ui.all.css' rel=stylesheet />"
+  "<link href='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css' rel=stylesheet />"
   //"<meta http-equiv='Content-Script-Type' content='text/javascript'>"
-  "<script src='http://jqueryui.com/latest/jquery-1.3.2.js'></script>"
-  "<script src='http://jqueryui.com/latest/ui/ui.core.js'></script>"
-  "<script src='http://jqueryui.com/latest/ui/ui.slider.js'></script>"
+  "<script src='http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js'></script>"
+  "<script src='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js'></script>"
   "<style> #slider { margin: 10px; } </style>"
   "<script>"
     "function changeBuzz(event, ui) { $('#indicator').text(ui.value); $.post('/buzz', { buzz: ui.value } ); }"

From 9dabd34a4725f10da61945d95ae73c7bd1072817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=F6nnqvist?= <simon@simon.fi>
Date: Tue, 3 Jan 2012 02:12:34 +0200
Subject: [PATCH 11/75] modification of Web_AjaxBuzzer to offer web-based
 slider controllers for RGB led

---
 examples/Web_AjaxRGB/Web_AjaxRGB.pde | 142 +++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 examples/Web_AjaxRGB/Web_AjaxRGB.pde

diff --git a/examples/Web_AjaxRGB/Web_AjaxRGB.pde b/examples/Web_AjaxRGB/Web_AjaxRGB.pde
new file mode 100644
index 0000000..8e05a8c
--- /dev/null
+++ b/examples/Web_AjaxRGB/Web_AjaxRGB.pde
@@ -0,0 +1,142 @@
+/* Web_AjaxRGB.pde - example sketch for Webduino library */
+
+#include "SPI.h"
+#include "Ethernet.h"
+#include "WebServer.h"
+
+// CHANGE THIS TO YOUR OWN UNIQUE VALUE
+static uint8_t mac[6] = { 0x02, 0xAA, 0xBB, 0xCC, 0x00, 0x22 };
+
+// CHANGE THIS TO MATCH YOUR HOST NETWORK
+static uint8_t ip[4] = { 192, 168, 1, 210 }; // area 51!
+
+/* all URLs on this server will start with /rgb because of how we
+ * define the PREFIX value.  We also will listen on port 80, the
+ * standard HTTP service port */
+#define PREFIX "/rgb"
+WebServer webserver(PREFIX, 80);
+
+#define RED_PIN 5
+#define GREEN_PIN 3
+#define BLUE_PIN 6
+
+int red = 0;            //integer for red darkness
+int blue = 0;           //integer for blue darkness
+int green = 0;          //integer for green darkness
+
+/* This command is set as the default command for the server.  It
+ * handles both GET and POST requests.  For a GET, it returns a simple
+ * page with some buttons.  For a POST, it saves the value posted to
+ * the red/green/blue variable, affecting the output of the speaker */
+void rgbCmd(WebServer &server, WebServer::ConnectionType type, char *, bool)
+{
+  if (type == WebServer::POST)
+  {
+    bool repeat;
+    char name[16], value[16];
+    do
+    {
+      /* readPOSTparam returns false when there are no more parameters
+       * to read from the input.  We pass in buffers for it to store
+       * the name and value strings along with the length of those
+       * buffers. */
+      repeat = server.readPOSTparam(name, 16, value, 16);
+
+      /* this is a standard string comparison function.  It returns 0
+       * when there's an exact match.  We're looking for a parameter
+       * named red/green/blue here. */
+      if (strcmp(name, "red") == 0)
+      {
+	/* use the STRing TO Unsigned Long function to turn the string
+	 * version of the color strength value into our integer red/green/blue
+	 * variable */
+        red = strtoul(value, NULL, 10);
+      }
+      if (strcmp(name, "green") == 0)
+      {
+        green = strtoul(value, NULL, 10);
+      }
+      if (strcmp(name, "blue") == 0)
+      {
+        blue = strtoul(value, NULL, 10);
+      }
+    } while (repeat);
+    
+    // after procesing the POST data, tell the web browser to reload
+    // the page using a GET method. 
+    server.httpSeeOther(PREFIX);
+//    Serial.print(name);
+//    Serial.println(value);
+
+    return;
+  }
+
+  /* for a GET or HEAD, send the standard "it's all OK headers" */
+  server.httpSuccess();
+
+  /* we don't output the body for a HEAD request */
+  if (type == WebServer::GET)
+  {
+    /* store the HTML in program memory using the P macro */
+    P(message) = 
+"<!DOCTYPE html><html><head>"
+  "<title>Webduino AJAX RGB Example</title>"
+  "<link href='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css' rel=stylesheet />"
+  "<script src='http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js'></script>"
+  "<script src='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js'></script>"
+  "<style> body { background: black; } #red, #green, #blue { margin: 10px; } #red { background: #f00; } #green { background: #0f0; } #blue { background: #00f; } </style>"
+  "<script>"
+
+// change color on mouse up, not while sliding (causes much less traffic to the Arduino):
+//    "function changeRGB(event, ui) { var id = $(this).attr('id'); if (id == 'red') $.post('/rgb', { red: ui.value } ); if (id == 'green') $.post('/rgb', { green: ui.value } ); if (id == 'blue') $.post('/rgb', { blue: ui.value } ); } "
+//    "$(document).ready(function(){ $('#red, #green, #blue').slider({min: 0, max:255, change:changeRGB}); });"
+
+// change color on slide and mouse up (causes more traffic to the Arduino):
+    "function changeRGB(event, ui) { jQuery.ajaxSetup({timeout: 110}); /*not to DDoS the Arduino, you might have to change this to some threshold value that fits your setup*/ var id = $(this).attr('id'); if (id == 'red') $.post('/rgb', { red: ui.value } ); if (id == 'green') $.post('/rgb', { green: ui.value } ); if (id == 'blue') $.post('/rgb', { blue: ui.value } ); } "
+    "$(document).ready(function(){ $('#red, #green, #blue').slider({min: 0, max:255, change:changeRGB, slide:changeRGB}); });"
+
+  "</script>"
+"</head>"
+"<body style='font-size:62.5%;'>"
+  "<div id=red></div>"
+  "<div id=green></div>"
+  "<div id=blue></div>"
+"</body>"
+"</html>";
+
+    server.printP(message);
+  }
+}
+
+void setup()
+{
+  pinMode(RED_PIN, OUTPUT);
+  pinMode(GREEN_PIN, OUTPUT);
+  pinMode(BLUE_PIN, OUTPUT);
+
+//  Serial.begin(9600);
+
+  // setup the Ehternet library to talk to the Wiznet board
+  Ethernet.begin(mac, ip);
+
+  /* register our default command (activated with the request of
+   * http://x.x.x.x/rgb */
+  webserver.setDefaultCommand(&rgbCmd);
+
+  /* start the server to wait for connections */
+  webserver.begin();
+}
+
+void loop()
+{
+  // process incoming connections one at a time forever
+  webserver.processConnection();
+//  Serial.print(red);
+//  Serial.print(" ");
+//  Serial.print(green);
+//  Serial.print(" ");
+//  Serial.println(blue);
+  analogWrite(RED_PIN, red);
+  analogWrite(GREEN_PIN, green);
+  analogWrite(BLUE_PIN, blue);
+}

From f2df960961888c371b007a604d7261e020e77632 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Tue, 3 Jan 2012 17:15:22 +0100
Subject: [PATCH 12/75] HTTP Basic Authentication support

---
 WebServer.h                                   |  87 +++++++++++++-
 .../Web_Authentication/Web_Authentication.ino | 106 ++++++++++++++++++
 keywords.txt                                  |   7 ++
 3 files changed, 197 insertions(+), 3 deletions(-)
 create mode 100644 examples/Web_Authentication/Web_Authentication.ino

diff --git a/WebServer.h b/WebServer.h
index 7f43e9c..62004f6 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -35,8 +35,8 @@
  * CONFIGURATION
  ********************************************************************/
 
-#define WEBDUINO_VERSION 1005
-#define WEBDUINO_VERSION_STRING "1.5"
+#define WEBDUINO_VERSION 1006
+#define WEBDUINO_VERSION_STRING "1.6"
 
 #if WEBDUINO_SUPRESS_SERVER_HEADER
 #define WEBDUINO_SERVER_HEADER ""
@@ -61,6 +61,14 @@
 #define WEBDUINO_FAIL_MESSAGE "<h1>EPIC FAIL</h1>"
 #endif
 
+#ifndef WEBDUINO_AUTH_REALM
+#define WEBDUINO_AUTH_REALM "Webduino"
+#endif // #ifndef WEBDUINO_AUTH_REALM
+
+#ifndef WEBDUINO_AUTH_MESSAGE
+#define WEBDUINO_AUTH_MESSAGE "<h1>401 Unauthorized</h1>"
+#endif // #ifndef WEBDUINO_AUTH_MESSAGE
+
 // add '#define WEBDUINO_FAVICON_DATA ""' to your application
 // before including WebServer.h to send a null file as the favicon.ico file
 // otherwise this defaults to a 16x16 px black diode on blue ground
@@ -178,6 +186,10 @@ class WebServer: public Print
   // value or 0 if nothing was read.
   bool readInt(int &number);
 
+  // reads a header value, stripped of possible whitespace in front,
+  // from the server stream
+  void readHeader(char *value, int valueLen);
+
   // Read the next keyword parameter from the socket.  Assumes that other
   // code has already skipped over the headers,  and the next thing to
   // be read will be the start of a keyword.
@@ -192,8 +204,19 @@ class WebServer: public Print
   URLPARAM_RESULT nextURLparam(char **tail, char *name, int nameLen,
                                char *value, int valueLen);
 
+  // compare string against credentials in current request
+  //
+  // authCredentials must be Base64 encoded outside of Webduino
+  // (I wanted to be easy on the resources)
+  //
+  // returns true if strings match, false otherwise
+  bool checkCredentials(const char authCredentials[44]);
+
   // output headers and a message indicating a server error
   void httpFail();
+  
+  // output headers and a message indicating "401 Unauthorized"
+  void httpUnauthorized();
 
   // output standard headers indicating "200 Success".  You can change the
   // type of the data you're outputting or also add extra headers like
@@ -221,6 +244,7 @@ class WebServer: public Print
   char m_pushbackDepth;
 
   int m_contentLength;
+  char m_authCredentials[50];
   bool m_readingContent;
 
   Command *m_failureCmd;
@@ -452,6 +476,14 @@ void WebServer::processConnection(char *buff, int *bufflen)
   }
 }
 
+bool WebServer::checkCredentials(const char authCredentials[44])
+{
+  char str[50] = "Basic ";
+  strcat(str,authCredentials);
+  if(0 == strcmp(str,m_authCredentials)) return true;
+  return false;
+}
+
 void WebServer::httpFail()
 {
   P(failMsg) =
@@ -492,6 +524,19 @@ void WebServer::favicon(ConnectionType type)
   }
 }
 
+void WebServer::httpUnauthorized()
+{
+  P(failMsg) =
+    "HTTP/1.0 401 Authorization Required" CRLF
+    WEBDUINO_SERVER_HEADER
+    "Content-Type: text/html" CRLF
+    "WWW-Authenticate: Basic realm=\"" WEBDUINO_AUTH_REALM "\"" CRLF
+    CRLF
+    WEBDUINO_AUTH_MESSAGE;
+
+  printP(failMsg);
+}
+
 void WebServer::httpSuccess(const char *contentType,
                             const char *extraHeaders)
 {
@@ -661,6 +706,31 @@ bool WebServer::readInt(int &number)
   return gotNumber;
 }
 
+void WebServer::readHeader(char *value, int valueLen)
+{
+  int ch;
+  memset(value, 0, valueLen);
+  --valueLen;
+
+  // absorb whitespace
+  do
+  {
+    ch = read();
+  } while (ch == ' ' || ch == '\t');
+
+  // read rest of line
+  do
+  {
+    if (valueLen > 1)
+    {
+      *value++=ch;
+      --valueLen;
+      ch = read();
+    }
+  } while (ch != '\r');
+  push(ch);
+}
+
 bool WebServer::readPOSTparam(char *name, int nameLen,
                               char *value, int valueLen)
 {
@@ -914,7 +984,7 @@ void WebServer::getRequest(WebServer::ConnectionType &type,
 
 void WebServer::processHeaders()
 {
-  // look for two things: the Content-Length header and the double-CRLF
+  // look for three things: the Content-Length header, the Authorization header, and the double-CRLF
   // that ends the headers.
 
   while (1)
@@ -930,6 +1000,17 @@ void WebServer::processHeaders()
       continue;
     }
 
+    if (expect("Authorization:"))
+    {
+      readHeader(m_authCredentials,70);
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+      Serial.print("\n*** got Authorization: of ");
+      Serial.print(m_authCredentials);
+      Serial.print(" ***");
+#endif
+      continue;
+    }
+
     if (expect(CRLF CRLF))
     {
       m_readingContent = true;
diff --git a/examples/Web_Authentication/Web_Authentication.ino b/examples/Web_Authentication/Web_Authentication.ino
new file mode 100644
index 0000000..4a2384d
--- /dev/null
+++ b/examples/Web_Authentication/Web_Authentication.ino
@@ -0,0 +1,106 @@
+/* Web_Authentication.ino - Webduino Authentication example */
+
+/* This example assumes that you're familiar with the basics
+ * of the Ethernet library (particularly with setting MAC and
+ * IP addresses) and with the basics of Webduino. If you
+ * haven't had a look at the HelloWorld example you should
+ * probably check it out first */
+
+/* you can change the authentication realm by defining
+ * WEBDUINO_AUTH_REALM before including WebServer.h */
+#define WEBDUINO_AUTH_REALM "Weduino Authentication Example"
+
+#include "SPI.h"
+#include "Ethernet.h"
+#include "WebServer.h"
+
+/* CHANGE THIS TO YOUR OWN UNIQUE VALUE.  The MAC number should be
+ * different from any other devices on your network or you'll have
+ * problems receiving packets. */
+static uint8_t mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
+
+/* CHANGE THIS TO MATCH YOUR HOST NETWORK.  Most home networks are in
+ * the 192.168.0.XXX or 192.168.1.XXX subrange.  Pick an address
+ * that's not in use and isn't going to be automatically allocated by
+ * DHCP from your router. */
+static uint8_t ip[] = { 192, 168, 1, 210 };
+
+/* This creates an instance of the webserver.  By specifying a prefix
+ * of "", all pages will be at the root of the server. */
+#define PREFIX ""
+WebServer webserver(PREFIX, 80);
+
+void defaultCmd(WebServer &server, WebServer::ConnectionType type, char *, bool)
+{
+  server.httpSuccess();
+  if (type != WebServer::HEAD)
+  {
+    P(helloMsg) = "<h1>Hello, World!</h1><a href=\"private.html\">Private page</a>";
+    server.printP(helloMsg);
+  }
+}
+
+void privateCmd(WebServer &server, WebServer::ConnectionType type, char *, bool)
+{
+  /* if the user has requested this page using the following credentials
+   * username = user
+   * password = user
+   * display a page saying "Hello User"
+   *
+   * the credentials have to be concatenated with a colon like
+   * username:password
+   * and encoded using Base64 - this should be done outside of your Arduino
+   * to be easy on your resources
+   *
+   * in other words: "dXNlcjp1c2Vy" is the Base64 representation of "user:user"
+   *
+   * if you need to change the username/password dynamically please search
+   * the web for a Base64 library */
+  if (server.checkCredentials("dXNlcjp1c2Vy"))
+  {
+    server.httpSuccess();
+    if (type != WebServer::HEAD)
+    {
+      P(helloMsg) = "<h1>Hello User</h1>";
+      server.printP(helloMsg);
+    }
+  }
+  /* if the user has requested this page using the following credentials
+   * username = admin
+   * password = admin
+   * display a page saying "Hello Admin"
+   *
+   * in other words: "YWRtaW46YWRtaW4=" is the Base64 representation of "admin:admin" */
+  else if (server.checkCredentials("YWRtaW46YWRtaW4="))
+  {
+    server.httpSuccess();
+    if (type != WebServer::HEAD)
+    {
+      P(helloMsg) = "<h1>Hello Admin</h1>";
+      server.printP(helloMsg);
+    }
+  }
+  else
+  {
+    /* send a 401 error back causing the web browser to prompt the user for credentials */
+    server.httpUnauthorized();
+  }
+}
+
+void setup()
+{
+  Ethernet.begin(mac, ip);
+  webserver.setDefaultCommand(&defaultCmd);
+  webserver.addCommand("index.html", &defaultCmd);
+  webserver.addCommand("private.html", &privateCmd);
+  webserver.begin();
+}
+
+void loop()
+{
+  char buff[64];
+  int len = 64;
+
+  /* process incoming connections one at a time forever */
+  webserver.processConnection(buff, &len);
+}
diff --git a/keywords.txt b/keywords.txt
index c1365ab..747ad2d 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -1,5 +1,9 @@
 WebServer	KEYWORD1
 ConnectionType	KEYWORD1
+INVALID	KEYWORD2
+GET	KEYWORD2
+HEAD	KEYWORD2
+POST	KEYWORD2
 begin	KEYWORD2
 processConnection	KEYWORD2
 setDefaultCommand	KEYWORD2
@@ -14,9 +18,12 @@ read	KEYWORD2
 push	KEYWORD2
 expect	KEYWORD2
 readInt	KEYWORD2
+readHeader	KEYWORD2
 readPOSTparam	KEYWORD2
 nextURLparam	KEYWORD2
+checkCredentials	KEYWORD2
 httpFail	KEYWORD2
+httpUnauthorized	KEYWORD2
 httpSuccess	KEYWORD2
 httpSeeOther	KEYWORD2
 write	KEYWORD2

From cf4bf0c6066bed947d640043de869a405fc11582 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Tue, 3 Jan 2012 21:26:51 +0100
Subject: [PATCH 13/75] reverted earlier change about CRLF for extra headers.
 in-line documentation clearly states "Extra headers should each be terminated
 with CRLF." changed favicon method accordingly

---
 WebServer.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 7f43e9c..781b2d2 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -484,7 +484,7 @@ void WebServer::noRobots(ConnectionType type)
 
 void WebServer::favicon(ConnectionType type)
 {
-  httpSuccess("image/x-icon","Cache-Control: max-age=31536000");
+  httpSuccess("image/x-icon","Cache-Control: max-age=31536000\r\n");
   if (type != HEAD)
   {
     P(faviconIco) = WEBDUINO_FAVICON_DATA;
@@ -504,10 +504,8 @@ void WebServer::httpSuccess(const char *contentType,
   printP(successMsg1);
   print(contentType);
   printCRLF();
-  if (extraHeaders) {
+  if (extraHeaders)
     print(extraHeaders);
-    printCRLF();
-  }
   printCRLF();
 }
 

From ed2342da1213653305c0f27f1018a4e264b404e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=F6nnqvist?= <simon@simon.fi>
Date: Tue, 3 Jan 2012 23:42:04 +0200
Subject: [PATCH 14/75] Web_AjaxRGB.pde modified to use jQuery Mobile instead
 of jQuery UI

---
 .../Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.pde | 140 ++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.pde

diff --git a/examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.pde b/examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.pde
new file mode 100644
index 0000000..aa49ee2
--- /dev/null
+++ b/examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.pde
@@ -0,0 +1,140 @@
+/* Web_AjaxRGB_mobile.pde - example sketch for Webduino library */
+/* -  offers web-based slider controllers for RGB led  - */
+
+#include "SPI.h"
+#include "Ethernet.h"
+#include "WebServer.h"
+
+// CHANGE THIS TO YOUR OWN UNIQUE VALUE
+static uint8_t mac[6] = { 0x02, 0xAA, 0xBB, 0xCC, 0x00, 0x22 };
+
+// CHANGE THIS TO MATCH YOUR HOST NETWORK
+static uint8_t ip[4] = { 192, 168, 1, 210 }; // area 51!
+
+/* all URLs on this server will start with /rgb because of how we
+ * define the PREFIX value.  We also will listen on port 80, the
+ * standard HTTP service port */
+#define PREFIX "/rgb"
+WebServer webserver(PREFIX, 80);
+
+#define RED_PIN 5
+#define GREEN_PIN 3
+#define BLUE_PIN 6
+
+int red = 0;            //integer for red darkness
+int blue = 0;           //integer for blue darkness
+int green = 0;          //integer for green darkness
+
+/* This command is set as the default command for the server.  It
+ * handles both GET and POST requests.  For a GET, it returns a simple
+ * page with some buttons.  For a POST, it saves the value posted to
+ * the red/green/blue variable, affecting the output of the speaker */
+void rgbCmd(WebServer &server, WebServer::ConnectionType type, char *, bool)
+{
+  if (type == WebServer::POST)
+  {
+    bool repeat;
+    char name[16], value[16];
+    do
+    {
+      /* readPOSTparam returns false when there are no more parameters
+       * to read from the input.  We pass in buffers for it to store
+       * the name and value strings along with the length of those
+       * buffers. */
+      repeat = server.readPOSTparam(name, 16, value, 16);
+
+      /* this is a standard string comparison function.  It returns 0
+       * when there's an exact match.  We're looking for a parameter
+       * named red/green/blue here. */
+      if (strcmp(name, "red") == 0)
+      {
+	/* use the STRing TO Unsigned Long function to turn the string
+	 * version of the color strength value into our integer red/green/blue
+	 * variable */
+        red = strtoul(value, NULL, 10);
+      }
+      if (strcmp(name, "green") == 0)
+      {
+        green = strtoul(value, NULL, 10);
+      }
+      if (strcmp(name, "blue") == 0)
+      {
+        blue = strtoul(value, NULL, 10);
+      }
+    } while (repeat);
+    
+    // after procesing the POST data, tell the web browser to reload
+    // the page using a GET method. 
+    server.httpSeeOther(PREFIX);
+//    Serial.print(name);
+//    Serial.println(value);
+
+    return;
+  }
+
+  /* for a GET or HEAD, send the standard "it's all OK headers" */
+  server.httpSuccess();
+
+  /* we don't output the body for a HEAD request */
+  if (type == WebServer::GET)
+  {
+    /* store the HTML in program memory using the P macro */
+    P(message) = 
+"<!DOCTYPE html><html><head>"
+  "<meta charset=\"utf-8\"><meta name=\"apple-mobile-web-app-capable\" content=\"yes\" /><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\"><meta name=\"viewport\" content=\"width=device-width, user-scalable=no\">"
+  "<title>Webduino RGB</title>"
+  "<link rel=\"stylesheet\" href=\"http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.css\" />"
+  "<script src=\"http://code.jquery.com/jquery-1.6.4.min.js\"></script>"
+  "<script src=\"http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.js\"></script>"
+  "<style> body, .ui-page { background: black; } .ui-body { padding-bottom: 1.5em; } div.ui-slider { width: 88%; } #red, #green, #blue { display: block; margin: 10px; } #red { background: #f00; } #green { background: #0f0; } #blue { background: #00f; } </style>"
+  "<script>"
+// causes the Arduino to hang quite frequently (more often than Web_AjaxRGB.pde), probably due to the different event triggering the ajax requests
+    "$(document).ready(function(){ $('#red, #green, #blue').slider; $('#red, #green, #blue').bind( 'change', function(event, ui) { jQuery.ajaxSetup({timeout: 110}); /*not to DDoS the Arduino, you might have to change this to some threshold value that fits your setup*/ var id = $(this).attr('id'); var strength = $(this).val(); if (id == 'red') $.post('/rgb', { red: strength } ); if (id == 'green') $.post('/rgb', { green: strength } ); if (id == 'blue') $.post('/rgb', { blue: strength } ); });});"
+  "</script>"
+"</head>"
+"<body>"
+  "<div data-role=\"header\" data-position=\"inline\"><h1>Webduino RGB</h1></div>"
+    "<div class=\"ui-body ui-body-a\">"
+      "<input type=\"range\" name=\"slider\" id=\"red\" value=\"0\" min=\"0\" max=\"255\"  />"
+      "<input type=\"range\" name=\"slider\" id=\"green\" value=\"0\" min=\"0\" max=\"255\"  />"
+      "<input type=\"range\" name=\"slider\" id=\"blue\" value=\"0\" min=\"0\" max=\"255\"  />"
+    "</div>"
+  "</body>"
+"</html>";
+
+    server.printP(message);
+  }
+}
+
+void setup()
+{
+  pinMode(RED_PIN, OUTPUT);
+  pinMode(GREEN_PIN, OUTPUT);
+  pinMode(BLUE_PIN, OUTPUT);
+
+//  Serial.begin(9600);
+
+  // setup the Ehternet library to talk to the Wiznet board
+  Ethernet.begin(mac, ip);
+
+  /* register our default command (activated with the request of
+   * http://x.x.x.x/rgb */
+  webserver.setDefaultCommand(&rgbCmd);
+
+  /* start the server to wait for connections */
+  webserver.begin();
+}
+
+void loop()
+{
+  // process incoming connections one at a time forever
+  webserver.processConnection();
+//  Serial.print(red);
+//  Serial.print(" ");
+//  Serial.print(green);
+//  Serial.print(" ");
+//  Serial.println(blue);
+  analogWrite(RED_PIN, red);
+  analogWrite(GREEN_PIN, green);
+  analogWrite(BLUE_PIN, blue);
+}

From 0a14c0ba8f5226c9ec4aca8a1a3e93e2302bbf42 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Wed, 4 Jan 2012 14:11:24 +0100
Subject: [PATCH 15/75] fixed error: tail_complete was always true, even if
 tail was truncated; now becomes false when it should

---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index 781b2d2..296676c 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -903,8 +903,8 @@ void WebServer::getRequest(WebServer::ConnectionType &type,
     {
       *request = ch;
       ++request;
-      --*length;
     }
+    --*length;
   }
   // NUL terminate
   *request = 0;

From 7ae0eb7c2549b3c5713f6e0bef94897242738483 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Wed, 4 Jan 2012 14:18:54 +0100
Subject: [PATCH 16/75] readme updated: authentication, bump up version number
 to 1.6

---
 readme.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/readme.md b/readme.md
index 23a616c..5a8e492 100644
--- a/readme.md
+++ b/readme.md
@@ -1,8 +1,8 @@
 # Webduino
 
-### Project forked from 1.4.1 of http://code.google.com/p/webduino/ by Ben Combee
+### Project originally forked from 1.4.1 of http://code.google.com/p/webduino/ by Ben Combee
 
-This is an Arduino-based Web Server library, originally developed for a class at NYC Resistor. It's called Webduino, and it's an extensible web server library for the Arduino using the Wiznet-based Ethernet shields. It's released under the MIT license allowing all sorts of reuse. 
+This is an Arduino-based Web Server library, originally developed for a class at NYC Resistor. It's called Webduino, and it's an extensible web server library for the Arduino using the Wiznet-based Ethernet shields. It's released under the MIT license allowing all sorts of reuse.
 
 I've got a few examples up right now -- the Buzz example interfaces with Zach's Danger Shield allowing you to remotely start and stop the speaker. We had a room full of students pinging my Arduino board on Saturday, buzzing me while I was lecturing. It was fun. The big Demo example shows how to setup an HTML form running on the device where you can read and write pins.
 
@@ -15,16 +15,16 @@ I hope to add a few more examples in the next few weeks, including a web-enabled
 - Web Forms
 - Images
 - JSON/RESTful interface
+- HTTP Basic Authentication
 
 ## Installation Notes
 
-With Arduino 1.0, add the Webduino folder to the "libraries" folder of your sketchbook directory. 
+With Arduino 1.0, add the Webduino folder to the "libraries" folder of your sketchbook directory.
 
 You can put the examples in your own sketchbook directory, or in hardware/libraries/webduino/examples, as you prefer.
 
 If you get an error message when building the examples similar to "WebServer.h not found", it's a problem with where you put the Webduino folder. The server won't work if the header is directly in the libraries folder.
 
-
 ## Presentation
 
 [Wedbuino Presentation on Google Docs](http://docs.google.com/present/view?id=dd8gqxt8_5c8w9qfg3)
@@ -41,6 +41,10 @@ These have all been tested with the library successfully:
 
 ## Version history
 
+### 1.6 released in Jan 2012
+
+- added checkCredentials and httpUnauthorized methods as well as readHeader method for HTTP Basic Authentication; currently users will have to do the Base64 encoding outside of Webduino and I'm uncertain whether I ever want this inside the library or not...
+
 ### 1.5 released in Dec 2011
 
 - added a default favicon.ico based on the led.png from the Image example to save resources on Firefox trying to load this file on every request if it can't be loaded

From 661e702261aaad494501e58976d7aa61c0ae998a Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Wed, 4 Jan 2012 14:53:38 +0100
Subject: [PATCH 17/75] fixed the command dispatcher: previously the default
 command could not have a tail, but the EPIC FAIL was returned

---
 WebServer.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/WebServer.h b/WebServer.h
index 296676c..2e4d265 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -358,8 +358,18 @@ void WebServer::printCRLF()
 bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
         bool tail_complete)
 {
+  // if there is no URL, i.e. we have a prefix and it's requested without a trailing slash
+  // or if the URL is just the slash
   if ((verb[0] == 0) || ((verb[0] == '/') && (verb[1] == 0)))
   {
+    m_defaultCmd(*this, requestType, "", tail_complete);
+    return true;
+  }
+  // if the URL is just a slash followed by a question mark
+  // we're looking at the default command with GET parameters passed
+  if ((verb[0] == '/') && (verb[1] == '?'))
+  {
+    verb+=2; // skip over the "/?" part of the url
     m_defaultCmd(*this, requestType, verb, tail_complete);
     return true;
   }

From f86c06e81fcc9d6d36c0551730c0bd4c389c6905 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Wed, 4 Jan 2012 15:23:53 +0100
Subject: [PATCH 18/75] reducing program size: checkCredentials() now much more
 efficient

---
 WebServer.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index ab89b8c..db7ef36 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -478,9 +478,8 @@ void WebServer::processConnection(char *buff, int *bufflen)
 
 bool WebServer::checkCredentials(const char authCredentials[44])
 {
-  char str[50] = "Basic ";
-  strcat(str,authCredentials);
-  if(0 == strcmp(str,m_authCredentials)) return true;
+  char basic[7] = "Basic ";
+  if((0 == strncmp(m_authCredentials,basic,6)) && (0 == strcmp(authCredentials,m_authCredentials+6))) return true;
   return false;
 }
 
@@ -1000,7 +999,7 @@ void WebServer::processHeaders()
 
     if (expect("Authorization:"))
     {
-      readHeader(m_authCredentials,70);
+      readHeader(m_authCredentials,50);
 #if WEBDUINO_SERIAL_DEBUGGING > 1
       Serial.print("\n*** got Authorization: of ");
       Serial.print(m_authCredentials);

From 1711391319cf3b62d3c3bf09e964ae88acaed8b1 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Wed, 4 Jan 2012 04:26:51 +0800
Subject: [PATCH 19/75] reverted earlier change about CRLF for extra headers.
 in-line documentation clearly states "Extra headers should each be terminated
 with CRLF." changed favicon method accordingly

---
 WebServer.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 7f43e9c..781b2d2 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -484,7 +484,7 @@ void WebServer::noRobots(ConnectionType type)
 
 void WebServer::favicon(ConnectionType type)
 {
-  httpSuccess("image/x-icon","Cache-Control: max-age=31536000");
+  httpSuccess("image/x-icon","Cache-Control: max-age=31536000\r\n");
   if (type != HEAD)
   {
     P(faviconIco) = WEBDUINO_FAVICON_DATA;
@@ -504,10 +504,8 @@ void WebServer::httpSuccess(const char *contentType,
   printP(successMsg1);
   print(contentType);
   printCRLF();
-  if (extraHeaders) {
+  if (extraHeaders)
     print(extraHeaders);
-    printCRLF();
-  }
   printCRLF();
 }
 

From 927a054d35bb0068f4c5bcf94bbca9a18d487150 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Wed, 4 Jan 2012 21:11:24 +0800
Subject: [PATCH 20/75] fixed error: tail_complete was always true, even if
 tail was truncated; now becomes false when it should

---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index 781b2d2..296676c 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -903,8 +903,8 @@ void WebServer::getRequest(WebServer::ConnectionType &type,
     {
       *request = ch;
       ++request;
-      --*length;
     }
+    --*length;
   }
   // NUL terminate
   *request = 0;

From 8d98df9c76cbedab77e3605f0b69bfa84d61b0e8 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Wed, 4 Jan 2012 21:53:38 +0800
Subject: [PATCH 21/75] fixed the command dispatcher: previously the default
 command could not have a tail, but the EPIC FAIL was returned

---
 WebServer.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/WebServer.h b/WebServer.h
index 296676c..2e4d265 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -358,8 +358,18 @@ void WebServer::printCRLF()
 bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
         bool tail_complete)
 {
+  // if there is no URL, i.e. we have a prefix and it's requested without a trailing slash
+  // or if the URL is just the slash
   if ((verb[0] == 0) || ((verb[0] == '/') && (verb[1] == 0)))
   {
+    m_defaultCmd(*this, requestType, "", tail_complete);
+    return true;
+  }
+  // if the URL is just a slash followed by a question mark
+  // we're looking at the default command with GET parameters passed
+  if ((verb[0] == '/') && (verb[1] == '?'))
+  {
+    verb+=2; // skip over the "/?" part of the url
     m_defaultCmd(*this, requestType, verb, tail_complete);
     return true;
   }

From 92e82c46bdba51f070b7dd7d0c1e347b62f6401c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=F6nnqvist?= <simon@simon.fi>
Date: Wed, 4 Jan 2012 05:42:04 +0800
Subject: [PATCH 22/75] Web_AjaxRGB.pde modified to use jQuery Mobile instead
 of jQuery UI

---
 .../Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.pde | 140 ++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.pde

diff --git a/examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.pde b/examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.pde
new file mode 100644
index 0000000..aa49ee2
--- /dev/null
+++ b/examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.pde
@@ -0,0 +1,140 @@
+/* Web_AjaxRGB_mobile.pde - example sketch for Webduino library */
+/* -  offers web-based slider controllers for RGB led  - */
+
+#include "SPI.h"
+#include "Ethernet.h"
+#include "WebServer.h"
+
+// CHANGE THIS TO YOUR OWN UNIQUE VALUE
+static uint8_t mac[6] = { 0x02, 0xAA, 0xBB, 0xCC, 0x00, 0x22 };
+
+// CHANGE THIS TO MATCH YOUR HOST NETWORK
+static uint8_t ip[4] = { 192, 168, 1, 210 }; // area 51!
+
+/* all URLs on this server will start with /rgb because of how we
+ * define the PREFIX value.  We also will listen on port 80, the
+ * standard HTTP service port */
+#define PREFIX "/rgb"
+WebServer webserver(PREFIX, 80);
+
+#define RED_PIN 5
+#define GREEN_PIN 3
+#define BLUE_PIN 6
+
+int red = 0;            //integer for red darkness
+int blue = 0;           //integer for blue darkness
+int green = 0;          //integer for green darkness
+
+/* This command is set as the default command for the server.  It
+ * handles both GET and POST requests.  For a GET, it returns a simple
+ * page with some buttons.  For a POST, it saves the value posted to
+ * the red/green/blue variable, affecting the output of the speaker */
+void rgbCmd(WebServer &server, WebServer::ConnectionType type, char *, bool)
+{
+  if (type == WebServer::POST)
+  {
+    bool repeat;
+    char name[16], value[16];
+    do
+    {
+      /* readPOSTparam returns false when there are no more parameters
+       * to read from the input.  We pass in buffers for it to store
+       * the name and value strings along with the length of those
+       * buffers. */
+      repeat = server.readPOSTparam(name, 16, value, 16);
+
+      /* this is a standard string comparison function.  It returns 0
+       * when there's an exact match.  We're looking for a parameter
+       * named red/green/blue here. */
+      if (strcmp(name, "red") == 0)
+      {
+	/* use the STRing TO Unsigned Long function to turn the string
+	 * version of the color strength value into our integer red/green/blue
+	 * variable */
+        red = strtoul(value, NULL, 10);
+      }
+      if (strcmp(name, "green") == 0)
+      {
+        green = strtoul(value, NULL, 10);
+      }
+      if (strcmp(name, "blue") == 0)
+      {
+        blue = strtoul(value, NULL, 10);
+      }
+    } while (repeat);
+    
+    // after procesing the POST data, tell the web browser to reload
+    // the page using a GET method. 
+    server.httpSeeOther(PREFIX);
+//    Serial.print(name);
+//    Serial.println(value);
+
+    return;
+  }
+
+  /* for a GET or HEAD, send the standard "it's all OK headers" */
+  server.httpSuccess();
+
+  /* we don't output the body for a HEAD request */
+  if (type == WebServer::GET)
+  {
+    /* store the HTML in program memory using the P macro */
+    P(message) = 
+"<!DOCTYPE html><html><head>"
+  "<meta charset=\"utf-8\"><meta name=\"apple-mobile-web-app-capable\" content=\"yes\" /><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\"><meta name=\"viewport\" content=\"width=device-width, user-scalable=no\">"
+  "<title>Webduino RGB</title>"
+  "<link rel=\"stylesheet\" href=\"http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.css\" />"
+  "<script src=\"http://code.jquery.com/jquery-1.6.4.min.js\"></script>"
+  "<script src=\"http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.js\"></script>"
+  "<style> body, .ui-page { background: black; } .ui-body { padding-bottom: 1.5em; } div.ui-slider { width: 88%; } #red, #green, #blue { display: block; margin: 10px; } #red { background: #f00; } #green { background: #0f0; } #blue { background: #00f; } </style>"
+  "<script>"
+// causes the Arduino to hang quite frequently (more often than Web_AjaxRGB.pde), probably due to the different event triggering the ajax requests
+    "$(document).ready(function(){ $('#red, #green, #blue').slider; $('#red, #green, #blue').bind( 'change', function(event, ui) { jQuery.ajaxSetup({timeout: 110}); /*not to DDoS the Arduino, you might have to change this to some threshold value that fits your setup*/ var id = $(this).attr('id'); var strength = $(this).val(); if (id == 'red') $.post('/rgb', { red: strength } ); if (id == 'green') $.post('/rgb', { green: strength } ); if (id == 'blue') $.post('/rgb', { blue: strength } ); });});"
+  "</script>"
+"</head>"
+"<body>"
+  "<div data-role=\"header\" data-position=\"inline\"><h1>Webduino RGB</h1></div>"
+    "<div class=\"ui-body ui-body-a\">"
+      "<input type=\"range\" name=\"slider\" id=\"red\" value=\"0\" min=\"0\" max=\"255\"  />"
+      "<input type=\"range\" name=\"slider\" id=\"green\" value=\"0\" min=\"0\" max=\"255\"  />"
+      "<input type=\"range\" name=\"slider\" id=\"blue\" value=\"0\" min=\"0\" max=\"255\"  />"
+    "</div>"
+  "</body>"
+"</html>";
+
+    server.printP(message);
+  }
+}
+
+void setup()
+{
+  pinMode(RED_PIN, OUTPUT);
+  pinMode(GREEN_PIN, OUTPUT);
+  pinMode(BLUE_PIN, OUTPUT);
+
+//  Serial.begin(9600);
+
+  // setup the Ehternet library to talk to the Wiznet board
+  Ethernet.begin(mac, ip);
+
+  /* register our default command (activated with the request of
+   * http://x.x.x.x/rgb */
+  webserver.setDefaultCommand(&rgbCmd);
+
+  /* start the server to wait for connections */
+  webserver.begin();
+}
+
+void loop()
+{
+  // process incoming connections one at a time forever
+  webserver.processConnection();
+//  Serial.print(red);
+//  Serial.print(" ");
+//  Serial.print(green);
+//  Serial.print(" ");
+//  Serial.println(blue);
+  analogWrite(RED_PIN, red);
+  analogWrite(GREEN_PIN, green);
+  analogWrite(BLUE_PIN, blue);
+}

From f4835311c3f2229ab9c2be146e85a3be313eedf6 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Thu, 5 Jan 2012 10:19:46 +0100
Subject: [PATCH 23/75] readme.md updated, mentioning changes merged from
 "master" branch

---
 readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/readme.md b/readme.md
index 5a8e492..2e7a2bf 100644
--- a/readme.md
+++ b/readme.md
@@ -44,6 +44,8 @@ These have all been tested with the library successfully:
 ### 1.6 released in Jan 2012
 
 - added checkCredentials and httpUnauthorized methods as well as readHeader method for HTTP Basic Authentication; currently users will have to do the Base64 encoding outside of Webduino and I'm uncertain whether I ever want this inside the library or not...
+- fixed the request parser: previously the command dispatcher would always pass true for tail_complete, even if the tail was incomplete
+- fixed the command dispatcher: previously the default command could not have a tail, but the EPIC FAIL was returned
 
 ### 1.5 released in Dec 2011
 

From dce301917783534960c3ff9ed815d3404c7f02af Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Thu, 5 Jan 2012 10:45:10 +0100
Subject: [PATCH 24/75] fixes stupid mistake where unauthorized users would see
 private/protected content

---
 WebServer.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/WebServer.h b/WebServer.h
index f9279d5..d8529b6 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -994,6 +994,11 @@ void WebServer::processHeaders()
   // look for three things: the Content-Length header, the Authorization header, and the double-CRLF
   // that ends the headers.
 
+  // empty the m_authCredentials before every run of this function.
+  // otherwise users who don't send an Authorization header would be treated
+  // like the last user who tried to authenticate (possibly successful)
+  m_authCredentials[0]=0;
+
   while (1)
   {
     if (expect("Content-Length:"))

From 354d8efc70f9cb07692b162a99e2c86d4d054aa2 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Thu, 5 Jan 2012 11:40:36 +0100
Subject: [PATCH 25/75] fixed memory allocation for authentication credentials.
 previously i had not properly taken into consideration the NUL terminator

---
 WebServer.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index d8529b6..e8329ee 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -210,7 +210,7 @@ class WebServer: public Print
   // (I wanted to be easy on the resources)
   //
   // returns true if strings match, false otherwise
-  bool checkCredentials(const char authCredentials[44]);
+  bool checkCredentials(const char authCredentials[45]);
 
   // output headers and a message indicating a server error
   void httpFail();
@@ -244,7 +244,7 @@ class WebServer: public Print
   char m_pushbackDepth;
 
   int m_contentLength;
-  char m_authCredentials[50];
+  char m_authCredentials[51];
   bool m_readingContent;
 
   Command *m_failureCmd;
@@ -486,7 +486,7 @@ void WebServer::processConnection(char *buff, int *bufflen)
   }
 }
 
-bool WebServer::checkCredentials(const char authCredentials[44])
+bool WebServer::checkCredentials(const char authCredentials[45])
 {
   char basic[7] = "Basic ";
   if((0 == strncmp(m_authCredentials,basic,6)) && (0 == strcmp(authCredentials,m_authCredentials+6))) return true;
@@ -1014,7 +1014,7 @@ void WebServer::processHeaders()
 
     if (expect("Authorization:"))
     {
-      readHeader(m_authCredentials,50);
+      readHeader(m_authCredentials,51);
 #if WEBDUINO_SERIAL_DEBUGGING > 1
       Serial.print("\n*** got Authorization: of ");
       Serial.print(m_authCredentials);

From b91adce6c3771a8a85e728c2431604f13039ef71 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Thu, 5 Jan 2012 11:49:26 +0100
Subject: [PATCH 26/75] updated readme.md with links to API documentation

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 2e7a2bf..72cb7e3 100644
--- a/readme.md
+++ b/readme.md
@@ -43,7 +43,7 @@ These have all been tested with the library successfully:
 
 ### 1.6 released in Jan 2012
 
-- added checkCredentials and httpUnauthorized methods as well as readHeader method for HTTP Basic Authentication; currently users will have to do the Base64 encoding outside of Webduino and I'm uncertain whether I ever want this inside the library or not...
+- added [checkCredentials](http://ten-fingers-and-a-brain.com/arduino-projects/webduino/checkcredentials/) and [httpUnauthorized](http://ten-fingers-and-a-brain.com/arduino-projects/webduino/httpunauthorized/) methods as well as readHeader method for HTTP Basic Authentication; currently users will have to do the Base64 encoding outside of Webduino and I'm uncertain whether I ever want this inside the library or not...
 - fixed the request parser: previously the command dispatcher would always pass true for tail_complete, even if the tail was incomplete
 - fixed the command dispatcher: previously the default command could not have a tail, but the EPIC FAIL was returned
 

From 0d59803ea60c431ea03cc512bedd50be65bc3ad0 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Thu, 5 Jan 2012 15:35:57 +0100
Subject: [PATCH 27/75] fixes most (but not all) cases in #8

when connecting to Webduino with a telnet client and typing any character, the Arduino would hang. this change catches all cases except when the first character typed is "G", "H", or "P" (the first letters of the allowed verbs) in which cases the Arduino will still hang
---
 WebServer.h | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index e8329ee..42c945a 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -440,6 +440,8 @@ void WebServer::processConnection()
 
 void WebServer::processConnection(char *buff, int *bufflen)
 {
+  int urlPrefixLen = strlen(m_urlPrefix);
+
   m_client = m_server.available();
 
   if (m_client) {
@@ -457,21 +459,29 @@ void WebServer::processConnection(char *buff, int *bufflen)
     Serial.print(buff);
     Serial.println("\" ***");
 #endif
-    processHeaders();
+
+    // don't even look further at invalid requests.
+    // this is done to prevent Webduino from hanging
+    // - when there are illegal requests,
+    // - when someone contacts it through telnet rather than proper HTTP,
+    // - etc.
+    if (requestType != INVALID)
+    {
+      processHeaders();
 #if WEBDUINO_SERIAL_DEBUGGING > 1
-    Serial.println("*** headers complete ***");
+      Serial.println("*** headers complete ***");
 #endif
 
-    int urlPrefixLen = strlen(m_urlPrefix);
-    if (strcmp(buff, "/robots.txt") == 0)
-    {
-      noRobots(requestType);
-    }
-    else if (strcmp(buff, "/favicon.ico") == 0)
-    {
-      favicon(requestType);
+      if (strcmp(buff, "/robots.txt") == 0)
+      {
+        noRobots(requestType);
+      }
+      else if (strcmp(buff, "/favicon.ico") == 0)
+      {
+        favicon(requestType);
+      }
     }
-    else if (requestType == INVALID ||
+    if      (requestType == INVALID ||
              strncmp(buff, m_urlPrefix, urlPrefixLen) != 0 ||
              !dispatchCommand(requestType, buff + urlPrefixLen,
                               (*bufflen) >= 0))
@@ -482,7 +492,7 @@ void WebServer::processConnection(char *buff, int *bufflen)
 #if WEBDUINO_SERIAL_DEBUGGING > 1
     Serial.println("*** stopping connection ***");
 #endif
-    m_client.stop();
+    reset();
   }
 }
 
@@ -627,8 +637,7 @@ int WebServer::read()
 #if WEBDUINO_SERIAL_DEBUGGING
           Serial.println("*** Connection timed out");
 #endif
-          m_client.flush();
-          m_client.stop();
+          reset();
           return -1;
         }
       }
@@ -659,6 +668,8 @@ void WebServer::push(int ch)
 void WebServer::reset()
 {
   m_pushbackDepth = 0;
+  m_client.flush();
+  m_client.stop();
 }
 
 bool WebServer::expect(const char *str)
@@ -968,7 +979,9 @@ void WebServer::getRequest(WebServer::ConnectionType &type,
     type = POST;
 
   // if it doesn't start with any of those, we have an unknown method
-  // so just eat rest of header
+  // so just get out of here
+  else
+    return;
 
   int ch;
   while ((ch = read()) != -1)

From ea73fb83872f4e942fbaa3e83253a8dccaf096af Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Sun, 8 Jan 2012 22:17:03 -0600
Subject: [PATCH 28/75] Updated copyright string for 2012 and major authors
 Reformatted some macros and comments to fit in 80 columns

---
 WebServer.h | 43 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 42c945a..a62482c 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil;  c-file-style: "k&r"; c-basic-offset: 2; -*-
 
    Webduino, a simple Arduino web server
-   Copyright 2009 Ben Combee, Ran Talbott
+   Copyright 2009-2012 Ben Combee, Ran Talbott, Christopher Lee, Martin Lormes
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -74,7 +74,35 @@
 // otherwise this defaults to a 16x16 px black diode on blue ground
 // (or include your own icon if you like)
 #ifndef WEBDUINO_FAVICON_DATA
-#define WEBDUINO_FAVICON_DATA { 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x10, 0x10, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0xb0, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc1, 0xbf, 0x00, 0x00, 0xc0, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xbf, 0x00, 0x00, 0xc1, 0xbf, 0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+#define WEBDUINO_FAVICON_DATA { 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x10, \
+                                0x10, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, \
+                                0xb0, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, \
+                                0x00, 0x28, 0x00, 0x00, 0x00, 0x10, 0x00, \
+                                0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, \
+                                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, \
+                                0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, \
+                                0x00, 0xff, 0xff, 0x00, 0x00, 0xcf, 0xbf, \
+                                0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xc3, \
+                                0xbf, 0x00, 0x00, 0xc1, 0xbf, 0x00, 0x00, \
+                                0xc0, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0xc0, 0xbf, 0x00, 0x00, 0xc1, 0xbf, \
+                                0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc7, \
+                                0xbf, 0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, \
+                                0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00 }
 #endif // #ifndef WEBDUINO_FAVICON_DATA
 
 // add "#define WEBDUINO_SERIAL_DEBUGGING 1" to your application
@@ -382,8 +410,8 @@ void WebServer::printCRLF()
 bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
         bool tail_complete)
 {
-  // if there is no URL, i.e. we have a prefix and it's requested without a trailing slash
-  // or if the URL is just the slash
+  // if there is no URL, i.e. we have a prefix and it's requested without a 
+  // trailing slash or if the URL is just the slash
   if ((verb[0] == 0) || ((verb[0] == '/') && (verb[1] == 0)))
   {
     m_defaultCmd(*this, requestType, "", tail_complete);
@@ -499,7 +527,8 @@ void WebServer::processConnection(char *buff, int *bufflen)
 bool WebServer::checkCredentials(const char authCredentials[45])
 {
   char basic[7] = "Basic ";
-  if((0 == strncmp(m_authCredentials,basic,6)) && (0 == strcmp(authCredentials,m_authCredentials+6))) return true;
+  if((0 == strncmp(m_authCredentials,basic,6)) && 
+     (0 == strcmp(authCredentials, m_authCredentials + 6))) return true;
   return false;
 }
 
@@ -1004,8 +1033,8 @@ void WebServer::getRequest(WebServer::ConnectionType &type,
 
 void WebServer::processHeaders()
 {
-  // look for three things: the Content-Length header, the Authorization header, and the double-CRLF
-  // that ends the headers.
+  // look for three things: the Content-Length header, the Authorization 
+  // header, and the double-CRLF that ends the headers.
 
   // empty the m_authCredentials before every run of this function.
   // otherwise users who don't send an Authorization header would be treated

From f4109467402709e3f5f8989b5787e32dd902125f Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Sun, 8 Jan 2012 22:29:49 -0600
Subject: [PATCH 29/75] Fix Google Code issue 12, off-by-one error in
 name/value parser where the buffer wouldn't ever be completely filled

---
 WebServer.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index a62482c..623b888 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -820,13 +820,17 @@ bool WebServer::readPOSTparam(char *name, int nameLen,
       ch = strtoul(hex, NULL, 16);
     }
 
-    // check against 1 so we don't overwrite the final NUL
-    if (nameLen > 1)
+    // output the new character into the appropriate buffer or drop it if
+    // there's no room in either one.  This code will malfunction in the
+    // case where the parameter name is too long to fit into the name buffer,
+    // but in that case, it will just overflow into the value buffer so
+    // there's no harm.
+    if (nameLen > 0)
     {
       *name++ = ch;
       --nameLen;
     }
-    else if (valueLen > 1)
+    else if (valueLen > 0)
     {
       *value++ = ch;
       --valueLen;

From 092c2cb58d63f21a9eed0fbd7048d17cbd6cf723 Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Sun, 8 Jan 2012 22:32:46 -0600
Subject: [PATCH 30/75] Fix Google Code issue 11: support HTTP PUT and DELETE
 methods

---
 WebServer.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 623b888..036dcfe 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -143,7 +143,7 @@ class WebServer: public Print
 {
 public:
   // passed to a command to indicate what kind of request was received
-  enum ConnectionType { INVALID, GET, HEAD, POST };
+  enum ConnectionType { INVALID, GET, HEAD, POST, PUT, DELETE };
 
   // any commands registered with the web server have to follow
   // this prototype.
@@ -1003,13 +1003,17 @@ void WebServer::getRequest(WebServer::ConnectionType &type,
 
   type = INVALID;
 
-  // store the GET/POST line of the request
+  // store the HTTP method line of the request
   if (expect("GET "))
     type = GET;
   else if (expect("HEAD "))
     type = HEAD;
   else if (expect("POST "))
     type = POST;
+  else if (expect("PUT "))
+    type = PUT;
+  else if (expect("DELETE "))
+    type = DELETE;
 
   // if it doesn't start with any of those, we have an unknown method
   // so just get out of here

From beef3190e8f5480ab1d212c43ea211961336104b Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Sun, 8 Jan 2012 22:41:06 -0600
Subject: [PATCH 31/75] Add httpServerError() method to output 500 Internal
 Server Error message

---
 WebServer.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/WebServer.h b/WebServer.h
index 036dcfe..df8350d 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -69,6 +69,10 @@
 #define WEBDUINO_AUTH_MESSAGE "<h1>401 Unauthorized</h1>"
 #endif // #ifndef WEBDUINO_AUTH_MESSAGE
 
+#ifndef WEBDUINO_SERVER_ERROR_MESSAGE
+#define WEBDUINO_SERVER_ERROR_MESSAGE "<h1>500 Internal Server Error</h1>"
+#endif // WEBDUINO_SERVER_ERROR_MESSAGE
+
 // add '#define WEBDUINO_FAVICON_DATA ""' to your application
 // before including WebServer.h to send a null file as the favicon.ico file
 // otherwise this defaults to a 16x16 px black diode on blue ground
@@ -246,6 +250,9 @@ class WebServer: public Print
   // output headers and a message indicating "401 Unauthorized"
   void httpUnauthorized();
 
+  // output headers and a message indicating "500 Internal Server Error"
+  void httpServerError();
+
   // output standard headers indicating "200 Success".  You can change the
   // type of the data you're outputting or also add extra headers like
   // "Refresh: 1".  Extra headers should each be terminated with CRLF.
@@ -585,6 +592,18 @@ void WebServer::httpUnauthorized()
   printP(failMsg);
 }
 
+void WebServer::httpServerError()
+{
+  P(failMsg) =
+    "HTTP/1.0 500 Internal Server Error" CRLF
+    WEBDUINO_SERVER_HEADER
+    "Content-Type: text/html" CRLF
+    CRLF
+    WEBDUINO_SERVER_ERROR_MESSAGE;
+
+  printP(failMsg);
+}
+
 void WebServer::httpSuccess(const char *contentType,
                             const char *extraHeaders)
 {

From 84e9f4414114e767012a9ffb1b904ca4033dfae6 Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Sun, 8 Jan 2012 22:44:25 -0600
Subject: [PATCH 32/75] Fix Google Code issue #9 by allowing prog_char* strings
 for printP

---
 WebServer.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WebServer.h b/WebServer.h
index df8350d..fcf1907 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -191,6 +191,9 @@ class WebServer: public Print
   // with the P macro
   void printP(const prog_uchar *str);
 
+  // inline overload for printP to handle signed char strings
+  void printP(const prog_char *str) { printP((prog_uchar*)str); }
+
   // output raw data stored in program memory
   void writeP(const prog_uchar *data, size_t length);
 

From bc5284901a34e684e5c552f172775e5c019ad31c Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Sun, 8 Jan 2012 22:49:50 -0600
Subject: [PATCH 33/75] Fix Google Code issue 8 by adding
 WEBDUINO_NO_IMPLEMENTATION macro that allows including the class definition
 without the implementation code.

---
 WebServer.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/WebServer.h b/WebServer.h
index fcf1907..1a25f96 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -309,6 +309,11 @@ class WebServer: public Print
   void favicon(ConnectionType type);
 };
 
+/* define this macro if you want to include the header in a sketch source
+   file but not define any of the implementation. This is useful if
+   multiple source files are using the Webduino class. */
+#ifndef WEBDUINO_NO_IMPLEMENTATION
+
 /********************************************************************
  * IMPLEMENTATION
  ********************************************************************/
@@ -1147,4 +1152,6 @@ void WebServer::radioButton(const char *name, const char *val,
   outputCheckboxOrRadio("radio", name, val, label, selected);
 }
 
+#endif // WEBDUINO_NO_IMPLEMENTATION
+
 #endif // WEBDUINO_H_

From e35ef3342b9937b313093c9c318b2f8460289d89 Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Sun, 8 Jan 2012 23:03:53 -0600
Subject: [PATCH 34/75] Fix Google Code issue where expect fails with
 high-ASCII characters due to sign issues

---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index 1a25f96..ed3dc13 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -278,7 +278,7 @@ class WebServer: public Print
   EthernetClient m_client;
   const char *m_urlPrefix;
 
-  char m_pushback[32];
+  unsigned char m_pushback[32];
   char m_pushbackDepth;
 
   int m_contentLength;

From 433c7c39615ca87ac9ae12d95ddc47edaf807ba0 Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Sun, 8 Jan 2012 23:04:53 -0600
Subject: [PATCH 35/75] Update version to 1.7

---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index ed3dc13..1501b84 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -36,7 +36,7 @@
  ********************************************************************/
 
 #define WEBDUINO_VERSION 1006
-#define WEBDUINO_VERSION_STRING "1.6"
+#define WEBDUINO_VERSION_STRING "1.7"
 
 #if WEBDUINO_SUPRESS_SERVER_HEADER
 #define WEBDUINO_SERVER_HEADER ""

From 4102e948ffd95fd9d38cec4d52c9aa4a83dadae8 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Mon, 9 Jan 2012 09:28:14 +0100
Subject: [PATCH 36/75] updated WEBDUINO_VERSION macro

---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index 1501b84..fd60e28 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -35,7 +35,7 @@
  * CONFIGURATION
  ********************************************************************/
 
-#define WEBDUINO_VERSION 1006
+#define WEBDUINO_VERSION 1007
 #define WEBDUINO_VERSION_STRING "1.7"
 
 #if WEBDUINO_SUPRESS_SERVER_HEADER

From 480ed3b3bf5149c310a40717b96f79e975a83820 Mon Sep 17 00:00:00 2001
From: Martin Lormes <martinhh@gmail.com>
Date: Mon, 9 Jan 2012 09:29:18 +0100
Subject: [PATCH 37/75] updating keywords.txt for syntax highlighting in
 Arduino IDE

---
 keywords.txt |  1 +
 readme.md    | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/keywords.txt b/keywords.txt
index 747ad2d..b2c301b 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -24,6 +24,7 @@ nextURLparam	KEYWORD2
 checkCredentials	KEYWORD2
 httpFail	KEYWORD2
 httpUnauthorized	KEYWORD2
+httpServerError	KEYWORD2
 httpSuccess	KEYWORD2
 httpSeeOther	KEYWORD2
 write	KEYWORD2
diff --git a/readme.md b/readme.md
index 72cb7e3..74dbacd 100644
--- a/readme.md
+++ b/readme.md
@@ -1,17 +1,11 @@
 # Webduino
 
-### Project originally forked from 1.4.1 of http://code.google.com/p/webduino/ by Ben Combee
-
 This is an Arduino-based Web Server library, originally developed for a class at NYC Resistor. It's called Webduino, and it's an extensible web server library for the Arduino using the Wiznet-based Ethernet shields. It's released under the MIT license allowing all sorts of reuse.
 
-I've got a few examples up right now -- the Buzz example interfaces with Zach's Danger Shield allowing you to remotely start and stop the speaker. We had a room full of students pinging my Arduino board on Saturday, buzzing me while I was lecturing. It was fun. The big Demo example shows how to setup an HTML form running on the device where you can read and write pins.
-
-I hope to add a few more examples in the next few weeks, including a web-enabled fridge sign using a serial LCD and how to serve things other than just HTML text from the device. I also need to work on more documentation and finishing up my slides.
-
 ## Features
 
 - URL parameter parsing
-- Handle HTTP Methods, e.g. GET, POST
+- Handle the following HTTP Methods: GET, HEAD, POST, PUT, DELETE
 - Web Forms
 - Images
 - JSON/RESTful interface
@@ -41,6 +35,17 @@ These have all been tested with the library successfully:
 
 ## Version history
 
+### 1.7 released in Jan 2012
+
+- fixed Google Code issue [4](http://code.google.com/p/webduino/issues/detail?id=4) where expect fails with high-ASCII characters due to sign issues
+- fixed Google Code issue [8](http://code.google.com/p/webduino/issues/detail?id=8) by adding WEBDUINO_NO_IMPLEMENTATION macro that allows including the class definition without the implementation code
+- fixed Google Code issue [9](http://code.google.com/p/webduino/issues/detail?id=9): allowing prog_char* strings for printP
+- added httpServerError() method to output 500 Internal Server Error message
+- added support for HTTP PUT and DELETE methods (see Google Code issue [11](http://code.google.com/p/webduino/issues/detail?id=11)
+- fixed Google Code issue [12](http://code.google.com/p/webduino/issues/detail?id=12): off-by-one error in name/value parser (readPOSTparam) where the buffer wouldn't ever be completely filled
+- updated copyright string for 2012 and major authors
+- GitHub fork now the official version; all open issues on Goole Code site fixed or closed and moved to GitHub
+
 ### 1.6 released in Jan 2012
 
 - added [checkCredentials](http://ten-fingers-and-a-brain.com/arduino-projects/webduino/checkcredentials/) and [httpUnauthorized](http://ten-fingers-and-a-brain.com/arduino-projects/webduino/httpunauthorized/) methods as well as readHeader method for HTTP Basic Authentication; currently users will have to do the Base64 encoding outside of Webduino and I'm uncertain whether I ever want this inside the library or not...

From a1449c26235eb76c56cead6da6adc9d83cb9e4c8 Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Mon, 9 Jan 2012 06:39:48 -0600
Subject: [PATCH 38/75] Add HTTP PATCH method support too

---
 WebServer.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index 1501b84..f6cea28 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -147,7 +147,7 @@ class WebServer: public Print
 {
 public:
   // passed to a command to indicate what kind of request was received
-  enum ConnectionType { INVALID, GET, HEAD, POST, PUT, DELETE };
+  enum ConnectionType { INVALID, GET, HEAD, POST, PUT, DELETE, PATCH };
 
   // any commands registered with the web server have to follow
   // this prototype.
@@ -1041,6 +1041,8 @@ void WebServer::getRequest(WebServer::ConnectionType &type,
     type = PUT;
   else if (expect("DELETE "))
     type = DELETE;
+  else if (expect("PATCH "))
+    type = PATCH;
 
   // if it doesn't start with any of those, we have an unknown method
   // so just get out of here

From 38e39fed75b1d0396933b4b8765a64e45d397212 Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Mon, 9 Jan 2012 17:34:10 -0600
Subject: [PATCH 39/75] Add PUT,DELETE,PATCH to keywords.txt Update readme.md
 with PATCH and link to hardware pages for Ethernet boards

---
 keywords.txt |  3 +++
 readme.md    | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/keywords.txt b/keywords.txt
index b2c301b..f72c5a9 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -4,6 +4,9 @@ INVALID	KEYWORD2
 GET	KEYWORD2
 HEAD	KEYWORD2
 POST	KEYWORD2
+PUT	KEYWORD2
+DELETE	KEYWORD2
+PATCH	KEYWORD2
 begin	KEYWORD2
 processConnection	KEYWORD2
 setDefaultCommand	KEYWORD2
diff --git a/readme.md b/readme.md
index 74dbacd..b30c80e 100644
--- a/readme.md
+++ b/readme.md
@@ -5,7 +5,7 @@ This is an Arduino-based Web Server library, originally developed for a class at
 ## Features
 
 - URL parameter parsing
-- Handle the following HTTP Methods: GET, HEAD, POST, PUT, DELETE
+- Handle the following HTTP Methods: GET, HEAD, POST, PUT, DELETE, PATCH
 - Web Forms
 - Images
 - JSON/RESTful interface
@@ -27,11 +27,14 @@ If you get an error message when building the examples similar to "WebServer.h n
 
 These have all been tested with the library successfully:
 
-- Freetronics Etherten
-- Freetronics Ethernet Shield
-- Arduino Ethernet Shield, both original and updated microSD version
-- Adafruit Ethernet Shield w/ Wiznet 811MJ module
-- NKC Electronics Ethernet Shield DIY Kit
+- [Freetronics Etherten](http://www.freetronics.com/products/etherten)
+- [Freetronics Ethernet Shield](http://www.freetronics.com/products/ethernet-shield-with-poe)
+- [Arduino Ethernet](http://arduino.cc/en/Main/ArduinoBoardEthernet)
+- [Arduino Ethernet Shield, both original and updated microSD version](http://arduino.cc/en/Main/ArduinoEthernetShield)
+- [Adafruit Ethernet Shield w/ Wiznet 811MJ module](http://www.ladyada.net/make/eshield/)
+- [NKC Electronics Ethernet Shield DIY Kit](http://store.nkcelectronics.com/nkc-ethernet-shield-diy-kit-without-wiz812mj-mod812.html)
+
+Shields using the Microchip ENC28J60 
 
 ## Version history
 
@@ -41,10 +44,10 @@ These have all been tested with the library successfully:
 - fixed Google Code issue [8](http://code.google.com/p/webduino/issues/detail?id=8) by adding WEBDUINO_NO_IMPLEMENTATION macro that allows including the class definition without the implementation code
 - fixed Google Code issue [9](http://code.google.com/p/webduino/issues/detail?id=9): allowing prog_char* strings for printP
 - added httpServerError() method to output 500 Internal Server Error message
-- added support for HTTP PUT and DELETE methods (see Google Code issue [11](http://code.google.com/p/webduino/issues/detail?id=11)
+- added support for HTTP PUT, DELETE, and PATCH methods (see Google Code issue [11](http://code.google.com/p/webduino/issues/detail?id=11)
 - fixed Google Code issue [12](http://code.google.com/p/webduino/issues/detail?id=12): off-by-one error in name/value parser (readPOSTparam) where the buffer wouldn't ever be completely filled
 - updated copyright string for 2012 and major authors
-- GitHub fork now the official version; all open issues on Goole Code site fixed or closed and moved to GitHub
+- GitHub fork now the official version; all open issues on Google Code site fixed or closed and moved to GitHub
 
 ### 1.6 released in Jan 2012
 

From 6d450c612ff9866444701c6dc1cafcbe4563fef9 Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Mon, 9 Jan 2012 17:36:06 -0600
Subject: [PATCH 40/75] Complete readme message about incompatible hardware

---
 readme.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index b30c80e..2ef7e78 100644
--- a/readme.md
+++ b/readme.md
@@ -34,7 +34,8 @@ These have all been tested with the library successfully:
 - [Adafruit Ethernet Shield w/ Wiznet 811MJ module](http://www.ladyada.net/make/eshield/)
 - [NKC Electronics Ethernet Shield DIY Kit](http://store.nkcelectronics.com/nkc-ethernet-shield-diy-kit-without-wiz812mj-mod812.html)
 
-Shields using the Microchip ENC28J60 
+Shields using the Microchip ENC28J60 chip won't work with the library as that requires more software support for implementating 
+the TCP/IP stack.
 
 ## Version history
 

From 5cf947d9186acb8c747ee8f7f9fbd1e0163d1f6f Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Wed, 11 Jan 2012 20:36:56 -0800
Subject: [PATCH 41/75] Rename example source files from .pde for .ino for
 Arduino 1.0 IDE

---
 .../Web_AjaxBuzzer/{Web_AjaxBuzzer.pde => Web_AjaxBuzzer.ino}     | 0
 examples/Web_AjaxRGB/{Web_AjaxRGB.pde => Web_AjaxRGB.ino}         | 0
 .../{Web_AjaxRGB_mobile.pde => Web_AjaxRGB_mobile.ino}            | 0
 examples/Web_Buzzer/{Web_Buzzer.pde => Web_Buzzer.ino}            | 0
 examples/Web_Demo/{Web_Demo.pde => Web_Demo.ino}                  | 0
 .../Web_HelloWorld/{Web_HelloWorld.pde => Web_HelloWorld.ino}     | 0
 examples/Web_Image/{Web_Image.pde => Web_Image.ino}               | 0
 examples/Web_Parms/{Web_Parms.pde => Web_Parms.ino}               | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename examples/Web_AjaxBuzzer/{Web_AjaxBuzzer.pde => Web_AjaxBuzzer.ino} (100%)
 rename examples/Web_AjaxRGB/{Web_AjaxRGB.pde => Web_AjaxRGB.ino} (100%)
 rename examples/Web_AjaxRGB_mobile/{Web_AjaxRGB_mobile.pde => Web_AjaxRGB_mobile.ino} (100%)
 rename examples/Web_Buzzer/{Web_Buzzer.pde => Web_Buzzer.ino} (100%)
 rename examples/Web_Demo/{Web_Demo.pde => Web_Demo.ino} (100%)
 rename examples/Web_HelloWorld/{Web_HelloWorld.pde => Web_HelloWorld.ino} (100%)
 rename examples/Web_Image/{Web_Image.pde => Web_Image.ino} (100%)
 rename examples/Web_Parms/{Web_Parms.pde => Web_Parms.ino} (100%)

diff --git a/examples/Web_AjaxBuzzer/Web_AjaxBuzzer.pde b/examples/Web_AjaxBuzzer/Web_AjaxBuzzer.ino
similarity index 100%
rename from examples/Web_AjaxBuzzer/Web_AjaxBuzzer.pde
rename to examples/Web_AjaxBuzzer/Web_AjaxBuzzer.ino
diff --git a/examples/Web_AjaxRGB/Web_AjaxRGB.pde b/examples/Web_AjaxRGB/Web_AjaxRGB.ino
similarity index 100%
rename from examples/Web_AjaxRGB/Web_AjaxRGB.pde
rename to examples/Web_AjaxRGB/Web_AjaxRGB.ino
diff --git a/examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.pde b/examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.ino
similarity index 100%
rename from examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.pde
rename to examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.ino
diff --git a/examples/Web_Buzzer/Web_Buzzer.pde b/examples/Web_Buzzer/Web_Buzzer.ino
similarity index 100%
rename from examples/Web_Buzzer/Web_Buzzer.pde
rename to examples/Web_Buzzer/Web_Buzzer.ino
diff --git a/examples/Web_Demo/Web_Demo.pde b/examples/Web_Demo/Web_Demo.ino
similarity index 100%
rename from examples/Web_Demo/Web_Demo.pde
rename to examples/Web_Demo/Web_Demo.ino
diff --git a/examples/Web_HelloWorld/Web_HelloWorld.pde b/examples/Web_HelloWorld/Web_HelloWorld.ino
similarity index 100%
rename from examples/Web_HelloWorld/Web_HelloWorld.pde
rename to examples/Web_HelloWorld/Web_HelloWorld.ino
diff --git a/examples/Web_Image/Web_Image.pde b/examples/Web_Image/Web_Image.ino
similarity index 100%
rename from examples/Web_Image/Web_Image.pde
rename to examples/Web_Image/Web_Image.ino
diff --git a/examples/Web_Parms/Web_Parms.pde b/examples/Web_Parms/Web_Parms.ino
similarity index 100%
rename from examples/Web_Parms/Web_Parms.pde
rename to examples/Web_Parms/Web_Parms.ino

From 6bdde566d85762f77de2c6e24706a720b4c2d3c6 Mon Sep 17 00:00:00 2001
From: Raidohh <RKalbre@gmail.com>
Date: Fri, 10 Feb 2012 14:38:31 +0200
Subject: [PATCH 42/75] Last POST param is missed

---
 WebServer.h | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 76a1489..a034b03 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -810,6 +810,8 @@ bool WebServer::readPOSTparam(char *name, int nameLen,
 {
   // assume name is at current place in stream
   int ch;
+  // to not to miss the last parameter
+  bool foundSomething = false;
 
   // clear out name and value so they'll be NUL terminated
   memset(name, 0, nameLen);
@@ -821,6 +823,7 @@ bool WebServer::readPOSTparam(char *name, int nameLen,
 
   while ((ch = read()) != -1)
   {
+    foundSomething = true;
     if (ch == '+')
     {
       ch = ' ';
@@ -864,9 +867,17 @@ bool WebServer::readPOSTparam(char *name, int nameLen,
     }
   }
 
-  // if we get here, we hit the end-of-file, so POST is over and there
-  // are no more parameters
-  return false;
+  if (foundSomething)
+  {
+    // if we get here, we have one last parameter to serve
+    return true;
+  }
+  else
+  {
+    // if we get here, we hit the end-of-file, so POST is over and there
+    // are no more parameters
+    return false;
+  }
 }
 
 /* Retrieve a parameter that was encoded as part of the URL, stored in

From 6a58a17cf1e2b90eee35b430b4e940323fc4e38c Mon Sep 17 00:00:00 2001
From: Raidohh <RKalbre@gmail.com>
Date: Fri, 10 Feb 2012 14:39:58 +0200
Subject: [PATCH 43/75] Wrong method called when reading POST params.

---
 examples/Web_Parms/Web_Parms.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/Web_Parms/Web_Parms.ino b/examples/Web_Parms/Web_Parms.ino
index 3b7454e..4b848a5 100644
--- a/examples/Web_Parms/Web_Parms.ino
+++ b/examples/Web_Parms/Web_Parms.ino
@@ -205,7 +205,7 @@ void parsedCmd(WebServer &server, WebServer::ConnectionType type, char *url_tail
   if (type == WebServer::POST)
   {
     server.printP(Post_params_begin);
-    while (server.nextURLparam(&url_tail, name, NAMELEN, value, VALUELEN))
+    while (server.readPOSTparam(name, NAMELEN, value, VALUELEN))
     {
       server.print(name);
       server.printP(Parsed_item_separator);

From 838dcb9a5ab9cc4f9ee11077c3d3d0a732f852b6 Mon Sep 17 00:00:00 2001
From: Raidohh <RKalbre@gmail.com>
Date: Fri, 10 Feb 2012 14:38:31 +0200
Subject: [PATCH 44/75] Last POST param is missed

---
 WebServer.h | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 76a1489..a034b03 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -810,6 +810,8 @@ bool WebServer::readPOSTparam(char *name, int nameLen,
 {
   // assume name is at current place in stream
   int ch;
+  // to not to miss the last parameter
+  bool foundSomething = false;
 
   // clear out name and value so they'll be NUL terminated
   memset(name, 0, nameLen);
@@ -821,6 +823,7 @@ bool WebServer::readPOSTparam(char *name, int nameLen,
 
   while ((ch = read()) != -1)
   {
+    foundSomething = true;
     if (ch == '+')
     {
       ch = ' ';
@@ -864,9 +867,17 @@ bool WebServer::readPOSTparam(char *name, int nameLen,
     }
   }
 
-  // if we get here, we hit the end-of-file, so POST is over and there
-  // are no more parameters
-  return false;
+  if (foundSomething)
+  {
+    // if we get here, we have one last parameter to serve
+    return true;
+  }
+  else
+  {
+    // if we get here, we hit the end-of-file, so POST is over and there
+    // are no more parameters
+    return false;
+  }
 }
 
 /* Retrieve a parameter that was encoded as part of the URL, stored in

From 802b3f5e9161bbafef33a64c3511bca948f80cea Mon Sep 17 00:00:00 2001
From: Raidohh <RKalbre@gmail.com>
Date: Fri, 10 Feb 2012 14:39:58 +0200
Subject: [PATCH 45/75] Wrong method called when reading POST params.

---
 examples/Web_Parms/Web_Parms.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/Web_Parms/Web_Parms.ino b/examples/Web_Parms/Web_Parms.ino
index 3b7454e..4b848a5 100644
--- a/examples/Web_Parms/Web_Parms.ino
+++ b/examples/Web_Parms/Web_Parms.ino
@@ -205,7 +205,7 @@ void parsedCmd(WebServer &server, WebServer::ConnectionType type, char *url_tail
   if (type == WebServer::POST)
   {
     server.printP(Post_params_begin);
-    while (server.nextURLparam(&url_tail, name, NAMELEN, value, VALUELEN))
+    while (server.readPOSTparam(name, NAMELEN, value, VALUELEN))
     {
       server.print(name);
       server.printP(Parsed_item_separator);

From 472f6d3e167f5312e1a76aba00a40215c5974836 Mon Sep 17 00:00:00 2001
From: unwiredben <combee@techwood.org>
Date: Tue, 5 Jun 2012 01:04:10 -0500
Subject: [PATCH 46/75] Fix #18 by not decrementing m_contentLength until we
 actually read a character from the socket clien

---
 WebServer.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index a034b03..701027a 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -665,7 +665,6 @@ int WebServer::read()
 #endif
           return -1;
         }
-        --m_contentLength;
       }
 
       int ch = m_client.read();
@@ -674,6 +673,12 @@ int WebServer::read()
       // loop, checking connection status
       if (ch != -1)
       {
+        // count character against content-length
+        if (m_readingContent)
+        {
+          --m_contentLength;
+        }
+
 #if WEBDUINO_SERIAL_DEBUGGING
         if (ch == '\r')
           Serial.print("<CR>");

From 464e0fdb0821ee5a92c79ceadb1524e99924ca38 Mon Sep 17 00:00:00 2001
From: Fabio Pugliese Ornellas <fabio.ornellas@gmail.com>
Date: Fri, 16 Nov 2012 04:10:50 -0200
Subject: [PATCH 47/75] Added available() method to allow use with interrupts
 (see
 https://github.com/fornellas/sketchbook/tree/master/libraries/EthernetInterrupt).

---
 WebServer.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/WebServer.h b/WebServer.h
index 701027a..7eef2c7 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -273,6 +273,9 @@ class WebServer: public Print
   virtual size_t write(const uint8_t *buffer, size_t size);
   size_t write(const char *data, size_t length);
 
+  // tells if there is anything to process
+  uint8_t available();
+
 private:
   EthernetServer m_server;
   EthernetClient m_client;
@@ -1170,6 +1173,10 @@ void WebServer::radioButton(const char *name, const char *val,
   outputCheckboxOrRadio("radio", name, val, label, selected);
 }
 
+uint8_t WebServer::available(){
+  return m_server.available();
+}
+
 #endif // WEBDUINO_NO_IMPLEMENTATION
 
 #endif // WEBDUINO_H_

From b7f22ef0a3d45ae2c853258174bcf8db758d0432 Mon Sep 17 00:00:00 2001
From: polyphemus <rolfmorel@gmail.com>
Date: Mon, 26 Nov 2012 00:35:55 +0100
Subject: [PATCH 48/75] Fix #21 by only trying to dispatch command if request
 type and prefix are correct. Fix by quarencia.

---
 WebServer.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 701027a..81d464e 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -524,10 +524,15 @@ void WebServer::processConnection(char *buff, int *bufflen)
         favicon(requestType);
       }
     }
-    if      (requestType == INVALID ||
-             strncmp(buff, m_urlPrefix, urlPrefixLen) != 0 ||
-             !dispatchCommand(requestType, buff + urlPrefixLen,
-                              (*bufflen) >= 0))
+    // Only try to dispatch command if request type and prefix are correct.
+    // Fix by quarencia.
+    if (requestType == INVALID ||
+        strncmp(buff, m_urlPrefix, urlPrefixLen) != 0)
+    {
+      m_failureCmd(*this, requestType, buff, (*bufflen) >= 0);
+    }
+    else if (!dispatchCommand(requestType, buff + urlPrefixLen,
+             (*bufflen) >= 0))
     {
       m_failureCmd(*this, requestType, buff, (*bufflen) >= 0);
     }

From b8e3cc337f5de22883ec578cbb5421a82667f01e Mon Sep 17 00:00:00 2001
From: polyphemus <rolfmorel@gmail.com>
Date: Sun, 25 Nov 2012 14:31:01 +0100
Subject: [PATCH 49/75] Add setUrlPathCommand method, which adds support for
 resolving the URL in the function itself, when it doesn't match default or
 specified paths. Modified Command prototype, UrlPathCommand, now returns the
 extra parameter char **url_path. url_path contains pointers to the separate
 parts of the URL path.

---
 WebServer.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index a55e4a9..e12f1c4 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -57,6 +57,10 @@
 #define WEBDUINO_READ_TIMEOUT_IN_MS 1000
 #endif
 
+#ifndef WEBDUINO_URL_PATH_COMMAND_LENGTH
+#define WEBDUINO_URL_PATH_COMMAND_LENGTH 8
+#endif
+
 #ifndef WEBDUINO_FAIL_MESSAGE
 #define WEBDUINO_FAIL_MESSAGE "<h1>EPIC FAIL</h1>"
 #endif
@@ -158,6 +162,13 @@ class WebServer: public Print
   typedef void Command(WebServer &server, ConnectionType type,
                        char *url_tail, bool tail_complete);
 
+  // Prototype for the optional function which consumes the URL path itself.
+  // url_path contains pointers to the seperate parts of the URL path where '/'
+  //          was used as the delimiter.
+  typedef void UrlPathCommand(WebServer &server, ConnectionType type,
+                              char **url_path, char *url_tail,
+                              bool tail_complete);
+
   // constructor for webserver object
   WebServer(const char *urlPrefix = "", int port = 80);
 
@@ -184,6 +195,11 @@ class WebServer: public Print
   // add a new command to be run at the URL specified by verb
   void addCommand(const char *verb, Command *cmd);
 
+  // Set command that's run if default command or URL specified commands do
+  // not run, uses extra url_path parameter to allow resolving the URL in the
+  // function.
+  void setUrlPathCommand(UrlPathCommand *cmd);
+
   // utility function to output CRLF pair
   void printCRLF();
 
@@ -296,6 +312,7 @@ class WebServer: public Print
     Command *cmd;
   } m_commands[8];
   char m_cmdCount;
+  UrlPathCommand *m_urlPathCmd;
 
   void reset();
   void getRequest(WebServer::ConnectionType &type, char *request, int *length);
@@ -329,7 +346,8 @@ WebServer::WebServer(const char *urlPrefix, int port) :
   m_cmdCount(0),
   m_contentLength(0),
   m_failureCmd(&defaultFailCmd),
-  m_defaultCmd(&defaultFailCmd)
+  m_defaultCmd(&defaultFailCmd),
+  m_urlPathCmd(NULL)
 {
 }
 
@@ -357,6 +375,11 @@ void WebServer::addCommand(const char *verb, Command *cmd)
   }
 }
 
+void WebServer::setUrlPathCommand(UrlPathCommand *cmd)
+{
+  m_urlPathCmd = cmd;
+}
+
 size_t WebServer::write(uint8_t ch)
 {
   return m_client.write(ch);
@@ -472,6 +495,36 @@ bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
         return true;
       }
     }
+    // Check if UrlPathCommand is assigned.
+    if (m_urlPathCmd != NULL)
+    {
+      // Initialize with null bytes, so number of parts can be determined.
+      char *url_path[WEBDUINO_URL_PATH_COMMAND_LENGTH] = {0};
+      int part = 0;
+
+      // URL path should be terminated with null byte.
+      *(verb + verb_len) = 0;
+
+      // First URL path part is at the start of verb.
+      url_path[part++] = verb;
+      // Replace all slashes ('/') with a null byte so every part of the URL
+      // path is a seperate string. Add every char following a '/' as a new
+      // part of the URL, even if that char is a '/' (which will be replaced
+      // with a null byte).
+      for (char * p = verb; p < verb + verb_len; p++)
+      {
+        if (*p == '/')
+        {
+          *p = 0;
+          url_path[part++] = p + 1;
+          // Don't try to assign out of array bounds.
+          if (part == WEBDUINO_URL_PATH_COMMAND_LENGTH) break;
+        }
+      }
+      m_urlPathCmd(*this, requestType, url_path,
+                   verb + verb_len + qm_offset, tail_complete);
+      return true;
+    }
   }
   return false;
 }

From 539267c3ea4226a2860ca2ec969e32ce51ba7ec4 Mon Sep 17 00:00:00 2001
From: polyphemus <rolfmorel@gmail.com>
Date: Wed, 21 Nov 2012 17:29:17 +0100
Subject: [PATCH 50/75] Add "204 No Content" http status code support.

---
 WebServer.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/WebServer.h b/WebServer.h
index a55e4a9..298403c 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -256,6 +256,9 @@ class WebServer: public Print
   // output headers and a message indicating "500 Internal Server Error"
   void httpServerError();
 
+  // output headers indicating "204 No Content" and no further message
+  void httpNoContent();
+
   // output standard headers indicating "200 Success".  You can change the
   // type of the data you're outputting or also add extra headers like
   // "Refresh: 1".  Extra headers should each be terminated with CRLF.
@@ -620,6 +623,17 @@ void WebServer::httpServerError()
   printP(failMsg);
 }
 
+void WebServer::httpNoContent()
+{
+  P(noContentMsg) =
+    "HTTP/1.0 204 NO CONTENT" CRLF
+    WEBDUINO_SERVER_HEADER
+    "Content-Type: text/html" CRLF
+    CRLF;
+
+  printP(noContentMsg);
+}
+
 void WebServer::httpSuccess(const char *contentType,
                             const char *extraHeaders)
 {

From d8df23a4c331ebf34bf4b281d2c348757cddac22 Mon Sep 17 00:00:00 2001
From: polyphemus <rolfmorel@gmail.com>
Date: Tue, 27 Nov 2012 08:50:47 +0100
Subject: [PATCH 51/75] Better to not return a Content-Type header if there is
 no content.

---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index 298403c..1efad6b 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -628,7 +628,7 @@ void WebServer::httpNoContent()
   P(noContentMsg) =
     "HTTP/1.0 204 NO CONTENT" CRLF
     WEBDUINO_SERVER_HEADER
-    "Content-Type: text/html" CRLF
+    CRLF
     CRLF;
 
   printP(noContentMsg);

From a29cd68495040d1f199609888acdd4d5c68bf2ba Mon Sep 17 00:00:00 2001
From: Ben Combee <combee@techwood.org>
Date: Wed, 5 Dec 2012 23:58:09 -0800
Subject: [PATCH 52/75] Update WebServer.h

Fix issue #26 by moving read out of valueLen check so you don't end up in a situation where you loop without reading new bytes
---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index 1efad6b..d92e1e3 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -826,8 +826,8 @@ void WebServer::readHeader(char *value, int valueLen)
     {
       *value++=ch;
       --valueLen;
-      ch = read();
     }
+    ch = read();
   } while (ch != '\r');
   push(ch);
 }

From 03ac4436b758cfd55b53e4520932587d87e1b2d6 Mon Sep 17 00:00:00 2001
From: Peter Hardy <peter@hardy.dropbear.id.au>
Date: Sun, 6 Jan 2013 20:50:01 +1100
Subject: [PATCH 53/75] Updated PROGMEM data types for current avr-libc.

---
 WebServer.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 5bc6323..8647e09 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -127,7 +127,7 @@
 extern "C" unsigned long millis(void);
 
 // declare a static string
-#define P(name)   static const prog_uchar name[] PROGMEM
+#define P(name)   static const unsigned char name[] PROGMEM
 
 // returns the number of elements in the array
 #define SIZE(array) (sizeof(array) / sizeof(*array))
@@ -205,13 +205,13 @@ class WebServer: public Print
 
   // output a string stored in program memory, usually one defined
   // with the P macro
-  void printP(const prog_uchar *str);
+  void printP(const unsigned char *str);
 
   // inline overload for printP to handle signed char strings
-  void printP(const prog_char *str) { printP((prog_uchar*)str); }
+  void printP(const char *str) { printP((unsigned char*)str); }
 
   // output raw data stored in program memory
-  void writeP(const prog_uchar *data, size_t length);
+  void writeP(const unsigned char *data, size_t length);
 
   // output HTML for a radio button
   void radioButton(const char *name, const char *val,
@@ -403,7 +403,7 @@ size_t WebServer::write(const char *buffer, size_t length)
   return m_client.write((const uint8_t *)buffer, length);
 }
 
-void WebServer::writeP(const prog_uchar *data, size_t length)
+void WebServer::writeP(const unsigned char *data, size_t length)
 {
   // copy data out of program memory into local storage, write out in
   // chunks of 32 bytes to avoid extra short TCP/IP packets
@@ -425,7 +425,7 @@ void WebServer::writeP(const prog_uchar *data, size_t length)
     m_client.write(buffer, bufferEnd);
 }
 
-void WebServer::printP(const prog_uchar *str)
+void WebServer::printP(const unsigned char *str)
 {
   // copy data out of program memory into local storage, write out in
   // chunks of 32 bytes to avoid extra short TCP/IP packets

From 56929bf5a1291e57093f6cf2180634114f35c276 Mon Sep 17 00:00:00 2001
From: cat101 <github@matiascuenca.com.ar>
Date: Fri, 8 Feb 2013 19:30:01 -0200
Subject: [PATCH 54/75] Update readme.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added a link to a snippet that shows how to do a file server on top of webduino
---
 readme.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 2ef7e78..e312bc1 100644
--- a/readme.md
+++ b/readme.md
@@ -19,9 +19,11 @@ You can put the examples in your own sketchbook directory, or in hardware/librar
 
 If you get an error message when building the examples similar to "WebServer.h not found", it's a problem with where you put the Webduino folder. The server won't work if the header is directly in the libraries folder.
 
-## Presentation
+## Resources
+
+- [Wedbuino Presentation on Google Docs](http://docs.google.com/present/view?id=dd8gqxt8_5c8w9qfg3)
+- [A Wedbuino based file server](http://playground.arduino.cc//Main/WebduinoFileServer)
 
-[Wedbuino Presentation on Google Docs](http://docs.google.com/present/view?id=dd8gqxt8_5c8w9qfg3)
 
 ## Compatible Ethernet Shields
 

From 2d224fd83d429b838dcf824619809f943c802c9e Mon Sep 17 00:00:00 2001
From: cat101 <github@matiascuenca.com.ar>
Date: Tue, 12 Feb 2013 10:39:43 -0200
Subject: [PATCH 55/75] Update WebServer.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The nextURLparam logic was broken. On succesfull parse would return URLPARAM_BOTH_OFLO
---
 WebServer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 8647e09..9d46871 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -1033,7 +1033,7 @@ URLPARAM_RESULT WebServer::nextURLparam(char **tail, char *name, int nameLen,
       *name++ = ch;
       --nameLen;
     }
-    else
+    else if(keep_scanning)
       result = URLPARAM_NAME_OFLO;
   }
 
@@ -1089,7 +1089,7 @@ URLPARAM_RESULT WebServer::nextURLparam(char **tail, char *name, int nameLen,
         *value++ = ch;
         --valueLen;
       }
-      else
+      else if(keep_scanning)
         result = (result == URLPARAM_OK) ?
           URLPARAM_VALUE_OFLO :
           URLPARAM_BOTH_OFLO;

From 5df8eb8c17c9bfe69f5c450a7b085f72c661e98a Mon Sep 17 00:00:00 2001
From: EDVler <edvler@edvler-blog.de>
Date: Fri, 1 Mar 2013 17:16:52 +0100
Subject: [PATCH 56/75] Corrected one comment and remove to variables

- Corrected the comment in the my_failCmd function.
- Remove declaration of int name_len and int value_len (not used)
---
 examples/Web_Parms/Web_Parms.ino | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/examples/Web_Parms/Web_Parms.ino b/examples/Web_Parms/Web_Parms.ino
index 4b848a5..504bc81 100644
--- a/examples/Web_Parms/Web_Parms.ino
+++ b/examples/Web_Parms/Web_Parms.ino
@@ -154,9 +154,7 @@ void parsedCmd(WebServer &server, WebServer::ConnectionType type, char *url_tail
 {
   URLPARAM_RESULT rc;
   char name[NAMELEN];
-  int  name_len;
   char value[VALUELEN];
-  int value_len;
 
   /* this line sends the standard "we're all OK" headers back to the
      browser */
@@ -219,7 +217,7 @@ void parsedCmd(WebServer &server, WebServer::ConnectionType type, char *url_tail
 
 void my_failCmd(WebServer &server, WebServer::ConnectionType type, char *url_tail, bool tail_complete)
 {
-  /* this line sends the standard "we're all OK" headers back to the
+  /* this line sends the "HTTP 400 - Bad Request" headers back to the
      browser */
   server.httpFail();
 

From 4e41386ec3a706f6728fef7f6103b18cc57e3535 Mon Sep 17 00:00:00 2001
From: "www.edvler-blog.de" <edvler@edvler-blog.de>
Date: Thu, 7 Mar 2013 17:59:06 +0100
Subject: [PATCH 57/75] Added first version of Web_Net_Setup.pde example

With this example Sketch it's possible to configure the network settings
over a webinterface. It's simple to add some custom fields.
---
 examples/Web_Net_Setup/EEPROMAnything.h  |  20 +
 examples/Web_Net_Setup/Web_Net_Setup.pde | 679 +++++++++++++++++++++++
 2 files changed, 699 insertions(+)
 create mode 100644 examples/Web_Net_Setup/EEPROMAnything.h
 create mode 100644 examples/Web_Net_Setup/Web_Net_Setup.pde

diff --git a/examples/Web_Net_Setup/EEPROMAnything.h b/examples/Web_Net_Setup/EEPROMAnything.h
new file mode 100644
index 0000000..c548cbf
--- /dev/null
+++ b/examples/Web_Net_Setup/EEPROMAnything.h
@@ -0,0 +1,20 @@
+#include <EEPROM.h>
+#include <Arduino.h>  // for type definitions
+
+template <class T> int EEPROM_writeAnything(int ee, const T& value)
+{
+    const byte* p = (const byte*)(const void*)&value;
+    unsigned int i;
+    for (i = 0; i < sizeof(value); i++)
+          EEPROM.write(ee++, *p++);
+    return i;
+}
+
+template <class T> int EEPROM_readAnything(int ee, T& value)
+{
+    byte* p = (byte*)(void*)&value;
+    unsigned int i;
+    for (i = 0; i < sizeof(value); i++)
+          *p++ = EEPROM.read(ee++);
+    return i;
+}
diff --git a/examples/Web_Net_Setup/Web_Net_Setup.pde b/examples/Web_Net_Setup/Web_Net_Setup.pde
new file mode 100644
index 0000000..3ad54c7
--- /dev/null
+++ b/examples/Web_Net_Setup/Web_Net_Setup.pde
@@ -0,0 +1,679 @@
+/* Web_Net_Setup.pde - example for a webinterface to set the network configuration 
+Author:     Matthias Maderer
+Date:       07.03.2013
+Version:    1.0
+web:        www.edvler-blog.de
+
+This is a sample Sketch for Webduino!
+More informations about Webduino can be found at https://github.com/sirleech/Webduino
+
+For more informations about EEPROMAnything.h look at http://playground.arduino.cc/Code/EEPROMWriteAnything
+*/
+
+/*
+* With this example its possible to configure the network configuration of the
+* Arduino board over a webinterface. Imagine like your router setup.
+* 
+* It's possible to configure the following network settings:
+* - IP address
+* - Subnet
+* - Gateway
+* - DNS Server
+* - Webserver port
+* - USE DHCP YES/NO
+* - DHCP renew interval
+* 
+* You can configure default settings. This settings are used wenn no configuration is present.
+* Look at the function set_EEPROM_Default().
+*
+* It is possible to connect a RESET button. If the button is pressed and the Arduino is turned on 
+* the default values would be restored too.
+* See #define RESET_PIN.
+*
+*
+* All settings are stored in EEPROM. This means they are permanent.
+* Please look at http://arduino.cc/en/Reference/EEPROM for a short description.
+*
+* 
+* To setup your arduino upload this sketch.
+* 
+* If you don't change the sourcecode the default IP address is http://192.168.0.111/
+* Don't forget to change the IP of your network adapter to a suitable address (e.g. to IP 192.168.0.1, NETMASK 255.255.255.0)!
+*
+* Enter the following URL for the setup page:
+* http://192.168.0.111/setupNet.html
+*
+* Please note that no input checks are done!!
+* This means that no error would be thrown if you type a wrong IP address or other failures.
+* Keep this in mind.
+*
+* Resources:
+* 27.000 Bytes
+*
+* BUGS:
+* - After uploading your sketch the arduino is not reachable. --> Reset your Arduino!!
+*/
+
+
+#define WEBDUINO_FAVICON_DATA "" // no favicon
+//#define DEBUG  //uncomment for serial debug output
+
+
+#include "SPI.h" // new include
+#include "avr/pgmspace.h" // new include
+#include "Ethernet.h"
+#include "WebServer.h"
+
+
+/* #############################################################################################################################################################
+* Code for the EEPROM related things
+* 
+*/
+#include <EEPROM.h>
+#include "EEPROMAnything.h"
+
+#define RESET_PIN 40	//Connect a button to this PIN. If the button is hold, an the device is turned on the default ethernet settings are restored.
+
+/* structure which is stored in the eeprom. 
+* Look at "EEPROMAnything.h" for the functions storing and reading the struct
+*/
+struct config_t
+{
+    byte config_set;
+    byte use_dhcp;
+    byte dhcp_refresh_minutes;
+    byte mac[6];
+    byte ip[4];
+    byte gateway[4];
+    byte subnet[4];
+    byte dns_server[4];
+    unsigned int webserverPort;
+} eeprom_config;
+
+/* The default Ethernet settings. 
+* This settings are used when no config is present or the reset button is pressed.
+*/
+void set_EEPROM_Default() {
+    eeprom_config.config_set=1;  // dont change! It's used to check if the config is already set
+  
+    eeprom_config.use_dhcp=0; // use DHCP per default
+    eeprom_config.dhcp_refresh_minutes=60; // refresh the DHCP every 60 minutes
+  
+    // set the default MAC address. In this case its DE:AD:BE:EF:11:22
+    eeprom_config.mac[0]=0xDE;  
+    eeprom_config.mac[1]=0xAD;
+    eeprom_config.mac[2]=0xBE;
+    eeprom_config.mac[3]=0xEF;
+    eeprom_config.mac[4]=0x11;
+    eeprom_config.mac[5]=0x11;
+    
+    // set the default IP address for the arduino. In this case its 172.31.0.111
+    eeprom_config.ip[0]=192;
+    eeprom_config.ip[1]=168;
+    eeprom_config.ip[2]=0;
+    eeprom_config.ip[3]=111;
+  
+    // set the default GATEWAY. In this case its 172.31.0.254
+    eeprom_config.gateway[0]=192;
+    eeprom_config.gateway[1]=168;
+    eeprom_config.gateway[2]=0;
+    eeprom_config.gateway[3]=254;
+    
+    // set the default SUBNET. In this case its 255.255.255.0
+    eeprom_config.subnet[0]=255;
+    eeprom_config.subnet[1]=255;
+    eeprom_config.subnet[2]=255;
+    eeprom_config.subnet[3]=0;
+
+    // set the default DNS SERVER. In this case its 172.31.0.254
+    eeprom_config.dns_server[0]=192;
+    eeprom_config.dns_server[1]=168;
+    eeprom_config.dns_server[2]=0;
+    eeprom_config.dns_server[3]=254;
+
+    // set the default Webserver Port. In this case its Port 80
+    eeprom_config.webserverPort=80;
+    
+    #ifdef DEBUG
+      Serial.println("Config reset");
+    #endif 
+}
+
+
+/**
+* read_EEPROM_Settings function
+* This function is used to read the EEPROM settings at startup
+*
+* Overview:
+* - Set the PIN for the RESET-button to input and activate pullups
+* - Load the stored data from EEPROM into the eeprom_config struct
+* - Check if a config is stored or the reset button is pressed. If one of the conditions is ture, set the defaults
+*/
+void read_EEPROM_Settings() {
+  pinMode(RESET_PIN, INPUT);
+  digitalWrite(RESET_PIN, HIGH);
+  
+  // read the current config
+  EEPROM_readAnything(0, eeprom_config);
+  
+  // check if config is present or if reset button is pressed
+  if (eeprom_config.config_set != 1 || digitalRead(RESET_PIN) == LOW) {
+    // set default values
+    set_EEPROM_Default();
+    
+    // write the config to eeprom
+    EEPROM_writeAnything(0, eeprom_config);
+  } 
+}
+
+#ifdef DEBUG
+void print_EEPROM_Settings() {
+    Serial.print("IP: ");
+    for(int i = 0; i<4; i++) {
+      Serial.print(eeprom_config.ip[i]);
+      if (i<3) {
+        Serial.print('.');
+      }
+    }
+    Serial.println();
+  
+    Serial.print("Subnet: ");
+    for(int i = 0; i<4; i++) {
+      Serial.print(eeprom_config.subnet[i]);
+      if (i<3) {
+        Serial.print('.');
+      }
+    }
+    Serial.println();
+    
+    Serial.print("Gateway: ");
+    for(int i = 0; i<4; i++) {
+      Serial.print(eeprom_config.gateway[i]);
+      if (i<3) {
+        Serial.print('.');
+      }
+    }
+    Serial.println();
+
+    Serial.print("DNS Server: ");
+    for(int i = 0; i<4; i++) {
+      Serial.print(eeprom_config.dns_server[i]);
+      if (i<3) {
+        Serial.print('.');
+      }
+    }
+    Serial.println();
+    
+    Serial.print("MAC: ");
+    for (int a=0;a<6;a++) {
+      Serial.print(eeprom_config.mac[a],HEX);
+      if(a<5) {
+        Serial.print(":");
+      }
+    }
+    Serial.println();
+    
+    Serial.print("Webserver Port: ");
+    Serial.println(eeprom_config.webserverPort);
+    
+    Serial.print("USE DHCP: ");
+    Serial.println(eeprom_config.use_dhcp);
+    
+    Serial.print(" DHCP renew every ");
+    Serial.print(eeprom_config.dhcp_refresh_minutes);
+    Serial.println(" minutes");
+    
+    Serial.print("Config Set: ");
+    Serial.println(eeprom_config.config_set);
+
+}
+#endif
+
+// #############################################################################################################################################################
+
+
+/* START Network section #######################################################################################################################################
+* Webserver Code
+*/
+long last_dhcp_renew;
+byte dhcp_state;
+
+/**
+renewDHCP() function
+Renew the DHCP relase in a given interval.
+*/
+void renewDHCP(int interval) {
+  if (interval == 0 ) {
+     interval = 1; 
+  }
+  if (eeprom_config.use_dhcp==1) {
+    if((millis() - last_dhcp_renew) >  (interval*60*1000)) {
+      last_dhcp_renew=millis();
+      dhcp_state = Ethernet.maintain();
+    }
+  }
+}
+
+
+/**
+* setupNetwork() function (webpage)
+* This function is used to setupup the network according to the values stored in the eeprom
+*
+* Overview:
+* - First of all read the EEPROM settings
+* - Display a link to the ethernet setup
+* - Check if DHCP should be used, if not create instaces of IPAddress for ip, gateway, subnet and dns_server
+* - Invoke Ethernet.begin with all parameters if no dhcp is active (Ethernet.begin(mac, ip, dns_server, gateway, subnet);). 
+* - If DHCP is used invoke only with mac (Ethernet.begin(mac);) and display the ip on the serial console.
+*/
+void setupNetwork() {
+  read_EEPROM_Settings();
+  
+  #ifdef DEBUG
+   print_EEPROM_Settings();
+  #endif
+
+ // byte mac[] = { eeprom_config.mac[0], eeprom_config.mac[1], eeprom_config.mac[2], eeprom_config.mac[3], eeprom_config.mac[4], eeprom_config.mac[5] };  
+  
+  if (eeprom_config.use_dhcp != 1) {
+    IPAddress ip(eeprom_config.ip[0], eeprom_config.ip[1], eeprom_config.ip[2], eeprom_config.ip[3]);                                               
+    IPAddress gateway (eeprom_config.gateway[0],eeprom_config.gateway[1],eeprom_config.gateway[2],eeprom_config.gateway[3]);                      
+    IPAddress subnet  (eeprom_config.subnet[0], eeprom_config.subnet[1], eeprom_config.subnet[2], eeprom_config.subnet[3]);  
+    IPAddress dns_server  (eeprom_config.dns_server[0], eeprom_config.dns_server[1], eeprom_config.dns_server[2], eeprom_config.dns_server[3]);
+    Ethernet.begin(eeprom_config.mac, ip, dns_server, gateway, subnet);
+  } else {
+    if (Ethernet.begin(eeprom_config.mac) == 0) {
+      Serial.print("Failed to configure Ethernet using DHCP");
+    }
+    Serial.println(Ethernet.localIP());
+  }
+}
+// END Network section #########################################################################################################################################
+
+
+
+P(Page_start) = "<html><head><title>Web_EEPROM_Setup</title></head><body>\n";
+P(Page_end) = "</body></html>";
+
+P(Http400) = "HTTP 400 - BAD REQUEST";
+P(Index) = "<h1>index.html</h1><br>This is your main site!<br>The code is found in the indexHTML() function.<br>You can add more sites if you need. Please see the well documented source code.<br><br>Use the following link to setup the network.<br><a href=\"setupNet.html\">NETWORK SETUP</a>";
+
+P(Form_eth_start) = "<FORM action=\"setupNet.html\" method=\"get\">";
+P(Form_end) = "<FORM>";
+P(Form_input_send) = "<INPUT type=\"submit\" value=\"Set config\">";
+
+P(Form_input_text_start) = "<input type=\"text\" name=\"";
+P(Form_input_value)  = "\" value=\"";
+P(Form_input_size2) = "\" maxlength=\"2\" size=\"2";
+P(Form_input_size3) = "\" maxlength=\"3\" size=\"3";
+P(Form_input_end) = "\">\n";
+
+P(MAC) = "MAC address: ";
+P(IP) = "IP address: ";
+P(SUBNET) = "Subnet: ";
+P(GW) = "GW address: ";
+P(DNS_SERVER) = "DNS server: ";
+P(WEB_PORT) = "Webserver port (1-65535): ";
+P(DHCP_ACTIVE) = "Use DHCP: ";
+P(DHCP_REFRESH) = "Renew interval for DHCP in minutes (1 - 255): ";
+
+P(Form_cb) = "<input type=\"radio\" name=\"23\" value=\"";
+P(Form_cb_checked) = " checked ";
+P(Form_cb_on) = ">On";
+P(Form_cb_off) = ">Off";
+
+P(br) = "<br>\n";
+
+P(table_start) = "<table>";
+P(table_tr_start) = "<tr>";
+P(table_tr_end) = "</tr>";
+P(table_td_start) = "<td>";
+P(table_td_end) = "</td>";
+P(table_end) = "</table>";
+
+P(Config_set) = "<font size=\"6\" color=\"red\">New configuration stored! <br>Please turn off and on your Arduino or use the reset button!</font><br>";
+
+/*
+<script>
+
+function an()
+{document.getElementById('dynDiv').style.visibility = 'visible';}
+
+function aus()
+{document.getElementById('dynDiv').style.visibility = 'hidden';}
+
+</script>
+
+<div id='dynDiv' style='visibility:hidden'>nn</div> .. mehr auf http://w-w-w.ms/a1v0si#3127029
+*/
+
+//P(Form_input_cb_start) = "<input type=\"checkbox\" name=\"";
+
+/* This creates an pointer to instance of the webserver. */
+WebServer * webserver;
+
+void indexHTML(WebServer &server, WebServer::ConnectionType type, char *url_tail, bool tail_complete)
+{
+  /* this line sends the standard "we're all OK" headers back to the
+     browser */
+  server.httpSuccess();
+
+  /* if we're handling a GET or POST, we can output our data here.
+     For a HEAD request, we just stop after outputting headers. */
+  if (type == WebServer::HEAD)
+    return;
+    
+  server.printP(Page_start);
+  
+  server.printP(Index);
+  
+  server.printP(Page_end);
+    
+}
+
+#define NAMELEN 5
+#define VALUELEN 7
+
+void setupNetHTML(WebServer &server, WebServer::ConnectionType type, char *url_tail, bool tail_complete)
+{
+  URLPARAM_RESULT rc;
+  char name[NAMELEN];
+  char value[VALUELEN];
+  boolean params_present = false;
+  byte param_number = 0;
+
+  /* this line sends the standard "we're all OK" headers back to the
+     browser */
+  server.httpSuccess();
+
+  /* if we're handling a GET or POST, we can output our data here.
+     For a HEAD request, we just stop after outputting headers. */
+  if (type == WebServer::HEAD)
+    return;
+
+  server.printP(Page_start);
+
+  // check for parameters
+  if (strlen(url_tail)) {
+    while (strlen(url_tail)) {
+      rc = server.nextURLparam(&url_tail, name, NAMELEN, value, VALUELEN);
+      if (rc != URLPARAM_EOS) {
+        params_present=true;
+        // debug output for parameters
+        #ifdef DEBUG
+        Serial.print(name);
+        server.print(name);
+        Serial.print(" - "); 
+        server.print(" - ");
+        Serial.println(value);
+        server.print(value);
+        server.print("<br>");
+        #endif
+        
+        
+        param_number = atoi(name);
+ 
+        // read MAC address
+        if (param_number >=0 && param_number <=5) {
+          eeprom_config.mac[param_number]=strtol(value,NULL,16);
+        }
+    
+        // read IP address
+        if (param_number >=6 && param_number <=9) {
+          eeprom_config.ip[param_number-6]=atoi(value);
+        }
+    
+        // read SUBNET
+        if (param_number >=10 && param_number <=13) {
+          eeprom_config.subnet[param_number-10]=atoi(value);
+        }
+    
+        // read GATEWAY
+        if (param_number >=14 && param_number <=17) {
+          eeprom_config.gateway[param_number-14]=atoi(value);
+        }
+    
+        // read DNS-SERVER
+        if (param_number >=18 && param_number <=21) {
+          eeprom_config.dns_server[param_number-18]=atoi(value);
+        }
+        
+        // read WEBServer port
+        if (param_number == 22) {
+          eeprom_config.webserverPort=atoi(value);
+        }
+        
+        // read DHCP ON/OFF
+        if (param_number == 23) {
+          eeprom_config.use_dhcp=atoi(value);
+        }
+    
+        // read DHCP renew interval
+        if (param_number == 24) {
+          eeprom_config.dhcp_refresh_minutes=atoi(value);
+        } 
+      }
+    }
+    EEPROM_writeAnything(0, eeprom_config);
+  }
+  
+  // if no params given show the actual configuration
+
+    server.printP(Form_eth_start);
+    
+    if(params_present==true) {
+       server.printP(Config_set);
+    }
+      
+    server.printP(table_start);
+    
+    // print the current MAC
+    server.printP(table_tr_start);
+    server.printP(table_td_start);
+    server.printP(MAC);
+    server.printP(table_td_end);
+    server.printP(table_td_start);
+    for (int a=0;a<6;a++) {
+      server.printP(Form_input_text_start);
+      server.print(a);
+      server.printP(Form_input_value);
+      server.print(eeprom_config.mac[a],HEX);
+      server.printP(Form_input_size2);    
+      server.printP(Form_input_end);
+    }
+    server.printP(table_td_end);
+    server.printP(table_tr_end);
+
+    // print the current IP
+    server.printP(table_tr_start);
+    server.printP(table_td_start);
+    server.printP(IP);
+    server.printP(table_td_end);
+    server.printP(table_td_start);    
+    for (int a=0;a<4;a++) {
+      server.printP(Form_input_text_start);
+      server.print(a+6);
+      server.printP(Form_input_value);
+      server.print(eeprom_config.ip[a]);
+      server.printP(Form_input_size3);
+      server.printP(Form_input_end);
+    }
+    server.printP(table_td_end);
+    server.printP(table_tr_end);
+    
+
+    // print the current SUBNET
+    server.printP(table_tr_start);
+    server.printP(table_td_start);
+    server.printP(SUBNET);
+    server.printP(table_td_end);
+    server.printP(table_td_start); 
+    for (int a=0;a<4;a++) {
+      server.printP(Form_input_text_start);
+      server.print(a+10);
+      server.printP(Form_input_value);
+      server.print(eeprom_config.subnet[a]);
+      server.printP(Form_input_size3);
+      server.printP(Form_input_end);
+    }
+    server.printP(table_td_end);
+    server.printP(table_tr_end);
+
+    // print the current GATEWAY
+    server.printP(table_tr_start);
+    server.printP(table_td_start);
+    server.printP(GW);
+    server.printP(table_td_end);
+    server.printP(table_td_start); 
+    for (int a=0;a<4;a++) {
+      server.printP(Form_input_text_start);
+      server.print(a+14);
+      server.printP(Form_input_value);
+      server.print(eeprom_config.gateway[a]);
+      server.printP(Form_input_size3);
+      server.printP(Form_input_end);
+    }
+    server.printP(table_td_end);
+    server.printP(table_tr_end);
+
+    // print the current DNS-SERVER
+    server.printP(table_tr_start);
+    server.printP(table_td_start);
+    server.printP(DNS_SERVER);
+    server.printP(table_td_end);
+    server.printP(table_td_start); 
+    for (int a=0;a<4;a++) {
+      server.printP(Form_input_text_start);
+      server.print(a+18);
+      server.printP(Form_input_value);
+      server.print(eeprom_config.dns_server[a]);
+      server.printP(Form_input_size3);
+      server.printP(Form_input_end);
+    }
+    server.printP(table_td_end);
+    server.printP(table_tr_end);
+
+    
+    // print the current webserver port
+    server.printP(table_tr_start);
+    server.printP(table_td_start);
+    server.printP(WEB_PORT);
+    server.printP(table_td_end);
+    server.printP(table_td_start);
+    server.printP(Form_input_text_start);
+    server.print(22);
+    server.printP(Form_input_value);
+    server.print(eeprom_config.webserverPort);
+    server.printP(Form_input_end);
+    server.printP(table_td_end);
+    server.printP(table_tr_end);
+    
+    //print the current DHCP config
+    server.printP(table_tr_start);
+    server.printP(table_td_start);
+    server.printP(DHCP_ACTIVE);
+    server.printP(table_td_end);
+    server.printP(table_td_start);
+    server.printP(Form_cb);
+    server.print("0\"");
+     if(eeprom_config.use_dhcp != 1) {
+      server.printP(Form_cb_checked);
+    }
+    server.printP(Form_cb_off);   
+    
+    server.printP(Form_cb);
+    server.print("1\"");
+     if(eeprom_config.use_dhcp == 1) {
+      server.printP(Form_cb_checked);
+    }
+    server.printP(Form_cb_on);   
+    server.printP(table_td_end);
+    server.printP(table_tr_end);
+    
+    //print the current DHCP renew time
+    server.printP(table_tr_start);
+    server.printP(table_td_start);
+    server.printP(DHCP_REFRESH);
+    server.printP(table_td_end);
+    server.printP(table_td_start);
+    server.printP(Form_input_text_start);
+    server.print(24);
+    server.printP(Form_input_value);
+    server.print(eeprom_config.dhcp_refresh_minutes);
+    server.printP(Form_input_size3);
+    server.printP(Form_input_end);
+    server.printP(table_td_end);
+    server.printP(table_tr_end);
+    
+    
+
+  server.printP(table_end);
+  
+  //print the send button
+  server.printP(Form_input_send);    
+  server.printP(Form_end);
+  
+  server.printP(Page_end);
+
+}
+
+void errorHTML(WebServer &server, WebServer::ConnectionType type, char *url_tail, bool tail_complete)
+{
+  /* this line sends the standard "HTPP 400 Bad Request" headers back to the
+     browser */
+  server.httpFail();
+
+  /* if we're handling a GET or POST, we can output our data here.
+     For a HEAD request, we just stop after outputting headers. */
+  if (type == WebServer::HEAD)
+    return;
+    
+  server.printP(Http400);
+  
+  server.printP(Page_end);
+}
+
+
+
+
+void setup()
+{
+  #ifdef DEBUG
+    Serial.begin(9600);
+  #endif
+  
+  /* initialize the Ethernet adapter with the settings from eeprom */
+  delay(200); // some time to settle
+  setupNetwork();
+  delay(200); // some time to settle
+  
+  #define PREFIX ""
+  webserver = new WebServer(PREFIX, eeprom_config.webserverPort);
+
+  /* setup our default command that will be run when the user accesses
+   * the root page on the server */
+  webserver->setDefaultCommand(&indexHTML);
+
+  /* setup our default command that will be run when the user accesses
+   * a page NOT on the server */
+  webserver->setFailureCommand(&errorHTML);
+
+  /* run the same command if you try to load /index.html, a common
+   * default page name */
+  webserver->addCommand("index.html", &indexHTML);
+
+  /* display a network setup form. The configuration is stored in eeprom */
+  webserver->addCommand("setupNet.html", &setupNetHTML);
+
+  /* start the webserver */
+  webserver->begin();
+}
+
+void loop()
+{
+  char buff[200];
+  int len = 200;
+
+  /* process incoming connections one at a time forever */
+  webserver->processConnection(buff, &len);
+}

From 168ad89497e4d188852f0c50828f893f1ca41f82 Mon Sep 17 00:00:00 2001
From: "www.edvler-blog.de" <edvler@edvler-blog.de>
Date: Fri, 8 Mar 2013 18:56:50 +0100
Subject: [PATCH 58/75] Updated Web_Net_Setup and added some featues

- Updated some comments
- Fixed some failures in the source code
- Added System.h and System.cpp to display RAM usage and uptime
---
 examples/Web_Net_Setup/System.cpp        |  59 +++
 examples/Web_Net_Setup/System.h          |  39 ++
 examples/Web_Net_Setup/Web_Net_Setup.pde | 436 ++++++++++++++---------
 3 files changed, 368 insertions(+), 166 deletions(-)
 create mode 100644 examples/Web_Net_Setup/System.cpp
 create mode 100644 examples/Web_Net_Setup/System.h

diff --git a/examples/Web_Net_Setup/System.cpp b/examples/Web_Net_Setup/System.cpp
new file mode 100644
index 0000000..25ef78f
--- /dev/null
+++ b/examples/Web_Net_Setup/System.cpp
@@ -0,0 +1,59 @@
+#include "Arduino.h"
+#include "System.h"
+
+char* System::uptime()
+{
+  char buffer[65];
+
+  long days=0;
+  long hours=0;
+  long mins=0;
+  long secs=0;
+  
+  secs = millis()/1000; //convect milliseconds to seconds
+  mins=secs/60; //convert seconds to minutes
+  hours=mins/60; //convert minutes to hours
+  days=hours/24; //convert hours to days
+  secs=secs-(mins*60); //subtract the coverted seconds to minutes in order to display 59 secs max 
+  mins=mins-(hours*60); //subtract the coverted minutes to hours in order to display 59 minutes max
+  hours=hours-(days*24); //subtract the coverted hours to days in order to display 23 hours max
+
+  if (days > 0) {
+    ltoa(days,buffer,10);
+    strcpy(retval,buffer);
+  } 
+  else {
+    strcpy(retval,"0");
+  }
+
+  strcat(retval,":");
+  ltoa(hours,buffer,10);
+  strcat(retval,buffer);
+
+  strcat(retval,":");
+  ltoa(mins,buffer,10);
+  strcat(retval,buffer);
+
+  strcat(retval,":");
+  ltoa(secs,buffer,10);
+  strcat(retval,buffer);
+
+  strcat(retval,'\0');
+
+  return retval;
+}
+
+int System::ramFree () {
+  extern int __heap_start, *__brkval; 
+  int v;
+  int a = (int) &v - (__brkval == 0 ? (int) &__heap_start : (int) __brkval); 
+  return a;
+}
+
+int System::ramSize() {
+  int v;
+  int a = (int) &v;  
+  return a;
+}
+
+
diff --git a/examples/Web_Net_Setup/System.h b/examples/Web_Net_Setup/System.h
new file mode 100644
index 0000000..13397c4
--- /dev/null
+++ b/examples/Web_Net_Setup/System.h
@@ -0,0 +1,39 @@
+#ifndef System_h
+#define System_h
+
+#include <Arduino.h>
+
+/**
+* System Class.
+*
+* @author Matthias Maderer
+* @version 1.1.7
+*/
+class System {
+public:
+  /**
+  * Returns the uptime of the arduino with a char pointer.
+  * Format: DAYS:HOURS:MINUTES:SECONDS
+  * Sample: 1:20:23:50 = 1 day, 20 hours, 23 minutes and 50 seconds
+  * @return char *: pointer!
+  */
+  char * uptime();
+  
+  /**
+  * Returns the free RAM
+  * @return int: free RAM
+  */ 
+  int ramFree();
+  
+  /**
+  * Returns the size of the RAM
+  * @return int: RAM size
+  */ 
+  int ramSize();
+  
+private:
+  char retval[25];
+};
+
+#endif
+
diff --git a/examples/Web_Net_Setup/Web_Net_Setup.pde b/examples/Web_Net_Setup/Web_Net_Setup.pde
index 3ad54c7..196f287 100644
--- a/examples/Web_Net_Setup/Web_Net_Setup.pde
+++ b/examples/Web_Net_Setup/Web_Net_Setup.pde
@@ -1,7 +1,7 @@
 /* Web_Net_Setup.pde - example for a webinterface to set the network configuration 
 Author:     Matthias Maderer
 Date:       07.03.2013
-Version:    1.0
+Version:    1.0.1
 web:        www.edvler-blog.de
 
 This is a sample Sketch for Webduino!
@@ -22,6 +22,10 @@ For more informations about EEPROMAnything.h look at http://playground.arduino.c
 * - Webserver port
 * - USE DHCP YES/NO
 * - DHCP renew interval
+*
+* Other functions:
+* - Display DHCP renew status
+* - Display used RAM
 * 
 * You can configure default settings. This settings are used wenn no configuration is present.
 * Look at the function set_EEPROM_Default().
@@ -48,7 +52,8 @@ For more informations about EEPROMAnything.h look at http://playground.arduino.c
 * Keep this in mind.
 *
 * Resources:
-* 27.000 Bytes
+* There are many Strings for the HTML site. The compiled size is about 27.000 Bytes. Aprox. 2000 byte of SRAM is used.
+* On smaller Arduinos this may cause problems. I've tested it on a MEGA 2560.
 *
 * BUGS:
 * - After uploading your sketch the arduino is not reachable. --> Reset your Arduino!!
@@ -57,6 +62,7 @@ For more informations about EEPROMAnything.h look at http://playground.arduino.c
 
 #define WEBDUINO_FAVICON_DATA "" // no favicon
 //#define DEBUG  //uncomment for serial debug output
+#define USE_SYSTEM_LIBRARY //comment out if you want to save some space (about 1 Byte). You wouldn't see uptime and free RAM if it's commented out.
 
 
 #include "SPI.h" // new include
@@ -90,7 +96,10 @@ struct config_t
     unsigned int webserverPort;
 } eeprom_config;
 
-/* The default Ethernet settings. 
+/** 
+* set_EEPROM_Default() function
+*
+* The default settings. 
 * This settings are used when no config is present or the reset button is pressed.
 */
 void set_EEPROM_Default() {
@@ -99,21 +108,21 @@ void set_EEPROM_Default() {
     eeprom_config.use_dhcp=0; // use DHCP per default
     eeprom_config.dhcp_refresh_minutes=60; // refresh the DHCP every 60 minutes
   
-    // set the default MAC address. In this case its DE:AD:BE:EF:11:22
+    // set the default MAC address. In this case its DE:AD:BE:EF:FE:ED
     eeprom_config.mac[0]=0xDE;  
     eeprom_config.mac[1]=0xAD;
     eeprom_config.mac[2]=0xBE;
     eeprom_config.mac[3]=0xEF;
-    eeprom_config.mac[4]=0x11;
-    eeprom_config.mac[5]=0x11;
+    eeprom_config.mac[4]=0xFE;
+    eeprom_config.mac[5]=0xED;
     
-    // set the default IP address for the arduino. In this case its 172.31.0.111
+    // set the default IP address for the arduino. In this case its 192.168.0.111
     eeprom_config.ip[0]=192;
     eeprom_config.ip[1]=168;
     eeprom_config.ip[2]=0;
     eeprom_config.ip[3]=111;
   
-    // set the default GATEWAY. In this case its 172.31.0.254
+    // set the default GATEWAY. In this case its 192.168.0.254
     eeprom_config.gateway[0]=192;
     eeprom_config.gateway[1]=168;
     eeprom_config.gateway[2]=0;
@@ -125,7 +134,7 @@ void set_EEPROM_Default() {
     eeprom_config.subnet[2]=255;
     eeprom_config.subnet[3]=0;
 
-    // set the default DNS SERVER. In this case its 172.31.0.254
+    // set the default DNS SERVER. In this case its 192.168.0.254
     eeprom_config.dns_server[0]=192;
     eeprom_config.dns_server[1]=168;
     eeprom_config.dns_server[2]=0;
@@ -166,6 +175,12 @@ void read_EEPROM_Settings() {
   } 
 }
 
+/**
+* print_EEPROM_Settings() function
+*
+* This function is used for debugging the configuration.
+* It prints the actual configuration to the serial port.
+*/
 #ifdef DEBUG
 void print_EEPROM_Settings() {
     Serial.print("IP: ");
@@ -233,21 +248,27 @@ void print_EEPROM_Settings() {
 
 
 /* START Network section #######################################################################################################################################
-* Webserver Code
+* Code for setting up network connection
 */
-long last_dhcp_renew;
+unsigned long last_dhcp_renew;
 byte dhcp_state;
 
 /**
-renewDHCP() function
-Renew the DHCP relase in a given interval.
+* renewDHCP() function
+* Renew the DHCP relase in a given interval.
+* 
+* Overview:
+* - Check if interval = 0 and set it to 1
+* - Check if renew interval is reached and renew the lease
 */
 void renewDHCP(int interval) {
+  unsigned long interval_millis = interval * 60000;
+
   if (interval == 0 ) {
      interval = 1; 
   }
   if (eeprom_config.use_dhcp==1) {
-    if((millis() - last_dhcp_renew) >  (interval*60*1000)) {
+    if((millis() - last_dhcp_renew) >  interval_millis) {
       last_dhcp_renew=millis();
       dhcp_state = Ethernet.maintain();
     }
@@ -256,7 +277,7 @@ void renewDHCP(int interval) {
 
 
 /**
-* setupNetwork() function (webpage)
+* setupNetwork() function
 * This function is used to setupup the network according to the values stored in the eeprom
 *
 * Overview:
@@ -291,7 +312,18 @@ void setupNetwork() {
 // END Network section #########################################################################################################################################
 
 
+/* WEB-Server section #######################################################################################################################################
+* Webserver Code
+*/
 
+#ifdef USE_SYSTEM_LIBRARY
+#include "system.h"
+System sys;
+#endif
+
+/* Store all string in the FLASH storage to free SRAM.
+The P() is a function from Webduino.
+*/
 P(Page_start) = "<html><head><title>Web_EEPROM_Setup</title></head><body>\n";
 P(Page_end) = "</body></html>";
 
@@ -333,25 +365,25 @@ P(table_end) = "</table>";
 
 P(Config_set) = "<font size=\"6\" color=\"red\">New configuration stored! <br>Please turn off and on your Arduino or use the reset button!</font><br>";
 
-/*
-<script>
-
-function an()
-{document.getElementById('dynDiv').style.visibility = 'visible';}
+P(DHCP_STATE_TIME) = "DHCP last renew timestamp (sec)";
+P(DHCP_STATE) = "DHCP renew return code (sec)";
 
-function aus()
-{document.getElementById('dynDiv').style.visibility = 'hidden';}
 
-</script>
-
-<div id='dynDiv' style='visibility:hidden'>nn</div> .. mehr auf http://w-w-w.ms/a1v0si#3127029
-*/
+P(UPTIME) = "Uptime: ";
 
-//P(Form_input_cb_start) = "<input type=\"checkbox\" name=\"";
+#ifdef USE_SYSTEM_LIBRARY
+P(RAM_1) = "RAM (byte): ";
+P(RAM_2) = " free of ";
+#endif
 
 /* This creates an pointer to instance of the webserver. */
 WebServer * webserver;
 
+
+/**
+* indexHTML() function
+* This function is used to send the index.html to the client.
+*/
 void indexHTML(WebServer &server, WebServer::ConnectionType type, char *url_tail, bool tail_complete)
 {
   /* this line sends the standard "we're all OK" headers back to the
@@ -371,9 +403,20 @@ void indexHTML(WebServer &server, WebServer::ConnectionType type, char *url_tail
     
 }
 
+/**
+* setupNetHTML() function
+* This function is used to send the setupNet.html to the client.
+*
+* Overview:
+* - Send a HTTP 200 OK Header
+* - If get parameters exists assign them to the corresponding variable in the eeprom_config struct
+* - Print the configuration
+*
+* Parameters are simple numbers. The name of the parameter is converted to an int with the atoi function.
+* This saves some code for setting the MAC and IP addresses.
+*/
 #define NAMELEN 5
 #define VALUELEN 7
-
 void setupNetHTML(WebServer &server, WebServer::ConnectionType type, char *url_tail, bool tail_complete)
 {
   URLPARAM_RESULT rc;
@@ -456,170 +499,216 @@ void setupNetHTML(WebServer &server, WebServer::ConnectionType type, char *url_t
     }
     EEPROM_writeAnything(0, eeprom_config);
   }
-  
-  // if no params given show the actual configuration
-
-    server.printP(Form_eth_start);
-    
-    if(params_present==true) {
-       server.printP(Config_set);
-    }
-      
-    server.printP(table_start);
-    
-    // print the current MAC
-    server.printP(table_tr_start);
-    server.printP(table_td_start);
-    server.printP(MAC);
-    server.printP(table_td_end);
-    server.printP(table_td_start);
-    for (int a=0;a<6;a++) {
-      server.printP(Form_input_text_start);
-      server.print(a);
-      server.printP(Form_input_value);
-      server.print(eeprom_config.mac[a],HEX);
-      server.printP(Form_input_size2);    
-      server.printP(Form_input_end);
-    }
-    server.printP(table_td_end);
-    server.printP(table_tr_end);
 
-    // print the current IP
-    server.printP(table_tr_start);
-    server.printP(table_td_start);
-    server.printP(IP);
-    server.printP(table_td_end);
-    server.printP(table_td_start);    
-    for (int a=0;a<4;a++) {
-      server.printP(Form_input_text_start);
-      server.print(a+6);
-      server.printP(Form_input_value);
-      server.print(eeprom_config.ip[a]);
-      server.printP(Form_input_size3);
-      server.printP(Form_input_end);
-    }
-    server.printP(table_td_end);
-    server.printP(table_tr_end);
+  //print the form
+  server.printP(Form_eth_start);
+  
+  if(params_present==true) {
+     server.printP(Config_set);
+  }
     
+  server.printP(table_start);
+  
+  // print the current MAC
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(MAC);
+  server.printP(table_td_end);
+  server.printP(table_td_start);
+  for (int a=0;a<6;a++) {
+    server.printP(Form_input_text_start);
+    server.print(a);
+    server.printP(Form_input_value);
+    server.print(eeprom_config.mac[a],HEX);
+    server.printP(Form_input_size2);    
+    server.printP(Form_input_end);
+  }
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+
+  // print the current IP
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(IP);
+  server.printP(table_td_end);
+  server.printP(table_td_start);    
+  for (int a=0;a<4;a++) {
+    server.printP(Form_input_text_start);
+    server.print(a+6);
+    server.printP(Form_input_value);
+    server.print(eeprom_config.ip[a]);
+    server.printP(Form_input_size3);
+    server.printP(Form_input_end);
+  }
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+  
 
-    // print the current SUBNET
-    server.printP(table_tr_start);
-    server.printP(table_td_start);
-    server.printP(SUBNET);
-    server.printP(table_td_end);
-    server.printP(table_td_start); 
-    for (int a=0;a<4;a++) {
-      server.printP(Form_input_text_start);
-      server.print(a+10);
-      server.printP(Form_input_value);
-      server.print(eeprom_config.subnet[a]);
-      server.printP(Form_input_size3);
-      server.printP(Form_input_end);
-    }
-    server.printP(table_td_end);
-    server.printP(table_tr_end);
-
-    // print the current GATEWAY
-    server.printP(table_tr_start);
-    server.printP(table_td_start);
-    server.printP(GW);
-    server.printP(table_td_end);
-    server.printP(table_td_start); 
-    for (int a=0;a<4;a++) {
-      server.printP(Form_input_text_start);
-      server.print(a+14);
-      server.printP(Form_input_value);
-      server.print(eeprom_config.gateway[a]);
-      server.printP(Form_input_size3);
-      server.printP(Form_input_end);
-    }
-    server.printP(table_td_end);
-    server.printP(table_tr_end);
-
-    // print the current DNS-SERVER
-    server.printP(table_tr_start);
-    server.printP(table_td_start);
-    server.printP(DNS_SERVER);
-    server.printP(table_td_end);
-    server.printP(table_td_start); 
-    for (int a=0;a<4;a++) {
-      server.printP(Form_input_text_start);
-      server.print(a+18);
-      server.printP(Form_input_value);
-      server.print(eeprom_config.dns_server[a]);
-      server.printP(Form_input_size3);
-      server.printP(Form_input_end);
-    }
-    server.printP(table_td_end);
-    server.printP(table_tr_end);
-
-    
-    // print the current webserver port
-    server.printP(table_tr_start);
-    server.printP(table_td_start);
-    server.printP(WEB_PORT);
-    server.printP(table_td_end);
-    server.printP(table_td_start);
+  // print the current SUBNET
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(SUBNET);
+  server.printP(table_td_end);
+  server.printP(table_td_start); 
+  for (int a=0;a<4;a++) {
     server.printP(Form_input_text_start);
-    server.print(22);
+    server.print(a+10);
     server.printP(Form_input_value);
-    server.print(eeprom_config.webserverPort);
+    server.print(eeprom_config.subnet[a]);
+    server.printP(Form_input_size3);
     server.printP(Form_input_end);
-    server.printP(table_td_end);
-    server.printP(table_tr_end);
-    
-    //print the current DHCP config
+  }
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+
+  // print the current GATEWAY
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(GW);
+  server.printP(table_td_end);
+  server.printP(table_td_start); 
+  for (int a=0;a<4;a++) {
+    server.printP(Form_input_text_start);
+    server.print(a+14);
+    server.printP(Form_input_value);
+    server.print(eeprom_config.gateway[a]);
+    server.printP(Form_input_size3);
+    server.printP(Form_input_end);
+  }
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+
+  // print the current DNS-SERVER
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(DNS_SERVER);
+  server.printP(table_td_end);
+  server.printP(table_td_start); 
+  for (int a=0;a<4;a++) {
+    server.printP(Form_input_text_start);
+    server.print(a+18);
+    server.printP(Form_input_value);
+    server.print(eeprom_config.dns_server[a]);
+    server.printP(Form_input_size3);
+    server.printP(Form_input_end);
+  }
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+
+  
+  // print the current webserver port
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(WEB_PORT);
+  server.printP(table_td_end);
+  server.printP(table_td_start);
+  server.printP(Form_input_text_start);
+  server.print(22);
+  server.printP(Form_input_value);
+  server.print(eeprom_config.webserverPort);
+  server.printP(Form_input_end);
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+  
+  //print the current DHCP config
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(DHCP_ACTIVE);
+  server.printP(table_td_end);
+  server.printP(table_td_start);
+  server.printP(Form_cb);
+  server.print("0\"");
+   if(eeprom_config.use_dhcp != 1) {
+    server.printP(Form_cb_checked);
+  }
+  server.printP(Form_cb_off);   
+  
+  server.printP(Form_cb);
+  server.print("1\"");
+  if(eeprom_config.use_dhcp == 1) {
+    server.printP(Form_cb_checked);
+  }
+  server.printP(Form_cb_on);   
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+  
+  //print the current DHCP renew time
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(DHCP_REFRESH);
+  server.printP(table_td_end);
+  server.printP(table_td_start);
+  server.printP(Form_input_text_start);
+  server.print(24);
+  server.printP(Form_input_value);
+  server.print(eeprom_config.dhcp_refresh_minutes);
+  server.printP(Form_input_size3);
+  server.printP(Form_input_end);
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+
+  //print DHCP status
+  if(eeprom_config.use_dhcp == 1) {
     server.printP(table_tr_start);
-    server.printP(table_td_start);
-    server.printP(DHCP_ACTIVE);
+    server.printP(table_td_start);	
+    server.printP(DHCP_STATE);
     server.printP(table_td_end);
     server.printP(table_td_start);
-    server.printP(Form_cb);
-    server.print("0\"");
-     if(eeprom_config.use_dhcp != 1) {
-      server.printP(Form_cb_checked);
-    }
-    server.printP(Form_cb_off);   
-    
-    server.printP(Form_cb);
-    server.print("1\"");
-     if(eeprom_config.use_dhcp == 1) {
-      server.printP(Form_cb_checked);
-    }
-    server.printP(Form_cb_on);   
+    server.print(dhcp_state);
     server.printP(table_td_end);
     server.printP(table_tr_end);
-    
-    //print the current DHCP renew time
+	 
     server.printP(table_tr_start);
-    server.printP(table_td_start);
-    server.printP(DHCP_REFRESH);
+    server.printP(table_td_start);	
+    server.printP(DHCP_STATE_TIME);
     server.printP(table_td_end);
     server.printP(table_td_start);
-    server.printP(Form_input_text_start);
-    server.print(24);
-    server.printP(Form_input_value);
-    server.print(eeprom_config.dhcp_refresh_minutes);
-    server.printP(Form_input_size3);
-    server.printP(Form_input_end);
+    server.print(last_dhcp_renew/1000);
     server.printP(table_td_end);
     server.printP(table_tr_end);
-    
-    
-
+  }
+  
+  #ifdef USE_SYSTEM_LIBRARY
+  //print uptime
+  server.printP(table_tr_start);
+  server.printP(table_td_start);	
+  server.printP(UPTIME);
+  server.printP(table_td_end);
+  server.printP(table_td_start);
+  server.print(sys.uptime());
+  server.printP(table_td_end);
+  server.printP(table_tr_end); 
+
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(RAM_1);	
+  server.print(sys.ramFree());
+  server.printP(RAM_2);
+  server.print(sys.ramSize());
+  server.printP(table_td_end);
+  server.printP(table_tr_end); 
+  #endif
+  
   server.printP(table_end);
   
   //print the send button
   server.printP(Form_input_send);    
   server.printP(Form_end);
   
+
+  
   server.printP(Page_end);
 
 }
 
+/**
+* errorHTML() function
+* This function is called whenever a non extisting page is called.
+* It sends a HTTP 400 Bad Request header and the same as text.
+*/
 void errorHTML(WebServer &server, WebServer::ConnectionType type, char *url_tail, bool tail_complete)
 {
-  /* this line sends the standard "HTPP 400 Bad Request" headers back to the
+  /* this line sends the standard "HTTP 400 Bad Request" headers back to the
      browser */
   server.httpFail();
 
@@ -633,9 +722,12 @@ void errorHTML(WebServer &server, WebServer::ConnectionType type, char *url_tail
   server.printP(Page_end);
 }
 
+// END WEBCODE ######################################################################################################################################################
 
-
-
+/**
+* setup() function
+* This function is called whenever the arduino is turned on.
+*/
 void setup()
 {
   #ifdef DEBUG
@@ -669,8 +761,20 @@ void setup()
   webserver->begin();
 }
 
+/**
+* loop() function
+* Runs forver ....
+* 
+* Overview:
+* - Renew the DHCP lease
+* - Serve web clients
+*
+*/
 void loop()
 {
+  // renew DHCP lease
+  renewDHCP(eeprom_config.dhcp_refresh_minutes);
+
   char buff[200];
   int len = 200;
 

From 871af354ce8975d3d7cd0164deff21ffbf6290da Mon Sep 17 00:00:00 2001
From: "www.edvler-blog.de" <edvler@edvler-blog.de>
Date: Wed, 13 Mar 2013 17:23:05 +0100
Subject: [PATCH 59/75] Updated comments. Fixed some bugs.

---
 examples/Web_Net_Setup/Web_Net_Setup.pde | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/examples/Web_Net_Setup/Web_Net_Setup.pde b/examples/Web_Net_Setup/Web_Net_Setup.pde
index 196f287..2425433 100644
--- a/examples/Web_Net_Setup/Web_Net_Setup.pde
+++ b/examples/Web_Net_Setup/Web_Net_Setup.pde
@@ -2,7 +2,7 @@
 Author:     Matthias Maderer
 Date:       07.03.2013
 Version:    1.0.1
-web:        www.edvler-blog.de
+web:        www.edvler-blog.de/arduino_networksetup_webinterface_with_eeprom
 
 This is a sample Sketch for Webduino!
 More informations about Webduino can be found at https://github.com/sirleech/Webduino
@@ -12,19 +12,22 @@ For more informations about EEPROMAnything.h look at http://playground.arduino.c
 
 /*
 * With this example its possible to configure the network configuration of the
-* Arduino board over a webinterface. Imagine like your router setup.
+* Arduino Ethernet Shield with a webinterface. Imagine like your router setup.
 * 
 * It's possible to configure the following network settings:
+* - MAC address
 * - IP address
 * - Subnet
 * - Gateway
 * - DNS Server
 * - Webserver port
-* - USE DHCP YES/NO
+* - USE DHCP YES/NO (if you use DHCP connect per serial port - 9600 baud - on powerup to see which ip address is assigned)
 * - DHCP renew interval
 *
 * Other functions:
 * - Display DHCP renew status
+* - Display DHCP renew timestamp
+* - Display Arduino uptime
 * - Display used RAM
 * 
 * You can configure default settings. This settings are used wenn no configuration is present.
@@ -63,6 +66,7 @@ For more informations about EEPROMAnything.h look at http://playground.arduino.c
 #define WEBDUINO_FAVICON_DATA "" // no favicon
 //#define DEBUG  //uncomment for serial debug output
 #define USE_SYSTEM_LIBRARY //comment out if you want to save some space (about 1 Byte). You wouldn't see uptime and free RAM if it's commented out.
+#define SERIAL_BAUD 9600
 
 
 #include "SPI.h" // new include
@@ -730,9 +734,7 @@ void errorHTML(WebServer &server, WebServer::ConnectionType type, char *url_tail
 */
 void setup()
 {
-  #ifdef DEBUG
-    Serial.begin(9600);
-  #endif
+  Serial.begin(SERIAL_BAUD);
   
   /* initialize the Ethernet adapter with the settings from eeprom */
   delay(200); // some time to settle

From b030ea9886599933914743a0349edcc52437878c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jupp=20M=C3=BCller?= <jupp0r@gmail.com>
Date: Wed, 27 Mar 2013 14:29:00 +0100
Subject: [PATCH 60/75] Ported to Arduino Due platform

---
 WebServer.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/WebServer.h b/WebServer.h
index 9d46871..c438ebd 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -127,11 +127,18 @@
 extern "C" unsigned long millis(void);
 
 // declare a static string
+#ifdef __AVR__
 #define P(name)   static const unsigned char name[] PROGMEM
+#else
+#define P(name)   static const unsigned char name[]
+#endif
 
 // returns the number of elements in the array
 #define SIZE(array) (sizeof(array) / sizeof(*array))
 
+#ifdef _VARIANT_ARDUINO_DUE_X_
+#define pgm_read_byte(ptr) (unsigned char)(* ptr)
+#endif
 /********************************************************************
  * DECLARATIONS
  ********************************************************************/

From 9e2633ab7b5226ffabcd926b1b4b5bd1e858f1d1 Mon Sep 17 00:00:00 2001
From: Matt Robinson <git@nerdoftheherd.com>
Date: Mon, 30 Dec 2013 12:12:50 +0000
Subject: [PATCH 61/75] Remove typedef specifier from URLPARAM_RESULT enum

Remove the typedef storage class specifier from the declaration of the
URLPARAM_RESULT enum as this is not required and causes gcc to emit the
warning "'typedef' was ignored in this declaration" when compiling with
-Wall.
---
 WebServer.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index c438ebd..879b6a8 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -147,11 +147,11 @@ extern "C" unsigned long millis(void);
  * when you call nextURLparam AFTER the last parameter is read.  The
  * last actual parameter gets an "OK" return code. */
 
-typedef enum URLPARAM_RESULT { URLPARAM_OK,
-                               URLPARAM_NAME_OFLO,
-                               URLPARAM_VALUE_OFLO,
-                               URLPARAM_BOTH_OFLO,
-                               URLPARAM_EOS         // No params left
+enum URLPARAM_RESULT { URLPARAM_OK,
+                       URLPARAM_NAME_OFLO,
+                       URLPARAM_VALUE_OFLO,
+                       URLPARAM_BOTH_OFLO,
+                       URLPARAM_EOS         // No params left
 };
 
 class WebServer: public Print

From 5df418fa5c0cbf9bc607a07a40e121f08d764043 Mon Sep 17 00:00:00 2001
From: Matt Robinson <git@nerdoftheherd.com>
Date: Mon, 30 Dec 2013 12:33:27 +0000
Subject: [PATCH 62/75] Re-order initializer list to match member order

Correct the order of the initializer list so that gcc doesn't emit the
warning "'WebServer::m_cmdCount' will be initialized after 'int
WebServer::m_contentLength' when initialized here" when compiling using
-Wall.
---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index 879b6a8..a1b2ba2 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -353,10 +353,10 @@ WebServer::WebServer(const char *urlPrefix, int port) :
   m_client(255),
   m_urlPrefix(urlPrefix),
   m_pushbackDepth(0),
-  m_cmdCount(0),
   m_contentLength(0),
   m_failureCmd(&defaultFailCmd),
   m_defaultCmd(&defaultFailCmd),
+  m_cmdCount(0),
   m_urlPathCmd(NULL)
 {
 }

From 8388e16e33438cf2bb596119feb9b3b784017f5d Mon Sep 17 00:00:00 2001
From: Matt Robinson <git@nerdoftheherd.com>
Date: Mon, 30 Dec 2013 12:38:57 +0000
Subject: [PATCH 63/75] Add extra brackets to while loop in printP

Add an additional set of brackets around the while loop condition in
WebServer::printP to stop gcc emitting the warning "suggest parentheses
around assignment used as truth value" when compiling using -Wall.
---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index a1b2ba2..791b22f 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -439,7 +439,7 @@ void WebServer::printP(const unsigned char *str)
   uint8_t buffer[32];
   size_t bufferEnd = 0;
   
-  while (buffer[bufferEnd++] = pgm_read_byte(str++))
+  while ((buffer[bufferEnd++] = pgm_read_byte(str++)))
   {
     if (bufferEnd == 32)
     {

From 0b91dc0bb8b27ffa837154dd94f72312cad9d8c3 Mon Sep 17 00:00:00 2001
From: Matt Robinson <git@nerdoftheherd.com>
Date: Mon, 30 Dec 2013 12:44:22 +0000
Subject: [PATCH 64/75] Change some ints and chars to unsigned

Convert some of the int and char variables to be unsigned int and unsigned
char types.  This prevents gcc generating the warnings "comparison between
signed and unsigned integer expressions" and "array subscript has type
'char'", as well as having a nice side-effect of shaving 42 bytes off the
compiled size when building for the Uno.
---
 WebServer.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 791b22f..74b0502 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -308,7 +308,7 @@ class WebServer: public Print
   const char *m_urlPrefix;
 
   unsigned char m_pushback[32];
-  char m_pushbackDepth;
+  unsigned char m_pushbackDepth;
 
   int m_contentLength;
   char m_authCredentials[51];
@@ -321,7 +321,7 @@ class WebServer: public Print
     const char *verb;
     Command *cmd;
   } m_commands[8];
-  char m_cmdCount;
+  unsigned char m_cmdCount;
   UrlPathCommand *m_urlPathCmd;
 
   void reset();
@@ -480,9 +480,9 @@ bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
   // if the first character is a slash,  there's more after it.
   if (verb[0] == '/')
   {
-    char i;
+    unsigned char i;
     char *qm_loc;
-    int verb_len;
+    unsigned int verb_len;
     int qm_offset;
     // Skip over the leading "/",  because it makes the code more
     // efficient and easier to understand.

From 128c7f4c2c90f2cb632e92af0dfecc9e7f6979f8 Mon Sep 17 00:00:00 2001
From: Matt Robinson <git@nerdoftheherd.com>
Date: Mon, 30 Dec 2013 12:58:22 +0000
Subject: [PATCH 65/75] Hide warning when passing string to m_defaultCmd

The Command prototype has a char* parameter for the URL tail, but
WebServer::dispatchCommand calls this with an empty string as a parameter
if there is no URL.  As gcc treats empty strings as const char*s this
causes a warning to be emitted when compiling using -Wall, so suppress it
by explicitly casting it to char*.
---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index 74b0502..022e45b 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -465,7 +465,7 @@ bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
   // trailing slash or if the URL is just the slash
   if ((verb[0] == 0) || ((verb[0] == '/') && (verb[1] == 0)))
   {
-    m_defaultCmd(*this, requestType, "", tail_complete);
+    m_defaultCmd(*this, requestType, (char*)"", tail_complete);
     return true;
   }
   // if the URL is just a slash followed by a question mark

From 8b022f601ddb475c2dda4a75273823f44250958f Mon Sep 17 00:00:00 2001
From: Ben Combee <ben.combee@lge.com>
Date: Mon, 30 Dec 2013 09:08:03 -0600
Subject: [PATCH 66/75] Merge with local changes for spacing

---
 WebServer.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 022e45b..a486bca 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -272,7 +272,7 @@ class WebServer: public Print
 
   // output headers and a message indicating a server error
   void httpFail();
-  
+
   // output headers and a message indicating "401 Unauthorized"
   void httpUnauthorized();
 
@@ -438,7 +438,7 @@ void WebServer::printP(const unsigned char *str)
   // chunks of 32 bytes to avoid extra short TCP/IP packets
   uint8_t buffer[32];
   size_t bufferEnd = 0;
-  
+
   while ((buffer[bufferEnd++] = pgm_read_byte(str++)))
   {
     if (bufferEnd == 32)
@@ -461,7 +461,7 @@ void WebServer::printCRLF()
 bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
         bool tail_complete)
 {
-  // if there is no URL, i.e. we have a prefix and it's requested without a 
+  // if there is no URL, i.e. we have a prefix and it's requested without a
   // trailing slash or if the URL is just the slash
   if ((verb[0] == 0) || ((verb[0] == '/') && (verb[1] == 0)))
   {
@@ -613,7 +613,7 @@ void WebServer::processConnection(char *buff, int *bufflen)
 bool WebServer::checkCredentials(const char authCredentials[45])
 {
   char basic[7] = "Basic ";
-  if((0 == strncmp(m_authCredentials,basic,6)) && 
+  if((0 == strncmp(m_authCredentials,basic,6)) &&
      (0 == strcmp(authCredentials, m_authCredentials + 6))) return true;
   return false;
 }
@@ -1168,7 +1168,7 @@ void WebServer::getRequest(WebServer::ConnectionType &type,
 
 void WebServer::processHeaders()
 {
-  // look for three things: the Content-Length header, the Authorization 
+  // look for three things: the Content-Length header, the Authorization
   // header, and the double-CRLF that ends the headers.
 
   // empty the m_authCredentials before every run of this function.

From 3125b21fa9d2b246d7f61b5eafa3db61eaccb015 Mon Sep 17 00:00:00 2001
From: Matt Robinson <git@nerdoftheherd.com>
Date: Wed, 1 Jan 2014 16:08:43 +0000
Subject: [PATCH 67/75] Fix compile now EthernetClient == is overloaded

Remove comparison of m_client against NULL as this causes a compilation
error since arduino/Arduino@ca37de4ba4ecbdb941f14ac1fe7dd40f3008af75.
Also initialize m_client with MAX_SOCK_NUMBER to make boolean test of
m_client work correctly.
---
 WebServer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index a486bca..df3905c 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -350,7 +350,7 @@ class WebServer: public Print
 
 WebServer::WebServer(const char *urlPrefix, int port) :
   m_server(port),
-  m_client(255),
+  m_client(MAX_SOCK_NUM),
   m_urlPrefix(urlPrefix),
   m_pushbackDepth(0),
   m_contentLength(0),
@@ -726,7 +726,7 @@ void WebServer::httpSeeOther(const char *otherURL)
 
 int WebServer::read()
 {
-  if (m_client == NULL)
+  if (!m_client)
     return -1;
 
   if (m_pushbackDepth == 0)

From 8ce7dbc39d10f9cf5a071410ef784ea50f72485b Mon Sep 17 00:00:00 2001
From: Matt Robinson <git@nerdoftheherd.com>
Date: Thu, 16 Jan 2014 17:37:18 +0000
Subject: [PATCH 68/75] Add buffering for all output

Update WebServer::write(uint8_t) to write to a buffer instead of sending
single characters (or short strings) as small packets.  Remove the other
signatures of write so that the base ones in the Print class (which call
write(uint8_t)) are used instead and simplify the writeP/printP
definitions to do this too.

This greatly improves the performance of pages which are built from a
large number of small strings or values at the expense of a small
additional amount of memory (which can be adjusted with the use of a new
macro called WEBDUINO_OUTPUT_BUFFER_SIZE) and also saves ~85 bytes of
flash.
---
 WebServer.h | 75 ++++++++++++++++++++++-------------------------------
 1 file changed, 31 insertions(+), 44 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index df3905c..4e25ce3 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -77,6 +77,10 @@
 #define WEBDUINO_SERVER_ERROR_MESSAGE "<h1>500 Internal Server Error</h1>"
 #endif // WEBDUINO_SERVER_ERROR_MESSAGE
 
+#ifndef WEBDUINO_OUTPUT_BUFFER_SIZE
+#define WEBDUINO_OUTPUT_BUFFER_SIZE 32
+#endif // WEBDUINO_OUTPUT_BUFFER_SIZE
+
 // add '#define WEBDUINO_FAVICON_DATA ""' to your application
 // before including WebServer.h to send a null file as the favicon.ico file
 // otherwise this defaults to a 16x16 px black diode on blue ground
@@ -295,9 +299,6 @@ class WebServer: public Print
 
   // implementation of write used to implement Print interface
   virtual size_t write(uint8_t);
-  virtual size_t write(const char *str);
-  virtual size_t write(const uint8_t *buffer, size_t size);
-  size_t write(const char *data, size_t length);
 
   // tells if there is anything to process
   uint8_t available();
@@ -324,6 +325,9 @@ class WebServer: public Print
   unsigned char m_cmdCount;
   UrlPathCommand *m_urlPathCmd;
 
+  uint8_t m_buffer[WEBDUINO_OUTPUT_BUFFER_SIZE];
+  uint8_t m_bufFill;
+
   void reset();
   void getRequest(WebServer::ConnectionType &type, char *request, int *length);
   bool dispatchCommand(ConnectionType requestType, char *verb,
@@ -337,6 +341,7 @@ class WebServer: public Print
                              char *url_tail, bool tail_complete);
   void noRobots(ConnectionType type);
   void favicon(ConnectionType type);
+  void flushBuf();
 };
 
 /* define this macro if you want to include the header in a sketch source
@@ -357,7 +362,8 @@ WebServer::WebServer(const char *urlPrefix, int port) :
   m_failureCmd(&defaultFailCmd),
   m_defaultCmd(&defaultFailCmd),
   m_cmdCount(0),
-  m_urlPathCmd(NULL)
+  m_urlPathCmd(NULL),
+  m_bufFill(0)
 {
 }
 
@@ -392,70 +398,49 @@ void WebServer::setUrlPathCommand(UrlPathCommand *cmd)
 
 size_t WebServer::write(uint8_t ch)
 {
-  return m_client.write(ch);
-}
+  m_buffer[m_bufFill++] = ch;
 
-size_t WebServer::write(const char *str)
-{
-  return m_client.write(str);
-}
+  if(m_bufFill == sizeof(m_buffer))
+  {
+    m_client.write(m_buffer, sizeof(m_buffer));
+    m_bufFill = 0;
+  }
 
-size_t WebServer::write(const uint8_t *buffer, size_t size)
-{
-  return m_client.write(buffer, size);
+  return sizeof(ch);
 }
 
-size_t WebServer::write(const char *buffer, size_t length)
+void WebServer::flushBuf()
 {
-  return m_client.write((const uint8_t *)buffer, length);
+  if(m_bufFill > 0)
+  {
+    m_client.write(m_buffer, m_bufFill);
+    m_bufFill = 0;
+  }
 }
 
 void WebServer::writeP(const unsigned char *data, size_t length)
 {
-  // copy data out of program memory into local storage, write out in
-  // chunks of 32 bytes to avoid extra short TCP/IP packets
-  uint8_t buffer[32];
-  size_t bufferEnd = 0;
+  // copy data out of program memory into local storage
 
   while (length--)
   {
-    if (bufferEnd == 32)
-    {
-      m_client.write(buffer, 32);
-      bufferEnd = 0;
-    }
-
-    buffer[bufferEnd++] = pgm_read_byte(data++);
+    write(pgm_read_byte(data++));
   }
-
-  if (bufferEnd > 0)
-    m_client.write(buffer, bufferEnd);
 }
 
 void WebServer::printP(const unsigned char *str)
 {
-  // copy data out of program memory into local storage, write out in
-  // chunks of 32 bytes to avoid extra short TCP/IP packets
-  uint8_t buffer[32];
-  size_t bufferEnd = 0;
+  // copy data out of program memory into local storage
 
-  while ((buffer[bufferEnd++] = pgm_read_byte(str++)))
+  while (uint8_t value = pgm_read_byte(str++))
   {
-    if (bufferEnd == 32)
-    {
-      m_client.write(buffer, 32);
-      bufferEnd = 0;
-    }
+    write(value);
   }
-
-  // write out everything left but trailing NUL
-  if (bufferEnd > 1)
-    m_client.write(buffer, bufferEnd - 1);
 }
 
 void WebServer::printCRLF()
 {
-  m_client.write((const uint8_t *)"\r\n", 2);
+  print(CRLF);
 }
 
 bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
@@ -603,6 +588,8 @@ void WebServer::processConnection(char *buff, int *bufflen)
       m_failureCmd(*this, requestType, buff, (*bufflen) >= 0);
     }
 
+    flushBuf();
+
 #if WEBDUINO_SERIAL_DEBUGGING > 1
     Serial.println("*** stopping connection ***");
 #endif

From c50b210497aa7fe446401ec229aaee2b63993d54 Mon Sep 17 00:00:00 2001
From: cat101 <github@matiascuenca.com.ar>
Date: Sun, 2 Feb 2014 22:32:22 -0200
Subject: [PATCH 69/75] Update WebServer.h

Hi again. Here is a summary of the changes
- The recent patches did not compile. On Arduino 1.0.5 MAX_SOCK_NUM was missing so I included ethernet.h
- I added back write(const uint8_t *buffer, size_t size) which was removed with the addition of buffering
- I added printf for convenience
- I made reset & flushBuf public.
I'll continue to use the current version and report any bugs. I think that it may be a good time to up the version number

Thanks
---
 WebServer.h | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 4e25ce3..02a9a85 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -1,7 +1,8 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil;  c-file-style: "k&r"; c-basic-offset: 2; -*-
 
    Webduino, a simple Arduino web server
-   Copyright 2009-2012 Ben Combee, Ran Talbott, Christopher Lee, Martin Lormes
+   Copyright 2009-2014 Ben Combee, Ran Talbott, Christopher Lee, Martin Lormes
+   Francisco M Cuenca-Acuna
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -28,6 +29,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <Ethernet.h>
 #include <EthernetClient.h>
 #include <EthernetServer.h>
 
@@ -221,6 +223,12 @@ class WebServer: public Print
   // inline overload for printP to handle signed char strings
   void printP(const char *str) { printP((unsigned char*)str); }
 
+  // support for C style formating
+  void printf(char *fmt, ... );
+  #ifdef F
+  void printf(const __FlashStringHelper *format, ... );
+  #endif
+
   // output raw data stored in program memory
   void writeP(const unsigned char *data, size_t length);
 
@@ -299,10 +307,16 @@ class WebServer: public Print
 
   // implementation of write used to implement Print interface
   virtual size_t write(uint8_t);
+  virtual size_t write(const uint8_t *buffer, size_t size);
 
   // tells if there is anything to process
   uint8_t available();
 
+  // Flush the send buffer
+  void flushBuf(); 
+
+  // Close the current connection and flush ethernet buffers
+  void reset(); 
 private:
   EthernetServer m_server;
   EthernetClient m_client;
@@ -328,7 +342,6 @@ class WebServer: public Print
   uint8_t m_buffer[WEBDUINO_OUTPUT_BUFFER_SIZE];
   uint8_t m_bufFill;
 
-  void reset();
   void getRequest(WebServer::ConnectionType &type, char *request, int *length);
   bool dispatchCommand(ConnectionType requestType, char *verb,
                        bool tail_complete);
@@ -341,7 +354,6 @@ class WebServer: public Print
                              char *url_tail, bool tail_complete);
   void noRobots(ConnectionType type);
   void favicon(ConnectionType type);
-  void flushBuf();
 };
 
 /* define this macro if you want to include the header in a sketch source
@@ -409,6 +421,12 @@ size_t WebServer::write(uint8_t ch)
   return sizeof(ch);
 }
 
+size_t WebServer::write(const uint8_t *buffer, size_t size)
+{
+  flushBuf(); //Flush any buffered output
+  return m_client.write(buffer, size);
+}
+
 void WebServer::flushBuf()
 {
   if(m_bufFill > 0)
@@ -443,6 +461,32 @@ void WebServer::printCRLF()
   print(CRLF);
 }
 
+void WebServer::printf(char *fmt, ... )
+{
+  char tmp[128]; // resulting string limited to 128 chars
+  va_list args;
+  va_start (args, fmt );
+  vsnprintf(tmp, 128, fmt, args);
+  va_end (args);
+  print(tmp);
+}
+
+#ifdef F
+void WebServer::printf(const __FlashStringHelper *format, ... )
+{
+  char buf[128]; // resulting string limited to 128 chars
+  va_list ap;
+  va_start(ap, format);
+#ifdef __AVR__
+  vsnprintf_P(buf, sizeof(buf), (const char *)format, ap); // progmem for AVR
+#else
+  vsnprintf(buf, sizeof(buf), (const char *)format, ap); // for the rest of the world
+#endif  
+  va_end(ap);
+  print(buf);
+}
+#endif
+
 bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
         bool tail_complete)
 {

From c41b558b888250771c7a7e80e9b75a0c325992b1 Mon Sep 17 00:00:00 2001
From: ntruchsess <norbert.truchsess@t-online.de>
Date: Fri, 28 Feb 2014 13:52:37 +0100
Subject: [PATCH 70/75] constructor EthernetClient(MAX_SOCK_NUM) is
 undocumented and equivalent to EthernetClient() anyway

---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index 02a9a85..6025264 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -367,7 +367,7 @@ class WebServer: public Print
 
 WebServer::WebServer(const char *urlPrefix, int port) :
   m_server(port),
-  m_client(MAX_SOCK_NUM),
+  m_client(),
   m_urlPrefix(urlPrefix),
   m_pushbackDepth(0),
   m_contentLength(0),

From b2f650fb3bdcdb774dd55c9de6ef44240a96aeae Mon Sep 17 00:00:00 2001
From: Matt Robinson <git@nerdoftheherd.com>
Date: Sun, 16 Mar 2014 15:45:34 +0000
Subject: [PATCH 71/75] Reduce size and clarify type of some integer vars

Trim down the size of a couple of variables as they didn't need to be as
large, clarify the type of some others, and change port from int to
uint16_t to match EthernetServer.
---
 WebServer.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 6025264..7cb5c7c 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -183,7 +183,7 @@ class WebServer: public Print
                               bool tail_complete);
 
   // constructor for webserver object
-  WebServer(const char *urlPrefix = "", int port = 80);
+  WebServer(const char *urlPrefix = "", uint16_t port = 80);
 
   // start listening for connections
   void begin();
@@ -365,7 +365,7 @@ class WebServer: public Print
  * IMPLEMENTATION
  ********************************************************************/
 
-WebServer::WebServer(const char *urlPrefix, int port) :
+WebServer::WebServer(const char *urlPrefix, uint16_t port) :
   m_server(port),
   m_client(),
   m_urlPrefix(urlPrefix),
@@ -509,10 +509,10 @@ bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
   // if the first character is a slash,  there's more after it.
   if (verb[0] == '/')
   {
-    unsigned char i;
+    uint8_t i;
     char *qm_loc;
-    unsigned int verb_len;
-    int qm_offset;
+    uint16_t verb_len;
+    uint8_t qm_offset;
     // Skip over the leading "/",  because it makes the code more
     // efficient and easier to understand.
     verb++;
@@ -539,7 +539,7 @@ bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
     {
       // Initialize with null bytes, so number of parts can be determined.
       char *url_path[WEBDUINO_URL_PATH_COMMAND_LENGTH] = {0};
-      int part = 0;
+      uint8_t part = 0;
 
       // URL path should be terminated with null byte.
       *(verb + verb_len) = 0;

From f95122d70309f343740be6264853c9274fdef766 Mon Sep 17 00:00:00 2001
From: Matt Robinson <git@nerdoftheherd.com>
Date: Sun, 23 Mar 2014 16:58:12 +0000
Subject: [PATCH 72/75] Put flash strings into separate sections

Change the definition of the P() macro under the AVR architecture to store
the strings in sections named after the variables.  This allows unused
strings to be removed by the linker, saving space in the flash memory.

Also change the variable name for all but one of the instances of failMsg
to give the maximum benefit from the above.
---
 WebServer.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index 7cb5c7c..e88ce74 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -134,7 +134,7 @@ extern "C" unsigned long millis(void);
 
 // declare a static string
 #ifdef __AVR__
-#define P(name)   static const unsigned char name[] PROGMEM
+#define P(name)   static const unsigned char name[] __attribute__(( section(".progmem." #name) ))
 #else
 #define P(name)   static const unsigned char name[]
 #endif
@@ -691,7 +691,7 @@ void WebServer::favicon(ConnectionType type)
 
 void WebServer::httpUnauthorized()
 {
-  P(failMsg) =
+  P(unauthMsg) =
     "HTTP/1.0 401 Authorization Required" CRLF
     WEBDUINO_SERVER_HEADER
     "Content-Type: text/html" CRLF
@@ -699,19 +699,19 @@ void WebServer::httpUnauthorized()
     CRLF
     WEBDUINO_AUTH_MESSAGE;
 
-  printP(failMsg);
+  printP(unauthMsg);
 }
 
 void WebServer::httpServerError()
 {
-  P(failMsg) =
+  P(servErrMsg) =
     "HTTP/1.0 500 Internal Server Error" CRLF
     WEBDUINO_SERVER_HEADER
     "Content-Type: text/html" CRLF
     CRLF
     WEBDUINO_SERVER_ERROR_MESSAGE;
 
-  printP(failMsg);
+  printP(servErrMsg);
 }
 
 void WebServer::httpNoContent()

From 6b974fd4e9245e8e3029d7cf93456dfc9d592da3 Mon Sep 17 00:00:00 2001
From: Matt Robinson <git@nerdoftheherd.com>
Date: Sun, 23 Mar 2014 17:54:28 +0000
Subject: [PATCH 73/75] Save flash by only storing the server header once

Modify the functions which send headers to re-use one string containing
the server name instead of including it inline in all of the different
headers.
---
 WebServer.h | 86 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 31 deletions(-)

diff --git a/WebServer.h b/WebServer.h
index e88ce74..dadc763 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -40,12 +40,6 @@
 #define WEBDUINO_VERSION 1007
 #define WEBDUINO_VERSION_STRING "1.7"
 
-#if WEBDUINO_SUPRESS_SERVER_HEADER
-#define WEBDUINO_SERVER_HEADER ""
-#else
-#define WEBDUINO_SERVER_HEADER "Server: Webduino/" WEBDUINO_VERSION_STRING CRLF
-#endif
-
 // standard END-OF-LINE marker in HTTP
 #define CRLF "\r\n"
 
@@ -379,6 +373,8 @@ WebServer::WebServer(const char *urlPrefix, uint16_t port) :
 {
 }
 
+P(webServerHeader) = "Server: Webduino/" WEBDUINO_VERSION_STRING CRLF;
+
 void WebServer::begin()
 {
   m_server.begin();
@@ -651,14 +647,19 @@ bool WebServer::checkCredentials(const char authCredentials[45])
 
 void WebServer::httpFail()
 {
-  P(failMsg) =
-    "HTTP/1.0 400 Bad Request" CRLF
-    WEBDUINO_SERVER_HEADER
+  P(failMsg1) = "HTTP/1.0 400 Bad Request" CRLF;
+  printP(failMsg1);
+
+#ifndef WEBDUINO_SUPRESS_SERVER_HEADER
+  printP(webServerHeader);
+#endif
+
+  P(failMsg2) = 
     "Content-Type: text/html" CRLF
     CRLF
     WEBDUINO_FAIL_MESSAGE;
 
-  printP(failMsg);
+  printP(failMsg2);
 }
 
 void WebServer::defaultFailCmd(WebServer &server,
@@ -691,50 +692,70 @@ void WebServer::favicon(ConnectionType type)
 
 void WebServer::httpUnauthorized()
 {
-  P(unauthMsg) =
-    "HTTP/1.0 401 Authorization Required" CRLF
-    WEBDUINO_SERVER_HEADER
+  P(unauthMsg1) = "HTTP/1.0 401 Authorization Required" CRLF;
+  printP(unauthMsg1);
+
+#ifndef WEBDUINO_SUPRESS_SERVER_HEADER
+  printP(webServerHeader);
+#endif
+
+  P(unauthMsg2) = 
     "Content-Type: text/html" CRLF
     "WWW-Authenticate: Basic realm=\"" WEBDUINO_AUTH_REALM "\"" CRLF
     CRLF
     WEBDUINO_AUTH_MESSAGE;
 
-  printP(unauthMsg);
+  printP(unauthMsg2);
 }
 
 void WebServer::httpServerError()
 {
-  P(servErrMsg) =
-    "HTTP/1.0 500 Internal Server Error" CRLF
-    WEBDUINO_SERVER_HEADER
+  P(servErrMsg1) = "HTTP/1.0 500 Internal Server Error" CRLF;
+  printP(servErrMsg1);
+
+#ifndef WEBDUINO_SUPRESS_SERVER_HEADER
+  printP(webServerHeader);
+#endif
+
+  P(servErrMsg2) = 
     "Content-Type: text/html" CRLF
     CRLF
     WEBDUINO_SERVER_ERROR_MESSAGE;
 
-  printP(servErrMsg);
+  printP(servErrMsg2);
 }
 
 void WebServer::httpNoContent()
 {
-  P(noContentMsg) =
-    "HTTP/1.0 204 NO CONTENT" CRLF
-    WEBDUINO_SERVER_HEADER
+  P(noContentMsg1) = "HTTP/1.0 204 NO CONTENT" CRLF;
+  printP(noContentMsg1);
+
+#ifndef WEBDUINO_SUPRESS_SERVER_HEADER
+  printP(webServerHeader);
+#endif
+
+  P(noContentMsg2) = 
     CRLF
     CRLF;
 
-  printP(noContentMsg);
+  printP(noContentMsg2);
 }
 
 void WebServer::httpSuccess(const char *contentType,
                             const char *extraHeaders)
 {
-  P(successMsg1) =
-    "HTTP/1.0 200 OK" CRLF
-    WEBDUINO_SERVER_HEADER
+  P(successMsg1) = "HTTP/1.0 200 OK" CRLF;
+  printP(successMsg1);
+
+#ifndef WEBDUINO_SUPRESS_SERVER_HEADER
+  printP(webServerHeader);
+#endif
+
+  P(successMsg2) = 
     "Access-Control-Allow-Origin: *" CRLF
     "Content-Type: ";
 
-  printP(successMsg1);
+  printP(successMsg2);
   print(contentType);
   printCRLF();
   if (extraHeaders)
@@ -744,12 +765,15 @@ void WebServer::httpSuccess(const char *contentType,
 
 void WebServer::httpSeeOther(const char *otherURL)
 {
-  P(seeOtherMsg) =
-    "HTTP/1.0 303 See Other" CRLF
-    WEBDUINO_SERVER_HEADER
-    "Location: ";
+  P(seeOtherMsg1) = "HTTP/1.0 303 See Other" CRLF;
+  printP(seeOtherMsg1);
+
+#ifndef WEBDUINO_SUPRESS_SERVER_HEADER
+  printP(webServerHeader);
+#endif
 
-  printP(seeOtherMsg);
+  P(seeOtherMsg2) = "Location: ";
+  printP(seeOtherMsg2);
   print(otherURL);
   printCRLF();
   printCRLF();

From 4ee01d3cd37422a5edf74c00c47a4e59ceb1d1ef Mon Sep 17 00:00:00 2001
From: mkldon <mryanzin@gmail.com>
Date: Thu, 10 Apr 2014 16:44:09 +0400
Subject: [PATCH 74/75] Add WEBDUINO_COMMANDS_COUNT macro

Add macro for configuring maximum number of commands that can be defined.
This macro replaces hardcoded "8" number.
---
 WebServer.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index dadc763..6360460 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -53,6 +53,10 @@
 #define WEBDUINO_READ_TIMEOUT_IN_MS 1000
 #endif
 
+#ifndef WEBDUINO_COMMANDS_COUNT
+#define WEBDUINO_COMMANDS_COUNT 8
+#endif
+
 #ifndef WEBDUINO_URL_PATH_COMMAND_LENGTH
 #define WEBDUINO_URL_PATH_COMMAND_LENGTH 8
 #endif
@@ -329,7 +333,7 @@ class WebServer: public Print
   {
     const char *verb;
     Command *cmd;
-  } m_commands[8];
+  } m_commands[WEBDUINO_COMMANDS_COUNT];
   unsigned char m_cmdCount;
   UrlPathCommand *m_urlPathCmd;
 

From a68507ef6d99045fd55b21b4d64df84f3b5422fa Mon Sep 17 00:00:00 2001
From: Matt Robinson <git@nerdoftheherd.com>
Date: Thu, 17 Jul 2014 19:13:58 +0100
Subject: [PATCH 75/75] Fix compiler warnings about narrowing conversion

The latest 1.5.7 beta release of Arduino includes an updated toolchain
which now issues warnings about narrowing of ints to chars inside curly
braces becoming ill-formed in C++11.  Explicitly cast the values to char
to prevent this.
---
 WebServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebServer.h b/WebServer.h
index 6360460..c8c43c3 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -992,7 +992,7 @@ bool WebServer::readPOSTparam(char *name, int nameLen,
       int ch2 = read();
       if (ch1 == -1 || ch2 == -1)
         return false;
-      char hex[3] = { ch1, ch2, 0 };
+      char hex[3] = { (char)ch1, (char)ch2, '\0' };
       ch = strtoul(hex, NULL, 16);
     }