cvs commit: apache/src/modules/proxy ApacheModuleProxy.dsp .cvsignore

1997-07-20 Thread Ben Laurie 
ben 97/07/20 07:59:58

  Modified:src/modules/proxy  .cvsignore
  Added:   src/modules/proxy  ApacheModuleProxy.dsp
  Log:
  Upgrade to VC++ 5.0
  
  Revision  ChangesPath
  1.2   +5 -2  apache/src/modules/proxy/.cvsignore
  
  Index: .cvsignore
  ===
  RCS file: /export/home/cvs/apache/src/modules/proxy/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** .cvsignore1997/07/05 22:09:29 1.1
  --- .cvsignore1997/07/20 14:59:57 1.2
  ***
  *** 1,4 
Debug
Release
  ! proxy.mdp
  ! proxy.ncb
  --- 1,7 
Debug
Release
  ! ApacheModuleProxy.dsw
  ! ApacheModuleProxy.mdp
  ! ApacheModuleProxy.ncb
  ! ApacheModuleProxy.opt
  ! ApacheModuleProxy.plg
  
  
  
  1.1  apache/src/modules/proxy/ApacheModuleProxy.dsp
  
  Index: ApacheModuleProxy.dsp
  ===
  # Microsoft Developer Studio Project File - Name=ApacheModuleProxy - 
Package Owner=4
  # Microsoft Developer Studio Generated Build File, Format Version 5.00
  # ** DO NOT EDIT **
  
  # TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102
  
  CFG=ApacheModuleProxy - Win32 Release
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f ApacheModuleProxy.mak.
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f ApacheModuleProxy.mak\
   CFG=ApacheModuleProxy - Win32 Release
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE ApacheModuleProxy - Win32 Release (based on\
   Win32 (x86) Dynamic-Link Library)
  !MESSAGE ApacheModuleProxy - Win32 Debug (based on\
   Win32 (x86) Dynamic-Link Library)
  !MESSAGE 
  
  # Begin Project
  # PROP Scc_ProjName 
  # PROP Scc_LocalPath 
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  $(CFG) == ApacheModuleProxy - Win32 Release
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir .\ApacheMo
  # PROP BASE Intermediate_Dir .\ApacheMo
  # PROP BASE Target_Dir 
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir .\Release
  # PROP Intermediate_Dir .\Release
  # PROP Target_Dir 
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS 
/YX /c
  # ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\regex /D WIN32 /D 
NDEBUG /D _WINDOWS /YX /FD /c
  # ADD BASE MTL /nologo /D NDEBUG /win32
  # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
  # ADD BASE RSC /l 0x809 /d NDEBUG
  # ADD RSC /l 0x809 /d NDEBUG
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib 
odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
  # ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib 
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib 
uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll 
/machine:I386
  
  !ELSEIF  $(CFG) == ApacheModuleProxy - Win32 Debug
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir .\ApacheM0
  # PROP BASE Intermediate_Dir .\ApacheM0
  # PROP BASE Target_Dir 
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir .\Debug
  # PROP Intermediate_Dir .\Debug
  # PROP Target_Dir 
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D WIN32 /D _DEBUG /D 
_WINDOWS /YX /c
  # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ..\.. /I ..\..\regex /D 
WIN32 /D _DEBUG /D _WINDOWS /YX /FD /c
  # ADD BASE MTL /nologo /D _DEBUG /win32
  # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32
  # ADD BASE RSC /l 0x809 /d _DEBUG
  # ADD RSC /l 0x809 /d _DEBUG
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib 
odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
  # ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib 
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib 
uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll 
/debug /machine:I386
  
  !ENDIF 
  
  # Begin Target
  
  # Name ApacheModuleProxy - Win32 Release
  # Name ApacheModuleProxy - Win32 Debug
  # Begin Group Source Files
  
  # PROP Default_Filter cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90
  # Begin Source File
  
  SOURCE=.\mod_proxy.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\proxy_cache.c
  # End Source File
  # Begin Source File

cvs commit: apache/src/nt .cvsignore

1997-07-20 Thread Ben Laurie 
ben 97/07/20 08:05:12

  Modified:src   Apache.mak
   src/nt.cvsignore
  Log:
  Cleanup.
  
  Revision  ChangesPath
  1.2   +73 -99apache/src/Apache.mak
  
  Index: Apache.mak
  ===
  RCS file: /export/home/cvs/apache/src/Apache.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** Apache.mak1997/07/18 23:54:22 1.1
  --- Apache.mak1997/07/20 15:05:10 1.2
  ***
  *** 1,27 
  ! # Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
  ! # ** DO NOT EDIT **
  ! 
  ! # TARGTYPE Win32 (x86) Console Application 0x0103
  ! 
