cvs commit: apache-2.0/mpm/src/main iol_unix.c Makefile.tmpl buff.c http_connection.c http_protocol.c http_request.c

[dgaudet]

dgaudet 99/06/18 16:35:01

  Modified:mpm/src  CHANGES
   mpm/src/include buff.h
   mpm/src/main Makefile.tmpl buff.c http_connection.c
http_protocol.c http_request.c
  Added:   mpm/src/docs buff.txt
   mpm/src/include ap_iol.h
   mpm/src/main iol_unix.c
  Log:
  I'm sure this is wrong... but it's my start.  i/o layering.  Lots of stuff
  disabled/still to be implemented.  This served up a few static requests.
  
  Revision  ChangesPath
  1.3   +7 -0  apache-2.0/mpm/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/CHANGES,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CHANGES   1999/06/18 18:58:45 1.2
  +++ CHANGES   1999/06/18 23:34:56 1.3
  @@ -0,0 +1,7 @@
  +Changes with MPM
  +
  +* I/O layering and BUFF revamp.  See docs/buff.txt. [Dean Gaudet]
  +
  +* Basic restructuring to introduce the MPM concept; includes various
  +  changes to the module API... better described by
  +  docs/initial_blurb.txt.  [Dean Gaudet]
  
  
  
  1.1  apache-2.0/mpm/src/docs/buff.txt
  
  Index: buff.txt
  ===
  - ap_bungetc added
  - ap_blookc changed to return the character, rather than take a char *buff
  - in theory, errno is always useful on return from a BUFF routine
  - ap_bhalfduplex, B_SAFEREAD will be re-implemented using a layer I think
  - chunking gone for now, will return as a layer
  - ebcdic gone for now... it should be a layer
  
  
  
  1.3   +15 -15apache-2.0/mpm/src/include/buff.h
  
  Index: buff.h
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/include/buff.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- buff.h1999/06/18 19:20:47 1.2
  +++ buff.h1999/06/18 23:34:58 1.3
  @@ -63,6 +63,7 @@
   #endif
   
   #include 
  +#include "ap_iol.h"
   
   /* Reading is buffered */
   #define B_RD (1)
  @@ -83,16 +84,22 @@
   #define B_ERROR (48)
   /* TODO: implement chunked encoding as a layer */
   /* bflush() if a read would block */
  -#define B_SAFEREAD (128)
  +/* TODO: #define B_SAFEREAD (128) */
   /* buffer is a socket */
   #define B_SOCKET (256)
   
  +/* caller expects non-blocking behaviour */
  +#define B_NONBLOCK (512)
  +/* non-blocking bit set on fd */
  +#define B_NONBLOCK_SET (1024)
  +
   /* TODO: implement a ebcdic/ascii conversion layers */
   
   typedef struct buff_struct BUFF;
   
   struct buff_struct {
   int flags;   /* flags */
  +int saved_errno; /* saved errno */
   unsigned char *inptr;/* pointer to next location to read */
   int incnt;   /* number of bytes left to read from 
input buffer;
 * always 0 if had a read error  */
  @@ -106,14 +113,13 @@
   
   ap_pool *pool;
   
  -/* could also put pointers to the basic I/O routines here */
  -int fd;  /* the file descriptor */
  -time_t timeout;  /* timeout for B_SOCKET operations */
  +ap_iol iol;
   };
   
   /* Options to bset/getopt */
   #define BO_BYTECT (1)
   #define BO_TIMEOUT (2)
  +#define BO_ERROR (3)
   
   /* Stream creation and modification */
   API_EXPORT(BUFF *) ap_bcreate(pool *p, int flags);
  @@ -136,8 +142,7 @@
   /* I/O */
   API_EXPORT(int) ap_bread(BUFF *fb, void *buf, int nbyte);
   API_EXPORT(int) ap_bgets(char *s, int n, BUFF *fb);
  -API_EXPORT(int) ap_blookc(char *buff, BUFF *fb);
  -API_EXPORT(int) ap_bskiplf(BUFF *fb);
  +API_EXPORT(int) ap_blookc(BUFF *fb);
   API_EXPORT(int) ap_bwrite(BUFF *fb, const void *buf, int nbyte);
   API_EXPORT(int) ap_bflush(BUFF *fb);
   API_EXPORT(int) ap_bputs(const char *x, BUFF *fb);
  @@ -153,6 +158,10 @@
   #define ap_bgetc(fb)   ( ((fb)->incnt == 0) ? ap_bfilbuf(fb) : \
((fb)->incnt--, *((fb)->inptr++)) )
   
  +/* can only unput a single character that was read by ap_bgetc */
  +#define ap_bungetc(c, fb)  ((fb)->incnt++, *(--(fb)->inptr) = (c))
  + 
  +
   #define ap_bputc(c, fb) fb)->flags & (B_EOUT|B_WRERR|B_WR)) != B_WR || \
 (fb)->outcnt == (fb)->bufsiz) ? ap_bflsbuf(c, (fb)) : \
 ((fb)->outbase[(fb)->outcnt++] = (c), 0))
  @@ -181,15 +190,6 @@
   API_EXPORT(int) ap_bspawn_child(pool *, int (*)(void *, child_info *), void 
*,
enum kill_conditions, BUFF **pipe_in, 
BUFF **pipe_out,
BUFF **pipe_err);
  -
  -/* enable non-blocking operations */
  -API_EXPORT(int) ap_bnonblock(int fd);
  -API_EXPORT(int) ap_bblock(int fd);
  -/* and get an fd to select() on */
  -API_EXPORT(int) ap_bfileno(BUFF *fb, int direction);
  

