From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 31 Aug 2001 22:33:24 +0000 (+0000)
Subject:   Ahhh, a const headache.  Here's a flag that is writeable.
X-Git-Tag: 2.0.26~350
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=640e927610907422951b0dbd1211a1bb5c2bdce0;p=apache

  Ahhh, a const headache.  Here's a flag that is writeable.


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

diff --git a/server/request.c b/server/request.c
index 9e625e2d74..6804cb4017 100644
--- a/server/request.c
+++ b/server/request.c
@@ -1554,14 +1554,14 @@ AP_DECLARE(request_rec *) ap_sub_req_lookup_file(const char *new_file,
 
     /* Translate r->filename, if it was canonical, it stays canonical
      */
-    if (r->canonical_filename != r->filename)
-        r->canonical_filename = NULL;
+    if (r->canonical_filename == r->filename)
+        rnew->canonical_filename = (char*)(1);
     if (apr_filepath_merge(&rnew->filename, fdir, new_file,
                            APR_FILEPATH_TRUENAME, rnew->pool) != APR_SUCCESS) {
         rnew->status = HTTP_FORBIDDEN;
         return rnew;
     }
-    if (r->canonical_filename)
+    if (rnew->canonical_filename)
         rnew->canonical_filename = rnew->filename;
 
     /*