cvs commit: apache-1.3 STATUS

1998-06-19 Thread jim
jim 98/06/19 06:14:57

  Modified:.STATUS
  Log:
  Give us some time
  
  Revision  ChangesPath
  1.432 +1 -1  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.431
  retrieving revision 1.432
  diff -u -r1.431 -r1.432
  --- STATUS1998/06/17 12:03:39 1.431
  +++ STATUS1998/06/19 13:14:56 1.432
  @@ -2,7 +2,7 @@
   
   Release:
   
  -1.3.1: In development. Plan to release on June 19, 1998 to
  +1.3.1: In development. Plan to release on June 24, 1998 to
  incorporate the latest additions plus WIN32 compile problems.
  Jim offers to be RM.
   
  
  
  


cvs commit: apache-1.3/src/modules/standard mod_autoindex.c

1998-06-19 Thread coar
coar98/06/19 06:31:31

  Modified:src  CHANGES
   src/modules/standard mod_autoindex.c
  Log:
IndexIgnore was looking for an exact match of the filename against
the pattern, even though on Win32 README.html, Readme.html, and
readme.html are all the same file.
  
  PR:   2455
  
  Revision  ChangesPath
  1.926 +3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.925
  retrieving revision 1.926
  diff -u -r1.925 -r1.926
  --- CHANGES   1998/06/17 13:33:59 1.925
  +++ CHANGES   1998/06/19 13:31:28 1.926
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.1
   
  +  *) IndexIgnore should be case-blind on Win32 (and any other case-aware
  + but case-insensitive platforms).  [Ken Coar] PR#2455
  +
 *) Enable DSO support for OpenBSD in general, not only for 2.x, because it
also works for OpenBSD 1.x. [Ralf S. Engelschall]
   
  
  
  
  1.83  +10 -0 apache-1.3/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- mod_autoindex.c   1998/06/16 03:40:13 1.82
  +++ mod_autoindex.c   1998/06/19 13:31:30 1.83
  @@ -534,10 +534,20 @@
ap++;
}
   
  +#ifndef WIN32
if (!ap_strcmp_match(path, p-apply_path)
 !ap_strcmp_match(tt, ap)) {
return 1;
}
  +#else  /* !WIN32 */
  + /*
  +  * On Win32, the match must be case-blind.
  +  */
  + if (!ap_strcasecmp_match(path, p-apply_path)
  +  !ap_strcasecmp_match(tt, ap)) {
  + return 1;
  + }
  +#endif /* !WIN32 */
   }
   return 0;
   }
  
  
  


cvs commit: apache-devsite index.html mailing-lists.html

1998-06-19 Thread coar
coar98/06/19 08:26:56

  Modified:.index.html mailing-lists.html
  Log:
Add apache-announce to the list and do some HTML cleanup.
  
  Revision  ChangesPath
  1.23  +57 -66apache-devsite/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-devsite/index.html,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- index.html1998/05/04 02:57:05 1.22
  +++ index.html1998/06/19 15:26:54 1.23
  @@ -20,7 +20,7 @@
  Note that a lot of these documents may not be entirely up-to-date.
  Some may have been superseded by other references, and some may just
  be waiting for someone to get around to updating them.
  -
  +  /BLOCKQUOTE
 P
 H2User Feedback/H2
 UL TYPE=SQUARE
  @@ -29,75 +29,71 @@
  /LI
  LIA HREF=http://bugs.apache.org/private/;Developer access/A
(submit, query and edit) to the
  -Apache Bug Report Database.
  +database of Apache bug reports.