cvs commit: apache-2.0/mpm/src/main buff.c http_protocol.c

[dgaudet]

dgaudet 99/06/18 12:20:50

  Modified:mpm/src/include buff.h
   mpm/src/main buff.c http_protocol.c
  Log:
  break chunked encoding, ebcdic, ... layering goes here
  
  Revision  ChangesPath
  1.2   +4 -48 apache-2.0/mpm/src/include/buff.h
  
  Index: buff.h
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/include/buff.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- buff.h1999/06/18 18:39:28 1.1
  +++ buff.h1999/06/18 19:20:47 1.2
  @@ -62,10 +62,6 @@
   extern "C" {
   #endif
   
  -#ifdef B_SFIO
  -#include "sfio.h"
  -#endif
  -
   #include 
   
   /* Reading is buffered */
  @@ -85,16 +81,13 @@
   #undef B_ERROR
   #endif
   #define B_ERROR (48)
  -/* Use chunked writing */
  -#define B_CHUNK (64)
  +/* TODO: implement chunked encoding as a layer */
   /* bflush() if a read would block */
   #define B_SAFEREAD (128)
   /* buffer is a socket */
   #define B_SOCKET (256)
  -#ifdef CHARSET_EBCDIC
  -#define B_ASCII2EBCDIC 0x4000  /* Enable conversion for this buffer */
  -#define B_EBCDIC2ASCII 0x8000  /* Enable conversion for this buffer */
  -#endif /*CHARSET_EBCDIC*/
  +
  +/* TODO: implement a ebcdic/ascii conversion layers */
   
   typedef struct buff_struct BUFF;
   
  @@ -103,7 +96,6 @@
   unsigned char *inptr;/* pointer to next location to read */
   int incnt;   /* number of bytes left to read from 
input buffer;
 * always 0 if had a read error  */
  -int outchunk;/* location of chunk header when chunking */
   int outcnt;  /* number of byte put in output buffer 
*/
   unsigned char *inbase;
   unsigned char *outbase;
  @@ -116,29 +108,9 @@
   
   /* could also put pointers to the basic I/O routines here */
   int fd;  /* the file descriptor */
  -#ifdef WIN32
  -HANDLE hFH;  /* Windows filehandle */
  -#endif
   time_t timeout;  /* timeout for B_SOCKET operations */
  -
  -/* transport handle, for RPC binding handle or some such */
  -void *t_handle;
  -
  -#ifdef B_SFIO
  -Sfio_t *sf_in;
  -Sfio_t *sf_out;
  -#endif
   };
   
  -#ifdef B_SFIO
  -typedef struct {
  -Sfdisc_t disc;
  -BUFF *buff;
  -} apache_sfio;
  -
  -extern Sfdisc_t *bsfio_new(pool *p, BUFF *b);
  -#endif
  -
   /* Options to bset/getopt */
   #define BO_BYTECT (1)
   #define BO_TIMEOUT (2)
  @@ -150,9 +122,6 @@
   /* XXX - unused right now - mvsk */
   API_EXPORT(BUFF *) ap_bopenf(pool *a, const char *name, int flg, int mode);
   
  -#ifdef WIN32
  -API_EXPORT(void) ap_bpushh(BUFF *fb, HANDLE hFH);
  -#endif
   API_EXPORT(int) ap_bsetopt(BUFF *fb, int optname, const void *optval);
   API_EXPORT(int) ap_bgetopt(BUFF *fb, int optname, void *optval);
   API_EXPORT(int) ap_bsetflag(BUFF *fb, int flag, int value);
  @@ -181,27 +150,14 @@
   API_EXPORT(int) ap_bflsbuf(int c, BUFF *fb);
   API_EXPORT(int) ap_bfilbuf(BUFF *fb);
   
  -#ifndef CHARSET_EBCDIC
  -
   #define ap_bgetc(fb)   ( ((fb)->incnt == 0) ? ap_bfilbuf(fb) : \
