Merge branch 'stable'

1 files changed, 4 insertions, 2 deletions

diff --git a/html.c b/html.c
index d7d9fd7..66ba65d 100644
--- a/html.c
+++ b/html.c
@@ -91,56 +91,58 @@ void html_ntxt(int len, char *txt)
 		int c = *t;
 		if (c=='<' || c=='>' || c=='&') {
 			write(htmlfd, txt, t - txt);
 			if (c=='>')
 				html("&gt;");
 			else if (c=='<')
 				html("&lt;");
 			else if (c=='&')
 				html("&amp;");
 			txt = t+1;
 		}
 		t++;
 	}
 	if (t!=txt)
 		write(htmlfd, txt, t - txt);
 	if (len<0)
 		html("...");
 }
 
 void html_attr(char *txt)
 {
 	char *t = txt;
 	while(t && *t){
 		int c = *t;
-		if (c=='<' || c=='>' || c=='\'') {
+		if (c=='<' || c=='>' || c=='\'' || c=='\"') {
 			write(htmlfd, txt, t - txt);
 			if (c=='>')
 				html("&gt;");
 			else if (c=='<')
 				html("&lt;");
 			else if (c=='\'')
-				html("&quote;");
+				html("&#x27;");
+			else if (c=='"')
+				html("&quot;");
 			txt = t+1;
 		}
 		t++;
 	}
 	if (t!=txt)
 		html(txt);
 }
 
 void html_url_path(char *txt)
 {
 	char *t = txt;
 	while(t && *t){
 		int c = *t;
 		if (c=='"' || c=='#' || c=='\'' || c=='?') {
 			write(htmlfd, txt, t - txt);
 			write(htmlfd, fmt("%%%2x", c), 3);
 			txt = t+1;
 		}
 		t++;
 	}
 	if (t!=txt)
 		html(txt);
 }