cvs commit: apache-site/uri-res N2L.cgi

1999-02-26 Thread brian 
brian   99/02/25 16:40:10

  Modified:.manual-index.cgi
   dist .htaccess
   uri-res  N2L.cgi
  Log:
  Make paths more portable, since I plan on moving the docroot for apache.org 
soon.
  
  Revision  ChangesPath
  1.9   +1 -1  apache-site/manual-index.cgi
  
  Index: manual-index.cgi
  ===
  RCS file: /home/cvs/apache-site/manual-index.cgi,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- manual-index.cgi  1997/08/07 12:17:36 1.8
  +++ manual-index.cgi  1999/02/26 00:39:58 1.9
  @@ -60,7 +60,7 @@
   # apache/htdocs/manual directory of the Apache distribution tree).
   #***
   #***
  -$INDEX = "/export/pub/apache/manual-index-data";
  +$INDEX = "/www/apache.org/manual-index-data";
   
   #***
   #***
  
  
  
  1.19  +7 -7  apache-site/dist/.htaccess
  
  Index: .htaccess
  ===
  RCS file: /home/cvs/apache-site/dist/.htaccess,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- .htaccess 1999/01/12 04:34:13 1.18
  +++ .htaccess 1999/02/26 00:40:02 1.19
  @@ -13,13 +13,13 @@
   AddDescription "1.3.4 compressed source" apache_1.3.4.tar.Z
   AddDescription "1.3.4 gzipped source" apache_1.3.4.tar.gz
   AddDescription "1.3.4 Win32 binary" apache_1_3_4.exe
  -AddDescription "List of changes in 1.3" /export/pub/apache/dist/CHANGES_1.3
  -AddDescription "List of changes in 1.2" /export/pub/apache/dist/CHANGES_1.2
  -AddDescription "Developer PGP keys" /export/pub/apache/dist/KEYS
  +AddDescription "List of changes in 1.3" /www/apache.org/dist/CHANGES_1.3
  +AddDescription "List of changes in 1.2" /www/apache.org/dist/CHANGES_1.2
  +AddDescription "Developer PGP keys" /www/apache.org/dist/KEYS
   AddDescription "PGP signature" *.asc
   AddDescription "Apache 1.3.4 Released" Announcement.txt
  -AddDescription "Binary distributions" /export/pub/apache/dist/binaries
  -AddDescription "Contributed software" /export/pub/apache/dist/contrib
  -AddDescription "Old source & binaries" /export/pub/apache/dist/old
  -AddDescription "Official patches" /export/pub/apache/dist/patches
  +AddDescription "Binary distributions" /www/apache.org/dist/binaries
  +AddDescription "Contributed software" /www/apache.org/dist/contrib
  +AddDescription "Old source & binaries" /www/apache.org/dist/old
  +AddDescription "Official patches" /www/apache.org/dist/patches
   IndexIgnore CVS
  
  
  
  1.2   +1 -1  apache-site/uri-res/N2L.cgi
  
  Index: N2L.cgi
  ===
  RCS file: /home/cvs/apache-site/uri-res/N2L.cgi,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- N2L.cgi   1998/05/05 03:15:33 1.1
  +++ N2L.cgi   1999/02/26 00:40:09 1.2
  @@ -1,5 +1,5 @@
   #!/usr/local/bin/perl
  -$mirfile = '/pub/apache/mirrors/mirrors.list';
  +$mirfile = '/www/apache.org/mirrors/mirrors.list';
   
   print "Content-type: text/plain\r\n";
   print "Expires: ", &http_time(time+3600), "\r\n";

cvs commit: apache-apr/pthreads/src/main http_protocol.c

1999-02-26 Thread rbb 
rbb 99/02/26 08:37:22

  Modified:pthreads/src/main http_protocol.c
  Log:
  Inserted some error handling code, and got rid of a nasty infinite loop.  
