Commit c4ef468b authored by Eric Covener's avatar Eric Covener
Browse files

merge 1855743,1855744 ^/httpd/httpd/trunk . 

r->parsed_uri.path safety in recent backport

*) core: fix SEGFAULT in CONNECT with recent change
   2.4.x: svn merge -c 1855743,1855744 ^/httpd/httpd/trunk .
   +1: rpluem, icing, covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1855751 13f79535-47bb-0310-9956-ffa450edef68
parent a390de74

server/request.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -195,8 +195,10 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r) 
    ap_getparents(r->uri);     /* OK --- shrinking transformations... */

    ap_getparents(r->uri);     /* OK --- shrinking transformations... */

    if (sconf->merge_slashes != AP_CORE_CONFIG_OFF) { 

    if (sconf->merge_slashes != AP_CORE_CONFIG_OFF) { 

        ap_no2slash(r->uri);

        ap_no2slash(r->uri);

        if (r->parsed_uri.path) {

            ap_no2slash(r->parsed_uri.path);

            ap_no2slash(r->parsed_uri.path);

        }

        }

     }





    /* All file subrequests are a huge pain... they cannot bubble through the

    /* All file subrequests are a huge pain... they cannot bubble through the

     * next several steps.  Only file subrequests are allowed an empty uri,

     * next several steps.  Only file subrequests are allowed an empty uri,

server/util.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -566,6 +566,10 @@ AP_DECLARE(void) ap_no2slash_ex(char *name, int is_fs_path) 




    char *d, *s;

    char *d, *s;





    if (!name || !*name) {

        return;

    }



    s = d = name;

    s = d = name;





#ifdef HAVE_UNC_PATHS

#ifdef HAVE_UNC_PATHS