Commit 4fe832d2 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

*) core: Add missing APLOGNO() from r1729495 (somehow r1725395 was 

             backported in r1729495 but without this "server/core.c" change)



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

STATUS

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

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



  *) core: Add missing APLOGNO() from r1729495 (somehow r1725395 was

           backported in r1729495 but without this "server/core.c" change)

     trunk patch: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?r1=1725395&r2=1725394&pathrev=1725395&view=patch

     2.4.x patch: trunk above works

     +1: ylavic, icing, jim







PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

server/core.c

+1 −1
Original line number Diff line number Diff line
@@ -4449,7 +4449,7 @@ static int core_override_type(request_rec *r) 
        const char *val;

        val = ap_expr_str_exec(r, conf->expr_handler, &err);

        if (err) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO()

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(03154)

                          "Can't evaluate handler expression: %s", err);

            return HTTP_INTERNAL_SERVER_ERROR;

        }