date:19970810

cvs commit: apache/src http_main.c

1997-08-10 Thread Marc Slemko

marc97/08/10 00:23:28

  Modified:src  http_main.c
  Log:
  Add lockfile name to error message printed out when
  USE_FLOCK_SERIALIZED_ACCEPT is defined.
  
  Revision  ChangesPath
  1.149.2.7 +1 -1  apache/src/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.149.2.6
  retrieving revision 1.149.2.7
  diff -u -r1.149.2.6 -r1.149.2.7
  --- http_main.c   1997/08/04 05:42:45 1.149.2.6
  +++ http_main.c   1997/08/10 07:23:26 1.149.2.7
  @@ -268,7 +268,7 @@
   if (lock_fd == -1)
   {
perror (open);
  - fprintf (stderr, Cannot open lock file\n);
  + fprintf (stderr, Cannot open lock file: %s\n, lock_fname);
exit (1);
   }
   unlink(lock_fname);

cvs commit: apachen/src Configure

1997-08-10 Thread Paul Sutton

pcs 97/08/10 06:29:08

  Modified:src  Configure
  Log:
  Source re-org: new style Configure
  
  Revision  ChangesPath
  1.127 +272 -119  apachen/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apachen/src/Configure,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- Configure 1997/08/09 00:55:52 1.126
  +++ Configure 1997/08/10 13:29:06 1.127
  @@ -22,6 +22,8 @@
   ##
   file=Configuration
   tmpfile=htconf.$$
  +tmpfile2=$tmpfile.2
  +tmpfile3=$tmpfile.3
   makefile_tmpl=Makefile.tmpl
   
   
  @@ -77,6 +79,7 @@
   # we bail out
   #
   if egrep -v '^%?Module[  ]+[A-Za-z0-9_]+[]+[^]+$' $tmpfile \
  + | egrep -v '^%?AddModule[   ]+[^]+$' \
| grep -v =  /dev/null
   then
 echo Syntax error --- The configuration file is used only to
  @@ -94,39 +97,6 @@
   if [ -f modules.c ] ; then mv modules.c modules.c.bak; fi
   
   
  -# Start building the modules.c file from what was included
  -# in Configuration
  -
  -sed -e 's/_module//' $tmpfile | awk modules.c '\
  -   BEGIN { modules[n++] = core ; pmodules[pn++] = core} \
  -   /^Module/ { modules[n++] = $2 ; pmodules[pn++] = $2 } \
  -   /^%Module/ { pmodules[pn++] = $2 } \
  -   END { print /* modules.c --- automatically generated by Apache; \
  -  print  * configuration script.  DO NOT HAND EDIT!; \
  -  print  */; \
  -  print ; \
  -  print #include \httpd.h\; \
  -  print #include \http_config.h\; \
  -  print ; \
  -  for (i = 0; i  pn; ++i) { \
  -  printf (extern module %s_module;\n, pmodules[i]); \
  -  } \
  -  print ; \
  -  print module *prelinked_modules[] = {; \
  -  for (i = 0; i  n; ++i) { \
  -  printf   %s_module,\n, modules[i]; \
  -  } \
  -  print   NULL; \
  -  print };; \
  -  print module *preloaded_modules[] = {; \
  -  for (i = 0; i  pn; ++i) { \
  -  printf   %s_module,\n, pmodules[i]; \
  -  } \
  -  print   NULL; \
  -  print };; \
  -   }'
  -
  -
   # Start creating the Makefile. We add some comments and
   # then fold in the modules that were included in Configuration
   #
  @@ -137,17 +107,6 @@
   echo # is re-run  Makefile
   echo #  Makefile
   
  -awk Makefile $tmpfile '\
  -   /^Module/ { modules[n++] = $3 } \
  -   /^%Module/ { modules[n++] = $3 } \
  -   END { print MODULES=\\; \
  -  for (i = 0; i  n; ++i) { \
  -  if (i  n-1) printf (  %s \\\n, modules[i]); \
  -  else printf (  %s\n, modules[i]); \
  -  } \
  -  print  \
  -   }'
  -
   
   # Now we create a stub file, called Makefile.config, which
   # just includes those assignments (eg: CC=gcc) in Configuration
  @@ -197,6 +156,9 @@
   
   PLAT=`./helpers/GuessOS`
   
  +SHELL=/bin/sh
  +OSDIR=os/unix
  +
   case $PLAT in
   *MPE/iX*)
   OS='MPE/iX'
  @@ -538,6 +500,7 @@
   
   # Show user what OS we came up with
   #
  +SRCDIR=`pwd`
   echo  + configured for $OS platform
   
   
  @@ -642,61 +605,11 @@
   
   # Now we do some general checks and some intelligent Configuration
   # control.
  -#
  -# First, we adjust as needed depending on which modules are
  -# being used.
  -#
  -
  -#
  -# Are they using the status monitor module? If so, check
  -# for STATUS rule and add if needed.
  -#
  -STAT_MOD=mod_status
  -if grep $STAT_MOD Makefile  /dev/null; then
  -if [ $RULE_STATUS = yes ]; then
  - CFLAGS=$CFLAGS -DSTATUS
  -fi
  -fi
  -
  -#
  -# Now HS's POSIX regex implementation if needed/wanted
  -#
  -if [ $RULE_WANTHSREGEX = yes ]; then
  -REGLIB=regex/libregex.a
  -INCLUDES=$INCLUDES -Iregex
  -fi
  -
  -#
  -# Now SOCKS4.
  -#  NOTE: We assume that if they are using SOCKS4, then they've
  -#   adjusted EXTRA_LIBS and/or EXTRA_LDFLAGS 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
  -if grep EXTRA_ Makefile | grep \-lsocks  /dev/null; then : ;
  -else
  - LIBS=$LIBS -L/usr/local/lib -lsocks
  -fi
  -if [ $OS = Solaris 2 ]; then
  - LIBS=$LIBS -lresolv
  -fi
  -fi
   
   
   # Continue building Makefile.config. We can add all

cvs commit: apachen/src Configuration.tmpl

1997-08-10 Thread Paul Sutton

