mod_rewrite: use buffered I/O for RewriteMap txt: files

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@178500 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 3039989b0dab777c7e4495d70c53e6506d20349b..9a4a9a045b5bb22380136f29f2a7ea4650cf5b62 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 Changes with Apache 2.0.55
+  
+  *) mod_rewrite: use buffered I/O to improve performance with large
+     RewriteMap txt: files.  [Greg Ames]
 
   *) proxy HTTP: Rework the handling of request bodies to handle
      chunked input and input filters which modify content length, and

diff --git a/STATUS b/STATUS
index e3489d914fdd439d7e396b1a7026b0ee5650c37e..2c91f1c30d032cb310694da0b0562dd560899db0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -129,10 +129,6 @@ PATCHES TO BACKPORT FROM TRUNK:
            (ignore changes to event MPM, which don't apply to 2.0.x)
        +1: trawick, jorton, gregames
 
-    *) mod_rewrite: use buffered I/O for RewriteMap txt: files
-         http://svn.apache.org/viewcvs.cgi?rev=161354&view=rev
-       +1: gregames, trawick, striker
-
     *) several changes to improve logging of connection-oriented errors, including
        ap_log_cerror() API (needs minor bump in addition to changes below)
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.289&r2=1.291

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 62bfe1335b424ea776180967b781bdebe61dff06..563d97a39f9cda8c0953b808fe02338b72c0a21f 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3165,7 +3165,7 @@ static char *lookup_map_txtfile(request_rec *r, const char *file, char *key)
     char *curkey;
     char *curval;
 
-    rc = apr_file_open(&fp, file, APR_READ, APR_OS_DEFAULT, r->pool);
+    rc = apr_file_open(&fp, file, APR_READ|APR_BUFFERED, APR_OS_DEFAULT, r->pool);
     if (rc != APR_SUCCESS) {
        return NULL;
     }