date:19990310

cvs commit: apache-1.3/src/support htpasswd.c

1999-03-10 Thread coar

coar99/03/10 12:58:27

  Modified:src/support htpasswd.c
  Log:
Argh.. what happens when you've got too many patches going
at once..
  
  Revision  ChangesPath
  1.23  +12 -9 apache-1.3/src/support/htpasswd.c
  
  Index: htpasswd.c
  ===
  RCS file: /home/cvs/apache-1.3/src/support/htpasswd.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- htpasswd.c1999/03/10 20:36:46 1.22
  +++ htpasswd.c1999/03/10 20:58:23 1.23
  @@ -69,10 +69,12 @@
*
* Exit values:
*  0: Success
  - *  1: Failure; file permission problem
  + *  1: Failure; file access/permission problem
*  2: Failure; command line syntax problem (usage message issued)
*  3: Failure; password verification failure
*  4: Failure; operation interrupted (such as with CTRL/C)
  + *  5: Failure; buffer would overflow (username, filename, or computed
  + * record too long)
*/
   
   #include "ap_config.h"
  @@ -104,6 +106,7 @@
   #define ERR_SYNTAX 2
   #define ERR_PWMISMATCH 3
   #define ERR_INTERRUPTED 4
  +#define ERR_OVERFLOW 5
   
   /*
* This needs to be declared statically so the signal handler can
  @@ -223,7 +226,7 @@
   #endif
   
   /*
  - * Make a password record from the given information.  A true return
  + * Make a password record from the given information.  A zero return
* indicates success; failure means that the output buffer contains an
* error message instead.
*/
  @@ -236,7 +239,7 @@
   pw = strd((char *) getpass("New password: "));
   if (strcmp(pw, (char *) getpass("Re-type new password: "))) {
ap_cpystrn(record, "password verification error", (rlen - 1));
  - return 0;
  + return ERR_PWMISMATCH;
   }
   (void) srand((int) time((time_t *) NULL));
   to64(&salt[0], rand(), 8);
  @@ -261,12 +264,12 @@
*/
   if ((strlen(user) + 1 + strlen(cpw)) > (rlen - 1)) {
ap_cpystrn(record, "resultant record too long", (rlen - 1));
  - return 0;
  + return ERR_OVERFLOW;
   }
   strcpy(record, user);
   strcat(record, ":");
   strcat(record, cpw);
  -return 1;
  +return 0;
   }
   
   static int usage(void)
  @@ -413,12 +416,12 @@
   }
   if (strlen(argv[i]) > (sizeof(pwfilename) - 1)) {
fprintf(stderr, "%s: filename too long\n", argv[0]);
  - return 1;
  + return ERR_OVERFLOW;
   }
   strcpy(pwfilename, argv[i]);
   if (strlen(argv[i + 1]) > (sizeof(user) - 1)) {
fprintf(stderr, "%s: username too long\n", argv[0]);
  - return 1;
  + return ERR_OVERFLOW;
   }
   strcpy(user, argv[i + 1]);
   
  @@ -477,9 +480,9 @@