((fb)->incnt--, *((fb)->inptr++)) )
   
   #define ap_bputc(c, fb) fb)->flags & (B_EOUT|B_WRERR|B_WR)) != B_WR || \
 (fb)->outcnt == (fb)->bufsiz) ? ap_bflsbuf(c, (fb)) : \
 ((fb)->outbase[(fb)->outcnt++] = (c), 0))
  -
  -#else /*CHARSET_EBCDIC*/
  -
  -#define ap_bgetc(fb)   ( ((fb)->incnt == 0) ? ap_bfilbuf(fb) : \
  - ((fb)->incnt--, (fb->flags & B_ASCII2EBCDIC)\
  - ?os_toebcdic[(unsigned 
char)*((fb)->inptr++)]:*((fb)->inptr++)) )
  -
  -#define ap_bputc(c, fb) fb)->flags & (B_EOUT|B_WRERR|B_WR)) != B_WR || \
  -  (fb)->outcnt == (fb)->bufsiz) ? ap_bflsbuf(c, (fb)) : \
  -  ((fb)->outbase[(fb)->outcnt++] = (fb->flags & 
B_EBCDIC2ASCII)\
  -  ?os_toascii[(unsigned char)c]:(c), 0))
   
  -#endif /*CHARSET_EBCDIC*/
  +/* XXX: this doesn't belong here... should be part of a generic spawning API 
in APR/NSPR */
   struct child_info {
   #ifdef WIN32
   /*
  
  
  
  1.2   +11 -417   apache-2.0/mpm/src/main/buff.c
  
  Index: buff.c
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/main/buff.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- buff.c1999/06/18 18:39:29 1.1
  +++ buff.c1999/06/18 19:20:48 1.2
  @@ -75,12 +75,6 @@
   #ifndef DEFAULT_BUFSIZE
   #define DEFAULT_BUFSIZE (4096)
   #endif
  -/* This must be enough to represent (DEFAULT_BUFSIZE - 3) in hex,
  - * plus two extra characters.
  - */
  -#ifndef CHUNK_HEADER_SIZE
  -#define CHUNK_HEADER_SIZE (5)
  -#endif
   
   
   /* bwrite()s of greater than this size can result in a large_write() call,
  @@ -219,37 +213,21 @@
   else
fb->in

cvs commit: apache-2.0/mpm/src Configuration.mpm Configure

[dgaudet]

dgaudet 99/06/18 12:20:19

  Modified:mpm/src  Configuration.mpm Configure
  Log:
  lots todo
  
  Revision  ChangesPath
  1.2   +1 -1  apache-2.0/mpm/src/Configuration.mpm
  
  Index: Configuration.mpm
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/Configuration.mpm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Configuration.mpm 1999/06/18 18:49:44 1.1
  +++ Configuration.mpm 1999/06/18 19:20:18 1.2
  @@ -19,7 +19,7 @@
   Rule IRIXNIS=no
   Rule IRIXN32=yes
   Rule PARANOID=no
  -Rule EXPAT=default
  +Rule EXPAT=no
   Rule WANTHSREGEX=default
   # AddModule modules/experimental/mod_mmap_static.o
   # AddModule modules/standard/mod_env.o
  
  
  
  1.2   +6 -0  apache-2.0/mpm/src/Configure
  
  Index: Configure
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/Configure,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Configure 1999/06/18 18:39:23 1.1
  +++ Configure 1999/06/18 19:20:18 1.2
  @@ -1679,6 +1679,12 @@
   
   ## Now create modules.c
   ##
  +
  +## TODO: the mpm thing below should be controlled by a configuration
  +## TODO: directive... it should really be like another module, with
  +## TODO: a default selected depending on the platform
  +## TODO: there should be an mpm/foo/ hierarchy for the MPM
  +
   $CAT > $awkfile <<'EOFM'
   BEGIN {
modules[n++] = "core"
  
  
  

cvs commit: apache-apr/include apr_lock.h apr_thread_proc.h

[rbb]

rbb 99/06/18 12:11:20

  Modified:apr/include apr_win.h
   apr/test client.dsp server.dsp test.dsw testfile.dsp
testproc.dsp testsock.dsp testthread.c timetest.dsp
   apr/threadproc/win32 thread.c
   include  apr_lock.h apr_thread_proc.h
  Added:   apr/locks/win32 locks.c locks.def locks.dsp locks.h
  Log:
  Initial locking code for windows, and fixes for windows based threads.
  
  Revision  ChangesPath
  1.4   +1 -0  apache-apr/apr/include/apr_win.h
  
  Index: apr_win.h
  ===
  RCS file: /home/cvs/apache-apr/apr/include/apr_win.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_win.h 1999/06/03 19:43:50 1.3
  +++ apr_win.h 1999/06/18 19:10:58 1.4
  @@ -76,6 +76,7 @@
   
   #define API_EXPORT(x)x
   #define API_EXPORT_NONSTD(x) x
  +#define API_THREAD_FUNC __stdcall
   
   #define strcasecmp(s1, s2)   stricmp(s1, s2)
   #define sleep(t) Sleep(t * 1000)
  
  
  
  1.1  apache-apr/apr/locks/win32/locks.c
  
  Index: locks.c
  ===
  /* 
   * Copyright (c) 1999 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
   *[EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache"
   *nor may "Apache" appear in their names without prior written
   *permission of the Apache Group.
   *
   * 6. 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.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see .
   *
   */
  
  #include "apr_general.h"
  #include "apr_lib.h"
  #include "locks.h"
  
  ap_status_t ap_create_lock(ap_context_t *cont, ap_locktype_e type, char 
*fname, struct lock_t **lock)
  {
  struct lock_t *newlock;
  SECURITY_ATTRIBUTES sec;
  
  newlock = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
  
  newlock->cntxt = cont;
  newlock->fname = strdup(fname);
  
  sec.nLength = sizeof(SECURITY_ATTRIBUTES);
  sec.lpSecurityDescriptor = NULL;
  
  if (type == APR_CROSS_PROCESS || type == APR_LOCKALL) {
  sec.bInheritHandle = TRUE;
  }
  else {
  sec.bInheritHandle = FALSE;
  }
  
  newlock->mutex = CreateMutex(&sec, FALSE, fname);
  *lock = newlock;
  return APR_SUCCESS;
  }
  
  ap_status_t ap_child_init_lock(ap_context_t *cont, char *fname, struct lock_t 
**lock)
  {
  (*lock) = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
  
  if ((*lock) ==

cvs commit: apache-2.0/mpm/src/os/unix Makefile.tmpl

[dgaudet]

dgaudet 99/06/18 12:08:08

  Modified:mpm/src/ap Makefile.tmpl
   mpm/src  Makefile.tmpl
   mpm/src/main Makefile.tmpl
   mpm/src/modules/standard Makefile.tmpl
   mpm/src/os/unix Makefile.tmpl
  Log:
  update dependencies
  
  Revision  ChangesPath
  1.2   +8 -7  apache-2.0/mpm/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/ap/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl 1999/06/18 18:39:23 1.1
  +++ Makefile.tmpl 1999/06/18 19:07:57 1.2
  @@ -42,35 +42,36 @@
   ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
$(INCDIR)/util_uri.h
   ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
$(INCDIR)/util_uri.h
   ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
   ap_getpass.o: ap_getpass.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h
   ap_md5c.o: ap_md5c.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_md5.h \
  - $(INCDIR)/ap.h
  + $(INCDIR)/ap.h $(INCDIR)/apr.h
   ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
$(INCDIR)/util_uri.h
   ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_log.h
   ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
$(INCDIR)/util_uri.h
  
  
  
  1.2   +6 -5  apache-2.0/mpm/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl 1999/06/18 18:39:23 1.1
  +++ Makefile.tmpl 1999/06/18 19:07:59 1.2
  @@ -122,10 +122,11 @@
   
   # DO NOT REMOVE
   buildmark.o: buildmark.c include/ap_config.h include/ap_mmn.h \
  - include/ap_config_auto.h os/unix/os.h include/ap_ctype.h \
  - include/hsregex.h include/httpd.h include/alloc.h include/buff.h \
  - include/ap.h include/util_uri.h
  + include/ap_config_auto.h os/unix/os.h os/unix/os-inline.c \
  + include/ap_ctype.h include/hsregex.h include/httpd.h include/alloc.h \
  + include/buff.h include/ap.h include/apr.h include/util_uri.h
   modules.o: modules.c include/httpd.h include/ap_config.h \
include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \
  - include/ap_ctype.h include/hsregex.h include/alloc.h include/buff.h \
  - include/ap.h include/util_uri.h include/http_config.h
  + os/unix/os-inline.c include/ap_ctype.h include/hsregex.h \
  + include/alloc.h include/buff.h include/ap.h include/apr.h \
  + include/util_uri.h include/http_config.h
  
  
  
  1.2   +34 -63apache-2.0/mpm/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl 1999/06/18 18:39:29 1.1
  +++ Makefile.tmpl 1999/06/18 19:08:01 1.2
  @

cvs commit: apache-2.0/mpm/src/lib/expat-lite Makefile.tmpl

[dgaudet]

dgaudet 99/06/18 12:04:23

  Modified:mpm/src/lib/expat-lite Makefile.tmpl
  Log:
  someone needs to put a depend rule into here
  
  Revision  ChangesPath
  1.2   +2 -0  apache-2.0/mpm/src/lib/expat-lite/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/expat-lite/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl 1999/06/18 18:39:24 1.1
  +++ Makefile.tmpl 1999/06/18 19:04:21 1.2
  @@ -29,3 +29,5 @@
   
   .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $<
  +
  +depend:
  
  
  

cvs commit: apache-2.0/mpm 00README_FIRST_REALLY

[dgaudet]

dgaudet 99/06/18 12:00:18

  Added:   mpm  00README_FIRST_REALLY
  Log:
  ignore the man behind the curtain
  
  Revision  ChangesPath
  1.1  apache-2.0/mpm/00README_FIRST_REALLY
  
  Index: 00README_FIRST_REALLY
  ===
  This is a work in progress, don't believe anything you read in
  the docs at this level of the tree.
  
  Save yourself a headache and "cd src" and start working there.
  
  Dean
  
  
  

cvs commit: apache-2.0/mpm/src CHANGES BUILD.NOTES INDENT INSTALL PORTING README README.EBCDIC

[dgaudet]

dgaudet 99/06/18 11:58:49

  Modified:mpm/src  CHANGES
  Removed: mpm/src  BUILD.NOTES INDENT INSTALL PORTING README
README.EBCDIC
  Log:
  cleanup... rewrite the help later... clean state for changes for now
  
  Revision  ChangesPath
  1.2   +0 -6687   apache-2.0/mpm/src/CHANGES
  
<>
  
  

cvs commit: apache-2.0/mpm/src/main acceptlock.c fdqueue.c http_accept.c scoreboard.c

[dgaudet]

dgaudet 99/06/18 11:55:09

  Modified:mpm/src/include hsregex.h
  Removed: mpm/src/include acceptlock.h fdqueue.h
   mpm/src/main acceptlock.c fdqueue.c http_accept.c
scoreboard.c
  Log:
  clean these out for now, manoj/whoever can put them back if/when they
  implement mpms that use them
  
  Revision  ChangesPath
  1.2   +1 -1  apache-2.0/mpm/src/include/hsregex.h
  
  Index: hsregex.h
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/include/hsregex.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hsregex.h 1999/06/18 18:39:28 1.1
  +++ hsregex.h 1999/06/18 18:55:04 1.2
  @@ -16,7 +16,7 @@
   #endif
   #endif
   
  -#if defined(MAC_OS) || defined(MAC_OS_X_SERVER)
  +#if defined(RHAPSODY)
   #define ap_private_extern __private_extern__
   #else
   #define ap_private_extern
  
  
  

cvs commit: apache-2.0/mpm/src Configuration.mpm README.MPM 2.0_ARCH

[dgaudet]

dgaudet 99/06/18 11:49:45

  Added:   mpm/src  Configuration.mpm README.MPM
  Removed: mpm/src  2.0_ARCH
  Log:
  cleanup, build instructions
  
  Revision  ChangesPath
  1.1  apache-2.0/mpm/src/Configuration.mpm
  
  Index: Configuration.mpm
  ===
  EXTRA_CFLAGS= -Wall
  EXTRA_LDFLAGS=
  EXTRA_LIBS=
  EXTRA_INCLUDES=
  EXTRA_DEPS=
  #CC=
  #CPP=
  OPTIM=-O2 -g
  #RANLIB=
  #TARGET=
  #CFLAGS_SHLIB=
  #LD_SHLIB=
  #LDFLAGS_SHLIB=
  #LDFLAGS_SHLIB_EXPORT=
  Rule SHARED_CORE=default
  Rule SHARED_CHAIN=default
  Rule SOCKS4=no
  Rule SOCKS5=no
  Rule IRIXNIS=no
  Rule IRIXN32=yes
  Rule PARANOID=no
  Rule EXPAT=default
  Rule WANTHSREGEX=default
  # AddModule modules/experimental/mod_mmap_static.o
  # AddModule modules/standard/mod_env.o
  # AddModule modules/standard/mod_log_config.o
  # AddModule modules/standard/mod_log_agent.o
  # AddModule modules/standard/mod_log_referer.o
  # AddModule modules/standard/mod_mime_magic.o
  AddModule modules/standard/mod_mime.o
  # AddModule modules/standard/mod_negotiation.o
  # AddModule modules/standard/mod_status.o
  # AddModule modules/standard/mod_info.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
  # AddModule modules/standard/mod_asis.o
  # AddModule modules/standard/mod_imap.o
  # AddModule modules/standard/mod_actions.o
  # AddModule modules/standard/mod_speling.o
  # AddModule modules/standard/mod_userdir.o
  # AddModule modules/proxy/libproxy.a
  # AddModule modules/standard/mod_alias.o
  # AddModule modules/standard/mod_rewrite.o
  # AddModule modules/standard/mod_access.o
  # AddModule modules/standard/mod_auth.o
  # AddModule modules/standard/mod_auth_anon.o
  # AddModule modules/standard/mod_auth_dbm.o
  # AddModule modules/standard/mod_auth_db.o
  # AddModule modules/standard/mod_digest.o
  # AddModule modules/standard/mod_cern_meta.o
  # AddModule modules/standard/mod_expires.o
  # AddModule modules/standard/mod_headers.o
  # AddModule modules/standard/mod_usertrack.o
  # AddModule modules/example/mod_example.o
  # AddModule modules/standard/mod_unique_id.o
  # AddModule modules/standard/mod_so.o
  # AddModule modules/standard/mod_setenvif.o
  
  
  
  1.1  apache-2.0/mpm/src/README.MPM
  
  Index: README.MPM
  ===
  See the docs directory, in particular docs/initial_blurb.txt.
  
  Currently few of the modules compile, you'll want to use
  Configuration.mpm for now.
  
  Dean
  
  
  

cvs commit: apache-2.0/mpm/src/docs goals.txt initial_blurb.txt tls.txt

[dgaudet]

dgaudet 99/06/18 11:46:55

  Added:   mpm/src/docs goals.txt initial_blurb.txt tls.txt
  Log:
  add in some of the discussion
  
  Revision  ChangesPath
  1.1  apache-2.0/mpm/src/docs/goals.txt
  
  Index: goals.txt
  ===
  
  From [EMAIL PROTECTED] Fri Jun 18 11:46:10 1999
  Date: Fri, 18 Jun 1999 09:46:51 -0700 (PDT)
  From: Dean Gaudet <[EMAIL PROTECTED]>
  To: new-httpd@apache.org
  Subject: Re: work in progress: mpm-3.tar.gz
  X-Comment: Visit http://www.arctic.org/~dgaudet/legal for information 
regarding copyright and disclaimer.
  Reply-To: new-httpd@apache.org
  
  Yup it's a great idea waiting for someone to take it by the reins and
  implement it :) 
  
  A lot of folks in the past (in the group, and not in the group) have asked
  me "how can I help with 2.0?"  I'm trying to lay out a bunch of projects
  that will help me with this rearchitecture... and, if I can be so bold, I
  suspect that this is how we can finally get 2.0 going.  The stuff I'm
  doing is something which has been long overdue, and which is necessary for
  many of the plans that we've been thinking of. 
  
  I intend to make the feature set of mpm so desirable to unix-heads that
  they want to help clean it up, re-implement various 1.x features in it,
  and say "this is apache 2.0".
  
  I intend to make the feature set of mpm general enough that non-unix-heads
  see exactly where they can plug in a new kick-ass model that suits their
  architecture... such as completion ports for NT.  Previously these folks
  had to hack into the utter horrid mess of http_main, and there was much
  duplicated code.  My goal (and I think I've accomplished it in this first
  version) is to abstract the real purpose of the main loop inside http_main
  so that it can be replaced with architecture specific main loops. 
  
  Yes I'm a unix-bigot, but even within the unix world there are several
  possibilities for the MPM, and I want to be sure that people can implement
  all of them.  There's a fellow Zach from redhat who just implemented what
  is probably the fastest userland model for linux, and he's waiting to plug
  it into apache somehow.  There's a sun dude waiting to plug in solaris 7's
  in-kernel accelerator.  I want to accomodate all of them.  Hence the
  modular design of the MPM. 
  
  Some day we'll have a portable run-time, and that day we'll integrate it
  with the MPM.  I intend to ignore this issue for the moment, because we
  can't afford to wait any longer for the holy grail portable run-time...
  and I think it'll be obvious to the APR (or NSPR) folks how they too can
  plug into the MPM; but they're going to have to wait for layered BUFF
  first. 
  
  At the moment this is "dean's fork of apache", and I intend to play
  dictator on it for a while.  I have some very specific goals for it, and I
  want people to see where I'm going first before I release control.  I do
  want this to become apache 2.0 though, so I'm trying to accomodate enough
  people to make it acceptable.  But I could really use help as I've
  outlined -- at best I'm going to have prototype quality code; we've got a
  couple months of cleanup and testing before it'll be beta quality.
  
  OK back to hacking :)
  
  Dean
  
  On Fri, 18 Jun 1999, Ralf S. Engelschall wrote:
  
  > 
  > In article <[EMAIL PROTECTED]> you wrote:
  > 
  > > Oh, and another TODO which can happen now, before the modules are
  > > converted to the new structure... is to change the module structure to
  > > have only one "on_load" method, and have all other methods registered at
  > > run time. 
  > 
  > Yeah, that's a great idea. +1
  > We really have to get rid of the unflexible fixed dispatch lists...
  > 
  >Ralf S. Engelschall
  >[EMAIL PROTECTED]
  >www.engelschall.com
  > 
  
  
  
  
  1.1  apache-2.0/mpm/src/docs/initial_blurb.txt
  
  Index: initial_blurb.txt
  ===
  
  From [EMAIL PROTECTED] Fri Jun 18 11:43:50 1999
  Date: Thu, 17 Jun 1999 12:23:59 -0700 (PDT)
  From: Dean Gaudet <[EMAIL PROTECTED]>
  To: new-httpd@apache.org
  Subject: work in progress: mpm-3.tar.gz
  X-Comment: Visit http://www.arctic.org/~dgaudet/legal for information 
regarding copyright and disclaimer.
  Reply-To: new-httpd@apache.org
  
  This is the beginning of some massive code cleanup... we've been building
  so much crap into http_main it's been really difficult for me to work on
  the async/sync hybrid (ASH) stuff that I posted a few weeks back.  My main
  goal here was to rip out the "multi-processing model", or MPM, so that we
  can replace it with whatever we need depending on the platform. 
  
  For example, there could be a prefork MPM, a win32 MPM, a select/thread
  hybrid MPM, a tpf MPM, ...
  
  Th

cvs commit: apache-2.0/mpm/src/docs - New directory

[dgaudet]

dgaudet 99/06/18 11:43:13

  apache-2.0/mpm/src/docs - New directory

cvs commit: apache-2.0/mpm - Imported sources

[dgaudet]

dgaudet 99/06/18 11:40:00

  Log:
  import mpm-3 into the apache-2.0 repository
  
  Status:
  
  Vendor Tag:   dgaudet
  Release Tags: mpm-3
  
  N apache-2.0/mpm/ABOUT_APACHE
  N apache-2.0/mpm/Announcement
  N apache-2.0/mpm/INSTALL
  N apache-2.0/mpm/KEYS
  N apache-2.0/mpm/LICENSE
  N apache-2.0/mpm/Makefile.tmpl
  N apache-2.0/mpm/README
  N apache-2.0/mpm/README.NT
  N apache-2.0/mpm/README.configure
  N apache-2.0/mpm/RULES.CVS
  N apache-2.0/mpm/WARNING-NT.TXT
  N apache-2.0/mpm/config.layout
  N apache-2.0/mpm/configure
  N apache-2.0/mpm/config.status
  N apache-2.0/mpm/Makefile
  N apache-2.0/mpm/cgi-bin/printenv
  N apache-2.0/mpm/cgi-bin/test-cgi
  N apache-2.0/mpm/conf/.cvsignore
  N apache-2.0/mpm/conf/access.conf-dist
  N apache-2.0/mpm/conf/access.conf-dist-win
  N apache-2.0/mpm/conf/highperformance.conf-dist
  N apache-2.0/mpm/conf/httpd.conf-dist
  N apache-2.0/mpm/conf/httpd.conf-dist-win
  N apache-2.0/mpm/conf/magic
  N apache-2.0/mpm/conf/mime.types
  N apache-2.0/mpm/conf/srm.conf-dist
  N apache-2.0/mpm/conf/srm.conf-dist-win
  N apache-2.0/mpm/icons/back.gif
  N apache-2.0/mpm/icons/README
  N apache-2.0/mpm/icons/a.gif
  N apache-2.0/mpm/icons/alert.black.gif
  N apache-2.0/mpm/icons/alert.red.gif
  N apache-2.0/mpm/icons/apache_pb.gif
  N apache-2.0/mpm/icons/ball.gray.gif
  N apache-2.0/mpm/icons/ball.red.gif
  N apache-2.0/mpm/icons/binary.gif
  N apache-2.0/mpm/icons/binhex.gif
  N apache-2.0/mpm/icons/blank.gif
  N apache-2.0/mpm/icons/bomb.gif
  N apache-2.0/mpm/icons/box1.gif
  N apache-2.0/mpm/icons/box2.gif
  N apache-2.0/mpm/icons/broken.gif
  N apache-2.0/mpm/icons/burst.gif
  N apache-2.0/mpm/icons/c.gif
  N apache-2.0/mpm/icons/comp.blue.gif
  N apache-2.0/mpm/icons/comp.gray.gif
  N apache-2.0/mpm/icons/compressed.gif
  N apache-2.0/mpm/icons/continued.gif
  N apache-2.0/mpm/icons/dir.gif
  N apache-2.0/mpm/icons/dvi.gif
  N apache-2.0/mpm/icons/down.gif
  N apache-2.0/mpm/icons/f.gif
  N apache-2.0/mpm/icons/folder.gif
  N apache-2.0/mpm/icons/folder.open.gif
  N apache-2.0/mpm/icons/folder.sec.gif
  N apache-2.0/mpm/icons/forward.gif
  N apache-2.0/mpm/icons/generic.gif
  N apache-2.0/mpm/icons/generic.red.gif
  N apache-2.0/mpm/icons/generic.sec.gif
  N apache-2.0/mpm/icons/hand.right.gif
  N apache-2.0/mpm/icons/hand.up.gif
  N apache-2.0/mpm/icons/icon.sheet.gif
  N apache-2.0/mpm/icons/image1.gif
  N apache-2.0/mpm/icons/image2.gif
  N apache-2.0/mpm/icons/image3.gif
  N apache-2.0/mpm/icons/index.gif
  N apache-2.0/mpm/icons/layout.gif
  N apache-2.0/mpm/icons/left.gif
  N apache-2.0/mpm/icons/link.gif
  N apache-2.0/mpm/icons/movie.gif
  N apache-2.0/mpm/icons/p.gif
  N apache-2.0/mpm/icons/patch.gif
  N apache-2.0/mpm/icons/pdf.gif
  N apache-2.0/mpm/icons/pie0.gif
  N apache-2.0/mpm/icons/pie1.gif
  N apache-2.0/mpm/icons/pie2.gif
  N apache-2.0/mpm/icons/pie3.gif
  N apache-2.0/mpm/icons/pie4.gif
  N apache-2.0/mpm/icons/pie5.gif
  N apache-2.0/mpm/icons/pie6.gif
  N apache-2.0/mpm/icons/pie7.gif
  N apache-2.0/mpm/icons/pie8.gif
  N apache-2.0/mpm/icons/portal.gif
  N apache-2.0/mpm/icons/ps.gif
  N apache-2.0/mpm/icons/quill.gif
  N apache-2.0/mpm/icons/right.gif
  N apache-2.0/mpm/icons/screw1.gif
  N apache-2.0/mpm/icons/screw2.gif
  N apache-2.0/mpm/icons/script.gif
  N apache-2.0/mpm/icons/sound1.gif
  N apache-2.0/mpm/icons/sound2.gif
  N apache-2.0/mpm/icons/sphere1.gif
  N apache-2.0/mpm/icons/sphere2.gif
  N apache-2.0/mpm/icons/tar.gif
  N apache-2.0/mpm/icons/tex.gif
  N apache-2.0/mpm/icons/text.gif
  N apache-2.0/mpm/icons/transfer.gif
  N apache-2.0/mpm/icons/unknown.gif
  N apache-2.0/mpm/icons/up.gif
  N apache-2.0/mpm/icons/uu.gif
  N apache-2.0/mpm/icons/uuencoded.gif
  N apache-2.0/mpm/icons/world1.gif
  N apache-2.0/mpm/icons/world2.gif
  N apache-2.0/mpm/icons/small/README.txt
  N apache-2.0/mpm/icons/small/back.gif
  N apache-2.0/mpm/icons/small/binary.gif
  N apache-2.0/mpm/icons/small/binhex.gif
  N apache-2.0/mpm/icons/small/blank.gif
  N apache-2.0/mpm/icons/small/broken.gif
  N apache-2.0/mpm/icons/small/burst.gif
  N apache-2.0/mpm/icons/small/comp1.gif
  N apache-2.0/mpm/icons/small/comp2.gif
  N apache-2.0/mpm/icons/small/compressed.gif
  N apache-2.0/mpm/icons/small/continued.gif
  N apache-2.0/mpm/icons/small/dir.gif
  N apache-2.0/mpm/icons/small/dir2.gif
  N apache-2.0/mpm/icons/small/doc.gif
  N apache-2.0/mpm/icons/small/forward.gif
  N apache-2.0/mpm/icons/small/generic.gif
  N apache-2.0/mpm/icons/small/generic2.gif
  N apache-2.0/mpm/icons/small/generic3.gif
  N apache-2.0/mpm/icons/small/image.gif
  N apache-2.0/mpm/icons/small/image2.gif
  N apache-2.0/mpm/icons/small/index.gif
  N apache-2.0/mpm/icons/small/key.gif
  N apache-2.0/mpm/icons/small/movie.gif
  N apache-2.0/mpm/icons/small/patch.gif
  N apache-2.0/mpm/icons/small/ps.gif
  N apache-2.0/mpm/icons/small/rainbow.gif
  N apache-2.0/mpm/icons/small/sound.gif
  N apache-2.0/mpm/icons/small/sound2.gif
  N apache-2.0/mpm/icons/small/tar.gif
  N apache-2

Re: cvs commit: apache-1.3/src/main util.c

[Ben Laurie]

[EMAIL PROTECTED] wrote:
> 
> coar99/06/17 15:58:17
> 
>   Modified:src/main util.c
>   Log:
> Cosmetic; style fix and a nit: I object to the implicit assumption
> that NULL == 0, regardless of its validity.

That wasn't the assumption, implicit or otherwise. The assumption was
that !NULL is true.

BTW, I quote K&R ed. 2: "the constant zero may be assigned to a pointer,
and a pointer may be compared with the constant zero. The symbolic
constant NULL is often used in place of zero". So, you appear to be
objecting to the wisdom of God.

Cheers,

Ben.

--
http://www.apache-ssl.org/ben.html

"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
 - Indira Gandhi

cvs commit: apache-apr/apr/locks/win32 - New directory

[rbb]

rbb 99/06/18 05:27:40

  apache-apr/apr/locks/win32 - New directory

cvs commit: apache-apr/apr/misc/win32 timetest.c

[rbb]

rbb 99/06/18 05:08:57

  Modified:apr/misc/win32 timetest.c
  Log:
  Basic cleanup for timetest.c
  
  Revision  ChangesPath
  1.3   +54 -1 apache-apr/apr/misc/win32/timetest.c
  
  Index: timetest.c
  ===
  RCS file: /home/cvs/apache-apr/apr/misc/win32/timetest.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- timetest.c1999/06/17 18:56:05 1.2
  +++ timetest.c1999/06/18 12:08:56 1.3
  @@ -1,4 +1,57 @@
  -2
  +/* 
  + * Copyright (c) 1999 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
  + *[EMAIL PROTECTED]
  + *
  + * 5. Products derived from this software may not be called "Apache"
  + *nor may "Apache" appear in their names without prior written
  + *permission of the Apache Group.
  + *
  + * 6. 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.
  + * For more information on the Apache Group and the Apache HTTP server
  + * project, please see .
  + *
  + */
   #include 
   #include 
   #include 
  
  
  

cvs commit: apache-1.3/src CHANGES

[rse]

rse 99/06/18 00:58:35

  Modified:src  CHANGES
  Log:
  Be more clear that the DSO flags were involved only
  
  Revision  ChangesPath
  1.1382+1 -1  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1381
  retrieving revision 1.1382
  diff -u -r1.1381 -r1.1382
  --- CHANGES   1999/06/18 07:53:37 1.1381
  +++ CHANGES   1999/06/18 07:58:34 1.1382
  @@ -1,6 +1,6 @@
   Changes with Apache 1.3.7

  -  *) Better GCC detection for Solaris 2 where the `cc' 
  +  *) Better GCC detection for DSO flags under Solaris 2 where the `cc' 
