Fixed config parsing bug.

[ashd.git] / lib / resp.c

diff --git a/lib/resp.c b/lib/resp.c
index b6c91ae..9d7325b 100644 (file)
--- a/lib/resp.c
+++ b/lib/resp.c
@@ -17,6 +17,7 @@
 */
 
 #include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -73,16 +74,57 @@ void simpleerror(int fd, int code, char *msg, char *fmt, ...)
     bufcatstr(buf, "</body>\r\n");
     bufcatstr(buf, "</html>\r\n");
     free(tmp2);
-    out = fdopen(fd, "w");
-    fprintf(out, "HTTP/1.1 %i %s\r\n", code, msg);
-    fprintf(out, "Content-Type: text/html\r\n");
-    fprintf(out, "Content-Length: %i\r\n", buf.d);
-    fprintf(out, "\r\n");
+    out = fdopen(dup(fd), "w");
+    fprintf(out, "HTTP/1.1 %i %s\n", code, msg);
+    fprintf(out, "Content-Type: text/html\n");
+    fprintf(out, "Content-Length: %zi\n", buf.d);
+    fprintf(out, "\n");
     fwrite(buf.b, 1, buf.d, out);
     fclose(out);
     buffree(buf);
 }
 
+void stdredir(struct hthead *req, int fd, int code, char *dst)
+{
+    FILE *out;
+    char *sp, *cp, *ep, *path, *url, *adst, *proto, *host;
+    
+    sp = strchr(dst, '/');
+    cp = strchr(dst, ':');
+    if(cp && (!sp || (cp < sp))) {
+       adst = sstrdup(dst);
+    } else {
+       proto = getheader(req, "X-Ash-Protocol");
+       host = getheader(req, "Host");
+       if((proto == NULL) || (host == NULL)) {
+           /* Not compliant, but there isn't a whole lot to be done
+            * about it. */
+           adst = sstrdup(dst);
+       } else {
+           if(*dst == '/') {
+               path = sstrdup(dst + 1);
+           } else {
+               if((*(url = req->url)) == '/')
+                   url++;
+               if((ep = strrchr(url, '/')) != NULL)
+                   ep++;
+               else
+                   ep = url;
+               path = sprintf2("%.*s%s", ep - url, url, dst);
+           }
+           adst = sprintf2("%s://%s/%s", proto, host, path);
+           free(path);
+       }
+    }
+    out = fdopen(dup(fd), "w");
+    fprintf(out, "HTTP/1.1 %i Redirection\n", code);
+    fprintf(out, "Content-Length: 0\n");
+    fprintf(out, "Location: %s\n", adst);
+    fprintf(out, "\n");
+    fclose(out);
+    free(adst);
+}
+
 char *fmthttpdate(time_t time)
 {
     /* I avoid using strftime, since it depends on locale settings. */