cvs commit: apachen/src INDENT

[Randy Terbush]

randy   97/09/15 07:42:04

  Modified:src  INDENT
  Log:
  Reserve files to be indented while working on logging.
  
  Revision  ChangesPath
  1.15  +4 -4  apachen/src/INDENT
  
  Index: INDENT
  ===
  RCS file: /export/home/cvs/apachen/src/INDENT,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- INDENT1997/09/15 11:57:03 1.14
  +++ INDENT1997/09/15 14:42:03 1.15
  @@ -18,10 +18,10 @@
  http_conf_globals.h
  http_config.c
  http_config.h
  -   http_core.c
  -   http_core.h
  -   http_log.c
  -   http_log.h
  +   http_core.c   RESERVED by Randy
  +   http_core.h   RESERVED by Randy
  +   http_log.cRESERVED by Randy
  +   http_log.hRESERVED by Randy
  http_main.c   DONE by Dean
  http_main.h   DONE by Dean
  http_protocol.c   DONE by Roy
  
  
  

cvs commit: apachen/src INDENT

[Randy Terbush]

randy   97/09/14 15:49:49

  Modified:src  INDENT
  Log:
  Update INDENT
  
  Revision  ChangesPath
  1.13  +7 -7  apachen/src/INDENT
  
  Index: INDENT
  ===
  RCS file: /export/home/cvs/apachen/src/INDENT,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- INDENT1997/09/14 22:20:33 1.12
  +++ INDENT1997/09/14 22:49:48 1.13
  @@ -133,10 +133,10 @@
  utils.h   DONE
   
   ./support:
  -   cls.c RESERVED by Randy
  -   htdigest.cRESERVED by Randy
  -   htpasswd.cRESERVED by Randy
  -   logresolve.c  RESERVED by Randy
  -   rotatelogs.c  RESERVED by Randy
  -   suexec.c  RESERVED by Randy
  -   suexec.h  RESERVED by Randy
  +   cls.c DONE by Randy
  +   htdigest.cDONE by Randy
  +   htpasswd.cDONE by Randy
  +   logresolve.c  DONE by Randy
  +   rotatelogs.c  DONE by Randy
  +   suexec.c  DONE by Randy
  +   suexec.h  DONE by Randy
  
  
  

cvs commit: apachen/src/support cls.c htdigest.c htpasswd.c logresolve.c rotatelogs.c suexec.c suexec.h

[Randy Terbush]

randy   97/09/14 15:48:14

  Modified:src/support cls.c htdigest.c htpasswd.c logresolve.c
rotatelogs.c suexec.c suexec.h
  Log:
  indent
  
  Revision  ChangesPath
  1.4   +66 -65apachen/src/support/cls.c
  
  Index: cls.c
  ===
  RCS file: /export/home/cvs/apachen/src/support/cls.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- cls.c 1996/11/03 21:02:30 1.3
  +++ cls.c 1997/09/14 22:48:08 1.4
  @@ -14,150 +14,151 @@