pcs 97/08/10 06:29:51

  Modified:src  Configuration.tmpl
  Log:
  Source re-org: new style Configuration (Module - AddModule)
  
  Revision  ChangesPath
  1.71  +34 -34apachen/src/Configuration.tmpl
  
  Index: Configuration.tmpl
  ===
  RCS file: /export/home/cvs/apachen/src/Configuration.tmpl,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- Configuration.tmpl1997/08/05 10:17:52 1.70
  +++ Configuration.tmpl1997/08/10 13:29:51 1.71
  @@ -130,24 +130,24 @@
   ## passed to CGI/SSI scripts.  It is listed first (lowest priority) since
   ## it does not do per-request stuff.
   
  -Module env_module  mod_env.o
  +AddModule modules/standard/mod_env.o
   
   ## mod_dld defines commands that allow other modules to be loaded
   ## dynamically (at runtime).  This module is for experimental use only.
   
  -# Module dld_module  mod_dld.o
  +# AddModule modules/standard/mod_dld.o
   
   ##
   ## Request logging modules
   ##
   
  -Module config_log_module   mod_log_config.o
  +AddModule modules/standard/mod_log_config.o
   
   ## Optional modules for NCSA user-agent/referer logging compatibility
   ## We recommend, however, that you just use the configurable access_log.
   
  -# Module agent_log_modulemod_log_agent.o
  -# Module referer_log_module  mod_log_referer.o
  +# AddModule modules/standard/mod_log_agent.o
  +# AddModule modules/standard/mod_log_referer.o
   
   ##
   ## Type checking modules
  @@ -160,9 +160,9 @@
   ## don't confuse it with the previous module).
   ## mod_negotiation allows content selection based on the Accept* headers.
   
  -# Module mime_magic_module   mod_mime_magic.o
  -Module mime_module mod_mime.o
  -Module negotiation_module  mod_negotiation.o
  +# AddModule modules/standard/mod_mime_magic.o
  +AddModule modules/standard/mod_mime.o
  +AddModule modules/standard/mod_negotiation.o
   
   ##
   ## Content delivery modules
  @@ -172,22 +172,22 @@
   ## STATUS=yes (see the Rules section near the start of this file) to allow
   ## full status information.  Check conf/access.conf on how to enable this.
   
  -# Module status_module   mod_status.o
  +# AddModule modules/standard/mod_status.o
   
   ## The Info module displays configuration information for the server and 
   ## all included modules. It's very useful for debugging.
   
  -# Module info_module mod_info.o
  +# AddModule modules/standard/mod_info.o
   
   ## mod_include translates server-side include (SSI) statements in text files.
   ## mod_autoindex handles requests for directories which have no index file
   ## mod_dir handles requests on directories and directory index files.
   ## mod_cgi handles CGI scripts.
   
  -Module includes_module mod_include.o
  -Module autoindex_modulemod_autoindex.o
  -Module dir_module   mod_dir.o
  -Module cgi_module  mod_cgi.o
  +AddModule modules/standard/mod_include.o
  +AddModule modules/standard/mod_autoindex.o
  +AddModule modules/standard/mod_dir.o
  +AddModule modules/standard/mod_cgi.o
   
   ## The asis module implemented .asis file types, which allow the embedding
   ## of HTTP headers at the beginning of the document.  mod_imap handles 
internal 
  @@ -195,9 +195,9 @@
   ## CGI scripts which act as handlers for particular files, for example to
   ## automatically convert every GIF to another file type.
   
  -Module asis_module mod_asis.o
  -Module imap_module mod_imap.o
  -Module action_module   mod_actions.o
  +AddModule modules/standard/mod_asis.o
  +AddModule modules/standard/mod_imap.o
  +AddModule modules/standard/mod_actions.o
   
   ##
   ## URL translation modules.
  @@ -205,43 +205,43 @@
   ## The UserDir module for selecting resource directories by user name
   ## and a common prefix, e.g., /~user , /usr/web/user , etc.
   
  -Module userdir_module  mod_userdir.o
  +AddModule modules/standard/mod_userdir.o
   
   ## The proxy module enables the server to act as a proxy for outside
   ## http and ftp services. It's not as complete as it could be yet.
   ## NOTE: You do not want this module UNLESS you are running a proxy;
   ##   it is not needed for normal (origin server) operation.
   
  -# Module proxy_modulemodules/proxy/libproxy.a
  +# AddModule modules/proxy/libproxy.a
   
   ## The Alias module provides simple URL translation and redirection.
   
  -Module alias_modulemod_alias.o
  +AddModule modules/standard/mod_alias.o
   
   ## The URL rewriting module allows for powerful URI-to-URI and 
   ## URI-to-filename mapping using a regular expression based 
   ## rule-controlled rewriting engine.
   
  -# Module rewrite_module  mod_rewrite.o
  +# AddModule modules/standard/mod_rewrite.o
   
   ##
   ## Access control and authentication modules. 
   ##
  -Module access_module   mod_access.o
  -Module

cvs commit: apachen/src/core Makefile.tmpl

1997-08-10 Thread Paul Sutton

pcs 97/08/10 06:30:45

  Added:   src/core Makefile.tmpl
  Log:
  Source re-org: Makefile template (suffix) for the new core dir
  
  Revision  ChangesPath
  1.1  apachen/src/core/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  # Apache makefile suffix for core files
  
  # 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)
  LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  
  OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \
http_log.o http_protocol.o rfc1413.o util.o util_script.o buff.o\
md5c.o util_md5.o explain.o http_bprintf.o util_date.o util_snprintf.o \
fnmatch.o
  
  .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $
  
  all: $(OBJS)
  
  clean:
rm -f $(OBJS) 
  
  # Work around broken compilers
  http_bprintf.o: http_bprintf.c