!IF $(CFG) == 
  ! CFG=Apache - Win32 Debug
  ! !MESSAGE No configuration specified.  Defaulting to Apache - Win32 Debug.
!ENDIF 

  ! !IF $(CFG) != Apache - Win32 Release  $(CFG) !=\
  !  Apache - Win32 Debug
!MESSAGE Invalid configuration $(CFG) specified.
  ! !MESSAGE You can specify a configuration when running NMAKE on this makefile
  ! !MESSAGE by defining the macro CFG on the command line.  For example:
!MESSAGE 
  ! !MESSAGE NMAKE /f Apache.mak CFG=Apache - Win32 Debug
!MESSAGE 
!MESSAGE Possible choices for configuration are:
!MESSAGE 
  ! !MESSAGE Apache - Win32 Release (based on\
  !  Win32 (x86) Console Application)
  ! !MESSAGE Apache - Win32 Debug (based on\
  !  Win32 (x86) Console Application)
!MESSAGE 
!ERROR An invalid configuration is specified.
!ENDIF 
  --- 1,20 
  ! # Microsoft Developer Studio Generated NMAKE File, Based on Apache.dsp
!IF $(CFG) == 
  ! CFG=Apache - Win32 Release
  ! !MESSAGE No configuration specified. Defaulting to Apache - Win32 Release.
!ENDIF 

  ! !IF $(CFG) != Apache - Win32 Release  $(CFG) != Apache - Win32 
Debug
!MESSAGE Invalid configuration $(CFG) specified.
  ! !MESSAGE You can specify a configuration when running NMAKE
  ! !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE 
  ! !MESSAGE NMAKE /f Apache.mak CFG=Apache - Win32 Release
!MESSAGE 
!MESSAGE Possible choices for configuration are:
!MESSAGE 
  ! !MESSAGE Apache - Win32 Release (based on Win32 (x86) Console 
Application)
  ! !MESSAGE Apache - Win32 Debug (based on Win32 (x86) Console Application)
!MESSAGE 
!ERROR An invalid configuration is specified.
!ENDIF 
  ***
  *** 31,88 
!ELSE 
NULL=nul
!ENDIF 
  ! 

  ! # Begin Project
  ! # PROP Target_Last_Scanned Apache - Win32 Debug
CPP=cl.exe
RSC=rc.exe

!IF  $(CFG) == Apache - Win32 Release

  - # PROP BASE Use_MFC 0
  - # PROP BASE Use_Debug_Libraries 0
  - # PROP BASE Output_Dir ApacheLa
  - # PROP BASE Intermediate_Dir ApacheLa
  - # PROP BASE Target_Dir 
  - # PROP Use_MFC 0
  - # PROP Use_Debug_Libraries 0
  - # PROP Output_Dir LaunchR
  - # PROP Intermediate_Dir LaunchR
  - # PROP Target_Dir 
OUTDIR=.\LaunchR
INTDIR=.\LaunchR

ALL : $(OUTDIR)\Apache.exe

  ! CLEAN : 
[EMAIL PROTECTED] $(INTDIR)\dummy.obj
[EMAIL PROTECTED] $(OUTDIR)\Apache.exe

$(OUTDIR) :
if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)

  - # ADD BASE CPP /nologo /W3 /GX /O2 /D WIN32 /D NDEBUG /D _CONSOLE /YX 
/c
  - # ADD CPP /nologo /MD /W3 /GX /O2 /D WIN32 /D NDEBUG /D _CONSOLE /YX 
/c
CPP_PROJ=/nologo /MD /W3 /GX /O2 /D WIN32 /D NDEBUG /D _CONSOLE\
  !  /Fp$(INTDIR)/Apache.pch /YX /Fo$(INTDIR)/ /c 
CPP_OBJS=.\LaunchR/
  ! CPP_SBRS=.\.
  ! # ADD BASE RSC /l 0x809 /d NDEBUG
  ! # ADD RSC /l 0x809 /d NDEBUG
BSC32=bscmake.exe
  ! # ADD BASE BSC32 /nologo
  ! # ADD BSC32 /nologo
  ! BSC32_FLAGS=/nologo /o$(OUTDIR)/Apache.bsc 
BSC32_SBRS= \

LINK32=link.exe
  - # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib 
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib 
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
  - # ADD LINK32 CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib 
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib 
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
LINK32_FLAGS=CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
 winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
 uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console 
/incremental:no\
  !  /pdb:$(OUTDIR)/Apache.pdb /machine:I386\
  !  /out:$(OUTDIR)/Apache.exe 