*   * - swallow remaining characters 
*   - exact match for any other character
*/
  -static int
  -checkmask(const char *data, const char *mask)
  +static int checkmask(const char *data, const char *mask)
   {
   int i, ch, d;
   
  -for (i=0; mask[i] != '\0' && mask[i] != '*'; i++)
  -{
  +for (i = 0; mask[i] != '\0' && mask[i] != '*'; i++) {
ch = mask[i];
d = data[i];
  - if (ch == '@')
  - {
  - if (!isupper(d)) return 0;
  - } else if (ch == '$')
  - {
  - if (!islower(d)) return 0;
  - } else if (ch == '#')
  - {
  - if (!isdigit(d)) return 0;
  - } else if (ch == '&')
  - {
  - if (!isxdigit(d)) return 0;
  - } else if (ch != d) return 0;
  + if (ch == '@') {
  + if (!isupper(d))
  + return 0;
  + }
  + else if (ch == '$') {
  + if (!islower(d))
  + return 0;
  + }
  + else if (ch == '#') {
  + if (!isdigit(d))
  + return 0;
  + }
  + else if (ch == '&') {
  + if (!isxdigit(d))
  + return 0;
  + }
  + else if (ch != d)
  + return 0;
   }
   
  -if (mask[i] == '*') return 1;
  -else return (data[i] == '\0');
  +if (mask[i] == '*')
  + return 1;
  +else
  + return (data[i] == '\0');
   }
   
   /*
* Converts 8 hex digits to a time integer
*/
  -static int
  -hex2sec(const char *x)
  +static int hex2sec(const char *x)
   {
   int i, ch;
   unsigned int j;
   
  -for (i=0, j=0; i < 8; i++)
  -{
  +for (i = 0, j = 0; i < 8; i++) {
ch = x[i];
j <<= 4;
  - if (isdigit(ch)) j |= ch - '0';
  - else if (isupper(ch)) j |= ch - ('A' - 10);
  - else j |= ch - ('a' - 10);
  + if (isdigit(ch))
  + j |= ch - '0';
  + else if (isupper(ch))
  + j |= ch - ('A' - 10);
  + else
  + j |= ch - ('a' - 10);
   }
  -if (j == 0x) return -1;  /* so that it works with 8-byte ints */
  -else return j;
  +if (j == 0x)
  + return -1;  /* so that it works with 8-byte ints */
  +else
  + return j;
   }
   
  -int
  -main(int argc, char **argv)
  +int main(int argc, char **argv)
   {
   int i, ver;
   DIR *d;
   struct dirent *e;
   const char *s;
   FILE *fp;
  -char path[FILENAME_MAX+1];
  +char path[FILENAME_MAX + 1];
   char line[1035];
   time_t date, lmod, expire;
   unsigned int len;
   struct tm ts;
   char sdate[30], slmod[30], sexpire[30];
  -const char time_format[]="%e %b %Y %R";
  +const char time_format[] = "%e %b %Y %R";
   
  -if (argc != 2)
  -{
  +if (argc != 2) {
printf("Usage: cls directory\n");
exit(0);
   }
   
   d = opendir(argv[1]);
  -if (d == NULL)
  -{
  +if (d == NULL) {
perror("opendir");
exit(1);
   }
   
  -for (;;)
  -{
  +for (;;) {
e = readdir(d);
  - if (e == NULL) break;
  + if (e == NULL)
  + break;
s = e->d_name;
  - if (s[0] == '.' || s[0] == '#') continue;
  + if (s[0] == '.' || s[0] == '#')
  + continue;
sprintf(path, "%s/%s", argv[1], s);
fp = fopen(path, "r");
  - if (fp == NULL)
  - {
  + if (fp == NULL) {
perror("fopen");
continue;
}
  - if (fgets(line, 1034, fp) == NULL)
  - {
  + if (fgets(line, 1034, fp) == NULL) {
perror("fgets");
fclose(fp);
continue;
}
  - if (!checkmask(line, "    \n"))
  - {
  + if (!checkmask(line, "    \n")) 
{
fprintf(stderr, "Bad cache file\n");
fclose(fp);
continue;
}
date = hex2sec(line);
  - lmod = hex2sec(line+9);
  - expire = hex2sec(line+18);
  - ver = hex2sec(line+27);
  - len = hex2sec(line+35);
  - if (fgets(line, 1034, fp) == NULL)
  - {
  + lmod = hex2sec(line + 9);
  + expire = hex2sec(line + 18);
  + ver = hex2sec(line + 27);
  + len = hex2sec(line + 35);
  + if (fgets(line, 1034, fp) == NULL) {
perror("fgets");
fclose(fp);
continue;
}
fclose(f

cvs commit: apachen/src/support .indent.pro

[Randy Terbush]

randy   97/09/14 15:29:59

  Added:   src/support .indent.pro
  Log:
  Add .indent.pro for this directory.
  
  Revision  ChangesPath
  1.1  apachen/src/support/.indent.pro
  
  Index: .indent.pro
  ===
  -i4 -npsl -di0 -br -nce -d0 -cli0 -npcs -nfc1
  -TBUFF
  -TFILE
  -TTRANS
  -TUINT4
  -T_trans
  -Tallow_options_t
  -Tapache_sfio
  -Tarray_header
  -Tbool_int
  -Tbuf_area
  -Tbuff_struct
  -Tbuffy
  -Tcmd_how
  -Tcmd_parms
  -Tcommand_rec
  -Tcommand_struct
  -Tconn_rec
  -Tcore_dir_config
  -Tcore_server_config
  -Tdir_maker_func
  -Tevent
  -Tglobals_s
  -Thandler_func
  -Thandler_rec
  -Tjoblist_s
  -Tlisten_rec
  -Tmerger_func
  -Tmode_t
  -Tmodule
  -Tmodule_struct
  -Tmutex
  -Tn_long
  -Tother_child_rec
  -Toverrides_t
  -Tparent_score
  -Tpid_t
  -Tpiped_log
  -Tpool
  -Trequest_rec
  -Trequire_line
  -Trlim_t
  -Tscoreboard
  -Tsemaphore
  -Tserver_addr_rec
  -Tserver_rec
  -Tserver_rec_chain
  -Tshort_score
  -Ttable
  -Ttable_entry
  -Tthread
  -Tu_wide_int
  -Tvtime_t
  -Twide_int
  
  
  

cvs commit: apachen/src INDENT

[Randy Terbush]

randy   97/09/14 15:20:34

  Modified:src  INDENT
  Log:
  Updates to INDENT
  
  Revision  ChangesPath
  1.12  +15 -15apachen/src/INDENT
  
  Index: INDENT
  ===
  RCS file: /export/home/cvs/apachen/src/INDENT,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- INDENT1997/09/14 21:43:16 1.11
  +++ INDENT1997/09/14 22:20:33 1.12
  @@ -37,14 +37,14 @@
  rfc1413.c
  rfc1413.h
  scoreboard.h
  -   util.cRESERVED by Randy
  -   util_date.c   RESERVED by Randy
  -   util_date.h   RESERVED by Randy
  -   util_md5.cRESERVED by Randy
  -   util_md5.hRESERVED by Randy
  -   util_script.c RESERVED by Randy
  -   util_script.h RESERVED by Randy
  -   util_snprintf.c   RESERVED by Randy
  +   util.cDONE by Randy
  +   util_date.c   DONE by Randy
  +   util_date.h   DONE by Randy
  +   util_md5.cDONE by Randy
  +   util_md5.hDONE by Randy
  +   util_script.c DONE by Randy
  +   util_script.h DONE by Randy
  +   util_snprintf.c   DONE by Randy
   
   ./modules/example:
  mod_example.c RESERVED by Ken
  @@ -133,10 +133,10 @@
  utils.h   DONE
   
   ./support:
  -   cls.c
  -   htdigest.c
  -   htpasswd.c
  -   logresolve.c
  -   rotatelogs.c
  -   suexec.c
  -   suexec.h
  +   cls.c RESERVED by Randy
  +   htdigest.cRESERVED by Randy
  +   htpasswd.cRESERVED by Randy
  +   logresolve.c  RESERVED by Randy
  +   rotatelogs.c  RESERVED by Randy
  +   suexec.c  RESERVED by Randy
  +   suexec.h  RESERVED by Randy
  
  
  

cvs commit: apachen/src/main util.c util_date.c util_date.h util_md5.c util_md5.h util_script.c util_script.h util_snprintf.c

[Randy Terbush]

randy   97/09/14 15:19:04

  Modified:src/main util.c util_date.c util_date.h util_md5.c
util_md5.h util_script.c util_script.h
util_snprintf.c
  Log:
  indent
  
  Revision  ChangesPath
  1.69  +693 -594  apachen/src/main/util.c
  
  Index: util.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/util.c,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- util.c1997/08/28 01:37:00 1.68
  +++ util.c1997/09/14 22:18:57 1.69
  @@ -61,51 +61,56 @@
   #include "httpd.h"
   #include "http_conf_globals.h"   /* for user_id & group_id */
   
  -const char month_snames[12][4] = {
  -"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"
  +const char month_snames[12][4] =
  +{
  +"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", 
"Nov", "Dec"
   };
   
  -API_EXPORT(char *) get_time() {
  +API_EXPORT(char *) get_time()
  +{
   time_t t;
   char *time_string;
   
  -t=time(NULL);
  +t = time(NULL);
   time_string = ctime(&t);
   time_string[strlen(time_string) - 1] = '\0';
   return (time_string);
   }
   
  -API_EXPORT(char *) ht_time(pool *p, time_t t, const char *fmt, int gmt) {
  +API_EXPORT(char *) ht_time(pool *p, time_t t, const char *fmt, int gmt)
  +{
   char ts[MAX_STRING_LEN];
   struct tm *tms;
   
   tms = (gmt ? gmtime(&t) : localtime(&t));
   
   /* check return code? */
  -strftime(ts,MAX_STRING_LEN,fmt,tms);
  -return pstrdup (p, ts);
  +strftime(ts, MAX_STRING_LEN, fmt, tms);
  +return pstrdup(p, ts);
   }
   
  -API_EXPORT(char *) gm_timestr_822(pool *p, time_t sec) {
  -static const char *const days[7]=
  -   {"Sun","Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
  +API_EXPORT(char *) gm_timestr_822(pool *p, time_t sec)
  +{
  +static const char *const days[7] =
  +{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
   char ts[50];
   struct tm *tms;
   
   tms = gmtime(&sec);
   
  -/* RFC date format; as strftime '%a, %d %b %Y %T GMT' */
  -ap_snprintf(ts, sizeof(ts), 
  - "%s, %.2d %s %d %.2d:%.2d:%.2d GMT", days[tms->tm_wday],
  - tms->tm_mday, month_snames[tms->tm_mon], tms->tm_year + 1900,
  - tms->tm_hour, tms->tm_min, tms->tm_sec);
  +/* RFC date format; as strftime '%a, %d %b %Y %T GMT' */
  +ap_snprintf(ts, sizeof(ts),
  + "%s, %.2d %s %d %.2d:%.2d:%.2d GMT", days[tms->tm_wday],
  + tms->tm_mday, month_snames[tms->tm_mon], tms->tm_year + 1900,
  + tms->tm_hour, tms->tm_min, tms->tm_sec);
   
  -return pstrdup (p, ts);
  +return pstrdup(p, ts);
   }
   
   /* What a pain in the ass. */
   #if defined(HAVE_GMTOFF)
  -API_EXPORT(struct tm *) get_gmtoff(int *tz) {
  +API_EXPORT(struct tm *) get_gmtoff(int *tz)
  +{
   time_t tt = time(NULL);
   struct tm *t;
   
  @@ -114,18 +119,19 @@
   return t;
   }
   #else
  -API_EXPORT(struct tm *) get_gmtoff(int *tz) {
  +API_EXPORT(struct tm *) get_gmtoff(int *tz)
  +{
   time_t tt = time(NULL);
   struct tm gmt;
   struct tm *t;
   int days, hours, minutes;
   
   /* Assume we are never more than 24 hours away. */
  -gmt = *gmtime(&tt); /* remember gmtime/localtime return ptr to static */
  -t = localtime(&tt); /* buffer... so be careful */
  +gmt = *gmtime(&tt);  /* remember gmtime/localtime return ptr 
to static */
  +t = localtime(&tt);  /* buffer... so be careful */
   days = t->tm_yday - gmt.tm_yday;
   hours = ((days < -1 ? 24 : 1 < days ? -24 : days * 24)
  -  + t->tm_hour - gmt.tm_hour);
  +  + t->tm_hour - gmt.tm_hour);
   minutes = hours * 60 + t->tm_min - gmt.tm_min;
   *tz = minutes;
   return t;
  @@ -133,62 +139,65 @@
   #endif
   
   
  -/* Match = 0, NoMatch = 1, Abort = -1 */
  -/* Based loosely on sections of wildmat.c by Rich Salz
  +/* Match = 0, NoMatch = 1, Abort = -1
  + * Based loosely on sections of wildmat.c by Rich Salz
* Hmmm... shouldn't this really go component by component?
*/
  -API_EXPORT(int) strcmp_match(const char *str, const char *exp) {
  -int x,y;
  +API_EXPORT(int) strcmp_match(const char *str, const char *exp)
  +{
  +int x, y;
   
  -for(x=0,y=0;exp[y];++y,++x) {
  -if((!str[x]) && (exp[y] != '*'))
  -return -1;
  -if(exp[y] == '*') {
  -while(exp[++y] == '*');
  -if(!exp[y])
  -return 0;
  -while(str[x]) {
  -int ret;
  -if((ret = strcmp_match(&str[x++],&exp[y])) != 1)
  -return ret;
  -}
  -return -1;
  -} else 
  -if((exp[y] != '?') && (str[x] != exp[y]))
  -return 1;
  +for (x = 0, y = 0; exp[y]; +

cvs commit: apachen/src INDENT

[Randy Terbush]

randy   97/09/14 14:43:18

  Modified:src  INDENT
  Log:
  Reserve files for indentation.
  
  Revision  ChangesPath
  1.11  +8 -8  apachen/src/INDENT
  
  Index: INDENT
  ===
  RCS file: /export/home/cvs/apachen/src/INDENT,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- INDENT1997/09/14 17:01:53 1.10
  +++ INDENT1997/09/14 21:43:16 1.11
  @@ -37,14 +37,14 @@
  rfc1413.c
  rfc1413.h
  scoreboard.h
  -   util.c
  -   util_date.c
  -   util_date.h
  -   util_md5.c
  -   util_md5.h
  -   util_script.c
  -   util_script.h
  -   util_snprintf.c
  +   util.cRESERVED by Randy
  +   util_date.c   RESERVED by Randy
  +   util_date.h   RESERVED by Randy
  +   util_md5.cRESERVED by Randy
  +   util_md5.hRESERVED by Randy
  +   util_script.c RESERVED by Randy
  +   util_script.h RESERVED by Randy
  +   util_snprintf.c   RESERVED by Randy
   
   ./modules/example:
  mod_example.c RESERVED by Ken
  
  
  

cvs commit: apachen/src/main http_log.c

[Randy Terbush]

randy   97/09/09 19:35:39

  Modified:src/main http_log.c
  Log:
  Attempt to make syslog support more portable as suggested by Alexei.
  
  Revision  ChangesPath
  1.32  +34 -0 apachen/src/main/http_log.c
  
  Index: http_log.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- http_log.c1997/08/31 22:14:07 1.31
  +++ http_log.c1997/09/10 02:35:37 1.32
  @@ -75,26 +75,60 @@
   #ifdef LOG_AUTHPRIV
   {"authpriv",LOG_AUTHPRIV},
   #endif
  +#ifdef LOG_CRON
   {"cron", LOG_CRON},
  +#endif
  +#ifdef LOG_DAEMON
   {"daemon",   LOG_DAEMON},
  +#endif
   #ifdef LOG_FTP
   {"ftp",  LOG_FTP},
   #endif
  +#ifdef LOG_KERN
   {"kern", LOG_KERN},
  +#endif
  +#ifdef LOG_LPR
   {"lpr",  LOG_LPR},
  +#endif
  +#ifdef LOG_MAIL
   {"mail", LOG_MAIL},
  +#endif
  +#ifdef LOG_NEWS
   {"news", LOG_NEWS},
  +#endif
  +#ifdef LOG_SYSLOG
   {"syslog",   LOG_SYSLOG},
  +#endif
  +#ifdef LOG_USER
   {"user", LOG_USER},
  +#endif
  +#ifdef LOG_UUCP
   {"uucp", LOG_UUCP},
  +#endif
  +#ifdef LOG_LOCAL0
   {"local0",   LOG_LOCAL0},
  +#endif
  +#ifdef LOG_LOCAL1
   {"local1",   LOG_LOCAL1},
  +#endif
  +#ifdef LOG_LOCAL2
   {"local2",   LOG_LOCAL2},
  +#endif
  +#ifdef LOG_LOCAL3
   {"local3",   LOG_LOCAL3},
  +#endif
  +#ifdef LOG_LOCAL4
   {"local4",   LOG_LOCAL4},
  +#endif
  +#ifdef LOG_LOCAL5
   {"local5",   LOG_LOCAL5},
  +#endif
  +#ifdef LOG_LOCAL6
   {"local6",   LOG_LOCAL6},
  +#endif
  +#ifdef LOG_LOCAL7
   {"local7",   LOG_LOCAL7},
  +#endif
   {NULL,   -1},
   };
   #endif
  
  
  

cvs commit: apachen/src/main http_main.c http_protocol.c

[Randy Terbush]

randy   97/09/03 14:51:03

  Modified:src/main http_main.c http_protocol.c
  Log:
  More logging tweaks.
  
  Revision  ChangesPath
  1.215 +3 -3  apachen/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
  retrieving revision 1.214
  retrieving revision 1.215
  diff -u -r1.214 -r1.215
  --- http_main.c   1997/09/03 04:54:48 1.214
  +++ http_main.c   1997/09/03 21:50:54 1.215
  @@ -699,7 +699,7 @@
   }
   
   if (!current_conn->keptalive) 
  - aplog_error(APLOG_MARK, APLOG_WARNING, current_conn->server, errstr);
  + aplog_error(APLOG_MARK, APLOG_DEBUG, current_conn->server, errstr);
 
   if (timeout_req) {
/* Someone has asked for this transaction to just be aborted
  @@ -3049,14 +3049,14 @@
static int reported = 0;
   
if (!reported) {
  - aplog_error(APLOG_MARK, APLOG_WARNING, server_conf,
  + aplog_error(APLOG_MARK, APLOG_ERR, server_conf,
"server reached MaxClients setting, consider"
" raising the MaxClients setting");
reported = 1;
}
} else {
if (idle_spawn_rate >= 4) {
  - aplog_error(APLOG_MARK, APLOG_WARNING, server_conf,
  + aplog_error(APLOG_MARK, APLOG_ERR, server_conf,
"server seems busy, spawning %d children (you may 
need "
"to increase StartServers, or Min/MaxSpareServers)",
idle_spawn_rate);
  
  
  
  1.159 +3 -3  apachen/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_protocol.c,v
  retrieving revision 1.158
  retrieving revision 1.159
  diff -u -r1.158 -r1.159
  --- http_protocol.c   1997/09/03 04:54:52 1.158
  +++ http_protocol.c   1997/09/03 21:50:57 1.159
  @@ -1671,7 +1671,7 @@
   else if (errno == EAGAIN)
   continue;
   else {
  -aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
  +aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
"send body lost connection to %s",
   get_remote_host(r->connection,
r->per_dir_config, 
REMOTE_NAME));
  @@ -1750,7 +1750,7 @@
   else if (errno == EAGAIN)
   continue;
   else {
  -aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
  +aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
"send body lost connection to %s",
   get_remote_host(r->connection,
r->per_dir_config, 
REMOTE_NAME));
  @@ -1812,7 +1812,7 @@
   else if (errno == EAGAIN)
   continue;
   else {
  -aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
  +aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
"send mmap lost connection to %s",
   get_remote_host(r->connection,
r->per_dir_config, 
REMOTE_NAME));
  
  
  

cvs commit: apachen/src/main http_main.c http_protocol.c

[Randy Terbush]

randy   97/09/02 21:54:55

  Modified:src/main http_main.c http_protocol.c
  Log:
  Logging tweaks.
  
  Revision  ChangesPath
  1.214 +1 -1  apachen/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
  retrieving revision 1.213
  retrieving revision 1.214
  diff -u -r1.213 -r1.214
  --- http_main.c   1997/08/31 20:13:05 1.213
  +++ http_main.c   1997/09/03 04:54:48 1.214
  @@ -689,7 +689,7 @@
   if (timeout_req != NULL) dirconf = timeout_req->per_dir_config;
   else dirconf = current_conn->server->lookup_defaults;
   if (sig == SIGPIPE) {
  -ap_snprintf(errstr, sizeof(errstr), "%s lost connection to client 
%s",
  +ap_snprintf(errstr, sizeof(errstr), "%s lost connection to %s",
timeout_name ? timeout_name : "request",
get_remote_host(current_conn, dirconf, REMOTE_NAME));
   } else {
  
  
  
  1.158 +3 -3  apachen/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_protocol.c,v
  retrieving revision 1.157
  retrieving revision 1.158
  diff -u -r1.157 -r1.158
  --- http_protocol.c   1997/09/01 02:46:47 1.157
  +++ http_protocol.c   1997/09/03 04:54:52 1.158
  @@ -1671,7 +1671,7 @@
   else if (errno == EAGAIN)
   continue;
   else {
  -aplog_error(APLOG_MARK, APLOG_NOTICE, r->server,
  +aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
"send body lost connection to %s",
   get_remote_host(r->connection,
r->per_dir_config, 
REMOTE_NAME));
  @@ -1750,7 +1750,7 @@
   else if (errno == EAGAIN)
   continue;
   else {
  -aplog_error(APLOG_MARK, APLOG_NOTICE, r->server,
  +aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
"send body lost connection to %s",
   get_remote_host(r->connection,
r->per_dir_config, 
REMOTE_NAME));
  @@ -1812,7 +1812,7 @@
   else if (errno == EAGAIN)
   continue;
   else {
  -aplog_error(APLOG_MARK, APLOG_NOTICE, r->server,
  +aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
"send mmap lost connection to %s",
   get_remote_host(r->connection,
r->per_dir_config, 
REMOTE_NAME));
  
  
  

cvs commit: apachen/src/main http_config.h

[Randy Terbush]

randy   97/08/31 21:14:49

  Modified:src/main http_config.h
  Log:
  Bump the MODULE_MAGIC_NUMBER to indicated aplog_error() addition.
  
  Revision  ChangesPath
  1.47  +1 -1  apachen/src/main/http_config.h
  
  Index: http_config.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_config.h,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- http_config.h 1997/08/25 16:02:28 1.46
  +++ http_config.h 1997/09/01 04:14:48 1.47
  @@ -246,7 +246,7 @@
* handle it back-compatibly, or at least signal an error).
*/
   
  -#define MODULE_MAGIC_NUMBER 19970825
  +#define MODULE_MAGIC_NUMBER 19970831
   #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL
   
   /* Generic accessors for other modules to get at their own module-specific
  
  
  

cvs commit: apachen/src/os/win32 mod_isapi.c

[Randy Terbush]

randy   97/08/31 21:00:29

  Modified:src/os/win32 mod_isapi.c
  Log:
  More log_*() conversions to aplog_error().
  
  Revision  ChangesPath
  1.3   +20 -10apachen/src/os/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===
  RCS file: /export/home/cvs/apachen/src/os/win32/mod_isapi.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_isapi.c   1997/08/13 08:37:33 1.2
  +++ mod_isapi.c   1997/09/01 04:00:28 1.3
  @@ -130,20 +130,23 @@
   
   if (!(isapi_handle = LoadLibraryEx(r->filename, NULL,
   LOAD_WITH_ALTERED_SEARCH_PATH))) {
  - log_reason("Could not load DLL", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ALERT, r->server,
  + "Could not load DLL: %s", r->filename);
return SERVER_ERROR;
   }
   
   if (!(isapi_version =
  (void *)(GetProcAddress(isapi_handle, "GetExtensionVersion" {
  - log_reason("DLL could not load GetExtensionVersion()", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ALERT, r->server,
  + "DLL could not load GetExtensionVersion(): %s", 
r->filename);
FreeLibrary(isapi_handle);
return SERVER_ERROR;
   }
   
   if (!(isapi_entry =
  (void *)(GetProcAddress(isapi_handle, "HttpExtensionProc" {
  - log_reason("DLL could not load HttpExtensionProc()", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ALERT, r->server,
  + "DLL could not load HttpExtensionProc(): %s", r->filename);
FreeLibrary(isapi_handle);
return SERVER_ERROR;
   }
  @@ -153,7 +156,8 @@
   /* Run GetExtensionVersion() */
   
   if ((*isapi_version)(pVer) != TRUE) {
  - log_reason("ISAPI GetExtensionVersion() failed", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ALERT, r->server,
  + "ISAPI GetExtensionVersion() failed: %s", r->filename);
FreeLibrary(isapi_handle);
return SERVER_ERROR;
   }
  @@ -243,7 +247,8 @@
   
   /* Check for a log message - and log it */
   if (ecb->lpszLogData && strcmp(ecb->lpszLogData, ""))
  - log_reason(ecb->lpszLogData, r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "%s: %s", ecb->lpszLogData, r->filename);
   
   /* All done with the DLL... get rid of it */
   if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD);
  @@ -261,7 +266,8 @@
   
return OK;
   case HSE_STATUS_PENDING: /* We don't support this */
  - log_reason("ISAPI asynchronous I/O not supported", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
  + "ISAPI asynchronous I/O not supported: %s", r->filename);
   case HSE_STATUS_ERROR:
   default:
return SERVER_ERROR;
  @@ -321,7 +327,8 @@
   
   /* We only support synchronous writing */
   if (dwReserved && dwReserved != HSE_IO_SYNC) {
  - log_reason("ISAPI asynchronous I/O not supported", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
  + "ISAPI asynchronous I/O not supported: %s", r->filename);
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
   }
  @@ -401,7 +408,8 @@
int p;
   
if (!lf) { /* Huh? Invalid data, I think */
  - log_reason("ISA sent invalid headers", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "ISA sent invalid headers: %s", r->filename);
SetLastError(ERROR);/* XXX: Find right error */
return FALSE;
}
  @@ -419,7 +427,8 @@
   
if (!(value = strchr(data, ':'))) {
SetLastError(ERROR);/* XXX: Find right error */
  - log_reason("ISA sent invalid headers", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "ISA sent invalid headers", r->filename);
return FALSE;
}
   
  @@ -492,7 +501,8 @@
   /* We don't support all this async I/O, Microsoft-specific stuff */
   case HSE_REQ_IO_COMPLETION:
   case HSE_REQ_TRANSMIT_FILE:
  - log_reason("ISAPI asynchronous I/O not supported", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
  + "ISAPI asynchronous I/O not supported: %s", r->filename);
   default:
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
  
  
  

cvs commit: apachen/src/modules/standard mod_auth_db.c

[Randy Terbush]

randy   97/08/31 20:34:34

  Modified:src/modules/standard mod_auth_db.c
  Log:
  Correct some mistakes.
  
  Revision  ChangesPath
  1.22  +4 -2  apachen/src/modules/standard/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_db.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_auth_db.c 1997/08/31 22:24:49 1.21
  +++ mod_auth_db.c 1997/09/01 03:34:33 1.22
  @@ -259,7 +259,8 @@
  ap_snprintf(errstr, sizeof(errstr), 
   "user %s not in DB group file %s",
   user, sec->auth_dbgrpfile);
  -aplog_error(APLOG_MARK, APLOG_ERR, "%s: %s", errstr, 
r->filename);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +"%s: %s", errstr, r->filename);
   note_basic_auth_failure(r);
   return AUTH_REQUIRED;
  }
  @@ -275,7 +276,8 @@
  }
  ap_snprintf(errstr, sizeof(errstr), 
   "user %s not in right group",user);
  -aplog_error(APLOG_MARK, APLOG_ERR, "%s: %s", errstr, r->filename);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +"%s: %s", errstr, r->filename);
  note_basic_auth_failure(r);
   return AUTH_REQUIRED;
  }
  
  
  

cvs commit: apachen/src/modules/proxy mod_proxy.c proxy_connect.c proxy_http.c proxy_util.c

[Randy Terbush]

randy   97/08/31 20:07:30

  Modified:src/modules/proxy mod_proxy.c proxy_connect.c proxy_http.c
proxy_util.c
  Log:
  Convert log_*() to aplog_error().
  Something needs to be done with proxy_log_uerror() in here. I see no obvious
  reason not to replace it with aplog_error() but would like some feedback 
first.
  
  Revision  ChangesPath
  1.23  +9 -9  apachen/src/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/proxy/mod_proxy.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_proxy.c   1997/08/18 13:12:06 1.22
  +++ mod_proxy.c   1997/09/01 03:07:26 1.23
  @@ -221,9 +221,8 @@
   /* Split request into user, password, host, port */
   err = proxy_canon_netloc(r->pool, &url_copy, &user, &password, &host, 
&port);
   
  -if (err != NULL)
  -{
  - log_error(err, r->server);
  +if (err != NULL) {
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server, err);
return DECLINED;
   }
   
  @@ -251,8 +250,10 @@
   NULL);
   
table_set(r->headers_out, "Location", nuri);
  - log_error(pstrcat(r->pool, "Domain missing: ", r->uri, " sent to ", 
nuri,
  -   ref ? " from " : NULL, ref, NULL), r->server);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + pstrcat(r->pool, "Domain missing: ", r->uri, " sent to ", 
nuri,
  + ref ? " from " : NULL, ref, NULL));
  +
return REDIRECT;
   }
   }
  @@ -307,15 +308,14 @@
for (direct_connect=ii=0; ii < conf->dirconn->nelts && !direct_connect; 
ii++)
{
direct_connect = list[ii].matcher (&list[ii], r);
  - /*log_error("URI and NoProxy:", r->server);*/
  - /*log_error(r->uri, r->server);*/
  - /*log_error(list[ii].name, r->server);*/
  + aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  + "URI and NoProxy: %s: %s", r->uri, list[ii].name);
}
   #if DEBUGGING
{
char msg[256];
sprintf (msg, (direct_connect)?"NoProxy for %s":"UseProxy for %s", 
r->uri);
  - log_error(msg, r->server);
  + aplog_error(APLOG_MARK, APLOG_DEBUG, r->server, msg);
}
   #endif
   }
  
  
  
  1.14  +2 -1  apachen/src/modules/proxy/proxy_connect.c
  
  Index: proxy_connect.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_connect.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- proxy_connect.c   1997/08/17 13:56:27 1.13
  +++ proxy_connect.c   1997/09/01 03:07:27 1.14
  @@ -150,7 +150,8 @@
   sock = psocket(r->pool, PF_INET, SOCK_STREAM, IPPROTO_TCP);  
   if (sock == -1)
   { 
  -log_error("proxy: error creating socket", r->server);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "proxy: error creating socket");
   return SERVER_ERROR;
   } 

  
  
  
  1.30  +2 -1  apachen/src/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_http.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- proxy_http.c  1997/08/23 22:59:11 1.29
  +++ proxy_http.c  1997/09/01 03:07:27 1.30
  @@ -223,7 +223,8 @@
   sock = psocket(pool, PF_INET, SOCK_STREAM, IPPROTO_TCP);
   if (sock == -1)
   {
  - log_error("proxy: error creating socket", r->server);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "proxy: error creating socket");
return SERVER_ERROR;
   }
   
  
  
  
  1.25  +1 -1  apachen/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- proxy_util.c  1997/08/23 22:59:11 1.24
  +++ proxy_util.c  1997/09/01 03:07:28 1.25
  @@ -831,7 +831,7 @@
   err = proxy_canon_netloc(r->pool, &url, &user, &password, &host, &port);
   
   if (err != NULL)
  - log_error(err, r->server);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server, err);
   
   r->hostname = host;
   
  
  
  

cvs commit: apachen/src/modules/example mod_example.c

[Randy Terbush]

randy   97/08/31 19:53:50

  Modified:src/modules/example mod_example.c
  Log:
  Convert log_*() to aplog_error().
  
  Revision  ChangesPath
  1.18  +1 -1  apachen/src/modules/example/mod_example.c
  
  Index: mod_example.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/example/mod_example.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_example.c 1997/09/01 01:39:17 1.17
  +++ mod_example.c 1997/09/01 02:53:48 1.18
  @@ -413,7 +413,7 @@
*/
   /*
   if (s != NULL) {
  -log_printf(s, "mod_example: %s", note);
  +aplog_error(APLOG_MARK, APLOG_ERR, s, "mod_example: %s", note);
   }
*/
   }
  
  
  

cvs commit: apachen/src/modules/standard mod_status.c mod_unique_id.c

[Randy Terbush]

randy   97/08/31 19:49:48

  Modified:src/modules/standard mod_status.c mod_unique_id.c
  Log:
  Complete src/modules/standard module conversion of log_*() to aplog_error.
  
  Revision  ChangesPath
  1.61  +2 -1  apachen/src/modules/standard/mod_status.c
  
  Index: mod_status.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_status.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- mod_status.c  1997/08/18 13:12:18 1.60
  +++ mod_status.c  1997/09/01 02:49:44 1.61
  @@ -240,7 +240,8 @@
   status[SERVER_GRACEFUL]='G';
   
   if (!exists_scoreboard_image()) {
  - log_printf(r->server, "Server status unavailable in inetd mode");
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +  "Server status unavailable in inetd mode");
return HTTP_NOT_IMPLEMENTED;
}
   r->allowed = (1 << M_GET) | (1 << M_TRACE);
  
  
  
  1.2   +13 -7 apachen/src/modules/standard/mod_unique_id.c
  
  Index: mod_unique_id.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_unique_id.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mod_unique_id.c   1997/08/18 07:17:30 1.1
  +++ mod_unique_id.c   1997/09/01 02:49:45 1.2
  @@ -144,7 +144,10 @@
*/
   if (XtOffsetOf (unique_id_rec, counter) + sizeof (cur_unique_id.counter)
!= 14) {
  - log_error ("mod_unique_id: sorry the size assumptions are wrong in 
mod_unique_id.c, please remove it from your server or fix the code!", s);
  + aplog_error(APLOG_MARK, APLOG_ALERT, s,
  + "mod_unique_id: sorry the size assumptions are wrong "
  + "in mod_unique_id.c, please remove it from your server "
  + "or fix the code!");
exit (1);
   }
   
  @@ -153,20 +156,22 @@
* to be unique as the physical address of the machine
*/
   if (gethostname (str, sizeof (str) - 1) != 0) {
  - log_unixerr ("gethostname", "mod_unique_id",
  - "mod_unique_id requires the hostname of the server", s);
  + aplog_error(APLOG_MARK, APLOG_ALERT, s,
  + "gethostname: mod_unique_id requires the hostname of the 
server");
exit (1);
   }
   
   if ((hent = gethostbyname (str)) == NULL) {
  - log_printf (s, "mod_unique_id: unable to gethostbyname(\"%s\")", str);
  + aplog_error(APLOG_MARK, APLOG_ALERT, s,
  + "mod_unique_id: unable to gethostbyname(\"%s\")", str);
exit (1);
   }
   
   global_in_addr = ((struct in_addr *)hent->h_addr_list[0])->s_addr;
   
  -log_printf (s, "mod_unique_id: using ip addr %s",
  - inet_ntoa (*(struct in_addr *)hent->h_addr_list[0]));
  +aplog_error(APLOG_MARK, APLOG_INFO, s,
  + "mod_unique_id: using ip addr %s",
  + inet_ntoa (*(struct in_addr *)hent->h_addr_list[0]));
   
   /* If the server is pummelled with restart requests we could possibly
* end up in a situation where we're starting again during the same
  @@ -219,7 +224,8 @@
* test this during global_init ... but oh well.
*/
   if (cur_unique_id.pid != pid) {
  - log_error ("mod_unique_id: oh no! pids are greater than 16-bits!  I'm 
broken!", s);
  + aplog_error(APLOG_MARK, APLOG_DEBUG, s,
  + "oh no! pids are greater than 16-bits!  I'm broken!");
   }
   
   cur_unique_id.in_addr = global_in_addr;
  
  
  

cvs commit: apachen/src/modules/standard mod_rewrite.c

[Randy Terbush]

randy   97/08/31 19:39:06

  Modified:src/modules/standard mod_rewrite.c
  Log:
  Convert log_*() to aplog_error().
  
  Revision  ChangesPath
  1.50  +13 -6 apachen/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- mod_rewrite.c 1997/08/31 16:43:15 1.49
  +++ mod_rewrite.c 1997/09/01 02:39:03 1.50
  @@ -935,8 +935,9 @@
   /* check if the proxy module is enabled, so
  we can actually use it! */
   if (!proxy_available) {
  - log_reason("attempt to make remote request from mod_rewrite "
  - "without proxy enabled", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "attempt to make remote request from mod_rewrite "
  + "without proxy enabled", r->filename);
   return FORBIDDEN;
}
   
  @@ -1144,7 +1145,10 @@
*/
   if (!(allow_options(r) & (OPT_SYM_LINKS | OPT_SYM_OWNER))) {
   /* FollowSymLinks is mandatory! */
  -log_reason("Options FollowSymLinks or SymLinksIfOwnerMatch is off 
which implies that RewriteRule directive is forbidden", r->filename, r);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "Options FollowSymLinks or SymLinksIfOwnerMatch is off "
  + "which implies that RewriteRule directive is forbidden: %s",
  + r->filename);
   return FORBIDDEN;
   }
   else {
  @@ -2115,7 +2119,8 @@
   if (cpT != NULL) {
   n = strlen(cpT);
   if (cpO + n >= newuri + sizeof(newuri)) {
  -log_printf(r->server, "insufficient space in 
expand_map_lookups, aborting");
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "insufficient space in expand_map_lookups, 
aborting");
   return;
   }
   memcpy(cpO, cpT, n);
  @@ -2124,7 +2129,8 @@
   else {
   n = strlen(defaultvalue);
   if (cpO + n >= newuri + sizeof(newuri)) {
  -log_printf(r->server, "insufficient space in 
expand_map_lookups, aborting");
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "insufficient space in expand_map_lookups, 
aborting");
   return;
   }
   memcpy(cpO, defaultvalue, n);
  @@ -2137,7 +2143,8 @@
   cpT = cpI+strlen(cpI);
   n = cpT-cpI;
   if (cpO + n >= newuri + sizeof(newuri)) {
  -log_printf(r->server, "insufficient space in 
expand_map_lookups, aborting");
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "insufficient space in expand_map_lookups, 
aborting");
   return;
   }
   memcpy(cpO, cpI, n);
  
  
  

cvs commit: apachen/src/modules/standard mod_negotiation.c

[Randy Terbush]

randy   97/08/31 19:32:56

  Modified:src/modules/standard mod_negotiation.c
  Log:
  Convert log_*() to aplog_error().
  
  Revision  ChangesPath
  1.56  +13 -7 apachen/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- mod_negotiation.c 1997/08/23 14:20:35 1.55
  +++ mod_negotiation.c 1997/09/01 02:32:54 1.56
  @@ -629,15 +629,17 @@
   *cp++ = tolower(*cp);
   
   if (!*cp) {
  - log_reason ("Syntax error in type map --- no ':'", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "Syntax error in type map --- no ':': %s", r->filename);
return NULL;
   }
   
   do ++cp; while (*cp && isspace (*cp));
   
   if (!*cp) {
  - log_reason ("Syntax error in type map --- no header body",
  - r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "Syntax error in type map --- no header body: %s",
  + r->filename);
return NULL;
   }
   
  @@ -660,7 +662,8 @@
   }
   map = pfopen (neg->pool, rr->filename, "r");
   if (map == NULL) {
  -log_reason("cannot access type map file", rr->filename, r);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "cannot access type map file", rr->filename);
return FORBIDDEN;
   }
   
  @@ -745,7 +748,8 @@
   dirp = popendir (neg->pool, neg->dir_name);
   
   if (dirp == NULL) {
  -log_reason("cannot read directory for multi", neg->dir_name, r);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "cannot read directory for multi", neg->dir_name);
return FORBIDDEN;
   }
   
  @@ -1887,7 +1891,8 @@
   }
   
   if (!best) {
  -  log_reason ("no acceptable variant", r->filename, r);
  +  aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +   "no acceptable variant", r->filename);
   
 set_neg_headers(r, neg, na_result);
 store_variant_list (r, neg);
  @@ -1966,7 +1971,8 @@
   }
   
   if (!best) {
  -  log_reason ("no acceptable variant", r->filename, r);
  +  aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +   "no acceptable variant", r->filename);
   
 set_neg_headers (r, neg, na_result);
 store_variant_list (r, neg);
  
  
  

cvs commit: apachen/src/modules/standard mod_mime_magic.c

[Randy Terbush]

randy   97/08/31 19:22:58

  Modified:src/modules/standard mod_mime_magic.c
  Log:
  Convert log_*() to aplog_error().
  Wow! This module wins the prize for most calls to error...
  
  Revision  ChangesPath
  1.14  +151 -137  apachen/src/modules/standard/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_mime_magic.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_mime_magic.c  1997/08/22 21:55:37 1.13
  +++ mod_mime_magic.c  1997/09/01 02:22:56 1.14
  @@ -572,8 +572,9 @@
   palloc(r->pool, sizeof(magic_req_rec));
   
   if (!req_dat) {
  - log_printf(r->server, "%s: memory allocation failure in "
  - "magic_set_config()", MODNAME);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "%s: memory allocation failure in magic_set_config()",
  + MODNAME);
   return NULL;
   }
   req_dat->head = req_dat->tail = (magic_rsl *) NULL;
  @@ -592,8 +593,9 @@
   
   /* make sure we have a list to put it in */
   if (!req_dat) {
  - log_printf(r->server, "%s: request config should not be NULL",
  - MODNAME);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "%s: request config should not be NULL",
  + MODNAME);
   if (!(req_dat = magic_set_config(r))) {
   /* failure */
   return -1;
  @@ -602,8 +604,9 @@
   
   /* allocate the list entry */
   if (!(rsl = (magic_rsl *) palloc(r->pool, sizeof(magic_rsl {
  -log_printf(r->server, MODNAME ": "
  -   "memory allocation failure in magic_rsl_add()");
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "%s: memory allocation failure in magic_rsl_add()",
  + MODNAME);
   /* failure */
   return -1;
   }
  @@ -676,8 +679,9 @@
   
   /* allocate the result string */
   if (!(result = (char *) palloc(r->pool, len + 1))) {
  -log_printf(r->server, MODNAME ": "
  -   "memory allocation failure in rsl_strdup()");
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "%s: memory allocation failure in rsl_strdup()",
  + MODNAME);
   return NULL;
   }
   
  @@ -708,8 +712,8 @@
   /* clean up and return */
   result[res_pos] = 0;
   #if MIME_MAGIC_DEBUG
  -log_printf(r->server, MODNAME ": rsl_strdup() %d chars: %s",
  -res_pos - 1, result);
  +aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  + "%s: rsl_strdup() %d chars: %s", MODNAME, res_pos - 1, result);
   #endif
   return result;
   }
  @@ -781,9 +785,8 @@
   else {
   /* should not be possible */
   /* abandon malfunctioning module */
  -log_printf(r->server,
  -   "%s: bad state %d (ws)",
  -   MODNAME);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "%s: bad state %d (ws)", MODNAME);
   return DECLINED;
   }
   /* NOTREACHED */
  @@ -826,9 +829,8 @@
   else {
   /* should not be possible */
   /* abandon malfunctioning module */
  -log_printf(r->server,
  -   "%s: bad state %d (ns)",
  -   MODNAME);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "%s: bad state %d (ns)", MODNAME);
   return DECLINED;
   }
   /* NOTREACHED */
  @@ -892,8 +894,7 @@
* if (sb.st_mode & 0002) magic_rsl_puts(r,"writable, "); if
* (sb.st_mode & 0111) magic_rsl_puts(r,"executable, ");
*/
  -log_printf(r->server, "can't read `%s' (%s).",
  -   r->filename, strerror(errno));
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server, "can't read `%s'", 
r->filename);
   return;
   }
   
  @@ -901,7 +902,7 @@
* try looking at the first HOWMANY bytes
*/
   if ((nbytes = read(fd, (char *) buf, HOWMANY)) == -1) {
  -log_printf(r->server, "read failed (%s).", strerror(errno));
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server, "read failed");
   /* NOTREACHED */
   }
   
  @@ -957,8 +958,7 @@
* apprentice - load configuration from the magic file r
*  API request record
*/
  -static int 
  -apprentice(server_rec * s, pool * p)
  +static int apprentice (server_rec * s, pool * p)
   {
   FILE *f;
   char line[BUFSIZ + 1];
  @@ -979,8 +979,8 @@
   fname = server_root_relative(p, conf->magicfile);
   f = pfopen(p,

cvs commit: apachen/src/modules/standard mod_info.c

[Randy Terbush]

randy   97/08/31 18:36:47

  Modified:src/modules/standard mod_info.c
  Log:
  Convert log_*() to aplog_error().
  
  Revision  ChangesPath
  1.27  +1 -1  apachen/src/modules/standard/mod_info.c
  
  Index: mod_info.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_info.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- mod_info.c1997/08/31 13:30:52 1.26
  +++ mod_info.c1997/09/01 01:36:45 1.27
  @@ -163,7 +163,7 @@
filename,
NULL
);
  - log_error (msg, r->server);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server, msg);
return NULL;
}
while(!cfg_getline(s,MAX_STRING_LEN,fp)) {
  
  
  

cvs commit: apachen/src/modules/standard mod_include.c

[Randy Terbush]

randy   97/08/31 18:35:18

  Modified:src/modules/standard mod_include.c
  Log:
  Convert log_*() to aplog_error().
  Style changes.
  
  Revision  ChangesPath
  1.48  +184 -133  apachen/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_include.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- mod_include.c 1997/08/18 13:12:13 1.47
  +++ mod_include.c 1997/09/01 01:35:16 1.48
  @@ -98,7 +98,7 @@
   
   /*  Environment function -- 
*/
   
  -static void add_include_vars(request_rec *r, char *timefmt)
  +static void add_include_vars (request_rec *r, char *timefmt)
   {
   #ifndef WIN32
   struct passwd *pw;
  @@ -188,7 +188,7 @@
  c = (char)i; \
}
   
  -static int find_string(FILE *in, char *str, request_rec *r, int printing) {
  +static int find_string (FILE *in, char *str, request_rec *r, int printing) {
   int x, l = strlen(str), p;
   char outbuf[OUTBUFSIZE];
   int outind = 0;
  @@ -246,8 +246,7 @@
   
   /* The following is a shrinking transformation, therefore safe. */
   
  -static void
  -decodehtml(char *s)
  +static void decodehtml (char *s)
   {
   int val, i, j;
   char *p = s;
  @@ -320,8 +319,8 @@
* the tag value is html decoded if dodecode is non-zero
*/
   
  -static char *
  -get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode) {
  +static char *get_tag (pool *p, FILE *in, char *tag, int tagbuf_len, int 
dodecode)
  +{
   char *t = tag, *tag_val, c, term;
   int n;
   
  @@ -399,8 +398,8 @@
   return pstrdup (p, tag_val);
   }
   
  -static int
  -get_directive(FILE *in, char *d, pool *p) {
  +static int get_directive (FILE *in, char *d, pool *p)
  +{
   char c;
   
   /* skip initial whitespace */
  @@ -424,7 +423,7 @@
* Do variable substitution on strings
*/
   static void parse_string(request_rec *r, char *in, char *out, int length,
  -  int leave_name)
  +  int leave_name)
   {
   char ch;
   char *next = out;
  @@ -471,7 +470,8 @@
   var[vlen] = vtext[vtlen] = '\0';
   if (braces == 1) {
   if (*in != '}') {
  -log_printf(r->server, "Invalid variable \"%s%s\"", 
vtext, in);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "Invalid variable \"%s%s\"", vtext, in);
   *next = '\0';
   return;
   } else
  @@ -506,7 +506,7 @@
   
   /* --- Action handlers  
*/
   
  -static int include_cgi(char *s, request_rec *r)
  +static int include_cgi (char *s, request_rec *r)
   {
   request_rec *rr = sub_req_lookup_uri (s, r);
   
  @@ -545,7 +545,8 @@
   return 0;
   }
   
  -static int handle_include(FILE *in, request_rec *r, char *error, int noexec) 
{
  +static int handle_include (FILE *in, request_rec *r, char *error, int noexec)
  +{
   char tag[MAX_STRING_LEN];
   char parsed_string[MAX_STRING_LEN];
   char *tag_val;
  @@ -591,7 +592,8 @@
   chdir_file(r->filename);
   
   if (error_fmt) {
  -log_printf(r->server, error_fmt, tag_val, r->filename);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + error_fmt, tag_val, r->filename);
   rputs(error, r);
   }
   
  @@ -601,8 +603,9 @@
   else if (!strcmp(tag, "done"))
   return 0;
   else {
  -log_printf(r->server, "unknown parameter \"%s\" to tag include 
in %s",
  -   tag, r->filename);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "unknown parameter \"%s\" to tag include in %s",
  + tag, r->filename);
   rputs(error, r);
   }
   }
  @@ -684,7 +687,8 @@
   #endif /* WIN32 */
   }
   
  -static int include_cmd(char *s, request_rec *r) {
  +static int include_cmd (char *s, request_rec *r)
  +{
   include_cmd_arg arg;
   FILE *f;
   
  @@ -702,7 +706,7 @@
   }
   
   
  -static int handle_exec(FILE *in, request_rec *r, char *error)
  +static int handle_exec (FILE *in, request_rec *r, char *error)
   {
   char tag[MAX_STRING_LEN];
   char *tag_val;
  @@ -715,8 +719,9 @@
   if (!strcmp(tag, "cmd")) {
   parse_string(r, tag_val, parsed_string, MAX_STRING_LEN, 1);
   if (include_cmd(parsed_string, r) == -1) {
  -log_printf(r->server, "execution failure for parameter 
\"%s\" to tag exec in file %s", 
  -tag, r->filename);
  +aplog_error(APLOG_MARK, APLOG_ERR,

cvs commit: apachen/src/modules/standard mod_imap.c

[Randy Terbush]

randy   97/08/31 16:15:54

  Modified:src/modules/standard mod_imap.c
  Log:
  Convert log_*() to aplog_error().
  
  Revision  ChangesPath
  1.30  +6 -3  apachen/src/modules/standard/mod_imap.c
  
  Index: mod_imap.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_imap.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- mod_imap.c1997/08/18 13:12:12 1.29
  +++ mod_imap.c1997/08/31 23:15:52 1.30
  @@ -422,11 +422,13 @@
   return;  
 }
   
  -  strncpy(my_base, base, sizeof(my_base)-1);  /* must be a relative URL to 
be combined with base */
  +  /* must be a relative URL to be combined with base */
  +  strncpy(my_base, base, sizeof(my_base)-1);
 my_base[sizeof(my_base)-1] = '\0';
 if (strchr(my_base, '/') == NULL && (!strncmp(value, "../", 3) || 
!strcmp(value, "..")) ) {
   url[0] = '\0';
  -log_reason("invalid base directive in map file", r->uri, r);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "invalid base directive in map file: %s", r->uri);
   return;
 }
 string_pos = my_base; 
  @@ -477,7 +479,8 @@
  value += 2;  /* jump over the '..' that we found in the value */
 } else if (directory) {
url[0] = '\0';
  - log_reason("invalid directory name in map file", r->uri, r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "invalid directory name in map file: %s", r->uri);
return;
 }
 
  
  
  

cvs commit: apachen/src/modules/standard mod_expires.c

[Randy Terbush]

randy   97/08/31 16:11:28

  Modified:src/modules/standard mod_expires.c
  Log:
  Convert log_*() to aplog_error().
  
  Revision  ChangesPath
  1.17  +4 -2  apachen/src/modules/standard/mod_expires.c
  
  Index: mod_expires.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_expires.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_expires.c 1997/08/18 13:12:12 1.16
  +++ mod_expires.c 1997/08/31 23:11:27 1.17
  @@ -402,7 +402,8 @@
   
   conf = (expires_dir_config *)get_module_config(r->per_dir_config, 
&expires_module);
   if ( conf == NULL ) {
  -log_reason ("internal error in expires_module; add_expires(), conf 
== NULL", r->filename, r);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "internal error: %s", r->filename);
return SERVER_ERROR;
   };
   
  @@ -451,7 +452,8 @@
/* expecting the add_* routines to be case-hardened this 
 * is just a reminder that module is beta
 */
  -log_reason ("internal error in expires_module; bad expires 
code", r->filename, r);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "internal error: bad expires code: %s", r->filename);
   return SERVER_ERROR;
   };
   
  
  
  

cvs commit: apachen/src/modules/standard mod_digest.c

[Randy Terbush]

randy   97/08/31 16:05:34

  Modified:src/modules/standard mod_digest.c
  Log:
  Convert log_*() to aplog_error().
  Style changes.
  
  Revision  ChangesPath
  1.21  +108 -105  apachen/src/modules/standard/mod_digest.c
  
  Index: mod_digest.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_digest.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_digest.c  1997/08/18 13:12:11 1.20
  +++ mod_digest.c  1997/08/31 23:05:33 1.21
  @@ -98,15 +98,16 @@
   
   module MODULE_VAR_EXPORT digest_module;
   
  -char *get_hash(request_rec *r, char *user, char *auth_pwfile)
  +char *get_hash (request_rec *r, char *user, char *auth_pwfile)
   {
   FILE *f;
   char l[MAX_STRING_LEN];
   const char *rpw;
   char *w, *x;
   
  -if(!(f=pfopen(r->pool, auth_pwfile, "r"))) {
  -log_reason ("Could not open password file", auth_pwfile, r);
  +if (!(f=pfopen(r->pool, auth_pwfile, "r"))) {
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "Could not open password file: %s", auth_pwfile);
return NULL;
   }
   while(!(cfg_getline(l,MAX_STRING_LEN,f))) {
  @@ -126,113 +127,115 @@
   
   /* Parse the Authorization header, if it exists */
   
  -int get_digest_rec(request_rec *r, digest_header_rec *response) {
  -  const char *auth_line = table_get(r->headers_in, "Authorization");
  -  int l;
  -  int s = 0, vk = 0, vv = 0;
  -  char *t, *key, *value;
  -
  -  if (!(t = auth_type(r)) || strcasecmp(t, "Digest"))
  -return DECLINED;
  -
  -  if (!auth_name (r)) {
  -log_reason ("need AuthName", r->uri, r);
  -return SERVER_ERROR;
  -  }
  -
  -  if (!auth_line) {
  -note_digest_auth_failure (r);
  -return AUTH_REQUIRED;
  -  }
  -
  -  if (strcmp(getword (r->pool, &auth_line, ' '), "Digest")) {
  -/* Client tried to authenticate using wrong auth scheme */
  -log_reason ("client used wrong authentication scheme", r->uri, r);
  -note_digest_auth_failure (r);
  -return AUTH_REQUIRED;
  -  }
  +int get_digest_rec (request_rec *r, digest_header_rec *response)
  +{
  +const char *auth_line = table_get(r->headers_in, "Authorization");
  +int l;
  +int s = 0, vk = 0, vv = 0;
  +char *t, *key, *value;
  +
  +if (!(t = auth_type(r)) || strcasecmp(t, "Digest"))
  + return DECLINED;
  +
  +if (!auth_name (r)) {
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server, "need AuthName: %s", 
r->uri);
  + return SERVER_ERROR;
  +}
  +
  +if (!auth_line) {
  + note_digest_auth_failure (r);
  + return AUTH_REQUIRED;
  +}
  +
  +if (strcmp(getword(r->pool, &auth_line, ' '), "Digest")) {
  + /* Client tried to authenticate using wrong auth scheme */
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "client used wrong authentication scheme: %s", r->uri);
  + note_digest_auth_failure(r);
  + return AUTH_REQUIRED;
  +}
   
  -  l = strlen(auth_line);
  +l = strlen(auth_line);
   
  -  key=palloc(r->pool,l);
  -  value=palloc(r->pool,l);
  +key = palloc(r->pool,l);
  +value = palloc(r->pool,l);
   
  -  /* There's probably a better way to do this, but for the time being... */
  +/* There's probably a better way to do this, but for the time being... */
   
   #define D_KEY 0
   #define D_VALUE 1
   #define D_STRING 2
   #define D_EXIT -1
   
  -  while (s != D_EXIT) {
  -switch (s) {
  -case D_STRING:
  -  if (auth_line[0] == '\"') {
  - s = D_VALUE;
  -  }
  -  else {
  - value[vv] = auth_line[0];
  - vv++;
  -  }
  -  auth_line++;
  -  break;
  -
  -case D_VALUE:
  -  if (isalnum(auth_line[0])) {
  - value[vv] = auth_line[0];
  - vv++;
  -  }
  -  else if (auth_line[0] == '\"') {
  - s = D_STRING;
  -  }
  -  else {
  - value[vv] = '\0';
  -
  - if (!strcasecmp(key, "username"))
  -   response->username = pstrdup(r->pool, value);
  - else if (!strcasecmp(key, "realm"))
  -   response->realm = pstrdup(r->pool, value);
  - else if (!strcasecmp(key, "nonce"))
  -   response->nonce = pstrdup(r->pool, value);
  - else if (!strcasecmp(key, "uri"))
  -   response->requested_uri = pstrdup(r->pool, value);
  - else if (!strcasecmp(key, "response"))
  -   response->digest = pstrdup(r->pool, value);
  -
  - vv = 0;
  - s = D_KEY;
  -  }
  -  auth_line++;
  -  break;
  -
  -case D_KEY:
  -  if (isalnum(auth_line[0])) {
  - key[vk] = auth_line[0];
  - vk++;
  -  }
  -  else if (auth_line[0] == '=') {
  - key[vk] = '\0';
  - vk = 0;
  - s = D_VALUE;
  -  }
  -  auth_line++;
  -  break;
  -}
  -
  -if (auth_line[-1] == '\0')
  -  s = D_EXIT;
  -  }
  -
  -  if (!response->username || !response->realm ||

cvs commit: apachen/src/modules/standard mod_cgi.c

[Randy Terbush]

randy   97/08/31 15:59:09

  Modified:src/modules/standard mod_cgi.c
  Log:
  Convert log_*() to aplog_error().
  
  Revision  ChangesPath
  1.55  +12 -11apachen/src/modules/standard/mod_cgi.c
  
  Index: mod_cgi.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cgi.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- mod_cgi.c 1997/08/18 13:12:11 1.54
  +++ mod_cgi.c 1997/08/31 22:59:08 1.55
  @@ -155,12 +155,12 @@
   { NULL}
   };
   
  -static int log_scripterror(request_rec *r, cgi_server_conf *conf, int ret,
  - char *error)
  +static int log_scripterror (request_rec *r, cgi_server_conf *conf, int ret,
  + char *error)
   {
   FILE *f;
   
  -log_reason(error, r->filename, r);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server, error, r->filename);
   
   if (!conf->logname ||
((stat(server_root_relative(r->pool, conf->logname), &r->finfo) == 0)
  @@ -182,8 +182,8 @@
   return ret;
   }
   
  -static int log_script(request_rec *r, cgi_server_conf *conf, int ret,
  - char *dbuf, char *sbuf, BUFF *script_in, BUFF *script_err)
  +static int log_script (request_rec *r, cgi_server_conf *conf, int ret,
  +char *dbuf, char *sbuf, BUFF *script_in, BUFF 
*script_err)
   {
   table *hdrs_arr = r->headers_in;
   table_entry *hdrs = (table_entry *)hdrs_arr->elts;
  @@ -323,7 +323,7 @@
*
* Oh, well.  Muddle through as best we can...
*
  - * (NB we can't use log_error, or anything like that, because we
  + * (NB we can't use aplog_error, or anything like that, because we
* just closed the file descriptor which r->server->error_log
* was tied to in cleanup_for_exec().  It's only available on stderr
* now, so that's what we use).
  @@ -412,11 +412,12 @@
* SSI request -djg
*/
   if (!(child_pid =
  -   spawn_child_err_buff (r->main ? r->main->pool : r->pool, cgi_child,
  - (void *)&cld,
  - kill_after_timeout,
  - &script_out, &script_in, &script_err))) {
  -log_reason ("couldn't spawn child process", r->filename, r);
  +   spawn_child_err_buff(r->main ? r->main->pool : r->pool, cgi_child,
  +(void *)&cld,
  +kill_after_timeout,
  +&script_out, &script_in, &script_err))) {
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "couldn't spawn child process: %s", r->filename);
   return SERVER_ERROR;
   }
   
  
  
  

cvs commit: apachen/src/modules/standard mod_cern_meta.c

[Randy Terbush]

randy   97/08/31 15:53:14

  Modified:src/modules/standard mod_cern_meta.c
  Log:
  Convert log_*() to aplog_error().
  Style changes.
  
  Revision  ChangesPath
  1.19  +20 -16apachen/src/modules/standard/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cern_meta.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_cern_meta.c   1997/08/23 02:19:01 1.18
  +++ mod_cern_meta.c   1997/08/31 22:53:12 1.19
  @@ -236,41 +236,42 @@
else w[p-1] = '\0';
}
   
  -if(w[0] == '\0') {
  +if (w[0] == '\0') {
return OK;
}
  
/* if we see a bogus header don't ignore it. Shout and scream */

  -if(!(l = strchr(w,':'))) {
  - log_reason ("malformed header in meta file", r->filename, r);
  +if (!(l = strchr(w,':'))) {
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "malformed header in meta file: %s", r->filename);
return SERVER_ERROR;
   }
   
   *l++ = '\0';
while (*l && isspace (*l)) ++l;

  -if(!strcasecmp(w,"Content-type")) {
  +if (!strcasecmp(w,"Content-type")) {
   
/* Nuke trailing whitespace */

char *endp = l + strlen(l) - 1;
while (endp > l && isspace(*endp)) *endp-- = '\0';

  - r->content_type = pstrdup (r->pool, l);
  + r->content_type = pstrdup(r->pool, l);
}
  -else if(!strcasecmp(w,"Status")) {
  +else if (!strcasecmp(w,"Status")) {
   sscanf(l, "%d", &r->status);
   r->status_line = pstrdup(r->pool, l);
   }
   else {
  - table_set (r->headers_out, w, l);
  + table_set(r->headers_out, w, l);
   }
   }
   return OK;
   }
   
  -int add_cern_meta_data(request_rec *r)
  +int add_cern_meta_data (request_rec *r)
   {
   char *metafilename;
   char *last_slash;
  @@ -281,7 +282,7 @@
   int rv;
   request_rec *rr;
   
  -dconf = get_module_config (r->per_dir_config, &cern_meta_module); 
  +dconf = get_module_config(r->per_dir_config, &cern_meta_module); 
   
   if (!dconf->metafiles) {
   return DECLINED;
  @@ -308,9 +309,11 @@
real_file = last_slash;
real_file++;
*last_slash = '\0';
  -} else {
  +}
  +else {
/* no last slash, buh?! */
  -log_reason("internal error in mod_cern_meta", r->filename, r);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "internal error in mod_cern_meta", r->filename);
/* should really barf, but hey, let's be friends... */
return DECLINED;
   };
  @@ -326,19 +329,20 @@
* A better solution might be a "safe open" feature of pfopen to avoid
* pipes, symlinks, and crap like that.
*/
  -rr = sub_req_lookup_file (metafilename, r);
  +rr = sub_req_lookup_file(metafilename, r);
   if (rr->status != HTTP_OK) {
  - destroy_sub_req (rr);
  + destroy_sub_req(rr);
return DECLINED;
   }
  -destroy_sub_req (rr);
  +destroy_sub_req(rr);
   
  -f = pfopen (r->pool, metafilename, "r");
  +f = pfopen(r->pool, metafilename, "r");
   if (f == NULL) {
if (errno == ENOENT) {
return DECLINED;
}
  -log_reason("meta file permissions deny server access", metafilename, 
r);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "meta file permissions deny server access: %s", 
metafilename);
   return FORBIDDEN;
   };
   
  
  
  

cvs commit: apachen/src/modules/standard mod_autoindex.c

[Randy Terbush]

randy   97/08/31 15:47:51

  Modified:src/modules/standard mod_autoindex.c
  Log:
  Conver log_*() to aplog_error().
  Style changes. One change to correct problems Emacs was having with formating.
  
  Revision  ChangesPath
  1.47  +14 -11apachen/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- mod_autoindex.c   1997/08/23 02:55:31 1.46
  +++ mod_autoindex.c   1997/08/31 22:47:49 1.47
  @@ -961,7 +961,8 @@
   char direction;
   
   if (!(d = popendir(r->pool, name))) {
  -log_reason ("Can't open directory for index", r->filename, r);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "Can't open directory for index: %s", r->filename);
   return HTTP_FORBIDDEN;
   }
   
  @@ -1037,10 +1038,10 @@
   p = p->next;
   }
   
  -qsort((void *)ar, num_ent, sizeof(struct ent *),
   #ifdef ULTRIX_BRAIN_DEATH
  -  (int (*))dsortf);
  +qsort((void *)ar, num_ent, sizeof(struct ent *), (int (*))dsortf);
   #else
  +qsort((void *)ar, num_ent, sizeof(struct ent *),
 (int (*)(const void *, const void *))dsortf);
   #endif
   }
  @@ -1048,13 +1049,13 @@
   direction);
   pclosedir(r->pool, d);
   
  -if (autoindex_opts & FANCY_INDEXING)
  +if (autoindex_opts & FANCY_INDEXING) {
   if ((tmp = find_readme(autoindex_conf, r)))
   insert_readme(name, tmp, "", HRULE, END_MATTER, r);
  -else {
  -rputs("", r);
  + else {
  + rputs("", r);
  + }
   }
  -
   rputs ("\n", r);
   
   kill_timeout(r);
  @@ -1066,8 +1067,8 @@
   static int handle_autoindex (request_rec *r)
   {
   autoindex_config_rec *d =
  -  (autoindex_config_rec *)get_module_config (r->per_dir_config,
  -  &autoindex_module);
  + (autoindex_config_rec *)get_module_config(r->per_dir_config,
  +   &autoindex_module);
   int allow_opts = allow_options (r);
   
   if (r->method_number != M_GET) return NOT_IMPLEMENTED;
  @@ -1084,8 +1085,10 @@
   r->filename = pstrcat (r->pool, r->filename, "/", NULL);
   }
   return index_directory (r, d);
  -} else {
  -log_reason ("Directory index forbidden by rule", r->filename, r);
  +}
  + else {
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "Directory index forbidden by rule: %s", r->filename);
   return HTTP_FORBIDDEN;
   }
   }
  
  
  

cvs commit: apachen/src/modules/standard Makefile.tmpl mod_auth_msql.c

[Randy Terbush]

randy   97/08/31 15:36:26

  Modified:src  CHANGES Configuration.tmpl
   src/modules/standard Makefile.tmpl
  Removed: src/modules/standard mod_auth_msql.c
  Log:
  Remove mod_auth_msql from the distribution. Note in changes references a
  URL that is not yet active, pending Brian's changes to DNS.
  
  Revision  ChangesPath
  1.425 +7 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.424
  retrieving revision 1.425
  diff -u -r1.424 -r1.425
  --- CHANGES   1997/08/28 01:38:48 1.424
  +++ CHANGES   1997/08/31 22:36:21 1.425
  @@ -1,5 +1,12 @@
   Changes with Apache 1.3a2
   
  +  *) Removal of mod_auth_msql.c from the distribution. There are many
  + other options for databases today. Rather than offer one option,
  + offer none at this time. mod_auth_msql and other SQL database
  + authentication modules can be found at the Apache Module Registry.
  + http://modules.apache.org/ It would be nice to offer a generic
  + mod_auth_sql option in the near future.
  +
 *) PORT: BeOS support added [Alexei Kosut]
   
 *) Configure no longer accepts the -make option, since it creates
  
  
  
  1.75  +0 -11 apachen/src/Configuration.tmpl
  
  Index: Configuration.tmpl
  ===
  RCS file: /export/home/cvs/apachen/src/Configuration.tmpl,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- Configuration.tmpl1997/08/24 16:39:58 1.74
  +++ Configuration.tmpl1997/08/31 22:36:22 1.75
  @@ -252,17 +252,6 @@
   # AddModule modules/standard/mod_auth_dbm.o
   # AddModule modules/standard/mod_auth_db.o
   
  -## msql_auth checks against an mSQL database.  You must have mSQL installed
  -## and an "msql.h" available for this to even compile.  Additionally,
  -## you may need to add a couple entries to the EXTRA_LIBS line, like
  -##
  -##  -lmsql -L/usr/local/lib -L/usr/local/Minerva/lib
  -##
  -## This depends on your installation of mSQL. (This may be done by Configure
  -## at a later date)
  -
  -# AddModulemodules/standard/mod_auth_msql.o
  -
   ## "digest" implements HTTP Digest Authentication rather than the less 
   ## secure Basic Auth used by the other modules.
   
  
  
  
  1.3   +0 -5  apachen/src/modules/standard/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/Makefile.tmpl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.tmpl 1997/08/24 12:27:43 1.2
  +++ Makefile.tmpl 1997/08/31 22:36:25 1.3
  @@ -38,11 +38,6 @@
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
$(INCDIR)/http_protocol.h
   
  -mod_auth_msql.o: mod_auth_msql.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_protocol.h
  -
   mod_autoindex.o: mod_autoindex.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_request.h \
  
  
  

cvs commit: apachen/src/modules/standard mod_auth_db.c

[Randy Terbush]

randy   97/08/31 15:24:50

  Modified:src/modules/standard mod_auth_db.c
  Log:
  Convert log_*() to aplog_error().
  Style changes.
  
  Revision  ChangesPath
  1.21  +30 -28apachen/src/modules/standard/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_db.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_auth_db.c 1997/08/23 04:00:35 1.20
  +++ mod_auth_db.c 1997/08/31 22:24:49 1.21
  @@ -134,7 +134,8 @@
   
   module db_auth_module;
   
  -static char *get_db_pw(request_rec *r, char *user, const char 
*auth_dbpwfile) {
  +static char *get_db_pw(request_rec *r, char *user, const char *auth_dbpwfile)
  +{
   DB *f; 
   DBT d, q; 
   char *pw = NULL;
  @@ -142,13 +143,14 @@
   q.data = user; 
   q.size = strlen(q.data); 
   
  -if(!(f=dbopen(auth_dbpwfile,O_RDONLY,0664,DB_HASH,NULL))) {
  -log_reason ("could not open db auth file", auth_dbpwfile, r);
  +if (!(f = dbopen(auth_dbpwfile,O_RDONLY,0664,DB_HASH,NULL))) {
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "could not open db auth file: %s", auth_dbpwfile);
return NULL;
   }
   
   if (!((f->get)(f,&q,&d,0))) {
  -pw = palloc (r->pool, d.size + 1);
  +pw = palloc(r->pool, d.size + 1);
strncpy(pw,d.data,d.size);
pw[d.size] = '\0'; /* Terminate the string */
   }
  @@ -185,36 +187,35 @@
   static int db_authenticate_basic_user (request_rec *r)
   {
   db_auth_config_rec *sec =
  -  (db_auth_config_rec *)get_module_config (r->per_dir_config,
  + (db_auth_config_rec *)get_module_config(r->per_dir_config,
&db_auth_module);
   conn_rec *c = r->connection;
   char *sent_pw, *real_pw, *colon_pw;
   char errstr[MAX_STRING_LEN];
   int res;
   
  -if ((res = get_basic_auth_pw (r, &sent_pw)))
  +if ((res = get_basic_auth_pw(r, &sent_pw)))
   return res;
   
  -if(!sec->auth_dbpwfile)
  +if (!sec->auth_dbpwfile)
   return DECLINED;

  -if(!(real_pw = get_db_pw(r, c->user, sec->auth_dbpwfile))) {
  +if (!(real_pw = get_db_pw(r, c->user, sec->auth_dbpwfile))) {
if (!(sec -> auth_dbauthoritative))
return DECLINED; 
   ap_snprintf(errstr, sizeof(errstr), "DB user %s not found", c->user);
  - log_reason (errstr, r->filename, r);
  - note_basic_auth_failure (r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, 
r->filename);
  + note_basic_auth_failure(r);
return AUTH_REQUIRED;
   }
   /* Password is up to first : if exists */
   colon_pw = strchr(real_pw,':');
   if (colon_pw) *colon_pw='\0';   
   /* anyone know where the prototype for crypt is? */
  -if(strcmp(real_pw,(char *)crypt(sent_pw,real_pw))) {
  -ap_snprintf(errstr, sizeof(errstr), 
  - "user %s: password mismatch",c->user);
  - log_reason (errstr, r->uri, r);
  - note_basic_auth_failure (r);
  +if (strcmp(real_pw,(char *)crypt(sent_pw,real_pw))) {
  +ap_snprintf(errstr, sizeof(errstr), "user %s: password 
mismatch",c->user);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, r->uri);
  + note_basic_auth_failure(r);
return AUTH_REQUIRED;
   }
   return OK;
  @@ -222,9 +223,10 @@
   
   /* Checking ID */
   
  -static int db_check_auth(request_rec *r) {
  +static int db_check_auth(request_rec *r)
  +{
   db_auth_config_rec *sec =
  -  (db_auth_config_rec *)get_module_config (r->per_dir_config,
  + (db_auth_config_rec *)get_module_config(r->per_dir_config,
&db_auth_module);
   char *user = r->connection->user;
   int m = r->method_number;
  @@ -240,14 +242,14 @@
   if (!sec->auth_dbgrpfile) return DECLINED;
   if (!reqs_arr) return DECLINED;
   
  -for(x=0; x < reqs_arr->nelts; x++) {
  +for (x = 0; x < reqs_arr->nelts; x++) {
 
if (! (reqs[x].method_mask & (1 << m))) continue;

   t = reqs[x].requirement;
   w = getword(r->pool, &t, ' ');

  -if(!strcmp(w,"group") && sec->auth_dbgrpfile) {
  +if (!strcmp(w,"group") && sec->auth_dbgrpfile) {
   const char *orig_groups,*groups;
  char *v;
   
  @@ -255,25 +257,25 @@
   if (!(sec->auth_dbauthoritative))
 return DECLINED;
  ap_snprintf(errstr, sizeof(errstr), 
  - "user %s not in DB group file %s",
  - user, sec->auth_dbgrpfile);
  -log_reason (errstr, r->filename, r);
  -note_basic_auth_failure (r);
  +"user %s not in DB g

cvs commit: apachen/src/modules/standard mod_auth_dbm.c

[Randy Terbush]

randy   97/08/31 15:23:22

  Modified:src/modules/standard mod_auth_dbm.c
  Log:
  Convert log_*() to aplog_error().
  Style changes.
  
  Revision  ChangesPath
  1.28  +34 -29apachen/src/modules/standard/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_dbm.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_auth_dbm.c1997/08/24 16:43:26 1.27
  +++ mod_auth_dbm.c1997/08/31 22:23:20 1.28
  @@ -151,7 +151,8 @@
   
   module dbm_auth_module;
   
  -static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile) {
  +static char *get_dbm_pw (request_rec *r, char *user, char *auth_dbmpwfile)
  +{
   DBM *f; 
   datum d, q; 
   char *pw = NULL;
  @@ -164,15 +165,16 @@
   #endif
   
   
  -if(!(f=dbm_open(auth_dbmpwfile,O_RDONLY,0664))) {
  -log_reason ("could not open dbm auth file", auth_dbmpwfile, r);
  +if (!(f=dbm_open(auth_dbmpwfile,O_RDONLY,0664))) {
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "could not open dbm auth file: %s", auth_dbmpwfile);
return NULL;
   }
   
   d = dbm_fetch(f, q);
   
   if (d.dptr) {
  -pw = palloc (r->pool, d.dsize + 1);
  +pw = palloc(r->pool, d.dsize + 1);
strncpy(pw,d.dptr,d.dsize);
pw[d.dsize] = '\0'; /* Terminate the string */
   }
  @@ -209,36 +211,36 @@
   static int dbm_authenticate_basic_user (request_rec *r)
   {
   dbm_auth_config_rec *sec =
  -  (dbm_auth_config_rec *)get_module_config (r->per_dir_config,
  - &dbm_auth_module);
  + (dbm_auth_config_rec *)get_module_config(r->per_dir_config,
  +  &dbm_auth_module);
   conn_rec *c = r->connection;
   char *sent_pw, *real_pw, *colon_pw;
   char errstr[MAX_STRING_LEN];
   int res;
   
  -if ((res = get_basic_auth_pw (r, &sent_pw)))
  +if ((res = get_basic_auth_pw(r, &sent_pw)))
   return res;
   
  -if(!sec->auth_dbmpwfile)
  +if (!sec->auth_dbmpwfile)
   return DECLINED;

   if(!(real_pw = get_dbm_pw(r, c->user, sec->auth_dbmpwfile))) {
if (!(sec->auth_dbmauthoritative))
return DECLINED;
   ap_snprintf(errstr, sizeof(errstr), "DBM user %s not found", 
c->user);
  - log_reason (errstr, r->filename, r);
  - note_basic_auth_failure (r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, 
r->filename);
  + note_basic_auth_failure(r);
return AUTH_REQUIRED;
   }
   /* Password is up to first : if exists */
   colon_pw = strchr(real_pw,':');
   if (colon_pw) *colon_pw='\0';   
   /* anyone know where the prototype for crypt is? */
  -if(strcmp(real_pw,(char *)crypt(sent_pw,real_pw))) {
  +if (strcmp(real_pw,(char *)crypt(sent_pw,real_pw))) {
   ap_snprintf(errstr, sizeof(errstr), 
  - "user %s: password mismatch",c->user);
  - log_reason (errstr, r->uri, r);
  - note_basic_auth_failure (r);
  + "user %s: password mismatch",c->user);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, r->uri);
  + note_basic_auth_failure(r);
return AUTH_REQUIRED;
   }
   return OK;
  @@ -246,15 +248,16 @@
   
   /* Checking ID */
   
  -static int dbm_check_auth(request_rec *r) {
  +static int dbm_check_auth (request_rec *r)
  +{
   dbm_auth_config_rec *sec =
  -  (dbm_auth_config_rec *)get_module_config (r->per_dir_config,
  - &dbm_auth_module);
  + (dbm_auth_config_rec *)get_module_config(r->per_dir_config,
  +  &dbm_auth_module);
   char *user = r->connection->user;
   int m = r->method_number;
   char errstr[MAX_STRING_LEN];
   
  -array_header *reqs_arr = requires (r);
  +array_header *reqs_arr = requires(r);
   require_line *reqs = reqs_arr ? (require_line *)reqs_arr->elts : NULL;
   
   register int x;
  @@ -264,14 +267,14 @@
   if (!sec->auth_dbmgrpfile) return DECLINED;
   if (!reqs_arr) return DECLINED;
   
  -for(x=0; x < reqs_arr->nelts; x++) {
  +for (x = 0; x < reqs_arr->nelts; x++) {
 
if (! (reqs[x].method_mask & (1 << m))) continue;

   t = reqs[x].requirement;
   w = getword(r->pool, &t, ' ');

  -if(!strcmp(w,"group") && sec->auth_dbmgrpfile) {
  +if (!strcmp(w,"group") && sec->auth_dbmgrpfile) {
  const char *orig_groups,*groups;
   char *v;
   
  @@ -279,25 +282,27 @@
   if (!(sec->auth_dbmauthoritative))
   return DECLINED;
  ap_snprintf(errstr, sizeof(er

cvs commit: apachen/src/main http_log.c

[Randy Terbush]

randy   97/08/31 15:14:09

  Modified:src/main http_log.c
  Log:
  Fix a warning.
  
  Revision  ChangesPath
  1.31  +0 -1  apachen/src/main/http_log.c
  
  Index: http_log.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- http_log.c1997/08/31 21:28:51 1.30
  +++ http_log.c1997/08/31 22:14:07 1.31
  @@ -160,7 +160,6 @@
   
   #ifdef HAVE_SYSLOG
   else if (!strncasecmp(s->error_fname, "syslog", 6)) {
  - register TRANS *fac;
if ((fname = strchr(s->error_fname, ':'))) {
fname++;
for (fac = facilities; fac->t_name; fac++) {
  
  
  

cvs commit: apachen/src/modules/standard mod_auth_anon.c

[Randy Terbush]

randy   97/08/31 14:54:03

  Modified:src/modules/standard mod_auth_anon.c
  Log:
  Convert log_*() to aplog_error().
  Style changes.
  
  Revision  ChangesPath
  1.24  +35 -36apachen/src/modules/standard/mod_auth_anon.c
  
  Index: mod_auth_anon.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_anon.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_auth_anon.c   1997/08/18 13:12:09 1.23
  +++ mod_auth_anon.c   1997/08/31 21:54:00 1.24
  @@ -200,12 +200,12 @@
   int anon_authenticate_basic_user (request_rec *r)
   {
   anon_auth_config_rec *sec =
  -  (anon_auth_config_rec *)get_module_config (r->per_dir_config,
  - &anon_auth_module);
  + (anon_auth_config_rec *)get_module_config(r->per_dir_config,
  +&anon_auth_module);
   conn_rec *c = r->connection;
   char *send_pw;
   char errstr[MAX_STRING_LEN];
  -int res=DECLINED;
  +int res = DECLINED;
   
   if ((res=get_basic_auth_pw (r,&send_pw)))
return res;
  @@ -216,52 +216,51 @@
   /* Do we allow an empty userID and/or is it the magic one
*/
   
  -if ( (!(c->user[0])) && (sec->auth_anon_nouserid) ) {
  -  res=OK;
  -} else {
  -  auth_anon *p=sec->auth_anon_passwords;
  -  res=DECLINED;
  -  while ((res == DECLINED) && (p !=NULL)) {
  - if (!(strcasecmp(c->user,p->password)))
  -   res=OK;
  - p=p->next;
  -  }
  +if ((!(c->user[0])) && (sec->auth_anon_nouserid)) {
  + res = OK;
  +}
  +else {
  + auth_anon *p=sec->auth_anon_passwords;
  + res = DECLINED;
  + while ((res == DECLINED) && (p !=NULL)) {
  + if (!(strcasecmp(c->user,p->password)))
  + res = OK;
  + p = p->next;
  + }
   }
   if (
/* username is OK */
  - (res == OK) &&
  + (res == OK)
/* password been filled out ? */ 
  - ( (!sec->auth_anon_mustemail) || strlen(send_pw)  ) &&
  + && ((!sec->auth_anon_mustemail) || strlen(send_pw))
/* does the password look like an email address ? */
  - ( (!sec->auth_anon_verifyemail) || 
  -  ((strpbrk("@",send_pw) != NULL) 
  -   &&
  -   (strpbrk(".",send_pw) != NULL))
  -   ) 
  - ) {
  -  if (sec->auth_anon_logemail && is_initial_req(r)) {
  - ap_snprintf(errstr, sizeof(errstr), "Anonymous: Passwd <%s> Accepted", 
  + && ((!sec->auth_anon_verifyemail)
  + || ((strpbrk("@",send_pw) != NULL) 
  + && (strpbrk(".",send_pw) != NULL
  +{
  + if (sec->auth_anon_logemail && is_initial_req(r)) {
  + ap_snprintf(errstr, sizeof(errstr), "Anonymous: Passwd <%s> 
Accepted", 
send_pw ? send_pw : "\'none\'");
  - log_error (errstr, r->server );
  -  }
  -  return OK;
  -} else {
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server, errstr);
  + }
  + return OK;
  +}
  +else {
   if (sec->auth_anon_authoritative) {
  - ap_snprintf(errstr, sizeof(errstr),
  - "Anonymous: Authoritative, Passwd <%s> not accepted",
  - send_pw ? send_pw : "\'none\'");
  - log_error(errstr,r->server);
  - return AUTH_REQUIRED;
  + ap_snprintf(errstr, sizeof(errstr),
  + "Anonymous: Authoritative, Passwd <%s> not accepted",
  + send_pw ? send_pw : "\'none\'");
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server, errstr);
  + return AUTH_REQUIRED;
}
/* Drop out the bottom to return DECLINED */
   }

  -
  -   return DECLINED;
  +return DECLINED;
   }
   
  -int check_anon_access (request_rec *r) {
  -
  +int check_anon_access (request_rec *r)
  +{
   #ifdef NOTYET
   conn_rec *c = r->connection;
   anon_auth_config_rec *sec =
  
  
  

cvs commit: apachen/src/modules/standard mod_auth.c

[Randy Terbush]

randy   97/08/31 14:41:15

  Modified:src/modules/standard mod_auth.c
  Log:
  Convert log_*() to aplog_error().
  Style changes.
  
  Revision  ChangesPath
  1.26  +23 -21apachen/src/modules/standard/mod_auth.c
  
  Index: mod_auth.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mod_auth.c1997/08/23 04:00:34 1.25
  +++ mod_auth.c1997/08/31 21:41:13 1.26
  @@ -120,7 +120,8 @@
   const char *rpw, *w;
   
   if(!(f=pfopen(r->pool, auth_pwfile, "r"))) {
  -log_reason ("Could not open password file", auth_pwfile, r);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "Could not open password file: %s", auth_pwfile);
return NULL;
   }
   while(!(cfg_getline(l,MAX_STRING_LEN,f))) {
  @@ -194,22 +195,22 @@
   
   if ((res = get_basic_auth_pw (r, &sent_pw))) return res;
   
  -if(!sec->auth_pwfile) 
  +if (!sec->auth_pwfile) 
   return DECLINED;

   if (!(real_pw = get_pw(r, c->user, sec->auth_pwfile))) {
if (!(sec->auth_authoritative))
return DECLINED;
  -ap_snprintf(errstr, sizeof(errstr), "user %s not found",c->user);
  - log_reason (errstr, r->uri, r);
  - note_basic_auth_failure (r);
  +ap_snprintf(errstr, sizeof(errstr), "user %s not found", c->user);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, r->uri);
  + note_basic_auth_failure(r);
return AUTH_REQUIRED;
   }
   /* anyone know where the prototype for crypt is? */
  -if(strcmp(real_pw,(char *)crypt(sent_pw,real_pw))) {
  +if (strcmp(real_pw, (char *)crypt(sent_pw,real_pw))) {
   ap_snprintf(errstr, sizeof(errstr), "user %s: password 
mismatch",c->user);
  - log_reason (errstr, r->uri, r);
  - note_basic_auth_failure (r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server, "%s: %s", errstr, r->uri);
  + note_basic_auth_failure(r);
return AUTH_REQUIRED;
   }
   return OK;
  @@ -217,9 +218,10 @@
   
   /* Checking ID */
   
  -static int check_user_access (request_rec *r) {
  +static int check_user_access (request_rec *r)
  +{
   auth_config_rec *sec =
  -  (auth_config_rec *)get_module_config (r->per_dir_config, &auth_module);
  + (auth_config_rec *)get_module_config (r->per_dir_config, &auth_module);
   char *user = r->connection->user;
   int m = r->method_number;
   int method_restricted = 0;
  @@ -236,12 +238,12 @@
   return (OK);
   reqs = (require_line *)reqs_arr->elts;
   
  -if(sec->auth_grpfile)
  +if (sec->auth_grpfile)
   grpstatus = groups_for_user (r->pool, user, sec->auth_grpfile);
   else
   grpstatus = NULL;
   
  -for(x=0; x < reqs_arr->nelts; x++) {
  +for (x = 0; x < reqs_arr->nelts; x++) {
 
if (! (reqs[x].method_mask & (1 << m))) continue;

  @@ -249,22 +251,22 @@
   
   t = reqs[x].requirement;
   w = getword(r->pool, &t, ' ');
  -if(!strcmp(w,"valid-user"))
  +if (!strcmp(w,"valid-user"))
   return OK;
  -if(!strcmp(w,"user")) {
  +if (!strcmp(w,"user")) {
   while(t[0]) {
  -w = getword_conf (r->pool, &t);
  -if(!strcmp(user,w))
  +w = getword_conf(r->pool, &t);
  +if (!strcmp(user,w))
   return OK;
   }
   }
  -else if(!strcmp(w,"group")) {
  -if(!grpstatus) 
  +else if (!strcmp(w,"group")) {
  +if (!grpstatus) 
return DECLINED;/* DBM group?  Something else? */

  -while(t[0]) {
  +while (t[0]) {
   w = getword_conf(r->pool, &t);
  -if(table_get (grpstatus, w))
  +if (table_get(grpstatus, w))
return OK;
   }
   }
  @@ -276,7 +278,7 @@
   if (!(sec -> auth_authoritative))
 return DECLINED;
   
  -note_basic_auth_failure (r);
  +note_basic_auth_failure(r);
   return AUTH_REQUIRED;
   }
   
  
  
  

cvs commit: apachen/src/modules/standard mod_asis.c

[Randy Terbush]

randy   97/08/31 14:36:00

  Modified:src/modules/standard mod_asis.c
  Log:
  Convert log_*() to aplog_error().
  Style changes.
  
  Revision  ChangesPath
  1.19  +9 -7  apachen/src/modules/standard/mod_asis.c
  
  Index: mod_asis.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_asis.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_asis.c1997/08/18 13:12:08 1.18
  +++ mod_asis.c1997/08/31 21:35:58 1.19
  @@ -65,19 +65,21 @@
   
   if (r->method_number != M_GET) return DECLINED;
   if (r->finfo.st_mode == 0) {
  - log_reason("File does not exist", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "File does not exist", r->filename);
return NOT_FOUND;
   }

  -f = pfopen (r->pool, r->filename, "r");
  +f = pfopen(r->pool, r->filename, "r");
   
   if (f == NULL) {
  -log_reason("file permissions deny server access", r->filename, r);
  +aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "file permissions deny server access: %s", r->filename);
   return FORBIDDEN;
   }
 
  -scan_script_header (r, f);
  -location = table_get (r->headers_out, "Location");
  +scan_script_header(r, f);
  +location = table_get(r->headers_out, "Location");
   
   if (location && location[0] == '/' && 
   ((r->status == HTTP_OK) || is_HTTP_REDIRECT(r->status))) {
  @@ -93,11 +95,11 @@
r->method = pstrdup(r->pool, "GET");
r->method_number = M_GET;
   
  - internal_redirect_handler (location, r);
  + internal_redirect_handler(location, r);
return OK;
   }
   
  -send_http_header (r);
  +send_http_header(r);
   if (!r->header_only) send_fd (f, r);
   
   pfclose(r->pool, f);
  
  
  

cvs commit: apachen/src/modules/standard mod_actions.c

[Randy Terbush]

randy   97/08/31 14:33:09

  Modified:src/modules/standard mod_actions.c
  Log:
  Convert log_*() to aplog_error().
  
  Revision  ChangesPath
  1.17  +2 -1  apachen/src/modules/standard/mod_actions.c
  
  Index: mod_actions.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_actions.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_actions.c 1997/08/18 13:12:08 1.16
  +++ mod_actions.c 1997/08/31 21:33:08 1.17
  @@ -181,7 +181,8 @@
action ? action : default_type(r {
   script = t;
if (r->finfo.st_mode == 0) {
  - log_reason("File does not exist", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "File does not exist: %s", r->filename);
return NOT_FOUND;
}
   }
  
  
  

cvs commit: apachen/src/modules/standard mod_access.c

[Randy Terbush]

randy   97/08/31 14:31:00

  Modified:src/modules/standard mod_access.c
  Log:
  Convert log_*() to aplog_error().
  
  Revision  ChangesPath
  1.24  +2 -1  apachen/src/modules/standard/mod_access.c
  
  Index: mod_access.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_access.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_access.c  1997/08/18 13:12:07 1.23
  +++ mod_access.c  1997/08/31 21:30:59 1.24
  @@ -342,7 +342,8 @@
   if (ret == FORBIDDEN && (
   satisfies(r) != SATISFY_ANY || !some_auth_required(r)
   )) {
  - log_reason ("Client denied by server configuration", r->filename, r);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "Client denied by server configuration: %s", r->filename);
   }
   
   return ret;
  
  
  

cvs commit: apachen/src/main http_config.c http_core.c http_log.c http_protocol.c http_request.c rfc1413.c util_script.c

[Randy Terbush]

randy   97/08/31 14:28:59

  Modified:src/main http_config.c http_core.c http_log.c
http_protocol.c http_request.c rfc1413.c
util_script.c
  Log:
  Complete conversion of src/main/* to aplog_error(). On to the modules...
  
  Revision  ChangesPath
  1.78  +8 -7  apachen/src/main/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_config.c,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- http_config.c 1997/08/27 05:45:34 1.77
  +++ http_config.c 1997/08/31 21:28:49 1.78
  @@ -934,9 +934,9 @@
   while (!f && access_name[0]) {
char *w = getword_conf(r->pool, &access_name);
filename = make_full_path(r->pool, d, w);
  - f=pfopen(r->pool, filename, "r");
  + f = pfopen(r->pool, filename, "r");
   }
  -if(f) {
  +if (f) {
   dc = create_per_dir_config (r->pool);

   parms.infile = f;
  @@ -947,18 +947,19 @@
   pfclose(r->pool, f);
   
if (errmsg) {
  - log_reason (errmsg, filename, r);
  + aplog_error(APLOG_MARK, APLOG_ALERT, r->server, "%s: %s", filename, 
errmsg);
return SERVER_ERROR;
}

*result = dc;
  -} else {
  +}
  +else {
if (errno == ENOENT || errno == ENOTDIR)
dc = NULL;
else {
  - log_unixerr("pfopen", filename, 
  - "unable to check htaccess file, ensure it is readable",
  - r->server);
  + aplog_error(APLOG_MARK, APLOG_CRIT, r->server,
  + "%s pfopen: unable to check htaccess file, ensure it is 
readable",
  + filename);
return HTTP_FORBIDDEN;
}
   }
  
  
  
  1.116 +23 -18apachen/src/main/http_core.c
  
  Index: http_core.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- http_core.c   1997/08/27 05:45:35 1.115
  +++ http_core.c   1997/08/31 21:28:50 1.116
  @@ -1224,14 +1224,14 @@
   rlim_t cur = 0;
   rlim_t max = 0;
   
  -*plimit=(struct rlimit *)pcalloc(cmd->pool,sizeof **plimit);
  -limit=*plimit;
  -if ((getrlimit(type, limit)) != 0)
  - {
  +*plimit = (struct rlimit *)pcalloc(cmd->pool,sizeof **plimit);
  +limit = *plimit;
  +if ((getrlimit(type, limit)) != 0)   {
*plimit = NULL;
  - log_unixerr("getrlimit",cmd->cmd->name,"failed",cmd->server);
  + aplog_error(APLOG_MARK, APLOG_ERR, cmd->server,
  + "%s: getrlimit failed", cmd->cmd->name);
return;
  - }
  +}
   
   if ((str = getword_conf(cmd->pool, &arg)))
if (!strcasecmp(str, "max"))
  @@ -1239,7 +1239,8 @@
else
cur = atol(str);
   else {
  - log_printf(cmd->server, "Invalid parameters for %s", cmd->cmd->name);
  + aplog_error(APLOG_MARK, APLOG_ERR, cmd->server,
  + "Invalid parameters for %s", cmd->cmd->name);
return;
   }
   
  @@ -1250,8 +1251,8 @@
   if (geteuid()) {
limit->rlim_cur = cur;
if (max)
  - log_printf(cmd->server, "Must be uid 0 to raise maximum %s",
  -   cmd->cmd->name);
  + aplog_error(APLOG_MARK, APLOG_ERR, cmd->server,
  + "Must be uid 0 to raise maximum %s", cmd->cmd->name);
   }
   else {
if (cur)
  @@ -1266,8 +1267,8 @@
   static const char *no_set_limit (cmd_parms *cmd, core_dir_config *conf,
 char *arg, char *arg2)
   {
  -log_printf(cmd->server, "%s not supported on this platform",
  -cmd->cmd->name);
  +aplog_error(APLOG_MARK, APLOG_ERR, cmd->server,
  + "%s not supported on this platform", cmd->cmd->name);
   return NULL;
   }
   #endif
  @@ -1542,7 +1543,8 @@
 
   if (r->proxyreq) return HTTP_FORBIDDEN;
   if ((r->uri[0] != '/') && strcmp(r->uri, "*")) {
  - log_printf(r->server, "Invalid URI in request %s", r->the_request);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "Invalid URI in request %s", r->the_request);
return BAD_REQUEST;
   }
   
  @@ -1603,16 +1605,17 @@
   r->allowed |= (1 << M_OPTIONS);
   
   if (r->method_number == M_INVALID) {
  - log_printf(r->server, "Invalid method in request %s", r->the_request);
  + aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  + "Invalid method in request %s", r->the_request);
return NOT_IMPLEMENTED;
   }
   if (r->method_number == M_OPTIONS) return send_http_options(r);
   if (r->method_number == M_PUT) return METHOD_NOT_ALLOWED;
   
   if (r->finfo.s

cvs commit: apachen/src/main http_main.c

[Randy Terbush]

randy   97/08/31 13:13:08

  Modified:src/main http_main.c
  Log:
  Begin conversion of log_*() to aplog_error(). Change some code style to
  Apache format while we're at it.
  
  Revision  ChangesPath
  1.213 +163 -149  apachen/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
  retrieving revision 1.212
  retrieving revision 1.213
  diff -u -r1.212 -r1.213
  --- http_main.c   1997/08/28 01:36:59 1.212
  +++ http_main.c   1997/08/31 20:13:05 1.213
  @@ -540,8 +540,8 @@
continue;
   
   if (ret < 0) {
  - log_unixerr("fcntl", "F_SETLKW", "Error getting accept lock. Exiting!",
  - server_conf);
  + aplog_error(APLOG_MARK, APLOG_EMERG, server_conf,
  + "fcntl: F_SETLKW: Error getting accept lock. Exiting!");
exit(1);
   }
   }
  @@ -550,8 +550,8 @@
   {
   if (fcntl (lock_fd, F_SETLKW, &unlock_it) < 0)
   {
  - log_unixerr("fcntl", "F_SETLKW", "Error freeing accept lock. Exiting!",
  - server_conf);
  + aplog_error(APLOG_MARK, APLOG_EMERG, server_conf,
  + "fcntl: F_SETLKW: Error freeing accept lock. Exiting!");
exit(1);
   }
   }
  @@ -571,10 +571,9 @@
   
   expand_lock_fname (p);
   lock_fd = popenf(p, lock_fname, O_CREAT | O_WRONLY | O_EXCL, 0644);
  -if (lock_fd == -1)
  -{
  - perror ("open");
  - fprintf (stderr, "Cannot open lock file: %s\n", lock_fname);
  +if (lock_fd == -1) {
  + aplog_error(APLOG_MARK, APLOG_EMERG, server_conf,
  + "Cannot open lock file: %s\n", lock_fname);
exit (1);
   }
   unlink(lock_fname);
  @@ -588,8 +587,8 @@
continue;
   
   if (ret < 0) {
  - log_unixerr("flock", "LOCK_EX", "Error getting accept lock. Exiting!",
  - server_conf);
  + aplog_error(APLOG_MARK, APLOG_EMERG, server_conf,
  + "flock: LOCK_EX: Error getting accept lock. Exiting!");
exit(1);
   }
   }
  @@ -598,8 +597,8 @@
   {
   if (flock (lock_fd, LOCK_UN) < 0)
   {
  - log_unixerr("flock", "LOCK_UN", "Error freeing accept lock. Exiting!",
  - server_conf);
  + aplog_error(APLOG_MARK, APLOG_EMERG, server_conf,
  + "flock: LOCK_UN: Error freeing accept lock. Exiting!");
exit(1);
   }
   }
  @@ -691,17 +690,17 @@
   else dirconf = current_conn->server->lookup_defaults;
   if (sig == SIGPIPE) {
   ap_snprintf(errstr, sizeof(errstr), "%s lost connection to client 
%s",
  - timeout_name ? timeout_name : "request",
  - get_remote_host(current_conn, dirconf, REMOTE_NAME));
  + timeout_name ? timeout_name : "request",
  + get_remote_host(current_conn, dirconf, REMOTE_NAME));
   } else {
   ap_snprintf(errstr, sizeof(errstr), "%s timed out for %s",
  - timeout_name ? timeout_name : "request",
  - get_remote_host(current_conn, dirconf, REMOTE_NAME));
  + timeout_name ? timeout_name : "request",
  + get_remote_host(current_conn, dirconf, REMOTE_NAME));
   }
   
   if (!current_conn->keptalive) 
  -   log_error(errstr, current_conn->server);
  -  
  + aplog_error(APLOG_MARK, APLOG_WARNING, current_conn->server, errstr);
  +  
   if (timeout_req) {
/* Someone has asked for this transaction to just be aborted
 * if it times out...
  @@ -930,7 +929,7 @@
   
   if (setsockopt(s, SOL_SOCKET, SO_LINGER,
  (char *)&li, sizeof(struct linger)) < 0) {
  -log_unixerr("setsockopt", "(SO_LINGER)", NULL, server_conf);
  +aplog_error(APLOG_MARK, APLOG_WARNING, server_conf, "setsockopt: 
(SO_LINGER)");
   /* not a fatal error */
   }
   }
  @@ -1231,7 +1230,7 @@
   }
   
   ap_snprintf(errstr, sizeof(errstr), "created shared memory segment #%d", 
shmid);
  -log_error(errstr, server_conf);
  +aplog_error(APLOG_MARK, APLOG_INFO, server_conf, errstr);
   
   #ifdef MOVEBREAK
   /*
  @@ -1282,8 +1281,10 @@
   if (shmctl(shmid, IPC_RMID, NULL) != 0) {
perror("shmctl");
fprintf(stderr, "httpd: Could not delete segment #%d\n", shmid);
  - ap_snprintf(errstr, sizeof(errstr), "could not remove shared memory 
segment #%d", shmid);
  - log_unixerr("shmctl","IPC_RMID",errstr, server_conf);
  + ap_snprintf(errstr, sizeof(errstr),
  + "could not remove shared memory segment #%d", shmid);
  + aplog_error(APLOG_MARK, APLOG_WARNING, server_conf,
  + "shmctl: IPC_RMID: %s", errstr);
   }
   if (scoreboard_image == BADSHMAT)/* now bailout */
exit(1);
  @@ -1628,17 +1629,23 @@
switch (tries) {
case 1:
 

cvs commit: apachen/src/main http_log.c

[Randy Terbush]

randy   97/08/27 08:51:29

  Modified:src/main http_log.c
  Log:
  Correct lack of newline pointed out by Martin Kraemer.
  
  Revision  ChangesPath
  1.29  +1 -1  apachen/src/main/http_log.c
  
  Index: http_log.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- http_log.c1997/08/27 15:49:13 1.28
  +++ http_log.c1997/08/27 15:51:27 1.29
  @@ -299,7 +299,7 @@
   API_EXPORT(void) log_reason (const char *reason, const char *file, 
request_rec *r) 
   {
   aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  - "access to %s failed for %s, reason: %s\n",
  + "access to %s failed for %s, reason: %s",
file,
get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME),
reason);
  
  
  

cvs commit: apachen/src/main http_log.c

[Randy Terbush]

randy   97/08/27 08:49:14

  Modified:src/main http_log.c
  Log:
  
  
  Revision  ChangesPath
  1.28  +1 -0  apachen/src/main/http_log.c
  
  Index: http_log.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- http_log.c1997/08/27 14:22:07 1.27
  +++ http_log.c1997/08/27 15:49:13 1.28
  @@ -246,6 +246,7 @@
   if (s->error_log) {
fprintf(s->error_log, "[%s] %s", get_time(), errstr);
vfprintf(s->error_log, fmt, args);
  + fprintf(s->error_log, "\n");
fflush(s->error_log);
   }
   #ifdef HAVE_SYSLOG
  
  
  

cvs commit: apachen/src/main conf.h http_log.c

[Randy Terbush]

randy   97/08/27 07:22:09

  Modified:src/main conf.h http_log.c
  Log:
  HAVE_SYSLOG. Added #define for most platforms erroring on the optimistic side.
  
  Revision  ChangesPath
  1.129 +28 -0 apachen/src/main/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/conf.h,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- conf.h1997/08/24 18:24:03 1.128
  +++ conf.h1997/08/27 14:22:06 1.129
  @@ -93,6 +93,7 @@
   #define NO_LINGCLOSE
   #define USE_FLOCK_SERIALIZED_ACCEPT
   #define NEED_DIFFTIME
  +#define HAVE_SYSLOG
   
   #elif defined(SOLARIS2)
   #undef HAVE_GMTOFF
  @@ -109,6 +110,7 @@
   #define USE_MMAP_FILES
   #define HAVE_CRYPT_H
   int gethostname(char *name, int namelen);
  +#define HAVE_SYSLOG
   
   #elif defined(IRIX)
   #undef HAVE_GMTOFF
  @@ -125,6 +127,7 @@
   #define NO_LONG_DOUBLE
   #define HAVE_BSTRING_H
   #define NO_LINGCLOSE
  +#define HAVE_SYSLOG
   
   #elif defined(HIUX)
   #define HAVE_SYS_RESOURCE_H
  @@ -137,6 +140,7 @@
   #define JMP_BUF sigjmp_buf
   #define HAVE_SHMGET
   #define SELECT_NEEDS_CAST
  +#define HAVE_SYSLOG
   
   #elif defined(HPUX) || defined(HPUX10)
   #define HAVE_SYS_RESOURCE_H
  @@ -148,6 +152,7 @@
   #endif
   #define JMP_BUF sigjmp_buf
   #define HAVE_SHMGET
  +#define HAVE_SYSLOG
   #ifndef HPUX10
   #define SELECT_NEEDS_CAST
   typedef int rlim_t;
  @@ -162,6 +167,7 @@
   #ifndef __ps2__
   #define HAVE_MMAP
   #define USE_MMAP_FILES
  +#define HAVE_SYSLOG
   #ifndef DEFAULT_GROUP
   #define DEFAULT_GROUP "nobody"
   #endif
  @@ -184,6 +190,7 @@
   #define const /* Not implemented */
   #endif
   #define JMP_BUF sigjmp_buf
  +#define HAVE_SYSLOG
   
   #elif defined(OSF1)
   #define HAVE_GMTOFF
  @@ -194,6 +201,7 @@
   #define USE_MMAP_FILES
   #define HAVE_CRYPT_H
   #define NO_LONG_DOUBLE
  +#define HAVE_SYSLOG
   
   #elif defined(PARAGON)
   #define HAVE_GMTOFF
  @@ -204,6 +212,7 @@
   #define USE_MMAP_FILES
   #define HAVE_CRYPT_H
   #define NO_LONG_DOUBLE
  +#define HAVE_SYSLOG
   typedef int rlim_t;
   
   #elif defined(SEQUENT)
  @@ -211,6 +220,7 @@
   #undef NO_KILLPG
   #define NO_SETSID
   #define NEED_STRDUP
  +#define HAVE_SYSLOG
   #define tolower(c) (isupper(c) ? tolower(c) : c)
   
   #elif defined(NEXT)
  @@ -271,6 +281,7 @@
   #define JMP_BUF jmp_buf
   #define USE_LONGJMP
   #define NO_USE_SIGACTION
  +#define HAVE_SYSLOG
   
   #elif defined(LINUX)
   #if LINUX > 1
  @@ -295,6 +306,7 @@
   #undef NEED_STRDUP
   #define JMP_BUF sigjmp_buf
   #include  
  +#define HAVE_SYSLOG
   
   #elif defined(SCO)
   #undef HAVE_GMTOFF
  @@ -305,6 +317,7 @@
   #define JMP_BUF sigjmp_buf
   #define SIGURG SIGUSR1 /* but note, this signal will be sent to a process 
group if enabled (for OOB data). It is not currently enabled. */
   #include  
  +#define HAVE_SYSLOG
   
   #elif defined(SCO5)
   
  @@ -316,6 +329,7 @@
   #define USE_MMAP_FILES
   #define HAVE_SYS_RESOURCE_H
   #define SecureWare
  +#define HAVE_SYSLOG
   
   /* Although SCO 5 defines these in  (note the "s") they don't have
   consts. Sigh. */
  @@ -355,6 +369,7 @@
   #define MOVEBREAK0x400
   #define NO_LINGCLOSE
   #define NO_SLACK
  +#define HAVE_SYSLOG
   
   #elif defined(SVR4)
   #define NO_KILLPG
  @@ -368,6 +383,7 @@
   #define JMP_BUF sigjmp_buf
   /* A lot of SVR4 systems need this */
   #define USE_FCNTL_SERIALIZED_ACCEPT
  +#define HAVE_SYSLOG
   
   #elif defined(UW)
   #define NO_LINGCLOSE
  @@ -388,6 +404,7 @@
   #include 
   #define _POSIX_SOURCE
   #define NET_SIZE_T size_t
  +#define HAVE_SYSLOG
   
   #elif defined(DGUX)
   #define NO_KILLPG
  @@ -400,6 +417,7 @@
   /* A lot of SVR4 systems need this */
   #define USE_FCNTL_SERIALIZED_ACCEPT
   #define ap_inet_addr inet_network
  +#define HAVE_SYSLOG
   
   #elif defined(__NetBSD__) || defined(__OpenBSD__)
   #define HAVE_SYS_RESOURCE_H
  @@ -407,6 +425,7 @@
   #undef NO_KILLPG
   #undef NO_SETSID
   #define JMP_BUF sigjmp_buf
  +#define HAVE_SYSLOG
   #ifndef DEFAULT_USER
   #define DEFAULT_USER "nobody"
   #endif
  @@ -422,6 +441,7 @@
   #define STDIN_FILENO 0
   #define STDOUT_FILENO 1
   #define STDERR_FILENO 2
  +#define HAVE_SYSLOG
   #define strftime(buf,bufsize,fmt,tm)ascftime(buf,fmt,tm)
   #include 
   
  @@ -429,6 +449,7 @@
   #undef HAVE_GMTOFF
   #undef NO_KILLPG
   #undef NO_SETSID
  +#define HAVE_SYSLOG
   
   #elif defined(__FreeBSD__) || defined(__bsdi__)
   #if defined(__FreeBSD__)
  @@ -452,6 +473,7 @@
   typedef quad_t rlim_t;
   #endif
   #define USE_FLOCK_SERIALIZED_ACCEPT
  +#define HAVE_SYSLOG
   
   #elif defined(QNX)
   #ifndef crypt
  @@ -472,6 +494,7 @@
   #include 
   #define JMP_BUF sigjmp_buf
   #define HAVE_MMAP
  +#define HAVE_SYSLOG
   
   #elif defined(LYNXOS)
   #undef NO_KILLPG
  @@ -480,6 +503,7 @@
   #define NEED_STRNCASECMP
   #define NEED_INITGROUPS
   #define JMP_BUF jmp_buf
  +#de

cvs commit: apachen/src/main http_config.c http_core.c http_log.c http_log.h httpd.h

[Randy Terbush]

randy   97/08/26 22:45:41

  Modified:src  CHANGES
   src/main http_config.c http_core.c http_log.c http_log.h
httpd.h
  Log:
  Backoff aplog_error() to be configureable on a per-server basis.
  Attempt to fix portability issues with syslog().
  Convert existing log functions to wrappers for aplog_error().
  Add #ifdef USE_SYSLOG
  
  Revision  ChangesPath
  1.423 +1 -1  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.422
  retrieving revision 1.423
  diff -u -r1.422 -r1.423
  --- CHANGES   1997/08/27 01:12:18 1.422
  +++ CHANGES   1997/08/27 05:45:14 1.423
  @@ -22,7 +22,7 @@
 *) Add aplog_error() providing a mechanism to define levels of
verbosity to the server error logging. This addition also provides
the ablity to log errors using syslogd. Error logging is configurable
  - on a per-directory basis using the LogLevel directive. Conversion
  + on a per-server basis using the LogLevel directive. Conversion
of log_*() in progress. [Randy Terbush]
   
 *) Canonicalise filenames under Win32. Short filenames are
  
  
  
  1.77  +3 -0  apachen/src/main/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_config.c,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- http_config.c 1997/08/26 00:00:54 1.76
  +++ http_config.c 1997/08/27 05:45:34 1.77
  @@ -1081,6 +1081,8 @@
   s->keep_alive = -1;
   s->keep_alive_max = -1;
   s->error_log = main_server->error_log;
  +s->loglevel = main_server->loglevel;
  +
   /* start the list of addreses */
   addrs = &s->addrs;
   while( hostname[0] ) {
  @@ -1201,6 +1203,7 @@
   s->server_hostname = NULL; 
   s->error_fname = DEFAULT_ERRORLOG;
   s->error_log = stderr;
  +s->loglevel = DEFAULT_LOGLEVEL;
   s->srm_confname = RESOURCE_CONFIG_FILE;
   s->access_confname = ACCESS_CONFIG_FILE;
   s->timeout = DEFAULT_TIMEOUT;
  
  
  
  1.115 +10 -12apachen/src/main/http_core.c
  
  Index: http_core.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- http_core.c   1997/08/25 02:00:38 1.114
  +++ http_core.c   1997/08/27 05:45:35 1.115
  @@ -130,8 +130,6 @@
   conf->limit_nproc = NULL;
   #endif
   
  -conf->loglevel = DEFAULT_LOGLEVEL;
  -
   conf->sec = make_array (a, 2, sizeof(void *));
   
   return (void *)conf;
  @@ -1374,27 +1372,27 @@
   return NULL;
   }
   
  -const char *set_loglevel (cmd_parms *cmd, core_dir_config *conf, const char 
*arg) 
  +const char *set_loglevel (cmd_parms *cmd, void *dummy, const char *arg) 
   {
  char *str;
   
  if ((str = getword_conf(cmd->pool, &arg))) {
  if (!strcasecmp(str, "emerg"))
  -conf->loglevel = APLOG_EMERG;
  +cmd->server->loglevel = APLOG_EMERG;
  else if (!strcasecmp(str, "alert"))
  -conf->loglevel = APLOG_ALERT;
  +cmd->server->loglevel = APLOG_ALERT;
  else if (!strcasecmp(str, "crit"))
  -conf->loglevel = APLOG_CRIT;
  +cmd->server->loglevel = APLOG_CRIT;
  else if (!strcasecmp(str, "error"))
  -conf->loglevel = APLOG_ERR;
  +cmd->server->loglevel = APLOG_ERR;
  else if (!strcasecmp(str, "warn"))
  -conf->loglevel = APLOG_WARNING;
  +cmd->server->loglevel = APLOG_WARNING;
  else if (!strcasecmp(str, "notice"))
  -conf->loglevel = APLOG_NOTICE;
  +cmd->server->loglevel = APLOG_NOTICE;
  else if (!strcasecmp(str, "info"))
  -conf->loglevel = APLOG_INFO;
  +cmd->server->loglevel = APLOG_INFO;
  else if (!strcasecmp(str, "debug"))
  -conf->loglevel = APLOG_DEBUG;
  +cmd->server->loglevel = APLOG_DEBUG;
  }
  else
  return "LogLevel requires level keyword";
  @@ -1528,7 +1526,7 @@
   { "ListenBacklog", set_listenbacklog, NULL, RSRC_CONF, TAKE1, "maximum 
length of the queue of pending connections, as used by listen(2)" },
   { "CoreDumpDirectory", set_coredumpdir, NULL, RSRC_CONF, TAKE1, "The 
location of the directory Apache changes to before dumping core" },
   { "Include", include_config, NULL, RSRC_CONF, TAKE1, "config file to be 
included" },
  -{ &

cvs commit: apachen/src/main http_log.c

[Randy Terbush]

randy   97/08/25 07:53:41

  Modified:src/main http_log.c
  Log:
  Comment out syslog support temporarily until I can come up with a more
  portable option.
  
  Revision  ChangesPath
  1.25  +2 -0  apachen/src/main/http_log.c
  
  Index: http_log.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- http_log.c1997/08/25 14:26:29 1.24
  +++ http_log.c1997/08/25 14:53:39 1.25
  @@ -248,12 +248,14 @@
vfprintf(r->server->error_log, fmt, args);
fflush(r->server->error_log);
   }
  +#ifdef NOTYET
   else {
if (errstr)
syslog(level, "%s", errstr);
   
vsyslog(level, fmt, args);
   }
  +#endif
   
   va_end(args);
   }
  
  
  

cvs commit: apachen/src/main http_core.c http_core.h http_log.c http_log.h

[Randy Terbush]

randy   97/08/24 19:00:43

  Modified:src  CHANGES
   src/main http_core.c http_core.h http_log.c http_log.h
  Log:
  Add LogLevels functionality through the addition of aplog_error().
  This change also provides the ability to log errors via syslogd.
  Reviewed by:  Dean Gaudet, Jim Jagielski, Ken Coar
  
  Revision  ChangesPath
  1.418 +6 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.417
  retrieving revision 1.418
  diff -u -r1.417 -r1.418
  --- CHANGES   1997/08/24 18:46:16 1.417
  +++ CHANGES   1997/08/25 02:00:27 1.418
  @@ -1,5 +1,11 @@
   Changes with Apache 1.3a2
   
  +  *) Add aplog_error() providing a mechanism to define levels of
  + verbosity to the server error logging. This addition also provides
  + the ablity to log errors using syslogd. Error logging is configurable
  + on a per-directory basis using the LogLevel directive. Conversion
  + of log_*() in progress. [Randy Terbush]
  +
 *) Canonicalise filenames under Win32. Short filenames are
converted to long ones. Backslashes are converted to forward
 slashes. Case is converted to lower. Parts of URLs that do not
  
  
  
  1.114 +31 -0 apachen/src/main/http_core.c
  
  Index: http_core.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- http_core.c   1997/08/23 01:52:51 1.113
  +++ http_core.c   1997/08/25 02:00:38 1.114
  @@ -130,6 +130,8 @@
   conf->limit_nproc = NULL;
   #endif
   
  +conf->loglevel = DEFAULT_LOGLEVEL;
  +
   conf->sec = make_array (a, 2, sizeof(void *));
   
   return (void *)conf;
  @@ -1372,6 +1374,34 @@
   return NULL;
   }
   
  +const char *set_loglevel (cmd_parms *cmd, core_dir_config *conf, const char 
*arg) 
  +{
  +   char *str;
  +
  +   if ((str = getword_conf(cmd->pool, &arg))) {
  +   if (!strcasecmp(str, "emerg"))
  +conf->loglevel = APLOG_EMERG;
  +   else if (!strcasecmp(str, "alert"))
  +conf->loglevel = APLOG_ALERT;
  +   else if (!strcasecmp(str, "crit"))
  +conf->loglevel = APLOG_CRIT;
  +   else if (!strcasecmp(str, "error"))
  +conf->loglevel = APLOG_ERR;
  +   else if (!strcasecmp(str, "warn"))
  +conf->loglevel = APLOG_WARNING;
  +   else if (!strcasecmp(str, "notice"))
  +conf->loglevel = APLOG_NOTICE;
  +   else if (!strcasecmp(str, "info"))
  +conf->loglevel = APLOG_INFO;
  +   else if (!strcasecmp(str, "debug"))
  +conf->loglevel = APLOG_DEBUG;
  +   }
  +   else
  +   return "LogLevel requires level keyword";
  +   
  +   return NULL;
  +}
  +
   /* Note --- ErrorDocument will now work from .htaccess files.  
* The AllowOverride of Fileinfo allows webmasters to turn it off
*/
  @@ -1498,6 +1528,7 @@
   { "ListenBacklog", set_listenbacklog, NULL, RSRC_CONF, TAKE1, "maximum 
length of the queue of pending connections, as used by listen(2)" },
   { "CoreDumpDirectory", set_coredumpdir, NULL, RSRC_CONF, TAKE1, "The 
location of the directory Apache changes to before dumping core" },
   { "Include", include_config, NULL, RSRC_CONF, TAKE1, "config file to be 
included" },
  +{ "LogLevel", set_loglevel, (void*)XtOffsetOf(core_dir_config, loglevel), 
OR_ALL, TAKE1, "set level of verbosity in error logging" },
   { NULL },
   };
   
  
  
  
  1.28  +3 -0  apachen/src/main/http_core.h
  
  Index: http_core.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_core.h,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- http_core.h   1997/08/23 16:17:12 1.27
  +++ http_core.h   1997/08/25 02:00:39 1.28
  @@ -189,6 +189,9 @@
   struct rlimit *limit_nproc;
   #endif
   
  +/* logging options */
  +int loglevel;
  +
   /* Access control */
   array_header *sec;
   regex_t *r;
  
  
  
  1.22  +144 -33   apachen/src/main/http_log.c
  
  Index: http_log.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- http_log.c1997/07/21 05:53:43 1.21
  +++ http_log.c1997/08/25 02:00:40 1.22
  @@ -58,15 +58,52 @@
*/
   
   
  +#define CORE_PRIVATE
   #include "httpd.h"
   #include "http_config.h"
   #inc

cvs commit: apachen/htdocs/manual/mod mod_cern_meta.html

[Randy Terbush]

randy   97/08/23 11:42:09

  Modified:htdocs/manual/mod mod_cern_meta.html
  Log:
  Update docs to reflect changes to mod_cern_meta
  
  Revision  ChangesPath
  1.8   +16 -2 apachen/htdocs/manual/mod/mod_cern_meta.html
  
  Index: mod_cern_meta.html
  ===
  RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_cern_meta.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_cern_meta.html1997/07/06 17:19:16 1.7
  +++ mod_cern_meta.html1997/08/23 18:42:07 1.8
  @@ -36,16 +36,29 @@
   
   Directives
   
  +MetaFiles
   MetaDir
   MetaSuffix
   
   
   
   
  +MetaFiles
  +Syntax: MetaFiles on/off
  +Default: MetaFiles off
  +Context: per-directory config
  +Status: Base
  +Module: mod_cern_meta
  +Compatibility: MetaFiles is only available in Apache 1.3
  +and later.
  +
  +Turns on/off Meta file processing on a per-directory basis. This option was 
introduced in Apache 1.3.
  +
   MetaDir
   Syntax: MetaDir directory name
   Default: MetaDir .web
  -Context: server config
  +Context: (Apache prior to 1.3) server config
  +Context: (Apache 1.3) per-directory config
   Status: Base
   Module: mod_cern_meta
   Compatibility: MetaDir is only available in Apache 1.1
  @@ -60,7 +73,8 @@
   MetaSuffix
   Syntax: MetaSuffix suffix
   Default: MetaSuffix .meta
  -Context: server config
  +Context: (Apache prior to 1.3) server config
  +Context: (Apache 1.3) per-directory config
   Status: Base
   Module: mod_cern_meta
   Compatibility: MetaSuffix is only available in Apache 1.1
  
  
  

cvs commit: apachen/src/main conf.h httpd.h

[Randy Terbush]

randy   97/08/23 09:01:24

  Modified:src/main conf.h httpd.h
  Log:
  Conditionalize a few more defines.
  
  Revision  ChangesPath
  1.127 +12 -0 apachen/src/main/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/conf.h,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- conf.h1997/08/18 10:59:03 1.126
  +++ conf.h1997/08/23 16:01:21 1.127
  @@ -162,9 +162,13 @@
   #ifndef __ps2__
   #define HAVE_MMAP
   #define USE_MMAP_FILES
  +#ifndef DEFAULT_GROUP
   #define DEFAULT_GROUP "nobody"
   #endif
  +#endif
  +#ifndef DEFAULT_USER
   #define DEFAULT_USER "nobody"
  +#endif
   #ifdef NEED_RLIM_T
   typedef int rlim_t;
   #endif
  @@ -401,8 +405,12 @@
   #undef NO_KILLPG
   #undef NO_SETSID
   #define JMP_BUF sigjmp_buf
  +#ifndef DEFAULT_USER
   #define DEFAULT_USER "nobody"
  +#endif
  +#ifndef DEFAULT_GROUP
   #define DEFAULT_GROUP "nogroup"
  +#endif
   
   #elif defined(UTS21)
   #undef HAVE_GMTOFF
  @@ -431,8 +439,12 @@
   #define JMP_BUF sigjmp_buf
   #define HAVE_MMAP
   #define USE_MMAP_FILES
  +#ifndef DEFAULT_USER
   #define DEFAULT_USER "nobody"
  +#endif
  +#ifndef DEFAULT_GROUP
   #define DEFAULT_GROUP "nogroup"
  +#endif
   #if defined(__bsdi__) || \
   (defined(__FreeBSD_version) && (__FreeBSD_version < 22))
   typedef quad_t rlim_t;
  
  
  
  1.142 +2 -0  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.141
  retrieving revision 1.142
  diff -u -r1.141 -r1.142
  --- httpd.h   1997/08/19 07:52:42 1.141
  +++ httpd.h   1997/08/23 16:01:22 1.142
  @@ -366,7 +366,9 @@
   #define APACHE_RELEASE 103
   
   #define SERVER_PROTOCOL "HTTP/1.1"
  +#ifndef SERVER_SUPPORT
   #define SERVER_SUPPORT "http://www.apache.org/";
  +#endif
   
   #define DECLINED -1  /* Module declines to handle */
   #define DONE -2 /* Module has served the response completely 
  
  
  

cvs commit: apachen/src CHANGES

[Randy Terbush]

randy   97/08/22 21:24:23

  Modified:src  CHANGES
  Log:
  (set_file_slot): New function, allowing auth directives to be
  independent of the server root, so the server documents can be
  moved to a different directory or machine more easily.
  [These changes were accidentally commited with the core -> main change]
  Submitted by: David J. MacKenzie <[EMAIL PROTECTED]>
  Reviewed by:  Dean Gaudet, Brian Behlendorf, Randy Terbush
  
  Revision  ChangesPath
  1.411 +5 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.410
  retrieving revision 1.411
  diff -u -r1.410 -r1.411
  --- CHANGES   1997/08/23 02:59:36 1.410
  +++ CHANGES   1997/08/23 04:24:20 1.411
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3a2
   
  +  *) (set_file_slot): New function, allowing auth directives to be
  + independent of the server root, so the server documents can be
  + moved to a different directory or machine more easily.
  + [David J. MacKenzie]
  +
 *) If no TransferLog is given explicitly, decline
to log.  This supports coexistence with other logging modules,
such as the custom one that UUNET uses. [David J. MacKenzie]
  
  
  

cvs commit: apachen/src Apache.dsp ApacheCore.dsp

[Randy Terbush]

randy   97/08/22 21:10:12

  Modified:src  Apache.dsp ApacheCore.dsp
  Log:
  Perhaps this is the last of the cleanups...
  
  Revision  ChangesPath
  1.4   +1 -1  apachen/src/Apache.dsp
  
  Index: Apache.dsp
  ===
  RCS file: /export/home/cvs/apachen/src/Apache.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Apache.dsp1997/08/13 08:37:12 1.3
  +++ Apache.dsp1997/08/23 04:10:08 1.4
  @@ -85,7 +85,7 @@
   # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
  -SOURCE=.\core\dummy.c
  +SOURCE=.\main\dummy.c
   # End Source File
   # End Group
   # Begin Group "Header Files"
  
  
  
  1.8   +40 -40apachen/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===
  RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ApacheCore.dsp1997/08/18 11:10:19 1.7
  +++ ApacheCore.dsp1997/08/23 04:10:09 1.8
  @@ -44,7 +44,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" 
/YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\core" /D "WIN32" /D 
"NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /D "WIN32" /D 
"NDEBUG" /D "_WINDOWS" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -70,7 +70,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\core" /D 
"WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\main" /D 
"WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -93,7 +93,7 @@
   # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
  -SOURCE=.\core\alloc.c
  +SOURCE=.\main\alloc.c
   # End Source File
   # Begin Source File
   
  @@ -101,15 +101,15 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\buff.c
  +SOURCE=.\main\buff.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\explain.c
  +SOURCE=.\main\explain.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\fnmatch.c
  +SOURCE=.\main\fnmatch.c
   # End Source File
   # Begin Source File
   
  @@ -117,35 +117,35 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\http_bprintf.c
  +SOURCE=.\main\http_bprintf.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\http_config.c
  +SOURCE=.\main\http_config.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\http_core.c
  +SOURCE=.\main\http_core.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\http_log.c
  +SOURCE=.\main\http_log.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\http_main.c
  +SOURCE=.\main\http_main.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\http_protocol.c
  +SOURCE=.\main\http_protocol.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\http_request.c
  +SOURCE=.\main\http_request.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\md5c.c
  +SOURCE=.\main\md5c.c
   # End Source File
   # Begin Source File
   
  @@ -233,7 +233,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\rfc1413.c
  +SOURCE=.\main\rfc1413.c
   # End Source File
   # Begin Source File
   
  @@ -241,23 +241,23 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\util.c
  +SOURCE=.\main\util.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\util_date.c
  +SOURCE=.\main\util_date.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\util_md5.c
  +SOURCE=.\main\util_md5.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\util_script.c
  +SOURCE=.\main\util_script.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\util_snprintf.c
  +SOURCE=.\main\util_snprintf.c
   # End Source File
   # Begin Source File
   
  @@ -269,23 +269,23 @@
   # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
   # Begin Source File
   
  -SOURCE=.\core\alloc.h
  +SOURCE=.\main\alloc.h
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\buff.h
  +SOURCE=.\main\buff.h
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\conf.h
  +SOURCE=.\main\conf.h
   # End Source File
   # Begin Source File
   
  -SOURCE=.\core\explain.h
  +SOURCE=.\main\explain.h
   # End Source File
   # Begin

cvs commit: apachen/src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c

[Randy Terbush]

randy   97/08/22 21:00:38

  Modified:src  Apache.mak ApacheCore.mak Configure
   src/main http_config.c http_config.h
   src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c
  Log:
  More cleanup for core -> main.
  
  Revision  ChangesPath
  1.5   +1 -1  apachen/src/Apache.mak
  
  Index: Apache.mak
  ===
  RCS file: /export/home/cvs/apachen/src/Apache.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Apache.mak1997/08/13 08:37:13 1.4
  +++ Apache.mak1997/08/23 04:00:16 1.5
  @@ -159,7 +159,7 @@
   
   
   !IF "$(CFG)" == "Apache - Win32 Release" || "$(CFG)" == "Apache - Win32 
Debug"
  -SOURCE=.\core\dummy.c
  +SOURCE=.\main\dummy.c
   
   "$(INTDIR)\dummy.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
  
  
  
  1.14  +577 -577  apachen/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===
  RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ApacheCore.mak1997/08/18 11:10:19 1.13
  +++ ApacheCore.mak1997/08/23 04:00:18 1.14
  @@ -101,7 +101,7 @@
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\core" /D "WIN32" /D\
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /D "WIN32" /D\
"NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\"\
/Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\CoreR/
  @@ -284,7 +284,7 @@
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\core" /D 
"WIN32"\
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\main" /D 
"WIN32"\
/D "_DEBUG" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ApacheCore.pch" 
/YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\CoreD/
  @@ -434,16 +434,16 @@
   
   !IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\
"ApacheCore - Win32 Debug"
  -SOURCE=.\core\alloc.c
  +SOURCE=.\main\alloc.c
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_ALLOC=\
  - ".\core\alloc.h"\
  - ".\core\buff.h"\
  - ".\core\conf.h"\
  - ".\core\httpd.h"\
  - ".\core\multithread.h"\
  + ".\main\alloc.h"\
  + ".\main\buff.h"\
  + ".\main\conf.h"\
  + ".\main\httpd.h"\
  + ".\main\multithread.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\

  @@ -455,11 +455,11 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_ALLOC=\
  - ".\core\alloc.h"\
  - ".\core\buff.h"\
  - ".\core\conf.h"\
  - ".\core\httpd.h"\
  - ".\core\multithread.h"\
  + ".\main\alloc.h"\
  + ".\main\buff.h"\
  + ".\main\conf.h"\
  + ".\main\httpd.h"\
  + ".\main\multithread.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\

  @@ -471,16 +471,16 @@
   
   !ENDIF 
   
  -SOURCE=.\core\buff.c
  +SOURCE=.\main\buff.c
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_BUFF_=\
  - ".\core\alloc.h"\
  - ".\core\buff.h"\
  - ".\core\conf.h"\
  - ".\core\http_main.h"\
  - ".\core\httpd.h"\
  + ".\main\alloc.h"\
  + ".\main\buff.h"\
  + ".\main\conf.h"\
  + ".\main\http_main.h"\
  + ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\

  @@ -492,11 +492,11 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_BUFF_=\
  - ".\core\alloc.h"\
  - ".\core\buff.h"\
  - ".\core\conf.h"\
  - ".\core\http_main.h"\
  - ".\core\httpd.h"\
  + ".\main\alloc.h"\
  + ".\main\buff.h"\
  + ".\main\conf.h"\
  + ".\main\http_main.h"\
  + ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\

  @@ -508,9 +508,9 @@
   
   !ENDIF 
   
  -SOURCE=.\core\explain.c
  +SOURCE=.\main\explain.c
   DEP_CPP_EXPLA=\
  - ".\core\explain.h"\
  + ".\main\explain.h"\

   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
  @@ -530,9 +530,9 @@
   
   !ENDIF 
   
  -SOURCE=.\core\fnmatch.c
  +SOURCE=.\main\fnmatch.c
   DEP_CPP_FNMAT=\
  - ".\core\fnmatch.h"\
  + ".\main\fnmatch.h"\

   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
  @@ -570,15 +570,15 @@
   
   !ENDIF 
   
  -SOURCE=.\core\http_bprintf.c
  +SOURCE=.\main\http_bprintf.c
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_HTTP_=\
  - ".\core\alloc.h"\
  - ".\core\buff.h"\
  - ".\core\conf.h"\
  - ".\core\httpd.h"\
  + ".\main\alloc.h"\
  + ".\main\buff.h"\
  + ".\main\conf.h"\
  + ".\main\httpd.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\

  @@ -590,10 +590,10 

cvs commit: apachen/src Makefile.tmpl

[Randy Terbush]

randy   97/08/22 20:36:13

  Modified:src  Makefile.tmpl
  Log:
  Cleanup after core dir rename.
  
  Revision  ChangesPath
  1.58  +10 -10apachen/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apachen/src/Makefile.tmpl,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- Makefile.tmpl 1997/08/21 08:55:34 1.57
  +++ Makefile.tmpl 1997/08/23 03:36:09 1.58
  @@ -9,12 +9,12 @@
   LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
   
   OBJS= \
  -  core/alloc.o core/http_main.o core/http_core.o \
  -  core/http_config.o core/http_request.o core/http_log.o \
  -  core/http_protocol.o core/rfc1413.o core/util.o \
  -  core/util_script.o core/buff.o core/md5c.o \
  -  core/util_md5.o core/explain.o core/http_bprintf.o \
  -  core/util_date.o core/util_snprintf.o core/fnmatch.o \
  +  main/alloc.o main/http_main.o main/http_core.o \
  +  main/http_config.o main/http_request.o main/http_log.o \
  +  main/http_protocol.o main/rfc1413.o main/util.o \
  +  main/util_script.o main/buff.o main/md5c.o \
  +  main/util_md5.o main/explain.o main/http_bprintf.o \
  +  main/util_date.o main/util_snprintf.o main/fnmatch.o \
 modules.o \
 $(OSOBJ) \
 $(MODULES)
  @@ -47,14 +47,14 @@
cd support; $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)'
   
   core-dir:
  - cd core; $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)'
  + cd main; $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)'
   
   os-dir:  
cd $(OSDIR); $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' 
RANLIB='$(RANLIB)'
   
   clean:
rm -f httpd *.o $(OBJS) 
  - cd core; $(MAKE) clean
  + cd main; $(MAKE) clean
cd regex; $(MAKE) clean
cd modules; $(MAKE) clean
cd support; $(MAKE) clean
  @@ -81,5 +81,5 @@
   $(OBJS): Makefile
   
   # DO NOT REMOVE
  -modules.o: modules.c core/httpd.h core/conf.h core/alloc.h core/buff.h \
  - core/http_config.h
  +modules.o: modules.c main/httpd.h main/conf.h main/alloc.h main/buff.h \
  + main/http_config.h
  
  
  

cvs commit: apachen/htdocs/manual/mod core.html directives.html

[Randy Terbush]

randy   97/08/22 20:10:56

  Modified:htdocs/manual/mod core.html directives.html
  Log:
  Document 'Include'
  
  Revision  ChangesPath
  1.72  +11 -0 apachen/htdocs/manual/mod/core.html
  
  Index: core.html
  ===
  RCS file: /export/home/cvs/apachen/htdocs/manual/mod/core.html,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- core.html 1997/08/14 01:24:49 1.71
  +++ core.html 1997/08/23 03:10:53 1.72
  @@ -42,6 +42,7 @@
   HostNameLookups
   IdentityCheck
   
  +
   KeepAlive
   KeepAliveTimeout
   
  @@ -721,6 +722,16 @@
   
    sections are nest-able, which can be used to implement
   simple multiple-module tests.
  +
  + 
  +
  +Include directive
  +Syntax: (Apache 1.2) Include filename
  +Context: server config
  +Status: Core
  +Compatibility: Include is only available in Apache 1.3 and 
later.
  +
  +This directive allows inclusion of other configuration files from within the 
server configuration files.
   

   
  
  
  
  1.30  +1 -0  apachen/htdocs/manual/mod/directives.html
  
  Index: directives.html
  ===
  RCS file: /export/home/cvs/apachen/htdocs/manual/mod/directives.html,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- directives.html   1997/08/03 20:29:16 1.29
  +++ directives.html   1997/08/23 03:10:54 1.30
  @@ -101,6 +101,7 @@
   ImapBase
   ImapDefault
   ImapMenu
  +Include
   IndexIgnore
   IndexOptions
   KeepAlive
  
  
  

cvs commit: apachen/src/modules/standard mod_log_config.c

[Randy Terbush]

randy   97/08/22 19:59:46

  Modified:src  CHANGES
   src/modules/standard mod_log_config.c
  Log:
  If no TransferLog is given explicitly, decline to log.
  This supports coexistence with other logging modules,
  such as the custom one that UUNET uses.
  Submitted by: David J. MacKenzie <[EMAIL PROTECTED]>
  Reviewed by:  Dean Gaudet, Brian Behlendorf, Randy Terbush
  
  Revision  ChangesPath
  1.410 +4 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.409
  retrieving revision 1.410
  diff -u -r1.409 -r1.410
  --- CHANGES   1997/08/23 02:55:22 1.409
  +++ CHANGES   1997/08/23 02:59:36 1.410
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3a2
   
  +  *) If no TransferLog is given explicitly, decline
  + to log.  This supports coexistence with other logging modules,
  + such as the custom one that UUNET uses. [David J. MacKenzie]
  +
 *) Check for titles in server-parsed HTML files.
Ignore leading newlines and returns in titles.  The old behavior
of replacing a newline after  with a space causes the
  
  
  
  1.36  +11 -0 apachen/src/modules/standard/mod_log_config.c
  
  Index: mod_log_config.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_log_config.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- mod_log_config.c  1997/08/18 13:12:14 1.35
  +++ mod_log_config.c  1997/08/23 02:59:45 1.36
  @@ -51,6 +51,9 @@
*/
   
   /*
  + * Modified by [EMAIL PROTECTED]:
  + * If no TransferLog is given explicitly, decline to log.
  + *
* This is module implements the TransferLog directive (same as the
* common log module), and additional directives, LogFormat and CustomLog.
*
  @@ -532,6 +535,10 @@
   int len = 0;
   array_header *format;
   
  +if (cls->fname == NULL) {
  +  return DECLINED;
  +}
  +
   format = cls->format ? cls->format : default_format;
   
   strsa= make_array(r->pool, format->nelts,sizeof(char*));
  @@ -703,6 +710,10 @@
   config_log_state *cls,
   array_header *default_format) {
   if (cls->log_fd > 0) return cls; /* virtual config shared w/main server 
*/
  +
  +if (cls->fname == NULL) {
  +   return cls;   /* Leave it NULL to decline.  */
  +}
   
   if (*cls->fname == '|') {
   FILE *dummy;
  
  
  

cvs commit: apachen/src/modules/standard mod_autoindex.c

[Randy Terbush]

randy   97/08/22 19:55:33

  Modified:src  CHANGES
   src/modules/standard mod_autoindex.c
  Log:
  Check for titles in server-parsed HTML files.
  Ignore leading newlines and returns in titles.  The old behavior
  of replacing a newline after  with a space causes the
  title to be misaligned in the listing.
  Submitted by: David J. MacKenzie <[EMAIL PROTECTED]>
  Reviewed by:  Dean Gaudet, Brian Behlendorf, Randy Terbush
  
  Revision  ChangesPath
  1.409 +5 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.408
  retrieving revision 1.409
  diff -u -r1.408 -r1.409
  --- CHANGES   1997/08/23 02:23:34 1.408
  +++ CHANGES   1997/08/23 02:55:22 1.409
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3a2
   
  +  *) Check for titles in server-parsed HTML files.
  + Ignore leading newlines and returns in titles.  The old behavior
  + of replacing a newline after  with a space causes the
  + title to be misaligned in the listing. [David J. MacKenzie]
  +
 *) Change mod_cern_meta to be configurable on a per-directory basis.
[David J. MacKenzie]
   
  
  
  
  1.46  +9 -2  apachen/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- mod_autoindex.c   1997/08/18 13:12:10 1.45
  +++ mod_autoindex.c   1997/08/23 02:55:31 1.46
  @@ -583,7 +583,11 @@
   if (r->status != HTTP_OK) {
   return NULL;
   }
  -if (r->content_type && !strcmp(r->content_type, "text/html") && 
!r->content_encoding) {
  +if (r->content_type
  + && (!strcmp(r->content_type,"text/html")
  + || !strcmp(r->content_type,INCLUDES_MAGIC_TYPE))
  + && !r->content_encoding)
  +{
   if (!(thefile = pfopen(r->pool, r->filename, "r")))
   return NULL;
   n = fread(titlebuf, sizeof(char), MAX_STRING_LEN - 1, thefile);
  @@ -596,7 +600,10 @@
   /* Scan for line breaks for Tanmoy's secretary */
   for (y = x; titlebuf[y]; y++)
   if ((titlebuf[y] == CR) || (titlebuf[y] == LF))
  -titlebuf[y] = ' ';
  + if (y==x)
  + x++;
  + else
  + titlebuf[y] = ' ';
   pfclose (r->pool, thefile);
   return pstrdup(r->pool, &titlebuf[x]);
   }
  
  
  

cvs commit: apachen/src CHANGES

[Randy Terbush]

randy   97/08/22 19:23:37

  Modified:src  CHANGES
  Log:
  Update CHANGES with mod_cern_meta changes.
  
  Revision  ChangesPath
  1.408 +3 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.407
  retrieving revision 1.408
  diff -u -r1.407 -r1.408
  --- CHANGES   1997/08/23 01:52:37 1.407
  +++ CHANGES   1997/08/23 02:23:34 1.408
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3a2
   
  +  *) Change mod_cern_meta to be configurable on a per-directory basis.
  + [David J. MacKenzie]
  +
 *) Add 'Include' directive to allow inclusion of configuration
files within configuration files. [Randy Terbush]
   
  
  
  

cvs commit: apachen/src/modules/standard mod_cern_meta.c

[Randy Terbush]

randy   97/08/22 19:19:04

  Modified:src/modules/standard mod_cern_meta.c
  Log:
  This version of mod_cern_meta.c controls Meta File behaviour on a
  per-directory basis.  Previous versions of the module defined behaviour
  on a per-server basis.  The upshot is that you'll need to revisit your
  configuration files in order to make use of the new module.
  Submitted by: David J. MacKenzie <[EMAIL PROTECTED]>
  Reviewed by:  Dean Gaudet, Brian Behlendorf, Randy Terbush
  
  Revision  ChangesPath
  1.18  +78 -34apachen/src/modules/standard/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cern_meta.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_cern_meta.c   1997/08/18 13:12:10 1.17
  +++ mod_cern_meta.c   1997/08/23 02:19:01 1.18
  @@ -52,11 +52,18 @@
   
   /*
* mod_cern_meta.c
  - * version 0.0.5
  + * version 0.1.0
* status beta
* 
* Andrew Wilson <[EMAIL PROTECTED]> 25.Jan.96
*
  + * *** IMPORTANT ***
  + * This version of mod_cern_meta.c controls Meta File behaviour on a
  + * per-directory basis.  Previous versions of the module defined behaviour
  + * on a per-server basis.  The upshot is that you'll need to revisit your 
  + * configuration files in order to make use of the new module.
  + * ***
  + *
* Emulate the CERN HTTPD Meta file semantics.  Meta files are HTTP
* headers that can be output in addition to the normal range of
* headers for each file accessed.  They appear rather like the Apache
  @@ -67,8 +74,16 @@
* who can exploit this module.  It should be noted that there are probably
* more sensitive ways of managing the Expires: header specifically.
*
  - * The module obeys the following directives, which can only appear 
  - * in the server's .conf files and not in any .htaccess file.
  + * The module obeys the following directives, which can appear 
  + * in the server's .conf files and in .htaccess files.
  + *
  + *  MetaFiles  
  + *
  + *turns on|off meta file processing for any directory.  
  + *Default value is off
  + *
  + *# turn on MetaFiles in this directory
  + *MetaFiles on
*
*  MetaDir 
*  
  @@ -122,7 +137,10 @@
*   need to report missing ones as spurious errors. 
* 31.Jan.96 log_error reports about a malformed .meta file, rather
*   than a script error.
  - *
  + * 20.Jun.96 MetaFiles  default off, added, so that module
  + *   can be configured per-directory.  Prior to this the module
  + *   was running for each request anywhere on the server, naughty..
  + * 29.Jun.96 All directives made per-directory.
*/
   
   #include "httpd.h"
  @@ -133,51 +151,70 @@
   #include "http_log.h"
   #include "http_request.h"
   
  +#define DIR_CMD_PERMS OR_INDEXES
  +
   #define DEFAULT_METADIR  ".web"
   #define DEFAULT_METASUFFIX   ".meta"
  +#define DEFAULT_METAFILES0
   
   module MODULE_VAR_EXPORT cern_meta_module;
   
   typedef struct {
  - char *metadir;
  - char *metasuffix;
  -} cern_meta_config;
  +char *metadir;
  +char *metasuffix;
  +char *metafiles;
  +} cern_meta_dir_config;
   
  -void *create_cern_meta_config (pool *p, server_rec *dummy)
  +void *create_cern_meta_dir_config (pool *p, char *dummy)
   {
  -cern_meta_config *new =
  -  (cern_meta_config *) palloc (p, sizeof(cern_meta_config)); 
  - 
  -new->metadir = DEFAULT_METADIR;
  -new->metasuffix = DEFAULT_METASUFFIX;
  +cern_meta_dir_config *new =
  + (cern_meta_dir_config *)palloc(p, sizeof(cern_meta_dir_config));
  +
  +new->metadir = NULL;
  +new->metasuffix = NULL;
  +new->metafiles = DEFAULT_METAFILES;
  +
  +return new;
  +}
  +
  +void *merge_cern_meta_dir_configs (pool *p, void *basev, void *addv) 
  +{
  +cern_meta_dir_config *base = (cern_meta_dir_config *)basev;
  +cern_meta_dir_config *add = (cern_meta_dir_config *)addv; 
  +cern_meta_dir_config *new =
  + (cern_meta_dir_config *)palloc(p, sizeof(cern_meta_dir_config));
   
  +new->metadir = add->metadir ? add->metadir : base->metadir;
  +new->metasuffix = add->metasuffix ? add->metasuffix : base->metasuffix;
  +new->metafiles = add->metafiles;
  +
   return new;
   }   
   
  -const char *set_metadir (cmd_parms *parms, void *dummy, char *arg)
  +const char *set_metadir (cmd_parms *parms, cern_meta_dir_config *dconf, char 
*arg)
   {   
  -cern_meta_config *cmc ;
  -
  -cmc = get_module_config (parms->server->module_config,
  -   &cern_meta_module); 
  -cmc->metadir = arg;
  +dconf->metadir = arg;
   return NULL;
   }
   
  -con

cvs commit: apachen/src/core http_core.c

[Randy Terbush]

randy   97/08/22 18:52:53

  Modified:src  CHANGES
   src/core http_core.c
  Log:
  Add 'Include' directive.
  
  Revision  ChangesPath
  1.407 +3 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.406
  retrieving revision 1.407
  diff -u -r1.406 -r1.407
  --- CHANGES   1997/08/22 08:10:11 1.406
  +++ CHANGES   1997/08/23 01:52:37 1.407
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3a2
   
  +  *) Add 'Include' directive to allow inclusion of configuration
  + files within configuration files. [Randy Terbush]
  +
 *) Proxy errors on connect() are logged to the error_log (nothing
new); now they include the IP address and port that failed
(*that's* new).  PR#352  [Ken Coar, Marc Slemko]
  
  
  
  1.113 +10 -0 apachen/src/core/http_core.c
  
  Index: http_core.c
  ===
  RCS file: /export/home/cvs/apachen/src/core/http_core.c,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- http_core.c   1997/08/18 07:19:34 1.112
  +++ http_core.c   1997/08/23 01:52:51 1.113
  @@ -1363,6 +1363,15 @@
   return NULL;
   }
   
  +const char *include_config (cmd_parms *cmd, void *dummy, char *name)
  +{
  +name = server_root_relative(cmd->pool, name);
  +
  +process_resource_config(cmd->server, name, cmd->pool, cmd->temp_pool);
  +
  +return NULL;
  +}
  +
   /* Note --- ErrorDocument will now work from .htaccess files.  
* The AllowOverride of Fileinfo allows webmasters to turn it off
*/
  @@ -1488,6 +1497,7 @@
   { "ExcessRequestsPerChild", set_excess_requests, NULL, RSRC_CONF, TAKE1, 
"Maximum number of requests a particular child serves after it is ready to 
die." },
   { "ListenBacklog", set_listenbacklog, NULL, RSRC_CONF, TAKE1, "maximum 
length of the queue of pending connections, as used by listen(2)" },
   { "CoreDumpDirectory", set_coredumpdir, NULL, RSRC_CONF, TAKE1, "The 
location of the directory Apache changes to before dumping core" },
  +{ "Include", include_config, NULL, RSRC_CONF, TAKE1, "config file to be 
included" },
   { NULL },
   };
   
  
  
  

cvs commit: apache-site index.html

[Randy Terbush]

randy   97/08/10 19:31:10

  Modified:.index.html
  Log:
  Get rid of those dang orange balls... :-)
  
  Revision  ChangesPath
  1.31  +16 -24apache-site/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/index.html,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- index.html1997/07/25 03:36:06 1.30
  +++ index.html1997/08/11 02:31:09 1.31
  @@ -28,31 +28,23 @@
   
   
   
  -  
  -  International Mirror Sites
  -  
  -  Server Documentation
  -  
  -  The Apache FAQ
  -  
  -  Bug Reporting
  -  
  -  Background Information
  -  
  -  Project Library
  +
  +   International Mirror Sites
  +   Server Documentation
  +   The Apache FAQ
  +   Bug Reporting
  +   Background Information
  +   Project Library
  +
   
  -  
  -  Download!
  -  
  -  Announcements via Email
  -  
  -  In the News
  -  
  -  Related Projects
  -  
  -  Project Contributors
  -  
  -  Other Information
  +
  +   Download!
  +   Announcements via Email
  +   In the News
  +   Related Projects
  +   Project Contributors
  +   Other Information
  +
   
   
   
  
  
  

cvs commit: apache-site/mirrors index.html mirrors.list

[Randy Terbush]

randy   97/08/10 19:04:16

  Modified:mirrors  index.html mirrors.list
  Log:
  Add a few new mirror sites.
  
  Revision  ChangesPath
  1.14  +8 -0  apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- index.html1997/08/11 01:41:04 1.13
  +++ index.html1997/08/11 02:04:13 1.14
  @@ -85,6 +85,8 @@
   
   http://apache.iit.uni-miskolc.hu/";>hu -
   
  +http://apache.ub.net.id/";>id -
  +
   http://apache.koala.ie/";>ie -
   
   http://apache.csn.ul.ie";>ie -
  @@ -207,6 +209,10 @@
   
   http://apache.mpl.net/";>us -
   
  +http://apache.plinet.com/";>us -
  +
  +http://www.fon.bg.ac.yu/mirror/apache/";>yu -
  +
   http://www.is.co.za/resources/ftpsite/apache/";>za -
   
   
  @@ -269,6 +275,8 @@
   ftp://sunsite.srce.hr/mirrors/ftp.apache.org/apache/";>hr -
   
   ftp://xenia.sote.hu/pub/linux/mirrors/www.apache.org/dist/";>hu -
  +
  +ftp://apache.ub.net.id/pub/apache/";>id -
   
   ftp://apache.koala.ie/pub/apache/dist/";>ie -
   
  
  
  
  1.27  +5 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- mirrors.list  1997/08/11 01:41:06 1.26
  +++ mirrors.list  1997/08/11 02:04:14 1.27
  @@ -29,6 +29,7 @@
   http hu  http://foobar.szabinet.hu/apache/   [EMAIL PROTECTED]
   http hu  http://xenia.sote.hu/ftp/linux/mirrors/www.apache.org/  [EMAIL 
PROTECTED]
   http hu  http://apache.iit.uni-miskolc.hu/   [EMAIL PROTECTED]
  +http id  http://apache.ub.net.id/[EMAIL PROTECTED]
   http ie  http://apache.koala.ie/ [EMAIL PROTECTED]
   http ie  http://apache.csn.ul.ie [EMAIL PROTECTED]
   http il  http://vipe.technion.ac.il/apache/  [EMAIL PROTECTED]
  @@ -70,6 +71,7 @@
   http tr  http://apache.bilkent.edu.tr/   [EMAIL PROTECTED]
   http tw  http://www.uuserv.net.tw/apache/[EMAIL PROTECTED]
   http tw  http://www.me.ncu.edu.tw/apache/[EMAIL PROTECTED]
  +http:tw  http://apache.ficnet.net.tw/[EMAIL PROTECTED]
   http ua  http://www.neon.dp.ua/www.apache.org/   [EMAIL PROTECTED]
   http ua  http://ftp.icmp.lviv.ua/Apache/ [EMAIL PROTECTED]
   http ua  http://www.apache.carrier.kiev.ua/  [EMAIL PROTECTED]
  @@ -90,6 +92,8 @@
   http us  http://www.ameth.org/apache/[EMAIL PROTECTED]
   http us  http://apache.technomancer.com/ [EMAIL PROTECTED]
   http us  http://apache.mpl.net/  [EMAIL PROTECTED]
  +http us  http://apache.plinet.com/   [EMAIL PROTECTED]
  +http yu  http://www.fon.bg.ac.yu/mirror/apache/  [EMAIL PROTECTED]
   http za  http://www.is.co.za/resources/ftpsite/apache/   [EMAIL 
PROTECTED]
   ftp  ar  ftp://ftp.infoap.com.ar/pub/apache/dist/
   ftp  at  ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/
  @@ -119,6 +123,7 @@
   ftp  hk  ftp://ftp.hk.super.net/mirror/apache/dist/  [EMAIL 
PROTECTED]
   ftp  hr  ftp://sunsite.srce.hr/mirrors/ftp.apache.org/apache/
   ftp  hu  ftp://xenia.sote.hu/pub/linux/mirrors/www.apache.org/dist/
  +ftp  id  ftp://apache.ub.net.id/pub/apache/
   ftp  ie  ftp://apache.koala.ie/pub/apache/dist/
   ftp  il  ftp://ftp.rifkin.technion.ac.il/pub/apache/
   ftp  il  ftp://apache.linux.org.il/pub/linux/apache/dist/
  
  
  

cvs commit: apache-site/mirrors index.html mirrors.list

[Randy Terbush]

randy   97/08/10 18:41:08

  Modified:mirrors  index.html mirrors.list
  Log:
  Losing our only Canadian mirror.
  
  Revision  ChangesPath
  1.13  +0 -2  apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- index.html1997/07/30 13:16:34 1.12
  +++ index.html1997/08/11 01:41:04 1.13
  @@ -41,8 +41,6 @@
   
   http://apache.abordo.com.br/";>br -
   
  -http://apache.oncomdis.on.ca/";>ca -
  -
   http://sunsite.cnlab-switch.ch/www/mirror/apache/";>ch -
   
   http://apache.ucr.ac.cr/";>cr -
  
  
  
  1.26  +0 -1  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mirrors.list  1997/07/30 13:16:35 1.25
  +++ mirrors.list  1997/08/11 01:41:06 1.26
  @@ -7,7 +7,6 @@
   http br  http://br.apache.org/   [EMAIL PROTECTED]
   http br  http://redes.ucpel.tche.br/apache-mirror/   [EMAIL 
PROTECTED]
   http br  http://apache.abordo.com.br/[EMAIL PROTECTED]
  -http ca  http://apache.oncomdis.on.ca/   [EMAIL PROTECTED]
   http ch  http://sunsite.cnlab-switch.ch/www/mirror/apache/   [EMAIL 
PROTECTED]
   http cr  http://apache.ucr.ac.cr/[EMAIL PROTECTED]
   http cz  http://sunsite.mff.cuni.cz/web/apache/  [EMAIL PROTECTED]
  
  
  

cvs commit: apache-site/mirrors index.html mirrors.list

[Randy Terbush]

randy   97/07/30 06:16:36

  Modified:mirrors   index.html mirrors.list
  Log:
  Include an FTP site for this mirror.
  
  Revision  ChangesPath
  1.12  +2 -0  apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- index.html1997/07/30 03:27:02 1.11
  +++ index.html1997/07/30 13:16:34 1.12
  @@ -242,6 +242,8 @@
   
   ftp://ftp.fokus.gmd.de/pub/Web/apache/";>de -
   
  +ftp://ftp.fh-hannover.de/pub/apache/";>de -
  +
   ftp://sunsite.auc.dk/pub/infosystems/www/apache/dist/";>dk -
   
   ftp://ftp.ut.ee/pub/WWW/apache/dist/";>ee -
  
  
  
  1.25  +1 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mirrors.list  1997/07/30 03:27:02 1.24
  +++ mirrors.list  1997/07/30 13:16:35 1.25
  @@ -105,6 +105,7 @@
   ftp  de  ftp://ftp.apache.de/pub/Apache/
   ftp  de  ftp://ftp.mpi-sb.mpg.de/pub/www/mirror/ftp.apache.org/
   ftp  de  ftp://ftp.fokus.gmd.de/pub/Web/apache/
  +ftp  de  ftp://ftp.fh-hannover.de/pub/apache/
   ftp  dk  ftp://sunsite.auc.dk/pub/infosystems/www/apache/dist/
   ftp  ee  ftp://ftp.ut.ee/pub/WWW/apache/dist/
   ftp  es  ftp://ftp.develnet.es/apache/dist/
  
  
  

cvs commit: apache-site/mirrors index.html mirrors.list

[Randy Terbush]

randy   97/07/29 20:27:04

  Modified:mirrors   index.html mirrors.list
  Log:
  Catch-up on new mirror additions.
  
  Revision  ChangesPath
  1.11  +32 -0 apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- index.html1997/07/23 14:03:09 1.10
  +++ index.html1997/07/30 03:27:02 1.11
  @@ -39,6 +39,8 @@
   
   http://redes.ucpel.tche.br/apache-mirror/";>br -
   
  +http://apache.abordo.com.br/";>br -
  +
   http://apache.oncomdis.on.ca/";>ca -
   
   http://sunsite.cnlab-switch.ch/www/mirror/apache/";>ch -
  @@ -51,6 +53,10 @@
   
   http://www.cs.tu-berlin.de/home/ftp/pub/net/www/apache/";>de -
   
  +http://www.fokus.gmd.de/apache/";>de -
  +
  +http://apache.rz.fh-hannover.de/";>de -
  +
   http://sunsite.auc.dk/apache/";>dk -
   
   http://zone.pspt.fi/apache/";>fi -
  @@ -133,12 +139,16 @@
   
   http://www.sorosis.ro/ftp/mirrors/www.apache.org/";>ro -
   
  +http://www.utt.ro/ftp/pub/packages/apache/";>ro -
  +
   http://www.module.vympel.msk.ru/mirror/apache/";>ru -
   
   http://apache.ifmo.ru/";>ru -
   
   http://www.tomcat.ru/apache/";>ru -
   
  +http://apache.inf.ru/";>ru -
  +
   http://www.unit.liu.se/apache/";>se -
   
   http://apache.dc.luth.se/";>se -
  @@ -193,6 +203,12 @@
   
   http://apache.utw.com/";>us -
   
  +http://www.ameth.org/apache/";>us -
  +
  +http://apache.technomancer.com/";>us -
  +
  +http://apache.mpl.net/";>us -
  +
   http://www.is.co.za/resources/ftpsite/apache/";>za -
   
   
  @@ -208,6 +224,8 @@
   
   ftp://ftp.gns.com.br/pub/unix/apache/dist/";>br -
   
  +ftp://ftp.abordo.com.br/pub/apache/";>br -
  +
   ftp://ftp.ucr.ac.cr/pub/WWW/Unix/apache/dist/";>cr -
   
   ftp://sunsite.cnlab-switch.ch/mirror/apache/dist/";>ch -
  @@ -220,6 +238,10 @@
   
   ftp://ftp.apache.de/pub/Apache/";>de -
   
  +ftp://ftp.mpi-sb.mpg.de/pub/www/mirror/ftp.apache.org/";>de -
  +
  +ftp://ftp.fokus.gmd.de/pub/Web/apache/";>de -
  +
   ftp://sunsite.auc.dk/pub/infosystems/www/apache/dist/";>dk -
   
   ftp://ftp.ut.ee/pub/WWW/apache/dist/";>ee -
  @@ -288,6 +310,8 @@
   
   ftp://ftp.sorosis.ro/pub/mirrors/www.apache.org/apache/dist/";>ro -
   
  +ftp://ftp.utt.ro/pub/packages/apache/";>ro -
  +
   ftp://ftp.module.vympel.msk.ru/pub/www/apache_mirror/dist/";>ru -
   
   ftp://ftp.ifmo.ru/mirrors/www.apache.org/apache/dist/";>ru -
  @@ -304,6 +328,8 @@
   
   ftp://ftp.bilkent.edu.tr/apache/dist/";>tr -
   
  +ftp://ftp.oneway.com.tw/pub/apache/";>tw -
  +
   ftp://ftp.icmp.lviv.ua/pub/www/Apache/dist/";>ua -
   
   ftp://ftp-mirror.carrier.kiev.ua/pub/unix/apache/";>ua -
  @@ -325,6 +351,12 @@
   ftp://ftp.epix.net/pub/apache/dist/";>us -
   
   ftp://fanying.eecs.stevens-tech.edu/pub/mirrors/apache/";>us -
  +
  +ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/";>us 
-
  +
  +ftp://ftp.connectnet.com/pub/www/apache/";>us -
  +
  +ftp://apache.technomancer.com/mirrors/apache/dist/";>us -
   
   ftp://ftp.is.co.za/internet/www/servers/apache/";>za -
   
  
  
  
  1.24  +16 -0 apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mirrors.list  1997/07/23 14:03:09 1.23
  +++ mirrors.list  1997/07/30 03:27:02 1.24
  @@ -6,12 +6,15 @@
   http bg  http://apache.nat.bg/   [EMAIL PROTECTED]
   http br  http://br.apache.org/   [EMAIL PROTECTED]
   http br  http://redes.ucpel.tche.br/apache-mirror/   [EMAIL 
PROTECTED]
  +http br  http://apache.abordo.com.br/[EMAIL PROTECTED]
   http ca  http://apache.oncomdis.on.ca/   [EMAIL PROTECTED]
   http ch  http://sunsite.cnlab-switch.ch/www/mirror/apache/   [EMAIL 
PROTECTED]
   http cr  http://apache.ucr.ac.cr/[EMAIL PROTECTED]
   http cz  http://sunsite.mff.cuni.cz/web/apache/  [EMAIL PROTECTED]
   http de  http://www.apache.de/   [EMAIL PROTECTED]
   http de  http://www.cs.tu-berlin.de/home/ftp/pub/net/www/apache/ [EMAIL 
PROTECTED]
  +http de  http://www.fokus.gmd.de/apache/ [EMAIL PROTECTED]
  +http de  http://apache.rz.fh-hannover.de/[EMAIL PROTECTED]
   http dk  http://sunsite.auc.dk/apache/   [EMAIL PROTECTED]
   http fi  http://zone.pspt.fi/apache/ [EMAIL PROTECTED]
   http fi  http://www.pal.xgw.fi/apache/   [EMAIL PROTECTED]
  @@ -53,9 +56,11 @@
   http pt  http://ftp.ua.pt/pub/infosystems/www/apache/[EMAIL 
PROTECTED]
   http pt  http://ftp.dei

cvs commit: apache-site/mirrors index.html mirrors.list

[Randy Terbush]

randy   97/07/23 07:03:11

  Modified:mirrors   index.html mirrors.list
  Log:
  Losing our Taiwan mirror.
  
  Revision  ChangesPath
  1.10  +0 -4  apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- index.html1997/07/11 01:42:35 1.9
  +++ index.html1997/07/23 14:03:09 1.10
  @@ -159,8 +159,6 @@
   
   http://www.me.ncu.edu.tw/apache/";>tw -
   
  -http://apache.oneway.com.tw/";>tw -
  -
   http://www.neon.dp.ua/www.apache.org/";>ua -
   
   http://ftp.icmp.lviv.ua/Apache/";>ua -
  @@ -305,8 +303,6 @@
   ftp://ftp.sai.msu.su/pub/unix/WWW/servers/apache/mirror/dist/";>su -
   
   ftp://ftp.bilkent.edu.tr/apache/dist/";>tr -
  -
  -ftp://apache.oneway.com.tw/apache/dist/";>tw -
   
   ftp://ftp.icmp.lviv.ua/pub/www/Apache/dist/";>ua -
   
  
  
  
  1.23  +0 -2  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mirrors.list  1997/07/21 21:07:25 1.22
  +++ mirrors.list  1997/07/23 14:03:09 1.23
  @@ -66,7 +66,6 @@
   http tr  http://apache.bilkent.edu.tr/   [EMAIL PROTECTED]
   http tw  http://www.uuserv.net.tw/apache/[EMAIL PROTECTED]
   http tw  http://www.me.ncu.edu.tw/apache/[EMAIL PROTECTED]
  -http tw  http://apache.oneway.com.tw/[EMAIL PROTECTED]
   http ua  http://www.neon.dp.ua/www.apache.org/   [EMAIL PROTECTED]
   http ua  http://ftp.icmp.lviv.ua/Apache/ [EMAIL PROTECTED]
   http ua  http://www.apache.carrier.kiev.ua/  [EMAIL PROTECTED]
  @@ -137,7 +136,6 @@
   ftp  sk  ftp://sunsite.uakom.sk/pub/WWW/apache/
   ftp  su  ftp://ftp.sai.msu.su/pub/unix/WWW/servers/apache/mirror/dist/
   ftp  tr  ftp://ftp.bilkent.edu.tr/apache/dist/
  -ftp  tw  ftp://apache.oneway.com.tw/apache/dist/
   ftp  ua  ftp://ftp.icmp.lviv.ua/pub/www/Apache/dist/
   ftp  ua  ftp://ftp-mirror.carrier.kiev.ua/pub/unix/apache/
   ftp  co.uk   ftp://ftp.idiscover.co.uk/pub/apache/dist/
  
  
  

cvs commit: apache/htdocs/manual/misc FAQ.html

[Randy Terbush]

randy   97/07/14 10:47:33

  Modified:htdocs/manual/misc  Tag: APACHE_1_2_X  FAQ.html
  Log:
  Fix a broken link.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.63.2.10 +2 -2  apache/htdocs/manual/misc/FAQ.html
  
  Index: FAQ.html
  ===
  RCS file: /export/home/cvs/apache/htdocs/manual/misc/FAQ.html,v
  retrieving revision 1.63.2.9
  retrieving revision 1.63.2.10
  diff -C3 -r1.63.2.9 -r1.63.2.10
  *** FAQ.html  1997/07/09 10:15:42 1.63.2.9
  --- FAQ.html  1997/07/14 17:47:30 1.63.2.10
  ***
  *** 15,21 
  
  Apache Server Frequently Asked Questions
  
  !   $Revision: 1.63.2.9 $ ($Date: 1997/07/09 10:15:42 $)
  
  
  The latest version of this FAQ is always available from the main
  --- 15,21 
  
  Apache Server Frequently Asked Questions
  
  !   $Revision: 1.63.2.10 $ ($Date: 1997/07/14 17:47:30 $)
  
  
  The latest version of this FAQ is always available from the main
  ***
  *** 761,767 
  
  Apache version 1.1 and above comes with a
  proxy module.
  If compiled
  in, this will make Apache act as a caching-proxy server.
  --- 761,767 
  
  Apache version 1.1 and above comes with a
  proxy module.
  If compiled
  in, this will make Apache act as a caching-proxy server.
  
  
  

cvs commit: apache-site/mirrors index.html mirrors.list

[Randy Terbush]

randy   97/07/10 18:42:38

  Modified:mirrors   index.html mirrors.list
  Log:
  Add mirrors for Turkey, Croatia, Utah USA, and Israel.
  
  Revision  ChangesPath
  1.9   +14 -0 apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -C3 -r1.8 -r1.9
  *** index.html1997/07/06 15:54:18 1.8
  --- index.html1997/07/11 01:42:35 1.9
  ***
  *** 73,78 
  --- 73,80 

http://www.ntua.gr/apache/";>gr -

  + http://sunsite.srce.hr/mirrors/ftp.apache.org/apache/";>hr -
  + 
http://foobar.szabinet.hu/apache/";>hu -

http://xenia.sote.hu/ftp/linux/mirrors/www.apache.org/";>hu -
  ***
  *** 83,88 
  --- 85,92 

http://apache.csn.ul.ie";>ie -

  + http://vipe.technion.ac.il/apache/";>il -
  + 
http://www.linux.org.il/apache/";>il -

http://download.netvision.net.il/apache/";>il -
  ***
  *** 149,154 
  --- 153,160 

http://www-dc.riubon.ac.th/pub/apache/";>th -

  + http://apache.bilkent.edu.tr/";>tr -
  + 
http://www.uuserv.net.tw/apache/";>tw -

http://www.me.ncu.edu.tw/apache/";>tw -
  ***
  *** 187,192 
  --- 193,200 

http://fanying.eecs.stevens-tech.edu/pub/mirrors/apache/";>us -

  + http://apache.utw.com/";>us -
  + 
http://www.is.co.za/resources/ftpsite/apache/";>za -


  ***
  *** 238,247 
  --- 246,259 

ftp://ftp.hk.super.net/mirror/apache/dist/";>hk -

  + ftp://sunsite.srce.hr/mirrors/ftp.apache.org/apache/";>hr -
  + 
ftp://xenia.sote.hu/pub/linux/mirrors/www.apache.org/dist/";>hu 
-

ftp://apache.koala.ie/pub/apache/dist/";>ie -

  + ftp://ftp.rifkin.technion.ac.il/pub/apache/";>il -
  + 
ftp://apache.linux.org.il/pub/linux/apache/dist/";>il -

ftp://download.netvision.net.il/pub/mirrors/apache";>il -
  ***
  *** 291,296 
  --- 303,310 
ftp://sunsite.uakom.sk/pub/WWW/apache/";>sk -

ftp://ftp.sai.msu.su/pub/unix/WWW/servers/apache/mirror/dist/";>su -
  + 
  + ftp://ftp.bilkent.edu.tr/apache/dist/";>tr -

ftp://apache.oneway.com.tw/apache/dist/";>tw -

  
  
  
  1.21  +7 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -C3 -r1.20 -r1.21
  *** mirrors.list  1997/07/06 15:54:18 1.20
  --- mirrors.list  1997/07/11 01:42:36 1.21
  ***
  *** 23,33 
  --- 23,35 
httpfr  http://www.cge-ol.fr/apache/[EMAIL PROTECTED]
httpfr  http://www.teaser.fr/apache/[EMAIL PROTECTED]
httpgr  http://www.ntua.gr/apache/  [EMAIL PROTECTED]
  + httphr  http://sunsite.srce.hr/mirrors/ftp.apache.org/apache/   
[EMAIL PROTECTED]
httphu  http://foobar.szabinet.hu/apache/   [EMAIL 
PROTECTED]
httphu  http://xenia.sote.hu/ftp/linux/mirrors/www.apache.org/  
[EMAIL PROTECTED]
httphu  http://apache.iit.uni-miskolc.hu/   [EMAIL 
PROTECTED]
httpie  http://apache.koala.ie/ [EMAIL PROTECTED]
httpie  http://apache.csn.ul.ie [EMAIL PROTECTED]
  + httpil  http://vipe.technion.ac.il/apache/  [EMAIL 
PROTECTED]
httpil  http://www.linux.org.il/apache/ [EMAIL PROTECTED]
httpil  http://download.netvision.net.il/apache/[EMAIL 
PROTECTED]
httpil  http://www.ibm.net.il/apache/   [EMAIL PROTECTED]
  ***
  *** 61,66 
  --- 63,69 
httpsk  http://sunsite.uakom.sk/apache/ [EMAIL PROTECTED]
httpsu  http://www.sai.msu.su/apache/   oleg@sai.msu.su
httpth  http://www-dc.riubon.ac.th/pub/apache/  [EMAIL 
PROTECTED]
  + httptr  http://apache.bilkent.edu.tr/   [EMAIL PROTECTED]
httptw  http://www.uuserv.net.tw/apache/[EMAIL 
PROTECTED]
httptw  http://www.me.ncu.edu.tw/apache/[EMAIL 
PROTECTED]
httptw  http://apache.oneway.com.tw/[EMAIL 
PROTECTED]
  ***
  *** 80,85 
  --- 83,89 
httpus  http://ftp.epix.net/apache/ archive@epix.net
httpus  http://apache.iquest.net/   [EMAIL PROTECTED]
httpus  
http://fanying.eecs.stevens-tech.edu/pub/mirrors/apache/[EMAIL 
PROTECTED]
  + httpus  http://apache.utw.com/  [EMAIL PROTECTED]
http   

cvs commit: apache/htdocs/manual/misc perf.html

[Randy Terbush]

randy   97/07/06 12:37:52

  Modified:htdocs/manual/misc  Tag: APACHE_1_2_X  perf.html
  Log:
  Make this reflect the remote document title.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.8.2.3   +1 -1  apache/htdocs/manual/misc/perf.html
  
  Index: perf.html
  ===
  RCS file: /export/home/cvs/apache/htdocs/manual/misc/perf.html,v
  retrieving revision 1.8.2.2
  retrieving revision 1.8.2.3
  diff -C3 -r1.8.2.2 -r1.8.2.3
  *** perf.html 1997/07/06 19:35:56 1.8.2.2
  --- perf.html 1997/07/06 19:37:51 1.8.2.3
  ***
  *** 107,113 



  ! http://www.sun.com/sun-on-net/performance.html";>World Wide Web 
Server Performance



  --- 107,113 



  ! http://www.sun.com/sun-on-net/performance.html";>Sun 
Performance Information



  
  
  

cvs commit: apache/htdocs/manual/misc perf.html

[Randy Terbush]

randy   97/07/06 12:35:58

  Modified:htdocs/manual/misc  Tag: APACHE_1_2_X  perf.html
  Log:
  Sun has changed some of these URLs.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.8.2.2   +1 -5  apache/htdocs/manual/misc/perf.html
  
  Index: perf.html
  ===
  RCS file: /export/home/cvs/apache/htdocs/manual/misc/perf.html,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -C3 -r1.8.2.1 -r1.8.2.2
  *** perf.html 1997/06/27 03:02:07 1.8.2.1
  --- perf.html 1997/07/06 19:35:56 1.8.2.2
  ***
  *** 107,117 



  ! http://www.sun.com/sun-on-net/Sun.Internet.Solutions/performance/";>
  ! World Wide Web Server Performance, 
  ! 
;
  ! http://www.sun.com/solaris/products/siss/";>
  ! Solaris Internet Server Supplement for 2.5.1



  --- 107,113 



  ! http://www.sun.com/sun-on-net/performance.html";>World Wide Web 
Server Performance



  
  
  

cvs commit: apache-site/mirrors index.html mirrors.list

[Randy Terbush]

randy   97/07/06 08:54:19

  Modified:mirrors   index.html mirrors.list
  Log:
  Add a couple more European mirrors.
  
  Revision  ChangesPath
  1.8   +8 -0  apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -C3 -r1.7 -r1.8
  *** index.html1997/07/06 01:34:16 1.7
  --- index.html1997/07/06 15:54:18 1.8
  ***
  *** 53,58 
  --- 53,60 

http://sunsite.auc.dk/apache/";>dk -

  + http://zone.pspt.fi/apache/";>fi -
  + 
http://www.pal.xgw.fi/apache/";>fi -

http://www.ut.ee/apache/";>ee -
  ***
  *** 111,116 
  --- 113,120 

http://www.mbh.org/archive/apache/";>nl -

  + http://www.ipe.nl/apache/";>nl -
  + 
http://archive.bitcon.no/apache/";>no -

http://www.powertech.no/apache/";>no -
  ***
  *** 224,229 
  --- 228,235 

ftp://slug.ctv.es/mirror/apache_httpd/";>es -

  + ftp://ftp.pspt.fi/pub/unix/www/apache/";>fi -
  + 
ftp://ftp.pal.xgw.fi/pub/www/servers/apache/dist/";>fi -

ftp://ftp.ibp.fr/pub/www/apache/dist/";>fr -
  ***
  *** 259,264 
  --- 265,272 
ftp://cosmos.kaist.ac.kr/packages/www/apache/dist/";>kr -

ftp://ftp.nuri.net/pub/apache/dist/";>kr -
  + 
  + ftp://ftp.ipe.nl/apache/";>nl -

ftp://ftp.bitcon.no/pub/unix/www/servers/apache/dist/";>no -

  
  
  
  1.20  +4 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -C3 -r1.19 -r1.20
  *** mirrors.list  1997/07/06 01:34:16 1.19
  --- mirrors.list  1997/07/06 15:54:18 1.20
  ***
  *** 13,18 
  --- 13,19 
httpde  http://www.apache.de/   [EMAIL PROTECTED]
httpde  http://www.cs.tu-berlin.de/home/ftp/pub/net/www/apache/ 
[EMAIL PROTECTED]
httpdk  http://sunsite.auc.dk/apache/   [EMAIL PROTECTED]
  + httpfi  http://zone.pspt.fi/apache/ [EMAIL PROTECTED]
httpfi  http://www.pal.xgw.fi/apache/   [EMAIL PROTECTED]
httpee  http://www.ut.ee/apache/[EMAIL PROTECTED]
httpes  http://www.develnet.es/apache/  [EMAIL PROTECTED]
  ***
  *** 42,47 
  --- 43,49 
httpkr  http://www.iworld.net/apache/   [EMAIL PROTECTED]
httpmy  http://www.cyberweb.com.my/apache/  [EMAIL 
PROTECTED]
httpnl  http://www.mbh.org/archive/apache/  [EMAIL 
PROTECTED]
  + httpnl  http://www.ipe.nl/apache/   [EMAIL PROTECTED]
httpno  http://archive.bitcon.no/apache/[EMAIL 
PROTECTED]
httpno  http://www.powertech.no/apache/ [EMAIL PROTECTED]
httppl  http://sunsite.icm.edu.pl/pub/www/apache/   [EMAIL 
PROTECTED]
  ***
  *** 96,101 
  --- 98,104 
ftp es  ftp://ftp.cs.us.es/pub/www/servers/apache/dist/
ftp es  ftp://ftp.rediris.es/software/infosystems/www/apache/dist/
ftp es  ftp://slug.ctv.es/mirror/apache_httpd/
  + ftp fi  ftp://ftp.pspt.fi/pub/unix/www/apache/
ftp fi  ftp://ftp.pal.xgw.fi/pub/www/servers/apache/dist/
ftp fr  ftp://ftp.ibp.fr/pub/www/apache/dist/   [EMAIL PROTECTED]
ftp gr  ftp://ftp.ntua.gr/pub/www/Apache/dist/
  ***
  *** 114,119 
  --- 117,123 
ftp jp  ftp://ftp.lab.kdd.co.jp/infosystems/apache/dist/
ftp kr  ftp://cosmos.kaist.ac.kr/packages/www/apache/dist/
ftp kr  ftp://ftp.nuri.net/pub/apache/dist/
  + ftp nl  ftp://ftp.ipe.nl/apache/
ftp no  ftp://ftp.bitcon.no/pub/unix/www/servers/apache/dist/
ftp pl  ftp://sunsite.icm.edu.pl/pub/www/apache/dist/
ftp pl  ftp://xenium.pdi.lodz.pl/pub/Linux/network/www/Apache/
  
  
  

cvs commit: apache-site/mirrors index.html mirrors.list

[Randy Terbush]

randy   97/07/05 18:34:17

  Modified:mirrors   index.html mirrors.list
  Log:
  New Swedish mirror.
  
  Revision  ChangesPath
  1.7   +4 -0  apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -C3 -r1.6 -r1.7
  *** index.html1997/06/30 03:58:38 1.6
  --- index.html1997/07/06 01:34:16 1.7
  ***
  *** 135,140 
  --- 135,142 

http://apache.dc.luth.se/";>se -

  + http://www.apache.nis.sll.se/";>se -
  + 
http://www.kabi.si/apache/";>si -

http://sunsite.uakom.sk/apache/";>sk -
  ***
  *** 275,280 
  --- 277,284 
ftp://ftp.tomcat.ru/pub/apache/dist/";>ru -

ftp://ftp.liu.se/pub/mirror/apache/dist/";>se -
  + 
  + ftp://ftp.nis.sll.se/mirror/apache/";>se -

ftp://sunsite.uakom.sk/pub/WWW/apache/";>sk -

  
  
  
  1.19  +2 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -C3 -r1.18 -r1.19
  *** mirrors.list  1997/06/30 03:58:39 1.18
  --- mirrors.list  1997/07/06 01:34:16 1.19
  ***
  *** 54,59 
  --- 54,60 
httpru  http://www.tomcat.ru/apache/[EMAIL PROTECTED]
httpse  http://www.unit.liu.se/apache/  [EMAIL PROTECTED]
httpse  http://apache.dc.luth.se/   [EMAIL PROTECTED]
  + httpse  http://www.apache.nis.sll.se/   [EMAIL PROTECTED]
httpsi  http://www.kabi.si/apache/  [EMAIL PROTECTED]
httpsk  http://sunsite.uakom.sk/apache/ [EMAIL PROTECTED]
httpsu  http://www.sai.msu.su/apache/   oleg@sai.msu.su
  ***
  *** 122,127 
  --- 123,129 
ftp ru  ftp://ftp.ifmo.ru/mirrors/www.apache.org/apache/dist/
ftp ru  ftp://ftp.tomcat.ru/pub/apache/dist/
ftp se  ftp://ftp.liu.se/pub/mirror/apache/dist/
  + ftp se  ftp://ftp.nis.sll.se/mirror/apache/
ftp sk  ftp://sunsite.uakom.sk/pub/WWW/apache/
ftp su  ftp://ftp.sai.msu.su/pub/unix/WWW/servers/apache/mirror/dist/
ftp tw  ftp://apache.oneway.com.tw/apache/dist/
  
  
  

cvs commit: apache-site/mirrors index.html mirrors.list

[Randy Terbush]

randy   97/06/29 20:58:40

  Modified:mirrors   index.html mirrors.list
  Log:
  Add new co.uk mirror.
  
  Revision  ChangesPath
  1.6   +4 -0  apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -C3 -r1.5 -r1.6
  *** index.html1997/06/26 13:21:57 1.5
  --- index.html1997/06/30 03:58:38 1.6
  ***
  *** 165,170 
  --- 165,172 

http://www.gbnet.net/apache/";>co.uk -

  + http://www.flirble.org/apache/";>co.uk -
  + 
https://www.c2.net/apache/";>us -

http://www.rge.com/pub/infosystems/apache/";>us -
  ***
  *** 287,292 
  --- 289,296 
ftp://ftp.idiscover.co.uk/pub/apache/dist/";>co.uk -

ftp://ftp.gbnet.net/pub/apache/dist/";>co.uk -
  + 
  + ftp://ftp.flirble.org/pub/web/apache/";>co.uk -

ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/";>us -

  
  
  
  1.18  +2 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -C3 -r1.17 -r1.18
  *** mirrors.list  1997/06/26 13:21:58 1.17
  --- mirrors.list  1997/06/30 03:58:39 1.18
  ***
  *** 69,74 
  --- 69,75 
httpco.uk   http://www2.idiscover.co.uk/apache/ [EMAIL 
PROTECTED]
httpco.uk   http://www.domino.org/apache/   ?
httpco.uk   http://www.gbnet.net/apache/[EMAIL PROTECTED]
  + httpco.uk   http://www.flirble.org/apache/  [EMAIL PROTECTED]
httpus  https://www.c2.net/apache/  [EMAIL PROTECTED]
httpus  http://www.rge.com/pub/infosystems/apache/  [EMAIL 
PROTECTED]
httpus  http://apache.compuex.com/  [EMAIL PROTECTED]
  ***
  *** 128,133 
  --- 129,135 
ftp ua  ftp://ftp-mirror.carrier.kiev.ua/pub/unix/apache/
ftp co.uk   ftp://ftp.idiscover.co.uk/pub/apache/dist/
ftp co.uk   ftp://ftp.gbnet.net/pub/apache/dist/
  + ftp co.uk   ftp://ftp.flirble.org/pub/web/apache/
ftp us  ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/
ftp us  ftp://ftp.rge.com/pub/infosystems/apache/dist/
ftp us  ftp://apache.compuex.com/pub/apache/dist/
  
  
  

cvs commit: apache-site in_the_news.html

[Randy Terbush]

randy   97/06/28 12:10:41

  Modified:. in_the_news.html
  Log:
  Wired article on Apache.
  
  Revision  ChangesPath
  1.8   +4 -0  apache-site/in_the_news.html
  
  Index: in_the_news.html
  ===
  RCS file: /export/home/cvs/apache-site/in_the_news.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -C3 -r1.7 -r1.8
  *** in_the_news.html  1997/06/19 07:15:32 1.7
  --- in_the_news.html  1997/06/28 19:10:40 1.8
  ***
  *** 12,17 
  --- 12,21 



  + http://www.wired.com/news/news/wiredview/story/4753.html";>Wired, 
June 28th 1997, Software Wants to Be Free
  + 
  + "It's no secret that Apache is the most powerful, the most flexible, and 
the best Web-server software on the market."
  + 
http://www8.zdnet.com/pcweek/news/0609/09apache.html";>
PC Week, June 9th 1997, "Fort Apache"

  
  
  

cvs commit: apache-site/mirrors index.html mirrors.list

[Randy Terbush]

randy   97/06/26 06:21:59

  Modified:mirrors   index.html mirrors.list
  Log:
  Add new mirrors for the Ukraine and Poland.
  Soon you will be able to pick up a copy of Apache at your local corner
  drugstore. :-)
  
  Revision  ChangesPath
  1.5   +10 -0 apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -C3 -r1.4 -r1.5
  *** index.html1997/06/26 04:43:16 1.4
  --- index.html1997/06/26 13:21:57 1.5
  ***
  *** 117,122 
  --- 117,124 

http://sunsite.icm.edu.pl/pub/www/apache/";>pl -

  + http://xenium.pdi.lodz.pl/Apache/";>pl -
  + 
http://ftp.ua.pt/pub/infosystems/www/apache/";>pt -

http://ftp.dei.uc.pt/apache/";>pt -
  ***
  *** 151,156 
  --- 153,160 

http://ftp.icmp.lviv.ua/Apache/";>ua -

  + http://www.apache.carrier.kiev.ua/";>ua -
  + 
http://sunsite.doc.ic.ac.uk/packages/apache/";>ac.uk -

http://www.ukweb.com/apache/";>co.uk -
  ***
  *** 256,261 
  --- 260,267 

ftp://sunsite.icm.edu.pl/pub/www/apache/dist/";>pl -

  + ftp://xenium.pdi.lodz.pl/pub/Linux/network/www/Apache/";>pl -
  + 
ftp://ftp.dei.uc.pt/pub/apache/dist/";>pt -

ftp://ftp.sorosis.ro/pub/mirrors/www.apache.org/apache/dist/";>ro -
  ***
  *** 273,278 
  --- 279,288 
ftp://ftp.sai.msu.su/pub/unix/WWW/servers/apache/mirror/dist/";>su -

ftp://apache.oneway.com.tw/apache/dist/";>tw -
  + 
  + ftp://ftp.icmp.lviv.ua/pub/www/Apache/dist/";>ua -
  + 
  + ftp://ftp-mirror.carrier.kiev.ua/pub/unix/apache/";>ua -

ftp://ftp.idiscover.co.uk/pub/apache/dist/";>co.uk -

  
  
  
  1.17  +5 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -C3 -r1.16 -r1.17
  *** mirrors.list  1997/06/26 04:43:17 1.16
  --- mirrors.list  1997/06/26 13:21:58 1.17
  ***
  *** 45,50 
  --- 45,51 
httpno  http://archive.bitcon.no/apache/[EMAIL 
PROTECTED]
httpno  http://www.powertech.no/apache/ [EMAIL PROTECTED]
httppl  http://sunsite.icm.edu.pl/pub/www/apache/   [EMAIL 
PROTECTED]
  + httppl  http://xenium.pdi.lodz.pl/Apache/   [EMAIL 
PROTECTED]
httppt  http://ftp.ua.pt/pub/infosystems/www/apache/[EMAIL 
PROTECTED]
httppt  http://ftp.dei.uc.pt/apache/[EMAIL PROTECTED]
httpro  http://www.sorosis.ro/ftp/mirrors/www.apache.org/   
[EMAIL PROTECTED]
  ***
  *** 62,67 
  --- 63,69 
httptw  http://apache.oneway.com.tw/[EMAIL 
PROTECTED]
httpua  http://www.neon.dp.ua/www.apache.org/   [EMAIL 
PROTECTED]
httpua  http://ftp.icmp.lviv.ua/Apache/ [EMAIL PROTECTED]
  + httpua  http://www.apache.carrier.kiev.ua/  [EMAIL 
