From 7b0ca91b2660fa9becb299ab674e9f681793a81a Mon Sep 17 00:00:00 2001
From: pvvx <pvvx@mail.ru>
Date: Sun, 7 May 2017 17:51:51 +0300
Subject: [PATCH] update

---
 WEBFiles/protect/scan.htm    | 2 +-
 WEBFiles/protect/timeout.htm | 6 +++---
 WEBFiles/protect/wifi.htm    | 2 +-
 WEBFiles/protect2/debug.htm  | 2 +-
 project/src/web/web_srv.c    | 2 ++
 5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/WEBFiles/protect/scan.htm b/WEBFiles/protect/scan.htm
index b6a903a..59bd5eb 100644
--- a/WEBFiles/protect/scan.htm
+++ b/WEBFiles/protect/scan.htm
@@ -14,7 +14,7 @@
 		<table id="aps" class="scan">
 			<tr><th>SSID</th><th>BSSID</th><th>Auth</th><th>Ch</th><th>RSSI</th><th>Hd</th></tr>
 		</table>
-		<form id="stform" style="display: none" method='post' action='/timeout.htm'>
+		<form id="stform" style="display: none" method='post' action='timeout.htm'>
 			<table class="form">
 				<tr>
 					<td class="label">Select or input SSID:<input type='hidden' name='wifi_rdcfg' value='0x1C00'></td>
diff --git a/WEBFiles/protect/timeout.htm b/WEBFiles/protect/timeout.htm
index e0e8588..439b0f5 100644
--- a/WEBFiles/protect/timeout.htm
+++ b/WEBFiles/protect/timeout.htm
@@ -2,14 +2,14 @@
 <html><head>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<title>RTL871X WIFI</title>
-	<link rel="stylesheet" href="style.css">
-	<script src="scripts.js"></script>
+	<link rel="stylesheet" href="/style.css">
+	<script src="/scripts.js"></script>
 </head><body onload="reloadTimer.reload(10)">
 	<h3 class="top">RTL871X Built-in Web server <sup>&copy;</sup></h3>
 	<div class="content">
 		<h3>Timeout <span id='timer'>?</span> sec...</h3>
 		* Redirect: <a href='http://~sys_url~/'>http://~sys_url~/</a> *<br><br>
-		<a href='index.htm'>Main</a>
+		<a href='/index.htm'>Main</a>
 	</div>
 ~inc:footer.inc~
 </body>
diff --git a/WEBFiles/protect/wifi.htm b/WEBFiles/protect/wifi.htm
index cd8aa8f..e40d291 100644
--- a/WEBFiles/protect/wifi.htm
+++ b/WEBFiles/protect/wifi.htm
@@ -7,7 +7,7 @@
 </head><body>
 	~inc:menu.inc~
 	<div class="content">
-		<form method='post' action='/timeout.htm'>
+		<form method='post' action='timeout.htm'>
 		<table class="form">
 			<tr>
 				<td colspan="2"><h2 class="title">WiFi SoftAP</h2></td>
diff --git a/WEBFiles/protect2/debug.htm b/WEBFiles/protect2/debug.htm
index 21c1e35..ddb5de3 100644
--- a/WEBFiles/protect2/debug.htm
+++ b/WEBFiles/protect2/debug.htm
@@ -9,7 +9,7 @@
 <h2 class="title">Debug and Tests</h2>
 <p class="center">
 Chart <a href="/heap.htm">'heap'</a>, <a href="/tst.htm">ST-AP RSSI</a><br><br>
-<a href='/timeout.htm?sys_restart=12345'>System Restart</a><br><br>
+<a href='/protect/timeout.htm?sys_restart=12345'>System Restart</a><br><br>
 Counter erase the last flash sector config: ~sys_rdec0x980FE000~<br><br>
 </p>
 </div>
diff --git a/project/src/web/web_srv.c b/project/src/web/web_srv.c
index 53b8ca9..7dab6f5 100644
--- a/project/src/web/web_srv.c
+++ b/project/src/web/web_srv.c
@@ -2004,6 +2004,7 @@ void qfnk_task(void)
 #if DEBUGSOO > 2
 				os_printf("qfn: %p(%p)\n", qfn.fnk, qfn.param);
 #endif
+				vTaskDelay(200); // Timeout + WDT
 				qfn.fnk(qfn.param);
 			}
 //			else {
@@ -2081,6 +2082,7 @@ err_t ICACHE_FLASH_ATTR webserver_close(uint16 portn)
 	if(xQueueWebSrv) {
 		WEB_SRV_QFNK qfn;
 		qfn.fnk = vTaskDelete;
+		qfn.fnk = NULL;
 		qfn.param = NULL;
 		if(xQueueSendToBack(xQueueWebSrv, &qfn, 1000) == pdPASS) {
 			while(uxQueueMessagesWaiting(xQueueWebSrv)) {
