httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1733291 - in /httpd/httpd/branches/2.4.x: STATUS server/core.c
Date Wed, 02 Mar 2016 13:52:20 GMT
Author: jim
Date: Wed Mar  2 13:52:20 2016
New Revision: 1733291

URL: http://svn.apache.org/viewvc?rev=1733291&view=rev
Log:
  *) core: Add missing APLOGNO() from r1729495 (somehow r1725395 was
             backported in r1729495 but without this "server/core.c" change)


Modified:
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/server/core.c

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1733291&r1=1733290&r2=1733291&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Mar  2 13:52:20 2016
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?rev=1733291&r1=1733290&r2=1733291&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core.c (original)
+++ httpd/httpd/branches/2.4.x/server/core.c Wed Mar  2 13:52:20 2016
@@ -4449,7 +4449,7 @@ static int core_override_type(request_re
         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;
         }



Mime
View raw message