PROTECTED]
httpac.uk   http://sunsite.doc.ic.ac.uk/packages/apache/[EMAIL 
PROTECTED]
httpco.uk   http://www.ukweb.com/apache/[EMAIL PROTECTED]
httpco.uk   http://www2.idiscover.co.uk/apache/ [EMAIL 
PROTECTED]
  ***
  *** 112,117 
  --- 114,120 
ftp kr  ftp://ftp.nuri.net/pub/apache/dist/
ftp no  ftp://ftp.bitcon.no/pub/unix/www/servers/apache/dist/
ftp pl  ftp://sunsite.icm.edu.pl/pub/www/apache/dist/
  + ftp pl  ftp://xenium.pdi.lodz.pl/pub/Linux/network/www/Apache/
ftp pt  ftp://ftp.dei.uc.pt/pub/apache/dist/
ftp ro  ftp://ftp.sorosis.ro/pub/mirrors/www.apache.org/apache/dist/
ftp ru  ftp://ftp.module.vympel.msk.ru/pub/www/apache_mirror/dist/
  ***
  *** 121,126 
  --- 124,131 
ftp sk  ftp://sunsite.uakom.sk/pub/WWW/apache/
ftp su  ftp://ftp.sai.msu.su/pub/unix/WWW/servers/apache/mirror/dist/
ftp tw  ftp://apache.oneway.com.tw/apache/dist/
  + ftp ua  ftp://ftp.icmp.lviv.ua/pub/www/Apache/dist/
  + ftp ua  ftp://ftp-mirror.carrier.kiev.ua/pub/unix/apache/