* Any error message text is returned in the record buffer, since
* the mkrecord() routine doesn't have access to argv[].
*/
  -if (! mkrecord(user, record, sizeof(record) - 1, alg)) {
  +if ((i = mkrecord(user, record, sizeof(record) - 1, alg)) != 0) {
fprintf(stderr, "%s: %s\n", argv[0], record);
  - exit(ERR_PWMISMATCH);
  + exit(i);
   }
   
   /*

cvs commit: apache-1.3/src/support htpasswd.c

1999-03-10 Thread coar

coar99/03/10 12:36:47

  Modified:src/support htpasswd.c
  Log:
Add licence, change argumbnt handling to alway recognise '-' as
a flag prefix, make a little easier to expand to other algorithms
in the future, and change file handling.  Previously a misspelt
passphrase could destroy existing security data (i.e., '-c'
would leave an empty file rather than whatever had been there
before).  Also distinguish between failure causes in the
exit status.
  
  Revision  ChangesPath
  1.22  +374 -142  apache-1.3/src/support/htpasswd.c
  
  Index: htpasswd.c
  ===
  RCS file: /home/cvs/apache-1.3/src/support/htpasswd.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- htpasswd.c1999/03/08 20:14:05 1.21
  +++ htpasswd.c1999/03/10 20:36:46 1.22
  @@ -1,3 +1,60 @@
  +/* 
  + * Copyright (c) 1995-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 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 .
  + *
  + */
  +
   
/**

**
* NOTE! This program is not safe as a setuid executable!  Do not make it
  @@ -5,14 +62,23 @@

**

*/
   /*
  - * htpasswd.c: simple program for manipulating password file for NCSA httpd
  + * htpasswd.c: simple program for manipulating password file for
  + * the Apache HTTP server
* 
  - * Rob McCool
  + * Originally by Rob McCool
  + *
  + * Exit values:
  + *  0: Success
  + *  1: Failure; file permission problem
  + *  2: Failure; command line syntax problem (usage message issued)
  + *  3: Failure; password verification failure
  + *  4: Failure; operation interrupted (such as with CTRL/C)
*/
   
   #include "ap_config.h"
   #include 
   #include 
  +#include 
   #incl

cvs commit: apache-1.3/src/include http_core.h

1999-03-10 Thread dgaudet

dgaudet 99/03/10 12:18:59

  Modified:src/include http_core.h
  Log:
  oops this was not supposed to be committed
  
  Revision  ChangesPath
  1.55  +0 -3  apache-1.3/src/include/http_core.h
  
  Index: http_core.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/http_core.h,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- http_core.h   1999/03/10 17:42:40 1.54
  +++ http_core.h   1999/03/10 20:18:55 1.55
  @@ -238,9 +238,6 @@
*/
   unsigned d_is_fnmatch : 1;
   
  -/* takes sense only if use_canonical_name is on */
  -unsigned use_canonical_port : 1;
  -
   /* System Resource Control */
   #ifdef RLIMIT_CPU
   struct rlimit *limit_cpu;

cvs commit: apache-1.3/src/test test.gif

1999-03-10 Thread coar

coar99/03/10 10:33:13

  Removed: src/test test.gif
  Log:
Binary file updates in CVS won't be diffed and sent any more;
instead, the message will note that the file is binary.

cvs commit: apache-1.3/src/test test.gif

1999-03-10 Thread coar

coar99/03/10 10:30:59

  Modified:src/test test.gif
  Log:
Addition of binary files works; how about updates?
  
  Revision  ChangesPath
  1.2   +1 -1  apache-1.3/src/test/test.gif
  
<>

cvs commit: apache-1.3/src/test test.gif

1999-03-10 Thread coar

coar99/03/10 10:29:41

  Added:   src/test test.gif
  Log:
Testing changes to CVS change mail code for dealing with
binary files (i.e., don't send them!).
  
  Revision  ChangesPath
  1.1  apache-1.3/src/test/test.gif
  
<>

cvs commit: apache-1.3/src/main util_script.c

1999-03-10 Thread dgaudet

dgaudet 99/03/10 10:09:46

  Modified:src  CHANGES
   src/main util_script.c
  Log:
  Set-Cookie headers were being doubled up for some CGIs by the O(n^2)
  avoidance code added in 1.3.3.
  
  PR:   3872
  Submitted by: Jeff Lewis <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.1278+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1277
  retrieving revision 1.1278
  diff -u -r1.1277 -r1.1278
  --- CHANGES   1999/03/10 17:42:35 1.1277
  +++ CHANGES   1999/03/10 18:09:40 1.1278
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.5
   
  +  *) Set-Cookie headers were being doubled up for some CGIs by the O(n^2)
  + avoidance code added in 1.3.3.
  + [Dean Gaudet, Jeff Lewis <[EMAIL PROTECTED]>] PR#3872
  +
 *) ap_isxdigit was somehow neglected when adding the ap_isfoo() macros
for 8-bit safeness.  [Dean Gaudet]
   
  
  
  
  1.139 +2 -0  apache-1.3/src/main/util_script.c
  
  Index: util_script.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/util_script.c,v
  retrieving revision 1.138
  retrieving revision 1.139
  diff -u -r1.138 -r1.139
  --- util_script.c 1999/02/05 00:37:48 1.138
  +++ util_script.c 1999/03/10 18:09:44 1.139
  @@ -496,6 +496,8 @@
ap_overlap_tables(r->err_headers_out, merge,
AP_OVERLAP_TABLES_MERGE);
if (!ap_is_empty_table(cookie_table)) {
  + /* the cookies have already been copied to the cookie_table */
  + ap_table_unset(r->err_headers_out, "Set-Cookie");
r->err_headers_out = ap_overlay_tables(r->pool,
r->err_headers_out, cookie_table);
}

cvs commit: apache-1.3/src/modules/proxy mod_proxy.c proxy_ftp.c proxy_util.c

1999-03-10 Thread dgaudet

dgaudet 99/03/10 09:42:47

  Modified:src  CHANGES
   src/include ap_ctype.h ap_mmn.h http_core.h
   src/main http_protocol.c util.c util_date.c
   src/modules/proxy mod_proxy.c proxy_ftp.c proxy_util.c
  Log:
  somehow we missed implementing ap_isxdigit... oh and there was a stray
  use of isdigit()
  
  Revision  ChangesPath
  1.1277+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1276
  retrieving revision 1.1277
  diff -u -r1.1276 -r1.1277
  --- CHANGES   1999/03/10 13:37:58 1.1276
  +++ CHANGES   1999/03/10 17:42:35 1.1277
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.5
   
  +  *) ap_isxdigit was somehow neglected when adding the ap_isfoo() macros
  + for 8-bit safeness.  [Dean Gaudet]
  +
 *) Use -fPIC instead of -fpic on Solaris and SunOS for compiling DSOs