$(CC) -c $(INCLUDES) $(CFLAGS) $(BROKEN_BPRINTF_FLAGS) http_bprintf.c
  
  #Dependencies
  
  $(OBJS): 
  
  # DO NOT REMOVE
  alloc.o: alloc.c httpd.h conf.h alloc.h buff.h multithread.h
  buff.o: buff.c httpd.h conf.h alloc.h buff.h http_main.h
  dummy.o: dummy.c
  explain.o: explain.c explain.h
  fnmatch.o: fnmatch.c
  gnu-fnmatch.o: gnu-fnmatch.c fnmatch.h
  http_bprintf.o: http_bprintf.c httpd.h conf.h alloc.h buff.h
  http_config.o: http_config.c httpd.h conf.h alloc.h buff.h \
   http_config.h http_core.h http_log.h http_request.h \
   http_conf_globals.h explain.h
  http_core.o: http_core.c httpd.h conf.h alloc.h buff.h http_config.h \
   http_core.h http_protocol.h http_conf_globals.h http_main.h \
   http_log.h rfc1413.h util_md5.h md5.h scoreboard.h fnmatch.h
  http_log.o: http_log.c httpd.h conf.h alloc.h buff.h http_config.h \
   http_core.h http_log.h
  http_main.o: http_main.c httpd.h conf.h alloc.h buff.h http_main.h \
   http_log.h http_config.h http_protocol.h http_request.h \
   http_conf_globals.h http_core.h scoreboard.h multithread.h explain.h
  http_protocol.o: http_protocol.c httpd.h conf.h alloc.h buff.h \
   http_config.h http_core.h http_protocol.h http_main.h http_log.h \
   util_date.h
  http_request.o: http_request.c httpd.h conf.h alloc.h buff.h \
   http_config.h http_request.h http_core.h http_protocol.h http_log.h \
   http_main.h scoreboard.h fnmatch.h
  md5c.o: md5c.c conf.h md5.h
  mod_access.o: mod_access.c httpd.h conf.h alloc.h buff.h http_core.h \
   http_config.h http_log.h http_request.h
  mod_actions.o: mod_actions.c httpd.h conf.h alloc.h buff.h \
   http_config.h http_request.h http_core.h http_protocol.h http_main.h \
   http_log.h util_script.h
  mod_alias.o: mod_alias.c httpd.h conf.h alloc.h buff.h http_config.h
  mod_asis.o: mod_asis.c httpd.h conf.h alloc.h buff.h http_config.h \
   http_protocol.h http_log.h util_script.h http_main.h http_request.h
  mod_auth.o: mod_auth.c httpd.h conf.h alloc.h buff.h http_config.h \
   http_core.h http_log.h http_protocol.h
  mod_auth_anon.o: mod_auth_anon.c httpd.h conf.h alloc.h buff.h \
   http_config.h http_core.h http_log.h http_protocol.h http_request.h
  mod_auth_db.o: mod_auth_db.c httpd.h conf.h alloc.h buff.h \
   http_config.h http_core.h http_log.h http_protocol.h
  mod_auth_dbm.o: mod_auth_dbm.c httpd.h conf.h alloc.h buff.h \
   http_config.h http_core.h http_log.h http_protocol.h
  mod_auth_msql.o: mod_auth_msql.c httpd.h conf.h alloc.h buff.h \
   http_config.h http_core.h http_log.h http_protocol.h
  mod_autoindex.o: mod_autoindex.c httpd.h conf.h alloc.h buff.h \
   http_config.h http_core.h http_request.h http_protocol.h http_log.h \
   http_main.h util_script.h
  mod_browser.o: mod_browser.c httpd.h conf.h alloc.h buff.h \
   http_config.h
  mod_cern_meta.o: mod_cern_meta.c httpd.h conf.h alloc.h buff.h \
   http_config.h util_script.h http_log.h http_request.h
  mod_cgi.o: mod_cgi.c httpd.h conf.h alloc.h buff.h http_config.h \
   http_request.h http_core.h http_protocol.h http_main.h http_log.h \
   util_script.h http_conf_globals.h
  mod_digest.o: mod_digest.c httpd.h conf.h alloc.h buff.h http_config.h \
   http_core.h http_log.h http_protocol.h util_md5.h md5.h
  mod_dir.o: mod_dir.c httpd.h conf.h alloc.h buff.h http_config.h \
   http_core.h http_request.h http_protocol.h http_log.h http_main.h \
   util_script.h
  mod_dld.o: mod_dld.c httpd.h conf.h alloc.h buff.h http_config.h \
   http_conf_globals.h
  mod_env.o: mod_env.c httpd.h conf.h alloc.h buff.h http_config.h
  mod_expires.o: mod_expires.c httpd.h conf.h alloc.h buff.h \
   http_config.h http_log.h
  mod_headers.o: mod_headers.c httpd.h conf.h alloc.h buff.h \
   http_config.h
  mod_imap.o: mod_imap.c httpd.h conf.h alloc.h buff.h http_config.h \
   http_request.h http_core.h http_protocol.h http_main.h http_log.h \
   util_script.h
  mod_include.o: mod_include.c httpd.h

cvs commit: apachen/src/modules/standard mod_auth_db.module

1997-08-10 Thread Paul Sutton

pcs 97/08/10 06:31:18

  Added:   src/modules/standard mod_auth_db.module
  Log:
  Source re-org: module definition file
  
  Revision  ChangesPath
  1.1  apachen/src/modules/standard/mod_auth_db.module
  
  Index: mod_auth_db.module
  ===
  Name: db_auth_module
  ConfigStart
 LIBS=$LIBS $DB_LIB
 if [ X$DB_LIB != X ]; then
   echo  + using $DB_LIB for mod_auth_db
 fi
  ConfigEnd

cvs commit: apachen/src/modules/standard mod_auth_dbm.c mod_status.c

1997-08-10 Thread Paul Sutton

