diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/w3c-httpd/Makefile | 6 | ||||
| -rw-r--r-- | www/w3c-httpd/files/patch-SSL | 18 | ||||
| -rw-r--r-- | www/w3c-httpd/files/patch-bb | 43 |
3 files changed, 45 insertions, 22 deletions
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile index 3c19e6c..c17a55a 100644 --- a/www/w3c-httpd/Makefile +++ b/www/w3c-httpd/Makefile @@ -3,7 +3,7 @@ # Date created: 29 October 1994 # Whom: pst # -# $Id: Makefile,v 1.18 1998/10/15 02:03:14 jseger Exp $ +# $Id: Makefile,v 1.19 1999/01/08 19:59:26 fenner Exp $ # DISTNAME= w3c-httpd-3.0A @@ -11,12 +11,10 @@ CATEGORIES= www MASTER_SITES= ftp://ftp.w3.org/pub/httpd/ \ ftp://ftp-eu.w3.org/pub/httpd/ -MAINTAINER= giffunip@asme.org +MAINTAINER= ports@FreeBSD.org NO_WRKSUBDIR= yes -BROKEN_ELF= yes - WWW_ROOT= ${PREFIX}/www pre-configure: diff --git a/www/w3c-httpd/files/patch-SSL b/www/w3c-httpd/files/patch-SSL index fea2f33..cb73626 100644 --- a/www/w3c-httpd/files/patch-SSL +++ b/www/w3c-httpd/files/patch-SSL @@ -363,19 +363,19 @@ PATCH TO WWW COMMON LIBRARY 2.17 AND CERN HTTPD 3.0: + fd_set rd_fds, wr_fds; + int status; + -+ memset(&rd_fds, 0, sizeof(rd_fds)); -+ memset(&wr_fds, 0, sizeof(wr_fds)); -+ + if (initial && *initial) { + strcpy(b1, initial); + c1 = strlen(initial); + } + + while (1) { -+ FD_SET(sd1, &rd_fds); -+ FD_SET(sd2, &rd_fds); -+ FD_SET(sd1, &wr_fds); -+ FD_SET(sd2, &wr_fds); ++ FD_ZERO(&rd_fds); ++ FD_ZERO(&wr_fds); ++ /* Only set the FDs that are relevant - 10/12/98 gram@cdsec.com */ ++ if (!c1) FD_SET(sd2, &rd_fds); ++ else FD_SET(sd1, &wr_fds); ++ if (!c2) FD_SET(sd1, &rd_fds); ++ else FD_SET(sd2, &wr_fds); + + if (!(status = select(n_fds, &rd_fds, &wr_fds, NULL, NULL))) + { @@ -404,12 +404,12 @@ PATCH TO WWW COMMON LIBRARY 2.17 AND CERN HTTPD 3.0: + if (shove_buffer(sd2, b2, &i2, &c2) == -1) + closed2 = 1; + } -+ if (r1 && !c2) ++ if (r1) + { + if (!drag_buffer(sd1, b2, &i2, &c2)) + closed1 = 1; + } -+ if (r2 && !c1) ++ if (r2) + { + if (!drag_buffer(sd2, b1, &i1, &c1)) + closed2 = 1; diff --git a/www/w3c-httpd/files/patch-bb b/www/w3c-httpd/files/patch-bb index e7bd67a..d3cdcf8 100644 --- a/www/w3c-httpd/files/patch-bb +++ b/www/w3c-httpd/files/patch-bb @@ -1,19 +1,44 @@ -*** All/freebsd/Makefile.include.orig Mon Dec 30 17:18:49 1996 ---- All/freebsd/Makefile.include Mon Dec 30 17:19:46 1996 +*** All/freebsd/Makefile.include.orig Wed Jan 10 20:07:31 1996 +--- All/freebsd/Makefile.include Sat May 8 12:30:11 1999 *************** -*** 5,11 **** +*** 4,14 **** + # For W3 distribution, machine type for subdirectories WWW_MACH = freebsd - CFLAGS += -DDEBUG -D__BSD__ +! CFLAGS += -DDEBUG -D__BSD__ ! LFLAGS = # Directory for installed binary: - BINDIR = /usr/local/bin ---- 5,11 ---- +! BINDIR = /usr/local/bin + + # Where is the W3 object library to be installed (not normally done)? + LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) +--- 4,14 ---- + # For W3 distribution, machine type for subdirectories WWW_MACH = freebsd - CFLAGS += -DDEBUG -D__BSD__ -! LFLAGS = -lcrypt +! CFLAGS += -D__BSD__ +! LFLAGS += -lcrypt # Directory for installed binary: - BINDIR = /usr/local/bin +! BINDIR = $(PREFIX)/bin + + # Where is the W3 object library to be installed (not normally done)? + LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) +*************** +*** 25,31 **** + # + # Uncomment these six lines (and edit them, if necessary). + # +! # WAIS = ../../../freeWAIS + # WAISLIB = $(WAIS)/bin/client.a $(WAIS)/bin/wais.a + # MATHLIB = -lm + # WAISINC = -I$(WAIS)/include +--- 25,31 ---- + # + # Uncomment these six lines (and edit them, if necessary). + # +! # WAIS = ${PORTSDIR}/net/wais/work/freeWAIS-0.5/src + # WAISLIB = $(WAIS)/bin/client.a $(WAIS)/bin/wais.a + # MATHLIB = -lm + # WAISINC = -I$(WAIS)/include |
