cvs commit: apache/src conf.h

1996-08-04 Thread Jim Jagielski
jim 96/08/04 18:45:09

  Modified:src   conf.h
  Log:
  Be specific
  
  Revision  ChangesPath
  1.31  +1 -1  apache/src/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -C3 -r1.30 -r1.31
  *** conf.h1996/07/30 19:36:59 1.30
  --- conf.h1996/08/05 01:45:08 1.31
  ***
  *** 397,403 
#include 
#endif

  ! #include "regex.h"

#ifdef HAVE_SYS_RESOURCE_H
#include 
  --- 397,403 
#include 
#endif

  ! #include 

#ifdef HAVE_SYS_RESOURCE_H
#include 
  
  
  


Re: cvs commit: apache/conf mime.types

1996-08-04 Thread Alexei Kosut
On Sun, 4 Aug 1996, Roy T. Fielding wrote:

> okay, so why did it say
> 
> Bad avail line: unavai

Because Paul (I think) mispelled unavail in the avail file. Someone should
probably fix it. But it doesn't hurt anything.

> Vi's standard input and output must be a terminal.
>  
> Log message unchanged or not specified
> a)bort, c)ontinue, e)dit, !)reuse this message unchanged for remaining 
> dirs

This comes about because cvs server has to do weird things with vi
and rcs to check in a file. I'm not sure exactly what, but it does it
every time. It's normal.

> Action: (continue) Checking in mime.types;
> /export/home/cvs/apache/conf/mime.types,v  <--  mime.types
> new revision: 1.5; previous revision: 1.4
> done
> Mailing the commit message...

This should be self-explanatory. It started to check in the file,
tells you what the filename is, what revision you are checking in, it
finished, and then it mails a message.

-- 

Alexei Kosut <[EMAIL PROTECTED]>  The Apache HTTP Server
URL: http://www.nueva.pvt.k12.ca.us/~akosut/   http://www.apache.org/



cvs commit: apache/src Configure Makefile.tmpl

1996-08-04 Thread Alexei Kosut
akosut  96/08/04 18:34:26

  Modified:src   Configure Makefile.tmpl
  Log:
  Make the extra space when compling http_bprintf on every OS except SCO5
  go away; it's disconcerting.
  
  Revision  ChangesPath
  1.8   +1 -1  apache/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -C3 -r1.7 -r1.8
  *** Configure 1996/08/05 01:17:22 1.7
  --- Configure 1996/08/05 01:34:24 1.8
  ***
  *** 196,202 
OS='SCO 5'
CFLAGS="$CFLAGS -DSCO5"
LIBS="$LIBS -lsocket -lmalloc -lprot"
  ! OSBPRINTF="-K noinline"
;;
SOLARIS2)
OS='Solaris 2'
  --- 196,202 
OS='SCO 5'
CFLAGS="$CFLAGS -DSCO5"
LIBS="$LIBS -lsocket -lmalloc -lprot"
  ! OSBPRINTF=" -K noinline"
;;
SOLARIS2)
OS='Solaris 2'
  
  
  
  1.22  +1 -1  apache/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -C3 -r1.21 -r1.22
  *** Makefile.tmpl 1996/08/05 01:25:52 1.21
  --- Makefile.tmpl 1996/08/05 01:34:25 1.22
  ***
  *** 43,49 

# Work around broken compilers
http_bprintf.o: http_bprintf.c
  ! $(CC) -c $(INCLUDES) $(CFLAGS) $(BROKEN_BPRINTF_FLAGS) http_bprintf.c

#Dependencies
#Core code
  --- 43,49 

# Work around broken compilers
http_bprintf.o: http_bprintf.c
  ! $(CC) -c $(INCLUDES) $(CFLAGS)$(BROKEN_BPRINTF_FLAGS) http_bprintf.c

#Dependencies
#Core code
  
  
  


cvs commit: apache/src Makefile.tmpl

