httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_negotiation.c
Date Mon, 18 Jun 2001 05:36:35 GMT
wrowe       01/06/17 22:36:35

  Modified:    .        CHANGES
               modules/http mod_mime.c
               modules/mappers mod_negotiation.c
  Log:
    Allow index.html.en and Index.html.FR to both be considered in negotation
    on case insensitive platforms, only.
  
  Revision  Changes    Path
  1.227     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.226
  retrieving revision 1.227
  diff -u -r1.226 -r1.227
  --- CHANGES	2001/06/15 18:33:08	1.226
  +++ CHANGES	2001/06/18 05:36:29	1.227
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.19-dev
   
  +  *) Solve case-insensitive platforms' confusion about negotiated
  +     filenames, allowing files of differnt case to match in choosing
  +     the document to serve.  [William Rowe]
  +
     *) Fix brokenness when ThreadsPerChild is higher than the built-in
        limit.  We left ap_threads_per_child at the higher value which
        led to segfaults when doing certain scoreboard operations.
  
  
  
  1.42      +7 -0      httpd-2.0/modules/http/mod_mime.c
  
  Index: mod_mime.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/mod_mime.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- mod_mime.c	2001/03/16 07:28:06	1.41
  +++ mod_mime.c	2001/06/18 05:36:31	1.42
  @@ -683,6 +683,13 @@
       while ((ext = ap_getword(r->pool, &fn, '.')) && *ext) {
           int found = 0;
   
  +#ifdef CASE_BLIND_FILESYSTEM
  +        /* We have a basic problem that folks on case-crippled systems
  +         * expect anything and everything to succeed
  +         */
  +        ap_str_tolower(ext);
  +#endif
  +
           /* Check for Content-Type */
           if ((type = apr_table_get(conf->forced_types, ext))
               || (type = apr_table_get(hash_buckets[hash(*ext)], ext))) {
  
  
  
  1.58      +4 -0      httpd-2.0/modules/mappers/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_negotiation.c	2001/04/10 20:28:01	1.57
  +++ mod_negotiation.c	2001/06/18 05:36:33	1.58
  @@ -935,7 +935,11 @@
           request_rec *sub_req;
           
           /* Do we have a match? */
  +#ifdef CASE_BLIND_FILESYSTEM
  +        if (strncasecmp(dirent.name, filp, prefix_len)) {
  +#else
           if (strncmp(dirent.name, filp, prefix_len)) {
  +#endif
               continue;
           }
           if (dirent.name[prefix_len] != '.') {
  
  
  

Mime
View raw message