Commit db9d065e authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

Fix a segfault with mod_include when r->path_info is not set 

(which is the case with mod_proxy).

My only question about this is whether we should place some value
(such as <UNKNOWN>) when path_info isn't set.

Submitted by:	Ian Holsman <ianh@cnet.com>
Reviewed by:	Justin Erenkrantz


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

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.26-dev



  *) Fix a segfault with mod_include when r->path_info is not set

     (which is the case with mod_proxy).  [Ian Holsman <ianh@cnet.com>]



  *) Add -X functionality back.  This indicates to all MPMs and any other

     part of Apache that it should run in "debug" mode.  [Justin Erenkrantz]

modules/filters/mod_include.c

+3 −1
Original line number Diff line number Diff line
@@ -113,7 +113,9 @@ static void add_include_vars(request_rec *r, char *timefmt) 
    apr_table_setn(e, "LAST_MODIFIED",

              ap_ht_time(r->pool, r->finfo.mtime, timefmt, 0));

    apr_table_setn(e, "DOCUMENT_URI", r->uri);

    if (r->path_info && *r->path_info) {

        apr_table_setn(e, "DOCUMENT_PATH_INFO", r->path_info);

    }

    if (apr_get_username(&pwname, r->finfo.user, r->pool) == APR_SUCCESS) {

        apr_table_setn(e, "USER_NAME", pwname);

    }