head	1.4;
access;
symbols
	RELEASE_8_3_0:1.4
	RELEASE_9_0_0:1.4
	RELEASE_7_4_0:1.4
	RELEASE_8_2_0:1.4
	RELEASE_6_EOL:1.4
	RELEASE_8_1_0:1.4
	RELEASE_7_3_0:1.4
	RELEASE_8_0_0:1.4
	RELEASE_7_2_0:1.4
	RELEASE_7_1_0:1.4
	RELEASE_6_4_0:1.4
	RELEASE_5_EOL:1.4
	RELEASE_7_0_0:1.4
	RELEASE_6_3_0:1.4
	PRE_XORG_7:1.4
	RELEASE_4_EOL:1.4
	RELEASE_6_2_0:1.3
	RELEASE_6_1_0:1.3
	RELEASE_5_5_0:1.3
	RELEASE_6_0_0:1.3
	RELEASE_5_4_0:1.3
	RELEASE_4_11_0:1.3
	RELEASE_5_3_0:1.3
	RELEASE_4_10_0:1.3
	RELEASE_5_2_1:1.3
	RELEASE_5_2_0:1.3
	RELEASE_4_9_0:1.3
	RELEASE_5_1_0:1.3
	RELEASE_4_8_0:1.3
	RELEASE_5_0_0:1.3
	RELEASE_4_7_0:1.3
	RELEASE_4_6_2:1.3
	RELEASE_4_6_1:1.3
	RELEASE_4_6_0:1.3
	RELEASE_5_0_DP1:1.3
	RELEASE_4_5_0:1.3
	RELEASE_4_4_0:1.3
	RELEASE_4_3_0:1.3
	RELEASE_4_2_0:1.3
	RELEASE_4_1_1:1.3
	RELEASE_4_1_0:1.3
	RELEASE_3_5_0:1.2
	RELEASE_4_0_0:1.1;
locks; strict;
comment	@# @;


1.4
date	2006.12.15.08.38.17;	author miwi;	state Exp;
branches;
next	1.3;

1.3
date	2000.07.13.23.00.46;	author jedgar;	state Exp;
branches;
next	1.2;

1.2
date	2000.05.28.03.25.16;	author steve;	state Exp;
branches;
next	1.1;

1.1
date	2000.01.29.07.15.17;	author steve;	state Exp;
branches;
next	;


desc
@@


1.4
log
@- Fix gcc 4.X build

PR:		ports/106737
Submitted by:	trasz
@
text
@--- 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>
 #include <time.h>
+#include <machine/param.h> /* for ALIGN macro needed by CMSG_DATA */
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
@@@@ -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;
- h=accept(xsocket->gethandle(),(struct sockaddr*)s,&hisaddresslength);
+ h=accept(xsocket->gethandle(),(struct sockaddr*)s,(socklen_t*)&hisaddresslength);
  if(h<0) return;
  hisaddress=(struct sockaddr*)malloc(hisaddresslength);
  if(hisaddress) memcpy(hisaddress,s,hisaddresslength); else{
@@@@ -1861,7 +1864,7 @@@@
     if(fdarray[sockets[i]->handleindexforwheel].revents&POLLIN){
      fdarray[sockets[i]->handleindexforwheel].revents&=~POLLIN;
      hisaddresslength=128;
-     h=accept(sockets[i]->gethandle(),(struct sockaddr*)s,&hisaddresslength);
+     h=accept(sockets[i]->gethandle(),(struct sockaddr*)s,(socklen_t*)&hisaddresslength);
      if(h>=0){
 #ifdef DEBUG
       log("Wheel::onepass: accepting connection");
@


1.3
log
@Fix invalid (and unnecessary) check for the FreeBSD version.  Verified to
build on RELENG_3 and RELENG_4

Noticed by:	bento
@
text
@d1 2
a2 2
--- sockobj.cc.orig	Sat May 15 07:13:54 1999
+++ sockobj.cc	Thu Jul 13 18:50:19 2000
d11 10
a20 1
@@@@ -645,7 +646,7 @@@@
d29 1
a29 1
@@@@ -1861,7 +1862,7 @@@@
@


1.2
log
@Don't add -O2 to CFLAGS.  Make this port honor CFLAGS and CXXFLAGS.  Fix
build for -current.
@
text
@d1 3
a3 3
--- sockobj.cc.orig	Sat May 15 06:13:54 1999
+++ sockobj.cc	Sat May 27 14:57:47 2000
@@@@ -53,6 +53,9 @@@@
a6 1
+#if defined(__FreeBSD__) && __FreeBSD__ >= 5
a7 1
+#endif
d11 1
a11 1
@@@@ -645,7 +648,7 @@@@
d20 1
a20 1
@@@@ -1861,7 +1864,7 @@@@
@


1.1
log
@Adding fhttpd version 0.4.2.
A C++-based FTP/HTTP server that supports modules.

PR:		15804
Submitted by:	Will Andrews <andrews@@technologist.com>
@
text
@d1 13
a13 3
--- sockobj.cc.orig	Sat Jan 29 00:54:37 2000
+++ sockobj.cc	Sat Jan 29 00:55:34 2000
@@@@ -645,7 +645,7 @@@@
d22 1
a22 1
@@@@ -1861,7 +1861,7 @@@@
@

