After committing Brian Havard's fix to Unix file_io yesterday,

we seem to be reading/seeking .var files fine on Unix even with
buffering turned on.

wrowe reports that they're working on Win32 also.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90812 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index 6939cd63e65720ab6800f5898ff1ef59cc65cf85..7e910c94cc8ee0ce1e4ad947b2e13228f98cde31 100644 (file)
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -888,7 +888,7 @@ static int read_type_map(apr_file_t **map, negotiation_state *neg, request_rec *
     /* We are not using multiviews */
     neg->count_multiviews_variants = 0;
 
-    if ((status = apr_file_open(map, rr->filename, APR_READ /* | APR_BUFFERED */,
+    if ((status = apr_file_open(map, rr->filename, APR_READ | APR_BUFFERED,
                 APR_OS_DEFAULT, neg->pool)) != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
                       "cannot access type map file: %s", rr->filename);