because SPARCs have a small machine-specific maximum size for the Global
Offset Table which is often exceeded when compiling one of the larger
  
  
  
  1.5   +1 -0  apache-1.3/src/include/ap_ctype.h
  
  Index: ap_ctype.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/ap_ctype.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ap_ctype.h1999/01/01 19:04:39 1.4
  +++ ap_ctype.h1999/03/10 17:42:39 1.5
  @@ -79,6 +79,7 @@
   #define ap_ispunct(c) (ispunct(((unsigned char)(c
   #define ap_isspace(c) (isspace(((unsigned char)(c
   #define ap_isupper(c) (isupper(((unsigned char)(c
  +#define ap_isxdigit(c) (isxdigit(((unsigned char)(c
   #define ap_tolower(c) (tolower(((unsigned char)(c
   #define ap_toupper(c) (toupper(((unsigned char)(c
   
  
  
  
  1.31  +2 -1  apache-1.3/src/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- ap_mmn.h  1999/03/08 15:43:59 1.30
  +++ ap_mmn.h  1999/03/10 17:42:40 1.31
  @@ -212,6 +212,7 @@
* 19990108.5   - added ap_sub_req_method_uri() and added const to 
the
*definition of method in request_rec.
* 19990108.6   - SIGPIPE is now ignored by the core server.
  + * 19990108.7   - ap_isxdigit added
*/
   
   #define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */
  @@ -219,7 +220,7 @@
   #ifndef MODULE_MAGIC_NUMBER_MAJOR
   #define MODULE_MAGIC_NUMBER_MAJOR 19990108
   #endif
  -#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */
  +#define MODULE_MAGIC_NUMBER_MINOR 7 /* 0...n */
   #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward 
compat */
   
   /* Useful for testing for features. */
  
  
  
  1.54  +3 -0  apache-1.3/src/include/http_core.h
  
  Index: http_core.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/http_core.h,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- http_core.h   1999/02/05 00:37:48 1.53
  +++ http_core.h   1999/03/10 17:42:40 1.54
  @@ -238,6 +238,9 @@