pcs 97/08/10 06:32:01

  Modified:src/modules/standard mod_auth_dbm.c mod_status.c
  Log:
  Source re-org: add information required by Configure for this module
  
  Revision  ChangesPath
  1.22  +16 -0 apachen/src/modules/standard/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_dbm.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_auth_dbm.c1997/07/28 18:22:52 1.21
  +++ mod_auth_dbm.c1997/08/10 13:31:59 1.22
  @@ -71,6 +71,22 @@
   #include http_protocol.h
   #include ndbm.h
   
  +/*
  + * Module definition information - the part between the -START and -END
  + * lines below is used by Configure. This could be stored in a separate
  + * instead.
  + *
  + * MODULE-DEFINITION-START
  + * Name: dbm_auth_module
  + * ConfigStart
  +LIBS=$LIBS $DBM_LIB
  +if [ X$DBM_LIB != X ]; then
  + echo  + using $DBM_LIB for mod_auth_dbm
  +fi
  + * ConfigEnd
  + * MODULE-DEFINITION-END
  + */
  +
   typedef struct  {
   
   char *auth_dbmpwfile;
  
  
  
  1.59  +15 -0 apachen/src/modules/standard/mod_status.c
  
  Index: mod_status.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_status.c,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- mod_status.c  1997/07/28 18:23:05 1.58
  +++ mod_status.c  1997/08/10 13:31:59 1.59
  @@ -87,6 +87,21 @@
* 21.5.96  Additional Status codes (DNS and LOGGING only enabled if
extended STATUS is enabled) [George Burgyan/Jim J.]  */
   
  +/*
  + * Module definition information - the part between the -START and -END
  + * lines below is used by Configure. This could be stored in a separate
  + * instead.
  + *
  + * MODULE-DEFINITION-START
  + * Name: status_module
  + * ConfigStart
  +if [ $RULE_STATUS = yes ]; then
  + CFLAGS=$CFLAGS -DSTATUS
  +fi
  + * ConfigEnd
  + * MODULE-DEFINITION-END
  + */
  +
   #define IS_MODULE
   
   #include httpd.h

cvs commit: apachen/src/modules/proxy Makefile

1997-08-10 Thread Paul Sutton

pcs 97/08/10 06:32:37

  Modified:src/modules/example Makefile
   src/modules/proxy Makefile
  Log:
  Source re-org: refer to new core dir for include files
  
  Revision  ChangesPath
  1.3   +1 -1  apachen/src/modules/example/Makefile
  
  Index: Makefile
  ===
  RCS file: /export/home/cvs/apachen/src/modules/example/Makefile,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile  1997/07/23 18:08:45 1.2
  +++ Makefile  1997/08/10 13:32:30 1.3
  @@ -56,7 +56,7 @@
   # directory.  If the depth or relationship changes, the following line
   # may need to be changed.
   #
  -INCDIR=../..
  +INCDIR=../../core
   
   #
   # Everything below this point should be invariant.
  
  
  
  1.12  +1 -1  apachen/src/modules/proxy/Makefile
  
  Index: Makefile
  ===
  RCS file: /export/home/cvs/apachen/src/modules/proxy/Makefile,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile  1997/03/18 10:23:56 1.11
  +++ Makefile  1997/08/10 13:32:36 1.12
  @@ -53,7 +53,7 @@
   
   SHELL = /bin/sh
   
  -INCDIR = ../..
  +INCDIR = ../../core
   
   LIB=libproxy.a

cvs commit: apachen/src/os/unix Makefile.tmpl os.c os.h

1997-08-10 Thread Paul Sutton

pcs 97/08/10 06:33:20

  Added:   src/os/unix Makefile.tmpl os.c os.h
  Log:
  Source re-org: add dummy OS abstraction files for Unix
  
  Revision  ChangesPath
  1.1  apachen/src/os/unix/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  LIBS=$(EXTRA_LIBS) $(LIBS1)
  INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
  LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
  INCDIR=../../core
  
  OBJS= os.o
  
  all:  $(OBJS)
  
  .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $
  
  clean:
rm -f $(OBJS)
  
  # DO NOT REMOVE
  os.o: os.c
  
  
  
  1.1  apachen/src/os/unix/os.c
  
  Index: os.c
  ===
  
  
  
  1.1  apachen/src/os/unix/os.h
  
  Index: os.h
  ===

cvs commit: apachen/src Makefile.tmpl

1997-08-10 Thread Paul Sutton

pcs 97/08/10 06:33:59

  Modified:src  Makefile.tmpl
  Log:
  Source re-org: new simplified top-level makefile suffix
  
  Revision  ChangesPath
  1.55  +29 -118   apachen/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apachen/src/Makefile.tmpl,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- Makefile.tmpl 1997/08/06 20:21:19 1.54
  +++ Makefile.tmpl 1997/08/10 13:33:58 1.55
  @@ -8,15 +8,21 @@
   INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
   LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
   
  -OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \
  -  http_log.o http_protocol.o rfc1413.o util.o util_script.o modules.o buff.o\
  -  md5c.o util_md5.o explain.o http_bprintf.o util_date.o util_snprintf.o\
  -  fnmatch.o $(MODULES)
  +OBJS= \
  +  core/alloc.o core/http_main.o core/http_core.o \
  +  core/http_config.o core/http_request.o core/http_log.o \
  +  core/http_protocol.o core/rfc1413.o core/util.o \
  +  core/util_script.o core/buff.o core/md5c.o \
  +  core/util_md5.o core/explain.o core/http_bprintf.o \
  +  core/util_date.o core/util_snprintf.o core/fnmatch.o \
  +  modules.o \
  +  $(OSOBJ) \
  +  $(MODULES)
   
   .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $
   
  -all: @@Configuration@@ httpd
  +all: @@Configuration@@ os-dir core-dir modules/last-built httpd 
   
   @@Configuration@@: Configuration.tmpl
@echo @@Configuration@@ older than Configuration.tmpl, or doesn't 
exist.
  @@ -25,7 +31,7 @@
@echo If not, you will at least have to touch @@Configuration@@.
@false
   
  -httpd: $(REGLIB) $(OBJS)
  +httpd: $(REGLIB) modules.o
$(CC) $(LDFLAGS)  -o httpd $(OBJS) $(REGLIB) $(LIBS)
   
   regex/libregex.a:
  @@ -35,10 +41,23 @@
(cd modules; \
$(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
   
  +support: support-dir
  +
  +support-dir:
  + cd support; $(MAKE)
  +
  +core-dir:
  + cd core; $(MAKE)
  +
  +os-dir:  
  + cd $(OSDIR); $(MAKE)
  +
   clean:
  - rm -f httpd *.o core
  + rm -f httpd *.o $(OBJS) 
  + cd core; $(MAKE) clean
cd regex; $(MAKE) clean
cd modules; $(MAKE) clean
  + cd support; $(MAKE) clean
   
   dist.tar: 
# Assure a semi-sensible configuration going out...
  @@ -47,10 +66,6 @@
tar cvf dist.tar README INSTALL CHANGES TODO API.html \
Configuration Configure Makefile.tmpl Makefile *.h *.c
   
  -# Work around broken compilers
  -http_bprintf.o: http_bprintf.c
  - $(CC) -c $(INCLUDES) $(CFLAGS) $(BROKEN_BPRINTF_FLAGS) http_bprintf.c
  -
   # We really don't expect end users to use this rule.  It works only with
   # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
   # using it.
  @@ -60,115 +75,11 @@
 mv Makefile.tmpl Makefile.tmpl.bak \
 mv Makefile.new Makefile.tmpl
   
  +
   #Dependencies
   
   $(OBJS): Makefile
   
   # DO NOT REMOVE
  -alloc.o: alloc.c httpd.h conf.h alloc.h buff.h multithread.h
  -buff.o: buff.c httpd.h conf.h alloc.h buff.h http_main.h
  -dummy.o: dummy.c
  -explain.o: explain.c explain.h
  -fnmatch.o: fnmatch.c
  -gnu-fnmatch.o: gnu-fnmatch.c fnmatch.h
  -http_bprintf.o: http_bprintf.c httpd.h conf.h alloc.h buff.h
  -http_config.o: http_config.c httpd.h conf.h alloc.h buff.h \
  - http_config.h http_core.h http_log.h http_request.h \
  - http_conf_globals.h explain.h
  -http_core.o: http_core.c httpd.h conf.h alloc.h buff.h http_config.h \
  - http_core.h http_protocol.h http_conf_globals.h http_main.h \
  - http_log.h rfc1413.h util_md5.h md5.h scoreboard.h fnmatch.h
  -http_log.o: http_log.c httpd.h conf.h alloc.h buff.h http_config.h \
  - http_core.h http_log.h
  -http_main.o: http_main.c httpd.h conf.h alloc.h buff.h http_main.h \
  - http_log.h http_config.h http_protocol.h http_request.h \
  - http_conf_globals.h http_core.h scoreboard.h multithread.h explain.h
  -http_protocol.o: http_protocol.c httpd.h conf.h alloc.h buff.h \
  - http_config.h http_core.h http_protocol.h http_main.h http_log.h \
  - util_date.h
  -http_request.o: http_request.c httpd.h conf.h alloc.h buff.h \
  - http_config.h http_request.h http_core.h http_protocol.h http_log.h \
  - http_main.h scoreboard.h fnmatch.h
  -md5c.o: md5c.c conf.h md5.h
  -mod_access.o: mod_access.c httpd.h conf.h alloc.h buff.h http_core.h \
  - http_config.h http_log.h http_request.h
  -mod_actions.o: mod_actions.c httpd.h conf.h alloc.h buff.h \
  - http_config.h http_request.h http_core.h http_protocol.h http_main.h \
  - http_log.h util_script.h
  -mod_alias.o: mod_alias.c httpd.h conf.h alloc.h buff.h http_config.h
  -mod_asis.o: mod_asis.c httpd.h conf.h alloc.h buff.h http_config.h \
  - http_protocol.h http_log.h util_script.h http_main.h http_request.h
  -mod_auth.o: mod_auth.c httpd.h conf.h alloc.h buff.h

cvs commit: apachen/src/modules/standard Makefile.tmpl

1997-08-10 Thread Paul Sutton

pcs 97/08/10 07:15:02

  Added:   src/modules/standard Makefile.tmpl
  Log:
  Source re-org: Makefile suffix for standard modules
  
  Revision  ChangesPath
  1.1  apachen/src/modules/standard/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  mod_access.o: mod_access.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_core.h \
$(INCDIR)/http_config.h $(INCDIR)/http_log.h \
$(INCDIR)/http_request.h
  
  mod_actions.o: mod_actions.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_request.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
$(INCDIR)/http_log.h $(INCDIR)/util_script.h
  
  mod_alias.o: mod_alias.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h
  
  mod_asis.o: mod_asis.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
$(INCDIR)/util_script.h $(INCDIR)/http_main.h \
$(INCDIR)/http_request.h
  
  mod_auth.o: mod_auth.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_protocol.h
  
  mod_auth_anon.o: mod_auth_anon.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_protocol.h
  
  mod_auth_db.o: mod_auth_db.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_protocol.h
  
  mod_auth_dbm.o: mod_auth_dbm.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_protocol.h
  
  mod_auth_msql.o: mod_auth_msql.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_protocol.h
  
  mod_autoindex.o: mod_autoindex.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_request.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
$(INCDIR)/http_main.h $(INCDIR)/util_script.h
  
  mod_browser.o: mod_browser.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h
  
  mod_cern_meta.o: mod_cern_meta.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/util_script.h $(INCDIR)/http_log.h \
$(INCDIR)/http_request.h
  
  mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_request.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
$(INCDIR)/http_log.h $(INCDIR)/util_script.h \
$(INCDIR)/http_conf_globals.h
  
  mod_digest.o: mod_digest.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h $(INCDIR)/md5.h
  
  mod_dir.o: mod_dir.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_request.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
$(INCDIR)/http_main.h $(INCDIR)/util_script.h
  
  mod_dld.o: mod_dld.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_conf_globals.h
  
  mod_env.o: mod_env.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h
  
  mod_expires.o: mod_expires.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_log.h
  
  mod_headers.o: mod_headers.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h
  
  mod_imap.o: mod_imap.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_request.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
$(INCDIR)/http_log.h $(INCDIR)/util_script.h
  
  mod_include.o: mod_include.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \

cvs commit: apachen/src Configure

1997-08-10 Thread Jim Jagielski

jim 97/08/10 13:18:50

  Modified:src  Configure
  Log:
  Adjust some code layout to have TestCompile work a bit better. Also,
  [ -e ... ] isn't generic, so use [ -f ... ] instead.
  
  Revision  ChangesPath
  1.128 +31 -46apachen/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apachen/src/Configure,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- Configure 1997/08/10 13:29:06 1.127
  +++ Configure 1997/08/10 20:18:49 1.128
  @@ -1,5 +1,5 @@
   #!/bin/sh
  -trap 'rm -f $tmpfile; exit' 0 1 2 3 15
  +trap 'rm -f $tmpfile $tmpfile.2 $tmpfile.3; exit' 0 1 2 3 15
   
   # Apache configuration script, first cut --- rst.
   # Dont like it?  Inspired to do something better?  Go for it.
  @@ -25,6 +25,7 @@
   tmpfile2=$tmpfile.2
   tmpfile3=$tmpfile.3
   makefile_tmpl=Makefile.tmpl
  +SRCDIR=`pwd`
   
   
   ## Now handle any arguments, which, for now, are -file and -make
  @@ -70,6 +71,8 @@
sed 's/[]*$//' | \
sed 's/[]*=[]*/=/' | \
sed 's/^Rule[   ]*/##Rule:/' | \
  + sed 's/^[   ]*AddModule/AddModule/' | \
  + sed 's/^[]*%AddModule/%AddModule/' | \
sed 's/^[   ]*Module/Module/' | \
sed 's/^[]*%Module/%Module/'  $tmpfile
   
  @@ -85,8 +88,9 @@
 echo Syntax error --- The configuration file is used only to
 echo define the list of included modules or to set Makefile
 echo options or Configure rules, and I don't see that at all:
  -  egrep -v '^Module[ ]+[A-Za-z0-9_]+[]+[^]+$' $tmpfile | 
\
  -   grep -v =
  +  egrep -v '^%?Module[   ]+[A-Za-z0-9_]+[]+[^]+$' $tmpfile \
  +   | egrep -v '^%?AddModule[ ]+[^]+$'  \
  +   | grep -v =
 exit 1
   fi
   
  @@ -500,7 +504,6 @@
   
   # Show user what OS we came up with
   #
  -SRCDIR=`pwd`
   echo  + configured for $OS platform
   
   
  @@ -567,7 +570,6 @@
   # are going to use. This is easy, since this can be gleamed from
   # Makefile.config
   #
  -TCC=`egrep '^CC=' Makefile.config | tail -1 | awk -F= '{print $2}'`
   case $OS in
   'ULTRIX')
if [ $TCC = cc ]; then
  @@ -606,31 +608,9 @@
   # Now we do some general checks and some intelligent Configuration
   # control.
   
  -
  -# Continue building Makefile.config. We can add all flags with
  -# the exception of LIBS at this point
   #
  -
  -# Use TestCompile to see if $(CC) is ANSI and as a final sanity
  -# check
  -#
  -echo  + doing sanity check on compiler and options
  -if ./helpers/TestCompile ansi; then
  -:
  -else
  -   echo ** A test compilation with your Makefile configuration
  -   echo ** failed. This is most likely because your C compiler
  -   echo ** is not ANSI. Apache requires an ANSI C Compiler, such
  -   echo ** as gcc. The above error message from your compiler
  -   echo ** will also provide a clue.
  -   echo  Aborting!
  -   exit 1
  -fi
  -
  -
   # Use TestCompile to look for various LIBS
   #
  -
   case $PLAT in
   *-linux*)
# newer systems using glibc 2.x need -lcrypt
  @@ -689,8 +669,8 @@
LIBS=$LIBS -lresolv
   fi
   fi
  - 
  -#
  +
  +
   # Find out what modules we want and try and configure things for them
   # Module lines can look like this:
   #
  @@ -777,7 +757,7 @@
   
if [ -r $modbase.module ] ; then
cat $modbase.module  $tmpfile2
  - elif [ -e $modbase.c ] ; then
  + elif [ -f $modbase.c ] ; then
# Guess module structure name in case there is not
# module definition in this file
modname=`grep '^module .*;' $modbase.c | head -1 |\
  @@ -795,7 +775,7 @@
modname=`fgrep Name: $tmpfile2 | sed 's/^.*Name:[ ]*//'`
cat $tmpfile2 | sed '1,/ConfigStart/d;/ConfigEnd/,$d'  \
$tmpfile3
  - . $tmpfile3
  + . ./$tmpfile3
rm -f $tmpfile2 $tmpfile3
ext=o
fi
  @@ -803,7 +783,7 @@
modname=`echo $modbase | sed 's/^.*\///' | \
sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'`
fi
  - echo Adding Module $modname $modbase.$ext
  +#echo Adding Module $modname $modbase.$ext
echo Module $modname $modbase.$ext $tmpfile
   done
   
  @@ -854,16 +834,9 @@
  }'
   
   
  -#