command potentially _is_ GCC. [Ralf S. Engelschall]
   
 *) Fix apxs build issues on AIX 
  
  
  

cvs commit: apache-1.3/src CHANGES Configure

[rse]

rse 99/06/18 00:53:40

  Modified:src  CHANGES Configure
  Log:
  Better GCC detection for Solaris 2 where the `cc'
  command potentially _is_ GCC.
  
  Revision  ChangesPath
  1.1381+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1380
  retrieving revision 1.1381
  diff -u -r1.1380 -r1.1381
  --- CHANGES   1999/06/17 11:49:28 1.1380
  +++ CHANGES   1999/06/18 07:53:37 1.1381
  @@ -1,4 +1,8 @@
   Changes with Apache 1.3.7
  + 
  +  *) Better GCC detection for Solaris 2 where the `cc' 
  + command potentially _is_ GCC. [Ralf S. Engelschall]
  +
 *) Fix apxs build issues on AIX 
[Rasmus Lerdorf <[EMAIL PROTECTED]>]
   
  
  
  
  1.355 +5 -4  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.354
  retrieving revision 1.355
  diff -u -r1.354 -r1.355
  --- Configure 1999/06/16 22:19:16 1.354
  +++ Configure 1999/06/18 07:53:38 1.355
  @@ -1019,10 +1019,11 @@
SHLIB_SUFFIX_DEPTH=0
;;
*-solaris2*)
  - case $CC in
  - */gcc|gcc ) CFLAGS_SHLIB="-fPIC" ;;
  - */cc|cc   ) CFLAGS_SHLIB="-KPIC" ;;
  - esac
  + if [ "x`$CC -v 2>&1 | grep gcc`" != "x" ]; then
  + CFLAGS_SHLIB="-fPIC"
  + else
  + CFLAGS_SHLIB="-KPIC"
  + fi
LDFLAGS_SHLIB="-G"
LDFLAGS_SHLIB_EXPORT=""
SHLIB_SUFFIX_DEPTH=1