Stupid
  errno not getting reset when I thought it was.  This should fix the timeout
  code.
  
  Revision  ChangesPath
  1.7   +21 -3 apache-apr/pthreads/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/main/http_protocol.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- http_protocol.c   1999/02/25 13:43:36 1.6
  +++ http_protocol.c   1999/02/26 16:37:20 1.7
  @@ -903,6 +903,7 @@
   const char *expect;
   int access_status;
   struct pollfd *filedes;
  +int timeout, rv;
   
   filedes = (struct pollfd *)malloc(sizeof(struct pollfd));
   p = ap_make_sub_pool(conn->pool);
  @@ -941,16 +942,33 @@
   
   /* Get the request... */
   ap_bnonblock(r->connection->client, B_RD);
  +errno = 0;
   while (!read_request_line(r)) {
   if (errno == EAGAIN) {
  +errno = 0;
   filedes->fd = ap_bfileno(r->connection->client, B_RD);
   filedes->events = POLLIN; 
   filedes->revents = 0; 
  -if (poll(filedes, 1, ap_get_timeout(r)) == 0) {
  +timeout = ap_get_timeout(r);
  +if ((rv = poll(filedes, 1, timeout)) == 0) {
   ap_bclose(r->connection->client);
   }
  -else {
  -continue;
  +else if (rv == -1) { 
  +ap_bclose(r->connection->client);
  +ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
  + "Timeout hasn't occured, but something is wrong,
  +  closing the connection.");
  +}
  +else {
  +if (filedes->revents &= POLLIN) {
  +continue;
  +}
  +else {
  +ap_bclose(r->connection->client);
  +ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
  +  "Event other than POLLIN, closing 
connection.");
  +}
  +
   }
   }
   if (r->status == HTTP_REQUEST_URI_TOO_LARGE) {

cvs commit: apache-apr/apr/file_io/beos - New directory

1999-02-26 Thread rbb 
rbb 99/02/26 09:00:00

  apache-apr/apr/file_io/beos - New directory

cvs commit: apache-apr/apr/file_io/beos Makefile filedup.c filestat.c open.c readwrite.c

1999-02-26 Thread rbb 
rbb 99/02/26 09:06:45

  Added:   apr/file_io/beos Makefile filedup.c filestat.c open.c
readwrite.c
  Log:
  Initial revision of apr file_io logic for BeOS.
  Submitted by: David Reid
  
  Revision  ChangesPath
  1.1  apache-apr/apr/file_io/beos/Makefile
  
  Index: Makefile
  ===
  ##
  ##  Apache Makefile, automatically generated by Configure script.
  ##  Hand-edited changes will be lost if the Configure script is re-run.
  ##  Sources: - ../Makefile.config (via Configuration.apaci)
  ##   - ./Makefile.tmpl
  ##
  
  ##
  ##  Inherited Makefile options from Configure script
  ##  (Begin of automatically generated section)
  ##
  SRCDIR=..
  EXTRA_CFLAGS=-g 
  EXTRA_LDFLAGS=
  EXTRA_LIBS=
  EXTRA_INCLUDES=
  EXTRA_DEPS=
  OSDIR=
  INCDIR=../../../include
  INCLUDES0=-I $(INCDIR)
  SHELL=/bin/sh
  CC=gcc
  CPP=gcc -E
  TARGET=
  OPTIM=
  CFLAGS_SHLIB=-fpic -DSHARED_MODULE
  LD_SHLIB=ld
  LDFLAGS_SHLIB=-Bshareable
  LDFLAGS_SHLIB_EXPORT=-rdynamic
  CFLAGS1= -DBEOS -DUSE_HSREGEX
  INCLUDES1=
  LIBS_SHLIB=
  LDFLAGS1=
  MFLAGS_STATIC=--no-print-directory
  REGLIB=regex/libregex.a
  RANLIB=ranlib
  LIBS1= #-lm -lcrypt -lndbm -ldl
  ##
  ##  (End of automatically generated section)
  ##
  
  
  CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  LIBS=$(EXTRA_LIBS) $(LIBS1)
  INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  
  LIB=  libfile.a
  
  OBJS= open.o readwrite.o filedup.o filestat.o\
  
  .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $<
  
  all: $(HEADERS) $(LIB)
  
  $(LIB): $(OBJS)
rm -f $@
ar cr $@ $(OBJS)
$(RANLIB) $@
cp $@ ../
  clean:
rm -f *.o $(LIB)
  
  distclean: clean
-rm -f Makefile
  
  # 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.
  depend:
cp Makefile.tmpl Makefile.tmpl.bak \
&& sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
&& gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
&& sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
   -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
> Makefile.tmpl \
&& rm Makefile.new
  
  #Dependencies
  
  $(OBJS): Makefile
  
  # DO NOT REMOVE
  open.o: open.c filestat.c
  readwrite.o: readwrite.c
  filedup.o: filedup.c
  filestat.o: filestat.c
  
  
  
  1.1  apache-apr/apr/file_io/beos/filedup.c
  
  Index: filedup.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 CONTRA

cvs commit: apache-1.3/htdocs/manual/mod mod_so.html

1999-02-26 Thread stoddard 
stoddard99/02/26 09:07:04

  Modified:htdocs/manual/mod mod_so.html
  Log:
  mod_so is base, not experimental.
  Submitted by: Shane Owenby
  
  Revision  ChangesPath
  1.6   +2 -2  apache-1.3/htdocs/manual/mod/mod_so.html
  
  Index: mod_so.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_so.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_so.html   1998/05/20 14:12:59 1.5
  +++ mod_so.html   1999/02/26 17:07:03 1.6
  @@ -57,7 +57,7 @@
   Status: Experimental
  +>Status: Base
   Status: Experimental
  +>Status: Base

cvs commit: apache-apr/apr/test Makefile.beos testfile.c

1999-02-26 Thread rbb 
rbb 99/02/26 10:58:59

  Modified:apr/test testfile.c
  Added:   apr/test Makefile.beos
  Log:
  New code for BeOS testing of apr.  Mostly minor changes that are a good idea
  for any OS.  Except for #includes, these changes will all go away once the
  rest of the abstraction is finished.  Also a new Makefile for the BeOS.  This
  is temporary until I figure out autoconf well enough to have the Makefiles
  generated for us.
  Submitted by: David Reid
  
  Revision  ChangesPath
  1.4   +9 -2  apache-apr/apr/test/testfile.c
  
  Index: testfile.c
  ===
  RCS file: /home/cvs/apache-apr/apr/test/testfile.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- testfile.c1999/02/25 19:48:57 1.3
  +++ testfile.c1999/02/26 18:58:59 1.4
  @@ -58,8 +58,11 @@
   #include "apr_general.h"
   #include "errno.h"
   #include 
  +#ifdef BEOS
  +#include 
  +#endif
   
  -void main()
  +int main()
   {
   apr_file_t *thefile = NULL;
   apr_status_t status = 0;
  @@ -109,8 +112,11 @@
   }
   
   fprintf(stdout, "Moving to start of file...");
  -
  +#ifdef BEOS
  +if (lseek(thefile->filedes, 0, SEEK_SET) != 0) {
  +#else
   if (lseek(thefile->filedes, SEEK_SET, 0) != 0) {
  +#endif
   perror("couldn't seek to beginning of file.");
   exit(-1);
   }
  @@ -143,4 +149,5 @@
   else {
   fprintf(stdout, "OK\n");
   }
  +return 1;
   }
  
  
  
  1.1  apache-apr/apr/test/Makefile.beos
  
  Index: Makefile.beos
  ===
  ##
  ##  Apache Makefile, automatically generated by Configure script.
  ##  Hand-edited changes will be lost if the Configure script is re-run.
  ##  Sources: - ../Makefile.config (via Configuration.apaci)
  ##   - ./Makefile.tmpl
  ##
  
  ##
  ##  Inherited Makefile options from Configure script
  ##  (Begin of automatically generated section)
  ##
  SRCDIR=..
  EXTRA_CFLAGS=-g -Wall
  EXTRA_LDFLAGS=
  EXTRA_LIBS= -L../file_io -lfile
  EXTRA_INCLUDES=
  EXTRA_DEPS=
  OSDIR=
  INCDIR=../../include
  INCLUDES0=-I $(INCDIR)
  SHELL=/bin/sh
  CC=gcc
  CPP=gcc -E
  TARGET=
  OPTIM=
  CFLAGS_SHLIB=-nostart
  LD_SHLIB=ld
  LDFLAGS_SHLIB=-Bshareable
  LDFLAGS_SHLIB_EXPORT=-nostart
  CFLAGS1= -DBEOS -DUSE_HSREGEX
  INCLUDES1=
  LIBS_SHLIB=
  LDFLAGS1=
  MFLAGS_STATIC=--no-print-directory
  REGLIB=regex/libregex.a
  RANLIB=ranlib
  LIBS1= 
  ##
  ##  (End of automatically generated section)
  ##
  
  
  CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  LIBS=$(EXTRA_LIBS) $(LIBS1)
  INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  
  OBJS= testfile.o \
  
  .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(LIBS) $<
  
  testfile:
$(CC) testfile.c $(INCLUDES) $(CFLAGS) $(LIBS) $<
  
  
  clean:
rm -f *.o $(LIB)
  
  distclean: clean
-rm -f Makefile
  
  # 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.
  depend:
cp Makefile.tmpl Makefile.tmpl.bak \
&& sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
&& gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
&& sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
   -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
> Makefile.tmpl \
&& rm Makefile.new
  
  #Dependencies
  
  $(OBJS): Makefile
  
  # DO NOT REMOVE
  alloc.o: open.c

cvs commit: apache-apr STATUS

1999-02-26 Thread rbb 
rbb 99/02/26 11:59:13

  Modified:.STATUS
  Log:
  Update the STATUS file
  
  Revision  ChangesPath
  1.10  +6 -9  apache-apr/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-apr/STATUS,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- STATUS1999/02/17 08:13:13 1.9
  +++ STATUS1999/02/26 19:59:13 1.10
  @@ -1,5 +1,5 @@
   Apache Portable Runtime STATUS:
  -Last modified at [$Date: 1999/02/17 08:13:13 $]
  +Last modified at [$Date: 1999/02/26 19:59:13 $]
   
   Release:
   
  @@ -27,13 +27,6 @@
Re-write mod_status to use updated scoreboard for hybrid server.
   This is pretty close to completion. 
   
  -Accept Serialization across Processes
  - Currently, we use one mutex total, we need to change this to be
  - one mutex per socket.  Possibly, we could attach the mutex to the
  - listen_rec, and pass it down to the accept loop.
  -
  -Timeouts.  (only soft timeouts)
  -
   Check misc thread safety.  Make sure UNIX code path mirrors NT path where
  appropriate
   
  @@ -77,5 +70,9 @@
   Put (back) in the logic to manage the number of processes.
Managing threads per process other than with a configuration
constant is in doubt.
  -
  +Accept Serialization across Processes
  + We now use one mutex per socket.
  +Timeouts.  (only soft timeouts)
  + Keepalive and Initail Conection timeouts are done.  Are there others?
  + CGI?

cvs commit: apache-apr/pthreads/src Configure

1999-02-26 Thread rbb 
rbb 99/02/26 12:04:21

  Modified:pthreads/src Configure
  Log:
  Changes to configure so the hybrid server will compile correctly on AIX.
  
  Revision  ChangesPath
  1.7   +7 -0  apache-apr/pthreads/src/Configure
  
  Index: Configure
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/Configure,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Configure 1999/02/23 20:52:15 1.6
  +++ Configure 1999/02/26 20:04:21 1.7
  @@ -285,33 +285,40 @@
;;
   i386-ibm-aix*)
OS='IBM AIX PS/2'
  + CC=cc_r
CFLAGS="$CFLAGS -DAIX=1 -U__STR__ -DUSEBCOPY"
DEF_WANTHSREGEX=no
;;
   *-ibm-aix[1-2].*)
OS='IBM AIX 1.x/2.x'
  + CC=cc_r
CFLAGS="$CFLAGS -DAIX=1 -DNEED_RLIM_T -U__STR__"
;;
   *-ibm-aix3.*)
OS='IBM AIX 3.x'
  + CC=cc_r
CFLAGS="$CFLAGS -DAIX=30 -DNEED_RLIM_T -U__STR__"
;;
   *-ibm-aix4.1)
OS='IBM AIX 4.1'
  + CC=cc_r
CFLAGS="$CFLAGS -DAIX=41 -DNEED_RLIM_T -U__STR__"
;;
   *-ibm-aix4.2)
OS='IBM AIX 4.2'
  + CC=cc_r
CFLAGS="$CFLAGS -DAIX=42 -U__STR__"
LDFLAGS="$LDFLAGS -lm -lpthreads"
;;
   *-ibm-aix4.3)
OS='IBM AIX 4.3'
  + CC=cc_r
CFLAGS="$CFLAGS -DAIX=43 -U__STR__"
LDFLAGS="$LDFLAGS -lm -lpthreads"
;;
   *-ibm-aix*)
OS='IBM AIX'
  + CC=cc_r
CFLAGS="$CFLAGS -DAIX=1 -U__STR__"
LDFLAGS="$LDFLAGS -lm"
;;