httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@hyperreal.org
Subject cvs commit: apachen/src/support Makefile.tmpl
Date Sat, 15 Nov 1997 19:04:54 GMT
coar        97/11/15 11:04:54

  Modified:    htdocs/manual new_features_1_3.html
               src      CHANGES Configure Makefile.tmpl
               src/main http_main.c
               src/support Makefile.tmpl
  Added:       src/ap   .cvsignore Makefile.tmpl ap_signal.c
  Log:
  	Create new src/ap sibdirectory for the ap_*() routines, and
  	tweak things to use it.  So far only ap_signal() has been
  	moved here, but that's enough to get htdigest to build.
  	Other functions can move here over time.
  
  PR:		512, 905, 1252, 1308
  Reviewed by:	Dean Gaudet, Roy Fielding
  
  Revision  Changes    Path
  1.34      +13 -0     apachen/htdocs/manual/new_features_1_3.html
  
  Index: new_features_1_3.html
  ===================================================================
  RCS file: /export/home/cvs/apachen/htdocs/manual/new_features_1_3.html,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- new_features_1_3.html	1997/11/12 23:29:18	1.33
  +++ new_features_1_3.html	1997/11/15 19:04:44	1.34
  @@ -469,6 +469,19 @@
     module has also been modified to display years using four digits in
     FancyIndexed directory listings.
    </LI>
  +
  + <LI><STRONG><SAMP>ap_*()</SAMP> Routines Moving to a Separate
