mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-06 06:39:46 +00:00
Fixed bug #52279: httpd.c http_init_file() miss uri
This commit is contained in:
parent
b296d2c7bb
commit
0f685e4fb5
@ -1598,8 +1598,7 @@ http_send(struct altcp_pcb *pcb, struct http_state *hs)
|
|||||||
static err_t
|
static err_t
|
||||||
http_find_error_file(struct http_state *hs, u16_t error_nr)
|
http_find_error_file(struct http_state *hs, u16_t error_nr)
|
||||||
{
|
{
|
||||||
const char *uri1, *uri2, *uri3;
|
const char *uri, *uri1, *uri2, *uri3;
|
||||||
err_t err;
|
|
||||||
|
|
||||||
if (error_nr == 501) {
|
if (error_nr == 501) {
|
||||||
uri1 = "/501.html";
|
uri1 = "/501.html";
|
||||||
@ -1611,19 +1610,18 @@ http_find_error_file(struct http_state *hs, u16_t error_nr)
|
|||||||
uri2 = "/400.htm";
|
uri2 = "/400.htm";
|
||||||
uri3 = "/400.shtml";
|
uri3 = "/400.shtml";
|
||||||
}
|
}
|
||||||
err = fs_open(&hs->file_handle, uri1);
|
if (fs_open(&hs->file_handle, uri1) == ERR_OK) {
|
||||||
if (err != ERR_OK) {
|
uri = uri1;
|
||||||
err = fs_open(&hs->file_handle, uri2);
|
} else if (fs_open(&hs->file_handle, uri2) == ERR_OK) {
|
||||||
if (err != ERR_OK) {
|
uri = uri2;
|
||||||
err = fs_open(&hs->file_handle, uri3);
|
} else if (fs_open(&hs->file_handle, uri3) == ERR_OK) {
|
||||||
if (err != ERR_OK) {
|
uri = uri2;
|
||||||
|
} else {
|
||||||
LWIP_DEBUGF(HTTPD_DEBUG, ("Error page for error %"U16_F" not found\n",
|
LWIP_DEBUGF(HTTPD_DEBUG, ("Error page for error %"U16_F" not found\n",
|
||||||
error_nr));
|
error_nr));
|
||||||
return ERR_ARG;
|
return ERR_ARG;
|
||||||
}
|
}
|
||||||
}
|
return http_init_file(hs, &hs->file_handle, 0, uri, 0, NULL);
|
||||||
}
|
|
||||||
return http_init_file(hs, &hs->file_handle, 0, NULL, 0, NULL);
|
|
||||||
}
|
}
|
||||||
#else /* LWIP_HTTPD_SUPPORT_EXTSTATUS */
|
#else /* LWIP_HTTPD_SUPPORT_EXTSTATUS */
|
||||||
#define http_find_error_file(hs, error_nr) ERR_ARG
|
#define http_find_error_file(hs, error_nr) ERR_ARG
|
||||||
|
Loading…
Reference in New Issue
Block a user