LINK32_OBJS= \
$(INTDIR)\dummy.obj

  --- 24,72 
!ELSE 
NULL=nul
!ENDIF 
  ! 
CPP=cl.exe
RSC=rc.exe

!IF  $(CFG) == Apache - Win32 Release

OUTDIR=.\LaunchR
INTDIR=.\LaunchR
  + # Begin Custom Macros
  + OutDir=.\.\LaunchR
  + # End Custom Macros
  + 
  + !IF $(RECURSE) == 0 

ALL :

cvs commit: apache/src CHANGES mod_include.c

1997-07-20 Thread Dean Gaudet 
dgaudet 97/07/20 11:24:28

  Modified:src   Tag: APACHE_1_2_X  CHANGES mod_include.c
  Log:
  fixup of mod_include logging
  
  Reviewed by:  Jim Jagielski, Dean Gaudet
  Submitted by: Marc Slemko
  PR:   797
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.286.2.30 +3 -0  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.286.2.29
  retrieving revision 1.286.2.30
  diff -C3 -r1.286.2.29 -r1.286.2.30
  *** CHANGES   1997/07/20 18:22:02 1.286.2.29
  --- CHANGES   1997/07/20 18:24:24 1.286.2.30
  ***
  *** 1,5 
  --- 1,8 
Changes with Apache 1.2.2

  +   *) mod_include would log some bogus values occasionally.
  +  [Skip Montanaro [EMAIL PROTECTED], Marc Slemko] PR#797
  + 
  *) PORT: The slack fd changes in 1.2.1 introduced a problem with SIGHUP
 under Solaris 2.x (up through 2.5.1).  It has been fixed.
 [Dean Gaudet] PR#832
  
  
  
  1.33.2.4  +40 -36apache/src/mod_include.c
  
  Index: mod_include.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_include.c,v
  retrieving revision 1.33.2.3
  retrieving revision 1.33.2.4
  diff -C3 -r1.33.2.3 -r1.33.2.4
  *** mod_include.c 1997/06/28 22:01:42 1.33.2.3
  --- mod_include.c 1997/07/20 18:24:25 1.33.2.4
  ***
  *** 458,464 
var[vlen] = vtext[vtlen] = '\0';
if (braces == 1) {
if (*in != '}') {
  ! log_printf(r-server, Invalid variable %s%s, 
vtext,in);
*next = '\0';
return;
} else
  --- 458,464 
var[vlen] = vtext[vtlen] = '\0';
if (braces == 1) {
if (*in != '}') {
  ! log_printf(r-server, Invalid variable \%s%s\, 
vtext,in);
*next = '\0';
return;
} else
  ***
  *** 545,563 
char tmp[MAX_STRING_LEN+2];
ap_snprintf(tmp, sizeof(tmp), /%s/, parsed_string);
if (parsed_string[0] == '/' || strstr(tmp, /../) != NULL)
  ! error_fmt = unable to include file %s in parsed file %s;
else
rr = sub_req_lookup_file (parsed_string, r);
} else
rr = sub_req_lookup_uri (parsed_string, r);

if (!error_fmt  rr-status != 200)
  ! error_fmt = unable to include %s in parsed file %s;

if (!error_fmt  noexec  rr-content_type
 (strncmp (rr-content_type, text/, 5)))
error_fmt =
  !   unable to include potential exec %s in parsed file %s;
if (error_fmt == NULL)
{
request_rec *p;
  --- 545,563 
char tmp[MAX_STRING_LEN+2];
ap_snprintf(tmp, sizeof(tmp), /%s/, parsed_string);
if (parsed_string[0] == '/' || strstr(tmp, /../) != NULL)
  ! error_fmt = unable to include file \%s\ in parsed file 
%s;
else
rr = sub_req_lookup_file (parsed_string, r);
} else
rr = sub_req_lookup_uri (parsed_string, r);

if (!error_fmt  rr-status != 200)
  ! error_fmt = unable to include \%s\ in parsed file %s;

if (!error_fmt  noexec  rr-content_type
 (strncmp (rr-content_type, text/, 5)))
error_fmt =
  !   unable to include potential exec \%s\ in parsed file %s;
if (error_fmt == NULL)
{
request_rec *p;
  ***
  *** 565,575 
for (p=r; p != NULL; p=p-main)
if (strcmp(p-filename, rr-filename) == 0) break;
if (p != NULL)
  ! error_fmt = Recursive include of %s in parsed file %s;
}

if (!error_fmt  run_sub_req (rr))
  ! error_fmt = unable to include %s in parsed file %s;
chdir_file(r-filename);

if (error_fmt) {
  --- 565,575 
for (p=r; p != NULL; p=p-main)
if (strcmp(p-filename, rr-filename) == 0) break;
if (p != NULL)
  ! error_fmt = Recursive include of \%s\ in parsed file 
%s;
}

if (!error_fmt  run_sub_req (rr))
  ! error_fmt = unable to include \%s\ in parsed file %s;
chdir_file(r-filename);

if (error_fmt) {

cvs commit: apache/src CHANGES

1997-07-20 Thread Dean Gaudet 
dgaudet 97/07/20 11:39:45

  Modified:src   Tag: APACHE_1_2_X  CHANGES
  Log:
  Note the fixes for PR#813, 814.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.286.2.31 +4 -0  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.286.2.30
  retrieving revision 1.286.2.31
  diff -C3 -r1.286.2.30 -r1.286.2.31
  *** CHANGES   1997/07/20 18:24:24 1.286.2.30
  --- CHANGES   1997/07/20 18:39:42 1.286.2.31
  ***
  *** 1,4 
  --- 1,8 
Changes with Apache 1.2.2
  +   
  +   *) The proxy didn't treat the Host: keyword of the host header as case-
  +  insensitive.  The proxy would corrupt the first line of a response from
  +  an HTTP/0.9 server.  [Kenichi Hori [EMAIL PROTECTED]] PR#813,814

  *) mod_include would log some bogus values occasionally.
 [Skip Montanaro [EMAIL PROTECTED], Marc Slemko] PR#797

