cvs commit: CVSROOT log_accum.pl
ben 96/08/24 04:17:12
Modified:. log_accum.pl
Log:
Try to diagnose missing change entries in email.
Revision ChangesPath
1.20 +3 -2 CVSROOT/log_accum.pl
Index: log_accum.pl
===
RCS file: /export/home/cvs/CVSROOT/log_accum.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C3 -r1.19 -r1.20
*** log_accum.pl 1996/03/14 19:01:46 1.19
--- log_accum.pl 1996/08/24 11:17:08 1.20
***
*** 1,6
#!/usr/bin/perl
#
! # $Id: log_accum.pl,v 1.19 1996/03/14 19:01:46 ben Exp $
#
# Perl filter to handle the log messages from the checkin of files in
# a directory. This script will group the lists of files by log
--- 1,6
#!/usr/bin/perl
#
! # $Id: log_accum.pl,v 1.20 1996/08/24 11:17:08 ben Exp $
#
# Perl filter to handle the log messages from the checkin of files in
# a directory. This script will group the lists of files by log
***
*** 220,226
$prev_rev =~ /(.*)\.([0-9]+$)/;
$prev = $2 - 1;
$prev_rev = $1 . "." . $prev;
! #print STDERR "Rev: $rev, $1, $2, $prev, $prev_rev\n";
open(DIFF, "-|") || exec 'cvs', '-Qn', 'diff', '-C3', "-r$prev_rev",
$file;
while () {
$diff .= $_;
--- 220,227
$prev_rev =~ /(.*)\.([0-9]+$)/;
$prev = $2 - 1;
$prev_rev = $1 . "." . $prev;
! print STDERR "Rev: $rev, $1, $2, $prev, $prev_rev\n";
! print STDERR "Dir: `pwd`\n";
open(DIFF, "-|") || exec 'cvs', '-Qn', 'diff', '-C3', "-r$prev_rev",
$file;
while () {
$diff .= $_;
cvs commit: apache/src CHANGES
ben 96/08/24 04:19:39 Modified:src CHANGES Log: Test. Revision ChangesPath 1.56 +3 -1 apache/src/CHANGES
cvs commit: CVSROOT log_accum.pl
ben 96/08/24 04:21:25
Modified:. log_accum.pl
Log:
Debug.
Revision ChangesPath
1.21 +3 -2 CVSROOT/log_accum.pl
Index: log_accum.pl
===
RCS file: /export/home/cvs/CVSROOT/log_accum.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C3 -r1.20 -r1.21
*** log_accum.pl 1996/08/24 11:17:08 1.20
--- log_accum.pl 1996/08/24 11:21:24 1.21
***
*** 1,6
#!/usr/bin/perl
#
! # $Id: log_accum.pl,v 1.20 1996/08/24 11:17:08 ben Exp $
#
# Perl filter to handle the log messages from the checkin of files in
# a directory. This script will group the lists of files by log
--- 1,6
#!/usr/bin/perl
#
! # $Id: log_accum.pl,v 1.21 1996/08/24 11:21:24 ben Exp $
#
# Perl filter to handle the log messages from the checkin of files in
# a directory. This script will group the lists of files by log
***
*** 221,227
$prev = $2 - 1;
$prev_rev = $1 . "." . $prev;
print STDERR "Rev: $rev, $1, $2, $prev, $prev_rev\n";
! print STDERR "Dir: `pwd`\n";
open(DIFF, "-|") || exec 'cvs', '-Qn', 'diff', '-C3', "-r$prev_rev",
$file;
while () {
$diff .= $_;
--- 221,228
$prev = $2 - 1;
$prev_rev = $1 . "." . $prev;
print STDERR "Rev: $rev, $1, $2, $prev, $prev_rev\n";
! $xxx=`pwd`;
! print STDERR "Dir: $xxx\n";
open(DIFF, "-|") || exec 'cvs', '-Qn', 'diff', '-C3', "-r$prev_rev",
$file;
while () {
$diff .= $_;
cvs commit: apache/src CHANGES
ben 96/08/24 04:22:15 Modified:src CHANGES Log: Test. Revision ChangesPath 1.57 +1 -3 apache/src/CHANGES
cvs commit: CVSROOT log_accum.pl
ben 96/08/24 04:30:45
Modified:. log_accum.pl
Log:
More debug.
Revision ChangesPath
1.22 +4 -2 CVSROOT/log_accum.pl
Index: log_accum.pl
===
RCS file: /export/home/cvs/CVSROOT/log_accum.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C3 -r1.21 -r1.22
*** log_accum.pl 1996/08/24 11:21:24 1.21
--- log_accum.pl 1996/08/24 11:30:43 1.22
***
*** 1,6
#!/usr/bin/perl
#
! # $Id: log_accum.pl,v 1.21 1996/08/24 11:21:24 ben Exp $
#
# Perl filter to handle the log messages from the checkin of files in
# a directory. This script will group the lists of files by log
--- 1,6
#!/usr/bin/perl
#
! # $Id: log_accum.pl,v 1.22 1996/08/24 11:30:43 ben Exp $
#
# Perl filter to handle the log messages from the checkin of files in
# a directory. This script will group the lists of files by log
***
*** 223,233
print STDERR "Rev: $rev, $1, $2, $prev, $prev_rev\n";
$xxx=`pwd`;
print STDERR "Dir: $xxx\n";
! open(DIFF, "-|") || exec 'cvs', '-Qn', 'diff', '-C3', "-r$prev_rev",
$file;
while () {
$diff .= $_;
}
close(DIFF);
$diff .= "\n\n";
#print STDERR "Diff:\n $diff\n";
--- 223,235
print STDERR "Rev: $rev, $1, $2, $prev, $prev_rev\n";
$xxx=`pwd`;
print STDERR "Dir: $xxx\n";
! print STDERR `ls -al`;
! open(DIFF, "-|") || exec 'cvs', '-Qn', 'diff', '-C3', "-r$prev_rev",
"-r$rev", $file;
while () {
$diff .= $_;
}
close(DIFF);
+ print STDERR `ls -al`;
$diff .= "\n\n";
#print STDERR "Diff:\n $diff\n";
cvs commit: apache/src CHANGES
ben 96/08/24 04:31:34 Modified:src CHANGES Log: Test Revision ChangesPath 1.58 +3 -1 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.57 retrieving revision 1.58 diff -C3 -r1.57 -r1.58 *** CHANGES 1996/08/24 11:22:15 1.57 --- CHANGES 1996/08/24 11:31:33 1.58 *** *** 1,4 ! $Id: CHANGES,v 1.57 1996/08/24 11:22:15 ben Exp $ Changes with Apache 1.2b1: --- 1,6 ! $Id: CHANGES,v 1.58 1996/08/24 11:31:33 ben Exp $ ! ! Test Changes with Apache 1.2b1:
cvs commit: apache/src CHANGES
ben 96/08/24 04:33:48 Modified:src CHANGES Log: Working? Revision ChangesPath 1.59 +1 -3 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.58 retrieving revision 1.59 diff -C3 -r1.58 -r1.59 *** CHANGES 1996/08/24 11:31:33 1.58 --- CHANGES 1996/08/24 11:33:47 1.59 *** *** 1,6 ! $Id: CHANGES,v 1.58 1996/08/24 11:31:33 ben Exp $ ! ! Test Changes with Apache 1.2b1: --- 1,4 ! $Id: CHANGES,v 1.59 1996/08/24 11:33:47 ben Exp $ Changes with Apache 1.2b1:
cvs commit: CVSROOT log_accum.pl
ben 96/08/24 04:35:31
Modified:. log_accum.pl
Log:
Fixed!
Submitted by: Alexei Kosut
Revision ChangesPath
1.23 +2 -6 CVSROOT/log_accum.pl
Index: log_accum.pl
===
RCS file: /export/home/cvs/CVSROOT/log_accum.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C3 -r1.22 -r1.23
*** log_accum.pl 1996/08/24 11:30:43 1.22
--- log_accum.pl 1996/08/24 11:35:29 1.23
***
*** 1,6
#!/usr/bin/perl
#
! # $Id: log_accum.pl,v 1.22 1996/08/24 11:30:43 ben Exp $
#
# Perl filter to handle the log messages from the checkin of files in
# a directory. This script will group the lists of files by log
--- 1,6
#!/usr/bin/perl
#
! # $Id: log_accum.pl,v 1.23 1996/08/24 11:35:29 ben Exp $
#
# Perl filter to handle the log messages from the checkin of files in
# a directory. This script will group the lists of files by log
***
*** 220,235
$prev_rev =~ /(.*)\.([0-9]+$)/;
$prev = $2 - 1;
$prev_rev = $1 . "." . $prev;
! print STDERR "Rev: $rev, $1, $2, $prev, $prev_rev\n";
! $xxx=`pwd`;
! print STDERR "Dir: $xxx\n";
! print STDERR `ls -al`;
open(DIFF, "-|") || exec 'cvs', '-Qn', 'diff', '-C3', "-r$prev_rev",
"-r$rev", $file;
while () {
$diff .= $_;
}
close(DIFF);
- print STDERR `ls -al`;
$diff .= "\n\n";
#print STDERR "Diff:\n $diff\n";
--- 220,231
$prev_rev =~ /(.*)\.([0-9]+$)/;
$prev = $2 - 1;
$prev_rev = $1 . "." . $prev;
! #print STDERR "Rev: $rev, $1, $2, $prev, $prev_rev\n";
open(DIFF, "-|") || exec 'cvs', '-Qn', 'diff', '-C3', "-r$prev_rev",
"-r$rev", $file;
while () {
$diff .= $_;
}
close(DIFF);
$diff .= "\n\n";
#print STDERR "Diff:\n $diff\n";
cvs commit: apache/src http_config.c mod_cookies.c
ben 96/08/24 07:36:15
Modified:src http_config.c mod_cookies.c
Log:
Flags must be "on" or "off", however, the test to force this was wrong! Fixed.
Revision ChangesPath
1.22 +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.21
retrieving revision 1.22
diff -C3 -r1.21 -r1.22
*** http_config.c 1996/08/20 11:50:42 1.21
--- http_config.c 1996/08/24 14:36:13 1.22
***
*** 50,56
*
*/
! /* $Id: http_config.c,v 1.21 1996/08/20 11:50:42 paul Exp $ */
/*
* http_config.c: once was auxillary functions for reading httpd's config
--- 50,56
*
*/
! /* $Id: http_config.c,v 1.22 1996/08/24 14:36:13 ben Exp $ */
/*
* http_config.c: once was auxillary functions for reading httpd's config
***
*** 468,474
w = getword_conf (parms->pool, &args);
! if (*w == '\0' || ((!strcasecmp(w, "on")) && (!strcasecmp (w, "off"
return pstrcat (parms->pool, cmd->name, " must be On or Off",
NULL);
--- 468,474
w = getword_conf (parms->pool, &args);
! if (*w == '\0' || (strcasecmp(w, "on") && strcasecmp (w, "off")))
return pstrcat (parms->pool, cmd->name, " must be On or Off",
NULL);
1.13 +2 -1 apache/src/mod_cookies.c
Index: mod_cookies.c
===
RCS file: /export/home/cvs/apache/src/mod_cookies.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C3 -r1.12 -r1.13
*** mod_cookies.c 1996/08/20 11:51:04 1.12
--- mod_cookies.c 1996/08/24 14:36:14 1.13
***
*** 50,56
*
*/
! /* $Id: mod_cookies.c,v 1.12 1996/08/20 11:51:04 paul Exp $ */
/* User Tracking Module
*
--- 50,56
*
*/
! /* $Id: mod_cookies.c,v 1.13 1996/08/24 14:36:14 ben Exp $ */
/* User Tracking Module
*
***
*** 219,224
--- 219,225
char *set_cookie_disable (cmd_parms *cmd, int *c, int arg)
{
+ fprintf(stderr,"%p\n",c);
*c = !arg;
return NULL;
}
cvs commit: apache/src CHANGES
ben 96/08/24 07:39:31 Modified:src CHANGES Log: Document previous change (enforce on/off in flags). Revision ChangesPath 1.60 +4 -1 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.59 retrieving revision 1.60 diff -C3 -r1.59 -r1.60 *** CHANGES 1996/08/24 11:33:47 1.59 --- CHANGES 1996/08/24 14:39:30 1.60 *** *** 1,6 ! $Id: CHANGES,v 1.59 1996/08/24 11:33:47 ben Exp $ Changes with Apache 1.2b1: *) Really fix misspellings of Authoritative in various directives. --- 1,9 ! $Id: CHANGES,v 1.60 1996/08/24 14:39:30 ben Exp $ Changes with Apache 1.2b1: + + *) Configuration flags should be either "on" or "off". Apache was not + enforcing this restriction. Fixed. [Ben Laurie] *) Really fix misspellings of Authoritative in various directives.
cvs commit: apache/src mod_cookies.c
ben 96/08/24 07:41:33
Modified:src mod_cookies.c
Log:
Remove debugging message.
Revision ChangesPath
1.14 +0 -1 apache/src/mod_cookies.c
Index: mod_cookies.c
===
RCS file: /export/home/cvs/apache/src/mod_cookies.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C3 -r1.13 -r1.14
*** mod_cookies.c 1996/08/24 14:36:14 1.13
--- mod_cookies.c 1996/08/24 14:41:32 1.14
***
*** 50,56
*
*/
! /* $Id: mod_cookies.c,v 1.13 1996/08/24 14:36:14 ben Exp $ */
/* User Tracking Module
*
--- 50,56
*
*/
! /* $Id: mod_cookies.c,v 1.14 1996/08/24 14:41:32 ben Exp $ */
/* User Tracking Module
*
***
*** 219,225
char *set_cookie_disable (cmd_parms *cmd, int *c, int arg)
{
- fprintf(stderr,"%p\n",c);
*c = !arg;
return NULL;
}
--- 219,224
cvs commit: apache/src http_protocol.c
ben 96/08/24 08:48:22
Modified:src http_protocol.c
Log:
check_hostalias obliterated the server port number. Fixed.
Revision ChangesPath
1.43 +3 -2 apache/src/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C3 -r1.42 -r1.43
*** http_protocol.c 1996/08/20 11:50:50 1.42
--- http_protocol.c 1996/08/24 15:48:21 1.43
***
*** 50,56
*
*/
! /* $Id: http_protocol.c,v 1.42 1996/08/20 11:50:50 paul Exp $ */
/*
* http_protocol.c --- routines which directly communicate with the
--- 50,56
*
*/
! /* $Id: http_protocol.c,v 1.43 1996/08/24 15:48:21 ben Exp $ */
/*
* http_protocol.c --- routines which directly communicate with the
***
*** 573,578
--- 573,579
}
void check_hostalias (request_rec *r) {
+ char *savehost=r->hostname;
char *host = getword(r->pool, &r->hostname, ':'); /* Get rid of port */
int port = (*r->hostname) ? atoi(r->hostname) : 80;
server_rec *s;
***
*** 586,592
host[l] = '\0';
}
! r->hostname = host;
for (s = r->server->next; s; s = s->next) {
char *names = s->names;
--- 587,593
host[l] = '\0';
}
! r->hostname = savehost;
for (s = r->server->next; s; s = s->next) {
char *names = s->names;
cvs commit: apache/src http_protocol.c
ben 96/08/24 09:04:55
Modified:src http_protocol.c
Log:
Undo last change, it was misguided. But make check_hostalias static since it
only really works once.
Revision ChangesPath
1.44 +3 -4 apache/src/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C3 -r1.43 -r1.44
*** http_protocol.c 1996/08/24 15:48:21 1.43
--- http_protocol.c 1996/08/24 16:04:54 1.44
***
*** 50,56
*
*/
! /* $Id: http_protocol.c,v 1.43 1996/08/24 15:48:21 ben Exp $ */
/*
* http_protocol.c --- routines which directly communicate with the
--- 50,56
*
*/
! /* $Id: http_protocol.c,v 1.44 1996/08/24 16:04:54 ben Exp $ */
/*
* http_protocol.c --- routines which directly communicate with the
***
*** 572,579
}
}
! void check_hostalias (request_rec *r) {
! char *savehost=r->hostname;
char *host = getword(r->pool, &r->hostname, ':'); /* Get rid of port */
int port = (*r->hostname) ? atoi(r->hostname) : 80;
server_rec *s;
--- 572,578
}
}
! static void check_hostalias (request_rec *r) {
char *host = getword(r->pool, &r->hostname, ':'); /* Get rid of port */
int port = (*r->hostname) ? atoi(r->hostname) : 80;
server_rec *s;
***
*** 587,593
host[l] = '\0';
}
! r->hostname = savehost;
for (s = r->server->next; s; s = s->next) {
char *names = s->names;
--- 586,592
host[l] = '\0';
}
! r->hostname = host;
for (s = r->server->next; s; s = s->next) {
char *names = s->names;
Aaaargh!
I'm mailing to apache-cvs as well as the main list since my mail to the main list seems to be going in to the bit bucket... Anyway, I fixed the commit mail problem, but now I seem to have an even more disgusting fault: cvs isn't checking in my modified files consistently. Sometimes I have to touch them and try again. What the fnarg is going on? Perhaps we should consider moving to 1.8 (or whatever the current version is)? Cheers, Ben. -- Ben Laurie Phone: +44 (181) 994 6435 Freelance Consultant andFax: +44 (181) 994 6472 Technical Director Email: [EMAIL PROTECTED] A.L. Digital Ltd, URL: http://www.algroup.co.uk London, England.Apache Group member (http://www.apache.org)
cvs commit: apache/src httpd.h
ben 96/08/24 09:33:30 Modified:src httpd.h Log: Correct comment referring to HostAlias instead of ServerAlias. Revision ChangesPath 1.48 +2 -2 apache/src/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.47 retrieving revision 1.48 diff -C3 -r1.47 -r1.48 *** httpd.h 1996/08/20 11:50:52 1.47 --- httpd.h 1996/08/24 16:33:29 1.48 *** *** 50,56 * */ ! /* $Id: httpd.h,v 1.47 1996/08/20 11:50:52 paul Exp $ */ /* * httpd.h: header for simple (ha! not anymore) http daemon --- 50,56 * */ ! /* $Id: httpd.h,v 1.48 1996/08/24 16:33:29 ben Exp $ */ /* * httpd.h: header for simple (ha! not anymore) http daemon *** *** 525,531 char *path; /* Pathname for ServerPath */ int pathlen;/* Length of path */ ! char *names;/* Wildcarded names for HostAlias servers */ uid_t server_uid; /* effective user id when calling exec wrapper */ gid_t server_gid; /* effective group id when calling exec wrapper */ --- 525,531 char *path; /* Pathname for ServerPath */ int pathlen;/* Length of path */ ! char *names;/* Wildcarded names for ServerAlias servers */ uid_t server_uid; /* effective user id when calling exec wrapper */ gid_t server_gid; /* effective group id when calling exec wrapper */
ServerPath?
Can someone explain the ServerPath directive to me in words of one syllable, please? Cheers, Ben. -- Ben Laurie Phone: +44 (181) 994 6435 Freelance Consultant andFax: +44 (181) 994 6472 Technical Director Email: [EMAIL PROTECTED] A.L. Digital Ltd, URL: http://www.algroup.co.uk London, England.Apache Group member (http://www.apache.org)
new-httpd??
My mail to new-httpd is definitely disappearing somewhere ... can anyone investigate? I'm getting the cvs stuff no trouble... Cheers, Ben. -- Ben Laurie Phone: +44 (181) 994 6435 Freelance Consultant andFax: +44 (181) 994 6472 Technical Director Email: [EMAIL PROTECTED] A.L. Digital Ltd, URL: http://www.algroup.co.uk London, England.Apache Group member (http://www.apache.org)
Re: ServerPath?
On Sat, 24 Aug 1996, Ben Laurie wrote: > Can someone explain the ServerPath directive to me in words of one syllable, > please? I can try (but it will be hard, and more hard to parse than if I could use words more than one beat long). When you have a host that's based on Host:, and get it the old way, with no Host:, there is no way to tell what host it is, and you will get the main host. With the line you talk about (I can't use it, for it is more than one beat long), you can skip this, and make your host work for all, both old and new ways. If you put this line in your file, with "/foo", and then get "/foo" the old and new ways, you will get the right page. And you can still use "/" the new way. Do you get it now? I doubt it: since I can't use real words, I don't make much sense. Hope this helps. Thanks! -- Alexei Kosut <[EMAIL PROTECTED]>The Apache HTTP Server http://www.nueva.pvt.k12.ca.us/~akosut/ http://www.apache.org/