cvs commit: apache/src/helpers TestCompile

1997-08-10 Thread Jim Jagielski

jim 97/08/10 13:27:29

  Modified:src  Configure
   src/helpers TestCompile
  Log:
  Minor change: rename 'ansi' flag of TestCompile to 'sanity', which
  makes more sense
  
  Revision  ChangesPath
  1.127 +1 -1  apache/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- Configure 1997/08/09 00:55:52 1.126
  +++ Configure 1997/08/10 20:27:27 1.127
  @@ -702,7 +702,7 @@
   # check
   #
   echo  + doing sanity check on compiler and options
  -if ./helpers/TestCompile ansi; then
  +if ./helpers/TestCompile sanity; then
   :
   else
  echo ** A test compilation with your Makefile configuration
  
  
  
  1.4   +3 -3  apache/src/helpers/TestCompile
  
  Index: TestCompile
  ===
  RCS file: /export/home/cvs/apache/src/helpers/TestCompile,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestCompile   1997/08/04 23:46:00 1.3
  +++ TestCompile   1997/08/10 20:27:28 1.4
  @@ -9,8 +9,8 @@
   # ./helpers/TestCompile lib libname
   #Which checks to see if libname exists on this system
   #
  -# ./helpers/TestCompile ansi
  -#Which checks to see if $(CC) is ANSI
  +# ./helpers/TestCompile sanity
  +#Which does a simple sanity check/test compile
   #
   # It does these by creating a small mini-makefile, based on
   # ../Makefile.config and trying to compile a small dummy
  @@ -53,7 +53,7 @@
