Commit 18d98b31 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  APR_FILEPATH_NOTABOVEROOT was undefined with a left-hand NULL
  or empty path.  The SECUREROOTPATH and NOTABSOLUTE tests were
  sufficient for this application.  Adjusts for a bug in earlier
  versions of APR with this undefined value.


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

modules/filters/mod_include.c

+0 −2
Changes for modules/filters/mod_include.c: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1539,7 +1539,6 @@ static int find_file(request_rec *r, const char *directive, const char *tag, 


        /* be safe; only files in this directory or below allowed */

        rv = apr_filepath_merge(&newpath, NULL, tag_val,

                                APR_FILEPATH_NOTABOVEROOT |

                                APR_FILEPATH_SECUREROOTTEST |

                                APR_FILEPATH_NOTABSOLUTE, r->pool);
@@ -1655,7 +1654,6 @@ static apr_status_t handle_include(include_ctx_t *ctx, ap_filter_t *f, 


            /* be safe; only files in this directory or below allowed */

            rv = apr_filepath_merge(&newpath, NULL, parsed_string,

                                    APR_FILEPATH_NOTABOVEROOT |

                                    APR_FILEPATH_SECUREROOTTEST |

                                    APR_FILEPATH_NOTABSOLUTE, ctx->dpool);