Requires authorisation.
  +   /LI
  +   LIInformation about the various Apache
  +   A HREF=mailing-lists.htmlmailing lists/A.
  /LI
  -   LI
  -   A
  - HREF=mailing-lists
  -Information/A
  - about the available Apache Mailing Lists.
  -   /LI
  -   LI
  -A
  - HREF=mail/
  -Archives/A 
  - of the Apache Mailing Lists.
  +   LIA HREF=mail/Archives/A of the Apache mailing lists.
  /LI
  -   LI How to contribute A HREF=patches.htmlcode patches/A to Apache.
  +   LIHow to contribute A HREF=patches.htmlcode patches/A to Apache.
  +   /LI
 /UL
   
 P
 H2General Developer Guidelines/H2
 UL TYPE=SQUARE
  LIThe latest draft of the
  -A
  - HREF=project-plan
  -Apache project plan/ABR
  -(last modified on !--#flastmod virtual=project-plan.html --)
  -   /LI
  -   LIA HREF=guidelinesApache Project Guidelines/A.
  -(last modified on !--#flastmod virtual=guidelines.html --)
  -   /LI
  -   LIThe Apache coding A HREF=styleguidestyle guide/ABR
  -(last modified on !--#flastmod virtual=styleguide.html --)
  +   A HREF=project-plan.htmlApache project plan/A
  +   BR
  +   (last modified on !--#flastmod virtual=project-plan.html --)
  +   /LI
  +   LIA HREF=guidelines.htmlApache Project Guidelines/A.
  +   (last modified on !--#flastmod virtual=guidelines.html --)
  +   /LI
  +   LIThe Apache coding A HREF=styleguide.htmlstyle guide/A
  +   BR
  +   (last modified on !--#flastmod virtual=styleguide.html --)
  +   /LI
  +   LISome notes on A HREF=API.htmlthe API/A
  +   BR
  +   (last modified on !--#flastmod virtual=API.html --)
  +   /LI
  +   LISome notes on A HREF=debugging.htmldebugging/A
  +   BR
  +(last modified on !--#flastmod virtual=debugging.html --)
  /LI
  -   LISome notes on A HREF=APIthe API/ABR
  -(last modified on !--#flastmod virtual=API.html --)
  -   /LI
  -   LISome notes on A HREF=debugging.htmldebugging/ABR
  -(last modified on !--#flastmod virtual=debugging.html --)
  -   /LI
 /UL
   
 P
 H2Source Repository Guidelines/H2
 UL TYPE=SQUARE
  LIA HREF=devnotesApache Development Notes/A about
  -   using CVS and maintaining the Apache site.BR
  -(last modified on !--#flastmod virtual=devnotes.html --)
  +   using CVS and maintaining the Apache site.
  +   BR
  +   (last modified on !--#flastmod virtual=devnotes.html --)
  /LI
  LIA HREF=anoncvs.txtInstructions/A
  - on developer access to the repository via Anonymous CVS.BR
  -(last modified on !--#flastmod virtual=anoncvs.txt --)
  -   /LI
  -   LIA 
HREF=http://www.engelschall.com/pw/apache/cvsguide/;Instructions/A
  - on developer access to the repository via CVSup.
  +   on developer access to the repository EMvia/EM Anonymous CVS.
  +   BR
  +   (last modified on !--#flastmod virtual=anoncvs.txt --)
  +   /LI
  +   LIA
  +
HREF=http://www.engelschall.com/pw/apache/cvsguide/;Instructions/A
  +   on developer access to the repository EMvia/EM CVSup.
  +   /LI
  +   LIA HREF=nt-cvs-ssh.txtCVS and SSH for NT users/A, useful for
  +   NT developers.
  +   /LI
  +   LIThe A HREF=todo.htmlto-do list/A of the Apache developers.
  +   BR
  +   (last modified on !--#flastmod virtual=todo.html --)
  /LI
  -   lia href=nt-cvs-ssh.txtCVS and SSH for NT users/a, useful for
  - NT developers.
  -   /li
  -   LIThe
  -A
  - HREF=todo
  -to-do list/A of the Apache developers.BR
  -(last modified on !--#flastmod virtual=todo.html --)
  -   /LI
  LIRecord of changes to the
  -A
  - HREF=mmn
  -module magic number/ABR
  -(last modified on !--#flastmod virtual=mmn.txt --)
  +   A HREF=mmn.txtmodule magic number/A
  +   BR
  +   (last modified on !--#flastmod virtual=mmn.txt --)
  /LI
 /UL
   
  

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

1998-06-19 Thread coar
coar98/06/19 14:02:44

  Modified:src  CHANGES
   src/ap   Makefile.tmpl
   src/include ap.h httpd.h
   src/main util.c
  Removed: src/ap   ap_strings.c
  Log:
Move ap_escape_quotes(), with its use of pools, out of libap.
  
  Reviewed by:  Dean Gaudet
  
  Revision  ChangesPath
  1.927 +4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.926
  retrieving revision 1.927
  diff -u -r1.926 -r1.927
  --- CHANGES   1998/06/19 13:31:28 1.926
  +++ CHANGES   1998/06/19 21:02:30 1.927
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.1
   
  +  *) Move ap_escape_quotes() from src/ap to src/main/util.c; it uses
  + pools and thus pollutes libap (until the pool stuff is moved there).
  + [Ken Coar]
  +
 *) IndexIgnore should be case-blind on Win32 (and any other case-aware
but case-insensitive platforms).  [Ken Coar] PR#2455
   
  
  
  
  1.24  +1 -4  apache-1.3/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Makefile.tmpl 1998/05/10 13:04:30 1.23
  +++ Makefile.tmpl 1998/06/19 21:02:33 1.24
  @@ -6,7 +6,7 @@
   LIB=libap.a
   
   OBJS=ap_execve.o ap_cpystrn.o ap_signal.o \
  - ap_slack.o ap_snprintf.o ap_strings.o
  + ap_slack.o ap_snprintf.o
   
   .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $
  @@ -52,8 +52,5 @@
$(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_log.h
   ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  - $(INCDIR)/util_uri.h
  -ap_strings.o: ap_strings.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h
  
  
  
  1.17  +0 -1  apache-1.3/src/include/ap.h
  
  Index: ap.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/ap.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ap.h  1998/05/11 20:42:35 1.16
  +++ ap.h  1998/06/19 21:02:36 1.17
  @@ -67,7 +67,6 @@
   
   API_EXPORT(char *) ap_cpystrn(char *, const char *, size_t);
   int ap_slack(int, int);
  -API_EXPORT(char *) ap_escape_quotes(pool *, const char *);
   API_EXPORT(int) ap_snprintf(char *, size_t, const char *, ...);
   API_EXPORT(int) ap_vsnprintf(char *, size_t, const char *, va_list ap);
   int ap_execle(const char *, const char *, ...);
  
  
  
  1.225 +2 -0  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.224
  retrieving revision 1.225
  diff -u -r1.224 -r1.225
  --- httpd.h   1998/06/13 15:22:49 1.224
  +++ httpd.h   1998/06/19 21:02:37 1.225
  @@ -992,6 +992,8 @@
   #define AP_SLACK_HIGH2
   #endif
   
  +API_EXPORT(char *) ap_escape_quotes(pool *p, const char *instr);
  +
   /*
* Redefine assert() to something more useful for an Apache...
*/
  
  
  
  1.122 +50 -0 apache-1.3/src/main/util.c
  
  Index: util.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- util.c1998/06/13 15:22:54 1.121
  +++ util.c1998/06/19 21:02:42 1.122
  @@ -1805,3 +1805,53 @@
*semi = ';';
   }
   }
  +
  +/*
  + * Given a string, replace any bare  with \ .
  + */
  +API_EXPORT(char *) ap_escape_quotes (pool *p, const char *instring)
  +{
  +int newlen = 0;
  +const char *inchr = instring;
  +char *outchr, *outstring;
  +
  +/*
  + * Look through the input string, jogging the length of the output
  + * string up by an extra byte each time we find an unescaped .
  + */
  +while (*inchr != '\0') {
  + newlen++;
  +if (*inchr == '') {
  + newlen++;
  + }
  + /*
  +  * If we find a slosh, and it's not the last byte in the string,
  +  * it's escaping something - advance past both bytes.
  +  */
  + if ((*inchr == '\\')  (inchr[1] != '\0')) {
  + inchr++;
  + }
  + inchr++;
  +}
  +outstring = ap_palloc(p, newlen + 1);
  +inchr = instring;
  +outchr = outstring;
  +/*
  + * Now copy the input string to the output string, inserting a slosh
  + * in front of every  that doesn't already have one.
  + */
  +