ERRDIR='2/dev/null'
fi
;;
  -ansi)
  +sanity)
TLIB=
if [ $VERBOSE = no ]; then
ERRDIR='2/dev/null'

cvs commit: apachen/src/helpers TestCompile

1997-08-10 Thread Jim Jagielski

jim 97/08/10 13:28:04

  Modified:src  Configure
   src/helpers TestCompile
  Log:
  Minor change: rename 'ansi' flag of TestCompile to 'sanity', which
  makes more sense
  
  Revision  ChangesPath
  1.129 +3 -1  apachen/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apachen/src/Configure,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- Configure 1997/08/10 20:18:49 1.128
  +++ Configure 1997/08/10 20:28:02 1.129
  @@ -723,6 +723,8 @@
   #contain modules we want to build from both AddModule and Module
   #lines
   
  +echo  + Adding selected modules
  +
   MODFILES=`awk $tmpfile '$1 == AddModule { printf %s , $2 }'`
   MODDIRS=`awk  $tmpfile '\
($1 == Module  $3 ~ /^modules\//) { \
  @@ -857,7 +859,7 @@
   # check
   #
   echo  + doing sanity check on compiler and options
  -if ./helpers/TestCompile ansi; then
  +if ./helpers/TestCompile sanity; then
   :
   else
  echo ** A test compilation with your Makefile configuration
  
  
  
  1.4   +3 -3  apachen/src/helpers/TestCompile
  
  Index: TestCompile
  ===
  RCS file: /export/home/cvs/apachen/src/helpers/TestCompile,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestCompile   1997/08/04 23:46:00 1.3
  +++ TestCompile   1997/08/10 20:28:03 1.4
  @@ -9,8 +9,8 @@
   # ./helpers/TestCompile lib libname
   #Which checks to see if libname exists on this system
   #
  -# ./helpers/TestCompile ansi
  -#Which checks to see if $(CC) is ANSI
  +# ./helpers/TestCompile sanity
  +#Which does a simple sanity check/test compile
   #
   # It does these by creating a small mini-makefile, based on
   # ../Makefile.config and trying to compile a small dummy
  @@ -53,7 +53,7 @@
ERRDIR='2/dev/null'
fi
;;
  -ansi)
  +sanity)
TLIB=
if [ $VERBOSE = no ]; then
ERRDIR='2/dev/null'

cvs commit: apachen/src Configure

1997-08-10 Thread Jim Jagielski

jim 97/08/10 14:37:28

  Modified:src  Configure
  Log:
  Be a little paranoid: have Configure print out the lines between
  a module's ConfigStart/ConfigEnd lines. Also, don't bother creating
  and running those lines if they don't exist
  
  Revision  ChangesPath
  1.130 +12 -7 apachen/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apachen/src/Configure,v
  retrieving revision 1.129
  retrieving revision 1.130
  diff -u -r1.129 -r1.130
  --- Configure 1997/08/10 20:28:02 1.129
  +++ Configure 1997/08/10 21:37:27 1.130
  @@ -1,5 +1,5 @@
   #!/bin/sh
  -trap 'rm -f $tmpfile $tmpfile.2 $tmpfile.3; exit' 0 1 2 3 15
  +trap 'rm -f $tmpfile $tmpfile2 $tmpfile3; exit' 0 1 2 3 15
   
   # Apache configuration script, first cut --- rst.
   # Dont like it?  Inspired to do something better?  Go for it.
  @@ -766,7 +766,7 @@
sed 's/^module.*[   ][  ]*//' | \
sed 's/[]*;[]*$//'`
# Get any module definition part
  - if fgrep MODULE-DEFINITION- $modbase.c  /dev/null; then
  + if grep MODULE-DEFINITION- $modbase.c  /dev/null; then