ftp co.uk   ftp://ftp.idiscover.co.uk/pub/apache/dist/
ftp co.uk   ftp://ftp.gbnet.net/pub/apache/dist/
ftp us  ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/
  
  
  

cvs commit: apache-site/mirrors index.html mirrors.list

[Randy Terbush]

randy   97/06/25 21:43:18

  Modified:mirrors   index.html mirrors.list
  Log:
  Add a couple more mirror sites.
  
  Revision  ChangesPath
  1.4   +6 -0  apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** index.html1997/06/25 19:42:38 1.3
  --- index.html1997/06/26 04:43:16 1.4
  ***
  *** 135,140 
  --- 135,142 

http://www.kabi.si/apache/";>si -

  + http://sunsite.uakom.sk/apache/";>sk -
  + 
http://www.sai.msu.su/apache/";>su -

http://www-dc.riubon.ac.th/pub/apache/";>th -
  ***
  *** 147,152 
  --- 149,156 

http://www.neon.dp.ua/www.apache.org/";>ua -

  + http://ftp.icmp.lviv.ua/Apache/";>ua -
  + 
http://sunsite.doc.ic.ac.uk/packages/apache/";>ac.uk -

http://www.ukweb.com/apache/";>co.uk -
  ***
  *** 263,268 
  --- 267,274 