*/
   unsigned d_is_fnmatch : 1;
   
  +/* takes sense only if use_canonical_name is on */
  +unsigned use_canonical_port : 1;
  +
   /* System Resource Control */
   #ifdef RLIMIT_CPU
   struct rlimit *limit_cpu;
  
  
  
  1.261 +2 -2  apache-1.3/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
  retrieving revision 1.260
  retrieving revision 1.261
  diff -u -r1.260 -r1.261
  --- http_protocol.c   1999/03/08 15:44:00 1.260
  +++ http_protocol.c   1999/03/10 17:42:42 1.261
  @@ -1664,7 +1664,7 @@
   {
   long chunksize = 0;
   
  -while (isxdigit(*b)) {
  +while (ap_isxdigit(*b)) {
   int xvalue = 0;
   
   if (*b >= '0' && *b <= '9')
  @@ -1742,7 +1742,7 @@
   
   chunk_start = getline(buffer, bufsiz, r->connection->client, 0);
   if ((chunk_start <= 0) || (chunk_start >= (bufsiz - 1))
  -|| !isxdigit(*buffer)) {
  +|| !ap_isxdigit(*buffer)) {
   r->connection->keepalive = -1;
   return -1;
   }
  
  
  
  1.155 +1 -1  apache-1.3/src/main/util.c
  
  Index: util.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/util.c,v
  retrieving revision 1.154
  retrieving revision 1.155
  diff -u -r1.154 -r1.155
  --- util.c1999/03/10 12:11:57 1.154
  +++ util.c

cvs commit: apache-1.3/src CHANGES Configure

1999-03-10 Thread rse

rse 99/03/10 05:38:02

  Modified:src  CHANGES Configure
  Log:
  Use -fPIC instead of -fpic on Solaris and SunOS for compiling DSOs because
  SPARCs have a small machine-specific maximum size for the Global Offset Table
  which is often exceeded when compiling one of the larger third-party modules
  with Apache.
  
  Suggested by: Peter Urban <[EMAIL PROTECTED]>
  Reviewed by: Ralf S. Engelschall
  PR: 3977
  
  Revision  ChangesPath
  1.1276+5 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1275
  retrieving revision 1.1276
  diff -u -r1.1275 -r1.1276
  --- CHANGES   1999/03/10 13:02:10 1.1275
  +++ CHANGES   1999/03/10 13:37:58 1.1276
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.5
   
  +  *) Use -fPIC instead of -fpic on Solaris and SunOS for compiling DSOs
  + because SPARCs have a small machine-specific maximum size for the Global
  + Offset Table which is often exceeded when compiling one of the larger
  + third-party modules with Apache. [Peter Urban <[EMAIL PROTECTED]>] 
PR#3977
  +
 *) Move the directive `ExtendedStatus' in httpd.conf-dist-win _after_ the
DSO/DLL section because it's a directive from mod_status and isn't
available before the DLL of mod_status is loaded.
  
  
  
  1.331 +2 -2  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.330
  retrieving revision 1.331
  diff -u -r1.330 -r1.331
  --- Configure 1999/02/10 11:48:44 1.330
  +++ Configure 1999/03/10 13:37:58 1.331
  @@ -996,7 +996,7 @@
;;
*-solaris2*)
case $CC in
  - */gcc|gcc ) CFLAGS_SHLIB="-fpic" ;;
  + */gcc|gcc ) CFLAGS_SHLIB="-fPIC" ;;
*/cc|cc   ) CFLAGS_SHLIB="-KPIC" ;;
esac
LDFLAGS_SHLIB="-G"
  @@ -1005,7 +1005,7 @@
;;
*-sunos4*)
case $CC in
  - */gcc|gcc ) CFLAGS_SHLIB="-fpic" ;;
  + */gcc|gcc ) CFLAGS_SHLIB="-fPIC" ;;
*/acc|acc ) CFLAGS_SHLIB="-pic" ;;
esac
LDFLAGS_SHLIB="-assert pure-text"

cvs commit: apache-1.3/conf httpd.conf-dist-win

1999-03-10 Thread rse

rse 99/03/10 05:02:13

  Modified:src  CHANGES
   conf httpd.conf-dist-win
  Log:
  Move the directive `ExtendedStatus' in httpd.conf-dist-win _after_ the DSO/DLL
  section because it's a directive from mod_status and isn't available before
  the DLL of mod_status is loaded.
  
  Submitted by: Martin POESCHL <[EMAIL PROTECTED]>
  Reviewed by: Ralf S. Engelschall
  PR: 3936
  
  Revision  ChangesPath
  1.1275+5 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1274
  retrieving revision 1.1275
  diff -u -r1.1274 -r1.1275
  --- CHANGES   1999/03/10 12:11:55 1.1274
  +++ CHANGES   1999/03/10 13:02:10 1.1275
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.5
   
  +  *) Move the directive `ExtendedStatus' in httpd.conf-dist-win _after_ the
  + DSO/DLL section because it's a directive from mod_status and isn't
  + available before the DLL of mod_status is loaded.
  + [Martin POESCHL <[EMAIL PROTECTED]>] PR#3936
  + 
 *) Fix a bug in the calculation of the buffer size for the line 
continuation
facility in Apache's configuration files which could lead to a buffer
overflow situation. [Thomas Devanneaux <[EMAIL PROTECTED]>] PR#3617
  
  
  
  1.22  +7 -7  apache-1.3/conf/httpd.conf-dist-win
  
  Index: httpd.conf-dist-win
  ===
  RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist-win,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- httpd.conf-dist-win   1998/12/12 17:04:29 1.21
  +++ httpd.conf-dist-win   1999/03/10 13:02:12 1.22
  @@ -89,13 +89,6 @@
   #AccessConfig conf/access.conf
   
   #
  -# ExtendedStatus controls whether Apache will generate "full" status
  -# information (ExtendedStatus On) or just basic information (ExtendedStatus
  -# Off) when the "server-status" handler is called. The default is Off.
  -#
  -#ExtendedStatus On
  -
  -#
   # Timeout: The number of seconds before receives and sends time out.
   #
   Timeout 300
  @@ -185,6 +178,13 @@
   #LoadModule speling_module modules/ApacheModuleSpeling.dll
   #LoadModule status_module modules/ApacheModuleStatus.dll
   #LoadModule usertrack_module modules/ApacheModuleUserTrack.dll
  +
  +#
  +# ExtendedStatus controls whether Apache will generate "full" status
  +# information (ExtendedStatus On) or just basic information (ExtendedStatus
  +# Off) when the "server-status" handler is called. The default is Off.
  +#
  +#ExtendedStatus On
   
   ### Section 2: 'Main' server configuration
   #

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

1999-03-10 Thread rse

rse 99/03/10 04:11:57

  Modified:src  CHANGES
   src/main util.c
  Log:
  Fix a bug in the calculation of the buffer size for the line continuation
  facility in Apache's configuration files which could lead to a buffer overflow
  situation.
  
  Submitted by: Thomas Devanneaux <[EMAIL PROTECTED]>
  Reviewed by: Ralf S. Engelschall
  PR: 3617
  
  Revision  ChangesPath
  1.1274+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1273
  retrieving revision 1.1274
  diff -u -r1.1273 -r1.1274
  --- CHANGES   1999/03/10 11:52:54 1.1273
  +++ CHANGES   1999/03/10 12:11:55 1.1274
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.5
   
  +  *) Fix a bug in the calculation of the buffer size for the line 
continuation
  + facility in Apache's configuration files which could lead to a buffer
  + overflow situation. [Thomas Devanneaux <[EMAIL PROTECTED]>] PR#3617
  +
 *) Make documentation and error messages of APACI's --activate-module=FILE 
option more clear. [Jan Wolter <[EMAIL PROTECTED]>] PR#3995
   
  
  
  
  1.154 +1 -1  apache-1.3/src/main/util.c
  
  Index: util.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/util.c,v
  retrieving revision 1.153
  retrieving revision 1.154
  diff -u -r1.153 -r1.154
  --- util.c1999/02/20 18:12:35 1.153
  +++ util.c1999/03/10 12:11:57 1.154
  @@ -877,8 +877,8 @@
 * line continuation requested -
 * then remove backslash and continue
 */
  - cbuf = cp;
cbufsize -= (cp-cbuf);
  + cbuf = cp;
continue;
}
else {

cvs commit: apache-1.3 INSTALL configure

1999-03-10 Thread rse

rse 99/03/10 03:53:05

  Modified:src  CHANGES
   .INSTALL configure
  Log:
  Make documentation and error messages of APACI's --activate-module=FILE
  option more clear.
  
  Submitted by: Jan Wolter <[EMAIL PROTECTED]>
  PR: 3995
  
  Revision  ChangesPath
  1.1273+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1272
  retrieving revision 1.1273
  diff -u -r1.1272 -r1.1273
  --- CHANGES   1999/03/10 11:37:50 1.1272
  +++ CHANGES   1999/03/10 11:52:54 1.1273
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.5
   
  +  *) Make documentation and error messages of APACI's --activate-module=FILE 
  + option more clear. [Jan Wolter <[EMAIL PROTECTED]>] PR#3995
  +
 *) Fix the gcc version check (for enabling the `inline' facility) to 
