1 files changed, 6 insertions, 4 deletions

diff --git a/html.c b/html.c
index a60bc13..6f31097 100644
--- a/html.c
+++ b/html.c
@@ -13,17 +13,17 @@
 #include <string.h>
 #include <errno.h>
 
 /* Percent-encoding of each character, except: a-zA-Z0-9!$()*,./:;@- */
 static const char* url_escape_table[256] = {
         "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09",
         "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13",
         "%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d",
-        "%1e", "%1f", "+", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
+        "%1e", "%1f", "%20", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
         "%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d",
         "%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%7b",
         "%7c", "%7d", 0, "%7f", "%80", "%81", "%82", "%83", "%84", "%85",
         "%86", "%87", "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f",
         "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99",
         "%9a", "%9b", "%9c", "%9d", "%9e", "%9f", "%a0", "%a1", "%a2", "%a3",
@@ -157,36 +157,38 @@ void html_attr(const char *txt)
 }
 
 void html_url_path(const char *txt)
 {
         const char *t = txt;
         while(t && *t){
                 int c = *t;
                 const char *e = url_escape_table[c];
-                if (e && c!='+' && c!='&' && c!='+') {
+                if (e && c!='+' && c!='&') {
                         html_raw(txt, t - txt);
-                        html_raw(e, 3);
+                        html(e);
                         txt = t+1;
                 }
                 t++;
         }
         if (t!=txt)
                 html(txt);
 }
 
 void html_url_arg(const char *txt)
 {
         const char *t = txt;
         while(t && *t){
                 int c = *t;
                 const char *e = url_escape_table[c];
+                if (c == ' ')
+                        e = "+";
                 if (e) {
                         html_raw(txt, t - txt);
-                        html_raw(e, strlen(e));
+                        html(e);
                         txt = t+1;
                 }
                 t++;
         }
         if (t!=txt)
                 html(txt);
 }