cat $modbase.c | \
sed '1,/MODULE-DEFINITION-START/d;/MODULE-DEFINITION-END/,$d' \
 $tmpfile2
  @@ -774,14 +774,19 @@
fi  
if [ -r $tmpfile2 ] ; then
# Read a module definition from .module or .c
  - modname=`fgrep Name: $tmpfile2 | sed 's/^.*Name:[ ]*//'`
  - cat $tmpfile2 | sed '1,/ConfigStart/d;/ConfigEnd/,$d'  \
  - $tmpfile3
  - . ./$tmpfile3
  + modname=`grep Name: $tmpfile2 | sed 's/^.*Name:[  ]*//'`
  + if grep ConfigStart $tmpfile2  /dev/null \
  +   grep ConfigEnd $tmpfile2  /dev/null; then
  + echo o $modname runs:
  + sed '1,/ConfigStart/d;/ConfigEnd/,$d' $tmpfile2  \
  +  $tmpfile3
  + sed 's/^/ /' $tmpfile3
  + . ./$tmpfile3
  + fi
rm -f $tmpfile2 $tmpfile3
ext=o
fi
  - if [ -z $modname ] ; then
  + if [ x$modname = x ] ; then
modname=`echo $modbase | sed 's/^.*\///' | \
sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'`
fi

cvs commit: apache-site/mirrors index.html mirrors.list

1997-08-10 Thread Randy Terbush

randy   97/08/10 19:04:16

  Modified:mirrors  index.html mirrors.list
  Log:
  Add a few new mirror sites.
  
  Revision  ChangesPath
  1.14  +8 -0  apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- index.html1997/08/11 01:41:04 1.13
  +++ index.html1997/08/11 02:04:13 1.14
  @@ -85,6 +85,8 @@
   !-- [EMAIL PROTECTED] --
   A HREF=http://apache.iit.uni-miskolc.hu/;hu/A -
   !-- [EMAIL PROTECTED] --
  +A HREF=http://apache.ub.net.id/;id/A -
  +!-- [EMAIL PROTECTED] --
   A HREF=http://apache.koala.ie/;ie/A -
   !-- [EMAIL PROTECTED] --
   A HREF=http://apache.csn.ul.ie;ie/A -
  @@ -207,6 +209,10 @@
   !-- [EMAIL PROTECTED] --
   A HREF=http://apache.mpl.net/;us/A -
   !-- [EMAIL PROTECTED] --
  +A HREF=http://apache.plinet.com/;us/A -
  +!-- [EMAIL PROTECTED] --
  +A HREF=http://www.fon.bg.ac.yu/mirror/apache/;yu/A -
  +!-- [EMAIL PROTECTED] --
   A HREF=http://www.is.co.za/resources/ftpsite/apache/;za/A -
   !-- [EMAIL PROTECTED] --
   /STRONG
  @@ -269,6 +275,8 @@
   A HREF=ftp://sunsite.srce.hr/mirrors/ftp.apache.org/apache/;hr/A -
   !--  --
   A HREF=ftp://xenia.sote.hu/pub/linux/mirrors/www.apache.org/dist/;hu/A -
  +!--  --
  +A HREF=ftp://apache.ub.net.id/pub/apache/;id/A -
   !--  --
   A HREF=ftp://apache.koala.ie/pub/apache/dist/;ie/A -
   !--  --
  
  
  
  1.27  +5 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- mirrors.list  1997/08/11 01:41:06 1.26
  +++ mirrors.list  1997/08/11 02:04:14 1.27
  @@ -29,6 +29,7 @@
   http hu  http://foobar.szabinet.hu/apache/   [EMAIL PROTECTED]
   http hu  http://xenia.sote.hu/ftp/linux/mirrors/www.apache.org/  [EMAIL 