really support all future gcc versions >= 2.7 until we know more.
[John Tobey <[EMAIL PROTECTED]>] PR#3983
  
  
  
  1.54  +9 -8  apache-1.3/INSTALL
  
  Index: INSTALL
  ===
  RCS file: /home/cvs/apache-1.3/INSTALL,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- INSTALL   1999/02/11 19:59:51 1.53
  +++ INSTALL   1999/03/10 11:52:59 1.54
  @@ -238,14 +238,15 @@
to automatically include a simple third-party module to the Apache build
process.

  - Use the --activate-module=FILE option to on-the-fly add an entry for an
  - existing module source file in the configuration file. FILE has to be a
  - valid path under src/modules/ of the Apache source tree, i.e. it already
  - has to be copied to this location before.  The module is automatically
  - enabled. Use this option to automatically include a complex third-party
  - module to the Apache build process where, for instance a module like
  - mod_perl or mod_php3 consisting of more than one file which are created 
by
  - a third-party configuration scheme.
  + Use the --activate-module=FILE option to add an entry for an existing
  + module source file into the configuration file on-the-fly. FILE has to 
be
  + a valid path beginning with "src/modules/", and the file has to have 
been
  + copied to this location in the Apache source tree before running
  + configure.  The module is automatically enabled. Use this option to
  + automatically include a complex third-party module to the Apache build
  + process where, for instance a module like mod_perl or mod_php3 
consisting
  + of more than one file which are created by a third-party configuration
  + scheme.