ftp://ftp.tomcat.ru/pub/apache/dist/";>ru -

ftp://ftp.liu.se/pub/mirror/apache/dist/";>se -
  + 
  + ftp://sunsite.uakom.sk/pub/WWW/apache/";>sk -

ftp://ftp.sai.msu.su/pub/unix/WWW/servers/apache/mirror/dist/";>su -

  
  
  
  1.16  +3 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -C3 -r1.15 -r1.16
  *** mirrors.list  1997/06/25 19:40:59 1.15
  --- mirrors.list  1997/06/26 04:43:17 1.16
  ***
  *** 54,65 
  --- 54,67 
httpse  http://www.unit.liu.se/apache/  [EMAIL PROTECTED]
httpse  http://apache.dc.luth.se/   [EMAIL PROTECTED]
httpsi  http://www.kabi.si/apache/  [EMAIL PROTECTED]
  + httpsk  http://sunsite.uakom.sk/apache/ [EMAIL PROTECTED]
httpsu  http://www.sai.msu.su/apache/   oleg@sai.msu.su
httpth  http://www-dc.riubon.ac.th/pub/apache/  [EMAIL 
PROTECTED]
httptw  http://www.uuserv.net.tw/apache/[EMAIL 
PROTECTED]
httptw  http://www.me.ncu.edu.tw/apache/[EMAIL 
PROTECTED]
httptw  http://apache.oneway.com.tw/[EMAIL 
PROTECTED]
httpua  http://www.neon.dp.ua/www.apache.org/   [EMAIL 
PROTECTED]
  + httpua  http://ftp.icmp.lviv.ua/Apache/ [EMAIL PROTECTED]