PROTECTED]
   http hu  http://apache.iit.uni-miskolc.hu/   [EMAIL PROTECTED]
  +http id  http://apache.ub.net.id/[EMAIL PROTECTED]
   http ie  http://apache.koala.ie/ [EMAIL PROTECTED]
   http ie  http://apache.csn.ul.ie [EMAIL PROTECTED]
   http il  http://vipe.technion.ac.il/apache/  [EMAIL PROTECTED]
  @@ -70,6 +71,7 @@
   http tr  http://apache.bilkent.edu.tr/   [EMAIL PROTECTED]
   http tw  http://www.uuserv.net.tw/apache/[EMAIL PROTECTED]
   http tw  http://www.me.ncu.edu.tw/apache/[EMAIL PROTECTED]
  +http:tw  http://apache.ficnet.net.tw/[EMAIL PROTECTED]
   http ua  http://www.neon.dp.ua/www.apache.org/   [EMAIL PROTECTED]
   http ua  http://ftp.icmp.lviv.ua/Apache/ [EMAIL PROTECTED]
   http ua  http://www.apache.carrier.kiev.ua/  [EMAIL PROTECTED]
  @@ -90,6 +92,8 @@
   http us  http://www.ameth.org/apache/[EMAIL PROTECTED]
   http us  http://apache.technomancer.com/ [EMAIL PROTECTED]
   http us  http://apache.mpl.net/  [EMAIL PROTECTED]
  +http us  http://apache.plinet.com/   [EMAIL PROTECTED]
  +http yu  http://www.fon.bg.ac.yu/mirror/apache/  [EMAIL PROTECTED]
   http za  http://www.is.co.za/resources/ftpsite/apache/   [EMAIL 
PROTECTED]
   ftp  ar  ftp://ftp.infoap.com.ar/pub/apache/dist/
   ftp  at  ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/
  @@ -119,6 +123,7 @@
   ftp  hk  ftp://ftp.hk.super.net/mirror/apache/dist/  [EMAIL 
PROTECTED]
   ftp  hr  ftp://sunsite.srce.hr/mirrors/ftp.apache.org/apache/
   ftp  hu  ftp://xenia.sote.hu/pub/linux/mirrors/www.apache.org/dist/
  +ftp  id  ftp://apache.ub.net.id/pub/apache/
   ftp  ie  ftp://apache.koala.ie/pub/apache/dist/
   ftp  il  ftp://ftp.rifkin.technion.ac.il/pub/apache/
   ftp  il  ftp://apache.linux.org.il/pub/linux/apache/dist/

cvs commit: apache-site index.html

1997-08-10 Thread Randy Terbush

randy   97/08/10 19:31:10

  Modified:.index.html
  Log:
  Get rid of those dang orange balls... :-)
  
  Revision  ChangesPath
  1.31  +16 -24apache-site/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/index.html,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- index.html1997/07/25 03:36:06 1.30
  +++ index.html1997/08/11 02:31:09 1.31
  @@ -28,31 +28,23 @@
   
   TABLE CELLPADDING=10
   TRTD
  -  IMG SRC=images/orange_ball.gif WIDTH=15 HEIGHT=15 alt=o
  -  A HREF=mirrors/International Mirror Sites/ABR
  -  IMG SRC=images/orange_ball.gif WIDTH=15 HEIGHT=15 alt=o
  -  A HREF=docs/Server Documentation/ABR
  -  IMG SRC=images/orange_ball.gif WIDTH=15 HEIGHT=15 alt=o
  -  A HREF=docs/misc/FAQ.htmlThe Apache FAQ/ABR
  -  IMG SRC=images/orange_ball.gif WIDTH=15 HEIGHT=15 alt=o
  -  A HREF=bug_report.htmlBug Reporting/ABR
  -  IMG SRC=images/orange_ball.gif WIDTH=15 HEIGHT=15 alt=o
  -  A HREF=info.htmlBackground Information/ABR
  -  IMG SRC=images/orange_ball.gif WIDTH=15 HEIGHT=15 alt=o
  -  A HREF=library/Project Library/A
  +UL
  +  LI A HREF=mirrors/International Mirror Sites/ABR
  +  LI A HREF=docs/Server Documentation/ABR
  +  LI A HREF=docs/misc/FAQ.htmlThe Apache FAQ/ABR
  +  LI A HREF=bug_report.htmlBug Reporting/ABR
  +  LI A HREF=info.htmlBackground Information/ABR
  +  LI A HREF=library/Project Library/A
  +/UL
   TD
  -  IMG SRC=images/orange_ball.gif WIDTH=15 HEIGHT=15 alt=o
  -  A HREF=dist/Download!/ABR
  -  IMG SRC=images/orange_ball.gif WIDTH=15 HEIGHT=15 alt=o
  -  A HREF=announcelist.htmlAnnouncements via Email/ABR
  -  IMG SRC=images/orange_ball.gif WIDTH=15 HEIGHT=15 alt=o
  -  A HREF=in_the_news.htmlIn the News/ABR
  -  IMG SRC=images/orange_ball.gif WIDTH=15 HEIGHT=15 alt=o
  -  A HREF=related_projects.htmlRelated Projects/ABR
  -  IMG SRC=images/orange_ball.gif WIDTH=15 HEIGHT=15 alt=o
  -  A HREF=contributors/Project Contributors/ABR
  -  IMG SRC=images/orange_ball.gif WIDTH=15 HEIGHT=15 alt=o
  -  A HREF=info/Other Information/A
  +UL
  +  LI A HREF=dist/Download!/ABR
  +  LI A HREF=announcelist.htmlAnnouncements via Email/ABR
  +  LI A HREF=in_the_news.htmlIn the News/ABR
  +  LI A HREF=related_projects.htmlRelated Projects/ABR
  +  LI A HREF=contributors/Project Contributors/ABR
  +  LI A HREF=info/Other Information/A
  +/UL
   /TR
   /TABLE

cvs commit: apache/src http_main.c

cvs commit: apachen/src Configure

cvs commit: apachen/src Configuration.tmpl

cvs commit: apachen/src/core Makefile.tmpl

cvs commit: apachen/src/modules/standard mod_auth_db.module

cvs commit: apachen/src/modules/standard mod_auth_dbm.c mod_status.c

cvs commit: apachen/src/modules/proxy Makefile

cvs commit: apachen/src/os/unix Makefile.tmpl os.c os.h

cvs commit: apachen/src Makefile.tmpl

cvs commit: apachen/src/modules/standard Makefile.tmpl

cvs commit: apachen/src Configure

cvs commit: apache/src/helpers TestCompile

cvs commit: apachen/src/helpers TestCompile

cvs commit: apachen/src Configure

cvs commit: apache-site/mirrors index.html mirrors.list

cvs commit: apache-site index.html

16 matches

Site Navigation

Mail list logo

Footer information