Use the --enable-module=NAME and --disable-module=NAME options to enable
or disable a particular already distributed module from the Apache
  
  
  
  1.76  +1 -1  apache-1.3/configure
  
  Index: configure
  ===
  RCS file: /home/cvs/apache-1.3/configure,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- configure 1999/03/10 11:22:11 1.75
  +++ configure 1999/03/10 11:53:02 1.76
  @@ -617,7 +617,7 @@
   file="$apc_optarg"
   case $file in
   src/modules/* ) ;;
  -*)  echo "configure:Error: Module source already has to stay 
below src/modules/ to be activated" 1>&2
  +*)  echo "configure:Error: Module source already has to be 
below src/modules/ to be activated" 1>&2
   exit 1
   ;;
   esac

cvs commit: apache-1.3/src/include ap_config.h

1999-03-10 Thread rse

rse 99/03/10 03:37:53

  Modified:src  CHANGES
   src/include ap_config.h
  Log:
  Fix the gcc version check (for enabling the `inline' facility) to
  really support all future gcc versions >= 2.7 until we know more.
  
  Submitted by: John Tobey <[EMAIL PROTECTED]>
  Reviewed by: Ralf S. Engelschall
  PR: 3983
  
  Revision  ChangesPath
  1.1272+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1271
  retrieving revision 1.1272
  diff -u -r1.1271 -r1.1272
  --- CHANGES   1999/03/10 11:22:09 1.1271
  +++ CHANGES   1999/03/10 11:37:50 1.1272
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.5
   
  +  *) Fix the gcc version check (for enabling the `inline' facility) to 
  + really support all future gcc versions >= 2.7 until we know more.
  + [John Tobey <[EMAIL PROTECTED]>] PR#3983
  +
 *) Let APACI's configure script correctly complain for unknown --enable-XXX
and --disable-XXX options. [Ralf S. Engelschall] PR#3958
   
  
  
  
  1.251 +3 -1  apache-1.3/src/include/ap_config.h
  
  Index: ap_config.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
  retrieving revision 1.250
  retrieving revision 1.251
  diff -u -r1.250 -r1.251
  --- ap_config.h   1999/01/01 19:04:38 1.250
  +++ ap_config.h   1999/03/10 11:37:52 1.251
  @@ -95,7 +95,9 @@
* means.  In particular it's missing inline and the __attribute__
* stuff.  So we hack around it.  PR#1613. -djg
*/
  -#if !defined(__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 7 || defined(NEXT)
  +#if !defined(__GNUC__) || __GNUC__ < 2 || \
  +(__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\
  +defined(NEXT)
   #define ap_inline
   #define __attribute__(__x)
   #define ENUM_BITFIELD(e,n,w)  signed int n : w

cvs commit: apache-1.3 configure

1999-03-10 Thread rse

rse 99/03/10 03:22:12

  Modified:src  CHANGES
   .configure
  Log:
  Let APACI's configure script correctly complain for unknown --enable-XXX
  and --disable-XXX options.
  
  PR: 3958
  
  Revision  ChangesPath
  1.1271+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1270
  retrieving revision 1.1271
  diff -u -r1.1270 -r1.1271
  --- CHANGES   1999/03/10 11:06:06 1.1270
  +++ CHANGES   1999/03/10 11:22:09 1.1271
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.5
   
  +  *) Let APACI's configure script correctly complain for unknown --enable-XXX
  + and --disable-XXX options. [Ralf S. Engelschall] PR#3958
  +
 *) Link the shared core bootstrap program (``Rule SHARED_CORE=yes'') also
against libap.a and use its ap_snprintf() instead of sprintf() to avoid
possible buffer overflows. [Ralf S. Engelschall]
  
  
  
  1.75  +8 -0  apache-1.3/configure
  
  Index: configure
  ===
  RCS file: /home/cvs/apache-1.3/configure,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- configure 1999/03/08 20:03:17 1.74
  +++ configure 1999/03/10 11:22:11 1.75
  @@ -729,6 +729,10 @@
   suexec ) 
   suexec=1
   ;;
  +* ) 
  +echo "configure:Error: invalid option '$apc_option'" 1>&2
  +exit 1
  +;;
   esac
   ;;
   --disable-*)
  @@ -786,6 +790,10 @@
  eval "shared_${apc_optarg}=no" 
  ;;
   esac
  +;;
  +* ) 
  +echo "configure:Error: invalid option '$apc_option'" 1>&2
  +exit 1
   ;;
   esac
   ;;

cvs commit: apache-1.3/src/main http_main.c

1999-03-10 Thread rse

rse 99/03/10 03:06:12

  Modified:src  CHANGES Makefile.tmpl
   src/main http_main.c
  Log:
  Link the shared core bootstrap program (``SHARED_CORE'') also against libap.a
  and use it's ap_snprintf() instead of sprintf() to avoid possible buffer
  overflows.
  
  Hint given by: John Bley <[EMAIL PROTECTED]>
  Submitted by: Ralf S. Engelschall
  
  Revision  ChangesPath
  1.1270+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1269
  retrieving revision 1.1270
  diff -u -r1.1269 -r1.1270
  --- CHANGES   1999/03/10 10:34:00 1.1269
  +++ CHANGES   1999/03/10 11:06:06 1.1270
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.5
   
  +  *) Link the shared core bootstrap program (``Rule SHARED_CORE=yes'') also
  + against libap.a and use its ap_snprintf() instead of sprintf() to avoid
  + possible buffer overflows. [Ralf S. Engelschall]
  +
 *) Remove no longer used non-API function ap_single_module_init().
[Ralf S. Engelschall]
   
  
  
  
  1.109 +1 -1  apache-1.3/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-1.3/src/Makefile.tmpl,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- Makefile.tmpl 1999/01/06 21:57:02 1.108
  +++ Makefile.tmpl 1999/03/10 11:06:07 1.109
  @@ -35,7 +35,7 @@
   
   target_shared: lib$(TARGET).ep
