@@ -208,62 +208,62 @@ void HTTPServer::requestAuthentication(HTTPAuthMethod mode, const char* realm, c
208
208
}
209
209
210
210
RequestHandler& HTTPServer::on (const Uri &uri, HTTPServer::THandlerFunction handler) {
211
- return on (uri, HTTP_ANY, handler);
211
+ return on (uri, HTTP_ANY, handler);
212
212
}
213
213
214
214
RequestHandler& HTTPServer::on (const Uri &uri, HTTPMethod method, HTTPServer::THandlerFunction fn) {
215
- return on (uri, method, fn, _fileUploadHandler);
215
+ return on (uri, method, fn, _fileUploadHandler);
216
216
}
217
217
218
218
RequestHandler& HTTPServer::on (const Uri &uri, HTTPMethod method, HTTPServer::THandlerFunction fn, HTTPServer::THandlerFunction ufn) {
219
- FunctionRequestHandler *handler = new FunctionRequestHandler (fn, ufn, uri, method);
220
- _addRequestHandler (handler);
221
- return *handler;
219
+ FunctionRequestHandler *handler = new FunctionRequestHandler (fn, ufn, uri, method);
220
+ _addRequestHandler (handler);
221
+ return *handler;
222
222
}
223
223
224
224
bool HTTPServer::removeRoute (const char *uri) {
225
- return removeRoute (String (uri), HTTP_ANY);
225
+ return removeRoute (String (uri), HTTP_ANY);
226
226
}
227
227
228
228
bool HTTPServer::removeRoute (const char *uri, HTTPMethod method) {
229
- return removeRoute (String (uri), method);
229
+ return removeRoute (String (uri), method);
230
230
}
231
231
232
232
bool HTTPServer::removeRoute (const String &uri) {
233
- return removeRoute (uri, HTTP_ANY);
233
+ return removeRoute (uri, HTTP_ANY);
234
234
}
235
235
236
236
bool HTTPServer::removeRoute (const String &uri, HTTPMethod method) {
237
- bool anyHandlerRemoved = false ;
238
- RequestHandler *handler = _firstHandler;
239
- RequestHandler *previousHandler = nullptr ;
240
-
241
- while (handler) {
242
- if (handler->canHandle (method, uri)) {
243
- if (_removeRequestHandler (handler)) {
244
- anyHandlerRemoved = true ;
245
- // Move to the next handler
246
- if (previousHandler) {
247
- handler = previousHandler->next ();
248
- } else {
249
- handler = _firstHandler;
237
+ bool anyHandlerRemoved = false ;
238
+ RequestHandler *handler = _firstHandler;
239
+ RequestHandler *previousHandler = nullptr ;
240
+
241
+ while (handler) {
242
+ if (handler->canHandle (method, uri)) {
243
+ if (_removeRequestHandler (handler)) {
244
+ anyHandlerRemoved = true ;
245
+ // Move to the next handler
246
+ if (previousHandler) {
247
+ handler = previousHandler->next ();
248
+ } else {
249
+ handler = _firstHandler;
250
+ }
251
+ continue ;
252
+ }
250
253
}
251
- continue ;
252
- }
254
+ previousHandler = handler ;
255
+ handler = handler-> next ();
253
256
}
254
- previousHandler = handler;
255
- handler = handler->next ();
256
- }
257
257
258
- return anyHandlerRemoved;
258
+ return anyHandlerRemoved;
259
259
}
260
260
261
261
void HTTPServer::addHandler (RequestHandler* handler) {
262
262
_addRequestHandler (handler);
263
263
}
264
264
265
265
bool HTTPServer::removeHandler (RequestHandler *handler) {
266
- return _removeRequestHandler (handler);
266
+ return _removeRequestHandler (handler);
267
267
}
268
268
269
269
void HTTPServer::_addRequestHandler (RequestHandler* handler) {
@@ -277,29 +277,29 @@ void HTTPServer::_addRequestHandler(RequestHandler* handler) {
277
277
}
278
278
279
279
bool HTTPServer::_removeRequestHandler (RequestHandler *handler) {
280
- RequestHandler *current = _firstHandler;
281
- RequestHandler *previous = nullptr ;
282
-
283
- while (current != nullptr ) {
284
- if (current == handler) {
285
- if (previous == nullptr ) {
286
- _firstHandler = current->next ();
287
- } else {
288
- previous->next (current->next ());
289
- }
290
-
291
- if (current == _lastHandler) {
292
- _lastHandler = previous;
293
- }
294
-
295
- // Delete 'matching' handler
296
- delete current;
297
- return true ;
298
- }
299
- previous = current;
300
- current = current->next ();
301
- }
302
- return false ;
280
+ RequestHandler *current = _firstHandler;
281
+ RequestHandler *previous = nullptr ;
282
+
283
+ while (current != nullptr ) {
284
+ if (current == handler) {
285
+ if (previous == nullptr ) {
286
+ _firstHandler = current->next ();
287
+ } else {
288
+ previous->next (current->next ());
289
+ }
290
+
291
+ if (current == _lastHandler) {
292
+ _lastHandler = previous;
293
+ }
294
+
295
+ // Delete 'matching' handler
296
+ delete current;
297
+ return true ;
298
+ }
299
+ previous = current;
300
+ current = current->next ();
301
+ }
302
+ return false ;
303
303
}
304
304
305
305
void HTTPServer::serveStatic (const char * uri, FS& fs, const char * path, const char * cache_header) {
0 commit comments