Library</STRONG>
  +  <BR>
  +  There are a number of functions and routines that have been developed
  +  for the Apache project that supplement or supersede library routines
  +  that differ from one operating system to another.  While most of these
  +  are used only by the Apache server itself, some are referenced by
  +  supporting applications (such as <SAMP>htdigest</SAMP>), and these
  +  other applications would fail to build because the routines were built
  +  only into the server.  These routines are now being migrated to a
  +  separate subdirectory and library so they can be used by other
  +  applications than just the server.
  + </LI>
   </ul>
   
   <!--#include virtual="footer.html" -->
  
  
  
  1.513     +4 -0      apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.512
  retrieving revision 1.513
  diff -u -r1.512 -r1.513
  --- CHANGES	1997/11/15 03:29:55	1.512
  +++ CHANGES	1997/11/15 19:04:46	1.513
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3b3
   
  +  *) Start separating the ap_*() routines into their own library, so they
  +     can be used by items in src/support among other things.  PR#512, 905,
  +     1252, 1308 [Ken Coar]
  +
     *) Give a more informative error when no AuthType is set.
        [Lars Eilebrecht]
   
  
  
  
  1.171     +2 -2      apachen/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/Configure,v
  retrieving revision 1.170
  retrieving revision 1.171
  diff -u -r1.170 -r1.171
  --- Configure	1997/11/08 21:47:33	1.170
  +++ Configure	1997/11/15 19:04:47	1.171
  @@ -26,7 +26,7 @@
   tmpfile2=$tmpfile.2
   tmpfile3=$tmpfile.3
   awkfile=$tmpfile.4
  -SUBDIRS='$(OSDIR) main modules'
  +SUBDIRS='$(OSDIR) main ap modules'
   
   ####################################################################
   ## Now handle any arguments, which, for now, is -file
  @@ -1031,7 +1031,7 @@
   #
   # directories to create makefiles in
   #
  -MAKEDIRS="support main regex $OSDIR"
  +MAKEDIRS="support main ap regex $OSDIR"
   for dir in $MAKEDIRS ; do
   	echo Creating Makefile in $dir
   	cat Makefile.config $dir/Makefile.tmpl > $dir/Makefile
  
  
  
  1.72      +2 -1      apachen/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/Makefile.tmpl,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- Makefile.tmpl	1997/11/13 22:25:44	1.71
  +++ Makefile.tmpl	1997/11/15 19:04:47	1.72
  @@ -12,7 +12,8 @@
     modules.o \
     $(MODULES) \
     main/libmain.a \
  -  $(OSDIR)/libos.a
  +  $(OSDIR)/libos.a \
  +  ap/libap.a
   
   .c.o:
   	$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
  
  
  
  1.1                  apachen/src/ap/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  Makefile
  
  
  
  1.1                  apachen/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  LIBS=$(EXTRA_LIBS) $(LIBS1)
  INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES)
  LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  INCDIR=../main
  
  LIB=libap.a
  
  OBJS=ap_signal.o
  
  .c.o:
  	$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
  
  all: $(LIB)
  
  clean:
  	rm -f *.o *.a
  
  $(OBJS): Makefile
  
  $(LIB): $(OBJS)
  	ar cr $(LIB) $(OBJS)
  
  # dependencies
  ap_signal.o: $(INCDIR)/httpd.h
  
  
  
  1.1                  apachen/src/ap/ap_signal.c
  
  Index: ap_signal.c
  ===================================================================
  /* ====================================================================
   * Copyright (c) 1995-1997 The Apache Group.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *    software must display the following acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * 4. The names "Apache Server" and "Apache Group" must not be used to
   *    endorse or promote products derived from this software without
   *    prior written permission. For written permission, please contact
   *    apache@apache.org.
   *
   * 5. Redistributions of any form whatsoever must retain the following
   *    acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Group and was originally based
   * on public domain software written at the National Center for
   * Supercomputing Applications, University of Illinois, Urbana-Champaign.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see <http://www.apache.org/>.
   *
   */
  
  #include "httpd.h"
  
  #ifndef NO_USE_SIGACTION
  /*
   * Replace standard signal() with the more reliable sigaction equivalent
   * from W. Richard Stevens' "Advanced Programming in the UNIX Environment"
   * (the version that does not automatically restart system calls).
   */
  Sigfunc *signal(int signo, Sigfunc * func)
  {
      struct sigaction act, oact;
  
      act.sa_handler = func;
      sigemptyset(&act.sa_mask);
      act.sa_flags = 0;
  #ifdef  SA_INTERRUPT		/* SunOS */
      act.sa_flags |= SA_INTERRUPT;
  #endif
      if (sigaction(signo, &act, &oact) < 0)
  	return SIG_ERR;
      return oact.sa_handler;
  }
  #endif
  
  
  
  1.251     +0 -22     apachen/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
  retrieving revision 1.250
  retrieving revision 1.251
  diff -u -r1.250 -r1.251
  --- http_main.c	1997/11/13 20:20:46	1.250
  +++ http_main.c	1997/11/15 19:04:51	1.251
  @@ -714,28 +714,6 @@
   static APACHE_TLS int volatile alarm_pending = 0;
   static APACHE_TLS int volatile exit_after_unblock = 0;
   
  -#ifndef NO_USE_SIGACTION
  -/*
  - * Replace standard signal() with the more reliable sigaction equivalent
  - * from W. Richard Stevens' "Advanced Programming in the UNIX Environment"
  - * (the version that does not automatically restart system calls).
  - */
  -Sigfunc *signal(int signo, Sigfunc * func)
  -{
  -    struct sigaction act, oact;
  -
  -    act.sa_handler = func;
  -    sigemptyset(&act.sa_mask);
  -    act.sa_flags = 0;
  -#ifdef  SA_INTERRUPT		/* SunOS */
  -    act.sa_flags |= SA_INTERRUPT;
  -#endif
  -    if (sigaction(signo, &act, &oact) < 0)
  -	return SIG_ERR;
  -    return oact.sa_handler;
  -}
  -#endif
  -
   /* a clean exit from a child with proper cleanup */
   static void __attribute__((noreturn)) clean_child_exit(int code)
   {
  
  
  
  1.8       +5 -5      apachen/src/support/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/support/Makefile.tmpl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.tmpl	1997/10/22 23:31:25	1.7
  +++ Makefile.tmpl	1997/11/15 19:04:54	1.8
  @@ -4,9 +4,9 @@
   # by the configure script to make the actual Makefile.
   
   CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  -LIBS=$(EXTRA_LIBS) $(LIBS1)
  +LIBS=$(EXTRA_LIBS) $(LIBS1) -lap
   INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES)
  -LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  +LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L../ap
   
   .c.o: 
   	$(CC) -c $(CFLAGS) $(INCLUDES) $<
  @@ -16,16 +16,16 @@
   all: $(TARGETS)
   
   htpasswd: htpasswd.o
  -	$(CC) $(CFLAGS) htpasswd.o -o htpasswd $(LIBS)
  +	$(CC) $(CFLAGS) htpasswd.o -o htpasswd $(LDFLAGS) $(LIBS)
   
   htdigest: htdigest.o
  -	$(CC) $(CFLAGS) htdigest.o -o htdigest $(LIBS)
  +	$(CC) $(CFLAGS) htdigest.o -o htdigest $(LDFLAGS) $(LIBS)
   
   rotatelogs: rotatelogs.o
   	$(CC) $(INCLUDES) $(CFLAGS) rotatelogs.o -o rotatelogs
   
   logresolve: logresolve.o
  -	$(CC) $(INCLUDES) $(CFLAGS) logresolve.o -o logresolve $(LIBS)
  +	$(CC) $(INCLUDES) $(CFLAGS) logresolve.o -o logresolve $(LDFLAGS) $(LIBS)
   
   clean:
   	rm -f $(TARGETS) *.o
  
  
  

Mime
View raw message