cvs commit: apache/htdocs/manual env.html

1997-07-20 Thread Dean Gaudet 
dgaudet 97/07/20 14:27:05

  Modified:htdocs/manual  env.html
  Log:
  Blurb about downgrade-1.0.
  
  Revision  ChangesPath
  1.6   +6 -1  apache/htdocs/manual/env.html
  
  Index: env.html
  ===
  RCS file: /export/home/cvs/apache/htdocs/manual/env.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -C3 -r1.5 -r1.6
  *** env.html  1997/07/06 17:18:53 1.5
  --- env.html  1997/07/20 21:27:04 1.6
  ***
  *** 30,40 
BLOCKQUOTECODE
BrowserMatch Mozilla/2 nokeepalive
/CODE/BLOCKQUOTE
H2force-response-1.0/H2
This forces an HTTP/1.0 response when set. It was originally implemented as 
a
  ! result of a problem with AOL's proxies. Some clients may not behave 
correctly
when given an HTTP/1.1 response, and this can be used to interoperate with
them.

!--#include virtual=footer.html --
/BODY
  --- 30,45 
BLOCKQUOTECODE
BrowserMatch Mozilla/2 nokeepalive
/CODE/BLOCKQUOTE
  + 
H2force-response-1.0/H2
This forces an HTTP/1.0 response when set. It was originally implemented as 
a
  ! result of a problem with AOL's proxies.  Some clients may not behave 
correctly
when given an HTTP/1.1 response, and this can be used to interoperate with
them.
  + 
  + H2downgrade-1.0/H2
  + pThis forces the request to be treated as a HTTP/1.0 request even if it
  + was in a later dialect.

!--#include virtual=footer.html --
/BODY

cvs commit: apache/support Makefile.tmpl suexec.c

1997-07-20 Thread Dean Gaudet 
dgaudet 97/07/20 16:44:50

  Modified:support   Makefile.tmpl suexec.c
  Log:
  htdigest needs $(LIBS).  QNX doesn't support initgroups.
  
  Submitted by: Igor N Kovalenko [EMAIL PROTECTED]
  Reviewed by:  Dean Gaudet
  
  Revision  ChangesPath
  1.4   +1 -1  apache/support/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache/support/Makefile.tmpl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** Makefile.tmpl 1997/07/14 11:56:08 1.3
  --- Makefile.tmpl 1997/07/20 23:44:49 1.4
  ***
  *** 19,25 
$(CC) $(CFLAGS) htpasswd.c -o htpasswd $(LIBS)

htdigest: htdigest.c
  ! $(CC) $(CFLAGS) htdigest.c -o htdigest

httpd_monitor: httpd_monitor.c
$(CC) $(INCLUDES) $(CFLAGS) httpd_monitor.c -o httpd_monitor
  --- 19,25 
$(CC) $(CFLAGS) htpasswd.c -o htpasswd $(LIBS)

htdigest: htdigest.c
  ! $(CC) $(CFLAGS) htdigest.c -o htdigest $(LIBS)

