neale
/
eris
mirror of https://github.com/nealey/eris.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply most Debian patches

This commit is contained in:
Neale Pickett 2012-02-13 20:41:08 -07:00
parent 273f348fa8
commit 5602b42135
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fnord.c
View File

@ -84,10 +84,6 @@
* equal sign ('='), fnord will throw away the URI part. */ * equal sign ('='), fnord will throw away the URI part. */
#define REDIRECT #define REDIRECT
/* uncomment the following line to make fnord tarpit queries from
* EmailSiphon (an email harvester for spammers) */
#define TARPIT
/* uncomment the following line to make fnord chroot to the current /* uncomment the following line to make fnord chroot to the current
* working directory and drop privileges */ * working directory and drop privileges */
#define CHROOT #define CHROOT
@ -677,6 +673,7 @@ static char* header(char* buf,int buflen,const char* hname) {
break; break;
} }
} }
while (*c==' ' || *c=='\t') ++c;
return c; return c;
} }
} }
@ -720,6 +717,7 @@ static struct mimeentry { const char* name, *type; } mimetab[] = {
{ "xbm", "image/x-xbitmap" }, { "xbm", "image/x-xbitmap" },
{ "xpm", "image/x-xpixmap" }, { "xpm", "image/x-xpixmap" },
{ "xwd", "image/x-xwindowdump" }, { "xwd", "image/x-xwindowdump" },
{ "ico", "image/x-icon" },
{ 0 } }; { 0 } };
/* try to find out MIME type and content encoding. /* try to find out MIME type and content encoding.
@ -1030,7 +1028,7 @@ bad:
} }
static void redirectboilerplate() { static void redirectboilerplate() {
buffer_puts(buffer_1,"HTTP/1.0 301 Go Away\r\nConnection: close\r\nLocation: "); buffer_puts(buffer_1,"HTTP/1.0 301 Go Away\r\nConnection: close\r\nContent-Length: 0\r\nLocation: ");
} }
static void handleredirect(const char *url,const char* origurl) { static void handleredirect(const char *url,const char* origurl) {
@ -1512,9 +1510,9 @@ handlenext:
{ {
char *tmp; char *tmp;
if ((tmp=header(buf,len,"User-Agent"))) ua=tmp; ua=header(buf,len,"User-Agent");
if ((tmp=header(buf,len,"Referer"))) refer=tmp; refer=header(buf,len,"Referer");
if ((tmp=header(buf,len,"Accept-Encoding"))) accept_enc=tmp; accept_enc=header(buf,len,"Accept-Encoding");
#ifdef KEEPALIVE #ifdef KEEPALIVE
if ((tmp=header(buf,len,"Connection"))) { /* see if it's "keep-alive" or "close" */ if ((tmp=header(buf,len,"Connection"))) { /* see if it's "keep-alive" or "close" */
if (!strcasecmp(tmp,"keep-alive")) if (!strcasecmp(tmp,"keep-alive"))
@ -1524,13 +1522,13 @@ handlenext:
} }
#endif #endif
#ifdef CGI #ifdef CGI
if ((tmp=header(buf,len,"Cookie"))) cookie=tmp; cookie=header(buf,len,"Cookie");
if ((tmp=header(buf,len,"Authorization"))) auth_type=tmp; auth_type=header(buf,len,"Authorization");
if (method==POST) { if (method==POST) {
if ((tmp=header(buf,len,"Content-Type"))) content_type=tmp; content_type=header(buf,len,"Content-Type");
if ((tmp=header(buf,len,"Content-Length"))) content_len=tmp; content_len=header(buf,len,"Content-Length");
if (tmp) { if (content_len) {
scan_ulong(tmp,&post_len); scan_ulong(content_len,&post_len);
post_miss=buf+len+1; post_miss=buf+len+1;
post_mlen=in-len-1; post_mlen=in-len-1;
if (post_len<=post_mlen) post_mlen=post_len; if (post_len<=post_mlen) post_mlen=post_len;
@ -1539,10 +1537,6 @@ handlenext:
#endif #endif
} }
#ifdef TARPIT
if (str_equal(ua,"EmailSiphon")) { sleep(120); exit(0); }
#endif
port=getenv("TCPLOCALPORT"); port=getenv("TCPLOCALPORT");
if (!port) port="80"; if (!port) port="80";
{ {