#include <sys/un.h>
#include <netinet/in.h>
#include <netdb.h>
-#include <sys/signal.h>
+#include <signal.h>
#include <errno.h>
#ifdef HAVE_CONFIG_H
#endif
#include <utils.h>
#include <req.h>
+#include <resp.h>
#include <log.h>
#include <mt.h>
#include <mtio.h>
}
}
-static char *defstatus(int code)
-{
- if(code == 200)
- return("OK");
- else if(code == 201)
- return("Created");
- else if(code == 202)
- return("Accepted");
- else if(code == 204)
- return("No Content");
- else if(code == 300)
- return("Multiple Choices");
- else if(code == 301)
- return("Moved Permanently");
- else if(code == 302)
- return("Found");
- else if(code == 303)
- return("See Other");
- else if(code == 304)
- return("Not Modified");
- else if(code == 307)
- return("Moved Temporarily");
- else if(code == 400)
- return("Bad Request");
- else if(code == 401)
- return("Unauthorized");
- else if(code == 403)
- return("Forbidden");
- else if(code == 404)
- return("Not Found");
- else if(code == 500)
- return("Internal Server Error");
- else if(code == 501)
- return("Not Implemented");
- else if(code == 503)
- return("Service Unavailable");
- else
- return("Unknown status");
-}
-
static struct hthead *parseresp(FILE *in)
{
struct hthead *resp;
resp->msg = sstrdup(p);
} else {
resp->code = atoi(st);
- resp->msg = sstrdup(defstatus(resp->code));
+ resp->msg = sstrdup(httpdefstatus(resp->code));
}
headrmheader(resp, "Status");
} else if(getheader(resp, "Location")) {
return(0);
}
-#define fgetc2(f) ({int __c__ = fgetc(f); if(__c__ == EOF) return(-1); __c__;})
-
static int recvrec(FILE *in, int *type, int *rid, char **data, size_t *dlen)
{
- int b1, b2, pl;
+ unsigned char header[8];
+ int tl;
- if(fgetc2(in) != 1)
+ if(fread(header, 1, 8, in) != 8)
+ return(-1);
+ if(header[0] != 1)
return(-1);
- *type = fgetc2(in);
- b1 = fgetc2(in);
- b2 = fgetc2(in);
- *rid = (b1 << 8) | b2;
- b1 = fgetc2(in);
- b2 = fgetc2(in);
- *dlen = (b1 << 8) | b2;
- pl = fgetc2(in);
- if(fgetc2(in) != 0)
+ *type = header[1];
+ *rid = (header[2] << 8) | header[3];
+ *dlen = (header[4] << 8) | header[5];
+ tl = *dlen + header[6];
+ if(header[7] != 0)
return(-1);
- *data = smalloc(max(*dlen, 1));
- if(fread(*data, 1, *dlen, in) != *dlen) {
+ *data = smalloc(max(tl, 1));
+ if(fread(*data, 1, tl, in) != tl) {
free(*data);
return(-1);
}
- for(; pl > 0; pl--) {
- if(fgetc(in) == EOF) {
- free(*data);
- return(-1);
- }
- }
return(0);
}
return(sendrec(out, FCGI_BEGIN_REQUEST, rid, rec, 8));
}
-static void mtiopipe(FILE **read, FILE **write)
-{
- int fds[2];
-
- pipe(fds);
- *read = mtstdopen(fds[0], 0, 600, "r");
- *write = mtstdopen(fds[1], 0, 600, "w");
-}
-
static void outplex(struct muth *muth, va_list args)
{
vavar(FILE *, sk);