httpd_monitor: httpd_monitor.c
$(CC) $(INCLUDES) $(CFLAGS) httpd_monitor.c -o httpd_monitor
  
  
  
  1.24  +18 -0 apache/support/suexec.c
  
  Index: suexec.c
  ===
  RCS file: /export/home/cvs/apache/support/suexec.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -C3 -r1.23 -r1.24
  *** suexec.c  1997/06/23 22:48:48 1.23
  --- suexec.c  1997/07/20 23:44:49 1.24
  ***
  *** 81,86 
  --- 81,104 
#include time.h
#include sys/stat.h

  + /*
  +  ***
  +  * There is no initgroups() in QNX, so I believe this is safe :-)
  +  * Use cc -osuexec -3 -O -mf -DQNX suexec.c to compile.
  +  *
  +  * May 17, 1997.
  +  * Igor N. Kovalenko -- [EMAIL PROTECTED]
  +  ***
  +  */
  + 
  + #if defined(QNX)
  + int initgroups(const char *name, gid_t basegid)
  + {
  + /* QNX and MPE do not appear to support supplementary groups. */
  + return 0;
  + }
  + #endif
  + 
#if defined(PATH_MAX)
#define AP_MAXPATH PATH_MAX
#elif defined(MAXPATHLEN)

cvs commit: apache/src CHANGES

1997-07-20 Thread Dean Gaudet 
dgaudet 97/07/20 16:45:46

  Modified:src   CHANGES
  Log:
  Note the initgroups change for QNX.
  
  Revision  ChangesPath
  1.356 +3 -0  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.355
  retrieving revision 1.356
  diff -C3 -r1.355 -r1.356
  *** CHANGES   1997/07/20 18:52:39 1.355
  --- CHANGES   1997/07/20 23:45:45 1.356
  ***
  *** 1,5 
  --- 1,8 
Changes with Apache 1.3

  +   *) PORT: QNX doesn't have initgroups() which support/suexec.c uses.
  +  [Igor N Kovalenko [EMAIL PROTECTED]]
  + 
  *) force-response-1.0 now only applies to requests which are HTTP/1.0 to
 begin with.  nokeepalive now works for HTTP/1.1 clients.  Added
 downgrade-1.0 which causes Apache to pretend it received a 1.0.

cvs commit: apache/src/helpers TestLib

1997-07-20 Thread Dean Gaudet 
dgaudet 97/07/20 17:16:20

  Modified:src/helpers  TestLib
  Log:
  I get nervous about 'rm -r' where it's not strictly needed.
  
  Revision  ChangesPath
  1.5   +2 -2  apache/src/helpers/TestLib
  
  Index: TestLib
  ===
  RCS file: /export/home/cvs/apache/src/helpers/TestLib,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -C3 -r1.4 -r1.5
  *** TestLib   1997/07/17 17:12:42 1.4
  --- TestLib   1997/07/21 00:16:19 1.5
  ***
  *** 1,5 
#!/bin/sh
  ! trap 'rm -rf Makefile dummy; exit' 0 1 2 3 15
#
# Yet another Apache Configure helper script.
# This one exists simply to test for the existance of
  --- 1,5 
#!/bin/sh
  ! trap 'rm -f Makefile dummy; exit' 0 1 2 3 15
#
# Yet another Apache Configure helper script.
# This one exists simply to test for the existance of
  ***
  *** 27,33 
# Get makefile settings and build a basic Makefile
#
cd ./helpers
  ! rm -rf dummy
cat ../Makefile.config  Makefile
cat EOF  Makefile
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  --- 27,33 
# Get makefile settings and build a basic Makefile
#
cd ./helpers
  ! rm -f dummy
cat ../Makefile.config  Makefile
cat EOF  Makefile
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)

cvs commit: apache/src/helpers TestLib

1997-07-20 Thread Jim Jagielski 
jim 97/07/20 18:21:34

  Modified:src/helpers  TestLib
  Log:
  Add Dean's suggestions in... TestLib is now silent, we check it's
  exit status .
  
  Revision  ChangesPath
  1.6   +12 -12apache/src/helpers/TestLib
  
  Index: TestLib
  ===
  RCS file: /export/home/cvs/apache/src/helpers/TestLib,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -C3 -r1.5 -r1.6
  *** TestLib   1997/07/21 00:16:19 1.5
  --- TestLib   1997/07/21 01:21:33 1.6
  ***
  *** 1,5 
#!/bin/sh
  ! trap 'rm -f Makefile dummy; exit' 0 1 2 3 15
#
# Yet another Apache Configure helper script.
# This one exists simply to test for the existance of
  --- 1,6 
