Commit 1bec644f authored by Rainer Jung's avatar Rainer Jung
Browse files

Add APLOGNO, first chunk (those that were 

detected by coccinelle).

There are some more but they are easier to
backport once these here are applied.

Backport of r1725392, r1725394, r1725395
and r1725468 from trunk.

Submitted by: rjung
Reviewed by: jim, ylavic


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ Changes with Apache 2.4.19 
  *) mime.types: add common extension "m4a" for MPEG 4 Audio.

     PR 57895 [Dylan Millikin <dylan.millikin gmail.com>]



  *) Added many log numbers to log statements that had none.

     [Rainer Jung]



  *) mod_log_config: Add GlobalLog to allow a globally defined log to

     be inherited by virtual hosts that define a CustomLog.

     [Edward Lu]

STATUS

+0 −14
Original line number Diff line number Diff line
@@ -134,20 +134,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     trunk patch:  http://svn.apache.org/r1725940

     +1: icing, jim, ylavic



  *) Add APLOGNO, first chunk (those that were detected by coccinelle).

     There are some more but they are easier to backport once these here are applied.

     trunk patch:  http://svn.apache.org/r1725392 (modules)

                   http://svn.apache.org/r1725394 (server/mpm)

                   http://svn.apache.org/r1725395 (server others)

                   http://svn.apache.org/r1725468 (remove APLOGNO from mod_log_debug custom messages)

     2.4.x patch:  http://people.apache.org/~rjung/patches/aplogno-backport-r1725392.patch

                   http://people.apache.org/~rjung/patches/aplogno-backport-r1725394.patch

                   http://people.apache.org/~rjung/patches/aplogno-backport-r1725395.patch

                   http://people.apache.org/~rjung/patches/aplogno-backport-r1725468.patch

     +1: rjung, jim, ylavic

     icing: needs http://svn.apache.org/r1725468

     rjung: You are right, I added r1725468 and restarted the vote.



  *) core: Prevent a server crash in case of an invalid CONNECT request with

     a custom error page for status code 400 that uses server side includes.

     PR 58929

modules/aaa/mod_auth_form.c

+2 −2
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ static int get_form_auth(request_rec * r, 
    /* a missing username or missing password means auth denied */

    if (!sent_user || !*sent_user) {



        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02982)

                      "form parsed, but username field '%s' was missing or empty, unauthorized",

                      username);
@@ -691,7 +691,7 @@ static int get_form_auth(request_rec * r, 
    }

    if (!sent_pw || !*sent_pw) {



        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02983)

                      "form parsed, but password field '%s' was missing or empty, unauthorized",

                      password);

modules/arch/win32/mod_isapi.c

+5 −5
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ static int APR_THREAD_FUNC regfnWriteClient(isapi_cid *cid, 
        rv = ap_pass_brigade(r->output_filters, bb);

        cid->response_sent = 1;

        if (rv != APR_SUCCESS)

            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,

            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(02984)

                          "WriteClient ap_pass_brigade failed: %s",

                          r->filename);

    }
@@ -1017,7 +1017,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, 
                r->args = apr_pstrdup(r->pool, (char*) buf_data);

        }

        if (cid->dconf.log_to_errlog)

            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02985)

                          "%s: %s", cid->r->filename,

                          (char*) buf_data);

        return 1;
@@ -1187,7 +1187,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, 
        int res = 0;

        if (!cid->dconf.fake_async) {

            if (cid->dconf.log_unsupported)

                ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,

                ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02986)

                              "asynchronous I/O not supported: %s",

                              r->filename);

            apr_set_os_error(APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER));

modules/core/mod_macro.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void warn_if_non_blank(const char * what, 
        if (*p == '#')

            break;

        if (*p != ' ' && *p != '\t') {

            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,

            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02989)

                         "%s on line %d of %s: %s",

                         what, cfg->line_number, cfg->name, ptr);

            break;