diff --git a/examples/WebRadio/WebRadio.ino b/examples/WebRadio/WebRadio.ino index 06ba8bb..3f83618 100644 --- a/examples/WebRadio/WebRadio.ino +++ b/examples/WebRadio/WebRadio.ino @@ -319,7 +319,7 @@ void loop() if (decoder && decoder->isRunning()) { strcpy_P(status, PSTR("Playing")); // By default we're OK unless the decoder says otherwise if (!decoder->loop()) { - Serial.printf_P(PSTR("Stopping decoder")); + Serial.printf_P(PSTR("Stopping decoder\n")); decoder->stop(); strcpy_P(title, PSTR("Stopped")); } @@ -330,7 +330,8 @@ void loop() char *reqUrl; char *params; WiFiClient client = server.available(); - if (client && WebReadRequest(&client, &reqUrl, ¶ms)) { + char *reqBuff = (char *)alloca(384); + if (client && WebReadRequest(&client, reqBuff, 384, &reqUrl, ¶ms)) { Serial.printf_P(PSTR("URL: '%s'\n"), reqUrl); if (IsIndexHTML(reqUrl)) { HandleIndex(&client); diff --git a/examples/WebRadio/web.cpp b/examples/WebRadio/web.cpp index caf1973..ec79f2d 100644 --- a/examples/WebRadio/web.cpp +++ b/examples/WebRadio/web.cpp @@ -24,8 +24,6 @@ #define LogPrintf(fmt, ...) { Serial.printf_P(PSTR(fmt), ## __VA_ARGS__); } -// Web request line (URL, PARAMs parsed in-line) -static char reqBuff[384]; void WebPrintError(WiFiClient *client, int code) { @@ -155,7 +153,7 @@ void URLDecode(char *ptr) // Parse HTTP request -bool WebReadRequest(WiFiClient *client, char **urlStr, char **paramStr) +bool WebReadRequest(WiFiClient *client, char *reqBuff, int reqBuffLen, char **urlStr, char **paramStr) { static char NUL = 0; // Get around writable strings... @@ -169,7 +167,7 @@ bool WebReadRequest(WiFiClient *client, char **urlStr, char **paramStr) LogPrintf("-WebReadRequest: Timeout @ %d\n", millis()); return false; } - int wlen = client->readBytesUntil('\r', reqBuff, sizeof(reqBuff)-1); + int wlen = client->readBytesUntil('\r', reqBuff, reqBuffLen-1); reqBuff[wlen] = 0; @@ -206,7 +204,7 @@ bool WebReadRequest(WiFiClient *client, char **urlStr, char **paramStr) qp = strchr(url, '?'); if (qp) *qp = 0; // End URL @ ? // In a POST the params are in the body - int sizeleft = sizeof(reqBuff) - strlen(reqBuff) - 1; + int sizeleft = reqBuffLen - strlen(reqBuff) - 1; qp = reqBuff + strlen(reqBuff) + 1; int wlen = client->readBytesUntil('\r', qp, sizeleft-1); qp[wlen] = 0; diff --git a/examples/WebRadio/web.h b/examples/WebRadio/web.h index 49804f4..b0208e8 100644 --- a/examples/WebRadio/web.h +++ b/examples/WebRadio/web.h @@ -41,7 +41,7 @@ void Base64Decode(char *str); // In-place B64 decode void URLDecode(char *ptr); // In-place URL decode // GET/POST parsing -bool WebReadRequest(WiFiClient *client, char **urlStr, char **paramStr); +bool WebReadRequest(WiFiClient *client, char *reqBuff, int reqBuffLen, char **urlStr, char **paramStr); bool ParseParam(char **paramStr, char **name, char **value); // Get next name/parameter from a param string bool IsIndexHTML(const char *url); // Is this meant to be index.html (/, index.htm, etc.)