httpac.uk   http://sunsite.doc.ic.ac.uk/packages/apache/[EMAIL 
PROTECTED]
httpco.uk   http://www.ukweb.com/apache/[EMAIL PROTECTED]
httpco.uk   http://www2.idiscover.co.uk/apache/ [EMAIL 
PROTECTED]
  ***
  *** 116,121 
  --- 118,124 
ftp ru  ftp://ftp.ifmo.ru/mirrors/www.apache.org/apache/dist/
ftp ru  ftp://ftp.tomcat.ru/pub/apache/dist/
ftp se  ftp://ftp.liu.se/pub/mirror/apache/dist/
  + ftp sk  ftp://sunsite.uakom.sk/pub/WWW/apache/
ftp su  ftp://ftp.sai.msu.su/pub/unix/WWW/servers/apache/mirror/dist/
ftp tw  ftp://apache.oneway.com.tw/apache/dist/
ftp co.uk   ftp://ftp.idiscover.co.uk/pub/apache/dist/
  
  
  

cvs commit: apache-site/mirrors index.html mirrors.list

[Randy Terbush]

randy   97/06/20 17:43:57

  Modified:mirrors   index.html mirrors.list
  Log:
  New mirror in Brazil.
  
  Revision  ChangesPath
  1.2   +15 -7 apache-site/mirrors/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/index.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** index.html1997/06/14 20:06:54 1.1
  --- index.html1997/06/21 00:43:55 1.2
  ***
  *** 37,42 
  --- 37,44 