1996-08-04 Thread Alexei Kosut
akosut  96/08/04 18:25:53

  Modified:src   Makefile.tmpl
  Log:
  Fix typo in CFLAGS.
  
  Revision  ChangesPath
  1.21  +1 -1  apache/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -C3 -r1.20 -r1.21
  *** Makefile.tmpl 1996/08/05 01:17:22 1.20
  --- Makefile.tmpl 1996/08/05 01:25:52 1.21
  ***
  *** 3,9 
# This is combined with the information in the "Configuration" file
# by the configure script to make the actual Makefile.

  ! CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_FLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
  --- 3,9 
# This is combined with the information in the "Configuration" file
# by the configure script to make the actual Makefile.

  ! CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
  
  
  


cvs commit: apache/src CHANGES Configuration.tmpl Configure INSTALL Makefile.tmpl README TODO

1996-08-04 Thread Jim Jagielski
jim 96/08/04 18:17:26

  Modified:src   CHANGES Configuration.tmpl Configure INSTALL
Makefile.tmpl  README TODO
  Log:
  Configure/Configuration.tmpl update.
  Clean up the way Configure does things and make Configuration a bit
  easier and intuitive on how to use it (No -1's so I guess it's OK)
  
  Revision  ChangesPath
  1.51  +6 -1  apache/src/CHANGES
  
  
  
  
  1.26  +115 -169  apache/src/Configuration.tmpl
  
  Index: Configuration.tmpl
  ===
  RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -C3 -r1.25 -r1.26
  *** Configuration.tmpl1996/07/30 19:36:57 1.25
  --- Configuration.tmpl1996/08/05 01:17:21 1.26
  ***
  *** 1,185 
# Config file for the Apache httpd.

# Configuration.tmpl is the template for Configuration. Configuration should
  ! # be edited to select system type. Configuration.tmpl should only be changed
  ! # when a new system or module is added, or an existing one modified.

  ! # There are three types of lines here:

# '#' comments, distinguished by having a '#' as the first non-blank 
character
#
  ! # Lines which set a Make option --- these are simply copied into the 
Makefile
#
# Module selection lines, distinguished by having 'Module' at the front.
# These list the configured modules, in priority order (highest priority
# first).  They're down at the bottom.

  - # First, ordinary compile-time configuration.
  - 
  - # What to call the compiler:  For normal machines with ANSI compilers
  - # CC= cc
  - # For Suns or other non-ANSI platforms. Please make sure your gcc is
  - # 2.0 or later, as 1.40 seems to create bad code for the Sun 4.
  - CC= gcc
  - 
  - # CFLAGS, compile flags.
  - 
  - # -DMINIMAL_DNS is now obsolete. Use httpd.conf settings of
  - # HostnameLookups on
  - # or
  - # HostnameLookups off
  - #
  - # If you want to have more secure hostname resolution at the cost of some 
  - # performance, use -DMAXIMUM_DNS.
  - # If you want setting the xbit of a file to cause it to be treated as
  - # server-included HTML (unless it is a CGI script), say -DXBITHACK.  Note
  - # that this is a run-time option, per-directory, either way (via the 
XBITHACK
  - # command); this option only sets the default.
  - 
  - # If you find that your OS can't cope with mmap (compiles OKAY but refuses
  - # to run and moans "httpd: Could not mmap memory" .. or similar) try
  - # disabling use of shared memory for process management (scoreboard with
  - # -DNO_MMAP) by uncommenting the line below:
  - #NOMMAPCFLAG= -DNO_MMAP
  - 
  - # Status Instrumentation
  - # In order for the status module to obtain full statistics Apache must
  - # be modified to keep track of various information.  This is not
  - # turned on by default. In order to enable full status details uncomment
  - # the line below:
  - #STATCFLAG= -DSTATUS
  - 
  - # Using SOCKS
  - # Apache can be compiled to work over a SOCKS firewall by 
  - # uncommenting the line below:
  - #SOCKSCFLAG= -Dconnect=Rconnect -Dselect=Rselect 
