@@ -33,6 +33,10 @@

 #define ALIVETIMEOUT 15

 #define MAXETAGSIZE 127

+#define HEXNIBBLE2BIN(a) (((a)>='0' && (a)<='9')?(a)-'0':((a)>='a' && (a)<='f')?(a)-'a'+10:((a)>='A' && (a)<='F')?(a)-'A'+10:0)

+#define ISHEXNIBBLE(a) ((((a)>='0' && (a)<='9')||((a)>='a' && (a)<='f')||((a)>='A' && (a)<='F'))?1:0)

+

+

 typedef struct wk_post {

         char *name;

         char *value;

@@ -916,6 +920,28 @@ mime_getdefault(const char *filename, const char *defaultmime)

         return(defaultmime);

 }

+int

+uri_urldecode(char *s)

+{

+        int i,o;

+        int a,b,n;

+        for(i=0,o=0;s[i]!='\0';i++,o++) {

+                if(s[i]=='+')

+                        s[o]=' ';

+                else if(s[i]=='%' && (a=s[i+1])!='\0' && (b=s[i+2])!='\0' && ISHEXNIBBLE(a) && ISHEXNIBBLE(b)) {

+                        n=(HEXNIBBLE2BIN(a)<<4)|HEXNIBBLE2BIN(b);

+                        s[o]=128|64|(n>>6);

+                        s[o+1]=128|(n&0x3f);

+                        i+=2;

+                        o++;

+                } else

+                        s[o]=s[i];

+        }

+        s[o]='\0';

+        return(0);

+}

+

+

 int

 wk_sbufacquire(wk *paramweb)

 {

@@ -73,7 +73,7 @@ int wk_post_addvalid(wk *web, int connid, char *varname, char *tofile);

 char *wk_post_get(wk *web, int connid, char *varname, int *isfile);

 const char *mime_getdefault(const char *filename, const char *defaultmime);

-

+int uri_urldecode(char *component); /* simple decoder for url-encoded strings. In-place substitution, outputs UTF-8 data */

 int wk_sbufacquire(wk *web);

 sbuf *wk_sbufget(wk *web, int sbufid);