cvs commit: apache/conf srm.conf-dist

1996-06-12 Thread Brian Behlendorf 
brian   96/06/12 19:04:45

  Modified:conf  srm.conf-dist
  Log:
  Submitted by: Brian Behlendorf
  
  Removed the Meta keywords, since the cern_meta_dir module is now not
  compiled in by default.
  
  Revision  ChangesPath
  1.7   +2 -2  apache/conf/srm.conf-dist
  
  Index: srm.conf-dist
  ===
  RCS file: /export/home/cvs/apache/conf/srm.conf-dist,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -C3 -r1.6 -r1.7
  *** srm.conf-dist 1996/05/28 01:45:34 1.6
  --- srm.conf-dist 1996/06/13 02:04:43 1.7
  ***
  *** 185,196 
# meta information files. These files contain additional HTTP headers
# to include when sending the document

  ! MetaDir .web

# MetaSuffix: specifies the file name suffix for the file containing the
# meta information.

  ! MetaSuffix .meta

# Customizable error response (Apache style)
#  these come in three flavors
  --- 185,196 
# meta information files. These files contain additional HTTP headers
# to include when sending the document

  ! #MetaDir .web

# MetaSuffix: specifies the file name suffix for the file containing the
# meta information.

  ! #MetaSuffix .meta

# Customizable error response (Apache style)
#  these come in three flavors

cvs commit: apache/src http_request.c

1996-06-12 Thread Brian Behlendorf 
brian   96/06/12 20:09:24

  Modified:src   http_request.c
  Log:
  Reviewed by:  Brian Behlendorf
  Submitted by: Andrew Wilson
  
  Fixed compilation warning with an unused variable without STATUS 
instrumentation.
  
  Revision  ChangesPath
  1.9   +2 -0  apache/src/http_request.c
  
  Index: http_request.c
  ===
  RCS file: /export/home/cvs/apache/src/http_request.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -C3 -r1.8 -r1.9
  *** http_request.c1996/06/10 02:04:04 1.8
  --- http_request.c1996/06/13 03:09:22 1.9
  ***
  *** 749,755 
  --- 749,757 

void process_request (request_rec *r)
{
  + #ifdef STATUS
int old_stat;
  + #endif /* STATUS */
process_request_internal (r);
#ifdef STATUS
old_stat = update_child_status (r-connection-child_num, 
SERVER_BUSY_LOG,

cvs commit: apache/support Makefile htdigest.c change-passwd.readme inc2shtml.c unescape.c

1996-06-12 Thread Brian Behlendorf 
brian   96/06/12 20:39:34

  Modified:support   Makefile htdigest.c
  Removed: support   change-passwd.readme inc2shtml.c unescape.c
  Log:
  Reviewed by:  Brian Behlendorf
  Submitted by: Mario Sergio, [EMAIL PROTECTED] + others
  
  made sure the Makefile included compilation lines for rotatelogs and 
resolvehosts.
  
  fixed a compile warning in htdigest.c
  
  removed various files that we were no longer supporting.
  
  Revision  ChangesPath
  1.8   +9 -9  apache/support/Makefile
  
  Index: Makefile
  ===
  RCS file: /export/home/cvs/apache/support/Makefile,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -C3 -r1.7 -r1.8
  *** Makefile  1996/05/08 05:07:50 1.7
  --- Makefile  1996/06/13 03:39:29 1.8
  ***
  *** 18,24 
.c.o: 
$(CC) -c $(CFLAGS) $(INCLUDES) $

  ! TARGETS=htpasswd htdigest unescape inc2shtml httpd_monitor rotatelogs

all: $(TARGETS)

  --- 18,24 
.c.o: 
$(CC) -c $(CFLAGS) $(INCLUDES) $

  ! TARGETS=htpasswd htdigest httpd_monitor rotatelogs logresolve

all: $(TARGETS)

  ***
  *** 50,57 
make all CC=cc EXTRA_LIBS=-lcrypt_i


  ! tar: htpasswd unescape
  ! $(RM) htpasswd unescape

htpasswd: htpasswd.c
$(CC) $(CFLAGS) htpasswd.c -o htpasswd $(EXTRA_LIBS)
  --- 50,57 
make all CC=cc EXTRA_LIBS=-lcrypt_i


  ! tar: htpasswd 
  ! $(RM) htpasswd

htpasswd: htpasswd.c
$(CC) $(CFLAGS) htpasswd.c -o htpasswd $(EXTRA_LIBS)
  ***
  *** 59,72 
htdigest: htdigest.c
$(CC) $(CFLAGS) htdigest.c -o htdigest

  - unescape: unescape.c
  - $(CC) $(CFLAGS) unescape.c -o unescape
  - 
  - inc2shtml: inc2shtml.c
  - $(CC) $(CFLAGS) inc2shtml.c -o inc2shtml
  - 
httpd_monitor: httpd_monitor.c
$(CC) $(INCLUDES) $(CFLAGS) httpd_monitor.c -o httpd_monitor

clean:
rm -f $(TARGETS)
  --- 59,72 
htdigest: htdigest.c
$(CC) $(CFLAGS) htdigest.c -o htdigest

httpd_monitor: httpd_monitor.c
$(CC) $(INCLUDES) $(CFLAGS) httpd_monitor.c -o httpd_monitor
  + 
  + rotatelogs: rotatelogs.c
  + $(CC) $(INCLUDES) $(CFLAGS) rotatelogs.c -o rotatelogs
  + 
  + logresolve: logresolve.c
  + $(CC) $(INCLUDES) $(CFLAGS) logresolve.c -o logresolve

clean:
rm -f $(TARGETS)
  
  
  
  1.2   +2 -2  apache/support/htdigest.c
  
  Index: htdigest.c
  ===
  RCS file: /export/home/cvs/apache/support/htdigest.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** htdigest.c1996/05/08 05:07:50 1.1
  --- htdigest.c1996/06/13 03:39:31 1.2
  ***
  *** 74,81 
char string[MAX_STRING_LEN];
unsigned int i;

  ! pw = strd(getpass(New password:));
  ! if(strcmp(pw,getpass(Re-type new password:))) {
fprintf(stderr,They don't match, sorry.\n);
if(tn)
unlink(tn);
  --- 74,81 
char string[MAX_STRING_LEN];
unsigned int i;

  ! pw = strd((char *) getpass(New password:));
  ! if(strcmp(pw,(char *) getpass(Re-type new password:))) {
fprintf(stderr,They don't match, sorry.\n);
if(tn)
unlink(tn);