-Dgethostbyname=Rgethostbyname
  - 
  - #
  - # Also add the following to the EXTRA_LIBS define:
  - #
  - #  -L/usr/local/lib -lsocks
  - #
  - # making sure that -L points to wherever you've put libsocks.a.
  - 
  - # [Some other former Apache compile-time options are now treated 
differently;
  - #  the virtual host code is always present; DBM auth is an optional module, 
and
  - #  may be configured out by changing the module config below, though it 
still
  - #  defaults in.  Note that this config file does not include DBM auth by
  - #  default --- configure it in below if you need it].
  - 
  - # What level of optimization?
  - OPTMCFLAG= -O2
  - 
  - # Add whatever other flags you'd like here... Like, maybe -Wall
  - XTRACFLAG=
  - 
  - # Apache requires a POSIX regex implementation. Some/most platforms provide
  - # this capability, but for those that don't, Apache provides, simply for
  - # convenience, a regex implementation. The regex code is NOT official
  - # Apache code and the Apache team does not support or guarantee the code.
  - # If you want to use the supplied regex package, uncomment the following
  - # line (or set it equal to the regex lib on your system). ALSO: If
  - # using this _regex_ package, be sure to also uncomment REGINC as well
  - #REGLIBS=regex/libregex.a
  - #REGINC= -Iregex
  - 
  - # Default to using ranlib on libraries (for regex). Set this to something 
else
  - # if ranlib kills your system (usually by setting it again in the OS 
specific
  - # section below)
  - RANLIB=ranlib
  - 
  - # Place here any flags you may need upon linking, such as a flag to
  - # prevent dynamic linking (if desired)
  - LFLAGS= 

  ! # Place here any extra libraries you may need to link to. 
  ! # -lndb

Re: cvs commit: apache/conf mime.types

1996-08-04 Thread Roy T. Fielding
okay, so why did it say

Bad avail line: unavai
Vi's standard input and output must be a terminal.
 
Log message unchanged or not specified
a)bort, c)ontinue, e)dit, !)reuse this message unchanged for remaining dirs
Action: (continue) Checking in mime.types;
/export/home/cvs/apache/conf/mime.types,v  <--  mime.types
new revision: 1.5; previous revision: 1.4
done
Mailing the commit message...

after I edited the log message?  It apparently worked fine, but I've
never seen this response from a local commit.  I am assuming it is
part of the remote commit actions, and the part about the Log message
being unchanged is due to my mistake of placing the log text after the
Submitted-by line instead of before it, but the "Bad avail line" does
not give me the warm fuzzies. :(

.Roy


cvs commit: apache/conf mime.types

1996-08-04 Thread Roy Fielding
fielding96/08/04 02:26:08

  Modified:conf  mime.types
  Log:
  Submitted by: Roy Fielding
  Removed extensions from x-compress and x-gzip so that they won't
  conflict with the AddEncoding directives in srm.conf.
  
  Revision  ChangesPath
  1.5   +2 -2  apache/conf/mime.types
  
  Index: mime.types
  ===
  RCS file: /export/home/cvs/apache/conf/mime.types,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -C3 -r1.4 -r1.5
  *** mime.types1996/06/07 23:10:15 1.4
  --- mime.types1996/08/04 09:26:06 1.5
  ***
  *** 25,37 
application/wordperfect5.1
application/x-bcpio bcpio
application/x-cdlinkvcd
  ! application/x-compress  Z
application/x-cpio  cpio
application/x-csh   csh
application/x-director  dcr dir dxr
application/x-dvi   dvi
application/x-gtar  gtar
  ! application/x-gzip  gz
application/x-hdf   hdf
application/x-httpd-cgi cgi
application/x-koan  skp skd skt skm
  --- 25,37 
application/wordperfect5.1
application/x-bcpio bcpio
application/x-cdlinkvcd
  ! application/x-compress
application/x-cpio  cpio
application/x-csh   csh
application/x-director  dcr dir dxr
application/x-dvi   dvi
application/x-gtar  gtar
  ! application/x-gzip
application/x-hdf   hdf
application/x-httpd-cgi cgi
application/x-koan  skp skd skt skm