cvs commit: apache-1.3/src/include ap_config.h

[marc]

marc98/09/28 18:22:57

  Modified:src/include ap_config.h
  Log:
  Unserialized accept() should be safe (in all versions) and efficient
  (in anything vaguely recent) on FreeBSD.
  
  Revision  ChangesPath
  1.237 +1 -0  apache-1.3/src/include/ap_config.h
  
  Index: ap_config.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v
  retrieving revision 1.236
  retrieving revision 1.237
  diff -u -r1.236 -r1.237
  --- ap_config.h   1998/09/24 17:25:55 1.236
  +++ ap_config.h   1998/09/29 01:22:57 1.237
  @@ -646,6 +646,7 @@
   typedef quad_t rlim_t;
   #endif
   #define USE_FLOCK_SERIALIZED_ACCEPT
  +#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
   #define HAVE_SYSLOG 1
   #define SYS_SIGLIST sys_siglist
   
  
  
  

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

[coar]

coar98/09/29 08:13:19

  Modified:src/modules/standard mod_speling.c
  Log:
Make the list of spelling-correction variants available to
ErrorDocument 300 processing through the use of the new
envariable *VARIANTS.  The format of the envariable value is
uri;reason, uri;reason, ... to be at least semi-consistent
with existing multi-value field usages.  It's a little expensive
in terms of memory, but the number of variants should be small
and we're about to complete the request, so it seems a reasonable
tradeoff.
  
  PR:   2859
  
  Revision  ChangesPath
  1.29  +13 -10apache-1.3/src/modules/standard/mod_speling.c
  
  Index: mod_speling.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_speling.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- mod_speling.c 1998/09/25 17:17:54 1.28
  +++ mod_speling.c 1998/09/29 15:13:18 1.29
  @@ -453,18 +453,21 @@
   t = ;
   
   for (i = 0; i  candidates-nelts; ++i) {
  + char *vuri;
  + const char *reason;
   
  + reason = sp_reason_str[(int) (variant[i].quality)];
   /* The format isn't very neat... */
  -t = ap_pstrcat(p, t, lia href=\, url,
  -variant[i].name, r-path_info,
  -r-parsed_uri.query ? ? : ,
  -r-parsed_uri.query ? r-parsed_uri.query : ,
  -\, variant[i].name, r-path_info,
  -r-parsed_uri.query ? ? : ,
  -r-parsed_uri.query ? r-parsed_uri.query : ,
  -/a (,
  -sp_reason_str[(int) (variant[i].quality)],
  -)\n, NULL);
  + vuri = ap_pstrcat(p, url, variant[i].name, r-path_info,
  +   (r-parsed_uri.query != NULL) ? ? : ,
  +   (r-parsed_uri.query != NULL)
  +   ? r-parsed_uri.query : ,
  +   NULL);
  + ap_table_mergen(r-subprocess_env, VARIANTS,
  + ap_pstrcat(p, \, vuri, \;\,
  +reason, \, NULL));
  +t = ap_pstrcat(p, t, lia href=\, vuri,
  +\, vuri, /a (, reason, )\n, NULL);
   
   /*
* when we have printed the close matches and there are
  
  
  

cvs commit: apache-1.3/src CHANGES

[coar]

coar98/09/29 08:17:04

  Modified:src  CHANGES
  Log:
Oy, forgot to update CHANGES again..
  
  Revision  ChangesPath
  1.1084+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1083
  retrieving revision 1.1084
  diff -u -r1.1083 -r1.1084
  --- CHANGES   1998/09/28 22:32:10 1.1083
  +++ CHANGES   1998/09/29 15:17:02 1.1084
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.3
   
  +  *) Add [REDIRECT_]VARIANTS environment variable to mod_speling
  + so that ErrorDocument 300 processors can reformat the list
  + if desired.  [Ken Coar] PR#2859
  +
 *) Add +/- incremental prefixes to IndexOptions keywords, and
enable merging of multiple IndexOptions directives.  [Ken Coar]