$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
  -   -o $(TARGET) -DSHARED_CORE_BOOTSTRAP main/http_main.c
  +   -o $(TARGET) -DSHARED_CORE_BOOTSTRAP main/http_main.c ap/libap.a
   
   lib$(TARGET).ep: lib$(TARGET).$(SHLIB_SUFFIX_NAME)
$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
  
  
  
  1.426 +3 -3  apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.425
  retrieving revision 1.426
  diff -u -r1.425 -r1.426
  --- http_main.c   1999/03/08 15:44:00 1.425
  +++ http_main.c   1999/03/10 11:06:10 1.426
  @@ -6101,7 +6101,7 @@
   /* 
* create path to SHARED_CORE_EXECUTABLE_PROGRAM
*/
  -sprintf(prog, "%s/%s", llp_dir, SHARED_CORE_EXECUTABLE_PROGRAM);
  +ap_snprintf(prog, sizeof(prog), "%s/%s", llp_dir, 
SHARED_CORE_EXECUTABLE_PROGRAM);
   
   /* 
* adjust process environment therewith the Unix loader 
  @@ -6127,9 +6127,9 @@
envp[i] = NULL;
   }
   if (llp_existing != NULL)
  -  sprintf(llp_buf, "%s=%s:%s", VARNAME, llp_dir, llp_existing);
  +  ap_snprintf(llp_buf, sizeof(llp_buf), "%s=%s:%s", VARNAME, llp_dir, 
llp_existing);
   else
  -  sprintf(llp_buf, "%s=%s", VARNAME, llp_dir);
  +  ap_snprintf(llp_buf, sizeof(llp_buf), "%s=%s", VARNAME, llp_dir);
   *llp_slot = strdup(llp_buf);
   
   /*

cvs commit: apache-1.3/src/include http_config.h

1999-03-10 Thread rse

rse 99/03/10 02:34:09

  Modified:src  CHANGES
   src/main http_config.c
   src/include http_config.h
  Log:
  Remove the no longer used non-API function ap_single_module_init() to make
  some people happy who considers this as dead code since it's usage in mod_so
  was removed.
  
  Revision  ChangesPath
  1.1269+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1268
  retrieving revision 1.1269
  diff -u -r1.1268 -r1.1269
  --- CHANGES   1999/03/08 21:06:59 1.1268
  +++ CHANGES   1999/03/10 10:34:00 1.1269
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.5
   
  +  *) Remove no longer used non-API function ap_single_module_init().
  + [Ralf S. Engelschall]
  +
 *) Add Apple's Mac OS X Server Layout "Rhapsody" to config.layout.
[Wilfredo Sanchez]
   
  
  
  
  1.143 +0 -8  apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.142
  retrieving revision 1.143
  diff -u -r1.142 -r1.143
  --- http_config.c 1999/02/22 17:07:39 1.142
  +++ http_config.c 1999/03/10 10:34:06 1.143
  @@ -1492,14 +1492,6 @@
(*m->create_dir_config)(p, NULL));
   }
   
  -void ap_single_module_init(pool *p, server_rec *s, module *m)
  -{
  -if (m->init)
  -(*m->init)(s, p);
  -build_method_shortcuts();
  -init_handlers(p);
  -}
  -
   void ap_init_modules(pool *p, server_rec *s)
   {
   module *m;
  
  
  
  1.101 +0 -1  apache-1.3/src/include/http_config.h
  
  Index: http_config.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/http_config.h,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- http_config.h 1999/01/06 19:14:51 1.100
  +++ http_config.h 1999/03/10 10:34:08 1.101
  @@ -344,7 +344,6 @@
   /* For mod_so.c... */
   
   void ap_single_module_configure(pool *p, server_rec *s, module *m);
  -void ap_single_module_init(pool *p, server_rec *s, module *m);
   
   /* For http_main.c... */

cvs commit: apache-1.3/conf httpd.conf-dist

1999-03-10 Thread rse

rse 99/03/10 01:14:27

  Modified:conf httpd.conf-dist
  Log:
  Because with the TARGET feature the name can be different, avoid explicit
  self-references inside httpd.conf which confused people in the past.
  
  Revision  ChangesPath
  1.38  +2 -3  apache-1.3/conf/httpd.conf-dist
  
  Index: httpd.conf-dist
  ===
  RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- httpd.conf-dist   1999/02/07 06:25:23 1.37
  +++ httpd.conf-dist   1999/03/10 09:14:27 1.38
  @@ -86,7 +86,7 @@
   ScoreBoardFile logs/apache_runtime_status
   
   #
  -# In the standard configuration, the server will process httpd.conf,
  +# In the standard configuration, the server will process this file,
   # srm.conf, and access.conf in that order.  The latter two files are
   # now distributed empty, as it is recommended that all directives
   # be kept in a single file for simplicity.  The commented-out values
  @@ -132,8 +132,7 @@
   # It does this by periodically checking how many servers are waiting
   # for a request.  If there are fewer than MinSpareServers, it creates
   # a new spare.  If there are more than MaxSpareServers, some of the
  -# spares die off.  The default values in httpd.conf-dist are probably OK
  -# for most sites.
  +# spares die off.  The default values are probably OK for most sites.
   #
   MinSpareServers 5
   MaxSpareServers 10

