Merge branch 'main' of https://github.com/openshwprojects/OpenBK7231T_App

src/httpserver/new_http.c

@@ -604,6 +604,7 @@ int HTTP_ProcessPacket(http_request_t* request) {
 		ADDLOGF_ERROR("You gave request with NULL input");
 		return 0;
 	}
+	request->method = -1;
 	recvbuf = request->received;
 	for (i = 0; i < sizeof(methodNames) / sizeof(*methodNames); i++) {
 		if (http_startsWith(recvbuf, methodNames[i])) {

src/logging/logging.c

@@ -426,6 +426,10 @@ static int getData(char* buff, int buffsize, int* tail) {
 	if (!initialised)
 		return 0;
 	taken = xSemaphoreTake(logMemory.mutex, 100);
+	if (taken == 0)
+	{
+		return 0;
+	}
 
 	count = 0;
 	p = buff;