chuck 96/10/09 10:36:22
Modified: src CHANGES Configure Configuration.tmpl
Log:
Changed references to SOCKS to SOCKS4. SOCKS5 will not require compile
time defines and linking of a static lib, so let's not confuse folks.
Revision Changes Path
1.70 +2 -2 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.69
retrieving revision 1.70
diff -C3 -r1.69 -r1.70
*** CHANGES 1996/10/09 15:23:09 1.69
--- CHANGES 1996/10/09 17:36:15 1.70
***************
*** 1,4 ****
! $Id: CHANGES,v 1.69 1996/10/09 15:23:09 mjc Exp $
Changes with Apache 1.2b1:
--- 1,4 ----
! $Id: CHANGES,v 1.70 1996/10/09 17:36:15 chuck Exp $
Changes with Apache 1.2b1:
***************
*** 91,97 ****
POSIX/regex...
*) Changes to mod_proxy since 1.1beta:
! tested w/SOCKS proxy for http
fixed IP address formation in host2addr()
fixed SIGALRM on big cache cleanup
fixed temp files #tmp not removed
--- 91,97 ----
POSIX/regex...
*) Changes to mod_proxy since 1.1beta:
! tested w/SOCKS4 proxy for http
fixed IP address formation in host2addr()
fixed SIGALRM on big cache cleanup
fixed temp files #tmp not removed
1.26 +5 -5 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.25
retrieving revision 1.26
diff -C3 -r1.25 -r1.26
*** Configure 1996/10/08 06:26:30 1.25
--- Configure 1996/10/09 17:36:18 1.26
***************
*** 1,5 ****
#!/bin/sh
! # $Id: Configure,v 1.25 1996/10/08 06:26:30 brian Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
--- 1,5 ----
#!/bin/sh
! # $Id: Configure,v 1.26 1996/10/09 17:36:18 chuck Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
***************
*** 111,117 ****
#
RULE_WANTHSREGEX=`./CutRule WANTHSREGEX $file`
RULE_STATUS=`./CutRule STATUS $file`
! RULE_SOCKS=`./CutRule SOCKS $file`
RULE_BADMMAP=`./CutRule BADMMAP $file`
RULE_IRIXNIS=`./CutRule IRIXNIS $file`
--- 111,117 ----
#
RULE_WANTHSREGEX=`./CutRule WANTHSREGEX $file`
RULE_STATUS=`./CutRule STATUS $file`
! RULE_SOCKS4=`./CutRule SOCKS4 $file`
RULE_BADMMAP=`./CutRule BADMMAP $file`
RULE_IRIXNIS=`./CutRule IRIXNIS $file`
***************
*** 366,377 ****
fi
#
! # Now SOCKS.
! # NOTE: We assume that if they are using SOCKS, then they've
# adjusted EXTRA_LIBS and/or EXTRA_LFLAGS as required,
# otherwise we assume "-L/usr/local/lib -lsocks"
#
! if [ "$RULE_SOCKS" = "yes" ]; then
# Set flag and check Makefile for -lsocks line
CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect"
CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname"
--- 366,377 ----
fi
#
! # Now SOCKS4.
! # NOTE: We assume that if they are using SOCKS4, then they've
# adjusted EXTRA_LIBS and/or EXTRA_LFLAGS as required,
# otherwise we assume "-L/usr/local/lib -lsocks"
#
! if [ "$RULE_SOCKS4" = "yes" ]; then
# Set flag and check Makefile for -lsocks line
CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect"
CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname"
1.44 +5 -5 apache/src/Configuration.tmpl
Index: Configuration.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
retrieving revision 1.43
retrieving revision 1.44
diff -C3 -r1.43 -r1.44
*** Configuration.tmpl 1996/10/01 11:00:42 1.43
--- Configuration.tmpl 1996/10/09 17:36:18 1.44
***************
*** 1,4 ****
! # $Id: Configuration.tmpl,v 1.43 1996/10/01 11:00:42 ben Exp $
# Config file for the Apache httpd.
# Configuration.tmpl is the template for Configuration. Configuration should
--- 1,4 ----
! # $Id: Configuration.tmpl,v 1.44 1996/10/09 17:36:18 chuck Exp $
# Config file for the Apache httpd.
# Configuration.tmpl is the template for Configuration. Configuration should
***************
*** 55,61 ****
# These are used to let Configure know that we want certain
# functions. The format is: Rule RULE=value
#
! # At present, only the following RULES are known: WANTHSREGEX, SOCKS,
# STATUS, BADMMAP and IRIXNIS.
#
# For all Rules, if set to "yes", then Configure knows we want that
--- 55,61 ----
# These are used to let Configure know that we want certain
# functions. The format is: Rule RULE=value
#
! # At present, only the following RULES are known: WANTHSREGEX, SOCKS4,
# STATUS, BADMMAP and IRIXNIS.
#
# For all Rules, if set to "yes", then Configure knows we want that
***************
*** 63,70 ****
# then Configure makes a "best guess"; if set to anything else, or not
# present, then nothing is done.
#
! # SOCKS:
! # If SOCKS is set to 'yes', be sure that you add the sock library
# location to EXTRA_LIBS, otherwise Configure will assume
# "-L/usr/local/lib -lsocks"
#
--- 63,70 ----
# then Configure makes a "best guess"; if set to anything else, or not
# present, then nothing is done.
#
! # SOCKS4:
! # If SOCKS4 is set to 'yes', be sure that you add the sock library
# location to EXTRA_LIBS, otherwise Configure will assume
# "-L/usr/local/lib -lsocks"
#
***************
*** 81,87 ****
#
Rule STATUS=yes
! Rule SOCKS=no
Rule IRIXNIS=no
# The following rules should be set automatically by Configure. However, if
--- 81,87 ----
#
Rule STATUS=yes
! Rule SOCKS4=no
Rule IRIXNIS=no
# The following rules should be set automatically by Configure. However, if
