date:19961103

cvs commit: apache/src http_config.h http_config.c http_core.c http_main.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 12:29:43

  Modified:src   http_config.h http_config.c http_core.c
http_main.c
  Log:
  Reviewed by:  Brian Behlendorf, Jim Jagielski
  Submitted by: Dean Gaudet
  
  Fixed problems related to parsing of  segments where both
  IP-vhosts and name-vhosts were used.
  
  Revision  ChangesPath
  1.18  +2 -2  apache/src/http_config.h
  
  Index: http_config.h
  ===
  RCS file: /export/home/cvs/apache/src/http_config.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -C3 -r1.17 -r1.18
  *** http_config.h 1996/10/20 18:03:30 1.17
  --- http_config.h 1996/11/03 20:29:38 1.18
  ***
  *** 50,56 
 *
 */

  ! /* $Id: http_config.h,v 1.17 1996/10/20 18:03:30 ben Exp $ */

/*
 * The central data structures around here...
  --- 50,56 
 *
 */

  ! /* $Id: http_config.h,v 1.18 1996/11/03 20:29:38 brian Exp $ */

/*
 * The central data structures around here...
  ***
  *** 272,278 
   char *path, char *file);
const char *srm_command_loop (cmd_parms *parms, void *config);

  ! server_rec *init_virtual_host (pool *p, const char *hostname);
int is_virtual_server (server_rec *);
void process_resource_config(server_rec *s, char *fname, pool *p, pool 
*ptemp);

  --- 272,278 
   char *path, char *file);
const char *srm_command_loop (cmd_parms *parms, void *config);

  ! server_rec *init_virtual_host (pool *p, const char *hostname, server_rec 
*main_server);
int is_virtual_server (server_rec *);
void process_resource_config(server_rec *s, char *fname, pool *p, pool 
*ptemp);

  
  
  
  1.28  +20 -14apache/src/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /export/home/cvs/apache/src/http_config.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -C3 -r1.27 -r1.28
  *** http_config.c 1996/10/20 18:03:29 1.27
  --- http_config.c 1996/11/03 20:29:38 1.28
  ***
  *** 50,56 
 *
 */

  ! /* $Id: http_config.c,v 1.27 1996/10/20 18:03:29 ben Exp $ */

/*
 * http_config.c: once was auxillary functions for reading httpd's config
  --- 50,56 
 *
 */

  ! /* $Id: http_config.c,v 1.28 1996/11/03 20:29:38 brian Exp $ */