cvs commit: apache-site/info how-to-mirror.html

1999-03-10 Thread brian

brian 99/03/09 19:27:23

Modified:info how-to-mirror.html
Log:
Rsync is now preferred to cvsup, based on my experience it's easier to set
up and much more portable. Also, start the path towards closing FTP by
discouraging its use for mirroring.

Revision ChangesPath
1.15 +15 -34apache-site/info/how-to-mirror.html

Index: how-to-mirror.html
===
RCS file: /home/cvs/apache-site/info/how-to-mirror.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- how-to-mirror.html1998/12/30 18:47:59 1.14
+++ how-to-mirror.html1999/03/10 03:27:22 1.15
@@ -48,10 +48,7 @@

Run your mirroring software between midnight and 4am Pacific Standard
Time
(8am-noon GMT) when traffic to www.apache.org is at its lowest.
- Consider also making the "dist" subdirectory available via FTP. It is
not
- particularly helpful to mirror the complete web site for FTP, since
many
- pages use server-side includes, and directories get listed rather than
- serving up "index.html".
+ Consider also making the "dist" subdirectory.

Mirroring Techniques
@@ -61,6 +58,20 @@

+Use Rsync. Rsync is similar to cvsup, but (in theory) more widely
+ported, and uses hashes rather than CVS versions to watch for
+differences. You can find details on rsync at http://rsync.samba.org/";> http://rsync.samba.org/. You
+might want to call it using the following arguments, for example:
+
+rsync -rtvz --delete --exclude incoming
+dev.apache.org::apache-site /local/path/to/mirror
+
+You can also just do a rsync dev.apache.org:: to get a
+list of rsync modules available.
+
+
+
Use the "CVSup" package. This is a package which uses the
versioning scheme in CVS to determine exactly which parts of which
files changed between accesses, and is thus by far the most efficient
@@ -92,23 +103,6 @@

-Use the "rsync 2.0" anonymous access option. Rsync is similar to
-cvsup, but (in theory) more widely ported, and uses hashes rather than
-CVS versions to watch for differences. You can find details on rsync
-at http://samba.anu.edu.au/rsync";>
-http://samba.anu.edu.au/rsync and http://sunsite.auc.dk/SunSITE/rsync";>
-http://sunsite.auc.dk/SunSITE/rsync. You might want to call it
-using the following arguments:
-
-rsync -rtvz --delete --exclude incoming
-dev.apache.org::apache-site /local/path/to/mirror
-
-You can also just do a rsync dev.apache.org:: to get a
-list of rsync modules available.
-
-
-
Use the http://www.apache.org/docs/mod/mod_proxy.html";>proxy module
in Apache to "pass-through" requests to the central Apache web site.
@@ -122,19 +116,6 @@
Every request which then comes into this server will be passed along
to www.apache.org, unless the object is already in your local cache
and is less than 24 hours old.
-
-
-
-Use the FTP-based "mirror.pl" package, available at
-http://sunsite.org.uk/packages/mirror/";>
-http://sunsite.org.uk/packages/mirror/
-as well as at
-ftp://ftp.debian.org/debian/stable/source/net/";>
-ftp://ftp.debian.org/debian/stable/source/net/. When you set this
-up, make sure your configuration has "mode_copy=true" to ensure
-permissions preservation. If you use this, point the package at
-ftp://ftp.apache.org/apache/. There is also "Wget", a package
-available from most GNU mirrors.

cvs commit: apache-1.3/src/support htpasswd.c

cvs commit: apache-1.3/src/support htpasswd.c

cvs commit: apache-1.3/src/include http_core.h

cvs commit: apache-1.3/src/test test.gif

cvs commit: apache-1.3/src/test test.gif

cvs commit: apache-1.3/src/test test.gif

cvs commit: apache-1.3/src/main util_script.c

cvs commit: apache-1.3/src/modules/proxy mod_proxy.c proxy_ftp.c proxy_util.c

cvs commit: apache-1.3/src CHANGES Configure

cvs commit: apache-1.3/conf httpd.conf-dist-win

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

cvs commit: apache-1.3 INSTALL configure

cvs commit: apache-1.3/src/include ap_config.h

cvs commit: apache-1.3 configure

cvs commit: apache-1.3/src/main http_main.c

cvs commit: apache-1.3/src/include http_config.h

cvs commit: apache-1.3/conf httpd.conf-dist

cvs commit: apache-site/info how-to-mirror.html

18 matches

Site Navigation

Mail list logo

Footer information