[Feature][ZXW-33]merge ZXW 0428 version

Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/app/goahead/server/cgi.c b/ap/app/goahead/server/cgi.c
index c9286c6..7742a7b 100755
--- a/ap/app/goahead/server/cgi.c
+++ b/ap/app/goahead/server/cgi.c
@@ -210,7 +210,7 @@
 
 	if (wp->flags & WEBS_CGI_HTTPSHARE_UPLOAD)
 	{
-		printf("[httpshare]call zte_process_cgi_end.\n");
+		printf("[httpshare]call process_cgi_end.\n");
 		return zte_process_cgi_end(wp);
 	}else if(wp->flags & WEBS_CGI_UPLOAD)
 	{
diff --git a/ap/app/goahead/server/webs.c b/ap/app/goahead/server/webs.c
index b0238e1..00ba24c 100755
--- a/ap/app/goahead/server/webs.c
+++ b/ap/app/goahead/server/webs.c
@@ -433,7 +433,7 @@
             //Add By liuyingnan for XML COMM API START
             if(wp->flags & WEBS_XML_CLIENT_REQUEST)
             {
-                slog(MISC_PRINT,SLOG_DEBUG,"[websReadEvent]:zte_change_wp_query function:%s\n",websRecvHttpBuffer_XML);
+                slog(MISC_PRINT,SLOG_DEBUG,"[websReadEvent]:change_wp_query function:%s\n",websRecvHttpBuffer_XML);
                 //zte_change_wp_query(wp,websRecvHttpBuffer_Json);
                 zte_change_wp_query(wp,websRecvHttpBuffer_XML);
                 memset(websRecvHttpBuffer_XML,0,HTTP_BUFFER_SIZE);
@@ -2274,7 +2274,7 @@
             (void)zte_web_write(NV_LOGINFO,"timeout");
 			(void)zte_web_write(NV_COOKIE_ID, "");
             (void)zte_web_write(NV_USER_LOGIN_TIMEMARK,"0");
-            slog(MISC_PRINT,SLOG_ERR,"zte_mgmt_login_timemark_check: the login is timeout .\n");
+            slog(MISC_PRINT,SLOG_ERR,"mgmt_login_timemark_check: the login is timeout .\n");
         }
         else
         {