#!/bin/sh
  ! exstat=1
  ! trap 'rm -f Makefile dummy; exit $exstat' 0 1 2 3 15
#
# Yet another Apache Configure helper script.
# This one exists simply to test for the existance of
  ***
  *** 20,26 
# Make sure we have an argument
#
if [ x$1 = x ]; then
  !   exit 1
fi

#
  --- 21,27 
# Make sure we have an argument
#
if [ x$1 = x ]; then
  !   exit
fi

#
  ***
  *** 30,51 
rm -f dummy
cat ../Makefile.config  Makefile
cat EOF  Makefile
  ! CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  ! LIBS=$(EXTRA_LIBS) $(LIBS1)
  ! INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
  ! LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)

  ! all:
\$(CC) \$(CFLAGS) \$(INCLUDES) \$(LDFLAGS) dummy.c -o dummy -l$1

EOF

# Now run that Makefile
  ! `make  /dev/null 21`

  ! # And see if dummy exists
if [ -f dummy ]; then
  ! echo yes
  ! else
  ! echo no
fi
  --- 31,51 
rm -f dummy
cat ../Makefile.config  Makefile
cat EOF  Makefile
  ! CFLAGS=\$(OPTIM) \$(CFLAGS1) \$(EXTRA_CFLAGS)
  ! LIBS=\$(EXTRA_LIBS) \$(LIBS1)
  ! INCLUDES=\$(INCLUDES1) \$(EXTRA_INCLUDES)
  ! LDFLAGS=\$(LDFLAGS1) \$(EXTRA_LDFLAGS)

  ! dummy:
\$(CC) \$(CFLAGS) \$(INCLUDES) \$(LDFLAGS) dummy.c -o dummy -l$1

EOF

# Now run that Makefile
  ! make dummy  /dev/null 21

  ! # And see if dummy exists, if so, then we assume the 
  ! # library we are testing for exists
if [ -f dummy ]; then
  ! exstat=0
fi

cvs commit: apache/src/modules/proxy proxy_ftp.c

1997-07-20 Thread Dean Gaudet 
dgaudet 97/07/20 20:37:54

  Modified:src   CHANGES Configure PORTING conf.h dummy.c
http_main.c
   src/modules/proxy  proxy_ftp.c
  Log:
  Linux porting tweaks for glibc based systems.  Linux tweaks to find db
  libraries.  Added NET_SIZE_T for handling size_t * args to some functions.
  
  Revision  ChangesPath
  1.357 +8 -0  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.356
  retrieving revision 1.357
  diff -C3 -r1.356 -r1.357
  *** CHANGES   1997/07/20 23:45:45 1.356
  --- CHANGES   1997/07/21 03:37:47 1.357
  ***
  *** 1,5 
  --- 1,13 
Changes with Apache 1.3

  +   *) PORT: Some architectures use size_t for various lengths in network
  +  functions such as accept(), and getsockname().  The definition
  +  NET_SIZE_T is used to control this. [Dean Gaudet]
  + 
  +   *) PORT: Linux: Attempt to detect glibc based systems and include crypt.h
  +  and -lcrypt.  Test for various db libraries (dbm, ndbm, db) when
  +  mod_auth_dbm or mod_auth_db are included.  [Dean Gaudet]
  + 
  *) PORT: QNX doesn't have initgroups() which support/suexec.c uses.
 [Igor N Kovalenko [EMAIL PROTECTED]]

  
  
  
  1.114 +24 -12apache/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -C3 -r1.113 -r1.114
  *** Configure 1997/07/19 09:34:32 1.113
  --- Configure 1997/07/21 03:37:48 1.114
  ***
  *** 279,300 
CFLAGS=$CFLAGS -DIRIX
fi
;;
  - alpha-*-linux2)
  - DEF_WANTHSREGEX=yes
  - OS='Linux'
  - CFLAGS=$CFLAGS -DLINUX=2
  - LIBS=$LIBS -lcrypt
  - ;;
  - sparc-*-linux2)
  - DEF_WANTHSREGEX=yes
  - OS='Linux'
  - CFLAGS=$CFLAGS -DLINUX=2
  - LIBS=$LIBS -lm
  - ;;
*-linux2)
DEF_WANTHSREGEX=yes
OS='Linux'
CFLAGS=$CFLAGS -DLINUX=2
;;
*-linux1)
DEF_WANTHSREGEX=yes
  --- 279,289 
CFLAGS=$CFLAGS -DIRIX
fi
;;
*-linux2)
DEF_WANTHSREGEX=yes
OS='Linux'
CFLAGS=$CFLAGS -DLINUX=2
  + LIBS=$LIBS -lm
