diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2006-12-15 08:38:17 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2006-12-15 08:38:17 +0000 |
| commit | 1f9fc6e88c28ef3ee3bd57991b0281480a717aeb (patch) | |
| tree | e5bc432c9717ab10ad40e2ea3743f95249d0b492 /www/fhttpd/files | |
| parent | - Update to 0.16 (diff) | |
- Fix gcc 4.X build
PR: ports/106737
Submitted by: trasz
Diffstat (limited to 'www/fhttpd/files')
| -rw-r--r-- | www/fhttpd/files/patch-ae | 17 | ||||
| -rw-r--r-- | www/fhttpd/files/patch-fhttpd.h | 13 |
2 files changed, 26 insertions, 4 deletions
diff --git a/www/fhttpd/files/patch-ae b/www/fhttpd/files/patch-ae index 638f7ecc7971..d02ffd02651f 100644 --- a/www/fhttpd/files/patch-ae +++ b/www/fhttpd/files/patch-ae @@ -1,5 +1,5 @@ ---- sockobj.cc.orig Sat May 15 07:13:54 1999 -+++ sockobj.cc Thu Jul 13 18:50:19 2000 +--- sockobj.cc.orig Sat May 15 13:13:54 1999 ++++ sockobj.cc Fri Dec 15 00:37:45 2006 @@ -53,6 +53,7 @@ #include <stdarg.h> #include <errno.h> @@ -8,7 +8,16 @@ #include <sys/socket.h> #include <sys/un.h> #include <netinet/in.h> -@@ -645,7 +646,7 @@ +@@ -93,6 +94,8 @@ + extern int errno; + #endif + ++void cleanupserverdriver(SIGARGS); ++ + /**************************************** + *** common daemon global variables + ****************************************/ +@@ -645,7 +648,7 @@ global_nconnections++; if(xsocket->status==0){ hisaddresslength=128; @@ -17,7 +26,7 @@ if(h<0) return; hisaddress=(struct sockaddr*)malloc(hisaddresslength); if(hisaddress) memcpy(hisaddress,s,hisaddresslength); else{ -@@ -1861,7 +1862,7 @@ +@@ -1861,7 +1864,7 @@ if(fdarray[sockets[i]->handleindexforwheel].revents&POLLIN){ fdarray[sockets[i]->handleindexforwheel].revents&=~POLLIN; hisaddresslength=128; diff --git a/www/fhttpd/files/patch-fhttpd.h b/www/fhttpd/files/patch-fhttpd.h new file mode 100644 index 000000000000..b36c63d04936 --- /dev/null +++ b/www/fhttpd/files/patch-fhttpd.h @@ -0,0 +1,13 @@ +--- fhttpd.h.orig Fri Dec 15 00:34:52 2006 ++++ fhttpd.h Fri Dec 15 00:35:10 2006 +@@ -249,8 +249,8 @@ + void response(ServerConnection *client,char *fmt,...); + void hugeresponse(ServerConnection *client,char *buffer,unsigned long size); + void setexitafterresponse(ServerConnection *client,int closeonexit); +-int ControlFTPServer::getexitafterresponse(ServerConnection *client); +-void ControlFTPServer::emptyresponse(ServerConnection *client); ++int getexitafterresponse(ServerConnection *client); ++void emptyresponse(ServerConnection *client); + void suspendpollforresponse(ServerConnection *client,int startpollonexit); + + void answer_to_list(char *buffer,int i,int *syncexpected, |