/*
 * http_config.c: once was auxillary functions for reading httpd's config
  ***
  *** 757,768 
 * paddr is used to create a list in the order of input
 * **paddr is the ->next pointer of the last entry (or s->addrs)
 * *paddr is the variable used to keep track of **paddr between calls
 */
  ! static void get_addresses (pool *p, char *w, server_addr_rec ***paddr)
{
struct hostent *hep;
unsigned long my_addr;
  - int ports;
server_addr_rec *sar;
char *t;
int i;
  --- 757,768 
 * paddr is used to create a list in the order of input
 * **paddr is the ->next pointer of the last entry (or s->addrs)
 * *paddr is the variable used to keep track of **paddr between calls
  +  * port is the default port to assume
 */
  ! static void get_addresses (pool *p, char *w, server_addr_rec ***paddr, int 
port)
{
struct hostent *hep;
unsigned long my_addr;
server_addr_rec *sar;
char *t;
int i;
  ***
  *** 770,785 
if( *w == 0 ) return;

t = strchr(w, ':');
  ! ports = 0;
  ! if (t != NULL && strcmp(t+1, "*") != 0) ports = atoi(t+1);

  - if (t != NULL) *t = '\0';
if (strcmp(w, "*") == 0) {
sar = pcalloc( p, sizeof( server_addr_rec ) );
**paddr = sar;
*paddr = &sar->next;
sar->host_addr.s_addr = htonl(INADDR_ANY);
  ! sar->host_port = ports;
sar->virthost = pstrdup(p, w);
if (t != NULL) *t = ':';
return;
  --- 770,792 
if( *w == 0 ) return;

t = strchr(w, ':');
  ! if (t) {
  ! if( strcmp(t+1,"*") == 0 ) {
  ! port = 0;
  ! } else if( (i = atoi(t+1)) ) {
  ! port = i;
  ! } else {
  ! fprintf( stderr, "Port must be numeric\n" );
  ! }
  ! *t = 0;
  ! }

if (strcmp(w, "*") == 0) {
sar = pcalloc( p, sizeof( server_addr_rec ) );
**paddr = sar;
*paddr = &sar->next;
sar->host_addr.s_addr = htonl(INADDR_ANY);
  ! sar->host_port = port;
sar->virthost = pstrdup(p, w);
if (t != NULL) *t = ':';
return;
  ***
  *** 795,801 
**paddr = sar;
*paddr = &sar->next;
sar->host_addr.s_addr = my_addr;
  ! sar->host_port = ports;
sar->virthost = pstrdup(p, w);
if (t != NULL) *t = ':';
return;
  --- 802,808

cvs commit: apache/src mod_log_agent.c mod_log_referer.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 12:33:18

  Modified:src   mod_log_agent.c mod_log_referer.c
  Log:
  Fixed -Wall warnings related to constifications.
  
  Revision  ChangesPath
  1.4   +2 -2  apache/src/mod_log_agent.c
  
  Index: mod_log_agent.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_log_agent.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** mod_log_agent.c   1996/08/20 11:51:14 1.3
  --- mod_log_agent.c   1996/11/03 20:33:16 1.4
  ***
  *** 50,56 
 *
 */

  ! /* $Id: mod_log_agent.c,v 1.3 1996/08/20 11:51:14 paul Exp $ */


#include "httpd.h"
  --- 50,56 
 *
 */

  ! /* $Id: mod_log_agent.c,v 1.4 1996/11/03 20:33:16 brian Exp $ */


#include "httpd.h"
  ***
  *** 83,89 
return (void *)cls;
}

  ! char *set_agent_log (cmd_parms *parms, void *dummy, char *arg)
{
agent_log_state *cls = get_module_config (parms->server->module_config,
   &agent_log_module);
  --- 83,89 
return (void *)cls;
}

  ! const char *set_agent_log (cmd_parms *parms, void *dummy, char *arg)
{
agent_log_state *cls = get_module_config (parms->server->module_config,
   &agent_log_module);
  
  
  
  1.5   +3 -3  apache/src/mod_log_referer.c
  
  Index: mod_log_referer.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_log_referer.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -C3 -r1.4 -r1.5
  *** mod_log_referer.c 1996/08/20 11:51:16 1.4
  --- mod_log_referer.c 1996/11/03 20:33:17 1.5
  ***
  *** 50,56 
 *
 */

  ! /* $Id: mod_log_referer.c,v 1.4 1996/08/20 11:51:16 paul Exp $ */


#include "httpd.h"
  --- 50,56 
 *
 */

  ! /* $Id: mod_log_referer.c,v 1.5 1996/11/03 20:33:17 brian Exp $ */


#include "httpd.h"
  ***
  *** 84,90 
return (void *)cls;
}

  ! char *set_referer_log (cmd_parms *parms, void *dummy, char *arg)
{
referer_log_state *cls = get_module_config 
(parms->server->module_config,
   &referer_log_module);
  --- 84,90 
return (void *)cls;
}

  ! const char *set_referer_log (cmd_parms *parms, void *dummy, char *arg)
{
referer_log_state *cls = get_module_config 
(parms->server->module_config,
   &referer_log_module);
  ***
  *** 93,99 
return NULL;
}

  ! char *add_referer_ignore (cmd_parms *parms, void *dummy, char *arg)
{
  char **addme;
  referer_log_state *cls = get_module_config (parms->server->module_config,
  --- 93,99 
return NULL;
}

  ! const char *add_referer_ignore (cmd_parms *parms, void *dummy, char *arg)
{
  char **addme;
  referer_log_state *cls = get_module_config (parms->server->module_config,

cvs commit: apache/src mod_headers.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 12:34:25

  Modified:src   mod_headers.c
  Log:
  Removed unused variable.
  
  Revision  ChangesPath
  1.2   +0 -1  apache/src/mod_headers.c
  
  Index: mod_headers.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_headers.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** mod_headers.c 1996/11/01 14:59:50 1.1
  --- mod_headers.c 1996/11/03 20:34:24 1.2
  ***
  *** 197,203 
void do_headers_fixup(request_rec *r, array_header *headers)
{
int i;
  - array_header *arr;

for (i = 0; i < headers->nelts; ++i) {
header_entry *hdr = &((header_entry*)(headers->elts))[i];
  --- 197,202

cvs commit: apache/src http_bprintf.c http_config.c http_log.c http_main.c http_request.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 12:36:39

  Modified:src   http_bprintf.c http_config.c http_log.c
http_main.c  http_request.c
  Log:
  Removed $Id lines, per group consensus.
  
  Revision  ChangesPath
  1.7   +0 -2  apache/src/http_bprintf.c
  
  Index: http_bprintf.c
  ===
  RCS file: /export/home/cvs/apache/src/http_bprintf.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -C3 -r1.6 -r1.7
  *** http_bprintf.c1996/08/20 11:50:41 1.6
  --- http_bprintf.c1996/11/03 20:36:34 1.7
  ***
  *** 12,19 
 * History:
 * 18 May 1996 Initial revision [Ben Laurie]
 *
  -  * $Id: http_bprintf.c,v 1.6 1996/08/20 11:50:41 paul Exp $
  -  *
 */

#include 
  --- 12,17 
  
  
  
  1.29  +0 -2  apache/src/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /export/home/cvs/apache/src/http_config.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -C3 -r1.28 -r1.29
  *** http_config.c 1996/11/03 20:29:38 1.28
  --- http_config.c 1996/11/03 20:36:34 1.29
  ***
  *** 50,57 
 *
 */

  - /* $Id: http_config.c,v 1.28 1996/11/03 20:29:38 brian Exp $ */
  - 
/*
 * http_config.c: once was auxillary functions for reading httpd's config
 * file and converting filenames into a namespace
  --- 50,55 
  
  
  
  1.9   +0 -2  apache/src/http_log.c
  
  Index: http_log.c
  ===
  RCS file: /export/home/cvs/apache/src/http_log.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -C3 -r1.8 -r1.9
  *** http_log.c1996/10/20 18:03:31 1.8
  --- http_log.c1996/11/03 20:36:35 1.9
  ***
  *** 50,57 
 *
 */

  - /* $Id: http_log.c,v 1.8 1996/10/20 18:03:31 ben Exp $ */
  - 
/*
 * http_log.c: Dealing with the logs and errors
 * 
  --- 50,55 
  
  
  
  1.82  +0 -2  apache/src/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -C3 -r1.81 -r1.82
  *** http_main.c   1996/11/03 20:29:40 1.81
  --- http_main.c   1996/11/03 20:36:36 1.82
  ***
  *** 50,57 
 *
 */

  - /* $Id: http_main.c,v 1.81 1996/11/03 20:29:40 brian Exp $ */
  - 
/*
 * httpd.c: simple http daemon for answering WWW file requests
 *
  --- 50,55 
  
  
  
  1.26  +0 -2  apache/src/http_request.c
  
  Index: http_request.c
  ===
  RCS file: /export/home/cvs/apache/src/http_request.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -C3 -r1.25 -r1.26
  *** http_request.c1996/10/22 18:45:34 1.25
  --- http_request.c1996/11/03 20:36:36 1.26
  ***
  *** 50,57 
 *
 */

  - /* $Id: http_request.c,v 1.25 1996/10/22 18:45:34 brian Exp $ */
  - 
/*
 * http_request.c: functions to get and process requests
 * 
  --- 50,55

cvs commit: apache/src mod_ai_backcompat.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 12:40:53

  Removed: src   mod_ai_backcompat.c
  Log:
  Removed module which never got much use outside of MIT.

cvs commit: apache/src mod_alias.c mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c mod_auth_msql.c mod_cern_meta.c mod_digest.c mod_dir.c mod_dld.c mod_imap.c mod_include.c mod_info.c mod_log_agent.c mod_log_referer.c mod_negotiation.c mod_usertrack.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 12:48:49

  Modified:src   mod_alias.c mod_asis.c mod_auth.c mod_auth_anon.c 
mod_auth_db.c mod_auth_dbm.c mod_auth_msql.c
mod_cern_meta.c  mod_digest.c mod_dir.c mod_dld.c
mod_imap.c mod_include.c  mod_info.c
mod_log_agent.c mod_log_referer.c mod_negotiation.c
 mod_usertrack.c
  Log:
  Removed $Id lines, per group consensus.  Converted references to Shambala
  (Apache prototype by rob thau) to Apache.
  
  Revision  ChangesPath
  1.9   +0 -2  apache/src/mod_alias.c
  
  Index: mod_alias.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_alias.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -C3 -r1.8 -r1.9
  *** mod_alias.c   1996/10/20 18:03:33 1.8
  --- mod_alias.c   1996/11/03 20:48:28 1.9
  ***
  *** 50,57 
 *
 */

  - /* $Id: mod_alias.c,v 1.8 1996/10/20 18:03:33 ben Exp $ */
  - 
/*
 * http_alias.c: Stuff for dealing with directory aliases
 * 
  --- 50,55 
  
  
  
  1.8   +0 -2  apache/src/mod_asis.c
  
  Index: mod_asis.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_asis.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -C3 -r1.7 -r1.8
  *** mod_asis.c1996/10/16 23:24:34 1.7
  --- mod_asis.c1996/11/03 20:48:29 1.8
  ***
  *** 50,57 
 *
 */

  - /* $Id: mod_asis.c,v 1.7 1996/10/16 23:24:34 fielding Exp $ */
  - 
#include "httpd.h"
#include "http_config.h"
#include "http_protocol.h"
  --- 50,55 
  
  
  
  1.8   +1 -1  apache/src/mod_auth.c
  
  Index: mod_auth.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_auth.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -C3 -r1.7 -r1.8
  *** mod_auth.c1996/10/20 18:03:34 1.7
  --- mod_auth.c1996/11/03 20:48:29 1.8
  ***
  *** 55,61 
 * 
 * Rob McCool
 * 
  !  * Adapted to Shambhala by rst.
 */

#include "httpd.h"
  --- 55,61 
 * 
 * Rob McCool
 * 
  !  * Adapted to Apache by rst.
 */

#include "httpd.h"
  
  
  
  1.10  +2 -4  apache/src/mod_auth_anon.c
  
  Index: mod_auth_anon.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_auth_anon.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -C3 -r1.9 -r1.10
  *** mod_auth_anon.c   1996/10/31 00:06:42 1.9
  --- mod_auth_anon.c   1996/11/03 20:48:30 1.10
  ***
  *** 50,67 
 *
 */

  - /* $Id: mod_auth_anon.c,v 1.9 1996/10/31 00:06:42 brian Exp $ */
  - 
/*
 * http_auth: authentication
 * 
 * Rob McCool & Brian Behlendorf.
 * 
  !  * Adapted to Shambhala by rst.
 *
 * Version 0.5 May 1996
 *
  !  * Brutally raped by [EMAIL PROTECTED] to
 * 
 * Adapted to allow anonymous logins, just like with Anon-FTP, when
 * one gives the magic user name 'anonymous' and ones email address
  --- 50,65 
 *
 */

/*
 * http_auth: authentication
 * 
 * Rob McCool & Brian Behlendorf.
 * 
  !  * Adapted to Apache by rst.
 *
 * Version 0.5 May 1996
 *
  !  * Modified by [EMAIL PROTECTED] to
 * 
 * Adapted to allow anonymous logins, just like with Anon-FTP, when
 * one gives the magic user name 'anonymous' and ones email address
  
  
  
  1.4   +0 -2  apache/src/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_auth_db.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** mod_auth_db.c 1996/10/08 22:19:23 1.3
  --- mod_auth_db.c 1996/11/03 20:48:30 1.4
  ***
  *** 50,57 
 *
 */

  - /* $Id: mod_auth_db.c,v 1.3 1996/10/08 22:19:23 brian Exp $ */
  - 
/*
 * mod_auth_db: authentication
 * 
  --- 50,55 
  
  
  
  1.9   +1 -3  apache/src/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_auth_dbm.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -C3 -r1.8 -r1.9
  *** mod_auth_dbm.c1996/10/31 00:06:42 1.8
  --- mod_auth_dbm.c1996/11/03 20:48:31 1.9
  ***
  *** 50,63 
 *
 */

  - /* $Id: mod_auth_dbm.c,v 1.8 1996/10/31 00:06:42 brian Exp $ */
  - 
/*
 * http_auth: authentication
 * 
 * Rob McCool & Brian Behlendorf.
 * 
  !  * Adapted to Shambhala by rst.
 */

#include "httpd.h"
  --- 50,61

cvs commit: apache/src http_config.c http_main.c http_request.c rfc1413.c util_script.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 12:52:15

  Modified:src   http_config.c http_main.c http_request.c rfc1413.c
 util_script.c
  Log:
  Converted references to Shambhala (early apache prototype by rob thau) to 
Apache.
  
  Revision  ChangesPath
  1.30  +2 -2  apache/src/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /export/home/cvs/apache/src/http_config.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -C3 -r1.29 -r1.30
  *** http_config.c 1996/11/03 20:36:34 1.29
  --- http_config.c 1996/11/03 20:52:09 1.30
  ***
  *** 56,65 
 *
 * Rob McCool 
 * 
  !  * Wall-to-wall rewrite for Shambhala... commands which are part of the
 * server core can now be found next door in "http_core.c".  Now contains
 * general command loop, and functions which do bookkeeping for the new
  !  * Shambhala config stuff (modules and configuration vectors).
 *
 * rst
 *
  --- 56,65 
 *
 * Rob McCool 
 * 
  !  * Wall-to-wall rewrite for Apache... commands which are part of the
 * server core can now be found next door in "http_core.c".  Now contains
 * general command loop, and functions which do bookkeeping for the new
  !  * Apache config stuff (modules and configuration vectors).
 *
 * rst
 *
  
  
  
  1.83  +2 -2  apache/src/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -C3 -r1.82 -r1.83
  *** http_main.c   1996/11/03 20:36:36 1.82
  --- http_main.c   1996/11/03 20:52:10 1.83
  ***
  *** 70,76 
 *  Apache server, and also to have child processes do accept() 
directly.
 *
 * April-July '95 rst
  !  *  Extensive rework for Shambhala.
 */


  --- 70,76 
 *  Apache server, and also to have child processes do accept() 
directly.
 *
 * April-July '95 rst
  !  *  Extensive rework for Apache.
 */


  ***
  *** 155,161 
 * which is a pretty nice debugging environment.  (You'll get a SIGHUP
 * early in standalone_main; just continue through.  This is the server
 * trying to kill off any child processes which it might have lying
  !  * around --- Shambhala doesn't keep track of their pids, it just sends
 * SIGHUP to the process group, ignoring it in the root process.
 * Continue through and you'll be fine.).
 */
  --- 155,161 
 * which is a pretty nice debugging environment.  (You'll get a SIGHUP
 * early in standalone_main; just continue through.  This is the server
 * trying to kill off any child processes which it might have lying
  !  * around --- Apache doesn't keep track of their pids, it just sends
 * SIGHUP to the process group, ignoring it in the root process.
 * Continue through and you'll be fine.).
 */
  
  
  
  1.27  +2 -2  apache/src/http_request.c
  
  Index: http_request.c
  ===
  RCS file: /export/home/cvs/apache/src/http_request.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -C3 -r1.26 -r1.27
  *** http_request.c1996/11/03 20:36:36 1.26
  --- http_request.c1996/11/03 20:52:11 1.27
  ***
  *** 55,61 
 * 
 * Rob McCool 3/21/93
 *
  !  * Thoroughly revamped by rst for Shambhala.  NB this file reads
 * best from the bottom up.
 * 
 */
  --- 55,61 
 * 
 * Rob McCool 3/21/93
 *
  !  * Thoroughly revamped by rst for Apache.  NB this file reads
 * best from the bottom up.
 * 
 */
  ***
  *** 497,503 
 * These do all access checks, etc., but don't actually run the transaction
 * ... use run_sub_req below for that.  Also, be sure to use destroy_sub_req
 * as appropriate if you're likely to be creating more than a few of these.
  !  * (An early Shambhala version didn't destroy the sub_reqs used in directory
 * indexing.  The result, when indexing a directory with 800-odd files in
 * it, was massively excessive storage allocation).
 *
  --- 497,503 
 * These do all access checks, etc., but don't actually run the transaction
 * ... use run_sub_req below for that.  Also, be sure to use destroy_sub_req
 * as appropriate if you're likely to be creating more than a few of these.
  !  * (An early Apache version didn't destroy the sub_reqs used in directory
 * indexing.  The result, when indexing a directory with 800-odd files in
 * it, was massively excessive storage allocation).
 *
  
  
  
  1.5   +2 -2  apache/src/rfc1413.c
  
  Index: rfc1413.c
  ===
  RCS file:

cvs commit: apache/src CHANGES Configuration.tmpl INSTALL Makefile.tmpl README TODO

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 12:56:08

  Modified:src   CHANGES Configuration.tmpl INSTALL Makefile.tmpl
README TODO
  Log:
  Removed Id lines, as per group consensus.
  
  Revision  ChangesPath
  1.71  +0 -2  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -C3 -r1.70 -r1.71
  *** CHANGES   1996/10/09 17:36:15 1.70
  --- CHANGES   1996/11/03 20:56:02 1.71
  ***
  *** 1,5 
  - $Id: CHANGES,v 1.70 1996/10/09 17:36:15 chuck Exp $
  - 
Changes with Apache 1.2b1:

  *) Allow directives to have any number of arguments between one
  --- 1,3 
  
  
  
  1.49  +0 -1  apache/src/Configuration.tmpl
  
  Index: Configuration.tmpl
  ===
  RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -C3 -r1.48 -r1.49
  *** Configuration.tmpl1996/11/01 14:59:51 1.48
  --- Configuration.tmpl1996/11/03 20:56:03 1.49
  ***
  *** 1,4 
  - # $Id: Configuration.tmpl,v 1.48 1996/11/01 14:59:51 pcs Exp $
# Config file for the Apache httpd.

# Configuration.tmpl is the template for Configuration. Configuration should
  --- 1,3 
  
  
  
  1.10  +0 -2  apache/src/INSTALL
  
  Index: INSTALL
  ===
  RCS file: /export/home/cvs/apache/src/INSTALL,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -C3 -r1.9 -r1.10
  *** INSTALL   1996/10/24 21:17:34 1.9
  --- INSTALL   1996/11/03 20:56:03 1.10
  ***
  *** 1,5 
  - $Id: INSTALL,v 1.9 1996/10/24 21:17:34 jim Exp $
  - 
This release of Apache supports the notion of "optional modules".
However, the server has to know which modules are compiled into it, in
order for those modules to be effective; this requires generation of a
  --- 1,3 
  
  
  
  1.31  +0 -1  apache/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -C3 -r1.30 -r1.31
  *** Makefile.tmpl 1996/10/27 18:28:21 1.30
  --- Makefile.tmpl 1996/11/03 20:56:03 1.31
  ***
  *** 1,4 
  - # $Id: Makefile.tmpl,v 1.30 1996/10/27 18:28:21 chuck Exp $
# Apache makefile template (well, suffix).

# This is combined with the information in the "Configuration" file
  --- 1,3 
  
  
  
  1.17  +0 -2  apache/src/README
  
  Index: README
  ===
  RCS file: /export/home/cvs/apache/src/README,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -C3 -r1.16 -r1.17
  *** README1996/08/23 18:19:09 1.16
  --- README1996/11/03 20:56:04 1.17
  ***
  *** 1,5 
  - $Id: README,v 1.16 1996/08/23 18:19:09 jim Exp $ 
  - 
The basic idea of the new Apache release is to make a modular
"tinkertoy" server, to which people can easily add code which is
valuable to them (even if it isn't universally useful) without hairing
  --- 1,3 
  
  
  
  1.14  +0 -2  apache/src/TODO
  
  Index: TODO
  ===
  RCS file: /export/home/cvs/apache/src/TODO,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -C3 -r1.13 -r1.14
  *** TODO  1996/08/20 11:50:37 1.13
  --- TODO  1996/11/03 20:56:04 1.14
  ***
  *** 1,5 
  - $Id: TODO,v 1.13 1996/08/20 11:50:37 paul Exp $
  - 
*) Random stray failures to get_local_addr --- it's returning EINVAL, of all
   things.  Are these clients aborting really, really early or what?

  --- 1,3

cvs commit: apache/support Makefile

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 12:57:43

  Modified:. CHANGES LICENSE README RULES.CVS
   support   Makefile
  Log:
  Removed Id lines, as per group consensus.
  
  Revision  ChangesPath
  1.5   +0 -2  apache/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/CHANGES,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -C3 -r1.4 -r1.5
  *** CHANGES   1996/08/20 13:16:34 1.4
  --- CHANGES   1996/11/03 20:57:23 1.5
  ***
  *** 1,5 
  - $Id: CHANGES,v 1.4 1996/08/20 13:16:34 paul Exp $
  - 
New features with this release, as extensions of the Apache functionality
(see also more detailed CHANGES file) in the source directory. For more
information, see http://www.apache.org/docs/1.1/
  --- 1,3 
  
  
  
  1.4   +0 -2  apache/LICENSE
  
  Index: LICENSE
  ===
  RCS file: /export/home/cvs/apache/LICENSE,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** LICENSE   1996/08/20 13:16:34 1.3
  --- LICENSE   1996/11/03 20:57:23 1.4
  ***
  *** 50,56 
 *
 */

  - /* $Id: LICENSE,v 1.3 1996/08/20 13:16:34 paul Exp $ */
  - 


  --- 50,54 
  
  
  
  1.7   +0 -2  apache/README
  
  Index: README
  ===
  RCS file: /export/home/cvs/apache/README,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -C3 -r1.6 -r1.7
  *** README1996/08/20 13:16:35 1.6
  --- README1996/11/03 20:57:24 1.7
  ***
  *** 1,8 
 Apache
 Version 1.1 (and up)

  - $Id: README,v 1.6 1996/08/20 13:16:35 paul Exp $
  - 
What is it?
---

  --- 1,6 
  
  
  
  1.3   +0 -2  apache/RULES.CVS
  
  Index: RULES.CVS
  ===
  RCS file: /export/home/cvs/apache/RULES.CVS,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -C3 -r1.2 -r1.3
  *** RULES.CVS 1996/08/20 13:16:37 1.2
  --- RULES.CVS 1996/11/03 20:57:24 1.3
  ***
  *** 1,5 
  - $Id: RULES.CVS,v 1.2 1996/08/20 13:16:37 paul Exp $
  - 
1. Don't commit several unrelated changes in one go. Each change should be
committed separately (that is, it can affect multiple files, but it should 
all
be part of a single change).
  --- 1,3 
  
  
  
  1.14  +2 -2  apache/support/Makefile
  
  Index: Makefile
  ===
  RCS file: /export/home/cvs/apache/support/Makefile,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -C3 -r1.13 -r1.14
  *** Makefile  1996/11/01 23:23:51 1.13
  --- Makefile  1996/11/03 20:57:42 1.14
  ***
  *** 1,4 
  ! # $Id: Makefile,v 1.13 1996/11/01 23:23:51 ben Exp $
# For gcc
CC= gcc
# For ANSI compilers
  --- 1,4 
  ! # $Id: Makefile,v 1.14 1996/11/03 20:57:42 brian Exp $
# For gcc
CC= gcc
# For ANSI compilers
  ***
  *** 7,13 
#For Optimization
#CFLAGS= -O2
#For debugging
  ! CFLAGS= -g
# For SCO ODT
#EXTRA_LIBS= -lcrypt_i
# For OS/2 port
  --- 7,13 
#For Optimization
#CFLAGS= -O2
#For debugging
  ! CFLAGS= -g -Wall
# For SCO ODT
#EXTRA_LIBS= -lcrypt_i
# For OS/2 port

cvs commit: apache/support Makefile cls.c htdigest.c htpasswd.c httpd_monitor.c logresolve.c rotatelogs.c suexec.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 13:02:38

  Modified:support   Makefile cls.c htdigest.c htpasswd.c
httpd_monitor.c  logresolve.c rotatelogs.c suexec.c
  Log:
  Removed Id lines, as per group consensus.
  Fixed accidental change in Makefile made in last commit.
  
  Revision  ChangesPath
  1.15  +1 -2  apache/support/Makefile
  
  Index: Makefile
  ===
  RCS file: /export/home/cvs/apache/support/Makefile,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -C3 -r1.14 -r1.15
  *** Makefile  1996/11/03 20:57:42 1.14
  --- Makefile  1996/11/03 21:02:29 1.15
  ***
  *** 1,4 
  - # $Id: Makefile,v 1.14 1996/11/03 20:57:42 brian Exp $
# For gcc
CC= gcc
# For ANSI compilers
  --- 1,3 
  ***
  *** 7,13 
#For Optimization
#CFLAGS= -O2
#For debugging
  ! CFLAGS= -g -Wall
# For SCO ODT
#EXTRA_LIBS= -lcrypt_i
# For OS/2 port
  --- 6,12 
#For Optimization
#CFLAGS= -O2
#For debugging
  ! CFLAGS= -g
# For SCO ODT
#EXTRA_LIBS= -lcrypt_i
# For OS/2 port
  
  
  
  1.3   +0 -1  apache/support/cls.c
  
  Index: cls.c
  ===
  RCS file: /export/home/cvs/apache/support/cls.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -C3 -r1.2 -r1.3
  *** cls.c 1996/08/20 13:25:02 1.2
  --- cls.c 1996/11/03 21:02:30 1.3
  ***
  *** 1,4 
  - # $Id: cls.c,v 1.2 1996/08/20 13:25:02 paul Exp $
#include 
#include 
#include 
  --- 1,3 
  
  
  
  1.5   +0 -2  apache/support/htdigest.c
  
  Index: htdigest.c
  ===
  RCS file: /export/home/cvs/apache/support/htdigest.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -C3 -r1.4 -r1.5
  *** htdigest.c1996/10/23 18:48:17 1.4
  --- htdigest.c1996/11/03 21:02:31 1.5
  ***
  *** 4,11 
 * by Alexei Kosut, based on htpasswd.c, by Rob McCool
 */

  - /* $Id: htdigest.c,v 1.4 1996/10/23 18:48:17 brian Exp $ */
  - 
#include 
#include 
#include 
  --- 4,9 
  
  
  
  1.4   +0 -2  apache/support/htpasswd.c
  
  Index: htpasswd.c
  ===
  RCS file: /export/home/cvs/apache/support/htpasswd.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** htpasswd.c1996/08/20 13:25:05 1.3
  --- htpasswd.c1996/11/03 21:02:31 1.4
  ***
  *** 4,11 
 * Rob McCool
 */

  - /* $Id: htpasswd.c,v 1.3 1996/08/20 13:25:05 paul Exp $ */
  - 
#include 
#include 
#include 
  --- 4,9 
  
  
  
  1.4   +0 -2  apache/support/httpd_monitor.c
  
  Index: httpd_monitor.c
  ===
  RCS file: /export/home/cvs/apache/support/httpd_monitor.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** httpd_monitor.c   1996/10/23 18:53:46 1.3
  --- httpd_monitor.c   1996/11/03 21:02:32 1.4
  ***
  *** 49,56 
 * For more information on the Apache Group and the Apache HTTP server
 * project, please see .

  -  * $Id: httpd_monitor.c,v 1.3 1996/10/23 18:53:46 brian Exp $
  - 

 * simple script to monitor the child Apache processes
 *   Usage:
  --- 49,54 
  
  
  
  1.6   +0 -2  apache/support/logresolve.c
  
  Index: logresolve.c
  ===
  RCS file: /export/home/cvs/apache/support/logresolve.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -C3 -r1.5 -r1.6
  *** logresolve.c  1996/08/20 13:25:09 1.5
  --- logresolve.c  1996/11/03 21:02:32 1.6
  ***
  *** 1,6 
/***  
***\
  - $Id: logresolve.c,v 1.5 1996/08/20 13:25:09 paul Exp $
  - 
logresolve 1.1

Tom Rathborne - [EMAIL PROTECTED] - http://www.uunet.ca/~tomr/
  --- 1,4 
  
  
  
  1.4   +0 -2  apache/support/rotatelogs.c
  
  Index: rotatelogs.c
  ===
  RCS file: /export/home/cvs/apache/support/rotatelogs.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** rotatelogs.c  1996/08/20 13:25:09 1.3
  --- rotatelogs.c  1996/11/03 21:02:33 1.4
  ***
  *** 1,7 
/*

  - $Id: rotatelogs.c,v 1.3 1996/08/20 13:25:09 paul Exp $
  - 
Simple program to rotate Apache logs without having to kill the server.

Contributed by Ben Laurie <[EMAIL PROTECTED]>
  --- 1,5 
  
  
  
  1.3   +0 -2  apache/support/suexec.c
  
  In

cvs commit: apache/support htpasswd.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 13:09:08

  Modified:support   htpasswd.c
  Log:
  Various bugfixes, -Wall warnings.
  
  Revision  ChangesPath
  1.5   +4 -9  apache/support/htpasswd.c
  
  Index: htpasswd.c
  ===
  RCS file: /export/home/cvs/apache/support/htpasswd.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -C3 -r1.4 -r1.5
  *** htpasswd.c1996/11/03 21:02:31 1.4
  --- htpasswd.c1996/11/03 21:09:07 1.5
  ***
  *** 10,15 
  --- 10,16 
#include 
#include 
#include 
  + #include 

#define LF 10
#define CR 13
  ***
  *** 36,42 
if(line[x]) ++x;
y=0;

  ! while(line[y++] = line[x++]);
}

int getline(char *s, int n, FILE *f) {
  --- 37,43 
if(line[x]) ++x;
y=0;

  ! while((line[y++] = line[x++]));
}

int getline(char *s, int n, FILE *f) {
  ***
  *** 68,86 
static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";

  ! to64(s, v, n)
  !   register char *s;
  !   register long v;
  !   register int n;
  ! {
while (--n >= 0) {
*s++ = itoa64[v&0x3f];
v >>= 6;
}
}

  - char *crypt(char *pw, char *salt); /* why aren't these prototyped in 
include */
  - 
void add_password(char *user, FILE *f) {
char *pw, *cpw, salt[3];

  --- 69,81 
static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";

  ! void to64(register char *s, register long v, register int n) {
while (--n >= 0) {
*s++ = itoa64[v&0x3f];
v >>= 6;
}
}

void add_password(char *user, FILE *f) {
char *pw, *cpw, salt[3];

  ***
  *** 110,116 
exit(1);
}

  ! main(int argc, char *argv[]) {
FILE *tfp,*f;
char user[MAX_STRING_LEN];
char line[MAX_STRING_LEN];
  --- 105,111 
exit(1);
}

  ! void main(int argc, char *argv[]) {
FILE *tfp,*f;
char user[MAX_STRING_LEN];
char line[MAX_STRING_LEN];

cvs commit: apache/support htdigest.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 13:10:14

  Modified:support   htdigest.c
  Log:
  Missing include file, as with htpasswd.c
  
  Revision  ChangesPath
  1.6   +1 -0  apache/support/htdigest.c
  
  Index: htdigest.c
  ===
  RCS file: /export/home/cvs/apache/support/htdigest.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -C3 -r1.5 -r1.6
  *** htdigest.c1996/11/03 21:02:31 1.5
  --- htdigest.c1996/11/03 21:10:13 1.6
  ***
  *** 10,15 
  --- 10,16 
#include 
#include 
#include 
  + #include 

/* This is probably the easiest way to do it */
#include "../src/md5c.c"

cvs commit: apache/support rotatelogs.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 13:13:01

  Modified:support   rotatelogs.c
  Log:
  More missing header files, printf warning fixed.
  
  Revision  ChangesPath
  1.5   +3 -1  apache/support/rotatelogs.c
  
  Index: rotatelogs.c
  ===
  RCS file: /export/home/cvs/apache/support/rotatelogs.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -C3 -r1.4 -r1.5
  *** rotatelogs.c  1996/11/03 21:02:33 1.4
  --- rotatelogs.c  1996/11/03 21:13:00 1.5
  ***
  *** 12,20 
  --- 12,22 
#define MAX_PATH1024

#include 
  + #include 
#include 
#include 
#include 
  + #include 

void main(int argc,char **argv)
{
  ***
  *** 64,70 
if(nLogFD < 0)
{
time_t tLogStart=(time(NULL)/tRotation)*tRotation;
  ! sprintf(buf2,"%s.%d",szLogRoot,tLogStart);
tLogEnd=tLogStart+tRotation;
nLogFD=open(buf2,O_WRONLY|O_CREAT|O_APPEND,0666);
if(nLogFD < 0)
  --- 66,72 
if(nLogFD < 0)
{
time_t tLogStart=(time(NULL)/tRotation)*tRotation;
  ! sprintf(buf2,"%s.%d",szLogRoot,(int)tLogStart);
tLogEnd=tLogStart+tRotation;
nLogFD=open(buf2,O_WRONLY|O_CREAT|O_APPEND,0666);
if(nLogFD < 0)

cvs commit: apache/src mod_pics_simple.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 13:19:55

  Removed: src   mod_pics_simple.c
  Log:
  Removed, as its functionality is now provided by mod_header.

cvs commit: apache/src buff.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 13:21:05

  Modified:src   buff.c
  Log:
  Reviewed by:  Brian Behlendorf
  Submitted by: Sameer Parekh
  
  Simple typo.
  
  Revision  ChangesPath
  1.7   +2 -2  apache/src/buff.c
  
  Index: buff.c
  ===
  RCS file: /export/home/cvs/apache/src/buff.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -C3 -r1.6 -r1.7
  *** buff.c1996/08/20 11:50:38 1.6
  --- buff.c1996/11/03 21:21:04 1.7
  ***
  *** 50,56 
 *
 */

  ! /* $Id: buff.c,v 1.6 1996/08/20 11:50:38 paul Exp $ */

#include 
#include 
  --- 50,56 
 *
 */

  ! /* $Id: buff.c,v 1.7 1996/11/03 21:21:04 brian Exp $ */

#include 
#include 
  ***
  *** 116,122 
else fb->inbase = NULL;

if (flags & B_WR) fb->outbase = palloc(p, fb->bufsiz);
  ! else fb->inbase = NULL;

fb->inptr = fb->inbase;

  --- 116,122 
else fb->inbase = NULL;

if (flags & B_WR) fb->outbase = palloc(p, fb->bufsiz);
  ! else fb->outbase = NULL;

fb->inptr = fb->inbase;

cvs commit: apache/src alloc.h buff.c buff.h conf.h explain.h http_conf_globals.h http_config.h http_core.h http_log.h http_main.h http_request.h md5.h rfc1413.h scoreboard.h util_md5.h util_script.h

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 13:25:17

  Modified:src   alloc.h buff.c buff.h conf.h explain.h
http_conf_globals.h  http_config.h http_core.h
http_log.h http_main.h  http_request.h md5.h
rfc1413.h scoreboard.h util_md5.h  util_script.h
  Log:
  Removed Id lines, as per group consensus.
  
  Revision  ChangesPath
  1.14  +0 -2  apache/src/alloc.h
  
  Index: alloc.h
  ===
  RCS file: /export/home/cvs/apache/src/alloc.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -C3 -r1.13 -r1.14
  *** alloc.h   1996/10/17 08:59:54 1.13
  --- alloc.h   1996/11/03 21:25:03 1.14
  ***
  *** 51,58 
 *
 */

  - /* $Id: alloc.h,v 1.13 1996/10/17 08:59:54 ben Exp $ */
  - 
/*
 * Resource allocation routines...
 *
  --- 51,56 
  
  
  
  1.8   +0 -2  apache/src/buff.c
  
  Index: buff.c
  ===
  RCS file: /export/home/cvs/apache/src/buff.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -C3 -r1.7 -r1.8
  *** buff.c1996/11/03 21:21:04 1.7
  --- buff.c1996/11/03 21:25:04 1.8
  ***
  *** 50,57 
 *
 */

  - /* $Id: buff.c,v 1.7 1996/11/03 21:21:04 brian Exp $ */
  - 
#include 
#include 
#include 
  --- 50,55 
  
  
  
  1.7   +0 -2  apache/src/buff.h
  
  Index: buff.h
  ===
  RCS file: /export/home/cvs/apache/src/buff.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -C3 -r1.6 -r1.7
  *** buff.h1996/08/20 11:50:39 1.6
  --- buff.h1996/11/03 21:25:04 1.7
  ***
  *** 50,57 
 *
 */

  - /* $Id: buff.h,v 1.6 1996/08/20 11:50:39 paul Exp $ */
  - 
#include 

/* Reading is buffered */
  --- 50,55 
  
  
  
  1.42  +0 -2  apache/src/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -C3 -r1.41 -r1.42
  *** conf.h1996/10/22 04:21:44 1.41
  --- conf.h1996/11/03 21:25:05 1.42
  ***
  *** 50,57 
 *
 */

  - /* $Id: conf.h,v 1.41 1996/10/22 04:21:44 akosut Exp $ */
  - 
/*
 * conf.h: system-dependant #defines and includes...
 * See README for a listing of what they mean
  --- 50,55 
  
  
  
  1.3   +0 -2  apache/src/explain.h
  
  Index: explain.h
  ===
  RCS file: /export/home/cvs/apache/src/explain.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -C3 -r1.2 -r1.3
  *** explain.h 1996/08/20 11:50:41 1.2
  --- explain.h 1996/11/03 21:25:05 1.3
  ***
  *** 1,5 
  - /* $Id: explain.h,v 1.2 1996/08/20 11:50:41 paul Exp $ */
  - 
#ifndef EXPLAIN
#define DEF_Explain
#define Explain0(f)
  --- 1,3 
  
  
  
  1.7   +0 -2  apache/src/http_conf_globals.h
  
  Index: http_conf_globals.h
  ===
  RCS file: /export/home/cvs/apache/src/http_conf_globals.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -C3 -r1.6 -r1.7
  *** http_conf_globals.h   1996/10/02 00:31:51 1.6
  --- http_conf_globals.h   1996/11/03 21:25:06 1.7
  ***
  *** 50,57 
 *
 */

  - /* $Id: http_conf_globals.h,v 1.6 1996/10/02 00:31:51 jim Exp $ */
  - 
/* 
 * Process config --- what the process ITSELF is doing
 */
  --- 50,55 
  
  
  
  1.19  +0 -2  apache/src/http_config.h
  
  Index: http_config.h
  ===
  RCS file: /export/home/cvs/apache/src/http_config.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -C3 -r1.18 -r1.19
  *** http_config.h 1996/11/03 20:29:38 1.18
  --- http_config.h 1996/11/03 21:25:06 1.19
  ***
  *** 50,57 
 *
 */

  - /* $Id: http_config.h,v 1.18 1996/11/03 20:29:38 brian Exp $ */
  - 
/*
 * The central data structures around here...
 */
  --- 50,55 
  
  
  
  1.14  +0 -2  apache/src/http_core.h
  
  Index: http_core.h
  ===
  RCS file: /export/home/cvs/apache/src/http_core.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -C3 -r1.13 -r1.14
  *** http_core.h   1996/10/22 18:54:01 1.13
  --- http_core.h   1996/11/03 21:25:07 1.14
  ***
  *** 50,57 
 *
 */

  - /* $Id: http_core.h,v 1.13 1996/10/22 18:54:01 brian Exp $ */
  - 
/*
 *
 * T

cvs commit: apache/src alloc.c explain.c md5c.c rfc1413.c util_md5.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 13:29:04

  Modified:src   alloc.c explain.c md5c.c rfc1413.c util_md5.c
  Log:
  Removal of Id lines, as per group consensus (this should be it, folks!)
  
  Revision  ChangesPath
  1.18  +0 -2  apache/src/alloc.c
  
  Index: alloc.c
  ===
  RCS file: /export/home/cvs/apache/src/alloc.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -C3 -r1.17 -r1.18
  *** alloc.c   1996/10/17 08:59:54 1.17
  --- alloc.c   1996/11/03 21:28:58 1.18
  ***
  *** 50,57 
 *
 */

  - /* $Id: alloc.c,v 1.17 1996/10/17 08:59:54 ben Exp $ */
  - 

/*
 * Resource allocation code... the code here is responsible for making
  --- 50,55 
  
  
  
  1.3   +0 -2  apache/src/explain.c
  
  Index: explain.c
  ===
  RCS file: /export/home/cvs/apache/src/explain.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -C3 -r1.2 -r1.3
  *** explain.c 1996/08/20 11:50:40 1.2
  --- explain.c 1996/11/03 21:28:59 1.3
  ***
  *** 1,5 
  - /* $Id: explain.c,v 1.2 1996/08/20 11:50:40 paul Exp $ */
  - 
#include 
#include 
#include "explain.h"
  --- 1,3 
  
  
  
  1.3   +0 -2  apache/src/md5c.c
  
  Index: md5c.c
  ===
  RCS file: /export/home/cvs/apache/src/md5c.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -C3 -r1.2 -r1.3
  *** md5c.c1996/08/20 11:50:53 1.2
  --- md5c.c1996/11/03 21:29:00 1.3
  ***
  *** 1,5 
  - /* $Id: md5c.c,v 1.2 1996/08/20 11:50:53 paul Exp $ */
  - 
/*
 * This is work is derived from material Copyright RSA Data Security, Inc.
 *
  --- 1,3 
  
  
  
  1.6   +0 -2  apache/src/rfc1413.c
  
  Index: rfc1413.c
  ===
  RCS file: /export/home/cvs/apache/src/rfc1413.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -C3 -r1.5 -r1.6
  *** rfc1413.c 1996/11/03 20:52:11 1.5
  --- rfc1413.c 1996/11/03 21:29:01 1.6
  ***
  *** 50,57 
 *
 */

  - /* $Id: rfc1413.c,v 1.5 1996/11/03 20:52:11 brian Exp $ */
  - 
/*
 * rfc1413() speaks a common subset of the RFC 1413, AUTH, TAP and IDENT
 * protocols. The code queries an RFC 1413 etc. compatible daemon on a 
remote
  --- 50,55 
  
  
  
  1.5   +0 -2  apache/src/util_md5.c
  
  Index: util_md5.c
  ===
  RCS file: /export/home/cvs/apache/src/util_md5.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -C3 -r1.4 -r1.5
  *** util_md5.c1996/08/20 11:51:24 1.4
  --- util_md5.c1996/11/03 21:29:01 1.5
  ***
  *** 50,57 
 *
 */

  - /* $Id: util_md5.c,v 1.4 1996/08/20 11:51:24 paul Exp $ */
  - 
/
 * NCSA HTTPd Server
 * Software Development Group
  --- 50,55

cvs commit: apache/src http_protocol.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 13:36:17

  Modified:src   http_protocol.c
  Log:
  Reviewed by:  Brian Behlendorf
  Submitted by: Chuck Murcko
  
  Fixed -Wall warning.  Woohoo!
  
  Revision  ChangesPath
  1.69  +2 -2  apache/src/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /export/home/cvs/apache/src/http_protocol.c,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -C3 -r1.68 -r1.69
  *** http_protocol.c   1996/10/31 17:36:20 1.68
  --- http_protocol.c   1996/11/03 21:36:16 1.69
  ***
  *** 342,349 
 */

if (r->finfo.st_mode != 0)
  ! sprintf(weak_etag, "W/\"%lx-%lx-%lx\"", r->finfo.st_ino,
  ! r->finfo.st_size, mtime);
else
sprintf(weak_etag, "W/\"%lx\"", mtime);

  --- 342,349 
 */

if (r->finfo.st_mode != 0)
  ! sprintf(weak_etag, "W/\"%lx-%lx-%lx\"", (unsigned 
long)r->finfo.st_ino,
  ! (unsigned long)r->finfo.st_size, mtime);
else
sprintf(weak_etag, "W/\"%lx\"", mtime);

cvs commit: apache/src mod_auth_db.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 13:40:24

  Modified:src   mod_auth_db.c
  Log:
  Fixed -Wall warnings related to constification.
  
  Revision  ChangesPath
  1.5   +5 -3  apache/src/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_auth_db.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -C3 -r1.4 -r1.5
  *** mod_auth_db.c 1996/11/03 20:48:30 1.4
  --- mod_auth_db.c 1996/11/03 21:40:23 1.5
  ***
  *** 93,99 
return pcalloc (p, sizeof(db_auth_config_rec));
}

  ! char *set_db_slot (cmd_parms *cmd, void *offset, char *f, char *t)
{
if (!t || strcmp(t, "db"))
return DECLINE_CMD;
  --- 93,99 
return pcalloc (p, sizeof(db_auth_config_rec));
}

  ! const char *set_db_slot (cmd_parms *cmd, void *offset, char *f, char *t)
{
if (!t || strcmp(t, "db"))
return DECLINE_CMD;
  ***
  *** 216,222 
require_line *reqs = reqs_arr ? (require_line *)reqs_arr->elts : NULL;

register int x;
  ! char *t, *w;

if (!sec->auth_dbgrpfile) return DECLINED;
if (!reqs_arr) return DECLINED;
  --- 216,223 
require_line *reqs = reqs_arr ? (require_line *)reqs_arr->elts : NULL;

register int x;
  ! const char *t;
  ! char *w;

if (!sec->auth_dbgrpfile) return DECLINED;
if (!reqs_arr) return DECLINED;
  ***
  *** 229,235 
w = getword(r->pool, &t, ' ');

if(!strcmp(w,"group") && sec->auth_dbgrpfile) {
  !char *orig_groups,*groups,*v;

   if (!(groups = get_db_grp(r, user, sec->auth_dbgrpfile))) {
   sprintf(errstr,"user %s not in DB group file %s",
  --- 230,237 
w = getword(r->pool, &t, ' ');

if(!strcmp(w,"group") && sec->auth_dbgrpfile) {
  !const char *orig_groups,*groups;
  !char *v;

   if (!(groups = get_db_grp(r, user, sec->auth_dbgrpfile))) {
   sprintf(errstr,"user %s not in DB group file %s",

cvs commit: apache/src Configuration.tmpl Configure http_config.c http_config.h http_core.c http_main.c mod_info.c

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 16:55:24

  Modified:src   Configuration.tmpl Configure http_config.c
http_config.h  http_core.c http_main.c mod_info.c
  Log:
  Reviewed by:  Brian Behlendorf
  Submitted by: Tom Tromey ([EMAIL PROTECTED])
  
  Implemented the "AddModule" functionality.
  
  Revision  ChangesPath
  1.50  +6 -1  apache/src/Configuration.tmpl
  
  Index: Configuration.tmpl
  ===
  RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -C3 -r1.49 -r1.50
  *** Configuration.tmpl1996/11/03 20:56:03 1.49
  --- Configuration.tmpl1996/11/04 00:55:16 1.50
  ***
  *** 8,14 
# or an existing one modified. This will also most likely require some minor
# changes to Configure to recognize those changes.

  ! # There are 4 types of lines here:

# '#' comments, distinguished by having a '#' as the first non-blank 
character
#
  --- 8,14 
# or an existing one modified. This will also most likely require some minor
# changes to Configure to recognize those changes.

  ! # There are 5 types of lines here:

# '#' comments, distinguished by having a '#' as the first non-blank 
character
#
  ***
  *** 20,25 
  --- 20,30 
# Module selection lines, distinguished by having 'Module' at the front.
# These list the configured modules, in priority order (highest priority
# first).  They're down at the bottom.
  + #
  + # Optional module selection lines, distinguished by having `%Module'
  + # at the front.  These specify a module that is to be compiled in (but
  + # not enabled).  The AddModule directive can be used to enable such a
  + # module.  By default no such modules are defined.



  
  
  
  1.34  +25 -11apache/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -C3 -r1.33 -r1.34
  *** Configure 1996/10/25 13:06:35 1.33
  --- Configure 1996/11/04 00:55:16 1.34
  ***
  *** 1,5 
#!/bin/sh
  ! # $Id: Configure,v 1.33 1996/10/25 13:06:35 jim Exp $
trap 'rm -f $tmpfile; exit' 0 1 2 3 15

# Apache configuration script, first cut --- rst.
  --- 1,5 
#!/bin/sh
  ! # $Id: Configure,v 1.34 1996/11/04 00:55:16 brian Exp $
trap 'rm -f $tmpfile; exit' 0 1 2 3 15

# Apache configuration script, first cut --- rst.
  ***
  *** 37,44 

# Check for syntax errors...

  ! if egrep -v '^Module[   ]+[A-Za-z0-9_]+[]+[^]+$' $tmpfile | 
\
  !grep -v = > /dev/null
then
   echo "Syntax error --- The configuration file is used only to"
   echo "define the list of included modules or to set Makefile"
  --- 37,44 

# Check for syntax errors...

  ! if egrep -v '^%?Module[ ]+[A-Za-z0-9_]+[]+[^]+$' $tmpfile \
  !| grep -v = > /dev/null
then
   echo "Syntax error --- The configuration file is used only to"
   echo "define the list of included modules or to set Makefile"
  ***
  *** 53,61 
if [ -f Makefile ] ; then mv Makefile Makefile.bak; fi
if [ -f modules.c ] ; then mv modules.c modules.c.bak; fi

  ! awk >modules.c <$tmpfile '\
  !BEGIN { modules[n++] = "core_module" } \
  !/^Module/ { modules[n++] = $2 } \
   END { print "/* modules.c --- automatically generated by Apache"; \
 print " * configuration script.  DO NOT HAND EDIT!"; \
 print " */"; \
  --- 53,62 
if [ -f Makefile ] ; then mv Makefile Makefile.bak; fi
if [ -f modules.c ] ; then mv modules.c modules.c.bak; fi

  ! sed -e 's/_module//' $tmpfile | awk >modules.c '\
  !BEGIN { modules[n++] = "core" ; pmodules[pn++] = "core"} \
  !/^Module/ { modules[n++] = $2 ; pmodules[pn++] = $2 } \
  !/^%Module/ { pmodules[pn++] = $2 } \
   END { print "/* modules.c --- automatically generated by Apache"; \
 print " * configuration script.  DO NOT HAND EDIT!"; \
 print " */"; \
  ***
  *** 63,83 
 print "#include \"httpd.h\""; \
 print "#include \"http_config.h\""; \
 print ""; \
  !  for (i = 0; i < n; ++i) { \
  !  printf ("extern module %s;\n", modules[i]); \
 } \
 print ""; \
 print "module *prelinked_modules[] = {"; \
 for (i = 0; i < n; ++i) { \
  !  printf "  &%s,\n", modules[i]; \
 } \
 print "  NULL"; \
 print "};"; \
 print "char *module_names[] = {"; \
  !  for (i = n-1; i > -1; --i) { \

cvs commit: apache/src mod_expires.c Configuration.tmpl

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 17:06:03

  Modified:src   Configuration.tmpl
  Added:   src   mod_expires.c
  Log:
  Reviewed by:  Brian Behlendorf
  Submitted by: Andrew Wilson <[EMAIL PROTECTED]>
  
  Long-overdue add of mod_expires.
  
  Revision  ChangesPath
  1.51  +5 -0  apache/src/Configuration.tmpl
  
  Index: Configuration.tmpl
  ===
  RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -C3 -r1.50 -r1.51
  *** Configuration.tmpl1996/11/04 00:55:16 1.50
  --- Configuration.tmpl1996/11/04 01:06:00 1.51
  ***
  *** 204,209 
  --- 204,214 

# Module digest_module   mod_digest.o

  + ## The expires module can apply Expires: headers to resources,
  + ## as a function of access time or modification time.
  + 
  + # Module expires_module  mod_expires.o
  + 
## The headers module can set arbitrary HTTP response headers,
## in server, vhost, access.conf or .htaccess configs

cvs commit: apache/src http_protocol.c mod_log_config.c

1996-11-03 Thread Jim Jagielski

jim 96/11/03 17:06:12

  Modified:src   http_protocol.c mod_log_config.c
  Log:
  -Wall cleanups, continued
  
  Revision  ChangesPath
  1.70  +1 -1  apache/src/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /export/home/cvs/apache/src/http_protocol.c,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -C3 -r1.69 -r1.70
  *** http_protocol.c   1996/11/03 21:36:16 1.69
  --- http_protocol.c   1996/11/04 01:06:09 1.70
  ***
  *** 227,233 

r->byterange = 2;
table_unset(r->headers_out, "Content-Length");
  ! sprintf(boundary, "%lx%lx", r->request_time, getpid());
r->boundary = pstrdup(r->pool, boundary);
}

  --- 227,233 

r->byterange = 2;
table_unset(r->headers_out, "Content-Length");
  ! sprintf(boundary, "%lx%lx", r->request_time, (long)getpid());
r->boundary = pstrdup(r->pool, boundary);
}

  
  
  
  1.15  +1 -1  apache/src/mod_log_config.c
  
  Index: mod_log_config.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_log_config.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -C3 -r1.14 -r1.15
  *** mod_log_config.c  1996/10/20 18:03:35 1.14
  --- mod_log_config.c  1996/11/04 01:06:10 1.15
  ***
  *** 328,334 

char *log_child_pid (request_rec *r, char *a) {
char pidnum[10];
  ! sprintf(pidnum, "%ld", getpid());
return pstrdup(r->pool, pidnum);
}
/*
  --- 328,334 

char *log_child_pid (request_rec *r, char *a) {
char pidnum[10];
  ! sprintf(pidnum, "%ld", (long)getpid());
return pstrdup(r->pool, pidnum);
}
/*

cvs commit: apache/src httpd.h

1996-11-03 Thread Brian Behlendorf

brian   96/11/03 17:19:18

  Modified:src   httpd.h
  Log:
  Tweaked up HARD_SERVER_LIMIT, based on comments from users and group
  discussions.
  
  Revision  ChangesPath
  1.59  +1 -1  apache/src/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -C3 -r1.58 -r1.59
  *** httpd.h   1996/10/28 16:05:46 1.58
  --- httpd.h   1996/11/04 01:19:16 1.59
  ***
  *** 219,225 
 * enough that we can read the whole thing without worrying too much about
 * the overhead.
 */
  ! #define HARD_SERVER_LIMIT 150

/* Number of requests to try to handle in a single process.  If <= 0,
 * the children don't die off.  That's the default here, since I'm still
  --- 219,225 
 * enough that we can read the whole thing without worrying too much about
 * the overhead.
 */
  ! #define HARD_SERVER_LIMIT 256

/* Number of requests to try to handle in a single process.  If <= 0,
 * the children don't die off.  That's the default here, since I'm still

cvs commit: apache/src http_config.h http_config.c http_core.c http_main.c

cvs commit: apache/src mod_log_agent.c mod_log_referer.c

cvs commit: apache/src mod_headers.c

cvs commit: apache/src http_bprintf.c http_config.c http_log.c http_main.c http_request.c

cvs commit: apache/src mod_ai_backcompat.c

cvs commit: apache/src mod_alias.c mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c mod_auth_msql.c mod_cern_meta.c mod_digest.c mod_dir.c mod_dld.c mod_imap.c mod_include.c mod_info.c mod_log_agent.c mod_log_referer.c mod_negotiation.c mod_usertrack.c

cvs commit: apache/src http_config.c http_main.c http_request.c rfc1413.c util_script.c

cvs commit: apache/src CHANGES Configuration.tmpl INSTALL Makefile.tmpl README TODO

cvs commit: apache/support Makefile

cvs commit: apache/support Makefile cls.c htdigest.c htpasswd.c httpd_monitor.c logresolve.c rotatelogs.c suexec.c

cvs commit: apache/support htpasswd.c

cvs commit: apache/support htdigest.c

cvs commit: apache/support rotatelogs.c

cvs commit: apache/src mod_pics_simple.c

cvs commit: apache/src buff.c

cvs commit: apache/src alloc.h buff.c buff.h conf.h explain.h http_conf_globals.h http_config.h http_core.h http_log.h http_main.h http_request.h md5.h rfc1413.h scoreboard.h util_md5.h util_script.h

cvs commit: apache/src alloc.c explain.c md5c.c rfc1413.c util_md5.c

cvs commit: apache/src http_protocol.c

cvs commit: apache/src mod_auth_db.c

cvs commit: apache/src Configuration.tmpl Configure http_config.c http_config.h http_core.c http_main.c mod_info.c

cvs commit: apache/src mod_expires.c Configuration.tmpl

cvs commit: apache/src http_protocol.c mod_log_config.c

cvs commit: apache/src httpd.h

23 matches

Site Navigation

Mail list logo

Footer information