;;
*-linux1)
DEF_WANTHSREGEX=yes
  ***
  *** 684,697 
  --- 673,709 
# before we actually write LIBS to Makefile.config.
# Punt for now...

  + case $PLAT in
  + *-linux*)
  + # newer systems using glibc 2.x need -lcrypt
  + if ./helpers/TestLib crypt; then
  + LIBS=$LIBS -lcrypt
  + fi
  + # many systems have -ldb installed
  + DB_LIB=
  + if ./helpers/TestLib db; then
  + DB_LIB=-ldb
  + fi;
  + # many systems don't have -ldbm
  + DBM_LIB=
  + if ./helpers/TestLib dbm; then
  + DBM_LIB=-ldbm
  + elif ./helpers/TestLib ndbm; then
  + DBM_LIB=-lndbm
  + fi
  + ;;
  + esac
  + 
#
# Are they using dbm/db auth? If so, add DBM/DB library.
#
if grep mod_auth_dbm Makefile  /dev/null; then
LIBS=$LIBS $DBM_LIB
  + echo  + using $DBM_LIB for mod_auth_dbm
fi
if grep mod_auth_db Makefile  /dev/null; then
LIBS=$LIBS $DB_LIB
  + echo  + using $DB_LIB for mod_auth_db
fi


  
  
  
  1.8   +5 -0  apache/src/PORTING
  
  Index: PORTING
  ===
  RCS file: /export/home/cvs/apache/src/PORTING,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -C3 -r1.7 -r1.8
  *** PORTING   1997/07/07 14:34:24 1.7
  --- PORTING   1997/07/21 03:37:48 1.8
  ***
  *** 245,250 
  --- 245,255 
   Amount to move sbrk() breakpoint, if required, before attaching
   shared-memory segment.

  +   NET_SIZE_T:
  +Some functions such as accept(), getsockname(), getpeername() take
  +an int *len on some architectures and a size_t *len on others.
  +If left undefined apache will default it to int.
  + 
---
Conclusion:
---
  
  
  
  1.116 +14 -0 apache/src/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -C3 -r1.115 -r1.116
  *** conf.h1997/07/16 00:41:20 1.115
  --- conf.h1997/07/21 03:37:48 1.116
  ***
  *** 259,264 
  --- 259,270 

#elif defined(LINUX)
#if LINUX  1
  + #include features.h
  + #if defined(__GNU_LIBRARY__)  __GNU_LIBRARY__  1
  + /* it's a glibc host */
  +

cvs commit: apache/src Configure

1997-07-20 Thread Dean Gaudet 
dgaudet 97/07/20 20:42:12

  Modified:src   Configure
  Log:
  Don't print + using  for mod_auth_db when DB_LIB=, similarly for DBM_LIB.
  Fix BSD44 archs which don't require -ldb for db functions.
  
  Revision  ChangesPath
  1.115 +10 -2 apache/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -C3 -r1.114 -r1.115
  *** Configure 1997/07/21 03:37:48 1.114
  --- Configure 1997/07/21 03:42:11 1.115
  ***
  *** 299,318 
  --- 299,322 
OS='BSDI w/486'
CFLAGS=$CFLAGS -m486
DBM_LIB=
  + DB_LIB=
;;
*-bsdi*)
OS='BSDI'
DBM_LIB=
  + DB_LIB=
;;
*486-*-freebsd*|*486-*-netbsd*)
OS='FreeBSD/NETBSD on 486'
LIBS=$LIBS -lcrypt
DBM_LIB=
  + DB_LIB=
;;
*-freebsd*|*-netbsd*)
OS='FreeBSD/NetBSD'
LIBS=$LIBS -lcrypt
DBM_LIB=
  + DB_LIB=
;;
*-openbsd*)
OS='OpenBSD'
  ***
  *** 699,709 
#
if grep mod_auth_dbm Makefile  /dev/null; then
LIBS=$LIBS $DBM_LIB
  ! echo  + using $DBM_LIB for mod_auth_dbm
fi
if grep mod_auth_db Makefile  /dev/null; then
LIBS=$LIBS $DB_LIB
  ! echo  + using $DB_LIB for mod_auth_db
fi


  --- 703,717 
#
if grep mod_auth_dbm Makefile  /dev/null; then
LIBS=$LIBS $DBM_LIB
  ! if [ X$DBM_LIB != X ]; then
  ! echo  + using $DBM_LIB for mod_auth_dbm
  ! fi
fi
if grep mod_auth_db Makefile  /dev/null; then
LIBS=$LIBS $DB_LIB
  ! if [ X$DB_LIB != X ]; then
  ! echo  + using $DB_LIB for mod_auth_db
  ! fi