http://br.apache.org/";>br -

  + http://redes.ucpel.tche.br/apache-mirror/";>br -
  + 
http://apache.oncomdis.on.ca/";>ca -

http://sunsite.cnlab-switch.ch/www/mirror/apache/";>ch -
  ***
  *** 157,163 

http://www.apache.org/";>us -

  ! http://www.c2.net/apache/";>us -

http://www.rge.com/pub/infosystems/apache/";>us -

  --- 159,165 

http://www.apache.org/";>us -

  ! https://www.c2.net/apache/";>us -

http://www.rge.com/pub/infosystems/apache/";>us -

  ***
  *** 167,173 

http://ftp.epix.net/apache/";>us -

  ! http://www.is.co.za/resources/ftpsite/apache";>za -



  --- 169,179 

http://ftp.epix.net/apache/";>us -

  ! http://apache.iquest.net/";>us -
  ! 
  ! http://fanying.eecs.stevens-tech.edu/pub/mirrors/apache/";>us -
  ! 
  ! http://www.is.co.za/resources/ftpsite/apache/";>za -



  ***
  *** 182,189 

ftp://ftp.gns.com.br/pub/unix/apache/dist/";>br -

  - ftp://sunsite.cnlab-switch.ch/mirror/apache/dist/";>ch -
  - 
ftp://ftp.ucr.ac.cr/pub/WWW/Unix/apache/dist/";>cr -

ftp://sunsite.cnlab-switch.ch/mirror/apache/dist/";>ch -
  --- 188,193 
  ***
  *** 208,213 
  --- 212,219 

ftp://ftp.rediris.es/software/infosystems/www/apache/dist/";>es 
-

  + ftp://slug.ctv.es/mirror/apache_httpd/";>es -
  + 
ftp://ftp.pal.xgw.fi/pub/www/servers/apache/dist/";>fi -

ftp://ftp.ibp.fr/pub/www/apache/dist/";>fr -
  ***
  *** 260,266 

ftp://ftp.liu.se/pub/mirror/apache/dist/";>se -

  ! ftp://ftp.sai.msu.su/pub/unix/WWW/servers/apache/mirror/";>su -

ftp://apache.oneway.com.tw/apache/dist/";>tw -

  --- 266,272 

ftp://ftp.liu.se/pub/mirror/apache/dist/";>se -

  ! ftp://ftp.sai.msu.su/pub/unix/WWW/servers/apache/mirror/dist/";>su -

ftp://apache.oneway.com.tw/apache/dist/";>tw -

  ***
  *** 278,286 

ftp://apache.arctic.org/pub/apache/dist/";>us -

  ! ftp://ftp.epix.net/pub/apache/";>us -

  ! ftp://ftp.is.co.za/packages/apache/dist/";>za -



  --- 284,294 

ftp://apache.arctic.org/pub/apache/dist/";>us -

  ! ftp://ftp.epix.net/pub/apache/dist/";>us -
  ! 
  ! ftp://fanying.eecs.stevens-tech.edu/pub/mirrors/apache/";>us -

  ! ftp://ftp.is.co.za/internet/www/servers/apache/dist/";>za -



  
  
  
  1.13  +1 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -C3 -r1.12 -r1.13
  *** mirrors.list  1997/06/17 14:29:07 1.12
  --- mirrors.list  1997/06/21 00:43:55 1.13
  ***
  *** 5,10 
  --- 5,11 
httpbe  http://boomer.digibel.be/mirrors/apache/[EMAIL 
PROTECTED]
httpbg  http://apache.nat.bg/   [EMAIL PROTECTED]
httpbr  http://br.apache.org/   [EMAIL PROTECTED]
  + httpbr  http://redes.ucpel.tche.br/apache-mirror/   [EMAIL 
PROTECTED]
httpca  http://apache.oncomdis.on.ca/   [EMAIL PROTECTED]
httpch  http://sunsite.cnlab-switch.ch/www/mirror/apache/   
[EMAIL PROTECTED]
httpcr  http://apache.ucr.ac.cr/[EMAIL PROTECTED]
  
  
  

cvs commit: apache-site/mirrors mirrors.list

[Randy Terbush]

randy   97/06/17 07:29:08

  Modified:mirrors   mirrors.list
  Log:
  Yet another US mirror site.
  
  Revision  ChangesPath
  1.12  +2 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -C3 -r1.11 -r1.12
  *** mirrors.list  1997/06/16 18:07:44 1.11
  --- mirrors.list  1997/06/17 14:29:07 1.12
  ***
  *** 71,76 
  --- 71,77 
httpus  http://apache.arctic.org/   [EMAIL PROTECTED]
httpus  http://ftp.epix.net/apache/ archive@epix.net
httpus  http://apache.iquest.net/   [EMAIL PROTECTED]
  + httpus  
http://fanying.eecs.stevens-tech.edu/pub/mirrors/apache/[EMAIL 
PROTECTED]
httpza  http://www.is.co.za/resources/ftpsite/apache/   [EMAIL 
PROTECTED]
ftp ar  ftp://ftp.infoap.com.ar/pub/apache/dist/
ftp at  ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/
  ***
  *** 125,128 
  --- 126,130 
ftp us  ftp://apache.compuex.com/pub/apache/dist/
ftp us  ftp://apache.arctic.org/pub/apache/dist/
ftp us  ftp://ftp.epix.net/pub/apache/dist/
  + ftp us  ftp://fanying.eecs.stevens-tech.edu/pub/mirrors/apache/
ftp za  ftp://ftp.is.co.za/internet/www/servers/apache/dist/
  
  
  

cvs commit: apache-site/mirrors mirrors.list

[Randy Terbush]

randy   97/06/16 11:07:45

  Modified:mirrors   mirrors.list
  Log:
  Add an FTP mirror entry for an existing HTTP mirror.
  
  Revision  ChangesPath
  1.11  +1 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -C3 -r1.10 -r1.11
  *** mirrors.list  1997/06/15 23:30:10 1.10
  --- mirrors.list  1997/06/16 18:07:44 1.11
  ***
  *** 88,93 
  --- 88,94 
ftp es  ftp://ftp.vesatec.com/pub/apache/dist/
ftp es  ftp://ftp.cs.us.es/pub/www/servers/apache/dist/
ftp es  ftp://ftp.rediris.es/software/infosystems/www/apache/dist/
  + ftp es  ftp://slug.ctv.es/mirror/apache_httpd/
ftp fi  ftp://ftp.pal.xgw.fi/pub/www/servers/apache/dist/
ftp fr  ftp://ftp.ibp.fr/pub/www/apache/dist/   [EMAIL PROTECTED]
ftp gr  ftp://ftp.ntua.gr/pub/www/Apache/dist/
  
  
  

cvs commit: apache/src multithread.h

[Randy Terbush]

randy   97/06/16 08:20:17

  Modified:src   multithread.h
  Log:
  Fix the warnings in alloc.c complaining of code that does nothing.
  Make it clear to the compiler that we intend for it not to do anything.
  
  Revision  ChangesPath
  1.3   +2 -2  apache/src/multithread.h
  
  Index: multithread.h
  ===
  RCS file: /export/home/cvs/apache/src/multithread.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -C3 -r1.2 -r1.3
  *** multithread.h 1997/06/15 22:27:12 1.2
  --- multithread.h 1997/06/16 15:20:16 1.3
  ***
  *** 48,55 
#define APACHE_TLS
/* Only define the ones actually used, for now */
#define create_mutex(name)  NULL
  ! #define acquire_mutex(mutex_id) MULTI_OK
  ! #define release_mutex(mutex_id) MULTI_OK


#endif /* ndef MULTITHREAD */
  --- 48,55 
#define APACHE_TLS
/* Only define the ones actually used, for now */
#define create_mutex(name)  NULL
  ! #define acquire_mutex(mutex_id) {}
  ! #define release_mutex(mutex_id) {}


#endif /* ndef MULTITHREAD */
  
  
  

cvs commit: apache/src/modules/proxy proxy_util.c

[Randy Terbush]

randy   97/06/16 08:16:29

  Modified:src/modules/proxy  proxy_util.c
  Log:
  Portability for threading missed in first cut.
  
  Revision  ChangesPath
  1.19  +3 -3  apache/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===
  RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -C3 -r1.18 -r1.19
  *** proxy_util.c  1997/06/15 19:22:49 1.18
  --- proxy_util.c  1997/06/16 15:16:28 1.19
  ***
  *** 766,774 
{
int i;
struct hostent *hp;
  ! static __declspec( thread ) struct hostent hpbuf;
  ! static __declspec( thread ) u_long ipaddr;
  ! static __declspec( thread ) char* charpbuf[2];

for (i=0; host[i] != '\0'; i++)
if (!isdigit(host[i]) && host[i] != '.')
  --- 766,774 
{
int i;
struct hostent *hp;
  ! static APACHE_TLS struct hostent hpbuf;
  ! static APACHE_TLS u_long ipaddr;
  ! static APACHE_TLS char* charpbuf[2];

for (i=0; host[i] != '\0'; i++)
if (!isdigit(host[i]) && host[i] != '.')
  
  
  

cvs commit: apache-site/mirrors mirrors.list

[Randy Terbush]

randy   97/06/14 20:46:04

  Modified:mirrors   mirrors.list
  Log:
  Yet another mirror. US site.
  
  Revision  ChangesPath
  1.9   +1 -0  apache-site/mirrors/mirrors.list
  
  Index: mirrors.list
  ===
  RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -C3 -r1.8 -r1.9
  *** mirrors.list  1997/06/15 00:18:02 1.8
  --- mirrors.list  1997/06/15 03:46:03 1.9
  ***
  *** 70,75 
  --- 70,76 
httpus  http://apache.compuex.com/  [EMAIL PROTECTED]
httpus  http://apache.arctic.org/   [EMAIL PROTECTED]
httpus  http://ftp.epix.net/apache/ archive@epix.net
  + httpus  http://apache.iquest.net/   [EMAIL PROTECTED]
httpza  http://www.is.co.za/resources/ftpsite/apache/   [EMAIL 
PROTECTED]
ftp ar  ftp://ftp.infoap.com.ar/pub/apache/dist/
ftp at  ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/
  
  
  

cvs commit: apache/src httpd.h

[Randy Terbush]

randy   97/06/06 06:51:11

  Modified:src   httpd.h
  Log:
  1.3-dev is the current HEAD.
  
  Revision  ChangesPath
  1.112 +1 -1  apache/src/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -C3 -r1.111 -r1.112
  *** httpd.h   1997/06/05 22:53:27 1.111
  --- httpd.h   1997/06/06 13:51:10 1.112
  ***
  *** 255,261 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2.1-dev" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  --- 255,261 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.3-dev" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  
  
  

cvs commit: apache/src httpd.h

[Randy Terbush]

randy   97/06/05 15:53:29

  Modified:src   httpd.h
  Log:
  Begin branch for minor versions of 1.2.
  
  Revision  ChangesPath
  1.111 +1 -1  apache/src/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -C3 -r1.110 -r1.111
  *** httpd.h   1997/06/05 20:16:27 1.110
  --- httpd.h   1997/06/05 22:53:27 1.111
  ***
  *** 255,261 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2.0" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  --- 255,261 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2.1-dev" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  
  
  

cvs commit: apache/src httpd.h

[Randy Terbush]

randy   97/06/05 13:16:29

  Modified:src   httpd.h
  Log:
  The long awaited version 1.2.0 is official.
  
  Revision  ChangesPath
  1.110 +1 -1  apache/src/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -C3 -r1.109 -r1.110
  *** httpd.h   1997/05/29 18:48:42 1.109
  --- httpd.h   1997/06/05 20:16:27 1.110
  ***
  *** 255,261 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b12-dev" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  --- 255,261 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2.0" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  
  
  

cvs commit: apache/htdocs/manual suexec.html

[Randy Terbush]

randy   97/06/05 13:07:21

  Modified:htdocs/manual  suexec.html
  Log:
  Update suexec docs.
  Reviewed by: Ken Coar, Randy Terbush
  Submitted by: Jason Dour
  
  Revision  ChangesPath
  1.11  +447 -132  apache/htdocs/manual/suexec.html
  
  Index: suexec.html
  ===
  RCS file: /export/home/cvs/apache/htdocs/manual/suexec.html,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -C3 -r1.10 -r1.11
  *** suexec.html   1997/06/04 11:07:51 1.10
  --- suexec.html   1997/06/05 20:07:19 1.11
  ***
  *** 1,8 

  ! 
  ! Apache SetUserID Support
  ! 
  ! 


  ! 
  ! 
  ! Apache suEXEC Support
  ! 



  - Apache suEXEC Support

  ! 

  ! What is suEXEC?
  ! The suEXEC feature, introduced in Apache 1.2 provides
  ! the ability to run CGI programs under user IDs
  ! different from the user ID of the calling web-server. Used properly,
  ! this feature can reduce considerably the insecurity of allowing users to
  ! run CGI programs. At the same time, improperly configured, this facility
  ! can crash your computer, burn your house down and steal all the money
  ! from your retirement fund. :-) If you aren't familiar
  ! with managing setuid root programs and the security issues they
  ! present, we highly recommend that you not consider using this feature.
  ! 
  ! 
  ! 
  ! Enabling suEXEC Support
  ! Having said all that, enabling this feature is purposefully difficult with
  ! the intent that it will only be installed by users determined to use it and
  ! is not part of the normal install/compile process.
  ! 
  ! Configuring the suEXEC wrapper
  ! From the top-level of the Apache source tree,
  ! type:  cd support [ENTER]
Edit the suexec.h file and change the following macros to
  ! match your local Apache installation.
From support/suexec.h
  ! 
  ! /*
  !  * HTTPD_USER -- Define as the username under which Apache normally
  !  *   runs.  This is the only user allowed to execute
  !  *   this program.
  !  */
  ! #define HTTPD_USER "www"
  ! 
  ! /*
  !  * LOG_EXEC -- Define this as a filename if you want all suEXEC
  !  * transactions and errors logged for auditing and
  !  * debugging purposes.
  !  */
  ! #define LOG_EXEC "/usr/local/etc/httpd/logs/cgi.log"
  ! 
  ! /*
  !  * DOC_ROOT -- Define as the DocumentRoot set for Apache.  This
  !  * will be the only hierarchy (aside from UserDirs)
  !  * that can be used for suEXEC behavior.
  !  */
  ! #define DOC_ROOT "/usr/local/etc/httpd/htdocs"
  ! 
  ! /*
  !  * SAFE_PATH -- Define a safe PATH environment to pass to CGI executables.
  !  *
  !  */
  ! #define SAFE_PATH "/usr/local/bin:/usr/bin:/bin"
  ! 
  ! 
  ! Compiling the suEXEC wrapper
  ! At the shell command prompt, type:  cc suexec.c
  ! -o suexec [ENTER].
This should create the suexec wrapper executable.

  ! Compiling Apache for suEXEC support
By default, Apache is compiled to look for the suEXEC wrapper in the 
following
  ! location.
From src/httpd.h
  ! 
  ! /* The path to the suEXEC wrapper */
  ! #ifndef SUEXEC_BIN
  ! #define SUEXEC_BIN "/usr/local/etc/httpd/sbin/suexec"
  ! #endif
  ! 
  ! 
If your installation requires location of the wrapper program in a different
directory, edit src/httpd.h and recompile your Apache server.
  ! See Compiling and Installing Apache for more
  ! info on this process.

  ! Installing the suEXEC wrapper
Copy the suexec executable created in the
  ! exercise above to the defined location for SUEXEC_BIN.
  ! In order for the wrapper to set the user ID for execution requests it
  ! must me installed as owner root and must have
  ! the setuserid execution bit set for file modes.
  ! If you are not running a root user shell, do
  ! so now and execute the following commands.
  ! 
  ! chown root /usr/local/etc/httpd/sbin/suexec 
[ENTER]
  ! chmod 4711 /usr/local/etc/httpd/sbin/suexec 
[ENTER]
  ! 
  ! Change the path to the suEXEC wrapper to match your system
  ! installation.
  ! 
  ! 
  ! 
  ! Security Model of suEXEC
  ! The suEXEC wrapper supplied with Apache performs the
  ! following security checks before it will execute any program passed to
  ! it for execution.
  ! 
  ! User executing the wrapper must be a valid user on this
  !  system.
  ! User executing the wrapper must be the compiled in
  !  HTTPD_USER.
  ! The command that the request wishes to execute must not
  !  contain a leading / or ../, or the string "/../" 
anywhere.
  ! The command being executed must reside under the compiled in
  !  DOC_ROOT.
  ! The current working directory must be a directory.
  ! The current working directory must not be writable by
  !  group or other.
  ! The command being executed cannot be a symbolic link.
  ! The command being executed

cvs commit: apache KEYS

[Randy Terbush]

randy   97/06/04 22:22:06

  Modified:. KEYS
  Log:
  Yet another.
  
  Revision  ChangesPath
  1.6   +17 -0 apache/KEYS
  
  Index: KEYS
  ===
  RCS file: /export/home/cvs/apache/KEYS,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -C3 -r1.5 -r1.6
  *** KEYS  1997/06/04 21:03:44 1.5
  --- KEYS  1997/06/05 05:22:05 1.6
  ***
  *** 107,109 
  --- 107,126 
9poJQrcbKeOqLcGZTu/hY90gWBUZ++9umR8X8lyh/WEgcUolfgYHew==
=upYh
-END PGP PUBLIC KEY BLOCK-
  + 
  + Type Bits/KeyIDDate   User ID
  + pub  1024/631B5749 1996/06/21 Randy Terbush <[EMAIL PROTECTED]>
  + 
  + -BEGIN PGP PUBLIC KEY BLOCK-
  + Version: 2.6.3
  + 
  + mQCNAzHLBS8AAAEEANGFXb9o0NPVfVjSLvQh1j3fN6cMeVNA5BGUJ6HZGP/NDxTE
  + i8hwejJqakkU4ux/g6Kqckrx3h8WR7OXZZ+R8CsA0bg9Sr42ndEQCUISgArg+lXZ
  + gRUniARPPA7tamTSq8v1mnxqy9s26Ht2rAG2D6IiK/7v0JlezKirDeBjG1dJAAUR
  + tCFSYW5keSBUZXJidXNoIDxyYW5keUB6eXp6eXZhLmNvbT6JAJUDBRAxywUwqKsN
  + 4GMbV0kBAegnA/sH63WyfwMFmn3nWe8T/5IXO/QkMYoMGLS1i7IxMY9O8BVvKQM+
  + oxEcJdFAG7zPZkpgKzTBxmExz5hMZ9hwJ42XhrslWoP7JVvADJcdthrUAYW9W+jx
  + GcDYAW3qW5DpKsQchfvXq9QOBDxP+Kbbe2B8xGEyGUhLkacISFTrIhhQSg==
  + =8P8s
  + -END PGP PUBLIC KEY BLOCK-
  + 
  
  
  

