@@ -912,7 +912,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
912
912
ESP_LOGE (TAG , "bad origin %s" , request -> origin );
913
913
_reply_forbidden (socket , request );
914
914
} else if (memcmp (request -> path , "/fs/" , 4 ) == 0 ) {
915
- if (strcmp (request -> method , "OPTIONS" ) == 0 ) {
915
+ if (strcasecmp (request -> method , "OPTIONS" ) == 0 ) {
916
916
// OPTIONS is sent for CORS preflight, unauthenticated
917
917
_reply_access_control (socket , request );
918
918
} else if (!request -> authenticated ) {
@@ -936,7 +936,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
936
936
}
937
937
// Delete is almost identical for files and directories so share the
938
938
// implementation.
939
- if (strcmp (request -> method , "DELETE" ) == 0 ) {
939
+ if (strcasecmp (request -> method , "DELETE" ) == 0 ) {
940
940
if (_usb_active ()) {
941
941
_reply_conflict (socket , request );
942
942
return false;
@@ -966,7 +966,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
966
966
return true;
967
967
}
968
968
} else if (directory ) {
969
- if (strcmp (request -> method , "GET" ) == 0 ) {
969
+ if (strcasecmp (request -> method , "GET" ) == 0 ) {
970
970
FF_DIR dir ;
971
971
FRESULT res = f_opendir (fs , & dir , path );
972
972
// Put the / back for replies.
@@ -986,7 +986,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
986
986
}
987
987
988
988
f_closedir (& dir );
989
- } else if (strcmp (request -> method , "PUT" ) == 0 ) {
989
+ } else if (strcasecmp (request -> method , "PUT" ) == 0 ) {
990
990
if (_usb_active ()) {
991
991
_reply_conflict (socket , request );
992
992
return false;
@@ -1015,7 +1015,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
1015
1015
}
1016
1016
}
1017
1017
} else { // Dealing with a file.
1018
- if (strcmp (request -> method , "GET" ) == 0 ) {
1018
+ if (strcasecmp (request -> method , "GET" ) == 0 ) {
1019
1019
FIL active_file ;
1020
1020
FRESULT result = f_open (fs , & active_file , path , FA_READ );
1021
1021
@@ -1026,18 +1026,18 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
1026
1026
}
1027
1027
1028
1028
f_close (& active_file );
1029
- } else if (strcmp (request -> method , "PUT" ) == 0 ) {
1029
+ } else if (strcasecmp (request -> method , "PUT" ) == 0 ) {
1030
1030
_write_file_and_reply (socket , request , fs , path );
1031
1031
return true;
1032
1032
}
1033
1033
}
1034
1034
}
1035
1035
} else if (memcmp (request -> path , "/cp/" , 4 ) == 0 ) {
1036
1036
const char * path = request -> path + 3 ;
1037
- if (strcmp (request -> method , "OPTIONS" ) == 0 ) {
1037
+ if (strcasecmp (request -> method , "OPTIONS" ) == 0 ) {
1038
1038
// handle preflight requests to /cp/
1039
1039
_reply_access_control (socket , request );
1040
- } else if (strcmp (request -> method , "GET" ) != 0 ) {
1040
+ } else if (strcasecmp (request -> method , "GET" ) != 0 ) {
1041
1041
_reply_method_not_allowed (socket , request );
1042
1042
} else if (strcmp (path , "/devices.json" ) == 0 ) {
1043
1043
_reply_with_devices_json (socket , request );
@@ -1058,7 +1058,7 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
1058
1058
} else {
1059
1059
_reply_missing (socket , request );
1060
1060
}
1061
- } else if (strcmp (request -> method , "GET" ) != 0 ) {
1061
+ } else if (strcasecmp (request -> method , "GET" ) != 0 ) {
1062
1062
_reply_method_not_allowed (socket , request );
1063
1063
} else {
1064
1064
if (strcmp (request -> path , "/" ) == 0 ) {
@@ -1175,27 +1175,27 @@ static void _process_request(socketpool_socket_obj_t *socket, _request *request)
1175
1175
request -> header_value [request -> offset - 1 ] = '\0' ;
1176
1176
request -> offset = 0 ;
1177
1177
request -> state = STATE_HEADER_KEY ;
1178
- if (strcmp (request -> header_key , "Authorization" ) == 0 ) {
1178
+ if (strcasecmp (request -> header_key , "Authorization" ) == 0 ) {
1179
1179
const char * prefix = "Basic " ;
1180
1180
request -> authenticated = memcmp (request -> header_value , prefix , strlen (prefix )) == 0 &&
1181
1181
strcmp (_api_password , request -> header_value + strlen (prefix )) == 0 ;
1182
- } else if (strcmp (request -> header_key , "Host" ) == 0 ) {
1182
+ } else if (strcasecmp (request -> header_key , "Host" ) == 0 ) {
1183
1183
request -> redirect = strcmp (request -> header_value , "circuitpython.local" ) == 0 ;
1184
- } else if (strcmp (request -> header_key , "Content-Length" ) == 0 ) {
1184
+ } else if (strcasecmp (request -> header_key , "Content-Length" ) == 0 ) {
1185
1185
request -> content_length = strtoul (request -> header_value , NULL , 10 );
1186
- } else if (strcmp (request -> header_key , "Expect" ) == 0 ) {
1186
+ } else if (strcasecmp (request -> header_key , "Expect" ) == 0 ) {
1187
1187
request -> expect = strcmp (request -> header_value , "100-continue" ) == 0 ;
1188
- } else if (strcmp (request -> header_key , "Accept" ) == 0 ) {
1189
- request -> json = strcmp (request -> header_value , "application/json" ) == 0 ;
1190
- } else if (strcmp (request -> header_key , "Origin" ) == 0 ) {
1188
+ } else if (strcasecmp (request -> header_key , "Accept" ) == 0 ) {
1189
+ request -> json = strcasecmp (request -> header_value , "application/json" ) == 0 ;
1190
+ } else if (strcasecmp (request -> header_key , "Origin" ) == 0 ) {
1191
1191
strcpy (request -> origin , request -> header_value );
1192
- } else if (strcmp (request -> header_key , "X-Timestamp" ) == 0 ) {
1192
+ } else if (strcasecmp (request -> header_key , "X-Timestamp" ) == 0 ) {
1193
1193
request -> timestamp_ms = strtoull (request -> header_value , NULL , 10 );
1194
- } else if (strcmp (request -> header_key , "Upgrade" ) == 0 ) {
1194
+ } else if (strcasecmp (request -> header_key , "Upgrade" ) == 0 ) {
1195
1195
request -> websocket = strcmp (request -> header_value , "websocket" ) == 0 ;
1196
- } else if (strcmp (request -> header_key , "Sec-WebSocket-Version" ) == 0 ) {
1196
+ } else if (strcasecmp (request -> header_key , "Sec-WebSocket-Version" ) == 0 ) {
1197
1197
request -> websocket_version = strtoul (request -> header_value , NULL , 10 );
1198
- } else if (strcmp (request -> header_key , "Sec-WebSocket-Key" ) == 0 &&
1198
+ } else if (strcasecmp (request -> header_key , "Sec-WebSocket-Key" ) == 0 &&
1199
1199
strlen (request -> header_value ) == 24 ) {
1200
1200
strcpy (request -> websocket_key , request -> header_value );
1201
1201
}
0 commit comments