You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2012/12/10 21:53:24 UTC

svn commit: r1419755 - /httpd/httpd/trunk/modules/http/http_filters.c

Author: jailletc36
Date: Mon Dec 10 20:53:24 2012
New Revision: 1419755

URL: http://svn.apache.org/viewvc?rev=1419755&view=rev
Log:
Avoid unnecessary %s substitution

Modified:
    httpd/httpd/trunk/modules/http/http_filters.c

Modified: httpd/httpd/trunk/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=1419755&r1=1419754&r2=1419755&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_filters.c (original)
+++ httpd/httpd/trunk/modules/http/http_filters.c Mon Dec 10 20:53:24 2012
@@ -966,10 +966,10 @@ static void basic_http_header(request_re
          * Date and Server are less interesting, use TRACE5 for them while
          * using TRACE4 for the other headers.
          */
-        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "  %s: %s", "Date",
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "  Date: %s",
                       proxy_date ? proxy_date : date );
         if (server)
-            ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "  %s: %s", "Server",
+            ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "  Server: %s",
                           server);
     }
 



Re: svn commit: r1419755 - /httpd/httpd/trunk/modules/http/http_filters.c

Posted by Stefan Fritsch <sf...@sfritsch.de>.
On Monday 10 December 2012, Marion & Christophe JAILLET wrote:
> Just above this, there is the following comment :
>          /*
>           * Date and Server are less interesting, use TRACE5 for
> them while * using TRACE4 for the other headers.
>           */
> However, I don't see where the other headers are logged.

It's done in send_all_header_fields() which sends everything except 
"Date" and "Server". The comment is here because the trace4 for the ", 
headers:" string does not match the trace5 of the Server+Date header.

> You can find a little above:
>          ap_log_rerror(APLOG_MARK, APLOG_TRACE3, 0, r,
>                        "Response sent with status %d%s",
>                        r->status,
>                        APLOGrtrace4(r) ? ", headers:" : "");
> but, IMO, it does not log the headers, it only prints "headers: ".

> Apparently, it has been that way, since the beginning in
> 
http://svn.apache.org/viewvc?view=revision&sortby=date&revision=963057
>
> Should something be added here to match the comment, or remove the
> comment ?

Neither. But maybe add a comment that points to 
send_all_header_fields()?

Re: svn commit: r1419755 - /httpd/httpd/trunk/modules/http/http_filters.c

Posted by Marion & Christophe JAILLET <ch...@wanadoo.fr>.
Le 10/12/2012 21:53, jailletc36@apache.org a écrit :
> Author: jailletc36
> Date: Mon Dec 10 20:53:24 2012
> New Revision: 1419755
>
> URL: http://svn.apache.org/viewvc?rev=1419755&view=rev
> Log:
> Avoid unnecessary %s substitution
>
> Modified:
>      httpd/httpd/trunk/modules/http/http_filters.c
>
> Modified: httpd/httpd/trunk/modules/http/http_filters.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=1419755&r1=1419754&r2=1419755&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/http/http_filters.c (original)
> +++ httpd/httpd/trunk/modules/http/http_filters.c Mon Dec 10 20:53:24 2012
> @@ -966,10 +966,10 @@ static void basic_http_header(request_re
>            * Date and Server are less interesting, use TRACE5 for them while
>            * using TRACE4 for the other headers.
>            */
> -        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "  %s: %s", "Date",
> +        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "  Date: %s",
>                         proxy_date ? proxy_date : date );
>           if (server)
> -            ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "  %s: %s", "Server",
> +            ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "  Server: %s",
>                             server);
>       }

Just above this, there is the following comment :
         /*
          * Date and Server are less interesting, use TRACE5 for them while
          * using TRACE4 for the other headers.
          */
However, I don't see where the other headers are logged.

You can find a little above:
         ap_log_rerror(APLOG_MARK, APLOG_TRACE3, 0, r,
                       "Response sent with status %d%s",
                       r->status,
                       APLOGrtrace4(r) ? ", headers:" : "");
but, IMO, it does not log the headers, it only prints "headers: ".


Apparently, it has been that way, since the beginning in 
http://svn.apache.org/viewvc?view=revision&sortby=date&revision=963057

Should something be added here to match the comment, or remove the comment ?

Best regards,
CJ