cvs commit: apache/src httpd.h

[Randy Terbush]

randy   97/05/29 11:48:43

  Modified:src   httpd.h
  Log:
  Release 1.2b11 complete.
  
  Revision  ChangesPath
  1.109 +1 -1  apache/src/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -C3 -r1.108 -r1.109
  *** httpd.h   1997/05/29 18:30:24 1.108
  --- httpd.h   1997/05/29 18:48:42 1.109
  ***
  *** 255,261 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b11" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  --- 255,261 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b12-dev" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  
  
  

cvs commit: apache/src httpd.h

[Randy Terbush]

randy   97/05/29 11:30:26

  Modified:src   httpd.h
  Log:
  Prepare for 1.2b11 realease. This one _really_ is the 1.2 release candidate.
  
  Revision  ChangesPath
  1.108 +1 -1  apache/src/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -C3 -r1.107 -r1.108
  *** httpd.h   1997/05/29 03:10:54 1.107
  --- httpd.h   1997/05/29 18:30:24 1.108
  ***
  *** 255,261 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b11-dev" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  --- 255,261 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b11" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  
  
  

cvs commit: apache/src rfc1413.c

[Randy Terbush]

randy   97/05/29 11:29:14

  Modified:src   rfc1413.c
  Log:
  Unfortunately, the recent setjmp fix to rfc1413.c changed something
  completely unrelated, and upon which one of my modules depends:
  namely, the declaration of rfc1413_timeout as a global int.  This
  needs to be put back, please.
  #ken:-(}
  
  Reviewed by:  Randy Terbush, Jim Jagielski, Dean Gaudet
  Submitted by: Ken Coar
  
  Revision  ChangesPath
  1.11  +3 -1  apache/src/rfc1413.c
  
  Index: rfc1413.c
  ===
  RCS file: /export/home/cvs/apache/src/rfc1413.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -C3 -r1.10 -r1.11
  *** rfc1413.c 1997/05/29 04:50:27 1.10
  --- rfc1413.c 1997/05/29 18:29:12 1.11
  ***
  *** 95,100 
  --- 95,102 
#define ANY_PORT0   /* Any old port will do */
#define FROM_UNKNOWN  "unknown"

  + int rfc1413_timeout = RFC1413_TIMEOUT;  /* Global so it can be changed */
  + 
JMP_BUF timebuf;

/* bind_connect - bind both ends of a socket */
  ***
  *** 208,214 
if (ap_setjmp(timebuf) == 0)
{
signal(SIGALRM, ident_timeout);
  ! alarm(RFC1413_TIMEOUT);

if (get_rfc1413(sock, &conn->local_addr, &conn->remote_addr, user,
  srv)
  --- 210,216 
if (ap_setjmp(timebuf) == 0)
{
signal(SIGALRM, ident_timeout);
  ! alarm(rfc1413_timeout);

if (get_rfc1413(sock, &conn->local_addr, &conn->remote_addr, user,
  srv)
  
  
  

cvs commit: apache/src util_script.c

[Randy Terbush]

randy   97/04/25 06:39:35

  Modified:src   util_script.c
  Log:
  Reverse previous changes.
  
  Revision  ChangesPath
  1.51  +8 -11 apache/src/util_script.c
  
  Index: util_script.c
  ===
  RCS file: /export/home/cvs/apache/src/util_script.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -C3 -r1.50 -r1.51
  *** util_script.c 1997/04/25 05:29:53 1.50
  --- util_script.c 1997/04/25 13:39:33 1.51
  ***
  *** 433,443 
void call_exec (request_rec *r, char *argv0, char **env, int shellcmd) 
{
char *execuser;
  - char *grpname;
  - char *useruri;
core_dir_config *conf;
struct passwd *pw;
struct group *gr;

conf = (core_dir_config *)get_module_config(r->per_dir_config, 
&core_module);

  --- 433,442 
void call_exec (request_rec *r, char *argv0, char **env, int shellcmd) 
{
char *execuser;
core_dir_config *conf;
struct passwd *pw;
struct group *gr;
  + char *grpname;

conf = (core_dir_config *)get_module_config(r->per_dir_config, 
&core_module);

  ***
  *** 547,569 
  (!strncmp("/~", r->uri, 2))) ) {

if (!strncmp("/~",r->uri,2)) {
  ! useruri = r->uri;
  ! useruri += 2;
  ! if ((pw = getpwnam (getword_nc (r->pool, &useruri, '/'))) == 
NULL) {
log_unixerr("getpwnam", NULL, "invalid username", r->server);
return;
}
  ! useruri -= 2;
if ((gr = getgrgid (pw->pw_gid)) == NULL) {
if ((grpname = palloc (r->pool, 16)) == NULL) 
return;
else
  ! ap_snprintf(grpname, sizeof(grpname), "%d", pw->pw_gid);
}
else
grpname = gr->gr_name;
  ! 
  ! execuser = pstrcat (r->pool, "~", pw->pw_name, NULL);
}
else {
if ((pw = getpwuid (r->server->server_uid)) == NULL) {
  --- 546,567 
  (!strncmp("/~", r->uri, 2))) ) {

if (!strncmp("/~",r->uri,2)) {
  ! r->uri += 2;
  ! if ((pw = getpwnam (getword_nc (r->pool, &r->uri, '/'))) == 
NULL) {
log_unixerr("getpwnam", NULL, "invalid username", r->server);
return;
}
  ! r->uri -= 2;
if ((gr = getgrgid (pw->pw_gid)) == NULL) {
if ((grpname = palloc (r->pool, 16)) == NULL) 
return;
else
  ! ap_snprintf(grpname, sizeof(grpname), "%d\0", pw->pw_gid);
}
else
grpname = gr->gr_name;
  ! execuser = (char *) palloc (r->pool, (sizeof(pw->pw_name) + 1));
  ! execuser = pstrcat (r->pool, "~", pw->pw_name, NULL);
}
else {
if ((pw = getpwuid (r->server->server_uid)) == NULL) {
  ***
  *** 574,581 
log_unixerr("getgrgid", NULL, "invalid groupid", r->server);
return;
}
  ! 
  ! grpname = gr->gr_name;
execuser = pw->pw_name;
}
  
  --- 572,578 
log_unixerr("getgrgid", NULL, "invalid groupid", r->server);
return;
}
  ! execuser = (char *) palloc (r->pool, sizeof(pw->pw_name)); 
execuser = pw->pw_name;
}
  
  
  
  

cvs commit: apache/src util_script.c

[Randy Terbush]

randy   97/04/24 22:29:55

  Modified:src   util_script.c
  Log:
  Get this right. Roy pointed out a couple of Bad Things (tm) and it seems
  this patch even broke the non ~user functionality by not setting the group.
  
  Revision  ChangesPath
  1.50  +12 -9 apache/src/util_script.c
  
  Index: util_script.c
  ===
  RCS file: /export/home/cvs/apache/src/util_script.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -C3 -r1.49 -r1.50
  *** util_script.c 1997/04/24 23:25:09 1.49
  --- util_script.c 1997/04/25 05:29:53 1.50
  ***
  *** 433,442 
void call_exec (request_rec *r, char *argv0, char **env, int shellcmd) 
{
char *execuser;
core_dir_config *conf;
struct passwd *pw;
struct group *gr;
  - char *grpname;

conf = (core_dir_config *)get_module_config(r->per_dir_config, 
&core_module);

  --- 433,443 
void call_exec (request_rec *r, char *argv0, char **env, int shellcmd) 
{
char *execuser;
  + char *grpname;
  + char *useruri;
core_dir_config *conf;
struct passwd *pw;
struct group *gr;

conf = (core_dir_config *)get_module_config(r->per_dir_config, 
&core_module);

  ***
  *** 543,566 
if ( suexec_enabled &&
 ((r->server->server_uid != user_id) ||
  (r->server->server_gid != group_id) ||
  !   (!strncmp("/~",r->uri,2))) ) {

if (!strncmp("/~",r->uri,2)) {
  ! r->uri += 2;
  ! if ((pw = getpwnam (getword_nc (r->pool, &r->uri, '/'))) == 
NULL) {
log_unixerr("getpwnam", NULL, "invalid username", r->server);
return;
}
  ! r->uri -= 2;
if ((gr = getgrgid (pw->pw_gid)) == NULL) {
if ((grpname = palloc (r->pool, 16)) == NULL) 
return;
else
  ! ap_snprintf(grpname, sizeof(grpname), "%d\0", pw->pw_gid);
}
  ! else
grpname = gr->gr_name;
  ! execuser = (char *) palloc (r->pool, (sizeof(pw->pw_name) + 1));
execuser = pstrcat (r->pool, "~", pw->pw_name, NULL);
}
else {
  --- 544,568 
if ( suexec_enabled &&
 ((r->server->server_uid != user_id) ||
  (r->server->server_gid != group_id) ||
  !   (!strncmp("/~", r->uri, 2))) ) {

if (!strncmp("/~",r->uri,2)) {
  ! useruri = r->uri;
  ! useruri += 2;
  ! if ((pw = getpwnam (getword_nc (r->pool, &useruri, '/'))) == 
NULL) {
log_unixerr("getpwnam", NULL, "invalid username", r->server);
return;
}
  ! useruri -= 2;
if ((gr = getgrgid (pw->pw_gid)) == NULL) {
if ((grpname = palloc (r->pool, 16)) == NULL) 
return;
else
  ! ap_snprintf(grpname, sizeof(grpname), "%d", pw->pw_gid);
}
  ! else
grpname = gr->gr_name;
  ! 
execuser = pstrcat (r->pool, "~", pw->pw_name, NULL);
}
else {
  ***
  *** 572,578 
log_unixerr("getgrgid", NULL, "invalid groupid", r->server);
return;
}
  ! execuser = (char *) palloc (r->pool, sizeof(pw->pw_name));
execuser = pw->pw_name;
}
  
  --- 574,581 
log_unixerr("getgrgid", NULL, "invalid groupid", r->server);
return;
}
  ! 
  ! grpname = gr->gr_name;
execuser = pw->pw_name;
}
  
  
  
  

cvs commit: apache/src httpd.h

[Randy Terbush]

randy   97/04/07 21:06:05

  Modified:src   httpd.h
  Log:
  Could this be general? Rev to b9-dev
  
  Revision  ChangesPath
  1.95  +1 -1  apache/src/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -C3 -r1.94 -r1.95
  *** httpd.h   1997/04/08 03:49:32 1.94
  --- httpd.h   1997/04/08 04:06:03 1.95
  ***
  *** 248,254 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b8" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  --- 248,254 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b9-dev" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  
  
  

cvs commit: apache/src httpd.h

[Randy Terbush]

randy   97/04/07 20:49:35

  Modified:src   httpd.h
  Log:
  Going for B8 release.
  
  Revision  ChangesPath
  1.94  +1 -1  apache/src/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -C3 -r1.93 -r1.94
  *** httpd.h   1997/03/29 03:40:34 1.93
  --- httpd.h   1997/04/08 03:49:32 1.94
  ***
  *** 248,254 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b8-dev" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  --- 248,254 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b8" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  
  
  

cvs commit: apache/support suexec.c

[Randy Terbush]

randy   97/03/03 11:33:54

  Modified:src   CHANGES
  Log:
  suexec changes.
  
  Revision  ChangesPath
  1.182 +4 -0  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.181
  retrieving revision 1.182
  diff -C3 -r1.181 -r1.182
  *** CHANGES   1997/03/03 05:01:43 1.181
  --- CHANGES   1997/03/03 19:30:32 1.182
  ***
  *** 1,4 
  --- 1,8 
Changes with Apache 1.2b8
  +  
  +   *) Fix bug in suexec reintroduced by changes in 1.2b7 which allows
  +  initgroups() to hose the group information needed for later
  +  comparisons. [Randy Terbush]

  *) Remove unnecessary call to va_end() in create_argv() which
 caused a SEGV on some systems.
  
  
  

  Modified:support   suexec.c
  Log:
  Fix bug reintroduced by 1.2b7 which allowed initgroups() to hose the
  group information needed for later comparisons.
  Reviewed by: 3 bug reporters
  
  Revision  ChangesPath
  1.19  +28 -18apache/support/suexec.c
  
  Index: suexec.c
  ===
  RCS file: /export/home/cvs/apache/support/suexec.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -C3 -r1.18 -r1.19
  *** suexec.c  1997/02/21 01:20:40 1.18
  --- suexec.c  1997/03/03 19:33:53 1.19
  ***
  *** 216,221 
  --- 216,224 
gid_t gid;  /* target group placeholder  */
char *target_uname; /* target user name  */
char *target_gname; /* target group name */
  + char *target_homedir;   /* target home directory */
  + char *actual_uname; /* actual user name*/
  + char *actual_gname; /* actual group name   */
char *prog; /* name of this program  */
char *cmd;  /* command to be executed*/
char cwd[AP_MAXPATH];   /* current working directory */
  ***
  *** 297,317 
}

/*
 * Log the transaction here to be sure we have an open log 
 * before we setuid().
 */
log_err("uid: (%s/%s) gid: (%s/%s) %s\n",
  !  target_uname, pw->pw_name,
  !  target_gname, gr->gr_name,
 cmd);

/*
 * Error out if attempt is made to execute as root or as
 * a UID less than UID_MIN.  Tsk tsk.
 */
  ! if ((pw->pw_uid == 0) ||
  ! (pw->pw_uid < UID_MIN)) {
  ! log_err("cannot run as forbidden uid (%d/%s)\n", pw->pw_uid, cmd);
exit(107);
}

  --- 300,329 
}

/*
  +  * Save these for later since initgroups will hose the struct
  +  */
  + uid = pw->pw_uid;
  + gid = gr->gr_gid;
  + actual_uname = strdup(pw->pw_name);
  + actual_gname = strdup(gr->gr_name);
  + target_homedir = strdup(pw->pw_dir);
  + 
  + /*
 * Log the transaction here to be sure we have an open log 
 * before we setuid().
 */
log_err("uid: (%s/%s) gid: (%s/%s) %s\n",
  !  target_uname, actual_uname,
  !  target_gname, actual_gname,
 cmd);

/*
 * Error out if attempt is made to execute as root or as
 * a UID less than UID_MIN.  Tsk tsk.
 */
  ! if ((uid == 0) ||
  ! (uid < UID_MIN)) {
  ! log_err("cannot run as forbidden uid (%d/%s)\n", uid, cmd);
exit(107);
}

  ***
  *** 319,327 
 * Error out if attempt is made to execute as root group
 * or as a GID less than GID_MIN.  Tsk tsk.
 */
  ! if ((gr->gr_gid == 0) ||
  ! (gr->gr_gid < GID_MIN)) {
  ! log_err("cannot run as forbidden gid (%d/%s)\n", gr->gr_gid, cmd);
exit(108);
}

  --- 331,339 
 * Error out if attempt is made to execute as root group
 * or as a GID less than GID_MIN.  Tsk tsk.
 */
  ! if ((gid == 0) ||
  ! (gid < GID_MIN)) {
  ! log_err("cannot run as forbidden gid (%d/%s)\n", gid, cmd);
exit(108);
}

  ***
  *** 331,339 
 * Initialize the group access list for the target user,
 * and setgid() to the target group. If unsuccessful, error out.
 */
  ! uid = pw->pw_uid;
  ! gid = gr->gr_gid;
  ! if (((setgid(gid)) != 0) || (initgroups(pw->pw_name,gid) != 0)) {
log_err("failed to setgid (%ld: %s/%s)\n", gid, cwd, cmd);
exit(109);
}
  --- 343,349 
 * Initialize the group access list for the target user,
 * and setgid() to the target group. If unsuccessful, error out.

cvs commit: apache/src CHANGES util_script.c

[Randy Terbush]

randy   97/03/02 21:01:46

  Modified:src   CHANGES util_script.c
  Log:
  Remove unnecessary call to va_end() in create_argv().
  Reviewed by: Chuck Murcko, Dean Gaudet
  
  Revision  ChangesPath
  1.181 +5 -0  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.180
  retrieving revision 1.181
  diff -C3 -r1.180 -r1.181
  *** CHANGES   1997/02/25 20:56:37 1.180
  --- CHANGES   1997/03/03 05:01:43 1.181
  ***
  *** 1,3 
  --- 1,8 
  + Changes with Apache 1.2b8
  + 
  +   *) Remove unnecessary call to va_end() in create_argv() which
  +  caused a SEGV on some systems.
  + 
Changes with Apache 1.2b7

  *) Port to  UXP/DS(V20) [Toshiaki Nomura <[EMAIL PROTECTED]>]
  
  
  
  1.46  +4 -7  apache/src/util_script.c
  
  Index: util_script.c
  ===
  RCS file: /export/home/cvs/apache/src/util_script.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -C3 -r1.45 -r1.46
  *** util_script.c 1997/02/10 11:47:24 1.45
  --- util_script.c 1997/03/03 05:01:44 1.46
  ***
  *** 91,97 

unescape_url(t);
av[idx] = escape_shell_cmd(r->pool, t);
  - av[idx] = t;
idx++;
if (idx >= APACHE_ARG_MAX-1) break;

  --- 91,96 
  ***
  *** 99,113 
unescape_url(t);
assert(idx < APACHE_ARG_MAX);
av[idx] = escape_shell_cmd(r->pool, t);
  - av[idx] = t;
idx++;
if (idx >= APACHE_ARG_MAX-1) break;
}
  - va_end(args);
}
va_end(args);

  ! av[idx] = '\0';
return av;
}

  --- 98,110 
unescape_url(t);
assert(idx < APACHE_ARG_MAX);
av[idx] = escape_shell_cmd(r->pool, t);
idx++;
if (idx >= APACHE_ARG_MAX-1) break;
}
}
va_end(args);

  ! av[idx] = NULL;
return av;
}

  ***
  *** 538,544 
execv("CMD.EXE", create_argv_cmd(r->pool, argv0, r->args, 
r->filename));
}
else
  ! execv(r->filename, create_argv(r, argv0, r->args, NULL));
}
}
#else
  --- 535,541 
execv("CMD.EXE", create_argv_cmd(r->pool, argv0, r->args, 
r->filename));
}
else
  ! execv(r->filename, create_argv(r, argv0, r->args, (void *)NULL));
}
}
#else
  ***
  *** 579,585 

else {
execve(SUEXEC_BIN,
  !create_argv(r, SUEXEC_BIN, execuser, gr->gr_name, argv0, 
r->args, NULL),
   env);
}
}
  --- 576,582 

else {
execve(SUEXEC_BIN,
  !create_argv(r, SUEXEC_BIN, execuser, gr->gr_name, argv0, 
r->args, (void *)NULL),
   env);
}
}
  ***
  *** 591,597 
execle(r->filename, argv0, NULL, env);

else
  ! execve(r->filename, create_argv(r, argv0, r->args, NULL), env);
}
#endif
}
  --- 588,594 
execle(r->filename, argv0, NULL, env);

else
  ! execve(r->filename, create_argv(r, argv0, r->args, (void *)NULL), 
env);
}
#endif
}
  
  
  

cvs commit: apache/src conf.h

[Randy Terbush]

randy   97/03/02 08:12:52

  Modified:src   conf.h
  Log:
  FreeBSD 2.2 portability
  
  Revision  ChangesPath
  1.86  +3 -0  apache/src/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -C3 -r1.85 -r1.86
  *** conf.h1997/02/25 21:04:42 1.85
  --- conf.h1997/03/02 16:12:51 1.86
  ***
  *** 395,401 
  --- 395,404 
#define HAVE_MMAP
#define DEFAULT_USER "nobody"
#define DEFAULT_GROUP "nogroup"
  + #if defined(__bsdi__) || \
  + (defined(__FreeBSD_version) && (__FreeBSD_version < 22))
typedef quad_t rlim_t;
  + #endif

#elif defined(QNX)
#ifndef crypt
  
  
  

cvs commit: apache/src httpd.h

[Randy Terbush]

randy   97/02/21 16:47:34

  Modified:src   httpd.h
  Log:
  Change version to 1.2b8-dev
  
  Revision  ChangesPath
  1.90  +1 -1  apache/src/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -C3 -r1.89 -r1.90
  *** httpd.h   1997/02/22 00:38:04 1.89
  --- httpd.h   1997/02/22 00:47:32 1.90
  ***
  *** 248,254 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b7" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  --- 248,254 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b8-dev" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  
  
  

cvs commit: apache/src httpd.h

[Randy Terbush]

randy   97/02/21 16:38:05

  Modified:src   httpd.h
  Log:
  Prepare for 1.2b7
  
  Revision  ChangesPath
  1.89  +1 -1  apache/src/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -C3 -r1.88 -r1.89
  *** httpd.h   1997/02/18 16:27:27 1.88
  --- httpd.h   1997/02/22 00:38:04 1.89
  ***
  *** 248,254 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b7-dev" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  --- 248,254 
 * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
 */

  ! #define SERVER_BASEVERSION "Apache/1.2b7" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION  SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
  
  
  

cvs commit: apache/src CHANGES http_protocol.c

[Randy Terbush]

randy   97/02/21 16:37:20

  Modified:src   CHANGES http_protocol.c
  Log:
  Unset Content-Length if chunked (RFC-2068)
  Reviewed by: Dean Gaudet, Randy Terbush, Marc Slemko
  Submitted by: Petra Lampa
  
  Revision  ChangesPath
  1.179 +3 -1  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.178
  retrieving revision 1.179
  diff -C3 -r1.178 -r1.179
  *** CHANGES   1997/02/22 00:33:29 1.178
  --- CHANGES   1997/02/22 00:37:17 1.179
  ***
  *** 1,6 
Changes with Apache 1.2b7

  !   *) mod_negotiation fixes [Petr Lampa]
 - replace protocol response numbers with symbols
 - save variant-list into main request notes
 - free allocated memory from subrequests
  --- 1,8 
Changes with Apache 1.2b7

  !   *) unset Content-Length if chunked (RFC-2068) [Petr Lampa]
  ! 
  !   *) mod_negotiation fixes [Petr Lampa] PR#157, PR#158, PR#159
 - replace protocol response numbers with symbols
 - save variant-list into main request notes
 - free allocated memory from subrequests
  
  
  
  1.105 +5 -1  apache/src/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /export/home/cvs/apache/src/http_protocol.c,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -C3 -r1.104 -r1.105
  *** http_protocol.c   1997/02/20 23:36:39 1.104
  --- http_protocol.c   1997/02/22 00:37:18 1.105
  ***
  *** 1102,1109 
if (!table_get(r->subprocess_env, "nokeepalive"))
set_keepalive (r);

  ! if (r->chunked)
bputs("Transfer-Encoding: chunked\015\012", fd);

if (r->byterange > 1)
bvputs(fd, "Content-Type: multipart/",
  --- 1102,1113 
if (!table_get(r->subprocess_env, "nokeepalive"))
set_keepalive (r);

  ! if (r->chunked) {
bputs("Transfer-Encoding: chunked\015\012", fd);
  + /* RFC2068 #4.4: Messages MUST NOT include both a Content-Length
  +  * header field and the "chunked" transfer coding. */
  + table_unset(r->headers_out, "Content-Length");
  + }

if (r->byterange > 1)
bvputs(fd, "Content-Type: multipart/",
  
  
  

cvs commit: apache/src CHANGES mod_negotiation.c

[Randy Terbush]

randy   97/02/21 16:33:32

  Modified:src   CHANGES mod_negotiation.c
  Log:
  - replace protocol response numbers with symbols
  - save variant-list into main request notes
  - free allocated memory from subrequests
  - merge notes, headers_out and err_headers_out
  Reviewed by:  Dean Gaudet, Randy Terbush, Marc Slemko
  Submitted by: Petr Lampa
  
  Revision  ChangesPath
  1.178 +6 -0  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.177
  retrieving revision 1.178
  diff -C3 -r1.177 -r1.178
  *** CHANGES   1997/02/21 01:20:39 1.177
  --- CHANGES   1997/02/22 00:33:29 1.178
  ***
  *** 1,5 
  --- 1,11 
Changes with Apache 1.2b7

  +   *) mod_negotiation fixes [Petr Lampa]
  +  - replace protocol response numbers with symbols
  +  - save variant-list into main request notes
  +  - free allocated memory from subrequests
  +  - merge notes, headers_out and err_headers_out
  + 
  *) changed status check mask in proxy_http.c from "HTTP/#.# ### *" to
 "HTTP/#.# ###*" to be more lenient about what we accept.
 [Chuck Murcko]
  
  
  
  1.33  +49 -14apache/src/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -C3 -r1.32 -r1.33
  *** mod_negotiation.c 1997/02/07 07:13:15 1.32
  --- mod_negotiation.c 1997/02/22 00:33:29 1.33
  ***
  *** 763,769 
if (sub_req->handler && !sub_req->content_type)
  sub_req->content_type = CGI_MAGIC_TYPE;

  ! if (sub_req->status != 200 || !sub_req->content_type) continue;

/* If it's a map file, we use that instead of the map
 * we're building...
  --- 763,769 
if (sub_req->handler && !sub_req->content_type)
  sub_req->content_type = CGI_MAGIC_TYPE;

  ! if (sub_req->status != HTTP_OK || !sub_req->content_type) continue;

/* If it's a map file, we use that instead of the map
 * we're building...
  ***
  *** 1761,1767 

void store_variant_list (request_rec *r, negotiation_state *neg)
{
  !   table_set (r->notes, "variant-list", make_variant_list (r, neg));
}

/* Called if we got a "Choice" response from the network algorithm.
  --- 1761,1771 

void store_variant_list (request_rec *r, negotiation_state *neg)
{
  !   if (r->main == NULL) {
  !  table_set (r->notes, "variant-list", make_variant_list (r, neg));
  !   } else {
  !  table_set (r->main->notes, "variant-list", make_variant_list (r->main, 
neg));
  !   }
}

/* Called if we got a "Choice" response from the network algorithm.
  ***
  *** 1777,1783 

if (!variant->sub_req) {
sub_req = sub_req_lookup_file(variant->file_name, r);
  ! if (sub_req->status != 200 && sub_req->status != 300)
return sub_req->status;
variant->sub_req = sub_req;
}
  --- 1781,1787 

if (!variant->sub_req) {
sub_req = sub_req_lookup_file(variant->file_name, r);
  ! if (sub_req->status != HTTP_OK && sub_req->status != 
HTTP_MULTIPLE_CHOICES)
return sub_req->status;
variant->sub_req = sub_req;
}
  ***
  *** 1793,1799 
 * the normal variant handling 
 */

  ! if ((sub_req->status == 300) ||
(table_get(sub_req->headers_out, "Alternates")) ||
(table_get(sub_req->headers_out, "Content-Location")))
return VARIANT_ALSO_VARIES;
  --- 1797,1803 
 * the normal variant handling 
 */

  ! if ((sub_req->status == HTTP_MULTIPLE_CHOICES) ||
(table_get(sub_req->headers_out, "Alternates")) ||
(table_get(sub_req->headers_out, "Content-Location")))
return VARIANT_ALSO_VARIES;
  ***
  *** 1870,1878 
int handle_multi (request_rec *r)
{
negotiation_state *neg;
  ! var_rec *best;
request_rec *sub_req;
int res;
int na_result;  /* result of network algorithm */

if (r->finfo.st_mode != 0 || !(allow_options (r) & OPT_MULTI))
  --- 1874,1883 
int handle_multi (request_rec *r)
{
negotiation_state *neg;
  ! var_rec *best, *avail_recs;
request_rec *sub_req;
int res;
  + int j;
int

cvs commit: apache/src/modules Makefile

[Randy Terbush]

randy   97/02/21 16:15:04

  Modified:src/modules  Makefile
  Log:
  Quote variables
  
  Revision  ChangesPath
  1.7   +1 -1  apache/src/modules/Makefile
  
  Index: Makefile
  ===
  RCS file: /export/home/cvs/apache/src/modules/Makefile,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -C3 -r1.6 -r1.7
  *** Makefile  1997/01/16 17:20:32 1.6
  --- Makefile  1997/02/22 00:15:02 1.7
  ***
  *** 58,64 
default:
(for dir in $(MODULES); do \
cd $$dir; \
  ! $(MAKE) CC=$(CC) AUX_CFLAGS="$(AUX_CFLAGS)" RANLIB=$(RANLIB); \
cd ..; \
done)

  --- 58,64 
default:
(for dir in $(MODULES); do \
cd $$dir; \
  ! $(MAKE) CC=$(CC) AUX_CFLAGS="$(AUX_CFLAGS)" RANLIB="$(RANLIB)"; 
\
cd ..; \
done)

  
  
  

cvs commit: apache/src conf.h

[Randy Terbush]

randy   97/02/20 08:08:57

  Modified:src   conf.h
  Log:
  Backing out this change until I hear back from FreeBSD development.
  The 2.2 codebase currently has an older version than the older 2.1.7
  codebase.
  
  Revision  ChangesPath
  1.82  +0 -2  apache/src/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -C3 -r1.81 -r1.82
  *** conf.h1997/02/20 08:11:51 1.81
  --- conf.h1997/02/20 16:08:55 1.82
  ***
  *** 401,409 
#define HAVE_MMAP
#define DEFAULT_USER "nobody"
#define DEFAULT_GROUP "nogroup"
  - #if defined(__bsdi__) || (__FreeBSD_version < 199701)
typedef quad_t rlim_t;
  - #endif

#elif defined(QNX)
#ifndef crypt
  --- 401,407 
  
  
  

cvs commit: apache/src conf.h

[Randy Terbush]

randy   97/02/20 00:11:53

  Modified:src   conf.h
  Log:
  Fix a warning on FreeBSD 2.2
  
  Revision  ChangesPath
  1.81  +5 -0  apache/src/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -C3 -r1.80 -r1.81
  *** conf.h1997/02/18 02:56:37 1.80
  --- conf.h1997/02/20 08:11:51 1.81
  ***
  *** 390,395 
  --- 390,398 
#undef NO_SETSID

#elif defined(__FreeBSD__) || defined(__bsdi__)
  + #if defined(__FreeBSD__)
  + #include 
  + #endif
#define HAVE_SYS_RESOURCE_H
#define HAVE_GMTOFF
#undef NO_KILLPG
  ***
  *** 398,404 
  --- 401,409 
#define HAVE_MMAP
#define DEFAULT_USER "nobody"
#define DEFAULT_GROUP "nogroup"
  + #if defined(__bsdi__) || (__FreeBSD_version < 199701)
typedef quad_t rlim_t;
  + #endif

#elif defined(QNX)
#ifndef crypt