Commit 14d5a812 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1719016 from trunk: 

There is no need to duplicate some memory  here, the 'path' given to ap_parse_htaccess is never modified.
Submitted by: jailletc36
Reviewed/backported by: jim


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

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -112,11 +112,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) core: Save memory when calling 'ap_parse_htaccess'

     trunk patch: http://svn.apache.org/r1719016

     2.4.x patch: trunk works

     +1: jailletc36, covener, jim



  *) Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order

     to save a few cycles.

     Fix some style issues.

server/request.c

+1 −2
Original line number Diff line number Diff line
@@ -1012,8 +1012,7 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r) 


                res = ap_parse_htaccess(&htaccess_conf, r, opts.override,

                                        opts.override_opts, opts.override_list,

                                        apr_pstrdup(r->pool, r->filename),

                                        sconf->access_name);

                                        r->filename, sconf->access_name);

                if (res) {

                    return res;

                }