fi

cvs commit: apache/htdocs/manual/mod mod_proxy.html

1997-07-20 Thread Brian Behlendorf 
brian   97/07/20 21:41:58

  Modified:htdocs/manual/mod  mod_proxy.html
  Log:
  PR: 785
  Submitted by: Lars Eilebrecht [EMAIL PROTECTED]
  
  mod_proxy directives can be put in virtual hosts too.
  
  Revision  ChangesPath
  1.28  +15 -15apache/htdocs/manual/mod/mod_proxy.html
  
  Index: mod_proxy.html
  ===
  RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_proxy.html,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -C3 -r1.27 -r1.28
  *** mod_proxy.html1997/07/20 22:19:33 1.27
  --- mod_proxy.html1997/07/21 04:41:57 1.28
  ***
  *** 60,66 
A name=proxyrequestsh2ProxyRequests/h2/A
strongSyntax:/strong ProxyRequests emon/off/embr
strongDefault:/strong codeProxyRequests Off/codebr
  ! strongContext:/strong server configbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr
strongCompatibility:/strong ProxyRequest is only available in
  --- 60,66 
A name=proxyrequestsh2ProxyRequests/h2/A
strongSyntax:/strong ProxyRequests emon/off/embr
strongDefault:/strong codeProxyRequests Off/codebr
  ! strongContext:/strong server config, virtual hostbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr
strongCompatibility:/strong ProxyRequest is only available in
  ***
  *** 72,78 

A name=proxyremoteh2ProxyRemote/h2/A
strongSyntax:/strong ProxyRemote emlt;matchgt; 
lt;remote-servergt;/embr
  ! strongContext:/strong server configbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr
strongCompatibility:/strong ProxyRemote is only available in
  --- 72,78 

A name=proxyremoteh2ProxyRemote/h2/A
strongSyntax:/strong ProxyRemote emlt;matchgt; 
lt;remote-servergt;/embr
  ! strongContext:/strong server config, virtual hostbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr
strongCompatibility:/strong ProxyRemote is only available in
  ***
  *** 104,110 

A name=proxypassh2ProxyPass/h2/A
strongSyntax:/strong ProxyPass emlt;pathgt; lt;urlgt;/embr
  ! strongContext:/strong server configbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr
strongCompatibility:/strong ProxyPass is only available in
  --- 104,110 

A name=proxypassh2ProxyPass/h2/A
strongSyntax:/strong ProxyPass emlt;pathgt; lt;urlgt;/embr
  ! strongContext:/strong server config, virtual hostbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr
strongCompatibility:/strong ProxyPass is only available in
  ***
  *** 124,130 

A name=proxyblockh2ProxyBlock/h2/A
strongSyntax:/strong ProxyBlock emlt;word/host/domain 
listgt;/embr
  ! strongContext:/strong server configbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr
strongCompatibility:/strong ProxyBlock is only available in
  --- 124,130 

A name=proxyblockh2ProxyBlock/h2/A
strongSyntax:/strong ProxyBlock emlt;word/host/domain 
listgt;/embr
  ! strongContext:/strong server config, virtual hostbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr
strongCompatibility:/strong ProxyBlock is only available in
  ***
  *** 158,164 
 | A HREF=#ipaddremlt;IpAddrgt;/em/A
 | A 
HREF=#hostnameemlt;Hostnamegt;/em/A
 } br
  ! strongContext:/strong server configbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr
strongCompatibility:/strong NoProxy is only available in
  --- 158,164 
 | A HREF=#ipaddremlt;IpAddrgt;/em/A
 | A 
HREF=#hostnameemlt;Hostnamegt;/em/A
 } br
  ! strongContext:/strong server config, virtual hostbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr
strongCompatibility:/strong NoProxy is only available in
  ***
  *** 260,266 

A name=proxydomainh2ProxyDomain/h2/A
strongSyntax:/strong ProxyDomain emlt;Domaingt;/embr
  ! strongContext:/strong server configbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr
strongCompatibility:/strong ProxyDomain is only available in
  --- 260,266 

A name=proxydomainh2ProxyDomain/h2/A
strongSyntax:/strong ProxyDomain emlt;Domaingt;/embr
  ! strongContext:/strong server config, virtual hostbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr
strongCompatibility:/strong ProxyDomain is only available in
  ***
  *** 281,287 

A name=cacherooth2CacheRoot/h2/A
strongSyntax:/strong CacheRoot emlt;directorygt;/embr
  ! strongContext:/strong server configbr
strongStatus:/strong Basebr
strongModule:/strong mod_proxybr