Re: svn commit: r1729495 [2/2] - in /httpd/httpd/branches/2.4.x: ./ modules/aaa/ modules/arch/win32/ modules/core/ modules/examples/ modules/filters/ modules/http2/ modules/loggers/ modules/lua/ modul

2016-02-23 Thread Rainer Jung 

Am 22.02.2016 um 22:48 schrieb Marion & Christophe JAILLET:

Le 22/02/2016 22:21, Rainer Jung a écrit :

Am 15.02.2016 um 07:28 schrieb Christophe JAILLET:

Le 10/02/2016 00:09, rj...@apache.org a écrit :

Modified: httpd/httpd/branches/2.4.x/server/mpm/event/event.c
URL:
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/event/event.c?rev=1729495=1729494=1729495=diff


@@ -3245,7 +3247,7 @@ static int event_check_config(apr_pool_t
  ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP,
0, NULL, APLOGNO(00497)
   "WARNING: ServerLimit of %d exceeds
compile-time "
   "limit of", server_limit);
-ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP,
0, NULL,
+ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP,
0, NULL, APLOGNO(03105)
   " %d servers, decreasing to %d.",
   MAX_SERVER_LIMIT, MAX_SERVER_LIMIT);
  } else {



Should we really add an APLOGNO here? It looks like a multi-line log
message.

This is the same for APLOGNO(03105) --> APLOGNO(03116) in event.c.
Similar code can also be found in other MPM.


You are right. I wonder whether we actually want to reformat those
startup messages to single (long) line messages. What do you (and
others) think?

Regards,

Rainer



+1, it is what I had in mind to clarify and avoid false positive when
using coccinelle.


Commited in r1731929.

Regards,

Rainer

Re: svn commit: r1729495 [2/2] - in /httpd/httpd/branches/2.4.x: ./ modules/aaa/ modules/arch/win32/ modules/core/ modules/examples/ modules/filters/ modules/http2/ modules/loggers/ modules/lua/ modul

2016-02-22 Thread Marion & Christophe JAILLET 



Le 22/02/2016 22:21, Rainer Jung a écrit :

Am 15.02.2016 um 07:28 schrieb Christophe JAILLET:

Le 10/02/2016 00:09, rj...@apache.org a écrit :

Modified: httpd/httpd/branches/2.4.x/server/mpm/event/event.c
URL:
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/event/event.c?rev=1729495=1729494=1729495=diff 



@@ -3245,7 +3247,7 @@ static int event_check_config(apr_pool_t
  ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP,
0, NULL, APLOGNO(00497)
   "WARNING: ServerLimit of %d exceeds
compile-time "
   "limit of", server_limit);
-ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP,
0, NULL,
+ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP,
0, NULL, APLOGNO(03105)
   " %d servers, decreasing to %d.",
   MAX_SERVER_LIMIT, MAX_SERVER_LIMIT);
  } else {



Should we really add an APLOGNO here? It looks like a multi-line log
message.

This is the same for APLOGNO(03105) --> APLOGNO(03116) in event.c.
Similar code can also be found in other MPM.


You are right. I wonder whether we actually want to reformat those 
startup messages to single (long) line messages. What do you (and 
others) think?


Regards,

Rainer


+1, it is what I had in mind to clarify and avoid false positive when 
using coccinelle.


CJ

Re: svn commit: r1729495 [2/2] - in /httpd/httpd/branches/2.4.x: ./ modules/aaa/ modules/arch/win32/ modules/core/ modules/examples/ modules/filters/ modules/http2/ modules/loggers/ modules/lua/ modul

2016-02-22 Thread William A Rowe Jr 
This looks busted anyways, the author broke the atomic behavior of log
messages :(
Fix the underlying bug.

Each AP# string should have exactly one string value, for later
internationalization.
There is no way, without the APLOGNO, that this second message can be
translated.

Cheers,

Bill

On Mon, Feb 22, 2016 at 3:21 PM, Rainer Jung 
wrote:

> Am 15.02.2016 um 07:28 schrieb Christophe JAILLET:
>
>> Le 10/02/2016 00:09, rj...@apache.org a écrit :
>>
>>> Modified: httpd/httpd/branches/2.4.x/server/mpm/event/event.c
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/event/event.c?rev=1729495=1729494=1729495=diff
>>>
>>> @@ -3245,7 +3247,7 @@ static int event_check_config(apr_pool_t
>>>   ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP,
>>> 0, NULL, APLOGNO(00497)
>>>"WARNING: ServerLimit of %d exceeds
>>> compile-time "
>>>"limit of", server_limit);
>>> -ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP,
>>> 0, NULL,
>>> +ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP,
>>> 0, NULL, APLOGNO(03105)
>>>" %d servers, decreasing to %d.",
>>>MAX_SERVER_LIMIT, MAX_SERVER_LIMIT);
>>>   } else {
>>>
>>>
>> Should we really add an APLOGNO here? It looks like a multi-line log
>> message.
>>
>> This is the same for APLOGNO(03105) --> APLOGNO(03116) in event.c.
>> Similar code can also be found in other MPM.
>>
>
> You are right. I wonder whether we actually want to reformat those startup
> messages to single (long) line messages. What do you (and others) think?
>
> Regards,
>
> Rainer
>
>

Re: svn commit: r1729495 [2/2] - in /httpd/httpd/branches/2.4.x: ./ modules/aaa/ modules/arch/win32/ modules/core/ modules/examples/ modules/filters/ modules/http2/ modules/loggers/ modules/lua/ modul

2016-02-22 Thread Rainer Jung 

Am 15.02.2016 um 07:28 schrieb Christophe JAILLET:

Le 10/02/2016 00:09, rj...@apache.org a écrit :

Modified: httpd/httpd/branches/2.4.x/server/mpm/event/event.c
URL:
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/event/event.c?rev=1729495=1729494=1729495=diff

@@ -3245,7 +3247,7 @@ static int event_check_config(apr_pool_t
  ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP,
0, NULL, APLOGNO(00497)
   "WARNING: ServerLimit of %d exceeds
compile-time "
   "limit of", server_limit);
-ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP,
0, NULL,
+ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP,
0, NULL, APLOGNO(03105)
   " %d servers, decreasing to %d.",
   MAX_SERVER_LIMIT, MAX_SERVER_LIMIT);
  } else {



Should we really add an APLOGNO here? It looks like a multi-line log
message.

This is the same for APLOGNO(03105) --> APLOGNO(03116) in event.c.
Similar code can also be found in other MPM.


You are right. I wonder whether we actually want to reformat those 
startup messages to single (long) line messages. What do you (and 
others) think?


Regards,

Rainer

Re: svn commit: r1729495 [2/2] - in /httpd/httpd/branches/2.4.x: ./ modules/aaa/ modules/arch/win32/ modules/core/ modules/examples/ modules/filters/ modules/http2/ modules/loggers/ modules/lua/ modul

2016-02-14 Thread Christophe JAILLET 

Le 10/02/2016 00:09, rj...@apache.org a écrit :

Modified: httpd/httpd/branches/2.4.x/server/mpm/event/event.c
URL: 
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/event/event.c?rev=1729495=1729494=1729495=diff
@@ -3245,7 +3247,7 @@ static int event_check_config(apr_pool_t
  ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, 
APLOGNO(00497)
   "WARNING: ServerLimit of %d exceeds compile-time "
   "limit of", server_limit);
-ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL,
+ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, 
APLOGNO(03105)
   " %d servers, decreasing to %d.",
   MAX_SERVER_LIMIT, MAX_SERVER_LIMIT);
  } else {



Should we really add an APLOGNO here? It looks like a multi-line log 
message.


This is the same for APLOGNO(03105) --> APLOGNO(03116) in event.c. 
Similar code can also be found in other MPM.


Best regards,
CJ