apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@rowe-clan.net>
Subject Re: cvs commit: httpd-2.0/modules/mappers mod_negotiation.c
Date Tue, 28 Aug 2001 03:03:11 GMT
From: "William A. Rowe, Jr." <wrowe@rowe-clan.net>
Sent: Monday, August 27, 2001 8:52 PM


> If you error 506, then we are in the negotation bug (or mod_includes
> anti-recursion bug), and clear of our apr file read/buffered seek
> fooness.  This bug is a bigger pita, but at least you will know the
> apr_file_read/seek stuff is good :)

wrowe       01/08/23 21:16:29

  Modified:    modules/mappers mod_negotiation.c
  Log:
    Add the config of the ForceLanguagePriority directive, since we seem
    to agree on what it does.  My last question is where do I force this
    behavior without tons of extra filesystem/cpu consumption?
  
  Revision  Changes    Path
  1.75      +45 -10    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.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- mod_negotiation.c 2001/08/24 03:04:44 1.74
  +++ mod_negotiation.c 2001/08/24 04:16:29 1.75
  @@ -925,7 +960,7 @@
                        break;
                   }
                   mime_info.bytes = len;
  -                mime_info.file_name = rr->filename;
  +                mime_info.file_name = apr_filename_of_pathname(rr->filename);
               }
           }
           else {
  

Well there's that bug.  Actually, not a bug, but it stopped triggering the 
neg->is_transparent flag when we have a body.  Now if we didn't have a body
with that .var map file, then this is the correct error.  Since we are on
_the_ file they've asked for (or we've decided to serve as an error), the
patch I just committed will take kindly to this body and go ahead and serve it.

Notice that I made this change on purpose, I'm looking for the obvious places we
give away to much local information about the server.  This was one example.
If you looked with language cz (not supported), you would have seen the full
path of the file, repeated four times (de, en, es, fr).  I've backed out this
patch, I have a feeling that we should do such cleanup in the not acceptable
block when we format alternatives for the user.

Bill



Mime
View raw message